[evm] refactor evm parameters #3958
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #3958 +/- ##
==========================================
+ Coverage 75.38% 76.17% +0.79%
==========================================
Files 303 328 +25
Lines 25923 27982 +2059
==========================================
+ Hits 19541 21316 +1775
- Misses 5360 5570 +210
- Partials 1022 1096 +74
... and 3 files with indirect coverage changes 📣 Codecov offers a browser extension for seamless coverage viewing on GitHub. Try it in Chrome or Firefox today! |
envestcc
requested review from
CoderZhi,
dustinxie and
Liuhaai
as code owners
2 tasks
dustinxie
reviewed
Nov 2, 2023
action/protocol/execution/evm/evm.go
Outdated
| retval, depositGas, remainingGas, contractAddress, statusCode, err := executeInEVM(ctx, ps, stateDB, g.Blockchain, blkCtx.GasLimit, blkCtx.BlockHeight) | ||
| actionCtx := ps.actionCtx | ||
| blkCtx := ps.blkCtx | ||
| featureCtx := ps.featureCtx |
There was a problem hiding this comment.
directly use ps.actionCtx/blkCtx/featureCtx
dustinxie
reviewed
Nov 2, 2023
action/protocol/execution/evm/evm.go
Outdated
| config = vmCfg | ||
| } | ||
| chainConfig := getChainConfig(g, blockHeight, evmParams.evmNetworkID) | ||
| config := evmParams.evmConfig |
There was a problem hiding this comment.
directly use evmParams.evmConfig since it is only used 1 time
dustinxie
reviewed
Nov 2, 2023
action/protocol/execution/evm/evm.go
Outdated
| } | ||
| chainConfig := getChainConfig(g, blockHeight, evmParams.evmNetworkID) | ||
| config := evmParams.evmConfig | ||
| chainConfig := evmParams.chainConfig |
dustinxie
reviewed
Nov 2, 2023
action/protocol/execution/evm/evm.go
Outdated
| func executeInEVM(evmParams *Params, stateDB *StateDBAdapter) ([]byte, uint64, uint64, string, iotextypes.ReceiptStatus, error) { | ||
| gasLimit := evmParams.blkCtx.GasLimit | ||
| blockHeight := evmParams.blkCtx.BlockHeight | ||
| g := evmParams.genesis |
There was a problem hiding this comment.
looks better to group together
var (
gasLimit
....
)
dustinxie
reviewed
Nov 2, 2023
action/protocol/execution/evm/evm.go
Outdated
| @@ -105,6 +111,7 @@ func newParams( | |||
| actionCtx := protocol.MustGetActionCtx(ctx) | |||
| blkCtx := protocol.MustGetBlockCtx(ctx) | |||
| featureCtx := protocol.MustGetFeatureCtx(ctx) | |||
| g := genesis.MustExtractGenesisContext(ctx) | |||
There was a problem hiding this comment.
looks better to group together
var (
actionCtx
...
)
dustinxie
reviewed
Nov 2, 2023
action/protocol/execution/evm/evm.go
Outdated
| @@ -162,6 +169,12 @@ func newParams( | |||
| Difficulty: new(big.Int).SetUint64(uint64(50)), | |||
| BaseFee: new(big.Int), | |||
| } | |||
| evmNetworkID := protocol.MustGetBlockchainCtx(ctx).EvmNetworkID | |||
| vmConfig := vm.Config{} | |||
dustinxie
reviewed
Nov 3, 2023
action/protocol/execution/evm/evm.go
Outdated
| blkCtx protocol.BlockCtx | ||
| genesis genesis.Blockchain | ||
| featureCtx protocol.FeatureCtx | ||
| actionCtx protocol.ActionCtx |
There was a problem hiding this comment.
L89 executorRawAddress string can be deleted, defined but not used at all
dustinxie
reviewed
Nov 3, 2023
action/protocol/execution/evm/evm.go
Outdated
| vmConfig vm.Config | ||
| contractAddrPointer *common.Address | ||
| getHashFn vm.GetHashFunc | ||
| ) | ||
| executorAddr := common.BytesToAddress(actionCtx.Caller.Bytes()) |
dustinxie
approved these changes
Nov 3, 2023
millken
approved these changes
Nov 3, 2023
|
SonarCloud Quality Gate failed.
|
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
To ensure easier code maintenance in EVM, the
Paramsstruct is used internally to access the required parameters.Fixes #(issue)
Type of change
Please delete options that are not relevant.
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
Test Configuration:
Checklist: