From 30a2015a6836355a7e451f875745d81a069a5e40 Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Sun, 15 Dec 2019 14:19:16 -0800
Subject: [PATCH] Fix build

---
 .../exchange-forwarder/contracts/src/libs/LibConstants.sol    | 2 +-
 contracts/integrations/test/forwarder/deploy_forwarder.ts     | 3 ++-
 contracts/integrations/test/forwarder/forwarder_test.ts       | 1 +
 packages/migrations/src/migration.ts                          | 1 +
 packages/migrations/src/testnet_migrations.ts                 | 4 ++--
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/contracts/exchange-forwarder/contracts/src/libs/LibConstants.sol b/contracts/exchange-forwarder/contracts/src/libs/LibConstants.sol
index b167b665de..05fe8d2c73 100644
--- a/contracts/exchange-forwarder/contracts/src/libs/LibConstants.sol
+++ b/contracts/exchange-forwarder/contracts/src/libs/LibConstants.sol
@@ -27,7 +27,7 @@ contract LibConstants {
 
     uint256 constant internal MAX_UINT = uint256(-1);
 
-    // The v2 order id is the first 4 bytes of the ExchangeV2 order shema hash.
+    // The v2 order id is the first 4 bytes of the ExchangeV2 order schema hash.
     // bytes4(keccak256(abi.encodePacked(
     //     "Order(",
     //     "address makerAddress,",
diff --git a/contracts/integrations/test/forwarder/deploy_forwarder.ts b/contracts/integrations/test/forwarder/deploy_forwarder.ts
index 9566ab35af..1654dd06ba 100644
--- a/contracts/integrations/test/forwarder/deploy_forwarder.ts
+++ b/contracts/integrations/test/forwarder/deploy_forwarder.ts
@@ -1,6 +1,6 @@
 import { artifacts as exchangeArtifacts } from '@0x/contracts-exchange';
 import { artifacts, ForwarderContract } from '@0x/contracts-exchange-forwarder';
-import { BlockchainTestsEnvironment } from '@0x/contracts-test-utils';
+import { BlockchainTestsEnvironment, constants } from '@0x/contracts-test-utils';
 
 import { DeploymentManager } from '../framework/deployment_manager';
 
@@ -17,6 +17,7 @@ export async function deployForwarderAsync(
         deployment.txDefaults,
         { ...exchangeArtifacts, ...artifacts },
         deployment.exchange.address,
+        constants.NULL_ADDRESS, // ExchangeV2 not tested on Ganache
         deployment.tokens.weth.address,
     );
 }
diff --git a/contracts/integrations/test/forwarder/forwarder_test.ts b/contracts/integrations/test/forwarder/forwarder_test.ts
index 9ccb465415..68a50b2e58 100644
--- a/contracts/integrations/test/forwarder/forwarder_test.ts
+++ b/contracts/integrations/test/forwarder/forwarder_test.ts
@@ -125,6 +125,7 @@ blockchainTests('Forwarder integration tests', env => {
                 env.txDefaults,
                 {},
                 exchange.address,
+                constants.NULL_ADDRESS,
                 deployment.tokens.weth.address,
             );
             await expect(deployForwarder).to.revertWith(
diff --git a/packages/migrations/src/migration.ts b/packages/migrations/src/migration.ts
index d5c9765a0f..3db4cdf26f 100644
--- a/packages/migrations/src/migration.ts
+++ b/packages/migrations/src/migration.ts
@@ -243,6 +243,7 @@ export async function runMigrationsAsync(
         txDefaults,
         artifacts,
         exchange.address,
+        constants.NULL_ADDRESS,
         etherToken.address,
     );
 
diff --git a/packages/migrations/src/testnet_migrations.ts b/packages/migrations/src/testnet_migrations.ts
index 3a8c91fc0a..2a96fc7f8a 100644
--- a/packages/migrations/src/testnet_migrations.ts
+++ b/packages/migrations/src/testnet_migrations.ts
@@ -238,15 +238,15 @@ export async function runMigrationsAsync(supportedProvider: SupportedProvider, t
         chainId,
     );
 
-    const forwarder = await ForwarderContract.deployFrom0xArtifactAsync(
+    await ForwarderContract.deployFrom0xArtifactAsync(
         forwarderArtifacts.Forwarder,
         provider,
         txDefaults,
         forwarderArtifacts,
         exchange.address,
+        deployedAddresses.exchangeV2,
         deployedAddresses.etherToken,
     );
-    await forwarder.approveMakerAssetProxy(deployedAddresses.etherToken).awaitTransactionSuccessAsync();
 }
 
 (async () => {