diff --git a/Scarb.lock b/Scarb.lock index ce6eae2d..f82c296d 100644 --- a/Scarb.lock +++ b/Scarb.lock @@ -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", @@ -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", @@ -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" diff --git a/Scarb.toml b/Scarb.toml index b7fedc09..c9579210 100644 --- a/Scarb.toml +++ b/Scarb.toml @@ -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" diff --git a/contracts/src/systems/registry.cairo b/contracts/src/systems/registry.cairo index 4e02b6a3..10cb3b25 100644 --- a/contracts/src/systems/registry.cairo +++ b/contracts/src/systems/registry.cairo @@ -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 diff --git a/contracts/src/tests/mocks/collection.cairo b/contracts/src/tests/mocks/collection.cairo index 6fa1b6ba..83c758af 100644 --- a/contracts/src/tests/mocks/collection.cairo +++ b/contracts/src/tests/mocks/collection.cairo @@ -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); diff --git a/packages/collection/src/collection.cairo b/packages/collection/src/collection.cairo index 6fa1b6ba..83c758af 100644 --- a/packages/collection/src/collection.cairo +++ b/packages/collection/src/collection.cairo @@ -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); diff --git a/packages/orderbook/src/components/verifiable.cairo b/packages/orderbook/src/components/verifiable.cairo index f98e088f..e4fee29f 100644 --- a/packages/orderbook/src/components/verifiable.cairo +++ b/packages/orderbook/src/components/verifiable.cairo @@ -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; diff --git a/packages/orderbook/src/tests/erc1155/test_fees.cairo b/packages/orderbook/src/tests/erc1155/test_fees.cairo index b371c26c..4529b027 100644 --- a/packages/orderbook/src/tests/erc1155/test_fees.cairo +++ b/packages/orderbook/src/tests/erc1155/test_fees.cairo @@ -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 diff --git a/packages/orderbook/src/tests/erc1155/test_intent_execute.cairo b/packages/orderbook/src/tests/erc1155/test_intent_execute.cairo index 4ba39ab4..b01f1838 100644 --- a/packages/orderbook/src/tests/erc1155/test_intent_execute.cairo +++ b/packages/orderbook/src/tests/erc1155/test_intent_execute.cairo @@ -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 diff --git a/packages/orderbook/src/tests/erc1155/test_list_cancel.cairo b/packages/orderbook/src/tests/erc1155/test_list_cancel.cairo index 4b39fe0d..4d661e87 100644 --- a/packages/orderbook/src/tests/erc1155/test_list_cancel.cairo +++ b/packages/orderbook/src/tests/erc1155/test_list_cancel.cairo @@ -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 diff --git a/packages/orderbook/src/tests/erc1155/test_list_execute.cairo b/packages/orderbook/src/tests/erc1155/test_list_execute.cairo index c916873e..4bb00c57 100644 --- a/packages/orderbook/src/tests/erc1155/test_list_execute.cairo +++ b/packages/orderbook/src/tests/erc1155/test_list_execute.cairo @@ -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 diff --git a/packages/orderbook/src/tests/erc1155/test_list_remove.cairo b/packages/orderbook/src/tests/erc1155/test_list_remove.cairo index 1798c359..2ae6911e 100644 --- a/packages/orderbook/src/tests/erc1155/test_list_remove.cairo +++ b/packages/orderbook/src/tests/erc1155/test_list_remove.cairo @@ -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 diff --git a/packages/orderbook/src/tests/erc1155/test_offer_cancel.cairo b/packages/orderbook/src/tests/erc1155/test_offer_cancel.cairo index 0d521f10..70f65fa3 100644 --- a/packages/orderbook/src/tests/erc1155/test_offer_cancel.cairo +++ b/packages/orderbook/src/tests/erc1155/test_offer_cancel.cairo @@ -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 diff --git a/packages/orderbook/src/tests/erc1155/test_offer_execute.cairo b/packages/orderbook/src/tests/erc1155/test_offer_execute.cairo index e89f6d2d..d2a493d6 100644 --- a/packages/orderbook/src/tests/erc1155/test_offer_execute.cairo +++ b/packages/orderbook/src/tests/erc1155/test_offer_execute.cairo @@ -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 diff --git a/packages/orderbook/src/tests/erc1155/test_offer_remove.cairo b/packages/orderbook/src/tests/erc1155/test_offer_remove.cairo index b2a69893..a73e14a9 100644 --- a/packages/orderbook/src/tests/erc1155/test_offer_remove.cairo +++ b/packages/orderbook/src/tests/erc1155/test_offer_remove.cairo @@ -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 diff --git a/packages/orderbook/src/tests/erc721/test_fees.cairo b/packages/orderbook/src/tests/erc721/test_fees.cairo index 640c5753..eee0a339 100644 --- a/packages/orderbook/src/tests/erc721/test_fees.cairo +++ b/packages/orderbook/src/tests/erc721/test_fees.cairo @@ -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 diff --git a/packages/orderbook/src/tests/erc721/test_intent_execute.cairo b/packages/orderbook/src/tests/erc721/test_intent_execute.cairo index 16ac572f..3b5d8f49 100644 --- a/packages/orderbook/src/tests/erc721/test_intent_execute.cairo +++ b/packages/orderbook/src/tests/erc721/test_intent_execute.cairo @@ -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 diff --git a/packages/orderbook/src/tests/erc721/test_list_cancel.cairo b/packages/orderbook/src/tests/erc721/test_list_cancel.cairo index d445584d..8d6c8eea 100644 --- a/packages/orderbook/src/tests/erc721/test_list_cancel.cairo +++ b/packages/orderbook/src/tests/erc721/test_list_cancel.cairo @@ -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 diff --git a/packages/orderbook/src/tests/erc721/test_list_execute.cairo b/packages/orderbook/src/tests/erc721/test_list_execute.cairo index e1a1b078..c71e2313 100644 --- a/packages/orderbook/src/tests/erc721/test_list_execute.cairo +++ b/packages/orderbook/src/tests/erc721/test_list_execute.cairo @@ -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 diff --git a/packages/orderbook/src/tests/erc721/test_list_remove.cairo b/packages/orderbook/src/tests/erc721/test_list_remove.cairo index 3d3dae4e..e7b5ddf6 100644 --- a/packages/orderbook/src/tests/erc721/test_list_remove.cairo +++ b/packages/orderbook/src/tests/erc721/test_list_remove.cairo @@ -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 diff --git a/packages/orderbook/src/tests/erc721/test_offer_cancel.cairo b/packages/orderbook/src/tests/erc721/test_offer_cancel.cairo index f306d986..0107a96f 100644 --- a/packages/orderbook/src/tests/erc721/test_offer_cancel.cairo +++ b/packages/orderbook/src/tests/erc721/test_offer_cancel.cairo @@ -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 diff --git a/packages/orderbook/src/tests/erc721/test_offer_execute.cairo b/packages/orderbook/src/tests/erc721/test_offer_execute.cairo index 80ae5d6e..d2225845 100644 --- a/packages/orderbook/src/tests/erc721/test_offer_execute.cairo +++ b/packages/orderbook/src/tests/erc721/test_offer_execute.cairo @@ -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 diff --git a/packages/orderbook/src/tests/erc721/test_offer_remove.cairo b/packages/orderbook/src/tests/erc721/test_offer_remove.cairo index 1dffb497..56ce76c4 100644 --- a/packages/orderbook/src/tests/erc721/test_offer_remove.cairo +++ b/packages/orderbook/src/tests/erc721/test_offer_remove.cairo @@ -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 diff --git a/packages/orderbook/src/tests/setup.cairo b/packages/orderbook/src/tests/setup.cairo index 867e2342..c907619f 100644 --- a/packages/orderbook/src/tests/setup.cairo +++ b/packages/orderbook/src/tests/setup.cairo @@ -7,9 +7,9 @@ pub mod setup { spawn_test_world, }; use models::rbac::models::index as rbac_models; - use openzeppelin::token::erc1155::interface::IERC1155Dispatcher; - use openzeppelin::token::erc20::interface::IERC20Dispatcher; - use openzeppelin::token::erc721::interface::IERC721Dispatcher; + use openzeppelin::interfaces::token::erc1155::IERC1155Dispatcher; + use openzeppelin::interfaces::token::erc20::IERC20Dispatcher; + use openzeppelin::interfaces::token::erc721::IERC721Dispatcher; use starknet::syscalls::deploy_syscall; use starknet::testing::set_contract_address; use starknet::{ContractAddress, SyscallResultTrait}; diff --git a/packages/registry/src/tests/mocks/collection.cairo b/packages/registry/src/tests/mocks/collection.cairo index 6fa1b6ba..83c758af 100644 --- a/packages/registry/src/tests/mocks/collection.cairo +++ b/packages/registry/src/tests/mocks/collection.cairo @@ -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); diff --git a/packages/starterpack/src/components/issuable.cairo b/packages/starterpack/src/components/issuable.cairo index 9481d8be..1a814018 100644 --- a/packages/starterpack/src/components/issuable.cairo +++ b/packages/starterpack/src/components/issuable.cairo @@ -6,7 +6,7 @@ pub mod IssuableComponent { // External imports - use openzeppelin::token::erc20::interface::{IERC20Dispatcher, IERC20DispatcherTrait}; + use openzeppelin::interfaces::token::erc20::{IERC20Dispatcher, IERC20DispatcherTrait}; use starknet::{ContractAddress, get_block_timestamp, get_caller_address}; // Internal imports @@ -126,10 +126,7 @@ pub mod IssuableComponent { // Use payment_receiver if set, otherwise default to owner let owner_payment = base_price - referral_fee_amount; if owner_payment > 0 { - let receiver = match starterpack.payment_receiver { - Option::Some(addr) => addr, - Option::None => starterpack.owner, - }; + let receiver = starterpack.payment_receiver.unwrap_or(starterpack.owner); token_dispatcher.transfer_from(payer, receiver, owner_payment); } } diff --git a/packages/starterpack/src/tests/setup.cairo b/packages/starterpack/src/tests/setup.cairo index 2db76d8d..1aba8dcf 100644 --- a/packages/starterpack/src/tests/setup.cairo +++ b/packages/starterpack/src/tests/setup.cairo @@ -7,7 +7,7 @@ pub mod setup { spawn_test_world, }; use models::rbac::models::index as rbac_models; - use openzeppelin::token::erc20::interface::IERC20Dispatcher; + use openzeppelin::interfaces::token::erc20::IERC20Dispatcher; use starknet::syscalls::deploy_syscall; use starknet::testing::set_contract_address; use starknet::{ContractAddress, SyscallResultTrait}; diff --git a/packages/starterpack/src/tests/test_fees.cairo b/packages/starterpack/src/tests/test_fees.cairo index 156e21fa..31fa0eeb 100644 --- a/packages/starterpack/src/tests/test_fees.cairo +++ b/packages/starterpack/src/tests/test_fees.cairo @@ -1,6 +1,6 @@ // Internal imports -use openzeppelin::token::erc20::interface::IERC20DispatcherTrait; +use openzeppelin::interfaces::token::erc20::IERC20DispatcherTrait; use starknet::testing; use crate::constants::FEE_DENOMINATOR; use crate::tests::mocks::registry::IRegistryDispatcherTrait; diff --git a/packages/starterpack/src/tests/test_issue.cairo b/packages/starterpack/src/tests/test_issue.cairo index 6204aa7d..234e0f38 100644 --- a/packages/starterpack/src/tests/test_issue.cairo +++ b/packages/starterpack/src/tests/test_issue.cairo @@ -1,6 +1,6 @@ // Internal imports -use openzeppelin::token::erc20::interface::IERC20DispatcherTrait; +use openzeppelin::interfaces::token::erc20::IERC20DispatcherTrait; use starknet::testing; use crate::models::index::{GroupReward, ReferralReward, Starterpack}; use crate::store::{