chore: bump to 1.7.0

Author: glihm

.github/workflows/test.yaml

@@ -9,8 +9,6 @@ on:
 jobs:
   sozo-test:
     runs-on: ubuntu-latest
-    env:
-      DOJO_VERSION: v1.7.0-alpha.4
     steps:
       - uses: actions/checkout@v3
       - uses: software-mansion/setup-scarb@v1

.tool-versions

@@ -1,2 +1,2 @@
-sozo 1.7.0-alpha.4
+sozo 1.7.0
 scarb 2.12.2

Scarb.lock

@@ -3,30 +3,33 @@ version = 1
 
 [[package]]
 name = "dojo"
-version = "1.7.0-alpha.4"
-source = "git+https://github.com/dojoengine/dojo?tag=v1.7.0-alpha.4#7b78108ce7aea7753c0a9e34cb83465a76bbf2e4"
+version = "1.7.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:43866af1b23659c992fcf786f7f69429689eb684d42ffb77a351490e763bf915"
 dependencies = [
- "dojo_macros",
+ "dojo_cairo_macros",
 ]
 
+[[package]]
+name = "dojo_cairo_macros"
+version = "1.7.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:53d38987d9a0acc9493282711cd504ad4920fd4cd31f230deb5ff4ea11183958"
+
 [[package]]
 name = "dojo_cairo_test"
-version = "1.7.0-alpha.4"
-source = "git+https://github.com/dojoengine/dojo?tag=v1.7.0-alpha.4#7b78108ce7aea7753c0a9e34cb83465a76bbf2e4"
+version = "1.7.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:3e95042deeef76bd43c8c05b15f8757060663269aed7e31f9c6c4a3934a5cba4"
 dependencies = [
  "dojo",
 ]
 
-[[package]]
-name = "dojo_macros"
-version = "1.7.0-alpha.4"
-source = "git+https://github.com/dojoengine/dojo?tag=v1.7.0-alpha.4#7b78108ce7aea7753c0a9e34cb83465a76bbf2e4"
-
 [[package]]
 name = "dojo_starter"
-version = "1.7.0-alpha.4"
+version = "1.7.0"
 dependencies = [
  "dojo",
+ "dojo_cairo_macros",
  "dojo_cairo_test",
- "dojo_macros",
 ]

Scarb.toml

@@ -1,25 +1,25 @@
 [package]
 cairo-version = "2.12.2"
 name = "dojo_starter"
-version = "1.7.0-alpha.4"
+version = "1.7.0"
 edition = "2024_07"
 
 [cairo]
 sierra-replace-ids = true
 
 [scripts]
-migrate = "sozo build && sozo migrate"                      # scarb run migrate
-spawn = "sozo execute dojo_starter-actions spawn --wait"    # scarb run spawn
-move = "sozo execute dojo_starter-actions move -c 1 --wait" # scarb run move
+migrate = "sozo build && sozo migrate"
+spawn = "sozo execute dojo_starter-actions spawn --wait"
+move = "sozo execute dojo_starter-actions move -c 1 --wait"
 
 [dependencies]
-dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.7.0-alpha.4" }
-dojo_macros = { git = "https://github.com/dojoengine/dojo", tag = "v1.7.0-alpha.4" }
+dojo = "1.7.0"
+dojo_cairo_macros = "1.7.0"
 starknet = "2.12.2"
 
 [[target.starknet-contract]]
 build-external-contracts = ["dojo::world::world_contract::world"]
 
 [dev-dependencies]
 cairo_test = "2.12.2"
-dojo_cairo_test = { git = "https://github.com/dojoengine/dojo", tag = "v1.7.0-alpha.4" }
+dojo_cairo_test = "1.7.0"

src/tests/test_world.cairo

@@ -1,7 +1,7 @@
 #[cfg(test)]
 mod tests {
     use dojo::model::{ModelStorage, ModelStorageTest};
-    use dojo::world::WorldStorageTrait;
+    use dojo::world::{WorldStorageTrait, world};
     use dojo_cairo_test::{
         ContractDef, ContractDefTrait, NamespaceDef, TestResource, WorldStorageTestTrait,
         spawn_test_world,
@@ -14,10 +14,10 @@ mod tests {
         let ndef = NamespaceDef {
             namespace: "dojo_starter",
             resources: [
-                TestResource::Model(m_Position::TEST_CLASS_HASH.into()),
-                TestResource::Model(m_Moves::TEST_CLASS_HASH.into()),
-                TestResource::Event(actions::e_Moved::TEST_CLASS_HASH.into()),
-                TestResource::Contract(actions::TEST_CLASS_HASH.into()),
+                TestResource::Model(m_Position::TEST_CLASS_HASH),
+                TestResource::Model(m_Moves::TEST_CLASS_HASH),
+                TestResource::Event(actions::e_Moved::TEST_CLASS_HASH),
+                TestResource::Contract(actions::TEST_CLASS_HASH),
             ]
                 .span(),
         };
@@ -40,7 +40,7 @@ mod tests {
         let ndef = namespace_def();
 
         // Register the resources.
-        let mut world = spawn_test_world([ndef].span());
+        let mut world = spawn_test_world(world::TEST_CLASS_HASH, [ndef].span());
 
         // Ensures permissions and initializations are synced.
         world.sync_perms_and_inits(contract_defs());
@@ -70,7 +70,7 @@ mod tests {
         let caller: ContractAddress = 0.try_into().unwrap();
 
         let ndef = namespace_def();
-        let mut world = spawn_test_world([ndef].span());
+        let mut world = spawn_test_world(world::TEST_CLASS_HASH, [ndef].span());
         world.sync_perms_and_inits(contract_defs());
 
         let (contract_address, _) = world.dns(@"actions").unwrap();