Use correct EVM address in tests and transient networks #5255
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 ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #5255 +/- ##
==========================================
+ Coverage 55.61% 55.66% +0.04%
==========================================
Files 995 995
Lines 95485 95510 +25
==========================================
+ Hits 53107 53161 +54
+ Misses 38403 38378 -25
+ Partials 3975 3971 -4
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
turbolent
approved these changes
Jan 19, 2024
fvm/evm/evm.go
Outdated
| @@ -12,39 +12,48 @@ import ( | |||
| "github.com/onflow/flow-go/model/flow" | |||
| ) | |||
|
|
|||
| func RootAccountAddress(chainID flow.ChainID) (flow.Address, error) { | |||
| func ContractAccountAddress(chainID flow.ChainID) (flow.Address, error) { | |||
| sc := systemcontracts.SystemContractsForChain(chainID) | |||
| return sc.EVM.Address, nil | |||
There was a problem hiding this comment.
Maybe also rename EVM to EVMContract, just like the EVM storage account is called EVMStorage
ramtinms
approved these changes
Jan 19, 2024
sideninja
approved these changes
Jan 22, 2024
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.
ref: #4964, #4959
What was done in this PR
The EVM contract account will be the service account on all networks.
The EVM state storage account will be the fifth account on all transient networks. On non-transient networks an Account still has to be picked to serve that purpose.