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

[EFM] Sync master -> feature/efm-recovery #6332

Merged
merged 224 commits into from
Aug 21, 2024

Conversation

durkmurder
Copy link
Member

@durkmurder durkmurder commented Aug 13, 2024

Context

This PR brings latest changes from master to feature branch. No major conflicts, mostly resolved dependencies due to forked version of smart contracts. List of conflicted files:

  both modified:   engine/execution/state/bootstrap/bootstrap_test.go
  both modified:   go.mod
  both modified:   insecure/go.mod
  both modified:   integration/go.mod
  both modified:   integration/go.sum
  both modified:   state/protocol/protocol_state/epochs/fallback_statemachine_test.go
  both modified:   utils/unittest/execution_state.go

Guitarheroua and others added 30 commits May 29, 2024 17:23
….com:The-K-R-O-K/flow-go into AndriiSlisarchuk/5789-version-control-integration-to-script-execution
….com:The-K-R-O-K/flow-go into AndriiSlisarchuk/5789-version-control-integration-to-script-execution
….com:The-K-R-O-K/flow-go into AndriiSlisarchuk/5789-version-control-integration-to-script-execution
….com:The-K-R-O-K/flow-go into AndriiSlisarchuk/5789-version-control-integration-to-script-execution
….com:The-K-R-O-K/flow-go into AndriiSlisarchuk/5789-version-control-integration-to-script-execution
…drukhiv/6017-pebble-as-execution-datastore-db
….com:The-K-R-O-K/flow-go into AndriiSlisarchuk/5789-version-control-integration-to-script-execution
….com:The-K-R-O-K/flow-go into AndriiSlisarchuk/5789-version-control-integration-to-script-execution
….com:The-K-R-O-K/flow-go into AndriiSlisarchuk/5789-version-control-integration-to-script-execution
SupunS and others added 10 commits August 12, 2024 17:57
…0-preview.46

Update to Cadence v1.0.0-preview.47
Report the stored path of the untyped-capability
…/sync-master-to-efm-recovery

Conflicts:
	engine/execution/state/bootstrap/bootstrap_test.go
	go.mod
	insecure/go.mod
	integration/go.mod
	integration/go.sum
	state/protocol/protocol_state/epochs/fallback_statemachine_test.go
	utils/unittest/execution_state.go
@codecov-commenter
Copy link

codecov-commenter commented Aug 13, 2024

Codecov Report

Attention: Patch coverage is 46.88612% with 597 lines in your changes missing coverage. Please review.

Project coverage is 41.53%. Comparing base (2d1fafa) to head (06b4a51).

Files Patch % Lines
fvm/environment/program_recovery.go 0.00% 107 Missing ⚠️
fvm/evm/debug/tracer.go 33.06% 75 Missing and 8 partials ⚠️
cmd/access/node_builder/access_node_builder.go 0.00% 63 Missing ⚠️
cmd/observer/node_builder/observer_builder.go 0.00% 62 Missing ⚠️
engine/access/rest/apiproxy/rest_proxy_handler.go 0.00% 32 Missing ⚠️
...util/ledger/migrations/cadence_values_migration.go 75.24% 25 Missing ⚠️
...cutiondatasync/storage/pebble_datastore_manager.go 0.00% 23 Missing ⚠️
storage/pebble/consumer_progress.go 0.00% 20 Missing ⚠️
cmd/util/ledger/migrations/cadence.go 85.71% 14 Missing and 5 partials ⚠️
fvm/evm/handler/handler.go 83.63% 9 Missing and 9 partials ⚠️
... and 21 more
Additional details and impacted files
@@                   Coverage Diff                    @@
##           feature/efm-recovery    #6332      +/-   ##
========================================================
+ Coverage                 41.49%   41.53%   +0.03%     
========================================================
  Files                      2003     2012       +9     
  Lines                    142653   143354     +701     
========================================================
+ Hits                      59200    59538     +338     
- Misses                    77276    77624     +348     
- Partials                   6177     6192      +15     
Flag Coverage Δ
unittests 41.53% <46.88%> (+0.03%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

@AlexHentschel AlexHentschel merged commit a01877f into feature/efm-recovery Aug 21, 2024
55 checks passed
@AlexHentschel AlexHentschel deleted the yurii/sync-master-to-efm-recovery branch August 21, 2024 00:28
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.