From decee074ab8ab3e73c3ce89a169ea37dd62b996d Mon Sep 17 00:00:00 2001 From: John Huang Date: Tue, 24 Oct 2023 14:59:40 -0700 Subject: [PATCH] Feature/trcl 2685 remove staging reference (#67) * TRCL-2685 Removed staging and dev configs from client library. User can access testnet, or construct the configs in code. * build for native --- .../__native__/__ios__/v4-native-client.js | 67 +++---------------- .../modules/client/AccountEndpoints.test.ts | 2 +- .../modules/client/FaucetEndpoint.test.ts | 2 +- .../modules/client/MarketsEndpoints.test.ts | 2 +- .../modules/client/Transfers.test.ts | 2 +- .../modules/client/UtilityEndpoints.test.ts | 2 +- .../client/ValidatorGetEndpoints.test.ts | 2 +- .../client/ValidatorPostEndpoints.test.ts | 2 +- v4-client-js/examples/account_endpoints.ts | 2 +- v4-client-js/examples/composite_example.ts | 2 +- v4-client-js/examples/faucet_endpoint.ts | 2 +- .../long_term_order_cancel_example.ts | 2 +- v4-client-js/examples/markets_endpoints.ts | 2 +- v4-client-js/examples/native_examples.ts | 20 +----- .../short_term_order_cancel_example.ts | 2 +- .../short_term_order_composite_example.ts | 2 +- v4-client-js/examples/test.ts | 2 +- .../examples/transfer_example_deposit.ts | 4 +- .../examples/transfer_example_send.ts | 4 +- .../transfer_example_subaccount_transfer.ts | 4 +- .../examples/transfer_example_withdraw.ts | 4 +- .../transfer_example_withdraw_other.ts | 4 +- v4-client-js/examples/utility_endpoints.ts | 2 +- .../examples/validator_get_example.ts | 2 +- .../examples/validator_post_example.ts | 2 +- v4-client-js/examples/websocket_example.ts | 2 +- v4-client-js/package.json | 2 +- v4-client-js/src/clients/constants.ts | 42 ------------ v4-client-js/src/clients/faucet-client.ts | 2 +- v4-client-js/src/clients/native.ts | 30 ++------- v4-client-py/README.md | 4 +- v4-client-py/examples/account_endpoints.py | 2 +- v4-client-py/examples/chain_client/Account.py | 2 +- .../examples/chain_client/BankBalance.py | 2 +- .../examples/chain_client/BankBalances.py | 2 +- v4-client-py/examples/chain_client/GetTx.py | 2 +- v4-client-py/examples/composite_example.py | 2 +- v4-client-py/examples/faucet_endpoint.py | 2 +- .../long_term_order_cancel_example.py | 2 +- v4-client-py/examples/markets_endpoints.py | 2 +- .../short_term_order_cancel_example.py | 2 +- .../short_term_order_composite_example.py | 2 +- .../examples/transfer_example_deposit.py | 2 +- .../transfer_example_subaccount_transfer.py | 2 +- .../examples/transfer_example_withdraw.py | 2 +- v4-client-py/examples/utility_endpoints.py | 2 +- .../examples/validator_get_examples.py | 2 +- .../examples/validator_post_examples.py | 2 +- v4-client-py/examples/websocket_example.py | 2 +- v4-client-py/pyproject.toml | 4 +- .../tests/test_indexer_markets_endpoints.py | 2 +- .../tests/test_indexer_utility_endpoints.py | 2 +- .../tests/test_validator_get_endpoints.py | 2 +- v4-client-py/tests_integration/test_faucet.py | 2 +- .../test_indexer_account_endpoints.py | 2 +- v4-client-py/tests_integration/test_trades.py | 2 +- .../tests_integration/test_transfers.py | 4 +- .../v4_client_py/clients/constants.py | 49 +------------- 58 files changed, 74 insertions(+), 256 deletions(-) diff --git a/v4-client-js/__native__/__ios__/v4-native-client.js b/v4-client-js/__native__/__ios__/v4-native-client.js index be6c6ec6..08e9bcd2 100644 --- a/v4-client-js/__native__/__ios__/v4-native-client.js +++ b/v4-client-js/__native__/__ios__/v4-native-client.js @@ -197654,36 +197654,26 @@ exports.TESTNET_CHAIN_ID = 'dydx-testnet-4'; // ------------ API URLs ------------ var IndexerApiHost; (function (IndexerApiHost) { - IndexerApiHost["DEV"] = "https://indexer.v4dev.dydx.exchange"; - IndexerApiHost["STAGING"] = "https://indexer.v4staging.dydx.exchange"; IndexerApiHost["TESTNET"] = "https://dydx-testnet.imperator.co"; // TODO: Add MAINNET })(IndexerApiHost = exports.IndexerApiHost || (exports.IndexerApiHost = {})); var IndexerWSHost; (function (IndexerWSHost) { - IndexerWSHost["DEV"] = "wss://indexer.v4dev.dydx.exchange/v4/ws"; - IndexerWSHost["STAGING"] = "wss://indexer.v4staging.dydx.exchange/v4/ws"; IndexerWSHost["TESTNET"] = "wss://dydx-testnet.imperator.co/v4/ws"; // TODO: Add MAINNET })(IndexerWSHost = exports.IndexerWSHost || (exports.IndexerWSHost = {})); var FaucetApiHost; (function (FaucetApiHost) { - FaucetApiHost["DEV"] = "https://faucet.v4dev.expotrading.com"; - FaucetApiHost["STAGING"] = "https://faucet.v4staging.dydx.exchange"; FaucetApiHost["TESTNET"] = "https://faucet.v4testnet.dydx.exchange"; })(FaucetApiHost = exports.FaucetApiHost || (exports.FaucetApiHost = {})); var ValidatorApiHost; (function (ValidatorApiHost) { - ValidatorApiHost["DEV"] = "https://validator.v4dev.dydx.exchange"; - ValidatorApiHost["STAGING"] = "https://validator.v4staging.dydx.exchange"; ValidatorApiHost["TESTNET"] = "https://dydx-testnet-archive.allthatnode.com"; // TODO: Add MAINNET })(ValidatorApiHost = exports.ValidatorApiHost || (exports.ValidatorApiHost = {})); // ------------ Network IDs ------------ var NetworkId; (function (NetworkId) { - NetworkId["DEV"] = "dydxprotocol-testnet"; - NetworkId["STAGING"] = "dydxprotocol-testnet"; NetworkId["TESTNET"] = "dydx-testnet-4"; // TODO: Add MAINNET })(NetworkId = exports.NetworkId || (exports.NetworkId = {})); @@ -197792,28 +197782,6 @@ class Network { this.indexerConfig = indexerConfig; this.validatorConfig = validatorConfig; } - static dev() { - const indexerConfig = new IndexerConfig(IndexerApiHost.DEV, IndexerWSHost.DEV); - const validatorConfig = new ValidatorConfig(ValidatorApiHost.DEV, exports.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() { - const indexerConfig = new IndexerConfig(IndexerApiHost.STAGING, IndexerWSHost.STAGING); - const validatorConfig = new ValidatorConfig(ValidatorApiHost.STAGING, exports.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() { const indexerConfig = new IndexerConfig(IndexerApiHost.TESTNET, IndexerWSHost.TESTNET); const validatorConfig = new ValidatorConfig(ValidatorApiHost.TESTNET, exports.TESTNET_CHAIN_ID, { @@ -197831,7 +197799,7 @@ class Network { } } exports.Network = Network; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaWVudHMvY29uc3RhbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsZ0RBQXdCO0FBSXhCLG1EQUFpQztBQUVqQyxXQUFXO0FBQ0UsUUFBQSxZQUFZLEdBQUcsc0JBQXNCLENBQUM7QUFDdEMsUUFBQSxnQkFBZ0IsR0FBRyxzQkFBc0IsQ0FBQztBQUMxQyxRQUFBLGdCQUFnQixHQUFHLGdCQUFnQixDQUFDO0FBRWpELHFDQUFxQztBQUNyQyxJQUFZLGNBS1g7QUFMRCxXQUFZLGNBQWM7SUFDeEIsNkRBQTJDLENBQUE7SUFDM0MscUVBQW1ELENBQUE7SUFDbkQsK0RBQTZDLENBQUE7SUFDN0Msb0JBQW9CO0FBQ3RCLENBQUMsRUFMVyxjQUFjLEdBQWQsc0JBQWMsS0FBZCxzQkFBYyxRQUt6QjtBQUVELElBQVksYUFLWDtBQUxELFdBQVksYUFBYTtJQUN2QixnRUFBK0MsQ0FBQTtJQUMvQyx3RUFBdUQsQ0FBQTtJQUN2RCxrRUFBaUQsQ0FBQTtJQUNqRCxvQkFBb0I7QUFDdEIsQ0FBQyxFQUxXLGFBQWEsR0FBYixxQkFBYSxLQUFiLHFCQUFhLFFBS3hCO0FBRUQsSUFBWSxhQUlYO0FBSkQsV0FBWSxhQUFhO0lBQ3ZCLDZEQUE0QyxDQUFBO0lBQzVDLG1FQUFrRCxDQUFBO0lBQ2xELG1FQUFrRCxDQUFBO0FBQ3BELENBQUMsRUFKVyxhQUFhLEdBQWIscUJBQWEsS0FBYixxQkFBYSxRQUl4QjtBQUVELElBQVksZ0JBS1g7QUFMRCxXQUFZLGdCQUFnQjtJQUMxQixpRUFBNkMsQ0FBQTtJQUM3Qyx5RUFBcUQsQ0FBQTtJQUNyRCw0RUFBd0QsQ0FBQTtJQUN4RCxvQkFBb0I7QUFDdEIsQ0FBQyxFQUxXLGdCQUFnQixHQUFoQix3QkFBZ0IsS0FBaEIsd0JBQWdCLFFBSzNCO0FBRUQsd0NBQXdDO0FBRXhDLElBQVksU0FL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 +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaWVudHMvY29uc3RhbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsZ0RBQXdCO0FBSXhCLG1EQUFpQztBQUVqQyxXQUFXO0FBQ0UsUUFBQSxZQUFZLEdBQUcsc0JBQXNCLENBQUM7QUFDdEMsUUFBQSxnQkFBZ0IsR0FBRyxzQkFBc0IsQ0FBQztBQUMxQyxRQUFBLGdCQUFnQixHQUFHLGdCQUFnQixDQUFDO0FBRWpELHFDQUFxQztBQUNyQyxJQUFZLGNBR1g7QUFIRCxXQUFZLGNBQWM7SUFDeEIsK0RBQTZDLENBQUE7SUFDN0Msb0JBQW9CO0FBQ3RCLENBQUMsRUFIVyxjQUFjLEdBQWQsc0JBQWMsS0FBZCxzQkFBYyxRQUd6QjtBQUVELElBQVksYUFHWDtBQUhELFdBQVksYUFBYTtJQUN2QixrRUFBaUQsQ0FBQTtJQUNqRCxvQkFBb0I7QUFDdEIsQ0FBQyxFQUhXLGFBQWEsR0FBYixxQkFBYSxLQUFiLHFCQUFhLFFBR3hCO0FBRUQsSUFBWSxhQUVYO0FBRkQsV0FBWSxhQUFhO0lBQ3ZCLG1FQUFrRCxDQUFBO0FBQ3BELENBQUMsRUFGVyxhQUFhLEdBQWIscUJBQWEsS0FBYixxQkFBYSxRQUV4QjtBQUVELElBQVksZ0JBR1g7QUFIRCxXQUFZLGdCQUFnQjtJQUMxQiw0RUFBd0QsQ0FBQTtJQUN4RCxvQkFBb0I7QUFDdEIsQ0FBQyxFQUhXLGdCQUFnQixHQUFoQix3QkFBZ0IsS0FBaEIsd0JBQWdCLFFBRzNCO0FBRUQsd0NBQXdDO0FBRXhDLElBQVksU0FHWDtBQUhELFdBQVksU0FBUztJQUNuQix1Q0FBMEIsQ0FBQTtJQUMxQixvQkFBb0I7QUFDdEIsQ0FBQyxFQUhXLFNBQVMsR0FBVCxpQkFBUyxLQUFULGlCQUFTLFFBR3BCO0FBQ1ksUUFBQSxrQkFBa0IsR0FBa0IsSUFBSSxDQUFDO0FBQ3pDLFFBQUEsa0JB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 /***/ }), @@ -197851,7 +197819,7 @@ exports.FaucetClient = void 0; const rest_1 = __importDefault(__webpack_require__(/*! ./modules/rest */ "./src/clients/modules/rest.ts")); class FaucetClient extends rest_1.default { /** - * @description For staging and testnet only, add USDC to an subaccount + * @description For testnet only, add USDC to an subaccount * * @returns The HTTP response. */ @@ -199687,7 +199655,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.getMarketPrice = exports.getDelegatorUnbondingDelegations = exports.getDelegatorDelegations = exports.getRewardsParams = exports.getOptimalIndexer = exports.getOptimalNode = exports.decodeAccountResponseValue = exports.encodeAccountRequestData = exports.signCancelOrder = exports.signPlaceOrder = exports.signRawPlaceOrder = exports.simulateTransferNativeToken = exports.simulateWithdraw = exports.simulateDeposit = exports.getUserStats = exports.getAccountBalances = exports.getAccountBalance = exports.transferNativeToken = exports.withdrawToIBC = exports.faucet = exports.withdraw = exports.deposit = exports.cancelOrder = exports.wrappedError = exports.placeOrder = exports.getPerpetualMarkets = exports.getUserFeeTier = exports.getFeeTiers = exports.getHeight = exports.deriveMnemomicFromEthereumSignature = exports.connect = exports.connectWallet = exports.connectNetwork = exports.connectClient = exports.Environment = void 0; +exports.getMarketPrice = exports.getDelegatorUnbondingDelegations = exports.getDelegatorDelegations = exports.getRewardsParams = exports.getOptimalIndexer = exports.getOptimalNode = exports.decodeAccountResponseValue = exports.encodeAccountRequestData = exports.signCancelOrder = exports.signPlaceOrder = exports.signRawPlaceOrder = exports.simulateTransferNativeToken = exports.simulateWithdraw = exports.simulateDeposit = exports.getUserStats = exports.getAccountBalances = exports.getAccountBalance = exports.transferNativeToken = exports.withdrawToIBC = exports.faucet = exports.withdraw = exports.deposit = exports.cancelOrder = exports.wrappedError = exports.placeOrder = exports.getPerpetualMarkets = exports.getUserFeeTier = exports.getFeeTiers = exports.getHeight = exports.deriveMnemomicFromEthereumSignature = exports.connect = exports.connectWallet = exports.connectNetwork = exports.connectClient = void 0; const stargate_1 = __webpack_require__(/*! @cosmjs/stargate */ "./node_modules/@cosmjs/stargate/build/index.js"); const AuthModule = __importStar(__webpack_require__(/*! cosmjs-types/cosmos/auth/v1beta1/query */ "./node_modules/cosmjs-types/cosmos/auth/v1beta1/query.js")); const constants_1 = __webpack_require__(/*! ../lib/constants */ "./src/lib/constants.ts"); @@ -199700,27 +199668,10 @@ const constants_2 = __webpack_require__(/*! ./constants */ "./src/clients/consta const faucet_client_1 = __webpack_require__(/*! ./faucet-client */ "./src/clients/faucet-client.ts"); const local_wallet_1 = __importDefault(__webpack_require__(/*! ./modules/local-wallet */ "./src/clients/modules/local-wallet.ts")); const subaccount_1 = __webpack_require__(/*! ./subaccount */ "./src/clients/subaccount.ts"); -/* this should match the definitions in Abacus */ -var Environment; -(function (Environment) { - Environment["staging"] = "dydxprotocol-staging"; - Environment["testnet"] = "dydxprotocol-testnet-2"; -})(Environment = exports.Environment || (exports.Environment = {})); -function network(env) { - switch (env) { - case Environment.staging: - return constants_2.Network.staging(); - case Environment.testnet: - return constants_2.Network.testnet(); - default: - throw new errors_1.UserError('invalid environment'); - } -} -async function connectClient(env) { +async function connectClient(network) { try { - const config = network(env); - globalThis.client = await composite_client_1.CompositeClient.connect(config); - return (0, helpers_1.encodeJson)(config); + globalThis.client = await composite_client_1.CompositeClient.connect(network); + return (0, helpers_1.encodeJson)(network); } catch (e) { return wrappedError(e); @@ -199778,9 +199729,9 @@ async function connectWallet(mnemonic) { } } exports.connectWallet = connectWallet; -async function connect(env, mnemonic) { +async function connect(network, mnemonic) { try { - await connectClient(env); + await connectClient(network); return connectWallet(mnemonic); } catch (e) { @@ -200481,7 +200432,7 @@ async function getMarketPrice(payload) { } } exports.getMarketPrice = getMarketPrice; -//# 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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"} /***/ }), diff --git a/v4-client-js/__tests__/modules/client/AccountEndpoints.test.ts b/v4-client-js/__tests__/modules/client/AccountEndpoints.test.ts index 4d7b6b0b..0ad2af08 100644 --- a/v4-client-js/__tests__/modules/client/AccountEndpoints.test.ts +++ b/v4-client-js/__tests__/modules/client/AccountEndpoints.test.ts @@ -3,7 +3,7 @@ import { IndexerClient } from '../../../src/clients/indexer-client'; import { DYDX_TEST_ADDRESS } from './constants'; describe('IndexerClient', () => { - const client = new IndexerClient(Network.staging().indexerConfig); + const client = new IndexerClient(Network.testnet().indexerConfig); describe('Private Endpoints', () => { it('Subaccounts', async () => { diff --git a/v4-client-js/__tests__/modules/client/FaucetEndpoint.test.ts b/v4-client-js/__tests__/modules/client/FaucetEndpoint.test.ts index 6c0deeac..fbd14ce8 100644 --- a/v4-client-js/__tests__/modules/client/FaucetEndpoint.test.ts +++ b/v4-client-js/__tests__/modules/client/FaucetEndpoint.test.ts @@ -3,7 +3,7 @@ import { FaucetClient } from '../../../src/clients/faucet-client'; import { DYDX_TEST_ADDRESS } from './constants'; describe('FaucetClient', () => { - const client = new FaucetClient(FaucetApiHost.STAGING); + const client = new FaucetClient(FaucetApiHost.TESTNET); describe('Faucet Endpoints', () => { it('Fill', async () => { diff --git a/v4-client-js/__tests__/modules/client/MarketsEndpoints.test.ts b/v4-client-js/__tests__/modules/client/MarketsEndpoints.test.ts index 12155505..0ec69285 100644 --- a/v4-client-js/__tests__/modules/client/MarketsEndpoints.test.ts +++ b/v4-client-js/__tests__/modules/client/MarketsEndpoints.test.ts @@ -5,7 +5,7 @@ import { IndexerClient } from '../../../src/clients/indexer-client'; export const MARKET_BTC_USD: string = 'BTC-USD'; describe('IndexerClient', () => { - const client = new IndexerClient(Network.staging().indexerConfig); + const client = new IndexerClient(Network.testnet().indexerConfig); describe('Market Endpoints', () => { it('Markets', async () => { diff --git a/v4-client-js/__tests__/modules/client/Transfers.test.ts b/v4-client-js/__tests__/modules/client/Transfers.test.ts index 84c9800c..915a48e8 100644 --- a/v4-client-js/__tests__/modules/client/Transfers.test.ts +++ b/v4-client-js/__tests__/modules/client/Transfers.test.ts @@ -19,7 +19,7 @@ describe('Validator Client', () => { beforeEach(async () => { wallet = await LocalWallet.fromMnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX); subaccount = new Subaccount(wallet, 0); - client = await ValidatorClient.connect(Network.staging().validatorConfig); + client = await ValidatorClient.connect(Network.testnet().validatorConfig); await sleep(5000); // wait for withdraw to complete }); diff --git a/v4-client-js/__tests__/modules/client/UtilityEndpoints.test.ts b/v4-client-js/__tests__/modules/client/UtilityEndpoints.test.ts index eec33112..c3163dea 100644 --- a/v4-client-js/__tests__/modules/client/UtilityEndpoints.test.ts +++ b/v4-client-js/__tests__/modules/client/UtilityEndpoints.test.ts @@ -3,7 +3,7 @@ import { Network } from '../../../src/clients/constants'; import { DYDX_TEST_ADDRESS } from './constants'; describe('IndexerClient', () => { - const client = new IndexerClient(Network.staging().indexerConfig); + const client = new IndexerClient(Network.testnet().indexerConfig); describe('Utility Endpoints', () => { it('getTime', async () => { diff --git a/v4-client-js/__tests__/modules/client/ValidatorGetEndpoints.test.ts b/v4-client-js/__tests__/modules/client/ValidatorGetEndpoints.test.ts index 55ecd25d..6add1702 100644 --- a/v4-client-js/__tests__/modules/client/ValidatorGetEndpoints.test.ts +++ b/v4-client-js/__tests__/modules/client/ValidatorGetEndpoints.test.ts @@ -6,7 +6,7 @@ describe('Validator Client', () => { let client: ValidatorClient; describe('Get', () => { beforeEach(async () => { - client = await ValidatorClient.connect(Network.staging().validatorConfig); + client = await ValidatorClient.connect(Network.testnet().validatorConfig); }); it('Account', async () => { diff --git a/v4-client-js/__tests__/modules/client/ValidatorPostEndpoints.test.ts b/v4-client-js/__tests__/modules/client/ValidatorPostEndpoints.test.ts index ba57a9be..fad0009e 100644 --- a/v4-client-js/__tests__/modules/client/ValidatorPostEndpoints.test.ts +++ b/v4-client-js/__tests__/modules/client/ValidatorPostEndpoints.test.ts @@ -30,7 +30,7 @@ describe('Validator Client', () => { describe('Post', () => { beforeEach(async () => { wallet = await LocalWallet.fromMnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX); - client = await ValidatorClient.connect(Network.staging().validatorConfig); + client = await ValidatorClient.connect(Network.testnet().validatorConfig); }); it('PlaceOrder', async () => { diff --git a/v4-client-js/examples/account_endpoints.ts b/v4-client-js/examples/account_endpoints.ts index b6fd8b51..243a82b9 100644 --- a/v4-client-js/examples/account_endpoints.ts +++ b/v4-client-js/examples/account_endpoints.ts @@ -7,7 +7,7 @@ import { IndexerClient } from '../src/clients/indexer-client'; import { DYDX_TEST_ADDRESS } from './constants'; async function test(): Promise { - const client = new IndexerClient(Network.staging().indexerConfig); + const client = new IndexerClient(Network.testnet().indexerConfig); const address = DYDX_TEST_ADDRESS; // Get subaccounts diff --git a/v4-client-js/examples/composite_example.ts b/v4-client-js/examples/composite_example.ts index 939df3a3..4ce54ee2 100644 --- a/v4-client-js/examples/composite_example.ts +++ b/v4-client-js/examples/composite_example.ts @@ -16,7 +16,7 @@ async function sleep(ms: number): Promise { async function test(): Promise { 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); diff --git a/v4-client-js/examples/faucet_endpoint.ts b/v4-client-js/examples/faucet_endpoint.ts index 874ebba4..0b68bc7c 100644 --- a/v4-client-js/examples/faucet_endpoint.ts +++ b/v4-client-js/examples/faucet_endpoint.ts @@ -7,7 +7,7 @@ import { FaucetClient } from '../src/clients/faucet-client'; import { DYDX_TEST_ADDRESS } from './constants'; async function test(): Promise { - const client = new FaucetClient(FaucetApiHost.STAGING); + const client = new FaucetClient(FaucetApiHost.TESTNET); const address = DYDX_TEST_ADDRESS; // Use faucet to fill subaccount diff --git a/v4-client-js/examples/long_term_order_cancel_example.ts b/v4-client-js/examples/long_term_order_cancel_example.ts index 64a4cd5c..23c672d6 100644 --- a/v4-client-js/examples/long_term_order_cancel_example.ts +++ b/v4-client-js/examples/long_term_order_cancel_example.ts @@ -15,7 +15,7 @@ async function sleep(ms: number): Promise { async function test(): Promise { 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); diff --git a/v4-client-js/examples/markets_endpoints.ts b/v4-client-js/examples/markets_endpoints.ts index 1c36b5b4..60ad3372 100644 --- a/v4-client-js/examples/markets_endpoints.ts +++ b/v4-client-js/examples/markets_endpoints.ts @@ -9,7 +9,7 @@ import { IndexerClient } from '../src/clients/indexer-client'; export const MARKET_BTC_USD: string = 'BTC-USD'; async function test(): Promise { - const client = new IndexerClient(Network.staging().indexerConfig); + const client = new IndexerClient(Network.testnet().indexerConfig); // Get perp markets try { diff --git a/v4-client-js/examples/native_examples.ts b/v4-client-js/examples/native_examples.ts index a75ec5e4..1d32d6aa 100644 --- a/v4-client-js/examples/native_examples.ts +++ b/v4-client-js/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 { 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 { 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); } diff --git a/v4-client-js/examples/short_term_order_cancel_example.ts b/v4-client-js/examples/short_term_order_cancel_example.ts index 8bfb2925..00a7541a 100644 --- a/v4-client-js/examples/short_term_order_cancel_example.ts +++ b/v4-client-js/examples/short_term_order_cancel_example.ts @@ -11,7 +11,7 @@ import { DYDX_TEST_MNEMONIC, MAX_CLIENT_ID } from './constants'; async function test(): Promise { 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); diff --git a/v4-client-js/examples/short_term_order_composite_example.ts b/v4-client-js/examples/short_term_order_composite_example.ts index d0381e3e..f5d4947b 100644 --- a/v4-client-js/examples/short_term_order_composite_example.ts +++ b/v4-client-js/examples/short_term_order_composite_example.ts @@ -18,7 +18,7 @@ async function sleep(ms: number): Promise { async function test(): Promise { 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); diff --git a/v4-client-js/examples/test.ts b/v4-client-js/examples/test.ts index 939df3a3..4ce54ee2 100644 --- a/v4-client-js/examples/test.ts +++ b/v4-client-js/examples/test.ts @@ -16,7 +16,7 @@ async function sleep(ms: number): Promise { async function test(): Promise { 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); diff --git a/v4-client-js/examples/transfer_example_deposit.ts b/v4-client-js/examples/transfer_example_deposit.ts index 40e0541d..dfbe0119 100644 --- a/v4-client-js/examples/transfer_example_deposit.ts +++ b/v4-client-js/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 { 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); diff --git a/v4-client-js/examples/transfer_example_send.ts b/v4-client-js/examples/transfer_example_send.ts index b0c6e7e2..32fd3e88 100644 --- a/v4-client-js/examples/transfer_example_send.ts +++ b/v4-client-js/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 { const wallet = await LocalWallet.fromMnemonic( DYDX_TEST_MNEMONIC, @@ -19,7 +17,7 @@ async function test(): Promise { ); 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); diff --git a/v4-client-js/examples/transfer_example_subaccount_transfer.ts b/v4-client-js/examples/transfer_example_subaccount_transfer.ts index 39dc4310..8acc2cec 100644 --- a/v4-client-js/examples/transfer_example_subaccount_transfer.ts +++ b/v4-client-js/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 { 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); diff --git a/v4-client-js/examples/transfer_example_withdraw.ts b/v4-client-js/examples/transfer_example_withdraw.ts index 9f8ad885..66d646fe 100644 --- a/v4-client-js/examples/transfer_example_withdraw.ts +++ b/v4-client-js/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 { 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); diff --git a/v4-client-js/examples/transfer_example_withdraw_other.ts b/v4-client-js/examples/transfer_example_withdraw_other.ts index c8a36841..6fd05fc4 100644 --- a/v4-client-js/examples/transfer_example_withdraw_other.ts +++ b/v4-client-js/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 { 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); diff --git a/v4-client-js/examples/utility_endpoints.ts b/v4-client-js/examples/utility_endpoints.ts index 1ca25ae5..34e810f1 100644 --- a/v4-client-js/examples/utility_endpoints.ts +++ b/v4-client-js/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 { - const client = new IndexerClient(Network.staging().indexerConfig); + const client = new IndexerClient(Network.testnet().indexerConfig); // Get indexer server time try { diff --git a/v4-client-js/examples/validator_get_example.ts b/v4-client-js/examples/validator_get_example.ts index f942ccd5..824e1dbf 100644 --- a/v4-client-js/examples/validator_get_example.ts +++ b/v4-client-js/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 { - 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); diff --git a/v4-client-js/examples/validator_post_example.ts b/v4-client-js/examples/validator_post_example.ts index bf2f6909..71c07def 100644 --- a/v4-client-js/examples/validator_post_example.ts +++ b/v4-client-js/examples/validator_post_example.ts @@ -33,7 +33,7 @@ async function test(): Promise { 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); diff --git a/v4-client-js/examples/websocket_example.ts b/v4-client-js/examples/websocket_example.ts index c7acd585..410a65d1 100644 --- a/v4-client-js/examples/websocket_example.ts +++ b/v4-client-js/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'); }, diff --git a/v4-client-js/package.json b/v4-client-js/package.json index 3d4aff2c..187e7c5e 100644 --- a/v4-client-js/package.json +++ b/v4-client-js/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": { diff --git a/v4-client-js/src/clients/constants.ts b/v4-client-js/src/clients/constants.ts index ed0ae806..d78b4539 100644 --- a/v4-client-js/src/clients/constants.ts +++ b/v4-client-js/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, diff --git a/v4-client-js/src/clients/faucet-client.ts b/v4-client-js/src/clients/faucet-client.ts index 8745e728..f34f510d 100644 --- a/v4-client-js/src/clients/faucet-client.ts +++ b/v4-client-js/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. */ diff --git a/v4-client-js/src/clients/native.ts b/v4-client-js/src/clients/native.ts index 89183a7f..518317e6 100644 --- a/v4-client-js/src/clients/native.ts +++ b/v4-client-js/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 { 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 { try { - await connectClient(env); + await connectClient(network); return connectWallet(mnemonic); } catch (e) { return wrappedError(e); diff --git a/v4-client-py/README.md b/v4-client-py/README.md index ac41c4ca..05f7d1ed 100644 --- a/v4-client-py/README.md +++ b/v4-client-py/README.md @@ -72,7 +72,7 @@ Select "Python: Current File" ## Running tests -Integration tests uses Staging environment for testing. We use pytest. +Integration tests uses testnet environment for testing. We use pytest. To install pytest @@ -87,7 +87,7 @@ pytest -v ``` For integration tests with transactions, a subaccount must exist for the specified address. -This subaccount may be reset when staging environment is reset. To create the subaccount, run +This subaccount may be reset when testnet environment is reset. To create the subaccount, run examples/faucet_endpoint.py diff --git a/v4-client-py/examples/account_endpoints.py b/v4-client-py/examples/account_endpoints.py index 32785d18..6dc80828 100644 --- a/v4-client-py/examples/account_endpoints.py +++ b/v4-client-py/examples/account_endpoints.py @@ -9,7 +9,7 @@ from tests.constants import DYDX_TEST_MNEMONIC client = IndexerClient( - config=Network.staging().indexer_config, + config=Network.testnet().indexer_config, ) try: diff --git a/v4-client-py/examples/chain_client/Account.py b/v4-client-py/examples/chain_client/Account.py index d155e4e9..2dc29c35 100644 --- a/v4-client-py/examples/chain_client/Account.py +++ b/v4-client-py/examples/chain_client/Account.py @@ -7,7 +7,7 @@ from tests.constants import DYDX_TEST_MNEMONIC client = ValidatorClient( - config=Network.staging().validator_config, + config=Network.testnet().validator_config, ) subaccount = Subaccount.from_mnemonic(DYDX_TEST_MNEMONIC) address = subaccount.address diff --git a/v4-client-py/examples/chain_client/BankBalance.py b/v4-client-py/examples/chain_client/BankBalance.py index da689956..17f558ed 100644 --- a/v4-client-py/examples/chain_client/BankBalance.py +++ b/v4-client-py/examples/chain_client/BankBalance.py @@ -8,7 +8,7 @@ from tests.constants import DYDX_TEST_MNEMONIC client = ValidatorClient( - config=Network.staging().validator_config, + config=Network.testnet().validator_config, ) subaccount = Subaccount.from_mnemonic(DYDX_TEST_MNEMONIC) address = subaccount.address diff --git a/v4-client-py/examples/chain_client/BankBalances.py b/v4-client-py/examples/chain_client/BankBalances.py index 837b1d10..6605d0f2 100644 --- a/v4-client-py/examples/chain_client/BankBalances.py +++ b/v4-client-py/examples/chain_client/BankBalances.py @@ -8,7 +8,7 @@ from tests.constants import DYDX_TEST_MNEMONIC client = ValidatorClient( - config=Network.staging().validator_config, + config=Network.testnet().validator_config, ) subaccount = Subaccount.from_mnemonic(DYDX_TEST_MNEMONIC) address = subaccount.address diff --git a/v4-client-py/examples/chain_client/GetTx.py b/v4-client-py/examples/chain_client/GetTx.py index 60a25f85..2a4d9927 100644 --- a/v4-client-py/examples/chain_client/GetTx.py +++ b/v4-client-py/examples/chain_client/GetTx.py @@ -7,7 +7,7 @@ from tests.constants import DYDX_TEST_MNEMONIC client = ValidatorClient( - config=Network.staging().validator_config, + config=Network.testnet().validator_config, ) subaccount = Subaccount.from_mnemonic(DYDX_TEST_MNEMONIC) address = subaccount.address diff --git a/v4-client-py/examples/composite_example.py b/v4-client-py/examples/composite_example.py index 75da1e66..04f5b2c9 100644 --- a/v4-client-py/examples/composite_example.py +++ b/v4-client-py/examples/composite_example.py @@ -22,7 +22,7 @@ async def main() -> None: wallet = LocalWallet.from_mnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX) - network = Network.staging() + network = Network.testnet() client = CompositeClient( network, ) diff --git a/v4-client-py/examples/faucet_endpoint.py b/v4-client-py/examples/faucet_endpoint.py index 838bed21..bbdb4dcf 100644 --- a/v4-client-py/examples/faucet_endpoint.py +++ b/v4-client-py/examples/faucet_endpoint.py @@ -8,7 +8,7 @@ from tests.constants import DYDX_TEST_MNEMONIC client = FaucetClient( - host=Network.staging().faucet_endpoint, + host=Network.testnet().faucet_endpoint, ) subaccount = Subaccount.from_mnemonic(DYDX_TEST_MNEMONIC) diff --git a/v4-client-py/examples/long_term_order_cancel_example.py b/v4-client-py/examples/long_term_order_cancel_example.py index c2438341..f8950fc4 100644 --- a/v4-client-py/examples/long_term_order_cancel_example.py +++ b/v4-client-py/examples/long_term_order_cancel_example.py @@ -22,7 +22,7 @@ async def main() -> None: wallet = LocalWallet.from_mnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX) - network = Network.staging() + network = Network.testnet() client = CompositeClient( network, ) diff --git a/v4-client-py/examples/markets_endpoints.py b/v4-client-py/examples/markets_endpoints.py index 279b9978..373aefff 100644 --- a/v4-client-py/examples/markets_endpoints.py +++ b/v4-client-py/examples/markets_endpoints.py @@ -7,7 +7,7 @@ from v4_client_py.clients.constants import Network, MARKET_BTC_USD client = IndexerClient( - config=Network.staging().indexer_config, + config=Network.testnet().indexer_config, ) # Get perp markets diff --git a/v4-client-py/examples/short_term_order_cancel_example.py b/v4-client-py/examples/short_term_order_cancel_example.py index f4d91bf7..01864fa2 100644 --- a/v4-client-py/examples/short_term_order_cancel_example.py +++ b/v4-client-py/examples/short_term_order_cancel_example.py @@ -19,7 +19,7 @@ async def main() -> None: wallet = LocalWallet.from_mnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX) - network = Network.staging() + network = Network.testnet() client = CompositeClient( network, ) diff --git a/v4-client-py/examples/short_term_order_composite_example.py b/v4-client-py/examples/short_term_order_composite_example.py index c375e308..d80b23fc 100644 --- a/v4-client-py/examples/short_term_order_composite_example.py +++ b/v4-client-py/examples/short_term_order_composite_example.py @@ -19,7 +19,7 @@ async def main() -> None: wallet = LocalWallet.from_mnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX) - network = Network.staging() + network = Network.testnet() client = CompositeClient( network, ) diff --git a/v4-client-py/examples/transfer_example_deposit.py b/v4-client-py/examples/transfer_example_deposit.py index 78e0e86c..d58de223 100644 --- a/v4-client-py/examples/transfer_example_deposit.py +++ b/v4-client-py/examples/transfer_example_deposit.py @@ -10,7 +10,7 @@ async def main() -> None: - network = Network.staging() + network = Network.testnet() client = ValidatorClient(network.validator_config) wallet = LocalWallet.from_mnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX); subaccount = Subaccount(wallet, 0) diff --git a/v4-client-py/examples/transfer_example_subaccount_transfer.py b/v4-client-py/examples/transfer_example_subaccount_transfer.py index 53f36710..8b23ba2d 100644 --- a/v4-client-py/examples/transfer_example_subaccount_transfer.py +++ b/v4-client-py/examples/transfer_example_subaccount_transfer.py @@ -10,7 +10,7 @@ async def main() -> None: - network = Network.staging() + network = Network.testnet() client = ValidatorClient(network.validator_config) wallet = LocalWallet.from_mnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX); subaccount = Subaccount(wallet, 0) diff --git a/v4-client-py/examples/transfer_example_withdraw.py b/v4-client-py/examples/transfer_example_withdraw.py index 213063ea..d6341259 100644 --- a/v4-client-py/examples/transfer_example_withdraw.py +++ b/v4-client-py/examples/transfer_example_withdraw.py @@ -10,7 +10,7 @@ async def main() -> None: - network = Network.staging() + network = Network.testnet() client = ValidatorClient(network.validator_config) wallet = LocalWallet.from_mnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX); subaccount = Subaccount(wallet, 0) diff --git a/v4-client-py/examples/utility_endpoints.py b/v4-client-py/examples/utility_endpoints.py index 70c4358f..dfca8804 100644 --- a/v4-client-py/examples/utility_endpoints.py +++ b/v4-client-py/examples/utility_endpoints.py @@ -7,7 +7,7 @@ from v4_client_py.clients.constants import Network client = IndexerClient( - config=Network.staging().indexer_config, + config=Network.testnet().indexer_config, ) # Get indexer server time diff --git a/v4-client-py/examples/validator_get_examples.py b/v4-client-py/examples/validator_get_examples.py index 5fd5f34e..4e17a303 100644 --- a/v4-client-py/examples/validator_get_examples.py +++ b/v4-client-py/examples/validator_get_examples.py @@ -8,7 +8,7 @@ async def main() -> None: - network = Network.staging() + network = Network.testnet() client = ValidatorClient(network.validator_config) address = DYDX_TEST_ADDRESS try: diff --git a/v4-client-py/examples/validator_post_examples.py b/v4-client-py/examples/validator_post_examples.py index e722174f..cb3c7815 100644 --- a/v4-client-py/examples/validator_post_examples.py +++ b/v4-client-py/examples/validator_post_examples.py @@ -41,7 +41,7 @@ def dummy_order(height): return placeOrder async def main() -> None: - network = Network.staging() + network = Network.testnet() client = ValidatorClient(network.validator_config) wallet = LocalWallet.from_mnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX); subaccount = Subaccount(wallet, 0) diff --git a/v4-client-py/examples/websocket_example.py b/v4-client-py/examples/websocket_example.py index b99ef707..5b764762 100644 --- a/v4-client-py/examples/websocket_example.py +++ b/v4-client-py/examples/websocket_example.py @@ -30,7 +30,7 @@ def on_message(ws, message): def on_close(ws): print('WebSocket connection closed') -my_ws = SocketClient(config=Network.staging().indexer_config, +my_ws = SocketClient(config=Network.testnet().indexer_config, on_message=on_message, on_open=on_open, on_close=on_close) diff --git a/v4-client-py/pyproject.toml b/v4-client-py/pyproject.toml index 9ca171a1..b09d8373 100644 --- a/v4-client-py/pyproject.toml +++ b/v4-client-py/pyproject.toml @@ -5,9 +5,9 @@ package-dir = {"" = "v4_client_py"} [tool.poetry] name = "v4-client-py" -version = "0.7.0" +version = "0.8.0" description = "dYdX v4 Client" -authors = ["John Huang "] +authors = ["dYdX "] license = "BSL-1.1" readme = "README.md" diff --git a/v4-client-py/tests/test_indexer_markets_endpoints.py b/v4-client-py/tests/test_indexer_markets_endpoints.py index dffac476..1737b25e 100644 --- a/v4-client-py/tests/test_indexer_markets_endpoints.py +++ b/v4-client-py/tests/test_indexer_markets_endpoints.py @@ -3,7 +3,7 @@ from v4_client_py.clients.constants import Network, MARKET_BTC_USD client = IndexerClient( - config=Network.staging().indexer_config, + config=Network.testnet().indexer_config, ) def test_get_perpetual_markets(): diff --git a/v4-client-py/tests/test_indexer_utility_endpoints.py b/v4-client-py/tests/test_indexer_utility_endpoints.py index 043cb4cc..b40cbb10 100644 --- a/v4-client-py/tests/test_indexer_utility_endpoints.py +++ b/v4-client-py/tests/test_indexer_utility_endpoints.py @@ -8,7 +8,7 @@ address = subaccount.address client = IndexerClient( - config=Network.staging().indexer_config, + config=Network.testnet().indexer_config, ) def test_get_time(): diff --git a/v4-client-py/tests/test_validator_get_endpoints.py b/v4-client-py/tests/test_validator_get_endpoints.py index 261728f3..537eac26 100644 --- a/v4-client-py/tests/test_validator_get_endpoints.py +++ b/v4-client-py/tests/test_validator_get_endpoints.py @@ -3,7 +3,7 @@ from tests.constants import DYDX_TEST_ADDRESS -network = Network.staging() +network = Network.testnet() client = ValidatorClient(network.validator_config) address = DYDX_TEST_ADDRESS print('address:') diff --git a/v4-client-py/tests_integration/test_faucet.py b/v4-client-py/tests_integration/test_faucet.py index e276d1fe..213aba29 100644 --- a/v4-client-py/tests_integration/test_faucet.py +++ b/v4-client-py/tests_integration/test_faucet.py @@ -5,7 +5,7 @@ from tests.constants import DYDX_TEST_MNEMONIC client = FaucetClient( - host=Network.staging().faucet_endpoint, + host=Network.testnet().faucet_endpoint, ) subaccount = Subaccount.from_mnemonic(DYDX_TEST_MNEMONIC) diff --git a/v4-client-py/tests_integration/test_indexer_account_endpoints.py b/v4-client-py/tests_integration/test_indexer_account_endpoints.py index f6b09b00..80df1b18 100644 --- a/v4-client-py/tests_integration/test_indexer_account_endpoints.py +++ b/v4-client-py/tests_integration/test_indexer_account_endpoints.py @@ -5,7 +5,7 @@ from tests.constants import DYDX_TEST_MNEMONIC client = IndexerClient( - config=Network.staging().indexer_config, + config=Network.testnet().indexer_config, ) subaccount = Subaccount.from_mnemonic(DYDX_TEST_MNEMONIC) diff --git a/v4-client-py/tests_integration/test_trades.py b/v4-client-py/tests_integration/test_trades.py index 3332938e..e61575b6 100644 --- a/v4-client-py/tests_integration/test_trades.py +++ b/v4-client-py/tests_integration/test_trades.py @@ -40,7 +40,7 @@ def dummy_order(height): return placeOrder async def main() -> None: - network = Network.staging() + network = Network.testnet() client = ValidatorClient(network.validator_config) wallet = LocalWallet.from_mnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX); subaccount = Subaccount(wallet, 0) diff --git a/v4-client-py/tests_integration/test_transfers.py b/v4-client-py/tests_integration/test_transfers.py index 2254a5e8..1839d7a5 100644 --- a/v4-client-py/tests_integration/test_transfers.py +++ b/v4-client-py/tests_integration/test_transfers.py @@ -10,7 +10,7 @@ async def main() -> None: - network = Network.staging() + network = Network.testnet() client = ValidatorClient(network.validator_config) wallet = LocalWallet.from_mnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX) subaccount = Subaccount(wallet, 0) @@ -45,7 +45,7 @@ async def main() -> None: await asyncio.sleep(5) - network = Network.staging() + network = Network.testnet() client = ValidatorClient(network.validator_config) wallet = LocalWallet.from_mnemonic(DYDX_TEST_MNEMONIC, BECH32_PREFIX) subaccount = Subaccount(wallet, 0) diff --git a/v4-client-py/v4_client_py/clients/constants.py b/v4-client-py/v4_client_py/clients/constants.py index 9f7fc3c2..86920ca4 100644 --- a/v4-client-py/v4_client_py/clients/constants.py +++ b/v4-client-py/v4_client_py/clients/constants.py @@ -5,32 +5,21 @@ # ------------ API URLs ------------ INDEXER_API_HOST_MAINNET = None INDEXER_API_HOST_TESTNET = 'https://dydx-testnet.imperator.co' -INDEXER_API_HOST_STAGING = 'https://indexer.v4staging.dydx.exchange' -INDEXER_API_HOST_DEV = 'https://indexer.v4dev.dydx.exchange' + INDEXER_WS_HOST_MAINNET = None INDEXER_WS_HOST_TESTNET = 'wss://indexer.v4testnet.dydx.exchange/v4/ws' -INDEXER_WS_HOST_STAGING = 'wss://indexer.v4staging.dydx.exchange/v4/ws' -INDEXER_WS_HOST_DEV = 'wss://indexer.v4dev.dydx.exchange/v4/ws' FAUCET_API_HOST_TESTNET = 'https://faucet.v4testnet.dydx.exchange' -FAUCET_API_HOST_STAGING = 'https://faucet.v4staging.dydx.exchange' -FAUCET_API_HOST_DEV = 'https://faucet.v4dev.expotrading.com' VALIDATOR_API_HOST_MAINNET = None VALIDATOR_API_HOST_TESTNET = 'https://dydx-testnet-archive.allthatnode.com' -VALIDATOR_API_HOST_STAGING = 'https://validator.v4staging.dydx.exchange' -VALIDATOR_API_HOST_DEV = 'https://validator.v4dev.dydx.exchange' VALIDATOR_GRPC_MAINNET = None VALIDATOR_GRPC_TESTNET = 'dydx-testnet-archive.allthatnode.com:9090' -VALIDATOR_GRPC_STAGING = '54.249.255.18:9090' -VALIDATOR_GRPC_DEV = '52.192.187.113:9090' # ------------ Ethereum Network IDs ------------ NETWORK_ID_MAINNET = None NETWORK_ID_TESTNET = 'dydx-testnet-4' -NETWORK_ID_STAGING = 'dydxprotocol-testnet' -NETWORK_ID_DEV = 'dydxprotocol-testnet' # ------------ Market Statistic Day Types ------------ MARKET_STATISTIC_DAY_ONE = '1' @@ -139,42 +128,6 @@ def __init__( faucet_endpoint = faucet_endpoint[:-1] self.faucet_endpoint = faucet_endpoint - @classmethod - def dev(cls): - validator_config=ValidatorConfig( - grpc_endpoint=VALIDATOR_GRPC_DEV, - chain_id=NETWORK_ID_DEV, - ssl_enabled=False - ) - indexer_config=IndexerConfig( - rest_endpoint=INDEXER_API_HOST_DEV, - websocket_endpoint=INDEXER_WS_HOST_DEV, - ) - return cls( - env='dev', - validator_config=validator_config, - indexer_config=indexer_config, - faucet_endpoint=FAUCET_API_HOST_DEV, - ) - - @classmethod - def staging(cls): - validator_config=ValidatorConfig( - grpc_endpoint=VALIDATOR_GRPC_STAGING, - chain_id=NETWORK_ID_STAGING, - ssl_enabled=False - ) - indexer_config=IndexerConfig( - rest_endpoint=INDEXER_API_HOST_STAGING, - websocket_endpoint=INDEXER_WS_HOST_STAGING, - ) - return cls( - env='staging', - validator_config=validator_config, - indexer_config=indexer_config, - faucet_endpoint=FAUCET_API_HOST_STAGING, - ) - @classmethod def testnet(cls): validator_config=ValidatorConfig(