forked from visoftsolutions/noir_rs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: updating L2 Block encoding and
Rollup.process function (Aztec…
…Protocol#4015) Fixes AztecProtocol#3936 Fixes AztecProtocol#4010 Fixes AztecProtocol#4011
- Loading branch information
Showing
35 changed files
with
795 additions
and
554 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // Copyright 2023 Aztec Labs. | ||
| pragma solidity >=0.8.18; | ||
|
|
||
| // Libraries | ||
| import {Errors} from "./Errors.sol"; | ||
| import {Constants} from "./ConstantsGen.sol"; | ||
| import {Hash} from "./Hash.sol"; | ||
|
|
||
| /** | ||
| * @title Header Library | ||
| * @author Aztec Labs | ||
| * @notice Decoding and validating an L2 block header | ||
| * Concerned with readability and velocity of development not giving a damn about gas costs. | ||
| * | ||
| * ------------------- | ||
| * You can use https://gist.github.com/LHerskind/724a7e362c97e8ac2902c6b961d36830 to generate the below outline. | ||
| * ------------------- | ||
| * L2 Block Header specification | ||
| * ------------------- | ||
| * | ||
| * | byte start | num bytes | name | ||
| * | --- | --- | --- | ||
| * | | | Header { | ||
| * | | | GlobalVariables { | ||
| * | 0x0000 | 0x20 | chainId | ||
| * | 0x0020 | 0x20 | version | ||
| * | 0x0040 | 0x20 | blockNumber | ||
| * | 0x0060 | 0x20 | timestamp | ||
| * | | | } | ||
| * | | | StateReference { | ||
| * | 0x0080 | 0x20 | l1ToL2MessageTree.root | ||
| * | 0x00a0 | 0x04 | l1ToL2MessageTree.nextAvailableLeafIndex | ||
| * | | | PartialStateReference { | ||
| * | 0x00a4 | 0x20 | noteHashTree.root | ||
| * | 0x00c4 | 0x04 | noteHashTree.nextAvailableLeafIndex | ||
| * | 0x00c8 | 0x20 | nullifierTree.root | ||
| * | 0x00e8 | 0x04 | nullifierTree.nextAvailableLeafIndex | ||
| * | 0x00ec | 0x20 | contractTree.root | ||
| * | 0x010c | 0x04 | contractTree.nextAvailableLeafIndex | ||
| * | 0x0110 | 0x20 | publicDataTree.root | ||
| * | 0x0130 | 0x04 | publicDataTree.nextAvailableLeafIndex | ||
| * | | | } | ||
| * | | | } | ||
| * | 0x0134 | 0x20 | lastArchive.root | ||
| * | 0x0154 | 0x04 | lastArchive.nextAvailableLeafIndex | ||
| * | 0x0158 | 0x20 | bodyHash | ||
| * | | | } | ||
| * | --- | --- | --- | ||
| */ | ||
| library HeaderLib { | ||
| struct AppendOnlyTreeSnapshot { | ||
| bytes32 root; | ||
| uint32 nextAvailableLeafIndex; | ||
| } | ||
|
|
||
| struct GlobalVariables { | ||
| uint256 chainId; | ||
| uint256 version; | ||
| uint256 blockNumber; | ||
| uint256 timestamp; | ||
| } | ||
|
|
||
| struct PartialStateReference { | ||
| AppendOnlyTreeSnapshot noteHashTree; | ||
| AppendOnlyTreeSnapshot nullifierTree; | ||
| AppendOnlyTreeSnapshot contractTree; | ||
| AppendOnlyTreeSnapshot publicDataTree; | ||
| } | ||
|
|
||
| struct StateReference { | ||
| AppendOnlyTreeSnapshot l1ToL2MessageTree; | ||
| // Note: Can't use "partial" name here as in yellow paper because it is a reserved solidity keyword | ||
| PartialStateReference partialStateReference; | ||
| } | ||
|
|
||
| struct Header { | ||
| GlobalVariables globalVariables; | ||
| StateReference stateReference; | ||
| AppendOnlyTreeSnapshot lastArchive; | ||
| bytes32 bodyHash; | ||
| } | ||
|
|
||
| /** | ||
| * @notice Decodes the header | ||
| * @param _header - The header calldata | ||
| * @return The decoded header | ||
| */ | ||
| function decode(bytes calldata _header) internal pure returns (Header memory) { | ||
| require(_header.length == 376, "Invalid header length"); | ||
|
|
||
| Header memory header; | ||
|
|
||
| header.globalVariables.chainId = uint256(bytes32(_header[:0x20])); | ||
| header.globalVariables.version = uint256(bytes32(_header[0x20:0x40])); | ||
| header.globalVariables.blockNumber = uint256(bytes32(_header[0x40:0x60])); | ||
| header.globalVariables.timestamp = uint256(bytes32(_header[0x60:0x80])); | ||
| header.stateReference.l1ToL2MessageTree = | ||
| AppendOnlyTreeSnapshot(bytes32(_header[0x80:0xa0]), uint32(bytes4(_header[0xa0:0xa4]))); | ||
| header.stateReference.partialStateReference.noteHashTree = | ||
| AppendOnlyTreeSnapshot(bytes32(_header[0xa4:0xc4]), uint32(bytes4(_header[0xc4:0xc8]))); | ||
| header.stateReference.partialStateReference.nullifierTree = | ||
| AppendOnlyTreeSnapshot(bytes32(_header[0xc8:0xe8]), uint32(bytes4(_header[0xe8:0xec]))); | ||
| header.stateReference.partialStateReference.contractTree = | ||
| AppendOnlyTreeSnapshot(bytes32(_header[0xec:0x10c]), uint32(bytes4(_header[0x10c:0x110]))); | ||
| header.stateReference.partialStateReference.publicDataTree = | ||
| AppendOnlyTreeSnapshot(bytes32(_header[0x110:0x130]), uint32(bytes4(_header[0x130:0x134]))); | ||
| header.lastArchive = | ||
| AppendOnlyTreeSnapshot(bytes32(_header[0x134:0x154]), uint32(bytes4(_header[0x154:0x158]))); | ||
|
|
||
| header.bodyHash = bytes32(_header[0x158:0x178]); | ||
|
|
||
| return header; | ||
| } | ||
|
|
||
| /** | ||
| * @notice Validates the header | ||
| * @param _header - The decoded header | ||
| * @param _version - The expected version | ||
| * @param _lastBlockTs - The timestamp of the last block | ||
| * @param _archive - The expected archive root | ||
| */ | ||
| function validate(Header memory _header, uint256 _version, uint256 _lastBlockTs, bytes32 _archive) | ||
| internal | ||
| view | ||
| { | ||
| if (block.chainid != _header.globalVariables.chainId) { | ||
| revert Errors.Rollup__InvalidChainId(_header.globalVariables.chainId, block.chainid); | ||
| } | ||
|
|
||
| if (_header.globalVariables.version != _version) { | ||
| revert Errors.Rollup__InvalidVersion(_header.globalVariables.version, _version); | ||
| } | ||
|
|
||
| // block number already constrained by archive root check | ||
|
|
||
| if (_header.globalVariables.timestamp > block.timestamp) { | ||
| revert Errors.Rollup__TimestampInFuture(); | ||
| } | ||
|
|
||
| // @todo @LHerskind consider if this is too strict | ||
| // This will make multiple l2 blocks in the same l1 block impractical. | ||
| // e.g., the first block will update timestamp which will make the second fail. | ||
| // Could possibly allow multiple blocks if in same l1 block | ||
| if (_header.globalVariables.timestamp < _lastBlockTs) { | ||
| revert Errors.Rollup__TimestampTooOld(); | ||
| } | ||
|
|
||
| // @todo @LHerskind Proper genesis state. If the state is empty, we allow anything for now. | ||
| if (_archive != bytes32(0) && _archive != _header.lastArchive.root) { | ||
| revert Errors.Rollup__InvalidArchive(_archive, _header.lastArchive.root); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.