From cb4fcf4de7b9decad05536f2edf1c1ffd8666a72 Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Mon, 3 Sep 2018 20:35:00 -0700
Subject: Revert in Forwarder constructor if ERC20 proxy isn't registered

---
 .../extensions/Forwarder/MixinForwarderCore.sol    | 11 ++++----
 packages/contracts/test/extensions/forwarder.ts    | 33 +++++++++++++++++++---
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/packages/contracts/src/2.0.0/extensions/Forwarder/MixinForwarderCore.sol b/packages/contracts/src/2.0.0/extensions/Forwarder/MixinForwarderCore.sol
index 14f191879..54487f726 100644
--- a/packages/contracts/src/2.0.0/extensions/Forwarder/MixinForwarderCore.sol
+++ b/packages/contracts/src/2.0.0/extensions/Forwarder/MixinForwarderCore.sol
@@ -39,7 +39,6 @@ contract MixinForwarderCore is
     MExchangeWrapper,
     IForwarderCore
 {
-
     using LibBytes for bytes;
 
     /// @dev Constructor approves ERC20 proxy to transfer ZRX and WETH on this contract's behalf.
@@ -47,10 +46,12 @@ contract MixinForwarderCore is
         public
     {
         address proxyAddress = EXCHANGE.getAssetProxy(ERC20_DATA_ID);
-        if (proxyAddress != address(0)) {
-            ETHER_TOKEN.approve(proxyAddress, MAX_UINT);
-            ZRX_TOKEN.approve(proxyAddress, MAX_UINT);
-        }
+        require(
+            proxyAddress != address(0),
+            "UNREGISTERED_ASSET_PROXY"
+        );
+        ETHER_TOKEN.approve(proxyAddress, MAX_UINT);
+        ZRX_TOKEN.approve(proxyAddress, MAX_UINT);
     }
 
     /// @dev Purchases as much of orders' makerAssets as possible by selling up to 95% of transaction's ETH value.
diff --git a/packages/contracts/test/extensions/forwarder.ts b/packages/contracts/test/extensions/forwarder.ts
index 18101d684..8424d01fd 100644
--- a/packages/contracts/test/extensions/forwarder.ts
+++ b/packages/contracts/test/extensions/forwarder.ts
@@ -12,7 +12,11 @@ import { ExchangeContract } from '../../generated_contract_wrappers/exchange';
 import { ForwarderContract } from '../../generated_contract_wrappers/forwarder';
 import { WETH9Contract } from '../../generated_contract_wrappers/weth9';
 import { artifacts } from '../utils/artifacts';
-import { expectTransactionFailedAsync } from '../utils/assertions';
+import {
+    expectContractCreationFailedAsync,
+    expectTransactionFailedAsync,
+    sendTransactionResult,
+} from '../utils/assertions';
 import { chaiSetup } from '../utils/chai_setup';
 import { constants } from '../utils/constants';
 import { ERC20Wrapper } from '../utils/erc20_wrapper';
@@ -37,6 +41,7 @@ describe(ContractName.Forwarder, () => {
     let otherAddress: string;
     let defaultMakerAssetAddress: string;
     let zrxAssetData: string;
+    let wethAssetData: string;
 
     let weth: DummyERC20TokenContract;
     let zrxToken: DummyERC20TokenContract;
@@ -90,7 +95,7 @@ describe(ContractName.Forwarder, () => {
         weth = new DummyERC20TokenContract(wethContract.abi, wethContract.address, provider);
         erc20Wrapper.addDummyTokenContract(weth);
 
-        const wethAssetData = assetDataUtils.encodeERC20AssetData(wethContract.address);
+        wethAssetData = assetDataUtils.encodeERC20AssetData(wethContract.address);
         zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
         const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
             artifacts.Exchange,
@@ -98,8 +103,7 @@ describe(ContractName.Forwarder, () => {
             txDefaults,
             zrxAssetData,
         );
-        const exchangeContract = new ExchangeContract(exchangeInstance.abi, exchangeInstance.address, provider);
-        exchangeWrapper = new ExchangeWrapper(exchangeContract, provider);
+        exchangeWrapper = new ExchangeWrapper(exchangeInstance, provider);
         await exchangeWrapper.registerAssetProxyAsync(erc20Proxy.address, owner);
         await exchangeWrapper.registerAssetProxyAsync(erc721Proxy.address, owner);
 
@@ -162,6 +166,27 @@ describe(ContractName.Forwarder, () => {
         await blockchainLifecycle.revertAsync();
     });
 
+    describe('constructor', () => {
+        it('should revert if assetProxy is unregistered', async () => {
+            const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
+                artifacts.Exchange,
+                provider,
+                txDefaults,
+                zrxAssetData,
+            );
+            return expectContractCreationFailedAsync(
+                (ForwarderContract.deployFrom0xArtifactAsync(
+                    artifacts.Forwarder,
+                    provider,
+                    txDefaults,
+                    exchangeInstance.address,
+                    zrxAssetData,
+                    wethAssetData,
+                ) as any) as sendTransactionResult,
+                RevertReason.UnregisteredAssetProxy,
+            );
+        });
+    });
     describe('marketSellOrdersWithEth without extra fees', () => {
         it('should fill a single order', async () => {
             const ordersWithoutFee = [orderWithoutFee];
-- 
cgit