tx: invalidate cached dataFee on hardfork change

ethereumjs · Oct 26, 2021 · abcfd9c · abcfd9c · github-actions · Oct 26, 2021
1 parent 9021108
commit abcfd9c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/packages/tx/src/eip1559Transaction.ts b/packages/tx/src/eip1559Transaction.ts
@@ -236,14 +236,14 @@ export default class FeeMarketEIP1559Transaction extends BaseTransaction<FeeMark
    * The amount of gas paid for the data in this tx
    */
   getDataFee(): BN {
-    if (Object.isFrozen(this) && this.cache.dataFee) {
+    if (this.cache.dataFee) {
       return this.cache.dataFee
     }
 
     const cost = super.getDataFee()
     cost.iaddn(AccessLists.getDataFeeEIP2930(this.accessList, this.common))
 
-    if (Object.isFrozen(this) && !this.cache.dataFee) {
+    if (Object.isFrozen(this)) {
       this.cache.dataFee = cost
     }
 

diff --git a/packages/tx/src/eip2930Transaction.ts b/packages/tx/src/eip2930Transaction.ts
@@ -210,14 +210,14 @@ export default class AccessListEIP2930Transaction extends BaseTransaction<Access
    * The amount of gas paid for the data in this tx
    */
   getDataFee(): BN {
-    if (Object.isFrozen(this) && this.cache.dataFee) {
+    if (this.cache.dataFee) {
       return this.cache.dataFee
     }
 
     const cost = super.getDataFee()
     cost.iaddn(AccessLists.getDataFeeEIP2930(this.accessList, this.common))
 
-    if (Object.isFrozen(this) && !this.cache.dataFee) {
+    if (Object.isFrozen(this)) {
       this.cache.dataFee = cost
     }
 

diff --git a/packages/tx/src/legacyTransaction.ts b/packages/tx/src/legacyTransaction.ts
@@ -128,8 +128,13 @@ export default class Transaction extends BaseTransaction<Transaction> {
     }
 
     const freeze = opts?.freeze ?? true
+
     if (freeze) {
       Object.freeze(this)
+
+      this.common.on('hardforkChanged', () => {
+        delete this.cache.dataFee
+      })
     }
   }
 
@@ -222,12 +227,14 @@ export default class Transaction extends BaseTransaction<Transaction> {
    * The amount of gas paid for the data in this tx
    */
   getDataFee(): BN {
-    if (Object.isFrozen(this)) {
-      if (!this.cache.dataFee) {
-        this.cache.dataFee = super.getDataFee()
-      }
+    if (this.cache.dataFee) {
       return this.cache.dataFee
     }
+
+    if (Object.isFrozen(this)) {
+      this.cache.dataFee = super.getDataFee()
+    }
+
     return super.getDataFee()
   }
 

diff --git a/packages/tx/test/legacy.spec.ts b/packages/tx/test/legacy.spec.ts
@@ -171,6 +171,17 @@ tape('[Transaction]', function (t) {
     st.end()
   })
 
+  t.test('getDataFee() -> should invalidate cached value on hardfork change', function (st) {
+    const common = new Common({ chain: Chain.Mainnet, hardfork: Hardfork.Byzantium })
+    const tx = Transaction.fromValuesArray(txFixtures[0].raw.map(toBuffer), {
+      common,
+    })
+    st.equals(tx.getDataFee().toNumber(), 656)
+    tx.common.setHardfork(Hardfork.Istanbul)
+    st.equals(tx.getDataFee().toNumber(), 240)
+    st.end()
+  })
+
   t.test('getUpfrontCost() -> should return upfront cost', function (st) {
     const tx = Transaction.fromTxData({
       gasPrice: 1000,