Skip to content

chore: upgrade openzeppelin dep #291

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

Open
bal7hazar wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore: upgrade openzeppelin dep #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a9d729
chore: upgrade openzeppelin dep
bal7hazar Mar 2, 2026
d362e2f
Merge branch 'main' into chore/upgrade-deps
bal7hazar Mar 4, 2026
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
72 changes: 46 additions & 26 deletions Scarb.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,15 @@ dependencies = [

[[package]]
name = "openzeppelin"
version = "2.0.0"
version = "3.0.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:5e4fdecc957cfca7854d95912dc72d9f725517c063b116512900900add29fd77"
checksum = "sha256:ded6f53e0b50a3583f72c556d9ca508e627d175c6f01a2f5124f2e9a052ac985"
dependencies = [
"openzeppelin_access",
"openzeppelin_account",
"openzeppelin_finance",
"openzeppelin_governance",
"openzeppelin_interfaces",
"openzeppelin_introspection",
"openzeppelin_merkle_tree",
"openzeppelin_presets",
Expand All @@ -113,67 +114,80 @@ dependencies = [

[[package]]
name = "openzeppelin_access"
version = "2.0.0"
version = "3.0.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:511681dd26d814ee2bc996d44ff8cb4aaa5ae9d14272130def7eb901cf004850"
checksum = "sha256:2c7fab22d2601fca4f456c81272637f2563a423652d1671383bbe3d007803977"
dependencies = [
"openzeppelin_interfaces",
"openzeppelin_introspection",
]

[[package]]
name = "openzeppelin_account"
version = "2.0.0"
version = "3.0.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:fb3381c50d68b028d3801feb43df378e2bd62137b6884844f8f60aefe796188b"
checksum = "sha256:b46f41be21fff6692d32949664d2f0dd1919c741346a676d6e0f1fe2ea576999"
dependencies = [
"openzeppelin_interfaces",
"openzeppelin_introspection",
"openzeppelin_utils",
]

[[package]]
name = "openzeppelin_finance"
version = "2.0.0"
version = "3.0.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:e9456ef69502a87c4c99bf50145351b50950f8b11244847d92935c466c4ba787"
checksum = "sha256:f77f4f5262666d8033f16b3a7df839ed2abb699a09ad33099c7bb6bf2807fec1"
dependencies = [
"openzeppelin_access",
"openzeppelin_interfaces",
"openzeppelin_token",
]

[[package]]
name = "openzeppelin_governance"
version = "2.0.0"
version = "3.0.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:056e6d6f3d48193b53f06283884f8a9675f986fc85425f6a40e8c1aeb3b3ecfa"
checksum = "sha256:b76c87f72b1481a62e3c6904a9a3da5cfc4de8b5a86a4742de30f1e2984c7e2b"
dependencies = [
"openzeppelin_access",
"openzeppelin_account",
"openzeppelin_interfaces",
"openzeppelin_introspection",
"openzeppelin_token",
"openzeppelin_utils",
]

[[package]]
name = "openzeppelin_interfaces"
version = "2.1.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:f69fdb36eb894a0e0732385e723c5ff56d8cb4c1d49b29446c77eefac00b02a5"

[[package]]
name = "openzeppelin_introspection"
version = "2.0.0"
version = "3.0.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:87773ed6cd2318f169283ecbbb161890d1996260a80302d81ec45b70ee5e54c1"
checksum = "sha256:ee491981a69736cde220f8b7dd290b6d8620c85ee6b83c81f665f5bef78b62b1"
dependencies = [
"openzeppelin_interfaces",
]

[[package]]
name = "openzeppelin_merkle_tree"
version = "2.0.0"
version = "3.0.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:47f80c9ce59557774243214f8e75c5e866f30f3d8daa755855f6ffd01c89ca89"
checksum = "sha256:3417680a1f672bd6cfb54962481f6b96d72f6510be2658d17c8356709b5c950a"

[[package]]
name = "openzeppelin_presets"
version = "2.0.0"
version = "3.0.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:36c761ee923f1dc0887c0eab8c224b49ac242dbfe9163fbb0b08562042ab3d98"
checksum = "sha256:1facc433476df1c36ecb33e3a10b6a5fb219c670c437b43696788843fbc0bc25"
dependencies = [
"openzeppelin_access",
"openzeppelin_account",
"openzeppelin_finance",
"openzeppelin_interfaces",
"openzeppelin_introspection",
"openzeppelin_token",
"openzeppelin_upgrades",
Expand All @@ -182,33 +196,39 @@ dependencies = [

[[package]]
name = "openzeppelin_security"
version = "2.0.0"
version = "3.0.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:902932ec296c2f400e0ac7c579edeaafd6067b6ce6d9854c1191de28e396ffe3"
checksum = "sha256:470f2debae50e03f1435874bc697a0825c257edcad4d1a0cc134e40360e6aba8"
dependencies = [
"openzeppelin_interfaces",
]

[[package]]
name = "openzeppelin_token"
version = "2.0.0"
version = "3.0.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:6fe61f63b5a6706018265fb7373b6e5bd3ff829bdc760b2b90296b1e708d180c"
checksum = "sha256:5ce19d297251d9f11acc38a3e3e2faeb2e73b003c8de2f02c7c5d06d9161a5fc"
dependencies = [
"openzeppelin_access",
"openzeppelin_account",
"openzeppelin_interfaces",
"openzeppelin_introspection",
"openzeppelin_utils",
]

[[package]]
name = "openzeppelin_upgrades"
version = "2.0.0"
version = "3.0.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:560d57a9c3f3ec5a476e82fec8963c93c8df63a4ff9ff134f64ab8383bde3c61"
checksum = "sha256:1b148d5da1ae90a056b455e8865260423c5491a82777377abfdc68fd8e7d0675"

[[package]]
name = "openzeppelin_utils"
version = "2.0.0"
version = "2.1.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:bf799c794139837f397975ffdf6a7ed5032d198bbf70e87a8f44f144a9dfc505"
checksum = "sha256:4d5504fef1c5a6d9fee6a3ae392004a4a24b4b3ccb790c5e5217da96beb73e08"
dependencies = [
"openzeppelin_interfaces",
]

[[package]]
name = "orderbook"
Expand Down
2 changes: 1 addition & 1 deletion Scarb.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ cairo-version = "2.13.1"
dojo = "1.8.0"
dojo_cairo_test = "1.8.0"
graffiti = { git = "https://github.com/bal7hazar/graffiti.git", rev = "e8b0854" }
openzeppelin = "2.0.0"
openzeppelin = "3.0.0"
starknet = "2.13.1"
cairo_test = "2.13.1"

Expand Down
6 changes: 3 additions & 3 deletions contracts/src/systems/registry.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ pub mod Registry {

// External imports

use openzeppelin::introspection::interface::{ISRC5Dispatcher, ISRC5DispatcherTrait};
use openzeppelin::token::erc1155::interface::IERC1155_ID;
use openzeppelin::token::erc721::interface::IERC721_ID;
use openzeppelin::interfaces::introspection::{ISRC5Dispatcher, ISRC5DispatcherTrait};
use openzeppelin::interfaces::token::erc1155::IERC1155_ID;
use openzeppelin::interfaces::token::erc721::IERC721_ID;

// Component imports

Expand Down
4 changes: 2 additions & 2 deletions contracts/src/tests/mocks/collection.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ pub mod Collection {
use collection::interface::{CollectionTrait, MinterDispatcher, MinterDispatcherTrait};
use collection::types::contract_metadata::ContractMetadata;
use openzeppelin::access::ownable::OwnableComponent;
use openzeppelin::interfaces::token::erc721::IERC721Metadata;
use openzeppelin::interfaces::upgrades::IUpgradeable;
use openzeppelin::introspection::src5::SRC5Component;
use openzeppelin::token::erc721::interface::IERC721Metadata;
use openzeppelin::token::erc721::{ERC721Component, ERC721HooksEmptyImpl};
use openzeppelin::upgrades::UpgradeableComponent;
use openzeppelin::upgrades::interface::IUpgradeable;
use starknet::ContractAddress;

component!(path: UpgradeableComponent, storage: upgradeable, event: UpgradeableEvent);
Expand Down
4 changes: 2 additions & 2 deletions packages/collection/src/collection.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ pub mod Collection {
use collection::interface::{CollectionTrait, MinterDispatcher, MinterDispatcherTrait};
use collection::types::contract_metadata::ContractMetadata;
use openzeppelin::access::ownable::OwnableComponent;
use openzeppelin::interfaces::token::erc721::IERC721Metadata;
use openzeppelin::interfaces::upgrades::IUpgradeable;
use openzeppelin::introspection::src5::SRC5Component;
use openzeppelin::token::erc721::interface::IERC721Metadata;
use openzeppelin::token::erc721::{ERC721Component, ERC721HooksEmptyImpl};
use openzeppelin::upgrades::UpgradeableComponent;
use openzeppelin::upgrades::interface::IUpgradeable;
use starknet::ContractAddress;

component!(path: UpgradeableComponent, storage: upgradeable, event: UpgradeableEvent);
Expand Down
14 changes: 7 additions & 7 deletions packages/orderbook/src/components/verifiable.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ pub mod VerifiableComponent {

// External imports

use openzeppelin::introspection::interface::{ISRC5Dispatcher, ISRC5DispatcherTrait};
use openzeppelin::token::common::erc2981::interface::{
IERC2981Dispatcher, IERC2981DispatcherTrait, IERC2981_ID,
};
use openzeppelin::token::erc1155::interface::{
use openzeppelin::interfaces::introspection::{ISRC5Dispatcher, ISRC5DispatcherTrait};
use openzeppelin::interfaces::token::erc1155::{
IERC1155Dispatcher, IERC1155DispatcherTrait, IERC1155_ID,
};
use openzeppelin::token::erc20::interface::{IERC20Dispatcher, IERC20DispatcherTrait};
use openzeppelin::token::erc721::interface::{
use openzeppelin::interfaces::token::erc20::{IERC20Dispatcher, IERC20DispatcherTrait};
use openzeppelin::interfaces::token::erc2981::{
IERC2981Dispatcher, IERC2981DispatcherTrait, IERC2981_ID,
};
use openzeppelin::interfaces::token::erc721::{
IERC721Dispatcher, IERC721DispatcherTrait, IERC721_ID,
};
use starknet::ContractAddress;
Expand Down
4 changes: 2 additions & 2 deletions packages/orderbook/src/tests/erc1155/test_fees.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

// Internal imports

use openzeppelin::token::erc1155::interface::IERC1155DispatcherTrait;
use openzeppelin::token::erc20::interface::IERC20DispatcherTrait;
use openzeppelin::interfaces::token::erc1155::IERC1155DispatcherTrait;
use openzeppelin::interfaces::token::erc20::IERC20DispatcherTrait;
use crate::constants;

// Package imports
Expand Down
4 changes: 2 additions & 2 deletions packages/orderbook/src/tests/erc1155/test_intent_execute.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

// Internal imports

use openzeppelin::token::erc1155::interface::IERC1155DispatcherTrait;
use openzeppelin::token::erc20::interface::IERC20DispatcherTrait;
use openzeppelin::interfaces::token::erc1155::IERC1155DispatcherTrait;
use openzeppelin::interfaces::token::erc20::IERC20DispatcherTrait;
use crate::models::order::OrderAssert;

// Package imports
Expand Down
4 changes: 2 additions & 2 deletions packages/orderbook/src/tests/erc1155/test_list_cancel.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

// Internal imports

use openzeppelin::token::erc1155::interface::IERC1155DispatcherTrait;
use openzeppelin::token::erc20::interface::IERC20DispatcherTrait;
use openzeppelin::interfaces::token::erc1155::IERC1155DispatcherTrait;
use openzeppelin::interfaces::token::erc20::IERC20DispatcherTrait;
use crate::models::order::OrderAssert;

// Package imports
Expand Down
4 changes: 2 additions & 2 deletions packages/orderbook/src/tests/erc1155/test_list_execute.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

// Internal imports

use openzeppelin::token::erc1155::interface::IERC1155DispatcherTrait;
use openzeppelin::token::erc20::interface::IERC20DispatcherTrait;
use openzeppelin::interfaces::token::erc1155::IERC1155DispatcherTrait;
use openzeppelin::interfaces::token::erc20::IERC20DispatcherTrait;
use crate::models::order::OrderAssert;

// Package imports
Expand Down
4 changes: 2 additions & 2 deletions packages/orderbook/src/tests/erc1155/test_list_remove.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

// Internal imports

use openzeppelin::token::erc1155::interface::IERC1155DispatcherTrait;
use openzeppelin::token::erc20::interface::IERC20DispatcherTrait;
use openzeppelin::interfaces::token::erc1155::IERC1155DispatcherTrait;
use openzeppelin::interfaces::token::erc20::IERC20DispatcherTrait;
use crate::models::order::OrderAssert;

// Package imports
Expand Down
4 changes: 2 additions & 2 deletions packages/orderbook/src/tests/erc1155/test_offer_cancel.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

// Internal imports

use openzeppelin::token::erc1155::interface::IERC1155DispatcherTrait;
use openzeppelin::token::erc20::interface::IERC20DispatcherTrait;
use openzeppelin::interfaces::token::erc1155::IERC1155DispatcherTrait;
use openzeppelin::interfaces::token::erc20::IERC20DispatcherTrait;
use crate::models::order::OrderAssert;

// Package imports
Expand Down
4 changes: 2 additions & 2 deletions packages/orderbook/src/tests/erc1155/test_offer_execute.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

// Internal imports

use openzeppelin::token::erc1155::interface::IERC1155DispatcherTrait;
use openzeppelin::token::erc20::interface::IERC20DispatcherTrait;
use openzeppelin::interfaces::token::erc1155::IERC1155DispatcherTrait;
use openzeppelin::interfaces::token::erc20::IERC20DispatcherTrait;
use crate::models::order::OrderAssert;

// Package imports
Expand Down
4 changes: 2 additions & 2 deletions packages/orderbook/src/tests/erc1155/test_offer_remove.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

// Internal imports

use openzeppelin::token::erc1155::interface::IERC1155DispatcherTrait;
use openzeppelin::token::erc20::interface::IERC20DispatcherTrait;
use openzeppelin::interfaces::token::erc1155::IERC1155DispatcherTrait;
use openzeppelin::interfaces::token::erc20::IERC20DispatcherTrait;
use crate::models::order::OrderAssert;

// Package imports
Expand Down
4 changes: 2 additions & 2 deletions packages/orderbook/src/tests/erc721/test_fees.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

// Internal imports

use openzeppelin::token::erc20::interface::IERC20DispatcherTrait;
use openzeppelin::token::erc721::interface::IERC721DispatcherTrait;
use openzeppelin::interfaces::token::erc20::IERC20DispatcherTrait;
use openzeppelin::interfaces::token::erc721::IERC721DispatcherTrait;
use crate::constants;

// Package imports
Expand Down
4 changes: 2 additions & 2 deletions packages/orderbook/src/tests/erc721/test_intent_execute.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

// Internal imports

use openzeppelin::token::erc20::interface::IERC20DispatcherTrait;
use openzeppelin::token::erc721::interface::IERC721DispatcherTrait;
use openzeppelin::interfaces::token::erc20::IERC20DispatcherTrait;
use openzeppelin::interfaces::token::erc721::IERC721DispatcherTrait;
use crate::models::order::OrderAssert;

// Package imports
Expand Down
4 changes: 2 additions & 2 deletions packages/orderbook/src/tests/erc721/test_list_cancel.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

// Internal imports

use openzeppelin::token::erc20::interface::IERC20DispatcherTrait;
use openzeppelin::token::erc721::interface::IERC721DispatcherTrait;
use openzeppelin::interfaces::token::erc20::IERC20DispatcherTrait;
use openzeppelin::interfaces::token::erc721::IERC721DispatcherTrait;
use crate::models::order::OrderAssert;

// Package imports
Expand Down
4 changes: 2 additions & 2 deletions packages/orderbook/src/tests/erc721/test_list_execute.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

// Internal imports

use openzeppelin::token::erc20::interface::IERC20DispatcherTrait;
use openzeppelin::token::erc721::interface::IERC721DispatcherTrait;
use openzeppelin::interfaces::token::erc20::IERC20DispatcherTrait;
use openzeppelin::interfaces::token::erc721::IERC721DispatcherTrait;
use crate::models::order::OrderAssert;

// Package imports
Expand Down
4 changes: 2 additions & 2 deletions packages/orderbook/src/tests/erc721/test_list_remove.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

// Internal imports

use openzeppelin::token::erc20::interface::IERC20DispatcherTrait;
use openzeppelin::token::erc721::interface::IERC721DispatcherTrait;
use openzeppelin::interfaces::token::erc20::IERC20DispatcherTrait;
use openzeppelin::interfaces::token::erc721::IERC721DispatcherTrait;
use crate::models::order::OrderAssert;

// Package imports
Expand Down
4 changes: 2 additions & 2 deletions packages/orderbook/src/tests/erc721/test_offer_cancel.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

// Internal imports

use openzeppelin::token::erc20::interface::IERC20DispatcherTrait;
use openzeppelin::token::erc721::interface::IERC721DispatcherTrait;
use openzeppelin::interfaces::token::erc20::IERC20DispatcherTrait;
use openzeppelin::interfaces::token::erc721::IERC721DispatcherTrait;
use crate::models::order::OrderAssert;

// Package imports
Expand Down
Loading