5 files changed, 68 insertions, 0 deletions
diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json
index dea87b477..07031fc09 100644
--- a/packages/migrations/CHANGELOG.json
+++ b/packages/migrations/CHANGELOG.json
@@ -1,5 +1,22 @@
 [
     {
+        "version": "2.2.0",
+        "changes": [
+            {
+                "note": "Add CLI `0x-migrate` for running the 0x migrations in a language-agnostic way",
+                "pr": 1324
+            },
+            {
+                "note": "Deploy testnet Exchange arfitact. Previously mainnet Exchange artifact was deployed.",
+                "pr": 1309
+            },
+            {
+                "note": "Fund the Forwarder with ZRX for fees.",
+                "pr": 1309
+            }
+        ]
+    },
+    {
         "version": "2.1.0",
         "changes": [
             {
diff --git a/packages/migrations/bin/0x-migrate.js b/packages/migrations/bin/0x-migrate.js
new file mode 100755
index 000000000..59778c0fc
--- /dev/null
+++ b/packages/migrations/bin/0x-migrate.js
@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+require('../lib/cli.js');
diff --git a/packages/migrations/package.json b/packages/migrations/package.json
index c1ce7050d..b006a470a 100644
--- a/packages/migrations/package.json
+++ b/packages/migrations/package.json
@@ -21,6 +21,9 @@
             "assets": []
         }
     },
+    "bin": {
+        "0x-migrate": "bin/0x-migrate.js"
+    },
     "license": "Apache-2.0",
     "devDependencies": {
         "@0x/dev-utils": "^1.0.18",
diff --git a/packages/migrations/src/cli.ts b/packages/migrations/src/cli.ts
new file mode 100644
index 000000000..2404e7921
--- /dev/null
+++ b/packages/migrations/src/cli.ts
@@ -0,0 +1,38 @@
+#!/usr/bin/env node
+import { RPCSubprovider, Web3ProviderEngine } from '@0x/subproviders';
+import { logUtils } from '@0x/utils';
+import * as yargs from 'yargs';
+
+import { runMigrationsAsync } from './migration';
+
+const args = yargs
+    .option('rpc-url', {
+        describe: 'Endpoint where backing Ethereum JSON RPC interface is available',
+        type: 'string',
+        demandOption: false,
+        default: 'http://localhost:8545',
+    })
+    .option('from', {
+        describe: 'Ethereum address from which to deploy the contracts',
+        type: 'string',
+        demandOption: true,
+    })
+    .example(
+        '$0 --rpc-url http://localhost:8545 --from 0x5409ed021d9299bf6814279a6a1411a7e866a631',
+        'Full usage example',
+    ).argv;
+
+(async () => {
+    const rpcSubprovider = new RPCSubprovider(args['rpc-url']);
+    const provider = new Web3ProviderEngine();
+    provider.addProvider(rpcSubprovider);
+    provider.start();
+    const txDefaults = {
+        from: args.from,
+    };
+    await runMigrationsAsync(provider, txDefaults);
+    process.exit(0);
+})().catch(err => {
+    logUtils.log(err);
+    process.exit(1);
+});
diff --git a/packages/migrations/src/migration.ts b/packages/migrations/src/migration.ts
index 61ac56938..c684c4970 100644
--- a/packages/migrations/src/migration.ts
+++ b/packages/migrations/src/migration.ts
@@ -47,6 +47,7 @@ export async function runMigrationsAsync(provider: Provider, txDefaults: Partial
         artifacts.Exchange,
         provider,
         txDefaults,
+        zrxAssetData,
     );
 
     // Multisigs
@@ -140,6 +141,13 @@ export async function runMigrationsAsync(provider: Provider, txDefaults: Partial
         zrxAssetData,
     );
 
+    // Fund the Forwarder with ZRX
+    const zrxDecimals = await zrxToken.decimals.callAsync();
+    const zrxForwarderAmount = Web3Wrapper.toBaseUnitAmount(new BigNumber(5000), zrxDecimals);
+    await web3Wrapper.awaitTransactionSuccessAsync(
+        await zrxToken.transfer.sendTransactionAsync(forwarder.address, zrxForwarderAmount, txDefaults),
+    );
+
     return {
         erc20Proxy: erc20Proxy.address,
         erc721Proxy: erc721Proxy.address,