fix: block.timestamp is not accurate #3398

thomas-nguy · 2024-12-18T12:25:50Z

What ❔

Related to zkSync-Community-Hub/zksync-developers#820

Change the l2 block creation logic to start a new l2 block only when a transaction is ready to be executed.

Why ❔

Current logic starts a new l2 block as soon as the previous one is sealed.

A contract that relies on block.timestamp would be able to predict the time correctly because if the l2 block goes stale (no transaction), then it will be open indefinitely and the timestamp will not be accurate anymore

Solution has been tested locally but any feedbacks would be appreciated

Checklist

PR title corresponds to the body of PR (we generate changelog entries from PRs).
Tests for the changes have been added / updated.
Documentation comments have been added / updated.
Code has been formatted via zkstack dev fmt and zkstack dev lint.

core/node/state_keeper/src/keeper.rs

popzxc · 2025-01-09T08:07:36Z

@slowli PTAL

slowli

I think it could be worth exploring a slightly differing approach: decoupling setting a new block in the UpdatesManager and in BatchExecutor. Namely, as soon as a new block is added in the current workflow, it is still added in UpdatesManager, but is not sent to BatchExecutor. Instead, it is only sent to BatchExecutor after receiving the first transaction in the block with the updated timestamp (obviously, the timestamp needs to be updated in UpdatesManager as well). IMO, this would make it slightly easier to reason about correctness.

core/node/state_keeper/src/keeper.rs

slowli

AFAIU, this implementation is incomplete at least mathematically. Namely, if a node is restarted in the middle of a batch, logic in restore_state will request new block params at the end; i.e., the timestamp of the created new block may be outdated as previously. I think this could be fixed by passing the initial is_sealed / is_last_block_sealed value to process_l1_batch, and creating this new block (if appropriate) inside process_l1_batch.

core/node/state_keeper/src/keeper.rs

core/node/state_keeper/src/io/mempool.rs

core/node/state_keeper/src/updates/mod.rs

core/node/state_keeper/src/keeper.rs

core/node/state_keeper/src/updates/mod.rs

slowli

Other than get_next_l2_block_timestamp_as_mut(), looks good, although as I mentioned in a previous reply, I think the fix as-is is incomplete (could be improved in a separate PR).

core/node/state_keeper/src/updates/mod.rs

slowli

Good job 👍

Ideally, it'd make sense to unit-test the changes using a mock StateKeeperIO / batch executor implementations to check that the L2 block timestamp is indeed updated if there are no transactions, and that the timestamp passed to a VM instance is the updated one. Could wait for a follow-up PR.
Suggest for another review from the platform team (e.g., @perekopskiy or @Deniallugo ), but this isn't absolutely necessary.

core/node/state_keeper/src/keeper.rs

…3643) ## What ❔ Add a unit test to ensure that l2 block timestamp is updated upon receiving the first transaction (#3398) ## Why ❔ Missing unit test on a new feature ## Is this a breaking change? - [ ] Yes - [x] No ## Operational changes No ## Checklist   - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zkstack dev fmt` and `zkstack dev lint`.

🤖 I have created a release *beep* *boop* --- ## [26.5.0](core-v26.4.0...core-v26.5.0) (2025-03-03) ### Features * add a flag for stage1->stage2 validium migration ([#3562](#3562)) ([92e7895](92e7895)) * add custom DA support in external node ([#3445](#3445)) ([1a8546d](1a8546d)) * **contract-verifier:** add Etherscan contract verification ([#3609](#3609)) ([a4ea0f2](a4ea0f2)) * **da-clients:** raise Avail blob size to 1mb ([#3624](#3624)) ([0baa7ff](0baa7ff)) * **eigenda:** implement eigenDA client remaining features ([#3243](#3243)) ([88fc971](88fc971)) * preparation for new precompiles ([#3535](#3535)) ([3c1f3fb](3c1f3fb)) * **tee:** add support for recoverable signatures ([#3414](#3414)) ([7241a73](7241a73)) * **zkos:** Implement ZK OS Merkle tree ([#3625](#3625)) ([331e98c](331e98c)) ### Bug Fixes * **api:** Fix pending transactions filter again ([#3630](#3630)) ([7afa20f](7afa20f)) * **api:** lock simultaneous tx insertsion with mutex ([#3616](#3616)) ([644b621](644b621)) * block.timestamp is not accurate ([#3398](#3398)) ([adcb517](adcb517)) * Fflonk versioning ([#3610](#3610)) ([fc80840](fc80840)) * Limit number of connections open for GCS interactions ([#3637](#3637)) ([6b003e2](6b003e2)) ### Performance Improvements * **api:** Use watch channel in values cache updates ([#3663](#3663)) ([3a4bdcf](3a4bdcf)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: zksync-era-bot <[email protected]>

🤖 I have created a release *beep* *boop* --- ## [26.5.0](core-v26.4.0...core-v26.5.0) (2025-03-03) ### Features * add a flag for stage1->stage2 validium migration ([#3562](#3562)) ([92e7895](92e7895)) * add custom DA support in external node ([#3445](#3445)) ([db31e71](db31e71)) * **contract-verifier:** add Etherscan contract verification ([#3609](#3609)) ([f13bd80](f13bd80)) * **da-clients:** raise Avail blob size to 1mb ([#3624](#3624)) ([0baa7ff](0baa7ff)) * **eigenda:** implement eigenDA client remaining features ([#3243](#3243)) ([161da42](161da42)) * preparation for new precompiles ([#3535](#3535)) ([3c1f3fb](3c1f3fb)) * **tee:** add support for recoverable signatures ([#3414](#3414)) ([7241a73](7241a73)) * **zkos:** Implement ZK OS Merkle tree ([#3625](#3625)) ([331e98c](331e98c)) ### Bug Fixes * **api:** Fix pending transactions filter again ([#3630](#3630)) ([7afa20f](7afa20f)) * **api:** lock simultaneous tx insertsion with mutex ([#3616](#3616)) ([644b621](644b621)) * block.timestamp is not accurate ([#3398](#3398)) ([adcb517](adcb517)) * Fflonk versioning ([#3610](#3610)) ([fc80840](fc80840)) * Limit number of connections open for GCS interactions ([#3637](#3637)) ([6b003e2](6b003e2)) ### Performance Improvements * **api:** Use watch channel in values cache updates ([#3663](#3663)) ([3a4bdcf](3a4bdcf)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: zksync-era-bot <[email protected]>

🤖 I have created a release *beep* *boop* --- ## [26.5.0](matter-labs/zksync-era@core-v26.4.0...core-v26.5.0) (2025-03-03) ### Features * add a flag for stage1->stage2 validium migration ([#3562](matter-labs/zksync-era#3562)) ([92e7895](matter-labs/zksync-era@92e7895)) * add custom DA support in external node ([#3445](matter-labs/zksync-era#3445)) ([4ca2e03](matter-labs/zksync-era@4ca2e03)) * **contract-verifier:** add Etherscan contract verification ([#3609](matter-labs/zksync-era#3609)) ([180cd32](matter-labs/zksync-era@180cd32)) * **da-clients:** raise Avail blob size to 1mb ([#3624](matter-labs/zksync-era#3624)) ([0baa7ff](matter-labs/zksync-era@0baa7ff)) * **eigenda:** implement eigenDA client remaining features ([#3243](matter-labs/zksync-era#3243)) ([771e6f0](matter-labs/zksync-era@771e6f0)) * preparation for new precompiles ([#3535](matter-labs/zksync-era#3535)) ([3c1f3fb](matter-labs/zksync-era@3c1f3fb)) * **tee:** add support for recoverable signatures ([#3414](matter-labs/zksync-era#3414)) ([7241a73](matter-labs/zksync-era@7241a73)) * **zkos:** Implement ZK OS Merkle tree ([#3625](matter-labs/zksync-era#3625)) ([331e98c](matter-labs/zksync-era@331e98c)) ### Bug Fixes * **api:** Fix pending transactions filter again ([#3630](matter-labs/zksync-era#3630)) ([7afa20f](matter-labs/zksync-era@7afa20f)) * **api:** lock simultaneous tx insertsion with mutex ([#3616](matter-labs/zksync-era#3616)) ([644b621](matter-labs/zksync-era@644b621)) * block.timestamp is not accurate ([#3398](matter-labs/zksync-era#3398)) ([adcb517](matter-labs/zksync-era@adcb517)) * Fflonk versioning ([#3610](matter-labs/zksync-era#3610)) ([fc80840](matter-labs/zksync-era@fc80840)) * Limit number of connections open for GCS interactions ([#3637](matter-labs/zksync-era#3637)) ([6b003e2](matter-labs/zksync-era@6b003e2)) ### Performance Improvements * **api:** Use watch channel in values cache updates ([#3663](matter-labs/zksync-era#3663)) ([3a4bdcf](matter-labs/zksync-era@3a4bdcf)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: zksync-era-bot <[email protected]>

change logic to create l2 block only when transaction is received

38e1f72

github-actions bot added the external-contribution label Dec 18, 2024

thomas-nguy commented Dec 18, 2024

View reviewed changes

core/node/state_keeper/src/keeper.rs Outdated Show resolved Hide resolved

thomas-nguy changed the title ~~Fix: block.timestamp is not accurate~~ fix: block.timestamp is not accurate Dec 18, 2024

thomas-nguy added 3 commits December 18, 2024 21:31

Merge branch 'main' into thomas/fix-bloc-timestamp

094e564

Merge branch 'main' into thomas/fix-bloc-timestamp

479ccfe

Merge branch 'main' into thomas/fix-bloc-timestamp

7b7bd2a

popzxc requested a review from slowli January 9, 2025 08:07

Merge branch 'main' into thomas/fix-bloc-timestamp

a38f57d

slowli reviewed Jan 10, 2025

View reviewed changes

core/node/state_keeper/src/keeper.rs Outdated Show resolved Hide resolved

core/node/state_keeper/src/keeper.rs Outdated Show resolved Hide resolved

make flag local

5af005b

thomas-nguy requested a review from slowli January 13, 2025 11:43

thomas-nguy and others added 2 commits January 13, 2025 23:38

renamme local variable

06c1ca4

Merge branch 'main' into thomas/fix-bloc-timestamp

ad25d74

slowli reviewed Jan 14, 2025

View reviewed changes

core/node/state_keeper/src/keeper.rs Outdated Show resolved Hide resolved

core/node/state_keeper/src/keeper.rs Outdated Show resolved Hide resolved

fix based on comments

8e9752d

slowli reviewed Jan 17, 2025

View reviewed changes

core/node/state_keeper/src/keeper.rs Outdated Show resolved Hide resolved

fix based on comments

47f249e

thomas-nguy force-pushed the thomas/fix-bloc-timestamp branch 2 times, most recently from a801131 to 47f249e Compare January 22, 2025 04:03

thomas-nguy and others added 4 commits January 22, 2025 13:03

Merge branch 'main' into thomas/fix-bloc-timestamp

386b536

rename keeper methods

16761cd

Merge branch 'main' into thomas/fix-bloc-timestamp

886abf3

some renaming

d50917c

thomas-nguy force-pushed the thomas/fix-bloc-timestamp branch from 86e8242 to d50917c Compare January 29, 2025 02:14

thomas-nguy and others added 4 commits January 29, 2025 21:35

change signature next_l2_block_param

d161b67

Merge branch 'main' into thomas/fix-bloc-timestamp

1146c3c

remove await and rename method

4768ff1

remove logic from update manager

225beda

slowli reviewed Feb 6, 2025

View reviewed changes

thomas-nguy added 2 commits February 6, 2025 22:56

fix mutable

d3969ac

use take and expect

aac812d

thomas-nguy force-pushed the thomas/fix-bloc-timestamp branch from 44f2a75 to aac812d Compare February 7, 2025 09:22

thomas-nguy and others added 2 commits February 7, 2025 18:27

remove option in set next block params

94804bf

Merge branch 'main' into thomas/fix-bloc-timestamp

774a4d2

slowli reviewed Feb 10, 2025

View reviewed changes

core/node/state_keeper/src/updates/mod.rs Outdated Show resolved Hide resolved

thomas-nguy and others added 2 commits February 11, 2025 09:59

fix get_next_l2_block_timestamp_as_mut

bf42a5e

Merge branch 'main' into thomas/fix-bloc-timestamp

3d98c18

slowli previously approved these changes Feb 11, 2025

View reviewed changes

core/node/state_keeper/src/keeper.rs Outdated Show resolved Hide resolved

remove tracing

079d621

thomas-nguy dismissed slowli’s stale review via 079d621 February 11, 2025 14:08

Merge branch 'main' into thomas/fix-bloc-timestamp

8c61a82

slowli requested review from Deniallugo and perekopskiy February 12, 2025 14:44

perekopskiy reviewed Feb 13, 2025

View reviewed changes

core/node/state_keeper/src/keeper.rs Show resolved Hide resolved

perekopskiy approved these changes Feb 13, 2025

View reviewed changes

thomas-nguy added 3 commits February 13, 2025 21:26

Merge branch 'main' into thomas/fix-bloc-timestamp

0ca4321

Merge branch 'main' into thomas/fix-bloc-timestamp

1586981

Merge branch 'main' into thomas/fix-bloc-timestamp

8513eb2

slowli added this pull request to the merge queue Feb 14, 2025

Merged via the queue into matter-labs:main with commit adcb517 Feb 14, 2025
32 of 33 checks passed

zksync-era-bot mentioned this pull request Feb 14, 2025

chore(main): release core 26.5.0 #3612

Merged

thomas-nguy mentioned this pull request Feb 18, 2025

fix: block.timestamp is not accurate for the first transaction #3619

Closed

5 tasks

thomas-nguy mentioned this pull request Feb 25, 2025

test(state-keeper): add unit test for update_next_l2_block_timestamp #3643

Merged

6 tasks

fix: block.timestamp is not accurate #3398

fix: block.timestamp is not accurate #3398

Uh oh!

Conversation

thomas-nguy commented Dec 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What ❔

Why ❔

Checklist

Uh oh!

Uh oh!

popzxc commented Jan 9, 2025

Uh oh!

slowli left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

slowli left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

slowli left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

slowli left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

thomas-nguy commented Dec 18, 2024 •

edited

Loading