diff options
Diffstat (limited to 'packages/subproviders')
10 files changed, 36 insertions, 26 deletions
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index d945be9de..220058a8f 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -29,10 +29,10 @@ } }, "dependencies": { - "@0x/assert": "^1.0.23", - "@0x/types": "^1.5.2", - "@0x/utils": "^3.0.1", - "@0x/web3-wrapper": "^3.2.4", + "@0x/assert": "^2.0.6", + "@0x/types": "^2.1.1", + "@0x/utils": "^4.2.2", + "@0x/web3-wrapper": "^6.0.2", "@dexon-foundation/ganache-core": "^2.3.2", "@dexon-foundation/typescript-typings": "^4.0.2", "@dexon-foundation/web3-provider-engine": "^14.1.1", @@ -43,7 +43,7 @@ "bip39": "^2.5.0", "bn.js": "^4.11.8", "eth-lightwallet": "^3.0.1", - "ethereum-types": "^1.1.6", + "ethereum-types": "^2.1.0", "ethereumjs-tx": "^1.3.5", "ethereumjs-util": "^5.1.1", "hdkey": "^0.7.1", @@ -52,7 +52,7 @@ "semaphore-async-await": "^1.5.1" }, "devDependencies": { - "@0x/tslint-config": "^2.0.2", + "@0x/tslint-config": "^3.0.0", "@types/bip39": "^2.4.0", "@types/bn.js": "^4.11.0", "@types/ethereumjs-tx": "^1.0.0", diff --git a/packages/subproviders/src/globals.d.ts b/packages/subproviders/src/globals.d.ts index d174c2912..3cbf84e37 100644 --- a/packages/subproviders/src/globals.d.ts +++ b/packages/subproviders/src/globals.d.ts @@ -4,13 +4,13 @@ declare module '*.json' { export default json; /* tslint:enable */ } -declare module '@dexon-foundation/web3-provider-engine/util/rpc-cache-utils' { +declare module 'web3-provider-engine/util/rpc-cache-utils' { class ProviderEngineRpcUtils { public static blockTagForPayload(payload: any): string | null; } export = ProviderEngineRpcUtils; } -declare module '@dexon-foundation/web3-provider-engine/subproviders/fixture' { +declare module 'web3-provider-engine/subproviders/fixture' { import { JSONRPCRequestPayload, JSONRPCResponsePayload } from 'ethereum-types'; class FixtureSubprovider { constructor(staticResponses: any); diff --git a/packages/subproviders/src/index.ts b/packages/subproviders/src/index.ts index f438ea11a..bbb58c5a4 100644 --- a/packages/subproviders/src/index.ts +++ b/packages/subproviders/src/index.ts @@ -1,6 +1,6 @@ import Eth from '@ledgerhq/hw-app-eth'; import TransportU2F from '@ledgerhq/hw-transport-u2f'; -export import Web3ProviderEngine = require('@dexon-foundation/web3-provider-engine'); +export import Web3ProviderEngine = require('web3-provider-engine'); import { LedgerEthereumClient } from './types'; @@ -52,8 +52,16 @@ export { ECSignature, EIP712Object, EIP712ObjectValue, EIP712TypedData, EIP712Ty export { JSONRPCRequestPayload, - Provider, + SupportedProvider, JSONRPCResponsePayload, - JSONRPCErrorCallback, JSONRPCResponseError, + JSONRPCErrorCallback, + Web3JsProvider, + GanacheProvider, + EIP1193Provider, + ZeroExProvider, + EIP1193Event, + Web3JsV1Provider, + Web3JsV2Provider, + Web3JsV3Provider, } from 'ethereum-types'; diff --git a/packages/subproviders/src/subproviders/ganache.ts b/packages/subproviders/src/subproviders/ganache.ts index f42d6deac..6e53eeecc 100644 --- a/packages/subproviders/src/subproviders/ganache.ts +++ b/packages/subproviders/src/subproviders/ganache.ts @@ -1,5 +1,5 @@ -import { JSONRPCRequestPayload, Provider } from 'ethereum-types'; -import * as Ganache from '@dexon-foundation/ganache-core'; +import { GanacheProvider, JSONRPCRequestPayload } from 'ethereum-types'; +import * as Ganache from 'ganache-core'; import { Callback, ErrorCallback } from '../types'; @@ -10,7 +10,7 @@ import { Subprovider } from './subprovider'; * It intercepts all JSON RPC requests and relays them to an in-process ganache instance. */ export class GanacheSubprovider extends Subprovider { - private readonly _ganacheProvider: Provider; + private readonly _ganacheProvider: GanacheProvider; /** * Instantiates a GanacheSubprovider * @param opts The desired opts with which to instantiate the Ganache provider diff --git a/packages/subproviders/src/subproviders/metamask_subprovider.ts b/packages/subproviders/src/subproviders/metamask_subprovider.ts index ba207d4cc..bb85cf771 100644 --- a/packages/subproviders/src/subproviders/metamask_subprovider.ts +++ b/packages/subproviders/src/subproviders/metamask_subprovider.ts @@ -1,5 +1,6 @@ +import { providerUtils } from '@0x/utils'; import { marshaller, Web3Wrapper } from '@0x/web3-wrapper'; -import { JSONRPCRequestPayload, Provider } from 'ethereum-types'; +import { JSONRPCRequestPayload, SupportedProvider, ZeroExProvider } from 'ethereum-types'; import * as ethUtil from 'ethereumjs-util'; import { Callback, ErrorCallback } from '../types'; @@ -16,13 +17,14 @@ import { Subprovider } from './subprovider'; */ export class MetamaskSubprovider extends Subprovider { private readonly _web3Wrapper: Web3Wrapper; - private readonly _provider: Provider; + private readonly _provider: ZeroExProvider; /** * Instantiates a new MetamaskSubprovider - * @param provider Web3 provider that should handle all user account related requests + * @param supportedProvider Web3 provider that should handle all user account related requests */ - constructor(provider: Provider) { + constructor(supportedProvider: SupportedProvider) { super(); + const provider = providerUtils.standardizeOrThrow(supportedProvider); this._web3Wrapper = new Web3Wrapper(provider); this._provider = provider; } diff --git a/packages/subproviders/src/subproviders/nonce_tracker.ts b/packages/subproviders/src/subproviders/nonce_tracker.ts index 4e4013d23..eea722aee 100644 --- a/packages/subproviders/src/subproviders/nonce_tracker.ts +++ b/packages/subproviders/src/subproviders/nonce_tracker.ts @@ -3,7 +3,7 @@ import * as _ from 'lodash'; import { BlockParamLiteral, JSONRPCRequestPayload } from 'ethereum-types'; import EthereumTx = require('ethereumjs-tx'); import ethUtil = require('ethereumjs-util'); -import providerEngineUtils = require('@dexon-foundation/web3-provider-engine/util/rpc-cache-utils'); +import providerEngineUtils = require('web3-provider-engine/util/rpc-cache-utils'); import { Callback, ErrorCallback, NextCallback, NonceSubproviderErrors } from '../types'; diff --git a/packages/subproviders/src/subproviders/signer.ts b/packages/subproviders/src/subproviders/signer.ts index 9bd5cbdf1..21752c406 100644 --- a/packages/subproviders/src/subproviders/signer.ts +++ b/packages/subproviders/src/subproviders/signer.ts @@ -1,5 +1,5 @@ import { marshaller, Web3Wrapper } from '@0x/web3-wrapper'; -import { JSONRPCRequestPayload, Provider } from 'ethereum-types'; +import { JSONRPCRequestPayload, SupportedProvider } from 'ethereum-types'; import { Callback, ErrorCallback } from '../types'; @@ -15,11 +15,11 @@ export class SignerSubprovider extends Subprovider { private readonly _web3Wrapper: Web3Wrapper; /** * Instantiates a new SignerSubprovider. - * @param provider Web3 provider that should handle all user account related requests + * @param supportedProvider Web3 provider that should handle all user account related requests */ - constructor(provider: Provider) { + constructor(supportedProvider: SupportedProvider) { super(); - this._web3Wrapper = new Web3Wrapper(provider); + this._web3Wrapper = new Web3Wrapper(supportedProvider); } /** * This method conforms to the web3-provider-engine interface. diff --git a/packages/subproviders/src/subproviders/subprovider.ts b/packages/subproviders/src/subproviders/subprovider.ts index 214375dfd..444a8786b 100644 --- a/packages/subproviders/src/subproviders/subprovider.ts +++ b/packages/subproviders/src/subproviders/subprovider.ts @@ -1,6 +1,6 @@ import { promisify } from '@0x/utils'; import { JSONRPCRequestPayload, JSONRPCResponsePayload } from 'ethereum-types'; -import Web3ProviderEngine = require('@dexon-foundation/web3-provider-engine'); +import Web3ProviderEngine = require('web3-provider-engine'); import { Callback, ErrorCallback, JSONRPCRequestPayloadWithMethod } from '../types'; /** diff --git a/packages/subproviders/src/utils/subprovider_utils.ts b/packages/subproviders/src/utils/subprovider_utils.ts index f63699de2..beda408ab 100644 --- a/packages/subproviders/src/utils/subprovider_utils.ts +++ b/packages/subproviders/src/utils/subprovider_utils.ts @@ -1,4 +1,4 @@ -import Web3ProviderEngine = require('@dexon-foundation/web3-provider-engine'); +import Web3ProviderEngine = require('web3-provider-engine'); import { Subprovider } from '../subproviders/subprovider'; diff --git a/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts b/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts index e0fae763a..a5cef30dc 100644 --- a/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts +++ b/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts @@ -1,5 +1,5 @@ import * as chai from 'chai'; -import FixtureSubprovider = require('@dexon-foundation/web3-provider-engine/subproviders/fixture'); +import FixtureSubprovider = require('web3-provider-engine/subproviders/fixture'); import { promisify } from '@0x/utils'; import EthereumTx = require('ethereumjs-tx'); |