diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-11-26 23:08:57 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-11-26 23:08:57 +0800 |
| commit | 420a677828ed102b7980e9b18911885e0ecb08e8 (patch) | |
| tree | 712034da6837333a4a584ced6866c1223541aa08 /packages/migrations | |
| parent | 9da43878b169226e628ad2ea834e0fab78d5909b (diff) | |
| parent | 2648f5ba654ccc22d96a0755c0a24ef628054d02 (diff) | |
| download | dexon-sol-tools-420a677828ed102b7980e9b18911885e0ecb08e8.tar dexon-sol-tools-420a677828ed102b7980e9b18911885e0ecb08e8.tar.gz dexon-sol-tools-420a677828ed102b7980e9b18911885e0ecb08e8.tar.bz2 dexon-sol-tools-420a677828ed102b7980e9b18911885e0ecb08e8.tar.lz dexon-sol-tools-420a677828ed102b7980e9b18911885e0ecb08e8.tar.xz dexon-sol-tools-420a677828ed102b7980e9b18911885e0ecb08e8.tar.zst dexon-sol-tools-420a677828ed102b7980e9b18911885e0ecb08e8.zip | |
merge development
Diffstat (limited to 'packages/migrations')
| -rw-r--r-- | packages/migrations/CHANGELOG.json | 8 | ||||
| -rw-r--r-- | packages/migrations/src/migration.ts | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json index 78719fc90..07031fc09 100644 --- a/packages/migrations/CHANGELOG.json +++ b/packages/migrations/CHANGELOG.json @@ -5,6 +5,14 @@ { "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 } ] }, 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, |