Merge pull request #206 from MyEtherWallet/devop/wallet-update

reimplement chainid calculation and update for bitbox v5
MyEtherWallet · Dec 10, 2018 · 232061d · 232061d · mew-bot · Dec 10, 2018
2 parents 9db79d3 + 113a535
commit 232061d
Show file tree

Hide file tree

Showing 11 changed files with 267 additions and 200 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@
 
 ### Devop
 
+- ChainID calculation refactoring and BitBox v5 support [#206](https://github.com/MyEtherWallet/MyEtherWallet/pull/206)
 - Generate deterministic builds [#217](https://github.com/MyEtherWallet/MyEtherWallet/pull/217)
 - Use token package [#183](https://github.com/MyEtherWallet/MyEtherWallet/pull/183)
 - Update nonce properly on send and fetch, parse response properly [#185](https://github.com/MyEtherWallet/MyEtherWallet/pull/185)

diff --git a/src/wallets/WalletInterface.js b/src/wallets/WalletInterface.js
@@ -1,7 +1,8 @@
 import {
   getBufferFromHex,
   getSignTransactionObject,
-  sanitizeHex
+  sanitizeHex,
+  calculateChainIdFromV
 } from './utils';
 import ethUtil from 'ethereumjs-util';
 import ethTx from 'ethereumjs-tx';
@@ -65,7 +66,17 @@ class WalletInterface {
     return new Promise((resolve, reject) => {
       if (!this.isPubOnly) {
         const tx = new ethTx(txParams);
+        const networkId = tx._chainId;
         tx.sign(this.privateKey);
+        const signedChainId = calculateChainIdFromV(tx.v);
+        if (signedChainId !== networkId)
+          throw new Error(
+            'Invalid networkId signature returned. Expected: ' +
+              networkId +
+              ', Got: ' +
+              signedChainId,
+            'InvalidNetworkId'
+          );
         resolve(getSignTransactionObject(tx));
       } else {
         signer(txParams)