Skip to content

Support Contracts for Cairo v0.13.0, use hooks with ERC721/1155 and Pausable #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericglau merged 11 commits into from
May 22, 2024
Merged

Support Contracts for Cairo v0.13.0, use hooks with ERC721/1155 and Pausable #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e06d685
Add empty hooks
ericglau May 17, 2024
b54db93
Update erc721 burn to use _check_authorized
ericglau May 17, 2024
2b0c1a2
Use pausable in hooks WIP
ericglau May 21, 2024
a35ae98
Use pausable in hooks WIP
ericglau May 21, 2024
1d939d0
Use votes and pausable hook in erc20
ericglau May 21, 2024
a48653e
Simplify burn functions
ericglau May 21, 2024
34b6cc3
Update snapshots
ericglau May 21, 2024
714c6d2
Update versions, update changelog
ericglau May 21, 2024
25d046d
Remove unused
ericglau May 21, 2024
8f3375f
Update version in snapshots
ericglau May 21, 2024
ac71f88
Update changelog
ericglau May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions packages/core-cairo/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## 0.13.0 (2024-05-22)

- **Breaking changes**:
- Use OpenZeppelin Contracts for Cairo v0.13.0. ([#359](https://github.com/OpenZeppelin/contracts-wizard/pull/359))
- Use Hooks with ERC721 and ERC1155.
- Use Hooks for Pausable.

## 0.12.0 (2024-05-01)

- Add `votes` option to ERC20. ([#355](https://github.com/OpenZeppelin/contracts-wizard/pull/355))
Expand Down
2 changes: 1 addition & 1 deletion packages/core-cairo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@openzeppelin/wizard-cairo",
"version": "0.12.0",
"version": "0.13.0",
"description": "A boilerplate generator to get started with OpenZeppelin Contracts for Cairo",
"license": "MIT",
"repository": "github:OpenZeppelin/contracts-wizard",
Expand Down
5 changes: 1 addition & 4 deletions packages/core-cairo/src/add-pausable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getSelfArg } from './common-options';
import type { BaseImplementedTrait, ContractBuilder, ContractFunction } from './contract';
import type { ContractBuilder } from './contract';
import { Access, requireAccessControl } from './set-access-control';
import { defineFunctions } from './utils/define-functions';
import { defineComponents } from './utils/define-components';
Expand Down Expand Up @@ -57,6 +57,3 @@ const functions = defineFunctions({
},
});

export function setPausable(c: ContractBuilder, t: BaseImplementedTrait, fn: ContractFunction) {
c.addFunctionCodeBefore(t, fn, 'self.pausable.assert_not_paused()');
}
14 changes: 7 additions & 7 deletions packages/core-cairo/src/contract.test.ts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.12.0␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
␊
#[starknet::contract]␊
mod Foo {␊
Expand All @@ -24,7 +24,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.12.0␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
␊
#[starknet::contract]␊
mod Foo {␊
Expand All @@ -44,7 +44,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.12.0␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
␊
#[starknet::contract]␊
mod Foo {␊
Expand All @@ -64,7 +64,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.12.0␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
␊
#[starknet::contract]␊
mod Foo {␊
Expand All @@ -89,7 +89,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.12.0␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
␊
#[starknet::contract]␊
mod Foo {␊
Expand All @@ -114,7 +114,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.12.0␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
␊
#[starknet::contract]␊
mod Foo {␊
Expand Down Expand Up @@ -152,7 +152,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.12.0␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
␊
#[starknet::contract]␊
mod Foo {␊
Expand Down
Binary file modified packages/core-cairo/src/contract.test.ts.snap
View file
Open in desktop
Binary file not shown.
16 changes: 8 additions & 8 deletions packages/core-cairo/src/custom.test.ts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.12.0␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
␊
#[starknet::contract]␊
mod MyContract {␊
Expand All @@ -24,7 +24,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.12.0␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
␊
#[starknet::contract]␊
mod MyContract {␊
Expand Down Expand Up @@ -80,7 +80,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.12.0␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
␊
#[starknet::contract]␊
mod MyContract {␊
Expand Down Expand Up @@ -161,7 +161,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.12.0␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
␊
#[starknet::contract]␊
mod MyContract {␊
Expand Down Expand Up @@ -217,7 +217,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.12.0␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
␊
#[starknet::contract]␊
mod MyContract {␊
Expand All @@ -232,7 +232,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.12.0␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
␊
#[starknet::contract]␊
mod MyContract {␊
Expand Down Expand Up @@ -288,7 +288,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.12.0␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
␊
const UPGRADER_ROLE: felt252 = selector!("UPGRADER_ROLE");␊
␊
Expand Down Expand Up @@ -361,7 +361,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.12.0␊
// Compatible with OpenZeppelin Contracts for Cairo ^0.13.0␊
␊
#[starknet::contract]␊
mod MyContract {␊
Expand Down
Binary file modified packages/core-cairo/src/custom.test.ts.snap
View file
Open in desktop
Binary file not shown.
Loading