From d757b811fe1440a9e1ac295b76630a95b9963ff9 Mon Sep 17 00:00:00 2001 From: Nasr Date: Tue, 8 Jul 2025 11:05:53 +0800 Subject: [PATCH 1/3] feat: torii 1.6.0 --- Cargo.lock | 223 ++++++++++++++++++++++++++++++++++++++++++----------- Cargo.toml | 14 ++-- 2 files changed, 184 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 07ec6ee..abb0d91 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -488,7 +488,7 @@ dependencies = [ "cainome-cairo-serde-derive", "cainome-parser 0.1.1", "cainome-rs 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cainome-rs-macro", + "cainome-rs-macro 0.1.0", "camino", "clap", "clap_complete", @@ -503,6 +503,33 @@ dependencies = [ "url", ] +[[package]] +name = "cainome" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e04a357fdab01f56b676c8c41e11b154bb69eef184204cae47a4209eb4e0035" +dependencies = [ + "anyhow", + "async-trait", + "cainome-cairo-serde 0.2.0", + "cainome-cairo-serde-derive", + "cainome-parser 0.2.0", + "cainome-rs 0.2.0", + "cainome-rs-macro 0.2.0", + "camino", + "clap", + "clap_complete", + "convert_case", + "serde", + "serde_json", + "starknet 0.14.0", + "starknet-types-core", + "thiserror 1.0.69", + "tracing", + "tracing-subscriber", + "url", +] + [[package]] name = "cainome-cairo-serde" version = "0.1.0" @@ -526,6 +553,19 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "cainome-cairo-serde" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32790b9d4293a5ee97e4c646e2d40c186f6d2e0f5f9141e46bf187446bf4883f" +dependencies = [ + "num-bigint", + "serde", + "serde_with 3.12.0", + "starknet 0.14.0", + "thiserror 1.0.69", +] + [[package]] name = "cainome-cairo-serde-derive" version = "0.1.0" @@ -565,6 +605,20 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "cainome-parser" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "499219c70d1382b5f7defc6985b0266fb10b27b91dc4e8b0b0e4a10258e5d292" +dependencies = [ + "convert_case", + "quote", + "serde_json", + "starknet 0.14.0", + "syn 2.0.100", + "thiserror 1.0.69", +] + [[package]] name = "cainome-rs" version = "0.1.0" @@ -602,6 +656,25 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "cainome-rs" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67adae2e76aeb14e514dcda34092c86170e0f84843727b1ad8e2b7398b3e0b56" +dependencies = [ + "anyhow", + "cainome-cairo-serde 0.2.0", + "cainome-parser 0.2.0", + "camino", + "prettyplease", + "proc-macro2", + "quote", + "serde_json", + "starknet 0.14.0", + "syn 2.0.100", + "thiserror 1.0.69", +] + [[package]] name = "cainome-rs-macro" version = "0.1.0" @@ -621,6 +694,25 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "cainome-rs-macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40c4e39d654e8e5c94f31a59ae8583771abbd784f96215dae1d1592f1b7526b2" +dependencies = [ + "anyhow", + "cainome-cairo-serde 0.2.0", + "cainome-parser 0.2.0", + "cainome-rs 0.2.0", + "proc-macro-error", + "proc-macro2", + "quote", + "serde_json", + "starknet 0.14.0", + "syn 2.0.100", + "thiserror 1.0.69", +] + [[package]] name = "cairo-lang-casm" version = "2.10.1" @@ -1157,7 +1249,7 @@ dependencies = [ [[package]] name = "dojo-c" -version = "1.5.7" +version = "1.6.0-alpha.0" dependencies = [ "account_sdk", "anyhow", @@ -1183,7 +1275,7 @@ dependencies = [ "serde", "serde-wasm-bindgen", "serde_json", - "starknet 0.13.0", + "starknet 0.14.0", "starknet-crypto", "starknet-types-core", "stream-cancel", @@ -1203,11 +1295,11 @@ dependencies = [ [[package]] name = "dojo-types" -version = "1.5.0-alpha.2" -source = "git+https://github.com/dojoengine/dojo?rev=4145801#4145801c2a1da8e413af2c57615869a4ccf19e76" +version = "1.6.0-alpha.1" +source = "git+https://github.com/dojoengine/dojo?rev=054623b#054623bbf939a3bf90786355bd9b081a2b1b3c3a" dependencies = [ "anyhow", - "cainome 0.5.1", + "cainome 0.6.1", "crypto-bigint", "hex", "indexmap 2.9.0", @@ -1216,7 +1308,7 @@ dependencies = [ "regex", "serde", "serde_json", - "starknet 0.12.0", + "starknet 0.14.0", "starknet-crypto", "strum", "strum_macros", @@ -1225,12 +1317,12 @@ dependencies = [ [[package]] name = "dojo-world" -version = "1.5.0-alpha.2" -source = "git+https://github.com/dojoengine/dojo?rev=4145801#4145801c2a1da8e413af2c57615869a4ccf19e76" +version = "1.6.0-alpha.1" +source = "git+https://github.com/dojoengine/dojo?rev=054623b#054623bbf939a3bf90786355bd9b081a2b1b3c3a" dependencies = [ "anyhow", "async-trait", - "cainome 0.5.1", + "cainome 0.6.1", "cairo-lang-starknet-classes", "dojo-types", "hex", @@ -1240,7 +1332,7 @@ dependencies = [ "serde", "serde_json", "serde_with 3.12.0", - "starknet 0.12.0", + "starknet 0.14.0", "starknet-crypto", "thiserror 1.0.69", "toml", @@ -3644,13 +3736,14 @@ dependencies = [ [[package]] name = "starknet" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0c9ac3809cc7630784e8c8565fa3013af819d83c97aa2720d566016d439011" +checksum = "bc9b221c99a1ea1d65fb130e5b0dbaa6d362698430232902ebeb2a898a1ab531" dependencies = [ - "starknet-accounts 0.11.0", - "starknet-contract 0.11.0", + "starknet-accounts 0.12.0", + "starknet-contract 0.12.0", "starknet-core 0.12.3", + "starknet-core-derive", "starknet-crypto", "starknet-macros", "starknet-providers 0.12.1", @@ -3659,18 +3752,18 @@ dependencies = [ [[package]] name = "starknet" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9b221c99a1ea1d65fb130e5b0dbaa6d362698430232902ebeb2a898a1ab531" +checksum = "61e2e53e7705c9a9aad7f118a4bac7386afeb8db272b3eb445a464ca4c3dfee5" dependencies = [ - "starknet-accounts 0.12.0", - "starknet-contract 0.12.0", - "starknet-core 0.12.3", + "starknet-accounts 0.13.0", + "starknet-contract 0.13.0", + "starknet-core 0.13.0", "starknet-core-derive", "starknet-crypto", "starknet-macros", - "starknet-providers 0.12.1", - "starknet-signers 0.10.2", + "starknet-providers 0.13.0", + "starknet-signers 0.11.0", ] [[package]] @@ -3690,9 +3783,9 @@ dependencies = [ [[package]] name = "starknet-accounts" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee27ded58ade61da410fccafd57ed5429b0e79a9d62a4ae8b65818cb9d6f400" +checksum = "b3fc4364f5684e4a5dcb100847a9ea023deae3815f45526721a6fa94ab595651" dependencies = [ "async-trait", "auto_impl", @@ -3705,16 +3798,16 @@ dependencies = [ [[package]] name = "starknet-accounts" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3fc4364f5684e4a5dcb100847a9ea023deae3815f45526721a6fa94ab595651" +checksum = "eca52534db01eda3bf3250f398bd4597aed3856d0d17d84070efbc7919abad71" dependencies = [ "async-trait", "auto_impl", - "starknet-core 0.12.3", + "starknet-core 0.13.0", "starknet-crypto", - "starknet-providers 0.12.1", - "starknet-signers 0.10.2", + "starknet-providers 0.13.0", + "starknet-signers 0.11.0", "thiserror 1.0.69", ] @@ -3735,14 +3828,14 @@ dependencies = [ [[package]] name = "starknet-contract" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6ee5762d24c4f06ab7e9406550925df406712e73719bd2de905c879c674a87" +checksum = "3f2102b8f763477a1bdece683da51514bc73829d5dcc3bbe75ff1b6aca6d4e02" dependencies = [ "serde", "serde_json", "serde_with 3.12.0", - "starknet-accounts 0.11.0", + "starknet-accounts 0.12.0", "starknet-core 0.12.3", "starknet-providers 0.12.1", "thiserror 1.0.69", @@ -3750,16 +3843,16 @@ dependencies = [ [[package]] name = "starknet-contract" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2102b8f763477a1bdece683da51514bc73829d5dcc3bbe75ff1b6aca6d4e02" +checksum = "67d8d5a5306527eedcb4bd70afecfc6824add631a08eac8fd1cf9c2bdfd21e77" dependencies = [ "serde", "serde_json", "serde_with 3.12.0", - "starknet-accounts 0.12.0", - "starknet-core 0.12.3", - "starknet-providers 0.12.1", + "starknet-accounts 0.13.0", + "starknet-core 0.13.0", + "starknet-providers 0.13.0", "thiserror 1.0.69", ] @@ -3919,6 +4012,27 @@ dependencies = [ "url", ] +[[package]] +name = "starknet-providers" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c74c3850a661fa1ffd3c3e2cb9db6e28c94ab9aaaa0496503014a814f09cd455" +dependencies = [ + "async-trait", + "auto_impl", + "ethereum-types", + "flate2", + "getrandom 0.2.16", + "log", + "reqwest", + "serde", + "serde_json", + "serde_with 3.12.0", + "starknet-core 0.13.0", + "thiserror 1.0.69", + "url", +] + [[package]] name = "starknet-signers" version = "0.9.0" @@ -3953,6 +4067,23 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "starknet-signers" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2aeca13b8c61165b69d4775880d74ff9bbb9bafa36a297899e0f160619631b3" +dependencies = [ + "async-trait", + "auto_impl", + "crypto-bigint", + "eth-keystore", + "getrandom 0.2.16", + "rand", + "starknet-core 0.13.0", + "starknet-crypto", + "thiserror 1.0.69", +] + [[package]] name = "starknet-types-core" version = "0.1.8" @@ -4487,8 +4618,8 @@ dependencies = [ [[package]] name = "torii-client" -version = "1.5.8-preview.4" -source = "git+https://github.com/dojoengine/torii?rev=07ca961fa81c069b75c5a149984ddf65443e7dae#07ca961fa81c069b75c5a149984ddf65443e7dae" +version = "1.6.0-alpha.1" +source = "git+https://github.com/dojoengine/torii?rev=0e89d04#0e89d04daacff5bb3a62d09096f6d3f1c1111ac2" dependencies = [ "async-trait", "crypto-bigint", @@ -4500,7 +4631,7 @@ dependencies = [ "parking_lot", "serde", "serde_json", - "starknet 0.12.0", + "starknet 0.14.0", "starknet-crypto", "thiserror 1.0.69", "tokio", @@ -4511,8 +4642,8 @@ dependencies = [ [[package]] name = "torii-grpc-client" -version = "1.5.8-preview.4" -source = "git+https://github.com/dojoengine/torii?rev=07ca961fa81c069b75c5a149984ddf65443e7dae#07ca961fa81c069b75c5a149984ddf65443e7dae" +version = "1.6.0-alpha.1" +source = "git+https://github.com/dojoengine/torii?rev=0e89d04#0e89d04daacff5bb3a62d09096f6d3f1c1111ac2" dependencies = [ "crypto-bigint", "dojo-types", @@ -4520,7 +4651,7 @@ dependencies = [ "futures-util", "num-traits", "prost 0.13.5", - "starknet 0.12.0", + "starknet 0.14.0", "starknet-crypto", "thiserror 1.0.69", "tokio", @@ -4537,8 +4668,8 @@ dependencies = [ [[package]] name = "torii-proto" -version = "1.5.8-preview.4" -source = "git+https://github.com/dojoengine/torii?rev=07ca961fa81c069b75c5a149984ddf65443e7dae#07ca961fa81c069b75c5a149984ddf65443e7dae" +version = "1.6.0-alpha.1" +source = "git+https://github.com/dojoengine/torii?rev=0e89d04#0e89d04daacff5bb3a62d09096f6d3f1c1111ac2" dependencies = [ "chrono", "crypto-bigint", @@ -4548,7 +4679,7 @@ dependencies = [ "prost 0.13.5", "serde", "serde_json", - "starknet 0.12.0", + "starknet 0.14.0", "strum", "strum_macros", "thiserror 1.0.69", diff --git a/Cargo.toml b/Cargo.toml index 607cc52..a90d845 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,19 +1,19 @@ [package] edition = "2021" name = "dojo-c" -version = "1.5.7" +version = "1.6.0-alpha.0" [lib] crate-type = ["cdylib", "rlib", "staticlib"] [dependencies] -dojo-world = { git = "https://github.com/dojoengine/dojo", rev = "4145801" } -dojo-types = { git = "https://github.com/dojoengine/dojo", rev = "4145801" } -torii-proto = { git = "https://github.com/dojoengine/torii", rev = "07ca961fa81c069b75c5a149984ddf65443e7dae" } -torii-client = { git = "https://github.com/dojoengine/torii", rev = "07ca961fa81c069b75c5a149984ddf65443e7dae" } -torii-grpc-client = { git = "https://github.com/dojoengine/torii", rev = "07ca961fa81c069b75c5a149984ddf65443e7dae" } +dojo-world = { git = "https://github.com/dojoengine/dojo", rev = "054623b" } +dojo-types = { git = "https://github.com/dojoengine/dojo", rev = "054623b" } +torii-proto = { git = "https://github.com/dojoengine/torii", rev = "0e89d04" } +torii-client = { git = "https://github.com/dojoengine/torii", rev = "0e89d04" } +torii-grpc-client = { git = "https://github.com/dojoengine/torii", rev = "0e89d04" } -starknet = "0.13.0" +starknet = "0.14.0" starknet-crypto = "0.7.2" starknet-types-core = { version = "0.1.6", features = ["arbitrary"] } From ef828efbe70ac42b87290dd7a1355ac78dca1908 Mon Sep 17 00:00:00 2001 From: Nasr Date: Tue, 8 Jul 2025 09:55:45 +0800 Subject: [PATCH 2/3] feat(controller): update account sdk --- Cargo.lock | 936 +++++++++++++++++++++++++++++++++++++++++++-------- Cargo.toml | 3 +- src/c/mod.rs | 5 +- 3 files changed, 792 insertions(+), 152 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index abb0d91..a5b375d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,13 +5,16 @@ version = 4 [[package]] name = "account_sdk" version = "0.1.0" -source = "git+https://github.com/cartridge-gg/controller?rev=dbbe0353d64de743739d425f8aab91ca3ac0e16f#dbbe0353d64de743739d425f8aab91ca3ac0e16f" +source = "git+https://github.com/cartridge-gg/controller?rev=05fe96f4#05fe96f46a81e45e98085b0d0bb263561c8af2a3" dependencies = [ + "alloy-primitives", + "alloy-signer", "anyhow", "async-trait", "auto_impl", - "cainome 0.5.1", - "cainome-cairo-serde 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cainome 0.6.1", + "cainome-cairo-serde 0.2.0", + "chrono", "futures", "hex", "indexmap 2.9.0", @@ -20,12 +23,13 @@ dependencies = [ "num-traits", "once_cell", "primitive-types", + "rand 0.8.5", "reqwest", "serde", "serde-wasm-bindgen", "serde_json", - "serde_with 3.12.0", - "starknet 0.13.0", + "serde_with", + "starknet", "starknet-crypto", "starknet-types-core", "thiserror 1.0.69", @@ -94,6 +98,58 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" +[[package]] +name = "alloy-primitives" +version = "0.8.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c77490fe91a0ce933a1f219029521f20fc28c2c0ca95d53fa4da9c00b8d9d4e" +dependencies = [ + "alloy-rlp", + "bytes", + "cfg-if", + "const-hex", + "derive_more", + "foldhash", + "hashbrown 0.15.2", + "indexmap 2.9.0", + "itoa", + "k256", + "keccak-asm", + "paste", + "proptest", + "rand 0.8.5", + "ruint", + "rustc-hash 2.1.1", + "serde", + "sha3", + "tiny-keccak", +] + +[[package]] +name = "alloy-rlp" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f70d83b765fdc080dbcd4f4db70d8d23fe4761f2f02ebfa9146b833900634b4" +dependencies = [ + "arrayvec", + "bytes", +] + +[[package]] +name = "alloy-signer" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c96fbde54bee943cd94ebacc8a62c50b38c7dfd2552dcd79ff61aea778b1bfcc" +dependencies = [ + "alloy-primitives", + "async-trait", + "auto_impl", + "either", + "elliptic-curve", + "k256", + "thiserror 2.0.12", +] + [[package]] name = "android-tzdata" version = "0.1.1" @@ -171,6 +227,130 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" +[[package]] +name = "ark-ff" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b3235cc41ee7a12aaaf2c575a2ad7b46713a8a50bda2fc3b003a04845c05dd6" +dependencies = [ + "ark-ff-asm 0.3.0", + "ark-ff-macros 0.3.0", + "ark-serialize 0.3.0", + "ark-std 0.3.0", + "derivative", + "num-bigint", + "num-traits", + "paste", + "rustc_version 0.3.3", + "zeroize", +] + +[[package]] +name = "ark-ff" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" +dependencies = [ + "ark-ff-asm 0.4.2", + "ark-ff-macros 0.4.2", + "ark-serialize 0.4.2", + "ark-std 0.4.0", + "derivative", + "digest 0.10.7", + "itertools 0.10.5", + "num-bigint", + "num-traits", + "paste", + "rustc_version 0.4.1", + "zeroize", +] + +[[package]] +name = "ark-ff-asm" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-asm" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" +dependencies = [ + "num-bigint", + "num-traits", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-serialize" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6c2b318ee6e10f8c2853e73a83adc0ccb88995aa978d8a3408d492ab2ee671" +dependencies = [ + "ark-std 0.3.0", + "digest 0.9.0", +] + +[[package]] +name = "ark-serialize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" +dependencies = [ + "ark-std 0.4.0", + "digest 0.10.7", + "num-bigint", +] + +[[package]] +name = "ark-std" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + +[[package]] +name = "ark-std" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + [[package]] name = "arrayvec" version = "0.7.6" @@ -362,12 +542,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.7" @@ -380,13 +554,28 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64ct" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" + [[package]] name = "bit-set" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" dependencies = [ - "bit-vec", + "bit-vec 0.6.3", +] + +[[package]] +name = "bit-set" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" +dependencies = [ + "bit-vec 0.8.0", ] [[package]] @@ -395,6 +584,12 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +[[package]] +name = "bit-vec" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" + [[package]] name = "bitflags" version = "1.3.2" @@ -454,21 +649,24 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cainome" -version = "0.2.3" -source = "git+https://github.com/cartridge-gg/cainome?tag=v0.3.2#3aec6d1465e24af3765d3b9220cc233199a6aa14" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e04a357fdab01f56b676c8c41e11b154bb69eef184204cae47a4209eb4e0035" dependencies = [ "anyhow", "async-trait", - "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.2)", - "cainome-parser 0.1.0", - "cainome-rs 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.2)", + "cainome-cairo-serde 0.2.0", + "cainome-cairo-serde-derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cainome-parser 0.2.0", + "cainome-rs 0.2.0", + "cainome-rs-macro", "camino", "clap", "clap_complete", - "convert_case", + "convert_case 0.6.0", "serde", "serde_json", - "starknet 0.11.0", + "starknet", "starknet-types-core", "thiserror 1.0.69", "tracing", @@ -478,9 +676,8 @@ dependencies = [ [[package]] name = "cainome" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5d94fa57317b42e011a2715a07ce8cadeb80ca2a471167cbd85f48ea4d0934" +version = "0.8.0" +source = "git+https://github.com/Larkooo/cainome?branch=patch-1#fd5a6d3994c3f00bd9cfb95a49f4e552759af154" dependencies = [ "anyhow", "async-trait", @@ -492,12 +689,12 @@ dependencies = [ "camino", "clap", "clap_complete", - "convert_case", + "convert_case 0.8.0", "serde", "serde_json", - "starknet 0.13.0", + "starknet", "starknet-types-core", - "thiserror 1.0.69", + "thiserror 2.0.12", "tracing", "tracing-subscriber", "url", @@ -532,25 +729,27 @@ dependencies = [ [[package]] name = "cainome-cairo-serde" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2b487395a270c6f683a72ecb1f7848cfae81a269015a4a9328fbfa012448fe9" +checksum = "32790b9d4293a5ee97e4c646e2d40c186f6d2e0f5f9141e46bf187446bf4883f" dependencies = [ "num-bigint", "serde", - "serde_with 3.12.0", - "starknet 0.13.0", + "serde_with", + "starknet", "thiserror 1.0.69", ] [[package]] name = "cainome-cairo-serde" -version = "0.1.0" -source = "git+https://github.com/cartridge-gg/cainome?tag=v0.3.2#3aec6d1465e24af3765d3b9220cc233199a6aa14" +version = "0.2.1" +source = "git+https://github.com/Larkooo/cainome?branch=patch-1#fd5a6d3994c3f00bd9cfb95a49f4e552759af154" dependencies = [ + "num-bigint", "serde", - "starknet 0.11.0", - "thiserror 1.0.69", + "serde_with", + "starknet", + "thiserror 2.0.12", ] [[package]] @@ -579,81 +778,92 @@ dependencies = [ ] [[package]] -name = "cainome-parser" +name = "cainome-cairo-serde-derive" version = "0.1.0" -source = "git+https://github.com/cartridge-gg/cainome?tag=v0.3.2#3aec6d1465e24af3765d3b9220cc233199a6aa14" +source = "git+https://github.com/Larkooo/cainome?branch=patch-1#fd5a6d3994c3f00bd9cfb95a49f4e552759af154" dependencies = [ - "convert_case", + "proc-macro2", "quote", - "serde_json", - "starknet 0.11.0", "syn 2.0.100", - "thiserror 1.0.69", + "unzip-n", ] [[package]] name = "cainome-parser" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8053124dfe40eacb6c78ffe44e4199fc0547b22b3a1e506431b1cd554812ef1c" +checksum = "499219c70d1382b5f7defc6985b0266fb10b27b91dc4e8b0b0e4a10258e5d292" dependencies = [ - "convert_case", + "convert_case 0.6.0", "quote", "serde_json", - "starknet 0.13.0", + "starknet", "syn 2.0.100", "thiserror 1.0.69", ] [[package]] name = "cainome-parser" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "499219c70d1382b5f7defc6985b0266fb10b27b91dc4e8b0b0e4a10258e5d292" +version = "0.3.0" +source = "git+https://github.com/Larkooo/cainome?branch=patch-1#fd5a6d3994c3f00bd9cfb95a49f4e552759af154" dependencies = [ - "convert_case", + "convert_case 0.8.0", "quote", "serde_json", - "starknet 0.14.0", + "starknet", "syn 2.0.100", - "thiserror 1.0.69", + "thiserror 2.0.12", ] [[package]] name = "cainome-rs" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0e16da812c3df59d3093df7dd7cfe7fd1ff051c870aae3807dee2180c511557" +checksum = "67adae2e76aeb14e514dcda34092c86170e0f84843727b1ad8e2b7398b3e0b56" dependencies = [ "anyhow", - "cainome-cairo-serde 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cainome-parser 0.1.1", + "cainome-cairo-serde 0.2.0", + "cainome-parser 0.2.0", "camino", "prettyplease", "proc-macro2", "quote", "serde_json", - "starknet 0.13.0", + "starknet", + "syn 2.0.100", + "thiserror 1.0.69", +] + +[[package]] +name = "cainome-parser" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "499219c70d1382b5f7defc6985b0266fb10b27b91dc4e8b0b0e4a10258e5d292" +dependencies = [ + "convert_case", + "quote", + "serde_json", + "starknet 0.14.0", "syn 2.0.100", "thiserror 1.0.69", ] [[package]] name = "cainome-rs" -version = "0.1.0" -source = "git+https://github.com/cartridge-gg/cainome?tag=v0.3.2#3aec6d1465e24af3765d3b9220cc233199a6aa14" +version = "0.3.1" +source = "git+https://github.com/Larkooo/cainome?branch=patch-1#fd5a6d3994c3f00bd9cfb95a49f4e552759af154" dependencies = [ "anyhow", - "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.2)", - "cainome-parser 0.1.0", + "cainome-cairo-serde 0.2.1", + "cainome-parser 0.3.0", "camino", "prettyplease", "proc-macro2", "quote", "serde_json", - "starknet 0.11.0", + "starknet", "syn 2.0.100", - "thiserror 1.0.69", + "thiserror 2.0.12", ] [[package]] @@ -677,19 +887,19 @@ dependencies = [ [[package]] name = "cainome-rs-macro" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71009b935b7b3056c8032c2369d022beb629ea903f167e37bff0a2c84dd43675" +checksum = "40c4e39d654e8e5c94f31a59ae8583771abbd784f96215dae1d1592f1b7526b2" dependencies = [ "anyhow", - "cainome-cairo-serde 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cainome-parser 0.1.1", - "cainome-rs 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cainome-cairo-serde 0.2.0", + "cainome-parser 0.2.0", + "cainome-rs 0.2.0", "proc-macro-error", "proc-macro2", "quote", "serde_json", - "starknet 0.13.0", + "starknet", "syn 2.0.100", "thiserror 1.0.69", ] @@ -746,7 +956,7 @@ dependencies = [ "anyhow", "cairo-lang-utils", "const-fnv1a-hash", - "convert_case", + "convert_case 0.6.0", "derivative", "itertools 0.12.1", "lalrpop", @@ -837,7 +1047,7 @@ dependencies = [ "cairo-lang-sierra", "cairo-lang-sierra-to-casm", "cairo-lang-utils", - "convert_case", + "convert_case 0.6.0", "itertools 0.12.1", "num-bigint", "num-integer", @@ -909,9 +1119,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" dependencies = [ "android-tzdata", "iana-time-zone", @@ -993,6 +1203,25 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca" +[[package]] +name = "const-hex" +version = "1.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83e22e0ed40b96a48d3db274f72fd365bd78f67af39b6bbd47e8a15e1c6207ff" +dependencies = [ + "cfg-if", + "cpufeatures", + "hex", + "proptest", + "serde", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "const_format" version = "0.2.34" @@ -1022,6 +1251,15 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "convert_case" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -1078,7 +1316,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", - "rand_core", + "rand_core 0.6.4", "serdect", "subtle", "zeroize", @@ -1159,7 +1397,17 @@ dependencies = [ "futures-util", "num", "once_cell", - "rand", + "rand 0.8.5", +] + +[[package]] +name = "der" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" +dependencies = [ + "const-oid", + "zeroize", ] [[package]] @@ -1183,6 +1431,36 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_more" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", + "unicode-xid", +] + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + [[package]] name = "digest" version = "0.10.7" @@ -1190,6 +1468,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", + "const-oid", "crypto-common", "subtle", ] @@ -1255,8 +1534,9 @@ dependencies = [ "anyhow", "axum 0.8.3", "base64 0.22.1", - "cainome 0.2.3", + "cainome 0.8.0", "cbindgen", + "chrono", "crypto-bigint", "directories", "dojo-types", @@ -1346,12 +1626,45 @@ version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005" +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest 0.10.7", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] + [[package]] name = "either" version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest 0.10.7", + "ff", + "generic-array", + "group", + "pkcs8", + "rand_core 0.6.4", + "sec1", + "subtle", + "zeroize", +] + [[package]] name = "ena" version = "0.14.3" @@ -1394,11 +1707,11 @@ checksum = "1fda3bf123be441da5260717e0661c25a2fd9cb2b2c1d20bf2e05580047158ab" dependencies = [ "aes", "ctr", - "digest", + "digest 0.10.7", "hex", "hmac", "pbkdf2", - "rand", + "rand 0.8.5", "scrypt", "serde", "serde_json", @@ -1441,6 +1754,38 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +[[package]] +name = "fastrlp" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418" +dependencies = [ + "arrayvec", + "auto_impl", + "bytes", +] + +[[package]] +name = "fastrlp" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce8dba4714ef14b8274c371879b175aa55b16b30f269663f19d576f380018dc4" +dependencies = [ + "arrayvec", + "auto_impl", + "bytes", +] + +[[package]] +name = "ff" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "fixed-hash" version = "0.8.0" @@ -1448,7 +1793,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand", + "rand 0.8.5", "rustc-hex", "static_assertions", ] @@ -1599,6 +1944,7 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] @@ -1667,6 +2013,17 @@ dependencies = [ "microlp", ] +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "h2" version = "0.3.26" @@ -1708,6 +2065,9 @@ name = "hashbrown" version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +dependencies = [ + "foldhash", +] [[package]] name = "heck" @@ -1739,7 +2099,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest", + "digest 0.10.7", ] [[package]] @@ -2188,6 +2548,15 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.11.0" @@ -2231,6 +2600,19 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "k256" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" +dependencies = [ + "cfg-if", + "ecdsa", + "elliptic-curve", + "once_cell", + "sha2", +] + [[package]] name = "keccak" version = "0.1.5" @@ -2240,6 +2622,16 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "keccak-asm" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "505d1856a39b200489082f90d897c3f07c455563880bc5952e38eabf731c83b6" +dependencies = [ + "digest 0.10.7", + "sha3-asm", +] + [[package]] name = "keyring" version = "3.6.2" @@ -2261,7 +2653,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca" dependencies = [ "ascii-canvas", - "bit-set", + "bit-set 0.5.3", "ena", "itertools 0.11.0", "lalrpop-util", @@ -2328,6 +2720,12 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "libm" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" + [[package]] name = "libredox" version = "0.1.3" @@ -2564,6 +2962,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -2667,6 +3066,12 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + [[package]] name = "pathdiff" version = "0.2.3" @@ -2679,7 +3084,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest", + "digest 0.10.7", ] [[package]] @@ -2688,6 +3093,17 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "pest" +version = "2.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323" +dependencies = [ + "memchr", + "thiserror 2.0.12", + "ucd-trie", +] + [[package]] name = "petgraph" version = "0.6.5" @@ -2755,6 +3171,16 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + [[package]] name = "pkg-config" version = "0.3.32" @@ -2862,6 +3288,26 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "proptest" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f" +dependencies = [ + "bit-set 0.8.0", + "bit-vec 0.8.0", + "bitflags 2.9.0", + "lazy_static", + "num-traits", + "rand 0.9.1", + "rand_chacha 0.9.0", + "rand_xorshift", + "regex-syntax 0.8.5", + "rusty-fork", + "tempfile", + "unarray", +] + [[package]] name = "prost" version = "0.12.6" @@ -2967,6 +3413,12 @@ dependencies = [ "prost 0.13.5", ] +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + [[package]] name = "quote" version = "1.0.40" @@ -2995,8 +3447,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.3", ] [[package]] @@ -3006,7 +3468,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.3", ] [[package]] @@ -3018,6 +3490,24 @@ dependencies = [ "getrandom 0.2.16", ] +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +dependencies = [ + "getrandom 0.3.2", +] + +[[package]] +name = "rand_xorshift" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a" +dependencies = [ + "rand_core 0.9.3", +] + [[package]] name = "rawpointer" version = "0.2.1" @@ -3174,6 +3664,39 @@ dependencies = [ "rustc-hex", ] +[[package]] +name = "ruint" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11256b5fe8c68f56ac6f39ef0720e592f33d2367a4782740d9c9142e889c7fb4" +dependencies = [ + "alloy-rlp", + "ark-ff 0.3.0", + "ark-ff 0.4.2", + "bytes", + "fastrlp 0.3.1", + "fastrlp 0.4.0", + "num-bigint", + "num-integer", + "num-traits", + "parity-scale-codec", + "primitive-types", + "proptest", + "rand 0.8.5", + "rand 0.9.1", + "rlp", + "ruint-macro", + "serde", + "valuable", + "zeroize", +] + +[[package]] +name = "ruint-macro" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" + [[package]] name = "rust-analyzer-salsa" version = "0.17.0-pre.6" @@ -3185,7 +3708,7 @@ dependencies = [ "oorandom", "parking_lot", "rust-analyzer-salsa-macros", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "tracing", "triomphe", @@ -3215,12 +3738,36 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" + [[package]] name = "rustc-hex" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" +[[package]] +name = "rustc_version" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +dependencies = [ + "semver 0.11.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver 1.0.26", +] + [[package]] name = "rustix" version = "1.0.5" @@ -3324,6 +3871,18 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" +[[package]] +name = "rusty-fork" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +dependencies = [ + "fnv", + "quick-error", + "tempfile", + "wait-timeout", +] + [[package]] name = "ryu" version = "1.0.20" @@ -3410,6 +3969,20 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + [[package]] name = "security-framework" version = "2.11.1" @@ -3446,6 +4019,30 @@ dependencies = [ "libc", ] +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" + +[[package]] +name = "semver-parser" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9900206b54a3527fdc7b8a938bffd94a568bac4f4aa8113b209df75a09c0dec2" +dependencies = [ + "pest", +] + [[package]] name = "serde" version = "1.0.219" @@ -3542,22 +4139,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_with" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" -dependencies = [ - "base64 0.13.1", - "chrono", - "hex", - "indexmap 1.9.3", - "serde", - "serde_json", - "serde_with_macros 2.3.3", - "time", -] - [[package]] name = "serde_with" version = "3.12.0" @@ -3572,22 +4153,10 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "serde_with_macros 3.12.0", + "serde_with_macros", "time", ] -[[package]] -name = "serde_with_macros" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.100", -] - [[package]] name = "serde_with_macros" version = "3.12.0" @@ -3618,7 +4187,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest", + "digest 0.10.7", ] [[package]] @@ -3627,10 +4196,20 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest", + "digest 0.10.7", "keccak", ] +[[package]] +name = "sha3-asm" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28efc5e327c837aa837c59eae585fc250715ef939ac32881bcc11677cd02d46" +dependencies = [ + "cc", + "cfg-if", +] + [[package]] name = "sharded-slab" version = "0.1.7" @@ -3655,6 +4234,16 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest 0.10.7", + "rand_core 0.6.4", +] + [[package]] name = "siphasher" version = "1.0.1" @@ -3701,6 +4290,16 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "sprs" version = "0.11.3" @@ -3721,9 +4320,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "starknet" -version = "0.11.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e633a772f59214c296d5037c95c36b72792c9360323818da2b625c7b4ec4b49" +checksum = "61e2e53e7705c9a9aad7f118a4bac7386afeb8db272b3eb445a464ca4c3dfee5" dependencies = [ "starknet-accounts 0.10.0", "starknet-contract 0.10.0", @@ -3746,8 +4345,8 @@ dependencies = [ "starknet-core-derive", "starknet-crypto", "starknet-macros", - "starknet-providers 0.12.1", - "starknet-signers 0.10.2", + "starknet-providers", + "starknet-signers", ] [[package]] @@ -3768,13 +4367,13 @@ dependencies = [ [[package]] name = "starknet-accounts" -version = "0.10.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee8a6b588a22c7e79f5d8d4e33413387db63a8beb98be8610138541794cc0a5" +checksum = "eca52534db01eda3bf3250f398bd4597aed3856d0d17d84070efbc7919abad71" dependencies = [ "async-trait", "auto_impl", - "starknet-core 0.11.1", + "starknet-core 0.13.0", "starknet-crypto", "starknet-providers 0.11.0", "starknet-signers 0.9.0", @@ -3813,16 +4412,16 @@ dependencies = [ [[package]] name = "starknet-contract" -version = "0.10.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f91344f1e0b81873b6dc235c50ae4d084c6ea4dd4a1e3e27ad895803adb610" +checksum = "67d8d5a5306527eedcb4bd70afecfc6824add631a08eac8fd1cf9c2bdfd21e77" dependencies = [ "serde", "serde_json", - "serde_with 2.3.3", - "starknet-accounts 0.10.0", - "starknet-core 0.11.1", - "starknet-providers 0.11.0", + "serde_with", + "starknet-accounts", + "starknet-core 0.13.0", + "starknet-providers", "thiserror 1.0.69", ] @@ -3891,7 +4490,7 @@ dependencies = [ "serde", "serde_json", "serde_json_pythonic", - "serde_with 3.12.0", + "serde_with", "sha3", "starknet-core-derive", "starknet-crypto", @@ -3914,7 +4513,7 @@ dependencies = [ "serde", "serde_json", "serde_json_pythonic", - "serde_with 3.12.0", + "serde_with", "sha3", "starknet-core-derive", "starknet-crypto", @@ -3972,6 +4571,27 @@ dependencies = [ [[package]] name = "starknet-providers" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c74c3850a661fa1ffd3c3e2cb9db6e28c94ab9aaaa0496503014a814f09cd455" +dependencies = [ + "async-trait", + "auto_impl", + "ethereum-types", + "flate2", + "getrandom 0.2.16", + "log", + "reqwest", + "serde", + "serde_json", + "serde_with", + "starknet-core 0.13.0", + "thiserror 1.0.69", + "url", +] + +[[package]] +name = "starknet-signers" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59c85e0a0f4563ae95dfeae14ea0f0c70610efc0ec2462505c64eff5765e7b97" @@ -4044,25 +4664,8 @@ dependencies = [ "crypto-bigint", "eth-keystore", "getrandom 0.2.16", - "rand", - "starknet-core 0.11.1", - "starknet-crypto", - "thiserror 1.0.69", -] - -[[package]] -name = "starknet-signers" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518c7de189cd4158d45d33067c580094ad5cd2f027a90ac76d49a81c89fa37bc" -dependencies = [ - "async-trait", - "auto_impl", - "crypto-bigint", - "eth-keystore", - "getrandom 0.2.16", - "rand", - "starknet-core 0.12.3", + "rand 0.8.5", + "starknet-core 0.13.0", "starknet-crypto", "thiserror 1.0.69", ] @@ -4700,7 +5303,7 @@ dependencies = [ "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand", + "rand 0.8.5", "slab", "tokio", "tokio-util", @@ -4902,6 +5505,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ucd-trie" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" + [[package]] name = "uint" version = "0.9.5" @@ -4914,6 +5523,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + [[package]] name = "unicode-ident" version = "1.0.18" @@ -5007,6 +5622,15 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "wait-timeout" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11" +dependencies = [ + "libc", +] + [[package]] name = "walkdir" version = "2.5.0" @@ -5551,6 +6175,20 @@ name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] [[package]] name = "zerovec" diff --git a/Cargo.toml b/Cargo.toml index a90d845..2b651c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ wasm-bindgen = "0.2.92" stream-cancel = "0.8.2" cainome = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.3.2" } lazy_static = "1.5.0" -account_sdk = { git = "https://github.com/cartridge-gg/controller", rev = "dbbe0353d64de743739d425f8aab91ca3ac0e16f" } +account_sdk = { git = "https://github.com/cartridge-gg/controller", rev = "05fe96f4" } serde-wasm-bindgen = "0.6.3" wasm-bindgen-futures = "0.4.39" @@ -48,6 +48,7 @@ instant = { version = "0.1.13", features = ["wasm-bindgen"] } gloo-timers = { version = "0.3.0", features = ["futures"] } num-bigint = "0.4.6" num-traits = "0.2.19" +chrono = "0.4.41" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] axum = "0.8.1" diff --git a/src/c/mod.rs b/src/c/mod.rs index 3f4ca9a..34a3177 100644 --- a/src/c/mod.rs +++ b/src/c/mod.rs @@ -17,7 +17,6 @@ use account_sdk::account::session::account::SessionAccount; use account_sdk::account::session::hash::Session; use account_sdk::provider::{CartridgeJsonRpcProvider, CartridgeProvider}; use account_sdk::signers::Signer; -use account_sdk::utils::time::get_current_timestamp; use axum::extract::State; use axum::http::{header, HeaderValue, Method, StatusCode}; use axum::response::IntoResponse; @@ -26,6 +25,7 @@ use axum::Router; use base64::engine::general_purpose::STANDARD as BASE64; use base64::Engine as _; use cainome::cairo_serde::{self, ByteArray, CairoSerde}; +use chrono::Utc; use crypto_bigint::U256; use directories::ProjectDirs; use dojo_world::contracts::naming::compute_selector_from_tag; @@ -629,7 +629,7 @@ pub unsafe extern "C" fn controller_execute_from_outside( let caller = OutsideExecutionCaller::Any; let calls = unsafe { std::slice::from_raw_parts(calldata, calldata_len).to_vec() }; let calls = calls.into_iter().map(|c| c.into()).collect::>(); - let now = get_current_timestamp(); + let now = Utc::now().timestamp() as u64; let outside_execution = OutsideExecutionV3 { caller: caller.into(), execute_after: 0_u64, @@ -652,6 +652,7 @@ pub unsafe extern "C" fn controller_execute_from_outside( OutsideExecution::V3(outside_execution), (*controller).account.address(), signed.signature, + None, )) { Ok(res) => res, Err(e) => { From 6ebc07cefdf862d1aa872ed6efe0a118dbbb0733 Mon Sep 17 00:00:00 2001 From: Nasr Date: Tue, 8 Jul 2025 11:18:00 +0800 Subject: [PATCH 3/3] update order by --- Cargo.lock | 343 ++++++++++------------------------------------ dojo.h | 3 +- dojo.hpp | 3 +- dojo.pyx | 3 +- src/c/types.rs | 9 +- src/wasm/types.rs | 9 +- 6 files changed, 83 insertions(+), 287 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a5b375d..a3365f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,8 +28,8 @@ dependencies = [ "serde", "serde-wasm-bindgen", "serde_json", - "serde_with", - "starknet", + "serde_with 3.12.0", + "starknet 0.14.0", "starknet-crypto", "starknet-types-core", "thiserror 1.0.69", @@ -542,6 +542,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + [[package]] name = "base64" version = "0.21.7" @@ -649,24 +655,21 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cainome" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e04a357fdab01f56b676c8c41e11b154bb69eef184204cae47a4209eb4e0035" +version = "0.2.3" +source = "git+https://github.com/cartridge-gg/cainome?tag=v0.3.2#3aec6d1465e24af3765d3b9220cc233199a6aa14" dependencies = [ "anyhow", "async-trait", - "cainome-cairo-serde 0.2.0", - "cainome-cairo-serde-derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cainome-parser 0.2.0", - "cainome-rs 0.2.0", - "cainome-rs-macro", + "cainome-cairo-serde 0.1.0", + "cainome-parser 0.1.0", + "cainome-rs 0.1.0", "camino", "clap", "clap_complete", - "convert_case 0.6.0", + "convert_case", "serde", "serde_json", - "starknet", + "starknet 0.11.0", "starknet-types-core", "thiserror 1.0.69", "tracing", @@ -674,32 +677,6 @@ dependencies = [ "url", ] -[[package]] -name = "cainome" -version = "0.8.0" -source = "git+https://github.com/Larkooo/cainome?branch=patch-1#fd5a6d3994c3f00bd9cfb95a49f4e552759af154" -dependencies = [ - "anyhow", - "async-trait", - "cainome-cairo-serde 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cainome-cairo-serde-derive", - "cainome-parser 0.1.1", - "cainome-rs 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cainome-rs-macro 0.1.0", - "camino", - "clap", - "clap_complete", - "convert_case 0.8.0", - "serde", - "serde_json", - "starknet", - "starknet-types-core", - "thiserror 2.0.12", - "tracing", - "tracing-subscriber", - "url", -] - [[package]] name = "cainome" version = "0.6.1" @@ -712,7 +689,7 @@ dependencies = [ "cainome-cairo-serde-derive", "cainome-parser 0.2.0", "cainome-rs 0.2.0", - "cainome-rs-macro 0.2.0", + "cainome-rs-macro", "camino", "clap", "clap_complete", @@ -729,29 +706,14 @@ dependencies = [ [[package]] name = "cainome-cairo-serde" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32790b9d4293a5ee97e4c646e2d40c186f6d2e0f5f9141e46bf187446bf4883f" +version = "0.1.0" +source = "git+https://github.com/cartridge-gg/cainome?tag=v0.3.2#3aec6d1465e24af3765d3b9220cc233199a6aa14" dependencies = [ - "num-bigint", "serde", - "serde_with", - "starknet", + "starknet 0.11.0", "thiserror 1.0.69", ] -[[package]] -name = "cainome-cairo-serde" -version = "0.2.1" -source = "git+https://github.com/Larkooo/cainome?branch=patch-1#fd5a6d3994c3f00bd9cfb95a49f4e552759af154" -dependencies = [ - "num-bigint", - "serde", - "serde_with", - "starknet", - "thiserror 2.0.12", -] - [[package]] name = "cainome-cairo-serde" version = "0.2.0" @@ -777,59 +739,15 @@ dependencies = [ "unzip-n", ] -[[package]] -name = "cainome-cairo-serde-derive" -version = "0.1.0" -source = "git+https://github.com/Larkooo/cainome?branch=patch-1#fd5a6d3994c3f00bd9cfb95a49f4e552759af154" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.100", - "unzip-n", -] - [[package]] name = "cainome-parser" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "499219c70d1382b5f7defc6985b0266fb10b27b91dc4e8b0b0e4a10258e5d292" -dependencies = [ - "convert_case 0.6.0", - "quote", - "serde_json", - "starknet", - "syn 2.0.100", - "thiserror 1.0.69", -] - -[[package]] -name = "cainome-parser" -version = "0.3.0" -source = "git+https://github.com/Larkooo/cainome?branch=patch-1#fd5a6d3994c3f00bd9cfb95a49f4e552759af154" -dependencies = [ - "convert_case 0.8.0", - "quote", - "serde_json", - "starknet", - "syn 2.0.100", - "thiserror 2.0.12", -] - -[[package]] -name = "cainome-rs" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67adae2e76aeb14e514dcda34092c86170e0f84843727b1ad8e2b7398b3e0b56" +version = "0.1.0" +source = "git+https://github.com/cartridge-gg/cainome?tag=v0.3.2#3aec6d1465e24af3765d3b9220cc233199a6aa14" dependencies = [ - "anyhow", - "cainome-cairo-serde 0.2.0", - "cainome-parser 0.2.0", - "camino", - "prettyplease", - "proc-macro2", + "convert_case", "quote", "serde_json", - "starknet", + "starknet 0.11.0", "syn 2.0.100", "thiserror 1.0.69", ] @@ -850,20 +768,20 @@ dependencies = [ [[package]] name = "cainome-rs" -version = "0.3.1" -source = "git+https://github.com/Larkooo/cainome?branch=patch-1#fd5a6d3994c3f00bd9cfb95a49f4e552759af154" +version = "0.1.0" +source = "git+https://github.com/cartridge-gg/cainome?tag=v0.3.2#3aec6d1465e24af3765d3b9220cc233199a6aa14" dependencies = [ "anyhow", - "cainome-cairo-serde 0.2.1", - "cainome-parser 0.3.0", + "cainome-cairo-serde 0.1.0", + "cainome-parser 0.1.0", "camino", "prettyplease", "proc-macro2", "quote", "serde_json", - "starknet", + "starknet 0.11.0", "syn 2.0.100", - "thiserror 2.0.12", + "thiserror 1.0.69", ] [[package]] @@ -885,25 +803,6 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "cainome-rs-macro" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40c4e39d654e8e5c94f31a59ae8583771abbd784f96215dae1d1592f1b7526b2" -dependencies = [ - "anyhow", - "cainome-cairo-serde 0.2.0", - "cainome-parser 0.2.0", - "cainome-rs 0.2.0", - "proc-macro-error", - "proc-macro2", - "quote", - "serde_json", - "starknet", - "syn 2.0.100", - "thiserror 1.0.69", -] - [[package]] name = "cainome-rs-macro" version = "0.2.0" @@ -956,7 +855,7 @@ dependencies = [ "anyhow", "cairo-lang-utils", "const-fnv1a-hash", - "convert_case 0.6.0", + "convert_case", "derivative", "itertools 0.12.1", "lalrpop", @@ -1047,7 +946,7 @@ dependencies = [ "cairo-lang-sierra", "cairo-lang-sierra-to-casm", "cairo-lang-utils", - "convert_case 0.6.0", + "convert_case", "itertools 0.12.1", "num-bigint", "num-integer", @@ -1251,15 +1150,6 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "convert_case" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "core-foundation" version = "0.9.4" @@ -1534,7 +1424,7 @@ dependencies = [ "anyhow", "axum 0.8.3", "base64 0.22.1", - "cainome 0.8.0", + "cainome 0.2.3", "cbindgen", "chrono", "crypto-bigint", @@ -4139,6 +4029,22 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +dependencies = [ + "base64 0.13.1", + "chrono", + "hex", + "indexmap 1.9.3", + "serde", + "serde_json", + "serde_with_macros 2.3.3", + "time", +] + [[package]] name = "serde_with" version = "3.12.0" @@ -4153,10 +4059,22 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "serde_with_macros", + "serde_with_macros 3.12.0", "time", ] +[[package]] +name = "serde_with_macros" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.100", +] + [[package]] name = "serde_with_macros" version = "3.12.0" @@ -4320,9 +4238,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "starknet" -version = "0.14.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e2e53e7705c9a9aad7f118a4bac7386afeb8db272b3eb445a464ca4c3dfee5" +checksum = "1e633a772f59214c296d5037c95c36b72792c9360323818da2b625c7b4ec4b49" dependencies = [ "starknet-accounts 0.10.0", "starknet-contract 0.10.0", @@ -4333,22 +4251,6 @@ dependencies = [ "starknet-signers 0.9.0", ] -[[package]] -name = "starknet" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9b221c99a1ea1d65fb130e5b0dbaa6d362698430232902ebeb2a898a1ab531" -dependencies = [ - "starknet-accounts 0.12.0", - "starknet-contract 0.12.0", - "starknet-core 0.12.3", - "starknet-core-derive", - "starknet-crypto", - "starknet-macros", - "starknet-providers", - "starknet-signers", -] - [[package]] name = "starknet" version = "0.14.0" @@ -4367,34 +4269,19 @@ dependencies = [ [[package]] name = "starknet-accounts" -version = "0.13.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca52534db01eda3bf3250f398bd4597aed3856d0d17d84070efbc7919abad71" +checksum = "eee8a6b588a22c7e79f5d8d4e33413387db63a8beb98be8610138541794cc0a5" dependencies = [ "async-trait", "auto_impl", - "starknet-core 0.13.0", + "starknet-core 0.11.1", "starknet-crypto", "starknet-providers 0.11.0", "starknet-signers 0.9.0", "thiserror 1.0.69", ] -[[package]] -name = "starknet-accounts" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3fc4364f5684e4a5dcb100847a9ea023deae3815f45526721a6fa94ab595651" -dependencies = [ - "async-trait", - "auto_impl", - "starknet-core 0.12.3", - "starknet-crypto", - "starknet-providers 0.12.1", - "starknet-signers 0.10.2", - "thiserror 1.0.69", -] - [[package]] name = "starknet-accounts" version = "0.13.0" @@ -4412,31 +4299,16 @@ dependencies = [ [[package]] name = "starknet-contract" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67d8d5a5306527eedcb4bd70afecfc6824add631a08eac8fd1cf9c2bdfd21e77" -dependencies = [ - "serde", - "serde_json", - "serde_with", - "starknet-accounts", - "starknet-core 0.13.0", - "starknet-providers", - "thiserror 1.0.69", -] - -[[package]] -name = "starknet-contract" -version = "0.12.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2102b8f763477a1bdece683da51514bc73829d5dcc3bbe75ff1b6aca6d4e02" +checksum = "a5f91344f1e0b81873b6dc235c50ae4d084c6ea4dd4a1e3e27ad895803adb610" dependencies = [ "serde", "serde_json", - "serde_with 3.12.0", - "starknet-accounts 0.12.0", - "starknet-core 0.12.3", - "starknet-providers 0.12.1", + "serde_with 2.3.3", + "starknet-accounts 0.10.0", + "starknet-core 0.11.1", + "starknet-providers 0.11.0", "thiserror 1.0.69", ] @@ -4474,29 +4346,6 @@ dependencies = [ "starknet-types-core", ] -[[package]] -name = "starknet-core" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "977ce5d61089de1f4e425ad033162154a0da2cf000f0ed100484ebcbc54b6ff4" -dependencies = [ - "base64 0.21.7", - "crypto-bigint", - "flate2", - "foldhash", - "hex", - "indexmap 2.9.0", - "num-traits", - "serde", - "serde_json", - "serde_json_pythonic", - "serde_with", - "sha3", - "starknet-core-derive", - "starknet-crypto", - "starknet-types-core", -] - [[package]] name = "starknet-core" version = "0.13.0" @@ -4513,7 +4362,7 @@ dependencies = [ "serde", "serde_json", "serde_json_pythonic", - "serde_with", + "serde_with 3.12.0", "sha3", "starknet-core-derive", "starknet-crypto", @@ -4571,27 +4420,6 @@ dependencies = [ [[package]] name = "starknet-providers" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c74c3850a661fa1ffd3c3e2cb9db6e28c94ab9aaaa0496503014a814f09cd455" -dependencies = [ - "async-trait", - "auto_impl", - "ethereum-types", - "flate2", - "getrandom 0.2.16", - "log", - "reqwest", - "serde", - "serde_json", - "serde_with", - "starknet-core 0.13.0", - "thiserror 1.0.69", - "url", -] - -[[package]] -name = "starknet-signers" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59c85e0a0f4563ae95dfeae14ea0f0c70610efc0ec2462505c64eff5765e7b97" @@ -4611,27 +4439,6 @@ dependencies = [ "url", ] -[[package]] -name = "starknet-providers" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9256247f718564b3e4c73cc941735012691c14903fbc25cea306745bcbfa384" -dependencies = [ - "async-trait", - "auto_impl", - "ethereum-types", - "flate2", - "getrandom 0.2.16", - "log", - "reqwest", - "serde", - "serde_json", - "serde_with 3.12.0", - "starknet-core 0.12.3", - "thiserror 1.0.69", - "url", -] - [[package]] name = "starknet-providers" version = "0.13.0" @@ -4665,7 +4472,7 @@ dependencies = [ "eth-keystore", "getrandom 0.2.16", "rand 0.8.5", - "starknet-core 0.13.0", + "starknet-core 0.11.1", "starknet-crypto", "thiserror 1.0.69", ] @@ -4681,7 +4488,7 @@ dependencies = [ "crypto-bigint", "eth-keystore", "getrandom 0.2.16", - "rand", + "rand 0.8.5", "starknet-core 0.13.0", "starknet-crypto", "thiserror 1.0.69", diff --git a/dojo.h b/dojo.h index 596586d..8d039d2 100644 --- a/dojo.h +++ b/dojo.h @@ -729,8 +729,7 @@ typedef struct Entity { } Entity; typedef struct OrderBy { - const char *model; - const char *member; + const char *field; enum OrderDirection direction; } OrderBy; diff --git a/dojo.hpp b/dojo.hpp index bd722d6..9e1bc76 100644 --- a/dojo.hpp +++ b/dojo.hpp @@ -181,8 +181,7 @@ struct Entity { }; struct OrderBy { - const char *model; - const char *member; + const char *field; OrderDirection direction; }; diff --git a/dojo.pyx b/dojo.pyx index e4348c4..d03c0f9 100644 --- a/dojo.pyx +++ b/dojo.pyx @@ -460,8 +460,7 @@ cdef extern from *: CArrayStruct models; cdef struct OrderBy: - const char *model; - const char *member; + const char *field; OrderDirection direction; cdef enum COptionFieldElement_Tag: diff --git a/src/c/types.rs b/src/c/types.rs index 5c88279..df6c6cf 100644 --- a/src/c/types.rs +++ b/src/c/types.rs @@ -532,16 +532,14 @@ impl From for PaginationDirection { #[derive(Clone, Debug)] #[repr(C)] pub struct OrderBy { - pub model: *const c_char, - pub member: *const c_char, + pub field: *const c_char, pub direction: OrderDirection, } impl From for torii_proto::OrderBy { fn from(val: OrderBy) -> Self { torii_proto::OrderBy { - model: unsafe { CStr::from_ptr(val.model).to_string_lossy().to_string() }, - member: unsafe { CStr::from_ptr(val.member).to_string_lossy().to_string() }, + field: unsafe { CStr::from_ptr(val.field).to_string_lossy().to_string() }, direction: val.direction.into(), } } @@ -550,8 +548,7 @@ impl From for torii_proto::OrderBy { impl From for OrderBy { fn from(val: torii_proto::OrderBy) -> Self { OrderBy { - model: CString::new(val.model.clone()).unwrap().into_raw(), - member: CString::new(val.member.clone()).unwrap().into_raw(), + field: CString::new(val.field.clone()).unwrap().into_raw(), direction: val.direction.into(), } } diff --git a/src/wasm/types.rs b/src/wasm/types.rs index a4dad95..b973933 100644 --- a/src/wasm/types.rs +++ b/src/wasm/types.rs @@ -389,18 +389,13 @@ impl From for torii_proto::PaginationDirection { #[derive(Tsify, Serialize, Deserialize, Debug)] #[tsify(into_wasm_abi, from_wasm_abi)] pub struct OrderBy { - pub model: String, - pub member: String, + pub field: String, pub direction: OrderDirection, } impl From for torii_proto::OrderBy { fn from(value: OrderBy) -> Self { - Self { - model: value.model.clone(), - member: value.member.clone(), - direction: value.direction.into(), - } + Self { field: value.field.clone(), direction: value.direction.into() } } }