Bump cairo to 0.14.0 (#369)

Co-authored-by: Eric Lau <[email protected]>
OpenZeppelin · Jun 20, 2024 · 43e8849 · 43e8849
1 parent 5ddbf45
commit 43e8849
Show file tree

Hide file tree

Showing 22 changed files with 172 additions and 160 deletions.
diff --git a/packages/core-cairo/CHANGELOG.md b/packages/core-cairo/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.14.0 (2024-06-20)
+
+- **Breaking changes**:
+  - Use OpenZeppelin Contracts for Cairo v0.14.0. ([#369](https://github.com/OpenZeppelin/contracts-wizard/pull/369))
+  - Fix compile error with ERC1155 Burnable.
+
 ## 0.13.0 (2024-05-22)
 
 - **Breaking changes**:

diff --git a/packages/core-cairo/package.json b/packages/core-cairo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/wizard-cairo",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "A boilerplate generator to get started with OpenZeppelin Contracts for Cairo",
   "license": "MIT",
   "repository": "github:OpenZeppelin/contracts-wizard",

diff --git a/packages/core-cairo/src/add-pausable.ts b/packages/core-cairo/src/add-pausable.ts
@@ -44,15 +44,15 @@ const functions = defineFunctions({
       getSelfArg(),
     ],
     code: [
-      'self.pausable._pause()'
+      'self.pausable.pause()'
     ]
   },
   unpause: {
     args: [
       getSelfArg(),
     ],
     code: [
-      'self.pausable._unpause()'
+      'self.pausable.unpause()'
     ]
   },
 });

diff --git a/packages/core-cairo/src/contract.test.ts.md b/packages/core-cairo/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 ^0.13.0␊
+    // Compatible with OpenZeppelin Contracts for Cairo ^0.14.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 ^0.13.0␊
+    // Compatible with OpenZeppelin Contracts for Cairo ^0.14.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 ^0.13.0␊
+    // Compatible with OpenZeppelin Contracts for Cairo ^0.14.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 ^0.13.0␊
+    // Compatible with OpenZeppelin Contracts for Cairo ^0.14.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 ^0.13.0␊
+    // Compatible with OpenZeppelin Contracts for Cairo ^0.14.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 ^0.13.0␊
+    // Compatible with OpenZeppelin Contracts for Cairo ^0.14.0␊
     ␊
     #[starknet::contract]␊
     mod Foo {␊
@@ -152,7 +152,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
+    // Compatible with OpenZeppelin Contracts for Cairo ^0.14.0␊
     ␊
     #[starknet::contract]␊
     mod Foo {␊

diff --git a/packages/core-cairo/src/contract.test.ts.snap b/packages/core-cairo/src/contract.test.ts.snap
diff --git a/packages/core-cairo/src/contract.ts b/packages/core-cairo/src/contract.ts
@@ -131,7 +131,7 @@ export class ContractBuilder implements Contract {
     const key = component.name;
     const present = this.componentsMap.has(key);
     if (!present) {
-      const initializer = initializable ? { params } : undefined;  
+      const initializer = initializable ? { params } : undefined;
       const cp: Component = { initializer, ...component, impls: [ ...component.impls ] }; // spread impls to deep copy from original component
       this.componentsMap.set(key, cp);
     }

diff --git a/packages/core-cairo/src/custom.test.ts.md b/packages/core-cairo/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 ^0.13.0␊
+    // Compatible with OpenZeppelin Contracts for Cairo ^0.14.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 ^0.13.0␊
+    // Compatible with OpenZeppelin Contracts for Cairo ^0.14.0␊
     ␊
     #[starknet::contract]␊
     mod MyContract {␊
@@ -69,7 +69,7 @@ Generated by [AVA](https://avajs.dev).
         impl UpgradeableImpl of IUpgradeable<ContractState> {␊
             fn upgrade(ref self: ContractState, new_class_hash: ClassHash) {␊
                 self.ownable.assert_only_owner();␊
-                self.upgradeable._upgrade(new_class_hash);␊
+                self.upgradeable.upgrade(new_class_hash);␊
             }␊
         }␊
     }␊
@@ -80,7 +80,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
+    // Compatible with OpenZeppelin Contracts for Cairo ^0.14.0␊
     ␊
     #[starknet::contract]␊
     mod MyContract {␊
@@ -134,7 +134,7 @@ Generated by [AVA](https://avajs.dev).
         impl UpgradeableImpl of IUpgradeable<ContractState> {␊
             fn upgrade(ref self: ContractState, new_class_hash: ClassHash) {␊
                 self.ownable.assert_only_owner();␊
-                self.upgradeable._upgrade(new_class_hash);␊
+                self.upgradeable.upgrade(new_class_hash);␊
             }␊
         }␊
     ␊
@@ -144,13 +144,13 @@ Generated by [AVA](https://avajs.dev).
             #[external(v0)]␊
             fn pause(ref self: ContractState) {␊
                 self.ownable.assert_only_owner();␊
-                self.pausable._pause();␊
+                self.pausable.pause();␊
             }␊
     ␊
             #[external(v0)]␊
             fn unpause(ref self: ContractState) {␊
                 self.ownable.assert_only_owner();␊
-                self.pausable._unpause();␊
+                self.pausable.unpause();␊
             }␊
         }␊
     }␊
@@ -161,7 +161,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
+    // Compatible with OpenZeppelin Contracts for Cairo ^0.14.0␊
     ␊
     #[starknet::contract]␊
     mod MyContract {␊
@@ -206,7 +206,7 @@ Generated by [AVA](https://avajs.dev).
         impl UpgradeableImpl of IUpgradeable<ContractState> {␊
             fn upgrade(ref self: ContractState, new_class_hash: ClassHash) {␊
                 self.ownable.assert_only_owner();␊
-                self.upgradeable._upgrade(new_class_hash);␊
+                self.upgradeable.upgrade(new_class_hash);␊
             }␊
         }␊
     }␊
@@ -217,7 +217,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
+    // Compatible with OpenZeppelin Contracts for Cairo ^0.14.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 ^0.13.0␊
+    // Compatible with OpenZeppelin Contracts for Cairo ^0.14.0␊
     ␊
     #[starknet::contract]␊
     mod MyContract {␊
@@ -277,7 +277,7 @@ Generated by [AVA](https://avajs.dev).
         impl UpgradeableImpl of IUpgradeable<ContractState> {␊
             fn upgrade(ref self: ContractState, new_class_hash: ClassHash) {␊
                 self.ownable.assert_only_owner();␊
-                self.upgradeable._upgrade(new_class_hash);␊
+                self.upgradeable.upgrade(new_class_hash);␊
             }␊
         }␊
     }␊
@@ -288,7 +288,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
+    // Compatible with OpenZeppelin Contracts for Cairo ^0.14.0␊
     ␊
     const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊
     ␊
@@ -350,7 +350,7 @@ Generated by [AVA](https://avajs.dev).
         impl UpgradeableImpl of IUpgradeable<ContractState> {␊
             fn upgrade(ref self: ContractState, new_class_hash: ClassHash) {␊
                 self.accesscontrol.assert_only_role(UPGRADER_ROLE);␊
-                self.upgradeable._upgrade(new_class_hash);␊
+                self.upgradeable.upgrade(new_class_hash);␊
             }␊
         }␊
     }␊
@@ -361,7 +361,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
+    // Compatible with OpenZeppelin Contracts for Cairo ^0.14.0␊
     ␊
     #[starknet::contract]␊
     mod MyContract {␊
@@ -408,13 +408,13 @@ Generated by [AVA](https://avajs.dev).
             #[external(v0)]␊
             fn pause(ref self: ContractState) {␊
                 self.ownable.assert_only_owner();␊
-                self.pausable._pause();␊
+                self.pausable.pause();␊
             }␊
     ␊
             #[external(v0)]␊
             fn unpause(ref self: ContractState) {␊
                 self.ownable.assert_only_owner();␊
-                self.pausable._unpause();␊
+                self.pausable.unpause();␊
             }␊
         }␊
     }␊

diff --git a/packages/core-cairo/src/custom.test.ts.snap b/packages/core-cairo/src/custom.test.ts.snap