Skip to content

feat(fast-inbox): domain-separate the inbox rolling-hash chain #25067

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
spalladino wants to merge 1 commit into
base: spl/fast-inbox-3-cleanup
Choose a base branch
from
Open

feat(fast-inbox): domain-separate the inbox rolling-hash chain #25067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion l1-contracts/scripts/constants-codegen/solidity.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"EMPTY_EPOCH_OUT_HASH",
"FEE_JUICE_ADDRESS",
"BLS12_POINT_COMPRESSED_BYTES",
"ROOT_ROLLUP_PUBLIC_INPUTS_LENGTH"
"ROOT_ROLLUP_PUBLIC_INPUTS_LENGTH",
"DOM_SEP__INBOX_ROLLING_HASH"
]
10 changes: 7 additions & 3 deletions l1-contracts/src/core/libraries/crypto/Hash.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Copyright 2024 Aztec Labs.
pragma solidity >=0.8.27;

import {Constants} from "@aztec/core/libraries/ConstantsGen.sol";
import {DataStructures} from "@aztec/core/libraries/DataStructures.sol";

/**
Expand Down Expand Up @@ -52,13 +53,16 @@ library Hash {

/**
* @notice Advances the Inbox consensus rolling hash by one message leaf
* @dev Truncated at every link so the value is always a field element; the rollup circuits recompute the
* identical chain over the message leaves they insert. The genesis value is zero.
* @dev Each link is `sha256ToField(DOM_SEP__INBOX_ROLLING_HASH || rollingHash || leaf)` over the 4-byte big-endian
* domain separator followed by the two 32-byte big-endian values. The separator keeps a chain link from being
* reinterpreted as an untagged two-field sha256 hash, such as an `outHash` merkle node. Truncated at every link so
* the value is always a field element; the rollup circuits recompute the identical chain over the message leaves
* they insert. The genesis value is zero.
* @param _rollingHash - The current rolling hash
* @param _leaf - The message leaf to absorb
* @return The updated rolling hash
*/
function accumulateInboxRollingHash(bytes32 _rollingHash, bytes32 _leaf) internal pure returns (bytes32) {
return sha256ToField(abi.encodePacked(_rollingHash, _leaf));
return sha256ToField(abi.encodePacked(uint32(Constants.DOM_SEP__INBOX_ROLLING_HASH), _rollingHash, _leaf));
}
}
10 changes: 5 additions & 5 deletions l1-contracts/test/InboxBuckets.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,23 +56,23 @@ contract InboxBucketsTest is Test {
// and this L1 implementation. Generated from an independent sha256 implementation.
function testRollingHashTestVectors() public pure {
bytes32 h = Hash.accumulateInboxRollingHash(bytes32(0), bytes32(uint256(11)));
assertEq(h, 0x00815fb1e9d2076ae5761439b6144ad11da69eb6c41ab2aca39e770407ad8d12, "chain(0, [11])");
assertEq(h, 0x00066dfa22681f66d50aae7d84f190e3555d2d82e4a5e33c2291c3060d441f04, "chain(0, [11])");

h = Hash.accumulateInboxRollingHash(h, bytes32(uint256(22)));
h = Hash.accumulateInboxRollingHash(h, bytes32(uint256(33)));
assertEq(h, 0x0014cae968461979aab6d33266a2310ed234d3f6cf4472737c57551db07bd0da, "chain(0, [11, 22, 33])");
assertEq(h, 0x0077423b713a725ce4bf0b792847c68da87c316d52921de25652756bfe4c3e81, "chain(0, [11, 22, 33])");

h = bytes32(0);
for (uint256 i = 1; i <= 256; i++) {
h = Hash.accumulateInboxRollingHash(h, bytes32(i));
}
assertEq(h, 0x00ea95b96f17b75be03525b35a2a1918b42f03ad8c00a437cf641751825f3992, "chain(0, [1..=256])");
assertEq(h, 0x0030493fcb5915459bba42f03f283b58dfaa082dac02fbb3a494d5db8063238b, "chain(0, [1..=256])");

h = Hash.accumulateInboxRollingHash(bytes32(uint256(0x2a)), bytes32(uint256(7)));
assertEq(h, 0x0032a934005556d1b9d22708666ee8b05f91fafad624dd64a6ea878e048e5438, "chain(0x2a, [7])");
assertEq(h, 0x0048097cafad7fed00ccb578806b3855d5ee7bf11045fb8d41b2880ba36ef28f, "chain(0x2a, [7])");

h = Hash.accumulateInboxRollingHash(h, bytes32(uint256(8)));
assertEq(h, 0x0054d96b8a074a5030a5838972d0a3c04ba47cf5956348c853e02e9566233f65, "chain(0x2a, [7, 8])");
assertEq(h, 0x00a64d14c4b0234f5d835dc202bf8f9a857bc0734baf281dccd4b4978a48b2f9, "chain(0x2a, [7, 8])");
}

function testGenesisBucket() public {
Expand Down
46 changes: 23 additions & 23 deletions noir-projects/fnd/noir-protocol-circuits/crates/rollup-block-merge/Prover.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,15 +484,15 @@ proof = [

[inputs.previous_rollups.public_inputs]
timestamp = "0x0000000000000000000000000000000000000000000000000000000000000186"
block_headers_hash = "0x06defb29e0cc83c263924a02dbfacdaf24e07f985d6e331324980497f5ab009d"
block_headers_hash = "0x1ca57bb5adb75c6c4edf32143727c6201a6b795c1a965040867811b529e4318f"
out_hash = "0x006bd7618b0cf7b40e3f107022eee2d411bcc5850fbb774dacc46a15957659c4"
accumulated_fees = "0x0000000000000000000000000000000000000000000000000000000000000000"
accumulated_mana_used = "0x000000000000000000000000000000000000000000000000000000000006b6c0"

[inputs.previous_rollups.public_inputs.constants]
chain_id = "0x0000000000000000000000000000000000000000000000000000000000000000"
version = "0x0000000000000000000000000000000000000000000000000000000000000000"
vk_tree_root = "0x121ed84a634911bbb8a5e986c40e120a016a1713140a6a5ea4f8187a5e07e547"
vk_tree_root = "0x1f402fae1c4a7af3e53efe259e02abac215a7c79c757cce5917e87d9fff65ad4"
protocol_contracts_hash = "0x08d0026a4983c49638d0910859942c6648d5ea0a3a152c8a376e4983d0a003d9"
prover_id = "0x0000000000000000000000000000000000000000000000000000000000000000"
slot_number = "0x000000000000000000000000000000000000000000000000000000000000000f"
Expand All @@ -512,7 +512,7 @@ proof = [
next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000001"

[inputs.previous_rollups.public_inputs.new_archive]
root = "0x0a02b885838fb80d52ac8d0d5c2955fd2298804ed9cea5b239e7e4c0bf5c99cb"
root = "0x302d3a89701b288fd3831a4e0b36ab975691bba606bba85525701db3d565c84d"
next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000002"

[inputs.previous_rollups.public_inputs.start_state.l1_to_l2_message_tree]
Expand Down Expand Up @@ -575,10 +575,10 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
"0x0c123047b777079e8db5f669ddaf1ffa1c7780d56b21e29f35e4772ac0f6280c"
]
state = [
"0x10ba05722cbf8114df72299dc735360c577d1aa3d85f72d876102b0968e882c3",
"0x0e3514f9b6714e76e842b5a1a865de2ccbab5a421e8a45b8ce3e30b1d73123ac",
"0x19b221f0840f66d184dd2e539c7ca141d8102697616c32f57702745f85ced6c8",
"0x06dc4cfe7e4179e221b1cc2e2319b103452bdd12b27990aabb1abe3191e596e6"
"0x24234a67953ed812ff9d675ac97a84b2b59e82055727dad77edf74a34b6f90fd",
"0x0ce43547d695d3d5640916ef7441449fb71990b89abbbfcedc312e52814e3e2f",
"0x019930a8e509a4438b4ae2ac6d671cb361e3aa3c705715ddb39fd8d5cb2148b5",
"0x188d79c361c1631078332bc64bdf185917f8db618e12d020873baf02abc6c69f"
]
cache_size = "0x0000000000000000000000000000000000000000000000000000000000000003"
squeeze_mode = false
Expand Down Expand Up @@ -626,9 +626,9 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
"0x0beaba6d817ffeb92671c729be0bbb0e0f952849aa3de039d2febbcc3982bd18",
"0x1e16cf81772d4ffd1a84e0c458ae6fe2b66031a749e0a28cb82ec1fc5b5c5900",
"0x20f1c701d84b280c9f80a517272153688a9e1b92166d1000cfe7c829b7c25f69",
"0x25f9ac8d47a2dbcfb13b88ea474667fd2854bf5c901f2f698266864ffe7c21ad",
"0x045213eb590a89c16a60b58482f82f0e99de57252cce0368b27e93696abfa9d7",
"0x0db3ab63c7556f8724d86819156701855018cc79140a052893d67fb67c99c1f1",
"0x2a5c50782880ea145b4f04af31f7df9ef0cde48fab69c958aef179c68e836f62"
"0x1c3f1735c9300ec09296649338181e29ada1707949d1bfe2fdb9dc2d4c67bacc"
]

[inputs.previous_rollups.vk_data.vk]
Expand Down Expand Up @@ -1237,15 +1237,15 @@ proof = [

[inputs.previous_rollups.public_inputs]
timestamp = "0x0000000000000000000000000000000000000000000000000000000000000186"
block_headers_hash = "0x0bd67553a90b6d8dcbd607bee791721e1be4aec0076a699c959b9f6abb889c80"
block_headers_hash = "0x1352b896ee87e61299ede303817959d4706a25868dd6f0fa3a1026abf031c9ed"
out_hash = "0x00abb50b8989a7f19fd4526d43e15a1ab5d2a43af413cc8ca91e82a3c8828625"
accumulated_fees = "0x0000000000000000000000000000000000000000000000000000000000000000"
accumulated_mana_used = "0x0000000000000000000000000000000000000000000000000000000000000000"

[inputs.previous_rollups.public_inputs.constants]
chain_id = "0x0000000000000000000000000000000000000000000000000000000000000000"
version = "0x0000000000000000000000000000000000000000000000000000000000000000"
vk_tree_root = "0x121ed84a634911bbb8a5e986c40e120a016a1713140a6a5ea4f8187a5e07e547"
vk_tree_root = "0x1f402fae1c4a7af3e53efe259e02abac215a7c79c757cce5917e87d9fff65ad4"
protocol_contracts_hash = "0x08d0026a4983c49638d0910859942c6648d5ea0a3a152c8a376e4983d0a003d9"
prover_id = "0x0000000000000000000000000000000000000000000000000000000000000000"
slot_number = "0x000000000000000000000000000000000000000000000000000000000000000f"
Expand All @@ -1261,11 +1261,11 @@ proof = [
fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"

[inputs.previous_rollups.public_inputs.previous_archive]
root = "0x0a02b885838fb80d52ac8d0d5c2955fd2298804ed9cea5b239e7e4c0bf5c99cb"
root = "0x302d3a89701b288fd3831a4e0b36ab975691bba606bba85525701db3d565c84d"
next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000002"

[inputs.previous_rollups.public_inputs.new_archive]
root = "0x2d52f50f113807342bb8703e7e4bb4eb201f862dc894b0335a90239aedc6d9cf"
root = "0x08f13af3350295f34732c554bacd945824ba5e0f5784db916fb12a644594363b"
next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000003"

[inputs.previous_rollups.public_inputs.start_state.l1_to_l2_message_tree]
Expand Down Expand Up @@ -1310,10 +1310,10 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
"0x0c123047b777079e8db5f669ddaf1ffa1c7780d56b21e29f35e4772ac0f6280c"
]
state = [
"0x10ba05722cbf8114df72299dc735360c577d1aa3d85f72d876102b0968e882c3",
"0x0e3514f9b6714e76e842b5a1a865de2ccbab5a421e8a45b8ce3e30b1d73123ac",
"0x19b221f0840f66d184dd2e539c7ca141d8102697616c32f57702745f85ced6c8",
"0x06dc4cfe7e4179e221b1cc2e2319b103452bdd12b27990aabb1abe3191e596e6"
"0x24234a67953ed812ff9d675ac97a84b2b59e82055727dad77edf74a34b6f90fd",
"0x0ce43547d695d3d5640916ef7441449fb71990b89abbbfcedc312e52814e3e2f",
"0x019930a8e509a4438b4ae2ac6d671cb361e3aa3c705715ddb39fd8d5cb2148b5",
"0x188d79c361c1631078332bc64bdf185917f8db618e12d020873baf02abc6c69f"
]
cache_size = "0x0000000000000000000000000000000000000000000000000000000000000003"
squeeze_mode = false
Expand All @@ -1328,10 +1328,10 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
"0x0c123047b777079e8db5f669ddaf1ffa1c7780d56b21e29f35e4772ac0f6280c"
]
state = [
"0x18cc50c72512a32c7e9d03e3c75a6c231c64bb8b956e130edd92f0372cde5557",
"0x023a8d485733b7cf37de7afcb7b2ba2cecf58cc222cd6be8f423b5788aa711c4",
"0x0c8ae0e23734ad05a2db5cc7095e1762c2cab0f6cdcd5e8487d9b0c8f74b74f0",
"0x1bd89e098756374d4b55698f5fc2d7c41c3bdf340ce474b99b9b58a7e118affe"
"0x28914615b6af1140dacec41391403fa216fb2dc06c441bcffae67d1580e03f4a",
"0x2d63eabd936951e3dd4369f69d8f856b6f8bdf496558703eb00823b72446eff7",
"0x1c67535151e285ee3404892bd167f58ca7cfbd381b4ae3f042f69e636a337f63",
"0x29ebcfee5c78e6f71196a613718b271964049487ae0b55e780ec5d0a62a5cd7e"
]
cache_size = "0x0000000000000000000000000000000000000000000000000000000000000003"
squeeze_mode = false
Expand Down Expand Up @@ -1379,9 +1379,9 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
"0x0beaba6d817ffeb92671c729be0bbb0e0f952849aa3de039d2febbcc3982bd18",
"0x1e16cf81772d4ffd1a84e0c458ae6fe2b66031a749e0a28cb82ec1fc5b5c5900",
"0x20f1c701d84b280c9f80a517272153688a9e1b92166d1000cfe7c829b7c25f69",
"0x25f9ac8d47a2dbcfb13b88ea474667fd2854bf5c901f2f698266864ffe7c21ad",
"0x045213eb590a89c16a60b58482f82f0e99de57252cce0368b27e93696abfa9d7",
"0x0db3ab63c7556f8724d86819156701855018cc79140a052893d67fb67c99c1f1",
"0x2a5c50782880ea145b4f04af31f7df9ef0cde48fab69c958aef179c68e836f62"
"0x1c3f1735c9300ec09296649338181e29ada1707949d1bfe2fdb9dc2d4c67bacc"
]

[inputs.previous_rollups.vk_data.vk]
Expand Down
Loading
Loading