5 files changed, 27 insertions, 17 deletions
diff --git a/packages/migrations/src/1.0.0/migration.ts b/packages/migrations/src/1.0.0/migration.ts
index 6cc8dc4ef..0a3c25ae1 100644
--- a/packages/migrations/src/1.0.0/migration.ts
+++ b/packages/migrations/src/1.0.0/migration.ts
@@ -6,7 +6,7 @@ import { ArtifactWriter } from '../utils/artifact_writer';
 import { erc20TokenInfo } from '../utils/token_info';
 
 import { artifacts } from './artifacts';
-import { DummyERC20TokenContract } from './contract_wrappers/dummy_e_r_c20_token';
+import { DummyERC20TokenContract } from './contract_wrappers/dummy_erc20_token';
 import { Exchange_v1Contract } from './contract_wrappers/exchange_v1';
 import { MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressContract } from './contract_wrappers/multi_sig_wallet_with_time_lock_except_remove_authorized_address';
 import { TokenRegistryContract } from './contract_wrappers/token_registry';
diff --git a/packages/migrations/src/2.0.0-beta-testnet/migration.ts b/packages/migrations/src/2.0.0-beta-testnet/migration.ts
index b8173bac5..e8ce1d92d 100644
--- a/packages/migrations/src/2.0.0-beta-testnet/migration.ts
+++ b/packages/migrations/src/2.0.0-beta-testnet/migration.ts
@@ -8,8 +8,8 @@ import { constants } from '../utils/constants';
 
 import { artifacts } from './artifacts';
 import { AssetProxyOwnerContract } from './contract_wrappers/asset_proxy_owner';
-import { ERC20ProxyContract } from './contract_wrappers/e_r_c20_proxy';
-import { ERC721ProxyContract } from './contract_wrappers/e_r_c721_proxy';
+import { ERC20ProxyContract } from './contract_wrappers/erc20_proxy';
+import { ERC721ProxyContract } from './contract_wrappers/erc721_proxy';
 import { ExchangeContract } from './contract_wrappers/exchange';
 
 /**
diff --git a/packages/migrations/src/2.0.0/artifacts.ts b/packages/migrations/src/2.0.0/artifacts.ts
index 31dfc5abb..8bbd1fcd9 100644
--- a/packages/migrations/src/2.0.0/artifacts.ts
+++ b/packages/migrations/src/2.0.0/artifacts.ts
@@ -6,6 +6,7 @@ import * as DummyERC721Token from '../../artifacts/2.0.0/DummyERC721Token.json';
 import * as ERC20Proxy from '../../artifacts/2.0.0/ERC20Proxy.json';
 import * as ERC721Proxy from '../../artifacts/2.0.0/ERC721Proxy.json';
 import * as Exchange from '../../artifacts/2.0.0/Exchange.json';
+import * as Forwarder from '../../artifacts/2.0.0/Forwarder.json';
 import * as WETH9 from '../../artifacts/2.0.0/WETH9.json';
 import * as ZRX from '../../artifacts/2.0.0/ZRXToken.json';
 
@@ -18,4 +19,5 @@ export const artifacts = {
     WETH9: (WETH9 as any) as ContractArtifact,
     ERC20Proxy: (ERC20Proxy as any) as ContractArtifact,
     ERC721Proxy: (ERC721Proxy as any) as ContractArtifact,
+    Forwarder: (Forwarder as any) as ContractArtifact,
 };
diff --git a/packages/migrations/src/2.0.0/migration.ts b/packages/migrations/src/2.0.0/migration.ts
index 8978a12d6..226bf0a68 100644
--- a/packages/migrations/src/2.0.0/migration.ts
+++ b/packages/migrations/src/2.0.0/migration.ts
@@ -8,11 +8,12 @@ import { erc20TokenInfo, erc721TokenInfo } from '../utils/token_info';
 
 import { artifacts } from './artifacts';
 import { AssetProxyOwnerContract } from './contract_wrappers/asset_proxy_owner';
-import { DummyERC20TokenContract } from './contract_wrappers/dummy_e_r_c20_token';
-import { DummyERC721TokenContract } from './contract_wrappers/dummy_e_r_c721_token';
-import { ERC20ProxyContract } from './contract_wrappers/e_r_c20_proxy';
-import { ERC721ProxyContract } from './contract_wrappers/e_r_c721_proxy';
+import { DummyERC20TokenContract } from './contract_wrappers/dummy_erc20_token';
+import { DummyERC721TokenContract } from './contract_wrappers/dummy_erc721_token';
+import { ERC20ProxyContract } from './contract_wrappers/erc20_proxy';
+import { ERC721ProxyContract } from './contract_wrappers/erc721_proxy';
 import { ExchangeContract } from './contract_wrappers/exchange';
+import { ForwarderContract } from './contract_wrappers/forwarder';
 import { WETH9Contract } from './contract_wrappers/weth9';
 import { ZRXTokenContract } from './contract_wrappers/zrx_token';
 
@@ -105,7 +106,7 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str
 
     // Dummy ERC20 tokens
     for (const token of erc20TokenInfo) {
-        const totalSupply = new BigNumber(100000000000000000000);
+        const totalSupply = new BigNumber(1000000000000000000000000000);
         // tslint:disable-next-line:no-unused-variable
         const dummyErc20Token = await DummyERC20TokenContract.deployFrom0xArtifactAsync(
             artifacts.DummyERC20Token,
@@ -127,4 +128,17 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str
         erc721TokenInfo[0].name,
         erc721TokenInfo[0].symbol,
     );
+
+    // Forwarder
+    const forwarder = await ForwarderContract.deployFrom0xArtifactAsync(
+        artifacts.Forwarder,
+        provider,
+        txDefaults,
+        exchange.address,
+        etherToken.address,
+        zrxToken.address,
+        assetProxyUtils.encodeERC20AssetData(zrxToken.address),
+        assetProxyUtils.encodeERC20AssetData(etherToken.address),
+    );
+    artifactsWriter.saveArtifact(forwarder);
 };
diff --git a/packages/migrations/src/utils/provider_factory.ts b/packages/migrations/src/utils/provider_factory.ts
index 7a217b1e0..5f69b258d 100644
--- a/packages/migrations/src/utils/provider_factory.ts
+++ b/packages/migrations/src/utils/provider_factory.ts
@@ -1,10 +1,8 @@
-import { LedgerEthereumClient, LedgerSubprovider } from '@0xproject/subproviders';
+import { LedgerEthereumClient, LedgerSubprovider, RPCSubprovider, Web3ProviderEngine } from '@0xproject/subproviders';
 import Eth from '@ledgerhq/hw-app-eth';
 // tslint:disable:no-implicit-dependencies
 import TransportNodeHid from '@ledgerhq/hw-transport-node-hid';
 import { Provider } from 'ethereum-types';
-import ProviderEngine = require('web3-provider-engine');
-import RpcSubprovider = require('web3-provider-engine/subproviders/rpc');
 
 import { constants } from './constants';
 
@@ -15,18 +13,14 @@ async function ledgerEthereumNodeJsClientFactoryAsync(): Promise<LedgerEthereumC
 }
 export const providerFactory = {
     async getLedgerProviderAsync(): Promise<Provider> {
-        const provider = new ProviderEngine();
+        const provider = new Web3ProviderEngine();
         const ledgerWalletConfigs = {
             networkId: constants.KOVAN_NETWORK_ID,
             ledgerEthereumClientFactoryAsync: ledgerEthereumNodeJsClientFactoryAsync,
         };
         const ledgerSubprovider = new LedgerSubprovider(ledgerWalletConfigs);
         provider.addProvider(ledgerSubprovider);
-        provider.addProvider(
-            new RpcSubprovider({
-                rpcUrl: constants.RPC_URL,
-            }),
-        );
+        provider.addProvider(new RPCSubprovider(constants.RPC_URL));
         provider.start();
         return provider;
     },