Eip 7918 changes (#1273)

* Update to latest EIP-7918

* EIP-7918 t8n tool update

---------

Co-authored-by: Sam Wilson <[email protected]>
Co-authored-by: Guruprasad Kamath <[email protected]>

Author: 3 people

src/ethereum/cancun/vm/gas.py

@@ -297,8 +297,8 @@ def calculate_excess_blob_gas(parent_header: Header) -> U64:
     parent_blob_gas = excess_blob_gas + blob_gas_used
     if parent_blob_gas < TARGET_BLOB_GAS_PER_BLOCK:
         return U64(0)
-    else:
-        return parent_blob_gas - TARGET_BLOB_GAS_PER_BLOCK
+
+    return parent_blob_gas - TARGET_BLOB_GAS_PER_BLOCK
 
 
 def calculate_total_blob_gas(tx: Transaction) -> U64:

src/ethereum/osaka/vm/gas.py

@@ -20,7 +20,7 @@
 from ethereum.utils.numeric import ceil32, taylor_exponential
 
 from ..blocks import Header
-from ..transactions import TX_BASE_COST, BlobTransaction, Transaction
+from ..transactions import BlobTransaction, Transaction
 from . import Evm
 from .exceptions import OutOfGasError
 
@@ -69,6 +69,9 @@
 GAS_POINT_EVALUATION = Uint(50000)
 
 TARGET_BLOB_GAS_PER_BLOCK = U64(786432)
+BLOB_BASE_COST = Uint(2**14)
+BLOB_SCHEDULE_MAX = U64(9)
+BLOB_SCHEDULE_TARGET = U64(6)
 GAS_PER_BLOB = U64(2**17)
 MIN_BLOB_GASPRICE = Uint(1)
 BLOB_BASE_FEE_UPDATE_FRACTION = Uint(5007716)
@@ -295,24 +298,30 @@ def calculate_excess_blob_gas(parent_header: Header) -> U64:
     # At the fork block, these are defined as zero.
     excess_blob_gas = U64(0)
     blob_gas_used = U64(0)
+    base_fee_per_gas = Uint(0)
 
     if isinstance(parent_header, Header):
         # After the fork block, read them from the parent header.
         excess_blob_gas = parent_header.excess_blob_gas
         blob_gas_used = parent_header.blob_gas_used
+        base_fee_per_gas = parent_header.base_fee_per_gas
 
     parent_blob_gas = excess_blob_gas + blob_gas_used
     if parent_blob_gas < TARGET_BLOB_GAS_PER_BLOCK:
         return U64(0)
-    else:
-        target_blob_gas_price = Uint(
-            TARGET_BLOB_GAS_PER_BLOCK
-        ) * calculate_blob_gas_price(parent_header.excess_blob_gas)
-        base_blob_tx_price = TX_BASE_COST * parent_header.base_fee_per_gas
-        if base_blob_tx_price > target_blob_gas_price:
-            return parent_blob_gas // U64(3)
-        else:
-            return parent_blob_gas - TARGET_BLOB_GAS_PER_BLOCK
+
+    target_blob_gas_price = Uint(GAS_PER_BLOB)
+    target_blob_gas_price *= calculate_blob_gas_price(excess_blob_gas)
+
+    base_blob_tx_price = BLOB_BASE_COST * base_fee_per_gas
+    if base_blob_tx_price > target_blob_gas_price:
+        blob_schedule_delta = BLOB_SCHEDULE_MAX - BLOB_SCHEDULE_TARGET
+        return (
+            excess_blob_gas
+            + blob_gas_used * blob_schedule_delta // BLOB_SCHEDULE_MAX
+        )
+
+    return parent_blob_gas - TARGET_BLOB_GAS_PER_BLOCK
 
 
 def calculate_total_blob_gas(tx: Transaction) -> U64:

src/ethereum/prague/vm/gas.py

@@ -304,8 +304,8 @@ def calculate_excess_blob_gas(parent_header: Header) -> U64:
     parent_blob_gas = excess_blob_gas + blob_gas_used
     if parent_blob_gas < TARGET_BLOB_GAS_PER_BLOCK:
         return U64(0)
-    else:
-        return parent_blob_gas - TARGET_BLOB_GAS_PER_BLOCK
+
+    return parent_blob_gas - TARGET_BLOB_GAS_PER_BLOCK
 
 
 def calculate_total_blob_gas(tx: Transaction) -> U64:

src/ethereum_spec_tools/evm_tools/loaders/fork_loader.py

@@ -307,6 +307,31 @@ def TARGET_BLOB_GAS_PER_BLOCK(self) -> Any:
         """TARGET_BLOB_GAS_PER_BLOCK of the fork"""
         return self._module("vm.gas").TARGET_BLOB_GAS_PER_BLOCK
 
+    @property
+    def GAS_PER_BLOB(self) -> Any:
+        """GAS_PER_BLOB of the fork"""
+        return self._module("vm.gas").GAS_PER_BLOB
+
+    @property
+    def BLOB_BASE_COST(self) -> Any:
+        """BLOB_BASE_COST of the fork"""
+        return self._module("vm.gas").BLOB_BASE_COST
+
+    @property
+    def BLOB_SCHEDULE_MAX(self) -> Any:
+        """BLOB_SCHEDULE_MAX of the fork"""
+        return self._module("vm.gas").BLOB_SCHEDULE_MAX
+
+    @property
+    def BLOB_SCHEDULE_TARGET(self) -> Any:
+        """BLOB_SCHEDULE_TARGET of the fork"""
+        return self._module("vm.gas").BLOB_SCHEDULE_TARGET
+
+    @property
+    def calculate_blob_gas_price(self) -> Any:
+        """calculate_blob_gas_price of the fork"""
+        return self._module("vm.gas").calculate_blob_gas_price
+
     @property
     def apply_dao(self) -> Any:
         """apply_dao function of the fork"""

src/ethereum_spec_tools/evm_tools/t8n/env.py

@@ -102,7 +102,6 @@ def read_excess_blob_gas(self, data: Any, t8n: "T8N") -> None:
             self.excess_blob_gas = parse_hex_or_int(
                 data["currentExcessBlobGas"], U64
             )
-            return
 
         if "parentExcessBlobGas" in data:
             self.parent_excess_blob_gas = parse_hex_or_int(
@@ -114,15 +113,51 @@ def read_excess_blob_gas(self, data: Any, t8n: "T8N") -> None:
                 data["parentBlobGasUsed"], U64
             )
 
-        excess_blob_gas = (
+        if self.excess_blob_gas is not None:
+            return
+
+        assert self.parent_excess_blob_gas is not None
+        assert self.parent_blob_gas_used is not None
+
+        parent_blob_gas = (
             self.parent_excess_blob_gas + self.parent_blob_gas_used
         )
 
         target_blob_gas_per_block = t8n.fork.TARGET_BLOB_GAS_PER_BLOCK
 
-        self.excess_blob_gas = U64(0)
-        if excess_blob_gas >= target_blob_gas_per_block:
-            self.excess_blob_gas = excess_blob_gas - target_blob_gas_per_block
+        if parent_blob_gas < target_blob_gas_per_block:
+            self.excess_blob_gas = U64(0)
+        else:
+            self.excess_blob_gas = parent_blob_gas - target_blob_gas_per_block
+
+            if t8n.fork.is_after_fork("ethereum.osaka"):
+                # Under certain conditions specified in EIP-7918, the
+                # the excess_blob_gas is calculated differently in osaka
+                assert self.parent_base_fee_per_gas is not None
+
+                GAS_PER_BLOB = t8n.fork.GAS_PER_BLOB
+                BLOB_BASE_COST = t8n.fork.BLOB_BASE_COST
+                BLOB_SCHEDULE_MAX = t8n.fork.BLOB_SCHEDULE_MAX
+                BLOB_SCHEDULE_TARGET = t8n.fork.BLOB_SCHEDULE_TARGET
+
+                target_blob_gas_price = Uint(GAS_PER_BLOB)
+                target_blob_gas_price *= t8n.fork.calculate_blob_gas_price(
+                    self.parent_excess_blob_gas
+                )
+
+                base_blob_tx_price = (
+                    BLOB_BASE_COST * self.parent_base_fee_per_gas
+                )
+                if base_blob_tx_price > target_blob_gas_price:
+                    blob_schedule_delta = (
+                        BLOB_SCHEDULE_MAX - BLOB_SCHEDULE_TARGET
+                    )
+                    self.excess_blob_gas = (
+                        self.parent_excess_blob_gas
+                        + self.parent_blob_gas_used
+                        * blob_schedule_delta
+                        // BLOB_SCHEDULE_MAX
+                    )
 
     def read_base_fee_per_gas(self, data: Any, t8n: "T8N") -> None:
         """
@@ -139,16 +174,27 @@ def read_base_fee_per_gas(self, data: Any, t8n: "T8N") -> None:
                 self.base_fee_per_gas = parse_hex_or_int(
                     data["currentBaseFee"], Uint
                 )
-            else:
+
+            if "parentGasUsed" in data:
                 self.parent_gas_used = parse_hex_or_int(
                     data["parentGasUsed"], Uint
                 )
+
+            if "parentGasLimit" in data:
                 self.parent_gas_limit = parse_hex_or_int(
                     data["parentGasLimit"], Uint
                 )
+
+            if "parentBaseFee" in data:
                 self.parent_base_fee_per_gas = parse_hex_or_int(
                     data["parentBaseFee"], Uint
                 )
+
+            if self.base_fee_per_gas is None:
+                assert self.parent_gas_limit is not None
+                assert self.parent_gas_used is not None
+                assert self.parent_base_fee_per_gas is not None
+
                 parameters: List[object] = [
                     self.block_gas_limit,
                     self.parent_gas_limit,