upgrading to dojo 1.0.0

pixelaw · Nov 12, 2024 · a474c62 · a474c62
1 parent 6378941
commit a474c62
Show file tree

Hide file tree

Showing 87 changed files with 731 additions and 23,822 deletions.
diff --git a/.github/workflows/ci-contracts.yml b/.github/workflows/ci-contracts.yml
@@ -35,6 +35,6 @@ jobs:
       - uses: asdf-vm/actions/setup@v3
       - run: |
           asdf plugin add dojo https://github.com/dojoengine/asdf-dojo
-          asdf install dojo 1.0.0-alpha.19
-          asdf global dojo 1.0.0-alpha.19
+          asdf install dojo 1.0.0
+          asdf global dojo 1.0.0
           sozo test
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,7 @@ target/
 
 contracts/out
 contracts/target
-contracts/manifests/dev*
+contracts/manifest_dev.json
 
 *.account.json
 *.keystore.json

diff --git a/DOJO_VERSION b/DOJO_VERSION
@@ -1 +1 @@
-1.0.0-alpha.19
+1.0.0
diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,7 @@ SHELL ["/bin/bash", "-c"]
 
 ARG ASDF_VERSION="v0.14.1"
 ARG SCARB_VERSION="2.7.0"
-ARG DOJO_VERSION="1.0.0-alpha.19"
+ARG DOJO_VERSION="1.0.0"
 ARG STARKLI_VERSION="0.1.6"
 
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.4.7
+0.4.8
diff --git a/contracts/.tool-versions b/contracts/.tool-versions
@@ -1,2 +1,2 @@
-dojo 1.0.0-alpha.19
+dojo 1.0.0
 scarb 2.7.0
diff --git a/contracts/.vscode/settings.json b/contracts/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
   "cairo1.enableLanguageServer": true,
-  "cairo1.languageServerPath": "${userHome}/.asdf/installs/dojo/1.0.0-alpha.19/bin/dojo-language-server",
+  "cairo1.languageServerPath": "${userHome}/.asdf/installs/dojo/1.0.0/bin/dojo-language-server",
   "cairo1.enableScarb": true,
   "cairo1.scarbPath": "${userHome}/.asdf/installs/scarb/2.7.0/bin/scarb",
   "cairo1.preferScarbLanguageServer": false

diff --git a/contracts/README.md b/contracts/README.md
@@ -16,7 +16,7 @@ Follow the asdf installation instructions.
 
 ```
 asdf plugin add dojo https://github.com/dojoengine/asdf-dojo
-asdf install dojo 1.0.0-alpha.19
+asdf install dojo 1.0.0
 ```
 
 ### Install scarb

diff --git a/contracts/Scarb.lock b/contracts/Scarb.lock
@@ -3,12 +3,29 @@ version = 1
 
 [[package]]
 name = "dojo"
-version = "1.0.0-alpha.4"
-source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.19#e6bab2d0066c3cf1acfc5ee41a27294b5b23697d"
+version = "1.0.0"
+source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0#74280d48fa2828095331487dede59f9b2e378cd3"
+dependencies = [
+ "dojo_plugin",
+]
+
+[[package]]
+name = "dojo_cairo_test"
+version = "1.0.0-rc.0"
+source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0#74280d48fa2828095331487dede59f9b2e378cd3"
+dependencies = [
+ "dojo",
+]
+
+[[package]]
+name = "dojo_plugin"
+version = "2.8.4"
+source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0#74280d48fa2828095331487dede59f9b2e378cd3"
 
 [[package]]
 name = "pixelaw"
 version = "0.4.7"
 dependencies = [
  "dojo",
+ "dojo_cairo_test",
 ]
diff --git a/contracts/Scarb.toml b/contracts/Scarb.toml
@@ -1,21 +1,28 @@
 [package]
-cairo-version = "=2.7.0"
+cairo-version = "=2.8.4"
 name = "pixelaw"
-version = "0.4.7"
+version = "0.4.8"
 homepage = "https://github.com/pixelaw/core"
 edition = "2024_07"
 
 [cairo]
 sierra-replace-ids = true
 
 [dependencies]
-dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.19" }
+dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0" }
+starknet = "2.8.4"
+
+[dev-dependencies]
+dojo_cairo_test = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0" }
 
 [tool.fmt]
 sort-module-level-items = true
 
 [lib]
-#[[target.dojo]]
+
+[[target.starknet-contract]]
+sierra = true
+build-external-contracts = ["dojo::world::world_contract::world"]
 
 
 [profile.dev-pop]

diff --git a/contracts/Scarb_deploy.toml b/contracts/Scarb_deploy.toml
@@ -1,28 +1,35 @@
 [package]
-cairo-version = "=2.7.0"
+cairo-version = "=2.8.4"
 name = "pixelaw"
-version = "0.4.7"
+version = "0.4.8"
 homepage = "https://github.com/pixelaw/core"
 edition = "2024_07"
 
 [cairo]
 sierra-replace-ids = true
 
 [dependencies]
-dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.19" }
+dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0" }
+starknet = "2.8.4"
+
+[dev-dependencies]
+dojo_cairo_test = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0" }
 
 [tool.fmt]
 sort-module-level-items = true
 
-[[target.dojo]]
-build-external-contracts = []
+[[target.starknet-contract]]
+sierra = true
+build-external-contracts = ["dojo::world::world_contract::world"]
 
 [profile.dev-pop]
 
 [profile.slot]
 
 [profile.sepolia]
 
+[profile.mainnet]
+
 [scripts]
 init = "./scripts/init.sh"
 paint = "./scripts/paint.sh"

diff --git a/contracts/dojo_dev.toml b/contracts/dojo_dev.toml
@@ -11,5 +11,5 @@ mappings = {}
 rpc_url = "http://localhost:5050/"
 account_address = "0x3c4dd268780ef738920c801edc3a75b6337bc17558c74795b530c0ff502486"
 private_key = "0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a"
-world_address = "0x4adbe4bfe631a95a5ce99d8200a8721b1ac8096ff8941cecddc4e79a7b2d5d5"
+world_address = "0x6f130c8e150882e39cbe878c650c8f35c86579180dbc77d0c1cbe169449b5f6"