@dydxprotocol/v4-client-js 1.1.9 → 1.1.11

package/src/clients/modules/post.ts

@@ -22,7 +22,7 @@ import _ from 'lodash';
 import Long from 'long';
 import protobuf from 'protobufjs';
 
-import { GAS_MULTIPLIER } from '../constants';
+import { GAS_MULTIPLIER, SelectedGasDenom } from '../constants';
 import { UnexpectedClientError } from '../lib/errors';
 import { generateRegistry } from '../lib/registry';
 import { SubaccountInfo } from '../subaccount';
@@ -56,6 +56,7 @@ export class Post {
     public readonly denoms: DenomConfig;
     public readonly defaultClientMemo?: string;
 
+    public selectedGasDenom: SelectedGasDenom = SelectedGasDenom.USDC;
     public readonly defaultGasPrice: GasPrice;
     public readonly defaultDydxGasPrice: GasPrice;
 
@@ -79,6 +80,16 @@ export class Post {
         .fromString(`25000000000${denoms.CHAINTOKEN_GAS_DENOM !== undefined ? denoms.CHAINTOKEN_GAS_DENOM : denoms.CHAINTOKEN_DENOM}`);
     }
 
+    setSelectedGasDenom(selectedGasDenom: SelectedGasDenom): void {
+      this.selectedGasDenom = selectedGasDenom;
+    }
+
+    getGasPrice(): GasPrice {
+      return this.selectedGasDenom === SelectedGasDenom.USDC
+        ? this.defaultGasPrice
+        : this.defaultDydxGasPrice;
+    }
+
     /**
      * @description Simulate a transaction
      * the calling function is responsible for creating the messages.
@@ -90,7 +101,7 @@ export class Post {
     async simulate(
       wallet: LocalWallet,
       messaging: () => Promise<EncodeObject[]>,
-      gasPrice: GasPrice = this.defaultGasPrice,
+      gasPrice: GasPrice = this.getGasPrice(),
       memo?: string,
       account?: () => Promise<Account>,
     ): Promise<StdFee> {
@@ -120,7 +131,7 @@ export class Post {
       wallet: LocalWallet,
       messaging: () => Promise<EncodeObject[]>,
       zeroFee: boolean,
-      gasPrice: GasPrice = this.defaultGasPrice,
+      gasPrice: GasPrice = this.getGasPrice(),
       memo?: string,
       account?: () => Promise<Account>,
     ): Promise<Uint8Array> {
@@ -143,7 +154,7 @@ export class Post {
       wallet: LocalWallet,
       messaging: () => Promise<EncodeObject[]>,
       zeroFee: boolean,
-      gasPrice: GasPrice = this.defaultGasPrice,
+      gasPrice: GasPrice = this.getGasPrice(),
       memo?: string,
       broadcastMode?: BroadcastMode,
       account?: () => Promise<Account>,
@@ -202,7 +213,7 @@ export class Post {
       messages: EncodeObject[],
       account: Account,
       zeroFee: boolean,
-      gasPrice: GasPrice = this.defaultGasPrice,
+      gasPrice: GasPrice = this.getGasPrice(),
       memo?: string,
     ): Promise<Uint8Array> {
       // Simulate transaction if no fee is specified.
@@ -258,7 +269,7 @@ export class Post {
       account: Account,
       messages: EncodeObject[],
       zeroFee: boolean,
-      gasPrice: GasPrice = this.defaultGasPrice,
+      gasPrice: GasPrice = this.getGasPrice(),
       memo?: string,
       broadcastMode?: BroadcastMode,
     ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
@@ -301,7 +312,7 @@ export class Post {
       pubKey: Secp256k1Pubkey,
       sequence: number,
       messages: readonly EncodeObject[],
-      gasPrice: GasPrice = this.defaultGasPrice,
+      gasPrice: GasPrice = this.getGasPrice(),
       memo?: string,
     ): Promise<StdFee> {
       // Get simulated response.

package/src/clients/subaccount.ts

@@ -1,3 +1,4 @@
+import { MAX_SUBACCOUNT_NUMBER } from './constants';
 import LocalWallet from './modules/local-wallet';
 
 export class SubaccountInfo {
@@ -6,8 +7,8 @@ export class SubaccountInfo {
     readonly subaccountNumber: number;
 
     constructor(wallet: LocalWallet, subaccountNumber: number = 0) {
-      if (subaccountNumber < 0 || subaccountNumber > 127) {
-        throw new Error('Subaccount number must be between 0 and 127');
+      if (subaccountNumber < 0 || subaccountNumber > MAX_SUBACCOUNT_NUMBER) {
+        throw new Error(`Subaccount number must be between 0 and ${MAX_SUBACCOUNT_NUMBER}`);
       }
       this.wallet = wallet;
       this.subaccountNumber = subaccountNumber;

package/src/clients/validator-client.ts

@@ -3,7 +3,12 @@ import { Tendermint37Client } from '@cosmjs/tendermint-rpc';
 import Long from 'long';
 import protobuf from 'protobufjs';
 
-import { ValidatorConfig, BROADCAST_POLL_INTERVAL_MS, BROADCAST_TIMEOUT_MS } from './constants';
+import {
+  ValidatorConfig,
+  BROADCAST_POLL_INTERVAL_MS,
+  BROADCAST_TIMEOUT_MS,
+  SelectedGasDenom,
+} from './constants';
 import { Get } from './modules/get';
 import { Post } from './modules/post';
 import { TendermintClient } from './modules/tendermintClient';
@@ -55,6 +60,17 @@ export class ValidatorClient {
     return this._post!;
   }
 
+  get selectedGasDenom(): SelectedGasDenom | undefined {
+    if (!this._post) return undefined;
+    return this._post.selectedGasDenom;
+  }
+
+  setSelectedGasDenom(gasDenom: SelectedGasDenom): void {
+    if (!this._post) throw new Error('Post module not initialized');
+
+    this._post.setSelectedGasDenom(gasDenom);
+  }
+
   private async initialize(): Promise<void> {
     const tendermint37Client: Tendermint37Client = await Tendermint37Client.connect(
       this.config.restEndpoint,

package/src/lib/constants.ts

@@ -21,7 +21,7 @@ export const ZERO_FEE: StdFee = {
 
 // Validation
 export const MAX_UINT_32 = 4_294_967_295;
-export const MAX_SUBACCOUNT_NUMBER = 127;
+export const MAX_SUBACCOUNT_NUMBER = 128_000;
 
 export const DEFAULT_SEQUENCE: number = 0;