downgrade account to oz 0.15.1 because mismatch cairo version

bin/sozo/src/commands/options/account/controller.rs

@@ -285,7 +285,7 @@ mod tests {
             .build_test_config("spawn-and-move", Profile::DEV);
 
         let world_addr = felt!("0x74c73d35df54ddc53bcf34aab5e0dbb09c447e99e01f4d69535441253c9571a");
-        let user_addr = felt!("0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba");
+        let user_addr = felt!("0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891");
 
         let policies =
             collect_policies(WorldAddressOrName::Address(world_addr), user_addr, &config).unwrap();

bin/sozo/tests/test_data/policies.json

@@ -128,7 +128,7 @@
     "method": "set_facts_registry"
   },
   {
-    "target": "0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba",
+    "target": "0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891",
     "method": "__declare_transaction__"
   },
   {

crates/benches/contracts/Scarb.toml

@@ -17,7 +17,7 @@ initializer_class_hash = "0xbeef"
 [tool.dojo.env]
 # rpc_url = "http://localhost:5050/"
 # Default account for katana with seed = 0
-account_address = "0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba"
+account_address = "0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891"
 private_key = "0x1800000000300000180000000000030000000000003006001800006600"
 
 [tool.dojo.world.namespace]

crates/dojo-world/src/metadata_test.rs

@@ -59,16 +59,16 @@ async fn get_full_dojo_metadata_from_workspace() {
     assert!(env.rpc_url.unwrap().eq("http://localhost:5050/"));
 
     assert!(env.account_address.is_some());
-    assert!(
-        env.account_address
-            .unwrap()
-            .eq("0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba")
-    );
+    assert!(env
+        .account_address
+        .unwrap()
+        .eq("0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891"));
 
     assert!(env.private_key.is_some());
-    assert!(
-        env.private_key.unwrap().eq("0x1800000000300000180000000000030000000000003006001800006600")
-    );
+    assert!(env
+        .private_key
+        .unwrap()
+        .eq("0x1800000000300000180000000000030000000000003006001800006600"));
 
     assert!(env.world_address.is_some());
 

crates/katana/contracts/.tool-versions

@@ -1 +1 @@
-scarb 2.8.3
+scarb 2.7.0

crates/katana/contracts/Scarb.lock

@@ -14,15 +14,13 @@ version = "0.1.0"
 
 [[package]]
 name = "openzeppelin"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
+version = "0.15.1"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.1#2f8a93d762858714095a1d391afffa9e21df6983"
 dependencies = [
  "openzeppelin_access",
  "openzeppelin_account",
- "openzeppelin_finance",
  "openzeppelin_governance",
  "openzeppelin_introspection",
- "openzeppelin_merkle_tree",
  "openzeppelin_presets",
  "openzeppelin_security",
  "openzeppelin_token",
@@ -32,72 +30,57 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_access"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
+version = "0.15.1"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.1#2f8a93d762858714095a1d391afffa9e21df6983"
 dependencies = [
  "openzeppelin_introspection",
  "openzeppelin_utils",
 ]
 
 [[package]]
 name = "openzeppelin_account"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
+version = "0.15.1"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.1#2f8a93d762858714095a1d391afffa9e21df6983"
 dependencies = [
  "openzeppelin_introspection",
  "openzeppelin_utils",
 ]
 
-[[package]]
-name = "openzeppelin_finance"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
-dependencies = [
- "openzeppelin_access",
- "openzeppelin_token",
-]
-
 [[package]]
 name = "openzeppelin_governance"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
+version = "0.15.1"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.1#2f8a93d762858714095a1d391afffa9e21df6983"
 dependencies = [
  "openzeppelin_access",
  "openzeppelin_introspection",
 ]
 
 [[package]]
 name = "openzeppelin_introspection"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
-
-[[package]]
-name = "openzeppelin_merkle_tree"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
+version = "0.15.1"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.1#2f8a93d762858714095a1d391afffa9e21df6983"
 
 [[package]]
 name = "openzeppelin_presets"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
+version = "0.15.1"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.1#2f8a93d762858714095a1d391afffa9e21df6983"
 dependencies = [
  "openzeppelin_access",
  "openzeppelin_account",
- "openzeppelin_finance",
  "openzeppelin_introspection",
  "openzeppelin_token",
  "openzeppelin_upgrades",
 ]
 
 [[package]]
 name = "openzeppelin_security"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
+version = "0.15.1"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.1#2f8a93d762858714095a1d391afffa9e21df6983"
 
 [[package]]
 name = "openzeppelin_token"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
+version = "0.15.1"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.1#2f8a93d762858714095a1d391afffa9e21df6983"
 dependencies = [
  "openzeppelin_account",
  "openzeppelin_governance",
@@ -106,10 +89,10 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_upgrades"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
+version = "0.15.1"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.1#2f8a93d762858714095a1d391afffa9e21df6983"
 
 [[package]]
 name = "openzeppelin_utils"
-version = "0.17.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.17.0#bf5d02c25c989ccc24f3ab42ec649617d3f21289"
+version = "0.15.1"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.15.1#2f8a93d762858714095a1d391afffa9e21df6983"

crates/katana/contracts/Scarb.toml

@@ -8,7 +8,6 @@ edition = "2023_11"
 # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html
 
 [workspace.dependencies]
-starknet = "2.8.2"
-openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.17.0" }
-snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.31.0" }
-assert_macros = "2.8.2"
+starknet = "2.7.0"
+openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.15.1" }
+snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.26.0" }

crates/katana/contracts/account/Scarb.toml

@@ -11,3 +11,4 @@ openzeppelin.workspace = true
 
 [[target.starknet-contract]]
 sierra = true
+casm = true

crates/katana/contracts/account/src/lib.cairo

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.17.0 (presets/account.cairo)
+// OpenZeppelin Contracts for Cairo v0.15.1 (presets/account.cairo)
 
 /// # Account Preset
 ///
@@ -27,13 +27,13 @@ pub mod Account {
     impl UpgradeableInternalImpl = UpgradeableComponent::InternalImpl<ContractState>;
 
     #[storage]
-    pub struct Storage {
+    struct Storage {
         #[substorage(v0)]
-        pub account: AccountComponent::Storage,
+        account: AccountComponent::Storage,
         #[substorage(v0)]
-        pub src5: SRC5Component::Storage,
+        src5: SRC5Component::Storage,
         #[substorage(v0)]
-        pub upgradeable: UpgradeableComponent::Storage
+        upgradeable: UpgradeableComponent::Storage
     }
 
     #[event]

crates/katana/contracts/messaging/cairo/Makefile

@@ -1,5 +1,5 @@
 ACCOUNT_L2=./account_l2.json
-ACCOUNT_L2_ADDR=0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba
+ACCOUNT_L2_ADDR=0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891
 L2_PRIVATE_KEY=0x1800000000300000180000000000030000000000003006001800006600
 
 # Build files helpers.
@@ -40,7 +40,7 @@ send_msg_struct_l1:
 # ** L2 <-> L3 **
 #
 ACCOUNT_L3=./account_l3.json
-ACCOUNT_L3_ADDR=0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba
+ACCOUNT_L3_ADDR=0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891
 L3_PRIVATE_KEY=0x1800000000300000180000000000030000000000003006001800006600
 
 L2_APPCHAIN_MSG_ADDR=0x0368407c4a0e075c693cf372dd735750df7289c6b5d06234615018456e658591

crates/katana/contracts/messaging/cairo/account_l2.json

@@ -9,6 +9,6 @@
   "deployment": {
     "status": "deployed",
     "class_hash": "0x05400e90f7e0ae78bd02c77cd75527280470e2fe19c54970dd79dc37a9d3645c",
-    "address": "0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba"
+    "address": "0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891"
   }
 }

crates/katana/contracts/messaging/cairo/account_l3.json

@@ -9,6 +9,6 @@
   "deployment": {
     "status": "deployed",
     "class_hash": "0x05400e90f7e0ae78bd02c77cd75527280470e2fe19c54970dd79dc37a9d3645c",
-    "address": "0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba"
+    "address": "0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891"
   }
 }

crates/katana/contracts/messaging/l3.messaging.json

@@ -2,7 +2,7 @@
   "chain": "starknet",
   "rpc_url": "http://127.0.0.1:5050",
   "contract_address": "0x0368407c4a0e075c693cf372dd735750df7289c6b5d06234615018456e658591",
-  "sender_address": "0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba",
+  "sender_address": "0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891",
   "private_key": "0x1800000000300000180000000000030000000000003006001800006600",
   "interval": 2,
   "from_block": 0

crates/katana/contracts/messaging/solidity/Makefile

@@ -9,7 +9,7 @@ export $(shell sed 's/=.*//' .env)
 
 # Addresses fixed here for easy testing.
 C_MSG_L2_ADDR=0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512
-L2_ACCOUNT=0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba
+L2_ACCOUNT=0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891
 L2_CONTRACT_ADDR=0x609f8e7a76b6cc36f3ff86f09f6e5fdd0e6320f117d817e4344c1bf9fac7d67
 
 deploy_messaging_contracts:

crates/katana/executor/tests/executor.rs

@@ -28,7 +28,7 @@ fn test_executor_with_valid_blocks_impl<EF: ExecutorFactory>(
     // the contract address of the main account used to send most of the transactions (see the
     // `valid_blocks` fixture)
     let main_account =
-        address!("0x6677fe62ee39c7b07401f754138502bab7fac99d2d3c5d37df7d1c6fab10819");
+        address!("0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891");
     // the contract address of the account deployed using the `DeployAccount` tx (see the
     // `valid_blocks` fixture)
     let new_acc = address!("0x3ddfa445a70b927497249f94ff7431fc2e2abc761a34417fd4891beb7c2db85");
@@ -56,7 +56,11 @@ fn test_executor_with_valid_blocks_impl<EF: ExecutorFactory>(
 
     // ensure that all transactions succeeded, if not panic with the error message and tx index
     let has_failed = transactions.iter().enumerate().find_map(|(i, (_, res))| {
-        if let ExecutionResult::Failed { error } = res { Some((i, error)) } else { None }
+        if let ExecutionResult::Failed { error } = res {
+            Some((i, error))
+        } else {
+            None
+        }
     });
 
     if let Some((pos, error)) = has_failed {
@@ -196,7 +200,8 @@ fn test_executor_with_valid_blocks_impl<EF: ExecutorFactory>(
             felt!("0x12"),
             felt!("0x1b39"),
             felt!("0x0"),
-            felt!("0x6677fe62ee39c7b07401f754138502bab7fac99d2d3c5d37df7d1c6fab10819"),
+            // this address must match with the `sender_address` in `valid_blocks` fixture
+            felt!("0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891"),
         ],
     );
 

crates/katana/executor/tests/fixtures/mod.rs

@@ -89,8 +89,10 @@ pub fn valid_blocks() -> [ExecutableBlock; 3] {
     let chain_id = ChainId::parse("KATANA").unwrap();
     let sequencer_address = ContractAddress(1u64.into());
 
+    // one of the accounts that is generated by the `genesis` fixture. also one of the
+    // accounts generated by katana.
     let sender_address =
-        address!("0x6677fe62ee39c7b07401f754138502bab7fac99d2d3c5d37df7d1c6fab10819");
+        address!("0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891");
 
     let gas_prices = GasPrices { eth: 100 * u128::pow(10, 9), strk: 100 * u128::pow(10, 9) };
 

crates/katana/node-bindings/src/json.rs

@@ -34,7 +34,7 @@ pub struct Fields<T = serde_json::Value> {
 ///   "timestamp": "2024-10-10T14:55:04.452924Z",
 ///   "level": "INFO",
 ///   "fields": {
-///     "message": "{\"accounts\":[[\"0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba\",{\"balance\":\"0x21e19e0c9bab2400000\",\"class_hash\":\"0x5400e90f7e0ae78bd02c77cd75527280470e2fe19c54970dd79dc37a9d3645c\",\"private_key\":\"0x1800000000300000180000000000030000000000003006001800006600\",\"public_key\":\"0x2b191c2f3ecf685a91af7cf72a43e7b90e2e41220175de5c4f7498981b10053\"}]],\"seed\":\"0\"}"
+///     "message": "{\"accounts\":[[\"0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891\",{\"balance\":\"0x21e19e0c9bab2400000\",\"class_hash\":\"0x5400e90f7e0ae78bd02c77cd75527280470e2fe19c54970dd79dc37a9d3645c\",\"private_key\":\"0x1800000000300000180000000000030000000000003006001800006600\",\"public_key\":\"0x2b191c2f3ecf685a91af7cf72a43e7b90e2e41220175de5c4f7498981b10053\"}]],\"seed\":\"0\"}"
 ///   },
 ///   "target": "katana::cli"
 /// }

crates/katana/primitives/src/genesis/constant.rs

@@ -67,13 +67,13 @@ pub const DEFAULT_LEGACY_UDC_CLASS_HASH: ClassHash =
 /// The compiled class hash of DEFAULT_LEGACY_UDC_CASM.
 pub const DEFAULT_LEGACY_UDC_COMPILED_CLASS_HASH: CompiledClassHash = DEFAULT_LEGACY_UDC_CLASS_HASH;
 
-/// The class hash of DEFAULT_ACCOUNT_CLASS.
+/// The class hash of [`DEFAULT_ACCOUNT_CLASS`].
 pub const DEFAULT_ACCOUNT_CLASS_HASH: ClassHash =
-    felt!("0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2");
+    felt!("0x06599b8b9b4b4d65da09c8f5bede6046908452fa8e112d6ad4a2f979a5e65bbd");
 
-/// The compiled class hash of DEFAULT_ACCOUNT_CLASS.
+/// The compiled class hash of [`DEFAULT_ACCOUNT_CLASS`].
 pub const DEFAULT_ACCOUNT_COMPILED_CLASS_HASH: CompiledClassHash =
-    felt!("0x01b97e0ef7f5c2f2b7483cda252a3accc7f917773fb69d4bd290f92770069aec");
+    felt!("0x0138105ded3d2e4ea1939a0bc106fb80fd8774c9eb89c1890d4aeac88e6a1b27");
 
 /// Cartridge Controller account class hash.
 pub const CONTROLLER_CLASS_HASH: ClassHash =

crates/katana/rpc/rpc/tests/starknet.rs

@@ -413,7 +413,7 @@ async fn send_txs_with_insufficient_fee(
         // in no fee mode, setting the max fee (which translates to the tx run resources) lower
         // than the amount required would result in a validation failure. due to insufficient
         // resources.
-        assert_starknet_err!(dbg!(res).unwrap_err(), StarknetError::ValidationFailure(_));
+        assert_starknet_err!(res.unwrap_err(), StarknetError::ValidationFailure(_));
     } else {
         assert_starknet_err!(res.unwrap_err(), StarknetError::InsufficientMaxFee);
     }

crates/torii/types-test/dojo_dev.toml

@@ -11,6 +11,6 @@ description = "Graphql types testing"
 default = "types_test"
 
 [env]
-account_address = "0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba"
+account_address = "0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891"
 private_key = "0x1800000000300000180000000000030000000000003006001800006600"
 rpc_url = "http://localhost:5050/"

examples/rpc/starknet/starknet_getClass.hurl

@@ -5,7 +5,7 @@ Content-Type: application/json
     "method": "starknet_getClass",
     "params": [
         "latest",
-        "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2"
+        "0x06599b8b9b4b4d65da09c8f5bede6046908452fa8e112d6ad4a2f979a5e65bbd" // default katana account class hash
     ],
     "id":1
 }

examples/rpc/starknet/starknet_getClassAt.hurl

@@ -5,7 +5,7 @@ Content-Type: application/json
     "method": "starknet_getClassAt",
     "params": [
         "latest",
-        "0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba"
+        "0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891"
     ],
     "id":1
 }

examples/rpc/starknet/starknet_getClassHashAt.hurl

@@ -5,7 +5,7 @@ Content-Type: application/json
   "method": "starknet_getClassHashAt",
   "params": [
     "pending",
-    "0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba"
+    "0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891"
   ],
   "id": 1
 }

examples/rpc/starknet/starknet_getNonce.hurl

@@ -5,7 +5,7 @@ Content-Type: application/json
     "method": "starknet_getNonce",
     "params": [
         "latest",
-        "0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba"
+        "0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891"
     ],
     "id":1
 }