Skip to content

fix: allow only top level call in commitAndFinalizeBatch #126

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
zimpha merged 1 commit into from
Jul 16, 2025
Merged

fix: allow only top level call in commitAndFinalizeBatch #126

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
4 changes: 3 additions & 1 deletion src/L1/rollup/ScrollChain.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,9 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {

modifier OnlyTopLevelCall() {
// disallow contract accounts and delegated EOAs
if (msg.sender.code.length != 0) revert ErrorTopLevelCallRequired();
if (msg.sender != tx.origin || msg.sender.code.length != 0) {
revert ErrorTopLevelCallRequired();
}
_;
}

Expand Down
12 changes: 6 additions & 6 deletions src/test/ScrollChain.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ contract ScrollChainTest is DSTestPlus {

// revert when ErrorNotInEnforcedBatchMode
hevm.expectRevert(ScrollChain.ErrorNotInEnforcedBatchMode.selector);
hevm.startPrank(address(999));
hevm.startPrank(address(0x00a329c0648769A73afAc7F9381E08FB43dBEA72));
rollup.commitAndFinalizeBatch(
7,
bytes32(0),
Expand Down Expand Up @@ -372,7 +372,7 @@ contract ScrollChainTest is DSTestPlus {
// succeed to call commitAndFinalizeBatch 13
ScrollChainMockBlob(address(rollup)).setBlobVersionedHash(0, blobVersionedHash);
ScrollChainMockBlob(address(rollup)).setBlobVersionedHash(1, bytes32(0));
hevm.startPrank(address(999));
hevm.startPrank(address(0x00a329c0648769A73afAc7F9381E08FB43dBEA72));
rollup.commitAndFinalizeBatch(
7,
keccak256(headers[12]),
Expand Down Expand Up @@ -410,7 +410,7 @@ contract ScrollChainTest is DSTestPlus {
// succeed to call commitAndFinalizeBatch 14, no need to warp time
ScrollChainMockBlob(address(rollup)).setBlobVersionedHash(0, blobVersionedHash);
ScrollChainMockBlob(address(rollup)).setBlobVersionedHash(1, bytes32(0));
hevm.startPrank(address(999));
hevm.startPrank(address(0x00a329c0648769A73afAc7F9381E08FB43dBEA72));
rollup.commitAndFinalizeBatch(
7,
keccak256(headers[13]),
Expand Down Expand Up @@ -442,7 +442,7 @@ contract ScrollChainTest is DSTestPlus {

// not in enforced mode
hevm.expectRevert(ScrollChain.ErrorNotInEnforcedBatchMode.selector);
hevm.startPrank(address(999));
hevm.startPrank(address(0x00a329c0648769A73afAc7F9381E08FB43dBEA72));
rollup.commitAndFinalizeBatch(
7,
keccak256(headers[13]),
Expand Down Expand Up @@ -489,7 +489,7 @@ contract ScrollChainTest is DSTestPlus {

// revert when ErrorNotInEnforcedBatchMode
hevm.expectRevert(ScrollChain.ErrorNotInEnforcedBatchMode.selector);
hevm.startPrank(address(999));
hevm.startPrank(address(0x00a329c0648769A73afAc7F9381E08FB43dBEA72));
rollup.commitAndFinalizeBatch(
7,
bytes32(0),
Expand All @@ -514,7 +514,7 @@ contract ScrollChainTest is DSTestPlus {
// succeed to call commitAndFinalizeBatch 13
ScrollChainMockBlob(address(rollup)).setBlobVersionedHash(0, blobVersionedHash);
ScrollChainMockBlob(address(rollup)).setBlobVersionedHash(1, bytes32(0));
hevm.startPrank(address(999));
hevm.startPrank(address(0x00a329c0648769A73afAc7F9381E08FB43dBEA72));
rollup.commitAndFinalizeBatch(
7,
keccak256(headers[12]),
Expand Down
Loading