Updates to provider engine

Author: lnbc1QWFyb24

rollup.config.js

@@ -58,7 +58,6 @@ export default {
     '@toruslabs/torus-embed',
     'lodash.debounce',
     'regenerator-runtime/runtime',
-    'web3-provider-engine',
     'trezor-connect',
     'ethereumjs-tx',
     '@ledgerhq/hw-transport-u2f',
@@ -67,7 +66,10 @@ export default {
     'assert',
     'buffer',
     'stream',
+    'web3-provider-engine',
     'web3-provider-engine/subproviders/hooked-wallet',
-    'web3-provider-engine/subproviders/rpc'
+    'web3-provider-engine/subproviders/rpc',
+    'web3-provider-engine/subproviders/subscriptions',
+    'web3-provider-engine/subproviders/filters'
   ]
 }

src/@types/index.d.ts

@@ -4,6 +4,8 @@ declare module '@walletconnect/web3-provider'
 declare module 'web3-provider-engine'
 declare module 'web3-provider-engine/subproviders/rpc'
 declare module 'web3-provider-engine/subproviders/hooked-wallet'
+declare module 'web3-provider-engine/subproviders/subscriptions'
+declare module 'web3-provider-engine/subproviders/filters'
 declare module 'trezor-connect'
 declare module 'ethereumjs-tx'
 declare module '@ledgerhq/hw-app-eth'

src/modules/select/wallets/ledger.ts

@@ -6,9 +6,8 @@ import {
 } from '../../../interfaces'
 import ledgerIcon from '../wallet-icons/icon-ledger'
 
-import Web3ProviderEngine from 'web3-provider-engine'
-import RpcSource from 'web3-provider-engine/subproviders/rpc'
-import HookedWalletSubprovider from 'web3-provider-engine/subproviders/hooked-wallet'
+import createProvider from './providerEngine'
+
 import TransportU2F from '@ledgerhq/hw-transport-u2f'
 import Eth from '@ledgerhq/hw-app-eth'
 import { Transaction } from 'ethereumjs-tx'
@@ -81,7 +80,7 @@ async function ledgerProvider(options: {
 
   let enabled: boolean = false
 
-  const ledgerSubProvider = new HookedWalletSubprovider({
+  const provider = createProvider({
     getAccounts: (callback: any) => {
       getAccounts()
         .then((res: Array<any>) => callback(null, res))
@@ -91,26 +90,19 @@ async function ledgerProvider(options: {
       signTransaction(transactionData)
         .then((res: string) => callback(null, res))
         .catch(err => callback(err, null))
-    }
-  })
-
-  const rpcSubProvider = new RpcSource({
-    rpcUrl: rpcUrl.includes('http') ? rpcUrl : `https://${rpcUrl}`
+    },
+    rpcUrl
   })
-  const provider = new Web3ProviderEngine()
 
-  provider.on('error', (err: any) => {})
+  provider.on('error', (err: any) => console.log('provider error', err))
 
   provider.getPrimaryAddress = getPrimaryAddress
   provider.getAllAccountsAndBalances = getAllAccountsAndBalances
   provider.enable = enable
   provider.on = on
   provider.setPrimaryAccount = setPrimaryAccount
   provider.getBalance = getBalance
-
-  provider.addProvider(ledgerSubProvider)
-  provider.addProvider(rpcSubProvider)
-  provider.start()
+  provider.send = provider.sendAsync
 
   function enable() {
     enabled = true

src/modules/select/wallets/providerEngine.ts

@@ -0,0 +1,27 @@
+import Web3ProviderEngine from 'web3-provider-engine'
+import RpcSource from 'web3-provider-engine/subproviders/rpc'
+import HookedWalletSubprovider from 'web3-provider-engine/subproviders/hooked-wallet'
+import SubscriptionSubprovider from 'web3-provider-engine/subproviders/subscriptions'
+import FilterSubprovider from 'web3-provider-engine/subproviders/filters'
+
+function createProvider(config: any) {
+  const { getAccounts, signTransaction, rpcUrl } = config
+
+  const idMgmt = new HookedWalletSubprovider({ getAccounts, signTransaction })
+
+  const rpcSubProvider = new RpcSource({
+    rpcUrl: rpcUrl.includes('http') ? rpcUrl : `https://${rpcUrl}`
+  })
+
+  const provider = new Web3ProviderEngine()
+
+  provider.addProvider(new SubscriptionSubprovider())
+  provider.addProvider(new FilterSubprovider())
+  provider.addProvider(idMgmt)
+  provider.addProvider(rpcSubProvider)
+  provider.start()
+
+  return provider
+}
+
+export default createProvider

src/modules/select/wallets/trezor.ts

@@ -6,11 +6,10 @@ import {
 } from '../../../interfaces'
 import trezorIcon from '../wallet-icons/icon-trezor'
 
-import Web3ProviderEngine from 'web3-provider-engine'
-import RpcSource from 'web3-provider-engine/subproviders/rpc'
-import HookedWalletSubprovider from 'web3-provider-engine/subproviders/hooked-wallet'
+import createProvider from './providerEngine'
+
 import * as TrezorConnectLibrary from 'trezor-connect'
-import EthereumTx from 'ethereumjs-tx'
+import * as EthereumTx from 'ethereumjs-tx'
 
 const { default: TrezorConnect, DEVICE_EVENT, DEVICE } = TrezorConnectLibrary
 
@@ -105,7 +104,7 @@ async function trezorProvider(options: {
     }
   })
 
-  const trezorSubProvider = new HookedWalletSubprovider({
+  const provider = createProvider({
     getAccounts: (callback: any) => {
       getAccounts()
         .then((res: Array<string>) => callback(null, res))
@@ -115,26 +114,19 @@ async function trezorProvider(options: {
       signTransaction(transactionData)
         .then((res: string) => callback(null, res))
         .catch(err => callback(err, null))
-    }
-  })
-
-  const rpcSubProvider = new RpcSource({
-    rpcUrl: rpcUrl.includes('http') ? rpcUrl : `https://${rpcUrl}`
+    },
+    rpcUrl
   })
-  const provider = new Web3ProviderEngine()
 
-  provider.on('error', (err: any) => {})
+  provider.on('error', (err: any) => console.log('provider error', err))
 
   provider.getPrimaryAddress = getPrimaryAddress
   provider.getAllAccountsAndBalances = getAllAccountsAndBalances
   provider.enable = enable
   provider.on = on
   provider.setPrimaryAccount = setPrimaryAccount
   provider.getBalance = getBalance
-
-  provider.addProvider(trezorSubProvider)
-  provider.addProvider(rpcSubProvider)
-  provider.start()
+  provider.send = provider.sendAsync
 
   function enable() {
     enabled = true
@@ -284,7 +276,7 @@ async function trezorProvider(options: {
   async function signTransaction(transactionData: any) {
     const path = [...addressToPath.values()][0]
 
-    const transaction = new EthereumTx(transactionData, {
+    const transaction = new EthereumTx.Transaction(transactionData, {
       chain: networkName(networkId)
     })
     const trezorResult = await trezorSignTransaction(path, transactionData)