chore: yearn for the urn

AztecProtocol · Nov 10, 2024 · ba8e90e · ba8e90e
1 parent 102405e
commit ba8e90e
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 66 deletions.
diff --git a/barretenberg/cpp/src/barretenberg/world_state/world_state.test.cpp b/barretenberg/cpp/src/barretenberg/world_state/world_state.test.cpp
@@ -28,10 +28,12 @@ class WorldStateTest : public testing::Test {
     static std::string data_dir;
     uint64_t map_size = 10240;
     uint64_t thread_pool_size = 1;
+
+    // TODO(): https://github.com/AztecProtocol/aztec-packages/issues/8084
     std::unordered_map<MerkleTreeId, uint32_t> tree_heights{
-        { MerkleTreeId::NULLIFIER_TREE, 20 },   { MerkleTreeId::NOTE_HASH_TREE, 32 },
-        { MerkleTreeId::PUBLIC_DATA_TREE, 40 }, { MerkleTreeId::L1_TO_L2_MESSAGE_TREE, 16 },
-        { MerkleTreeId::ARCHIVE, 16 },
+        { MerkleTreeId::NULLIFIER_TREE, 40 },   { MerkleTreeId::NOTE_HASH_TREE, 40 },
+        { MerkleTreeId::PUBLIC_DATA_TREE, 40 }, { MerkleTreeId::L1_TO_L2_MESSAGE_TREE, 39 },
+        { MerkleTreeId::ARCHIVE, 29 },
     };
     std::unordered_map<MerkleTreeId, index_t> tree_prefill{
         { MerkleTreeId::NULLIFIER_TREE, 128 },
@@ -139,14 +141,14 @@ TEST_F(WorldStateTest, GetInitialTreeInfoForAllTrees)
         auto info = ws.get_tree_info(WorldStateRevision::committed(), MerkleTreeId::NULLIFIER_TREE);
         EXPECT_EQ(info.meta.size, 128);
         EXPECT_EQ(info.meta.depth, tree_heights.at(MerkleTreeId::NULLIFIER_TREE));
-        EXPECT_EQ(info.meta.root, bb::fr("0x19a8c197c12bb33da6314c4ef4f8f6fcb9e25250c085df8672adf67c8f1e3dbc"));
+        EXPECT_EQ(info.meta.root, bb::fr("0x0c499b373a1f0fe1b510a63563546d2d39e206895056a5af0143c5f30d639073"));
     }
 
     {
         auto info = ws.get_tree_info(WorldStateRevision::committed(), MerkleTreeId::NOTE_HASH_TREE);
         EXPECT_EQ(info.meta.size, 0);
         EXPECT_EQ(info.meta.depth, tree_heights.at(MerkleTreeId::NOTE_HASH_TREE));
-        EXPECT_EQ(info.meta.root, bb::fr("0x0b59baa35b9dc267744f0ccb4e3b0255c1fc512460d91130c6bc19fb2668568d"));
+        EXPECT_EQ(info.meta.root, bb::fr("0x1fd848aa69e1633722fe249a5b7f53b094f1c9cef9f5c694b073fd1cc5850dfb"));
     }
 
     {
@@ -160,7 +162,7 @@ TEST_F(WorldStateTest, GetInitialTreeInfoForAllTrees)
         auto info = ws.get_tree_info(WorldStateRevision::committed(), MerkleTreeId::L1_TO_L2_MESSAGE_TREE);
         EXPECT_EQ(info.meta.size, 0);
         EXPECT_EQ(info.meta.depth, tree_heights.at(MerkleTreeId::L1_TO_L2_MESSAGE_TREE));
-        EXPECT_EQ(info.meta.root, bb::fr("0x14f44d672eb357739e42463497f9fdac46623af863eea4d947ca00a497dcdeb3"));
+        EXPECT_EQ(info.meta.root, bb::fr("0x2e33ee2008411c04b99c24b313513d097a0d21a5040b6193d1f978b8226892d6"));
     }
 
     {
@@ -182,14 +184,14 @@ TEST_F(WorldStateTest, GetStateReference)
             auto snapshot = state_ref.at(MerkleTreeId::NULLIFIER_TREE);
             EXPECT_EQ(
                 snapshot,
-                std::make_pair(bb::fr("0x19a8c197c12bb33da6314c4ef4f8f6fcb9e25250c085df8672adf67c8f1e3dbc"), 128UL));
+                std::make_pair(bb::fr("0x0c499b373a1f0fe1b510a63563546d2d39e206895056a5af0143c5f30d639073"), 128UL));
         }
 
         {
             auto snapshot = state_ref.at(MerkleTreeId::NOTE_HASH_TREE);
             EXPECT_EQ(
                 snapshot,
-                std::make_pair(bb::fr("0x0b59baa35b9dc267744f0ccb4e3b0255c1fc512460d91130c6bc19fb2668568d"), 0UL));
+                std::make_pair(bb::fr("0x1fd848aa69e1633722fe249a5b7f53b094f1c9cef9f5c694b073fd1cc5850dfb"), 0UL));
         }
 
         {
@@ -203,7 +205,7 @@ TEST_F(WorldStateTest, GetStateReference)
             auto snapshot = state_ref.at(MerkleTreeId::L1_TO_L2_MESSAGE_TREE);
             EXPECT_EQ(
                 snapshot,
-                std::make_pair(bb::fr("0x14f44d672eb357739e42463497f9fdac46623af863eea4d947ca00a497dcdeb3"), 0UL));
+                std::make_pair(bb::fr("0x2e33ee2008411c04b99c24b313513d097a0d21a5040b6193d1f978b8226892d6"), 0UL));
         }
     }
 
@@ -215,14 +217,14 @@ TEST_F(WorldStateTest, GetStateReference)
             auto snapshot = state_ref.at(MerkleTreeId::NULLIFIER_TREE);
             EXPECT_EQ(
                 snapshot,
-                std::make_pair(bb::fr("0x19a8c197c12bb33da6314c4ef4f8f6fcb9e25250c085df8672adf67c8f1e3dbc"), 128UL));
+                std::make_pair(bb::fr("0x0c499b373a1f0fe1b510a63563546d2d39e206895056a5af0143c5f30d639073"), 128UL));
         }
 
         {
             auto snapshot = state_ref.at(MerkleTreeId::NOTE_HASH_TREE);
             EXPECT_EQ(
                 snapshot,
-                std::make_pair(bb::fr("0x12dbc0ae893e0aa914df8ed20837148c89d78fbef9471ede1d39416d9660c169"), 1UL));
+                std::make_pair(bb::fr("0x0f031292dfc64353244dfc38871cbeac74ddbd03df4a0856c411bb1ddfb494f0"), 1UL));
         }
 
         {
@@ -236,7 +238,7 @@ TEST_F(WorldStateTest, GetStateReference)
             auto snapshot = state_ref.at(MerkleTreeId::L1_TO_L2_MESSAGE_TREE);
             EXPECT_EQ(
                 snapshot,
-                std::make_pair(bb::fr("0x14f44d672eb357739e42463497f9fdac46623af863eea4d947ca00a497dcdeb3"), 0UL));
+                std::make_pair(bb::fr("0x2e33ee2008411c04b99c24b313513d097a0d21a5040b6193d1f978b8226892d6"), 0UL));
         }
     }
 }
@@ -489,13 +491,13 @@ TEST_F(WorldStateTest, SyncExternalBlockFromEmpty)
     WorldState ws(thread_pool_size, data_dir, map_size, tree_heights, tree_prefill, initial_header_generator_point);
     StateReference block_state_ref = {
         { MerkleTreeId::NULLIFIER_TREE,
-          { fr("0x0342578609a7358092788d0eed7d1ee0ec8e0c596c0b1e85ba980ddd5cc79d04"), 129 } },
+          { fr("0x187a19972150cd1e76d8201d720da7682fcf4d93ec6a3c7b0d84bbefde5bd927"), 129 } },
         { MerkleTreeId::NOTE_HASH_TREE,
-          { fr("0x15dad063953d8d216c1db77739d6fb27e1b73a5beef748a1208898b3428781eb"), 1 } },
+          { fr("0x2467e5f90736b4ea977e7d21cfb3714181e16b7d6cd867768b59e2ea90fa3eaf"), 1 } },
         { MerkleTreeId::PUBLIC_DATA_TREE,
           { fr("0x0278dcf9ff541da255ee722aecfad849b66af0d42c2924d949b5a509f2e1aec9"), 129 } },
         { MerkleTreeId::L1_TO_L2_MESSAGE_TREE,
-          { fr("0x20ea8ca97f96508aaed2d6cdc4198a41c77c640bfa8785a51bb905b9a672ba0b"), 1 } },
+          { fr("0x24ffd0fab86555ab2e86cffc706d4cfb4b8c405c3966af805de954504ffc27ac"), 1 } },
     };
 
     WorldStateStatus status = ws.sync_block(
@@ -521,13 +523,13 @@ TEST_F(WorldStateTest, SyncBlockFromDirtyState)
     WorldState ws(thread_pool_size, data_dir, map_size, tree_heights, tree_prefill, initial_header_generator_point);
     StateReference block_state_ref = {
         { MerkleTreeId::NULLIFIER_TREE,
-          { fr("0x0342578609a7358092788d0eed7d1ee0ec8e0c596c0b1e85ba980ddd5cc79d04"), 129 } },
+          { fr("0x187a19972150cd1e76d8201d720da7682fcf4d93ec6a3c7b0d84bbefde5bd927"), 129 } },
         { MerkleTreeId::NOTE_HASH_TREE,
-          { fr("0x15dad063953d8d216c1db77739d6fb27e1b73a5beef748a1208898b3428781eb"), 1 } },
+          { fr("0x2467e5f90736b4ea977e7d21cfb3714181e16b7d6cd867768b59e2ea90fa3eaf"), 1 } },
         { MerkleTreeId::PUBLIC_DATA_TREE,
           { fr("0x0278dcf9ff541da255ee722aecfad849b66af0d42c2924d949b5a509f2e1aec9"), 129 } },
         { MerkleTreeId::L1_TO_L2_MESSAGE_TREE,
-          { fr("0x20ea8ca97f96508aaed2d6cdc4198a41c77c640bfa8785a51bb905b9a672ba0b"), 1 } },
+          { fr("0x24ffd0fab86555ab2e86cffc706d4cfb4b8c405c3966af805de954504ffc27ac"), 1 } },
     };
 
     ws.append_leaves<fr>(MerkleTreeId::NOTE_HASH_TREE, { fr(142) });
@@ -564,13 +566,13 @@ TEST_F(WorldStateTest, SyncCurrentBlock)
     bb::fr block_hash(1);
     StateReference block_state_ref = {
         { MerkleTreeId::NULLIFIER_TREE,
-          { fr("0x0342578609a7358092788d0eed7d1ee0ec8e0c596c0b1e85ba980ddd5cc79d04"), 129 } },
+          { fr("0x187a19972150cd1e76d8201d720da7682fcf4d93ec6a3c7b0d84bbefde5bd927"), 129 } },
         { MerkleTreeId::NOTE_HASH_TREE,
-          { fr("0x15dad063953d8d216c1db77739d6fb27e1b73a5beef748a1208898b3428781eb"), 1 } },
+          { fr("0x2467e5f90736b4ea977e7d21cfb3714181e16b7d6cd867768b59e2ea90fa3eaf"), 1 } },
         { MerkleTreeId::PUBLIC_DATA_TREE,
           { fr("0x0278dcf9ff541da255ee722aecfad849b66af0d42c2924d949b5a509f2e1aec9"), 129 } },
         { MerkleTreeId::L1_TO_L2_MESSAGE_TREE,
-          { fr("0x20ea8ca97f96508aaed2d6cdc4198a41c77c640bfa8785a51bb905b9a672ba0b"), 1 } },
+          { fr("0x24ffd0fab86555ab2e86cffc706d4cfb4b8c405c3966af805de954504ffc27ac"), 1 } },
     };
 
     ws.append_leaves<fr>(MerkleTreeId::NOTE_HASH_TREE, { 42 });
@@ -602,13 +604,13 @@ TEST_F(WorldStateTest, RejectSyncBlockWithBadPublicWriteBatches)
     WorldState ws(thread_pool_size, data_dir, map_size, tree_heights, tree_prefill, initial_header_generator_point);
     StateReference block_state_ref = {
         { MerkleTreeId::NULLIFIER_TREE,
-          { fr("0x0342578609a7358092788d0eed7d1ee0ec8e0c596c0b1e85ba980ddd5cc79d04"), 129 } },
+          { fr("0x187a19972150cd1e76d8201d720da7682fcf4d93ec6a3c7b0d84bbefde5bd927"), 129 } },
         { MerkleTreeId::NOTE_HASH_TREE,
-          { fr("0x15dad063953d8d216c1db77739d6fb27e1b73a5beef748a1208898b3428781eb"), 1 } },
+          { fr("0x2467e5f90736b4ea977e7d21cfb3714181e16b7d6cd867768b59e2ea90fa3eaf"), 1 } },
         { MerkleTreeId::PUBLIC_DATA_TREE,
           { fr("0x0278dcf9ff541da255ee722aecfad849b66af0d42c2924d949b5a509f2e1aec9"), 129 } },
         { MerkleTreeId::L1_TO_L2_MESSAGE_TREE,
-          { fr("0x20ea8ca97f96508aaed2d6cdc4198a41c77c640bfa8785a51bb905b9a672ba0b"), 1 } },
+          { fr("0x24ffd0fab86555ab2e86cffc706d4cfb4b8c405c3966af805de954504ffc27ac"), 1 } },
     };
 
     auto sync = [&]() {
@@ -629,13 +631,13 @@ TEST_F(WorldStateTest, RejectSyncBlockWithInvalidStateRef)
     WorldState ws(thread_pool_size, data_dir, map_size, tree_heights, tree_prefill, initial_header_generator_point);
     StateReference block_state_ref = {
         { MerkleTreeId::NULLIFIER_TREE,
-          { fr("0x0342578609a7358092788d0eed7d1ee0ec8e0c596c0b1e85ba980ddd5cc79d04"), 129 } },
+          { fr("0x187a19972150cd1e76d8201d720da7682fcf4d93ec6a3c7b0d84bbefde5bd927"), 129 } },
         { MerkleTreeId::NOTE_HASH_TREE,
-          { fr("0x15dad063953d8d216c1db77739d6fb27e1b73a5beef748a1208898b3428781eb"), 1 } },
+          { fr("0x2467e5f90736b4ea977e7d21cfb3714181e16b7d6cd867768b59e2ea90fa3eaf"), 1 } },
         { MerkleTreeId::PUBLIC_DATA_TREE,
           { fr("0x0278dcf9ff541da255ee722aecfad849b66af0d42c2924d949b5a509f2e1aec9"), 129 } },
         { MerkleTreeId::L1_TO_L2_MESSAGE_TREE,
-          { fr("0x20ea8ca97f96508aaed2d6cdc4198a41c77c640bfa8785a51bb905b9a672ba0b"), 1 } },
+          { fr("0x24ffd0fab86555ab2e86cffc706d4cfb4b8c405c3966af805de954504ffc27ac"), 1 } },
     };
 
     auto sync = [&]() {

diff --git a/l1-contracts/test/fixtures/empty_block_1.json b/l1-contracts/test/fixtures/empty_block_1.json
@@ -8,8 +8,8 @@
     "l2ToL1Messages": []
   },
   "block": {
-    "archive": "0x1dc739468245c6d33b9e82026677997b13f58d9f425064daaadb8e419f9124d9",
-    "blockHash": "0x0b0f8a9eaf46c51bccc1c17ea83917432236129f64b485b254ac3bc93eceaedc",
+    "archive": "0x290224593fb92b62037b4de2998bf4a4885c336f2ad6c4cb696e6d63e5a89617",
+    "blockHash": "0x301afb0ad55a56e9c9a2d16066e8191e405050ab1ec4857548476ec5421d80c8",
     "body": "0x00000000",
     "txsEffectsHash": "0x00e994e16b3763fd5039413cf99c2b3c378e2bab939e7992a77bd201b28160d6",
     "decodedHeader": {
@@ -23,10 +23,10 @@
         "blockNumber": 1,
         "slotNumber": "0x0000000000000000000000000000000000000000000000000000000000000012",
         "chainId": 31337,
-        "timestamp": 1731179999,
+        "timestamp": 1731245188,
         "version": 1,
-        "coinbase": "0xab9d40790d335aaf7b1f06c27d8aa45bdaf8a124",
-        "feeRecipient": "0x180a31c8c30ff21d55649698c0a5a87b44bcadc1407f0f6bd5382ca04ae2929d",
+        "coinbase": "0x87fd4fd216cc188ed749b212d47da09302d48347",
+        "feeRecipient": "0x1dfe5e3a945913e1ca657ea603f1314311a41600cdda3484a4cdc2cd481ce830",
         "gasFees": {
           "feePerDaGas": 0,
           "feePerL2Gas": 0
@@ -59,8 +59,8 @@
         }
       }
     },
-    "header": "0x0237797d6a2c04d20d4fa06b74482bd970ccd51a43d9b05b57e9b91fa1ae1cae00000001000000000000000000000000000000000000000000000000000000000000000200e994e16b3763fd5039413cf99c2b3c378e2bab939e7992a77bd201b28160d600089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c00f5a5fd42d16a20302798ef6ed309979b43003d2320d9f0e8ea9831a92759fb2e33ee2008411c04b99c24b313513d097a0d21a5040b6193d1f978b8226892d6000000101fd848aa69e1633722fe249a5b7f53b094f1c9cef9f5c694b073fd1cc5850dfb000000800c499b373a1f0fe1b510a63563546d2d39e206895056a5af0143c5f30d6390730000010023c08a6b1297210c5e24c76b9a936250a1ce2721576c26ea797c7ec35f9e46a9000001000000000000000000000000000000000000000000000000000000000000007a6900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000672fb5dfab9d40790d335aaf7b1f06c27d8aa45bdaf8a124180a31c8c30ff21d55649698c0a5a87b44bcadc1407f0f6bd5382ca04ae2929d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "publicInputsHash": "0x000cf00d10cbffdead1f054f5531afd820d9287bc4fdda7b36f84c6f90537378",
+    "header": "0x0237797d6a2c04d20d4fa06b74482bd970ccd51a43d9b05b57e9b91fa1ae1cae00000001000000000000000000000000000000000000000000000000000000000000000200e994e16b3763fd5039413cf99c2b3c378e2bab939e7992a77bd201b28160d600089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c00f5a5fd42d16a20302798ef6ed309979b43003d2320d9f0e8ea9831a92759fb2e33ee2008411c04b99c24b313513d097a0d21a5040b6193d1f978b8226892d6000000101fd848aa69e1633722fe249a5b7f53b094f1c9cef9f5c694b073fd1cc5850dfb000000800c499b373a1f0fe1b510a63563546d2d39e206895056a5af0143c5f30d6390730000010023c08a6b1297210c5e24c76b9a936250a1ce2721576c26ea797c7ec35f9e46a9000001000000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000006730b48487fd4fd216cc188ed749b212d47da09302d483471dfe5e3a945913e1ca657ea603f1314311a41600cdda3484a4cdc2cd481ce8300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+    "publicInputsHash": "0x00bbb022d16d2176706938a537870842421b99b2192a8299ad91925730de7ea1",
     "numTxs": 0
   }
 }
diff --git a/l1-contracts/test/fixtures/empty_block_2.json b/l1-contracts/test/fixtures/empty_block_2.json
@@ -8,8 +8,8 @@
     "l2ToL1Messages": []
   },
   "block": {
-    "archive": "0x0fdd3d4dbff9b14f5b2f0ee2e9fe160b4dea41622ceeb1f83258d3c47e4fb026",
-    "blockHash": "0x0aec0680a3fc21d813abd51da419317a033fb68f58cd7a805d18524fc1e08553",
+    "archive": "0x0502f83ed524a73527dbacfd1d9b00295ebba0be1f4dee942045d98ede450ad1",
+    "blockHash": "0x0d29c9c1d2e244594b4e63bccc419fc0df1862e5caa4c562609b8d83ed4958fa",
     "body": "0x00000000",
     "txsEffectsHash": "0x00e994e16b3763fd5039413cf99c2b3c378e2bab939e7992a77bd201b28160d6",
     "decodedHeader": {
@@ -23,10 +23,10 @@
         "blockNumber": 2,
         "slotNumber": "0x0000000000000000000000000000000000000000000000000000000000000013",
         "chainId": 31337,
-        "timestamp": 1731180023,
+        "timestamp": 1731245212,
         "version": 1,
-        "coinbase": "0xab9d40790d335aaf7b1f06c27d8aa45bdaf8a124",
-        "feeRecipient": "0x180a31c8c30ff21d55649698c0a5a87b44bcadc1407f0f6bd5382ca04ae2929d",
+        "coinbase": "0x87fd4fd216cc188ed749b212d47da09302d48347",
+        "feeRecipient": "0x1dfe5e3a945913e1ca657ea603f1314311a41600cdda3484a4cdc2cd481ce830",
         "gasFees": {
           "feePerDaGas": 0,
           "feePerL2Gas": 0
@@ -36,7 +36,7 @@
       "totalManaUsed": "0x0000000000000000000000000000000000000000000000000000000000000000",
       "lastArchive": {
         "nextAvailableLeafIndex": 2,
-        "root": "0x1dc739468245c6d33b9e82026677997b13f58d9f425064daaadb8e419f9124d9"
+        "root": "0x290224593fb92b62037b4de2998bf4a4885c336f2ad6c4cb696e6d63e5a89617"
       },
       "stateReference": {
         "l1ToL2MessageTree": {
@@ -59,8 +59,8 @@
         }
       }
     },
-    "header": "0x1dc739468245c6d33b9e82026677997b13f58d9f425064daaadb8e419f9124d900000002000000000000000000000000000000000000000000000000000000000000000200e994e16b3763fd5039413cf99c2b3c378e2bab939e7992a77bd201b28160d600089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c00f5a5fd42d16a20302798ef6ed309979b43003d2320d9f0e8ea9831a92759fb2e33ee2008411c04b99c24b313513d097a0d21a5040b6193d1f978b8226892d6000000201fd848aa69e1633722fe249a5b7f53b094f1c9cef9f5c694b073fd1cc5850dfb000001000c499b373a1f0fe1b510a63563546d2d39e206895056a5af0143c5f30d6390730000018023c08a6b1297210c5e24c76b9a936250a1ce2721576c26ea797c7ec35f9e46a9000001800000000000000000000000000000000000000000000000000000000000007a6900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001300000000000000000000000000000000000000000000000000000000672fb5f7ab9d40790d335aaf7b1f06c27d8aa45bdaf8a124180a31c8c30ff21d55649698c0a5a87b44bcadc1407f0f6bd5382ca04ae2929d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "publicInputsHash": "0x00879d193be782fe7b6d2555f2ab28dce64e06c932117a46433a4f6b241d5a98",
+    "header": "0x290224593fb92b62037b4de2998bf4a4885c336f2ad6c4cb696e6d63e5a8961700000002000000000000000000000000000000000000000000000000000000000000000200e994e16b3763fd5039413cf99c2b3c378e2bab939e7992a77bd201b28160d600089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c00f5a5fd42d16a20302798ef6ed309979b43003d2320d9f0e8ea9831a92759fb2e33ee2008411c04b99c24b313513d097a0d21a5040b6193d1f978b8226892d6000000201fd848aa69e1633722fe249a5b7f53b094f1c9cef9f5c694b073fd1cc5850dfb000001000c499b373a1f0fe1b510a63563546d2d39e206895056a5af0143c5f30d6390730000018023c08a6b1297210c5e24c76b9a936250a1ce2721576c26ea797c7ec35f9e46a9000001800000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000013000000000000000000000000000000000000000000000000000000006730b49c87fd4fd216cc188ed749b212d47da09302d483471dfe5e3a945913e1ca657ea603f1314311a41600cdda3484a4cdc2cd481ce8300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+    "publicInputsHash": "0x00d769f9dff59cd685c31179085008d4afb866fab2e160b645972868968b6815",
     "numTxs": 0
   }
 }
diff --git a/l1-contracts/test/fixtures/mixed_block_1.json b/l1-contracts/test/fixtures/mixed_block_1.json
diff --git a/l1-contracts/test/fixtures/mixed_block_2.json b/l1-contracts/test/fixtures/mixed_block_2.json
diff --git a/yarn-project/circuits.js/src/structs/header.ts b/yarn-project/circuits.js/src/structs/header.ts
@@ -38,6 +38,7 @@ export class Header {
         state: StateReference.schema,
         globalVariables: GlobalVariables.schema,
         totalFees: schemas.Fr,
+        totalManaUsed: schemas.Fr,
       })
       .transform(Header.from);
   }

diff --git a/yarn-project/circuits.js/src/structs/rollup/base_or_merge_rollup_public_inputs.ts b/yarn-project/circuits.js/src/structs/rollup/base_or_merge_rollup_public_inputs.ts
@@ -63,6 +63,7 @@ export class BaseOrMergeRollupPublicInputs {
       Fr.zero(),
       Fr.zero(),
       Fr.zero(),
+      Fr.zero(),
     );
   }