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.

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

feat(protocol): Additional integration tests, solidity bump, reduce TokenVault contract size #13155

Merged
merged 17 commits into from
Feb 16, 2023
Merged
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
Revert "fix(protocol): make mixHash have random number from beaconcha…
…in (#13156)"

This reverts commit 01ba23c.
  • Loading branch information
dantaik committed Feb 15, 2023
commit a691892539b4c82f973577415457eaa8f05813f4
10 changes: 3 additions & 7 deletions packages/protocol/contracts/L1/libs/LibProposing.sol
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,9 @@ library LibProposing {
meta.l1Hash = blockhash(block.number - 1);
meta.timestamp = uint64(block.timestamp);

// After The Merge, mixHash contains the prevrandao
// from the beacon chain. Since multiple Taiko blocks
// can be proposed in one Ethereum block, we need to
// add salt to this random number.
meta.mixHash = keccak256(
abi.encodePacked(block.prevrandao, state.nextBlockId)
);
// if multiple L2 blocks included in the same L1 block,
// their block.mixHash fields for randomness will be the same.
meta.mixHash = bytes32(block.difficulty);
}

uint256 deposit;
Expand Down