Rename old exchange address to exchangeV2

packages/contract-addresses/src/index.ts

@@ -5,8 +5,8 @@ export interface ContractAddresses {
     erc721Proxy: string;
     zrxToken: string;
     etherToken: string;
+    exchangeV2: string;
     exchange: string;
-    exchange_v3: string;
     assetProxyOwner: string;
     forwarder: string;
     orderValidator: string;
@@ -35,8 +35,8 @@ const NULL_ADDRESS = '0x0000000000000000000000000000000000000000';
 
 const networkToAddresses: { [networkId: number]: ContractAddresses } = {
     1: {
-        exchange: '0x080bf510fcbf18b91105470639e9561022937712',
-        exchange_v3: '',
+        exchangeV2: '0x080bf510fcbf18b91105470639e9561022937712',
+        exchange: NULL_ADDRESS,
         erc20Proxy: '0x95e6f48254609a6ee006f7d493c8e5fb97094cef',
         erc721Proxy: '0xefc70a1b18c432bdc64b596838b4d138f6bc6cad',
         forwarder: '0x76481caa104b5f6bccb540dae4cefaf1c398ebea',
@@ -61,8 +61,8 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
         erc721Proxy: '0xe654aac058bfbf9f83fcaee7793311dd82f6ddb4',
         zrxToken: '0xff67881f8d12f372d91baae9752eb3631ff0ed00',
         etherToken: '0xc778417e063141139fce010982780140aa0cd5ab',
-        exchange: '0xbff9493f92a3df4b0429b6d00743b3cfb4c85831',
-        exchange_v3: '0x725bc2f8c85ed0289d3da79cde3125d33fc1d7e6',
+        exchangeV2: '0xbff9493f92a3df4b0429b6d00743b3cfb4c85831',
+        exchange: '0x725bc2f8c85ed0289d3da79cde3125d33fc1d7e6',
         assetProxyOwner: '0xdcf20f7b447d51f2b3e5499b7f6cbbf7295a5d26',
         forwarder: '0x1ebdc9758e85c1c6a85af06cc96cf89000a31913',
         orderValidator: '0x6eb6237350f3c110c96223e6ff9db55532525d2b',
@@ -79,8 +79,8 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
         stakingProxy: '0x5d751aa855a1aee5fe44cf5350ed25b5727b66ae',
     },
     4: {
-        exchange: '0xbff9493f92a3df4b0429b6d00743b3cfb4c85831',
-        exchange_v3: '0x8e1dfaf747b804d041adaed79d68dcef85b8de85',
+        exchangeV2: '0xbff9493f92a3df4b0429b6d00743b3cfb4c85831',
+        exchange: '0x8e1dfaf747b804d041adaed79d68dcef85b8de85',
         erc20Proxy: '0x2f5ae4f6106e89b4147651688a92256885c5f410',
         erc721Proxy: '0x7656d773e11ff7383a14dcf09a9c50990481cd10',
         zrxToken: '0x8080c7e4b81ecf23aa6f877cfbfd9b0c228c6ffa',
@@ -105,8 +105,8 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
         erc721Proxy: '0x2a9127c745688a165106c11cd4d647d2220af821',
         zrxToken: '0x2002d3812f58e35f0ea1ffbf80a75a38c32175fa',
         etherToken: '0xd0a1e359811322d97991e03f863a0c30c2cf029c',
-        exchange: '0x30589010550762d2f0d06f650d8e8b6ade6dbf4b',
-        exchange_v3: '0x617602cd3f734cf1e028c96b3f54c0489bed8022',
+        exchangeV2: '0x30589010550762d2f0d06f650d8e8b6ade6dbf4b',
+        exchange: '0x617602cd3f734cf1e028c96b3f54c0489bed8022',
         assetProxyOwner: '0x3654e5363cd75c8974c76208137df9691e820e97',
         forwarder: '0x1ebdc9758e85c1c6a85af06cc96cf89000a31913',
         orderValidator: '0xbcd49bf9b75cab056610fab3c788e8ce1b209f30',
@@ -129,8 +129,8 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
         erc1155Proxy: '0x6a4a62e5a7ed13c361b176a5f62c2ee620ac0df8',
         zrxToken: '0x871dd7c2b4b25e1aa18728e9d5f2af4c4e431f5c',
         etherToken: '0x0b1ba0af832d7c05fd64161e0db78e85978e8082',
-        exchange: '0x48bacb9266a570d521063ef5dd96e61686dbe788',
-        exchange_v3: '',
+        exchangeV2: '0x48bacb9266a570d521063ef5dd96e61686dbe788',
+        exchange: NULL_ADDRESS,
         assetProxyOwner: '0x8d42e38980ce74736c21c059b2240df09958d3c8',
         forwarder: '0xaa86dda78e9434aca114b6676fc742a18d15a1cc',
         orderValidator: '0x4d3d5c850dd5bd9d6f4adda3dd039a3c8054ca29',

packages/migrations/src/migration.ts

@@ -284,7 +284,7 @@ export async function runMigrationsAsync(
         multiAssetProxy: multiAssetProxy.address,
         staticCallProxy: staticCallProxy.address,
         devUtils: devUtils.address,
-        exchange_v3: constants.NULL_ADDRESS,
+        exchangeV2: constants.NULL_ADDRESS,
         zrxVault: constants.NULL_ADDRESS,
         readOnlyProxy: constants.NULL_ADDRESS,
         staking: constants.NULL_ADDRESS,

packages/migrations/src/testnet_migrations.ts

@@ -184,7 +184,7 @@ export async function runMigrationsAsync(supportedProvider: SupportedProvider, t
     const oldAssetProxyOwner = new AssetProxyOwnerContract(deployedAddresses.assetProxyOwner, provider, txDefaults);
     await submitAndExecuteTransactionAsync(
         oldAssetProxyOwner,
-        deployedAddresses.exchange, // Exchange 2.1 address
+        deployedAddresses.exchangeV2, // Exchange 2.1 address
         ownableInterface.transferOwnership.getABIEncodedTransactionData(assetProxyOwner.address),
     );
     await submitAndExecuteTransactionAsync(