diff --git a/packages/core/cairo_alpha/CHANGELOG.md b/packages/core/cairo_alpha/CHANGELOG.md index bf511c6bf..1c46b74cd 100644 --- a/packages/core/cairo_alpha/CHANGELOG.md +++ b/packages/core/cairo_alpha/CHANGELOG.md @@ -3,6 +3,7 @@ ## Unreleased - **Breaking changes**: + - Use OpenZeppelin Contracts for Cairo v3.0.0-alpha.1. ([#638](https://github.com/OpenZeppelin/contracts-wizard/pull/638)) - 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) diff --git a/packages/core/cairo_alpha/src/account.test.ts.md b/packages/core/cairo_alpha/src/account.test.ts.md index 140fb25ce..cc7eca0bc 100644 --- a/packages/core/cairo_alpha/src/account.test.ts.md +++ b/packages/core/cairo_alpha/src/account.test.ts.md @@ -9,14 +9,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::AccountComponent;␊ use openzeppelin::account::extensions::SRC9Component;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ @@ -86,7 +86,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -142,14 +142,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::AccountComponent;␊ use openzeppelin::account::extensions::SRC9Component;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ @@ -219,7 +219,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -275,13 +275,13 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::AccountComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ @@ -346,7 +346,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ @@ -396,14 +396,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::AccountComponent;␊ use openzeppelin::account::extensions::SRC9Component;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ @@ -477,13 +477,13 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::AccountComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ @@ -550,13 +550,13 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::AccountComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ @@ -623,13 +623,13 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::AccountComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ @@ -698,13 +698,13 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::AccountComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ @@ -773,13 +773,13 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::AccountComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ @@ -850,13 +850,13 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::AccountComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ @@ -927,15 +927,15 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::eth_account::EthAccountComponent;␊ use openzeppelin::account::extensions::SRC9Component;␊ - use openzeppelin::account::interface::EthPublicKey;␊ + use openzeppelin::interfaces::accounts::EthPublicKey;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ @@ -1005,13 +1005,13 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::eth_account::EthAccountComponent;␊ use openzeppelin::account::extensions::SRC9Component;␊ - use openzeppelin::account::interface::EthPublicKey;␊ + use openzeppelin::interfaces::accounts::EthPublicKey;␊ use openzeppelin::introspection::src5::SRC5Component;␊ ␊ component!(path: EthAccountComponent, storage: eth_account, event: EthAccountEvent);␊ @@ -1062,15 +1062,15 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::eth_account::EthAccountComponent;␊ use openzeppelin::account::extensions::SRC9Component;␊ - use openzeppelin::account::interface::EthPublicKey;␊ + use openzeppelin::interfaces::accounts::EthPublicKey;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ @@ -1140,13 +1140,13 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::eth_account::EthAccountComponent;␊ use openzeppelin::account::extensions::SRC9Component;␊ - use openzeppelin::account::interface::EthPublicKey;␊ + use openzeppelin::interfaces::accounts::EthPublicKey;␊ use openzeppelin::introspection::src5::SRC5Component;␊ ␊ component!(path: EthAccountComponent, storage: eth_account, event: EthAccountEvent);␊ @@ -1197,14 +1197,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::eth_account::EthAccountComponent;␊ - use openzeppelin::account::interface::EthPublicKey;␊ + use openzeppelin::interfaces::accounts::EthPublicKey;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ @@ -1269,12 +1269,12 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::eth_account::EthAccountComponent;␊ - use openzeppelin::account::interface::EthPublicKey;␊ + use openzeppelin::interfaces::accounts::EthPublicKey;␊ use openzeppelin::introspection::src5::SRC5Component;␊ ␊ component!(path: EthAccountComponent, storage: eth_account, event: EthAccountEvent);␊ @@ -1320,15 +1320,15 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::eth_account::EthAccountComponent;␊ use openzeppelin::account::extensions::SRC9Component;␊ - use openzeppelin::account::interface::EthPublicKey;␊ + use openzeppelin::interfaces::accounts::EthPublicKey;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ @@ -1402,14 +1402,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::eth_account::EthAccountComponent;␊ - use openzeppelin::account::interface::EthPublicKey;␊ + use openzeppelin::interfaces::accounts::EthPublicKey;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ @@ -1476,14 +1476,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::eth_account::EthAccountComponent;␊ - use openzeppelin::account::interface::EthPublicKey;␊ + use openzeppelin::interfaces::accounts::EthPublicKey;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ @@ -1550,14 +1550,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::eth_account::EthAccountComponent;␊ - use openzeppelin::account::interface::EthPublicKey;␊ + use openzeppelin::interfaces::accounts::EthPublicKey;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ @@ -1626,14 +1626,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::eth_account::EthAccountComponent;␊ - use openzeppelin::account::interface::EthPublicKey;␊ + use openzeppelin::interfaces::accounts::EthPublicKey;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ @@ -1702,14 +1702,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::eth_account::EthAccountComponent;␊ - use openzeppelin::account::interface::EthPublicKey;␊ + use openzeppelin::interfaces::accounts::EthPublicKey;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ @@ -1780,14 +1780,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract(account)]␊ mod MyAccount {␊ use openzeppelin::account::eth_account::EthAccountComponent;␊ - use openzeppelin::account::interface::EthPublicKey;␊ + use openzeppelin::interfaces::accounts::EthPublicKey;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::ClassHash;␊ ␊ diff --git a/packages/core/cairo_alpha/src/account.test.ts.snap b/packages/core/cairo_alpha/src/account.test.ts.snap index 822a79cde..28302cb54 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/account.ts b/packages/core/cairo_alpha/src/account.ts index f07293ede..10380232a 100644 --- a/packages/core/cairo_alpha/src/account.ts +++ b/packages/core/cairo_alpha/src/account.ts @@ -59,7 +59,7 @@ export function buildAccount(opts: AccountOptions): Contract { c.addComponent(components.AccountComponent, [{ lit: 'public_key' }], true); break; case 'eth': - c.addUseClause('openzeppelin::account::interface', 'EthPublicKey'); + c.addUseClause('openzeppelin::interfaces::accounts', 'EthPublicKey'); c.addConstructorArgument({ name: 'public_key', type: 'EthPublicKey' }); c.addComponent(components.EthAccountComponent, [{ lit: 'public_key' }], true); break; diff --git a/packages/core/cairo_alpha/src/contract.test.ts.md b/packages/core/cairo_alpha/src/contract.test.ts.md index 0ee366499..0076ec94b 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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod Foo {␊ @@ -237,7 +237,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ // Security contact: security@example.com␊ #[starknet::contract]␊ diff --git a/packages/core/cairo_alpha/src/contract.test.ts.snap b/packages/core/cairo_alpha/src/contract.test.ts.snap index 93f8ba017..f84bebe0d 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 bf5351d34..568cb6351 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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyContract {␊ @@ -24,12 +24,12 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyContract {␊ use openzeppelin::access::ownable::OwnableComponent;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -85,13 +85,13 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyContract {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::security::pausable::PausableComponent;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -171,12 +171,12 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyContract {␊ use openzeppelin::access::ownable::OwnableComponent;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -232,7 +232,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyContract {␊ @@ -247,12 +247,12 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyContract {␊ use openzeppelin::access::ownable::OwnableComponent;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -308,15 +308,15 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊ ␊ #[starknet::contract]␊ mod MyContract {␊ use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ use super::UPGRADER_ROLE;␊ @@ -385,7 +385,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[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 d269ba9ff..40cae1e65 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 b0caea4f7..90a8ca7a3 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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -81,14 +81,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::erc1155::{ERC1155Component, ERC1155HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -173,7 +173,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ const URI_SETTER_ROLE: felt252 = selector!("URI_SETTER_ROLE");␊ const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊ @@ -181,9 +181,9 @@ Generated by [AVA](https://avajs.dev). #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::erc1155::{ERC1155Component, ERC1155HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ use super::{UPGRADER_ROLE, URI_SETTER_ROLE};␊ @@ -282,14 +282,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::erc1155::{ERC1155Component, ERC1155HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -359,14 +359,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::erc1155::{ERC1155Component, ERC1155HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress, get_caller_address};␊ ␊ @@ -484,15 +484,15 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::security::pausable::PausableComponent;␊ use openzeppelin::token::erc1155::ERC1155Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -610,14 +610,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::erc1155::{ERC1155Component, ERC1155HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -737,7 +737,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ const MINTER_ROLE: felt252 = selector!("MINTER_ROLE");␊ const URI_SETTER_ROLE: felt252 = selector!("URI_SETTER_ROLE");␊ @@ -746,9 +746,9 @@ Generated by [AVA](https://avajs.dev). #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::erc1155::{ERC1155Component, ERC1155HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ use super::{MINTER_ROLE, UPGRADER_ROLE, URI_SETTER_ROLE};␊ @@ -884,14 +884,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::erc1155::{ERC1155Component, ERC1155HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -976,15 +976,15 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::common::erc2981::{DefaultConfig, ERC2981Component};␊ use openzeppelin::token::erc1155::{ERC1155Component, ERC1155HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -1086,7 +1086,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ const URI_SETTER_ROLE: felt252 = selector!("URI_SETTER_ROLE");␊ const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊ @@ -1094,10 +1094,10 @@ Generated by [AVA](https://avajs.dev). #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::common::erc2981::{DefaultConfig, ERC2981Component};␊ use openzeppelin::token::erc1155::{ERC1155Component, ERC1155HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ use super::{UPGRADER_ROLE, URI_SETTER_ROLE};␊ @@ -1212,15 +1212,15 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::common::erc2981::ERC2981Component;␊ use openzeppelin::token::erc1155::{ERC1155Component, ERC1155HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -1326,7 +1326,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ const URI_SETTER_ROLE: felt252 = selector!("URI_SETTER_ROLE");␊ const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊ @@ -1334,10 +1334,10 @@ Generated by [AVA](https://avajs.dev). #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::common::erc2981::ERC2981Component;␊ use openzeppelin::token::erc1155::{ERC1155Component, ERC1155HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ use super::{UPGRADER_ROLE, URI_SETTER_ROLE};␊ @@ -1456,7 +1456,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ const PAUSER_ROLE: felt252 = selector!("PAUSER_ROLE");␊ const MINTER_ROLE: felt252 = selector!("MINTER_ROLE");␊ @@ -1667,7 +1667,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ const PAUSER_ROLE: felt252 = selector!("PAUSER_ROLE");␊ const MINTER_ROLE: felt252 = selector!("MINTER_ROLE");␊ @@ -1677,11 +1677,11 @@ Generated by [AVA](https://avajs.dev). #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::security::pausable::PausableComponent;␊ use openzeppelin::token::common::erc2981::{DefaultConfig, ERC2981Component};␊ use openzeppelin::token::erc1155::ERC1155Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress, get_caller_address};␊ use super::{MINTER_ROLE, PAUSER_ROLE, UPGRADER_ROLE, URI_SETTER_ROLE};␊ diff --git a/packages/core/cairo_alpha/src/erc1155.test.ts.snap b/packages/core/cairo_alpha/src/erc1155.test.ts.snap index d8e7bd195..ba78dd92a 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 d5b7cf408..fcba39f5b 100644 --- a/packages/core/cairo_alpha/src/erc20.test.ts.md +++ b/packages/core/cairo_alpha/src/erc20.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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -49,13 +49,13 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -120,13 +120,13 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress, get_caller_address};␊ ␊ @@ -200,14 +200,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::security::pausable::PausableComponent;␊ 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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ const PAUSER_ROLE: felt252 = selector!("PAUSER_ROLE");␊ const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊ @@ -316,10 +316,10 @@ Generated by [AVA](https://avajs.dev). #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::security::pausable::PausableComponent;␊ use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ use super::{PAUSER_ROLE, UPGRADER_ROLE};␊ @@ -435,14 +435,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::security::pausable::PausableComponent;␊ use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress, get_caller_address};␊ ␊ @@ -548,13 +548,13 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -621,13 +621,13 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -692,13 +692,13 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ 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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ const MINTER_ROLE: felt252 = selector!("MINTER_ROLE");␊ const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊ @@ -781,9 +781,9 @@ Generated by [AVA](https://avajs.dev). #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ use super::{MINTER_ROLE, UPGRADER_ROLE};␊ @@ -873,14 +873,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ use openzeppelin::governance::votes::VotesComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::contract_clock::ERC6372TimestampClock;␊ use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊ @@ -989,14 +989,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ use openzeppelin::governance::votes::VotesComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::contract_clock::ERC6372TimestampClock;␊ use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊ @@ -1105,7 +1105,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -1191,7 +1191,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -1335,15 +1335,15 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ use openzeppelin::governance::votes::VotesComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::security::pausable::PausableComponent;␊ use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::contract_clock::ERC6372TimestampClock;␊ use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊ @@ -1499,7 +1499,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ const PAUSER_ROLE: felt252 = selector!("PAUSER_ROLE");␊ const MINTER_ROLE: felt252 = selector!("MINTER_ROLE");␊ @@ -1509,10 +1509,10 @@ Generated by [AVA](https://avajs.dev). mod MyToken {␊ use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊ use openzeppelin::governance::votes::VotesComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::security::pausable::PausableComponent;␊ use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::contract_clock::ERC6372TimestampClock;␊ 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 5ee61e71d..0d07d10ca 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/erc721.test.ts.md b/packages/core/cairo_alpha/src/erc721.test.ts.md index 92add384d..50be6ab63 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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -55,14 +55,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::erc721::{ERC721Component, ERC721HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -132,14 +132,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::erc721::{ERC721Component, ERC721HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -209,15 +209,15 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use core::num::traits::Zero;␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::erc721::{ERC721Component, ERC721HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress, get_caller_address};␊ ␊ @@ -296,15 +296,15 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::security::pausable::PausableComponent;␊ use openzeppelin::token::erc721::ERC721Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -410,14 +410,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::erc721::{ERC721Component, ERC721HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -512,15 +512,15 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::erc721::ERC721Component;␊ use openzeppelin::token::erc721::extensions::ERC721EnumerableComponent;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -611,16 +611,16 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::security::pausable::PausableComponent;␊ use openzeppelin::token::erc721::ERC721Component;␊ use openzeppelin::token::erc721::extensions::ERC721EnumerableComponent;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -736,7 +736,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ const MINTER_ROLE: felt252 = selector!("MINTER_ROLE");␊ const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊ @@ -744,9 +744,9 @@ Generated by [AVA](https://avajs.dev). #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::erc721::{ERC721Component, ERC721HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ use super::{MINTER_ROLE, UPGRADER_ROLE};␊ @@ -855,14 +855,14 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::erc721::{ERC721Component, ERC721HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -932,15 +932,15 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::common::erc2981::{DefaultConfig, ERC2981Component};␊ use openzeppelin::token::erc721::{ERC721Component, ERC721HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -1027,17 +1027,17 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::common::erc2981::{DefaultConfig, ERC2981Component};␊ use openzeppelin::token::erc721::{ERC721Component, ERC721HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ use super::UPGRADER_ROLE;␊ @@ -1135,15 +1135,15 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::common::erc2981::ERC2981Component;␊ use openzeppelin::token::erc721::{ERC721Component, ERC721HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -1234,17 +1234,17 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::common::erc2981::ERC2981Component;␊ use openzeppelin::token::erc721::{ERC721Component, ERC721HooksEmptyImpl};␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ use super::UPGRADER_ROLE;␊ @@ -1346,7 +1346,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -1531,15 +1531,15 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ use openzeppelin::governance::votes::VotesComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::erc721::ERC721Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::contract_clock::ERC6372TimestampClock;␊ use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊ @@ -1654,15 +1654,15 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use openzeppelin::access::ownable::OwnableComponent;␊ use openzeppelin::governance::votes::VotesComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::token::erc721::ERC721Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::contract_clock::ERC6372TimestampClock;␊ use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊ @@ -1777,7 +1777,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ @@ -1870,19 +1870,19 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyToken {␊ use core::num::traits::Zero;␊ use openzeppelin::access::ownable::OwnableComponent;␊ use openzeppelin::governance::votes::VotesComponent;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ use openzeppelin::security::pausable::PausableComponent;␊ use openzeppelin::token::common::erc2981::{DefaultConfig, ERC2981Component};␊ use openzeppelin::token::erc721::ERC721Component;␊ use openzeppelin::token::erc721::extensions::ERC721EnumerableComponent;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::contract_clock::ERC6372TimestampClock;␊ use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊ diff --git a/packages/core/cairo_alpha/src/erc721.test.ts.snap b/packages/core/cairo_alpha/src/erc721.test.ts.snap index 29874d6a2..5036886f9 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 8951311ea..f0160117f 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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyGovernor {␊ @@ -24,8 +24,8 @@ Generated by [AVA](https://avajs.dev). use openzeppelin::governance::governor::GovernorComponent::{␊ InternalExtendedImpl, InternalTrait as GovernorInternalTrait␊ };␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::cryptography::snip12::SNIP12Metadata;␊ use starknet::{ClassHash, ContractAddress};␊ @@ -151,7 +151,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyGovernor {␊ @@ -284,8 +284,8 @@ Generated by [AVA](https://avajs.dev). use openzeppelin::governance::governor::GovernorComponent::{␊ InternalExtendedImpl, InternalTrait as GovernorInternalTrait␊ };␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::cryptography::snip12::SNIP12Metadata;␊ use starknet::{ClassHash, ContractAddress};␊ @@ -411,7 +411,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyGovernor {␊ @@ -426,8 +426,8 @@ Generated by [AVA](https://avajs.dev). use openzeppelin::governance::governor::GovernorComponent::{␊ InternalExtendedImpl, InternalTrait as GovernorInternalTrait␊ };␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::cryptography::snip12::SNIP12Metadata;␊ use starknet::{ClassHash, ContractAddress};␊ @@ -553,7 +553,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod CustomGovernor {␊ @@ -568,8 +568,8 @@ Generated by [AVA](https://avajs.dev). use openzeppelin::governance::governor::GovernorComponent::{␊ InternalExtendedImpl, InternalTrait as GovernorInternalTrait␊ };␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::cryptography::snip12::SNIP12Metadata;␊ use starknet::{ClassHash, ContractAddress};␊ @@ -695,7 +695,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyGovernor {␊ @@ -710,8 +710,8 @@ Generated by [AVA](https://avajs.dev). use openzeppelin::governance::governor::GovernorComponent::{␊ InternalExtendedImpl, InternalTrait as GovernorInternalTrait␊ };␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::cryptography::snip12::SNIP12Metadata;␊ use starknet::{ClassHash, ContractAddress};␊ @@ -837,7 +837,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyGovernor {␊ @@ -852,8 +852,8 @@ Generated by [AVA](https://avajs.dev). use openzeppelin::governance::governor::GovernorComponent::{␊ InternalExtendedImpl, InternalTrait as GovernorInternalTrait␊ };␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::cryptography::snip12::SNIP12Metadata;␊ use starknet::{ClassHash, ContractAddress};␊ @@ -988,7 +988,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyGovernor {␊ @@ -1003,8 +1003,8 @@ Generated by [AVA](https://avajs.dev). use openzeppelin::governance::governor::GovernorComponent::{␊ InternalExtendedImpl, InternalTrait as GovernorInternalTrait␊ };␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::cryptography::snip12::SNIP12Metadata;␊ use starknet::{ClassHash, ContractAddress};␊ @@ -1130,7 +1130,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyGovernor {␊ @@ -1145,8 +1145,8 @@ Generated by [AVA](https://avajs.dev). use openzeppelin::governance::governor::GovernorComponent::{␊ InternalExtendedImpl, InternalTrait as GovernorInternalTrait␊ };␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::cryptography::snip12::SNIP12Metadata;␊ use starknet::{ClassHash, ContractAddress};␊ @@ -1272,7 +1272,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyGovernor {␊ @@ -1287,8 +1287,8 @@ Generated by [AVA](https://avajs.dev). use openzeppelin::governance::governor::GovernorComponent::{␊ InternalExtendedImpl, InternalTrait as GovernorInternalTrait␊ };␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::introspection::src5::SRC5Component;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use openzeppelin::utils::cryptography::snip12::SNIP12Metadata;␊ use starknet::{ClassHash, ContractAddress};␊ diff --git a/packages/core/cairo_alpha/src/governor.test.ts.snap b/packages/core/cairo_alpha/src/governor.test.ts.snap index 00106c90a..a72676333 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/multisig.test.ts.md b/packages/core/cairo_alpha/src/multisig.test.ts.md index f9eae3abb..f264673d6 100644 --- a/packages/core/cairo_alpha/src/multisig.test.ts.md +++ b/packages/core/cairo_alpha/src/multisig.test.ts.md @@ -9,12 +9,12 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod CustomMultisig {␊ use openzeppelin::governance::multisig::MultisigComponent;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -72,12 +72,12 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyMultisig {␊ use openzeppelin::governance::multisig::MultisigComponent;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -135,12 +135,12 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod CustomMultisig {␊ use openzeppelin::governance::multisig::MultisigComponent;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -198,12 +198,12 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyMultisig {␊ use openzeppelin::governance::multisig::MultisigComponent;␊ - use openzeppelin::upgrades::interface::IUpgradeable;␊ + use openzeppelin::interfaces::upgrades::IUpgradeable;␊ use openzeppelin::upgrades::UpgradeableComponent;␊ use starknet::{ClassHash, ContractAddress};␊ ␊ @@ -261,7 +261,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[starknet::contract]␊ mod MyMultisig {␊ diff --git a/packages/core/cairo_alpha/src/multisig.test.ts.snap b/packages/core/cairo_alpha/src/multisig.test.ts.snap index fdbc6a4e5..cbc9e00dc 100644 Binary files a/packages/core/cairo_alpha/src/multisig.test.ts.snap and b/packages/core/cairo_alpha/src/multisig.test.ts.snap differ diff --git a/packages/core/cairo_alpha/src/scripts/update-scarb-project.ts b/packages/core/cairo_alpha/src/scripts/update-scarb-project.ts index 107c810f7..ae4db934d 100644 --- a/packages/core/cairo_alpha/src/scripts/update-scarb-project.ts +++ b/packages/core/cairo_alpha/src/scripts/update-scarb-project.ts @@ -60,16 +60,22 @@ async function writeLibCairo(contractNames: string[]) { } async function updateScarbToml() { + console.log('Updating Scarb.toml...'); const scarbTomlPath = path.join('test_project', 'Scarb.toml'); const currentContent = await fs.readFile(scarbTomlPath, 'utf8'); - const updatedContent = currentContent + + // Update the version numbers from the version.ts file + let updatedContent = currentContent .replace(/edition = "\w+"/, `edition = "${edition}"`) .replace(/cairo-version = "\d+\.\d+\.\d+"/, `cairo-version = "${cairoVersion}"`) .replace(/scarb-version = "\d+\.\d+\.\d+"/, `scarb-version = "${scarbVersion}"`) .replace(/starknet = "\d+\.\d+\.\d+"/, `starknet = "${cairoVersion}"`) .replace(/openzeppelin = "\d+\.\d+\.\d+"/, `openzeppelin = "${contractsVersion}"`); + // In alphas, we add dependencies directly from the Github repo, and not from the registry. + updatedContent = updatedContent.replace(/(openzeppelin = {[^}]*tag = )"[^"]+"/, `$1"v${contractsVersion}"`); + await fs.writeFile(scarbTomlPath, updatedContent, 'utf8'); } diff --git a/packages/core/cairo_alpha/src/set-upgradeable.ts b/packages/core/cairo_alpha/src/set-upgradeable.ts index 59c363e61..43566983e 100644 --- a/packages/core/cairo_alpha/src/set-upgradeable.ts +++ b/packages/core/cairo_alpha/src/set-upgradeable.ts @@ -19,7 +19,7 @@ function setUpgradeableBase(c: ContractBuilder, upgradeable: Upgradeable): BaseI c.addComponent(components.UpgradeableComponent, [], false); - c.addUseClause('openzeppelin::upgrades::interface', 'IUpgradeable'); + c.addUseClause('openzeppelin::interfaces::upgrades', 'IUpgradeable'); c.addUseClause('starknet', 'ClassHash'); const t: BaseImplementedTrait = { diff --git a/packages/core/cairo_alpha/src/utils/version.ts b/packages/core/cairo_alpha/src/utils/version.ts index 055f13865..6772256ed 100644 --- a/packages/core/cairo_alpha/src/utils/version.ts +++ b/packages/core/cairo_alpha/src/utils/version.ts @@ -1,7 +1,7 @@ /** * The actual latest version to use in links. */ -export const contractsVersion = '3.0.0-alpha.0'; +export const contractsVersion = '3.0.0-alpha.1'; export const contractsVersionTag = `v${contractsVersion}`; /** @@ -16,4 +16,4 @@ export const scarbVersion = '2.12.0'; * If this targets a stable version, it should use a range (e.g. ^2.0.0) * If this targets an alpha version, it should be pinned to the exact version (e.g. not using ^) */ -export const compatibleContractsSemver = '3.0.0-alpha.0'; +export const compatibleContractsSemver = '3.0.0-alpha.1'; diff --git a/packages/core/cairo_alpha/src/vesting.test.ts.md b/packages/core/cairo_alpha/src/vesting.test.ts.md index 65c666705..f3e9422fc 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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[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 3.0.0-alpha.0␊ + // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊ ␊ #[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 c54d15576..e4854b472 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 e414131c9..81247383f 100644 --- a/packages/core/cairo_alpha/test_project/Scarb.lock +++ b/packages/core/cairo_alpha/test_project/Scarb.lock @@ -3,13 +3,14 @@ version = 1 [[package]] name = "openzeppelin" -version = "3.0.0-alpha.0" -source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.0#8023c19f0235b702d9d1729937690a655a98fb59" +version = "3.0.0-alpha.1" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.1#a03e01e56113c00a2ec473d580d40043c5d2db6f" dependencies = [ "openzeppelin_access", "openzeppelin_account", "openzeppelin_finance", "openzeppelin_governance", + "openzeppelin_interfaces", "openzeppelin_introspection", "openzeppelin_merkle_tree", "openzeppelin_presets", @@ -21,60 +22,73 @@ dependencies = [ [[package]] name = "openzeppelin_access" -version = "3.0.0-alpha.0" -source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.0#8023c19f0235b702d9d1729937690a655a98fb59" +version = "3.0.0-alpha.1" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.1#a03e01e56113c00a2ec473d580d40043c5d2db6f" dependencies = [ + "openzeppelin_interfaces", "openzeppelin_introspection", ] [[package]] name = "openzeppelin_account" -version = "3.0.0-alpha.0" -source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.0#8023c19f0235b702d9d1729937690a655a98fb59" +version = "3.0.0-alpha.1" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.1#a03e01e56113c00a2ec473d580d40043c5d2db6f" dependencies = [ + "openzeppelin_interfaces", "openzeppelin_introspection", "openzeppelin_utils", ] [[package]] name = "openzeppelin_finance" -version = "3.0.0-alpha.0" -source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.0#8023c19f0235b702d9d1729937690a655a98fb59" +version = "3.0.0-alpha.1" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.1#a03e01e56113c00a2ec473d580d40043c5d2db6f" dependencies = [ "openzeppelin_access", + "openzeppelin_interfaces", "openzeppelin_token", ] [[package]] name = "openzeppelin_governance" -version = "3.0.0-alpha.0" -source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.0#8023c19f0235b702d9d1729937690a655a98fb59" +version = "3.0.0-alpha.1" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.1#a03e01e56113c00a2ec473d580d40043c5d2db6f" dependencies = [ "openzeppelin_access", "openzeppelin_account", + "openzeppelin_interfaces", "openzeppelin_introspection", "openzeppelin_token", "openzeppelin_utils", ] +[[package]] +name = "openzeppelin_interfaces" +version = "2.1.0" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.1#a03e01e56113c00a2ec473d580d40043c5d2db6f" + [[package]] name = "openzeppelin_introspection" -version = "3.0.0-alpha.0" -source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.0#8023c19f0235b702d9d1729937690a655a98fb59" +version = "3.0.0-alpha.1" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.1#a03e01e56113c00a2ec473d580d40043c5d2db6f" +dependencies = [ + "openzeppelin_interfaces", +] [[package]] name = "openzeppelin_merkle_tree" -version = "3.0.0-alpha.0" -source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.0#8023c19f0235b702d9d1729937690a655a98fb59" +version = "3.0.0-alpha.1" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.1#a03e01e56113c00a2ec473d580d40043c5d2db6f" [[package]] name = "openzeppelin_presets" -version = "3.0.0-alpha.0" -source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.0#8023c19f0235b702d9d1729937690a655a98fb59" +version = "3.0.0-alpha.1" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.1#a03e01e56113c00a2ec473d580d40043c5d2db6f" dependencies = [ "openzeppelin_access", "openzeppelin_account", "openzeppelin_finance", + "openzeppelin_interfaces", "openzeppelin_introspection", "openzeppelin_token", "openzeppelin_upgrades", @@ -83,33 +97,41 @@ dependencies = [ [[package]] name = "openzeppelin_security" -version = "3.0.0-alpha.0" -source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.0#8023c19f0235b702d9d1729937690a655a98fb59" +version = "3.0.0-alpha.1" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.1#a03e01e56113c00a2ec473d580d40043c5d2db6f" +dependencies = [ + "openzeppelin_interfaces", +] [[package]] name = "openzeppelin_token" -version = "3.0.0-alpha.0" -source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.0#8023c19f0235b702d9d1729937690a655a98fb59" +version = "3.0.0-alpha.1" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.1#a03e01e56113c00a2ec473d580d40043c5d2db6f" dependencies = [ "openzeppelin_access", "openzeppelin_account", + "openzeppelin_interfaces", "openzeppelin_introspection", "openzeppelin_utils", ] [[package]] name = "openzeppelin_upgrades" -version = "3.0.0-alpha.0" -source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.0#8023c19f0235b702d9d1729937690a655a98fb59" +version = "3.0.0-alpha.1" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.1#a03e01e56113c00a2ec473d580d40043c5d2db6f" [[package]] name = "openzeppelin_utils" -version = "3.0.0-alpha.0" -source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.0#8023c19f0235b702d9d1729937690a655a98fb59" +version = "3.0.0-alpha.1" +source = "git+https://github.com/OpenZeppelin/cairo-contracts?tag=v3.0.0-alpha.1#a03e01e56113c00a2ec473d580d40043c5d2db6f" +dependencies = [ + "openzeppelin_interfaces", +] [[package]] name = "test_project" version = "0.1.0" dependencies = [ "openzeppelin", + "openzeppelin_interfaces", ] diff --git a/packages/core/cairo_alpha/test_project/Scarb.toml b/packages/core/cairo_alpha/test_project/Scarb.toml index b9d4d943c..feb00b2ed 100644 --- a/packages/core/cairo_alpha/test_project/Scarb.toml +++ b/packages/core/cairo_alpha/test_project/Scarb.toml @@ -7,7 +7,7 @@ scarb-version = "2.12.0" [dependencies] starknet = "2.12.0" -openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts", tag = "v3.0.0-alpha.0" } +openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts", tag = "v3.0.0-alpha.1" } [lib]