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

fetch and merge upstream v1.1.5 #35

Merged
merged 100 commits into from
Jul 8, 2024
Merged

fetch and merge upstream v1.1.5 #35

merged 100 commits into from
Jul 8, 2024

Conversation

zjg555543
Copy link

No description provided.

revitteth and others added 30 commits May 29, 2024 09:42
* feat(datastream): proto stream write

* feat(datastream): read proto stream

* fixing up some stream related things post rebase

* updating to latest proto for data stream

* some fixes for syncing on the new proto format

* only recover the data stream if execution has done any work

* simplify looking up fork id by batch

* fixing up datastream write

* fixing up tests related to data stream proto changes

* post merge fixes from zkevm branch

* more progress on proto datastream

* hack file for hosting a local datastream without erigon attached

* keep track of the fork id within the stream client rather than the batches stage

* handle ger updates in the new proto format for writing the stream

* fix stream related tests

* remove accidentally committed debug files

* datastream related code tidy up

* fix post zkevm merge problems in proto datastream

* fix(witness): closed growing number of cursors (0xPolygonHermez#416)

* add more detail to proto datastream

* add batch number to batch end proto

* add more details for proto format datastream

* fix(merge): hermez db merge fix

* fix for updating chain config with fork id changes

* fixing up tests after changing the fork lookup code for chain config

* do not write the batch end during genesis block write

this will be handled by the writing of block 1 (injected batch) once it detects that the batch number has changed h

* fix bad build on proto branch

* feat(datastream): l1 cache, debug fix

* feat(docs): cache headers, documentation

---------

Co-authored-by: Scott Fairclough <[email protected]>
* FIX: use actual forkId in handleInjectedBatch

* FIX: use initial forkid from config
…ez#487)

* changes to proto stream block hash and local exit root

* block hash in stream to be the actual block hash

* skip intermediate roots in the stream for post etrog
* add spec for the datastrea

* review fixes

* review fixes
…ce (0xPolygonHermez#500)

deletes here are also being handled in a transparent way to save any headaches there with mismatches
0xPolygonHermez#503)

* fix for duplicating blocks in the stream and writing too far ahead when no verifications available as RPC

* force min timestamp to be 0 for injected batch
…onHermez#497)

* feat(l1): configure highest l1 block type, default finalized

* docs(readme): l1 syncer highest block config
…xPolygonHermez#521)

* adding some docs for L1 info tree information from a sequencer perspective

* update to l1 info tree docs
* Set DynamicConfigs path to config directory

Instead of hardcoding dynamic configs path to a directory in user's home path, assume dynamic config files for a given network will be found along the main configuration file.

* Update README

* Typo
* handling batch start and end for the executor data stream bytes

* decrease write size for datastream catchup

previous value had the node mysteriously just stop, no panic, nothing, just stop.  Maybe OOM killed by the OS or something

* close state reader

was causing a memory leak over time as the underlying cursors were never closed during stream catchup

* stop looking for LER when we find one during stream generation

* fix for debug tool after proto executor changes
* fix(nightly): correct path for block comparison

* fix(nightly): network5
0xPolygonHermez#528)

* wip

add modes in acl db

refactored code

* acl cli

* Uts

* wip

* downgrade the lib version

* downgrade the lib version

* fix

* update makefile

* downgrade libs

* downgrade lib

* fix go mod

* update acl cmd tests

* fix code smells

* remove code smells

---------

Co-authored-by: Goran Rojovic <[email protected]>
* fix

* fix

* comments fix

* comments fix

* fix
V-Staykov and others added 17 commits June 14, 2024 09:47
* tweak(l1recovery): panic on startup if stream host not set

* test(nightly): l1 recovery
* create inner context for pool.flush

* remove debug files
* fix(nightly): l1 recovery set working dir

* ci(mac): upgrade macos deprecated version
* fix(test): policy test temp dir creation

* fix(test): increase timeout of test in makefile
This fixes bug where timestamp limit is always 0 in validium recovery mode
* wip - bug - passing some cases

* wip

* fix(bug): logic matching as closely the zkevm bug

---------

Co-authored-by: Kamen Stoykov <[email protected]>
@zjg555543 zjg555543 marked this pull request as ready for review June 25, 2024 11:25
V-Staykov and others added 6 commits June 27, 2024 10:28
…xPolygonHermez#660)

* added the test smart contract

* found global exit root

* added counter contract deployer

* don't print memory if it is empty in trace
…ermez#666)

* feat(smt): regen smt in ram flag (default false - slower)

* feat(docs): update to include zkevm.smt-regenerate-in-memory flag

* fix(smt): open batch on config, close tx
@KamiD KamiD merged commit 1e78a9c into dev Jul 8, 2024
2 of 3 checks passed
@zjg555543 zjg555543 deleted the zjg/merge-1.1.5 branch July 11, 2024 03:13
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.