chore: small FE fixes for 0.2.0

.gitignore

@@ -29,4 +29,7 @@ bin
 
 # ssl
 packages/client/ssl/*
-!packages/client/ssl/.gitkeep
+!packages/client/ssl/.gitkeep
+packages/starknet/data/db/*
+.env.sepolia
+.env.mainnet

.tool-versions

@@ -1,5 +1,5 @@
 scarb 2.13.1
-sozo 1.8.5
+sozo 1.8.6
 katana 1.7.0
 torii 1.8.7
-saya 0.2.1
+saya 0.2.2

README.md

@@ -87,7 +87,8 @@ bun run dev:saya
 
 <hr/>
 
-## 🗺️ World deployment:
+
+## 🗺️ O'Ruggin Trail story deployment:
 
 Initial deployments start with an empty world, use the editor at `https://localhost:5173/editor` to create and publish a world.
 

mprocs.local_saya-test.yaml

@@ -0,0 +1,248 @@
+procs:
+  initializer:
+    cwd: packages/contracts
+    env:
+      PROFILE: saya-test
+    shell: |
+      set -e # exit on error
+      source ../../scripts/utils.sh
+      #----------------
+      # delete targets to wait for a fresh deployment
+      echo ">>> Initializing..."
+      rm -rf ../contracts/target/${PROFILE}
+      rm -rf ../starknet/target/${PROFILE}
+      rm -rf ../starknet/data/${PROFILE}
+      #----------------
+      echo ">>> Waiting for L3 deployment..."
+      wait-on -l ../starknet/target/${PROFILE}/deployed
+      wait-on -l ../contracts/target/${PROFILE}/deployed
+      export APPCHAIN_ADDRESS=$(get_contract_address ${PROFILE} lore-actions_token)
+      #----------------
+      # configure L2...
+      #
+      cd ../starknet
+      export SN_ADDRESS=$(get_contract_address ${PROFILE} lore_sn-permit_token)
+      export DATA_PATH=./data/${PROFILE}
+      export PILTOVER_ADDRESS=$(grep '^core_contract' ${DATA_PATH}/config.toml | sed -E 's/core_contract = "([^"]+)"/\1/')
+      export CARTIDGE_ADDRESS=$(get_profile_env ${PROFILE} account_address)
+      echo ">>> L2: set_messaging_contract(${PILTOVER_ADDRESS})"
+      sozo -P ${PROFILE} execute --wait lore_sn-permit_token set_messaging_contract ${PILTOVER_ADDRESS}
+      echo ">>> L2: set_appchain_contract(${APPCHAIN_ADDRESS})"
+      sozo -P ${PROFILE} execute --wait lore_sn-permit_token set_appchain_contract ${APPCHAIN_ADDRESS}
+      echo ">>> L2: set_cartridge_contract(${CARTIDGE_ADDRESS})"
+      sozo -P ${PROFILE} execute --wait lore_sn-permit_token set_cartridge_contract ${CARTIDGE_ADDRESS}
+      echo ">>> L2: PermitConfig:"
+      sozo -P ${PROFILE} model get lore_sn-PermitConfig 1
+      #----------------
+      # Configure L3
+      #
+      cd ../contracts
+      echo ">>> L3: set_sn_contract(${SN_ADDRESS})"
+      sozo -P ${PROFILE} execute --wait lore-actions_token set_sn_contract ${SN_ADDRESS}
+      sozo -P ${PROFILE} model get lore-ActionsConfig 1
+      #----------------
+      touch ../starknet/target/${PROFILE}/initialized
+      echo "👍 Ready!!"
+  l2_katana:
+    cwd: packages/starknet
+    env:
+      KATANA_L2_PORT: "50000"
+      KATANA_L3_BIN: ./bin/katana-1.7.0-snos.4
+    shell: |
+      echo "Starting L2 Katana on port [${KATANA_L2_PORT}]..."
+      ${KATANA_L3_BIN} --version
+      ${KATANA_L3_BIN} --dev --dev.no-fee --http.port ${KATANA_L2_PORT}
+  l2_contracts:
+    cwd: packages/starknet
+    env:
+      PROFILE: saya-test
+      KATANA_L2_PORT: "50000"
+      KATANA_L3_BIN: ./bin/katana-1.7.0-snos.4
+      KATANA_L3_CHAIN: katana-l3
+      SETTLEMENT_RPC_URL: http://localhost:50000
+      SETTLEMENT_CHAIN_ID: KATANA
+      SETTLEMENT_ACCOUNT_ADDRESS: 0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec
+      SETTLEMENT_ACCOUNT_PRIVATE_KEY: 0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912
+      FACT_REGISTRY_ADDRESS: 0x3eb0d510d1238120bf7f9d176faafe0c7066797a86be985855952f87769d3bd
+      CORE_CONTRACT_ADDRESS: 0x1c8a55203cd99a6bfaf7cd91ae2ad953eff67b584826edab1857ca2e3c5db5d
+      CORE_CONTRACT_DEPLOYED_BLOCK: "4"
+    shell: |
+      sleep 1
+      set -e # exit on error
+      source ../../scripts/utils.sh
+      export DOJO_WORLD_ADDRESS=$(get_profile_env ${PROFILE} world_address)
+      echo ">>> Dojo world: [${DOJO_WORLD_ADDRESS}]"
+      #----------------
+      # based on:
+      # https://github.com/glihm/starknet-messaging-dev/blob/l2-l3-saya/README_saya.md#setup-the-l2-starknet
+      #
+      # wait for L2 katana to start...
+      wait-port ${KATANA_L2_PORT}
+      #
+      echo ">>> Deploying L2 mocked fact registry contract..."
+      saya core-contract declare-and-deploy-fact-registry-mock --salt 0x0
+      # will output: FACT_REGISTRY_ADDRESS
+      echo "!!! Validate: FACT_REGISTRY_ADDRESS=${FACT_REGISTRY_ADDRESS}"
+      #
+      echo ">>> Deploying L2 core contract..."
+      saya core-contract declare
+      saya core-contract deploy --salt 0x0
+      saya core-contract setup-program --chain-id ${KATANA_L3_CHAIN}
+      # will output: CORE_CONTRACT_ADDRESS
+      echo "!!! Validate: CORE_CONTRACT_ADDRESS=${CORE_CONTRACT_ADDRESS}"
+      #----------------
+      # katana_l3 init
+      #
+      export DATA_PATH=./data/${PROFILE}
+      mkdir -p ${DATA_PATH}
+      echo ">>> Creating Katana L3 config..."
+      ${KATANA_L3_BIN} init \
+        --settlement-chain ${SETTLEMENT_RPC_URL} \
+        --id ${KATANA_L3_CHAIN} \
+        --settlement-contract ${CORE_CONTRACT_ADDRESS} \
+        --settlement-contract-deployed-block ${CORE_CONTRACT_DEPLOYED_BLOCK} \
+        --settlement-facts-registry ${FACT_REGISTRY_ADDRESS} \
+        --output-path ${DATA_PATH}
+      # will output: PILTOVER_ADDRESS
+      #----------------
+      # validate piltover address
+      #
+      ls -l ${DATA_PATH}/config.toml
+      export PILTOVER_ADDRESS=$(grep '^core_contract' ${DATA_PATH}/config.toml | sed -E 's/core_contract = "([^"]+)"/\1/')
+      echo "!!! Validate if:           (PILTOVER_ADDRESS == CORE_CONTRACT_ADDRESS)"
+      echo "!!! PILTOVER_ADDRESS:      [${PILTOVER_ADDRESS}]"
+      echo "!!! CORE_CONTRACT_ADDRESS: [${CORE_CONTRACT_ADDRESS}]"
+      #----------------
+      # deploy contracts...
+      #
+      echo ">>> Deploying contracts..."
+      sozo -P ${PROFILE} build
+      sozo -P ${PROFILE} inspect
+      sozo -P ${PROFILE} migrate
+      #----------------
+      touch ../starknet/target/${PROFILE}/deployed
+      echo "👍 L2 Ready!"
+  l3_katana:
+    cwd: packages/starknet
+    env:
+      PROFILE: saya-test
+      KATANA_L3_BIN: ./bin/katana-1.7.0-snos.4
+      KATANA_L3_PORT: "5050"
+      BLOCK_TIME: "30000"
+      MAX_CAIRO_STEPS: "16000000"
+      RUST_LOG: "katana=info,rpc=info,node=info,messaging=trace,executor=trace,pool=trace"
+    shell: |
+      sleep 1
+      #----------------
+      # wait for katana_l3 init file
+      #
+      sleep 1
+      export DATA_PATH=./data/${PROFILE}
+      echo ">>> Waiting for L3 init config... [${DATA_PATH}/config.toml]"
+      wait-on -l ${DATA_PATH}/config.toml
+      #----------------
+      # start katana L3...
+      #
+      echo ">>> Starting L3 Katana on port [${KATANA_L3_PORT}]..."
+      rm -rf /tmp/katana-l3
+      ${KATANA_L3_BIN} --version
+      ${KATANA_L3_BIN} \
+        --chain ${DATA_PATH} \
+        --db-dir /tmp/katana-l3 \
+        --http.port ${KATANA_L3_PORT}
+        # --dev --dev.no-fee
+        # --http.cors_origins "*" \
+        # --cartridge.controllers --cartridge.paymaster
+        # --block-time ${BLOCK_TIME} --sequencing.block-max-cairo-steps ${MAX_CAIRO_STEPS}
+  l3_contracts:
+    cwd: packages/contracts
+    env:
+      PROFILE: saya-test
+      KATANA_L3_PORT: "5050"
+    shell: |
+      sleep 1
+      set -e # exit on error
+      source ../../scripts/utils.sh
+      export DOJO_WORLD_ADDRESS=$(get_profile_env ${PROFILE} world_address)
+      echo ">>> Dojo world: [${DOJO_WORLD_ADDRESS}]"
+      #----------------
+      # wait for katana_l3 init
+      wait-port ${KATANA_L3_PORT}
+      echo ">>> Deploying contracts..."
+      sozo -P ${PROFILE} build
+      sozo -P ${PROFILE} inspect
+      sozo -P ${PROFILE} migrate --l1-data-gas 20000000000 --l1-gas 20000000000 --l1-gas-price 20000000000 --l2-gas-price 20000000000 --l1-data-gas-price 20000000000 --l2-gas 20000000000
+      #----------------
+      touch ../contracts/target/${PROFILE}/deployed
+      echo "👍 L2 Ready!"
+  saya:
+    cwd: packages/starknet
+    env:
+      PROFILE: saya-test
+      RUST_LOG: saya=debug
+      KATANA_L2_RPC: http://localhost:50000
+      KATANA_L3_RPC: http://localhost:5050
+      SETTLEMENT_ACCOUNT_ADDRESS: 0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec
+      SETTLEMENT_ACCOUNT_PRIVATE_KEY: 0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912
+    shell: |
+      sleep 1
+      set -e # exit on error
+      #----------------
+      # wait for L2 and L3 to be deployed and initialized
+      wait-on -l ../starknet/target/${PROFILE}/initialized
+      #----------------
+      # gather data...
+      #
+      export DATA_PATH=./data/${PROFILE}
+      export PILTOVER_ADDRESS=$(grep '^core_contract' ${DATA_PATH}/config.toml | sed -E 's/core_contract = "([^"]+)"/\1/')
+      echo ">>> KATANA_L2_RPC: [${KATANA_L2_RPC}]"
+      echo ">>> KATANA_L3_RPC: [${KATANA_L3_RPC}]"
+      echo ">>> PILTOVER_ADDRESS: [${PILTOVER_ADDRESS}]"
+      echo ">>> SETTLEMENT_ACCOUNT_ADDRESS: [${SETTLEMENT_ACCOUNT_ADDRESS}]"
+      echo ">>> SETTLEMENT_ACCOUNT_PRIVATE_KEY: [${SETTLEMENT_ACCOUNT_PRIVATE_KEY}]"
+      #----------------
+      # sytart saya
+      #
+      echo ">>> Starting Saya..."
+      rm -f ./saya.db
+      saya --version
+      saya persistent start \
+        --settlement-rpc ${KATANA_L2_RPC} \
+        --settlement-piltover-address ${PILTOVER_ADDRESS} \
+        --settlement-account-address ${SETTLEMENT_ACCOUNT_ADDRESS} \
+        --settlement-account-private-key ${SETTLEMENT_ACCOUNT_PRIVATE_KEY} \
+        --rollup-rpc ${KATANA_L3_RPC} \
+        --mock-snos-from-pie \
+        --mock-layout-bridge-program-hash 0x43c5c4cc37c4614d2cf3a833379052c3a38cd18d688b617e2c720e8f941cb8
+  # torii:
+  #   cwd: packages/contracts
+  #   env:
+  #     PROFILE: saya-test
+  #     KATANA_L3_PORT: "5050"
+  #   shell: |
+  #     sleep 1
+  #     set -e # exit on error
+  #     source ../../scripts/utils.sh
+  #     export DOJO_WORLD_ADDRESS=$(get_profile_env ${PROFILE} world_address)
+  #     export GAME_TOKEN_ADDRESS=$(get_contract_address ${PROFILE} lore-game_token)
+  #     export TRAIL_TOKEN_ADDRESS=$(get_contract_address ${PROFILE} lore-trail_token)
+  #     echo ">>> Dojo world: [${DOJO_WORLD_ADDRESS}]"
+  #     echo ">>> Game token: [${GAME_TOKEN_ADDRESS}]"
+  #     echo ">>> Trail token: [${TRAIL_TOKEN_ADDRESS}]"
+  #     #----------------
+  #     wait-port ${KATANA_L3_PORT}
+  #     #----------------
+  #     # start Torii
+  #     torii --version
+  #     torii --http.cors_origins "*" \
+  #       --indexing.contracts erc721:${GAME_TOKEN_ADDRESS},erc721:${TRAIL_TOKEN_ADDRESS}
+  # client:
+  #   cwd: packages/client
+  #   env:
+  #     KATANA_L3_PORT: "5050"
+  #   shell: |
+  #     sleep 1
+  #     #----------------
+  #     wait-port ${KATANA_L3_PORT}
+  #     #----------------
+  #     bun run dev

package.json

@@ -8,7 +8,7 @@
   ],
   "scripts": {
     "dev": "mprocs --config ./mprocs.local.yaml",
-    "dev:saya": "mprocs --config ./mprocs.local_saya.yaml",
+    "dev:saya-test": "mprocs --config ./mprocs.local_saya-test.yaml",
     "dev:da": "mprocs --config ./mprocs.local_da.yaml",
     "dev:slot": "mprocs --config ./mprocs.slot.yaml",
     "quickstart": "bun run ./scripts/quickstart.ts # 🧾 quickstart installer "

packages/client/index.html

@@ -10,6 +10,16 @@
       href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y='.9em' font-size='90' transform='translate(110, 5) scale(-.975,.975)'>❔</text><text y='.1em' font-size='90' transform='translate(45, 30) scale(0.5,0.5)'>✨</text></svg>"
     />
     <title>The O'Ruggin Trail</title>
+
+    <!-- Google tag (gtag.js) -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=G-BGJTFFSBLZ"></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+
+      gtag('config', 'G-BGJTFFSBLZ');
+</script>
   </head>
   <body>
     <div id="root"></div>

packages/client/package.json

@@ -19,7 +19,8 @@
     "cert:install": "cd ssl && bunx mkcert create-ca && bunx mkcert create-cert localhost"
   },
   "dependencies": {
-    "@cartridge/controller": "0.12.1",
+    "@cartridge/controller": "0.13.5",
+    "@cartridge/presets": "0.5.4",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",

packages/client/src/data/command.data.ts

@@ -29,7 +29,7 @@ import DojoStore from "@/lib/stores/dojo.store";
 import WalletStore from "@/lib/stores/wallet.store";
 import GameStore from "@/lib/stores/game.store";
 import UIPanelStore, {DefaultValues} from "@/lib/stores/terminal.uiPanel.store";
-import { queryStories } from "@/lib/queries/commandResponseQueries";
+import { queryGameData } from "@/lib/queries/commandResponseQueries";
 import { startFetchingAmbientMessages, sleep } from "@/lib/utils/factEngine";
 import { reportBug } from "@/lib/utils/bugReport";
 import { useRightPanelStore } from "@/lib/stores/rightPanel.store";
@@ -93,6 +93,7 @@ export const TERMINAL_SYSTEM_COMMANDS: {
 			sendCommand("_connect_wallet");
 		} else {
 			sendCommand("_welcome_back");
+			sendCommand("ui show");
 		}
 
 		sendCommand("_hint");
@@ -290,7 +291,7 @@ export const TERMINAL_SYSTEM_COMMANDS: {
 				format: "hash",
 				useTypewriter: true,
 			});
-			sendCommand("ui show");
+			// sendCommand("ui show");
 		}
 
 		// Check properties
@@ -482,6 +483,8 @@ export const TERMINAL_SYSTEM_COMMANDS: {
 		console.log("COMPONENTS RESULT", components);
 	},
 	_gameData: async () => {
+		const terminalStore = useTerminalStore.getState();
+		terminalStore.setPrinting(true);
 		addTerminalContent({ text: "FETCHING GAME DATA...", format: "system", useTypewriter: true });
 		await sleep(500);
 
@@ -493,14 +496,15 @@ export const TERMINAL_SYSTEM_COMMANDS: {
 
 		const stopAmbient = startFetchingAmbientMessages();
 
-		await queryStories();
+		await queryGameData();
 		stopAmbient();
 
 		addTerminalContent({
 			text: "GAME DATA HAS BEEN FETCHED. CHECK YOUR DOWNLOADS FOLDER",
 			format: "system",
 			useTypewriter: true,
 		});
+		terminalStore.setPrinting(false);
 	},
 	connection: async () => {
 		const dest = {