From a509af2875751f66fe39cdaabccb2492fc60280d Mon Sep 17 00:00:00 2001 From: Lawrence Forman Date: Fri, 27 Mar 2020 16:34:46 -0400 Subject: [PATCH] `@0x/contract-addresses`: Add `dexForwarderBridge` address. `@0x/migrations`: Add `dexForwarderBridge` address field. --- .../asset-proxy/test/dex_forwarder_bridge.ts | 21 +++++++++++-------- packages/contract-addresses/CHANGELOG.json | 4 ++++ packages/contract-addresses/addresses.json | 15 ++++++++----- packages/contract-addresses/src/index.ts | 1 + packages/migrations/CHANGELOG.json | 9 ++++++++ packages/migrations/src/migration.ts | 1 + 6 files changed, 37 insertions(+), 14 deletions(-) diff --git a/contracts/asset-proxy/test/dex_forwarder_bridge.ts b/contracts/asset-proxy/test/dex_forwarder_bridge.ts index f8ad071963..e5032f558a 100644 --- a/contracts/asset-proxy/test/dex_forwarder_bridge.ts +++ b/contracts/asset-proxy/test/dex_forwarder_bridge.ts @@ -324,15 +324,18 @@ blockchainTests.resets('DexForwarderBridge unit tests', env => { describe('executeBridgeCall()', () => { it('cannot be called externally', async () => { - return expect(testContract.executeBridgeCall( - randomAddress(), - randomAddress(), - randomAddress(), - randomAddress(), - new BigNumber(1), - new BigNumber(1), - constants.NULL_BYTES, - ).callAsync(), + return expect( + testContract + .executeBridgeCall( + randomAddress(), + randomAddress(), + randomAddress(), + randomAddress(), + new BigNumber(1), + new BigNumber(1), + constants.NULL_BYTES, + ) + .callAsync(), ).to.revertWith('DexForwarderBridge/ONLY_SELF'); }); }); diff --git a/packages/contract-addresses/CHANGELOG.json b/packages/contract-addresses/CHANGELOG.json index d53f2fd769..ccc04fb98b 100644 --- a/packages/contract-addresses/CHANGELOG.json +++ b/packages/contract-addresses/CHANGELOG.json @@ -21,6 +21,10 @@ { "note": "Redeploy `CurveBridge` with GST support", "pr": 2530 + }, + { + "note": "Add `dexForwarderBridge` addresses", + "pr": 2525 } ] }, diff --git a/packages/contract-addresses/addresses.json b/packages/contract-addresses/addresses.json index 6c4c4e7e62..d1a9c6edbc 100644 --- a/packages/contract-addresses/addresses.json +++ b/packages/contract-addresses/addresses.json @@ -29,7 +29,8 @@ "broker": "0xd4690a51044db77d91d7aa8f7a3a5ad5da331af0", "chainlinkStopLimit": "0xeb27220f95f364e1d9531992c48613f231839f53", "curveBridge": "0x1cf6ccc7e15d0d99a9498f37e16ba65b5c54bdd0", - "maximumGasPrice": "0xe2bfd35306495d11e3c9db0d8de390cda24563cf" + "maximumGasPrice": "0xe2bfd35306495d11e3c9db0d8de390cda24563cf", + "dexForwarderBridge": "0xa96844087062acf8556ca06a27702c6d19f87e57" }, "3": { "erc20Proxy": "0xb1408f4c245a23c31b98d2c626777d4c0d766caa", @@ -61,7 +62,8 @@ "broker": "0x4aa817c6f383c8e8ae77301d18ce48efb16fd2be", "chainlinkStopLimit": "0x67a094cf028221ffdd93fc658f963151d05e2a74", "curveBridge": "0x0000000000000000000000000000000000000000", - "maximumGasPrice": "0x407b4128e9ecad8769b2332312a9f655cb9f5f3a" + "maximumGasPrice": "0x407b4128e9ecad8769b2332312a9f655cb9f5f3a", + "dexForwarderBridge": "0x3be8e59038d8c4e8d8776ca40ef2f024bad95ad1" }, "4": { "exchangeV2": "0xbff9493f92a3df4b0429b6d00743b3cfb4c85831", @@ -93,7 +95,8 @@ "broker": "0x0000000000000000000000000000000000000000", "chainlinkStopLimit": "0x407b4128e9ecad8769b2332312a9f655cb9f5f3a", "curveBridge": "0x0000000000000000000000000000000000000000", - "maximumGasPrice": "0x47697b44bd89051e93b4d5857ba8e024800a74ac" + "maximumGasPrice": "0x47697b44bd89051e93b4d5857ba8e024800a74ac", + "dexForwarderBridge": "0x0000000000000000000000000000000000000000" }, "42": { "erc20Proxy": "0xf1ec01d6236d3cd881a0bf0130ea25fe4234003e", @@ -125,7 +128,8 @@ "broker": "0x0000000000000000000000000000000000000000", "chainlinkStopLimit": "0x0000000000000000000000000000000000000000", "curveBridge": "0x90c62c91a9f655f4f739e6cee85c84f9ccf47323", - "maximumGasPrice": "0x67a094cf028221ffdd93fc658f963151d05e2a74" + "maximumGasPrice": "0x67a094cf028221ffdd93fc658f963151d05e2a74", + "dexForwarderBridge": "0x6cce442a48ab07635462a40594054f34f44195ff" }, "1337": { "erc20Proxy": "0x1dc4c1cefef38a777b15aa20260a54e584b16c48", @@ -157,6 +161,7 @@ "broker": "0x0000000000000000000000000000000000000000", "chainlinkStopLimit": "0x0000000000000000000000000000000000000000", "curveBridge": "0x0000000000000000000000000000000000000000", - "maximumGasPrice": "0x0000000000000000000000000000000000000000" + "maximumGasPrice": "0x0000000000000000000000000000000000000000", + "dexForwarderBridge": "0x0000000000000000000000000000000000000000" } } diff --git a/packages/contract-addresses/src/index.ts b/packages/contract-addresses/src/index.ts index a9d519b586..e6a1289bd3 100644 --- a/packages/contract-addresses/src/index.ts +++ b/packages/contract-addresses/src/index.ts @@ -31,6 +31,7 @@ export interface ContractAddresses { broker: string; chainlinkStopLimit: string; maximumGasPrice: string; + dexForwarderBridge: string; } export enum ChainId { diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json index 18089ac296..b2e44cd245 100644 --- a/packages/migrations/CHANGELOG.json +++ b/packages/migrations/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "6.3.0", + "changes": [ + { + "note": "Add `dexForwarderBridge` to migration output", + "pr": 2525 + } + ] + }, { "timestamp": 1583220306, "version": "6.2.4", diff --git a/packages/migrations/src/migration.ts b/packages/migrations/src/migration.ts index 42d4f4a6e7..ecd27803da 100644 --- a/packages/migrations/src/migration.ts +++ b/packages/migrations/src/migration.ts @@ -308,6 +308,7 @@ export async function runMigrationsAsync( broker: constants.NULL_ADDRESS, chainlinkStopLimit: constants.NULL_ADDRESS, maximumGasPrice: constants.NULL_ADDRESS, + dexForwarderBridge: constants.NULL_ADDRESS, }; return contractAddresses; }