Skip to content

Commit

Permalink
enabling in hash check in Rollup
Browse files Browse the repository at this point in the history
  • Loading branch information
@benesjan
benesjan committed Mar 12, 2024
1 parent c76a1e2 commit 68a6b80
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 40 deletions.
10 changes: 4 additions & 6 deletions l1-contracts/src/core/Rollup.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,10 @@ contract Rollup is IRollup {
IInbox inbox = REGISTRY.getInbox();
inbox.batchConsume(l1ToL2Msgs, msg.sender);

// TODO(#4633): enable the inHash check
NEW_INBOX.consume();
// bytes32 inHash = NEW_INBOX.consume();
// if (header.contentCommitment.inHash != inHash) {
// revert Errors.Rollup__InvalidInHash(inHash, header.contentCommitment.inHash);
// }
bytes32 inHash = NEW_INBOX.consume();
if (header.contentCommitment.inHash != inHash) {
revert Errors.Rollup__InvalidInHash(inHash, header.contentCommitment.inHash);
}

IOutbox outbox = REGISTRY.getOutbox();
outbox.sendL1Messages(l2ToL1Msgs);
Expand Down
1 change: 1 addition & 0 deletions l1-contracts/src/core/libraries/Errors.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ library Errors {

// Rollup
error Rollup__InvalidArchive(bytes32 expected, bytes32 actual); // 0xb682a40e
error Rollup__InvalidInHash(bytes32 expected, bytes32 actual); // 0xcd6f4233
error Rollup__InvalidProof(); // 0xa5b2ba17
error Rollup__InvalidChainId(uint256 expected, uint256 actual); // 0x37b5bc12
error Rollup__InvalidVersion(uint256 expected, uint256 actual); // 0x9ef30794
Expand Down
12 changes: 6 additions & 6 deletions l1-contracts/test/fixtures/empty_block_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
]
},
"block": {
"archive": "0x12e61edc1dad6fb9e81e4157d0906a171a2d2cad5daa767594eb07b7e7c1c189",
"archive": "0x20c801f2ee9453fa49caae58b4cec6f0ee05e59ed976c19488273900a92ce4ac",
"body": "0x00000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"txsEffectsHash": "0x9139297703640b243028d35c29ae8c0667886c4edc8db5f879c260d2051bb8a9",
"decodedHeader": {
"contentCommitment": {
"inHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"inHash": "0x536d98837f2dd165a55d5eeae91485954472d56f246df256bf3cae19352a123c",
"outHash": "0xc78009fdf07fc56a11f122370658a353aaa542ed63e44c4bc15ff4cd105ab33c",
"txTreeHeight": 2,
"txsEffectsHash": "0x9139297703640b243028d35c29ae8c0667886c4edc8db5f879c260d2051bb8a9"
Expand All @@ -50,8 +50,8 @@
"chainId": 31337,
"timestamp": 0,
"version": 1,
"coinbase": "0x837ac4b411a7a5911031e82d3f8799bb21c34795",
"feeRecipient": "0x1296779221953ecf9e3c115440521940f216ca20b860f64f13af55b8cdbdb9c7"
"coinbase": "0xeacbed58a3350230ff40d350a9c64be239280c66",
"feeRecipient": "0x19f22da4b7db9539deeff24fb31c9493dc2dd65b13ca88567ac3edbbb4adefa5"
},
"lastArchive": {
"nextAvailableLeafIndex": 1,
Expand All @@ -78,8 +78,8 @@
}
}
},
"header": "0x012a86560737adb075e12af8253fb09abf17aa841fb56d180bc89f0d2d473c7f0000000100000000000000000000000000000000000000000000000000000000000000029139297703640b243028d35c29ae8c0667886c4edc8db5f879c260d2051bb8a90000000000000000000000000000000000000000000000000000000000000000c78009fdf07fc56a11f122370658a353aaa542ed63e44c4bc15ff4cd105ab33c1864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000001016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000001000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000001800572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000000c00000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000837ac4b411a7a5911031e82d3f8799bb21c347951296779221953ecf9e3c115440521940f216ca20b860f64f13af55b8cdbdb9c7",
"header": "0x012a86560737adb075e12af8253fb09abf17aa841fb56d180bc89f0d2d473c7f0000000100000000000000000000000000000000000000000000000000000000000000029139297703640b243028d35c29ae8c0667886c4edc8db5f879c260d2051bb8a9536d98837f2dd165a55d5eeae91485954472d56f246df256bf3cae19352a123cc78009fdf07fc56a11f122370658a353aaa542ed63e44c4bc15ff4cd105ab33c1864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000001016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000001000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000001800572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000000c00000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000eacbed58a3350230ff40d350a9c64be239280c6619f22da4b7db9539deeff24fb31c9493dc2dd65b13ca88567ac3edbbb4adefa5",
"l1ToL2MessagesHash": "0x076a27c79e5ace2a3d47f9dd2e83e4ff6ea8872b3c2218f66c92b89b55f36560",
"publicInputsHash": "0x14d3a7d947fc1660f01d5f41f7768d9bee4a74809484cc80535183daf0346d1f"
"publicInputsHash": "0x27935ee6d68fb2c005e164b1e06c2388d7bab6c29eea9c465908be5991fbb4ca"
}
}
16 changes: 8 additions & 8 deletions l1-contracts/test/fixtures/empty_block_1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,27 @@
]
},
"block": {
"archive": "0x2eb0c375f9f387ef03e8f470f7f976a8213cf31a514b72cf3499a8dd251deb57",
"archive": "0x26f59272a35a1f3d432c941a961518225f570af8926ab9082be0d58462975619",
"body": "0x00000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"txsEffectsHash": "0x9139297703640b243028d35c29ae8c0667886c4edc8db5f879c260d2051bb8a9",
"decodedHeader": {
"contentCommitment": {
"inHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"inHash": "0x536d98837f2dd165a55d5eeae91485954472d56f246df256bf3cae19352a123c",
"outHash": "0xc78009fdf07fc56a11f122370658a353aaa542ed63e44c4bc15ff4cd105ab33c",
"txTreeHeight": 2,
"txsEffectsHash": "0x9139297703640b243028d35c29ae8c0667886c4edc8db5f879c260d2051bb8a9"
},
"globalVariables": {
"blockNumber": 2,
"chainId": 31337,
"timestamp": 1709939104,
"timestamp": 1710844994,
"version": 1,
"coinbase": "0x837ac4b411a7a5911031e82d3f8799bb21c34795",
"feeRecipient": "0x1296779221953ecf9e3c115440521940f216ca20b860f64f13af55b8cdbdb9c7"
"coinbase": "0xeacbed58a3350230ff40d350a9c64be239280c66",
"feeRecipient": "0x19f22da4b7db9539deeff24fb31c9493dc2dd65b13ca88567ac3edbbb4adefa5"
},
"lastArchive": {
"nextAvailableLeafIndex": 2,
"root": "0x12e61edc1dad6fb9e81e4157d0906a171a2d2cad5daa767594eb07b7e7c1c189"
"root": "0x20c801f2ee9453fa49caae58b4cec6f0ee05e59ed976c19488273900a92ce4ac"
},
"stateReference": {
"l1ToL2MessageTree": {
Expand All @@ -78,8 +78,8 @@
}
}
},
"header": "0x12e61edc1dad6fb9e81e4157d0906a171a2d2cad5daa767594eb07b7e7c1c1890000000200000000000000000000000000000000000000000000000000000000000000029139297703640b243028d35c29ae8c0667886c4edc8db5f879c260d2051bb8a90000000000000000000000000000000000000000000000000000000000000000c78009fdf07fc56a11f122370658a353aaa542ed63e44c4bc15ff4cd105ab33c1864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000002016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000002000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000002800572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000001400000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000065eb99a0837ac4b411a7a5911031e82d3f8799bb21c347951296779221953ecf9e3c115440521940f216ca20b860f64f13af55b8cdbdb9c7",
"header": "0x20c801f2ee9453fa49caae58b4cec6f0ee05e59ed976c19488273900a92ce4ac0000000200000000000000000000000000000000000000000000000000000000000000029139297703640b243028d35c29ae8c0667886c4edc8db5f879c260d2051bb8a9536d98837f2dd165a55d5eeae91485954472d56f246df256bf3cae19352a123cc78009fdf07fc56a11f122370658a353aaa542ed63e44c4bc15ff4cd105ab33c1864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000002016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000002000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000002800572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000001400000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000065f96c42eacbed58a3350230ff40d350a9c64be239280c6619f22da4b7db9539deeff24fb31c9493dc2dd65b13ca88567ac3edbbb4adefa5",
"l1ToL2MessagesHash": "0x076a27c79e5ace2a3d47f9dd2e83e4ff6ea8872b3c2218f66c92b89b55f36560",
"publicInputsHash": "0x18091cbbf29dbe3cd4e5387ea7cfa360121b458b5fb9229ff822cfd32288436e"
"publicInputsHash": "0x00f8983da39c512e02fa3befd1c777fa7f3a9d8a5c3852193af88afa8c4f6c86"
}
}
18 changes: 9 additions & 9 deletions l1-contracts/test/fixtures/mixed_block_0.json
View file

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions l1-contracts/test/fixtures/mixed_block_1.json
View file

Large diffs are not rendered by default.

0 comments on commit 68a6b80

Please sign in to comment.