-
Notifications
You must be signed in to change notification settings - Fork 491
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
Conversation
* integration-tests: update ipc path on ci tests * added devnetBorFlags in matic-cli-config.yml --------- Co-authored-by: Pratik Patil <pratikspatil024@gmail.com>
This reverts commit 0660fac.
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) |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
I think e2e tests fail because of your branch (and the upper one |
@pratikspatil024 please cherry-pick those changes in this branch |
Codecov ReportAttention:
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. |
core/parallel_state_processor.go
Outdated
@@ -288,6 +288,10 @@ func (p *ParallelStateProcessor) Process(block *types.Block, statedb *state.Stat | |||
|
|||
deps := GetDeps(blockTxDependency) | |||
|
|||
if !VerifyDeps(deps) { |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done, thanks!
9947ee5
to
60b5c41
Compare
Description
Changed parallel universe HF to Napoli HF
Changes
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
Cross repository changes
Testing
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