@exodus/ethereum-lib 4.2.0 → 4.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "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": "419d8b4d0d4f8617b8da97a5dd9d3e328a948ae6"
 }

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)
 }