Redeploy Forwarder and all bridges

contracts/asset-proxy/src/index.ts

@@ -13,6 +13,8 @@ export {
     StaticCallProxyContract,
     TestStaticCallTargetContract,
     UniswapBridgeContract,
+    KyberBridgeContract,
+    ChaiBridgeContract,
 } from './wrappers';
 
 export { ERC20Wrapper } from './erc20_wrapper';

contracts/utils/contracts/src/DeploymentConstants.sol

@@ -18,10 +18,6 @@
 
 pragma solidity ^0.5.9;
 
-import "./interfaces/IOwnable.sol";
-import "./LibOwnableRichErrors.sol";
-import "./LibRichErrors.sol";
-
 
 contract DeploymentConstants {
     /// @dev Mainnet address of the WETH contract.

packages/contract-addresses/addresses.json

@@ -4,7 +4,7 @@
         "exchange": "0x61935cbdd02287b511119ddb11aeb42f1593b7ef",
         "erc20Proxy": "0x95e6f48254609a6ee006f7d493c8e5fb97094cef",
         "erc721Proxy": "0xefc70a1b18c432bdc64b596838b4d138f6bc6cad",
-        "forwarder": "0xa3ac9844514b96bb502627ca9dceb57c4be289e3",
+        "forwarder": "0xbf1e3a8405906904b3692446e0fb4e309628a9fe",
         "orderValidator": "0x0000000000000000000000000000000000000000",
         "zrxToken": "0xe41d2489571d322189246dafa5ebde1f4699f498",
         "etherToken": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
@@ -22,9 +22,10 @@
         "devUtils": "0xc7612135356ba8f75dbf517b55d88a91977492dc",
         "erc20BridgeProxy": "0x8ed95d1746bf1e4dab58d8ed4724f1ef95b20db0",
         "uniswapBridge": "0xb0dc61047847732a013ce27341228228a38655a0",
-        "eth2DaiBridge": "0x0ac2d6f5f5afc669d3ca38f830dad2b4f238ad3f",
         "erc20BridgeSampler": "0x1b402fdb5ee87f989c11e3963557e89cc313b6c0",
         "kyberBridge": "0x7253a80c1d3a3175283bad9ed04b2cecad0fe0d3",
+        "eth2DaiBridge": "0x1c36b06fc0d9354a96cf155b861b141ed10c3312",
+        "chaiBridge": "0x6a3b7c553d47c08651641ef00cb3befae97bf415",
         "dydxBridge": "0x96ddba19b69d6ea2549f6a12d005595167414744"
     },
     "3": {
@@ -53,6 +54,7 @@
         "eth2DaiBridge": "0x0000000000000000000000000000000000000000",
         "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
         "kyberBridge": "0x0000000000000000000000000000000000000000",
+        "chaiBridge": "0x0000000000000000000000000000000000000000",
         "dydxBridge": "0x0000000000000000000000000000000000000000"
     },
     "4": {
@@ -81,6 +83,7 @@
         "eth2DaiBridge": "0x0000000000000000000000000000000000000000",
         "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
         "kyberBridge": "0x0000000000000000000000000000000000000000",
+        "chaiBridge": "0x0000000000000000000000000000000000000000",
         "dydxBridge": "0x0000000000000000000000000000000000000000"
     },
     "42": {
@@ -109,6 +112,7 @@
         "eth2DaiBridge": "0x0000000000000000000000000000000000000000",
         "erc20BridgeSampler": "0x551f0e213dcb71f676558d8b0ab559d1cdd103f2",
         "kyberBridge": "0x0000000000000000000000000000000000000000",
+        "chaiBridge": "0x0000000000000000000000000000000000000000",
         "dydxBridge": "0x0000000000000000000000000000000000000000"
     },
     "1337": {
@@ -137,6 +141,7 @@
         "eth2DaiBridge": "0x0000000000000000000000000000000000000000",
         "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
         "kyberBridge": "0x0000000000000000000000000000000000000000",
+        "chaiBridge": "0x0000000000000000000000000000000000000000",
         "dydxBridge": "0x0000000000000000000000000000000000000000"
     }
 }

packages/contract-addresses/src/index.ts

@@ -26,6 +26,7 @@ export interface ContractAddresses {
     uniswapBridge: string;
     eth2DaiBridge: string;
     kyberBridge: string;
+    chaiBridge: string;
     dydxBridge: string;
 }
 

packages/migrations/src/migration.ts

@@ -271,6 +271,7 @@ export async function runMigrationsAsync(
         eth2DaiBridge: constants.NULL_ADDRESS,
         kyberBridge: constants.NULL_ADDRESS,
         erc20BridgeSampler: constants.NULL_ADDRESS,
+        chaiBridge: constants.NULL_ADDRESS,
         dydxBridge: constants.NULL_ADDRESS,
     };
     return contractAddresses;

packages/migrations/src/testnet_migrations.ts

@@ -1,8 +1,11 @@
 import { getContractAddressesForChainOrThrow } from '@0x/contract-addresses';
 import {
     artifacts as assetProxyArtifacts,
+    ChaiBridgeContract,
+    DydxBridgeContract,
     ERC20BridgeProxyContract,
     Eth2DaiBridgeContract,
+    KyberBridgeContract,
     UniswapBridgeContract,
 } from '@0x/contracts-asset-proxy';
 import { artifacts as coordinatorArtifacts, CoordinatorContract } from '@0x/contracts-coordinator';
@@ -103,6 +106,27 @@ export async function runMigrationsAsync(supportedProvider: SupportedProvider, t
         assetProxyArtifacts,
     );
 
+    await KyberBridgeContract.deployFrom0xArtifactAsync(
+        assetProxyArtifacts.KyberBridge,
+        provider,
+        txDefaults,
+        assetProxyArtifacts,
+    );
+
+    await ChaiBridgeContract.deployFrom0xArtifactAsync(
+        assetProxyArtifacts.ChaiBridge,
+        provider,
+        txDefaults,
+        assetProxyArtifacts,
+    );
+
+    await DydxBridgeContract.deployFrom0xArtifactAsync(
+        assetProxyArtifacts.DydxBridge,
+        provider,
+        txDefaults,
+        assetProxyArtifacts,
+    );
+
     const authorizableInterface = new IAuthorizableContract(constants.NULL_ADDRESS, provider, txDefaults);
     const ownableInterface = new IOwnableContract(constants.NULL_ADDRESS, provider, txDefaults);