Merge pull request #62 from dojoengine/v7-array

V7 array
dojoengine · Jun 14, 2024 · 87ade2b · 87ade2b
2 parents b4b5f91 + 61cd9c2
commit 87ade2b
Show file tree

Hide file tree

Showing 17 changed files with 1,480 additions and 61 deletions.
diff --git a/.github/workflows/test.yaml b/.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 v0.7.0-alpha.5
+      - run: /home/runner/.config/.dojo/bin/dojoup -v v0.7.0
       - run: |
           /home/runner/.config/.dojo/bin/sozo build
           /home/runner/.config/.dojo/bin/sozo test

diff --git a/Scarb.lock b/Scarb.lock
@@ -3,8 +3,8 @@ version = 1
 
 [[package]]
 name = "dojo"
-version = "0.6.0"
-source = "git+https://github.com/dojoengine/dojo?tag=v0.7.0-alpha.5#328004d65bbbf7692c26f030b75fa95b7947841d"
+version = "0.7.0"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.7.0#34b13caa785c1149558d28f1a9d9fbd700c4aa2d"
 dependencies = [
  "dojo_plugin",
 ]
@@ -16,7 +16,7 @@ source = "git+https://github.com/dojoengine/dojo?tag=v0.3.11#1e651b5d4d3b79b14a7
 
 [[package]]
 name = "dojo_starter"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
  "dojo",
 ]
diff --git a/Scarb.toml b/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
-cairo-version = "2.5.4"
+cairo-version = "2.6.3"
 name = "dojo_starter"
-version = "0.6.0"
+version = "0.7.0"
 
 [cairo]
 sierra-replace-ids = true
@@ -12,7 +12,7 @@ spawn = "./scripts/spawn.sh"
 move = "./scripts/move.sh"
 
 [dependencies]
-dojo = { git = "https://github.com/dojoengine/dojo", tag = "v0.7.0-alpha.5" }
+dojo = { git = "https://github.com/dojoengine/dojo", tag = "v0.7.0" }
 
 [[target.dojo]]
 
@@ -24,7 +24,7 @@ rpc_url = "http://localhost:5050/"
 # Default account for katana with seed = 0
 account_address = "0xb3ff441a68610b30fd5e2abbf3a1548eb6ba6f3559f2862bf2dc757e5828ca"
 private_key = "0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a"
-world_address = "0x3b5a8147f17a7ab5d5857a24d0d98574011445db0cab5ac75f588644b2b1517"  # Update this line with your world address
+#world_address = "0x559e9e223d83b6a3121ba33b1339323a3bdf4c7c302078fb3e755fddc68a2fb"  # Update this line with your world address
 
 [tool.dojo.world]
 name = "Dojo starter"

diff --git a/manifests/dev/abis/base/contracts/dojo_starter_systems_actions_actions.json b/manifests/dev/abis/base/contracts/dojo_starter_systems_actions_actions.json
@@ -93,7 +93,7 @@
         "name": "spawn",
         "inputs": [],
         "outputs": [],
-        "state_mutability": "view"
+        "state_mutability": "external"
       },
       {
         "type": "function",
@@ -105,7 +105,7 @@
           }
         ],
         "outputs": [],
-        "state_mutability": "view"
+        "state_mutability": "external"
       }
     ]
   },

diff --git a/manifests/dev/abis/base/dojo_world_world.json b/manifests/dev/abis/base/dojo_world_world.json
@@ -555,6 +555,10 @@
           {
             "name": "program_output",
             "type": "dojo::interfaces::ProgramOutput"
+          },
+          {
+            "name": "program_hash",
+            "type": "core::felt252"
           }
         ],
         "outputs": [],
@@ -573,7 +577,19 @@
     "items": [
       {
         "type": "function",
-        "name": "set_program_hash",
+        "name": "set_differ_program_hash",
+        "inputs": [
+          {
+            "name": "program_hash",
+            "type": "core::felt252"
+          }
+        ],
+        "outputs": [],
+        "state_mutability": "external"
+      },
+      {
+        "type": "function",
+        "name": "set_merger_program_hash",
         "inputs": [
           {
             "name": "program_hash",
@@ -585,7 +601,18 @@
       },
       {
         "type": "function",
-        "name": "get_program_hash",
+        "name": "get_differ_program_hash",
+        "inputs": [],
+        "outputs": [
+          {
+            "type": "core::felt252"
+          }
+        ],
+        "state_mutability": "view"
+      },
+      {
+        "type": "function",
+        "name": "get_merger_program_hash",
         "inputs": [],
         "outputs": [
           {
@@ -831,7 +858,19 @@
   },
   {
     "type": "event",
-    "name": "dojo::config::component::Config::ProgramHashUpdate",
+    "name": "dojo::config::component::Config::DifferProgramHashUpdate",
+    "kind": "struct",
+    "members": [
+      {
+        "name": "program_hash",
+        "type": "core::felt252",
+        "kind": "data"
+      }
+    ]
+  },
+  {
+    "type": "event",
+    "name": "dojo::config::component::Config::MergerProgramHashUpdate",
     "kind": "struct",
     "members": [
       {
@@ -859,8 +898,13 @@
     "kind": "enum",
     "variants": [
       {
-        "name": "ProgramHashUpdate",
-        "type": "dojo::config::component::Config::ProgramHashUpdate",
+        "name": "DifferProgramHashUpdate",
+        "type": "dojo::config::component::Config::DifferProgramHashUpdate",
+        "kind": "nested"
+      },
+      {
+        "name": "MergerProgramHashUpdate",
+        "type": "dojo::config::component::Config::MergerProgramHashUpdate",
         "kind": "nested"
       },
       {