Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[CT-856] Add order replacement to fix vault causing orderbook… (backport #1897) #1900

Merged
merged 1 commit into from
Jul 12, 2024
+74 −186
Merged

Revert "[CT-856] Add order replacement to fix vault causing orderbook… (backport #1897) #1900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion protocol/app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,7 +1090,6 @@ func New(
app.PricesKeeper,
app.SendingKeeper,
app.SubaccountsKeeper,
app.IndexerEventManager,
[]string{
lib.GovModuleAddress.String(),
delaymsgmoduletypes.ModuleAddress.String(),
Expand Down
17 changes: 0 additions & 17 deletions protocol/indexer/events/stateful_order.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,6 @@ func NewLongTermOrderPlacementEvent(
}
}

func NewLongTermOrderReplacementEvent(
oldOrderId clobtypes.OrderId,
order clobtypes.Order,
) *StatefulOrderEventV1 {
oldIndexerOrderId := v1.OrderIdToIndexerOrderId(oldOrderId)
indexerOrder := v1.OrderToIndexerOrder(order)
orderReplace := StatefulOrderEventV1_LongTermOrderReplacementV1{
OldOrderId: &oldIndexerOrderId,
Order: &indexerOrder,
}
return &StatefulOrderEventV1{
Event: &StatefulOrderEventV1_OrderReplacement{
OrderReplacement: &orderReplace,
},
}
}

func NewStatefulOrderRemovalEvent(
removedOrderId clobtypes.OrderId,
reason sharedtypes.OrderRemovalReason,
Expand Down
57 changes: 5 additions & 52 deletions protocol/mocks/ClobKeeper.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 18 additions & 7 deletions protocol/mocks/MemClobKeeper.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion protocol/testutil/keeper/vault.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ func createVaultKeeper(
&mocks.PricesKeeper{},
&mocks.SendingKeeper{},
&mocks.SubaccountsKeeper{},
&mocks.IndexerEventManager{},
[]string{
lib.GovModuleAddress.String(),
delaymsgtypes.ModuleAddress.String(),
Expand Down
25 changes: 11 additions & 14 deletions protocol/x/clob/keeper/msg_server_cancel_orders.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func (k msgServer) CancelOrder(
) (resp *types.MsgCancelOrderResponse, err error) {
ctx := lib.UnwrapSDKContext(goCtx, types.ModuleName)

if err := k.Keeper.HandleMsgCancelOrder(ctx, msg, false); err != nil {
if err := k.Keeper.HandleMsgCancelOrder(ctx, msg); err != nil {
return nil, err
}

Expand All @@ -37,7 +37,6 @@ func (k msgServer) CancelOrder(
func (k Keeper) HandleMsgCancelOrder(
ctx sdk.Context,
msg *types.MsgCancelOrder,
isInternalOrder bool,
) (err error) {
lib.AssertDeliverTxMode(ctx)

Expand Down Expand Up @@ -104,19 +103,17 @@ func (k Keeper) HandleMsgCancelOrder(
k.AddDeliveredCancelledOrderId(ctx, msg.OrderId)

// 4. Add the relevant on-chain Indexer event for the cancellation.
if !isInternalOrder { // vault order indexer event logic is handled elsewhere
k.GetIndexerEventManager().AddTxnEvent(
ctx,
indexerevents.SubtypeStatefulOrder,
indexerevents.StatefulOrderEventVersion,
indexer_manager.GetBytes(
indexerevents.NewStatefulOrderRemovalEvent(
msg.OrderId,
indexershared.OrderRemovalReason_ORDER_REMOVAL_REASON_USER_CANCELED,
),
k.GetIndexerEventManager().AddTxnEvent(
ctx,
indexerevents.SubtypeStatefulOrder,
indexerevents.StatefulOrderEventVersion,
indexer_manager.GetBytes(
indexerevents.NewStatefulOrderRemovalEvent(
msg.OrderId,
indexershared.OrderRemovalReason_ORDER_REMOVAL_REASON_USER_CANCELED,
),
)
}
),
)

return nil
}
40 changes: 18 additions & 22 deletions protocol/x/clob/keeper/msg_server_place_order.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,35 +114,31 @@ func (k Keeper) HandleMsgPlaceOrder(

// 4. Emit the new order placement indexer event.
if order.IsConditionalOrder() {
if !isInternalOrder { // vault order indexer event logic is handled elsewhere
k.GetIndexerEventManager().AddTxnEvent(
ctx,
indexerevents.SubtypeStatefulOrder,
indexerevents.StatefulOrderEventVersion,
indexer_manager.GetBytes(
indexerevents.NewConditionalOrderPlacementEvent(
order,
),
k.GetIndexerEventManager().AddTxnEvent(
ctx,
indexerevents.SubtypeStatefulOrder,
indexerevents.StatefulOrderEventVersion,
indexer_manager.GetBytes(
indexerevents.NewConditionalOrderPlacementEvent(
order,
),
)
}
),
)
k.AddDeliveredConditionalOrderId(
ctx,
order.OrderId,
)
} else {
if !isInternalOrder { // vault order indexer event logic is handled elsewhere
k.GetIndexerEventManager().AddTxnEvent(
ctx,
indexerevents.SubtypeStatefulOrder,
indexerevents.StatefulOrderEventVersion,
indexer_manager.GetBytes(
indexerevents.NewLongTermOrderPlacementEvent(
order,
),
k.GetIndexerEventManager().AddTxnEvent(
ctx,
indexerevents.SubtypeStatefulOrder,
indexerevents.StatefulOrderEventVersion,
indexer_manager.GetBytes(
indexerevents.NewLongTermOrderPlacementEvent(
order,
),
)
}
),
)
k.AddDeliveredLongTermOrderId(
ctx,
order.OrderId,
Expand Down
1 change: 0 additions & 1 deletion protocol/x/clob/types/clob_keeper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ type ClobKeeper interface {
HandleMsgCancelOrder(
ctx sdk.Context,
msg *MsgCancelOrder,
isInternalOrder bool,
) (err error)
HandleMsgPlaceOrder(
ctx sdk.Context,
Expand Down
40 changes: 16 additions & 24 deletions protocol/x/vault/keeper/keeper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,20 @@ import (
storetypes "cosmossdk.io/store/types"
"github.com/cosmos/cosmos-sdk/codec"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/dydxprotocol/v4-chain/protocol/indexer/indexer_manager"
"github.com/dydxprotocol/v4-chain/protocol/lib"
"github.com/dydxprotocol/v4-chain/protocol/x/vault/types"
)

type (
Keeper struct {
cdc codec.BinaryCodec
storeKey storetypes.StoreKey
clobKeeper types.ClobKeeper
perpetualsKeeper types.PerpetualsKeeper
pricesKeeper types.PricesKeeper
sendingKeeper types.SendingKeeper
subaccountsKeeper types.SubaccountsKeeper
indexerEventManager indexer_manager.IndexerEventManager
authorities map[string]struct{}
cdc codec.BinaryCodec
storeKey storetypes.StoreKey
clobKeeper types.ClobKeeper
perpetualsKeeper types.PerpetualsKeeper
pricesKeeper types.PricesKeeper
sendingKeeper types.SendingKeeper
subaccountsKeeper types.SubaccountsKeeper
authorities map[string]struct{}
}
)

Expand All @@ -34,26 +32,20 @@ func NewKeeper(
pricesKeeper types.PricesKeeper,
sendingKeeper types.SendingKeeper,
subaccountsKeeper types.SubaccountsKeeper,
indexerEventManager indexer_manager.IndexerEventManager,
authorities []string,
) *Keeper {
return &Keeper{
cdc: cdc,
storeKey: storeKey,
clobKeeper: clobKeeper,
perpetualsKeeper: perpetualsKeeper,
pricesKeeper: pricesKeeper,
sendingKeeper: sendingKeeper,
subaccountsKeeper: subaccountsKeeper,
indexerEventManager: indexerEventManager,
authorities: lib.UniqueSliceToSet(authorities),
cdc: cdc,
storeKey: storeKey,
clobKeeper: clobKeeper,
perpetualsKeeper: perpetualsKeeper,
pricesKeeper: pricesKeeper,
sendingKeeper: sendingKeeper,
subaccountsKeeper: subaccountsKeeper,
authorities: lib.UniqueSliceToSet(authorities),
}
}

func (k Keeper) GetIndexerEventManager() indexer_manager.IndexerEventManager {
return k.indexerEventManager
}

func (k Keeper) HasAuthority(authority string) bool {
_, ok := k.authorities[authority]
return ok
Expand Down
Loading
Loading