Market packed

.github/workflows/test.yml

@@ -22,9 +22,8 @@ jobs:
           sudo apt-get install -y curl
 
       - name: Download Dojo release artifact
-        # curl -L -o dojo-linux-x86_64.tar.gz https://github.com/dojoengine/dojo/releases/download/nightly/dojo_nightly_linux_amd64.tar.gz
         run: |
-          curl -L -o dojo-linux-x86_64.tar.gz https://github.com/dojoengine/dojo/releases/download/v0.2.2/dojo_v0.2.2_linux_amd64.tar.gz
+          curl -L -o dojo-linux-x86_64.tar.gz https://github.com/dojoengine/dojo/releases/download/v0.5.0/dojo_v0.5.0_linux_amd64.tar.gz
           tar -xzf dojo-linux-x86_64.tar.gz
           sudo mv sozo /usr/local/bin/
 

.gitignore

@@ -1 +1,24 @@
-target
+target
+abis
+
+genesis.json
+
+/manifests/*
+
+!/manifests/dev
+/manifests/dev/*
+!/manifests/dev/overlays
+
+!/manifests/ryo420
+/manifests/ryo420/*
+!/manifests/ryo420/overlays
+
+!/manifests/ryo421
+/manifests/ryo421/*
+!/manifests/ryo421/overlays
+
+!/manifests/ryosepolia
+/manifests/ryosepolia/*
+!/manifests/ryosepolia/overlays
+
+

.tool-versions

@@ -0,0 +1 @@
+scarb 2.6.3

README.md

@@ -1,12 +1,12 @@
-![Roll Your Own Banner](.github/banner-wide.png)
+![Dope Wars Banner](.github/banner-wide.png)
 
-# Roll Your Own
+# Dope Wars
 
 ![Github Actions][gha-badge]
 
 [gha-badge]: https://img.shields.io/github/actions/workflow/status/cartridge-gg/rollyourown/test.yml?branch=main
 
-Roll Your Own is an onchain adaptation of the original Drug Wars game, built on Starknet using the [Dojo Engine](https://github.com/dojoengine/dojo).
+Dope Wars is an onchain adaptation of the original Drug Wars game, built on Starknet using the [Dojo Engine](https://github.com/dojoengine/dojo).
 
 ## Development
 

Scarb.lock

@@ -3,8 +3,7 @@ version = 1
 
 [[package]]
 name = "dojo"
-version = "0.3.15"
-source = "git+https://github.com/dojoengine/dojo.git?tag=v0.3.15#cdbaca4121b1642e1a8ca40d6831bad73d28ed26"
+version = "0.7.2"
 dependencies = [
  "dojo_plugin",
 ]
@@ -17,6 +16,14 @@ source = "git+https://github.com/dojoengine/dojo?tag=v0.3.11#1e651b5d4d3b79b14a7
 [[package]]
 name = "rollyourown"
 version = "0.1.0"
+dependencies = [
+ "dojo",
+ "token",
+]
+
+[[package]]
+name = "token"
+version = "0.0.0"
 dependencies = [
  "dojo",
 ]

Scarb.toml

@@ -1,51 +1,112 @@
 [package]
-cairo-version = "2.3.0"
+cairo-version = "2.6.3"
 name = "rollyourown"
 version = "0.1.0"
 
 [cairo]
-sierra-replace-ids = true
+# sierra-replace-ids = true
 
 [dependencies]
-# cubit = {git = "https://github.com/influenceth/cubit.git"}
-dojo = {git = "https://github.com/dojoengine/dojo.git", tag = "v0.3.15"}
-# dojo = {git = "https://github.com/dojoengine/dojo.git", rev = "d7f46502cba3d6462b68a4dfb07336377bca2678"}
+# dojo = {git = "https://github.com/dojoengine/dojo", tag = "v0.7.1"}
+# token = { git = "https://github.com/dojoengine/origami", tag = "v0.7.1"}
+dojo = { path = "../dojo/crates/dojo-core" }
+token = { path = "../origami" }
 
-[[target.dojo]]
 
 [scripts]
-katana = "katana --disable-fee --invoke-max-steps 999999999"
+
+# 
+katana = "katana --disable-fee --invoke-max-steps 2000000"
 build = "sozo build && scarb run gendojo"
+
+# common
+copy_manifest = "./scripts/copy_manifest.sh"
 gendojo = "./scripts/gen.sh"
-auth = "./scripts/default_auth.sh dev"
-auth_staging = "./scripts/default_auth.sh staging"
-auth_prod = "./scripts/default_auth.sh prod"
-migrate = "sozo -P dev migrate && scarb run gendojo && scarb run auth"
-migrate_staging = "sozo -P staging migrate"
-# migrate_staging = "sozo migrate --rpc-url https://api.cartridge.gg/x/ryodev/katana --account-address 0x6e857786bbd1652857d673836c41e0544d9d5ecd3e7a1bbde744e328b8cc2f6 --private-key 0x5e9d85de083b7ddd3029c44de2997ceba8384074bbebb66696a1b507f0466fc"
-migrate_prod = "sozo -P prod migrate"
-
-[profile.dev.tool.dojo.env]
+auth = "./scripts/default_auth.sh"
+
+
+# migrate  && scarb run gendojo $PROFILE
+migrate = "PROFILE=dev && sozo -P $PROFILE build && sozo -P $PROFILE migrate apply -vvv && scarb run copy_manifest $PROFILE && scarb run gendojo $PROFILE && scarb run auth $PROFILE"
+migrate_ryo420 = "PROFILE=ryo420 && sozo -P $PROFILE build && sozo -P $PROFILE migrate apply && scarb run copy_manifest $PROFILE && scarb run auth $PROFILE"
+migrate_ryo421 = "PROFILE=ryo421 && sozo -P $PROFILE build && sozo -P $PROFILE migrate apply && scarb run copy_manifest $PROFILE && scarb run gendojo $PROFILE && scarb run auth $PROFILE"
+
+migrateplan_sepolia = "PROFILE=ryosepolia && sozo -P $PROFILE build && sozo -P $PROFILE migrate plan --name ryo003"
+migrate_sepolia = "PROFILE=ryosepolia && sozo -P $PROFILE build && sozo -P $PROFILE migrate apply -vvv --name ryo003 --fee-estimate-multiplier 5 && scarb run copy_manifest $PROFILE"
+auth_sepolia = "PROFILE=ryosepolia && scarb run auth $PROFILE"
+
+# slot ryo420
+slot_ryo420_katana = "slot d create ryo420 katana --version v0.7.0-alpha.5 -a 4 -b 5000 --disable-fee true  --invoke-max-steps 1000000"
+slot_ryo420_torii = "slot d create ryo420 torii --rpc  https://api.cartridge.gg/x/ryo420/katana -s 0 --index-pending true --version v0.7.0-alpha.5 --world 0x78fcdfcc137fa18770f660ba2e8a3cf263907df38dfd462dc4dda048979c011"
+
+# slot ryo421
+slot_ryo421_katana = "slot d create ryo421 katana --seed 421 --version v0.7.1 -a 4 -b 5000 --disable-fee true --invoke-max-steps 1000000"
+slot_ryo421_torii = "slot d create ryo421 torii --rpc  https://api.cartridge.gg/x/ryo421/katana -s 0 --index-pending true --version v0.7.1 --world 0x2f569ad903a00476656bec6a74c954ef01e48202652bbab0149574d5f6d829"
+
+# slot ryo_sepolia
+slot_ryosepolia_torii = "slot d create ryosepolia torii --rpc https://api.cartridge.gg/rpc/starknet-sepolia -s 75075 --index-pending true --version v0.7.2 --world 0x2fc5b78f171fd1d6a5842276902dcbd91c770fb01e56bc293392e3931ffe817"
+
+
+[[target.dojo]]
+build-external-contracts = [
+    "token::components::security::initializable::initializable_model",
+    "token::components::token::erc20::erc20_metadata::erc_20_metadata_model",
+    "token::components::token::erc20::erc20_balance::erc_20_balance_model",
+    "token::components::token::erc20::erc20_allowance::erc_20_allowance_model",
+    "token::components::token::erc20::erc20_mintable::erc_20_mintable_model",
+    "token::components::token::erc20::erc20_burnable::erc_20_burnable_model",
+]
+
+[tool.dojo.env]
 rpc_url = "http://localhost:5050"
-account_address = "0x517ececd29116499f4a1b64b094da79ba08dfd54a3edaa316134c41f8160973"
+account_address = "0x6162896d1d7ab204c7ccac6dd5f8e9e7c25ecd5ae4fcb4ad32e57786bb46e03"
 private_key = "0x1800000000300000180000000000030000000000003006001800006600"
 
-# seed 420
-# [profile.staging.tool.dojo.env]
-# rpc_url = "https://api.cartridge.gg/x/ryodev/katana"
-# account_address = "0x6e857786bbd1652857d673836c41e0544d9d5ecd3e7a1bbde744e328b8cc2f6"
-# private_key = "0x5e9d85de083b7ddd3029c44de2997ceba8384074bbebb66696a1b507f0466fc"
+[profile.ryo420.tool.dojo.env]
+rpc_url = "https://api.cartridge.gg/x/ryo420/katana"
+account_address = "0x2ea5a09a95ee73556a3ef6420c11a8df775fe4f06e58fd9f7a21b5d99e0b5ea"
+private_key = "0x18055e629284db77daa8d60e4ca767d65807c3f1690785006e46d6e63a13d54"
+
+[profile.ryo421.tool.dojo.env]
+rpc_url = "https://api.cartridge.gg/x/ryo421/katana"
+account_address = "0x7d806fc9478c73c60fac37c27888771bdb3092c21eb93452277e7673954d034"
+private_key = "0x784b1dd14d761c414c6394fccca3ca1d1b0cac187e88122e4b06378f9e8c515"
+
+[profile.ryosepolia.tool.dojo.env]
+# world_address= "0x10c26511d4264cf894246bdbe2efc53cf99632d1fcd5fab7283649c34ca0494"
+rpc_url = "https://api.cartridge.gg/rpc/starknet-sepolia"
+account_address = "0x3677d8443f74dcc6cd23c4b3f217256c70f084ee7edc4ddc431af2ce91eb936"
+keystore_path = "/Users/boo/sozo_acc"
+# password = "sozo_acc"
 
 # [profile.prod.tool.dojo.env]
-# rpc_url = "https://api.cartridge.gg/x/ryo/katana"
-# account_address = "0x6e857786bbd1652857d673836c41e0544d9d5ecd3e7a1bbde744e328b8cc2f6"
-# private_key = "0x5e9d85de083b7ddd3029c44de2997ceba8384074bbebb66696a1b507f0466fc"
+# rpc_url = "https://api.cartridge.gg/x/ryo420/katana"
+# account_address = "0x795abc2a2d5866f75c58025741329973db20966d1add5dd2a9fbdf0bb8a0266"
+# private_key = "0x2e8ac99614186737cefc47effe03134f5a19c6dc2443c16510d3384769f9c78"
 
 [tool.dojo.world]
-name = "Roll Your Own"
-description = "Onchain adaptation of the classic Drug Wars game. An immersive recreation of the 1999 TI-83 classic where street smarts reign supreme and every choice matters in the end."
+name = "Dope Wars"
+description = "Dope Wars is an onchain adaptation of the classic arbitrage game Drug Wars, built by Cartridge in partnership with Dope DAO."
 website = "https://rollyourown.preview.cartridge.gg/"
 icon_uri = "file://assets/icon.png"
 cover_uri = "file://assets/cover.png"
 socials.x = "https://x.com/TheDopeWars"
 
+
+[profile.ryosepolia.tool.dojo.world]
+name = "Dope Wars"
+description = "Dope Wars is an onchain adaptation of the classic arbitrage game Drug Wars, built by Cartridge in partnership with Dope DAO.."
+website = "https://dopewars.game/"
+icon_uri = "file://assets/icon.png"
+cover_uri = "file://assets/cover.png"
+socials.x = "https://x.com/TheDopeWars"
+
+
+#  alpha.3
+#  create game  :     Steps: 272281 | Bitwise: 194 | Ec Op Builtin: 3 | L 1 Blob Gas Usage: 0 | L1 Gas: 10176 | Pedersen: 50 | Poseidon Builtin: 60 | Range Checks: 42093
+#  buy & travel :     Steps: 420350 | Bitwise: 296 | Ec Op Builtin: 3 | L 1 Blob Gas Usage: 0 | L1 Gas: 3550 | Pedersen: 56 | Poseidon Builtin: 37 | Range Checks: 77213
+#  sell & encounter : Steps: 250413 | Bitwise: 188 | Ec Op Builtin: 3 | L 1 Blob Gas Usage: 0 | L1 Gas: 3549 | Pedersen: 33 | Poseidon Builtin: 29 | Range Checks: 42965
+
+#  alpha.5
+#  create game :      Steps: 123719 | Bitwise: 194 | Ec Op Builtin: 3 | L 1 Blob Gas Usage: 0 | L1 Gas: 10176 | Pedersen: 50 | Poseidon Builtin: 74 | Range Checks: 8641
+#  buy & travel :     Steps: 124923 | Bitwise: 296 | Ec Op Builtin: 3 | L 1 Blob Gas Usage: 0 | L1 Gas: 3548 | Pedersen: 55 | Poseidon Builtin: 37 | Range Checks: 11166
+#  sell & encounter : Steps:  90913 | Bitwise: 190 | Ec Op Builtin: 3 | L 1 Blob Gas Usage: 0 | L1 Gas: 3549 | Pedersen: 33 | Poseidon Builtin: 29 | Range Checks: 7241