Update connectNetwork param and testnet id (#60)

* Update connectNetwork param and testnet id * make gasPrice public for access * update cancelOrder params * webpack
dydxprotocol · Oct 18, 2023 · 5ec0750 · 5ec0750
1 parent 82e33f4
commit 5ec0750
Show file tree

Hide file tree

Showing 7 changed files with 132 additions and 70 deletions.
diff --git a/v4-client-js/__native__/__ios__/v4-native-client.js b/v4-client-js/__native__/__ios__/v4-native-client.js
diff --git a/v4-client-js/examples/native_examples.ts b/v4-client-js/examples/native_examples.ts
@@ -102,13 +102,18 @@ async function test(): Promise<void> {
     tx = await withdrawToIBC(0, '13', encoded);
     console.log(tx);
 
-    const connected = await connectNetwork(
-      'dydxprotocol-testnet',
-      'https://validator.v4staging.dydx.exchange',
-      'https://indexer.v4staging.dydx.exchange',
-      'wss://indexer.v4staging.dydx.exchange/v4/ws',
-      'https://faucet.v4staging.dydx.exchange',
-    );
+    const connected = await connectNetwork(JSON.stringify({
+      indexerUrl: 'https://indexer.v4staging.dydx.exchange',
+      websocketUrl: 'wss://indexer.v4staging.dydx.exchange/v4/ws',
+      validatorUrl: 'https://validator.v4staging.dydx.exchange',
+      chainId: 'dydxprotocol-testnet',
+      faucetUrl: 'https://faucet.v4staging.dydx.exchange',
+      USDC_DENOM: 'ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5',
+      USDC_DECIMALS: 6,
+      USDC_GAS_DENOM: 'uusdc',
+      CHAINTOKEN_DENOM: 'adv4tnt',
+      CHAINTOKEN_DECIMALS: 18,
+    }));
     console.log(connected);
 
   } catch (error) {

diff --git a/v4-client-js/package-lock.json b/v4-client-js/package-lock.json
diff --git a/v4-client-js/src/clients/composite-client.ts b/v4-client-js/src/clients/composite-client.ts
@@ -611,8 +611,8 @@ export class CompositeClient {
     clientId: number,
     orderFlags: OrderFlags,
     marketId: string,
-    goodTilBlock: number,
-    goodTilTimeInSeconds: number,
+    goodTilBlock?: number,
+    goodTilTimeInSeconds?: number,
   ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
 
     const marketsResponse = await this.indexerClient.markets.getPerpetualMarkets(marketId);
@@ -625,7 +625,7 @@ export class CompositeClient {
 
     let goodTilBlockTime;
     if (isStatefulOrder(orderFlags)) {
-      if (goodTilTimeInSeconds === 0) {
+      if (goodTilTimeInSeconds === undefined || goodTilTimeInSeconds === 0) {
         throw new Error('goodTilTimeInSeconds must be set for LONG_TERM or CONDITIONAL order');
       }
       if (goodTilBlock !== 0) {
@@ -636,10 +636,10 @@ export class CompositeClient {
       }
       goodTilBlockTime = this.calculateGoodTilBlockTime(goodTilTimeInSeconds);
     } else {
-      if (goodTilBlock === 0) {
+      if (goodTilBlock === undefined || goodTilBlock === 0) {
         throw new Error('goodTilBlock must be non-zero for SHORT_TERM orders');
       }
-      if (goodTilTimeInSeconds !== 0) {
+      if (goodTilTimeInSeconds !== undefined && goodTilTimeInSeconds !== 0) {
         throw new Error('goodTilTimeInSeconds should be zero since SHORT_TERM orders use goodTilBlock instead of goodTilTimeInSeconds.');
       }
     }

diff --git a/v4-client-js/src/clients/constants.ts b/v4-client-js/src/clients/constants.ts
@@ -8,7 +8,7 @@ export * from '../lib/constants';
 // Chain ID
 export const DEV_CHAIN_ID = 'dydxprotocol-testnet';
 export const STAGING_CHAIN_ID = 'dydxprotocol-testnet';
-export const TESTNET_CHAIN_ID = 'dydx-testnet-3';
+export const TESTNET_CHAIN_ID = 'dydx-testnet-4';
 
 // ------------ API URLs ------------
 export enum IndexerApiHost {

diff --git a/v4-client-js/src/clients/modules/post.ts b/v4-client-js/src/clients/modules/post.ts
@@ -55,8 +55,8 @@ export class Post {
     public readonly get: Get;
     public readonly denoms: DenomConfig;
 
-    private readonly defaultGasPrice: GasPrice;
-    private readonly defaultDydxGasPrice: GasPrice;
+    public readonly defaultGasPrice: GasPrice;
+    public readonly defaultDydxGasPrice: GasPrice;
 
     private accountNumberCache: Map<string, Account> = new Map();
 

diff --git a/v4-client-js/src/clients/native.ts b/v4-client-js/src/clients/native.ts
@@ -63,27 +63,45 @@ export async function connectClient(
 }
 
 export async function connectNetwork(
-  chainId: string,
-  validatorUrl: string,
-  indexerUrl: string,
-  indexerSocketUrl: string,
-  faucetUrl?: string,
-  usdcDenom?: string,
-  usdcDecimals?: string,
-  usdcGasDenom?: string,
-  chainTokenDenom?: string,
-  chainTokenDecimals?: string,
-  chainTokenGasDenom?: string,
+  paramsJSON: string,
 ): Promise<string> {
   try {
-    const indexerConfig = new IndexerConfig(indexerUrl, indexerSocketUrl);
+    const params = JSON.parse(paramsJSON);
+    const {
+      indexerUrl,
+      websocketUrl,
+      validatorUrl,
+      chainId,
+      faucetUrl,
+      USDC_DENOM,
+      USDC_DECIMALS,
+      USDC_GAS_DENOM,
+      CHAINTOKEN_DENOM,
+      CHAINTOKEN_DECIMALS,
+      CHAINTOKEN_GAS_DENOM,
+    } = params;
+
+    if (indexerUrl === undefined ||
+      websocketUrl === undefined ||
+      validatorUrl === undefined ||
+      chainId === undefined) {
+      throw new UserError('Missing required network params');
+    }
+    if (USDC_DENOM === undefined ||
+      USDC_DECIMALS === undefined ||
+      CHAINTOKEN_DENOM === undefined ||
+      CHAINTOKEN_DECIMALS === undefined) {
+      throw new UserError('Missing required token params');
+    }
+
+    const indexerConfig = new IndexerConfig(indexerUrl, websocketUrl);
     const validatorConfig = new ValidatorConfig(validatorUrl, chainId, {
-      USDC_DENOM: usdcDenom ?? 'ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5',
-      USDC_DECIMALS: parseInt(usdcDecimals ?? '6', 10),
-      USDC_GAS_DENOM: usdcGasDenom ?? 'uusdc',
-      CHAINTOKEN_DENOM: chainTokenDenom ?? 'adv4tnt',
-      CHAINTOKEN_DECIMALS: parseInt(chainTokenDecimals ?? '18', 10),
-      CHAINTOKEN_GAS_DENOM: chainTokenGasDenom,
+      USDC_DENOM,
+      USDC_DECIMALS,
+      USDC_GAS_DENOM,
+      CHAINTOKEN_DENOM,
+      CHAINTOKEN_DECIMALS,
+      CHAINTOKEN_GAS_DENOM,
     });
     const config = new Network('native', indexerConfig, validatorConfig);
     globalThis.client = await CompositeClient.connect(config);