crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Amir Bandeali 2019-12-23 19:37:29 -08:00 committed by Amir
parent e515c91e5e
commit ff18852879
6 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/migrations/package.json
View File

@ -64,6 +64,7 @@
"@0x/base-contract": "^6.0.3", "@0x/base-contract": "^6.0.3",
"@0x/contract-addresses": "^4.2.0", "@0x/contract-addresses": "^4.2.0",
"@0x/contract-artifacts": "^3.3.0", "@0x/contract-artifacts": "^3.3.0",
"@0x/contract-wrappers": "13.3.0",
"@0x/contracts-asset-proxy": "^3.1.0", "@0x/contracts-asset-proxy": "^3.1.0",
"@0x/contracts-coordinator": "^3.0.3", "@0x/contracts-coordinator": "^3.0.3",
"@0x/contracts-dev-utils": "^1.0.3", "@0x/contracts-dev-utils": "^1.0.3",

3
packages/migrations/src/migration.ts
View File

@ -1,5 +1,6 @@
import { ContractAddresses } from '@0x/contract-addresses'; import { ContractAddresses } from '@0x/contract-addresses';
import * as artifacts from '@0x/contract-artifacts'; import * as artifacts from '@0x/contract-artifacts';
import { ForwarderContract } from '@0x/contract-wrappers';
import { import {
ERC1155ProxyContract, ERC1155ProxyContract,
ERC20BridgeProxyContract, ERC20BridgeProxyContract,
@ -14,7 +15,6 @@ import { ERC1155MintableContract } from '@0x/contracts-erc1155';
import { DummyERC20TokenContract, WETH9Contract } from '@0x/contracts-erc20'; import { DummyERC20TokenContract, WETH9Contract } from '@0x/contracts-erc20';
import { DummyERC721TokenContract } from '@0x/contracts-erc721'; import { DummyERC721TokenContract } from '@0x/contracts-erc721';
import { ExchangeContract } from '@0x/contracts-exchange'; import { ExchangeContract } from '@0x/contracts-exchange';
import { ForwarderContract } from '@0x/contracts-exchange-forwarder';
import { StakingProxyContract, TestStakingContract, ZrxVaultContract } from '@0x/contracts-staking'; import { StakingProxyContract, TestStakingContract, ZrxVaultContract } from '@0x/contracts-staking';
import { Web3ProviderEngine } from '@0x/subproviders'; import { Web3ProviderEngine } from '@0x/subproviders';
import { BigNumber, providerUtils } from '@0x/utils'; import { BigNumber, providerUtils } from '@0x/utils';
@ -243,7 +243,6 @@ export async function runMigrationsAsync(
txDefaults, txDefaults,
artifacts, artifacts,
exchange.address, exchange.address,
constants.NULL_ADDRESS,
etherToken.address, etherToken.address,
); );

2
packages/subproviders/package.json
View File

@ -47,7 +47,7 @@
"ethereum-types": "^3.0.0", "ethereum-types": "^3.0.0",
"ethereumjs-tx": "^1.3.5", "ethereumjs-tx": "^1.3.5",
"ethereumjs-util": "^5.1.1", "ethereumjs-util": "^5.1.1",
"ganache-core": "2.9.0-istanbul.0", "ganache-core": "^2.9.0-istanbul.0",
"hdkey": "^0.7.1", "hdkey": "^0.7.1",
"json-rpc-error": "2.0.0", "json-rpc-error": "2.0.0",
"lodash": "^4.17.11", "lodash": "^4.17.11",

1
packages/web3-wrapper/package.json
View File

@ -47,6 +47,7 @@
"chai-as-promised": "^7.1.0", "chai-as-promised": "^7.1.0",
"chai-bignumber": "^3.0.0", "chai-bignumber": "^3.0.0",
"dirty-chai": "^2.0.1", "dirty-chai": "^2.0.1",
"ganache-core": "^2.9.0-istanbul.0",
"make-promises-safe": "^1.1.0", "make-promises-safe": "^1.1.0",
"mocha": "^6.2.0", "mocha": "^6.2.0",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",

2
packages/web3-wrapper/test/web3_wrapper_test.ts
View File

@ -35,7 +35,7 @@ describe('Web3Wrapper tests', () => {
describe('#getNodeVersionAsync', () => { describe('#getNodeVersionAsync', () => {
it('gets the node version', async () => { it('gets the node version', async () => {
const nodeVersion = await web3Wrapper.getNodeVersionAsync(); const nodeVersion = await web3Wrapper.getNodeVersionAsync();
const NODE_VERSION = 'EthereumJS TestRPC/v2.6.0/ethereum-js'; const NODE_VERSION = 'EthereumJS TestRPC/v2.9.0-istanbul.0/ethereum-js';
expect(nodeVersion).to.be.equal(NODE_VERSION); expect(nodeVersion).to.be.equal(NODE_VERSION);
}); });
}); });

2
yarn.lock
View File

@ -7897,7 +7897,7 @@ ganache-cli@6.8.0-istanbul.0:
source-map-support "0.5.12" source-map-support "0.5.12"
yargs "13.2.4" yargs "13.2.4"
ganache-core@2.9.0-istanbul.0: ganache-core@2.9.0-istanbul.0, ganache-core@^2.9.0-istanbul.0:
version "2.9.0-istanbul.0" version "2.9.0-istanbul.0"
resolved "https://registry.npmjs.org/ganache-core/-/ganache-core-2.9.0-istanbul.0.tgz#bc336c770775a2b9fb06f5cae827088ecc194283" resolved "https://registry.npmjs.org/ganache-core/-/ganache-core-2.9.0-istanbul.0.tgz#bc336c770775a2b9fb06f5cae827088ecc194283"
integrity sha512-wqNWyxrfZe4QPxzaR/n4hGxIfa1iZAkymPg17wET0iWZ9uurMywGgpG4ZvxjVU9q7WCjIobOSzE1m9OT0dIYcQ== integrity sha512-wqNWyxrfZe4QPxzaR/n4hGxIfa1iZAkymPg17wET0iWZ9uurMywGgpG4ZvxjVU9q7WCjIobOSzE1m9OT0dIYcQ==