Skip to content
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

fix mip2 test stack too deep error #13138

Merged
merged 1 commit into from
Nov 29, 2024
Merged

fix mip2 test stack too deep error #13138

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
33 changes: 12 additions & 21 deletions packages/contracts-bedrock/test/cannon/MIPS2.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,8 +789,9 @@ contract MIPS2_Test is CommonTest {
vm.expectRevert(InvalidMemoryProof.selector);
mips.step(encodeState(state), bytes.concat(threadWitness, invalidInsnAndMemProof, memProof2), 0);

(, bytes memory invalidMemProof2) =
ffi.getCannonMemoryProof2(pc, insn, timespecAddr, secs + 1, timespecAddr + 4);
uint32 _secs = secs + 1;
uint32 _timespecAddr = timespecAddr + 4;
(, bytes memory invalidMemProof2) = ffi.getCannonMemoryProof2(pc, insn, timespecAddr, _secs, _timespecAddr);
vm.expectRevert(InvalidSecondMemoryProof.selector);
mips.step(encodeState(state), bytes.concat(threadWitness, insnAndMemProof, invalidMemProof2), 0);
}
Expand Down Expand Up @@ -2766,31 +2767,21 @@ contract MIPS2_Test is CommonTest {
}

function encodeState(IMIPS2.State memory _state) internal pure returns (bytes memory) {
// Split up encoding to get around stack-too-deep error
return abi.encodePacked(encodeStateA(_state), encodeStateB(_state));
}

function encodeStateA(IMIPS2.State memory _state) internal pure returns (bytes memory) {
return abi.encodePacked(
bytes memory a = abi.encodePacked(
_state.memRoot,
_state.preimageKey,
_state.preimageOffset,
_state.heap,
_state.llReservationStatus,
_state.llAddress,
_state.llOwnerThread,
_state.exitCode,
_state.exited,
_state.step,
_state.stepsSinceLastContextSwitch,
_state.wakeup,
_state.traverseRight,
_state.leftThreadStack
_state.llAddress
);
}

function encodeStateB(IMIPS2.State memory _state) internal pure returns (bytes memory) {
return abi.encodePacked(_state.rightThreadStack, _state.nextThreadID);
bytes memory b = abi.encodePacked(
_state.llOwnerThread, _state.exitCode, _state.exited, _state.step, _state.stepsSinceLastContextSwitch
);
bytes memory c = abi.encodePacked(
_state.wakeup, _state.traverseRight, _state.leftThreadStack, _state.rightThreadStack, _state.nextThreadID
);
return abi.encodePacked(a, b, c);
}

function copyState(IMIPS2.State memory _state) internal pure returns (IMIPS2.State memory out_) {
Expand Down