Enable limit close for perps (#1343)

* change key for perpetual order storage

* update execution

* fix tests

* add hooks

* add tests

* update cancel orders

* close percentage

* add tests

* remove checks

* review changes

* merge

* fix

* review changes

* add events for ccxt

* keep fields number

* set id

---------

Co-authored-by: Adarsh Kumar <itsadarshkumar@gmail.com>

Author: amityadav0

api/elys/tradeshield/query.pulsar.go

@@ -832,6 +832,7 @@ func NewAppKeeper(
 			// insert perpetual hooks receivers here
 			app.AccountedPoolKeeper.PerpetualHooks(),
 			app.TierKeeper.PerpetualHooks(),
+			app.TradeshieldKeeper.PerpetualHooks(),
 		),
 	)
 

api/elys/tradeshield/tx.pulsar.go

@@ -7,6 +7,7 @@ import "google/api/annotations.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "elys/tradeshield/params.proto";
 import "elys/tradeshield/types.proto";
+import "cosmos_proto/cosmos.proto";
 
 option go_package = "github.com/elys-network/elys/v6/x/tradeshield/types";
 
@@ -34,7 +35,8 @@ service Query {
   rpc PendingPerpetualOrder(QueryGetPendingPerpetualOrderRequest)
       returns (QueryGetPendingPerpetualOrderResponse) {
     option (google.api.http).get =
-        "/elys-network/elys/tradeshield/pending_perpetual_order/{id}";
+        "/elys-network/elys/tradeshield/pending_perpetual_order/"
+        "{owner_address}/{pool_id}/{order_id}";
   }
   rpc PendingPerpetualOrderAll(QueryAllPendingPerpetualOrderRequest)
       returns (QueryAllPendingPerpetualOrderResponse) {
@@ -83,7 +85,11 @@ message QueryAllPendingSpotOrderResponse {
   cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }
 
-message QueryGetPendingPerpetualOrderRequest { uint64 id = 1; }
+message QueryGetPendingPerpetualOrderRequest {
+  string owner_address = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
+  uint64 pool_id = 2;
+  uint64 order_id = 3;
+}
 
 message QueryGetPendingPerpetualOrderResponse {
   PerpetualOrderExtraInfo pending_perpetual_order = 1

api/elys/tradeshield/types.pulsar.go

@@ -135,12 +135,14 @@ message MsgCreatePerpetualCloseOrder {
   string owner_address = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
   LegacyTriggerPriceV1 legacy_trigger_price_v1 = 2
       [ (gogoproto.nullable) = false ];
+  uint64 position_id = 3;
   string trigger_price = 4 [
     (cosmos_proto.scalar) = "cosmos.Dec",
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
-  uint64 position_id = 3;
+  uint64 pool_id = 5;
+  uint64 close_percentage = 6;
 }
 
 message MsgCreatePerpetualCloseOrderResponse { uint64 order_id = 1; }
@@ -157,6 +159,7 @@ message MsgUpdatePerpetualOrder {
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
+  uint64 pool_id = 5;
 }
 
 message MsgUpdatePerpetualOrderResponse {}
@@ -166,6 +169,7 @@ message MsgCancelPerpetualOrder {
   option (amino.name) = "tradeshield/MsgCancelPerpetualOrder";
   string owner_address = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
   uint64 order_id = 2;
+  uint64 pool_id = 3;
 }
 
 message MsgCancelPerpetualOrderResponse { uint64 order_id = 1; }
@@ -174,7 +178,8 @@ message MsgCancelPerpetualOrders {
   option (cosmos.msg.v1.signer) = "owner_address";
   option (amino.name) = "tradeshield/MsgCancelPerpetualOrders";
   string owner_address = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
-  repeated uint64 order_ids = 2;
+  repeated uint64 legacy_order_ids = 2;
+  repeated PerpetualOrderPoolKey orders = 3 [ (gogoproto.nullable) = false ];
 }
 
 message MsgCancelPerpetualOrdersResponse {}
@@ -205,7 +210,20 @@ message MsgExecuteOrders {
   option (amino.name) = "tradeshield/MsgExecuteOrders";
   string creator = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
   repeated uint64 spot_order_ids = 2;
-  repeated uint64 perpetual_order_ids = 3;
+  repeated uint64 legacy_perpetual_order_ids = 3;
+  repeated PerpetualOrderKey perpetual_orders = 4
+      [ (gogoproto.nullable) = false ];
 }
 
 message MsgExecuteOrdersResponse {}
+
+message PerpetualOrderKey {
+  string owner_address = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
+  uint64 pool_id = 2;
+  uint64 order_id = 3;
+}
+
+message PerpetualOrderPoolKey {
+  uint64 pool_id = 1;
+  uint64 order_id = 2;
+}

app/keepers/keepers.go

@@ -74,6 +74,7 @@ message PerpetualOrder {
     (gogoproto.nullable) = false
   ];
   uint64 poolId = 12;
+  uint64 close_percentage = 13;
 }
 
 message PerpetualOrderExtraInfo {

proto/elys/tradeshield/query.proto

@@ -1,6 +1,7 @@
 package keeper
 
 import (
+	math "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/elys-network/elys/v6/x/accountedpool/types"
 	ammtypes "github.com/elys-network/elys/v6/x/amm/types"
@@ -80,6 +81,6 @@ func (h PerpetualHooks) AfterPerpetualPositionModified(ctx sdk.Context, ammPool
 	return h.k.PerpetualUpdates(ctx, ammPool, perpetualPool)
 }
 
-func (h PerpetualHooks) AfterPerpetualPositionClosed(ctx sdk.Context, ammPool ammtypes.Pool, perpetualPool perpetualtypes.Pool, sender sdk.AccAddress) error {
+func (h PerpetualHooks) AfterPerpetualPositionClosed(ctx sdk.Context, ammPool ammtypes.Pool, perpetualPool perpetualtypes.Pool, sender sdk.AccAddress, closingRatio math.LegacyDec, positionId uint64) error {
 	return h.k.PerpetualUpdates(ctx, ammPool, perpetualPool)
 }