Merge branch 'main' into fix/bump-up-alpha-9

pixelaw · Sep 4, 2024 · bad97d3 · bad97d3
2 parents 90d3f1f + 0cebd94
commit bad97d3
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 83 deletions.
diff --git a/.github/workflows/ci-contracts.yml b/.github/workflows/ci-contracts.yml
@@ -16,7 +16,7 @@ defaults:
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_VERSION: 1.79.0
+  RUST_VERSION: 1.80.1
 
 jobs:
   cairofmt:
@@ -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.6
-          asdf global dojo 1.0.0-alpha.6
+          asdf install dojo 1.0.0-alpha.7
+          asdf global dojo 1.0.0-alpha.7
           sozo test
diff --git a/Dockerfile b/Dockerfile
@@ -70,7 +70,7 @@ RUN starkliup -v ${STARKLI_VERSION}
 
 # Stage 4: Setup runtime
 FROM dojo AS builder
-ENV DOJO_VERSION="v1.0.0-alpha.6"
+
 ENV PUBLIC_TORII=http://localhost:8080
 ENV STARKNET_RPC=http://localhost:5050
 ENV CORE_VERSION=VERSION
@@ -113,23 +113,24 @@ RUN \
     rm -rf out/dev
 
 
-### Generate genesis.json for POPULATED core
-#RUN \
-#    --mount=type=secret,id=DOJO_KEYSTORE_PASSWORD \
-#    export DOJO_KEYSTORE_PASSWORD=$(cat /run/secrets/DOJO_KEYSTORE_PASSWORD) && \
-#    export STARKNET_KEYSTORE_PASSWORD=$(cat /run/secrets/DOJO_KEYSTORE_PASSWORD) && \
-#    bash scripts/create_snapshot.sh dev-pop && \
-#    WORLD_ADDRESS=$(jq -r '.world.address' manifests/dev-pop/deployment/manifest.json) && \
-#    echo $WORLD_ADDRESS && \
-#    mkdir -p /pixelaw/storage_init/$WORLD_ADDRESS && \
-#    cp out/dev-pop/genesis.json /pixelaw/storage_init/$WORLD_ADDRESS/genesis.json && \
-#    cp out/dev-pop/katana_db.zip /pixelaw/storage_init/$WORLD_ADDRESS/katana_db.zip && \
-#    cp out/dev-pop/torii.sqlite.zip /pixelaw/storage_init/$WORLD_ADDRESS/torii.sqlite.zip && \
-#    rm -rf out/dev-pop
+## Generate genesis.json for POPULATED core
+RUN \
+    --mount=type=cache,id=scarb_cache,target=/root/.cache/scarb \
+    --mount=type=secret,id=DOJO_KEYSTORE_PASSWORD \
+    export DOJO_KEYSTORE_PASSWORD=$(cat /run/secrets/DOJO_KEYSTORE_PASSWORD) && \
+    export STARKNET_KEYSTORE_PASSWORD=$(cat /run/secrets/DOJO_KEYSTORE_PASSWORD) && \
+    bash scripts/create_snapshot.sh dev-pop && \
+    WORLD_ADDRESS=$(jq -r '.world.address' manifests/dev-pop/deployment/manifest.json) && \
+    echo $WORLD_ADDRESS && \
+    mkdir -p /pixelaw/storage_init/$WORLD_ADDRESS && \
+    cp out/dev-pop/genesis.json /pixelaw/storage_init/$WORLD_ADDRESS/genesis.json && \
+    cp out/dev-pop/katana_db.zip /pixelaw/storage_init/$WORLD_ADDRESS/katana_db.zip && \
+    cp out/dev-pop/torii.sqlite.zip /pixelaw/storage_init/$WORLD_ADDRESS/torii.sqlite.zip && \
+    rm -rf out/dev-pop
 
 
 # Stage 2: Put the webapp files in place
-FROM ghcr.io/pixelaw/web:0.3.10 AS web
+FROM ghcr.io/pixelaw/web:0.3.11 AS web
 
 FROM ghcr.io/pixelaw/server:0.3.19 AS server
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.3.40
+0.3.44
diff --git a/contracts/Scarb.lock b/contracts/Scarb.lock
@@ -16,7 +16,7 @@ source = "git+https://github.com/dojoengine/dojo?rev=f15def33#f15def330c0d099e79
 
 [[package]]
 name = "pixelaw"
-version = "0.3.36"
+version = "0.3.40"
 dependencies = [
  "dojo",
 ]
diff --git a/contracts/Scarb.toml b/contracts/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 cairo-version = "=2.7.0"
 name = "pixelaw"
-version = "0.3.36"
+version = "0.3.40"
 homepage = "https://github.com/pixelaw/core"
 edition = "2024_07"
 

diff --git a/contracts/Scarb_deploy.toml b/contracts/Scarb_deploy.toml
@@ -1,7 +1,7 @@
 [package]
 cairo-version = "=2.7.0"
 name = "pixelaw"
-version = "0.3.36"
+version = "0.3.40"
 homepage = "https://github.com/pixelaw/core"
 edition = "2024_07"
 
@@ -11,7 +11,6 @@ sierra-replace-ids = true
 [dependencies]
 dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.9" }
 
-
 [[target.dojo]]
 build-external-contracts = []
 path = "../contracts/src/lib.cairo"

diff --git a/contracts/dojo_dev-pop.toml b/contracts/dojo_dev-pop.toml
@@ -9,6 +9,6 @@ mappings = {  }
 
 [env]
 rpc_url = "http://localhost:5050/"
-account_address = "0x003c4dd268780ef738920c801edc3a75b6337bc17558c74795b530c0ff502486"
+account_address = "0xb3ff441a68610b30fd5e2abbf3a1548eb6ba6f3559f2862bf2dc757e5828ca"
 private_key = "0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a"
-world_address = "0x00a712727a27defbf77122fae30c91e90ec62bba8f09a2a396eddc29b768386b"
+world_address = "0x7fbfb0b5eafc010baa13951e9396376dba54451d1c45b5cec78427dad79d6cc"
diff --git a/contracts/scripts/create_snapshot.sh b/contracts/scripts/create_snapshot.sh
@@ -84,6 +84,12 @@ sozo \
   migrate \
   apply
 
+sozo \
+  build \
+  --typescript \
+  --manifest-path $DEPLOY_SCARB \
+  --bindings-output $OUT
+
 sleep 1
 
 # Setup PixeLAW auth and init

diff --git a/contracts/scripts/populate.sh b/contracts/scripts/populate.sh