diff --git a/Cargo.lock b/Cargo.lock index 942123b..b27b971 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -803,30 +803,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" -[[package]] -name = "cainome" -version = "0.2.3" -source = "git+https://github.com/cartridge-gg/cainome?tag=v0.3.0#6c82c5b8e8169a79fe5606f963a3afdf0aa37078" -dependencies = [ - "anyhow", - "async-trait", - "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.0)", - "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.0)", - "cainome-rs 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.0)", - "camino", - "clap 4.5.9", - "clap_complete", - "convert_case", - "serde", - "serde_json", - "starknet", - "starknet-types-core", - "thiserror", - "tracing", - "tracing-subscriber", - "url", -] - [[package]] name = "cainome" version = "0.2.3" @@ -834,9 +810,9 @@ source = "git+https://github.com/cartridge-gg/cainome?tag=v0.3.2#3aec6d1465e24af 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 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.2)", - "cainome-rs 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.2)", + "cainome-cairo-serde", + "cainome-parser", + "cainome-rs", "cainome-rs-macro", "camino", "clap 4.5.9", @@ -852,16 +828,6 @@ dependencies = [ "url", ] -[[package]] -name = "cainome-cairo-serde" -version = "0.1.0" -source = "git+https://github.com/cartridge-gg/cainome?tag=v0.3.0#6c82c5b8e8169a79fe5606f963a3afdf0aa37078" -dependencies = [ - "serde", - "starknet", - "thiserror", -] - [[package]] name = "cainome-cairo-serde" version = "0.1.0" @@ -872,19 +838,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "cainome-parser" -version = "0.1.0" -source = "git+https://github.com/cartridge-gg/cainome?tag=v0.3.0#6c82c5b8e8169a79fe5606f963a3afdf0aa37078" -dependencies = [ - "convert_case", - "quote", - "serde_json", - "starknet", - "syn 2.0.71", - "thiserror", -] - [[package]] name = "cainome-parser" version = "0.1.0" @@ -898,32 +851,14 @@ dependencies = [ "thiserror", ] -[[package]] -name = "cainome-rs" -version = "0.1.0" -source = "git+https://github.com/cartridge-gg/cainome?tag=v0.3.0#6c82c5b8e8169a79fe5606f963a3afdf0aa37078" -dependencies = [ - "anyhow", - "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.0)", - "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.0)", - "camino", - "prettyplease 0.2.20", - "proc-macro2", - "quote", - "serde_json", - "starknet", - "syn 2.0.71", - "thiserror", -] - [[package]] name = "cainome-rs" version = "0.1.0" source = "git+https://github.com/cartridge-gg/cainome?tag=v0.3.2#3aec6d1465e24af3765d3b9220cc233199a6aa14" dependencies = [ "anyhow", - "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.2)", - "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.2)", + "cainome-cairo-serde", + "cainome-parser", "camino", "prettyplease 0.2.20", "proc-macro2", @@ -940,9 +875,9 @@ version = "0.1.0" source = "git+https://github.com/cartridge-gg/cainome?tag=v0.3.2#3aec6d1465e24af3765d3b9220cc233199a6aa14" dependencies = [ "anyhow", - "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.2)", - "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.2)", - "cainome-rs 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.2)", + "cainome-cairo-serde", + "cainome-parser", + "cainome-rs", "proc-macro2", "quote", "serde_json", @@ -2293,10 +2228,10 @@ dependencies = [ [[package]] name = "dojo-c" -version = "1.0.0-alpha.0" +version = "1.0.0-alpha.5" dependencies = [ "anyhow", - "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.0)", + "cainome", "cbindgen", "crypto-bigint", "dojo-types", @@ -2325,11 +2260,11 @@ dependencies = [ [[package]] name = "dojo-lang" -version = "1.0.0-alpha.4" -source = "git+https://github.com/dojoengine/dojo?rev=998c68011c09b4351badc3b58d47a766d6341935#998c68011c09b4351badc3b58d47a766d6341935" +version = "1.0.0-alpha.5" +source = "git+https://github.com/dojoengine/dojo?rev=ebed9bd#ebed9bd2d278c31e677722e8802bf47e487c6bdf" dependencies = [ "anyhow", - "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.2)", + "cainome", "cairo-lang-compiler", "cairo-lang-debug", "cairo-lang-defs", @@ -2376,10 +2311,10 @@ dependencies = [ [[package]] name = "dojo-types" -version = "1.0.0-alpha.4" -source = "git+https://github.com/dojoengine/dojo?rev=998c68011c09b4351badc3b58d47a766d6341935#998c68011c09b4351badc3b58d47a766d6341935" +version = "1.0.0-alpha.5" +source = "git+https://github.com/dojoengine/dojo?rev=ebed9bd#ebed9bd2d278c31e677722e8802bf47e487c6bdf" dependencies = [ - "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.2)", + "cainome", "crypto-bigint", "hex", "itertools 0.12.1", @@ -2394,12 +2329,12 @@ dependencies = [ [[package]] name = "dojo-world" -version = "1.0.0-alpha.4" -source = "git+https://github.com/dojoengine/dojo?rev=998c68011c09b4351badc3b58d47a766d6341935#998c68011c09b4351badc3b58d47a766d6341935" +version = "1.0.0-alpha.5" +source = "git+https://github.com/dojoengine/dojo?rev=ebed9bd#ebed9bd2d278c31e677722e8802bf47e487c6bdf" dependencies = [ "anyhow", "async-trait", - "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.2)", + "cainome", "cairo-lang-filesystem", "cairo-lang-project", "cairo-lang-starknet", @@ -4287,7 +4222,7 @@ dependencies = [ "hyper 0.14.30", "log", "rustls 0.20.9", - "rustls-native-certs", + "rustls-native-certs 0.6.3", "tokio", "tokio-rustls 0.23.4", ] @@ -7129,7 +7064,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls 0.21.12", - "rustls-native-certs", + "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.4", "serde", "serde_json", @@ -7433,6 +7368,20 @@ dependencies = [ "sct", ] +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.5", + "subtle", + "zeroize", +] + [[package]] name = "rustls" version = "0.23.11" @@ -7459,6 +7408,19 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustls-native-certs" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.2", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -8168,13 +8130,13 @@ dependencies = [ [[package]] name = "sozo-ops" -version = "1.0.0-alpha.4" -source = "git+https://github.com/dojoengine/dojo?rev=998c68011c09b4351badc3b58d47a766d6341935#998c68011c09b4351badc3b58d47a766d6341935" +version = "1.0.0-alpha.5" +source = "git+https://github.com/dojoengine/dojo?rev=ebed9bd#ebed9bd2d278c31e677722e8802bf47e487c6bdf" dependencies = [ "anyhow", "async-trait", "bigdecimal", - "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.2)", + "cainome", "cairo-lang-compiler", "cairo-lang-defs", "cairo-lang-filesystem", @@ -8198,6 +8160,7 @@ dependencies = [ "itertools 0.12.1", "num-bigint", "num-traits 0.2.19", + "reqwest 0.12.5", "rpassword", "scarb", "scarb-ui", @@ -9076,6 +9039,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.4", + "rustls-pki-types", + "tokio", +] + [[package]] name = "tokio-rustls" version = "0.26.0" @@ -9191,9 +9165,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" +checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" dependencies = [ "async-stream", "async-trait", @@ -9208,7 +9182,11 @@ dependencies = [ "percent-encoding", "pin-project", "prost 0.12.6", + "rustls-native-certs 0.7.1", + "rustls-pemfile 2.1.2", + "rustls-pki-types", "tokio", + "tokio-rustls 0.25.0", "tokio-stream", "tower", "tower-layer", @@ -9231,9 +9209,9 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" +checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" dependencies = [ "prettyplease 0.2.20", "proc-macro2", @@ -9244,22 +9222,22 @@ dependencies = [ [[package]] name = "tonic-reflection" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fa37c513df1339d197f4ba21d28c918b9ef1ac1768265f11ecb6b7f1cba1b76" +checksum = "548c227bd5c0fae5925812c4ec6c66ffcfced23ea370cb823f4d18f0fc1cb6a7" dependencies = [ "prost 0.12.6", "prost-types 0.12.6", "tokio", "tokio-stream", - "tonic 0.10.2", + "tonic 0.11.0", ] [[package]] name = "tonic-web" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fddb2a37b247e6adcb9f239f4e5cefdcc5ed526141a416b943929f13aea2cce" +checksum = "dc3b0e1cedbf19fdfb78ef3d672cb9928e0a91a9cb4629cc0c916e8cff8aaaa1" dependencies = [ "base64 0.21.7", "bytes", @@ -9268,7 +9246,7 @@ dependencies = [ "hyper 0.14.30", "pin-project", "tokio-stream", - "tonic 0.10.2", + "tonic 0.11.0", "tower-http", "tower-layer", "tower-service", @@ -9307,8 +9285,8 @@ checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d" [[package]] name = "torii-client" -version = "1.0.0-alpha.4" -source = "git+https://github.com/dojoengine/dojo?rev=998c68011c09b4351badc3b58d47a766d6341935#998c68011c09b4351badc3b58d47a766d6341935" +version = "1.0.0-alpha.5" +source = "git+https://github.com/dojoengine/dojo?rev=ebed9bd#ebed9bd2d278c31e677722e8802bf47e487c6bdf" dependencies = [ "async-trait", "crypto-bigint", @@ -9327,7 +9305,7 @@ dependencies = [ "starknet-crypto 0.7.1", "thiserror", "tokio", - "tonic 0.10.2", + "tonic 0.11.0", "tonic 0.9.2", "torii-grpc", "torii-relay", @@ -9336,13 +9314,13 @@ dependencies = [ [[package]] name = "torii-core" -version = "1.0.0-alpha.4" -source = "git+https://github.com/dojoengine/dojo?rev=998c68011c09b4351badc3b58d47a766d6341935#998c68011c09b4351badc3b58d47a766d6341935" +version = "1.0.0-alpha.5" +source = "git+https://github.com/dojoengine/dojo?rev=ebed9bd#ebed9bd2d278c31e677722e8802bf47e487c6bdf" dependencies = [ "anyhow", "async-trait", "base64 0.21.7", - "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.2)", + "cainome", "chrono", "crypto-bigint", "dojo-types", @@ -9372,8 +9350,8 @@ dependencies = [ [[package]] name = "torii-grpc" -version = "1.0.0-alpha.4" -source = "git+https://github.com/dojoengine/dojo?rev=998c68011c09b4351badc3b58d47a766d6341935#998c68011c09b4351badc3b58d47a766d6341935" +version = "1.0.0-alpha.5" +source = "git+https://github.com/dojoengine/dojo?rev=ebed9bd#ebed9bd2d278c31e677722e8802bf47e487c6bdf" dependencies = [ "bytes", "crypto-bigint", @@ -9399,9 +9377,9 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tonic 0.10.2", + "tonic 0.11.0", "tonic 0.9.2", - "tonic-build 0.10.2", + "tonic-build 0.11.0", "tonic-build 0.9.2", "tonic-reflection", "tonic-web", @@ -9413,12 +9391,12 @@ dependencies = [ [[package]] name = "torii-relay" -version = "1.0.0-alpha.4" -source = "git+https://github.com/dojoengine/dojo?rev=998c68011c09b4351badc3b58d47a766d6341935#998c68011c09b4351badc3b58d47a766d6341935" +version = "1.0.0-alpha.5" +source = "git+https://github.com/dojoengine/dojo?rev=ebed9bd#ebed9bd2d278c31e677722e8802bf47e487c6bdf" dependencies = [ "anyhow", "async-trait", - "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.2)", + "cainome", "chrono", "crypto-bigint", "dojo-types", diff --git a/Cargo.toml b/Cargo.toml index 6809c89..84ed946 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,19 +1,19 @@ [package] edition = "2021" name = "dojo-c" -version = "1.0.0-alpha.0" +version = "1.0.0-alpha.5" [lib] crate-type = ["cdylib", "rlib", "staticlib"] [dependencies] -dojo-types = { git = "https://github.com/dojoengine/dojo", rev = "998c68011c09b4351badc3b58d47a766d6341935" } -torii-client = { git = "https://github.com/dojoengine/dojo", rev = "998c68011c09b4351badc3b58d47a766d6341935" } +dojo-types = { git = "https://github.com/dojoengine/dojo", rev = "ebed9bd" } +torii-client = { git = "https://github.com/dojoengine/dojo", rev = "ebed9bd" } torii-grpc = { git = "https://github.com/dojoengine/dojo", features = [ "client", -], rev = "998c68011c09b4351badc3b58d47a766d6341935" } -torii-relay = { git = "https://github.com/dojoengine/dojo", rev = "998c68011c09b4351badc3b58d47a766d6341935" } -dojo-world = { git = "https://github.com/dojoengine/dojo", rev = "998c68011c09b4351badc3b58d47a766d6341935" } +], rev = "ebed9bd" } +torii-relay = { git = "https://github.com/dojoengine/dojo", rev = "ebed9bd" } +dojo-world = { git = "https://github.com/dojoengine/dojo", rev = "ebed9bd" } starknet = "0.11.0" @@ -30,8 +30,7 @@ futures = "0.3.30" futures-channel = "0.3.30" wasm-bindgen = "0.2.92" stream-cancel = "0.8.2" -cainome = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.3.0" } - +cainome = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.3.2" } # WASM [target.'cfg(target_arch = "wasm32")'.dependencies]