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 0.6.2 upstream #100

Merged
merged 52 commits into from
Mar 13, 2024
Merged

Merge 0.6.2 upstream #100

merged 52 commits into from
Mar 13, 2024

Conversation

Stefan-Ethernal
Copy link

Fetch the v0.6.2 upstream changes

ToniRamirezM and others added 30 commits February 14, 2024 11:09
* check unsupported precompiles

* downgrade prover

* restore solc version

* update SC

* new errors

* fix as workaround to close batch on tx oog (0xPolygonHermez#3271)

Co-authored-by: agnusmor <agnusmor@gmail.com>

* handle executor close batch

* added sanity check closing an empty batch

* change log

---------

Co-authored-by: agnusmor <agnusmor@gmail.com>
* fix RPC closebatch executor error

* fix close batch

* fix close batch

* fix close batch

* fix close batch

* fix close batch

---------

Co-authored-by: agnusmor <agnusmor@gmail.com>
* fix executor error closebatch

* fix linter

---------

Co-authored-by: agnusmor <agnusmor@gmail.com>
* fix oog2

* fix oog2 for estimateGas

---------

Co-authored-by: tclemos <thiago@polygon.technology>
* execution mode

* execution mode

* execution mode
* fix deltaTimestamp when debug tx

* fix deltaTimeStamp for unsigned txs execution for specific block

* fix deltaTimeStamp for unsigned txs execution for specific block

* Revert "fix deltaTimeStamp for unsigned txs execution for specific block"

This reverts commit eb77e04.

* Revert "fix deltaTimeStamp for unsigned txs execution for specific block"

This reverts commit d2cfa78.

* fix debug trace l1 info tree index and add l1 info tree data

* move MockL1InfoRoot from sequencer to state to allow multiple components to use the same value

---------

Co-authored-by: agnusmor <agnusmor@gmail.com>
* remove executor errors

* readd check
* add new sequenceBatches parameters
* update SMC Elderberry, contract dockers and genesis
* elderberry seq-sender (0xPolygonHermez#3312)
* elderberry seq-sender
* updated prover  image to v5.0.0-RC4
* increase timeout  to e2e-group7

---------

Co-authored-by: Toni Ramírez <58293609+ToniRamirezM@users.noreply.github.com>
Co-authored-by: dPunisher <dpunish3r@users.noreply.github.com>
* update prover image

* udpate prover docker memory limits

* downgrade prover

* upgrade prover
* last l2 block by batch number

* optimization

* change returned err in query
…rusted node (0xPolygonHermez#3336)

* add selector for trusted sync to check that batches  correspond to the supported forkids
…tamp baches (0xPolygonHermez#3340)

* synchronizer adopt GetLastL2BlockByBatchNumber to check elderberry bacthes tstamp
* reserved zk counters

* new prover image

* udpate counters names

* udpate counters names

* add gas used to reserved zkCounters

* add ReservedZKCounters to pool trasactions
* add reserved zk counters to pool transaction

* add reserved zk counters to pool transaction

* correct migration test
…ygonHermez#3352)

* return used if reserved counters are 0

* refactor

* refactor
* add executor reserved ZK counters

* update prover image to v5.0.0-RC6

* fix typos

* add check reserved counters when executing L2 block

* remove closeBatch

* update prover image v5.0.0-RC7

* fixes and logs improvements

* update prover image v5.0.0-RC8
* decode old ETROG processBatches use ETROG contract
* fix sanity genesis
* Add reasons to the field `state.batch.closing_reason` (issue 0xPolygonHermez#3243)
tclemos and others added 20 commits February 27, 2024 09:50
…tchOnClose and AcceptEmptyClosedBatches (0xPolygonHermez#3384)

* synchronizer accepts empty closed batches from trusted depending on config (0xPolygonHermez#3370)

* accept empty closed batches depending on config
* if trusted synchronization dont create L2 sync classes

* sync reprocess full batch on close, check GER, and fix minor bugs (0xPolygonHermez#3374)

* sync reprocess full batch on close
* reduce the of live of batch cache from 1hour to 5min
* fix reprocess, check virtualBatch before reseting state
* 0xPolygonHermez#3376 - check GlobalExitRoot before working on a batch
* update same data as updateWIPBatch do in the cache of batches

* set Synchronizer.L2Synchronization.ReprocessFullBatchOnClose to false

* update documentation
* fix metrics estimatedTxsPerSec div

* remove unneeded cast
* get im state root from receipt

* get im state root from receipt

* get im state root from receipt
* add gas estimation in metrics

* fix linter
…#3406)

* check L2Block hash on closed batch during sync from TrustedNode (0xPolygonHermez#3390)
* add log0 debug trace e2e tests

* add log0 debug trace e2e tests
* remove intermediate state root from receipts after Etrog

* use receipt state returned by executor instead of checking the RomError

* use receipt status from executor only after Etrog

* fix gasLimit and cumulativeGasUsed for Elderberry txs (0xPolygonHermez#3428)

* keep im state root in db (0xPolygonHermez#3427)

* generate receipt refactor (0xPolygonHermez#3436)

* generate receipt refactor

* update prover image

* downgrade prover image

---------

Co-authored-by: agnusmor <100322135+agnusmor@users.noreply.github.com>
Co-authored-by: Toni Ramírez <58293609+ToniRamirezM@users.noreply.github.com>
* remove intermediate state root from receipts after Etrog

* use receipt state returned by executor instead of checking the RomError

* use receipt status from executor only after Etrog

* fix gasLimit and cumulativeGasUsed for Elderberry txs (0xPolygonHermez#3428)

* keep im state root in db (0xPolygonHermez#3427)

* generate receipt refactor (0xPolygonHermez#3436)

* generate receipt refactor

* update prover image

* downgrade prover image

* update prover

* adapt test

* undo adapt test

* upgrade prover

---------

Co-authored-by: tclemos <thiago@polygon.technology>
Co-authored-by: agnusmor <100322135+agnusmor@users.noreply.github.com>
@Stefan-Ethernal Stefan-Ethernal marked this pull request as ready for review March 13, 2024 07:11
@Stefan-Ethernal Stefan-Ethernal requested a review from a team March 13, 2024 07:11
Copy link
Collaborator

@arnaubennassar arnaubennassar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like a clean pull. Just owndering why etherman/smartcontracts/bin/polygonzkevm.bin, etherman/smartcontracts/bin/etrogpolygonzkevm.bin and etherman/smartcontracts/abi/polygonzkevm.abi have changed

@Stefan-Ethernal
Copy link
Author

looks like a clean pull. Just owndering why etherman/smartcontracts/bin/polygonzkevm.bin, etherman/smartcontracts/bin/etrogpolygonzkevm.bin and etherman/smartcontracts/abi/polygonzkevm.abi have changed

Not sure either, it shouldn't be with this PR, since it is aligned through the previous one (v0.6.1).
Anyway, going to merge this.

@Stefan-Ethernal Stefan-Ethernal merged commit 5b24d5d into develop Mar 13, 2024
17 checks passed
@Stefan-Ethernal Stefan-Ethernal deleted the feat/fetch-0.6.2-upstream branch March 13, 2024 12: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.

None yet

6 participants