Remove dualcase SRC5 (#882)

* remove_src5_dualcase * fix * update * changelog-update * update-ERC721-class-hash * update * remove-snake-in-name * update * update * update * update * resolve-class-hash-conflict * final-update * resolve conflicts * fix
OpenZeppelin · Mar 18, 2024 · b87bb29 · b87bb29
1 parent f22438c
commit b87bb29
Show file tree

Hide file tree

Showing 25 changed files with 34 additions and 281 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -55,6 +55,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Non standard increase_allowance and decrease_allowance functions in ERC20 contract (#881)
 
+### Removed
+
+- DualCase SRC5 (#882)
+
 ## 0.8.1 (2024-01-23)
 
 ### Added

diff --git a/docs/modules/ROOT/pages/guides/src5-migration.adoc b/docs/modules/ROOT/pages/guides/src5-migration.adoc
@@ -45,8 +45,6 @@ mod MigratingContract {
     // SRC5
     #[abi(embed_v0)]
     impl SRC5Impl = SRC5Component::SRC5Impl<ContractState>;
-    #[abi(embed_v0)]
-    impl SRC5CamelOnlyImpl = SRC5Component::SRC5CamelImpl<ContractState>;
     impl SRC5InternalImpl = SRC5Component::InternalImpl<ContractState>;
 
     // Initializable

diff --git a/src/access/accesscontrol/dual_accesscontrol.cairo b/src/access/accesscontrol/dual_accesscontrol.cairo
@@ -7,6 +7,7 @@ use openzeppelin::utils::serde::SerializedAppend;
 use openzeppelin::utils::try_selector_with_fallback;
 use starknet::ContractAddress;
 use starknet::SyscallResultTrait;
+use starknet::call_contract_syscall;
 
 #[derive(Copy, Drop)]
 struct DualCaseAccessControl {
@@ -81,12 +82,7 @@ impl DualCaseAccessControlImpl of DualCaseAccessControlTrait {
         let mut args = array![];
         args.append_serde(interface_id);
 
-        try_selector_with_fallback(
-            *self.contract_address,
-            selectors::supports_interface,
-            selectors::supportsInterface,
-            args.span()
-        )
+        call_contract_syscall(*self.contract_address, selectors::supports_interface, args.span())
             .unwrap_and_cast()
     }
 }
diff --git a/src/account/account.cairo b/src/account/account.cairo
@@ -10,7 +10,7 @@ mod AccountComponent {
     use openzeppelin::account::utils::{MIN_TRANSACTION_VERSION, QUERY_VERSION, QUERY_OFFSET};
     use openzeppelin::account::utils::{execute_calls, is_valid_stark_signature};
     use openzeppelin::introspection::src5::SRC5Component::InternalTrait as SRC5InternalTrait;
-    use openzeppelin::introspection::src5::SRC5Component::{SRC5, SRC5Camel};
+    use openzeppelin::introspection::src5::SRC5Component::SRC5;
     use openzeppelin::introspection::src5::SRC5Component;
     use starknet::account::Call;
     use starknet::get_caller_address;

diff --git a/src/account/dual_account.cairo b/src/account/dual_account.cairo
@@ -7,6 +7,7 @@ use openzeppelin::utils::serde::SerializedAppend;
 use openzeppelin::utils::try_selector_with_fallback;
 use starknet::ContractAddress;
 use starknet::SyscallResultTrait;
+use starknet::call_contract_syscall;
 
 #[derive(Copy, Drop)]
 struct DualCaseAccount {
@@ -59,12 +60,7 @@ impl DualCaseAccountImpl of DualCaseAccountABI {
     fn supports_interface(self: @DualCaseAccount, interface_id: felt252) -> bool {
         let args = array![interface_id];
 
-        try_selector_with_fallback(
-            *self.contract_address,
-            selectors::supports_interface,
-            selectors::supportsInterface,
-            args.span()
-        )
+        call_contract_syscall(*self.contract_address, selectors::supports_interface, args.span())
             .unwrap_and_cast()
     }
 }
diff --git a/src/account/dual_eth_account.cairo b/src/account/dual_eth_account.cairo
@@ -9,6 +9,7 @@ use openzeppelin::utils::serde::SerializedAppend;
 use openzeppelin::utils::try_selector_with_fallback;
 use starknet::ContractAddress;
 use starknet::SyscallResultTrait;
+use starknet::call_contract_syscall;
 
 #[derive(Copy, Drop)]
 struct DualCaseEthAccount {
@@ -62,12 +63,7 @@ impl DualCaseEthAccountImpl of DualCaseEthAccountABI {
     fn supports_interface(self: @DualCaseEthAccount, interface_id: felt252) -> bool {
         let args = array![interface_id];
 
-        try_selector_with_fallback(
-            *self.contract_address,
-            selectors::supports_interface,
-            selectors::supportsInterface,
-            args.span()
-        )
+        call_contract_syscall(*self.contract_address, selectors::supports_interface, args.span())
             .unwrap_and_cast()
     }
 }
diff --git a/src/account/eth_account.cairo b/src/account/eth_account.cairo
@@ -13,7 +13,7 @@ mod EthAccountComponent {
     use openzeppelin::account::utils::{MIN_TRANSACTION_VERSION, QUERY_VERSION, QUERY_OFFSET};
     use openzeppelin::account::utils::{execute_calls, is_valid_eth_signature};
     use openzeppelin::introspection::src5::SRC5Component::InternalTrait as SRC5InternalTrait;
-    use openzeppelin::introspection::src5::SRC5Component::{SRC5, SRC5Camel};
+    use openzeppelin::introspection::src5::SRC5Component::SRC5;
     use openzeppelin::introspection::src5::SRC5Component;
     use poseidon::poseidon_hash_span;
     use starknet::SyscallResultTrait;

diff --git a/src/introspection.cairo b/src/introspection.cairo
@@ -1,3 +1,2 @@
-mod dual_src5;
 mod interface;
 mod src5;
diff --git a/src/introspection/interface.cairo b/src/introspection/interface.cairo
@@ -7,8 +7,3 @@ const ISRC5_ID: felt252 = 0x3f918d17e5ee77373b56385708f855659a07f75997f365cf8774
 trait ISRC5<TState> {
     fn supports_interface(self: @TState, interface_id: felt252) -> bool;
 }
-
-#[starknet::interface]
-trait ISRC5Camel<TState> {
-    fn supportsInterface(self: @TState, interfaceId: felt252) -> bool;
-}
diff --git a/src/introspection/src5.cairo b/src/introspection/src5.cairo
@@ -32,15 +32,6 @@ mod SRC5Component {
         }
     }
 
-    #[embeddable_as(SRC5CamelImpl)]
-    impl SRC5Camel<
-        TContractState, +HasComponent<TContractState>
-    > of interface::ISRC5Camel<ComponentState<TContractState>> {
-        fn supportsInterface(self: @ComponentState<TContractState>, interfaceId: felt252) -> bool {
-            self.supports_interface(interfaceId)
-        }
-    }
-
     #[generate_trait]
     impl InternalImpl<
         TContractState, +HasComponent<TContractState>

diff --git a/src/tests/access/test_accesscontrol.cairo b/src/tests/access/test_accesscontrol.cairo
@@ -6,7 +6,7 @@ use openzeppelin::access::accesscontrol::AccessControlComponent;
 use openzeppelin::access::accesscontrol::DEFAULT_ADMIN_ROLE;
 use openzeppelin::access::accesscontrol::interface::IACCESSCONTROL_ID;
 use openzeppelin::access::accesscontrol::interface::{IAccessControl, IAccessControlCamel};
-use openzeppelin::introspection::interface::{ISRC5, ISRC5Camel};
+use openzeppelin::introspection::interface::ISRC5;
 use openzeppelin::tests::mocks::accesscontrol_mocks::DualCaseAccessControlMock;
 use openzeppelin::tests::utils::constants::{
     ADMIN, AUTHORIZED, OTHER, OTHER_ADMIN, ROLE, OTHER_ROLE, ZERO

diff --git a/src/tests/access/test_dual_accesscontrol.cairo b/src/tests/access/test_dual_accesscontrol.cairo
@@ -200,21 +200,6 @@ fn test_dual_renounce_role_exists_and_panics() {
 // camelCase target
 //
 
-#[test]
-fn test_dual_supportsInterface() {
-    let (dispatcher, _) = setup_camel();
-
-    let supports_iaccesscontrol = dispatcher.supports_interface(IACCESSCONTROL_ID);
-    assert!(supports_iaccesscontrol);
-}
-
-#[test]
-#[should_panic(expected: ("Some error", 'ENTRYPOINT_FAILED',))]
-fn test_dual_supportsInterface_exists_and_panics() {
-    let (_, dispatcher) = setup_accesscontrol_panic();
-    dispatcher.supports_interface(IACCESSCONTROL_ID);
-}
-
 #[test]
 fn test_dual_hasRole() {
     let (dispatcher, _) = setup_camel();

diff --git a/src/tests/account/test_dual_account.cairo b/src/tests/account/test_dual_account.cairo
@@ -215,17 +215,3 @@ fn test_dual_isValidSignature_exists_and_panics() {
     let (_, dispatcher) = setup_account_panic();
     dispatcher.is_valid_signature(hash, signature);
 }
-
-#[test]
-fn test_dual_supportsInterface() {
-    let (camel_dispatcher, _) = setup_camel();
-    let supports_isrc5 = camel_dispatcher.supports_interface(ISRC5_ID);
-    assert!(supports_isrc5);
-}
-
-#[test]
-#[should_panic(expected: ("Some error", 'ENTRYPOINT_FAILED',))]
-fn test_dual_supportsInterface_exists_and_panics() {
-    let (_, dispatcher) = setup_account_panic();
-    dispatcher.supports_interface(ISRC5_ID);
-}
diff --git a/src/tests/account/test_dual_eth_account.cairo b/src/tests/account/test_dual_eth_account.cairo
@@ -221,16 +221,3 @@ fn test_dual_isValidSignature_exists_and_panics() {
     let (_, dispatcher) = setup_account_panic();
     dispatcher.is_valid_signature(hash, signature);
 }
-
-#[test]
-fn test_dual_supportsInterface() {
-    let (camel_dispatcher, _) = setup_camel();
-    assert!(camel_dispatcher.supports_interface(ISRC5_ID), "Should implement ISRC5");
-}
-
-#[test]
-#[should_panic(expected: ("Some error", 'ENTRYPOINT_FAILED',))]
-fn test_dual_supportsInterface_exists_and_panics() {
-    let (_, dispatcher) = setup_account_panic();
-    dispatcher.supports_interface(ISRC5_ID);
-}
diff --git a/src/tests/introspection.cairo b/src/tests/introspection.cairo
@@ -1,2 +1 @@
-mod test_dual_src5;
 mod test_src5;
diff --git a/src/tests/introspection/test_dual_src5.cairo b/src/tests/introspection/test_dual_src5.cairo
diff --git a/src/tests/introspection/test_src5.cairo b/src/tests/introspection/test_src5.cairo
@@ -1,11 +1,11 @@
 use openzeppelin::introspection::interface::{ISRC5_ID, ISRC5};
 use openzeppelin::introspection::src5::SRC5Component::InternalTrait;
 use openzeppelin::introspection::src5::SRC5Component;
-use openzeppelin::tests::mocks::src5_mocks::DualCaseSRC5Mock;
+use openzeppelin::tests::mocks::src5_mocks::SRC5Mock;
 
 const OTHER_ID: felt252 = 0x12345678;
 
-type ComponentState = SRC5Component::ComponentState<DualCaseSRC5Mock::ContractState>;
+type ComponentState = SRC5Component::ComponentState<SRC5Mock::ContractState>;
 
 fn COMPONENT_STATE() -> ComponentState {
     SRC5Component::component_state_for_testing()

diff --git a/src/tests/mocks/erc721_mocks.cairo b/src/tests/mocks/erc721_mocks.cairo
@@ -289,12 +289,6 @@ mod CamelERC721PanicMock {
     #[abi(per_item)]
     #[generate_trait]
     impl ExternalImpl of ExternalTrait {
-        #[external(v0)]
-        fn supportsInterface(self: @ContractState, interfaceId: felt252) -> bool {
-            panic!("Some error");
-            false
-        }
-
         #[external(v0)]
         fn tokenURI(self: @ContractState, tokenId: u256) -> felt252 {
             panic!("Some error");