diff --git a/packages/core/cairo_alpha/CHANGELOG.md b/packages/core/cairo_alpha/CHANGELOG.md index e0873968a..69f182b91 100644 --- a/packages/core/cairo_alpha/CHANGELOG.md +++ b/packages/core/cairo_alpha/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## Unreleased + +- **Breaking changes**: + - Use OpenZeppelin Contracts for Cairo v2.0.0-alpha.0. ([#491](https://github.com/OpenZeppelin/contracts-wizard/pull/491)) + ## 1.0.0 (2025-02-25) - **Breaking changes**: diff --git a/packages/core/cairo_alpha/README.md b/packages/core/cairo_alpha/README.md index 27000e092..f567c9dcf 100644 --- a/packages/core/cairo_alpha/README.md +++ b/packages/core/cairo_alpha/README.md @@ -4,12 +4,16 @@ Interactively build a contract out of components from OpenZeppelin Contracts for Cairo. Provide parameters and desired features for the kind of contract that you want, and the Wizard will generate all of the code necessary. The resulting code is ready to be compiled and deployed, or it can serve as a starting point and customized further with application specific logic. -This package provides a programmatic API. For a web interface, see https://wizard.openzeppelin.com/cairo +This package provides a programmatic API. For a web interface, see https://wizard.openzeppelin.com/cairo#version=alpha ### Installation `npm install @openzeppelin/wizard-cairo-alpha` +> NOTE +> The `@openzeppelin/wizard-cairo-alpha` package is currently private and cannot be used as a dependency. +> For a stable version, please use `@openzeppelin/wizard-cairo` instead. + ### Contract types The following contract types are supported: diff --git a/packages/core/cairo_alpha/package.json b/packages/core/cairo_alpha/package.json index 209e7e5cb..7375ed875 100644 --- a/packages/core/cairo_alpha/package.json +++ b/packages/core/cairo_alpha/package.json @@ -1,7 +1,7 @@ { "name": "@openzeppelin/wizard-cairo-alpha", "private": true, - "version": "1.0.0", + "version": "2.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", diff --git a/packages/core/cairo_alpha/src/account.test.ts.md b/packages/core/cairo_alpha/src/account.test.ts.md index 643a60fd4..8fbfdc927 100644 --- a/packages/core/cairo_alpha/src/account.test.ts.md +++ b/packages/core/cairo_alpha/src/account.test.ts.md @@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -86,7 +86,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -142,7 +142,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -219,7 +219,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -275,7 +275,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -346,7 +346,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -396,7 +396,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -477,7 +477,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -550,7 +550,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -623,7 +623,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -698,7 +698,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -773,7 +773,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -850,7 +850,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -927,7 +927,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -1005,7 +1005,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -1062,7 +1062,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -1140,7 +1140,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -1197,7 +1197,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -1269,7 +1269,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -1320,7 +1320,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -1402,7 +1402,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -1476,7 +1476,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -1550,7 +1550,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -1626,7 +1626,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -1702,7 +1702,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -1780,7 +1780,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ diff --git a/packages/core/cairo_alpha/src/account.test.ts.snap b/packages/core/cairo_alpha/src/account.test.ts.snap index 2ba8df589..14c333009 100644 Binary files a/packages/core/cairo_alpha/src/account.test.ts.snap and b/packages/core/cairo_alpha/src/account.test.ts.snap differ diff --git a/packages/core/cairo_alpha/src/contract.test.ts.md b/packages/core/cairo_alpha/src/contract.test.ts.md index f63d27858..cceeaf6d8 100644 --- a/packages/core/cairo_alpha/src/contract.test.ts.md +++ b/packages/core/cairo_alpha/src/contract.test.ts.md @@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod Foo {␊ @@ -24,7 +24,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod Foo {␊ @@ -44,7 +44,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod Foo {␊ @@ -64,7 +64,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod Foo {␊ @@ -89,7 +89,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod Foo {␊ @@ -114,7 +114,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod Foo {␊ @@ -154,7 +154,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod Foo {␊ @@ -195,7 +195,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod Foo {␊ diff --git a/packages/core/cairo_alpha/src/contract.test.ts.snap b/packages/core/cairo_alpha/src/contract.test.ts.snap index a3420dcfc..609cb4b97 100644 Binary files a/packages/core/cairo_alpha/src/contract.test.ts.snap and b/packages/core/cairo_alpha/src/contract.test.ts.snap differ diff --git a/packages/core/cairo_alpha/src/custom.test.ts.md b/packages/core/cairo_alpha/src/custom.test.ts.md index 43832e49d..6b28d0889 100644 --- a/packages/core/cairo_alpha/src/custom.test.ts.md +++ b/packages/core/cairo_alpha/src/custom.test.ts.md @@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyContract {␊ @@ -24,7 +24,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyContract {␊ @@ -85,7 +85,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyContract {␊ @@ -171,7 +171,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyContract {␊ @@ -232,7 +232,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyContract {␊ @@ -247,7 +247,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyContract {␊ @@ -308,7 +308,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊ ␊ @@ -385,7 +385,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyContract {␊ diff --git a/packages/core/cairo_alpha/src/custom.test.ts.snap b/packages/core/cairo_alpha/src/custom.test.ts.snap index 083886c4b..3c21f8b4d 100644 Binary files a/packages/core/cairo_alpha/src/custom.test.ts.snap and b/packages/core/cairo_alpha/src/custom.test.ts.snap differ diff --git a/packages/core/cairo_alpha/src/erc1155.test.ts.md b/packages/core/cairo_alpha/src/erc1155.test.ts.md index 4cd926ed1..c3d702658 100644 --- a/packages/core/cairo_alpha/src/erc1155.test.ts.md +++ b/packages/core/cairo_alpha/src/erc1155.test.ts.md @@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -81,7 +81,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -173,7 +173,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ const URI_SETTER_ROLE: felt252 = selector!("URI_SETTER_ROLE");␊ const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊ @@ -280,7 +280,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -357,7 +357,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -482,7 +482,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -608,7 +608,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -735,7 +735,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ const MINTER_ROLE: felt252 = selector!("MINTER_ROLE");␊ const URI_SETTER_ROLE: felt252 = selector!("URI_SETTER_ROLE");␊ @@ -880,7 +880,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -972,7 +972,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -1082,7 +1082,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ const URI_SETTER_ROLE: felt252 = selector!("URI_SETTER_ROLE");␊ const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊ @@ -1206,7 +1206,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -1320,7 +1320,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ const URI_SETTER_ROLE: felt252 = selector!("URI_SETTER_ROLE");␊ const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊ @@ -1448,7 +1448,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ const PAUSER_ROLE: felt252 = selector!("PAUSER_ROLE");␊ const MINTER_ROLE: felt252 = selector!("MINTER_ROLE");␊ @@ -1657,7 +1657,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ const PAUSER_ROLE: felt252 = selector!("PAUSER_ROLE");␊ const MINTER_ROLE: felt252 = selector!("MINTER_ROLE");␊ diff --git a/packages/core/cairo_alpha/src/erc1155.test.ts.snap b/packages/core/cairo_alpha/src/erc1155.test.ts.snap index f19bfd177..858979987 100644 Binary files a/packages/core/cairo_alpha/src/erc1155.test.ts.snap and b/packages/core/cairo_alpha/src/erc1155.test.ts.snap differ diff --git a/packages/core/cairo_alpha/src/erc20.test.ts.md b/packages/core/cairo_alpha/src/erc20.test.ts.md index 4e893cdc1..aa09913c2 100644 --- a/packages/core/cairo_alpha/src/erc20.test.ts.md +++ b/packages/core/cairo_alpha/src/erc20.test.ts.md @@ -9,11 +9,11 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ - use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊ + use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊ ␊ component!(path: ERC20Component, storage: erc20, event: ERC20Event);␊ ␊ @@ -49,12 +49,12 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ - use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊ + use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊ use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ @@ -120,12 +120,12 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ - use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊ + use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊ use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress, get_caller_address};␊ @@ -200,13 +200,13 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ use openzeppelin::security::pausable::PausableComponent;␊ - use openzeppelin::token::erc20::ERC20Component;␊ + use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊ use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ @@ -308,7 +308,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ const PAUSER_ROLE: felt252 = selector!("PAUSER_ROLE");␊ const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊ @@ -318,7 +318,7 @@ Generated by [AVA](https://avajs.dev). use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::security::pausable::PausableComponent;␊ - use openzeppelin::token::erc20::ERC20Component;␊ + use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊ use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ @@ -435,13 +435,13 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ use openzeppelin::security::pausable::PausableComponent;␊ - use openzeppelin::token::erc20::ERC20Component;␊ + use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊ use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress, get_caller_address};␊ @@ -548,12 +548,12 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ - use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊ + use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊ use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ @@ -621,12 +621,12 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ - use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊ + use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊ use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ @@ -692,12 +692,12 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ - use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊ + use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊ use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ @@ -773,7 +773,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ const MINTER_ROLE: felt252 = selector!("MINTER_ROLE");␊ const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊ @@ -782,7 +782,7 @@ Generated by [AVA](https://avajs.dev). mod MyToken {␊ use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊ + use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊ use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ @@ -873,13 +873,13 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ use openzeppelin::governance::votes::VotesComponent;␊ - use openzeppelin::token::erc20::ERC20Component;␊ + use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊ use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊ @@ -988,13 +988,13 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ use openzeppelin::governance::votes::VotesComponent;␊ - use openzeppelin::token::erc20::ERC20Component;␊ + use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊ use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊ @@ -1103,12 +1103,12 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::governance::votes::VotesComponent;␊ - use openzeppelin::token::erc20::ERC20Component;␊ + use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊ use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊ use openzeppelin::utils::cryptography::snip12::SNIP12Metadata;␊ ␊ @@ -1187,14 +1187,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ use openzeppelin::governance::votes::VotesComponent;␊ use openzeppelin::security::pausable::PausableComponent;␊ - use openzeppelin::token::erc20::ERC20Component;␊ + use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊ use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊ use openzeppelin::utils::cryptography::snip12::SNIP12Metadata;␊ use starknet::{ContractAddress, get_caller_address};␊ @@ -1330,14 +1330,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ use openzeppelin::governance::votes::VotesComponent;␊ use openzeppelin::security::pausable::PausableComponent;␊ - use openzeppelin::token::erc20::ERC20Component;␊ + use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊ use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊ @@ -1493,7 +1493,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ const PAUSER_ROLE: felt252 = selector!("PAUSER_ROLE");␊ const MINTER_ROLE: felt252 = selector!("MINTER_ROLE");␊ @@ -1505,7 +1505,7 @@ Generated by [AVA](https://avajs.dev). use openzeppelin::governance::votes::VotesComponent;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::security::pausable::PausableComponent;␊ - use openzeppelin::token::erc20::ERC20Component;␊ + use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊ use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊ diff --git a/packages/core/cairo_alpha/src/erc20.test.ts.snap b/packages/core/cairo_alpha/src/erc20.test.ts.snap index 56f59692d..acee16115 100644 Binary files a/packages/core/cairo_alpha/src/erc20.test.ts.snap and b/packages/core/cairo_alpha/src/erc20.test.ts.snap differ diff --git a/packages/core/cairo_alpha/src/erc20.ts b/packages/core/cairo_alpha/src/erc20.ts index e780f48ad..626f3b3df 100644 --- a/packages/core/cairo_alpha/src/erc20.ts +++ b/packages/core/cairo_alpha/src/erc20.ts @@ -182,6 +182,7 @@ function addERC20Mixin(c: ContractBuilder) { } function addBase(c: ContractBuilder, name: string, symbol: string) { + c.addUseClause('openzeppelin::token::erc20', 'DefaultConfig'); c.addComponent(components.ERC20Component, [name, symbol], true); } diff --git a/packages/core/cairo_alpha/src/erc721.test.ts.md b/packages/core/cairo_alpha/src/erc721.test.ts.md index 10bf3a1b0..25a261219 100644 --- a/packages/core/cairo_alpha/src/erc721.test.ts.md +++ b/packages/core/cairo_alpha/src/erc721.test.ts.md @@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -55,7 +55,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -132,7 +132,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -209,7 +209,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -296,7 +296,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -410,7 +410,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -512,7 +512,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -611,7 +611,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -736,7 +736,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ const MINTER_ROLE: felt252 = selector!("MINTER_ROLE");␊ const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊ @@ -853,7 +853,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -930,7 +930,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -1025,7 +1025,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊ ␊ @@ -1131,7 +1131,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -1230,7 +1230,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊ ␊ @@ -1340,7 +1340,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -1524,7 +1524,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -1646,7 +1646,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -1768,7 +1768,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -1860,7 +1860,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyToken {␊ diff --git a/packages/core/cairo_alpha/src/erc721.test.ts.snap b/packages/core/cairo_alpha/src/erc721.test.ts.snap index e9b6a8e3b..843b18d5e 100644 Binary files a/packages/core/cairo_alpha/src/erc721.test.ts.snap and b/packages/core/cairo_alpha/src/erc721.test.ts.snap differ diff --git a/packages/core/cairo_alpha/src/governor.test.ts.md b/packages/core/cairo_alpha/src/governor.test.ts.md index 5aa18348d..da61a0043 100644 --- a/packages/core/cairo_alpha/src/governor.test.ts.md +++ b/packages/core/cairo_alpha/src/governor.test.ts.md @@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyGovernor {␊ @@ -151,7 +151,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyGovernor {␊ @@ -269,7 +269,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyGovernor {␊ @@ -411,7 +411,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyGovernor {␊ @@ -553,7 +553,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod CustomGovernor {␊ @@ -695,7 +695,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyGovernor {␊ @@ -837,7 +837,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyGovernor {␊ @@ -988,7 +988,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyGovernor {␊ @@ -1130,7 +1130,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyGovernor {␊ @@ -1272,7 +1272,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyGovernor {␊ diff --git a/packages/core/cairo_alpha/src/governor.test.ts.snap b/packages/core/cairo_alpha/src/governor.test.ts.snap index b71cfde7e..83673fb46 100644 Binary files a/packages/core/cairo_alpha/src/governor.test.ts.snap and b/packages/core/cairo_alpha/src/governor.test.ts.snap differ diff --git a/packages/core/cairo_alpha/src/utils/version.ts b/packages/core/cairo_alpha/src/utils/version.ts index 834e23e38..f50b35b6f 100644 --- a/packages/core/cairo_alpha/src/utils/version.ts +++ b/packages/core/cairo_alpha/src/utils/version.ts @@ -1,17 +1,17 @@ /** * The actual latest version to use in links. */ -export const contractsVersion = '2.0.0-alpha'; +export const contractsVersion = '2.0.0-alpha.0'; export const contractsVersionTag = `v${contractsVersion}`; /** * Cairo compiler versions. */ export const edition = '2024_07'; -export const cairoVersion = '2.9.4'; -export const scarbVersion = '2.9.4'; +export const cairoVersion = '2.11.2'; +export const scarbVersion = '2.11.3'; /** * Semantic version string representing of the minimum compatible version of Contracts to display in output. */ -export const compatibleContractsSemver = '^2.0.0-alpha'; +export const compatibleContractsSemver = '^2.0.0-alpha.0'; diff --git a/packages/core/cairo_alpha/src/vesting.test.ts.md b/packages/core/cairo_alpha/src/vesting.test.ts.md index 6980954e8..3ef4b7769 100644 --- a/packages/core/cairo_alpha/src/vesting.test.ts.md +++ b/packages/core/cairo_alpha/src/vesting.test.ts.md @@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod CustomVesting {␊ @@ -64,7 +64,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyVesting {␊ @@ -119,7 +119,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyVesting {␊ @@ -174,7 +174,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyVesting {␊ @@ -229,7 +229,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyVesting {␊ @@ -299,7 +299,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha␊ + // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0-alpha.0␊ ␊ #[starknet::contract]␊ mod MyVesting {␊ diff --git a/packages/core/cairo_alpha/src/vesting.test.ts.snap b/packages/core/cairo_alpha/src/vesting.test.ts.snap index ad93317d2..40f3e7013 100644 Binary files a/packages/core/cairo_alpha/src/vesting.test.ts.snap and b/packages/core/cairo_alpha/src/vesting.test.ts.snap differ diff --git a/packages/core/cairo_alpha/test_project/Scarb.lock b/packages/core/cairo_alpha/test_project/Scarb.lock index f4fd0c5c8..7862b674c 100644 --- a/packages/core/cairo_alpha/test_project/Scarb.lock +++ b/packages/core/cairo_alpha/test_project/Scarb.lock @@ -3,9 +3,8 @@ version = 1 [[package]] name = "openzeppelin" -version = "1.0.0" -source = "registry+https://scarbs.xyz/" -checksum = "sha256:320185f3e17cf9fafda88b1ce490f5eaed0bfcc273036b56cd22ce4fb8de628f" +version = "2.0.0-alpha.0" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v2.0.0-alpha.0#bc66fb75b9d9f118d8951ae1afcd71cf2b54102b" dependencies = [ "openzeppelin_access", "openzeppelin_account", @@ -22,19 +21,16 @@ dependencies = [ [[package]] name = "openzeppelin_access" -version = "1.0.0" -source = "registry+https://scarbs.xyz/" -checksum = "sha256:a39a4ea1582916c637bf7e3aee0832c3fe1ea3a3e39191955e8dc39d08327f9b" +version = "2.0.0-alpha.0" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v2.0.0-alpha.0#bc66fb75b9d9f118d8951ae1afcd71cf2b54102b" dependencies = [ "openzeppelin_introspection", - "openzeppelin_utils", ] [[package]] name = "openzeppelin_account" -version = "1.0.0" -source = "registry+https://scarbs.xyz/" -checksum = "sha256:7e943a2de32ddca4d48e467e52790e380ab1f49c4daddbbbc4634dd930d0243f" +version = "2.0.0-alpha.0" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v2.0.0-alpha.0#bc66fb75b9d9f118d8951ae1afcd71cf2b54102b" dependencies = [ "openzeppelin_introspection", "openzeppelin_utils", @@ -42,9 +38,8 @@ dependencies = [ [[package]] name = "openzeppelin_finance" -version = "1.0.0" -source = "registry+https://scarbs.xyz/" -checksum = "sha256:9fa9e91d39b6ccdfa31eef32fdc087cd06c0269cc9c6b86e32d57f5a6997d98b" +version = "2.0.0-alpha.0" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v2.0.0-alpha.0#bc66fb75b9d9f118d8951ae1afcd71cf2b54102b" dependencies = [ "openzeppelin_access", "openzeppelin_token", @@ -52,9 +47,8 @@ dependencies = [ [[package]] name = "openzeppelin_governance" -version = "1.0.0" -source = "registry+https://scarbs.xyz/" -checksum = "sha256:c05add2974b3193c3a5c022b9586a84cf98c5970cdb884dcf201c77dbe359f55" +version = "2.0.0-alpha.0" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v2.0.0-alpha.0#bc66fb75b9d9f118d8951ae1afcd71cf2b54102b" dependencies = [ "openzeppelin_access", "openzeppelin_account", @@ -65,21 +59,18 @@ dependencies = [ [[package]] name = "openzeppelin_introspection" -version = "1.0.0" -source = "registry+https://scarbs.xyz/" -checksum = "sha256:34e088ecf19e0b3012481a29f1fbb20e600540cb9a5db1c3002a97ebb7f5a32a" +version = "2.0.0-alpha.0" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v2.0.0-alpha.0#bc66fb75b9d9f118d8951ae1afcd71cf2b54102b" [[package]] name = "openzeppelin_merkle_tree" -version = "1.0.0" -source = "registry+https://scarbs.xyz/" -checksum = "sha256:a5341705514a3d9beeeb39cf11464111f7355be621639740d2c5006786aa63dc" +version = "2.0.0-alpha.0" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v2.0.0-alpha.0#bc66fb75b9d9f118d8951ae1afcd71cf2b54102b" [[package]] name = "openzeppelin_presets" -version = "1.0.0" -source = "registry+https://scarbs.xyz/" -checksum = "sha256:4eb098e2ee3ac0e67b6828115a7de62f781418beab767d4e80b54e176808369d" +version = "2.0.0-alpha.0" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v2.0.0-alpha.0#bc66fb75b9d9f118d8951ae1afcd71cf2b54102b" dependencies = [ "openzeppelin_access", "openzeppelin_account", @@ -92,15 +83,13 @@ dependencies = [ [[package]] name = "openzeppelin_security" -version = "1.0.0" -source = "registry+https://scarbs.xyz/" -checksum = "sha256:1deb811a239c4f9cc28fc302039e2ffcb19911698a8c612487207448d70d2e6e" +version = "2.0.0-alpha.0" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v2.0.0-alpha.0#bc66fb75b9d9f118d8951ae1afcd71cf2b54102b" [[package]] name = "openzeppelin_token" -version = "1.0.0" -source = "registry+https://scarbs.xyz/" -checksum = "sha256:33fcb84a1a76d2d3fff9302094ff564f78d45b743548fd7568c130b272473f66" +version = "2.0.0-alpha.0" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v2.0.0-alpha.0#bc66fb75b9d9f118d8951ae1afcd71cf2b54102b" dependencies = [ "openzeppelin_access", "openzeppelin_account", @@ -110,15 +99,13 @@ dependencies = [ [[package]] name = "openzeppelin_upgrades" -version = "1.0.0" -source = "registry+https://scarbs.xyz/" -checksum = "sha256:36f7a03e7e7111577916aacf31f88ad0053de20f33ee10b0ab3804849c3aa373" +version = "2.0.0-alpha.0" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v2.0.0-alpha.0#bc66fb75b9d9f118d8951ae1afcd71cf2b54102b" [[package]] name = "openzeppelin_utils" -version = "1.0.0" -source = "registry+https://scarbs.xyz/" -checksum = "sha256:fd348b31c4a4407add33adc3c2b8f26dca71dbd7431faaf726168f37a91db0c1" +version = "2.0.0-alpha.0" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v2.0.0-alpha.0#bc66fb75b9d9f118d8951ae1afcd71cf2b54102b" [[package]] name = "test_project" diff --git a/packages/core/cairo_alpha/test_project/Scarb.toml b/packages/core/cairo_alpha/test_project/Scarb.toml index d444d13d1..3865ff53a 100644 --- a/packages/core/cairo_alpha/test_project/Scarb.toml +++ b/packages/core/cairo_alpha/test_project/Scarb.toml @@ -2,12 +2,12 @@ name = "test_project" version = "0.1.0" edition = "2024_07" -cairo-version = "2.9.4" -scarb-version = "2.9.4" +cairo-version = "2.11.2" +scarb-version = "2.11.3" [dependencies] -starknet = "2.9.4" -openzeppelin = "1.0.0" +starknet = "2.11.2" +openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts", tag = "v2.0.0-alpha.0" } [lib] diff --git a/packages/ui/src/cairo_alpha/ERC721Controls.svelte b/packages/ui/src/cairo_alpha/ERC721Controls.svelte index c00b9a898..0e04def0c 100644 --- a/packages/ui/src/cairo_alpha/ERC721Controls.svelte +++ b/packages/ui/src/cairo_alpha/ERC721Controls.svelte @@ -17,7 +17,7 @@ royaltyInfo: { ...erc721.defaults.royaltyInfo }, // copy fields info: { ...infoDefaults }, // create new object since Info is nested }; - + export let errors: undefined | OptionsErrorMessages; $: requireAccessControl = erc721.isAccessControlRequired(opts);