[trezor-v2.2.2-alpha.1] : Bug - Fix trezor signing issue by adding a new transaction type (#1246)

* Fix trezor issue by adding a new transaction type used by ethers in signing
* Fix yarn command in PR template
* Add empty fall back for value prop in transaction data
* Yarn it

Author: Adamj1232

packages/demo/package.json

@@ -36,7 +36,7 @@
     "@web3-onboard/portis": "^2.1.1",
     "@web3-onboard/sequence": "^2.0.0",
     "@web3-onboard/torus": "^2.1.1",
-    "@web3-onboard/trezor": "^2.3.0-alpha.1",
+    "@web3-onboard/trezor": "^2.3.0-alpha.2",
     "@web3-onboard/walletconnect": "^2.1.1",
     "@web3-onboard/web3auth": "^2.1.1",
     "vconsole": "^3.9.5"

packages/trezor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/trezor",
-  "version": "2.3.0-alpha.1",
+  "version": "2.3.0-alpha.2",
   "description": "Trezor hardware wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",
@@ -66,6 +66,6 @@
     "eth-crypto": "^2.1.0",
     "ethereumjs-util": "^7.1.3",
     "hdkey": "^2.0.1",
-    "trezor-connect": "^8.2.6"
+    "trezor-connect": "^8.2.11"
   }
 }

packages/trezor/src/index.ts

@@ -1,6 +1,12 @@
 import { Account, Asset, ScanAccountsOptions } from '@web3-onboard/hw-common'
 import type { StaticJsonRpcProvider } from '@ethersproject/providers'
 import type { TransactionRequest } from '@ethersproject/providers'
+import type {
+  FeeMarketEIP1559TxData,
+  TxData,
+  FeeMarketEIP1559Transaction,
+  Transaction
+} from '@ethereumjs/tx'
 
 // cannot be dynamically imported
 import { Buffer } from 'buffer'
@@ -132,7 +138,9 @@ function trezor(options: TrezorOptions): WalletInit {
       getIcon,
       getInterface: async ({ EventEmitter, chains }) => {
         const { default: Trezor } = await import('trezor-connect')
-        const { Transaction } = await import('@ethereumjs/tx')
+        const { Transaction, FeeMarketEIP1559Transaction } = await import(
+          '@ethereumjs/tx'
+        )
 
         const { createEIP1193Provider, ProviderRpcError } = await import(
           '@web3-onboard/common'
@@ -293,7 +301,7 @@ function trezor(options: TrezorOptions): WalletInit {
           ) {
             return {
               to: transactionData.to!,
-              value: transactionData.value!,
+              value: transactionData.value || '',
               gasLimit: gasLimit!,
               maxFeePerGas: transactionData.maxFeePerGas!,
               maxPriorityFeePerGas: transactionData.maxPriorityFeePerGas!,
@@ -306,7 +314,7 @@ function trezor(options: TrezorOptions): WalletInit {
           }
           return {
             to: transactionData.to!,
-            value: transactionData.value!,
+            value: transactionData.value || '',
             gasPrice: transactionData.gasPrice!,
             gasLimit: gasLimit!,
             nonce: transactionData.nonce!,
@@ -380,11 +388,11 @@ function trezor(options: TrezorOptions): WalletInit {
           const updateBigNumberFields =
             bigNumberFieldsToStrings(populatedTransaction)
 
-          // Set the `from` field to the currently selected account
           const transactionData = createTrezorTransactionObject(
             updateBigNumberFields as TransactionObject
           )
 
+          transactionData.from = address
           const chainId = currentChain.hasOwnProperty('id')
             ? Number(currentChain.id)
             : 1
@@ -404,26 +412,27 @@ function trezor(options: TrezorOptions): WalletInit {
             throw new Error(message)
           }
 
-          const { r, s } = trezorResult.payload
-          let v = trezorResult.payload.v
-
-          // EIP155 support. check/recalc signature v value.
-          const rv = parseInt(v, 16)
-          let cv = Number(currentChain.id) * 2 + 35
-          if (rv !== cv && (rv & cv) !== rv) {
-            cv += 1 // add signature v bit.
+          let signedTx: FeeMarketEIP1559Transaction | Transaction
+          if (
+            transactionData!.maxFeePerGas ||
+            transactionData!.maxPriorityFeePerGas
+          ) {
+            signedTx = FeeMarketEIP1559Transaction.fromTxData(
+              {
+                ...(transactionData as FeeMarketEIP1559TxData),
+                ...trezorResult.payload
+              },
+              { common }
+            )
+          } else {
+            signedTx = Transaction.fromTxData(
+              {
+                ...(transactionData as TxData),
+                ...trezorResult.payload
+              },
+              { common }
+            )
           }
-          v = cv.toString(16)
-
-          const signedTx = Transaction.fromTxData(
-            {
-              ...populatedTransaction,
-              v: `0x${v}`,
-              r: r,
-              s: s
-            },
-            { common }
-          )
           return signedTx ? `0x${signedTx.serialize().toString('hex')}` : ''
         }
 

pull_request_template.md

@@ -5,5 +5,5 @@
 - [ ] The version field in `package.json` is incremented following [semantic versioning](https://semver.org/)
 - [ ] The box that allows repo maintainers to update this PR is checked
 - [ ] I tested locally to make sure this feature/fix works
-- [ ] I have run `yarn type-check` & `yarn build` to confirm there are not any associated errors
+- [ ] I have run `yarn check` & `yarn build` to confirm there are not any associated errors
 - [ ] This PR passes the Circle CI checks

yarn.lock

@@ -2974,6 +2974,25 @@
   dependencies:
     "@walletconnect/window-getters" "^1.0.0"
 
+"@web3-onboard/core@^2.8.1":
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/@web3-onboard/core/-/core-2.8.1.tgz#559552f667850578e319a94ed98948d77da496f6"
+  integrity sha512-96wrXCYbXzjNC1r0r6fN2KMQddpSIrxunpTkhaO6IDiglEyX2+Im7OWktUxQDlwBce36gv6ahFwxL+dmAVXSkg==
+  dependencies:
+    "@web3-onboard/common" "^2.2.1"
+    bignumber.js "^9.0.0"
+    bnc-sdk "^4.4.1"
+    bowser "^2.11.0"
+    ethers "5.5.3"
+    eventemitter3 "^4.0.7"
+    joi "17.6.0"
+    lodash.merge "^4.6.2"
+    lodash.partition "^4.6.0"
+    nanoid "^4.0.0"
+    rxjs "^7.5.2"
+    svelte "^3.49.0"
+    svelte-i18n "^3.3.13"
+
 "@web3auth/base-plugin@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@web3auth/base-plugin/-/base-plugin-1.0.1.tgz#1e2a87acf745299fdff6f92e6c46ee9bc38aa670"
@@ -4596,7 +4615,7 @@ cross-fetch@^2.1.0:
     node-fetch "^2.6.7"
     whatwg-fetch "^2.0.4"
 
-cross-fetch@^3.1.4, cross-fetch@^3.1.5:
+cross-fetch@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
   integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
@@ -10275,13 +10294,13 @@ tr46@~0.0.3:
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
 
-trezor-connect@^8.2.6:
-  version "8.2.6"
-  resolved "https://registry.yarnpkg.com/trezor-connect/-/trezor-connect-8.2.6.tgz#2731f9af2837116307672aeba747cf29c02b6229"
-  integrity sha512-ioa/NkwtFHY94VI95q4JPdoDU3HaQFFIqdS47751zHa5q8qVBzwf5vgUrNS+q3vJ2ZNE7mTk/r4FjURtDB1xjA==
+trezor-connect@^8.2.11:
+  version "8.2.11"
+  resolved "https://registry.yarnpkg.com/trezor-connect/-/trezor-connect-8.2.11.tgz#6484a52f1e492748939f01a891ab9b2df28950c1"
+  integrity sha512-08yQrFJjZ/PjB4ZaHSnEwahG7cnc4FDndDxIen6kQ3hlpHmnu+J2V/ldUs5FOlZx22XDg5bhTKuIqytZrj9B0w==
   dependencies:
     "@babel/runtime" "^7.15.4"
-    cross-fetch "^3.1.4"
+    cross-fetch "^3.1.5"
     events "^3.3.0"
 
 ts-custom-error@^3.2.0: