merge

.devcontainer/Dockerfile

@@ -14,7 +14,7 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-RUN curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | bash -s -- -v 2.5.4
+RUN curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | bash
 RUN curl https://get.starkli.sh | bash
 RUN /root/.starkli/bin/starkliup
 # Specify the command to run on container start

.github/workflows/build.yml

@@ -7,7 +7,7 @@ on:
   pull_request:
 
 env:
-  SCARB_VERSION: 2.5.4
+  SCARB_VERSION: 2.6.5
 
 jobs:
   build:
@@ -22,8 +22,6 @@ jobs:
             market,
             obstacles,
             combat,
-            game_entropy,
-            game_snapshot,
           ]
     steps:
       - uses: actions/checkout@v3

.gitignore

@@ -12,9 +12,8 @@ contracts/beasts/target/CACHEDIR.TAG
 
 keys
 account
-loot-survivor.pem
-contracts/game_entropy/target/CACHEDIR.TAG
-contracts/game_entropy/target/dev/game_entropy.sierra
+ls1.5.pem
 
-scripts/stress_test.py
 .env
+katana.log
+scripts/katana/katana/

.vscode/settings.json

@@ -1,3 +1,6 @@
 {
-    "editor.wordWrap": "on"
-}
+  "editor.wordWrap": "on",
+  "cairo1.enableLanguageServer": true,
+  "cairo1.enableScarb": true,
+  "cairo1.languageServerPath": "/Users/os/.asdf/shims/scarb-cairo-language-server"
+}

README.md

@@ -159,6 +159,19 @@ bash scripts/starkli_setup.sh
 bash scripts/deploy.sh.sh
 ```
 
+#### Run UI
+
+```bash
+cd ui
+yarn dev
+```
+
+#### Deploy Katana & Run UI
+
+```bash
+bash scripts/katana/setup.sh
+```
+
 ### Play
 
 #### Mint $lords and approve LS to spend

Scarb.lock

@@ -2,76 +2,111 @@
 version = 1
 
 [[package]]
-name = "arcade_account"
+name = "adventurer"
 version = "0.1.0"
-source = "git+https://github.com/BibliothecaDAO/arcade-account?branch=next#cb3a3c9ca4e56c0fcc89ec5e273b48e1f9050b5f"
 dependencies = [
- "openzeppelin",
+ "beasts",
+ "combat",
+ "loot",
+ "market",
+ "obstacles",
 ]
 
 [[package]]
-name = "beasts"
+name = "alexandria_bytes"
 version = "0.1.0"
+source = "git+https://github.com/keep-starknet-strange/alexandria.git#0aa7cca8a1acb1f35cff32420614f7f58e38de5e"
 dependencies = [
- "combat",
+ "alexandria_data_structures",
+ "alexandria_math",
 ]
 
 [[package]]
-name = "combat"
-version = "0.1.0"
+name = "alexandria_data_structures"
+version = "0.2.0"
+source = "git+https://github.com/keep-starknet-strange/alexandria.git#0aa7cca8a1acb1f35cff32420614f7f58e38de5e"
+dependencies = [
+ "alexandria_encoding",
+]
 
 [[package]]
-name = "game"
+name = "alexandria_encoding"
 version = "0.1.0"
+source = "git+https://github.com/keep-starknet-strange/alexandria.git#0aa7cca8a1acb1f35cff32420614f7f58e38de5e"
 dependencies = [
- "arcade_account",
- "game_entropy",
- "game_snapshot",
- "golden_token",
- "lootitems",
- "market",
- "obstacles",
- "openzeppelin",
- "survivor",
+ "alexandria_bytes",
+ "alexandria_math",
+ "alexandria_numeric",
 ]
 
 [[package]]
-name = "game_entropy"
-version = "0.1.0"
+name = "alexandria_math"
+version = "0.2.0"
+source = "git+https://github.com/keep-starknet-strange/alexandria.git#0aa7cca8a1acb1f35cff32420614f7f58e38de5e"
+dependencies = [
+ "alexandria_data_structures",
+]
 
 [[package]]
-name = "game_snapshot"
+name = "alexandria_numeric"
 version = "0.1.0"
+source = "git+https://github.com/keep-starknet-strange/alexandria.git#0aa7cca8a1acb1f35cff32420614f7f58e38de5e"
+dependencies = [
+ "alexandria_math",
+ "alexandria_searching",
+]
 
 [[package]]
-name = "golden_token"
+name = "alexandria_searching"
 version = "0.1.0"
-source = "git+https://github.com/BibliothecaDAO/golden-token?branch=next#a9f644453fd097bfe68170f39bed1c8a5d0af73e"
+source = "git+https://github.com/keep-starknet-strange/alexandria.git#0aa7cca8a1acb1f35cff32420614f7f58e38de5e"
 dependencies = [
- "arcade_account",
- "openzeppelin",
+ "alexandria_data_structures",
 ]
 
 [[package]]
-name = "lootitems"
+name = "beasts"
 version = "0.1.0"
 dependencies = [
  "combat",
 ]
 
 [[package]]
-name = "lords"
+name = "combat"
+version = "0.1.0"
+
+[[package]]
+name = "game"
 version = "0.1.0"
 dependencies = [
+ "adventurer",
+ "alexandria_encoding",
+ "graffiti",
+ "loot",
+ "market",
+ "obstacles",
  "openzeppelin",
+ "pragma_lib",
+]
+
+[[package]]
+name = "graffiti"
+version = "0.1.0"
+source = "git+https://github.com/ponderingdemocritus/graffiti?rev=bc569531791dbc71c6cd8d9bc154c34eedad31fe#bc569531791dbc71c6cd8d9bc154c34eedad31fe"
+
+[[package]]
+name = "loot"
+version = "0.1.0"
+dependencies = [
+ "combat",
 ]
 
 [[package]]
 name = "market"
 version = "0.1.0"
 dependencies = [
  "combat",
- "lootitems",
+ "loot",
 ]
 
 [[package]]
@@ -83,16 +118,10 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin"
-version = "0.9.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.9.0#364db5b1aecc1335d2e65db887291d19aa28937d"
+version = "0.14.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.14.0#f091c4f51ddeb10297db984acae965328c5a4e5b"
 
 [[package]]
-name = "survivor"
-version = "0.1.0"
-dependencies = [
- "beasts",
- "combat",
- "lootitems",
- "market",
- "obstacles",
-]
+name = "pragma_lib"
+version = "1.0.0"
+source = "git+https://github.com/astraly-labs/pragma-lib#fe9a46743254182ac331da488ccfc05e0185cdd0"

Scarb.toml

@@ -4,23 +4,17 @@ members = [
     "contracts/beasts",
     "contracts/combat",
     "contracts/game",
-    "contracts/game_entropy",
-    "contracts/game_snapshot",
     "contracts/loot",
-    "contracts/lords",
     "contracts/market",
     "contracts/obstacles",
 ]
 name = "loot_survivor"
 version = "0.1.0"
-description = "Loot Survivor collection of libraries and contracts for the BibliothecaDAO ecosystem and beyond."
-homepage = "https://github.com/BibliothecaDAO/loot-survivor"
+description = "A fully onchain arcade dungeon crawler built on Starknet in conjunction with Realms.world. Explore the dynamically generated dungeons while you fight for your life against beasts and obstacles in pursuit of a spot on the esteemed leaderboard."
+homepage = "https://github.com/provable-games/loot-survivor"
 
 [workspace.dependencies]
-starknet = ">=2.5.3"
-openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.9.0" }
-golden_token = { git = "https://github.com/BibliothecaDAO/golden-token", branch = "next" }
-arcade_account = { git = "https://github.com/BibliothecaDAO/arcade-account", branch = "next" }
+starknet = ">=2.6.4"
 
 [workspace.tool.fmt]
 sort-module-level-items = true

contracts/adventurer/Scarb.lock

@@ -13,7 +13,7 @@ name = "combat"
 version = "0.1.0"
 
 [[package]]
-name = "lootitems"
+name = "loot"
 version = "0.1.0"
 dependencies = [
  "combat",
@@ -24,7 +24,7 @@ name = "market"
 version = "0.1.0"
 dependencies = [
  "combat",
- "lootitems",
+ "loot",
 ]
 
 [[package]]
@@ -35,12 +35,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "survivor"
+name = "adventurer"
 version = "0.1.0"
 dependencies = [
  "beasts",
  "combat",
- "lootitems",
+ "loot",
  "market",
  "obstacles",
 ]

contracts/adventurer/Scarb.toml

@@ -1,14 +1,12 @@
 [package]
-name = "survivor"
+name = "adventurer"
 version = "0.1.0"
 description = "Adventurer Library"
-homepage = "https://github.com/BibliothecaDAO/loot-survivor"
-
-# See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest
+homepage = "https://github.com/provable-games/loot-survivor"
 
 [dependencies]
-lootitems = { path = "../loot" }
+loot = { path = "../loot" }
 obstacles = { path = "../obstacles" }
 combat = { path = "../combat" }
 market = { path = "../market" }
-beasts = { path = "../beasts" }
+beasts = { path = "../beasts" }