Pullupstream/v0.5.0 rc4 #52

arnaubennassar · 2024-01-17T11:46:26Z

Instead of reviewing this PR code diff, which is absolutely insane, review the code diff vs zkevm-node. Instructions on docs/diff/diff.md included on this branch

…mez#2755) Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.4.0 to 0.5.0. - [Commits](golang/sync@v0.4.0...v0.5.0) --- updated-dependencies: - dependency-name: golang.org/x/sync 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>

…xPolygonHermez#2754) Bumps [github.com/gorilla/websocket](https://github.com/gorilla/websocket) from 1.5.0 to 1.5.1. - [Release notes](https://github.com/gorilla/websocket/releases) - [Commits](gorilla/websocket@v1.5.0...v1.5.1) --- 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>

…ygonHermez#2758) Bumps [github.com/fatih/color](https://github.com/fatih/color) from 1.15.0 to 1.16.0. - [Release notes](https://github.com/fatih/color/releases) - [Commits](fatih/color@v1.15.0...v1.16.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>

…onHermez#2741) to develop branch (0xPolygonHermez#2766) * Fix GlobalQueue/AccountQueue pool config (0xPolygonHermez#2738) * Fix missing pool.Config parameter when creating a new Sequencer (0xPolygonHermez#2741) * add gasprice update log * log finalizer L1/L2 gas prices * fix passing pool.Config to new sequencer * remove temporary logs

* adapt ARR552 fixes from PR 0xPolygonHermez#2694 * add failfast to reduce the time on fail * fix problem with update GER * avoid duplicated code for vector_groupx

…nHermez#2768) (0xPolygonHermez#2772) * + renamed config vars for L1 parallel sync

…rmez#2770) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.17.0 to 0.18.0. - [Commits](golang/net@v0.17.0...v0.18.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>

* state refactor * enable tests * fix tests

* fix problem if L1 block have 2 transactions

…nHermez#2779)

…gonHermez#2794) * update GER on closed batch without txs * refactor

* improve tool performance * update streamer lib * fix * fix * fix query * fix * update streamer lib * remove unused code * fix makefile text * fix makefile text

* implementation + tests * linter * Public HashLeafData

…ygonHermez#2722) * etherman: read tx with blockHash and txIndex instead of txHash Signed-off-by: jsvisa <[email protected]> * etherman: use TransactionInBlock instead Signed-off-by: jsvisa <[email protected]> --------- Signed-off-by: jsvisa <[email protected]>

* fix tx size check * fix tx size check * refactor * fix test * fix test * fix

…d L2 gas price (EGP disabled) (0xPolygonHermez#2777) (0xPolygonHermez#2805) * added L2GasPriceSuggesterFactor config parameter to "simulate" estimated l2 gas price when egp is disabled * fix L2GasPriceSuggesterFactor value in test config file * fix L2GasPriceSuggesterFactor value in test config file * update doc

…icate it when implement ETROG fork (0xPolygonHermez#2812) * Isolate L1 event code in classes Co-authored-by: Alonso <[email protected]>

* merkleproof * json doc

… on successful transaction processing (0xPolygonHermez#2821) * feature: storing LER in state.batch on successful transaction processing (0xPolygonHermez#2658) Signed-off-by: Nikolay Nedkov <[email protected]> * fix doc --------- Signed-off-by: Nikolay Nedkov <[email protected]> Co-authored-by: Nikolay Nedkov <[email protected]>

* Fix timestamp stored in exit_root table * json doc

…olygonHermez#2824) Bumps [github.com/0xPolygonHermez/zkevm-data-streamer](https://github.com/0xPolygonHermez/zkevm-data-streamer) from 0.1.11 to 0.1.13. - [Release notes](https://github.com/0xPolygonHermez/zkevm-data-streamer/releases) - [Commits](0xPolygon/zkevm-data-streamer@v0.1.11...v0.1.13) --- updated-dependencies: - dependency-name: github.com/0xPolygonHermez/zkevm-data-streamer 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>

* smc * rename matic to pol * WIP * Etherman + unit tests * Addresses * aggregator * New genesis file * new genesis * state unit tests * aggregator unit test * sequencer uni tests * pool unit test * fix symLinks * linter * documentation * Wip * oldPolygonZkevmBridge * fix e2e group 1 * linter * docs * Fix init Batch 1 * linter * Fix e2e * Fix forced * Revert "Fix forced" This reverts commit cfaa28b. * wip * fix forced e2e * support genesis config with pointer to BatchData (0xPolygonHermez#2729) * genesis fix * forkID 6 * fix e2e forcedBatches again * new smc * genesis * linter * Fix e2e * genesis * new docker + genesis * json doc * fix e2e

…PolygonHermez#2830)

* update LxLy changes --------- Co-authored-by: Alonso Rodriguez <[email protected]>

…2836) * moved l1_parallel files to l1_parallel_sync folder

* same solution as group 8

* wip * new tracers * update prover image * update prover config * remove unused method * converters v2 * process batch v2 * update logs * new errors * refactor * doc * new zk counter * update prover image * refactor response v1 to look like v2 * fix test * change prover image * comment test * comment test * disable check superset batch transactions * fix store txs * fix store txs * fix store txs * fix store txs * uncomment test * change handleForcedTxsProcessResp * change handleForcedTxsProcessResp * fix ExecuteBatchV2 * revert executor image * add l2 tx hash to process tx response * udpate hashdb proto (0xPolygonHermez#2833) * Refactor finalizer: remove use of f.processRequest, move getLastBatchNumAndOldStateRoot function (0xPolygonHermez#2834) * remove f.processRequest. Move getLastBatchNumAndOldStateRoot to sequencer * refactor get wip batch when starting sequencer/finalizer * remove consts for numbers * Refactor finalizer: remove sharedResourcesMux, reduce logs with info level (0xPolygonHermez#2835) * remove f.processRequest. Move getLastBatchNumAndOldStateRoot to sequencer * refactor get wip batch when starting sequencer/finalizer * remove sharedResourcesMux. reduce logs with info level --------- Co-authored-by: agnusmor <[email protected]>

* L1InfoTreeIndex is 32bits (new type L1InfoTreeIndexType)

…z#3105) Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.17.0 to 1.18.0. - [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.17.0...v1.18.0) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang 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>

…rmez#3106) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.19.0 to 0.20.0. - [Commits](golang/net@v0.19.0...v0.20.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>

Stefan-Ethernal

Linter is complaining that there are some unused fields and functions in cmd/policy.go, although they are indeed used. Maybe we should try to suppress unused warning for that file?

Leaving some comments to consider.

docs/diff/diff.md

dataavailability/dataavailability.go

dataavailability/datacommittee/datacommittee.go

cmd/run.go

state/pgstatestorage/pgstatestorage.go

dataavailability/dataavailability.go

dataavailability/datacommittee/datacommittee.go

Stefan-Ethernal

Linter is complaining that there are some unused fields and functions in cmd/policy.go, although they are indeed used. Maybe we should try to suppress unused warning for that file?

Leaving some comments to consider.

cmd/run.go

dataavailability/dataavailability.go

dataavailability/datacommittee/datacommittee.go

dataavailability/datacommittee/datacommittee_test.go

etherman/etherman.go

etherman/etherman_test.go

* wip * Fix aggregator * change name to UpgradeEtrogBatchNumber * doc

vcastellm · 2024-01-22T17:50:03Z

test/scripts/sendForcedBatch/main.go

-			return err
-		}
-	}
+	// // Allow forced batches in smart contract if disallowed


Is this a leftover?

I had to upgrade contracts beyond the version that was used in the commit I'm pulling changes from upstream. This made me comment a bunch of code related to forced batches. In the next pulling this code should be uncommented with some chenges

… number to L2 block. Several refactors (0xPolygonHermez#3118) * add L2 block sequential process. Execute empty L2 block. Add tracking number to L2 block. Several refactors * fix finalizer UT

dataavailability/dataavailability.go

vcastellm · 2024-01-24T16:47:19Z

sequencesender/sequencesender.go

@@ -35,18 +34,18 @@ type SequenceSender struct {
 	ethTxManager ethTxManager
 	etherman     etherman
 	eventLog     *event.EventLog
-	privKey      *ecdsa.PrivateKey
+	da           dataAbilitier


dataEnabler better?

vcastellm

Aside from minor comments LGTM

Pullupstream/v0.5.0 rc23

dependabot bot and others added 30 commits November 6, 2023 17:50

Fix e2e group 10 (forced batches) (0xPolygonHermez#2750)

4e0e957

* adapt ARR552 fixes from PR 0xPolygonHermez#2694 * add failfast to reduce the time on fail * fix problem with update GER * avoid duplicated code for vector_groupx

+ renamed config vars for L1 parallel sync (cherry-pick from 0xPolygo…

a79a7be

…nHermez#2768) (0xPolygonHermez#2772) * + renamed config vars for L1 parallel sync

Refactor State: Step 1 (0xPolygonHermez#2773)

34d2274

* state refactor * enable tests * fix tests

Fix e2e group 8 (debug trace) (0xPolygonHermez#2761)

2c08b3c

* fix problem if L1 block have 2 transactions

add queue to ws subscription filters (0xPolygonHermez#2769) (0xPolygo…

59e43db

…nHermez#2779)

Update GER on closed batch without txs (0xPolygonHermez#2793) (0xPoly…

522c324

…gonHermez#2794) * update GER on closed batch without txs * refactor

Fix data stream tool performance (0xPolygonHermez#2785)

ded0fb4

* improve tool performance * update streamer lib * fix * fix * fix query * fix * update streamer lib * remove unused code * fix makefile text * fix makefile text

L1InfoTree implementation + tests (0xPolygonHermez#2786)

26713cf

* implementation + tests * linter * Public HashLeafData

Fix tx size check (0xPolygonHermez#2799) (0xPolygonHermez#2804)

b7e59ae

* fix tx size check * fix tx size check * refactor * fix test * fix test * fix

Fix typos (0xPolygonHermez#2803)

6b5b378

Refactor incaberry L1 event executors to another files to avoid modif…

6c12fb7

…icate it when implement ETROG fork (0xPolygonHermez#2812) * Isolate L1 event code in classes Co-authored-by: Alonso <[email protected]>

compute merkleproof (0xPolygonHermez#2820)

837a78a

* merkleproof * json doc

Fix timestamp stored in exit_root table (0xPolygonHermez#2811)

4bd8c1f

* Fix timestamp stored in exit_root table * json doc

new tracers (0xPolygonHermez#2663)

d7630ce

add response headers to all http responses (0xPolygonHermez#2829) (0x…

511b41f

…PolygonHermez#2830)

fork-etrog: synchronizer: update L1InfoTree (0xPolygonHermez#2818)

f755f8f

* update LxLy changes --------- Co-authored-by: Alonso Rodriguez <[email protected]>

synchronized refactor: move l1_parallel to a folder (0xPolygonHermez#…

ad201b9

…2836) * moved l1_parallel files to l1_parallel_sync folder

fix e2e group 5 (0xPolygonHermez#2838)

7a03d12

* same solution as group 8

etrog: L1InfoTreeIndex is 32bits (0xPolygonHermez#2844)

2bc173d

* L1InfoTreeIndex is 32bits (new type L1InfoTreeIndexType)

dependabot bot added 2 commits January 22, 2024 11:00

Stefan-Ethernal approved these changes Jan 22, 2024

View reviewed changes

goran-ethernal reviewed Jan 22, 2024

View reviewed changes

Feature/aggregator update etrog batch (0xPolygonHermez#3117)

05357ab

* wip * Fix aggregator * change name to UpgradeEtrogBatchNumber * doc

vcastellm reviewed Jan 22, 2024

View reviewed changes

arnaubennassar and others added 2 commits January 22, 2024 18:42

Add reuqests from PR

a03bdeb

Add L2 block sequential process. Execute empty L2 block. Add tracking…

76e3118

… number to L2 block. Several refactors (0xPolygonHermez#3118) * add L2 block sequential process. Execute empty L2 block. Add tracking number to L2 block. Several refactors * fix finalizer UT

arnaubennassar requested a review from goran-ethernal January 23, 2024 08:55

arnaubennassar added 6 commits January 23, 2024 11:32

Fix conflicts

1344f85

Upgrade contracts and fix compilation errors

a7ceb37

Update L1 docker image for testing

0cbd740

Fix UTs

65dd7ff

Update diff docs

6f5a7a9

Update config docs

81e449c

vcastellm reviewed Jan 24, 2024

View reviewed changes

dataavailability/dataavailability.go Outdated Show resolved Hide resolved

vcastellm reviewed Jan 24, 2024

View reviewed changes

vcastellm approved these changes Jan 24, 2024

View reviewed changes

WIP

7c36fb3

goran-ethernal approved these changes Jan 25, 2024

View reviewed changes

arnaubennassar added 7 commits January 25, 2024 15:46

Fix linter

f85be4d

Remove unnecessary GHA

6a6a6c7

Update diff html

83a7967

Fix linter

98f14f7

Expand explanation of the code diff

097f930

minor config docs fixes

6208cca

Merge pull request #61 from 0xPolygon/pullupstream/v0.5.0-RC23

916ec91

Pullupstream/v0.5.0 rc23

arnaubennassar merged commit b423092 into develop Feb 1, 2024
17 checks passed

Stefan-Ethernal deleted the pullupstream/v0.5.0-RC4 branch February 5, 2024 12:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pullupstream/v0.5.0 rc4 #52

Pullupstream/v0.5.0 rc4 #52

arnaubennassar commented Jan 17, 2024 •

edited

Loading

Stefan-Ethernal left a comment

Stefan-Ethernal left a comment

vcastellm Jan 22, 2024

arnaubennassar Jan 22, 2024

vcastellm Jan 24, 2024

vcastellm left a comment

Pullupstream/v0.5.0 rc4 #52

Pullupstream/v0.5.0 rc4 #52

Conversation

arnaubennassar commented Jan 17, 2024 • edited Loading

Stefan-Ethernal left a comment

Choose a reason for hiding this comment

Stefan-Ethernal left a comment

Choose a reason for hiding this comment

vcastellm Jan 22, 2024

Choose a reason for hiding this comment

arnaubennassar Jan 22, 2024

Choose a reason for hiding this comment

vcastellm Jan 24, 2024

Choose a reason for hiding this comment

vcastellm left a comment

Choose a reason for hiding this comment

arnaubennassar commented Jan 17, 2024 •

edited

Loading