Merge pull request #694 from InjectiveLabs/chore/initial-leverage

chore/initial-leverage

Author: ThomasRalee

packages/sdk-ts/package.json

@@ -468,7 +468,7 @@
     "@injectivelabs/grpc-web": "^0.0.1",
     "@injectivelabs/grpc-web-node-http-transport": "^0.0.2",
     "@injectivelabs/grpc-web-react-native-transport": "^0.0.2",
-    "@injectivelabs/indexer-proto-ts-v2": "1.18.23",
+    "@injectivelabs/indexer-proto-ts-v2": "1.18.24",
     "@injectivelabs/mito-proto-ts-v2": "1.17.3",
     "@injectivelabs/networks": "workspace:*",
     "@injectivelabs/olp-proto-ts-v2": "1.17.6",

packages/sdk-ts/src/client/indexer/grpc/IndexerGrpcRfqGwApi.ts

@@ -25,6 +25,7 @@ export class IndexerGrpcRfqGwApi extends BaseIndexerGrpcConsumer {
     direction,
     simulate,
     worstPrice,
+    txBodyMemo,
     takerAddress,
     autosignPubKey,
     unfilledAction,
@@ -45,6 +46,7 @@ export class IndexerGrpcRfqGwApi extends BaseIndexerGrpcConsumer {
     direction: string
     simulate?: boolean
     worstPrice: string
+    txBodyMemo?: string
     takerAddress?: string
     autosignPubKey: string
     autosignAddress: string
@@ -122,6 +124,10 @@ export class IndexerGrpcRfqGwApi extends BaseIndexerGrpcConsumer {
       request.cid = cid
     }
 
+    if (txBodyMemo) {
+      request.txBodyMemo = txBodyMemo
+    }
+
     const requestMessage = InjectiveRfqGwRpcPb.PrepareAutoSignRequest.create()
     requestMessage.request = request
 
@@ -147,6 +153,7 @@ export class IndexerGrpcRfqGwApi extends BaseIndexerGrpcConsumer {
     direction,
     simulate,
     worstPrice,
+    txBodyMemo,
     takerPubKey,
     takerAddress,
     unfilledAction,
@@ -166,6 +173,7 @@ export class IndexerGrpcRfqGwApi extends BaseIndexerGrpcConsumer {
     direction: string
     simulate?: boolean
     worstPrice: string
+    txBodyMemo?: string
     takerAddress: string
     takerPubKey: string
     subaccountNonce?: number
@@ -238,6 +246,10 @@ export class IndexerGrpcRfqGwApi extends BaseIndexerGrpcConsumer {
       request.cid = cid
     }
 
+    if (txBodyMemo) {
+      request.txBodyMemo = txBodyMemo
+    }
+
     const requestMessage = InjectiveRfqGwRpcPb.PrepareRequest.create()
     requestMessage.request = request
 
@@ -262,6 +274,7 @@ export class IndexerGrpcRfqGwApi extends BaseIndexerGrpcConsumer {
     direction,
     simulate,
     worstPrice,
+    txBodyMemo,
     ethChainId,
     takerPubKey,
     takerAddress,
@@ -284,6 +297,7 @@ export class IndexerGrpcRfqGwApi extends BaseIndexerGrpcConsumer {
     direction: string
     simulate?: boolean
     worstPrice: string
+    txBodyMemo?: string
     ethChainId?: number
     takerAddress: string
     takerPubKey: string
@@ -370,6 +384,10 @@ export class IndexerGrpcRfqGwApi extends BaseIndexerGrpcConsumer {
       request.gas = BigInt(gas)
     }
 
+    if (txBodyMemo) {
+      request.txBodyMemo = txBodyMemo
+    }
+
     const requestMessage = InjectiveRfqGwRpcPb.PrepareEip712Request.create()
     requestMessage.request = request
 
@@ -394,6 +412,7 @@ export class IndexerGrpcRfqGwApi extends BaseIndexerGrpcConsumer {
     direction,
     simulate,
     worstPrice,
+    txBodyMemo,
     ethChainId,
     takerAddress,
     autosignPubKey,
@@ -417,6 +436,7 @@ export class IndexerGrpcRfqGwApi extends BaseIndexerGrpcConsumer {
     direction: string
     simulate?: boolean
     worstPrice: string
+    txBodyMemo?: string
     ethChainId?: number
     takerAddress?: string
     autosignPubKey: string
@@ -509,6 +529,10 @@ export class IndexerGrpcRfqGwApi extends BaseIndexerGrpcConsumer {
       request.gas = BigInt(gas)
     }
 
+    if (txBodyMemo) {
+      request.txBodyMemo = txBodyMemo
+    }
+
     const requestMessage =
       InjectiveRfqGwRpcPb.PrepareEip712AutoSignRequest.create()
     requestMessage.request = request

packages/sdk-ts/src/client/indexer/transformers/IndexerGrpcDerivativeTransformer.ts

@@ -571,7 +571,11 @@ export class IndexerGrpcDerivativeTransformer {
       fundingLast: position.fundingLast,
       subaccountId: position.subaccountId,
       updatedAt: Number(position.updatedAt),
+      initialMargin: position.initialMargin,
+      initialQuantity: position.initialQuantity,
+      initialLeverage: position.initialLeverage,
       liquidationPrice: position.liquidationPrice,
+      initialEntryPrice: position.initialEntryPrice,
       direction: position.direction as TradeDirection,
       cumulativeFundingEntry: position.cumulativeFundingEntry,
       effectiveCumulativeFundingEntry: position.effectiveCumulativeFundingEntry,

packages/sdk-ts/src/client/indexer/transformers/IndexerGrpcTcDerivativesTransformer.ts

@@ -125,7 +125,11 @@ export class IndexerGrpcTcDerivativesTransformer {
       fundingSum: position.fundingSum,
       fundingLast: position.fundingLast,
       subaccountId: position.subaccountId,
+      initialMargin: position.initialMargin,
       updatedAt: Number(position.updatedAt),
+      initialQuantity: position.initialQuantity,
+      initialLeverage: position.initialLeverage,
+      initialEntryPrice: position.initialEntryPrice,
       liquidationPrice: position.liquidationPrice,
       direction: position.direction as TradeDirection,
       cumulativeFundingEntry: position.cumulativeFundingEntry,

packages/sdk-ts/src/client/indexer/types/derivatives.ts

@@ -38,6 +38,10 @@ export interface PositionV2 extends Omit<
   denom: string
   fundingSum: string
   fundingLast: string
+  initialMargin: string
+  initialQuantity: string
+  initialLeverage: string
+  initialEntryPrice: string
   cumulativeFundingEntry: string
   effectiveCumulativeFundingEntry: string
 }

packages/sdk-ts/src/client/indexer/types/tc-derivatives.ts

@@ -78,7 +78,11 @@ export interface TcDerivativePosition {
   fundingSum: string
   fundingLast: string
   subaccountId: string
+  initialMargin: string
+  initialQuantity: string
+  initialLeverage: string
   liquidationPrice: string
+  initialEntryPrice: string
   direction: TradeDirection
   cumulativeFundingEntry: string
   effectiveCumulativeFundingEntry: string