Upgrade Dojo to v1.0.0-alpha.6

pixelaw · Aug 21, 2024 · d68ddfd · d68ddfd
1 parent 12b72b6
commit d68ddfd
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 21 deletions.
diff --git a/DOJO_VERSION b/DOJO_VERSION
@@ -1 +1 @@
-v1.0.0-alpha.3
+v1.0.0-alpha.6
diff --git a/Dockerfile b/Dockerfile
@@ -43,7 +43,7 @@ ENV PATH="/root/.starkli/bin:${PATH}"
 RUN starkliup -v 0.1.6
 
 #Install Scarb
-RUN curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | bash -s -- -v 2.6.4
+RUN curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | bash -s -- -v 2.7.0
 #RUN chmod +x ./install.sh
 #RUN export PATH=$HOME/.local/bin:$PATH && ./install.sh
 RUN echo 'export PATH=$HOME/.local/bin:$PATH' >> $HOME/.bashrc
@@ -63,6 +63,7 @@ HEALTHCHECK CMD curl --fail http://localhost:3000 && \
                 exit 1
 
 COPY ./dojo_init /tmp/dojo_init
+COPY ./contracts/dojo_dev.toml /tmp/dojo_init
 COPY ./contracts/Scarb.toml /tmp/dojo_init
 COPY ./contracts/Scarb.lock /tmp/dojo_init
 

diff --git a/contracts/Scarb.lock b/contracts/Scarb.lock
@@ -3,16 +3,16 @@ version = 1
 
 [[package]]
 name = "dojo"
-version = "0.7.3"
-source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.4#d08c46191fc1b4c4f90816cef4787cb8db02988f"
+version = "1.0.0-alpha.4"
+source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.6#ede7930735c708572af8a87f81bb76354a401b3a"
 dependencies = [
  "dojo_plugin",
 ]
 
 [[package]]
 name = "dojo_plugin"
-version = "0.7.3"
-source = "git+https://github.com/dojoengine/dojo?rev=71b1f1a4#71b1f1a467534cbeeb901356f41e612ed4187bd1"
+version = "1.0.0-alpha.4"
+source = "git+https://github.com/dojoengine/dojo?rev=f15def33#f15def330c0d099e79351d11c197f63e8cc1ff36"
 
 [[package]]
 name = "pixelaw"

diff --git a/contracts/Scarb.toml b/contracts/Scarb.toml
@@ -1,5 +1,5 @@
 [package]
-cairo-version = "=2.7.0-rc.3"
+cairo-version = "=2.7.0"
 name = "pixelaw"
 version = "0.3.35"
 homepage = "https://github.com/pixelaw/core"
@@ -11,7 +11,7 @@ homepage = "https://github.com/pixelaw/core"
 sierra-replace-ids = true
 
 [dependencies]
-dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.4" }
+dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.6" }
 
 [lib]
 name = "pixelaw"
@@ -35,16 +35,16 @@ description = "Empty PixeLAW world"
 name = "pixelaw"
 seed="pixelaw"
 
-[tool.dojo.world.namespace]
-default = "pixelaw"
-mappings = { }
-
-
-[tool.dojo.env]
-rpc_url = "http://localhost:5050/"
-account_address = "0x003c4dd268780ef738920c801edc3a75b6337bc17558c74795b530c0ff502486"
-private_key = "0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a"
-world_address= "0xd4136ca2b9f1b08c6d6857b0f19da3dc8d136105ec46459787a6de0fd92bf8"
+#[tool.dojo.world.namespace]
+#default = "pixelaw"
+#mappings = { }
+#
+#
+#[tool.dojo.env]
+#rpc_url = "http://localhost:5050/"
+#account_address = "0x003c4dd268780ef738920c801edc3a75b6337bc17558c74795b530c0ff502486"
+#private_key = "0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a"
+#world_address= "0xd4136ca2b9f1b08c6d6857b0f19da3dc8d136105ec46459787a6de0fd92bf8"
 
 
 ## The "Populated" world

diff --git a/contracts/Scarb_deploy.toml b/contracts/Scarb_deploy.toml
@@ -1,5 +1,5 @@
 [package]
-cairo-version = "=2.7.0-rc.3"
+cairo-version = "=2.7.0"
 name = "pixelaw"
 version = "0.3.35"
 homepage = "https://github.com/pixelaw/core"
@@ -11,7 +11,7 @@ homepage = "https://github.com/pixelaw/core"
 sierra-replace-ids = true
 
 [dependencies]
-dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.4" }
+dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.6" }
 
 
 [[target.dojo]]

diff --git a/contracts/dojo_dev.toml b/contracts/dojo_dev.toml
@@ -0,0 +1,32 @@
+
+
+# The "Empty" world
+# ----------------------------------------------------------------------------
+[world]
+description = "Empty PixeLAW world"
+name = "pixelaw"
+seed="pixelaw"
+
+[namespace]
+default = "pixelaw"
+mappings = { }
+
+
+[env]
+rpc_url = "http://localhost:5050/"
+account_address = "0x003c4dd268780ef738920c801edc3a75b6337bc17558c74795b530c0ff502486"
+private_key = "0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a"
+world_address= "0x2c130238b73abf493f1876d26cd52e0f45f318f99accac1d28f0ca6a3d7800f"
+
+
+## The "Populated" world
+## ----------------------------------------------------------------------------
+#[profile.dev-pop.tool.dojo.world]
+#description = "Populated PixeLAW world"
+#name = "dev-pop"
+#
+#[profile.dev-pop.tool.dojo.env]
+#rpc_url = "http://localhost:5050/"
+#account_address = "0x003c4dd268780ef738920c801edc3a75b6337bc17558c74795b530c0ff502486"
+#private_key = "0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a"
+#world_address = "0x00a712727a27defbf77122fae30c91e90ec62bba8f09a2a396eddc29b768386b"
diff --git a/contracts/dojo_pop.toml b/contracts/dojo_pop.toml
@@ -0,0 +1,19 @@
+
+
+# The "Populated" world
+# ----------------------------------------------------------------------------
+[world]
+description = "Empty PixeLAW world"
+name = "pixelaw"
+seed="pixelaw"
+
+[namespace]
+default = "pixelaw"
+mappings = { }
+
+
+[env]
+rpc_url = "http://localhost:5050/"
+account_address = "0x003c4dd268780ef738920c801edc3a75b6337bc17558c74795b530c0ff502486"
+private_key = "0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a"
+world_address= "0x00a712727a27defbf77122fae30c91e90ec62bba8f09a2a396eddc29b768386b"
diff --git a/contracts/scripts/create_snapshot.sh b/contracts/scripts/create_snapshot.sh
@@ -89,7 +89,7 @@ sleep 1
 # Setup PixeLAW auth and init
 declare "WORLD"=$(cat $MANIFEST | jq -r '.world.address')
 
-CORE_MODELS=("App" "AppName" "CoreActionsAddress" "Pixel" "Permissions" "QueueItem")
+CORE_MODELS=("App" "AppName" "CoreActionsAddress" "Pixel" "Permissions" "QueueItem" "Instruction")
 SNAKE_MODELS=("Snake" "SnakeSegment")
 
 echo "Start Torii"