Bump ethereumjs/** versions (#153)

Co-authored-by: legobt <[email protected]>

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

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/utils": "^5.0.0",
     "eth-sig-util": "^2.0.0",
-    "ethereumjs-util": "^7.0.9",
     "hdkey": "0.8.0"
   },
   "devDependencies": {
@@ -90,11 +91,8 @@
   "lavamoat": {
     "allowScripts": {
       "@lavamoat/preinstall-always-fail": false,
-      "eth-sig-util>ethereumjs-abi>ethereumjs-util>keccak": false,
-      "eth-sig-util>ethereumjs-util>keccak": false,
-      "ethereumjs-tx>ethereumjs-util>keccak": false,
-      "ethereumjs-util>ethereum-cryptography>keccak": false,
-      "ethereumjs-util>ethereum-cryptography>secp256k1": false,
+      "eth-sig-util>ethereumjs-util>ethereum-cryptography>keccak": false,
+      "eth-sig-util>ethereumjs-util>ethereum-cryptography>secp256k1": false,
       "hdkey>secp256k1": false
     }
   }

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 sigUtil from 'eth-sig-util';
 import EthereumTx from 'ethereumjs-tx';
-import * as ethUtil from 'ethereumjs-util';
 import HDKey from 'hdkey';
 
 import { LedgerBridge } from './ledger-bridge';
@@ -536,9 +537,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;
           });

src/ledger-keyring.ts

@@ -1,9 +1,10 @@
+import { RLP } from '@ethereumjs/rlp';
 import { TransactionFactory, TxData, TypedTransaction } from '@ethereumjs/tx';
+import * as ethUtil from '@ethereumjs/util';
 // eslint-disable-next-line import/no-nodejs-modules
 import { Buffer } from 'buffer';
 import * as sigUtil from 'eth-sig-util';
 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';
@@ -333,7 +334,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