Merge pull request #2196 from 0xProject/quick-fixes

Quick fixes
This commit is contained in:
Jacob Evans 2019-09-24 21:48:58 +02:00 committed by GitHub
commit 44f6d21e9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 1 deletions

View File

@ -39,6 +39,9 @@ module.exports = {
}),
],
},
externals: {
fs: true,
},
module: {
rules: [
{

View File

@ -30,7 +30,7 @@
"config": {
"s3_snapshot_bucket": "s3://ganache-snapshots.0x.org",
"docker_snapshot_name": "0xorg/ganache-cli",
"snapshot_name": "0x_ganache_snapshot",
"snapshot_name": "0x_ganache_snapshot-v3-beta",
"postpublish": {
"assets": []
}

View File

@ -260,6 +260,13 @@ export async function runMigrationsAsync(
// await multiAssetProxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, txDefaults),
// );
// Fake the above transactions so our nonce increases and we result with the same addresses
// while AssetProxyOwner is disabled (TODO: @dekz remove)
const dummyTransactionCount = 5;
for (let index = 0; index < dummyTransactionCount; index++) {
await web3Wrapper.sendTransactionAsync({ to: txDefaults.from, from: txDefaults.from, value: new BigNumber(0) });
}
// Fund the Forwarder with ZRX
const zrxDecimals = await zrxToken.decimals.callAsync();
const zrxForwarderAmount = Web3Wrapper.toBaseUnitAmount(new BigNumber(5000), zrxDecimals);

View File

@ -12,6 +12,9 @@
"type": "git",
"url": "https://github.com/0xProject/0x-monorepo.git"
},
"publishConfig": {
"access": "public"
},
"scripts": {
"clean": "shx rm -rf lib generated_docs",
"test": "jest",