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

Changed parallel universe HF to Cancun HF and some important fixes #1132

Merged
merged 13 commits into from
Jan 23, 2024

Conversation

pratikspatil024
Copy link
Member

Description

Changed parallel universe HF to Napoli HF

Changes

  • Bugfix (non-breaking change that solves an issue)
  • Hotfix (change that solves an urgent issue, and requires immediate attention)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (change that is not backwards-compatible and/or changes current functionality)
  • Changes only for a subset of nodes

Breaking changes

Please complete this section if any breaking changes have been made, otherwise delete it

Nodes audience

In case this PR includes changes that must be applied only to a subset of nodes, please specify how you handled it (e.g. by adding a flag with a default value...)

Checklist

  • I have added at least 2 reviewer or the whole pos-v1 team
  • I have added sufficient documentation in code
  • I will be resolving comments - if any - by pushing each fix in a separate commit and linking the commit hash in the comment reply
  • Created a task in Jira and informed the team for implementation in Erigon client (if applicable)
  • Includes RPC methods changes, and the Notion documentation has been updated

Cross repository changes

  • This PR requires changes to heimdall
    • In case link the PR here:
  • This PR requires changes to matic-cli
    • In case link the PR here:

Testing

  • I have added unit tests
  • I have added tests to CI
  • I have tested this code manually on local environment
  • I have tested this code manually on remote devnet using express-cli
  • I have tested this code manually on mumbai
  • I have created new e2e tests into express-cli

Manual tests

Please complete this section with the steps you performed if you ran manual tests for this functionality, otherwise delete it

Additional comments

Please post additional comments in this section if you have them, otherwise delete it

@pratikspatil024 pratikspatil024 requested a review from a team January 19, 2024 09:08
manav2401 and others added 2 commits January 19, 2024 14:50
* integration-tests: update ipc path on ci tests

* added devnetBorFlags in matic-cli-config.yml

---------

Co-authored-by: Pratik Patil <pratikspatil024@gmail.com>
params/config.go Outdated
@@ -567,7 +567,7 @@ type BorConfig struct {
BurntContract map[string]string `json:"burntContract"` // governance contract where the token will be sent to and burnt in london fork
JaipurBlock *big.Int `json:"jaipurBlock"` // Jaipur switch block (nil = no fork, 0 = already on jaipur)
DelhiBlock *big.Int `json:"delhiBlock"` // Delhi switch block (nil = no fork, 0 = already on delhi)
ParallelUniverseBlock *big.Int `json:"parallelUniverseBlock"` // TODO: update all occurrence, change name and finalize number (hardfork for block-stm related changes)
NapoliBlock *big.Int `json:"napoliBlock"` // TODO: update all occurrence, change name and finalize number (hardfork for block-stm related changes)
Copy link
Contributor

Choose a reason for hiding this comment

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

Minor one: this won't only be block-stm related HF, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, sorry, my bad. Discussed with @temaniarpit27, this will be Cancun Block in bor. In Erigon it will be called Napoli.

@marcello33
Copy link
Contributor

marcello33 commented Jan 19, 2024

I think e2e tests fail because of your branch (and the upper one v1.2.2-beta-candidate still using the old node version.
See here.
This has been updated in develop and master branch.

@temaniarpit27 temaniarpit27 changed the base branch from arpit/v1.2.2-beta-candidate to v1.2.3-candidate January 19, 2024 11:11
@temaniarpit27
Copy link
Contributor

I think e2e tests fail because of your branch (and the upper one v1.2.2-beta-candidate still using the old node version. See here. This has been updated in develop and master branch.

@pratikspatil024 please cherry-pick those changes in this branch

Copy link

codecov bot commented Jan 19, 2024

Codecov Report

Attention: 54 lines in your changes are missing coverage. Please review.

Comparison is base (5fc30ae) 55.92% compared to head (90d45e0) 55.95%.
Report is 30 commits behind head on v1.2.3-candidate.

Files Patch % Lines
core/parallel_state_processor.go 41.02% 23 Missing ⚠️
miner/worker.go 50.00% 12 Missing ⚠️
consensus/bor/snapshot.go 0.00% 9 Missing ⚠️
consensus/bor/bor.go 0.00% 8 Missing ⚠️
core/types/block.go 0.00% 2 Missing ⚠️
Additional details and impacted files
@@                 Coverage Diff                  @@
##           v1.2.3-candidate    #1132      +/-   ##
====================================================
+ Coverage             55.92%   55.95%   +0.02%     
====================================================
  Files                   658      658              
  Lines                114436   114440       +4     
====================================================
+ Hits                  63997    64031      +34     
+ Misses                46588    46566      -22     
+ Partials               3851     3843       -8     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@pratikspatil024 pratikspatil024 changed the title Changed parallel universe HF to Napoli HF Changed parallel universe HF to Cancun HF and some important fixes Jan 22, 2024
@@ -288,6 +288,10 @@ func (p *ParallelStateProcessor) Process(block *types.Block, statedb *state.Stat

deps := GetDeps(blockTxDependency)

if !VerifyDeps(deps) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's verify the length of deps is equal to the length of transactions in this block

Copy link
Member Author

Choose a reason for hiding this comment

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

Done, thanks!

@pratikspatil024 pratikspatil024 merged commit f1e0b1d into v1.2.3-candidate Jan 23, 2024
11 of 12 checks passed
@pratikspatil024 pratikspatil024 deleted the psp-metadata branch January 23, 2024 05:22
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.

5 participants