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 upstream v1.1.5.7 #64

Merged
merged 12 commits into from
Jul 15, 2024
Merged

merge upstream v1.1.5.7 #64

merged 12 commits into from
Jul 15, 2024

Conversation

zjg555543
Copy link

No description provided.

hexoscott and others added 12 commits July 1, 2024 17:21
* fix(zkevm_api): getBatchByNumber, ler, other fixes

* fix(zkevm_api): getBatchByNumber match zkevm node when batch not found

* feat(zkevm_api): getBatchDataByNumbers impl closes 0xPolygonHermez#679

* tweak(log): log info when sync limit reached

* fix(flags): flag check fix, bali addrs, stream

* fix(zkevm_api): getBatchDataByNumbers output format

* remove check for data streamer timeout - this is optional

---------

Co-authored-by: Scott Fairclough <scott@hexosoft.co.uk>
* fix(zkevm_api): getBatchByNumber 2nd param true

* tweak(zkevm_api): turn off senders fixed

* tweak(zkevm_api): improve not synced batch handling
* fix(zkevm_api): getBatchByNumber l2hashes

* fix(zkevm_api): getBatchByNumber oldAccInputHash

---------

Co-authored-by: Max Revitt <max@revitt.consulting>
…z#727)

* fix(zkevm_api): pre fork 10 zkevm-node match on getBatchByNumber

* fix(zkevm_api): 0x00 ger, mer, rer on no change

Co-authored-by: Max Revitt <max.revitt@gmail.com>
@KamiD KamiD merged commit 6e9a818 into dev Jul 15, 2024
2 of 3 checks passed
@zjg555543 zjg555543 deleted the zjg/merge-upstream-v1.1.5.7 branch July 15, 2024 04:45
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.

None yet

6 participants