fix: add explicit edition for test cairo contracts across the repo (#…

…2974) fix: add explicit edition for test cairo contracts
dojoengine · Jan 30, 2025 · 687334d · 687334d
1 parent 0adbcdd
commit 687334d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/bin/sozo/tests/test_data/invalid_cairo_version/Scarb.toml b/bin/sozo/tests/test_data/invalid_cairo_version/Scarb.toml
@@ -2,3 +2,4 @@
 cairo-version = "1.2.0"
 name = "sozo_test"
 version = "0.3.1-rc7"
+edition = "2023_01"
diff --git a/crates/benches/contracts/Scarb.toml b/crates/benches/contracts/Scarb.toml
@@ -2,6 +2,7 @@
 cairo-version = "=2.9.1"
 name = "benches"
 version = "1.0.0-rc.0"
+edition = "2023_01"
 
 [[target.starknet-contract]]
 build-external-contracts = ["dojo::world::world_contract::world"]

diff --git a/crates/katana/contracts/messaging/cairo/Scarb.toml b/crates/katana/contracts/messaging/cairo/Scarb.toml
@@ -1,6 +1,7 @@
 [package]
 name = "katana_messaging"
 version.workspace = true
+edition = "2023_01"
 
 [dependencies]
 starknet.workspace = true

diff --git a/crates/katana/contracts/messaging/cairo/src/appchain_messaging.cairo b/crates/katana/contracts/messaging/cairo/src/appchain_messaging.cairo
@@ -238,10 +238,11 @@ mod appchain_messaging {
             selector: felt252,
             payload: Span<felt252>
         ) -> (felt252, felt252) {
+            let from_address = starknet::get_caller_address();
             let nonce = self.sn_to_appc_nonce.read() + 1;
             self.sn_to_appc_nonce.write(nonce);
 
-            let msg_hash = compute_hash_sn_to_appc(nonce, to_address, selector, payload);
+            let msg_hash = compute_hash_sn_to_appc(from_address, to_address, selector, payload, nonce);
 
             self
                 .emit(