From 9df7f80fbb5b68c57fecbfeb64be4cdcd31b4976 Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Mon, 11 Nov 2019 16:42:32 -0800
Subject: [PATCH] Move extension deployments after contract configurations

---
 packages/migrations/src/testnet_migrations.ts | 55 ++++++++++---------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/packages/migrations/src/testnet_migrations.ts b/packages/migrations/src/testnet_migrations.ts
index bc5f73a0eb..32d1476b93 100644
--- a/packages/migrations/src/testnet_migrations.ts
+++ b/packages/migrations/src/testnet_migrations.ts
@@ -86,33 +86,6 @@ export async function runMigrationsAsync(supportedProvider: SupportedProvider, t
         assetProxyArtifacts,
     );
 
-    const devUtils = await DevUtilsContract.deployFrom0xArtifactAsync(
-        devUtilsArtifacts.DevUtils,
-        provider,
-        txDefaults,
-        devUtilsArtifacts,
-        exchange.address,
-    );
-
-    await CoordinatorContract.deployFrom0xArtifactAsync(
-        coordinatorArtifacts.Coordinator,
-        provider,
-        txDefaults,
-        coordinatorArtifacts,
-        exchange.address,
-        chainId,
-    );
-
-    const wethAssetData = await devUtils.encodeERC20AssetData.callAsync(deployedAddresses.etherToken);
-    await ForwarderContract.deployFrom0xArtifactAsync(
-        forwarderArtifacts.Forwarder,
-        provider,
-        txDefaults,
-        forwarderArtifacts,
-        exchange.address,
-        wethAssetData,
-    );
-
     const authorizableInterface = new IAuthorizableContract(constants.NULL_ADDRESS, provider, txDefaults);
     const ownableInterface = new IOwnableContract(constants.NULL_ADDRESS, provider, txDefaults);
 
@@ -230,6 +203,34 @@ export async function runMigrationsAsync(supportedProvider: SupportedProvider, t
         functionCalls.map(() => constants.ZERO_AMOUNT),
     ]);
     await submitAndExecuteTransactionAsync(governor, governor.address, batchTransactionData);
+
+    const devUtils = await DevUtilsContract.deployFrom0xArtifactAsync(
+        devUtilsArtifacts.DevUtils,
+        provider,
+        txDefaults,
+        devUtilsArtifacts,
+        exchange.address,
+    );
+
+    await CoordinatorContract.deployFrom0xArtifactAsync(
+        coordinatorArtifacts.Coordinator,
+        provider,
+        txDefaults,
+        coordinatorArtifacts,
+        exchange.address,
+        chainId,
+    );
+
+    const wethAssetData = await devUtils.encodeERC20AssetData.callAsync(deployedAddresses.etherToken);
+    const forwarder = await ForwarderContract.deployFrom0xArtifactAsync(
+        forwarderArtifacts.Forwarder,
+        provider,
+        txDefaults,
+        forwarderArtifacts,
+        exchange.address,
+        wethAssetData,
+    );
+    await forwarder.approveMakerAssetProxy.awaitTransactionSuccessAsync(deployedAddresses.etherToken);
 }
 
 (async () => {