Merge pull request #186 from KeystoneHQ/fix/fix-eth-1559

chore: update package versions and dependencies to improve compatibility
KeystoneHQ · Feb 25, 2025 · 4c2033d · 4c2033d
2 parents b0b7ef7 + 4443a0f
commit 4c2033d
Show file tree

Hide file tree

Showing 5 changed files with 105 additions and 194 deletions.
diff --git a/packages/base-eth-keyring/package.json b/packages/base-eth-keyring/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keystonehq/base-eth-keyring",
-  "version": "0.14.1",
+  "version": "0.15.0",
   "description": "base eth keyring",
   "author": "aaronisme <[email protected]>",
   "homepage": "https://github.com/KeystoneHQ/keystone-airgaped-base#readme",
@@ -26,8 +26,9 @@
     "build": "tsdx build"
   },
   "dependencies": {
-    "@ethereumjs/tx": "^4.0.2",
+    "@ethereumjs/tx": "5.1.0",
     "@ethereumjs/util": "^8.0.0",
+    "@ethereumjs/rlp": "^4.0.1",
     "@keystonehq/bc-ur-registry-eth": "^0.19.1",
     "hdkey": "^2.0.1",
     "rlp": "^3.0.0",

diff --git a/packages/base-eth-keyring/src/BaseKeyring.ts b/packages/base-eth-keyring/src/BaseKeyring.ts
@@ -4,9 +4,9 @@ import {
   publicToAddress,
   stripHexPrefix,
 } from "@ethereumjs/util";
-import rlp from "rlp";
+import { RLP } from "@ethereumjs/rlp";
 import {
-  Transaction,
+  LegacyTransaction as Transaction,
   FeeMarketEIP1559Transaction,
   TransactionFactory,
   TypedTransaction,
@@ -436,11 +436,11 @@ export class BaseKeyring {
     let messageToSign: Buffer;
     if (tx.type === 0) {
       messageToSign = Buffer.from(
-        rlp.encode((tx as Transaction).getMessageToSign(false))
+        RLP.encode((tx as Transaction).getMessageToSign())
       );
     } else {
-      messageToSign = (tx as FeeMarketEIP1559Transaction).getMessageToSign(
-        false
+      messageToSign = Buffer.from(
+        (tx as FeeMarketEIP1559Transaction).serialize()
       );
     }
     const hdPath = await this._pathFromAddress(address);
@@ -500,7 +500,14 @@ export class BaseKeyring {
       "Scan with your Keystone",
       'After your Keystone has signed this message, click on "Scan Keystone" to receive the signature'
     );
-    return "0x" + Buffer.concat([r, s, v]).toString("hex");
+    return (
+      "0x" +
+      Buffer.concat([
+        Uint8Array.from(r),
+        Uint8Array.from(s),
+        Uint8Array.from(v),
+      ]).toString("hex")
+    );
   }
 
   async signTypedData(withAccount: string, typedData: any): Promise<string> {
@@ -521,7 +528,14 @@ export class BaseKeyring {
       "Scan with your Keystone",
       'After your Keystone has signed this data, click on "Scan Keystone" to receive the signature'
     );
-    return "0x" + Buffer.concat([r, s, v]).toString("hex");
+    return (
+      "0x" +
+      Buffer.concat([
+        Uint8Array.from(r),
+        Uint8Array.from(s),
+        Uint8Array.from(v),
+      ]).toString("hex")
+    );
   }
 
   __addressFromIndex = async (pb: string, i: number): Promise<string> => {

diff --git a/packages/metamask-airgapped-keyring/package.json b/packages/metamask-airgapped-keyring/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keystonehq/metamask-airgapped-keyring",
-  "version": "0.14.1",
+  "version": "0.15.0",
   "description": "airgapped eth keyring for metamask",
   "author": "aaronisme <[email protected]>",
   "homepage": "https://github.com/KeystoneHQ/keystone-airgaped-base#readme",
@@ -26,8 +26,10 @@
     "build": "tsdx build"
   },
   "dependencies": {
-    "@ethereumjs/tx": "^4.0.2",
-    "@keystonehq/base-eth-keyring": "^0.14.1",
+    "@ethereumjs/rlp": "^4.0.1",
+    "@ethereumjs/tx": "5.1.0",
+    "@ethereumjs/util": "9.1.0",
+    "@keystonehq/base-eth-keyring": "workspace:^",
     "@keystonehq/bc-ur-registry-eth": "^0.19.1",
     "@metamask/obs-store": "^9.0.0",
     "rlp": "^2.2.6",

diff --git a/packages/metamask-airgapped-keyring/src/MetaMaskKeyring.ts b/packages/metamask-airgapped-keyring/src/MetaMaskKeyring.ts
@@ -2,12 +2,12 @@ import { BaseKeyring, StoredKeyring } from "@keystonehq/base-eth-keyring";
 import { MetamaskInteractionProvider } from "./MetaMaskInteractionProvider";
 import {
   TransactionFactory,
-  Transaction,
+  LegacyTransaction as Transaction,
   FeeMarketEIP1559Transaction,
 } from "@ethereumjs/tx";
 import { DataType, EthSignRequest } from "@keystonehq/bc-ur-registry-eth";
 import * as uuid from "uuid";
-import rlp from "rlp";
+import { RLP } from "@ethereumjs/rlp";
 
 export class MetaMaskKeyring extends BaseKeyring {
   static type = BaseKeyring.type;
@@ -38,10 +38,12 @@ export class MetaMaskKeyring extends BaseKeyring {
       tx.type === 0 ? DataType.transaction : DataType.typedTransaction;
     let messageToSign;
     if (tx.type === 0) {
-      messageToSign = rlp.encode((tx as Transaction).getMessageToSign(false));
+      messageToSign = Buffer.from(
+        RLP.encode((tx as Transaction).getMessageToSign())
+      );
     } else {
-      messageToSign = (tx as FeeMarketEIP1559Transaction).getMessageToSign(
-        false
+      messageToSign = Buffer.from(
+        (tx as FeeMarketEIP1559Transaction).serialize()
       );
     }
     const hdPath = await this._pathFromAddress(address);