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(protocol): revert removing proposedIn (being used by node/client) #16644

Merged
merged 3 commits into from
Apr 4, 2024
Merged

fix(protocol): revert removing proposedIn (being used by node/client) #16644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cf3f64
Revert "feat(protocol): remove and clear `proposedIn` from TaikoData.…
dantaik Apr 4, 2024
e61efa6
Update TaikoData.sol
dantaik Apr 4, 2024
7a704ab
Merge branch 'main' into revert_change
davidtaikocha Apr 4, 2024
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
2 changes: 1 addition & 1 deletion packages/protocol/contracts/L1/TaikoData.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ library TaikoData {
uint96 livenessBond;
uint64 blockId; // slot 3
uint64 proposedAt; // timestamp
uint64 __reserved1;
uint64 proposedIn; // L1 block number, required/used by node/client.
uint32 nextTransitionId;
uint32 verifiedTransitionId;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/contracts/L1/libs/LibProposing.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ library LibProposing {
livenessBond: _config.livenessBond,
blockId: b.numBlocks,
proposedAt: meta_.timestamp,
__reserved1: 0,
proposedIn: uint64(block.number),
// For a new block, the next transition ID is always 1, not 0.
nextTransitionId: 1,
// For unverified block, its verifiedTransitionId is always 0.
Expand Down
Loading