Merge pull request #74 from glihm/main

fix: update to 1.0.0-alpha.4

.github/workflows/test.yaml

@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: curl -L https://install.dojoengine.org | bash
-      - run: /home/runner/.config/.dojo/bin/dojoup -v v1.0.0-alpha.3
+      - run: /home/runner/.config/.dojo/bin/dojoup -v v1.0.0-alpha.4
       - run: |
           /home/runner/.config/.dojo/bin/sozo build
           /home/runner/.config/.dojo/bin/sozo test

Scarb.lock

@@ -4,7 +4,7 @@ version = 1
 [[package]]
 name = "dojo"
 version = "0.7.3"
-source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.3#a6a7724380169372336e886fb36f31f56e7d0d8a"
+source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.4#d08c46191fc1b4c4f90816cef4787cb8db02988f"
 dependencies = [
  "dojo_plugin",
 ]

Scarb.toml

@@ -12,7 +12,7 @@ spawn = "./scripts/spawn.sh"
 move = "./scripts/move.sh"
 
 [dependencies]
-dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.3" }
+dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.4" }
 
 [[target.dojo]]
 

manifests/dev/base/abis/dojo-world.json

@@ -394,13 +394,13 @@
         "type": "function",
         "name": "is_owner",
         "inputs": [
-          {
-            "name": "address",
-            "type": "core::starknet::contract_address::ContractAddress"
-          },
           {
             "name": "resource",
             "type": "core::felt252"
+          },
+          {
+            "name": "address",
+            "type": "core::starknet::contract_address::ContractAddress"
           }
         ],
         "outputs": [
@@ -414,13 +414,13 @@
         "type": "function",
         "name": "grant_owner",
         "inputs": [
-          {
-            "name": "address",
-            "type": "core::starknet::contract_address::ContractAddress"
-          },
           {
             "name": "resource",
             "type": "core::felt252"
+          },
+          {
+            "name": "address",
+            "type": "core::starknet::contract_address::ContractAddress"
           }
         ],
         "outputs": [],
@@ -430,13 +430,13 @@
         "type": "function",
         "name": "revoke_owner",
         "inputs": [
-          {
-            "name": "address",
-            "type": "core::starknet::contract_address::ContractAddress"
-          },
           {
             "name": "resource",
             "type": "core::felt252"
+          },
+          {
+            "name": "address",
+            "type": "core::starknet::contract_address::ContractAddress"
           }
         ],
         "outputs": [],
@@ -975,6 +975,33 @@
       }
     ]
   },
+  {
+    "type": "event",
+    "name": "dojo::world::world_contract::world::StoreUpdateMember",
+    "kind": "struct",
+    "members": [
+      {
+        "name": "table",
+        "type": "core::felt252",
+        "kind": "data"
+      },
+      {
+        "name": "entity_id",
+        "type": "core::felt252",
+        "kind": "data"
+      },
+      {
+        "name": "member_selector",
+        "type": "core::felt252",
+        "kind": "data"
+      },
+      {
+        "name": "values",
+        "type": "core::array::Span::<core::felt252>",
+        "kind": "data"
+      }
+    ]
+  },
   {
     "type": "event",
     "name": "dojo::world::world_contract::world::StoreDelRecord",
@@ -1156,6 +1183,11 @@
         "type": "dojo::world::world_contract::world::StoreUpdateRecord",
         "kind": "nested"
       },
+      {
+        "name": "StoreUpdateMember",
+        "type": "dojo::world::world_contract::world::StoreUpdateMember",
+        "kind": "nested"
+      },
       {
         "name": "StoreDelRecord",
         "type": "dojo::world::world_contract::world::StoreDelRecord",

manifests/dev/base/contracts/dojo_starter-actions-7a1c7102.toml

@@ -1,6 +1,6 @@
 kind = "DojoContract"
-class_hash = "0x58bba620da6e6411af49f295669985f8832c56caae31903e1078e149356115f"
-original_class_hash = "0x58bba620da6e6411af49f295669985f8832c56caae31903e1078e149356115f"
+class_hash = "0x417cbd6fb05fb73eef19c2eefffeb9897007add48b949f0c7ce234566cb8604"
+original_class_hash = "0x417cbd6fb05fb73eef19c2eefffeb9897007add48b949f0c7ce234566cb8604"
 base_class_hash = "0x0"
 abi = "manifests/dev/base/abis/contracts/dojo_starter-actions-7a1c7102.json"
 reads = []

manifests/dev/base/dojo-world.toml

@@ -1,6 +1,6 @@
 kind = "Class"
-class_hash = "0x32fb65ebfe6d91bb4b7ba0640650722c43ca0c917f5fc0f649ee2ecf720cde"
-original_class_hash = "0x32fb65ebfe6d91bb4b7ba0640650722c43ca0c917f5fc0f649ee2ecf720cde"
+class_hash = "0x2178527e9556d1aa21d3c2961d28f9114fcfed81b4c3674ed591c50ce46cc9d"
+original_class_hash = "0x2178527e9556d1aa21d3c2961d28f9114fcfed81b4c3674ed591c50ce46cc9d"
 abi = "manifests/dev/base/abis/dojo-world.json"
 tag = "dojo-world"
 manifest_name = "dojo-world"

src/tests/test_world.cairo

@@ -27,28 +27,29 @@ mod tests {
         let actions_system = IActionsDispatcher { contract_address };
         // call spawn()
         actions_system.spawn();
-    // // call move with direction right
-    // actions_system.move(Direction::Right);
 
-    // // Check world state
-    // let moves = get!(world, caller, Moves);
+        // call move with direction right
+        actions_system.move(Direction::Right);
 
-    // // casting right direction
-    // let right_dir_felt: felt252 = Direction::Right.into();
+        // Check world state
+        let moves = get!(world, caller, Moves);
 
-    // // check moves
-    // assert(moves.remaining == 99, 'moves is wrong');
+        // casting right direction
+        let right_dir_felt: felt252 = Direction::Right.into();
 
-    // // check last direction
-    // assert(moves.last_direction.into() == right_dir_felt, 'last direction is wrong');
+        // check moves
+        assert(moves.remaining == 99, 'moves is wrong');
 
-    // // get new_position
-    // let new_position = get!(world, caller, Position);
+        // check last direction
+        assert(moves.last_direction.into() == right_dir_felt, 'last direction is wrong');
 
-    // // check new position x
-    // assert(new_position.vec.x == 11, 'position x is wrong');
+        // get new_position
+        let new_position = get!(world, caller, Position);
 
-    // // check new position y
-    // assert(new_position.vec.y == 10, 'position y is wrong');
+        // check new position x
+        assert(new_position.vec.x == 11, 'position x is wrong');
+
+        // check new position y
+        assert(new_position.vec.y == 10, 'position y is wrong');
     }
 }