Perp fixes (#1315)

* fixing open price when adding collateral to an already existing position

* fixing model for perpetual counter

* fixing open price func

Author: avkr003

api/elys/perpetual/genesis.pulsar.go

@@ -14,5 +14,7 @@ message GenesisState {
   Params params = 1 [ (gogoproto.nullable) = false ];
   repeated Pool pool_list = 2 [ (gogoproto.nullable) = false ];
   repeated MTP mtp_list = 3 [ (gogoproto.nullable) = false ];
-  repeated string address_whitelist = 4;
+  repeated string address_whitelist = 4 [ (gogoproto.nullable) = false ];
+  repeated PerpetualCounter perpetual_counter = 5
+      [ (gogoproto.nullable) = false ];
 }

api/elys/perpetual/pool.pulsar.go

@@ -36,37 +36,6 @@ message PoolAsset {
   ];
 }
 
-message LegacyPool {
-  uint64 amm_pool_id = 1;
-  string health = 2 [
-    (cosmos_proto.scalar) = "cosmos.Dec",
-    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
-    (gogoproto.nullable) = false
-  ];
-
-  string borrow_interest_rate = 3 [
-    (cosmos_proto.scalar) = "cosmos.Dec",
-    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
-    (gogoproto.nullable) = false
-  ];
-  repeated PoolAsset pool_assets_long = 4 [ (gogoproto.nullable) = false ];
-  repeated PoolAsset pool_assets_short = 5 [ (gogoproto.nullable) = false ];
-  int64 last_height_borrow_interest_rate_computed = 6;
-  // funding rate, if positive longs pay shorts, if negative shorts pay longs
-  string funding_rate = 7 [
-    (cosmos_proto.scalar) = "cosmos.Dec",
-    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
-    (gogoproto.nullable) = false
-  ];
-  repeated cosmos.base.v1beta1.Coin fees_collected = 8
-      [ (gogoproto.nullable) = false ];
-  string leverage_max = 9 [
-    (cosmos_proto.scalar) = "cosmos.Dec",
-    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
-    (gogoproto.nullable) = false
-  ];
-}
-
 message Pool {
   uint64 amm_pool_id = 1;
   string base_asset_liabilities_ratio = 2 [
@@ -102,3 +71,9 @@ message Pool {
     (gogoproto.nullable) = false
   ];
 }
+
+message PerpetualCounter {
+  uint64 amm_pool_id = 1;
+  uint64 counter = 2;
+  uint64 total_open = 3;
+}

api/elys/perpetual/query.pulsar.go

@@ -34,9 +34,9 @@ service Query {
                                    "{amm_pool_id}/{pagination.key}";
   }
 
-  // Retuns the total number of open and lifetime mtps.
-  rpc GetStatus(StatusRequest) returns (StatusResponse) {
-    option (google.api.http).get = "/elys-network/elys/perpetual/status";
+  rpc PerpetualCounter(PerpetualCounterRequest)
+      returns (PerpetualCounterResponse) {
+    option (google.api.http).get = "/elys-network/elys/perpetual/counter/{id}";
   }
 
   // Queries a list of mtp positions for a given address.
@@ -169,11 +169,10 @@ message PositionsByPoolResponse {
   cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }
 
-message StatusRequest {}
+message PerpetualCounterRequest { uint64 id = 1; }
 
-message StatusResponse {
-  uint64 open_mtp_count = 1;
-  uint64 lifetime_mtp_count = 2;
+message PerpetualCounterResponse {
+  PerpetualCounter result = 1 [ (gogoproto.nullable) = false ];
 }
 
 message PositionsForAddressRequest {

api/elys/perpetual/query_grpc.pb.go

@@ -31,9 +31,9 @@ func (am AppModule) AutoCLIOptions() *autocliv1.ModuleOptions {
 					PositionalArgs: []*autocliv1.PositionalArgDescriptor{{ProtoField: "amm_pool_id"}},
 				},
 				{
-					RpcMethod: "GetStatus",
-					Use:       "get-status",
-					Short:     "Query get-status",
+					RpcMethod: "PerpetualCounter",
+					Use:       "counter [id]",
+					Short:     "Query total open positions for a pool",
 				},
 				{
 					RpcMethod:      "GetPositionsForAddress",

proto/elys/perpetual/genesis.proto

@@ -21,10 +21,9 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState)
 		}
 	}
 
-	// Set genesis MTP count
-	k.SetMTPCount(ctx, (uint64)(len(genState.MtpList)))
-	// Set genesis open MTP count
-	k.SetOpenMTPCount(ctx, (uint64)(len(genState.MtpList)))
+	for _, val := range genState.PerpetualCounter {
+		k.SetPerpetualCounter(ctx, val)
+	}
 
 	// Set all the whitelisted
 	for _, elem := range genState.AddressWhitelist {
@@ -46,6 +45,8 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
 	genesis.PoolList = k.GetAllPools(ctx)
 	genesis.MtpList = k.GetAllMTPs(ctx)
 
+	genesis.PerpetualCounter = k.GetAllPerpetualCounter(ctx)
+
 	whitelist := k.GetAllWhitelistedAddress(ctx)
 	whitelistAddresses := make([]string, len(whitelist))
 	for i, whitelistAddress := range whitelist {

proto/elys/perpetual/pool.proto

@@ -6,12 +6,13 @@ import (
 	"github.com/elys-network/elys/v6/x/perpetual/types"
 )
 
-func (k Keeper) CheckMaxOpenPositions(ctx sdk.Context) error {
+func (k Keeper) CheckMaxOpenPositions(ctx sdk.Context, poolId uint64) error {
 	// If set to -1, no limit on how many positions can be open
 	if k.GetMaxOpenPositions(ctx) < 0 {
 		return nil
 	}
-	if k.GetOpenMTPCount(ctx) >= uint64(k.GetMaxOpenPositions(ctx)) {
+	perpetualCounter := k.GetPerpetualCounter(ctx, poolId)
+	if perpetualCounter.TotalOpen >= uint64(k.GetMaxOpenPositions(ctx)) {
 		return errorsmod.Wrap(types.ErrMaxOpenPositions, "cannot open new positions")
 	}
 	return nil