Update Stable Cadence feature branch #5472
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
This commit also added --allow-partial-state-from-payload-file flag to execution-state-extract program. User needs to specify this flag allow partial payload file as input (e.g. not all accounts) in order to prevent accidental use of partial state during real migration. The primary use case for payload file is for development, testing, and debugging of migrations because it allows migrating a subset of payloads instead of all payloads.
[Access] Sort events returned from index in tx index order
…ling Improve account migration error handling
[Access] Sort events returned from index in tx index order - backport
Add version, partial state indicator, and checksum to payload file (intermediate migration file)
…ress-zero-for-deployment [Flow EVM] return empty string when deployed address is empty
…hash-nonce [Flow EVM] make EVM address' code/codeHash/nonce accessible
ramtinms
commented
Feb 28, 2024
Comment on lines
+35
to
+37
| flagAllowPartialStateFromPayloads bool | ||
| flagLogVerboseValidationError bool | ||
| flagStagedContractsFile string |
There was a problem hiding this comment.
Conflict resolution 1 - kept both flags
ramtinms
commented
Feb 28, 2024
Comment on lines
+307
to
312
| cause := context.Cause(ctx) | ||
| if cause != nil { | ||
| err = cause | ||
| } | ||
|
|
||
| return nil, fmt.Errorf("failed to migrate payload: %w", err) |
There was a problem hiding this comment.
conflict resolution
ramtinms
commented
Feb 28, 2024
Comment on lines
+174
to
+176
| assert.Equal(t, evt.Type().ID(), "evm.TransactionExecuted") | ||
|
|
||
| location, qualifiedIdentifier, err := cdcCommon.DecodeTypeID(nil, "evm.BlockExecuted") | ||
| location, qualifiedIdentifier, err := cdcCommon.DecodeTypeID(nil, "evm.TransactionExecuted") |
There was a problem hiding this comment.
Conflict resolution
ramtinms
requested review from
janezpodhostnik,
AlexHentschel and
peterargue
as code owners
ramtinms
requested review from
turbolent
and removed request for
AlexHentschel
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## feature/stable-cadence #5472 +/- ##
==========================================================
+ Coverage 56.14% 56.22% +0.08%
==========================================================
Files 1039 1039
Lines 101079 101283 +204
==========================================================
+ Hits 56752 56948 +196
- Misses 40019 40020 +1
- Partials 4308 4315 +7
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
Feb 28, 2024
janezpodhostnik
approved these changes
Feb 28, 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.
Updates the stable cadence branch with the latest changes of the master. Resolved conflicts are flagged with comments.