chore: v3 structure

Scarb.lock

@@ -3,12 +3,12 @@ version = 1
 
 [[package]]
 name = "snforge_std"
-version = "0.20.1"
-source = "git+https://github.com/foundry-rs/starknet-foundry.git?tag=v0.20.1#fea2db8f2b20148cc15ee34b08de12028eb42942"
+version = "0.27.0"
+source = "git+https://github.com/foundry-rs/starknet-foundry.git?tag=v0.27.0#2d99b7c00678ef0363881ee0273550c44a9263de"
 
 [[package]]
 name = "token_bound_accounts"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
  "snforge_std",
 ]

src/account/account.cairo

@@ -92,9 +92,7 @@ mod AccountComponent {
         }
 
         fn __validate_deploy__(
-            self: @ComponentState<TContractState>,
-            class_hash: felt252,
-            contract_address_salt: felt252,
+            ref self: ComponentState<TContractState>, token_contract: ContractAddress, token_id: u256
         ) -> felt252 {
             self._validate_transaction()
         }

src/components.cairo

@@ -0,0 +1,3 @@
+mod lockable;
+mod permissionable;
+mod upgradeable;

src/components/lockable.cairo

@@ -0,0 +1 @@
+mod lockable;

src/components/lockable/lockable.cairo

@@ -0,0 +1 @@
+// lockable component

src/components/permissionable.cairo

@@ -0,0 +1 @@
+mod permissionable;

src/components/permissionable/permissionable.cairo

@@ -0,0 +1 @@
+// permissionable component

src/components/upgradeable.cairo

@@ -0,0 +1 @@
+mod upgradeable;

src/interfaces/IAccount.cairo

@@ -13,9 +13,7 @@ trait IAccount<TContractState> {
     fn is_valid_signer(self: @TContractState, signer: ContractAddress) -> felt252;
     fn __validate__(ref self: TContractState, calls: Array<Call>) -> felt252;
     fn __validate_declare__(self: @TContractState, class_hash: felt252) -> felt252;
-    fn __validate_deploy__(
-        self: @TContractState, class_hash: felt252, contract_address_salt: felt252
-    ) -> felt252;
+    fn __validate_deploy__(ref self: TContractState, token_contract: ContractAddress, token_id: u256) -> felt252;
     fn __execute__(ref self: TContractState, calls: Array<Call>) -> Array<Span<felt252>>;
     fn token(self: @TContractState) -> (ContractAddress, u256);
     fn owner(self: @TContractState) -> ContractAddress;

src/lib.cairo

@@ -3,4 +3,4 @@ mod account;
 mod interfaces;
 mod presets;
 mod test_helper;
-mod upgradeable;
+mod components;

src/presets/account.cairo

@@ -6,7 +6,7 @@ mod Account {
     use starknet::{ContractAddress, get_caller_address};
     use starknet::ClassHash;
     use token_bound_accounts::account::AccountComponent;
-    use token_bound_accounts::upgradeable::UpgradeableComponent;
+    use token_bound_accounts::components::upgradeable::upgradeable::UpgradeableComponent;
     use token_bound_accounts::interfaces::IUpgradeable::IUpgradeable;
 
     component!(path: AccountComponent, storage: account, event: AccountEvent);

src/registry/registry.cairo

@@ -8,14 +8,14 @@ mod Registry {
     use core::pedersen::PedersenTrait;
     use starknet::{
         ContractAddress, get_caller_address, syscalls::call_contract_syscall, class_hash::ClassHash,
-        class_hash::Felt252TryIntoClassHash, syscalls::deploy_syscall, SyscallResultTrait
+        class_hash::Felt252TryIntoClassHash, syscalls::deploy_syscall, SyscallResultTrait, storage::Map
     };
     use token_bound_accounts::interfaces::IERC721::{IERC721DispatcherTrait, IERC721Dispatcher};
     use token_bound_accounts::interfaces::IRegistry::IRegistry;
 
     #[storage]
     struct Storage {
-        registry_deployed_accounts: LegacyMap<
+        registry_deployed_accounts: Map<
             (ContractAddress, u256), u8
         >, // tracks no. of deployed accounts by registry for an NFT
     }

src/test_helper/account_upgrade.cairo

@@ -8,10 +8,10 @@ trait IUpgradedAccount<TContractState> {
     fn __validate__(ref self: TContractState, calls: Array<Call>) -> felt252;
     fn __validate_declare__(self: @TContractState, class_hash: felt252) -> felt252;
     fn __validate_deploy__(
-        self: @TContractState,
-        class_hash: felt252,
-        contract_address_salt: felt252,
-        public_key: felt252
+        ref self: TContractState,
+        _public_key: felt252,
+        token_contract: ContractAddress,
+        token_id: u256
     ) -> felt252;
     fn __execute__(ref self: TContractState, calls: Array<Call>) -> Array<Span<felt252>>;
     fn token(self: @TContractState) -> (ContractAddress, u256);
@@ -107,10 +107,10 @@ mod UpgradedAccount {
         }
 
         fn __validate_deploy__(
-            self: @ContractState,
-            class_hash: felt252,
-            contract_address_salt: felt252,
-            public_key: felt252
+            ref self: ContractState,
+            _public_key: felt252,
+            token_contract: ContractAddress,
+            token_id: u256
         ) -> felt252 {
             self.validate_transaction()
         }

src/test_helper/erc721_helper.cairo

@@ -27,17 +27,17 @@ mod ERC721 {
     use starknet::ContractAddress;
     use starknet::get_caller_address;
     use core::zeroable::Zeroable;
-    use starknet::contract_address_to_felt252;
+    use starknet::{contract_address_to_felt252, storage::Map};
 
     #[storage]
     struct Storage {
         name: felt252,
         symbol: felt252,
-        owners: LegacyMap::<u256, ContractAddress>,
-        balances: LegacyMap::<ContractAddress, u256>,
-        token_approvals: LegacyMap::<u256, ContractAddress>,
-        operator_approvals: LegacyMap::<(ContractAddress, ContractAddress), bool>,
-        token_uri: LegacyMap<u256, felt252>,
+        owners: Map::<u256, ContractAddress>,
+        balances: Map::<ContractAddress, u256>,
+        token_approvals: Map::<u256, ContractAddress>,
+        operator_approvals: Map::<(ContractAddress, ContractAddress), bool>,
+        token_uri: Map<u256, felt252>,
     }
 
     #[event]

src/test_helper/simple_account.cairo

@@ -9,12 +9,7 @@ trait ISimpleAccount<TContractState> {
     ) -> felt252;
     fn __validate__(ref self: TContractState, calls: Array<Call>) -> felt252;
     fn __validate_declare__(self: @TContractState, class_hash: felt252) -> felt252;
-    fn __validate_deploy__(
-        self: @TContractState,
-        class_hash: felt252,
-        contract_address_salt: felt252,
-        public_key: felt252
-    ) -> felt252;
+    fn __validate_deploy__(ref self: TContractState, public_key: felt252) -> felt252;
     fn __execute__(ref self: TContractState, calls: Array<Call>) -> Array<Span<felt252>>;
 }
 
@@ -33,8 +28,8 @@ mod SimpleAccount {
     }
 
     #[constructor]
-    fn constructor(ref self: ContractState, _public_key: felt252) {
-        self._public_key.write(_public_key);
+    fn constructor(ref self: ContractState, public_key: felt252) {
+        self._public_key.write(public_key);
     }
 
     #[abi(embed_v0)]
@@ -54,12 +49,7 @@ mod SimpleAccount {
             self._is_valid_signature(hash, signature)
         }
 
-        fn __validate_deploy__(
-            self: @ContractState,
-            class_hash: felt252,
-            contract_address_salt: felt252,
-            public_key: felt252
-        ) -> felt252 {
+        fn __validate_deploy__(ref self: ContractState, public_key: felt252) -> felt252 {
             self.validate_transaction()
         }