Skip to content

feat: tx effects tree #25332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IlyasRidhuan wants to merge 3 commits into
base: next
Choose a base branch
from
Open

feat: tx effects tree #25332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76e08ee
feat: add tx effects tree root to the block header
IlyasRidhuan Aug 26, 2026
2272bf7
chore: regenerate circuit sample inputs for the new header field
IlyasRidhuan Aug 26, 2026
676ba14
test: regenerate L1 checkpoint fixtures for the new header field
IlyasRidhuan Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions barretenberg/cpp/src/barretenberg/world_state/world_state.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,6 +1038,7 @@ bb::fr WorldState::compute_initial_block_header_hash(const StateReference& initi
initial_state_ref.at(MerkleTreeId::PUBLIC_DATA_TREE).first,
initial_state_ref.at(MerkleTreeId::PUBLIC_DATA_TREE).second,
0, // sponge_blob_hash
0, // tx_effects_tree_root
// global variables
0, // chain_id
0, // version
Expand Down
26 changes: 13 additions & 13 deletions l1-contracts/test/fixtures/empty_checkpoint_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,29 +25,29 @@
"l2ToL1Messages": []
},
"checkpoint": {
"archive": "0x09d45c1e01b8596153838a068ddb470ead95e6e1e151f40b4d48664c1e311af6",
"blobCommitments": "0x01b5ee84e13509320e7da39921b53268c6e918a8981cc76cea986944ee28cebf6f6792d882657deafbc05c8acae3e0e3c0",
"batchedBlobInputs": "0x01851e02ace4d00c5648b2c63e082a6b23bbb7409c4b56f593b30ffd179f37482294e64217fe3e55d50b62a2d8de4b8cebe8b27dcbb32271b1c2745551eb4e5636f3a36a62e42bada7d17029a10c09583af4da2dca90062ca5c55a7478ebae8db5ee84e13509320e7da39921b53268c6e918a8981cc76cea986944ee28cebf6f6792d882657deafbc05c8acae3e0e3c084d838af4d5c73b08f0150f8415f80949e980ef4efa679cc47a07b1683cc8158fabf688dc0fbddd0179b955abb08f841",
"archive": "0x1a2faa8d85b5e6cc286b14f52d05dcf79315b4302df692365666f7fc33acdc9a",
"blobCommitments": "0x019755e23032263740485d7a9b1fb7cb0674d07be979dce631f6651a6c9c2c7436166ab4cd9d4a83382fcd4dc6a5c716e1",
"batchedBlobInputs": "0x01f2f80955d67c846dd468286f298cbc042b670715ee331dad97b0605c0cc3fe006e5b08c0993408bd95eb20bc44e4d0d1ee7892629c616a376b4d8f156452fa51c7e1df54112355c864db48048ffd2f5ddf375f26c03baf9640a9d99eb714c59755e23032263740485d7a9b1fb7cb0674d07be979dce631f6651a6c9c2c7436166ab4cd9d4a83382fcd4dc6a5c716e1add4910f0c6b8ac9d2c7a51dec63c820f0b1ad2e6ec089ac5ff058299ad4e2d531089aafb59a588cd18c0ae4bf094d07",
"checkpointNumber": 1,
"body": "0x00000000",
"header": {
"lastArchiveRoot": "0x177a4955b31ecaafad999753938a44e526b54c5ba5d536688227f85f15cfbdf5",
"blockHeadersHash": "0x2e3e0911389bc48fa8126a93273d016cc7dc08019f8ffc5f1f5ae7d90745eaa2",
"blobsHash": "0x00e5b752fe6bc2154155ff3a979c4c5fa91d3ac0d716169ac521e1560fd83b2b",
"inboxRollingHash": "0x00cad6497cf81748167158f149ba70c31f34c68b0ae1b156117de63e073d14b5",
"lastArchiveRoot": "0x0a0877e7fa8646252b46122976de111ece73d0cc054da8d780e3f12ec1709305",
"blockHeadersHash": "0x1eb4f003d907c3700453bde5a442132987f6e9627a8bfd6dd0cf0d21ddecff79",
"blobsHash": "0x00e36cab5c0dcd95a83c738ec193116b8e0bbb8db307d4a685b70daab009947a",
"inboxRollingHash": "0x00c5533cbcbefb2d76ef9d6ac24ee129ae1414dda8e2a99e9fde62f0ca8c43b1",
"outHash": "0x00c95e0ceb41951039e1592745ec2faea9866f6eaf01bf189a4463b4143af093",
"slotNumber": 99,
"timestamp": 1776857814,
"coinbase": "0x35b8c86ef5942f43d1541967cb19102a2d993b31",
"feeRecipient": "0x1e23fb62f5dd64886d92830820df4ee59bb32fe60838439a13dfb209f4d89b15",
"timestamp": 1787821532,
"coinbase": "0xfb65547d5bb1828bdf254a002b75c7a2d706c549",
"feeRecipient": "0x01c5f8def3834b839581a7609592cfe24811934720ff38dd8d1a45b532873fad",
"gasFees": {
"feePerDaGas": 0,
"feePerL2Gas": 292838000000
"feePerL2Gas": 20829300000
},
"totalManaUsed": 0,
"accumulatedFees": 0
},
"headerHash": "0x00230a553b85ec7931eded45ec1ea096e47789226758b16dca0403f5ab53f3d6",
"headerHash": "0x0011187c1d6793680e37f9c2704901809ac9d1d608f8cdb3f1973d9af596ea97",
"numTxs": 0
}
}
}
26 changes: 13 additions & 13 deletions l1-contracts/test/fixtures/empty_checkpoint_2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,29 +25,29 @@
"l2ToL1Messages": []
},
"checkpoint": {
"archive": "0x2f5d974309f7521c2ed6702859e70e8109b81adaf4dbbaf65a1eab3ce2940741",
"blobCommitments": "0x01b6c78db072b1e60f406e06a344eeb437bc114c2fe5a6d7d8f040daa0b89826f80409ae0226b7b358b938d9a35d64ab30",
"batchedBlobInputs": "0x010cb5eb29ba6106cf394027727fe818e02bbd3954b071af66c6a25ca1ae6ce10109b73199ed129da5c971b43c8c393ec7b053a834293a65b3c7737d1e826bb63846ddb2ef2be6a518b0b5d6b5d12eb5eb6b351ab0a94e666b8a243d287dc060acd1e03115fee2bbdd47f1c216f398650836c3b27078ae8d2daaf7a1d53082b769430801fffdf961265746a02f6d5e38a2114a89820bbf592cb4e01d5aa32bdb93439b715be7806f7decf63c088e188b3988ca9796d09ee460cdaad61805aeff",
"archive": "0x299f7226fb475b76e4910d0d20c5dc5079a31510c2ef283249a28dd31d0ead9b",
"blobCommitments": "0x01b3ccb2e20737b7dd25f84587a422ed7c0acd11a07cc6a3c57e53a2ac1174e074c4add0ad4089fd72a292e2afe5300ced",
"batchedBlobInputs": "0x0190ec07763f83656b26eac5dc282384fef950d4168ea2851eff61297eb5c64816557fbeed7d4fdf3a53efe23b75d108baf92f191a4493b703bfdf2a7d60853317e12799229b6cc1013ed9e5f515f3bfdd4e78e7a2c67c81e2853e64a4d77edaad8ef0ce2941f24c2ba63fcb9d82a41dca77c083bcee059bfcba3f11eae3cf75dd85b1fd788f1a71e0400bb6a6e05cef8b8fdfb3e4fc041765d006db581b2a97b599e41b65cbc9b1b4048bdd9f36f0c880b3679daff312c831aa4b92a378222c",
"checkpointNumber": 2,
"body": "0x00000000",
"header": {
"lastArchiveRoot": "0x09d45c1e01b8596153838a068ddb470ead95e6e1e151f40b4d48664c1e311af6",
"blockHeadersHash": "0x0b3bda1754ca30707b8c0bbe72760c68e574cf23309e7e4fd7cabea36b4078da",
"blobsHash": "0x000e9acabf609c9c113078ecb383ba6310573ce246958b605452132617d2c960",
"inboxRollingHash": "0x0080dbf2bd9576e81fd99fc0f9d35bfd7fc15a6221d0b6e1e92a1884f14d0c84",
"lastArchiveRoot": "0x1a2faa8d85b5e6cc286b14f52d05dcf79315b4302df692365666f7fc33acdc9a",
"blockHeadersHash": "0x20cdd3a677e28e11ebc0d21cd0dc0f94605bbd945030d5edb5137514126d5e76",
"blobsHash": "0x00afc4ce8554940482f56137bf5e5fa237afab054f67677affcfb292e6ba2661",
"inboxRollingHash": "0x00c5742e045891daea618eb01febd89dbe05fc8142585eb13029805a8f6dfd11",
"outHash": "0x00c95e0ceb41951039e1592745ec2faea9866f6eaf01bf189a4463b4143af093",
"slotNumber": 102,
"timestamp": 1776858030,
"coinbase": "0x35b8c86ef5942f43d1541967cb19102a2d993b31",
"feeRecipient": "0x1e23fb62f5dd64886d92830820df4ee59bb32fe60838439a13dfb209f4d89b15",
"timestamp": 1787821748,
"coinbase": "0xfb65547d5bb1828bdf254a002b75c7a2d706c549",
"feeRecipient": "0x01c5f8def3834b839581a7609592cfe24811934720ff38dd8d1a45b532873fad",
"gasFees": {
"feePerDaGas": 0,
"feePerL2Gas": 19067000000
"feePerL2Gas": 537300000
},
"totalManaUsed": 0,
"accumulatedFees": 0
},
"headerHash": "0x00a184a160ada9af4ba75961ba596043d76f56c75b2e7e9652a0c162a7bf59b9",
"headerHash": "0x00bcd22d69da55c80faebd233f82f73297a25d3f1b969e6c5d1ea00718604855",
"numTxs": 0
}
}
}
28 changes: 14 additions & 14 deletions l1-contracts/test/fixtures/mixed_checkpoint_1.json
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions l1-contracts/test/fixtures/mixed_checkpoint_2.json
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions l1-contracts/test/fixtures/single_tx_checkpoint_1.json
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions l1-contracts/test/fixtures/single_tx_checkpoint_2.json
View file
Open in desktop

Large diffs are not rendered by default.

37 changes: 37 additions & 0 deletions labs-patches/0002-feat-bump-the-oracle-and-TXE-oracle-interface-major-.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: IlyasRidhuan <ilyasridhuan@gmail.com>
Date: Tue, 1 Sep 2026 12:56:54 +0000
Subject: [PATCH] feat: bump the oracle and TXE oracle interface major versions

The block header gains a tx_effects_tree_root field, which changes the
header layout returned by the PXE and TXE oracles: the oracle interface
major version moves 30 -> 31 and the TXE oracle major version 8 -> 9.

diff --git a/noir-projects/aztec-nr/aztec/src/oracle/version.nr b/noir-projects/aztec-nr/aztec/src/oracle/version.nr
index 6137d3d641d7d2d964a3a5d74a04aa76ef8ecc26..8ef8a54b6afb59bb38133a32f54786f28bda3c9f 100644
--- a/noir-projects/aztec-nr/aztec/src/oracle/version.nr
+++ b/noir-projects/aztec-nr/aztec/src/oracle/version.nr
@@ -10,8 +10,8 @@
/// the PXE and used to provide helpful error messages if a contract calls an oracle that doesn't exist. We don't throw
/// immediately if AZTEC_NR_MINOR > PXE_MINOR because if a contract is updated to use a newer Aztec.nr dependency
/// without actually using any of the new oracles then there is no reason to throw.
-pub global ORACLE_VERSION_MAJOR: Field = 30;
-pub global ORACLE_VERSION_MINOR: Field = 8;
+pub global ORACLE_VERSION_MAJOR: Field = 31;
+pub global ORACLE_VERSION_MINOR: Field = 0;

/// Asserts that the version of the oracle is compatible with the version expected by the contract.
pub fn assert_compatible_oracle_version() {
diff --git a/noir-projects/aztec-nr/aztec/src/test/helpers/txe_oracles.nr b/noir-projects/aztec-nr/aztec/src/test/helpers/txe_oracles.nr
index 1e51db51ff11bb08fdba62152f6a3bfe7658520b..8d946d9d4cdb85abc2571540c5ef10a3cba4047e 100644
--- a/noir-projects/aztec-nr/aztec/src/test/helpers/txe_oracles.nr
+++ b/noir-projects/aztec-nr/aztec/src/test/helpers/txe_oracles.nr
@@ -21,7 +21,7 @@ use crate::protocol::{
/// [`oracle::version`](crate::oracle::version), which covers oracles used during contract execution by PXE.
///
/// The TypeScript counterparts are in `yarn-project/txe/src/oracle/txe_oracle_version.ts`.
-pub global TXE_ORACLE_VERSION_MAJOR: Field = 8;
+pub global TXE_ORACLE_VERSION_MAJOR: Field = 9;
pub global TXE_ORACLE_VERSION_MINOR: Field = 0;

/// Asserts that the TXE oracle interface version is compatible.
Loading
Loading