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

merge v2.0.0 beta18 #139

Merged
merged 19 commits into from
Sep 11, 2024
Merged

merge v2.0.0 beta18 #139

merged 19 commits into from
Sep 11, 2024

Conversation

zjg555543
Copy link

No description provided.

hexoscott and others added 19 commits August 28, 2024 09:59
* duplicate-values-in-debug-timer

* format duration only in ms

* use int ms
…#1059)

* handle-unwinds-on-seq-restart (0xPolygonHermez#1050)

* handle-unwinds-on-seq-restart

* add more check to DS correcness
# Conflicts:
#	zk/stages/stage_sequence_execute.go

* handing-unwinds-on-seq-restart-2 (0xPolygonHermez#1061)

---------

Co-authored-by: Kamen Stoykov <[email protected]>
…ady' and 'txpool empty' states. (0xPolygonHermez#1037)

# Conflicts:
#	zk/stages/stage_sequence_execute.go
* add-sequener-timeout-on-empty-tx-pool

* Update cmd/utils/flags.go

Co-authored-by: Igor Mandrigin <[email protected]>

---------

Co-authored-by: Igor Mandrigin <[email protected]>
# Conflicts:
#	zk/stages/stage_sequence_execute.go
As we unwind now on sequencer restart this process can take a long time on each sequencer restart.  As we only sync finalised data from the L1 this will not change anyway so no point unwinding it
@KamiD KamiD merged commit ea259cb into dev Sep 11, 2024
3 checks passed
@zjg555543 zjg555543 deleted the zjg/meger-v2.0.0-beta18 branch September 11, 2024 02:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants