diff --git a/packages/asset-buyer/src/index.ts b/packages/asset-buyer/src/index.ts index e3262bc1c6..78ce978276 100644 --- a/packages/asset-buyer/src/index.ts +++ b/packages/asset-buyer/src/index.ts @@ -4,6 +4,14 @@ export { JSONRPCResponseError, JSONRPCErrorCallback, SupportedProvider, + Web3JsProvider, + GanacheProvider, + EIP1193Provider, + ZeroExProvider, + EIP1193Event, + Web3JsV1Provider, + Web3JsV2Provider, + Web3JsV3Provider, } from 'ethereum-types'; export { SignedOrder } from '@0x/types'; export { BigNumber } from '@0x/utils'; diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 727db9096b..32a1159366 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -45,7 +45,8 @@ "tslint": "5.11.0", "typedoc": "0.13.0", "typescript": "3.0.1", - "yargs": "^10.0.3" + "yargs": "^10.0.3", + "web3-provider-engine": "14.0.6" }, "dependencies": { "@0x/abi-gen-wrappers": "^3.0.3", @@ -59,6 +60,7 @@ "@0x/utils": "^4.1.0", "@0x/web3-wrapper": "^5.0.0", "@ledgerhq/hw-app-eth": "^4.3.0", + "@types/web3-provider-engine": "^14.0.0", "ethereum-types": "^2.0.0", "ethers": "~4.0.4", "lodash": "^4.17.11" diff --git a/packages/migrations/src/index.ts b/packages/migrations/src/index.ts index a7290eabc6..9d73027333 100644 --- a/packages/migrations/src/index.ts +++ b/packages/migrations/src/index.ts @@ -1,10 +1,4 @@ -export { - TxData, - JSONRPCRequestPayload, - JSONRPCErrorCallback, - TxDataPayable, - JSONRPCResponsePayload, - JSONRPCResponseError, -} from 'ethereum-types'; +export { TxData, TxDataPayable } from 'ethereum-types'; export { ContractAddresses } from '@0x/contract-addresses'; export { runMigrationsAsync, runMigrationsOnceAsync } from './migration'; +export import Web3ProviderEngine = require('web3-provider-engine'); diff --git a/packages/order-utils/src/index.ts b/packages/order-utils/src/index.ts index f174e492ec..2dc6fc71ca 100644 --- a/packages/order-utils/src/index.ts +++ b/packages/order-utils/src/index.ts @@ -27,6 +27,14 @@ export { JSONRPCErrorCallback, JSONRPCResponsePayload, JSONRPCResponseError, + Web3JsProvider, + GanacheProvider, + EIP1193Provider, + ZeroExProvider, + EIP1193Event, + Web3JsV1Provider, + Web3JsV2Provider, + Web3JsV3Provider, } from 'ethereum-types'; export { diff --git a/packages/order-watcher/src/index.ts b/packages/order-watcher/src/index.ts index a4ab38b233..e9449c5cf0 100644 --- a/packages/order-watcher/src/index.ts +++ b/packages/order-watcher/src/index.ts @@ -22,4 +22,12 @@ export { SupportedProvider, JSONRPCResponsePayload, JSONRPCResponseError, + Web3JsProvider, + GanacheProvider, + EIP1193Provider, + ZeroExProvider, + EIP1193Event, + Web3JsV1Provider, + Web3JsV2Provider, + Web3JsV3Provider, } from 'ethereum-types'; diff --git a/packages/sol-coverage/package.json b/packages/sol-coverage/package.json index 8bc91f63c2..7b7ef4aed9 100644 --- a/packages/sol-coverage/package.json +++ b/packages/sol-coverage/package.json @@ -33,11 +33,13 @@ "@0x/subproviders": "^3.0.3", "@0x/typescript-typings": "^4.0.0", "ethereum-types": "^2.0.0", - "lodash": "^4.17.11" + "lodash": "^4.17.11", + "web3-provider-engine": "14.0.6" }, "devDependencies": { "@0x/tslint-config": "^3.0.0", "@types/node": "*", + "@types/web3-provider-engine": "^14.0.0", "npm-run-all": "^4.1.2", "nyc": "^11.0.1", "shx": "^0.2.2", diff --git a/packages/sol-coverage/src/index.ts b/packages/sol-coverage/src/index.ts index d0373083eb..a2212fb44c 100644 --- a/packages/sol-coverage/src/index.ts +++ b/packages/sol-coverage/src/index.ts @@ -8,13 +8,7 @@ export { Sources, } from '@0x/sol-tracing-utils'; -export { - JSONRPCRequestPayload, - SupportedProvider, - JSONRPCErrorCallback, - JSONRPCResponsePayload, - JSONRPCResponseError, -} from 'ethereum-types'; +export { JSONRPCRequestPayload, JSONRPCResponsePayload, JSONRPCResponseError } from 'ethereum-types'; export { JSONRPCRequestPayloadWithMethod, @@ -23,3 +17,5 @@ export { OnNextCompleted, Callback, } from '@0x/subproviders'; + +export import Web3ProviderEngine = require('web3-provider-engine'); diff --git a/packages/sol-profiler/package.json b/packages/sol-profiler/package.json index c28d3207a9..acbff2a3fb 100644 --- a/packages/sol-profiler/package.json +++ b/packages/sol-profiler/package.json @@ -33,11 +33,13 @@ "@0x/subproviders": "^3.0.3", "@0x/typescript-typings": "^4.0.0", "ethereum-types": "^2.0.0", - "lodash": "^4.17.11" + "lodash": "^4.17.11", + "web3-provider-engine": "14.0.6" }, "devDependencies": { "@0x/tslint-config": "^3.0.0", "@types/node": "*", + "@types/web3-provider-engine": "^14.0.0", "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.11.0", diff --git a/packages/sol-profiler/src/index.ts b/packages/sol-profiler/src/index.ts index aef48df6d2..3182acfa34 100644 --- a/packages/sol-profiler/src/index.ts +++ b/packages/sol-profiler/src/index.ts @@ -10,13 +10,7 @@ export { // HACK: ProfilerSubprovider is a hacky way to do profiling using coverage tools. Not production ready export { ProfilerSubprovider } from './profiler_subprovider'; -export { - JSONRPCRequestPayload, - SupportedProvider, - JSONRPCErrorCallback, - JSONRPCResponsePayload, - JSONRPCResponseError, -} from 'ethereum-types'; +export { JSONRPCRequestPayload, JSONRPCResponsePayload, JSONRPCResponseError } from 'ethereum-types'; export { JSONRPCRequestPayloadWithMethod, @@ -25,3 +19,5 @@ export { OnNextCompleted, Callback, } from '@0x/subproviders'; + +export import Web3ProviderEngine = require('web3-provider-engine'); diff --git a/packages/sol-trace/package.json b/packages/sol-trace/package.json index 6dc3a230ed..686d207e42 100644 --- a/packages/sol-trace/package.json +++ b/packages/sol-trace/package.json @@ -36,12 +36,14 @@ "ethereum-types": "^2.0.0", "ethereumjs-util": "^5.1.1", "lodash": "^4.17.11", - "loglevel": "^1.6.1" + "loglevel": "^1.6.1", + "web3-provider-engine": "14.0.6" }, "devDependencies": { "@0x/tslint-config": "^3.0.0", "@types/loglevel": "^1.5.3", "@types/node": "*", + "@types/web3-provider-engine": "^14.0.0", "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.11.0", diff --git a/packages/sol-trace/src/index.ts b/packages/sol-trace/src/index.ts index 22777b0b09..ee45de51e9 100644 --- a/packages/sol-trace/src/index.ts +++ b/packages/sol-trace/src/index.ts @@ -9,13 +9,7 @@ export { export { RevertTraceSubprovider } from './revert_trace_subprovider'; -export { - JSONRPCRequestPayload, - SupportedProvider, - JSONRPCErrorCallback, - JSONRPCResponsePayload, - JSONRPCResponseError, -} from 'ethereum-types'; +export { JSONRPCRequestPayload, JSONRPCResponsePayload, JSONRPCResponseError } from 'ethereum-types'; export { JSONRPCRequestPayloadWithMethod, @@ -24,3 +18,5 @@ export { OnNextCompleted, Callback, } from '@0x/subproviders'; + +export import Web3ProviderEngine = require('web3-provider-engine'); diff --git a/packages/typescript-typings/types/ganache-core/index.d.ts b/packages/typescript-typings/types/ganache-core/index.d.ts index 3022d9e5e4..172f634117 100644 --- a/packages/typescript-typings/types/ganache-core/index.d.ts +++ b/packages/typescript-typings/types/ganache-core/index.d.ts @@ -1,5 +1,5 @@ declare module 'ganache-core' { - import GanacheProvider = require('ethereum-types').GanacheProvider; + const GanacheProvider = require('ethereum-types').GanacheProvider; export interface GanacheOpts { verbose?: boolean; logger?: {