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

[evm] Upgrade to Shanghai at SumatraHeight #3963

Merged
merged 4 commits into from
Dec 1, 2023

Conversation

envestcc
Copy link
Member

@envestcc envestcc commented Nov 7, 2023

Description

Upgrade evm from Bellatrix to Shanghai at SumatraHeight. The main changes include:

  • Updating go-ethereum.
  • Activating Merge and Shanghai at Sumatra height.
  • Disabling EIP-4399 because there is not suitable random number implementation yet.
  • Deprecating PrepareAccessList and using Prepare instead. For background, refer to [evm] Add methods for StatedbAdapter #3964.

Type of change

Please delete options that are not relevant.

  • [] Bug fix (non-breaking change which fixes an issue)
  • [] New feature (non-breaking change which adds functionality)
  • [] Code refactor or improvement
  • Breaking change (fix or feature that would cause a new or changed behavior of existing functionality)
  • [] This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

  • [] make test
  • [] fullsync
  • [] Other test (please specify)

Test Configuration:

  • Firmware version:
  • Hardware:
  • Toolchain:
  • SDK:

Checklist:

  • [] My code follows the style guidelines of this project
  • [] I have performed a self-review of my code
  • [] I have commented my code, particularly in hard-to-understand areas
  • [] I have made corresponding changes to the documentation
  • [] My changes generate no new warnings
  • [] I have added tests that prove my fix is effective or that my feature works
  • [] New and existing unit tests pass locally with my changes
  • [] Any dependent changes have been merged and published in downstream modules

@CoderZhi
Copy link
Collaborator

CoderZhi commented Nov 9, 2023

split it into multiple prs

@envestcc envestcc linked an issue Nov 17, 2023 that may be closed by this pull request
6 tasks
@envestcc envestcc force-pushed the pr_shanghai branch 2 times, most recently from 5e31408 to 3319fc2 Compare November 23, 2023 08:25
Copy link

codecov bot commented Nov 23, 2023

Codecov Report

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

Comparison is base (e1f0636) 75.38% compared to head (8b8e587) 76.26%.
Report is 120 commits behind head on master.

Files Patch % Lines
blockindex/contractstaking/event_handler.go 67.23% 45 Missing and 13 partials ⚠️
action/protocol/staking/staking_statereader.go 69.76% 35 Missing and 17 partials ⚠️
action/protocol/execution/evm/evm.go 48.93% 47 Missing and 1 partial ⚠️
action/protocol/staking/protocol.go 33.33% 28 Missing ⚠️
...tion/protocol/staking/contractstake_bucket_type.go 0.00% 24 Missing ⚠️
api/coreservice.go 68.49% 17 Missing and 6 partials ⚠️
blockindex/contractstaking/util.go 39.47% 22 Missing and 1 partial ⚠️
action/protocol/rewarding/fund.go 23.07% 19 Missing and 1 partial ⚠️
api/websocket.go 0.00% 20 Missing ⚠️
blockindex/sgd_indexer.go 90.30% 12 Missing and 7 partials ⚠️
... and 29 more
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3963      +/-   ##
==========================================
+ Coverage   75.38%   76.26%   +0.88%     
==========================================
  Files         303      330      +27     
  Lines       25923    28270    +2347     
==========================================
+ Hits        19541    21559    +2018     
- Misses       5360     5609     +249     
- Partials     1022     1102      +80     

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

@envestcc envestcc marked this pull request as ready for review November 24, 2023 00:58
@envestcc envestcc requested review from CoderZhi, dustinxie, Liuhaai and a team as code owners November 24, 2023 00:58
@envestcc envestcc mentioned this pull request Nov 24, 2023
6 tasks
@envestcc envestcc removed a link to an issue Nov 24, 2023
6 tasks
now := time.Now()
getBlockTime := func(height uint64) (time.Time, error) {
return now.Add(time.Duration(height) * time.Second * 5), nil
}
Copy link
Member

Choose a reason for hiding this comment

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

these 2 lines can move to in front of if

Copy link
Member Author

Choose a reason for hiding this comment

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

which if?

Copy link
Member

Choose a reason for hiding this comment

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

i mean, for at L257

// Random opcode (EIP-4399) is not supported on IoTeX
zeroHash := common.BytesToHash(nil)
context.Random = &zeroHash
}
Copy link
Member

@dustinxie dustinxie Nov 28, 2023

Choose a reason for hiding this comment

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

i recall we now have value = 50? think we can remove this, no need to complicate things with this change. We make change in the future when we are ready to support

Copy link
Member Author

@envestcc envestcc Nov 28, 2023

Choose a reason for hiding this comment

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

If keep context.Random as nil, evm will panic when execute op prevrandom. Do you mean Random should be set as 50 instead of 0?

Copy link
Member

Choose a reason for hiding this comment

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

context.Random = &common.Hash{} will do

Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
2.8% 2.8% Duplication

@envestcc envestcc merged commit 4078579 into iotexproject:master Dec 1, 2023
4 of 5 checks passed
@envestcc envestcc deleted the pr_shanghai branch December 1, 2023 02:18
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.

4 participants