@dydxprotocol/v4-client-js 0.40.3 → 0.41.0

package/examples/native_examples.ts

@@ -1,8 +1,7 @@
+import { Network } from '../src/clients/constants';
 import { UserError } from '../src/clients/lib/errors';
 import {
-  Environment,
   connect,
-  connectNetwork,
   connectWallet,
   deposit,
   getAccountBalances,
@@ -34,7 +33,7 @@ async function test(): Promise<void> {
     const wallet = await connectWallet(DYDX_TEST_MNEMONIC);
     console.log(wallet);
 
-    const address = await connect(Environment.testnet, DYDX_TEST_MNEMONIC);
+    const address = await connect(Network.testnet(), DYDX_TEST_MNEMONIC);
     console.log(address);
 
     const payload = `{ "address": "${DYDX_TEST_ADDRESS}" }`;
@@ -113,21 +112,6 @@ async function test(): Promise<void> {
 
     tx = await withdrawToIBC(0, '13', encoded);
     console.log(tx);
-
-    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) {
     console.log(error.message);
   }

package/examples/short_term_order_cancel_example.ts

@@ -11,7 +11,7 @@ import { DYDX_TEST_MNEMONIC, MAX_CLIENT_ID } from './constants';
 async function test(): Promise<void> {
   const wallet = await LocalWallet.fromMnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX);
   console.log(wallet);
-  const network = Network.staging();
+  const network = Network.testnet();
   const client = await CompositeClient.connect(network);
   console.log('**Client**');
   console.log(client);

package/examples/short_term_order_composite_example.ts

@@ -18,7 +18,7 @@ async function sleep(ms: number): Promise<void> {
 async function test(): Promise<void> {
   const wallet = await LocalWallet.fromMnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX);
   console.log(wallet);
-  const network = Network.staging();
+  const network = Network.testnet();
   const client = await CompositeClient.connect(network);
   console.log('**Client**');
   console.log(client);

package/examples/test.ts

@@ -16,7 +16,7 @@ async function sleep(ms: number): Promise<void> {
 async function test(): Promise<void> {
   const wallet = await LocalWallet.fromMnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX);
   console.log(wallet);
-  const network = Network.staging();
+  const network = Network.testnet();
   const client = await CompositeClient.connect(network);
   console.log('**Client**');
   console.log(client);

package/examples/transfer_example_deposit.ts

@@ -7,13 +7,11 @@ import { Subaccount } from '../src/clients/subaccount';
 import { ValidatorClient } from '../src/clients/validator-client';
 import { DYDX_TEST_MNEMONIC } from './constants';
 
-// TODO: Test after staging deploy latest transfer contracts.
-
 async function test(): Promise<void> {
   const wallet = await LocalWallet.fromMnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX);
   console.log(wallet);
 
-  const client = await ValidatorClient.connect(Network.staging().validatorConfig);
+  const client = await ValidatorClient.connect(Network.testnet().validatorConfig);
   console.log('**Client**');
   console.log(client);
 

package/examples/transfer_example_send.ts

@@ -10,8 +10,6 @@ import { Subaccount } from '../src/clients/subaccount';
 import { ValidatorClient } from '../src/clients/validator-client';
 import { DYDX_TEST_MNEMONIC } from './constants';
 
-// TODO: Test after staging deploy latest transfer contracts.
-
 async function test(): Promise<void> {
   const wallet = await LocalWallet.fromMnemonic(
     DYDX_TEST_MNEMONIC,
@@ -19,7 +17,7 @@ async function test(): Promise<void> {
   );
   console.log(wallet);
 
-  const client = await ValidatorClient.connect(Network.staging().validatorConfig);
+  const client = await ValidatorClient.connect(Network.testnet().validatorConfig);
   console.log('**Client**');
   console.log(client);
 

package/examples/transfer_example_subaccount_transfer.ts

@@ -7,13 +7,11 @@ import { Subaccount } from '../src/clients/subaccount';
 import { ValidatorClient } from '../src/clients/validator-client';
 import { DYDX_TEST_MNEMONIC } from './constants';
 
-// TODO: Test after staging deploy latest transfer contracts.
-
 async function test(): Promise<void> {
   const wallet = await LocalWallet.fromMnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX);
   console.log(wallet);
 
-  const client = await ValidatorClient.connect(Network.staging().validatorConfig);
+  const client = await ValidatorClient.connect(Network.testnet().validatorConfig);
   console.log('**Client**');
   console.log(client);
 

package/examples/transfer_example_withdraw.ts

@@ -7,13 +7,13 @@ import { Subaccount } from '../src/clients/subaccount';
 import { ValidatorClient } from '../src/clients/validator-client';
 import { DYDX_TEST_MNEMONIC } from './constants';
 
-// TODO: Test after staging deploy latest transfer contracts.
+// TODO: Test after testnet deploy latest transfer contracts.
 
 async function test(): Promise<void> {
   const wallet = await LocalWallet.fromMnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX);
   console.log(wallet);
 
-  const client = await ValidatorClient.connect(Network.staging().validatorConfig);
+  const client = await ValidatorClient.connect(Network.testnet().validatorConfig);
   console.log('**Client**');
   console.log(client);
 

package/examples/transfer_example_withdraw_other.ts

@@ -10,13 +10,11 @@ import { Subaccount } from '../src/clients/subaccount';
 import { ValidatorClient } from '../src/clients/validator-client';
 import { DYDX_TEST_MNEMONIC } from './constants';
 
-// TODO: Test after staging deploy latest transfer contracts.
-
 async function test(): Promise<void> {
   const wallet = await LocalWallet.fromMnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX);
   console.log(wallet);
 
-  const client = await ValidatorClient.connect(Network.staging().validatorConfig);
+  const client = await ValidatorClient.connect(Network.testnet().validatorConfig);
   console.log('**Client**');
   console.log(client);
 

package/examples/utility_endpoints.ts

@@ -6,7 +6,7 @@ import { Network } from '../src/clients/constants';
 import { IndexerClient } from '../src/clients/indexer-client';
 
 async function test(): Promise<void> {
-  const client = new IndexerClient(Network.staging().indexerConfig);
+  const client = new IndexerClient(Network.testnet().indexerConfig);
 
   // Get indexer server time
   try {

package/examples/validator_get_example.ts

@@ -3,7 +3,7 @@ import { ValidatorClient } from '../src/clients/validator-client';
 import { DYDX_TEST_ADDRESS } from './constants';
 
 async function test(): Promise<void> {
-  const client = await ValidatorClient.connect(Network.staging().validatorConfig);
+  const client = await ValidatorClient.connect(Network.testnet().validatorConfig);
 
   try {
     const account = await client.get.getAccount(DYDX_TEST_ADDRESS);

package/examples/validator_post_example.ts

@@ -33,7 +33,7 @@ async function test(): Promise<void> {
   const wallet = await LocalWallet.fromMnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX);
   console.log(wallet);
 
-  const client = await ValidatorClient.connect(Network.staging().validatorConfig);
+  const client = await ValidatorClient.connect(Network.testnet().validatorConfig);
   console.log('**Client**');
   console.log(client);
 

package/examples/websocket_example.ts

@@ -4,7 +4,7 @@ import { DYDX_TEST_ADDRESS } from './constants';
 
 function test(): void {
   const mySocket = new SocketClient(
-    Network.staging().indexerConfig,
+    Network.testnet().indexerConfig,
     () => {
       console.log('socket opened');
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dydxprotocol/v4-client-js",
-  "version": "0.40.3",
+  "version": "0.41.0",
   "description": "General client library for the new dYdX system (v4 decentralized)",
   "main": "build/src/index.js",
   "scripts": {

package/src/clients/constants.ts

@@ -12,28 +12,20 @@ export const TESTNET_CHAIN_ID = 'dydx-testnet-4';
 
 // ------------ API URLs ------------
 export enum IndexerApiHost {
-  DEV = 'https://indexer.v4dev.dydx.exchange',
-  STAGING = 'https://indexer.v4staging.dydx.exchange',
   TESTNET = 'https://dydx-testnet.imperator.co',
   // TODO: Add MAINNET
 }
 
 export enum IndexerWSHost {
-  DEV = 'wss://indexer.v4dev.dydx.exchange/v4/ws',
-  STAGING = 'wss://indexer.v4staging.dydx.exchange/v4/ws',
   TESTNET = 'wss://dydx-testnet.imperator.co/v4/ws',
   // TODO: Add MAINNET
 }
 
 export enum FaucetApiHost {
-  DEV = 'https://faucet.v4dev.expotrading.com',
-  STAGING = 'https://faucet.v4staging.dydx.exchange',
   TESTNET = 'https://faucet.v4testnet.dydx.exchange',
 }
 
 export enum ValidatorApiHost {
-  DEV = 'https://validator.v4dev.dydx.exchange',
-  STAGING = 'https://validator.v4staging.dydx.exchange',
   TESTNET = 'https://dydx-testnet-archive.allthatnode.com',
   // TODO: Add MAINNET
 }
@@ -41,8 +33,6 @@ export enum ValidatorApiHost {
 // ------------ Network IDs ------------
 
 export enum NetworkId {
-  DEV = 'dydxprotocol-testnet',
-  STAGING = 'dydxprotocol-testnet',
   TESTNET = 'dydx-testnet-4',
   // TODO: Add MAINNET
 }
@@ -174,38 +164,6 @@ export class Network {
     public validatorConfig: ValidatorConfig,
   ) {}
 
-  static dev(): Network {
-    const indexerConfig = new IndexerConfig(
-      IndexerApiHost.DEV,
-      IndexerWSHost.DEV,
-    );
-    const validatorConfig = new ValidatorConfig(ValidatorApiHost.DEV, DEV_CHAIN_ID,
-      {
-        CHAINTOKEN_DENOM: 'adv4tnt',
-        USDC_DENOM: 'ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5',
-        USDC_GAS_DENOM: 'uusdc',
-        USDC_DECIMALS: 6,
-        CHAINTOKEN_DECIMALS: 18,
-      });
-    return new Network('dev', indexerConfig, validatorConfig);
-  }
-
-  static staging(): Network {
-    const indexerConfig = new IndexerConfig(
-      IndexerApiHost.STAGING,
-      IndexerWSHost.STAGING,
-    );
-    const validatorConfig = new ValidatorConfig(ValidatorApiHost.STAGING, STAGING_CHAIN_ID,
-      {
-        CHAINTOKEN_DENOM: 'adv4tnt',
-        USDC_DENOM: 'ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5',
-        USDC_GAS_DENOM: 'uusdc',
-        USDC_DECIMALS: 6,
-        CHAINTOKEN_DECIMALS: 18,
-      });
-    return new Network('staging', indexerConfig, validatorConfig);
-  }
-
   static testnet(): Network {
     const indexerConfig = new IndexerConfig(
       IndexerApiHost.TESTNET,

package/src/clients/faucet-client.ts

@@ -3,7 +3,7 @@ import RestClient from './modules/rest';
 
 export class FaucetClient extends RestClient {
   /**
-     * @description For staging and testnet only, add USDC to an subaccount
+     * @description For testnet only, add USDC to an subaccount
      *
      * @returns The HTTP response.
      */

package/src/clients/native.ts

@@ -31,32 +31,12 @@ declare global {
   var wallet: LocalWallet;
 }
 
-/* this should match the definitions in Abacus */
-export enum Environment {
-  staging = 'dydxprotocol-staging',
-  testnet = 'dydxprotocol-testnet-2',
-}
-
-function network(env: Environment): Network {
-  switch (env) {
-    case Environment.staging:
-      return Network.staging();
-
-    case Environment.testnet:
-      return Network.testnet();
-
-    default:
-      throw new UserError('invalid environment');
-  }
-}
-
 export async function connectClient(
-  env: Environment,
+  network: Network,
 ): Promise<string> {
   try {
-    const config = network(env);
-    globalThis.client = await CompositeClient.connect(config);
-    return encodeJson(config);
+    globalThis.client = await CompositeClient.connect(network);
+    return encodeJson(network);
   } catch (e) {
     return wrappedError(e);
   }
@@ -129,11 +109,11 @@ export async function connectWallet(
 }
 
 export async function connect(
-  env: Environment,
+  network: Network,
   mnemonic: string,
 ): Promise<string> {
   try {
-    await connectClient(env);
+    await connectClient(network);
     return connectWallet(mnemonic);
   } catch (e) {
     return wrappedError(e);