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

[workingset] opt the gaslimit of non-execution acts with instrinsicgas #4029

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

Liuhaai
Copy link
Member

@Liuhaai Liuhaai commented Dec 20, 2023

Description

Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that are required for this change.

Fixes #(issue)

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

Copy link

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

Copy link

codecov bot commented Dec 20, 2023

Codecov Report

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

Comparison is base (e1f0636) 75.38% compared to head (875c66f) 76.23%.
Report is 130 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.38% 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    #4029      +/-   ##
==========================================
+ Coverage   75.38%   76.23%   +0.85%     
==========================================
  Files         303      330      +27     
  Lines       25923    28268    +2345     
==========================================
+ Hits        19541    21551    +2010     
- Misses       5360     5617     +257     
- Partials     1022     1100      +78     

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

return nil, errors.New("failed to get intrinsicGas")
}
}
if gaslimit > blkCtx.GasLimit {
Copy link
Member Author

Choose a reason for hiding this comment

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

might check isNegative for L549?

if _, ok := nextAction.Action().(*action.Execution); ok {
gaslimit = nextAction.GasLimit()
} else {
gaslimit, err = nextAction.IntrinsicGas()
Copy link
Collaborator

Choose a reason for hiding this comment

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

I don't mind dropping this action as well as the actions of the account

Copy link
Member

Choose a reason for hiding this comment

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

this change will need a hard-fork?

if nextAction.GasLimit() > blkCtx.GasLimit {

// IntrinsicGas is used for all non-execution actions, and GasLimit is used for execution actions
var gaslimit uint64 = math.MaxUint64
Copy link
Member

Choose a reason for hiding this comment

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

move to L491

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.

3 participants