Merge pull request #64 from horuslabsio/v0.3.2

Feat: V0.3.2

Author: Darlington02

.tool-versions

@@ -1,2 +1,2 @@
-scarb 2.8.2
-starknet-foundry 0.31.0
+scarb 2.11.4
+starknet-foundry 0.45.0

Scarb.lock

@@ -3,73 +3,63 @@ version = 1
 
 [[package]]
 name = "openzeppelin_access"
-version = "0.17.0"
+version = "2.0.0"
 source = "registry+https://scarbs.xyz/"
-checksum = "sha256:541bb8fdf1ad17fe0d275b00acb9f0d7f56ea5534741e21535ac3fda2c600281"
+checksum = "sha256:511681dd26d814ee2bc996d44ff8cb4aaa5ae9d14272130def7eb901cf004850"
 dependencies = [
  "openzeppelin_introspection",
- "openzeppelin_utils",
 ]
 
 [[package]]
 name = "openzeppelin_account"
-version = "0.17.0"
+version = "2.0.0"
 source = "registry+https://scarbs.xyz/"
-checksum = "sha256:c4e11609fdd1f4c3d3004cd1468711bd2ea664739c9e59a4b270567fe4c23ee3"
+checksum = "sha256:fb3381c50d68b028d3801feb43df378e2bd62137b6884844f8f60aefe796188b"
 dependencies = [
  "openzeppelin_introspection",
  "openzeppelin_utils",
 ]
 
-[[package]]
-name = "openzeppelin_governance"
-version = "0.17.0"
-source = "registry+https://scarbs.xyz/"
-checksum = "sha256:b7e0142d88d69a8c367aea8c9dc7f659f27372551efc23f39a0cf71a189c1302"
-dependencies = [
- "openzeppelin_access",
- "openzeppelin_introspection",
-]
-
 [[package]]
 name = "openzeppelin_introspection"
-version = "0.17.0"
+version = "2.0.0"
 source = "registry+https://scarbs.xyz/"
-checksum = "sha256:892433a4a1ea0fc9cf7cdb01e06ddc2782182abcc188e4ea5dd480906d006cf8"
+checksum = "sha256:87773ed6cd2318f169283ecbbb161890d1996260a80302d81ec45b70ee5e54c1"
 
 [[package]]
 name = "openzeppelin_token"
-version = "0.17.0"
+version = "2.0.0"
 source = "registry+https://scarbs.xyz/"
-checksum = "sha256:77997a7e217b69674c34b402dc0c7b2210540db66a56087572679c31896eaabb"
+checksum = "sha256:6fe61f63b5a6706018265fb7373b6e5bd3ff829bdc760b2b90296b1e708d180c"
 dependencies = [
+ "openzeppelin_access",
  "openzeppelin_account",
- "openzeppelin_governance",
  "openzeppelin_introspection",
+ "openzeppelin_utils",
 ]
 
 [[package]]
 name = "openzeppelin_utils"
-version = "0.17.0"
+version = "2.0.0"
 source = "registry+https://scarbs.xyz/"
-checksum = "sha256:36d93e353f42fd6b824abcd8b4b51c3f5d02c893c5f886ae81403b0368aa5fde"
+checksum = "sha256:bf799c794139837f397975ffdf6a7ed5032d198bbf70e87a8f44f144a9dfc505"
 
 [[package]]
 name = "snforge_scarb_plugin"
-version = "0.31.0"
-source = "git+https://github.com/foundry-rs/starknet-foundry.git?tag=v0.31.0#72ea785ca354e9e506de3e5d687da9fb2c1b3c67"
+version = "0.45.0"
+source = "git+https://github.com/foundry-rs/starknet-foundry.git?tag=v0.45.0#f969d9c0db5e2345cb14f4e94e87ca1f89c6f2cb"
 
 [[package]]
 name = "snforge_std"
-version = "0.31.0"
-source = "git+https://github.com/foundry-rs/starknet-foundry.git?tag=v0.31.0#72ea785ca354e9e506de3e5d687da9fb2c1b3c67"
+version = "0.45.0"
+source = "git+https://github.com/foundry-rs/starknet-foundry.git?tag=v0.45.0#f969d9c0db5e2345cb14f4e94e87ca1f89c6f2cb"
 dependencies = [
  "snforge_scarb_plugin",
 ]
 
 [[package]]
 name = "token_bound_accounts"
-version = "0.3.1"
+version = "0.3.2"
 dependencies = [
  "openzeppelin_introspection",
  "openzeppelin_token",

Scarb.toml

@@ -1,14 +1,14 @@
 [package]
 name = "token_bound_accounts"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2024_07"
 authors = ["Horus Labs <horuslabsio@gmail.com>"]
 description = "A port of ERC6551 to Starknet"
 repository = "https://github.com/horuslabsio/TBA/blob/main/Scarb.toml"
 license-file = "LICENSE"
 keywords = ["ERC6551", "tokenbound", "cairo", "contracts", "starknet", "standards"]
 readme = "README.md"
-cairo_version = "2.8.2"
+cairo_version = "2.11.4"
 homepage = "https://www.tbaexplorer.com/"
 documentation = "https://github.com/horuslabsio/TBA-SDK"
 
@@ -22,12 +22,12 @@ casm = true
 [lib]
 
 [dependencies]
-starknet = "2.8.2"
-openzeppelin_introspection = "0.17.0"
-openzeppelin_token = "0.17.0"
+starknet = "2.11.4"
+openzeppelin_introspection = "2.0.0"
+openzeppelin_token = "2.0.0"
 
 [dev-dependencies]
-snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.31.0" }
+snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.45.0" }
 
 [tool.snforge]
 # exit_first = true

src/accountV3/accountV3.cairo

@@ -7,18 +7,20 @@ pub mod AccountV3 {
     // *************************************************************************
     //                             IMPORTS
     // *************************************************************************
-    use starknet::{ContractAddress, get_caller_address, get_tx_info, ClassHash, account::Call};
     use openzeppelin_introspection::src5::SRC5Component;
-
+    use starknet::account::Call;
+    use starknet::{ClassHash, ContractAddress, get_caller_address, get_tx_info};
     use token_bound_accounts::components::account::account::AccountComponent;
-    use token_bound_accounts::components::upgradeable::upgradeable::UpgradeableComponent;
     use token_bound_accounts::components::lockable::lockable::LockableComponent;
-    use token_bound_accounts::components::signatory::signatory::SignatoryComponent;
     use token_bound_accounts::components::permissionable::permissionable::PermissionableComponent;
-    use token_bound_accounts::interfaces::{
-        IUpgradeable::IUpgradeable, IExecutable::IExecutable, ILockable::ILockable,
-        ISignatory::ISignatory, IPermissionable::IPermissionable, IAccountV3::IAccountV3
-    };
+    use token_bound_accounts::components::signatory::signatory::SignatoryComponent;
+    use token_bound_accounts::components::upgradeable::upgradeable::UpgradeableComponent;
+    use token_bound_accounts::interfaces::IAccountV3::IAccountV3;
+    use token_bound_accounts::interfaces::IExecutable::IExecutable;
+    use token_bound_accounts::interfaces::ILockable::ILockable;
+    use token_bound_accounts::interfaces::IPermissionable::IPermissionable;
+    use token_bound_accounts::interfaces::ISignatory::ISignatory;
+    use token_bound_accounts::interfaces::IUpgradeable::IUpgradeable;
 
     // *************************************************************************
     //                             COMPONENTS
@@ -57,7 +59,7 @@ pub mod AccountV3 {
         #[substorage(v0)]
         permissionable: PermissionableComponent::Storage,
         #[substorage(v0)]
-        src5: SRC5Component::Storage
+        src5: SRC5Component::Storage,
     }
 
     // *************************************************************************
@@ -77,7 +79,7 @@ pub mod AccountV3 {
         #[flat]
         PermissionableEvent: PermissionableComponent::Event,
         #[flat]
-        SRC5Event: SRC5Component::Event
+        SRC5Event: SRC5Component::Event,
     }
 
     // *************************************************************************
@@ -98,7 +100,7 @@ pub mod AccountV3 {
         token_id: u256,
         registry: ContractAddress,
         implementation_hash: felt252,
-        salt: felt252
+        salt: felt252,
     ) {
         self.account.initializer(token_contract, token_id, registry, implementation_hash, salt);
     }
@@ -119,7 +121,7 @@ pub mod AccountV3 {
             operator: ContractAddress,
             from: ContractAddress,
             token_id: u256,
-            data: Span<felt252>
+            data: Span<felt252>,
         ) -> felt252 {
             let (_token_contract, _token_id, _chain_id) = self.account.token();
             let tx_info = get_tx_info().unbox();
@@ -144,7 +146,7 @@ pub mod AccountV3 {
             operator: ContractAddress,
             from: ContractAddress,
             token_id: u256,
-            data: Span<felt252>
+            data: Span<felt252>,
         ) -> felt252 {
             self.on_erc721_received(operator, from, token_id, data)
         }
@@ -171,7 +173,7 @@ pub mod AccountV3 {
         /// @param hash The message hash
         /// @param signature The signature to be validated
         fn is_valid_signature(
-            self: @ContractState, hash: felt252, signature: Span<felt252>
+            self: @ContractState, hash: felt252, signature: Span<felt252>,
         ) -> felt252 {
             self.signatory._is_valid_signature(hash, signature)
         }
@@ -253,7 +255,7 @@ pub mod AccountV3 {
         fn set_permission(
             ref self: ContractState,
             permissioned_addresses: Array<ContractAddress>,
-            permissions: Array<bool>
+            permissions: Array<bool>,
         ) {
             // set permissions
             self.permissionable._set_permission(permissioned_addresses, permissions)
@@ -263,7 +265,7 @@ pub mod AccountV3 {
         // @param owner tokenbound account owner
         // @param permissioned_address address to check permission for
         fn has_permission(
-            self: @ContractState, owner: ContractAddress, permissioned_address: ContractAddress
+            self: @ContractState, owner: ContractAddress, permissioned_address: ContractAddress,
         ) -> bool {
             self.permissionable._has_permission(owner, permissioned_address)
         }

src/components.cairo

@@ -1,6 +1,6 @@
 pub mod account;
 pub mod lockable;
 pub mod permissionable;
-pub mod upgradeable;
 pub mod presets;
 pub mod signatory;
+pub mod upgradeable;