PolyM #2

GloWE3 · 2024-09-10T14:50:20Z

Closes #.

What does this PR do?

Reviewers

Main reviewers:

@john
@doe

Codeowner reviewers:

@-Alice
@-Bob

* v1 to v2 working * fix make file

…ove use minGasPriceAllowed on egp calculation (#3041) Co-authored-by: tclemos <[email protected]>

* add new executor errors * fix linter

* add L1 block timestamp margin to send sequences * consider negative margin between timestamp of L1 block and last L2 block in the sequence. Fix close empty batch * fix doc * update l2block used resources * add egp UT for breakevengasprice equal to 0

)

* reprocess trusted batch * use GER of leaf 0 of L1InfoRoot * moved hash function to test.helper as HashByteArray * fix sequencer UT --------- Co-authored-by: agnusmor <[email protected]>

…3001) (#3002)

…x0000..00 (#3092)

* return zero GER when L1IntroTreeIndex is 0 * refactor * refactor --------- Co-authored-by: Toni Ramírez <[email protected]>

* removed fatals

* new contracts * Event etherman implementation * smc * proxy + etherman unit test * new event implemented in synchronizer * Fix setforcedBatch event * smc update * updateEtrogSequence working * fix ger mismatch * add comment suggested

* fix. A sequenced batch with OOC error is not a reorg

* fix OOC errors * fix OOC errors

* fix set l1InfoRootIndex on changeL2Block * increase poseidon hashes used by l2block (temp workaround) * fix linter/build * update prover image to v4.0.0-RC27 * fix finalizer tests

…2992) Bumps google.golang.org/protobuf from 1.31.0 to 1.32.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…3079) Bumps [github.com/rubenv/sql-migrate](https://github.com/rubenv/sql-migrate) from 1.5.2 to 1.6.1. - [Commits](rubenv/sql-migrate@v1.5.2...v1.6.1) --- updated-dependencies: - dependency-name: github.com/rubenv/sql-migrate dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix batch GER * fix use LER

* fix smtProof * remove logs * test force l1InfoRootIndex to 0 on startup * fix close batch due to exhausted resource * remove force l1InfoRootIndex to 0 on startup * update prover image to v4.0.0-RC28 * update prover image to v4.0.0-RC29

* fix new wipL2block on finalizeBatch function * fix sustract wipL2Block usedResources when opening new WIPbatch * fix openNewWipL2Block * fix openNewWipL2Block * update prover image to v4.0.0-RC27 * Update prover image to v4.0.0-RC28 * update prover image to v4.0.0-RC27

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.60.0 to 1.60.1. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.60.0...v1.60.1) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* DS Tool Doc

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.24.0 to 0.26.0. - [Commits](golang/net@v0.24.0...v0.26.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps google.golang.org/protobuf from 1.34.0 to 1.34.1. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* update readme

Bumps [github.com/gorilla/websocket](https://github.com/gorilla/websocket) from 1.5.1 to 1.5.2. - [Release notes](https://github.com/gorilla/websocket/releases) - [Commits](gorilla/websocket@v1.5.1...v1.5.2) --- updated-dependencies: - dependency-name: github.com/gorilla/websocket dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.19.0 to 1.19.1. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.19.0...v1.19.1) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.63.2 to 1.64.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.63.2...v1.64.0) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [github.com/fatih/color](https://github.com/fatih/color) from 1.16.0 to 1.17.0. - [Release notes](https://github.com/fatih/color/releases) - [Commits](fatih/color@v1.16.0...v1.17.0) --- updated-dependencies: - dependency-name: github.com/fatih/color dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps google.golang.org/protobuf from 1.34.1 to 1.34.2. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [github.com/gorilla/websocket](https://github.com/gorilla/websocket) from 1.5.2 to 1.5.3. - [Release notes](https://github.com/gorilla/websocket/releases) - [Commits](gorilla/websocket@v1.5.2...v1.5.3) --- updated-dependencies: - dependency-name: github.com/gorilla/websocket dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Print BatchL2Data from DS

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.64.0 to 1.65.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.64.0...v1.65.0) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [github.com/holiman/uint256](https://github.com/holiman/uint256) from 1.2.4 to 1.3.0. - [Release notes](https://github.com/holiman/uint256/releases) - [Commits](holiman/uint256@v1.2.4...v1.3.0) --- updated-dependencies: - dependency-name: github.com/holiman/uint256 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* add l2blockend to DS

* fix releaser * goreleaser yaml update version 2 * fix goreleaser version * remove testnet.zip from releaser

…d11 changes (#3734) (#3758)

…or (#3759) * Wait the state to be synced when starting (#3735) * remove continue

* Update datastream file fixes: end batch entry, previous L2 block timestamp, current batch number * Use GetFirstEventAfterBookmark

* refactor ds logs * update ds library to v0.2.3

…3764) * Fix tx OOC (node level) for first empty L2 block in batch * change log level for ooc (node level) when adding tx to the worker * fix check OOC (node level) when preexecuting the tx in RPC * Fix linter and test

#3748) (#3766)

…ly in trusted state (#3750) (#3768) * fix timestamp when querying zkevm_getBatchByNumer and the batch is only in trusted state * control timestamp to be returned for a batch in GetBatchTimestamp * fix ErrNotFound * fix state.ErrNotFound check * fix comments * fix GetRawBatchTimestamps * fix comments * fix GetRawBatchTimestamps return err

codesandbox · 2024-09-10T14:50:24Z

Review or Edit in CodeSandbox

Open the branch in Web Editor • VS Code • Insiders

Open Preview

joanestebanr and others added 30 commits January 15, 2024 08:48

remove unused code: ZeroL1InfoRoot cte (#3065)

ccde139

trusted sync: fix local_exit_root (#3067)

2acd0ed

v1 to v2 working (#3069)

021a399

* v1 to v2 working * fix make file

added egp value for eth transfer. Fix zkevm_EstimateFee endpoint. Rem…

fe3decc

…ove use minGasPriceAllowed on egp calculation (#3041) Co-authored-by: tclemos <[email protected]>

if a batch have no l2block it returns an zero l1inforoot (#3070)

e3de7a7

add new executor errors (#3077)

27ce15f

* add new executor errors * fix linter

fix finalize l2block when closing batch due to exhausted resource (#3084

3e40964

)

reprocess trusted batch, use GER of leaf 0 of L1InfoRoot (#3086)

f42895b

* reprocess trusted batch * use GER of leaf 0 of L1InfoRoot * moved hash function to test.helper as HashByteArray * fix sequencer UT --------- Co-authored-by: agnusmor <[email protected]>

fix default value for fromBlock when calling eth_getLogs (#3051)

8c526ae

Security - Add SHA Pin to Third Party Actions/Checkout Action (fixes #…

9da3acf

…3001) (#3002)

for L1 sequence batch event if the batch only use leaf 0 set GER as 0…

9fc1143

…x0000..00 (#3092)

Return zero GER when L1IntroTreeIndex is 0 (#3090)

13da817

* return zero GER when L1IntroTreeIndex is 0 * refactor * refactor --------- Co-authored-by: Toni Ramírez <[email protected]>

fix etrog stream generation (#3094)

7c7a7d8

synchronizer: remove fatals (#3093)

1690310

* removed fatals

Feature/#3081 smc (#3097)

f28d4f5

* new contracts * Event etherman implementation * smc * proxy + etherman unit test * new event implemented in synchronizer * Fix setforcedBatch event * smc update * updateEtrogSequence working * fix ger mismatch * add comment suggested

etrog: Fix synchronizer OOC sequenced batch (#3095)

bc72f05

* fix. A sequenced batch with OOC error is not a reorg

fix OOC errors (#3100)

cfe5048

* fix OOC errors * fix OOC errors

remove l2 hash from eth_getTransactionReceipt (#3089)

8972932

Fix set l1InfoRootIndex on changeL2Block (#3099)

3c7afae

* fix set l1InfoRootIndex on changeL2Block * increase poseidon hashes used by l2block (temp workaround) * fix linter/build * update prover image to v4.0.0-RC27 * fix finalizer tests

fix stream (#3101)

5332980

Fix batch GER (#3104)

0a11d35

* fix batch GER * fix use LER

force version of json-schema-for-humans to 0.47 (#3109)

de64ad2

add new endpoint zkevm_getLatestGlobalExitRoot (#3103)

25f4460

fix l1InfoRoot (#3115)

5ef9d3a

ToniRamirezM and others added 27 commits June 7, 2024 16:46

DS Tool Doc (#3702)

63a0010

* DS Tool Doc

Update DS Readme (#3707)

a037a3a

* update readme

handle invalid batch in DS tool (#3711)

2063f09

disable MT in DS Tool (#3714)

764495f

Print BatchL2Data from DS (#3715)

81ba651

* Print BatchL2Data from DS

improve DS tool cache generation (#3724)

b8cc290

add l2blockend to DS (#3751) (#3752)

094a3d3

* add l2blockend to DS

Fix release github action (#3745) (#3755)

aa9342c

* fix releaser * goreleaser yaml update version 2 * fix goreleaser version * remove testnet.zip from releaser

build (#3757)

07c3182

Add mined l1blocknumber to MonitoredTxResult. Undo forkid10 and forki…

9b315a1

…d11 changes (#3734) (#3758)

Cherry-pick #3735: Wait the state to be synced when starting aggregat…

45296c0

…or (#3759) * Wait the state to be synced when starting (#3735) * remove continue

Fix update datastream file (#3741) (#3760)

ce2de04

* Update datastream file fixes: end batch entry, previous L2 block timestamp, current batch number * Use GetFirstEventAfterBookmark

Refactor datastream logs (#3743) (#3763)

72a7767

* refactor ds logs * update ds library to v0.2.3

fix invalid "updateGER" entry when updating datastream file on startup (

a15dcc2

#3748) (#3766)

fix tx order in zkevm_getBatchByNumber endpoint (#3749) (#3767)

a3f4da9

GloWE3 merged commit 50ba0eb into GloWE3:develop Sep 10, 2024
2 checks passed

GloWE3 self-assigned this Sep 14, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PolyM #2

PolyM #2

GloWE3 commented Sep 10, 2024

codesandbox bot commented Sep 10, 2024

PolyM #2

PolyM #2

Conversation

GloWE3 commented Sep 10, 2024

What does this PR do?

Reviewers

codesandbox bot commented Sep 10, 2024

Review or Edit in CodeSandbox