npm - @dydxprotocol/v4-client-js - Versions diffs - 1.0.27 → 1.1.0 - Mend

@dydxprotocol/v4-client-js 1.0.27 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (63) hide show

package/build/src/clients/native.js CHANGED Viewed

@@ -269,6 +269,7 @@ async function placeOrder(payload) {
         }
         const timeInForce = json.timeInForce;
         const goodTilTimeInSeconds = json.goodTilTimeInSeconds;
+        const goodTilBlock = json.goodTilBlock;
         const execution = json.execution;
         const postOnly = (_a = json.postOnly) !== null && _a !== void 0 ? _a : false;
         const reduceOnly = (_b = json.reduceOnly) !== null && _b !== void 0 ? _b : false;
@@ -276,7 +277,7 @@ async function placeOrder(payload) {
         const marketInfo = json.marketInfo;
         const currentHeight = json.currentHeight;
         const subaccount = new subaccount_1.SubaccountInfo(wallet, subaccountNumber);
-        const tx = await client.placeOrder(subaccount, marketId, type, side, price, size, clientId, timeInForce, goodTilTimeInSeconds, execution, postOnly, reduceOnly, triggerPrice, marketInfo, currentHeight);
+        const tx = await client.placeOrder(subaccount, marketId, type, side, price, size, clientId, timeInForce, goodTilTimeInSeconds, execution, postOnly, reduceOnly, triggerPrice, marketInfo, currentHeight, goodTilBlock);
         return (0, helpers_1.encodeJson)(tx);
     }
     catch (error) {
@@ -969,4 +970,4 @@ async function cctpWithdraw(squidPayload) {
     }
 }
 exports.cctpWithdraw = cctpWithdraw;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"native.js","sourceRoot":"","sources":["../../../src/clients/native.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"native.js","sourceRoot":"","sources":["../../../src/clients/native.ts"],"names":[],"mappings":"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"}

package/build/src/clients/types.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import { Coin } from '@cosmjs/proto-signing';
 import { Method } from '@cosmjs/tendermint-rpc';
 import { Order_ConditionType, Order_Side, Order_TimeInForce } from '@dydxprotocol/v4-proto/src/codegen/dydxprotocol/clob/order';
+import { PerpetualMarketType } from '@dydxprotocol/v4-proto/src/codegen/dydxprotocol/perpetuals/perpetual';
 import BigNumber from 'bignumber.js';
 import Long from 'long';
 export declare type Integer = BigNumber;
@@ -85,6 +86,7 @@ export declare type GovAddNewMarketParams = {
     exchangeConfigJson: string;
     liquidityTier: number;
     atomicResolution: number;
+    marketType: PerpetualMarketType;
     quantumConversionExponent: number;
     stepBaseQuantums: Long;
     subticksPerTick: number;

package/build/src/clients/types.js CHANGED Viewed

@@ -23,4 +23,4 @@ var OrderFlags;
     OrderFlags[OrderFlags["CONDITIONAL"] = 32] = "CONDITIONAL";
 })(OrderFlags = exports.OrderFlags || (exports.OrderFlags = {}));
 __exportStar(require("./modules/proto-includes"), exports);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpZW50cy90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7OztBQTRCQSxzRUFBc0U7QUFDdEUsSUFBWSxVQUlYO0FBSkQsV0FBWSxVQUFVO0lBQ3BCLHVEQUFjLENBQUE7SUFDZCxzREFBYyxDQUFBO0lBQ2QsMERBQWdCLENBQUE7QUFDbEIsQ0FBQyxFQUpXLFVBQVUsR0FBVixrQkFBVSxLQUFWLGtCQUFVLFFBSXJCO0FBd0dELDJEQUF5QyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpZW50cy90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7OztBQTZCQSxzRUFBc0U7QUFDdEUsSUFBWSxVQUlYO0FBSkQsV0FBWSxVQUFVO0lBQ3BCLHVEQUFjLENBQUE7SUFDZCxzREFBYyxDQUFBO0lBQ2QsMERBQWdCLENBQUE7QUFDbEIsQ0FBQyxFQUpXLFVBQVUsR0FBVixrQkFBVSxLQUFWLGtCQUFVLFFBSXJCO0FBMEdELDJEQUF5QyJ9

package/examples/gov_add_new_market.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import { PerpetualMarketType } from '@dydxprotocol/v4-proto/src/codegen/dydxprotocol/perpetuals/perpetual';
 import Long from 'long';
 import { GovAddNewMarketParams, LocalWallet, ProposalStatus } from '../src';
@@ -30,6 +31,7 @@ const MOCK_DATA: GovAddNewMarketParams = {
   // x/perpetuals
   liquidityTier: 2,
   atomicResolution: -1,
+  marketType: PerpetualMarketType.PERPETUAL_MARKET_TYPE_CROSS,
   // x/clob
   quantumConversionExponent: -9,

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@dydxprotocol/v4-client-js",
-  "version": "1.0.27",
+  "version": "1.1.0",
   "description": "General client library for the new dYdX system (v4 decentralized)",
   "main": "build/src/index.js",
   "scripts": {
@@ -37,7 +37,7 @@
     "@cosmjs/stargate": "^0.32.1",
     "@cosmjs/tendermint-rpc": "^0.32.1",
     "@cosmjs/utils": "^0.32.1",
-    "@dydxprotocol/v4-proto": "4.0.0-dev.0",
+    "@dydxprotocol/v4-proto": "5.0.0-dev.0",
     "@osmonauts/lcd": "^0.6.0",
     "@scure/bip32": "^1.1.5",
     "@scure/bip39": "^1.1.1",

package/src/clients/composite-client.ts CHANGED Viewed

@@ -199,10 +199,15 @@ export class CompositeClient {
   private async calculateGoodTilBlock(
     orderFlags: OrderFlags,
     currentHeight?: number,
+    goodTilBlock?: number,
   ): Promise<number> {
     if (orderFlags === OrderFlags.SHORT_TERM) {
-      const height = currentHeight ?? await this.validatorClient.get.latestBlockHeight();
-      return height + SHORT_BLOCK_FORWARD;
+      if (goodTilBlock !== undefined && goodTilBlock !== 0) {
+        return Promise.resolve(goodTilBlock);
+      } else {
+        const height = currentHeight ?? await this.validatorClient.get.latestBlockHeight();
+        return height + SHORT_BLOCK_FORWARD;
+      }
     } else {
       return Promise.resolve(0);
     }
@@ -357,6 +362,7 @@ export class CompositeClient {
     triggerPrice?: number,
     marketInfo?: MarketInfo,
     currentHeight?: number,
+    goodTilBlock?: number,
     memo?: string,
   ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
     const msgs: Promise<EncodeObject[]> = new Promise((resolve) => {
@@ -377,6 +383,7 @@ export class CompositeClient {
         triggerPrice,
         marketInfo,
         currentHeight,
+        goodTilBlock,
       );
       msg.then((it) => resolve([it])).catch((err) => {
         console.log(err);
@@ -439,15 +446,16 @@ export class CompositeClient {
     triggerPrice?: number,
     marketInfo?: MarketInfo,
     currentHeight?: number,
+    goodTilBlock?: number,
   ): Promise<EncodeObject> {
     const orderFlags = calculateOrderFlags(type, timeInForce);
     const result = await Promise.all([
-      this.calculateGoodTilBlock(orderFlags, currentHeight),
+      this.calculateGoodTilBlock(orderFlags, currentHeight, goodTilBlock),
       this.retrieveMarketInfo(marketId, marketInfo),
     ],
     );
-    const goodTilBlock = result[0];
+    const desiredGoodTilBlock = result[0];
     const clobPairId = result[1].clobPairId;
     const atomicResolution = result[1].atomicResolution;
     const stepBaseQuantums = result[1].stepBaseQuantums;
@@ -488,7 +496,7 @@ export class CompositeClient {
       clientId,
       clobPairId,
       orderFlags,
-      goodTilBlock,
+      desiredGoodTilBlock,
       goodTilBlockTime,
       orderSide,
       quantums,
@@ -1057,6 +1065,7 @@ export class CompositeClient {
         params.ticker,
         params.atomicResolution,
         params.liquidityTier,
+        params.marketType,
       );
       // x/clob.MsgCreateClobPair

package/src/clients/modules/composer.ts CHANGED Viewed

@@ -10,6 +10,7 @@ import {
   MsgUpdateClobPair,
 } from '@dydxprotocol/v4-proto/src/codegen/dydxprotocol/clob/tx';
 import { MsgDelayMessage } from '@dydxprotocol/v4-proto/src/codegen/dydxprotocol/delaymsg/tx';
+import { PerpetualMarketType } from '@dydxprotocol/v4-proto/src/codegen/dydxprotocol/perpetuals/perpetual';
 import { MsgCreatePerpetual } from '@dydxprotocol/v4-proto/src/codegen/dydxprotocol/perpetuals/tx';
 import { MsgCreateOracleMarket } from '@dydxprotocol/v4-proto/src/codegen/dydxprotocol/prices/tx';
 import { MsgSend } from 'cosmjs-types/cosmos/bank/v1beta1/tx';
@@ -342,6 +343,7 @@ export class Composer {
     ticker: string,
     atomicResolution: number,
     liquidityTier: number,
+    marketType: PerpetualMarketType,
   ): EncodeObject {
     const msg: MsgCreatePerpetual = {
       // uses x/gov module account since creating the perpetual is a governance action.
@@ -353,6 +355,7 @@ export class Composer {
         atomicResolution,
         defaultFundingPpm: 0, // default funding should be 0 to start.
         liquidityTier,
+        marketType,
       },
     };

package/src/clients/modules/get.ts CHANGED Viewed

@@ -13,6 +13,7 @@ import { Any } from 'cosmjs-types/google/protobuf/any';
 import Long from 'long';
 import protobuf from 'protobufjs';
+import { ByteArrayEncoding, encodeJson } from '../../lib/helpers';
 import { PAGE_REQUEST } from '../constants';
 import { UnexpectedClientError } from '../lib/errors';
 import {
@@ -504,7 +505,7 @@ export class Get {
     return GovV1Module.QueryProposalsResponse.decode(data);
   }
-  async GetWithdrawalAndTransferGatingStatus(
+  async getWithdrawalAndTransferGatingStatus(
   ): Promise<SubaccountsModule.QueryGetWithdrawalAndTransfersBlockedInfoResponse> {
     const requestData = Uint8Array.from(
       SubaccountsModule.QueryGetWithdrawalAndTransfersBlockedInfoRequest
@@ -536,7 +537,8 @@ export class Get {
       requestData,
     );
-    return RateLimitModule.QueryCapacityByDenomResponse.decode(data);
+    const decodedResponse = RateLimitModule.QueryCapacityByDenomResponse.decode(data);
+    return JSON.parse(encodeJson(decodedResponse, ByteArrayEncoding.BIGINT));
   }
   private async sendQuery(requestUrl: string, requestData: Uint8Array): Promise<Uint8Array> {

package/src/clients/native.ts CHANGED Viewed

@@ -284,6 +284,7 @@ export async function placeOrder(
     }
     const timeInForce = json.timeInForce;
     const goodTilTimeInSeconds = json.goodTilTimeInSeconds;
+    const goodTilBlock = json.goodTilBlock;
     const execution = json.execution;
     const postOnly = json.postOnly ?? false;
     const reduceOnly = json.reduceOnly ?? false;
@@ -309,6 +310,7 @@ export async function placeOrder(
       triggerPrice,
       marketInfo,
       currentHeight,
+      goodTilBlock,
     );
     return encodeJson(tx);
   } catch (error) {

package/src/clients/types.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import { Coin } from '@cosmjs/proto-signing';
 import { Method } from '@cosmjs/tendermint-rpc';
 import { Order_ConditionType, Order_Side, Order_TimeInForce } from '@dydxprotocol/v4-proto/src/codegen/dydxprotocol/clob/order';
+import { PerpetualMarketType } from '@dydxprotocol/v4-proto/src/codegen/dydxprotocol/perpetuals/perpetual';
 import BigNumber from 'bignumber.js';
 import Long from 'long';
@@ -111,6 +112,7 @@ export type SquidIBCPayload = {
 };
 // ------------ x/gov: Add New Market ------------ //
 export type GovAddNewMarketParams = {
   // common
   id: number;
@@ -125,6 +127,7 @@ export type GovAddNewMarketParams = {
   // x/perpetuals
   liquidityTier: number;
   atomicResolution: number;
+  marketType: PerpetualMarketType;
   // x/clob
   quantumConversionExponent: number;