From 46a7a2e620e85b6466e6a46daa45a6f784296006 Mon Sep 17 00:00:00 2001 From: Ido Kleinman Date: Thu, 11 Aug 2022 13:31:47 -0700 Subject: [PATCH] Revert "chore: Remove unused addresses in addresses.json [TKR-519] (#548)" This reverts commit 8aa313a4375e90cae7693b16419e7273577421f8. --- packages/asset-swapper/src/swap_quoter.ts | 1 + .../src/utils/market_operation_utils/types.ts | 1 + .../test/market_operation_utils_test.ts | 1 + packages/contract-addresses/CHANGELOG.json | 8 + packages/contract-addresses/addresses.json | 247 ++++++++++++++++++ packages/contract-addresses/src/index.ts | 19 ++ packages/contract-wrappers/CHANGELOG.json | 8 + .../src/contract_wrappers.ts | 39 ++- .../src/contract_wrappers_config_schema.ts | 5 + 9 files changed, 328 insertions(+), 1 deletion(-) diff --git a/packages/asset-swapper/src/swap_quoter.ts b/packages/asset-swapper/src/swap_quoter.ts index 50d7e16c2c..b2fad503f8 100644 --- a/packages/asset-swapper/src/swap_quoter.ts +++ b/packages/asset-swapper/src/swap_quoter.ts @@ -154,6 +154,7 @@ export class SwapQuoter { this._contractAddresses, { chainId, + exchangeAddress: this._contractAddresses.exchange, }, ); diff --git a/packages/asset-swapper/src/utils/market_operation_utils/types.ts b/packages/asset-swapper/src/utils/market_operation_utils/types.ts index 0faec653bb..ba59aea4a8 100644 --- a/packages/asset-swapper/src/utils/market_operation_utils/types.ts +++ b/packages/asset-swapper/src/utils/market_operation_utils/types.ts @@ -20,6 +20,7 @@ import { SourceFilters } from './source_filters'; */ export interface OrderDomain { chainId: number; + exchangeAddress: string; } /** diff --git a/packages/asset-swapper/test/market_operation_utils_test.ts b/packages/asset-swapper/test/market_operation_utils_test.ts index 6e1cfaa2d3..d895bfef71 100644 --- a/packages/asset-swapper/test/market_operation_utils_test.ts +++ b/packages/asset-swapper/test/market_operation_utils_test.ts @@ -201,6 +201,7 @@ describe('MarketOperationUtils tests', () => { } const ORDER_DOMAIN = { + exchangeAddress: contractAddresses.exchange, chainId: CHAIN_ID, }; diff --git a/packages/contract-addresses/CHANGELOG.json b/packages/contract-addresses/CHANGELOG.json index 91a8a56eca..8e0343eae4 100644 --- a/packages/contract-addresses/CHANGELOG.json +++ b/packages/contract-addresses/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "6.20.1", + "changes": [ + { + "note": "Revert: Remove contract addresses that are no longer needed" + } + ] + }, { "version": "6.20.0", "changes": [ diff --git a/packages/contract-addresses/addresses.json b/packages/contract-addresses/addresses.json index cf494483ed..f97e57fc39 100644 --- a/packages/contract-addresses/addresses.json +++ b/packages/contract-addresses/addresses.json @@ -1,13 +1,32 @@ { "1": { + "exchangeV2": "0x080bf510fcbf18b91105470639e9561022937712", + "exchange": "0x61935cbdd02287b511119ddb11aeb42f1593b7ef", + "erc20Proxy": "0x95e6f48254609a6ee006f7d493c8e5fb97094cef", + "erc721Proxy": "0xefc70a1b18c432bdc64b596838b4d138f6bc6cad", + "forwarder": "0x6958f5e95332d93d21af0d7b9ca85b8212fee0a5", "zrxToken": "0xe41d2489571d322189246dafa5ebde1f4699f498", "etherToken": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", + "assetProxyOwner": "0xdffe798c7172dd6deb32baee68af322e8f495ce0", "zeroExGovernor": "0x7d3455421bbc5ed534a83c88fd80387dc8271392", + "coordinatorRegistry": "0x45797531b873fd5e519477a070a955764c1a5b07", + "coordinator": "0x38a795580d0f687e399913a00ddef6a17612c722", + "multiAssetProxy": "0xef701d5389ae74503d633396c4d654eabedc9d78", + "staticCallProxy": "0x3517b88c19508c08650616019062b898ab65ed29", + "erc1155Proxy": "0x7eefbd48fd63d441ec7435d024ec7c5131019add", "zrxVault": "0xba7f8b5fb1b19c1211c5d49550fcd149177a5eaf", "staking": "0x2a17c35ff147b32f13f19f2e311446eeb02503f3", "stakingProxy": "0xa26e80e7dea86279c6d778d702cc413e6cffa777", + "devUtils": "0x74134cf88b21383713e096a5ecf59e297dc7f547", "erc20BridgeProxy": "0x8ed95d1746bf1e4dab58d8ed4724f1ef95b20db0", "erc20BridgeSampler": "0xd8c38704c9937ea3312de29f824b4ad3450a5e61", + "chaiBridge": "0x77c31eba23043b9a72d13470f3a3a311344d7438", + "dydxBridge": "0x92af95e37afddac412e5688a9dcc1dd815d4ae53", + "godsUnchainedValidator": "0x09a379ef7218bcfd8913faa8b281ebc5a2e0bc04", + "broker": "0xd4690a51044db77d91d7aa8f7a3a5ad5da331af0", + "chainlinkStopLimit": "0xeb27220f95f364e1d9531992c48613f231839f53", + "maximumGasPrice": "0xe2bfd35306495d11e3c9db0d8de390cda24563cf", + "dexForwarderBridge": "0xc47b7094f378e54347e281aab170e8cca69d880a", "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e", "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff", "exchangeProxyTransformerDeployer": "0x39dce47a67ad34344eab877eae3ef1fa2a1d50bb", @@ -23,14 +42,33 @@ } }, "3": { + "erc20Proxy": "0xf1ec7d0ba42f15fb5c9e3adbe86431973e44764c", + "erc721Proxy": "0x070efeb7e5ffa3d1a59d03a219539551ae60ba43", "zrxToken": "0xff67881f8d12f372d91baae9752eb3631ff0ed00", "etherToken": "0xc778417e063141139fce010982780140aa0cd5ab", + "exchangeV2": "0xbff9493f92a3df4b0429b6d00743b3cfb4c85831", + "exchange": "0x5d8c9ba74607d2cbc4176882a42d4ace891c1c00", + "assetProxyOwner": "0x0000000000000000000000000000000000000000", "zeroExGovernor": "0x53993733d41a88ae86f77a18a024e5548ee26579", + "forwarder": "0xd5abddda4ba89c0120edc0ca8a95ed1ad0bf9fc3", + "coordinatorRegistry": "0xf8becacec90bfc361c0a2c720839e08405a72f6d", + "coordinator": "0xc2e2f8faf4bf649123b6f94103646cb4a0331006", + "multiAssetProxy": "0x7b70a148e20b348c320208df84fdd642aab49fd0", + "staticCallProxy": "0xaa460127562482faa5df42f2c39a025cd4a1cc0a", + "erc1155Proxy": "0x7f10d80f2659aaae790ab03da12be11c4e6008c3", + "devUtils": "0xc812af3f3fbc62f76ea4262576ec0f49db8b7f1c", "zrxVault": "0x38bbb9fb54a6b6d0376948bf3b2a7ed1e8aea6e8", "staking": "0x4af649ffde640ceb34b1afaba3e0bb8e9698cb01", "stakingProxy": "0x6acab4c9c4e3a0c78435fdb5ad1719c95460a668", "erc20BridgeProxy": "0xb344afed348de15eb4a9e180205a2b0739628339", "erc20BridgeSampler": "0x0000000000000000000000000000000000000000", + "chaiBridge": "0x0000000000000000000000000000000000000000", + "dydxBridge": "0x0000000000000000000000000000000000000000", + "godsUnchainedValidator": "0xd4690a51044db77d91d7aa8f7a3a5ad5da331af0", + "broker": "0x4022e3982f326455f0905de3dbc4449999baf2dc", + "chainlinkStopLimit": "0x67a094cf028221ffdd93fc658f963151d05e2a74", + "maximumGasPrice": "0x407b4128e9ecad8769b2332312a9f655cb9f5f3a", + "dexForwarderBridge": "0x3261ea1411a1a840aed708896f779e1b837c917e", "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e", "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff", "exchangeProxyTransformerDeployer": "0x1c9a27658dd303a31205a3b245e8993b92d4d502", @@ -46,14 +84,33 @@ } }, "4": { + "exchangeV2": "0xbff9493f92a3df4b0429b6d00743b3cfb4c85831", + "exchange": "0xf8becacec90bfc361c0a2c720839e08405a72f6d", + "erc20Proxy": "0x070efeb7e5ffa3d1a59d03a219539551ae60ba43", + "erc721Proxy": "0x7f10d80f2659aaae790ab03da12be11c4e6008c3", "zrxToken": "0x8080c7e4b81ecf23aa6f877cfbfd9b0c228c6ffa", "etherToken": "0xc778417e063141139fce010982780140aa0cd5ab", + "assetProxyOwner": "0x0000000000000000000000000000000000000000", "zeroExGovernor": "0x3f46b98061a3e1e1f41dff296ec19402c298f8a9", + "forwarder": "0xe30f6166fe1cd5f0048abeed3d20360feb4a1fd8", + "coordinatorRegistry": "0xc2e2f8faf4bf649123b6f94103646cb4a0331006", + "coordinator": "0xf1ec7d0ba42f15fb5c9e3adbe86431973e44764c", + "multiAssetProxy": "0xb344afed348de15eb4a9e180205a2b0739628339", + "staticCallProxy": "0x7b70a148e20b348c320208df84fdd642aab49fd0", + "erc1155Proxy": "0xaa460127562482faa5df42f2c39a025cd4a1cc0a", + "devUtils": "0x46b5bc959e8a754c0256fff73bf34a52ad5cdfa9", "zrxVault": "0x4af649ffde640ceb34b1afaba3e0bb8e9698cb01", "staking": "0x6acab4c9c4e3a0c78435fdb5ad1719c95460a668", "stakingProxy": "0x781ee6683595f823208be6540a279f940e6af196", "erc20BridgeProxy": "0xa2aa4befed748fba27a3be7dfd2c4b2c6db1f49b", "erc20BridgeSampler": "0x0000000000000000000000000000000000000000", + "chaiBridge": "0x0000000000000000000000000000000000000000", + "dydxBridge": "0x0000000000000000000000000000000000000000", + "godsUnchainedValidator": "0x0000000000000000000000000000000000000000", + "broker": "0x0dd2d6cabbd8ae7d2fe6840fa597a44b1a7e4747", + "chainlinkStopLimit": "0x407b4128e9ecad8769b2332312a9f655cb9f5f3a", + "maximumGasPrice": "0x47697b44bd89051e93b4d5857ba8e024800a74ac", + "dexForwarderBridge": "0x0000000000000000000000000000000000000000", "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e", "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff", "exchangeProxyTransformerDeployer": "0x1c9a27658dd303a31205a3b245e8993b92d4d502", @@ -69,14 +126,33 @@ } }, "5": { + "erc20Proxy": "0x0000000000000000000000000000000000000000", + "erc721Proxy": "0x0000000000000000000000000000000000000000", "zrxToken": "0x0000000000000000000000000000000000000000", "etherToken": "0xb4fbf271143f4fbf7b91a5ded31805e42b2208d6", + "exchangeV2": "0x0000000000000000000000000000000000000000", + "exchange": "0x0000000000000000000000000000000000000000", + "assetProxyOwner": "0x0000000000000000000000000000000000000000", "zeroExGovernor": "0x0000000000000000000000000000000000000000", + "forwarder": "0x0000000000000000000000000000000000000000", + "coordinatorRegistry": "0x0000000000000000000000000000000000000000", + "coordinator": "0x0000000000000000000000000000000000000000", + "multiAssetProxy": "0x0000000000000000000000000000000000000000", + "staticCallProxy": "0x0000000000000000000000000000000000000000", + "erc1155Proxy": "0x0000000000000000000000000000000000000000", + "devUtils": "0x0000000000000000000000000000000000000000", "zrxVault": "0x0000000000000000000000000000000000000000", "staking": "0x0000000000000000000000000000000000000000", "stakingProxy": "0x0000000000000000000000000000000000000000", "erc20BridgeProxy": "0x0000000000000000000000000000000000000000", "erc20BridgeSampler": "0x0000000000000000000000000000000000000000", + "chaiBridge": "0x0000000000000000000000000000000000000000", + "dydxBridge": "0x0000000000000000000000000000000000000000", + "godsUnchainedValidator": "0x0000000000000000000000000000000000000000", + "broker": "0x0000000000000000000000000000000000000000", + "chainlinkStopLimit": "0x0000000000000000000000000000000000000000", + "maximumGasPrice": "0x0000000000000000000000000000000000000000", + "dexForwarderBridge": "0x0000000000000000000000000000000000000000", "exchangeProxyGovernor": "0xf289f8a9d26f9a32ecc8602e92e634d71a91d490", "exchangeProxy": "0xf91bb752490473b8342a3e964e855b9f9a2a668e", "exchangeProxyTransformerDeployer": "0x7b4f0063cc0097c19c6b8cc74ecaf630621e2be6", @@ -92,14 +168,33 @@ } }, "42": { + "erc20Proxy": "0xaa460127562482faa5df42f2c39a025cd4a1cc0a", + "erc721Proxy": "0x7b70a148e20b348c320208df84fdd642aab49fd0", "zrxToken": "0x2002d3812f58e35f0ea1ffbf80a75a38c32175fa", "etherToken": "0xd0a1e359811322d97991e03f863a0c30c2cf029c", + "exchangeV2": "0x30589010550762d2f0d06f650d8e8b6ade6dbf4b", + "exchange": "0xf1ec7d0ba42f15fb5c9e3adbe86431973e44764c", + "assetProxyOwner": "0x0000000000000000000000000000000000000000", "zeroExGovernor": "0x6ff734d96104965c9c1b0108f83abc46e6e501df", + "forwarder": "0x0f64646a5154ae5e58b6dd87ede7b04f508d76f8", + "coordinatorRegistry": "0x070efeb7e5ffa3d1a59d03a219539551ae60ba43", + "coordinator": "0x7f10d80f2659aaae790ab03da12be11c4e6008c3", + "multiAssetProxy": "0x58a01e826e60731247e7de8b446ed4c8535a099c", + "staticCallProxy": "0xa2aa4befed748fba27a3be7dfd2c4b2c6db1f49b", + "erc1155Proxy": "0xb344afed348de15eb4a9e180205a2b0739628339", + "devUtils": "0xc67ae71928568a180b3aad1339dedcf3076876fe", "zrxVault": "0x781ee6683595f823208be6540a279f940e6af196", "staking": "0x73ea24041e03a012c51a45c307e0ba376af0238c", "stakingProxy": "0xe94cb304b3f515be7c95fedcfa249a84995fd748", "erc20BridgeProxy": "0x3577552c1fb7a44ad76beeb7ab53251668a21f8d", "erc20BridgeSampler": "0x298a99d3a2b891df04019425542897ac1a867d9d", + "chaiBridge": "0x0000000000000000000000000000000000000000", + "dydxBridge": "0xc213707de0454008758071c2edc1365621b8a5c5", + "godsUnchainedValidator": "0x0000000000000000000000000000000000000000", + "broker": "0xcdeb6d90ee7c96b4c713f7bb4f8604981f7ebe9d", + "chainlinkStopLimit": "0x0000000000000000000000000000000000000000", + "maximumGasPrice": "0x67a094cf028221ffdd93fc658f963151d05e2a74", + "dexForwarderBridge": "0x985d1a95c6a86a3bf85c4d425af984abceaf01de", "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e", "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff", "exchangeProxyTransformerDeployer": "0x1b62de2dbb5e7aa519e9c442721ecef75702807f", @@ -115,14 +210,33 @@ } }, "56": { + "erc20Proxy": "0x0000000000000000000000000000000000000000", + "erc721Proxy": "0x0000000000000000000000000000000000000000", "zrxToken": "0x0000000000000000000000000000000000000000", "etherToken": "0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c", + "exchangeV2": "0x0000000000000000000000000000000000000000", + "exchange": "0x0000000000000000000000000000000000000000", + "assetProxyOwner": "0x0000000000000000000000000000000000000000", "zeroExGovernor": "0x0000000000000000000000000000000000000000", + "forwarder": "0x0000000000000000000000000000000000000000", + "coordinatorRegistry": "0x0000000000000000000000000000000000000000", + "coordinator": "0x0000000000000000000000000000000000000000", + "multiAssetProxy": "0x0000000000000000000000000000000000000000", + "staticCallProxy": "0x0000000000000000000000000000000000000000", + "erc1155Proxy": "0x0000000000000000000000000000000000000000", + "devUtils": "0x0000000000000000000000000000000000000000", "zrxVault": "0x0000000000000000000000000000000000000000", "staking": "0x0000000000000000000000000000000000000000", "stakingProxy": "0x0000000000000000000000000000000000000000", "erc20BridgeProxy": "0x0000000000000000000000000000000000000000", "erc20BridgeSampler": "0x0000000000000000000000000000000000000000", + "chaiBridge": "0x0000000000000000000000000000000000000000", + "dydxBridge": "0x0000000000000000000000000000000000000000", + "godsUnchainedValidator": "0x0000000000000000000000000000000000000000", + "broker": "0x0000000000000000000000000000000000000000", + "chainlinkStopLimit": "0x0000000000000000000000000000000000000000", + "maximumGasPrice": "0x0000000000000000000000000000000000000000", + "dexForwarderBridge": "0x0000000000000000000000000000000000000000", "exchangeProxyGovernor": "0xccc9769c1a58766e79423a34b2cc5052d65c1983", "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff", "exchangeProxyTransformerDeployer": "0x8224aa8fe5c9f07d5a59c735386ff6cc6aaeb568", @@ -138,14 +252,33 @@ } }, "1337": { + "erc20Proxy": "0x1dc4c1cefef38a777b15aa20260a54e584b16c48", + "erc721Proxy": "0x0000000000000000000000000000000000000000", + "erc1155Proxy": "0x0000000000000000000000000000000000000000", "zrxToken": "0x871dd7c2b4b25e1aa18728e9d5f2af4c4e431f5c", "etherToken": "0x0b1ba0af832d7c05fd64161e0db78e85978e8082", + "exchange": "0x0000000000000000000000000000000000000000", + "assetProxyOwner": "0x0000000000000000000000000000000000000000", "erc20BridgeProxy": "0x0000000000000000000000000000000000000000", "zeroExGovernor": "0x0000000000000000000000000000000000000000", + "forwarder": "0x0000000000000000000000000000000000000000", + "coordinatorRegistry": "0x0000000000000000000000000000000000000000", + "coordinator": "0x0000000000000000000000000000000000000000", + "multiAssetProxy": "0x0000000000000000000000000000000000000000", + "staticCallProxy": "0x0000000000000000000000000000000000000000", + "devUtils": "0x0000000000000000000000000000000000000000", + "exchangeV2": "0x0000000000000000000000000000000000000000", "zrxVault": "0xf23276778860e420acfc18ebeebf7e829b06965c", "staking": "0x8a063452f7df2614db1bca3a85ef35da40cf0835", "stakingProxy": "0x59adefa01843c627ba5d6aa350292b4b7ccae67a", "erc20BridgeSampler": "0x0000000000000000000000000000000000000000", + "chaiBridge": "0x0000000000000000000000000000000000000000", + "dydxBridge": "0x0000000000000000000000000000000000000000", + "godsUnchainedValidator": "0x0000000000000000000000000000000000000000", + "broker": "0x0000000000000000000000000000000000000000", + "chainlinkStopLimit": "0x0000000000000000000000000000000000000000", + "maximumGasPrice": "0x0000000000000000000000000000000000000000", + "dexForwarderBridge": "0x0000000000000000000000000000000000000000", "exchangeProxyGovernor": "0x0000000000000000000000000000000000000000", "exchangeProxy": "0x5315e44798395d4a952530d131249fe00f554565", "exchangeProxyTransformerDeployer": "0x5409ed021d9299bf6814279a6a1411a7e866a631", @@ -161,14 +294,33 @@ } }, "137": { + "erc20Proxy": "0x0000000000000000000000000000000000000000", + "erc721Proxy": "0x0000000000000000000000000000000000000000", "zrxToken": "0x0000000000000000000000000000000000000000", "etherToken": "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270", + "exchangeV2": "0x0000000000000000000000000000000000000000", + "exchange": "0x0000000000000000000000000000000000000000", + "assetProxyOwner": "0x0000000000000000000000000000000000000000", "zeroExGovernor": "0x0000000000000000000000000000000000000000", + "forwarder": "0x0000000000000000000000000000000000000000", + "coordinatorRegistry": "0x0000000000000000000000000000000000000000", + "coordinator": "0x0000000000000000000000000000000000000000", + "multiAssetProxy": "0x0000000000000000000000000000000000000000", + "staticCallProxy": "0x0000000000000000000000000000000000000000", + "erc1155Proxy": "0x0000000000000000000000000000000000000000", + "devUtils": "0x0000000000000000000000000000000000000000", "zrxVault": "0x0000000000000000000000000000000000000000", "staking": "0x0000000000000000000000000000000000000000", "stakingProxy": "0x0000000000000000000000000000000000000000", "erc20BridgeProxy": "0x0000000000000000000000000000000000000000", "erc20BridgeSampler": "0x0000000000000000000000000000000000000000", + "chaiBridge": "0x0000000000000000000000000000000000000000", + "dydxBridge": "0x0000000000000000000000000000000000000000", + "godsUnchainedValidator": "0x0000000000000000000000000000000000000000", + "broker": "0x0000000000000000000000000000000000000000", + "chainlinkStopLimit": "0x0000000000000000000000000000000000000000", + "maximumGasPrice": "0x0000000000000000000000000000000000000000", + "dexForwarderBridge": "0x0000000000000000000000000000000000000000", "exchangeProxyGovernor": "0x4d3e56c56a55d23fc7aa9a9ffad61631cf7d1ae6", "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff", "exchangeProxyTransformerDeployer": "0xe6d9207df11c55bce2f7a189ae95e3222d5484d3", @@ -184,14 +336,33 @@ } }, "80001": { + "erc20Proxy": "0x0000000000000000000000000000000000000000", + "erc721Proxy": "0x0000000000000000000000000000000000000000", "zrxToken": "0x0000000000000000000000000000000000000000", "etherToken": "0x9c3c9283d3e44854697cd22d3faa240cfb032889", + "exchangeV2": "0x0000000000000000000000000000000000000000", + "exchange": "0x0000000000000000000000000000000000000000", + "assetProxyOwner": "0x0000000000000000000000000000000000000000", "zeroExGovernor": "0x0000000000000000000000000000000000000000", + "forwarder": "0x0000000000000000000000000000000000000000", + "coordinatorRegistry": "0x0000000000000000000000000000000000000000", + "coordinator": "0x0000000000000000000000000000000000000000", + "multiAssetProxy": "0x0000000000000000000000000000000000000000", + "staticCallProxy": "0x0000000000000000000000000000000000000000", + "erc1155Proxy": "0x0000000000000000000000000000000000000000", + "devUtils": "0x0000000000000000000000000000000000000000", "zrxVault": "0x0000000000000000000000000000000000000000", "staking": "0x0000000000000000000000000000000000000000", "stakingProxy": "0x0000000000000000000000000000000000000000", "erc20BridgeProxy": "0x0000000000000000000000000000000000000000", "erc20BridgeSampler": "0x0000000000000000000000000000000000000000", + "chaiBridge": "0x0000000000000000000000000000000000000000", + "dydxBridge": "0x0000000000000000000000000000000000000000", + "godsUnchainedValidator": "0x0000000000000000000000000000000000000000", + "broker": "0x0000000000000000000000000000000000000000", + "chainlinkStopLimit": "0x0000000000000000000000000000000000000000", + "maximumGasPrice": "0x0000000000000000000000000000000000000000", + "dexForwarderBridge": "0x0000000000000000000000000000000000000000", "exchangeProxyGovernor": "0x30186b2e187aeddabf019089f9375a8dc53138e4", "exchangeProxy": "0xf471d32cb40837bf24529fcf17418fc1a4807626", "exchangeProxyTransformerDeployer": "0x05481589f447a0767def2b0ed98a04ea5f5eba50", @@ -207,14 +378,33 @@ } }, "43114": { + "erc20Proxy": "0x0000000000000000000000000000000000000000", + "erc721Proxy": "0x0000000000000000000000000000000000000000", "zrxToken": "0x0000000000000000000000000000000000000000", "etherToken": "0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7", + "exchangeV2": "0x0000000000000000000000000000000000000000", + "exchange": "0x0000000000000000000000000000000000000000", + "assetProxyOwner": "0x0000000000000000000000000000000000000000", "zeroExGovernor": "0x0000000000000000000000000000000000000000", + "forwarder": "0x0000000000000000000000000000000000000000", + "coordinatorRegistry": "0x0000000000000000000000000000000000000000", + "coordinator": "0x0000000000000000000000000000000000000000", + "multiAssetProxy": "0x0000000000000000000000000000000000000000", + "staticCallProxy": "0x0000000000000000000000000000000000000000", + "erc1155Proxy": "0x0000000000000000000000000000000000000000", + "devUtils": "0x0000000000000000000000000000000000000000", "zrxVault": "0x0000000000000000000000000000000000000000", "staking": "0x0000000000000000000000000000000000000000", "stakingProxy": "0x0000000000000000000000000000000000000000", "erc20BridgeProxy": "0x0000000000000000000000000000000000000000", "erc20BridgeSampler": "0x0000000000000000000000000000000000000000", + "chaiBridge": "0x0000000000000000000000000000000000000000", + "dydxBridge": "0x0000000000000000000000000000000000000000", + "godsUnchainedValidator": "0x0000000000000000000000000000000000000000", + "broker": "0x0000000000000000000000000000000000000000", + "chainlinkStopLimit": "0x0000000000000000000000000000000000000000", + "maximumGasPrice": "0x0000000000000000000000000000000000000000", + "dexForwarderBridge": "0x0000000000000000000000000000000000000000", "exchangeProxyGovernor": "0xca7bab1b2d1ec7d81710b7f9e2ab4e6788930588", "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff", "exchangeProxyTransformerDeployer": "0xa60b57833dce6260f4f2411c811755dd980bc0a7", @@ -230,14 +420,33 @@ } }, "250": { + "erc20Proxy": "0x0000000000000000000000000000000000000000", + "erc721Proxy": "0x0000000000000000000000000000000000000000", "zrxToken": "0x0000000000000000000000000000000000000000", "etherToken": "0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83", + "exchangeV2": "0x0000000000000000000000000000000000000000", + "exchange": "0x0000000000000000000000000000000000000000", + "assetProxyOwner": "0x0000000000000000000000000000000000000000", "zeroExGovernor": "0x0000000000000000000000000000000000000000", + "forwarder": "0x0000000000000000000000000000000000000000", + "coordinatorRegistry": "0x0000000000000000000000000000000000000000", + "coordinator": "0x0000000000000000000000000000000000000000", + "multiAssetProxy": "0x0000000000000000000000000000000000000000", + "staticCallProxy": "0x0000000000000000000000000000000000000000", + "erc1155Proxy": "0x0000000000000000000000000000000000000000", + "devUtils": "0x0000000000000000000000000000000000000000", "zrxVault": "0x0000000000000000000000000000000000000000", "staking": "0x0000000000000000000000000000000000000000", "stakingProxy": "0x0000000000000000000000000000000000000000", "erc20BridgeProxy": "0x0000000000000000000000000000000000000000", "erc20BridgeSampler": "0x0000000000000000000000000000000000000000", + "chaiBridge": "0x0000000000000000000000000000000000000000", + "dydxBridge": "0x0000000000000000000000000000000000000000", + "godsUnchainedValidator": "0x0000000000000000000000000000000000000000", + "broker": "0x0000000000000000000000000000000000000000", + "chainlinkStopLimit": "0x0000000000000000000000000000000000000000", + "maximumGasPrice": "0x0000000000000000000000000000000000000000", + "dexForwarderBridge": "0x0000000000000000000000000000000000000000", "exchangeProxyGovernor": "0xf760c5b88d970d6f97e64e264dac5a3767dafd74", "exchangeProxy": "0xdef189deaef76e379df891899eb5a00a94cbc250", "exchangeProxyTransformerDeployer": "0x47f01db18a38261e4cb153bae6db7d3743acb33c", @@ -253,14 +462,33 @@ } }, "42220": { + "erc20Proxy": "0x0000000000000000000000000000000000000000", + "erc721Proxy": "0x0000000000000000000000000000000000000000", "zrxToken": "0x0000000000000000000000000000000000000000", "etherToken": "0x471ece3750da237f93b8e339c536989b8978a438", + "exchangeV2": "0x0000000000000000000000000000000000000000", + "exchange": "0x0000000000000000000000000000000000000000", + "assetProxyOwner": "0x0000000000000000000000000000000000000000", "zeroExGovernor": "0x0000000000000000000000000000000000000000", + "forwarder": "0x0000000000000000000000000000000000000000", + "coordinatorRegistry": "0x0000000000000000000000000000000000000000", + "coordinator": "0x0000000000000000000000000000000000000000", + "multiAssetProxy": "0x0000000000000000000000000000000000000000", + "staticCallProxy": "0x0000000000000000000000000000000000000000", + "erc1155Proxy": "0x0000000000000000000000000000000000000000", + "devUtils": "0x0000000000000000000000000000000000000000", "zrxVault": "0x0000000000000000000000000000000000000000", "staking": "0x0000000000000000000000000000000000000000", "stakingProxy": "0x0000000000000000000000000000000000000000", "erc20BridgeProxy": "0x0000000000000000000000000000000000000000", "erc20BridgeSampler": "0x0000000000000000000000000000000000000000", + "chaiBridge": "0x0000000000000000000000000000000000000000", + "dydxBridge": "0x0000000000000000000000000000000000000000", + "godsUnchainedValidator": "0x0000000000000000000000000000000000000000", + "broker": "0x0000000000000000000000000000000000000000", + "chainlinkStopLimit": "0x0000000000000000000000000000000000000000", + "maximumGasPrice": "0x0000000000000000000000000000000000000000", + "dexForwarderBridge": "0x0000000000000000000000000000000000000000", "exchangeProxyGovernor": "0x92115010fd9b170d4918b102efc86b1b7bebdc7f", "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff", "exchangeProxyTransformerDeployer": "0x1fe80d5ad9464dba2d60b88e449305f184823f8a", @@ -276,14 +504,33 @@ } }, "10": { + "erc20Proxy": "0x0000000000000000000000000000000000000000", + "erc721Proxy": "0x0000000000000000000000000000000000000000", "zrxToken": "0x0000000000000000000000000000000000000000", "etherToken": "0x4200000000000000000000000000000000000006", + "exchangeV2": "0x0000000000000000000000000000000000000000", + "exchange": "0x0000000000000000000000000000000000000000", + "assetProxyOwner": "0x0000000000000000000000000000000000000000", "zeroExGovernor": "0x0000000000000000000000000000000000000000", + "forwarder": "0x0000000000000000000000000000000000000000", + "coordinatorRegistry": "0x0000000000000000000000000000000000000000", + "coordinator": "0x0000000000000000000000000000000000000000", + "multiAssetProxy": "0x0000000000000000000000000000000000000000", + "staticCallProxy": "0x0000000000000000000000000000000000000000", + "erc1155Proxy": "0x0000000000000000000000000000000000000000", + "devUtils": "0x0000000000000000000000000000000000000000", "zrxVault": "0x0000000000000000000000000000000000000000", "staking": "0x0000000000000000000000000000000000000000", "stakingProxy": "0x0000000000000000000000000000000000000000", "erc20BridgeProxy": "0x0000000000000000000000000000000000000000", "erc20BridgeSampler": "0x0000000000000000000000000000000000000000", + "chaiBridge": "0x0000000000000000000000000000000000000000", + "dydxBridge": "0x0000000000000000000000000000000000000000", + "godsUnchainedValidator": "0x0000000000000000000000000000000000000000", + "broker": "0x0000000000000000000000000000000000000000", + "chainlinkStopLimit": "0x0000000000000000000000000000000000000000", + "maximumGasPrice": "0x0000000000000000000000000000000000000000", + "dexForwarderBridge": "0x0000000000000000000000000000000000000000", "exchangeProxyGovernor": "0x6d506b2847df0c6f04d2628da1adaf4d8fb2e81b", "exchangeProxy": "0xdef1abe32c034e558cdd535791643c58a13acc10", "exchangeProxyTransformerDeployer": "0x3a539ed6bd42de8fbaf3899fb490c792e153d647", diff --git a/packages/contract-addresses/src/index.ts b/packages/contract-addresses/src/index.ts index 0152aedc63..9ddf09161d 100644 --- a/packages/contract-addresses/src/index.ts +++ b/packages/contract-addresses/src/index.ts @@ -1,14 +1,33 @@ import addresses from '../addresses.json'; export interface ContractAddresses { + erc20Proxy: string; + erc721Proxy: string; zrxToken: string; etherToken: string; + exchangeV2: string; + exchange: string; + assetProxyOwner: string; zeroExGovernor: string; + forwarder: string; + coordinatorRegistry: string; + coordinator: string; + multiAssetProxy: string; + staticCallProxy: string; + erc1155Proxy: string; + devUtils: string; zrxVault: string; staking: string; stakingProxy: string; erc20BridgeProxy: string; erc20BridgeSampler: string; + chaiBridge: string; + dydxBridge: string; + godsUnchainedValidator: string; + broker: string; + chainlinkStopLimit: string; + maximumGasPrice: string; + dexForwarderBridge: string; exchangeProxyGovernor: string; exchangeProxy: string; exchangeProxyTransformerDeployer: string; diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json index 1ebc333e64..7c2be37887 100644 --- a/packages/contract-wrappers/CHANGELOG.json +++ b/packages/contract-wrappers/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "13.21.1", + "changes": [ + { + "note": "Revert: Remove deprecated contracts" + } + ] + }, { "version": "13.21.0", "changes": [ diff --git a/packages/contract-wrappers/src/contract_wrappers.ts b/packages/contract-wrappers/src/contract_wrappers.ts index f4ad9eb6a9..52665c075c 100644 --- a/packages/contract-wrappers/src/contract_wrappers.ts +++ b/packages/contract-wrappers/src/contract_wrappers.ts @@ -5,6 +5,12 @@ import { Web3Wrapper } from '@0x/web3-wrapper'; import { SupportedProvider } from 'ethereum-types'; import { ContractWrappersConfigSchema } from './contract_wrappers_config_schema'; +import { CoordinatorContract } from './generated-wrappers/coordinator'; +import { DevUtilsContract } from './generated-wrappers/dev_utils'; +import { ERC20TokenContract } from './generated-wrappers/erc20_token'; +import { ERC721TokenContract } from './generated-wrappers/erc721_token'; +import { ExchangeContract } from './generated-wrappers/exchange'; +import { ForwarderContract } from './generated-wrappers/forwarder'; import { IZeroExContract } from './generated-wrappers/i_zero_ex'; import { StakingContract } from './generated-wrappers/staking'; import { WETH9Contract } from './generated-wrappers/weth9'; @@ -19,11 +25,27 @@ export class ContractWrappers { * An index of the default contract addresses for this chain. */ public contractAddresses: ContractAddresses; + /** + * An instance of the ExchangeContract class containing methods for interacting with the 0x Exchange smart contract. + */ + public exchange: ExchangeContract; /** * An instance of the WETH9Contract class containing methods for interacting with the * WETH9 smart contract. */ public weth9: WETH9Contract; + /** + * An instance of the ForwarderContract class containing methods for interacting with any Forwarder smart contract. + */ + public forwarder: ForwarderContract; + /** + * An instance of the DevUtilsContract class containing methods for interacting with the DevUtils smart contract. + */ + public devUtils: DevUtilsContract; + /** + * An instance of the CoordinatorContract class containing methods for interacting with the Coordinator extension contract. + */ + public coordinator: CoordinatorContract; /** * An instance of the StakingContract class containing methods for interacting with the Staking contracts. */ @@ -47,7 +69,17 @@ export class ContractWrappers { gasPrice: config.gasPrice, }; this._web3Wrapper = new Web3Wrapper(supportedProvider, txDefaults); - const contractsArray = [StakingContract, WETH9Contract, IZeroExContract]; + const contractsArray = [ + CoordinatorContract, + DevUtilsContract, + ERC20TokenContract, + ERC721TokenContract, + ExchangeContract, + ForwarderContract, + StakingContract, + WETH9Contract, + IZeroExContract, + ]; contractsArray.forEach(contract => { this._web3Wrapper.abiDecoder.addABI(contract.ABI(), contract.contractName); }); @@ -56,7 +88,11 @@ export class ContractWrappers { ? _getDefaultContractAddresses(config.chainId) : config.contractAddresses; this.weth9 = new WETH9Contract(contractAddresses.etherToken, this.getProvider()); + this.exchange = new ExchangeContract(contractAddresses.exchange, this.getProvider()); + this.forwarder = new ForwarderContract(contractAddresses.forwarder, this.getProvider()); this.staking = new StakingContract(contractAddresses.stakingProxy, this.getProvider()); + this.devUtils = new DevUtilsContract(contractAddresses.devUtils, this.getProvider()); + this.coordinator = new CoordinatorContract(contractAddresses.coordinator, this.getProvider()); this.exchangeProxy = new IZeroExContract(contractAddresses.exchangeProxy, this.getProvider()); this.contractAddresses = contractAddresses; } @@ -64,6 +100,7 @@ export class ContractWrappers { * Unsubscribes from all subscriptions for all contracts. */ public unsubscribeAll(): void { + this.exchange.unsubscribeAll(); this.weth9.unsubscribeAll(); } /** diff --git a/packages/contract-wrappers/src/contract_wrappers_config_schema.ts b/packages/contract-wrappers/src/contract_wrappers_config_schema.ts index 50854004df..95e992144c 100644 --- a/packages/contract-wrappers/src/contract_wrappers_config_schema.ts +++ b/packages/contract-wrappers/src/contract_wrappers_config_schema.ts @@ -8,8 +8,13 @@ export const ContractWrappersConfigSchema = { contractAddresses: { type: 'object', properties: { + erc20Proxy: { $ref: '/addressSchema' }, + erc721Proxy: { $ref: '/addressSchema' }, zrxToken: { $ref: '/addressSchema' }, etherToken: { $ref: '/addressSchema' }, + exchange: { $ref: '/addressSchema' }, + assetProxyOwner: { $ref: '/addressSchema' }, + forwarder: { $ref: '/addressSchema' }, staking: { $ref: '/addressSchema' }, }, },