alpha 1

dojoengine · Jul 19, 2024 · 9b3554c · 9b3554c
1 parent 3603691
commit 9b3554c
Show file tree

Hide file tree

Showing 29 changed files with 848 additions and 326 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 v1.0.0-alpha.0
+      - run: /home/runner/.config/.dojo/bin/dojoup -v v1.0.0-alpha.1
       - run: |
           /home/runner/.config/.dojo/bin/sozo build
           /home/runner/.config/.dojo/bin/sozo test

diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ sozo build
 sozo migrate apply
 
 # Start Torii
-torii --world 0x2c8633f80cbeb14ed6d8b24f82fb465c9c1e0574ee40897f7188b569908337f --allowed-origins "*"
+torii --world 0x16a15cc2a571bf95eef741c701a5657e4dbf1a5b9ce3785b4060b60f58913f4 --allowed-origins "*"
 ```
 
 ---

diff --git a/Scarb.lock b/Scarb.lock
@@ -4,15 +4,15 @@ version = 1
 [[package]]
 name = "dojo"
 version = "0.7.3"
-source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.0#2e04f54ceaa1c595e5d9ca369aaef640e189ac2a"
+source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.1#e87da4a3a0c21d76c658abeead14d82b9cc3f85d"
 dependencies = [
  "dojo_plugin",
 ]
 
 [[package]]
 name = "dojo_plugin"
-version = "0.4.1"
-source = "git+https://github.com/dojoengine/dojo?tag=v0.7.2#3da5cad9fdd39b81551e0668015d88262e6c5fc4"
+version = "0.7.2"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.7.3#e8539d5b199efbd51c89c75da32f6592de5d9262"
 
 [[package]]
 name = "dojo_starter"

diff --git a/Scarb.toml b/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.0" }
+dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.1" }
 
 [[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 = "0xb4079627ebab1cd3cf9fd075dda1ad2454a7a448bf659591f259efa2519b18"  # Uncomment and update this line with your world address.
+world_address = "0x16a15cc2a571bf95eef741c701a5657e4dbf1a5b9ce3785b4060b60f58913f4"  # Uncomment and update this line with your world address.
 
 [tool.dojo.world]
 name = "Dojo starter"
@@ -33,7 +33,9 @@ cover_uri = "file://assets/cover.png"
 icon_uri = "file://assets/icon.png"
 website = "https://github.com/dojoengine/dojo-starter"
 seed = "dojo_starter"
-namespace = "dojo_starter"
+
+[tool.dojo.world.namespace]
+default = "dojo_starter"
 
 [tool.dojo.world.socials]
 x = "https://x.com/ohayo_dojo"

diff --git a/...tracts/dojo_starter-actions-7a1c7102.json → ...tracts/dojo_starter-actions-7a1c7102.json b/...tracts/dojo_starter-actions-7a1c7102.json → ...tracts/dojo_starter-actions-7a1c7102.json
@@ -39,18 +39,18 @@
       },
       {
         "type": "function",
-        "name": "selector",
+        "name": "namespace",
         "inputs": [],
         "outputs": [
           {
-            "type": "core::felt252"
+            "type": "core::byte_array::ByteArray"
           }
         ],
         "state_mutability": "view"
       },
       {
         "type": "function",
-        "name": "namespace",
+        "name": "tag",
         "inputs": [],
         "outputs": [
           {
@@ -61,7 +61,7 @@
       },
       {
         "type": "function",
-        "name": "namespace_selector",
+        "name": "name_hash",
         "inputs": [],
         "outputs": [
           {
@@ -72,11 +72,22 @@
       },
       {
         "type": "function",
-        "name": "tag",
+        "name": "namespace_hash",
         "inputs": [],
         "outputs": [
           {
-            "type": "core::byte_array::ByteArray"
+            "type": "core::felt252"
+          }
+        ],
+        "state_mutability": "view"
+      },
+      {
+        "type": "function",
+        "name": "selector",
+        "inputs": [],
+        "outputs": [
+          {
+            "type": "core::felt252"
           }
         ],
         "state_mutability": "view"

diff --git a/manifests/dev/abis/base/dojo-base.json → manifests/dev/base/abis/dojo-base.json b/manifests/dev/abis/base/dojo-base.json → manifests/dev/base/abis/dojo-base.json
diff --git a/...ests/dev/abis/deployments/dojo-world.json → manifests/dev/base/abis/dojo-world.json b/...ests/dev/abis/deployments/dojo-world.json → manifests/dev/base/abis/dojo-world.json
@@ -46,6 +46,24 @@
       }
     ]
   },
+  {
+    "type": "enum",
+    "name": "dojo::world::ModelIndex",
+    "variants": [
+      {
+        "name": "Keys",
+        "type": "core::array::Span::<core::felt252>"
+      },
+      {
+        "name": "Id",
+        "type": "core::felt252"
+      },
+      {
+        "name": "MemberId",
+        "type": "(core::felt252, core::felt252)"
+      }
+    ]
+  },
   {
     "type": "struct",
     "name": "core::array::Span::<core::integer::u8>",
@@ -182,6 +200,22 @@
         ],
         "state_mutability": "view"
       },
+      {
+        "type": "function",
+        "name": "contract",
+        "inputs": [
+          {
+            "name": "selector",
+            "type": "core::felt252"
+          }
+        ],
+        "outputs": [
+          {
+            "type": "(core::starknet::class_hash::ClassHash, core::starknet::contract_address::ContractAddress)"
+          }
+        ],
+        "state_mutability": "view"
+      },
       {
         "type": "function",
         "name": "register_model",
@@ -235,8 +269,8 @@
         "name": "upgrade_contract",
         "inputs": [
           {
-            "name": "address",
-            "type": "core::starknet::contract_address::ContractAddress"
+            "name": "selector",
+            "type": "core::felt252"
           },
           {
             "name": "class_hash",
@@ -282,12 +316,12 @@
         "name": "entity",
         "inputs": [
           {
-            "name": "model",
+            "name": "model_selector",
             "type": "core::felt252"
           },
           {
-            "name": "keys",
-            "type": "core::array::Span::<core::felt252>"
+            "name": "index",
+            "type": "dojo::world::ModelIndex"
           },
           {
             "name": "layout",
@@ -306,12 +340,12 @@
         "name": "set_entity",
         "inputs": [
           {
-            "name": "model",
+            "name": "model_selector",
             "type": "core::felt252"
           },
           {
-            "name": "keys",
-            "type": "core::array::Span::<core::felt252>"
+            "name": "index",
+            "type": "dojo::world::ModelIndex"
           },
           {
             "name": "values",
@@ -330,12 +364,12 @@
         "name": "delete_entity",
         "inputs": [
           {
-            "name": "model",
+            "name": "model_selector",
             "type": "core::felt252"
           },
           {
-            "name": "keys",
-            "type": "core::array::Span::<core::felt252>"
+            "name": "index",
+            "type": "dojo::world::ModelIndex"
           },
           {
             "name": "layout",
@@ -485,7 +519,27 @@
         "name": "can_write_model",
         "inputs": [
           {
-            "name": "model_id",
+            "name": "selector",
+            "type": "core::felt252"
+          },
+          {
+            "name": "contract",
+            "type": "core::starknet::contract_address::ContractAddress"
+          }
+        ],
+        "outputs": [
+          {
+            "type": "core::bool"
+          }
+        ],
+        "state_mutability": "view"
+      },
+      {
+        "type": "function",
+        "name": "can_write_contract",
+        "inputs": [
+          {
+            "name": "selector",
             "type": "core::felt252"
           },
           {
@@ -505,7 +559,7 @@
         "name": "can_write_namespace",
         "inputs": [
           {
-            "name": "namespace_id",
+            "name": "selector",
             "type": "core::felt252"
           },
           {
@@ -901,7 +955,7 @@
   },
   {
     "type": "event",
-    "name": "dojo::world::world::StoreDelRecord",
+    "name": "dojo::world::world::StoreUpdateRecord",
     "kind": "struct",
     "members": [
       {
@@ -910,12 +964,34 @@
         "kind": "data"
       },
       {
-        "name": "keys",
+        "name": "entity_id",
+        "type": "core::felt252",
+        "kind": "data"
+      },
+      {
+        "name": "values",
         "type": "core::array::Span::<core::felt252>",
         "kind": "data"
       }
     ]
   },
+  {
+    "type": "event",
+    "name": "dojo::world::world::StoreDelRecord",
+    "kind": "struct",
+    "members": [
+      {
+        "name": "table",
+        "type": "core::felt252",
+        "kind": "data"
+      },
+      {
+        "name": "entity_id",
+        "type": "core::felt252",
+        "kind": "data"
+      }
+    ]
+  },
   {
     "type": "event",
     "name": "dojo::world::world::WriterUpdated",
@@ -1075,6 +1151,11 @@
         "type": "dojo::world::world::StoreSetRecord",
         "kind": "nested"
       },
+      {
+        "name": "StoreUpdateRecord",
+        "type": "dojo::world::world::StoreUpdateRecord",
+        "kind": "nested"
+      },
       {
         "name": "StoreDelRecord",
         "type": "dojo::world::world::StoreDelRecord",

diff --git a/...starter-DirectionsAvailable-77844f1f.json → ...starter-DirectionsAvailable-77844f1f.json b/...starter-DirectionsAvailable-77844f1f.json → ...starter-DirectionsAvailable-77844f1f.json
@@ -240,18 +240,29 @@
     "items": [
       {
         "type": "function",
-        "name": "selector",
+        "name": "name",
         "inputs": [],
         "outputs": [
           {
-            "type": "core::felt252"
+            "type": "core::byte_array::ByteArray"
           }
         ],
         "state_mutability": "view"
       },
       {
         "type": "function",
-        "name": "name",
+        "name": "namespace",
+        "inputs": [],
+        "outputs": [
+          {
+            "type": "core::byte_array::ByteArray"
+          }
+        ],
+        "state_mutability": "view"
+      },
+      {
+        "type": "function",
+        "name": "tag",
         "inputs": [],
         "outputs": [
           {
@@ -273,18 +284,18 @@
       },
       {
         "type": "function",
-        "name": "namespace",
+        "name": "selector",
         "inputs": [],
         "outputs": [
           {
-            "type": "core::byte_array::ByteArray"
+            "type": "core::felt252"
           }
         ],
         "state_mutability": "view"
       },
       {
         "type": "function",
-        "name": "namespace_selector",
+        "name": "name_hash",
         "inputs": [],
         "outputs": [
           {
@@ -295,11 +306,11 @@
       },
       {
         "type": "function",
-        "name": "tag",
+        "name": "namespace_hash",
         "inputs": [],
         "outputs": [
           {
-            "type": "core::byte_array::ByteArray"
+            "type": "core::felt252"
           }
         ],
         "state_mutability": "view"