Group similar setup transactions

1 files changed, 9 insertions, 6 deletions

diff --git a/packages/migrations/src/migration.ts b/packages/migrations/src/migration.ts
index 8e6ae7726..e0f245017 100644
--- a/packages/migrations/src/migration.ts
+++ b/packages/migrations/src/migration.ts
@@ -83,20 +83,25 @@ export async function runMigrationsAsync(provider: Provider, txDefaults: Partial
         txDefaults,
     );
 
-    // Note: Perform all setup after contract deployments to have consistent addresses
-    // available in the snapshots
     await web3Wrapper.awaitTransactionSuccessAsync(
         await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, {
             from: owner,
         }),
     );
     await web3Wrapper.awaitTransactionSuccessAsync(
-        await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(multiAssetProxy.address, {
+        await erc721Proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, {
             from: owner,
         }),
     );
     await web3Wrapper.awaitTransactionSuccessAsync(
-        await erc721Proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, {
+        await multiAssetProxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, {
+            from: owner,
+        }),
+    );
+
+    // MultiAssetProxy
+    await web3Wrapper.awaitTransactionSuccessAsync(
+        await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(multiAssetProxy.address, {
             from: owner,
         }),
     );
@@ -105,8 +110,6 @@ export async function runMigrationsAsync(provider: Provider, txDefaults: Partial
             from: owner,
         }),
     );
-
-    // Register Asset Proxies to the MultiAssetProxy
     await web3Wrapper.awaitTransactionSuccessAsync(
         await multiAssetProxy.registerAssetProxy.sendTransactionAsync(erc20Proxy.address),
     );