Support blob txs by upgrading to latest dependencies

package.json

@@ -11,9 +11,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@ethereumjs/common": "^3.2.0",
-    "@ethereumjs/tx": "^4.2.0",
-    "@ethereumjs/util": "^8.1.0",
+    "@ethereumjs/common": "^4.3.0",
+    "@ethereumjs/tx": "^5.3.0",
+    "@ethereumjs/util": "^9.0.3",
     "@google-cloud/kms": "^4.2.0",
     "asn1js": "^3.0.5",
     "axios": "^1.6.8",

src/server.ts

@@ -66,7 +66,7 @@ async function handleEthSignTransaction(transactionArgs: TransactionArgs) {
 
 const start = async () => {
   try {
-    await app.listen({host:"0.0.0.0", port: 8000});
+    await app.listen({port: 8000});
     console.log('Server running at https://localhost:8000/');
   } catch (err) {
     console.error(err);

src/web3-kms-signer/core/Signer.ts

@@ -2,11 +2,10 @@ import {
     addHexPrefix,
     fromSigned,
     toUnsigned,
-    bigIntToBuffer,
     hashPersonalMessage,
-    bufferToBigInt, toBuffer
+    bigIntToBytes
 } from '@ethereumjs/util'
-import { TxData } from '@ethereumjs/tx';
+import { TypedTxData } from '@ethereumjs/tx';
 import { Common } from '@ethereumjs/common'
 import { Wallets } from './Wallets';
 import { UBuffer } from './Utils/UBuffer';
@@ -43,13 +42,13 @@ export class Signer {
      * @param txData The transaction data to sign.
      * @returns A Promise that resolves to the serialized transaction as a '0x'-prefixed hex string.
      */
-    public async signTransaction(account: { keyId: string, address?: Buffer }, txData: TxData) {
+    public async signTransaction(account: { keyId: string, address?: Buffer }, txData: TypedTxData) {
         let tx = TransactionFactory.fromTxData(txData, { common: this.common });
-        const digest     = tx.getMessageToSign()
-        const txType = Number(bufferToBigInt(toBuffer(txData.type)))
-        const {r, s, v}  = await this.wallets.ecsign(account, digest, txType, this.common?.chainId());
+        const digest     =  Buffer.from(tx.getHashedMessageToSign())
+
+        const {r, s, v}  = await this.wallets.ecsign(account, digest, tx.type, this.common?.chainId());
         const signed     = TransactionFactory.fromTxData({...txData, r, s, v}, { common: this.common });
-        return addHexPrefix(signed.serialize().toString('hex'));
+        return addHexPrefix(Buffer.from(signed.serialize()).toString('hex'));
     }
 
     /**
@@ -61,7 +60,7 @@ export class Signer {
      */
     public async signMessage(account: { keyId: string, address?: Buffer }, message: string) {
         const digest = hashPersonalMessage(Buffer.from(message));
-        return this.signDigest(account, digest);
+        return this.signDigest(account, Buffer.from(digest));
     }
 
     /**
@@ -73,9 +72,9 @@ export class Signer {
     public async signDigest(account: { keyId: string, address?: Buffer }, digest: string | Buffer) {
         const {r, s, v} = await this.wallets.ecsign(account, UBuffer.bufferOrHex(digest));
 
-        const rStr = toUnsigned(fromSigned(r)).toString('hex');
-        const sStr = toUnsigned(fromSigned(s)).toString('hex');
-        const vStr = bigIntToBuffer(v).toString('hex');
+        const rStr = Buffer.from(toUnsigned(fromSigned(r))).toString('hex');
+        const sStr = Buffer.from(toUnsigned(fromSigned(s))).toString('hex');
+        const vStr = Buffer.from(bigIntToBytes(v)).toString('hex');
 
         return addHexPrefix(rStr.concat(sStr, vStr));
     }

src/web3-kms-signer/core/Utils/UAddress.ts

@@ -19,7 +19,7 @@ export class UAddress {
      * Returns the wallet's address as a "0x" prefixed hex
      */
     public getAddressHex(): string {
-        return ethutil.bufferToHex(this.getAddress()).toLowerCase();
+        return UBuffer.bufferToHex(this.getAddress()).toLowerCase();
     }
 
     /**
@@ -35,7 +35,7 @@ export class UAddress {
      */
 
     public static fromPublickey(input: Buffer | string) {
-        return new UAddress(ethutil.publicToAddress(UBuffer.bufferOrHex(input)));
+        return new UAddress(Buffer.from(ethutil.publicToAddress(UBuffer.bufferOrHex(input))));
     }
 
     public static fromAddress(input: Buffer | string) {

src/web3-kms-signer/core/Utils/UBuffer.ts

@@ -2,4 +2,8 @@ export class UBuffer {
     public static bufferOrHex(input: Buffer | string) {
         return (input instanceof Buffer) ? input : Buffer.from(input.replace('0x', ''), 'hex');
     }
+
+    public static  bufferToHex = function (buf: Buffer): string {
+        return '0x' + buf.toString('hex')
+    }
 }

src/web3-kms-signer/core/Utils/UPublickey.ts

@@ -24,7 +24,7 @@ export class UPublickey {
      * Returns the wallet's public key as a "0x" prefixed hex
      */
     public getPublickeyHex(): string {
-        return ethutil.bufferToHex(this.getPublickey()).toLowerCase();
+        return UBuffer.bufferToHex(this.getPublickey()).toLowerCase();
     }
 
     /**
@@ -54,14 +54,14 @@ export class UPublickey {
      */
 
     public static fromPrivatekey(input: Buffer | string) {
-        return new UPublickey(ethutil.privateToPublic(UBuffer.bufferOrHex(input)));
+        return new UPublickey(Buffer.from(ethutil.privateToPublic(UBuffer.bufferOrHex(input))));
     }
 
     public static fromPublickey(input: Buffer | string) {
         return new UPublickey(UBuffer.bufferOrHex(input));
     }
 
     public static fromVRS(digest: Buffer, v: bigint, r: Buffer, s: Buffer, chainId?: bigint) {
-        return new UPublickey(ethutil.ecrecover(digest, v, r, s, chainId));
+        return new UPublickey(Buffer.from(ethutil.ecrecover(digest, v, r, s, chainId)));
     }
 }