diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-07-16 20:38:27 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-07-16 20:38:27 +0800 |
| commit | acff177c547dee049b97e4b051fe22e1efaf992c (patch) | |
| tree | 4580187592aac7695c1edae15a6f68eea5b1078c /packages/migrations | |
| parent | ffeb3194a8f5e68c266f0bc6c70c6c9ba0754ec6 (diff) | |
| parent | 6bdee26c3037733ad198d54c1e88f3c7647ad230 (diff) | |
| download | dexon-0x-contracts-acff177c547dee049b97e4b051fe22e1efaf992c.tar.gz dexon-0x-contracts-acff177c547dee049b97e4b051fe22e1efaf992c.tar.zst dexon-0x-contracts-acff177c547dee049b97e4b051fe22e1efaf992c.zip | |
Merge branch 'v2-prototype' into feature/order-watcher-v2
Diffstat (limited to 'packages/migrations')
| -rw-r--r-- | packages/migrations/package.json | 3 | ||||
| -rw-r--r-- | packages/migrations/src/utils/provider_factory.ts | 12 |
2 files changed, 4 insertions, 11 deletions
diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 84f5025fa..2859bf286 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -60,8 +60,7 @@ "@ledgerhq/hw-app-eth": "^4.3.0", "ethereum-types": "^0.0.2", "ethers": "3.0.22", - "lodash": "^4.17.4", - "web3-provider-engine": "14.0.6" + "lodash": "^4.17.4" }, "optionalDependencies": { "@ledgerhq/hw-transport-node-hid": "^4.3.0" diff --git a/packages/migrations/src/utils/provider_factory.ts b/packages/migrations/src/utils/provider_factory.ts index 7a217b1e0..5f69b258d 100644 --- a/packages/migrations/src/utils/provider_factory.ts +++ b/packages/migrations/src/utils/provider_factory.ts @@ -1,10 +1,8 @@ -import { LedgerEthereumClient, LedgerSubprovider } from '@0xproject/subproviders'; +import { LedgerEthereumClient, LedgerSubprovider, RPCSubprovider, Web3ProviderEngine } from '@0xproject/subproviders'; import Eth from '@ledgerhq/hw-app-eth'; // tslint:disable:no-implicit-dependencies import TransportNodeHid from '@ledgerhq/hw-transport-node-hid'; import { Provider } from 'ethereum-types'; -import ProviderEngine = require('web3-provider-engine'); -import RpcSubprovider = require('web3-provider-engine/subproviders/rpc'); import { constants } from './constants'; @@ -15,18 +13,14 @@ async function ledgerEthereumNodeJsClientFactoryAsync(): Promise<LedgerEthereumC } export const providerFactory = { async getLedgerProviderAsync(): Promise<Provider> { - const provider = new ProviderEngine(); + const provider = new Web3ProviderEngine(); const ledgerWalletConfigs = { networkId: constants.KOVAN_NETWORK_ID, ledgerEthereumClientFactoryAsync: ledgerEthereumNodeJsClientFactoryAsync, }; const ledgerSubprovider = new LedgerSubprovider(ledgerWalletConfigs); provider.addProvider(ledgerSubprovider); - provider.addProvider( - new RpcSubprovider({ - rpcUrl: constants.RPC_URL, - }), - ); + provider.addProvider(new RPCSubprovider(constants.RPC_URL)); provider.start(); return provider; }, |