Merge remote-tracking branch 'mm/main' into update-eth-sig-util-version

MetaMask · Oct 10, 2023 · f709645 · f709645
2 parents 36d2ab4 + 30ddc3a
commit f709645
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 191 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -43,8 +43,8 @@ module.exports = {
     global: {
       branches: 65.42,
       functions: 88.57,
-      lines: 81.57,
-      statements: 81.49,
+      lines: 81.63,
+      statements: 81.55,
     },
   },
 

diff --git a/package.json b/package.json
@@ -37,10 +37,11 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
+    "@ethereumjs/rlp": "^4.0.0",
     "@ethereumjs/tx": "^4.1.1",
+    "@ethereumjs/util": "^8.0.0",
     "@metamask/eth-sig-util": "^6.0.1",
     "@metamask/utils": "^5.0.0",
-    "ethereumjs-util": "^7.0.9",
     "hdkey": "0.8.0"
   },
   "devDependencies": {
@@ -91,11 +92,9 @@
   "lavamoat": {
     "allowScripts": {
       "@lavamoat/preinstall-always-fail": false,
+      "@ledgerhq/hw-app-eth>@ledgerhq/domain-service>eip55>keccak": false,
       "ethereumjs-tx>ethereumjs-util>keccak": false,
-      "ethereumjs-util>ethereum-cryptography>keccak": false,
-      "ethereumjs-util>ethereum-cryptography>secp256k1": false,
-      "hdkey>secp256k1": false,
-      "@ledgerhq/hw-app-eth>@ledgerhq/domain-service>eip55>keccak": false
+      "hdkey>secp256k1": false
     }
   }
 }
diff --git a/src/ledger-keyring.test.ts b/src/ledger-keyring.test.ts
@@ -1,8 +1,9 @@
 import { Common, Chain, Hardfork } from '@ethereumjs/common';
+import { RLP } from '@ethereumjs/rlp';
 import { TransactionFactory } from '@ethereumjs/tx';
+import * as ethUtil from '@ethereumjs/util';
 import * as sigUtil from '@metamask/eth-sig-util';
 import EthereumTx from 'ethereumjs-tx';
-import * as ethUtil from 'ethereumjs-util';
 import HDKey from 'hdkey';
 
 import { LedgerBridge } from './ledger-bridge';
@@ -544,9 +545,7 @@ describe('LedgerKeyring', function () {
           .mockImplementation(async (params) => {
             expect(params).toStrictEqual({
               hdPath: "m/44'/60'/0'/0",
-              tx: ethUtil.rlp
-                .encode(newFakeTx.getMessageToSign(false))
-                .toString('hex'),
+              tx: RLP.encode(newFakeTx.getMessageToSign(false)).toString(),
             });
             return expectedRSV;
           });

diff --git a/src/ledger-keyring.ts b/src/ledger-keyring.ts
@@ -1,4 +1,6 @@
+import { RLP } from '@ethereumjs/rlp';
 import { TransactionFactory, TxData, TypedTransaction } from '@ethereumjs/tx';
+import * as ethUtil from '@ethereumjs/util';
 import type { MessageTypes, TypedMessage } from '@metamask/eth-sig-util';
 import {
   recoverPersonalSignature,
@@ -9,7 +11,6 @@ import {
 // eslint-disable-next-line import/no-nodejs-modules
 import { Buffer } from 'buffer';
 import type OldEthJsTransaction from 'ethereumjs-tx';
-import * as ethUtil from 'ethereumjs-util';
 // eslint-disable-next-line import/no-nodejs-modules
 import { EventEmitter } from 'events';
 import HDKey from 'hdkey';
@@ -339,7 +340,7 @@ export class LedgerKeyring extends EventEmitter {
 
     rawTxHex = Buffer.isBuffer(messageToSign)
       ? messageToSign.toString('hex')
-      : ethUtil.rlp.encode(messageToSign).toString('hex');
+      : RLP.encode(messageToSign).toString();
 
     return this.#signTransaction(address, rawTxHex, (payload) => {
       // Because tx will be immutable, first get a plain javascript object that