Tx: Cache sender (#2985)

* tx: cache sender * tx: add legacy tx to sender cache
ethereumjs · Aug 24, 2023 · 66e79cc · 66e79cc
1 parent 5f96687
commit 66e79cc
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 5 deletions.
diff --git a/packages/tx/src/baseTransaction.ts b/packages/tx/src/baseTransaction.ts
@@ -28,11 +28,12 @@ import type { Hardfork } from '@ethereumjs/common'
 import type { BigIntLike } from '@ethereumjs/util'
 
 interface TransactionCache {
-  hash: Uint8Array | undefined
+  hash?: Uint8Array
   dataFee?: {
     value: bigint
     hardfork: string | Hardfork
   }
+  senderPubKey?: Uint8Array
 }
 
 /**
@@ -62,6 +63,7 @@ export abstract class BaseTransaction<T extends TransactionType>
   protected cache: TransactionCache = {
     hash: undefined,
     dataFee: undefined,
+    senderPubKey: undefined,
   }
 
   protected readonly txOptions: TxOptions

diff --git a/packages/tx/src/eip1559Transaction.ts b/packages/tx/src/eip1559Transaction.ts
@@ -336,6 +336,10 @@ export class FeeMarketEIP1559Transaction extends BaseTransaction<TransactionType
    * Returns the public key of the sender
    */
   public getSenderPublicKey(): Uint8Array {
+    if (this.cache.senderPubKey !== undefined) {
+      return this.cache.senderPubKey
+    }
+
     if (!this.isSigned()) {
       const msg = this._errorMsg('Cannot call this method if transaction is not signed')
       throw new Error(msg)
@@ -347,12 +351,16 @@ export class FeeMarketEIP1559Transaction extends BaseTransaction<TransactionType
     this._validateHighS()
 
     try {
-      return ecrecover(
+      const sender = ecrecover(
         msgHash,
         v! + BigInt(27), // Recover the 27 which was stripped from ecsign
         bigIntToUnpaddedBytes(r!),
         bigIntToUnpaddedBytes(s!)
       )
+      if (Object.isFrozen(this)) {
+        this.cache.senderPubKey = sender
+      }
+      return sender
     } catch (e: any) {
       const msg = this._errorMsg('Invalid Signature')
       throw new Error(msg)

diff --git a/packages/tx/src/eip2930Transaction.ts b/packages/tx/src/eip2930Transaction.ts
@@ -307,6 +307,10 @@ export class AccessListEIP2930Transaction extends BaseTransaction<TransactionTyp
    * Returns the public key of the sender
    */
   public getSenderPublicKey(): Uint8Array {
+    if (this.cache.senderPubKey !== undefined) {
+      return this.cache.senderPubKey
+    }
+
     if (!this.isSigned()) {
       const msg = this._errorMsg('Cannot call this method if transaction is not signed')
       throw new Error(msg)
@@ -318,12 +322,16 @@ export class AccessListEIP2930Transaction extends BaseTransaction<TransactionTyp
     this._validateHighS()
 
     try {
-      return ecrecover(
+      const sender = ecrecover(
         msgHash,
         v! + BigInt(27), // Recover the 27 which was stripped from ecsign
         bigIntToUnpaddedBytes(r!),
         bigIntToUnpaddedBytes(s!)
       )
+      if (Object.isFrozen(this)) {
+        this.cache.senderPubKey = sender
+      }
+      return sender
     } catch (e: any) {
       const msg = this._errorMsg('Invalid Signature')
       throw new Error(msg)

diff --git a/packages/tx/src/eip4844Transaction.ts b/packages/tx/src/eip4844Transaction.ts
@@ -534,6 +534,10 @@ export class BlobEIP4844Transaction extends BaseTransaction<TransactionType.Blob
    * Returns the public key of the sender
    */
   public getSenderPublicKey(): Uint8Array {
+    if (this.cache.senderPubKey !== undefined) {
+      return this.cache.senderPubKey
+    }
+
     if (!this.isSigned()) {
       const msg = this._errorMsg('Cannot call this method if transaction is not signed')
       throw new Error(msg)
@@ -545,12 +549,16 @@ export class BlobEIP4844Transaction extends BaseTransaction<TransactionType.Blob
     this._validateHighS()
 
     try {
-      return ecrecover(
+      const sender = ecrecover(
         msgHash,
         v! + BigInt(27), // Recover the 27 which was stripped from ecsign
         bigIntToUnpaddedBytes(r!),
         bigIntToUnpaddedBytes(s!)
       )
+      if (Object.isFrozen(this)) {
+        this.cache.senderPubKey = sender
+      }
+      return sender
     } catch (e: any) {
       const msg = this._errorMsg('Invalid Signature')
       throw new Error(msg)

diff --git a/packages/tx/src/legacyTransaction.ts b/packages/tx/src/legacyTransaction.ts
@@ -286,20 +286,28 @@ export class LegacyTransaction extends BaseTransaction<TransactionType.Legacy> {
    * Returns the public key of the sender
    */
   getSenderPublicKey(): Uint8Array {
+    if (this.cache.senderPubKey !== undefined) {
+      return this.cache.senderPubKey
+    }
+
     const msgHash = this.getMessageToVerifySignature()
 
     const { v, r, s } = this
 
     this._validateHighS()
 
     try {
-      return ecrecover(
+      const sender = ecrecover(
         msgHash,
         v!,
         bigIntToUnpaddedBytes(r!),
         bigIntToUnpaddedBytes(s!),
         this.supports(Capability.EIP155ReplayProtection) ? this.common.chainId() : undefined
       )
+      if (Object.isFrozen(this)) {
+        this.cache.senderPubKey = sender
+      }
+      return sender
     } catch (e: any) {
       const msg = this._errorMsg('Invalid Signature')
       throw new Error(msg)