@exodus/ethereum-lib 4.2.0 → 4.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "files": [
@@ -40,8 +40,9 @@
     "@exodus/solidity-contract": "^1.1.3",
     "base-x": "^3.0.2",
     "lodash": "^4.17.15",
+    "minimalistic-assert": "^1.0.1",
     "ms": "^2.1.1",
     "reselect": "~3.0.1"
   },
-  "gitHead": "c5aba08d687ed0470b9fea821879d41149156897"
+  "gitHead": "2ed589d85c4eff1a4b41d1d161c8dd0b1a0c3150"
 }

package/src/unsigned-tx/create-ethereumjs-tx.js

@@ -1,47 +1,38 @@
-/* @flow */
 import { Transaction, FeeMarketEIP1559Transaction } from '@exodus/ethereumjs-tx'
-import Common from '@exodus/ethereumjs-common'
+import Common, { Hardfork } from '@exodus/ethereumjs-common'
 
-import type { UnsignedTransaction } from '@exodus/models/lib/types'
-import { CUSTOM_CHAINS } from '../constants'
-
-export default function createEthereumJsTx(unsignedTx: UnsignedTransaction) {
+export default function createEthereumJsTx(unsignedTx) {
   const {
-    txData: { gasPrice, tipGasPrice: maxPriorityFeePerGas, chainId: chain, ...txData },
+    txData: { chainId, ...txData },
     txMeta: { eip1559Enabled },
   } = unsignedTx
+  const { gasPrice, tipGasPrice } = txData
 
-  let tx
   /*
-    To assemble an EIP 1559 tx,
-    both `tipGasPrice` and `eip` must have been set in the input object used to build `unsignedTx`.
-    Whether bsc will support EIP 1559 is unknown.
-    So we must prevent building accidentally an EIP1559 tx on bsc if tipGasPrice is set
-    `eip` will be set with s corresponding feature flag in the wallet
+    EIP1559 is not supported by all ethereum-like assets.
+    e.g BSC does not support EIP1559 at the moment, prevent building an EIP1559 transaction
+    if `tipGasPrice` or `maxPriorityFeePerGas` is set.
   */
-  if (maxPriorityFeePerGas && eip1559Enabled) {
-    tx = FeeMarketEIP1559Transaction.fromTxData(
+  const isEip1559Tx = !!(unsignedTx.txData.tipGasPrice || unsignedTx.txData.maxPriorityFeePerGas)
+  if (eip1559Enabled && isEip1559Tx) {
+    return FeeMarketEIP1559Transaction.fromTxData(
       {
         maxFeePerGas: gasPrice,
-        maxPriorityFeePerGas,
-        type: '0x02', // https://github.com/ethereumjs/ethereumjs-monorepo/tree/master/packages/tx#gas-fee-market-transactions-eip-1559,
+        maxPriorityFeePerGas: tipGasPrice,
+        // `maxPriorityFeePerGas`, `maxFeePerGas` set in `txData` below take precedence over ^.
         ...txData,
       },
       {
-        common: new Common({
-          chain,
-          hardfork: 'london',
-          customChains: CUSTOM_CHAINS,
-          eips: [1559],
-        }),
+        common: Common.custom(
+          {
+            chainId,
+          },
+          { hardfork: Hardfork.London }
+        ),
       }
     )
   } else {
     // Legacy tx
-    tx = Transaction.fromTxData(
-      { gasPrice, ...txData },
-      { common: Common.custom({ chainId: chain }) }
-    )
+    return Transaction.fromTxData(txData, { common: Common.custom({ chainId }) })
   }
-  return tx
 }

package/src/unsigned-tx/sign-hardware.js

@@ -1,3 +1,4 @@
+import assert from 'minimalistic-assert'
 import createEthereumJsTx from './create-ethereumjs-tx'
 
 export const signHardwareFactory = ({ baseAssetName }) => async ({
@@ -29,14 +30,27 @@ async function signWithHardwareWallet({ baseAssetName, tx, hardwareDevice, accou
   })
 
   const { signature } = signatures[0]
-
-  let v = signature.slice(0, 1)[0]
+  assert(signature.length >= 65, `signature length should be 65 or more`)
+  const V_SIZE = signature.length - 64
+  let v = Number.parseInt(signature.slice(0, V_SIZE).toString('hex'), '16')
   if (v === 0 || v === 1) {
-    // Undo the parity
-    v = v + 27
+    // _processSignature for EIP1559 expects 27 or 28.
+    // hardware wallets on the other hand already precomputed the final v (0, 1).
+    const diff = 27
+    v += diff
+  } else if (tx.common.chainId !== undefined) {
+    // _processSignature for legacy transactions expects 27 or 28.
+    // hardware wallets on the other hand already precomputed the final v (chainId * 2 + 35 + parity).
+    const diff = tx.common
+      .chainIdBN()
+      .muln(2)
+      .addn(8)
+      .toNumber()
+    v -= diff
   }
-  const r = signature.slice(1, 1 + 32)
-  const s = signature.slice(1 + 32, 1 + 32 + 32)
+  assert([27, 28].includes(v), `unexpected v-value, expected 27 or 28 but got ${v} `)
+  const r = signature.slice(V_SIZE, V_SIZE + 32)
+  const s = signature.slice(V_SIZE + 32, V_SIZE + 32 + 32)
 
   return tx._processSignature(v, r, s)
 }