Merge branch 'develop' into release/1.31.0

Author: taylorjdawson

package.json

@@ -75,6 +75,7 @@
     "eth-lattice-keyring": "^0.2.7",
     "eth-provider": "^0.6.1",
     "eth-sig-util": "^3.0.1",
+    "ethereumjs-tx": "^2.1.2",
     "ethereumjs-util": "^7.0.3",
     "fortmatic": "^2.2.1",
     "hdkey": "^2.0.1",

rollup.config.js

@@ -66,6 +66,7 @@ export default {
     'walletlink',
     'regenerator-runtime/runtime',
     'trezor-connect',
+    'ethereumjs-tx',
     '@ethereumjs/tx',
     '@ethereumjs/common',
     'ethereumjs-util',

src/@types/index.d.ts

@@ -8,6 +8,7 @@ declare module 'web3-provider-engine/subproviders/subscriptions'
 declare module 'web3-provider-engine/subproviders/filters'
 declare module 'trezor-connect'
 declare module 'eth-lattice-keyring'
+declare module 'ethereumjs-tx'
 declare module '@ethereumjs/tx'
 declare module '@ethereumjs/common'
 declare module 'ethereumjs-util'

src/modules/select/wallets/lattice.ts

@@ -1,24 +1,10 @@
-import {
-  LatticeOptions,
-  WalletModule,
-  HardwareWalletCustomNetwork,
-  Helpers
-} from '../../../interfaces'
+import { LatticeOptions, WalletModule, Helpers } from '../../../interfaces'
 import latticeIcon from '../wallet-icons/icon-lattice'
 
 function lattice(
   options: LatticeOptions & { networkId: number }
 ): WalletModule {
-  const {
-    appName,
-    rpcUrl,
-    networkId,
-    preferred,
-    label,
-    iconSrc,
-    svg,
-    customNetwork
-  } = options
+  const { appName, rpcUrl, networkId, preferred, label, iconSrc, svg } = options
 
   return {
     name: label || 'Lattice',
@@ -33,7 +19,6 @@ function lattice(
         networkId,
         BigNumber,
         networkName,
-        customNetwork,
         resetWalletState
       })
 
@@ -72,21 +57,18 @@ async function latticeProvider(options: {
   rpcUrl: string
   BigNumber: any
   networkName: (id: number) => string
-  customNetwork?: HardwareWalletCustomNetwork
   resetWalletState: (options?: {
     disconnected: boolean
     walletName: string
   }) => void
 }) {
   const { default: EthLatticeKeyring } = await import('eth-lattice-keyring')
-  const { Transaction } = await import('@ethereumjs/tx')
-  const { default: Common } = await import('@ethereumjs/common')
+  const EthereumTx = await import('ethereumjs-tx')
   const { default: createProvider } = await import('./providerEngine')
 
   const BASE_PATH = "m/44'/60'/0'/0"
 
-  const { networkId, appName, rpcUrl, BigNumber, networkName, customNetwork } =
-    options
+  const { networkId, appName, rpcUrl, BigNumber, networkName } = options
 
   const params = {
     name: appName,
@@ -246,17 +228,10 @@ async function latticeProvider(options: {
     if (addressList.length === 0) {
       await enable()
     }
-    const common = new Common({
-      chain: customNetwork || networkName(networkId)
-    })
 
-    const transaction = Transaction.fromTxData(
-      {
-        ...transactionData,
-        gasLimit: transactionData.gas ?? transactionData.gasLimit
-      },
-      { common, freeze: false }
-    )
+    const transaction = new EthereumTx.Transaction(transactionData, {
+      chain: networkName(networkId)
+    })
 
     try {
       const signedTx = await Lattice.signTransaction(

src/modules/select/wallets/trezor.ts

@@ -374,8 +374,8 @@ async function trezorProvider(options: {
     if (addressToPath.size === 0) {
       await enable()
     }
-
     const path = [...addressToPath.values()][0]
+    const { BN, toBuffer } = ethUtil
     const common = new Common({
       chain: customNetwork || networkName(networkId)
     })
@@ -386,18 +386,23 @@ async function trezorProvider(options: {
       },
       { common, freeze: false }
     )
-
+    transaction.v = new BN(toBuffer(networkId))
+    transaction.r = transaction.s = new BN(toBuffer(0))
     const trezorResult = await trezorSignTransaction(path, transactionData)
-
     if (!trezorResult.success) {
       throw new Error(trezorResult.payload.error)
     }
-
-    const signature = trezorResult.payload
-    transaction.v = signature.v
-    transaction.r = signature.r
-    transaction.s = signature.s
-
+    let v = trezorResult.payload.v.toString(16)
+    // EIP155 support. check/recalc signature v value.
+    const rv = parseInt(v, 16)
+    let cv = networkId * 2 + 35
+    if (rv !== cv && (rv & cv) !== rv) {
+      cv += 1 // add signature v bit.
+    }
+    v = cv.toString(16)
+    transaction.v = new BN(toBuffer(`0x${v}`))
+    transaction.r = new BN(toBuffer(`${trezorResult.payload.r}`))
+    transaction.s = new BN(toBuffer(`${trezorResult.payload.s}`))
     return `0x${transaction.serialize().toString('hex')}`
   }