Migrate Account to component

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: software-mansion/setup-scarb@v1
       with:
-        scarb-version: "2.3.0"
+        scarb-version: "2.3.1"
     - name: Markdown lint
       uses: DavidAnson/markdownlint-cli2-action@5b7c9f74fec47e6b15667b2cc23c63dff11e449e # v9
       with:

Scarb.toml

@@ -1,7 +1,7 @@
 [package]
 name = "openzeppelin"
 version = "0.8.0-beta.0"
-cairo-version = "2.3.0"
+cairo-version = "2.3.1"
 authors = ["OpenZeppelin Community <maintainers@openzeppelin.org>"]
 description = "OpenZeppelin Contracts written in Cairo for StarkNet, a decentralized ZK Rollup"
 documentation = "https://docs.openzeppelin.com/contracts-cairo"
@@ -11,7 +11,7 @@ license-file = "LICENSE"
 keywords = ["openzeppelin", "starknet", "cairo", "contracts", "security", "standards"]
 
 [dependencies]
-starknet = "2.3.0"
+starknet = "2.3.1"
 
 [lib]
 

docs/modules/ROOT/pages/access.adoc

@@ -27,29 +27,29 @@ xref:/api/access.adoc#AccessControl-initializer[`initializer`] like this:
 ----
 #[starknet::contract]
 mod MyContract {
-    use openzeppelin::access::ownable::Ownable as ownable_component;
+    use openzeppelin::access::ownable::OwnableComponent;
     use starknet::ContractAddress;
 
-    component!(path: ownable_component, storage: ownable, event: OwnableEvent);
+    component!(path: OwnableComponent, storage: ownable, event: OwnableEvent);
 
     #[abi(embed_v0)]
-    impl OwnableImpl = ownable_component::OwnableImpl<ContractState>;
+    impl OwnableImpl = OwnableComponent::OwnableImpl<ContractState>;
     #[abi(embed_v0)]
     impl OwnableCamelOnlyImpl =
-        ownable_component::OwnableCamelOnlyImpl<ContractState>;
-    impl InternalImpl = ownable_component::InternalImpl<ContractState>;
+        OwnableComponent::OwnableCamelOnlyImpl<ContractState>;
+    impl InternalImpl = OwnableComponent::InternalImpl<ContractState>;
 
     #[storage]
     struct Storage {
         #[substorage(v0)]
-        ownable: ownable_component::Storage
+        ownable: OwnableComponent::Storage
     }
 
     #[event]
     #[derive(Drop, starknet::Event)]
     enum Event {
         #[flat]
-        OwnableEvent: ownable_component::Event
+        OwnableEvent: OwnableComponent::Event
     }
 
     #[constructor]
@@ -137,37 +137,37 @@ const MINTER_ROLE: felt252 = selector!("MINTER_ROLE");
 
 #[starknet::contract]
 mod MyContract {
-    use openzeppelin::access::accesscontrol::AccessControl as accesscontrol_component;
-    use openzeppelin::introspection::src5::SRC5 as src5_component;
+    use openzeppelin::access::accesscontrol::AccessControlComponent;
+    use openzeppelin::introspection::src5::SRC5Component;
     use openzeppelin::token::erc20::ERC20;
     use starknet::ContractAddress;
     use super::MINTER_ROLE;
 
-    component!(path: accesscontrol_component, storage: accesscontrol, event: AccessControlEvent);
-    component!(path: src5_component, storage: src5, event: SRC5Event);
+    component!(path: AccessControlComponent, storage: accesscontrol, event: AccessControlEvent);
+    component!(path: SRC5Component, storage: src5, event: SRC5Event);
 
     #[abi(embed_v0)]
     impl AccessControlImpl =
-        accesscontrol_component::AccessControlImpl<ContractState>;
+        AccessControlComponent::AccessControlImpl<ContractState>;
     #[abi(embed_v0)]
-    impl SRC5Impl = src5_component::SRC5Impl<ContractState>;
-    impl AccessControlInternalImpl = accesscontrol_component::InternalImpl<ContractState>;
+    impl SRC5Impl = SRC5Component::SRC5Impl<ContractState>;
+    impl AccessControlInternalImpl = AccessControlComponent::InternalImpl<ContractState>;
 
     #[storage]
     struct Storage {
         #[substorage(v0)]
-        accesscontrol: accesscontrol_component::Storage,
+        accesscontrol: AccessControlComponent::Storage,
         #[substorage(v0)]
-        src5: src5_component::Storage,
+        src5: SRC5Component::Storage,
     }
 
     #[event]
     #[derive(Drop, starknet::Event)]
     enum Event {
         #[flat]
-        AccessControlEvent: accesscontrol_component::Event,
+        AccessControlEvent: AccessControlComponent::Event,
         #[flat]
-        SRC5Event: src5_component::Event
+        SRC5Event: SRC5Component::Event
     }
 
     #[constructor]
@@ -216,37 +216,37 @@ const BURNER_ROLE: felt252 = selector!("BURNER_ROLE");
 
 #[starknet::contract]
 mod MyContract {
-    use openzeppelin::access::accesscontrol::AccessControl as accesscontrol_component;
-    use openzeppelin::introspection::src5::SRC5 as src5_component;
+    use openzeppelin::access::accesscontrol::AccessControlComponent;
+    use openzeppelin::introspection::src5::SRC5Component;
     use openzeppelin::token::erc20::ERC20;
     use starknet::ContractAddress;
     use super::{MINTER_ROLE, BURNER_ROLE};
 
-    component!(path: accesscontrol_component, storage: accesscontrol, event: AccessControlEvent);
-    component!(path: src5_component, storage: src5, event: SRC5Event);
+    component!(path: AccessControlComponent, storage: accesscontrol, event: AccessControlEvent);
+    component!(path: SRC5Component, storage: src5, event: SRC5Event);
 
     #[abi(embed_v0)]
     impl AccessControlImpl =
-        accesscontrol_component::AccessControlImpl<ContractState>;
+        AccessControlComponent::AccessControlImpl<ContractState>;
     #[abi(embed_v0)]
-    impl SRC5Impl = src5_component::SRC5Impl<ContractState>;
-    impl AccessControlInternalImpl = accesscontrol_component::InternalImpl<ContractState>;
+    impl SRC5Impl = SRC5Component::SRC5Impl<ContractState>;
+    impl AccessControlInternalImpl = AccessControlComponent::InternalImpl<ContractState>;
 
     #[storage]
     struct Storage {
         #[substorage(v0)]
-        accesscontrol: accesscontrol_component::Storage,
+        accesscontrol: AccessControlComponent::Storage,
         #[substorage(v0)]
-        src5: src5_component::Storage,
+        src5: SRC5Component::Storage,
     }
 
     #[event]
     #[derive(Drop, starknet::Event)]
     enum Event {
         #[flat]
-        AccessControlEvent: accesscontrol_component::Event,
+        AccessControlEvent: AccessControlComponent::Event,
         #[flat]
-        SRC5Event: src5_component::Event
+        SRC5Event: SRC5Component::Event
     }
 
     #[constructor]
@@ -328,22 +328,22 @@ const BURNER_ROLE: felt252 = selector!("BURNER_ROLE");
 
 #[starknet::contract]
 mod MyContract {
-    use openzeppelin::access::accesscontrol::AccessControl as accesscontrol_component;
+    use openzeppelin::access::accesscontrol::AccessControlComponent;
     use openzeppelin::access::accesscontrol::DEFAULT_ADMIN_ROLE;
-    use openzeppelin::introspection::src5::SRC5 as src5_component;
+    use openzeppelin::introspection::src5::SRC5Component;
     use openzeppelin::token::erc20::ERC20;
     use starknet::ContractAddress;
     use super::{MINTER_ROLE, BURNER_ROLE};
 
-    component!(path: accesscontrol_component, storage: accesscontrol, event: AccessControlEvent);
-    component!(path: src5_component, storage: src5, event: SRC5Event);
+    component!(path: AccessControlComponent, storage: accesscontrol, event: AccessControlEvent);
+    component!(path: SRC5Component, storage: src5, event: SRC5Event);
 
     #[abi(embed_v0)]
     impl AccessControlImpl =
-        accesscontrol_component::AccessControlImpl<ContractState>;
+        AccessControlComponent::AccessControlImpl<ContractState>;
     #[abi(embed_v0)]
-    impl SRC5Impl = src5_component::SRC5Impl<ContractState>;
-    impl AccessControlInternalImpl = accesscontrol_component::InternalImpl<ContractState>;
+    impl SRC5Impl = SRC5Component::SRC5Impl<ContractState>;
+    impl AccessControlInternalImpl = AccessControlComponent::InternalImpl<ContractState>;
 
     (...)
 

docs/modules/ROOT/pages/api/access.adoc

@@ -21,7 +21,7 @@ assigned each to multiple accounts.
 === `++Ownable++` link:https://github.com/OpenZeppelin/cairo-contracts/blob/release-v0.8.0-beta.0/src/access/ownable/ownable.cairo[{github-icon},role=heading-link]
 
 ```javascript
-use openzeppelin::access::ownable::Ownable;
+use openzeppelin::access::ownable::OwnableComponent;
 ```
 
 `Ownable` provides a basic access control mechanism where an account
@@ -30,7 +30,7 @@ use openzeppelin::access::ownable::Ownable;
 This module includes the internal `assert_only_owner` to restrict a function to be used only by the owner.
 
 [.contract-index]
-.Embeddable Functions
+.Embeddable Implementations
 --
 .OwnableImpl
 
@@ -40,7 +40,7 @@ This module includes the internal `assert_only_owner` to restrict a function to
 --
 
 [.contract-index]
-.camelCase Support
+.Embeddable Implementations (camelCase)
 --
 .OwnableCamelOnlyImpl
 
@@ -49,7 +49,7 @@ This module includes the internal `assert_only_owner` to restrict a function to
 --
 
 [.contract-index]
-.Internal Functions
+.Internal Implementations
 --
 .InternalImpl
 
@@ -284,7 +284,7 @@ Emitted when `account` is revoked `role`.
 :revoke_role: xref:#AccessControl-revoke_role[revoke_role]
 
 ```javascript
-use openzeppelin::access::accesscontrol::AccessControl;
+use openzeppelin::access::accesscontrol::AccessControlComponent;
 ```
 
 Component that allows contracts to implement role-based access control mechanisms.
@@ -322,7 +322,7 @@ grant and revoke this role. Extra precautions should be taken to secure
 accounts that have been granted it.
 
 [.contract-index]
-.Embeddable Functions
+.Embeddable Implementations
 --
 .AccessControlImpl
 
@@ -337,7 +337,7 @@ accounts that have been granted it.
 --
 
 [.contract-index]
-.camelCase Support
+.Embeddable Implementations (camelCase)
 --
 .AccessControlCamelImpl
 
@@ -349,7 +349,7 @@ accounts that have been granted it.
 --
 
 [.contract-index]
-.Internal Functions
+.Internal Implementations
 --
 .InternalImpl