New exception type: INSUFFICIENT_MAX_FEE_PER_BLOB_GAS

NethermindEth · Nov 15, 2024 · 104a61c · 104a61c
1 parent b5778bc
commit 104a61c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Conform/TestRunner.lean b/Conform/TestRunner.lean
@@ -197,6 +197,7 @@ def executeTransaction (transaction : Transaction) (s : EVM.State) (header : Blo
   -- Validate transaction
   match transaction with
     | .blob t =>
+      if t.maxFeePerBlobGas.toNat < header.getBlobGasprice then .error (.InvalidTransaction .INSUFFICIENT_MAX_FEE_PER_BLOB_GAS)
       if header.blobGasUsed == none || header.excessBlobGas == none then .error (.InvalidTransaction .TYPE_3_TX_PRE_FORK)
       match t.blobVersionedHashes with
         | [] => .error (.InvalidTransaction .TYPE_3_TX_ZERO_BLOBS)

diff --git a/EvmYul/EVM/Exception.lean b/EvmYul/EVM/Exception.lean
@@ -16,6 +16,7 @@ inductive InvalidTransactionException where
   | TYPE_3_TX_ZERO_BLOBS : InvalidTransactionException
   | TYPE_3_TX_PRE_FORK : InvalidTransactionException
   | INTRINSIC_GAS_TOO_LOW : InvalidTransactionException
+  | INSUFFICIENT_MAX_FEE_PER_BLOB_GAS : InvalidTransactionException
 
 instance : Repr InvalidTransactionException where
   reprPrec s _ :=
@@ -31,6 +32,7 @@ instance : Repr InvalidTransactionException where
       | .TYPE_3_TX_ZERO_BLOBS => "TYPE_3_TX_ZERO_BLOBS"
       | .TYPE_3_TX_PRE_FORK => "TYPE_3_TX_PRE_FORK"
       | .INTRINSIC_GAS_TOO_LOW => "INTRINSIC_GAS_TOO_LOW"
+      | .INSUFFICIENT_MAX_FEE_PER_BLOB_GAS => "INTRINSIC_GAS_TOO_LOW"
 
 -- TODO - fix / cleanup.
 inductive Exception where

diff --git a/EvmYul/EllipticCurves.lean b/EvmYul/EllipticCurves.lean
@@ -87,5 +87,3 @@ private example :
 := by native_decide
 
 open Batteries
-
-#eval ByteArray.zeroes ⟨12⟩ ++ (KEC pᵤ).extract 12 32
Original file line number	Diff line number	Diff line change
Expand Up		@@ -87,5 +87,3 @@ private example :
		:= by native_decide

		open Batteries

		#eval ByteArray.zeroes ⟨12⟩ ++ (KEC pᵤ).extract 12 32