chore: update 2.9.4

Author: julio4

.tool-versions

@@ -1,2 +1,2 @@
-scarb 2.9.2
-starknet-foundry 0.35.0
+scarb 2.9.4
+starknet-foundry 0.37.0

CONTRIBUTING.md

@@ -103,7 +103,7 @@ version.workspace = true
 starknet.workspace = true
 # Uncomment the following lines if you want to use additional dependencies:
 # OpenZeppelin:
-# openzeppelin.workspace = true
+# openzeppelin_{package_name}.workspace = true
 
 # If you want to use another Starknet By Example's listing, you can add it as a dependency like this:
 # erc20 = { path = "../../getting-started/erc20" }
@@ -137,7 +137,7 @@ version.workspace = true
 starknet.workspace = true
 # Uncomment the following lines if you want to use additional dependencies:
 # OpenZeppelin:
-# openzeppelin.workspace = true
+# openzeppelin_{package_name}.workspace = true
 
 # If you want to use another Starknet By Example's listing, you can add it as a dependency like this:
 # erc20 = { path = "../../getting-started/erc20" }

Scarb.lock

@@ -5,7 +5,7 @@ version = 1
 name = "account_spending_limits"
 version = "0.1.0"
 dependencies = [
- "openzeppelin",
+ "openzeppelin_token",
  "snforge_std",
 ]
 
@@ -29,7 +29,7 @@ dependencies = [
 name = "coin_flip"
 version = "0.1.0"
 dependencies = [
- "openzeppelin",
+ "openzeppelin_token",
  "pragma_lib",
  "snforge_std",
 ]
@@ -53,7 +53,7 @@ dependencies = [
 name = "constant_product_amm"
 version = "0.1.0"
 dependencies = [
- "openzeppelin",
+ "openzeppelin_token",
 ]
 
 [[package]]
@@ -75,7 +75,7 @@ name = "crowdfunding"
 version = "0.1.0"
 dependencies = [
  "components",
- "openzeppelin",
+ "openzeppelin_token",
  "snforge_std",
 ]
 
@@ -143,123 +143,49 @@ dependencies = [
  "snforge_std",
 ]
 
-[[package]]
-name = "openzeppelin"
-version = "0.20.0"
-source = "registry+https://scarbs.xyz/"
-checksum = "sha256:05fd9365be85a4a3e878135d5c52229f760b3861ce4ed314cb1e75b178b553da"
-dependencies = [
- "openzeppelin_access",
- "openzeppelin_account",
- "openzeppelin_finance",
- "openzeppelin_governance",
- "openzeppelin_introspection",
- "openzeppelin_merkle_tree",
- "openzeppelin_presets",
- "openzeppelin_security",
- "openzeppelin_token",
- "openzeppelin_upgrades",
- "openzeppelin_utils",
-]
-
 [[package]]
 name = "openzeppelin_access"
-version = "0.20.0"
+version = "1.0.0"
 source = "registry+https://scarbs.xyz/"
-checksum = "sha256:7734901a0ca7a7065e69416fea615dd1dc586c8dc9e76c032f25ee62e8b2a06c"
+checksum = "sha256:a39a4ea1582916c637bf7e3aee0832c3fe1ea3a3e39191955e8dc39d08327f9b"
 dependencies = [
  "openzeppelin_introspection",
+ "openzeppelin_utils",
 ]
 
 [[package]]
 name = "openzeppelin_account"
-version = "0.20.0"
+version = "1.0.0"
 source = "registry+https://scarbs.xyz/"
-checksum = "sha256:1aa3a71e2f40f66f98d96aa9bf9f361f53db0fd20fa83ef7df04426a3c3a926a"
+checksum = "sha256:7e943a2de32ddca4d48e467e52790e380ab1f49c4daddbbbc4634dd930d0243f"
 dependencies = [
  "openzeppelin_introspection",
  "openzeppelin_utils",
 ]
 
-[[package]]
-name = "openzeppelin_finance"
-version = "0.20.0"
-source = "registry+https://scarbs.xyz/"
-checksum = "sha256:f0c507fbff955e4180ea3fa17949c0ff85518c40101f4948948d9d9a74143d6c"
-dependencies = [
- "openzeppelin_access",
- "openzeppelin_token",
-]
-
-[[package]]
-name = "openzeppelin_governance"
-version = "0.20.0"
-source = "registry+https://scarbs.xyz/"
-checksum = "sha256:c0fb60fad716413d537fabd5fcbb2c499ca6beb95af5f0d1699955ecec4c6f63"
-dependencies = [
- "openzeppelin_access",
- "openzeppelin_account",
- "openzeppelin_introspection",
- "openzeppelin_token",
- "openzeppelin_utils",
-]
-
 [[package]]
 name = "openzeppelin_introspection"
-version = "0.20.0"
-source = "registry+https://scarbs.xyz/"
-checksum = "sha256:13e04a2190684e6804229a77a6c56de7d033db8b9ef519e5e8dee400a70d8a3d"
-
-[[package]]
-name = "openzeppelin_merkle_tree"
-version = "0.20.0"
-source = "registry+https://scarbs.xyz/"
-checksum = "sha256:039608900e92f3dcf479bf53a49a1fd76452acd97eb86e390d1eb92cacdaf3af"
-
-[[package]]
-name = "openzeppelin_presets"
-version = "0.20.0"
-source = "registry+https://scarbs.xyz/"
-checksum = "sha256:5c07a8de32e5d9abe33988c7927eaa8b5f83bc29dc77302d9c8c44c898611042"
-dependencies = [
- "openzeppelin_access",
- "openzeppelin_account",
- "openzeppelin_finance",
- "openzeppelin_introspection",
- "openzeppelin_token",
- "openzeppelin_upgrades",
- "openzeppelin_utils",
-]
-
-[[package]]
-name = "openzeppelin_security"
-version = "0.20.0"
+version = "1.0.0"
 source = "registry+https://scarbs.xyz/"
-checksum = "sha256:27155597019ecf971c48d7bfb07fa58cdc146d5297745570071732abca17f19f"
+checksum = "sha256:34e088ecf19e0b3012481a29f1fbb20e600540cb9a5db1c3002a97ebb7f5a32a"
 
 [[package]]
 name = "openzeppelin_token"
-version = "0.20.0"
+version = "1.0.0"
 source = "registry+https://scarbs.xyz/"
-checksum = "sha256:4452f449dc6c1ea97cf69d1d9182749abd40e85bd826cd79652c06a627eafd91"
+checksum = "sha256:33fcb84a1a76d2d3fff9302094ff564f78d45b743548fd7568c130b272473f66"
 dependencies = [
  "openzeppelin_access",
  "openzeppelin_account",
  "openzeppelin_introspection",
  "openzeppelin_utils",
 ]
 
-[[package]]
-name = "openzeppelin_upgrades"
-version = "0.20.0"
-source = "registry+https://scarbs.xyz/"
-checksum = "sha256:15fdd63f6b50a0fda7b3f8f434120aaf7637bcdfe6fd8d275ad57343d5ede5e1"
-
 [[package]]
 name = "openzeppelin_utils"
-version = "0.20.0"
+version = "1.0.0"
 source = "registry+https://scarbs.xyz/"
-checksum = "sha256:44f32d242af1e43982decc49c563e613a9b67ade552f5c3d5cde504e92f74607"
+checksum = "sha256:fd348b31c4a4407add33adc3c2b8f26dca71dbd7431faaf726168f37a91db0c1"
 
 [[package]]
 name = "pragma_lib"
@@ -274,7 +200,8 @@ version = "0.1.0"
 name = "simple_account"
 version = "0.1.0"
 dependencies = [
- "openzeppelin",
+ "openzeppelin_account",
+ "openzeppelin_introspection",
 ]
 
 [[package]]
@@ -290,15 +217,15 @@ dependencies = [
 
 [[package]]
 name = "snforge_scarb_plugin"
-version = "0.35.0"
+version = "0.37.0"
 source = "registry+https://scarbs.xyz/"
-checksum = "sha256:20bd6a488fda7201ce2a5fd680d8e715b10e3545147b276747ad079c96c3d5d2"
+checksum = "sha256:9dbb114f853decc27b2d6d53e2ddd207217ce63c2d24a47c5c48d5f475b0b9a5"
 
 [[package]]
 name = "snforge_std"
-version = "0.35.0"
+version = "0.37.0"
 source = "registry+https://scarbs.xyz/"
-checksum = "sha256:fe4e1b1526c815441183baed7f93e73bc76a6393d23e1f9c34fbe227bfaedfd6"
+checksum = "sha256:f5702c4a6d54e3563b4aa78c834de6ddcf18ef8ca8fd35dc1bceb7ece58e9571"
 dependencies = [
  "snforge_scarb_plugin",
 ]
@@ -307,7 +234,7 @@ dependencies = [
 name = "staking"
 version = "0.1.0"
 dependencies = [
- "openzeppelin",
+ "openzeppelin_token",
 ]
 
 [[package]]
@@ -344,7 +271,8 @@ name = "timelock"
 version = "0.1.0"
 dependencies = [
  "components",
- "openzeppelin",
+ "openzeppelin_introspection",
+ "openzeppelin_token",
  "snforge_std",
 ]
 

Scarb.toml

@@ -12,11 +12,13 @@ test = "$(git rev-parse --show-toplevel)/scripts/test_resolver.sh"
 [workspace.tool.snforge]
 
 [workspace.dependencies]
-starknet = "2.9.2"
-cairo_test = "2.9.2"
-assert_macros = "2.9.2" 
-snforge_std = "0.35.0"
-openzeppelin = "0.20.0"
+starknet = "2.9.4"
+cairo_test = "2.9.4"
+assert_macros = "2.9.4" 
+snforge_std = "0.37.0"
+openzeppelin_token = "1.0.0"
+openzeppelin_account = "1.0.0"
+openzeppelin_introspection = "1.0.0"
 components = { path = "listings/applications/components" }
 pragma_lib = { git = "https://github.com/astraly-labs/pragma-lib", tag = "2.9.1" }
 

listings/advanced-concepts/account_spending_limits/Scarb.toml

@@ -5,7 +5,7 @@ edition.workspace = true
 
 [dependencies]
 starknet.workspace = true
-openzeppelin.workspace = true
+openzeppelin_token.workspace = true
 
 [dev-dependencies]
 assert_macros.workspace = true

listings/advanced-concepts/account_spending_limits/src/account.cairo

@@ -6,7 +6,7 @@ trait ISRC6<TContractState> {
     fn __execute__(ref self: TContractState, calls: Array<Call>) -> Array<Span<felt252>>;
     fn __validate__(self: @TContractState, calls: Array<Call>) -> felt252;
     fn is_valid_signature(
-        self: @TContractState, hash: felt252, signature: Array<felt252>
+        self: @TContractState, hash: felt252, signature: Array<felt252>,
     ) -> felt252;
 }
 
@@ -18,7 +18,7 @@ trait ISRC5<TContractState> {
 #[starknet::interface]
 trait IDeployableAccount<TContractState> {
     fn __validate_deploy__(
-        self: @TContractState, class_hash: felt252, salt: felt252, public_key: felt252
+        self: @TContractState, class_hash: felt252, public_key: felt252, time_limit: u64,
     ) -> felt252;
 }
 
@@ -47,15 +47,15 @@ struct SpendingLimit {
 #[starknet::contract(account)]
 mod Account {
     use super::{
-        ISRC6, ISRC5, IDeployableAccount, IDeclarerAccount, ISpendingLimitsAccount, SpendingLimit
+        ISRC6, ISRC5, IDeployableAccount, IDeclarerAccount, ISpendingLimitsAccount, SpendingLimit,
     };
     use starknet::{
         ContractAddress, get_caller_address, get_tx_info, VALIDATED, get_block_timestamp,
-        get_contract_address, account::Call, syscalls::call_contract_syscall
+        get_contract_address, account::Call, syscalls::call_contract_syscall,
     };
     use starknet::storage::{
         Map, StorageMapReadAccess, StorageMapWriteAccess, StoragePointerReadAccess,
-        StoragePointerWriteAccess
+        StoragePointerWriteAccess,
     };
     use core::num::traits::Zero;
 
@@ -115,7 +115,7 @@ mod Account {
                     self.update_timestamp(to);
                 }
 
-                let syscall_res = call_contract_syscall(to, selector, calldata).unwrap_syscall();
+                let syscall_res = call_contract_syscall(to, selector, calldata).unwrap();
                 res.append(syscall_res);
             };
             res
@@ -127,7 +127,7 @@ mod Account {
         }
 
         fn is_valid_signature(
-            self: @ContractState, hash: felt252, signature: Array<felt252>
+            self: @ContractState, hash: felt252, signature: Array<felt252>,
         ) -> felt252 {
             let is_valid = self._is_valid_signature(hash, signature.span());
             if is_valid {
@@ -148,7 +148,7 @@ mod Account {
     #[abi(embed_v0)]
     impl DeployableAccount of IDeployableAccount<ContractState> {
         fn __validate_deploy__(
-            self: @ContractState, class_hash: felt252, salt: felt252, public_key: felt252
+            self: @ContractState, class_hash: felt252, public_key: felt252, time_limit: u64,
         ) -> felt252 {
             self.only_protocol();
             self.validate_transaction()
@@ -174,25 +174,25 @@ mod Account {
         }
 
         fn set_spending_limit(
-            ref self: ContractState, token_address: ContractAddress, _limit: u256
+            ref self: ContractState, token_address: ContractAddress, _limit: u256,
         ) {
             assert(get_caller_address() == get_contract_address(), 'Invalid caller');
             let timemstamp = get_block_timestamp();
             let new_limit: SpendingLimit = SpendingLimit {
-                exists: true, limit: _limit, timestamp: timemstamp
+                exists: true, limit: _limit, timestamp: timemstamp,
             };
             self.spending_limit.write(token_address, new_limit);
             self.current_spending_limit.write(token_address, _limit);
         }
 
         fn get_current_spending_limit(
-            self: @ContractState, token_address: ContractAddress
+            self: @ContractState, token_address: ContractAddress,
         ) -> u256 {
             self.current_spending_limit.read(token_address)
         }
 
         fn get_spending_limit_timestamp(
-            self: @ContractState, token_address: ContractAddress
+            self: @ContractState, token_address: ContractAddress,
         ) -> u64 {
             self.spending_limit.read(token_address).timestamp
         }
@@ -237,11 +237,11 @@ mod Account {
         }
 
         fn _is_valid_signature(
-            self: @ContractState, hash: felt252, signature: Span<felt252>
+            self: @ContractState, hash: felt252, signature: Span<felt252>,
         ) -> bool {
             if signature.len() == 2_u32 {
                 core::ecdsa::check_ecdsa_signature(
-                    hash, self.public_key.read(), *signature.at(0_u32), *signature.at(1_u32)
+                    hash, self.public_key.read(), *signature.at(0_u32), *signature.at(1_u32),
                 )
             } else {
                 false