feat!: change timepoint interpretation #897
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adapting block.timepoint to the new form also adapts withdrawal_block_timepoint, deposit_block_timepoint, and stake_block_timepoint, which must all be equal to block.timepoint.
The global state should have the last_finalized_timepoint equal to the input.since, do not add the finality_time_in_ms.
keroro520
force-pushed
the
feat-new-interpretation-of-timepoint
branch
from
3719abe
to
24624ad
Compare
jjyr
approved these changes
Dec 12, 2022
| @@ -303,6 +321,20 @@ pub fn unlock_to_owner( | |||
| })) | |||
| } | |||
|
|
|||
| fn is_v1_withdrawal_cell(withdrawal_cell: &CellInfo) -> bool { | |||
There was a problem hiding this comment.
Suggested change
| fn is_v1_withdrawal_cell(withdrawal_cell: &CellInfo) -> bool { | |
| fn is_block_finalized_withdrawal_cell(withdrawal_cell: &CellInfo) -> bool { |
There was a problem hiding this comment.
"is_block_finalized_withdrawal_cell" is more confusing for me. How about "is_legacy_withdrawal_cell"?
| use gw_types::packed::RollupConfig; | ||
| use gw_types::prelude::*; | ||
|
|
||
| pub fn block_timepoint( |
There was a problem hiding this comment.
Suggested change
| pub fn block_timepoint( | |
| pub fn finalized_timepoint( |
jjyr
approved these changes
Dec 12, 2022
|
@zeroqn @sopium I will send another PR to rename structures after merging this PR. |
jjyr
reviewed
Dec 13, 2022
zeroqn
approved these changes
Dec 13, 2022
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The PR brings two major changes:
The interpretation of both the block timepoint change from occurance block timestamp to future finalized timestamp, as well the global state last finalized timepoint change from last finalized timestamp to current timestamp.
You can see the differences via diff:
let block_timepoint = { if fork_config.use_timestamp_as_timepoint(block_number) { - Timepoint::from_timestamp(block_timestamp) + let finality_time_in_ms = rollup_config.finality_time_in_ms(); + Timepoint::from_timestamp(block_timestamp + finality_time_in_ms) } else { Timepoint::from_block_number(block_number) } };let last_finalized_timepoint = if fork_config.use_timestamp_as_timepoint(block_number) { - let finality_time_in_ms = rollup_context.rollup_config.finality_time_in_ms(); - Timepoint::from_timestamp(block_timestamp.saturating_sub(finality_time_in_ms)) + Timepoint::from_timestamp(block_timestamp) } else { let finality_as_blocks = rollup_config.finality_blocks(); Timepoint::from_block_number(block_number.saturating_sub(finality_as_blocks)) };Note that
WithdrawalLockArgs.withdrawal_block_timepoint,CustodianLockArgs.deposit_block_timepointandStakeLockArgs.stake_block_timepointis also block timepoint.Check v2 withdrawal cell finality based on input since.
Without replying
GlobalState, or say rollup_state_cell, we still can check a v2 withdrawal cell finality based on input since, so that avoid celldep-race issue.Proposal for further changes:
Timepoint::BlockNumbertoTimepoint::Lagecy,Timepoint::TimestamptoTimepoint::NewGlobalState.lats_finalized_timepoint,WithdrawalLockArgs.withdrawal_block_timepoint,CustodianLockArgs.deposit_block_timepointandStakeLockArgs.stake_block_timepoint.This PR will not make these changes, since I am having some problems bumping gw-types in the "develop" branch.