diff --git a/.github/workflows/release-dispatch-macros.yml b/.github/workflows/release-dispatch-macros.yml index b8d5a83130..cf42d50e04 100644 --- a/.github/workflows/release-dispatch-macros.yml +++ b/.github/workflows/release-dispatch-macros.yml @@ -27,7 +27,7 @@ jobs: - uses: actions/checkout@v4 - uses: software-mansion/setup-scarb@v1 with: - scarb-version: "2.13.1" + scarb-version: "2.15.0" - run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: Normalize version and update files id: version diff --git a/.github/workflows/release-dispatch.yml b/.github/workflows/release-dispatch.yml index 06176cc293..a73e58d906 100644 --- a/.github/workflows/release-dispatch.yml +++ b/.github/workflows/release-dispatch.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v4 - uses: software-mansion/setup-scarb@v1 with: - scarb-version: "2.13.1" + scarb-version: "2.15.0" - run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: Normalize version and update files id: version diff --git a/.github/workflows/release-macros.yml b/.github/workflows/release-macros.yml index 4e547f5e38..00d1cb4c55 100644 --- a/.github/workflows/release-macros.yml +++ b/.github/workflows/release-macros.yml @@ -114,7 +114,7 @@ jobs: - uses: actions/checkout@v4 - uses: software-mansion/setup-scarb@v1 with: - scarb-version: "2.13.1" + scarb-version: "2.15.0" - uses: actions/download-artifact@v4 with: pattern: artifacts-* diff --git a/.github/workflows/release-sozo.yml b/.github/workflows/release-sozo.yml index 1fd65afc2e..3f9763a507 100644 --- a/.github/workflows/release-sozo.yml +++ b/.github/workflows/release-sozo.yml @@ -88,7 +88,7 @@ jobs: - uses: software-mansion/setup-scarb@v1 with: - scarb-version: "2.13.1" + scarb-version: "2.15.0" - name: Build binaries run: cargo build --release --locked --bin sozo --target ${{ matrix.job.target }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 988ff1f688..928f621c7a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,7 +46,7 @@ jobs: - uses: software-mansion/setup-scarb@v1 with: - scarb-version: "2.13.1" + scarb-version: "2.15.0" - name: Check if Dojo Cairo packages exist on Scarb registry id: check_packages diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fc3594a68e..9a5fad4e5f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -62,7 +62,7 @@ jobs: - uses: actions/checkout@v3 - uses: software-mansion/setup-scarb@v1 with: - scarb-version: "2.13.1" + scarb-version: "2.15.0" - uses: Swatinem/rust-cache@v2 - uses: actions/download-artifact@v4 with: @@ -74,7 +74,7 @@ jobs: # This puts Katana in the path for integration tests. - name: Download Katana for integration tests run: | - curl -L https://github.com/dojoengine/katana/releases/download/v1.7.0/katana_v1.7.0_linux_amd64.tar.gz -o katana.tar.gz; + curl -L https://github.com/dojoengine/katana/releases/download/v1.7.1/katana_v1.7.1_linux_amd64.tar.gz -o katana.tar.gz; tar -C /usr/local/bin -xzf katana.tar.gz - run: | @@ -120,7 +120,7 @@ jobs: - uses: actions/checkout@v3 - uses: software-mansion/setup-scarb@v1 with: - scarb-version: "2.13.1" + scarb-version: "2.15.0" - run: bash scripts/cairo_fmt.sh dojo-core-test: @@ -130,7 +130,7 @@ jobs: - uses: foundry-rs/setup-snfoundry@v3 - uses: software-mansion/setup-scarb@v1 with: - scarb-version: "2.13.1" + scarb-version: "2.15.0" - uses: actions/download-artifact@v4 with: name: dojo-bins @@ -147,7 +147,7 @@ jobs: - uses: foundry-rs/setup-snfoundry@v3 - uses: software-mansion/setup-scarb@v1 with: - scarb-version: "2.13.1" + scarb-version: "2.15.0" - uses: actions/download-artifact@v4 with: name: dojo-bins diff --git a/.tool-versions b/.tool-versions index 93bd0f77f7..eaef076ed6 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,6 +1,6 @@ -scarb 2.13.1 -starknet-foundry 0.51.0 +scarb 2.15.0 +starknet-foundry 0.55.0 cairo-profiler 0.9.0 -katana 1.7.0 -torii 1.8.3 -sozo 1.8.0 +katana 1.7.1 +torii 1.8.14 +sozo 1.8.6 diff --git a/Cargo.lock b/Cargo.lock index bd7b972197..c322211a32 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -238,9 +238,9 @@ checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "apollo_infra_utils" -version = "0.16.0-rc.1" +version = "0.16.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780c31485db92467019b1ba6cb0a4596c883030238f36ee1e6205fd65b6415e0" +checksum = "ef50783135b0289f491e738fb3ea57ffccde51e68b12be4d96b8a74db252532c" dependencies = [ "apollo_proc_macros", "num_enum", @@ -249,13 +249,14 @@ dependencies = [ "thiserror 1.0.69", "tokio", "tracing", + "url", ] [[package]] name = "apollo_proc_macros" -version = "0.16.0-rc.1" +version = "0.16.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde929210d699f0fce6c8e4068881a48304c5ff1f09e6607962725d1d7bd015d" +checksum = "4b177fec2f66debebbe1d39bf5e4c8680037f58f877c9527fb9a1885f7300135" dependencies = [ "lazy_static", "proc-macro2", @@ -263,6 +264,27 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "apollo_sizeof" +version = "0.16.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b230dd6ebc0c6cfe7ef87c9c3bbf760063b40b6b7b469b43fb216994033569f" +dependencies = [ + "apollo_sizeof_macros", + "starknet-types-core 0.2.4", +] + +[[package]] +name = "apollo_sizeof_macros" +version = "0.16.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b83d9b1feea5e65bccc822427caf564f5fc85cdcae116b2a87b72f1fd606c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "arbitrary" version = "1.4.2" @@ -1211,9 +1233,9 @@ dependencies = [ [[package]] name = "cairo-lang-casm" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7097103fbc084ff2d7d8149db29cc1dfb03a9496ea50608af3f1aa64bd6e0d8f" +checksum = "84e6207b0fd16c0d188e91c81ad4e96bbc6c3cd92e128c832d9fbc87e0a4a11e" dependencies = [ "cairo-lang-utils", "indoc", @@ -1225,9 +1247,9 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fcf24feb3ecb00c18eb1d70d76eb173f4f65f97daaa72bbecbc18bd15ea76cc" +checksum = "e28cc7001d335ea5f8f886e12b1d2ff1cb4d3862d570100ac734ef748eb3f441" dependencies = [ "anyhow", "cairo-lang-defs", @@ -1252,9 +1274,9 @@ dependencies = [ [[package]] name = "cairo-lang-debug" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e2bb7a6b3e59aa213b51147b4df7bb6e925aabdf6f90ee83dc9af5dc7d0048" +checksum = "3f8fa7f741b25dfe4319c657b32c79ef1fc91c854b45b4d82bb279cba35fbbf5" dependencies = [ "cairo-lang-utils", "id-arena", @@ -1263,15 +1285,16 @@ dependencies = [ [[package]] name = "cairo-lang-defs" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b68622a99b82d09529063842b76a964dca634a8d262de7577b05c730441f5d2" +checksum = "deaaad6ba678b88c88b0723907fd82b28d91831b4ee1c56d65084304cac7b72d" dependencies = [ "bincode", "cairo-lang-debug", "cairo-lang-diagnostics", "cairo-lang-filesystem", "cairo-lang-parser", + "cairo-lang-proc-macros", "cairo-lang-syntax", "cairo-lang-utils", "itertools 0.14.0", @@ -1283,12 +1306,13 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157eb48b9f2a0a9e0d49ad732d9f4eedb02c811943bf688cf337ed063fc0ba44" +checksum = "0bbb39a789267d1ea3c64dc4b5011530df096fd1c32bfe1dc72e0291ddb70e0b" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", + "cairo-lang-proc-macros", "cairo-lang-utils", "itertools 0.14.0", "salsa", @@ -1296,9 +1320,9 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb246041bb30dc95fedceaaf6474e7af6292c6cb258bc30c972d8ccbdae970a8" +checksum = "ac789761904a39372635b5e3816f539fd8b4602a215d83c18e226e291a552420" dependencies = [ "cairo-lang-utils", "good_lp", @@ -1306,11 +1330,12 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff9bb66c4066dbdd9162e8b732e6a6092afd98b1605c51b9799154a6d452796" +checksum = "9a13326b1762c69d58d22ccd4df0e4973405aa73f0054aff7f8af7fd73deb88a" dependencies = [ "cairo-lang-debug", + "cairo-lang-proc-macros", "cairo-lang-utils", "itertools 0.14.0", "path-clean", @@ -1323,9 +1348,9 @@ dependencies = [ [[package]] name = "cairo-lang-formatter" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fa341723e366f5efb7ef949a69d88896bb2c0e27b65627ce07d16e552f9e1e" +checksum = "ba34c08ac67ac02b3128d564a45582f42334e91cc8a47431e9ed4b95f8389495" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -1343,9 +1368,9 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ed7ca2928c84d673ca18702b9f198bcdd1bd37f82b1f988689bb45e3043ee7" +checksum = "c32179ee954dbef5c26899c960c8d5d7d158dfa83ae8a924799c1932578e353a" dependencies = [ "assert_matches", "bincode", @@ -1366,14 +1391,16 @@ dependencies = [ "num-traits", "salsa", "serde", + "starknet-types-core 0.2.4", "thiserror 2.0.12", + "tracing", ] [[package]] name = "cairo-lang-parser" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145d7fc7af17291a9f60248297271791e9f34e2cf8b28d89a6b1a5117ff5fa98" +checksum = "fa894404dd671130cfb3d86d59dce97df27f565aa92699708d0bc78663cb778e" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -1391,9 +1418,9 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3091fee80fa6ab2b83832d9531e1e372019ecd3d41d680c63e50bb0bf8ba056a" +checksum = "19c46896b74f3e66902d5beda1fed31fb0b8a205a13d9e1868a815d033817105" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -1415,11 +1442,12 @@ checksum = "123ac0ecadf31bacae77436d72b88fa9caef2b8e92c89ce63a125ae911a12fae" [[package]] name = "cairo-lang-proc-macros" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbedc5861c4169b000f15fd9ad57e6108cb9b6d3f80eabafd57ab912108c60e2" +checksum = "a8d5baca5b44cac3178306c82fedbc53ea677908b1682d29c39f03b03eb1d02e" dependencies = [ "cairo-lang-debug", + "proc-macro2", "quote", "salsa", "syn 2.0.106", @@ -1427,9 +1455,9 @@ dependencies = [ [[package]] name = "cairo-lang-project" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e28f481e11e8009bca8896008e6d7e1d2f1a8636234fa1f9f06989baddb2c99" +checksum = "c08a4ee75ce0fda214d882beb50a7c8d18d6e20107429200536b57d13d76bb7b" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -1440,9 +1468,9 @@ dependencies = [ [[package]] name = "cairo-lang-runnable-utils" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb16ff14379cb87ab1881d8c33c9b1e6ec537b822aa499fde65aee250368cc8" +checksum = "691bfb23661cc39c6f286b0256dc426096662fcae0c5b0d075abdc0e518d3934" dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", @@ -1458,9 +1486,9 @@ dependencies = [ [[package]] name = "cairo-lang-runner" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69671b6ceac5c7375100ee94176d4c6fd3493ba6c08cdf1bbfe3a4bab5c255b0" +checksum = "3d66b331e0a59fb52b31f725c8cc2d7112cbc6e85561d8a58b2809b6fa999716" dependencies = [ "ark-ff 0.5.0", "ark-secp256k1", @@ -1484,15 +1512,15 @@ dependencies = [ "salsa", "serde", "sha2", - "starknet-types-core 0.2.3", + "starknet-types-core 0.2.4", "thiserror 2.0.12", ] [[package]] name = "cairo-lang-semantic" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75aa8843a88c391c923714cdd7834c13601e0f52644b228ea72d08ebc0989bc5" +checksum = "83ad7598f3c29e628d5b306afdce4310fe72b123cd55567983dc47eabcb26fee" dependencies = [ "bincode", "cairo-lang-debug", @@ -1513,19 +1541,20 @@ dependencies = [ "salsa", "serde", "sha3", + "starknet-types-core 0.2.4", "toml 0.9.8", ] [[package]] name = "cairo-lang-sierra" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aa42101328ed3df7367c16af74ed65bdeb04fd9eac3253efce5a4273e855930" +checksum = "1f7ab456f23241d2948d8a8795bb032f3a81be48747b970a853924063ffea7c2" dependencies = [ "anyhow", "cairo-lang-utils", "const-fnv1a-hash", - "convert_case 0.8.0", + "convert_case 0.10.0", "derivative", "itertools 0.14.0", "lalrpop", @@ -1538,15 +1567,15 @@ dependencies = [ "serde_json", "sha3", "smol_str", - "starknet-types-core 0.2.3", + "starknet-types-core 0.2.4", "thiserror 2.0.12", ] [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45fd409f5664616f524c51b201724ee8ef732ae3f8c5a58d7beacf87aeb24aad" +checksum = "98a3ca83a79e6191dcaa3cbb49dd53aa90176b49f4534b7e72a79f5a3fbb1cb4" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -1560,9 +1589,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc9b471be8883a59a49dc8ea4efdedc944ea1f0e6ed45c887d981edccd47721" +checksum = "a5e2f9b5c7befa27d7cdb70ee03c8bd44309ecf6e16d439909c692770e733e1a" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -1576,15 +1605,16 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1225073fa696f827deb8ae7ebe2871487f9d475d1632c7256e29c4a3796a14fd" +checksum = "75afecf1adf1a1418b6b4865e694fd2f6e784551f2f812a28b2e33dd4c7c7d0b" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", "cairo-lang-diagnostics", "cairo-lang-filesystem", "cairo-lang-lowering", + "cairo-lang-proc-macros", "cairo-lang-semantic", "cairo-lang-sierra", "cairo-lang-syntax", @@ -1599,9 +1629,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a3527859e823778020ac2d2cf94173ef677c08467b9dca1ea149a77f63d459" +checksum = "5c20590351b15f1522023386d3385de34baee1ea47339729994dcff16faadd7c" dependencies = [ "assert_matches", "cairo-lang-casm", @@ -1614,15 +1644,15 @@ dependencies = [ "itertools 0.14.0", "num-bigint", "num-traits", - "starknet-types-core 0.2.3", + "starknet-types-core 0.2.4", "thiserror 2.0.12", ] [[package]] name = "cairo-lang-sierra-type-size" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff310efff9548ecbf2b32f826f637a62aa397ae701065f3b95ec40db258ba2ea" +checksum = "9a3c5b27e5f5f6f0bca52fb8e2a6c071d83d24fe09f8d6505b6aab3bed5e1a65" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -1630,9 +1660,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd52a824f559730f61ffc73da1b80762f26198da0d7acb98843757a88516b49" +checksum = "03449f446ffa58f6e365b95f2b95520031a6b2be265d6d4d1a33c0eb4e379810" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1655,23 +1685,23 @@ dependencies = [ "salsa", "serde", "serde_json", - "starknet-types-core 0.2.3", + "starknet-types-core 0.2.4", "thiserror 2.0.12", "typetag", ] [[package]] name = "cairo-lang-starknet-classes" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d278f0a2cc219de59fd6e9da191ec4e786dbb8e76c06a7801990d14988ec8a" +checksum = "fd03f9747aa0071117c17d8c3992c0faff32e870f7e8fb285b748a6d1edeaee0" dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", "cairo-lang-sierra-to-casm", "cairo-lang-sierra-type-size", "cairo-lang-utils", - "convert_case 0.8.0", + "convert_case 0.10.0", "itertools 0.14.0", "num-bigint", "num-integer", @@ -1680,19 +1710,20 @@ dependencies = [ "serde_json", "sha3", "smol_str", - "starknet-types-core 0.2.3", + "starknet-types-core 0.2.4", "thiserror 2.0.12", ] [[package]] name = "cairo-lang-syntax" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29a720f771a74197f51435ae7ae7ed19834eb04880213ba569b95bd689268b1" +checksum = "92ced2e38a83e79f41518ba9970159ab84d7fc47ed139f0f70db2d060faeb302" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", "cairo-lang-primitive-token", + "cairo-lang-proc-macros", "cairo-lang-utils", "num-bigint", "num-traits", @@ -1704,9 +1735,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7919f7d9ed476b32befc2811c121197cd04ff10e04d61b662492e6595bbde8d3" +checksum = "d12cf2171666fb224b4890906668f5ebcc31a5c91a4ff5a3b681b9d440d1c995" dependencies = [ "genco", "xshell", @@ -1714,9 +1745,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-utils" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "690e60ed412c276182b58402cd5feb3aed8f93b9022366710aaba3dabf0cb9ff" +checksum = "b2316a0647f8b273bb989f16a44d61e5a71dcb76f8cbdfcc00d2f68734488d3f" dependencies = [ "cairo-lang-formatter", "cairo-lang-proc-macros", @@ -1728,9 +1759,9 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a6e1312b4709181ee7c5f0d6b1dc2b9ea20946eb70a83fc2b267d9e2a5d3f6" +checksum = "d8469aa1f8361bd76648eade6cb9b18a957841e99937797788b327741de7cab8" dependencies = [ "hashbrown 0.16.0", "indexmap 2.12.0", @@ -1749,16 +1780,15 @@ dependencies = [ [[package]] name = "cairo-vm" -version = "2.5.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c21cacdf4e290ab5f0018f24d6bf97f8d3a8809bd09568550669270e7f9ed534" +checksum = "182965d2ccbc05674f798b30097854ecf015eed695194a3a5fe9b682c4163b9d" dependencies = [ "anyhow", "bincode", "bitvec", "generic-array", "hashbrown 0.15.5", - "hex", "indoc", "keccak", "lazy_static", @@ -1774,7 +1804,7 @@ dependencies = [ "sha2", "sha3", "starknet-crypto 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "starknet-types-core 0.2.3", + "starknet-types-core 0.2.4", "thiserror 2.0.12", "zip", ] @@ -2084,6 +2114,15 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "convert_case" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "cookie" version = "0.17.0" @@ -7020,42 +7059,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" -[[package]] -name = "size-of" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4e36eca171fddeda53901b0a436573b3f2391eaa9189d439b2bd8ea8cebd7e3" - -[[package]] -name = "sizeof" -version = "0.16.0-rc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29dcfb1a76f2e5486a3c2d4e66d939813ce9be7500b2169e059a627ed13436cd" -dependencies = [ - "sizeof_internal", - "sizeof_macro", -] - -[[package]] -name = "sizeof_internal" -version = "0.16.0-rc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2361e1b34f9c2b742419e30e99e2f3094a846dd93fb5edc23ee0f714feb4e43d" -dependencies = [ - "starknet-types-core 0.2.3", -] - -[[package]] -name = "sizeof_macro" -version = "0.16.0-rc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6503474d48a3ff40a3da73f2e277e33e958245d78fc77e2386c5e521d38b16d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", -] - [[package]] name = "sketches-ddsketch" version = "0.2.2" @@ -7571,8 +7574,8 @@ source = "git+https://github.com/dojoengine/starknet-rs?branch=feat%2Ftypes-rs-1 dependencies = [ "starknet-accounts", "starknet-contract", - "starknet-core", - "starknet-core-derive", + "starknet-core 0.16.0 (git+https://github.com/dojoengine/starknet-rs?branch=feat%2Ftypes-rs-100-blake2s)", + "starknet-core-derive 0.1.0 (git+https://github.com/dojoengine/starknet-rs?branch=feat%2Ftypes-rs-100-blake2s)", "starknet-crypto 0.8.1 (git+https://github.com/dojoengine/starknet-rs?branch=feat%2Ftypes-rs-100-blake2s)", "starknet-macros", "starknet-providers", @@ -7586,7 +7589,7 @@ source = "git+https://github.com/dojoengine/starknet-rs?branch=feat%2Ftypes-rs-1 dependencies = [ "async-trait", "auto_impl", - "starknet-core", + "starknet-core 0.16.0 (git+https://github.com/dojoengine/starknet-rs?branch=feat%2Ftypes-rs-100-blake2s)", "starknet-crypto 0.8.1 (git+https://github.com/dojoengine/starknet-rs?branch=feat%2Ftypes-rs-100-blake2s)", "starknet-providers", "starknet-signers", @@ -7602,11 +7605,34 @@ dependencies = [ "serde_json", "serde_with", "starknet-accounts", - "starknet-core", + "starknet-core 0.16.0 (git+https://github.com/dojoengine/starknet-rs?branch=feat%2Ftypes-rs-100-blake2s)", "starknet-providers", "thiserror 1.0.69", ] +[[package]] +name = "starknet-core" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efb7212226769766c1c7d79b70f9242ffbd213290a41604ecc7e78faa0ed0deb" +dependencies = [ + "base64 0.21.7", + "crypto-bigint", + "flate2", + "foldhash 0.1.5", + "hex", + "indexmap 2.12.0", + "num-traits", + "serde", + "serde_json", + "serde_json_pythonic", + "serde_with", + "sha3", + "starknet-core-derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "starknet-crypto 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "starknet-types-core 0.2.4", +] + [[package]] name = "starknet-core" version = "0.16.0" @@ -7624,11 +7650,22 @@ dependencies = [ "serde_json_pythonic", "serde_with", "sha3", - "starknet-core-derive", + "starknet-core-derive 0.1.0 (git+https://github.com/dojoengine/starknet-rs?branch=feat%2Ftypes-rs-100-blake2s)", "starknet-crypto 0.8.1 (git+https://github.com/dojoengine/starknet-rs?branch=feat%2Ftypes-rs-100-blake2s)", "starknet-types-core 1.0.0", ] +[[package]] +name = "starknet-core-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b08520b7d80eda7bf1a223e8db4f9bb5779a12846f15ebf8f8d76667eca7f5ad" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "starknet-core-derive" version = "0.1.0" @@ -7654,7 +7691,7 @@ dependencies = [ "rfc6979", "sha2", "starknet-curve 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "starknet-types-core 0.2.3", + "starknet-types-core 0.2.4", "zeroize", ] @@ -7682,7 +7719,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22c898ae81b6409532374cf237f1bd752d068b96c6ad500af9ebbd0d9bb712f6" dependencies = [ - "starknet-types-core 0.2.3", + "starknet-types-core 0.2.4", ] [[package]] @@ -7698,7 +7735,7 @@ name = "starknet-macros" version = "0.2.5" source = "git+https://github.com/dojoengine/starknet-rs?branch=feat%2Ftypes-rs-100-blake2s#bc33ecb0837f7bb605176deacf6d110409016039" dependencies = [ - "starknet-core", + "starknet-core 0.16.0 (git+https://github.com/dojoengine/starknet-rs?branch=feat%2Ftypes-rs-100-blake2s)", "syn 2.0.106", ] @@ -7717,7 +7754,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "starknet-core", + "starknet-core 0.16.0 (git+https://github.com/dojoengine/starknet-rs?branch=feat%2Ftypes-rs-100-blake2s)", "thiserror 1.0.69", "url", ] @@ -7733,16 +7770,16 @@ dependencies = [ "eth-keystore", "getrandom 0.2.16", "rand 0.8.5", - "starknet-core", + "starknet-core 0.16.0 (git+https://github.com/dojoengine/starknet-rs?branch=feat%2Ftypes-rs-100-blake2s)", "starknet-crypto 0.8.1 (git+https://github.com/dojoengine/starknet-rs?branch=feat%2Ftypes-rs-100-blake2s)", "thiserror 1.0.69", ] [[package]] name = "starknet-types-core" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab92594a86ac627dd4c8d3350362cc8035e55c548c27c71dfa4c9fc6b3b6ab1a" +checksum = "90d23b1bc014ee4cce40056ab3114bcbcdc2dbc1e845bbfb1f8bd0bab63507d4" dependencies = [ "blake2", "digest 0.10.7", @@ -7754,7 +7791,6 @@ dependencies = [ "num-traits", "rand 0.9.2", "serde", - "size-of", "zeroize", ] @@ -7780,11 +7816,12 @@ dependencies = [ [[package]] name = "starknet_api" -version = "0.16.0-rc.1" +version = "0.16.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9893be10768a72f91012e34ad3fbf66d4e058d3b1886195ebcd05815d3969e00" +checksum = "8d1b32bfe0c7d92604633fe2a6beafc732e6517e07203f0c5c3be1ec06d90d99" dependencies = [ "apollo_infra_utils", + "apollo_sizeof", "base64 0.13.1", "bitvec", "cached", @@ -7805,9 +7842,9 @@ dependencies = [ "serde", "serde_json", "sha3", - "sizeof", + "starknet-core 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "starknet-crypto 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "starknet-types-core 0.2.3", + "starknet-types-core 0.2.4", "strum", "strum_macros", "thiserror 1.0.69", diff --git a/Cargo.toml b/Cargo.toml index c0b041dc26..ef33eee9e4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -91,7 +91,7 @@ auto_impl = "1.2.0" base64 = "0.21.2" bigdecimal = "0.4.1" bytes = "1.6" -cairo-lang-starknet-classes = "=2.13.1" +cairo-lang-starknet-classes = "=2.15.0" camino = { version = "1.1.2", features = [ "serde1" ] } chrono = { version = "0.4.24", features = [ "serde" ] } clap = { version = "4.5.16", features = [ "derive", "env", "string" ] } diff --git a/bin/sozo/.tool-versions b/bin/sozo/.tool-versions index 219f926f87..844913d957 100644 --- a/bin/sozo/.tool-versions +++ b/bin/sozo/.tool-versions @@ -1,2 +1,2 @@ -scarb 2.13.1 -starknet-foundry 0.51.0 +scarb 2.15.0 +starknet-foundry 0.55.0 diff --git a/bin/sozo/tests/test_data/policies.json b/bin/sozo/tests/test_data/policies.json index 2341d9303f..931220bba5 100644 --- a/bin/sozo/tests/test_data/policies.json +++ b/bin/sozo/tests/test_data/policies.json @@ -1,4 +1,52 @@ [ + { + "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", + "method": "spawn" + }, + { + "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", + "method": "move" + }, + { + "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", + "method": "set_enemies" + }, + { + "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", + "method": "update_goblin" + }, + { + "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", + "method": "set_player_config" + }, + { + "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", + "method": "update_player_config_name" + }, + { + "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", + "method": "reset_player_config" + }, + { + "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", + "method": "set_player_server_profile" + }, + { + "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", + "method": "set_models" + }, + { + "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", + "method": "enter_dungeon" + }, + { + "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", + "method": "upgrade" + }, + { + "target": "0x4db3c3fe73c334f8aee0c98af79da40678885c6bed7d26d33005111ef09bd", + "method": "upgrade" + }, { "target": "0xbae3613bb40564f974ce08c438c1d94208392ccfe3df8d60b14b8b7d464cd1", "method": "spawn" @@ -139,60 +187,12 @@ "target": "0x2599029b10da79fe6673b4df7d9b4f17327a1dd4d4e4df6b26200aa6cb42107", "method": "upgrade" }, - { - "target": "0x67c959dab3ec6c246fde7381722263599c77226d2d2f3ac184b8051a9f9668f", - "method": "upgrade" - }, { "target": "0x59256311d2c3a307be90cb0b2cc91b25713d6db9361ac1a2071850751ddb20c", "method": "upgrade" }, { - "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", - "method": "spawn" - }, - { - "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", - "method": "move" - }, - { - "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", - "method": "set_enemies" - }, - { - "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", - "method": "update_goblin" - }, - { - "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", - "method": "set_player_config" - }, - { - "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", - "method": "update_player_config_name" - }, - { - "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", - "method": "reset_player_config" - }, - { - "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", - "method": "set_player_server_profile" - }, - { - "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", - "method": "set_models" - }, - { - "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", - "method": "enter_dungeon" - }, - { - "target": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", - "method": "upgrade" - }, - { - "target": "0x4db3c3fe73c334f8aee0c98af79da40678885c6bed7d26d33005111ef09bd", + "target": "0x67c959dab3ec6c246fde7381722263599c77226d2d2f3ac184b8051a9f9668f", "method": "upgrade" }, { diff --git a/crates/dojo/core-tests/Scarb.lock b/crates/dojo/core-tests/Scarb.lock index 18109f95e3..08efb63585 100644 --- a/crates/dojo/core-tests/Scarb.lock +++ b/crates/dojo/core-tests/Scarb.lock @@ -32,15 +32,15 @@ dependencies = [ [[package]] name = "snforge_scarb_plugin" -version = "0.51.1" +version = "0.55.0" source = "registry+https://scarbs.xyz/" -checksum = "sha256:6783f6990b19ec24f757381e99938d5966df1e7c734ec45e2c7c8133207c8624" +checksum = "sha256:638535780a23d1491c2438e64045c479d16de6a69e41ad17ac065272c485873b" [[package]] name = "snforge_std" -version = "0.51.1" +version = "0.55.0" source = "registry+https://scarbs.xyz/" -checksum = "sha256:5af23a16bc9d7067cfe99bbbe69118773eb7cc9411b2051513c7c1c6995e57a1" +checksum = "sha256:a04b0bf731f02307506dad368713099e701565edd9b98b044ca54b932c29ef74" dependencies = [ "snforge_scarb_plugin", ] diff --git a/crates/dojo/core-tests/Scarb.toml b/crates/dojo/core-tests/Scarb.toml index ebe6090e75..546e0faddf 100644 --- a/crates/dojo/core-tests/Scarb.toml +++ b/crates/dojo/core-tests/Scarb.toml @@ -5,15 +5,15 @@ version = "1.8.0" edition = "2024_07" [dependencies] -starknet = "2.13" +starknet = "2.15" dojo = { path = "../core" } dojo_cairo_macros = { path = "../macros" } dojo_snf_test = { path = "../dojo-snf-test" } [dev-dependencies] -snforge_std = "0.51" -assert_macros = "2.13" +snforge_std = "0.55" +assert_macros = "2.15" [[target.starknet-contract]] build-external-contracts = ["dojo::world::world_contract::world"] diff --git a/crates/dojo/core-tests/src/tests/world/acl.cairo b/crates/dojo/core-tests/src/tests/world/acl.cairo index e28a70b12a..eb2a37c0b3 100644 --- a/crates/dojo/core-tests/src/tests/world/acl.cairo +++ b/crates/dojo/core-tests/src/tests/world/acl.cairo @@ -50,7 +50,7 @@ fn test_grant_owner_not_registered_resource() { #[test] #[should_panic( - expected: "Contract `0x5b99b010a37a9aaa048ace8907aa2e0a2c337eb48d0524f93a1a2dec7daff66` does NOT have OWNER role on model (or its namespace) `Foo`", + expected: "Contract `0x8557deefd34f6cea225ebeb513a7c1b68f411155de0413f2ab99e45559b157` does NOT have OWNER role on model (or its namespace) `Foo`", )] fn test_grant_owner_through_malicious_contract() { let (world, foo_selector) = deploy_world_and_foo(); @@ -87,7 +87,7 @@ fn test_grant_owner_fails_for_non_owner() { #[test] #[should_panic( - expected: "Contract `0x5b99b010a37a9aaa048ace8907aa2e0a2c337eb48d0524f93a1a2dec7daff66` does NOT have OWNER role on model (or its namespace) `Foo`", + expected: "Contract `0x8557deefd34f6cea225ebeb513a7c1b68f411155de0413f2ab99e45559b157` does NOT have OWNER role on model (or its namespace) `Foo`", )] fn test_revoke_owner_through_malicious_contract() { let (world, foo_selector) = deploy_world_and_foo(); @@ -150,7 +150,7 @@ fn test_writer_not_registered_resource() { #[test] #[should_panic( - expected: "Contract `0x5b99b010a37a9aaa048ace8907aa2e0a2c337eb48d0524f93a1a2dec7daff66` does NOT have OWNER role on model (or its namespace) `Foo`", + expected: "Contract `0x8557deefd34f6cea225ebeb513a7c1b68f411155de0413f2ab99e45559b157` does NOT have OWNER role on model (or its namespace) `Foo`", )] fn test_grant_writer_through_malicious_contract() { let (world, foo_selector) = deploy_world_and_foo(); @@ -187,7 +187,7 @@ fn test_grant_writer_fails_for_non_owner() { #[test] #[should_panic( - expected: "Contract `0x5b99b010a37a9aaa048ace8907aa2e0a2c337eb48d0524f93a1a2dec7daff66` does NOT have OWNER role on model (or its namespace) `Foo`", + expected: "Contract `0x8557deefd34f6cea225ebeb513a7c1b68f411155de0413f2ab99e45559b157` does NOT have OWNER role on model (or its namespace) `Foo`", )] fn test_revoke_writer_through_malicious_contract() { let (world, foo_selector) = deploy_world_and_foo(); diff --git a/crates/dojo/core-tests/src/tests/world/contract.cairo b/crates/dojo/core-tests/src/tests/world/contract.cairo index 1ae1111f29..21e13cfb89 100644 --- a/crates/dojo/core-tests/src/tests/world/contract.cairo +++ b/crates/dojo/core-tests/src/tests/world/contract.cairo @@ -241,7 +241,7 @@ fn test_deploy_contract_with_unregistered_namespace() { // and it's not the account that is calling the deploy_contract function. #[test] #[should_panic( - expected: "Contract `0x5b99b010a37a9aaa048ace8907aa2e0a2c337eb48d0524f93a1a2dec7daff66` does NOT have OWNER role on namespace `dojo`", + expected: "Contract `0x8557deefd34f6cea225ebeb513a7c1b68f411155de0413f2ab99e45559b157` does NOT have OWNER role on namespace `dojo`", )] fn test_deploy_contract_through_malicious_contract() { let world = deploy_world(); @@ -349,7 +349,7 @@ fn test_upgrade_contract_from_random_account() { #[test] #[should_panic( - expected: "Contract `0x5b99b010a37a9aaa048ace8907aa2e0a2c337eb48d0524f93a1a2dec7daff66` does NOT have OWNER role on contract (or its namespace) `test_contract`", + expected: "Contract `0x8557deefd34f6cea225ebeb513a7c1b68f411155de0413f2ab99e45559b157` does NOT have OWNER role on contract (or its namespace) `test_contract`", )] fn test_upgrade_contract_through_malicious_contract() { let world = deploy_world(); diff --git a/crates/dojo/core-tests/src/tests/world/event.cairo b/crates/dojo/core-tests/src/tests/world/event.cairo index f641d98e52..46b29f31fd 100644 --- a/crates/dojo/core-tests/src/tests/world/event.cairo +++ b/crates/dojo/core-tests/src/tests/world/event.cairo @@ -297,7 +297,7 @@ fn test_register_event_with_unregistered_namespace() { // and it's not the account that is calling the register_event function. #[test] #[should_panic( - expected: "Contract `0x5bb23c540d3ed4157ef96cbec40f5bd9c18ac499fe8271f4f93b0b4d4bad39d` does NOT have OWNER role on namespace `dojo`", + expected: "Contract `0x545d70eff535a99a145cf61a05ab9e0f6b808e831fb6a39b236925ffb7d69d3` does NOT have OWNER role on namespace `dojo`", )] fn test_register_event_through_malicious_contract() { let bob: ContractAddress = 0xb0b.try_into().unwrap(); diff --git a/crates/dojo/core-tests/src/tests/world/metadata.cairo b/crates/dojo/core-tests/src/tests/world/metadata.cairo index 77aadfe7d4..c8e6a895ec 100644 --- a/crates/dojo/core-tests/src/tests/world/metadata.cairo +++ b/crates/dojo/core-tests/src/tests/world/metadata.cairo @@ -109,7 +109,7 @@ fn test_set_metadata_not_possible_for_random_account() { #[test] #[should_panic( - expected: "Contract `0x5b99b010a37a9aaa048ace8907aa2e0a2c337eb48d0524f93a1a2dec7daff66` does NOT have OWNER role on model (or its namespace) `Foo`", + expected: "Contract `0x8557deefd34f6cea225ebeb513a7c1b68f411155de0413f2ab99e45559b157` does NOT have OWNER role on model (or its namespace) `Foo`", )] fn test_set_metadata_through_malicious_contract() { let (world, model_selector) = deploy_world_and_foo(); diff --git a/crates/dojo/core-tests/src/tests/world/model.cairo b/crates/dojo/core-tests/src/tests/world/model.cairo index cbfe8e2423..2df956a63a 100644 --- a/crates/dojo/core-tests/src/tests/world/model.cairo +++ b/crates/dojo/core-tests/src/tests/world/model.cairo @@ -354,7 +354,7 @@ fn test_register_model_with_unregistered_namespace() { // and it's not the account that is calling the register_model function. #[test] #[should_panic( - expected: "Contract `0x5bb23c540d3ed4157ef96cbec40f5bd9c18ac499fe8271f4f93b0b4d4bad39d` does NOT have OWNER role on namespace `dojo`", + expected: "Contract `0x545d70eff535a99a145cf61a05ab9e0f6b808e831fb6a39b236925ffb7d69d3` does NOT have OWNER role on namespace `dojo`", )] fn test_register_model_through_malicious_contract() { let bob: ContractAddress = 0xb0b.try_into().unwrap(); diff --git a/crates/dojo/core-tests/src/tests/world/world.cairo b/crates/dojo/core-tests/src/tests/world/world.cairo index cfed3d4fb6..75dedbe7b0 100644 --- a/crates/dojo/core-tests/src/tests/world/world.cairo +++ b/crates/dojo/core-tests/src/tests/world/world.cairo @@ -257,7 +257,7 @@ fn test_can_call_init_only_world() { #[test] #[available_gas(l2_gas: 6000000)] #[should_panic( - expected: "Contract `0x13980ded8cc90b19393b302ce9b732a29541fb364d30817b8b4a90473295e8c` does NOT have OWNER role on contract (or its namespace) `test_contract`", + expected: "Contract `0x201c993df8aa75893465bccb26b59ff8f288acccf8ce17d8400e7bff423b13c` does NOT have OWNER role on contract (or its namespace) `test_contract`", )] fn test_can_call_init_only_owner() { let world = deploy_world(); diff --git a/crates/dojo/core/Scarb.toml b/crates/dojo/core/Scarb.toml index ce92a89ee7..329d07be72 100644 --- a/crates/dojo/core/Scarb.toml +++ b/crates/dojo/core/Scarb.toml @@ -11,7 +11,7 @@ experimental-features = ["negative_impls"] re-export-cairo-plugins = ["dojo_cairo_macros"] [dependencies] -starknet = "2.13" +starknet = "2.15" dojo_cairo_macros = { path = "../macros", version = "1.8.0" } [lib] diff --git a/crates/dojo/dojo-cairo-test/Scarb.toml b/crates/dojo/dojo-cairo-test/Scarb.toml index dca597e6b1..7e9e0242ef 100644 --- a/crates/dojo/dojo-cairo-test/Scarb.toml +++ b/crates/dojo/dojo-cairo-test/Scarb.toml @@ -4,14 +4,14 @@ description = "Testing library for Dojo using cairo test runner." license = "MIT" version = "1.8.0" edition = "2024_07" -cairo-version = "2.13" +cairo-version = "2.15" repository = "https://github.com/dojoengine/dojo" documentation = "https://book.dojoengine.org" keywords = ["dojo", "contracts", "starknet", "testing"] [dependencies] -starknet = "2.13" -cairo_test = "2.13" +starknet = "2.15" +cairo_test = "2.15" dojo = { path = "../core", version = "1.7" } diff --git a/crates/dojo/dojo-snf-test/Scarb.lock b/crates/dojo/dojo-snf-test/Scarb.lock index 21fa9191a6..5de960f676 100644 --- a/crates/dojo/dojo-snf-test/Scarb.lock +++ b/crates/dojo/dojo-snf-test/Scarb.lock @@ -22,15 +22,15 @@ dependencies = [ [[package]] name = "snforge_scarb_plugin" -version = "0.51.1" +version = "0.55.0" source = "registry+https://scarbs.xyz/" -checksum = "sha256:6783f6990b19ec24f757381e99938d5966df1e7c734ec45e2c7c8133207c8624" +checksum = "sha256:638535780a23d1491c2438e64045c479d16de6a69e41ad17ac065272c485873b" [[package]] name = "snforge_std" -version = "0.51.1" +version = "0.55.0" source = "registry+https://scarbs.xyz/" -checksum = "sha256:5af23a16bc9d7067cfe99bbbe69118773eb7cc9411b2051513c7c1c6995e57a1" +checksum = "sha256:a04b0bf731f02307506dad368713099e701565edd9b98b044ca54b932c29ef74" dependencies = [ "snforge_scarb_plugin", ] diff --git a/crates/dojo/dojo-snf-test/Scarb.toml b/crates/dojo/dojo-snf-test/Scarb.toml index 9000b45341..c9729a81eb 100644 --- a/crates/dojo/dojo-snf-test/Scarb.toml +++ b/crates/dojo/dojo-snf-test/Scarb.toml @@ -9,9 +9,9 @@ documentation = "https://book.dojoengine.org" keywords = ["dojo", "starknet", "testing"] [dependencies] -starknet = "2.13" -snforge_std = "0.51" -assert_macros = "2.13" +starknet = "2.15" +snforge_std = "0.55" +assert_macros = "2.15" dojo = { path = "../core", version = "1.7" } diff --git a/crates/dojo/macros/Cargo.lock b/crates/dojo/macros/Cargo.lock index bbf942a7ed..d31ff0c1bd 100644 --- a/crates/dojo/macros/Cargo.lock +++ b/crates/dojo/macros/Cargo.lock @@ -376,9 +376,9 @@ dependencies = [ [[package]] name = "cairo-lang-debug" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e2bb7a6b3e59aa213b51147b4df7bb6e925aabdf6f90ee83dc9af5dc7d0048" +checksum = "3f8fa7f741b25dfe4319c657b32c79ef1fc91c854b45b4d82bb279cba35fbbf5" dependencies = [ "cairo-lang-utils", "id-arena", @@ -387,15 +387,16 @@ dependencies = [ [[package]] name = "cairo-lang-defs" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b68622a99b82d09529063842b76a964dca634a8d262de7577b05c730441f5d2" +checksum = "deaaad6ba678b88c88b0723907fd82b28d91831b4ee1c56d65084304cac7b72d" dependencies = [ "bincode", "cairo-lang-debug", "cairo-lang-diagnostics", "cairo-lang-filesystem", "cairo-lang-parser", + "cairo-lang-proc-macros", "cairo-lang-syntax", "cairo-lang-utils", "itertools 0.14.0", @@ -407,12 +408,13 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157eb48b9f2a0a9e0d49ad732d9f4eedb02c811943bf688cf337ed063fc0ba44" +checksum = "0bbb39a789267d1ea3c64dc4b5011530df096fd1c32bfe1dc72e0291ddb70e0b" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", + "cairo-lang-proc-macros", "cairo-lang-utils", "itertools 0.14.0", "salsa", @@ -420,11 +422,12 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff9bb66c4066dbdd9162e8b732e6a6092afd98b1605c51b9799154a6d452796" +checksum = "9a13326b1762c69d58d22ccd4df0e4973405aa73f0054aff7f8af7fd73deb88a" dependencies = [ "cairo-lang-debug", + "cairo-lang-proc-macros", "cairo-lang-utils", "itertools 0.14.0", "path-clean", @@ -468,9 +471,9 @@ checksum = "414b7ba40b5ec3f26101b5c76df5739190832834b95689a723f3f88ec1695fe3" [[package]] name = "cairo-lang-parser" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145d7fc7af17291a9f60248297271791e9f34e2cf8b28d89a6b1a5117ff5fa98" +checksum = "fa894404dd671130cfb3d86d59dce97df27f565aa92699708d0bc78663cb778e" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -492,6 +495,19 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "123ac0ecadf31bacae77436d72b88fa9caef2b8e92c89ce63a125ae911a12fae" +[[package]] +name = "cairo-lang-proc-macros" +version = "2.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d5baca5b44cac3178306c82fedbc53ea677908b1682d29c39f03b03eb1d02e" +dependencies = [ + "cairo-lang-debug", + "proc-macro2", + "quote", + "salsa", + "syn 2.0.106", +] + [[package]] name = "cairo-lang-quote" version = "0.1.0" @@ -504,13 +520,14 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29a720f771a74197f51435ae7ae7ed19834eb04880213ba569b95bd689268b1" +checksum = "92ced2e38a83e79f41518ba9970159ab84d7fc47ed139f0f70db2d060faeb302" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", "cairo-lang-primitive-token", + "cairo-lang-proc-macros", "cairo-lang-utils", "num-bigint", "num-traits", @@ -522,9 +539,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7919f7d9ed476b32befc2811c121197cd04ff10e04d61b662492e6595bbde8d3" +checksum = "d12cf2171666fb224b4890906668f5ebcc31a5c91a4ff5a3b681b9d440d1c995" dependencies = [ "genco", "xshell", @@ -532,9 +549,9 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.13.1" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a6e1312b4709181ee7c5f0d6b1dc2b9ea20946eb70a83fc2b267d9e2a5d3f6" +checksum = "d8469aa1f8361bd76648eade6cb9b18a957841e99937797788b327741de7cab8" dependencies = [ "hashbrown 0.16.0", "indexmap 2.11.4", diff --git a/crates/dojo/macros/Cargo.toml b/crates/dojo/macros/Cargo.toml index a99f9562b6..2dc7ca93ae 100644 --- a/crates/dojo/macros/Cargo.toml +++ b/crates/dojo/macros/Cargo.toml @@ -23,11 +23,11 @@ anyhow = "1.0" dojo-types = { path = "../types", version = "1.7.0" } cairo-lang-primitive-token = "1" cairo-lang-macro = "0.2.0" -cairo-lang-parser = "2.13.1" -cairo-lang-utils = "2.13.1" -cairo-lang-syntax = "2.13.1" -cairo-lang-defs = "2.13.1" -cairo-lang-diagnostics = "2.13.1" +cairo-lang-parser = "2.15.0" +cairo-lang-utils = "2.15.0" +cairo-lang-syntax = "2.15.0" +cairo-lang-defs = "2.15.0" +cairo-lang-diagnostics = "2.15.0" smol_str = "0.3" starknet-crypto = { git = "https://github.com/dojoengine/starknet-rs", branch = "feat/types-rs-100-blake2s" } starknet = { git = "https://github.com/dojoengine/starknet-rs", branch = "feat/types-rs-100-blake2s" } diff --git a/crates/sozo/mcp/src/resources/mod.rs b/crates/sozo/mcp/src/resources/mod.rs index 1493b52450..f4a256dda2 100644 --- a/crates/sozo/mcp/src/resources/mod.rs +++ b/crates/sozo/mcp/src/resources/mod.rs @@ -166,10 +166,10 @@ edition = "2023_01" [dependencies] dojo = { git = "https://github.com/dojoengine/dojo" } -starknet = "2.4.0" +starknet = "2.15.0" [dev-dependencies] -cairo-lang-test-plugin = "2.4.0" +cairo-lang-test-plugin = "2.15.0" [[target.dojo]] "#; @@ -186,7 +186,7 @@ cairo-lang-test-plugin = "2.4.0" assert!(json_str.contains("2023_01")); assert!(json_str.contains("dojo")); assert!(json_str.contains("starknet")); - assert!(json_str.contains("2.4.0")); + assert!(json_str.contains("2.15.0")); } #[tokio::test] diff --git a/examples/game-lib/Scarb.toml b/examples/game-lib/Scarb.toml index 512c6f9e95..4c6205f3f9 100644 --- a/examples/game-lib/Scarb.toml +++ b/examples/game-lib/Scarb.toml @@ -11,6 +11,6 @@ edition = "2024_07" license = "MIT" [workspace.dependencies] -starknet = "2.13" +starknet = "2.15" dojo = { path = "../../crates/dojo/core/" } dojo_cairo_macros = { path = "../../crates/dojo/macros" } diff --git a/examples/game-lib/armory/Scarb.toml b/examples/game-lib/armory/Scarb.toml index 9dc214a901..7713201a53 100644 --- a/examples/game-lib/armory/Scarb.toml +++ b/examples/game-lib/armory/Scarb.toml @@ -10,7 +10,7 @@ dojo.workspace = true dojo_cairo_macros.workspace = true [dev-dependencies] -cairo_test = "2.13" +cairo_test = "2.15" dojo_cairo_test = { path = "../../../crates/dojo/dojo-cairo-test" } [lib] diff --git a/examples/game-lib/bestiary/Scarb.toml b/examples/game-lib/bestiary/Scarb.toml index c7fa08b7b9..cc9392c8eb 100644 --- a/examples/game-lib/bestiary/Scarb.toml +++ b/examples/game-lib/bestiary/Scarb.toml @@ -10,7 +10,7 @@ dojo.workspace = true dojo_cairo_macros.workspace = true [dev-dependencies] -cairo_test = "2.13" +cairo_test = "2.15" dojo_cairo_test = { path = "../../../crates/dojo/dojo-cairo-test" } [lib] diff --git a/examples/simple/Scarb.toml b/examples/simple/Scarb.toml index d11a99bea9..14c40e1780 100644 --- a/examples/simple/Scarb.toml +++ b/examples/simple/Scarb.toml @@ -12,10 +12,10 @@ build-external-contracts = ["dojo::world::world_contract::world"] [dependencies] dojo = { path = "../../crates/dojo/core" } dojo_cairo_macros = { path = "../../crates/dojo/macros" } -starknet = "2.13" +starknet = "2.15" [dev-dependencies] -cairo_test = "2.13" +cairo_test = "2.15" dojo_cairo_test = { path = "../../crates/dojo/dojo-cairo-test" } [features] diff --git a/examples/simple/manifest_dev.json b/examples/simple/manifest_dev.json index 33d42defe8..dbaae75c21 100644 --- a/examples/simple/manifest_dev.json +++ b/examples/simple/manifest_dev.json @@ -1,7 +1,7 @@ { "world": { - "class_hash": "0x613551abceb2b37073b1149bb862ea70cf029981ce1ca47e9dd7c7ab97cb65d", - "address": "0xe4a79292e2aaca4ece7922b834b395fef1498d7b35bc6d3ac331f7359a9c59", + "class_hash": "0x381899226c066a0262f45d6ab815f89818e0874ec3e66cdf72b5e92d8db4680", + "address": "0x1e93152b2495ed6f473d31164dbe1c0cdd2bd6ebadf8a8f56d56afb72bfe81e", "seed": "simple", "name": "simple", "entrypoints": [ @@ -33,8 +33,8 @@ }, "contracts": [ { - "address": "0x6a2312753a30573620efdfb0f141872d1e7883237c8b99dcf518e47618df886", - "class_hash": "0x6640063225e26aa901371598204cc4895922fd30083f334aa4283fb659d4053", + "address": "0xda15eec905eac99f0bddc83885a97decfa52789084d8b3ba577436e9ea30f6", + "class_hash": "0x2586cad74b228e524f2da23c0cd103323d97720a7abd4da2d6618f76f5ffc89", "init_calldata": [ "0xfffe" ], @@ -51,8 +51,8 @@ ] }, { - "address": "0x6129c0f8fd33316ed0a76ee4e99c99692deb0f43b4f9507407da1dbff017f10", - "class_hash": "0x333387983c76b08d957752a25ac8b38da7d89917471f65964fbfee1280e24ca", + "address": "0x7eac9dd06849785630e5fe45072c0c4b1f569d50047c300cd67b74f2f4021d5", + "class_hash": "0x62dc4653f509cd0bbcfc3486219a393bb5b7aecf75f95cd863b1d35093d1100", "init_calldata": [], "tag": "ns-c2", "selector": "0x7561c5d1d1d72352071ae8d14b5289444b3f2542b02daa2924c526fb0846e59", @@ -61,8 +61,8 @@ ] }, { - "address": "0x79a5c67dea017e76185338cdfe94ec60ae4bd77a91c0811eb9f8095ca4a864d", - "class_hash": "0x6640063225e26aa901371598204cc4895922fd30083f334aa4283fb659d4053", + "address": "0x51ac7790da654898eeeece295d6bdc1e29d7f68da8fc009385337c537c82c0e", + "class_hash": "0x2586cad74b228e524f2da23c0cd103323d97720a7abd4da2d6618f76f5ffc89", "init_calldata": [ "0xfffe" ], @@ -94,7 +94,7 @@ "key": false } ], - "class_hash": "0x2250577e3cc5c3c63b88a41ebd816985e254a66417fba80e6d286f570a7d1a6", + "class_hash": "0x534e8f4f6faced5b091acdc627c48c7e9d6179ae338c0566c1eb989f0d2ff7", "tag": "ns-M", "selector": "0x50aac05281bbfaa5393cacacc12e86f59ab7d5f3ee619427dd33a0756526f24" }, @@ -111,7 +111,7 @@ "key": false } ], - "class_hash": "0x19cb6434b5bae62c199654f970baeabc2ee18a4f22195027b9e6672bb8bc82c", + "class_hash": "0x642c5d803ad4fa197f0186286750aa03a9f0520bd9eebaf0e38cce269574eca", "tag": "ns-ModelTest", "selector": "0x7c4174c68c17cf1722d42a401236440eb2001b74204bc20d994768a9d5f7176" }, @@ -128,7 +128,7 @@ "key": false } ], - "class_hash": "0x2250577e3cc5c3c63b88a41ebd816985e254a66417fba80e6d286f570a7d1a6", + "class_hash": "0x534e8f4f6faced5b091acdc627c48c7e9d6179ae338c0566c1eb989f0d2ff7", "tag": "ns2-M", "selector": "0x3b26427a55dd1d51738b0e3e989fe6f25649e1311295f30f0a4fa2db439aa2c" } @@ -147,7 +147,7 @@ "key": false } ], - "class_hash": "0x23e6d6b986b4c29fbfaa9be3c75bf454ac87f27ca1f0c444329f326a0b3e25b", + "class_hash": "0x3ed470e5348cad680ac705500e4c89f7ecf97900b8c106da5c2655496085317", "tag": "ns-E", "selector": "0x260e0511a6fa454a7d4ed8bea5fa52fc80fc588e33ba4cb58c65bbeeadf7565" }, @@ -164,7 +164,7 @@ "key": false } ], - "class_hash": "0x2991a03adae9918f707a86644e45ec80c7cf466b1fc33bd318ce328b46aa657", + "class_hash": "0x50b93e8c3503fca3af36e7c34ee114431507c02d11cc4ccfccf10c63bd98d46", "tag": "ns-EH", "selector": "0x4c6c7772b19b700cf97d078d02a419670d11d2b689a7a3647eac311b2817ced" } diff --git a/examples/spawn-and-move/Scarb.lock b/examples/spawn-and-move/Scarb.lock index d12b17e7d0..4e70ddc8d4 100644 --- a/examples/spawn-and-move/Scarb.lock +++ b/examples/spawn-and-move/Scarb.lock @@ -169,15 +169,15 @@ checksum = "sha256:44f32d242af1e43982decc49c563e613a9b67ade552f5c3d5cde504e92f74 [[package]] name = "snforge_scarb_plugin" -version = "0.51.1" +version = "0.55.0" source = "registry+https://scarbs.xyz/" -checksum = "sha256:6783f6990b19ec24f757381e99938d5966df1e7c734ec45e2c7c8133207c8624" +checksum = "sha256:638535780a23d1491c2438e64045c479d16de6a69e41ad17ac065272c485873b" [[package]] name = "snforge_std" -version = "0.51.1" +version = "0.55.0" source = "registry+https://scarbs.xyz/" -checksum = "sha256:5af23a16bc9d7067cfe99bbbe69118773eb7cc9411b2051513c7c1c6995e57a1" +checksum = "sha256:a04b0bf731f02307506dad368713099e701565edd9b98b044ca54b932c29ef74" dependencies = [ "snforge_scarb_plugin", ] diff --git a/examples/spawn-and-move/Scarb.toml b/examples/spawn-and-move/Scarb.toml index 3297b3e7e5..3ca6e75e8c 100644 --- a/examples/spawn-and-move/Scarb.toml +++ b/examples/spawn-and-move/Scarb.toml @@ -3,7 +3,7 @@ name = "dojo_examples" description = "Dojo example to showcase Dojo features." version = "1.8.0" edition = "2024_07" -cairo-version = "2.13" +cairo-version = "2.15" license = "MIT" [cairo] @@ -11,7 +11,7 @@ sierra-replace-ids = true [dependencies] openzeppelin = "0.20.0" -starknet = "2.13" +starknet = "2.15" armory = { path = "../game-lib/armory" } bestiary = { path = "../game-lib/bestiary" } @@ -19,8 +19,8 @@ dojo = { path = "../../crates/dojo/core" } dojo_cairo_macros = { path = "../../crates/dojo/macros" } [dev-dependencies] -snforge_std = "0.51" -assert_macros = "2.13" +snforge_std = "0.55" +assert_macros = "2.15" dojo_snf_test = { path = "../../crates/dojo/dojo-snf-test" } diff --git a/examples/spawn-and-move/dojo_dev.toml b/examples/spawn-and-move/dojo_dev.toml index 2354871f9e..f368cff320 100644 --- a/examples/spawn-and-move/dojo_dev.toml +++ b/examples/spawn-and-move/dojo_dev.toml @@ -69,7 +69,7 @@ rpc_url = "http://localhost:5050/" # Default account for katana with seed = 0 account_address = "0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba" private_key = "0x1800000000300000180000000000030000000000003006001800006600" -world_address = "0x2599029b10da79fe6673b4df7d9b4f17327a1dd4d4e4df6b26200aa6cb42107" +world_address = "0x248860d333f5d0551397851538e0cf7bcc99aa6401ff2acca67b6763a660dd0" ipfs_config.url = "https://ipfs.infura.io:5001" ipfs_config.username = "2EBrzr7ZASQZKH32sl2xWauXPSA" ipfs_config.password = "12290b883db9138a8ae3363b6739d220" diff --git a/examples/spawn-and-move/external/Scarb.toml b/examples/spawn-and-move/external/Scarb.toml index c6fd80a1ef..29f6ad9153 100644 --- a/examples/spawn-and-move/external/Scarb.toml +++ b/examples/spawn-and-move/external/Scarb.toml @@ -4,7 +4,7 @@ version = "1.8.0" edition = "2024_07" [dependencies] -starknet = "2.11.4" +starknet = "2.15" [[target.starknet-contract]] sierra = true diff --git a/examples/spawn-and-move/manifest_dev.json b/examples/spawn-and-move/manifest_dev.json index 3c05917aa7..bcc235ad7c 100644 --- a/examples/spawn-and-move/manifest_dev.json +++ b/examples/spawn-and-move/manifest_dev.json @@ -1,7 +1,7 @@ { "world": { - "class_hash": "0x613551abceb2b37073b1149bb862ea70cf029981ce1ca47e9dd7c7ab97cb65d", - "address": "0x2599029b10da79fe6673b4df7d9b4f17327a1dd4d4e4df6b26200aa6cb42107", + "class_hash": "0x381899226c066a0262f45d6ab815f89818e0874ec3e66cdf72b5e92d8db4680", + "address": "0x248860d333f5d0551397851538e0cf7bcc99aa6401ff2acca67b6763a660dd0", "seed": "dojo_examples", "name": "example", "entrypoints": [ @@ -33,8 +33,8 @@ }, "contracts": [ { - "address": "0x10a62fa9160645a77d6df196bd093c8eb14de20fd2ee85e588e2f9f767c6bf1", - "class_hash": "0x7d3e8a01529b0f44d59580b9ac7c54fe61d99649f30a729c40ceec2964d4912", + "address": "0xc49229c5232c9185a1aafe315cfc58d0c65319e6ad53cb7ada51098206058d", + "class_hash": "0x10f2af932392071c39dd6160d0560f4837aa7f37f59300c34576c62fcf36662", "init_calldata": [], "tag": "ns-actions", "selector": "0x44f0e209e9c5b4b85306833a20e81c3b1a053fa9b3606cfcc59b30b28cb62f6", @@ -53,8 +53,8 @@ ] }, { - "address": "0x59256311d2c3a307be90cb0b2cc91b25713d6db9361ac1a2071850751ddb20c", - "class_hash": "0x5b91120905700e5f4b8add97dbe69504dad099e50c52233872ab8fcf82915c7", + "address": "0x2e586b79bed31ada01790e5fe63599920669ad9e20ba650a698a5fdb20469b8", + "class_hash": "0x5b732d97ed435bf27eacec1055dff4a3923fb55c0967cbfe3936041ab4fcb07", "init_calldata": [], "tag": "ns-dungeon", "selector": "0x4aec73bbf4f68c244877172d4792673ba5ea7af66e3dc7c86893a94bc9a3208", @@ -63,8 +63,8 @@ ] }, { - "address": "0x4db3c3fe73c334f8aee0c98af79da40678885c6bed7d26d33005111ef09bd", - "class_hash": "0x13e92f5650e07611d6fb37cad0a1b25c26cf31860015c682fd48e068730aa76", + "address": "0x14e48b267a625fcb0be86d5f466e41bc1794de100d77a5979d38fe52ee436d9", + "class_hash": "0x4433557eb6dc34a8209674595bb6190df6a72837df17ed78ec80679da3857de", "init_calldata": [], "tag": "ns-mock_token", "selector": "0x60a349ec0f14dd202f31c637ccccde03c97ac47110edd585dffb3f0c8fb72b4", @@ -73,8 +73,8 @@ ] }, { - "address": "0x67c959dab3ec6c246fde7381722263599c77226d2d2f3ac184b8051a9f9668f", - "class_hash": "0x6f84a65b4aa2aa4c91548d35cd61fa431c2b479f5e5be24739651ca0c2327f8", + "address": "0x7438f25dcce8f7b3f9d556cfc121f724c7b9372afa7aae3cb2c3924752b6b74", + "class_hash": "0x4d8ebe8a337e72daa8aa33d9033694f22fd050a640c5ffe61fcf554d7715fd", "init_calldata": [ "0xff" ], @@ -85,8 +85,8 @@ ] }, { - "address": "0xbae3613bb40564f974ce08c438c1d94208392ccfe3df8d60b14b8b7d464cd1", - "class_hash": "0x7d3e8a01529b0f44d59580b9ac7c54fe61d99649f30a729c40ceec2964d4912", + "address": "0x48d231ca0c06d7e5a019dd0e516847110f346018fd98c5742f2a95e446dccbf", + "class_hash": "0x10f2af932392071c39dd6160d0560f4837aa7f37f59300c34576c62fcf36662", "init_calldata": [], "tag": "ns2-actions", "selector": "0x1a920eff7b3fd2be618d5a222e63e805a2a82e71579f97ba06d716a45d1ae25", @@ -107,7 +107,7 @@ ], "libraries": [ { - "class_hash": "0x1abb2a8d6863416ca228fa6ee31ae9177c12ace52dc4612fc161e664eb7cd93", + "class_hash": "0x345688a3a03eab02c70dda77e997289486a461fc35d099381d5a972e6fe6982", "tag": "ns-simple_math_v0_1_0", "selector": "0x43022cc9b4933e6509e2292bf7dfa1c4fadb9a9d0c7a864b3e6487b8502e481", "systems": [], @@ -128,7 +128,7 @@ "key": false } ], - "class_hash": "0x385a09ee9f336eb7d933cafb5a5d27303536f426207c0e3787b748133759307", + "class_hash": "0x45e1a60017bae5f1eecf6b8b73e71b3818f516e8accf4fb0a33e59c9a33e23f", "tag": "ns-Enemy", "selector": "0x1a658aafaf58552ddd7f6d147664760c732c2e4aa85225becb84f136a0b1121" }, @@ -150,7 +150,7 @@ "key": false } ], - "class_hash": "0x50303e66e021455c2d1c91e7f78975b641432b1a2bb18cc347bf8f4b697c18a", + "class_hash": "0x656cec1ea49287824bad0d2ef3780a000ff95af6f0520446a7febe1ffa4ef87", "tag": "ns-Flatbow", "selector": "0x27a35f8bac96f1deebf4d3e83fc6b94a3da4e6d30a1ce34d5893d2fb602725d" }, @@ -177,7 +177,7 @@ "key": false } ], - "class_hash": "0x225a478b735e46d70d104c7fd7cbc5c5417af06e10c8dbfe50b90e2e106944a", + "class_hash": "0x7672282270b5e1a773c84354335448309fc4a7dceed8bc336fece65c23a0cb3", "tag": "ns-Message", "selector": "0x7e77b60a338fa7414998176fd93ff265e4ca04b93105ac98f155bcb2e9e8438" }, @@ -194,7 +194,7 @@ "key": false } ], - "class_hash": "0x22cc1446254a4a7d1230fb2a3542049dbcfd789e035cd5c49c554d72301389c", + "class_hash": "0x3fbd41d2dfa42f08980b2cd18afe8f52fc273070a7aef431f077a540ddf6fea", "tag": "ns-MockToken", "selector": "0x23ee42c8f47d1d693b966176dcd5deca0ec147b33e42186382d9d027603a6fd" }, @@ -216,7 +216,7 @@ "key": false } ], - "class_hash": "0x6975b4e73bdfa2576d7e4c793ace89e576934d9b6cfea25ffbcffaa9e9e0d68", + "class_hash": "0x43f3d6db3ce0a70290d728757e7d9360f71910a39a1e875ea51a7cc02245c76", "tag": "ns-Moves", "selector": "0x54104f060e63bdd9d68bb872f2dc6d40a101e168e18b999c10de348d06ea24a" }, @@ -243,7 +243,7 @@ "key": false } ], - "class_hash": "0x1d54176a8cb0837afc163b39365502c9e7e7a58119dfc3ce406b7f3fcc4bef9", + "class_hash": "0x1fea6ca3be0120f310c1ca7d6331be7f1c3ee511b859b89d953b333727877fe", "tag": "ns-PlayerConfig", "selector": "0x3bea561c3e142a660a00d1471d7712b70695dc4ee3b173aeaefd5178f7a21af" }, @@ -260,7 +260,7 @@ "key": false } ], - "class_hash": "0x258e9284dc73b6c6a631e7aaaf9a60ad709f82d9f1586628d160428818e7a6a", + "class_hash": "0x4d2cf46d19ee818464abde5195031302a85d38ee52c28c6f773af1ebf5ce0cf", "tag": "ns-Position", "selector": "0x5e12c61e9cf30881c126a6d298975c8d79f95abed1a05c2d38b7803ed19445f" }, @@ -287,7 +287,7 @@ "key": false } ], - "class_hash": "0x2345d02df575542b32ac3389554b5184cf7072f2edf499e30ad49e4813a004", + "class_hash": "0x6193e7d3202cc6e9b9e8ea2d1bacee0b9ba9ae4958430c9a2e079be50e0c432", "tag": "ns-RiverSkale", "selector": "0x47f763aa7de3b872f7fbec198275547e06751dbe26b66281b9cffaed9938f24" }, @@ -309,7 +309,7 @@ "key": false } ], - "class_hash": "0x401b0d838b416738fa92d00d3f1f6035eef36d851ba02b4644c51c8dd8ddb5a", + "class_hash": "0x12e06ade5f5bd55bfb1b354f8449f71e28cd6028b7f3707ac5989fd1253bf50", "tag": "ns-ServerProfile", "selector": "0x641dc5f178aff0c7935a8f1ae30c6038a3d3512ea164d486f98bc37b6beabf" }, @@ -336,7 +336,7 @@ "key": false } ], - "class_hash": "0x6f3b64df1bf6c55295d9cd2d87dc8a5fc1b1142dd79a572c0b7b2f6aa8bacdc", + "class_hash": "0x27cb0c1d59d2cc1548f530d22f10014fe367f8bb879d90d21c5bdc45bce7f7d", "tag": "ns-VintageEnemy", "selector": "0x189cce252214bd8ef882db814a8322c38f469817df10b4b19d0c869a120f43c" } @@ -355,7 +355,7 @@ "key": false } ], - "class_hash": "0x56476996d4da32221fef7adc63b72e0aeaaf0123dc543a24b12203d049529ed", + "class_hash": "0x5a7e02bf62cd33f859d7519bf1052aa9cb65aa79f6020c8c8729310e232228c", "tag": "ns-Moved", "selector": "0x6d4c1ac3717ba997500153c52344a2acac5123bbfa0f78d3dcc04cb786826b0" }, @@ -372,17 +372,17 @@ "key": false } ], - "class_hash": "0x4c73392b780fe7d9fa95b4418d87c16dc857e4d40a59c81b68266f2785a74e", + "class_hash": "0x304ec7733e45532bca60e1ee7c19d89cf34d96368619de3c4c905e1bb64ab7c", "tag": "ns-MyInit", "selector": "0xe1c030210beae7e2153a7b996d7d2ae6a428faf16a61f192f02178718b6f0" } ], "external_contracts": [ { - "class_hash": "0x28ecfb1c77c1598d2ac45a9e8ea746229f6e5d831cb9b4a6871789e044b110d", + "class_hash": "0x146c218245dec37476df5f89bc28ee5fd890f410a1565bfb1dbec5e870ff4b1", "contract_name": "ERC721Token", "tag": "ns-Badge", - "address": "0x20e49b7891797c16597d1abb6c14f5eb5d0f484682382d9dc4f2fe22bea8660", + "address": "0x797e7a46dcbe062b563cbebedac93f94e0f1168aa4dd60fa688dd4a20ff1736", "constructor_calldata": [ "0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba", "str:Badge", @@ -424,10 +424,10 @@ "block_number": null }, { - "class_hash": "0x27c53a21e35c003e1207c42f6f1ae9619fae087a68a34b100c33918fd90a319", + "class_hash": "0x2855b7bc6b15490b3f6b2536e525ddf129d70eed121aebcc2d4e31cae952c77", "contract_name": "Bank", "tag": "ns-Bank", - "address": "0x405582674cc93c6873ee140a917a3d2ad9ae78543903508991b1a9af57caf41", + "address": "0x1270f8f51a19105f1c0449fd4e33457dfb33c514231c8649d56bb6178749da5", "constructor_calldata": [ "0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba" ], @@ -440,10 +440,10 @@ "block_number": null }, { - "class_hash": "0x596f2a80126a8af0285808c79c3c66969bc08f89c9844bcfa14ef156fbc02e", + "class_hash": "0x4b39e999532f1cfffd08ca77d02d2b80d1b11a54ef9e5ac68ea9b6305953a6", "contract_name": "ERC20Token", "tag": "ns-GoldToken", - "address": "0x77e565b7c480b0ba01c37ffb1ba4af557b5ccc1d8cade2bd075207c43a63cf1", + "address": "0xb122de69bf51223a232232248cb906e97a666400ab209710c435245ce520f5", "constructor_calldata": [ "0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba", "str:Gold", @@ -478,10 +478,10 @@ "block_number": null }, { - "class_hash": "0x5958adeff0d79357e3d1f381b1591efa525447dda5da05cdfcb9f6816b2a5e2", + "class_hash": "0x7a3345ed2e34f07b2f3f072ec638cf6a8bb6abbccbe4072dd49bca8008e2e03", "contract_name": "ERC1155Token", "tag": "ns-Rewards", - "address": "0x8be915256870f22b8017e3ee373d989a836cda9228a4e3d9e56290194ed0fe", + "address": "0x174cfc844d14970c860d3e54a03febf4e8c015fe44568a961752a3482fe04f7", "constructor_calldata": [ "0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba", "str:https://rewards.com/" @@ -517,10 +517,10 @@ "block_number": null }, { - "class_hash": "0x87654796ef9f4057346dc61f2dc65f4235f143f3b8b62ac9f2ebde993ba913", + "class_hash": "0x31924d5c0a95a6dc182de07aa45c39887fa9ad03f19e16bfa03ce4d668c9421", "contract_name": "Saloon", "tag": "ns-Saloon", - "address": "0x471cc9cddc518c1fad723da0780b5afea98bec90496e37f2d681bcac309321f", + "address": "0x59d29d36feafc89cd2307e9444b5b64e0e4254f161ef3f030890f98210b6039", "constructor_calldata": [], "encoded_constructor_calldata": [], "entrypoints": [ @@ -529,10 +529,10 @@ "block_number": null }, { - "class_hash": "0x596f2a80126a8af0285808c79c3c66969bc08f89c9844bcfa14ef156fbc02e", + "class_hash": "0x4b39e999532f1cfffd08ca77d02d2b80d1b11a54ef9e5ac68ea9b6305953a6", "contract_name": "ERC20Token", "tag": "ns-WoodToken", - "address": "0x51cb990a29e77b02984bc50e40d04b0a1ccb9688b1d9fbbdd2c298c209f6e0e", + "address": "0x573a787072ed4144dd122fbbef8ba925b225861d646997661d2f5df0d0a3e71", "constructor_calldata": [ "0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba", "str:Wood", @@ -567,10 +567,10 @@ "block_number": null }, { - "class_hash": "0x596f2a80126a8af0285808c79c3c66969bc08f89c9844bcfa14ef156fbc02e", + "class_hash": "0x4b39e999532f1cfffd08ca77d02d2b80d1b11a54ef9e5ac68ea9b6305953a6", "contract_name": "ERC20Token", "tag": "ns2-GoldToken", - "address": "0x200a69831ab8b38bd28bd159c5d44f95caf5a87035ec804cffde5d7e3a32cae", + "address": "0x445f217200248671a352345ab5accbc2bf6837d4c104a30d0200dbee11d2ed2", "constructor_calldata": [ "0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba", "str:Gold", @@ -605,10 +605,10 @@ "block_number": null }, { - "class_hash": "0x27c53a21e35c003e1207c42f6f1ae9619fae087a68a34b100c33918fd90a319", + "class_hash": "0x2855b7bc6b15490b3f6b2536e525ddf129d70eed121aebcc2d4e31cae952c77", "contract_name": "Bank", "tag": "ns3-Bank", - "address": "0x3ff0a5472217dc0c7854fe8c0b68f93230dd84f240a8b74b2f47e37098b01db", + "address": "0x63a93593a2325e27bed72d101bffb36eca8acc7082a5df8d6fe26dd18b67d23", "constructor_calldata": [ "0x2af9427c5a277474c079a1283c880ee8a6f0f8fbf73ce969c08d88befec1bba" ], diff --git a/examples/spawn-and-move/src/actions.cairo b/examples/spawn-and-move/src/actions.cairo index 80361ed1f3..32dbbdf9c3 100644 --- a/examples/spawn-and-move/src/actions.cairo +++ b/examples/spawn-and-move/src/actions.cairo @@ -246,7 +246,7 @@ pub mod actions { let config: PlayerConfig = world.read_model(player); world.erase_model(@position); - // world.erase_model(@moves); + world.erase_model(@moves); world.erase_model(@config); } diff --git a/spawn-and-move-db.tar.gz b/spawn-and-move-db.tar.gz index 22f087a31c..adc36d4df5 100644 Binary files a/spawn-and-move-db.tar.gz and b/spawn-and-move-db.tar.gz differ