chore(fast-inbox): circuits cleanup and checkpoint header format (A-1387)

l1-contracts/scripts/constants-codegen/solidity.json

@@ -8,7 +8,5 @@
   "EMPTY_EPOCH_OUT_HASH",
   "FEE_JUICE_ADDRESS",
   "BLS12_POINT_COMPRESSED_BYTES",
-  "ROOT_ROLLUP_PUBLIC_INPUTS_LENGTH",
-  "NUM_MSGS_PER_BASE_PARITY",
-  "NUM_BASE_PARITY_PER_ROOT_PARITY"
+  "ROOT_ROLLUP_PUBLIC_INPUTS_LENGTH"
 ]

l1-contracts/src/core/libraries/rollup/ProposedHeaderLib.sol

@@ -21,7 +21,6 @@ struct ProposedHeader {
   bytes32 lastArchiveRoot;
   bytes32 blockHeadersHash;
   bytes32 blobsHash;
-  bytes32 inHash;
   bytes32 inboxRollingHash;
   bytes32 outHash;
   Slot slotNumber;
@@ -56,7 +55,6 @@ library ProposedHeaderLib {
         _header.lastArchiveRoot,
         _header.blockHeadersHash,
         _header.blobsHash,
-        _header.inHash,
         _header.inboxRollingHash,
         _header.outHash,
         _header.slotNumber,

l1-contracts/test/RollupFieldRange.t.sol

@@ -164,8 +164,6 @@ contract RollupFieldRangeTest is RollupBase {
     vm.warp(max(block.timestamp, Timestamp.unwrap(ts)));
 
     _populateInbox(full.populate.sender, full.populate.recipient, full.populate.l1ToL2Content);
-    // The header's inHash field is an unconstrained pass-through hint post-flip; propose does not check it.
-    header.inHash = bytes32(0);
     header.gasFees.feePerL2Gas = SafeCast.toUint128(rollup.getManaMinFeeAt(ts, true));
 
     // Every field the range check guards, set to the maximal in-range value.

l1-contracts/test/base/DecoderBase.sol

@@ -46,7 +46,6 @@ contract DecoderBase is TestBase {
     address coinbase;
     bytes32 feeRecipient;
     GasFees gasFees;
-    bytes32 inHash;
     bytes32 inboxRollingHash;
     bytes32 lastArchiveRoot;
     bytes32 outHash;
@@ -104,7 +103,6 @@ contract DecoderBase is TestBase {
           lastArchiveRoot: full.checkpoint.header.lastArchiveRoot,
           blockHeadersHash: full.checkpoint.header.blockHeadersHash,
           blobsHash: full.checkpoint.header.blobsHash,
-          inHash: full.checkpoint.header.inHash,
           inboxRollingHash: full.checkpoint.header.inboxRollingHash,
           outHash: full.checkpoint.header.outHash,
           slotNumber: Slot.wrap(full.checkpoint.header.slotNumber),

l1-contracts/test/base/RollupBase.sol

@@ -171,8 +171,6 @@ contract RollupBase is DecoderBase {
 
     // We jump to the time of the block, always past the L1 block the messages above landed in.
     vm.warp(max(block.timestamp + 1, Timestamp.unwrap(full.checkpoint.header.timestamp)));
-    // The header's inHash field is an unconstrained pass-through hint post-flip; propose does not check it.
-    full.checkpoint.header.inHash = bytes32(0);
     // Streaming Inbox: reference the newest bucket so the checkpoint consumes all messages
     // seeded above and the mandatory-consumption assert is trivially satisfied (a wrong ref could only revert).
     uint256 bucketHint = rollup.getInbox().getCurrentBucketSeq();

l1-contracts/test/escape-hatch/integration/EscapeHatchIntegrationBase.sol

@@ -130,18 +130,17 @@ abstract contract EscapeHatchIntegrationBase is ValidatorSelectionTestBase {
    * @dev Uses:
    *   - archive: GENESIS_ARCHIVE_ROOT
    *   - oracleInput: zero
-   *   - header fields from fixture for blockHeadersHash/blobsHash/inHash/outHash, rest overridden
+   *   - header fields from fixture for blockHeadersHash/blobsHash/outHash, rest overridden
    */
   function _buildProposeArgs(address _proposer) internal view returns (ProposeArgs memory args, bytes memory blobs) {
     bytes32 archive = bytes32(Constants.GENESIS_ARCHIVE_ROOT);
     Slot slotNumber = rollup.getCurrentSlot();
 
-    // Build header fresh, only copying blockHeadersHash/blobsHash/inHash/outHash from fixture
+    // Build header fresh, only copying blockHeadersHash/blobsHash/outHash from fixture
     ProposedHeader memory header = ProposedHeader({
       lastArchiveRoot: archive,
       blockHeadersHash: full.checkpoint.header.blockHeadersHash,
       blobsHash: full.checkpoint.header.blobsHash,
-      inHash: full.checkpoint.header.inHash,
       inboxRollingHash: full.checkpoint.header.inboxRollingHash,
       outHash: full.checkpoint.header.outHash,
       slotNumber: slotNumber,

l1-contracts/test/fixtures/empty_checkpoint_1.json

@@ -34,7 +34,6 @@
       "lastArchiveRoot": "0x177a4955b31ecaafad999753938a44e526b54c5ba5d536688227f85f15cfbdf5",
       "blockHeadersHash": "0x2e3e0911389bc48fa8126a93273d016cc7dc08019f8ffc5f1f5ae7d90745eaa2",
       "blobsHash": "0x00e5b752fe6bc2154155ff3a979c4c5fa91d3ac0d716169ac521e1560fd83b2b",
-      "inHash": "0x00de7b349d2306334734e4f58b1302a6ed5a6c796a706f6597a5641b6d468223",
       "inboxRollingHash": "0x00cad6497cf81748167158f149ba70c31f34c68b0ae1b156117de63e073d14b5",
       "outHash": "0x00c95e0ceb41951039e1592745ec2faea9866f6eaf01bf189a4463b4143af093",
       "slotNumber": 99,
@@ -48,7 +47,7 @@
       "totalManaUsed": 0,
       "accumulatedFees": 0
     },
-    "headerHash": "0x0002fc455005d993521be4e6f8ed92d1e0b50e58b21445881c87d02ed51a1e4c",
+    "headerHash": "0x00230a553b85ec7931eded45ec1ea096e47789226758b16dca0403f5ab53f3d6",
     "numTxs": 0
   }
 }

l1-contracts/test/fixtures/empty_checkpoint_2.json

@@ -34,7 +34,6 @@
       "lastArchiveRoot": "0x09d45c1e01b8596153838a068ddb470ead95e6e1e151f40b4d48664c1e311af6",
       "blockHeadersHash": "0x0b3bda1754ca30707b8c0bbe72760c68e574cf23309e7e4fd7cabea36b4078da",
       "blobsHash": "0x000e9acabf609c9c113078ecb383ba6310573ce246958b605452132617d2c960",
-      "inHash": "0x006504de282a40084bb8098456a915c645d53482d351db52fa9433b6cd638763",
       "inboxRollingHash": "0x0080dbf2bd9576e81fd99fc0f9d35bfd7fc15a6221d0b6e1e92a1884f14d0c84",
       "outHash": "0x00c95e0ceb41951039e1592745ec2faea9866f6eaf01bf189a4463b4143af093",
       "slotNumber": 102,
@@ -48,7 +47,7 @@
       "totalManaUsed": 0,
       "accumulatedFees": 0
     },
-    "headerHash": "0x00120ecaf7a72f61adf3c8ee180acd930401221668a4792a8f91584755840d16",
+    "headerHash": "0x00a184a160ada9af4ba75961ba596043d76f56c75b2e7e9652a0c162a7bf59b9",
     "numTxs": 0
   }
 }

l1-contracts/test/fixtures/mixed_checkpoint_1.json

@@ -67,7 +67,6 @@
       "lastArchiveRoot": "0x177a4955b31ecaafad999753938a44e526b54c5ba5d536688227f85f15cfbdf5",
       "blockHeadersHash": "0x087b6f59388fa4207876ee1b50521ff838d6eed422d0ad07ff996393f32a77e6",
       "blobsHash": "0x001bef3ff3f657c565ff86d5072186f7f2bfddb8a31ca0714562c164fe954d84",
-      "inHash": "0x00de7b349d2306334734e4f58b1302a6ed5a6c796a706f6597a5641b6d468223",
       "inboxRollingHash": "0x00cad6497cf81748167158f149ba70c31f34c68b0ae1b156117de63e073d14b5",
       "outHash": "0x00cffdbb0e7f5e164d314d781d38ae31230910a3bae4c34e7df6222df71b1539",
       "slotNumber": 99,
@@ -81,7 +80,7 @@
       "totalManaUsed": 0,
       "accumulatedFees": 0
     },
-    "headerHash": "0x00c1431d117825d25f8169e35eb70ed4b16c0fc4b3cac85506852c240d03740e",
+    "headerHash": "0x00f1c11fddfca8ff6073d1715c8b886d501facad96b7b032fb440462849697b8",
     "numTxs": 4
   }
 }

l1-contracts/test/fixtures/mixed_checkpoint_2.json

@@ -67,7 +67,6 @@
       "lastArchiveRoot": "0x0c87f76b6c5cc918111d2acc975bf7f2133f5c3cc23c8cf6cc1c3e78f5c84a3e",
       "blockHeadersHash": "0x144dbe32a03df9ccc672207c93cd22099eb91e44a71e1676148cd3c6c6c98b9e",
       "blobsHash": "0x008bd0b669b942b57ccf85d3401214db65cde3608afa0b2ae0e57f35ec60d72e",
-      "inHash": "0x006504de282a40084bb8098456a915c645d53482d351db52fa9433b6cd638763",
       "inboxRollingHash": "0x0080dbf2bd9576e81fd99fc0f9d35bfd7fc15a6221d0b6e1e92a1884f14d0c84",
       "outHash": "0x008a85da85a596471f2e5fe402fde332723da8d24b6e7affd60d16c7cb7e9020",
       "slotNumber": 102,
@@ -81,7 +80,7 @@
       "totalManaUsed": 0,
       "accumulatedFees": 0
     },
-    "headerHash": "0x00ab5faa05cb38faa2cd1fc62c40007f64594c9fdc3bb8b7b478a351a7c7dc5a",
+    "headerHash": "0x00e0c076d07c17d50e3aefe9ca264ba7a4894fab4956272bfbea600e9e34bb0f",
     "numTxs": 4
   }
 }

l1-contracts/test/fixtures/single_tx_checkpoint_1.json

@@ -43,7 +43,6 @@
       "lastArchiveRoot": "0x177a4955b31ecaafad999753938a44e526b54c5ba5d536688227f85f15cfbdf5",
       "blockHeadersHash": "0x07db5c24565ad9a2c9d39ef7d9a4446e9742d6090567ff28aef9a45f4738a5cb",
       "blobsHash": "0x00ec2400a7cfc9d975cb0802980d49387588738160a0cf0301f07e1abad6456c",
-      "inHash": "0x00de7b349d2306334734e4f58b1302a6ed5a6c796a706f6597a5641b6d468223",
       "inboxRollingHash": "0x00cad6497cf81748167158f149ba70c31f34c68b0ae1b156117de63e073d14b5",
       "outHash": "0x007c92c6cf05665e1c02a305370a4d38bcb8b555261c6b39c862f8c067d6bcb7",
       "slotNumber": 99,
@@ -57,7 +56,7 @@
       "totalManaUsed": 0,
       "accumulatedFees": 0
     },
-    "headerHash": "0x0072a35395a79027db315321cbdaba5bc0b070979c3395b7369ec902ca48d9b2",
+    "headerHash": "0x0018784f81057f236b2da6a1e9bc20cb7c931343cbecb2035b605dc8ca5dd3cb",
     "numTxs": 1
   }
 }

l1-contracts/test/fixtures/single_tx_checkpoint_2.json

@@ -43,7 +43,6 @@
       "lastArchiveRoot": "0x0f198bb13b63a3a8791a8b9994167bbe1554811a106fda0acb5e6c6539b1713e",
       "blockHeadersHash": "0x12813725f2d16ce92088d2401ffa4a53ce6061bf75b77320ca7b8ef6c5145adf",
       "blobsHash": "0x002b8ae4c9f405529e2b689b829852ad52f77acdac57d1dbac3dabea1760affc",
-      "inHash": "0x006504de282a40084bb8098456a915c645d53482d351db52fa9433b6cd638763",
       "inboxRollingHash": "0x0080dbf2bd9576e81fd99fc0f9d35bfd7fc15a6221d0b6e1e92a1884f14d0c84",
       "outHash": "0x0007eac1d76cddf92b28b8f11cd292f199f35dfc588376092986575cef487f59",
       "slotNumber": 102,
@@ -57,7 +56,7 @@
       "totalManaUsed": 0,
       "accumulatedFees": 0
     },
-    "headerHash": "0x000b3c0bf27d3123a81b66570e4b63734cb06bbfd260a70fabbbfd41dec13255",
+    "headerHash": "0x00782cfd7fa9f4e407c734be2832e8afb818d2ef8a0a11d288a3df34bcae0047",
     "numTxs": 1
   }
 }