Skip to content

Cairo: Support v3.0.0-alpha.0 #623

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.

Sign up for GitHub

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

Merged
ericglau merged 20 commits into from
Aug 18, 2025
Merged

Cairo: Support v3.0.0-alpha.0 #623

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
accf645
Update versions in cairo_alpha dir
immrsd Aug 12, 2025
9374350
Update versions in cairo dir
immrsd Aug 12, 2025
96d4330
Update cairo-alpha snapshots
immrsd Aug 12, 2025
4e41281
Add changelog entry for v3.0.0-alpha.0 to cairo-alpha
immrsd Aug 12, 2025
1b7570b
Revert "Update versions in cairo dir"
immrsd Aug 12, 2025
05fb24c
Fix Cairo versions comparison issue
immrsd Aug 12, 2025
70af61a
Lint files
immrsd Aug 12, 2025
5cb478b
Add ERC6372TimestampClock import for Votes component
immrsd Aug 12, 2025
ae94bb4
Merge branch 'master' into cairo/support-v3.0.0-alpha.0
immrsd Aug 12, 2025
04030c2
Fix Cairo version comparison
immrsd Aug 12, 2025
c83d3e7
Propagate section parameter when adding the Votes component
immrsd Aug 12, 2025
3bb66fb
Merge remote-tracking branch 'origin/cairo/support-v3.0.0-alpha.0' in…
immrsd Aug 12, 2025
87f59d7
Ignore wizard-cairo in changeset config
immrsd Aug 12, 2025
82313b8
Revert "Ignore wizard-cairo in changeset config"
immrsd Aug 12, 2025
fd091f9
Add empty changeset
immrsd Aug 12, 2025
cdef8e8
Update changeset
ericglau Aug 18, 2025
81d7435
Update snapshots
ericglau Aug 18, 2025
973cd39
Fix lint
ericglau Aug 18, 2025
634f666
Merge remote-tracking branch 'upstream/master' into cairo/support-v3.…
ericglau Aug 18, 2025
063d8ae
Revert section propagation, rename var for clarity
ericglau Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fluffy-clubs-write.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@openzeppelin/wizard-cairo': patch
---

Fix comment label and ordering for implementation sections
1 change: 1 addition & 0 deletions packages/core/cairo/src/common-components.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export function addVotesComponent(c: ContractBuilder, name: string, version: str
c.addImplToComponent(components.VotesComponent, {
name: 'VotesImpl',
value: `VotesComponent::VotesImpl<ContractState>`,
section,
});
}

Expand Down
36 changes: 24 additions & 12 deletions packages/core/cairo/src/erc20.test.ts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,15 +898,17 @@ Generated by [AVA](https://avajs.dev).
#[abi(embed_v0)]␊
impl NoncesImpl = NoncesComponent::NoncesImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl OwnableMixinImpl = OwnableComponent::OwnableMixinImpl<ContractState>;␊
␊
// Internal␊
impl ERC20InternalImpl = ERC20Component::InternalImpl<ContractState>;␊
impl VotesInternalImpl = VotesComponent::InternalImpl<ContractState>;␊
impl UpgradeableInternalImpl = UpgradeableComponent::InternalImpl<ContractState>;␊
impl OwnableInternalImpl = OwnableComponent::InternalImpl<ContractState>;␊
␊
// SNIP12 Metadata␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
#[storage]␊
struct Storage {␊
Expand Down Expand Up @@ -1013,15 +1015,17 @@ Generated by [AVA](https://avajs.dev).
#[abi(embed_v0)]␊
impl NoncesImpl = NoncesComponent::NoncesImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl OwnableMixinImpl = OwnableComponent::OwnableMixinImpl<ContractState>;␊
␊
// Internal␊
impl ERC20InternalImpl = ERC20Component::InternalImpl<ContractState>;␊
impl VotesInternalImpl = VotesComponent::InternalImpl<ContractState>;␊
impl UpgradeableInternalImpl = UpgradeableComponent::InternalImpl<ContractState>;␊
impl OwnableInternalImpl = OwnableComponent::InternalImpl<ContractState>;␊
␊
// SNIP12 Metadata␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
#[storage]␊
struct Storage {␊
Expand Down Expand Up @@ -1121,12 +1125,14 @@ Generated by [AVA](https://avajs.dev).
impl ERC20MixinImpl = ERC20Component::ERC20MixinImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl NoncesImpl = NoncesComponent::NoncesImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
// Internal␊
impl ERC20InternalImpl = ERC20Component::InternalImpl<ContractState>;␊
impl VotesInternalImpl = VotesComponent::InternalImpl<ContractState>;␊
␊
// SNIP12 Metadata␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
#[storage]␊
struct Storage {␊
Expand Down Expand Up @@ -1214,14 +1220,16 @@ Generated by [AVA](https://avajs.dev).
impl OwnableMixinImpl = OwnableComponent::OwnableMixinImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl NoncesImpl = NoncesComponent::NoncesImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
// Internal␊
impl ERC20InternalImpl = ERC20Component::InternalImpl<ContractState>;␊
impl PausableInternalImpl = PausableComponent::InternalImpl<ContractState>;␊
impl OwnableInternalImpl = OwnableComponent::InternalImpl<ContractState>;␊
impl VotesInternalImpl = VotesComponent::InternalImpl<ContractState>;␊
␊
// SNIP12 Metadata␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
#[storage]␊
struct Storage {␊
Expand Down Expand Up @@ -1360,15 +1368,17 @@ Generated by [AVA](https://avajs.dev).
impl OwnableMixinImpl = OwnableComponent::OwnableMixinImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl NoncesImpl = NoncesComponent::NoncesImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
// Internal␊
impl ERC20InternalImpl = ERC20Component::InternalImpl<ContractState>;␊
impl PausableInternalImpl = PausableComponent::InternalImpl<ContractState>;␊
impl OwnableInternalImpl = OwnableComponent::InternalImpl<ContractState>;␊
impl VotesInternalImpl = VotesComponent::InternalImpl<ContractState>;␊
impl UpgradeableInternalImpl = UpgradeableComponent::InternalImpl<ContractState>;␊
␊
// SNIP12 Metadata␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
#[storage]␊
struct Storage {␊
Expand Down Expand Up @@ -1530,15 +1540,17 @@ Generated by [AVA](https://avajs.dev).
impl AccessControlMixinImpl = AccessControlComponent::AccessControlMixinImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl NoncesImpl = NoncesComponent::NoncesImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
// Internal␊
impl ERC20InternalImpl = ERC20Component::InternalImpl<ContractState>;␊
impl PausableInternalImpl = PausableComponent::InternalImpl<ContractState>;␊
impl AccessControlInternalImpl = AccessControlComponent::InternalImpl<ContractState>;␊
impl VotesInternalImpl = VotesComponent::InternalImpl<ContractState>;␊
impl UpgradeableInternalImpl = UpgradeableComponent::InternalImpl<ContractState>;␊
␊
// SNIP12 Metadata␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
#[storage]␊
struct Storage {␊
Expand Down
Binary file modified packages/core/cairo/src/erc20.test.ts.snap
View file
Open in desktop
Binary file not shown.
30 changes: 20 additions & 10 deletions packages/core/cairo/src/erc721.test.ts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1388,8 +1388,6 @@ Generated by [AVA](https://avajs.dev).
impl ERC2981AdminOwnableImpl = ERC2981Component::ERC2981AdminOwnableImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl NoncesImpl = NoncesComponent::NoncesImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
// Internal␊
impl ERC721InternalImpl = ERC721Component::InternalImpl<ContractState>;␊
Expand All @@ -1398,6 +1396,10 @@ Generated by [AVA](https://avajs.dev).
impl ERC721EnumerableInternalImpl = ERC721EnumerableComponent::InternalImpl<ContractState>;␊
impl ERC2981InternalImpl = ERC2981Component::InternalImpl<ContractState>;␊
impl VotesInternalImpl = VotesComponent::InternalImpl<ContractState>;␊
␊
// SNIP12 Metadata␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
#[storage]␊
struct Storage {␊
Expand Down Expand Up @@ -1558,14 +1560,16 @@ Generated by [AVA](https://avajs.dev).
impl OwnableMixinImpl = OwnableComponent::OwnableMixinImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl NoncesImpl = NoncesComponent::NoncesImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
// Internal␊
impl ERC721InternalImpl = ERC721Component::InternalImpl<ContractState>;␊
impl UpgradeableInternalImpl = UpgradeableComponent::InternalImpl<ContractState>;␊
impl OwnableInternalImpl = OwnableComponent::InternalImpl<ContractState>;␊
impl VotesInternalImpl = VotesComponent::InternalImpl<ContractState>;␊
␊
// SNIP12 Metadata␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
#[storage]␊
struct Storage {␊
Expand Down Expand Up @@ -1680,14 +1684,16 @@ Generated by [AVA](https://avajs.dev).
impl OwnableMixinImpl = OwnableComponent::OwnableMixinImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl NoncesImpl = NoncesComponent::NoncesImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
// Internal␊
impl ERC721InternalImpl = ERC721Component::InternalImpl<ContractState>;␊
impl UpgradeableInternalImpl = UpgradeableComponent::InternalImpl<ContractState>;␊
impl OwnableInternalImpl = OwnableComponent::InternalImpl<ContractState>;␊
impl VotesInternalImpl = VotesComponent::InternalImpl<ContractState>;␊
␊
// SNIP12 Metadata␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
#[storage]␊
struct Storage {␊
Expand Down Expand Up @@ -1795,12 +1801,14 @@ Generated by [AVA](https://avajs.dev).
impl ERC721MixinImpl = ERC721Component::ERC721MixinImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl NoncesImpl = NoncesComponent::NoncesImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
// Internal␊
impl ERC721InternalImpl = ERC721Component::InternalImpl<ContractState>;␊
impl VotesInternalImpl = VotesComponent::InternalImpl<ContractState>;␊
␊
// SNIP12 Metadata␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
#[storage]␊
struct Storage {␊
Expand Down Expand Up @@ -1911,8 +1919,6 @@ Generated by [AVA](https://avajs.dev).
impl ERC2981AdminOwnableImpl = ERC2981Component::ERC2981AdminOwnableImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl NoncesImpl = NoncesComponent::NoncesImpl<ContractState>;␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
// Internal␊
impl ERC721InternalImpl = ERC721Component::InternalImpl<ContractState>;␊
Expand All @@ -1922,6 +1928,10 @@ Generated by [AVA](https://avajs.dev).
impl UpgradeableInternalImpl = UpgradeableComponent::InternalImpl<ContractState>;␊
impl ERC2981InternalImpl = ERC2981Component::InternalImpl<ContractState>;␊
impl VotesInternalImpl = VotesComponent::InternalImpl<ContractState>;␊
␊
// SNIP12 Metadata␊
#[abi(embed_v0)]␊
impl VotesImpl = VotesComponent::VotesImpl<ContractState>;␊
␊
#[storage]␊
struct Storage {␊
Expand Down
Binary file modified packages/core/cairo/src/erc721.test.ts.snap
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions packages/core/cairo_alpha/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## Unreleased

- **Breaking changes**:
- Use OpenZeppelin Contracts for Cairo v3.0.0-alpha.0. ([#623](https://github.com/OpenZeppelin/contracts-wizard/pull/623))

## 2.0.0 (2025-06-20)

- Add AccessControlWithDelay. ([#506](https://github.com/OpenZeppelin/contracts-wizard/pull/506))
Expand Down
2 changes: 1 addition & 1 deletion packages/core/cairo_alpha/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@openzeppelin/wizard-cairo-alpha",
"private": true,
"version": "2.0.0",
"version": "3.0.0-alpha.0",
"description": "A boilerplate generator to get started with the latest alpha version of OpenZeppelin Contracts for Cairo",
"license": "AGPL-3.0-only",
"repository": "https://github.com/OpenZeppelin/contracts-wizard",
Expand Down
Loading
Loading