dojoengine · kariy · Oct 14, 2024 · Oct 12, 2024 · Oct 12, 2024 · Oct 12, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/sozo/src/commands/options/account/controller.rs b/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!("0x6162896d1d7ab204c7ccac6dd5f8e9e7c25ecd5ae4fcb4ad32e57786bb46e03");
+        let user_addr = felt!("0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891");
 
         let policies =
             collect_policies(WorldAddressOrName::Address(world_addr), user_addr, &config).unwrap();

diff --git a/bin/sozo/tests/test_data/policies.json b/bin/sozo/tests/test_data/policies.json
@@ -128,7 +128,7 @@
     "method": "set_facts_registry"
   },
   {
-    "target": "0x6162896d1d7ab204c7ccac6dd5f8e9e7c25ecd5ae4fcb4ad32e57786bb46e03",
+    "target": "0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891",
     "method": "__declare_transaction__"
   },
   {

diff --git a/crates/benches/contracts/Scarb.toml b/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 = "0x6162896d1d7ab204c7ccac6dd5f8e9e7c25ecd5ae4fcb4ad32e57786bb46e03"
+account_address = "0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891"
 private_key = "0x1800000000300000180000000000030000000000003006001800006600"
 
 [tool.dojo.world.namespace]

diff --git a/crates/dojo-world/src/metadata_test.rs b/crates/dojo-world/src/metadata_test.rs
@@ -62,7 +62,7 @@ async fn get_full_dojo_metadata_from_workspace() {
     assert!(
         env.account_address
             .unwrap()
-            .eq("0x6162896d1d7ab204c7ccac6dd5f8e9e7c25ecd5ae4fcb4ad32e57786bb46e03")
+            .eq("0x5a37d83d451063858217e9c510d6f45d6bd37ff8664a7c0466329316f7a2891")
     );
 
     assert!(env.private_key.is_some());

diff --git a/crates/katana/cairo/Cargo.toml b/crates/katana/cairo/Cargo.toml
@@ -18,4 +18,4 @@ cairo-lang-starknet = "2.7.0"
 cairo-lang-starknet-classes = "2.7.0"
 cairo-lang-utils = "2.7.0"
 cairo-vm = "1.0.1"
-starknet_api = { git = "https://github.com/dojoengine/sequencer", tag = "v0.8.0-rc3.1" }
+starknet_api = { git = "https://github.com/dojoengine/sequencer", tag = "v0.8.0-rc3.2" }
diff --git a/crates/katana/contracts/.tool-versions b/crates/katana/contracts/.tool-versions
@@ -1 +1 @@
-scarb 2.8.3
+scarb 2.7.0
diff --git a/crates/katana/contracts/Makefile b/crates/katana/contracts/Makefile
@@ -0,0 +1,14 @@
+CONTRACT_CLASS_SUFFIX := .contract_class.json
+# Directory where the compiled classes will be stored
+BUILD_DIR := ./build
+
+## ---- Default Pre-deployed Account
+
+ORIGINAL_CLASS_NAME := katana_account_Account$(CONTRACT_CLASS_SUFFIX)
+CLASS_NAME := default_account.json
+
+$(BUILD_DIR): ./account/src/*
+	scarb build -p katana_account
+	mv target/dev/$(ORIGINAL_CLASS_NAME) $(BUILD_DIR)/$(CLASS_NAME)
+
+## ----
diff --git a/crates/katana/contracts/Scarb.lock b/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"
diff --git a/crates/katana/contracts/Scarb.toml b/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" }
diff --git a/crates/katana/contracts/account/Scarb.toml b/crates/katana/contracts/account/Scarb.toml
@@ -11,3 +11,4 @@ openzeppelin.workspace = true
 
 [[target.starknet-contract]]
 sierra = true
+casm = true
diff --git a/crates/katana/contracts/account/src/lib.cairo b/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]

diff --git a/...es/katana/contracts/compiled/account.json → crates/katana/contracts/build/account.json b/...es/katana/contracts/compiled/account.json → crates/katana/contracts/build/account.json
diff --git a/...d/account_with_dummy_validate.sierra.json → ...d/account_with_dummy_validate.sierra.json b/...d/account_with_dummy_validate.sierra.json → ...d/account_with_dummy_validate.sierra.json
diff --git a/.../compiled/argent_ArgentAccount_0.3.0.json → ...cts/build/argent_ArgentAccount_0.3.0.json b/.../compiled/argent_ArgentAccount_0.3.0.json → ...cts/build/argent_ArgentAccount_0.3.0.json
diff --git a/.../compiled/argent_ArgentAccount_0.3.1.json → ...cts/build/argent_ArgentAccount_0.3.1.json b/.../compiled/argent_ArgentAccount_0.3.1.json → ...cts/build/argent_ArgentAccount_0.3.1.json
diff --git a/...a/contracts/compiled/cairo1_contract.json → ...tana/contracts/build/cairo1_contract.json b/...a/contracts/compiled/cairo1_contract.json → ...tana/contracts/build/cairo1_contract.json
diff --git a/...ller_CartridgeAccount.contract_class.json → ...ller_CartridgeAccount.contract_class.json b/...ller_CartridgeAccount.contract_class.json → ...ller_CartridgeAccount.contract_class.json
diff --git a/crates/katana/contracts/build/default_account.json b/crates/katana/contracts/build/default_account.json
diff --git a/crates/katana/contracts/compiled/erc20.json → crates/katana/contracts/build/erc20.json b/crates/katana/contracts/compiled/erc20.json → crates/katana/contracts/build/erc20.json
diff --git a/crates/katana/contracts/compiled/test.json → crates/katana/contracts/build/test.json b/crates/katana/contracts/compiled/test.json → crates/katana/contracts/build/test.json
diff --git a/...ontracts/compiled/universal_deployer.json → ...a/contracts/build/universal_deployer.json b/...ontracts/compiled/universal_deployer.json → ...a/contracts/build/universal_deployer.json
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,3 +11,4 @@ openzeppelin.workspace = true

		[[target.starknet-contract]]
		sierra = true
		casm = true