1.29.0-0.5.11: Revert lattice changes (#636)

Author: taylorjdawson

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bnc-onboard",
-  "version": "1.29.0-0.5.10",
+  "version": "1.29.0-0.5.11",
   "description": "Onboard users to web3 by allowing them to select a wallet, get that wallet ready to transact and have access to synced wallet state.",
   "keywords": [
     "ethereum",
@@ -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(