Skip to content

Commit

Permalink
[CT-1258] add order removal reason for expired permissioned keys (#2407)
Browse files Browse the repository at this point in the history
  • Loading branch information
jayy04 authored Sep 30, 2024
1 parent d583dbc commit 3adc282
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 31 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@ export enum OrderRemoval_RemovalReason {
* would lead to the subaccount violating isolated subaccount constraints.
*/
REMOVAL_REASON_VIOLATES_ISOLATED_SUBACCOUNT_CONSTRAINTS = 8,

/**
* REMOVAL_REASON_PERMISSIONED_KEY_EXPIRED - REMOVAL_REASON_PERMISSIONED_KEY_EXPIRED represents a removal of an order
* that was placed using an expired permissioned key.
*/
REMOVAL_REASON_PERMISSIONED_KEY_EXPIRED = 9,
UNRECOGNIZED = -1,
}
export enum OrderRemoval_RemovalReasonSDKType {
Expand Down Expand Up @@ -131,6 +137,12 @@ export enum OrderRemoval_RemovalReasonSDKType {
* would lead to the subaccount violating isolated subaccount constraints.
*/
REMOVAL_REASON_VIOLATES_ISOLATED_SUBACCOUNT_CONSTRAINTS = 8,

/**
* REMOVAL_REASON_PERMISSIONED_KEY_EXPIRED - REMOVAL_REASON_PERMISSIONED_KEY_EXPIRED represents a removal of an order
* that was placed using an expired permissioned key.
*/
REMOVAL_REASON_PERMISSIONED_KEY_EXPIRED = 9,
UNRECOGNIZED = -1,
}
export function orderRemoval_RemovalReasonFromJSON(object: any): OrderRemoval_RemovalReason {
Expand Down Expand Up @@ -171,6 +183,10 @@ export function orderRemoval_RemovalReasonFromJSON(object: any): OrderRemoval_Re
case "REMOVAL_REASON_VIOLATES_ISOLATED_SUBACCOUNT_CONSTRAINTS":
return OrderRemoval_RemovalReason.REMOVAL_REASON_VIOLATES_ISOLATED_SUBACCOUNT_CONSTRAINTS;

case 9:
case "REMOVAL_REASON_PERMISSIONED_KEY_EXPIRED":
return OrderRemoval_RemovalReason.REMOVAL_REASON_PERMISSIONED_KEY_EXPIRED;

case -1:
case "UNRECOGNIZED":
default:
Expand Down Expand Up @@ -206,6 +222,9 @@ export function orderRemoval_RemovalReasonToJSON(object: OrderRemoval_RemovalRea
case OrderRemoval_RemovalReason.REMOVAL_REASON_VIOLATES_ISOLATED_SUBACCOUNT_CONSTRAINTS:
return "REMOVAL_REASON_VIOLATES_ISOLATED_SUBACCOUNT_CONSTRAINTS";

case OrderRemoval_RemovalReason.REMOVAL_REASON_PERMISSIONED_KEY_EXPIRED:
return "REMOVAL_REASON_PERMISSIONED_KEY_EXPIRED";

case OrderRemoval_RemovalReason.UNRECOGNIZED:
default:
return "UNRECOGNIZED";
Expand Down
3 changes: 3 additions & 0 deletions proto/dydxprotocol/clob/order_removals.proto
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ message OrderRemoval {
// REMOVAL_REASON_FULLY_FILLED represents a removal of an order that
// would lead to the subaccount violating isolated subaccount constraints.
REMOVAL_REASON_VIOLATES_ISOLATED_SUBACCOUNT_CONSTRAINTS = 8;
// REMOVAL_REASON_PERMISSIONED_KEY_EXPIRED represents a removal of an order
// that was placed using an expired permissioned key.
REMOVAL_REASON_PERMISSIONED_KEY_EXPIRED = 9;
}

RemovalReason removal_reason = 2;
Expand Down
4 changes: 4 additions & 0 deletions protocol/indexer/shared/order_removal_reason.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ func ConvertOrderRemovalReasonToIndexerOrderRemovalReason(
reason = sharedtypes.OrderRemovalReason_ORDER_REMOVAL_REASON_IMMEDIATE_OR_CANCEL_WOULD_REST_ON_BOOK
case clobtypes.OrderRemoval_REMOVAL_REASON_VIOLATES_ISOLATED_SUBACCOUNT_CONSTRAINTS:
reason = sharedtypes.OrderRemovalReason_ORDER_REMOVAL_REASON_VIOLATES_ISOLATED_SUBACCOUNT_CONSTRAINTS
case clobtypes.OrderRemoval_REMOVAL_REASON_PERMISSIONED_KEY_EXPIRED:
// This is a special case where the order is no longer valid because the permissioned key used to placed
// the order has expired.
reason = sharedtypes.OrderRemovalReason_ORDER_REMOVAL_REASON_EXPIRED
default:
panic("ConvertOrderRemovalReasonToIndexerOrderRemovalReason: unspecified removal reason not allowed")
}
Expand Down
69 changes: 38 additions & 31 deletions protocol/x/clob/types/order_removals.pb.go

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

0 comments on commit 3adc282

Please sign in to comment.