Skip to content

refactor: sequencer inbox DAS changes #698

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

Merged
PlasmaPower merged 16 commits into from
Jun 16, 2022
Merged

refactor: sequencer inbox DAS changes #698

Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2f5b441
refactor: avoid calldata to memory copy in sequencer inbox when not a…
fredlacs Jun 16, 2022
5dfc6f6
refactor: use modifier to validate batch correctness for das
fredlacs Jun 16, 2022
99a1371
refactor: track das keysets in struct
fredlacs Jun 16, 2022
be47f36
fix das byte check and add other batch validation logic to modifier
fredlacs Jun 16, 2022
9e9a313
add data length check
fredlacs Jun 16, 2022
aa4f18e
remove overflow check not needed in solc >=0.8
fredlacs Jun 16, 2022
d57e4a4
fix error name
fredlacs Jun 16, 2022
960ea5c
synchronize deletion of creation block
fredlacs Jun 16, 2022
07339b9
fix length check
fredlacs Jun 16, 2022
a1284d1
refactor das block creation to list every block a keyset was updated
fredlacs Jun 16, 2022
c03848c
docs: comment around 33 magic value
fredlacs Jun 16, 2022
a32123c
Revert "refactor das block creation to list every block a keyset was …
fredlacs Jun 16, 2022
6c84471
Revert "synchronize deletion of creation block"
fredlacs Jun 16, 2022
23e4530
add comments explaining code expectations
fredlacs Jun 16, 2022
9d956c0
use high level solidity for concat of bytes
fredlacs Jun 16, 2022
77923a0
clarify docs
fredlacs Jun 16, 2022
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
51 changes: 30 additions & 21 deletions contracts/src/bridge/SequencerInbox.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,11 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
mapping(address => bool) public isBatchPoster;
ISequencerInbox.MaxTimeVariation public maxTimeVariation;

mapping(bytes32 => bool) public isValidKeysetHash;
mapping(bytes32 => uint256) public keysetHashCreationBlock;
struct DasKeySetInfo {
bool isValidKeyset;
uint64 creationBlock;
}
mapping(bytes32 => DasKeySetInfo) public dasKeySetInfo;

modifier onlyRollupOwner() {
if (msg.sender != IRollupUserAbs(rollup).owner()) revert NotOwner(msg.sender, rollup);
Expand Down Expand Up @@ -199,15 +202,18 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
emit SequencerBatchData(sequenceNumber, data);
}

function dasKeysetHashFromBatchData(bytes memory data) internal pure returns (bytes32) {
modifier validateBatchData(bytes calldata data) {
if (data.length < 33 || data[0] & 0x80 == 0) {
return bytes32(0);
}
bytes32 temp;
assembly {
temp := mload(add(data, 33))
// not a DAS batch, so we don't need keyset validation
_;
} else {
bytes32 dasKeysetHash;
assembly {
dasKeysetHash := calldataload(add(data.offset, 33))
Comment thread
fredlacs marked this conversation as resolved.
Outdated
}
if (!dasKeySetInfo[dasKeysetHash].isValidKeyset) revert NoSuchKeyset(dasKeysetHash);
_;
}
return temp;
}

function packHeader(uint256 afterDelayedMessagesRead)
Expand All @@ -231,12 +237,9 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
function formDataHash(bytes calldata data, uint256 afterDelayedMessagesRead)
internal
view
validateBatchData(data)
returns (bytes32, TimeBounds memory)
{
bytes32 dasKeysetHash = dasKeysetHashFromBatchData(data);
if (dasKeysetHash != bytes32(0)) {
if (!isValidKeysetHash[dasKeysetHash]) revert NoSuchKeyset(dasKeysetHash);
}
uint256 fullDataLen = HEADER_LENGTH + data.length;
if (fullDataLen < HEADER_LENGTH) revert DataLengthOverflow();
if (fullDataLen > MAX_DATA_SIZE) revert DataTooLarge(fullDataLen, MAX_DATA_SIZE);
Expand Down Expand Up @@ -344,9 +347,11 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
*/
function setValidKeyset(bytes calldata keysetBytes) external onlyRollupOwner {
bytes32 ksHash = keccak256(keysetBytes);
if (isValidKeysetHash[ksHash]) revert AlreadyValidDASKeyset(ksHash);
isValidKeysetHash[ksHash] = true;
keysetHashCreationBlock[ksHash] = block.number;
if (dasKeySetInfo[ksHash].isValidKeyset) revert AlreadyValidDASKeyset(ksHash);
dasKeySetInfo[ksHash] = DasKeySetInfo({
isValidKeyset: true,
creationBlock: uint64(block.number)
});
emit SetValidKeyset(ksHash, keysetBytes);
emit OwnerFunctionCalled(2);
}
Expand All @@ -356,15 +361,19 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
* @param ksHash hash of the keyset
*/
function invalidateKeysetHash(bytes32 ksHash) external onlyRollupOwner {
if (!isValidKeysetHash[ksHash]) revert NoSuchKeyset(ksHash);
isValidKeysetHash[ksHash] = false;
if (!dasKeySetInfo[ksHash].isValidKeyset) revert NoSuchKeyset(ksHash);
dasKeySetInfo[ksHash].isValidKeyset = false;
emit InvalidateKeyset(ksHash);
emit OwnerFunctionCalled(3);
}

function isValidKeysetHash(bytes32 ksHash) external view returns (bool) {
return dasKeySetInfo[ksHash].isValidKeyset;
}

function getKeysetCreationBlock(bytes32 ksHash) external view returns (uint256) {
uint256 bnum = keysetHashCreationBlock[ksHash];
if (bnum == 0) revert NoSuchKeyset(ksHash);
return bnum;
DasKeySetInfo memory ksInfo = dasKeySetInfo[ksHash];
if (ksInfo.creationBlock == 0 || !ksInfo.isValidKeyset) revert NoSuchKeyset(ksHash);
return uint256(ksInfo.creationBlock);
}
}