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

Bump scarb to v2.9.1 #1239

Merged
merged 13 commits into from
Dec 4, 2024
Merged

Conversation

andrew-fleming
Copy link
Collaborator

Scarb's fmt command is bringing back trailing commas

This also bumps SN forge to v0.34.0

Copy link

codecov bot commented Dec 2, 2024

Codecov Report

Attention: Patch coverage is 69.88417% with 78 lines in your changes missing coverage. Please review.

Project coverage is 86.40%. Comparing base (a1aa93b) to head (9997f39).
Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
packages/token/src/erc721/erc721.cairo 56.52% 10 Missing ⚠️
packages/governance/src/governor/governor.cairo 66.66% 9 Missing ⚠️
.../governance/src/timelock/timelock_controller.cairo 55.55% 8 Missing ⚠️
packages/presets/src/interfaces/erc1155.cairo 0.00% 7 Missing ⚠️
packages/token/src/erc1155/erc1155.cairo 75.86% 7 Missing ⚠️
packages/account/src/interface.cairo 0.00% 4 Missing ⚠️
packages/governance/src/timelock/interface.cairo 0.00% 4 Missing ⚠️
packages/token/src/erc20/erc20.cairo 66.66% 4 Missing ⚠️
packages/account/src/eth_account.cairo 80.00% 3 Missing ⚠️
packages/governance/src/votes/votes.cairo 40.00% 3 Missing ⚠️
... and 10 more
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1239      +/-   ##
==========================================
- Coverage   92.26%   86.40%   -5.87%     
==========================================
  Files          59       79      +20     
  Lines        1811     4060    +2249     
==========================================
+ Hits         1671     3508    +1837     
- Misses        140      552     +412     
Files with missing lines Coverage Δ
...kages/access/src/accesscontrol/accesscontrol.cairo 100.00% <100.00%> (+26.66%) ⬆️
packages/access/src/ownable/ownable.cairo 100.00% <100.00%> (+18.75%) ⬆️
...ckages/account/src/extensions/src9/interface.cairo 50.00% <ø> (ø)
...ges/account/src/extensions/src9/snip12_utils.cairo 100.00% <ø> (+52.94%) ⬆️
packages/account/src/extensions/src9/src9.cairo 98.27% <100.00%> (+6.60%) ⬆️
packages/account/src/utils.cairo 94.44% <ø> (+3.53%) ⬆️
packages/account/src/utils/secp256_point.cairo 79.16% <ø> (-2.09%) ⬇️
packages/account/src/utils/signature.cairo 100.00% <ø> (+12.50%) ⬆️
packages/finance/src/vesting/vesting.cairo 100.00% <100.00%> (ø)
.../governor/extensions/governor_core_execution.cairo 85.71% <100.00%> (+7.93%) ⬆️
... and 61 more

... and 7 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a1aa93b...9997f39. Read the comment docs.

Copy link
Member

@ericnordelo ericnordelo left a comment

Choose a reason for hiding this comment

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

Looking good @andrew-fleming , I left a couple of comments. There seems to be some regression for the coverage tool after the update of foundry and scarb. Since you took the initiative, can you check that with them if necessary @andrew-fleming? cc @ggonzalez94 to be aware of coverage percentage issues.

@@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed (Breaking)

- Bump scarb to v2.9.1 (#1239)
Copy link
Member

Choose a reason for hiding this comment

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

Should we add the foundry update too?

Copy link
Member

Choose a reason for hiding this comment

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

We should probably decouple openzeppelin_testing from the rest of the packages to make bumping snforge not breaking for the rest.

Copy link
Member

Choose a reason for hiding this comment

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

To be discussed when releasing 1.0

Scarb.toml Outdated Show resolved Hide resolved
docs/modules/ROOT/pages/index.adoc Show resolved Hide resolved
packages/merkle_tree/src/merkle_proof.cairo Show resolved Hide resolved
@immrsd immrsd self-requested a review December 3, 2024 12:32
Copy link
Member

@ericnordelo ericnordelo left a comment

Choose a reason for hiding this comment

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

LGTM!

@andrew-fleming
Copy link
Collaborator Author

I commented out the cairo-coverage and codecov commands in the CI. I figured this is the easiest workaround until coverage is more stable

Copy link
Member

@ericnordelo ericnordelo left a comment

Choose a reason for hiding this comment

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

Let's comment the coverage tool for the sake of fixing the transient dependencies issue.

@andrew-fleming andrew-fleming merged commit 83a33fc into OpenZeppelin:main Dec 4, 2024
7 checks passed
@andrew-fleming andrew-fleming deleted the bump-scarb branch December 4, 2024 15:05
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.

2 participants