feat: cid

InjectiveLabs · Jan 11, 2024 · b286316 · b286316
1 parent d881db1
commit b286316
Show file tree

Hide file tree

Showing 26 changed files with 65 additions and 5 deletions.
diff --git a/packages/sdk-ts/src/core/modules/exchange/msgs/MsgBatchCancelBinaryOptionsOrders.spec.ts b/packages/sdk-ts/src/core/modules/exchange/msgs/MsgBatchCancelBinaryOptionsOrders.spec.ts
@@ -9,11 +9,13 @@ const params: MsgBatchCancelDerivativeOrders['params'] = {
       marketId: mockFactory.injUsdtDerivativeMarket.marketId,
       orderHash: mockFactory.orderHash,
       subaccountId: mockFactory.subaccountId,
+      cid: '',
     },
     {
       marketId: mockFactory.injUsdtDerivativeMarket.marketId,
       orderHash: mockFactory.orderHash2,
       subaccountId: mockFactory.subaccountId,
+      cid: '',
     },
   ],
 }

diff --git a/packages/sdk-ts/src/core/modules/exchange/msgs/MsgBatchCancelBinaryOptionsOrders.ts b/packages/sdk-ts/src/core/modules/exchange/msgs/MsgBatchCancelBinaryOptionsOrders.ts
@@ -13,6 +13,7 @@ export declare namespace MsgBatchCancelBinaryOptionsOrders {
       subaccountId: string
       orderHash: string
       orderMask?: InjectiveExchangeV1Beta1Exchange.OrderMask
+      cid?: string
     }[]
   }
 
@@ -41,6 +42,7 @@ export default class MsgBatchCancelBinaryOptionsOrders extends MsgBase<
       orderData.marketId = order.marketId
       orderData.orderHash = order.orderHash
       orderData.subaccountId = order.subaccountId
+      orderData.cid = order.cid || ''
 
       // TODO: Send order.orderMask instead when chain handles order mask properly.
       orderData.orderMask = InjectiveExchangeV1Beta1Exchange.OrderMask.ANY

diff --git a/packages/sdk-ts/src/core/modules/exchange/msgs/MsgBatchCancelDerivativeOrders.spec.ts b/packages/sdk-ts/src/core/modules/exchange/msgs/MsgBatchCancelDerivativeOrders.spec.ts
@@ -9,11 +9,13 @@ const params: MsgBatchCancelDerivativeOrders['params'] = {
       marketId: mockFactory.injUsdtDerivativeMarket.marketId,
       orderHash: mockFactory.orderHash,
       subaccountId: mockFactory.subaccountId,
+      cid: '',
     },
     {
       marketId: mockFactory.injUsdtDerivativeMarket.marketId,
       orderHash: mockFactory.orderHash2,
       subaccountId: mockFactory.subaccountId,
+      cid: '',
     },
   ],
 }

diff --git a/packages/sdk-ts/src/core/modules/exchange/msgs/MsgBatchCancelDerivativeOrders.ts b/packages/sdk-ts/src/core/modules/exchange/msgs/MsgBatchCancelDerivativeOrders.ts
@@ -13,6 +13,7 @@ export declare namespace MsgBatchCancelDerivativeOrders {
       subaccountId: string
       orderHash: string
       orderMask?: InjectiveExchangeV1Beta1Exchange.OrderMask
+      cid?: string
     }[]
   }
 
@@ -40,6 +41,7 @@ export default class MsgBatchCancelDerivativeOrders extends MsgBase<
       orderData.marketId = order.marketId
       orderData.orderHash = order.orderHash
       orderData.subaccountId = order.subaccountId
+      orderData.cid = order.cid || ''
 
       // TODO: Send order.orderMask instead when chain handles order mask properly.
       orderData.orderMask = InjectiveExchangeV1Beta1Exchange.OrderMask.ANY

diff --git a/packages/sdk-ts/src/core/modules/exchange/msgs/MsgBatchCancelSpotOrders.spec.ts b/packages/sdk-ts/src/core/modules/exchange/msgs/MsgBatchCancelSpotOrders.spec.ts
@@ -9,11 +9,13 @@ const params: MsgBatchCancelSpotOrders['params'] = {
       marketId: mockFactory.injUsdtSpotMarket.marketId,
       orderHash: mockFactory.orderHash,
       subaccountId: mockFactory.subaccountId,
+      cid: '',
     },
     {
       marketId: mockFactory.injUsdtSpotMarket.marketId,
       orderHash: mockFactory.orderHash2,
       subaccountId: mockFactory.subaccountId,
+      cid: '',
     },
   ],
 }

diff --git a/packages/sdk-ts/src/core/modules/exchange/msgs/MsgBatchCancelSpotOrders.ts b/packages/sdk-ts/src/core/modules/exchange/msgs/MsgBatchCancelSpotOrders.ts
@@ -13,6 +13,7 @@ export declare namespace MsgBatchCancelSpotOrders {
       subaccountId: string
       orderHash: string
       orderMask?: InjectiveExchangeV1Beta1Exchange.OrderMask
+      cid?: string
     }[]
   }
 
@@ -40,6 +41,7 @@ export default class MsgBatchCancelSpotOrders extends MsgBase<
       orderData.marketId = order.marketId
       orderData.orderHash = order.orderHash
       orderData.subaccountId = order.subaccountId
+      orderData.cid = order.cid || ''
 
       // TODO: Send order.orderMask instead when chain handles order mask properly.
       orderData.orderMask = InjectiveExchangeV1Beta1Exchange.OrderMask.ANY

diff --git a/packages/sdk-ts/src/core/modules/exchange/msgs/MsgBatchUpdateOrders.ts b/packages/sdk-ts/src/core/modules/exchange/msgs/MsgBatchUpdateOrders.ts
@@ -16,16 +16,19 @@ export declare namespace MsgBatchUpdateOrders {
       marketId: string
       subaccountId: string
       orderHash: string
+      cid?: string
     }[]
     derivativeOrdersToCancel?: {
       marketId: string
       subaccountId: string
       orderHash: string
+      cid?: string
     }[]
     binaryOptionsOrdersToCancel?: {
       marketId: string
       subaccountId: string
       orderHash: string
+      cid?: string
     }[]
     spotOrdersToCreate?: {
       orderType: InjectiveExchangeV1Beta1Exchange.OrderType
@@ -34,6 +37,7 @@ export declare namespace MsgBatchUpdateOrders {
       feeRecipient: string
       price: string
       quantity: string
+      cid?: string
     }[]
     derivativeOrdersToCreate?: {
       orderType: InjectiveExchangeV1Beta1Exchange.OrderType
@@ -43,6 +47,7 @@ export declare namespace MsgBatchUpdateOrders {
       price: string
       margin: string
       quantity: string
+      cid?: string
     }[]
     binaryOptionsOrdersToCreate?: {
       orderType: InjectiveExchangeV1Beta1Exchange.OrderType
@@ -52,6 +57,7 @@ export declare namespace MsgBatchUpdateOrders {
       price: string
       margin: string
       quantity: string
+      cid?: string
     }[]
     injectiveAddress: string
   }
@@ -104,11 +110,12 @@ export default class MsgBatchUpdateOrders extends MsgBase<
 
     if (params.spotOrdersToCancel && params.spotOrdersToCancel.length > 0) {
       const orderData = params.spotOrdersToCancel.map(
-        ({ marketId, subaccountId, orderHash }) => {
+        ({ marketId, subaccountId, orderHash, cid }) => {
           const orderData = InjectiveExchangeV1Beta1Tx.OrderData.create()
           orderData.marketId = marketId
           orderData.subaccountId = subaccountId
           orderData.orderHash = orderHash
+          orderData.cid = cid || ''
 
           return orderData
         },
@@ -122,11 +129,12 @@ export default class MsgBatchUpdateOrders extends MsgBase<
       params.derivativeOrdersToCancel.length > 0
     ) {
       const orderData = params.derivativeOrdersToCancel.map(
-        ({ marketId, subaccountId, orderHash }) => {
+        ({ marketId, subaccountId, orderHash, cid }) => {
           const orderData = InjectiveExchangeV1Beta1Tx.OrderData.create()
           orderData.marketId = marketId
           orderData.subaccountId = subaccountId
           orderData.orderHash = orderHash
+          orderData.cid = cid || ''
 
           return orderData
         },
@@ -139,11 +147,12 @@ export default class MsgBatchUpdateOrders extends MsgBase<
       params.binaryOptionsOrdersToCancel.length > 0
     ) {
       const orderData = params.binaryOptionsOrdersToCancel.map(
-        ({ marketId, subaccountId, orderHash }) => {
+        ({ marketId, subaccountId, orderHash, cid }) => {
           const orderData = InjectiveExchangeV1Beta1Tx.OrderData.create()
           orderData.marketId = marketId
           orderData.subaccountId = subaccountId
           orderData.orderHash = orderHash
+          orderData.cid = cid || ''
 
           return orderData
         },
@@ -168,6 +177,7 @@ export default class MsgBatchUpdateOrders extends MsgBase<
         orderInfo.feeRecipient = paramsFromArgs.feeRecipient
         orderInfo.price = paramsFromArgs.price
         orderInfo.quantity = paramsFromArgs.quantity
+        orderInfo.cid = orderInfo.cid || ''
 
         const order = InjectiveExchangeV1Beta1Exchange.SpotOrder.create()
         order.marketId = paramsFromArgs.marketId
@@ -204,6 +214,7 @@ export default class MsgBatchUpdateOrders extends MsgBase<
         orderInfo.feeRecipient = paramsFromArgs.feeRecipient
         orderInfo.price = paramsFromArgs.price
         orderInfo.quantity = paramsFromArgs.quantity
+        orderInfo.cid = orderInfo.cid || ''
 
         const order = InjectiveExchangeV1Beta1Exchange.DerivativeOrder.create()
         order.marketId = paramsFromArgs.marketId
@@ -239,6 +250,7 @@ export default class MsgBatchUpdateOrders extends MsgBase<
         orderInfo.feeRecipient = paramsFromArgs.feeRecipient
         orderInfo.price = paramsFromArgs.price
         orderInfo.quantity = paramsFromArgs.quantity
+        orderInfo.cid = orderInfo.cid || ''
 
         const order = InjectiveExchangeV1Beta1Exchange.DerivativeOrder.create()
         order.marketId = paramsFromArgs.marketId

diff --git a/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCancelBinaryOptionsOrder.spec.ts b/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCancelBinaryOptionsOrder.spec.ts
@@ -7,6 +7,7 @@ const params: MsgCancelBinaryOptionsOrder['params'] = {
   marketId: mockFactory.injUsdtDerivativeMarket.marketId,
   orderHash: mockFactory.orderHash,
   subaccountId: mockFactory.subaccountId,
+  cid: '',
 }
 
 const protoType = '/injective.exchange.v1beta1.MsgCancelBinaryOptionsOrder'
@@ -16,6 +17,7 @@ const protoParams = {
   marketId: params.marketId,
   orderHash: params.orderHash,
   subaccountId: params.subaccountId,
+  cid: params.cid,
   orderMask: 1,
 }
 const protoParamsAmino = snakecaseKeys(protoParams)

diff --git a/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCancelBinaryOptionsOrder.ts b/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCancelBinaryOptionsOrder.ts
@@ -12,6 +12,7 @@ export declare namespace MsgCancelBinaryOptionsOrder {
     injectiveAddress: string
     orderHash: string
     orderMask?: InjectiveExchangeV1Beta1Exchange.OrderMask
+    cid?: string
   }
 
   export type Proto = InjectiveExchangeV1Beta1Tx.MsgCancelBinaryOptionsOrder
@@ -39,6 +40,7 @@ export default class MsgCancelBinaryOptionsOrder extends MsgBase<
     message.marketId = params.marketId
     message.orderHash = params.orderHash
     message.subaccountId = params.subaccountId
+    message.cid = params.cid || ''
 
     // TODO: Send order.orderMask instead when chain handles order mask properly.
     message.orderMask = InjectiveExchangeV1Beta1Exchange.OrderMask.ANY

diff --git a/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCancelDerivativeOrder.spec.ts b/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCancelDerivativeOrder.spec.ts
@@ -7,6 +7,7 @@ const params: MsgCancelDerivativeOrder['params'] = {
   marketId: mockFactory.injUsdtDerivativeMarket.marketId,
   orderHash: mockFactory.orderHash,
   subaccountId: mockFactory.subaccountId,
+  cid: '',
 }
 
 const protoType = '/injective.exchange.v1beta1.MsgCancelDerivativeOrder'
@@ -17,6 +18,7 @@ const protoParams = {
   orderHash: params.orderHash,
   subaccountId: params.subaccountId,
   orderMask: 1,
+  cid: params.cid,
 }
 const protoParamsAmino = snakecaseKeys(protoParams)
 

diff --git a/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCancelDerivativeOrder.ts b/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCancelDerivativeOrder.ts
@@ -12,6 +12,7 @@ export declare namespace MsgCancelDerivativeOrder {
     injectiveAddress: string
     orderHash: string
     orderMask?: InjectiveExchangeV1Beta1Exchange.OrderMask
+    cid?: string
   }
 
   export type Proto = InjectiveExchangeV1Beta1Tx.MsgCancelDerivativeOrder
@@ -35,6 +36,7 @@ export default class MsgCancelDerivativeOrder extends MsgBase<
     message.marketId = params.marketId
     message.orderHash = params.orderHash
     message.subaccountId = params.subaccountId
+    message.cid = params.cid || ''
 
     // TODO: Send order.orderMask instead when chain handles order mask properly.
     message.orderMask = InjectiveExchangeV1Beta1Exchange.OrderMask.ANY

diff --git a/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCancelSpotOrder.spec.ts b/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCancelSpotOrder.spec.ts
@@ -7,6 +7,7 @@ const params: MsgCancelSpotOrder['params'] = {
   marketId: mockFactory.injUsdtSpotMarket.marketId,
   orderHash: mockFactory.orderHash,
   subaccountId: mockFactory.subaccountId,
+  cid: '',
 }
 
 const protoType = '/injective.exchange.v1beta1.MsgCancelSpotOrder'
@@ -16,6 +17,7 @@ const protoParams = {
   marketId: params.marketId,
   orderHash: params.orderHash,
   subaccountId: params.subaccountId,
+  cid: params.cid,
 }
 const protoParamsAmino = snakecaseKeys(protoParams)
 

diff --git a/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCancelSpotOrder.ts b/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCancelSpotOrder.ts
@@ -8,6 +8,7 @@ export declare namespace MsgCancelSpotOrder {
     subaccountId: string
     injectiveAddress: string
     orderHash: string
+    cid?: string
   }
 
   export type Proto = InjectiveExchangeV1Beta1Tx.MsgCancelSpotOrder
@@ -32,6 +33,7 @@ export default class MsgCancelSpotOrder extends MsgBase<
     message.marketId = params.marketId
     message.orderHash = params.orderHash
     message.subaccountId = params.subaccountId
+    message.cid = params.cid || ''
 
     // TODO: message.setOrderMask does not exist yet, enable this once it does.
 

diff --git a/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCreateBinaryOptionsLimitOrder.spec.ts b/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCreateBinaryOptionsLimitOrder.spec.ts
@@ -12,6 +12,7 @@ const params: MsgCreateBinaryOptionsLimitOrder['params'] = {
   quantity: '100',
   subaccountId: mockFactory.subaccountId,
   triggerPrice: '0',
+  cid: '',
 }
 
 const protoType = '/injective.exchange.v1beta1.MsgCreateBinaryOptionsLimitOrder'
@@ -25,6 +26,7 @@ const protoParams = {
       price: params.price,
       quantity: params.quantity,
       subaccountId: params.subaccountId,
+      cid: params.cid,
     },
     orderType: params.orderType,
     margin: params.margin,

diff --git a/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCreateBinaryOptionsLimitOrder.ts b/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCreateBinaryOptionsLimitOrder.ts
@@ -17,6 +17,7 @@ export declare namespace MsgCreateBinaryOptionsLimitOrder {
     price: string
     margin: string
     quantity: string
+    cid?: string
   }
 
   export type Proto =
@@ -29,6 +30,7 @@ const createLimitOrder = (params: MsgCreateBinaryOptionsLimitOrder.Params) => {
   orderInfo.feeRecipient = params.feeRecipient
   orderInfo.price = params.price
   orderInfo.quantity = params.quantity
+  orderInfo.cid = params.cid || ''
 
   const derivativeOrder =
     InjectiveExchangeV1Beta1Exchange.DerivativeOrder.create()

diff --git a/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCreateBinaryOptionsMarketOrder.spec.ts b/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCreateBinaryOptionsMarketOrder.spec.ts
@@ -11,6 +11,7 @@ const params: MsgCreateBinaryOptionsMarketOrder['params'] = {
   price: '1765000',
   quantity: '100',
   subaccountId: mockFactory.subaccountId,
+  cid: '',
   triggerPrice: '0',
 }
 
@@ -27,6 +28,7 @@ const protoParams = {
       price: params.price,
       quantity: params.quantity,
       subaccountId: params.subaccountId,
+      cid: params.cid,
     },
     orderType: params.orderType,
     triggerPrice: params.triggerPrice,

diff --git a/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCreateBinaryOptionsMarketOrder.ts b/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCreateBinaryOptionsMarketOrder.ts
@@ -17,6 +17,7 @@ export declare namespace MsgCreateBinaryOptionsMarketOrder {
     price: string
     margin: string
     quantity: string
+    cid?: string
   }
 
   export type Proto =
@@ -31,6 +32,7 @@ const createMarketOrder = (
   orderInfo.feeRecipient = params.feeRecipient
   orderInfo.price = params.price
   orderInfo.quantity = params.quantity
+  orderInfo.cid = params.cid || ''
 
   const derivativeOrder =
     InjectiveExchangeV1Beta1Exchange.DerivativeOrder.create()

diff --git a/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCreateDerivativeLimitOrder.spec.ts b/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCreateDerivativeLimitOrder.spec.ts
@@ -11,6 +11,7 @@ const params: MsgCreateDerivativeLimitOrder['params'] = {
   price: '1500000',
   quantity: '100',
   subaccountId: mockFactory.subaccountId,
+  cid: '',
   triggerPrice: '0',
 }
 
@@ -25,6 +26,7 @@ const protoParams = {
       price: params.price,
       quantity: params.quantity,
       subaccountId: params.subaccountId,
+      cid: params.cid,
     },
     orderType: params.orderType,
     margin: params.margin,

diff --git a/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCreateDerivativeLimitOrder.ts b/packages/sdk-ts/src/core/modules/exchange/msgs/MsgCreateDerivativeLimitOrder.ts
@@ -17,6 +17,7 @@ export declare namespace MsgCreateDerivativeLimitOrder {
     price: string
     margin: string
     quantity: string
+    cid?: string
   }
 
   export type Proto = InjectiveExchangeV1Beta1Tx.MsgCreateDerivativeLimitOrder
@@ -28,6 +29,7 @@ const createLimitOrder = (params: MsgCreateDerivativeLimitOrder.Params) => {
   orderInfo.feeRecipient = params.feeRecipient
   orderInfo.price = params.price
   orderInfo.quantity = params.quantity
+  orderInfo.cid = params.cid || ''
 
   const derivativeOrder =
     InjectiveExchangeV1Beta1Exchange.DerivativeOrder.create()