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

Update Stable Cadence feature branch #5429

Merged
merged 130 commits into from
Feb 21, 2024

Conversation

ramtinms
Copy link
Contributor

@ramtinms ramtinms commented Feb 21, 2024

Updates the stable cadence branch with the latest changes of the master. Only one conflict resolution (flagged in the comments)

Comment on lines 384 to +391
let coaRef = acc.capabilities.borrow<&EVM.CadenceOwnedAccount>(path)
?? panic("could not borrow Cadence-owned account's address")

if coaRef == nil {
return ValidationResult(
isValid: false,
problem: "could not borrow bridge account's resource"
)
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Conflict resolution

@ramtinms ramtinms changed the title [WIP] don't merge yet, Sync master with stable cadence branch Update Stable Cadence feature branch Feb 21, 2024
@ramtinms ramtinms marked this pull request as ready for review February 21, 2024 22:40
@ramtinms ramtinms requested review from turbolent and a team and removed request for yhassanzadeh13 and AlexHentschel February 21, 2024 22:40
@codecov-commenter
Copy link

codecov-commenter commented Feb 21, 2024

Codecov Report

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

Comparison is base (b8bfddc) 56.31% compared to head (3d0b84f) 57.83%.

❗ Current head 3d0b84f differs from pull request most recent head b57bd2e. Consider uploading reports for the commit b57bd2e to get more accurate results

Files Patch % Lines
fvm/evm/types/codeFinder.go 0.00% 84 Missing ⚠️
fvm/evm/stdlib/contract.go 45.71% 38 Missing ⚠️
fvm/evm/types/result.go 0.00% 20 Missing ⚠️
fvm/evm/handler/precompiles.go 43.33% 15 Missing and 2 partials ⚠️
fvm/evm/types/call.go 63.33% 11 Missing ⚠️
engine/access/rpc/connection/cache.go 93.05% 3 Missing and 2 partials ⚠️
ledger/complete/compactor.go 66.66% 2 Missing and 1 partial ⚠️
ledger/complete/wal/checkpoint_v6_reader.go 85.00% 2 Missing and 1 partial ⚠️
ledger/complete/wal/checkpointer.go 57.14% 2 Missing and 1 partial ⚠️
fvm/evm/handler/handler.go 94.11% 2 Missing ⚠️
... and 1 more
Additional details and impacted files
@@                    Coverage Diff                     @@
##           feature/stable-cadence    #5429      +/-   ##
==========================================================
+ Coverage                   56.31%   57.83%   +1.52%     
==========================================================
  Files                        1023      852     -171     
  Lines                       99140    84513   -14627     
==========================================================
- Hits                        55827    48875    -6952     
+ Misses                      39089    31894    -7195     
+ Partials                     4224     3744     -480     
Flag Coverage Δ
unittests 57.83% <54.39%> (+1.52%) ⬆️

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.

@ramtinms ramtinms requested review from a team and removed request for a team February 21, 2024 22:41
@turbolent turbolent requested a review from a team February 21, 2024 22:45
@turbolent turbolent merged commit e77011b into feature/stable-cadence Feb 21, 2024
50 of 51 checks passed
@turbolent turbolent deleted the ramtin/update-stable-cadence-12 branch February 21, 2024 23:52
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.

9 participants