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 v0.6.1 #95

Merged

Conversation

Stefan-Ethernal
Copy link
Collaborator

@Stefan-Ethernal Stefan-Ethernal commented Mar 6, 2024

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)
@Stefan-Ethernal Stefan-Ethernal force-pushed the CDK-98-fetch-zkevm-node-v-0-6-1-to-the-cdk-validium-node branch from 811e5b3 to 21093fb Compare March 12, 2024 12:06
@Stefan-Ethernal Stefan-Ethernal self-assigned this Mar 12, 2024
@Stefan-Ethernal Stefan-Ethernal requested a review from a team March 12, 2024 15:26
@Stefan-Ethernal Stefan-Ethernal marked this pull request as ready for review March 12, 2024 15:36
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.

Please remove forced-DAC-node.log, seq-sender.log, sync.log, txman.log,

@Stefan-Ethernal
Copy link
Collaborator Author

Please remove forced-DAC-node.log, seq-sender.log, sync.log, txman.log,

It has probably ended up in the diff.html, though I shouldn't have pushed to the repo. Anyways thanks for pointing that out. 🙏

@Stefan-Ethernal Stefan-Ethernal force-pushed the CDK-98-fetch-zkevm-node-v-0-6-1-to-the-cdk-validium-node branch from 58201a5 to 52f4055 Compare March 12, 2024 18:58
@Stefan-Ethernal Stefan-Ethernal merged commit 8eb6ca5 into develop Mar 12, 2024
17 checks passed
@Stefan-Ethernal Stefan-Ethernal deleted the CDK-98-fetch-zkevm-node-v-0-6-1-to-the-cdk-validium-node branch March 12, 2024 22:30
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.

6 participants