feat!(txpool,payload): track intrinsic state gas in pool and exclude it from protocol gas limits (TIP-1016) by fgimenez · Pull Request #2740 · tempoxyz/tempo

fgimenez · 2026-02-17T16:31:28Z

Closes CHAIN-790
Builds on top of #2714

Computes and caches intrinsic state gas during transaction validation so the payload builder can exclude it from protocol gas limits, ensuring storage creation gas only counts against the user's gas_limit.

Transaction pool

Add intrinsic_state_gas: OnceLock<u64> to TempoPooledTransaction and expose set_intrinsic_state_gas(), intrinsic_state_gas(), and execution_gas_limit() (= gas_limit - state_gas).
During validation, compute and cache intrinsic state gas for T2+ transactions (both AA and non-AA paths). Sources include new-account creation, CREATE calls, 2D nonce keys, and EIP-7702 auth list entries.
For pre-T2, intrinsic_state_gas stays 0 so execution_gas_limit() == gas_limit().

Payload builder

Use execution_gas_limit() instead of gas_limit() for protocol limit checks (non_shared_gas_limit, general_gas_limit). State gas only counts against the user's gas_limit, not the block's execution gas capacity.

Test utilities

Fix TxBuilder to use self.chain_id instead of hardcoded 1 when building AA transactions.
Add chain_id() setter method.

…it from protocol gas limits (TIP-1016)

rakita · 2026-02-17T16:54:39Z

crates/transaction-pool/src/validator.rs

+                        non_aa_state_gas += gas_params.tx_tip1000_auth_account_creation_state_gas();
+                    }
+                }
+                transaction.set_intrinsic_state_gas(non_aa_state_gas);


state_gas+regular_gas <= gas_limit do we have this check

good catch, added check ptal

mattsse

@rakita upcoming revm now returns intrinsic gas as part of the evm output right? which means tracking this in the pooled tx is no longer necessary after we bump?

mattsse · 2026-02-17T22:01:06Z

crates/payload/builder/src/lib.rs

            // The remaining `shared_gas_limit` is reserved for validator subblocks and must not
            // be consumed by proposer's pool transactions.
-            if cumulative_gas_used + pool_tx.gas_limit() > non_shared_gas_limit {
+            if cumulative_gas_used + tx_execution_gas > non_shared_gas_limit {


can we use consistent terminology here, gas vs gaslimit is always needlessly confusing

yep, changed to tx_execution_gas_limit

mattsse · 2026-02-17T22:01:51Z

crates/payload/builder/src/lib.rs

+            // TIP-1016: For T2+ transactions, use execution_gas_limit (gas_limit minus state gas)
+            // for protocol limit checks. State gas does NOT count against protocol limits.
+            // For pre-T2, execution_gas_limit() == gas_limit() (state gas is 0).


this is the builder, but I dont see a protocol check that's enforcing this

indeed, updated comment

mattsse · 2026-02-17T22:02:45Z

crates/transaction-pool/src/transaction.rs

+    /// Set during validation for T2+ transactions. The state gas portion does NOT count
+    /// against protocol limits (block/transaction execution gas caps), only against
+    /// the user's `gas_limit`.
+    intrinsic_state_gas: OnceLock<u64>,


isnt this problematic, because the intrinsic gas is hardfork specific, right?

so it's possible that a tx survives a hardfork boundary, making this incorrect fpr future blocks?

good catch, added comment about it, lmk if that is enough

… after TIP-1016 computation

github-actions · 2026-02-18T12:56:24Z

⚠️ Changelog not found.

A changelog entry is required before merging. We've generated a suggested changelog based on your changes:

Preview

---
tempo-payload-builder: patch
tempo-revm: patch
tempo-transaction-pool: patch
---

Implemented TIP-1016 state gas handling across the payload builder, EVM handler, and transaction pool. State gas (storage creation gas) is now tracked separately from execution gas, cached on `TempoPooledTransaction` via `intrinsic_state_gas`, and validated against `gas_limit` for T2+ transactions without counting toward protocol block/execution gas caps.

Add changelog to commit this to your branch.

feat!(txpool,payload): track intrinsic state gas in pool and exclude …

2d6234d

…it from protocol gas limits (TIP-1016)

fgimenez requested a review from rakita February 17, 2026 16:31

fgimenez added A-txpool S-breaking-stf This PR includes a breaking STF change labels Feb 17, 2026

fgimenez requested review from 0xKitsune and klkvr as code owners February 17, 2026 16:31

fgimenez added the A-block-building Related to block building label Feb 17, 2026

fgimenez requested a review from mattsse as a code owner February 17, 2026 16:31

rakita reviewed Feb 17, 2026

View reviewed changes

mattsse reviewed Feb 17, 2026

View reviewed changes

fgimenez added 4 commits February 18, 2026 10:13

tx_execution_gas -> tx_execution_gas_limit

d8775c8

fix(txpool,evm): ensure gas_limit covers both execution and state gas…

f108538

… after TIP-1016 computation

fix(payload-builder): clarify gas capacity comment

d27d8c3

added comment about intrisic_state_gas being hardfork specific

4ec69e1

properly gate total_intrinsic calculation

6dcbb98

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

feat!(txpool,payload): track intrinsic state gas in pool and exclude it from protocol gas limits (TIP-1016)#2740

feat!(txpool,payload): track intrinsic state gas in pool and exclude it from protocol gas limits (TIP-1016)#2740
fgimenez wants to merge 6 commits intofgimenez/chain-789-handler-state-gasfrom
fgimenez/chain-790

fgimenez commented Feb 17, 2026

Uh oh!

rakita Feb 17, 2026

Uh oh!

fgimenez Feb 18, 2026

Uh oh!

mattsse left a comment

Uh oh!

mattsse Feb 17, 2026

Uh oh!

fgimenez Feb 18, 2026

Uh oh!

mattsse Feb 17, 2026

Uh oh!

fgimenez Feb 18, 2026

Uh oh!

mattsse Feb 17, 2026

Uh oh!

fgimenez Feb 18, 2026

Uh oh!

github-actions bot commented Feb 18, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Comments

Conversation

fgimenez commented Feb 17, 2026

Transaction pool

Payload builder

Test utilities

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mattsse left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Feb 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⚠️ Changelog not found.

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

github-actions bot commented Feb 18, 2026 •

edited

Loading