Enable istanbul in Ganache

This commit is contained in:
Amir Bandeali 2019-12-17 08:25:46 -08:00 committed by Amir
parent fa99b75d1f
commit 0f151db355
5 changed files with 768 additions and 56 deletions

View File

@ -19,6 +19,7 @@ export let providerConfigs: Web3Config = {
total_accounts: constants.NUM_TEST_ACCOUNTS, total_accounts: constants.NUM_TEST_ACCOUNTS,
shouldUseInProcessGanache: true, shouldUseInProcessGanache: true,
shouldAllowUnlimitedContractSize: true, shouldAllowUnlimitedContractSize: true,
hardfork: 'istanbul',
}; };
export const provider: Web3ProviderEngine = web3Factory.getRpcProvider(providerConfigs); export const provider: Web3ProviderEngine = web3Factory.getRpcProvider(providerConfigs);

View File

@ -82,7 +82,7 @@
"async-child-process": "^1.1.1", "async-child-process": "^1.1.1",
"bundlewatch": "^0.2.1", "bundlewatch": "^0.2.1",
"coveralls": "^3.0.0", "coveralls": "^3.0.0",
"ganache-cli": "6.4.1", "ganache-cli": "6.8.0-istanbul.0",
"lcov-result-merger": "^3.0.0", "lcov-result-merger": "^3.0.0",
"lerna": "^3.0.0-beta.25", "lerna": "^3.0.0-beta.25",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",

View File

@ -25,6 +25,7 @@ export interface Web3Config {
blockTime?: number; blockTime?: number;
locked?: boolean; locked?: boolean;
unlocked_accounts?: string[]; unlocked_accounts?: string[];
hardfork?: string;
} }
export const web3Factory = { export const web3Factory = {
@ -81,6 +82,7 @@ export const web3Factory = {
blockTime: config.blockTime, blockTime: config.blockTime,
locked: config.locked, locked: config.locked,
unlocked_accounts: config.unlocked_accounts, unlocked_accounts: config.unlocked_accounts,
hardfork: config.hardfork,
} as any), // TODO remove any once types are merged in DefinitelyTyped } as any), // TODO remove any once types are merged in DefinitelyTyped
); );
} else { } else {

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.6.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",

817
yarn.lock

File diff suppressed because it is too large Load Diff