aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-09-05 03:22:32 +0800
committerFabio Berger <me@fabioberger.com>2018-09-05 03:22:32 +0800
commit3463903d02957a0a101c8947d315440f7fa9470e (patch)
treebdf72d1506260f32fd50f77722f742c005ebbb07 /packages
parent4061723863cabd9094b487fffd5fdc1905baf429 (diff)
parent603e8aa671be83fb334bb7719e772c151b4b5fc1 (diff)
downloaddexon-sol-tools-3463903d02957a0a101c8947d315440f7fa9470e.tar
dexon-sol-tools-3463903d02957a0a101c8947d315440f7fa9470e.tar.gz
dexon-sol-tools-3463903d02957a0a101c8947d315440f7fa9470e.tar.bz2
dexon-sol-tools-3463903d02957a0a101c8947d315440f7fa9470e.tar.lz
dexon-sol-tools-3463903d02957a0a101c8947d315440f7fa9470e.tar.xz
dexon-sol-tools-3463903d02957a0a101c8947d315440f7fa9470e.tar.zst
dexon-sol-tools-3463903d02957a0a101c8947d315440f7fa9470e.zip
Merge branch 'deployment/2.0.0-beta-testnet/ropsten' of github.com:0xProject/0x-monorepo into deployment/2.0.0-beta-testnet/ropsten
* 'deployment/2.0.0-beta-testnet/ropsten' of github.com:0xProject/0x-monorepo: Revert the exchange address change Tslint magic-number
Diffstat (limited to 'packages')
-rw-r--r--packages/migrations/artifacts/2.0.0-beta-testnet/Exchange.json4
-rw-r--r--packages/migrations/src/2.0.0-beta-testnet/migration.ts2
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/migrations/artifacts/2.0.0-beta-testnet/Exchange.json b/packages/migrations/artifacts/2.0.0-beta-testnet/Exchange.json
index 7b7ca5097..d2c5c3053 100644
--- a/packages/migrations/artifacts/2.0.0-beta-testnet/Exchange.json
+++ b/packages/migrations/artifacts/2.0.0-beta-testnet/Exchange.json
@@ -2291,9 +2291,9 @@
"constructorArgs": "[\"0xf47261b00000000000000000000000002002d3812f58e35f0ea1ffbf80a75a38c32175fa\"]"
},
"50": {
- "address": "0x0b1ba0af832d7c05fd64161e0db78e85978e8082",
+ "address": "0x48bacb9266a570d521063ef5dd96e61686dbe788",
"links": {},
"constructorArgs": "[\"0xf47261b0000000000000000000000000871dd7c2b4b25e1aa18728e9d5f2af4c4e431f5c\"]"
}
}
-} \ No newline at end of file
+}
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 66bc79239..62a16ddae 100644
--- a/packages/migrations/src/2.0.0-beta-testnet/migration.ts
+++ b/packages/migrations/src/2.0.0-beta-testnet/migration.ts
@@ -17,6 +17,7 @@ import { ExchangeContract } from './contract_wrappers/exchange';
import { ForwarderContract } from './contract_wrappers/forwarder';
import { OrderValidatorContract } from './contract_wrappers/order_validator';
+// tslint:disable-next-line:custom-no-magic-numbers
const ERC20_TOTAL_SUPPLY = new BigNumber(1000000000000000000000000000);
/**
@@ -144,6 +145,7 @@ export const runV2TestnetMigrationsAsync = async (
// Set enough ZRX Balance to the Forwarder
const maxZRXMintAmount = await zrxToken.MAX_MINT_AMOUNT.callAsync();
+ // tslint:disable-next-line:custom-no-magic-numbers
const forwarderZRXBalance = maxZRXMintAmount.times(10);
txHash = await zrxToken.setBalance.sendTransactionAsync(forwarder.address, forwarderZRXBalance);
await web3Wrapper.awaitTransactionSuccessAsync(txHash);