Skip to content

Check previous state root #616

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
chengwenxi merged 1 commit into from
Oct 30, 2024
Merged

Check previous state root #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions contracts/contracts/l1/rollup/Rollup.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ contract Rollup is IRollup, OwnableUpgradeable, PausableUpgradeable {
/// @notice prove remaining
uint256 public proveRemaining;

/// @notice committedStateRoots
mapping(uint256 batchIndex => bytes32 stateRoot) public committedStateRoots;

/**********************
* Function Modifiers *
**********************/
Expand Down Expand Up @@ -192,6 +195,7 @@ contract Rollup is IRollup, OwnableUpgradeable, PausableUpgradeable {
committedBatches[_batchIndex] = _batchHash;
batchDataStore[_batchIndex] = BatchData(block.timestamp, block.timestamp, 0, 0);

committedStateRoots[_batchIndex] = _postStateRoot;
finalizedStateRoots[_batchIndex] = _postStateRoot;
lastCommittedBatchIndex = _batchIndex;
lastFinalizedBatchIndex = _batchIndex;
Expand Down Expand Up @@ -226,9 +230,10 @@ contract Rollup is IRollup, OwnableUpgradeable, PausableUpgradeable {
// the variable `batchPtr` will be reused later for the current batch
(uint256 _batchPtr, bytes32 _parentBatchHash) = _loadBatchHeader(batchDataInput.parentBatchHeader);
uint256 _batchIndex = BatchHeaderCodecV0.getBatchIndex(_batchPtr);
require(committedBatches[_batchIndex] == _parentBatchHash, "incorrect parent batch hash");
require(committedBatches[_batchIndex + 1] == bytes32(0), "batch already committed");
require(_batchIndex == lastCommittedBatchIndex, "incorrect batch index");
require(committedBatches[_batchIndex] == _parentBatchHash, "incorrect parent batch hash");
require(committedStateRoots[_batchIndex] == batchDataInput.prevStateRoot, "incorrect previous state root");

uint256 _totalL1MessagesPoppedOverall = BatchHeaderCodecV0.getTotalL1MessagePopped(_batchPtr);
// compute the data hash for batch
Expand Down Expand Up @@ -278,8 +283,9 @@ contract Rollup is IRollup, OwnableUpgradeable, PausableUpgradeable {
BatchHeaderCodecV0.storeSkippedBitmap(_batchPtr, batchDataInput.skippedL1MessageBitmap);
BatchHeaderCodecV0.storeBlobVersionedHash(_batchPtr, _blobVersionedHash);
committedBatches[_batchIndex] = BatchHeaderCodecV0.computeBatchHash(_batchPtr, _headerLength);
committedStateRoots[_batchIndex] = batchDataInput.postStateRoot;
uint256 proveRemainingTime = 0;
if (inChallenge){
if (inChallenge) {
// Make the batch finalize time longer than the time required for the current challenge
proveRemainingTime = proofWindow + challenges[batchChallenged].startTime - block.timestamp;
}
Expand Down Expand Up @@ -500,7 +506,6 @@ contract Rollup is IRollup, OwnableUpgradeable, PausableUpgradeable {
(uint256 memPtr, bytes32 _batchHash) = _loadBatchHeader(_batchHeader);
uint256 _batchIndex = BatchHeaderCodecV0.getBatchIndex(memPtr);
require(committedBatches[_batchIndex] == _batchHash, "incorrect batch hash");

require(batchExist(_batchIndex), "batch not exist");
require(!batchInChallenge(_batchIndex), "batch in challenge");
require(!batchChallengedSuccess(_batchIndex), "batch should be revert");
Expand Down Expand Up @@ -530,6 +535,7 @@ contract Rollup is IRollup, OwnableUpgradeable, PausableUpgradeable {
);

delete batchDataStore[_batchIndex - 1];
delete committedStateRoots[_batchIndex - 1];
delete challenges[_batchIndex - 1];

emit FinalizeBatch(
Expand Down
54 changes: 51 additions & 3 deletions contracts/contracts/test/Rollup.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ contract RollupCommitBatchTest is L1MessageBaseTest {
assertFalse(rollup.isBatchFinalized(1));
bytes32 batchHash1 = rollup.committedBatches(1);
assertEq(batchHash1, bytes32(0x135ab7153517794b38566492dee2a60426285da9764f8ad07da93cf7dd560a59));
bytes32 stateRoot1 = rollup.committedStateRoots(1);
assertEq(stateRoot1, bytesData1);

emit log_bytes32(batchHash0);
// finalize batch1
Expand All @@ -132,6 +134,9 @@ contract RollupCommitBatchTest is L1MessageBaseTest {
assertEq(rollup.lastFinalizedBatchIndex(), 1);
assertFalse(l1MessageQueueWithGasPriceOracle.isMessageSkipped(0));
assertEq(l1MessageQueueWithGasPriceOracle.pendingQueueIndex(), 1);
// check deleted values
assertFalse(rollup.batchExist(0));
assertEq(rollup.committedStateRoots(0), 0);

// commit batch2 with 4 blocks, correctly
// 1. block0 has 3 tx, no L1 messages
Expand Down Expand Up @@ -204,18 +209,25 @@ contract RollupCommitBatchTest is L1MessageBaseTest {
assertFalse(rollup.isBatchFinalized(2));
bytes32 batchHash2 = rollup.committedBatches(2);
assertEq(batchHash2, bytes32(0x71259c7573b1db248381cef917270058e2ca20620c6eae975a1aa76b9858392a));
bytes32 stateRoot2 = rollup.committedStateRoots(2);
assertEq(stateRoot2, bytesData1);

// verify committed batch correctly
hevm.startPrank(address(0));
hevm.warp(block.timestamp + rollup.finalizationPeriodSeconds());
rollup.finalizeBatch(batchHeader2);
hevm.stopPrank();

// finalize batch2
assertTrue(rollup.isBatchFinalized(2));
assertEq(rollup.finalizedStateRoots(2), bytesData1);
assertTrue(rollup.withdrawalRoots(bytesData4));
assertEq(rollup.lastFinalizedBatchIndex(), 2);
assertEq(l1MessageQueueWithGasPriceOracle.pendingQueueIndex(), 265);
// check deleted values
assertFalse(rollup.batchExist(1));
assertEq(rollup.committedStateRoots(1), 0);

// 1 ~ 4, zero
for (uint256 i = 1; i < 4; i++) {
assertFalse(l1MessageQueueWithGasPriceOracle.isMessageSkipped(i));
Expand Down Expand Up @@ -354,12 +366,15 @@ contract RollupTest is L1MessageBaseTest {
rollup.commitBatch(batchDataInput, batchSignatureInput);
hevm.stopPrank();

// wrong bitmap length, revert
// incorrect batch index, revert
assembly {
mstore(add(batchHeader0, add(0x20, 1)), shl(192, 1)) // change batch index to 1
}
hevm.startPrank(alice);
hevm.expectRevert("wrong bitmap length");
hevm.expectRevert("incorrect batch index");
batchDataInput = IRollup.BatchDataInput(
0,
new bytes(250),
batchHeader0,
new bytes(1),
new bytes(0),
stateRoot,
Expand All @@ -368,6 +383,9 @@ contract RollupTest is L1MessageBaseTest {
);
rollup.commitBatch(batchDataInput, batchSignatureInput);
hevm.stopPrank();
assembly {
mstore(add(batchHeader0, add(0x20, 1)), 0) // change back
}

// incorrect parent batch hash, revert
assembly {
Expand All @@ -391,6 +409,36 @@ contract RollupTest is L1MessageBaseTest {
mstore(add(batchHeader0, add(0x20, 57)), 0x010657f37554c781402a22917dee2f75def7ab966d7b770905398eba3c444014)
}

// incorrect previous state root, revert
hevm.startPrank(alice);
hevm.expectRevert("incorrect previous state root");
batchDataInput = IRollup.BatchDataInput(
0,
batchHeader0,
new bytes(1),
new bytes(0),
bytes32(uint256(2)),
stateRoot,
getTreeRoot()
);
rollup.commitBatch(batchDataInput, batchSignatureInput);
hevm.stopPrank();

// wrong bitmap length, revert
hevm.startPrank(alice);
hevm.expectRevert("wrong bitmap length");
batchDataInput = IRollup.BatchDataInput(
0,
new bytes(250),
new bytes(1),
new bytes(0),
stateRoot,
stateRoot,
getTreeRoot()
);
rollup.commitBatch(batchDataInput, batchSignatureInput);
hevm.stopPrank();

// no block in batch, revert
bytes memory batch = new bytes(2);
hevm.startPrank(alice);
Expand Down