From d4d5e52ec17f8c7130c7424a8465a456f72a0e24 Mon Sep 17 00:00:00 2001 From: Nasr Date: Thu, 31 Oct 2024 13:18:18 -0400 Subject: [PATCH 1/5] add support for historical messages --- Cargo.lock | 2 +- Cargo.toml | 14 +++++++------- src/c/mod.rs | 8 +++++--- src/wasm/mod.rs | 7 ++++--- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 61fe19f..a2ab3fb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2258,7 +2258,7 @@ dependencies = [ [[package]] name = "dojo-c" -version = "1.0.0-alpha.18" +version = "1.0.0-rc.0" dependencies = [ "anyhow", "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.2)", diff --git a/Cargo.toml b/Cargo.toml index 6a1b775..665cbd3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,23 +1,23 @@ [package] edition = "2021" name = "dojo-c" -version = "1.0.0-alpha.18" +version = "1.0.0-rc.0" [lib] crate-type = ["cdylib", "rlib", "staticlib"] [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -dojo-world = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.18", features = [ +dojo-world = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-rc.0", features = [ "metadata", ] } [dependencies] -dojo-types = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.18" } -torii-client = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.18" } +dojo-types = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-rc.0" } +torii-client = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-rc.0" } torii-grpc = { git = "https://github.com/dojoengine/dojo", features = [ "client", -], tag = "v1.0.0-alpha.18" } -torii-relay = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.18" } +], tag = "v1.0.0-rc.0" } +torii-relay = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-rc.0" } starknet = "0.11.0" starknet-crypto = "0.7.2" @@ -37,7 +37,7 @@ cainome = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.3.2" } # WASM [target.'cfg(target_arch = "wasm32")'.dependencies] -dojo-world = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.18", features = [ +dojo-world = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-rc.0", features = [ ] } serde-wasm-bindgen = "0.6.3" wasm-bindgen-futures = "0.4.39" diff --git a/src/c/mod.rs b/src/c/mod.rs index df24fca..6d32a72 100644 --- a/src/c/mod.rs +++ b/src/c/mod.rs @@ -123,8 +123,9 @@ pub unsafe extern "C" fn client_entities( pub unsafe extern "C" fn client_event_messages( client: *mut ToriiClient, query: &Query, + historical: bool, ) -> Result> { - let event_messages_future = unsafe { (*client).inner.event_messages(query.into()) }; + let event_messages_future = unsafe { (*client).inner.event_messages(query.into(), historical) }; match (*client).runtime.block_on(event_messages_future) { Ok(event_messages) => { @@ -168,7 +169,7 @@ pub unsafe extern "C" fn client_on_entity_state_update( let max_backoff = Duration::from_secs(60); loop { - let rcv = client_clone.inner.on_entity_updated(clauses.clone()).await; + let rcv = client_clone.inner.on_entity_updated(clauses.clone(), historical).await; if let Ok(rcv) = rcv { backoff = Duration::from_secs(1); // Reset backoff on successful connection @@ -223,6 +224,7 @@ pub unsafe extern "C" fn client_on_event_message_update( client: *mut ToriiClient, clauses: *const EntityKeysClause, clauses_len: usize, + historical: bool, callback: unsafe extern "C" fn(types::FieldElement, CArray), ) -> Result<*mut Subscription> { let client = Arc::from_raw(client); @@ -242,7 +244,7 @@ pub unsafe extern "C" fn client_on_event_message_update( let max_backoff = Duration::from_secs(60); loop { - let rcv = client_clone.inner.on_event_message_updated(clauses.clone()).await; + let rcv = client_clone.inner.on_event_message_updated(clauses.clone(), historical).await; if let Ok(rcv) = rcv { backoff = Duration::from_secs(1); // Reset backoff on successful connection diff --git a/src/wasm/mod.rs b/src/wasm/mod.rs index 0e26d07..99aa6d0 100644 --- a/src/wasm/mod.rs +++ b/src/wasm/mod.rs @@ -453,11 +453,11 @@ impl ToriiClient { } #[wasm_bindgen(js_name = getEventMessages)] - pub async fn get_event_messages(&self, query: Query) -> Result { + pub async fn get_event_messages(&self, query: Query, historical: bool) -> Result { #[cfg(feature = "console-error-panic")] console_error_panic_hook::set_once(); - let results = self.inner.event_messages((&query).into()).await; + let results = self.inner.event_messages((&query).into(), historical).await; match results { Ok(event_messages) => Ok((&event_messages).into()), @@ -535,6 +535,7 @@ impl ToriiClient { pub async fn on_event_message_updated( &self, clauses: KeysClauses, + historical: bool, callback: js_sys::Function, ) -> Result { #[cfg(feature = "console-error-panic")] @@ -554,7 +555,7 @@ impl ToriiClient { let max_backoff = 60000; loop { - if let Ok(stream) = client.on_event_message_updated(clauses.clone()).await { + if let Ok(stream) = client.on_event_message_updated(clauses.clone(), historical).await { backoff = 1000; // Reset backoff on successful connection let mut stream = stream.take_until_if(tripwire.clone()); From 7fa084e3864ba8ef94de217f8398045c0719c9a6 Mon Sep 17 00:00:00 2001 From: Nasr Date: Thu, 31 Oct 2024 13:28:48 -0400 Subject: [PATCH 2/5] pad hex with 0x on wasm & historical --- Cargo.lock | 2904 +++++---------------------------------------- Cargo.toml | 9 +- dojo.h | 7 +- dojo.hpp | 8 +- dojo.pyx | 8 +- src/c/mod.rs | 5 +- src/wasm/mod.rs | 3 +- src/wasm/utils.rs | 16 +- 8 files changed, 342 insertions(+), 2618 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a2ab3fb..a01a2d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -59,7 +59,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom", "once_cell", "version_check", "zerocopy", @@ -74,21 +73,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - [[package]] name = "allocator-api2" version = "0.2.18" @@ -165,6 +149,12 @@ version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + [[package]] name = "arc-swap" version = "1.7.1" @@ -299,20 +289,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "async-compression" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" -dependencies = [ - "brotli", - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - [[package]] name = "async-executor" version = "1.13.1" @@ -719,27 +695,6 @@ dependencies = [ "piper", ] -[[package]] -name = "brotli" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - [[package]] name = "bs58" version = "0.5.1" @@ -749,17 +704,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "bstr" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" -dependencies = [ - "memchr", - "regex-automata 0.4.7", - "serde", -] - [[package]] name = "bumpalo" version = "3.16.0" @@ -784,12 +728,6 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" -[[package]] -name = "bytesize" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" - [[package]] name = "cainome" version = "0.2.3" @@ -816,14 +754,15 @@ dependencies = [ [[package]] name = "cainome" -version = "0.2.3" -source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.1#db76fb849d1b7f3e9a2e943868bcd8616cf72e90" +version = "0.4.6" +source = "git+https://github.com/cartridge-gg/cainome?rev=5c2616c273faca7700d2ba565503fcefb5b9d720#5c2616c273faca7700d2ba565503fcefb5b9d720" dependencies = [ "anyhow", "async-trait", - "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)", - "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)", - "cainome-rs 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)", + "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?rev=5c2616c273faca7700d2ba565503fcefb5b9d720)", + "cainome-cairo-serde-derive", + "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?rev=5c2616c273faca7700d2ba565503fcefb5b9d720)", + "cainome-rs 0.1.0 (git+https://github.com/cartridge-gg/cainome?rev=5c2616c273faca7700d2ba565503fcefb5b9d720)", "cainome-rs-macro", "camino", "clap 4.5.17", @@ -852,13 +791,24 @@ dependencies = [ [[package]] name = "cainome-cairo-serde" version = "0.1.0" -source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.1#db76fb849d1b7f3e9a2e943868bcd8616cf72e90" +source = "git+https://github.com/cartridge-gg/cainome?rev=5c2616c273faca7700d2ba565503fcefb5b9d720#5c2616c273faca7700d2ba565503fcefb5b9d720" dependencies = [ "serde", "starknet 0.12.0", "thiserror", ] +[[package]] +name = "cainome-cairo-serde-derive" +version = "0.1.0" +source = "git+https://github.com/cartridge-gg/cainome?rev=5c2616c273faca7700d2ba565503fcefb5b9d720#5c2616c273faca7700d2ba565503fcefb5b9d720" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", + "unzip-n", +] + [[package]] name = "cainome-parser" version = "0.1.0" @@ -875,7 +825,7 @@ dependencies = [ [[package]] name = "cainome-parser" version = "0.1.0" -source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.1#db76fb849d1b7f3e9a2e943868bcd8616cf72e90" +source = "git+https://github.com/cartridge-gg/cainome?rev=5c2616c273faca7700d2ba565503fcefb5b9d720#5c2616c273faca7700d2ba565503fcefb5b9d720" dependencies = [ "convert_case", "quote", @@ -906,11 +856,11 @@ dependencies = [ [[package]] name = "cainome-rs" version = "0.1.0" -source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.1#db76fb849d1b7f3e9a2e943868bcd8616cf72e90" +source = "git+https://github.com/cartridge-gg/cainome?rev=5c2616c273faca7700d2ba565503fcefb5b9d720#5c2616c273faca7700d2ba565503fcefb5b9d720" dependencies = [ "anyhow", - "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)", - "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)", + "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?rev=5c2616c273faca7700d2ba565503fcefb5b9d720)", + "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?rev=5c2616c273faca7700d2ba565503fcefb5b9d720)", "camino", "prettyplease", "proc-macro2", @@ -924,12 +874,12 @@ dependencies = [ [[package]] name = "cainome-rs-macro" version = "0.1.0" -source = "git+https://github.com/cartridge-gg/cainome?tag=v0.4.1#db76fb849d1b7f3e9a2e943868bcd8616cf72e90" +source = "git+https://github.com/cartridge-gg/cainome?rev=5c2616c273faca7700d2ba565503fcefb5b9d720#5c2616c273faca7700d2ba565503fcefb5b9d720" dependencies = [ "anyhow", - "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)", - "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)", - "cainome-rs 0.1.0 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)", + "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?rev=5c2616c273faca7700d2ba565503fcefb5b9d720)", + "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?rev=5c2616c273faca7700d2ba565503fcefb5b9d720)", + "cainome-rs 0.1.0 (git+https://github.com/cartridge-gg/cainome?rev=5c2616c273faca7700d2ba565503fcefb5b9d720)", "proc-macro-error", "proc-macro2", "quote", @@ -941,9 +891,9 @@ dependencies = [ [[package]] name = "cairo-lang-casm" -version = "2.7.0" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a43421bf72645b3a562d264747166d6f093e960a69dfa38b67bb3209e370366" +checksum = "fd4d6659539ace9649c8e8a7434e51b0c50a7a700111d0a2b967dde220ddff49" dependencies = [ "cairo-lang-utils", "indoc", @@ -953,261 +903,21 @@ dependencies = [ "serde", ] -[[package]] -name = "cairo-lang-compiler" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24242af537265add372896d9ab0678c86a68d3484281fbeb6d8a9d4d5bacf7c8" -dependencies = [ - "anyhow", - "cairo-lang-defs", - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-lowering", - "cairo-lang-parser", - "cairo-lang-project", - "cairo-lang-semantic", - "cairo-lang-sierra", - "cairo-lang-sierra-generator", - "cairo-lang-syntax", - "cairo-lang-utils", - "indoc", - "salsa", - "smol_str", - "thiserror", -] - -[[package]] -name = "cairo-lang-debug" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d28f38e1c62fed15a4de9f3c95741d6b24ef2a9e67a2b88a047eb6ea7de992e" -dependencies = [ - "cairo-lang-utils", -] - -[[package]] -name = "cairo-lang-defs" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712206b7be3fb1a33e50e1c30aa8502b4a461155fd93ad26213d0d8b242cb08d" -dependencies = [ - "cairo-lang-debug", - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-parser", - "cairo-lang-syntax", - "cairo-lang-utils", - "itertools 0.12.1", - "salsa", - "smol_str", -] - -[[package]] -name = "cairo-lang-diagnostics" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3c8dc2bff2411fbf602d80a83b719e6e3955c1c5d767ec18b295fc92e8616a" -dependencies = [ - "cairo-lang-debug", - "cairo-lang-filesystem", - "cairo-lang-utils", - "itertools 0.12.1", -] - [[package]] name = "cairo-lang-eq-solver" -version = "2.7.0" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaa8ac24c97770739f5a78d630b8515273c8b9f4aff34e1f88b988fac50340de" +checksum = "33a416c5871960fb4823160ebef2abc51e0c1b86fef1e97a1ebb2e5f3c3795d3" dependencies = [ "cairo-lang-utils", "good_lp", ] -[[package]] -name = "cairo-lang-filesystem" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4596331565fe61d10a0a6a03ace2b9d0ba93f03ee12a8450fe9252a6fee770f3" -dependencies = [ - "cairo-lang-debug", - "cairo-lang-utils", - "path-clean", - "salsa", - "serde", - "smol_str", -] - -[[package]] -name = "cairo-lang-formatter" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b8eb08e511d6e6df51370cdc7d85f0de9a38c8b14a15762665c60c2df6d32d" -dependencies = [ - "anyhow", - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-parser", - "cairo-lang-syntax", - "cairo-lang-utils", - "diffy", - "ignore", - "itertools 0.12.1", - "salsa", - "serde", - "smol_str", - "thiserror", -] - -[[package]] -name = "cairo-lang-lowering" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d535dc591513875b39b799270df21db10540033fd7710917760c22fc063a4ae" -dependencies = [ - "cairo-lang-debug", - "cairo-lang-defs", - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-parser", - "cairo-lang-proc-macros", - "cairo-lang-semantic", - "cairo-lang-syntax", - "cairo-lang-utils", - "id-arena", - "itertools 0.12.1", - "log", - "num-bigint", - "num-traits 0.2.19", - "once_cell", - "salsa", - "smol_str", -] - -[[package]] -name = "cairo-lang-macro" -version = "0.1.0" -source = "git+https://github.com/software-mansion/scarb?tag=v2.7.0#e9a2b8716daf7388bfab5e4b0a2656e1b0c02d4d" -dependencies = [ - "cairo-lang-macro-attributes", - "cairo-lang-macro-stable", - "linkme", -] - -[[package]] -name = "cairo-lang-macro-attributes" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32e958decd95ae122ee64daa26721da2f76e83231047f947fd9cdc5d3c90cc6" -dependencies = [ - "quote", - "scarb-stable-hash 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 2.0.77", -] - -[[package]] -name = "cairo-lang-macro-stable" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c49906d6b1c215e5814be7c5c65ecf2328898b335bee8c2409ec07cfb5530daf" - -[[package]] -name = "cairo-lang-parser" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73019d5873715964f428ff10467efb607d6dc007ae164a21547bf20d9b5dcc72" -dependencies = [ - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-syntax", - "cairo-lang-syntax-codegen", - "cairo-lang-utils", - "colored", - "itertools 0.12.1", - "num-bigint", - "num-traits 0.2.19", - "salsa", - "smol_str", - "unescaper", -] - -[[package]] -name = "cairo-lang-plugins" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96e52fca18bc696011a47a4ded0dc00e2e0ac7c81a8052eddd4ad546c46b818e" -dependencies = [ - "cairo-lang-defs", - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-parser", - "cairo-lang-syntax", - "cairo-lang-utils", - "indent", - "indoc", - "itertools 0.12.1", - "salsa", - "smol_str", -] - -[[package]] -name = "cairo-lang-proc-macros" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d55dcf98a6e1a03e0b36129fad4253f9e6666a1746ab9c075d212ba68a4e9c1" -dependencies = [ - "cairo-lang-debug", - "quote", - "syn 2.0.77", -] - -[[package]] -name = "cairo-lang-project" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ddb432e5199a65e37bab97ef6322afabd60e0e638ada31178d9c23d237219d" -dependencies = [ - "cairo-lang-filesystem", - "cairo-lang-utils", - "serde", - "smol_str", - "thiserror", - "toml 0.8.19", -] - -[[package]] -name = "cairo-lang-semantic" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "393325820207491a7475269e98163e0db7e85e4b215f4d801ca537ce1cd6daa7" -dependencies = [ - "cairo-lang-debug", - "cairo-lang-defs", - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-parser", - "cairo-lang-plugins", - "cairo-lang-proc-macros", - "cairo-lang-syntax", - "cairo-lang-test-utils", - "cairo-lang-utils", - "id-arena", - "indoc", - "itertools 0.12.1", - "num-bigint", - "num-traits 0.2.19", - "once_cell", - "salsa", - "smol_str", - "toml 0.8.19", -] - [[package]] name = "cairo-lang-sierra" -version = "2.7.0" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918fb0611203fb8cdd1fcdb434f395a59e0ebb0db64b11a0e15bfbfb03552821" +checksum = "424f55450494e959c1ae26c52a71075767a90f76e3ecca6e81056dd7517e8ba0" dependencies = [ "anyhow", "cairo-lang-utils", @@ -1220,9 +930,8 @@ dependencies = [ "num-bigint", "num-integer", "num-traits 0.2.19", - "once_cell", "regex", - "salsa", + "rust-analyzer-salsa", "serde", "serde_json", "sha3", @@ -1233,9 +942,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.7.0" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fa1834ec729e89fcbd00df03f2a64a18515fcf07eb18dfef39afe020a10955d" +checksum = "053dd520e0b9d1c1078d93ea69045f6f334c3d41b4b75db183ab33e32cfd8570" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -1249,9 +958,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.7.0" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b00927d39f910dd5ae1047cef9b46b2ee11617d33d290f875bc00dfc7e3d992" +checksum = "9a73227867377efc62ebb893cddaa88df3940bf2be5dbdc2f0b00f9edf69288e" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -1263,36 +972,11 @@ dependencies = [ "thiserror", ] -[[package]] -name = "cairo-lang-sierra-generator" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7620a6a7becf5997093a83d289a5e3b3162bc8fd031ad75df82a5bc04f8cc954" -dependencies = [ - "cairo-lang-debug", - "cairo-lang-defs", - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-lowering", - "cairo-lang-parser", - "cairo-lang-semantic", - "cairo-lang-sierra", - "cairo-lang-syntax", - "cairo-lang-utils", - "itertools 0.12.1", - "num-traits 0.2.19", - "once_cell", - "salsa", - "serde", - "serde_json", - "smol_str", -] - [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.7.0" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67bd155770abf91d4290a31b0c0a1fb393ecee85eb0af40c16893b4601eff4d6" +checksum = "7162fb3c93960dfc6d8005b65064e518e3f1ed6102e8981b42ea41879c331184" dependencies = [ "assert_matches", "cairo-lang-casm", @@ -1311,50 +995,19 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbae9458999da692c272501678b6cfec358a6bcadb54921bf35d21afdcd91251" -dependencies = [ - "cairo-lang-sierra", - "cairo-lang-utils", -] - -[[package]] -name = "cairo-lang-starknet" -version = "2.7.0" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f242d889180386d35935597f9d1cac07d4f3d60bd0f10558660ae4a77da701b6" +checksum = "a51b80c117e2b05a6d300f2e2247892cc99e42e950e79f6085e6ed6cbcb44d12" dependencies = [ - "anyhow", - "cairo-lang-compiler", - "cairo-lang-defs", - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-lowering", - "cairo-lang-plugins", - "cairo-lang-semantic", "cairo-lang-sierra", - "cairo-lang-sierra-generator", - "cairo-lang-starknet-classes", - "cairo-lang-syntax", "cairo-lang-utils", - "const_format", - "indent", - "indoc", - "itertools 0.12.1", - "once_cell", - "serde", - "serde_json", - "smol_str", - "starknet-types-core", - "thiserror", ] [[package]] name = "cairo-lang-starknet-classes" -version = "2.7.0" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa17b313f46fcf7ff4de32b86c250eaf584d1e2c8e37ed16db155b221721e735" +checksum = "832fd9072ddf4204ca6d227c0238929349f10146bd066a98025d51ac15d27fad" dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", @@ -1365,7 +1018,6 @@ dependencies = [ "num-bigint", "num-integer", "num-traits 0.2.19", - "once_cell", "serde", "serde_json", "sha3", @@ -1375,125 +1027,32 @@ dependencies = [ ] [[package]] -name = "cairo-lang-syntax" -version = "2.7.0" +name = "cairo-lang-utils" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d0ca518ed7c3674d9b62470f7482f4b07553eb3a02d83e0ae61bd6b5ecb4ec8" +checksum = "8bfc6372538143afad658c853a35bdc9f5210c5cb54e0c8f04ab78e268139466" dependencies = [ - "cairo-lang-debug", - "cairo-lang-filesystem", - "cairo-lang-utils", + "hashbrown 0.14.5", + "indexmap 2.5.0", + "itertools 0.12.1", "num-bigint", "num-traits 0.2.19", - "salsa", - "smol_str", - "unescaper", + "schemars", + "serde", ] [[package]] -name = "cairo-lang-syntax-codegen" -version = "2.7.1" +name = "camino" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01f276bc28f6302fc63032046a12b60d18498906e65f646acb963244eed97f7c" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ - "genco", - "xshell", + "serde", ] [[package]] -name = "cairo-lang-test-plugin" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b526ea053b930222352027b3259be44fb3cd3b25106e2b1fbc815526423650" -dependencies = [ - "anyhow", - "cairo-lang-compiler", - "cairo-lang-debug", - "cairo-lang-defs", - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-lowering", - "cairo-lang-semantic", - "cairo-lang-sierra", - "cairo-lang-sierra-generator", - "cairo-lang-starknet", - "cairo-lang-starknet-classes", - "cairo-lang-syntax", - "cairo-lang-utils", - "indoc", - "itertools 0.12.1", - "num-bigint", - "num-traits 0.2.19", - "serde", - "starknet-types-core", -] - -[[package]] -name = "cairo-lang-test-utils" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a2365bd502a657437f9d0d665e32e017054d0effdbecb1dda776bfcc11235d" -dependencies = [ - "cairo-lang-formatter", - "cairo-lang-utils", - "colored", - "log", - "pretty_assertions", -] - -[[package]] -name = "cairo-lang-utils" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd5c8c127b9362a12ffb9dede38e792c81b4ded5a98b448baec157b745f47d1" -dependencies = [ - "env_logger", - "hashbrown 0.14.5", - "indexmap 2.5.0", - "itertools 0.12.1", - "log", - "num-bigint", - "num-traits 0.2.19", - "schemars", - "serde", - "time", -] - -[[package]] -name = "camino" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cbc" -version = "0.1.2" +name = "cbc" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" dependencies = [ @@ -1525,8 +1084,6 @@ version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" dependencies = [ - "jobserver", - "libc", "shlex", ] @@ -1671,28 +1228,12 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" -[[package]] -name = "clru" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59" - [[package]] name = "colorchoice" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" -[[package]] -name = "colored" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" -dependencies = [ - "lazy_static", - "windows-sys 0.48.0", -] - [[package]] name = "common-multipart-rfc7578" version = "0.6.0" @@ -1718,19 +1259,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "console" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.52.0", -] - [[package]] name = "console_error_panic_hook" version = "0.1.7" @@ -1753,26 +1281,6 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" -[[package]] -name = "const_format" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b" -dependencies = [ - "const_format_proc_macros", -] - -[[package]] -name = "const_format_proc_macros" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - [[package]] name = "convert_case" version = "0.6.0" @@ -1840,26 +1348,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "create-output-dir" -version = "1.0.0" -source = "git+https://github.com/software-mansion/scarb?tag=v2.7.0#e9a2b8716daf7388bfab5e4b0a2656e1b0c02d4d" -dependencies = [ - "anyhow", - "core-foundation", - "tempfile", - "winapi", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" version = "0.8.5" @@ -1995,20 +1483,6 @@ dependencies = [ "syn 2.0.77", ] -[[package]] -name = "dashmap" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" -dependencies = [ - "cfg-if", - "crossbeam-utils", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core 0.9.10", -] - [[package]] name = "data-encoding" version = "2.6.0" @@ -2035,23 +1509,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "deno_task_shell" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec1b0c646a53492068b6675af74cecbef486e670be2c0cdd06e7e636d167e50f" -dependencies = [ - "anyhow", - "futures", - "glob", - "monch", - "os_pipe", - "path-dedot", - "thiserror", - "tokio", - "tokio-util", -] - [[package]] name = "der" version = "0.7.9" @@ -2112,65 +1569,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_builder" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.77", -] - -[[package]] -name = "derive_builder_macro" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" -dependencies = [ - "derive_builder_core", - "syn 2.0.77", -] - -[[package]] -name = "dialoguer" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" -dependencies = [ - "console", - "shell-words", - "tempfile", - "thiserror", - "zeroize", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "diffy" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e616e59155c92257e84970156f506287853355f58cd4a6eb167385722c32b790" -dependencies = [ - "nu-ansi-term", -] - [[package]] name = "digest" version = "0.10.7" @@ -2183,22 +1581,13 @@ dependencies = [ "subtle", ] -[[package]] -name = "directories" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" -dependencies = [ - "dirs-sys 0.4.1", -] - [[package]] name = "dirs" version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" dependencies = [ - "dirs-sys 0.3.7", + "dirs-sys", ] [[package]] @@ -2222,18 +1611,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - [[package]] name = "dirs-sys-next" version = "0.1.2" @@ -2261,7 +1638,7 @@ name = "dojo-c" version = "1.0.0-rc.0" dependencies = [ "anyhow", - "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.2)", + "cainome 0.2.3", "cbindgen", "crypto-bigint", "dojo-types", @@ -2275,8 +1652,9 @@ dependencies = [ "serde", "serde-wasm-bindgen", "serde_json", - "starknet 0.11.0", - "starknet-crypto 0.7.2", + "starknet 0.12.0", + "starknet-crypto", + "starknet-types-core", "stream-cancel", "tokio", "tokio-stream", @@ -2292,17 +1670,20 @@ dependencies = [ [[package]] name = "dojo-types" -version = "1.0.0-alpha.18" -source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.18#615e9fdea899d451ac2ad343a71bcebabb6b6cf6" +version = "1.0.0-rc.0" +source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-rc.0#f4199aec570a395278b8c8748bc46e2f6be3d0c7" dependencies = [ - "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)", + "anyhow", + "cainome 0.4.6", "crypto-bigint", "hex", "itertools 0.12.1", "num-traits 0.2.19", + "regex", "serde", "serde_json", "starknet 0.12.0", + "starknet-crypto", "strum", "strum_macros", "thiserror", @@ -2310,36 +1691,25 @@ dependencies = [ [[package]] name = "dojo-world" -version = "1.0.0-alpha.18" -source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.18#615e9fdea899d451ac2ad343a71bcebabb6b6cf6" +version = "1.0.0-rc.0" +source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-rc.0#f4199aec570a395278b8c8748bc46e2f6be3d0c7" dependencies = [ "anyhow", "async-trait", - "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)", - "cairo-lang-filesystem", - "cairo-lang-project", - "cairo-lang-starknet", + "cainome 0.4.6", "cairo-lang-starknet-classes", - "camino", - "convert_case", "dojo-types", - "http 0.2.12", "ipfs-api-backend-hyper", - "num-traits 0.2.19", "regex", - "scarb", "serde", "serde_json", - "serde_with", - "smol_str", + "serde_with 3.9.0", "starknet 0.12.0", - "starknet-crypto 0.7.2", + "starknet-crypto", "thiserror", "toml 0.8.19", - "topological-sort", "tracing", "url", - "walkdir", ] [[package]] @@ -2354,12 +1724,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" -[[package]] -name = "dunce" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" - [[package]] name = "dyn-clone" version = "1.0.17" @@ -2444,12 +1808,6 @@ dependencies = [ "log", ] -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - [[package]] name = "encoding_rs" version = "0.8.34" @@ -2471,45 +1829,12 @@ dependencies = [ "syn 2.0.77", ] -[[package]] -name = "env_filter" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "humantime", - "log", -] - [[package]] name = "equivalent" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -[[package]] -name = "erased-serde" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" -dependencies = [ - "serde", - "typeid", -] - [[package]] name = "errno" version = "0.3.9" @@ -2607,12 +1932,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "faster-hex" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" - [[package]] name = "fastrand" version = "1.9.0" @@ -2644,18 +1963,6 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" -[[package]] -name = "filetime" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" -dependencies = [ - "cfg-if", - "libc", - "libredox", - "windows-sys 0.59.0", -] - [[package]] name = "fixed-hash" version = "0.8.0" @@ -2702,47 +2009,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "foreign-types" -version = "0.3.2" +name = "form_urlencoded" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ - "foreign-types-shared", + "percent-encoding", ] -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fs4" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f9df8a11882c4e3335eb2d18a0137c505d9ca927470b0cac9c6f0ae07d28f7" -dependencies = [ - "async-trait", - "rustix 0.38.37", - "tokio", - "windows-sys 0.48.0", -] - -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - [[package]] name = "funty" version = "2.0.0" @@ -2827,982 +2101,138 @@ checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ "fastrand 1.9.0", "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand 2.1.1", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.77", -] - -[[package]] -name = "futures-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb" -dependencies = [ - "futures-io", - "rustls 0.23.13", - "rustls-pki-types", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-ticker" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9763058047f713632a52e916cc7f6a4b3fc6e9fc1ff8c5b1dc49e5a89041682e" -dependencies = [ - "futures", - "futures-timer", - "instant", -] - -[[package]] -name = "futures-timer" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" -dependencies = [ - "gloo-timers 0.2.6", - "send_wrapper 0.4.0", -] - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "genco" -version = "0.17.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afac3cbb14db69ac9fef9cdb60d8a87e39a7a527f85a81a923436efa40ad42c6" -dependencies = [ - "genco-macros", - "relative-path", - "smallvec", -] - -[[package]] -name = "genco-macros" -version = "0.17.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "553630feadf7b76442b0849fd25fdf89b860d933623aec9693fed19af0400c78" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.77", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", - "zeroize", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "ghash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" -dependencies = [ - "opaque-debug", - "polyval", -] - -[[package]] -name = "gimli" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" - -[[package]] -name = "gix" -version = "0.66.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9048b8d1ae2104f045cb37e5c450fc49d5d8af22609386bfc739c11ba88995eb" -dependencies = [ - "gix-actor", - "gix-archive", - "gix-attributes", - "gix-command", - "gix-commitgraph", - "gix-config", - "gix-credentials", - "gix-date", - "gix-diff", - "gix-dir", - "gix-discover", - "gix-features", - "gix-filter", - "gix-fs", - "gix-glob", - "gix-hash", - "gix-hashtable", - "gix-ignore", - "gix-index", - "gix-lock", - "gix-mailmap", - "gix-negotiate", - "gix-object", - "gix-odb", - "gix-pack", - "gix-path", - "gix-pathspec", - "gix-prompt", - "gix-ref", - "gix-refspec", - "gix-revision", - "gix-revwalk", - "gix-sec", - "gix-status", - "gix-submodule", - "gix-tempfile", - "gix-trace", - "gix-traverse", - "gix-url", - "gix-utils", - "gix-validate", - "gix-worktree", - "gix-worktree-state", - "gix-worktree-stream", - "once_cell", - "parking_lot 0.12.3", - "regex", - "signal-hook", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-actor" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc19e312cd45c4a66cd003f909163dc2f8e1623e30a0c0c6df3776e89b308665" -dependencies = [ - "bstr", - "gix-date", - "gix-utils", - "itoa", - "thiserror", - "winnow", -] - -[[package]] -name = "gix-archive" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9147c08a55c1398b755539e2cdd63ff690ffe4a2e5e5e0780ee6ef2b49b0a60a" -dependencies = [ - "bstr", - "gix-date", - "gix-object", - "gix-worktree-stream", - "jiff", - "thiserror", -] - -[[package]] -name = "gix-attributes" -version = "0.22.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebccbf25aa4a973dd352564a9000af69edca90623e8a16dad9cbc03713131311" -dependencies = [ - "bstr", - "gix-glob", - "gix-path", - "gix-quote", - "gix-trace", - "kstring", - "smallvec", - "thiserror", - "unicode-bom", -] - -[[package]] -name = "gix-bitmap" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a371db66cbd4e13f0ed9dc4c0fea712d7276805fccc877f77e96374d317e87ae" -dependencies = [ - "thiserror", -] - -[[package]] -name = "gix-chunk" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c8751169961ba7640b513c3b24af61aa962c967aaf04116734975cd5af0c52" -dependencies = [ - "thiserror", -] - -[[package]] -name = "gix-command" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff2e692b36bbcf09286c70803006ca3fd56551a311de450be317a0ab8ea92e7" -dependencies = [ - "bstr", - "gix-path", - "gix-trace", - "shell-words", -] - -[[package]] -name = "gix-commitgraph" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "133b06f67f565836ec0c473e2116a60fb74f80b6435e21d88013ac0e3c60fc78" -dependencies = [ - "bstr", - "gix-chunk", - "gix-features", - "gix-hash", - "memmap2", - "thiserror", -] - -[[package]] -name = "gix-config" -version = "0.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78e797487e6ca3552491de1131b4f72202f282fb33f198b1c34406d765b42bb0" -dependencies = [ - "bstr", - "gix-config-value", - "gix-features", - "gix-glob", - "gix-path", - "gix-ref", - "gix-sec", - "memchr", - "once_cell", - "smallvec", - "thiserror", - "unicode-bom", - "winnow", -] - -[[package]] -name = "gix-config-value" -version = "0.14.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03f76169faa0dec598eac60f83d7fcdd739ec16596eca8fb144c88973dbe6f8c" -dependencies = [ - "bitflags 2.6.0", - "bstr", - "gix-path", - "libc", - "thiserror", -] - -[[package]] -name = "gix-credentials" -version = "0.24.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce391d305968782f1ae301c4a3d42c5701df7ff1d8bc03740300f6fd12bce78" -dependencies = [ - "bstr", - "gix-command", - "gix-config-value", - "gix-path", - "gix-prompt", - "gix-sec", - "gix-trace", - "gix-url", - "thiserror", -] - -[[package]] -name = "gix-date" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c84b7af01e68daf7a6bb8bb909c1ff5edb3ce4326f1f43063a5a96d3c3c8a5" -dependencies = [ - "bstr", - "itoa", - "jiff", - "thiserror", -] - -[[package]] -name = "gix-diff" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92c9afd80fff00f8b38b1c1928442feb4cd6d2232a6ed806b6b193151a3d336c" -dependencies = [ - "bstr", - "gix-command", - "gix-filter", - "gix-fs", - "gix-hash", - "gix-object", - "gix-path", - "gix-tempfile", - "gix-trace", - "gix-worktree", - "imara-diff", - "thiserror", -] - -[[package]] -name = "gix-dir" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed3a9076661359a1c5a27c12ad6c3ebe2dd96b8b3c0af6488ab7c128b7bdd98" -dependencies = [ - "bstr", - "gix-discover", - "gix-fs", - "gix-ignore", - "gix-index", - "gix-object", - "gix-path", - "gix-pathspec", - "gix-trace", - "gix-utils", - "gix-worktree", - "thiserror", -] - -[[package]] -name = "gix-discover" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0577366b9567376bc26e815fd74451ebd0e6218814e242f8e5b7072c58d956d2" -dependencies = [ - "bstr", - "dunce", - "gix-fs", - "gix-hash", - "gix-path", - "gix-ref", - "gix-sec", - "thiserror", -] - -[[package]] -name = "gix-features" -version = "0.38.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac7045ac9fe5f9c727f38799d002a7ed3583cd777e3322a7c4b43e3cf437dc69" -dependencies = [ - "bytes", - "bytesize", - "crc32fast", - "crossbeam-channel", - "flate2", - "gix-hash", - "gix-trace", - "gix-utils", - "libc", - "once_cell", - "parking_lot 0.12.3", - "prodash", - "sha1_smol", - "thiserror", - "walkdir", -] - -[[package]] -name = "gix-filter" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4121790ae140066e5b953becc72e7496278138d19239be2e63b5067b0843119e" -dependencies = [ - "bstr", - "encoding_rs", - "gix-attributes", - "gix-command", - "gix-hash", - "gix-object", - "gix-packetline-blocking", - "gix-path", - "gix-quote", - "gix-trace", - "gix-utils", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-fs" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2bfe6249cfea6d0c0e0990d5226a4cb36f030444ba9e35e0639275db8f98575" -dependencies = [ - "fastrand 2.1.1", - "gix-features", - "gix-utils", -] - -[[package]] -name = "gix-glob" -version = "0.16.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74908b4bbc0a0a40852737e5d7889f676f081e340d5451a16e5b4c50d592f111" -dependencies = [ - "bitflags 2.6.0", - "bstr", - "gix-features", - "gix-path", -] - -[[package]] -name = "gix-hash" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93d7df7366121b5018f947a04d37f034717e113dcf9ccd85c34b58e57a74d5e" -dependencies = [ - "faster-hex", - "thiserror", -] - -[[package]] -name = "gix-hashtable" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ddf80e16f3c19ac06ce415a38b8591993d3f73aede049cb561becb5b3a8e242" -dependencies = [ - "gix-hash", - "hashbrown 0.14.5", - "parking_lot 0.12.3", -] - -[[package]] -name = "gix-ignore" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e447cd96598460f5906a0f6c75e950a39f98c2705fc755ad2f2020c9e937fab7" -dependencies = [ - "bstr", - "gix-glob", - "gix-path", - "gix-trace", - "unicode-bom", -] - -[[package]] -name = "gix-index" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cd4203244444017682176e65fd0180be9298e58ed90bd4a8489a357795ed22d" -dependencies = [ - "bitflags 2.6.0", - "bstr", - "filetime", - "fnv", - "gix-bitmap", - "gix-features", - "gix-fs", - "gix-hash", - "gix-lock", - "gix-object", - "gix-traverse", - "gix-utils", - "gix-validate", - "hashbrown 0.14.5", - "itoa", - "libc", - "memmap2", - "rustix 0.38.37", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-lock" -version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bc7fe297f1f4614774989c00ec8b1add59571dc9b024b4c00acb7dedd4e19d" -dependencies = [ - "gix-tempfile", - "gix-utils", - "thiserror", -] - -[[package]] -name = "gix-mailmap" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7d522c8ec2501e1a5b2b4cb54e83cb5d9a52471c9d23b3a1e8dadaf063752f7" -dependencies = [ - "bstr", - "gix-actor", - "gix-date", - "thiserror", -] - -[[package]] -name = "gix-negotiate" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4063bf329a191a9e24b6f948a17ccf6698c0380297f5e169cee4f1d2ab9475b" -dependencies = [ - "bitflags 2.6.0", - "gix-commitgraph", - "gix-date", - "gix-hash", - "gix-object", - "gix-revwalk", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-object" -version = "0.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f5b801834f1de7640731820c2df6ba88d95480dc4ab166a5882f8ff12b88efa" -dependencies = [ - "bstr", - "gix-actor", - "gix-date", - "gix-features", - "gix-hash", - "gix-utils", - "gix-validate", - "itoa", - "smallvec", - "thiserror", - "winnow", -] - -[[package]] -name = "gix-odb" -version = "0.63.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3158068701c17df54f0ab2adda527f5a6aca38fd5fd80ceb7e3c0a2717ec747" -dependencies = [ - "arc-swap", - "gix-date", - "gix-features", - "gix-fs", - "gix-hash", - "gix-object", - "gix-pack", - "gix-path", - "gix-quote", - "parking_lot 0.12.3", - "tempfile", - "thiserror", -] - -[[package]] -name = "gix-pack" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3223aa342eee21e1e0e403cad8ae9caf9edca55ef84c347738d10681676fd954" -dependencies = [ - "clru", - "gix-chunk", - "gix-features", - "gix-hash", - "gix-hashtable", - "gix-object", - "gix-path", - "memmap2", - "smallvec", - "thiserror", - "uluru", -] - -[[package]] -name = "gix-packetline-blocking" -version = "0.17.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9802304baa798dd6f5ff8008a2b6516d54b74a69ca2d3a2b9e2d6c3b5556b40" -dependencies = [ - "bstr", - "faster-hex", - "gix-trace", - "thiserror", -] - -[[package]] -name = "gix-path" -version = "0.10.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebfc4febd088abdcbc9f1246896e57e37b7a34f6909840045a1767c6dafac7af" -dependencies = [ - "bstr", - "gix-trace", - "home", - "once_cell", - "thiserror", -] - -[[package]] -name = "gix-pathspec" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d23bf239532b4414d0e63b8ab3a65481881f7237ed9647bb10c1e3cc54c5ceb" -dependencies = [ - "bitflags 2.6.0", - "bstr", - "gix-attributes", - "gix-config-value", - "gix-glob", - "gix-path", - "thiserror", -] - -[[package]] -name = "gix-prompt" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74fde865cdb46b30d8dad1293385d9bcf998d3a39cbf41bee67d0dab026fe6b1" -dependencies = [ - "gix-command", - "gix-config-value", - "parking_lot 0.12.3", - "rustix 0.38.37", - "thiserror", -] - -[[package]] -name = "gix-quote" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbff4f9b9ea3fa7a25a70ee62f545143abef624ac6aa5884344e70c8b0a1d9ff" -dependencies = [ - "bstr", - "gix-utils", - "thiserror", -] - -[[package]] -name = "gix-ref" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae0d8406ebf9aaa91f55a57f053c5a1ad1a39f60fdf0303142b7be7ea44311e5" -dependencies = [ - "gix-actor", - "gix-features", - "gix-fs", - "gix-hash", - "gix-lock", - "gix-object", - "gix-path", - "gix-tempfile", - "gix-utils", - "gix-validate", - "memmap2", - "thiserror", - "winnow", -] - -[[package]] -name = "gix-refspec" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebb005f82341ba67615ffdd9f7742c87787544441c88090878393d0682869ca6" -dependencies = [ - "bstr", - "gix-hash", - "gix-revision", - "gix-validate", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-revision" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4621b219ac0cdb9256883030c3d56a6c64a6deaa829a92da73b9a576825e1e" -dependencies = [ - "bstr", - "gix-date", - "gix-hash", - "gix-hashtable", - "gix-object", - "gix-revwalk", - "gix-trace", - "thiserror", -] - -[[package]] -name = "gix-revwalk" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41e72544b93084ee682ef3d5b31b1ba4d8fa27a017482900e5e044d5b1b3984" -dependencies = [ - "gix-commitgraph", - "gix-date", - "gix-hash", - "gix-hashtable", - "gix-object", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-sec" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fe4d52f30a737bbece5276fab5d3a8b276dc2650df963e293d0673be34e7a5f" -dependencies = [ - "bitflags 2.6.0", - "gix-path", - "libc", - "windows-sys 0.52.0", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", ] [[package]] -name = "gix-status" -version = "0.13.0" +name = "futures-lite" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f70d35ba639f0c16a6e4cca81aa374a05f07b23fa36ee8beb72c100d98b4ffea" -dependencies = [ - "bstr", - "filetime", - "gix-diff", - "gix-dir", - "gix-features", - "gix-filter", - "gix-fs", - "gix-hash", - "gix-index", - "gix-object", - "gix-path", - "gix-pathspec", - "gix-worktree", - "portable-atomic", - "thiserror", +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", ] [[package]] -name = "gix-submodule" -version = "0.14.0" +name = "futures-macro" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "529d0af78cc2f372b3218f15eb1e3d1635a21c8937c12e2dd0b6fc80c2ca874b" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "bstr", - "gix-config", - "gix-path", - "gix-pathspec", - "gix-refspec", - "gix-url", - "thiserror", + "proc-macro2", + "quote", + "syn 2.0.77", ] [[package]] -name = "gix-tempfile" -version = "14.0.2" +name = "futures-rustls" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046b4927969fa816a150a0cda2e62c80016fe11fb3c3184e4dddf4e542f108aa" +checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb" dependencies = [ - "dashmap", - "gix-fs", - "libc", - "once_cell", - "parking_lot 0.12.3", - "signal-hook", - "signal-hook-registry", - "tempfile", + "futures-io", + "rustls 0.23.13", + "rustls-pki-types", ] [[package]] -name = "gix-trace" -version = "0.1.10" +name = "futures-sink" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cae0e8661c3ff92688ce1c8b8058b3efb312aba9492bbe93661a21705ab431b" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] -name = "gix-traverse" -version = "0.41.0" +name = "futures-task" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030da39af94e4df35472e9318228f36530989327906f38e27807df305fccb780" -dependencies = [ - "bitflags 2.6.0", - "gix-commitgraph", - "gix-date", - "gix-hash", - "gix-hashtable", - "gix-object", - "gix-revwalk", - "smallvec", - "thiserror", -] +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] -name = "gix-url" -version = "0.27.5" +name = "futures-ticker" +version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd280c5e84fb22e128ed2a053a0daeacb6379469be6a85e3d518a0636e160c89" +checksum = "9763058047f713632a52e916cc7f6a4b3fc6e9fc1ff8c5b1dc49e5a89041682e" dependencies = [ - "bstr", - "gix-features", - "gix-path", - "home", - "thiserror", - "url", + "futures", + "futures-timer", + "instant", ] [[package]] -name = "gix-utils" -version = "0.1.12" +name = "futures-timer" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35192df7fd0fa112263bad8021e2df7167df4cc2a6e6d15892e1e55621d3d4dc" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" dependencies = [ - "bstr", - "fastrand 2.1.1", - "unicode-normalization", + "gloo-timers 0.2.6", + "send_wrapper 0.4.0", ] [[package]] -name = "gix-validate" -version = "0.9.0" +name = "futures-util" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81f2badbb64e57b404593ee26b752c26991910fd0d81fe6f9a71c1a8309b6c86" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ - "bstr", - "thiserror", + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", ] [[package]] -name = "gix-worktree" -version = "0.36.0" +name = "generic-array" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c312ad76a3f2ba8e865b360d5cb3aa04660971d16dec6dd0ce717938d903149a" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ - "bstr", - "gix-attributes", - "gix-features", - "gix-fs", - "gix-glob", - "gix-hash", - "gix-ignore", - "gix-index", - "gix-object", - "gix-path", - "gix-validate", + "typenum", + "version_check", + "zeroize", ] [[package]] -name = "gix-worktree-state" -version = "0.13.0" +name = "getrandom" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b05c4b313fa702c0bacd5068dd3e01671da73b938fade97676859fee286de43" -dependencies = [ - "bstr", - "gix-features", - "gix-filter", - "gix-fs", - "gix-glob", - "gix-hash", - "gix-index", - "gix-object", - "gix-path", - "gix-worktree", - "io-close", - "thiserror", +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", ] [[package]] -name = "gix-worktree-stream" -version = "0.15.0" +name = "ghash" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e81b87c1a3ece22a54b682d6fdc37fbb3977132da972cafe5ec07175fddbca" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" dependencies = [ - "gix-attributes", - "gix-features", - "gix-filter", - "gix-fs", - "gix-hash", - "gix-object", - "gix-path", - "gix-traverse", - "parking_lot 0.12.3", - "thiserror", + "opaque-debug", + "polyval", ] [[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globset" -version = "0.4.15" +name = "gimli" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", -] +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "gloo-timers" @@ -3907,15 +2337,6 @@ dependencies = [ "hashbrown 0.14.5", ] -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "heck" version = "0.4.1" @@ -4119,18 +2540,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "human_format" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c3b1f728c459d27b12448862017b96ad4767b1ec2ec5e6434e99f1577f085b8" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "hyper" version = "0.14.30" @@ -4246,19 +2655,6 @@ dependencies = [ "tokio-io-timeout", ] -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper 0.14.30", - "native-tls", - "tokio", - "tokio-native-tls", -] - [[package]] name = "hyper-util" version = "0.1.8" @@ -4302,12 +2698,6 @@ dependencies = [ "cc", ] -[[package]] -name = "id-arena" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" - [[package]] name = "ident_case" version = "1.0.1" @@ -4382,32 +2772,6 @@ dependencies = [ "xmltree", ] -[[package]] -name = "ignore" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata 0.4.7", - "same-file", - "walkdir", - "winapi-util", -] - -[[package]] -name = "imara-diff" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc9da1a252bd44cd341657203722352efc9bc0c847d06ea6d2dc1cd1135e0a01" -dependencies = [ - "ahash", - "hashbrown 0.14.5", -] - [[package]] name = "impl-codec" version = "0.6.0" @@ -4446,31 +2810,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "include_dir" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "indent" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f1a0777d972970f204fdf8ef319f1f4f8459131636d7e3c96c5d59570d0fa6" - [[package]] name = "indexmap" version = "1.9.3" @@ -4493,19 +2832,6 @@ dependencies = [ "serde", ] -[[package]] -name = "indicatif" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", -] - [[package]] name = "indoc" version = "2.0.5" @@ -4553,16 +2879,6 @@ dependencies = [ "webrtc-util 0.8.1", ] -[[package]] -name = "io-close" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "io-lifetimes" version = "1.0.11" @@ -4663,40 +2979,6 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" -[[package]] -name = "jiff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a45489186a6123c128fdf6016183fcfab7113e1820eb813127e036e287233fb" -dependencies = [ - "jiff-tzdb-platform", - "windows-sys 0.59.0", -] - -[[package]] -name = "jiff-tzdb" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91335e575850c5c4c673b9bd467b0e025f164ca59d0564f69d0c2ee0ffad4653" - -[[package]] -name = "jiff-tzdb-platform" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9835f0060a626fe59f160437bc725491a6af23133ea906500027d1bd2f8f4329" -dependencies = [ - "jiff-tzdb", -] - -[[package]] -name = "jobserver" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -dependencies = [ - "libc", -] - [[package]] name = "js-sys" version = "0.3.70" @@ -4715,15 +2997,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "kstring" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558bf9508a558512042d3095138b1f7b8fe90c5467d94f9f1da28b3731c5dbd1" -dependencies = [ - "static_assertions", -] - [[package]] name = "kv-log-macro" version = "1.0.7" @@ -4766,9 +3039,9 @@ dependencies = [ [[package]] name = "lambdaworks-crypto" -version = "0.7.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb5d4f22241504f7c7b8d2c3a7d7835d7c07117f10bff2a7d96a9ef6ef217c3" +checksum = "bbc2a4da0d9e52ccfe6306801a112e81a8fc0c76aa3e4449fefeda7fef72bb34" dependencies = [ "lambdaworks-math", "serde", @@ -4778,9 +3051,9 @@ dependencies = [ [[package]] name = "lambdaworks-math" -version = "0.7.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358e172628e713b80a530a59654154bfc45783a6ed70ea284839800cebdf8f97" +checksum = "d1bd2632acbd9957afc5aeec07ad39f078ae38656654043bf16e046fa2730e23" dependencies = [ "serde", "serde_json", @@ -4801,16 +3074,6 @@ version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" -[[package]] -name = "libloading" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" -dependencies = [ - "cfg-if", - "windows-targets 0.52.6", -] - [[package]] name = "libm" version = "0.2.8" @@ -5327,45 +3590,24 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.4", ] [[package]] name = "libsqlite3-sys" version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linkme" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c943daedff228392b791b33bba32e75737756e80a613e32e246c6ce9cbab20a" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ - "linkme-impl", + "cc", + "pkg-config", + "vcpkg", ] [[package]] -name = "linkme-impl" -version = "0.3.28" +name = "linked-hash-map" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb26336e6dc7cc76e7927d2c9e7e3bb376d7af65a6f56a0b16c47d18a9b1abc5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.77", -] +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" @@ -5462,15 +3704,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memmap2" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" -dependencies = [ - "libc", -] - [[package]] name = "memoffset" version = "0.7.1" @@ -5543,12 +3776,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "monch" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b52c1b33ff98142aecea13138bd399b68aa7ab5d9546c300988c345004001eea" - [[package]] name = "multiaddr" version = "0.17.1" @@ -5652,23 +3879,6 @@ dependencies = [ "unsigned-varint 0.8.0", ] -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "ndarray" version = "0.13.1" @@ -5897,21 +4107,6 @@ dependencies = [ "libc", ] -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - [[package]] name = "object" version = "0.36.4" @@ -5957,75 +4152,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" -[[package]] -name = "openssl" -version = "0.10.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.77", -] - [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-sys" -version = "0.9.103" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "ordered-float" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" -dependencies = [ - "num-traits 0.2.19", -] - -[[package]] -name = "os_pipe" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982" -dependencies = [ - "libc", - "windows-sys 0.59.0", -] - [[package]] name = "os_str_bytes" version = "6.6.1" @@ -6148,30 +4280,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "path-clean" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" - -[[package]] -name = "path-dedot" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397" -dependencies = [ - "once_cell", -] - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" -dependencies = [ - "camino", -] - [[package]] name = "pbkdf2" version = "0.11.0" @@ -6382,16 +4490,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - [[package]] name = "prettyplease" version = "0.2.22" @@ -6476,16 +4574,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prodash" -version = "28.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79" -dependencies = [ - "bytesize", - "human_format", -] - [[package]] name = "prometheus-client" version = "0.22.3" @@ -6700,16 +4788,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "ra_ap_toolchain" -version = "0.0.218" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53393fc4d85057bcca4dd2d7fa24929a094bb94712980814695f56cb9aa0b1e2" -dependencies = [ - "camino", - "home", -] - [[package]] name = "radium" version = "0.7.0" @@ -6785,15 +4863,6 @@ dependencies = [ "yasna", ] -[[package]] -name = "redb" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58323dc32ea52a8ae105ff94bc0460c5d906307533ba3401aa63db3cbe491fe5" -dependencies = [ - "libc", -] - [[package]] name = "redox_syscall" version = "0.2.16" @@ -6867,19 +4936,12 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" -[[package]] -name = "relative-path" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" - [[package]] name = "reqwest" version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "async-compression", "base64 0.21.7", "bytes", "encoding_rs", @@ -6890,17 +4952,14 @@ dependencies = [ "http-body 0.4.6", "hyper 0.14.30", "hyper-rustls 0.24.2", - "hyper-tls", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", "rustls 0.21.12", - "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.4", "serde", "serde_json", @@ -6908,14 +4967,11 @@ dependencies = [ "sync_wrapper 0.1.2", "system-configuration", "tokio", - "tokio-native-tls", "tokio-rustls 0.24.1", - "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-streams", "web-sys", "webpki-roots 0.25.4", "winreg", @@ -7096,6 +5152,35 @@ dependencies = [ "webrtc-util 0.8.1", ] +[[package]] +name = "rust-analyzer-salsa" +version = "0.17.0-pre.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719825638c59fd26a55412a24561c7c5bcf54364c88b9a7a04ba08a6eafaba8d" +dependencies = [ + "indexmap 2.5.0", + "lock_api", + "oorandom", + "parking_lot 0.12.3", + "rust-analyzer-salsa-macros", + "rustc-hash 1.1.0", + "smallvec", + "tracing", + "triomphe", +] + +[[package]] +name = "rust-analyzer-salsa-macros" +version = "0.17.0-pre.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d96498e9684848c6676c399032ebc37c52da95ecbefa83d71ccc53b9f8a4a8e" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "rustc-demangle" version = "0.1.24" @@ -7310,35 +5395,6 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" -[[package]] -name = "salsa" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b84d9f96071f3f3be0dc818eae3327625d8ebc95b58da37d6850724f31d3403" -dependencies = [ - "crossbeam-utils", - "indexmap 1.9.3", - "lock_api", - "log", - "oorandom", - "parking_lot 0.11.2", - "rustc-hash 1.1.0", - "salsa-macros", - "smallvec", -] - -[[package]] -name = "salsa-macros" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3904a4ba0a9d0211816177fd34b04c7095443f8cdacd11175064fe541c8fe2" -dependencies = [ - "heck 0.3.3", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "salsa20" version = "0.10.2" @@ -7349,148 +5405,12 @@ dependencies = [ ] [[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scarb" -version = "2.7.0" -source = "git+https://github.com/software-mansion/scarb?tag=v2.7.0#e9a2b8716daf7388bfab5e4b0a2656e1b0c02d4d" -dependencies = [ - "anyhow", - "async-trait", - "cairo-lang-compiler", - "cairo-lang-defs", - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-formatter", - "cairo-lang-lowering", - "cairo-lang-macro", - "cairo-lang-macro-stable", - "cairo-lang-parser", - "cairo-lang-semantic", - "cairo-lang-sierra", - "cairo-lang-sierra-to-casm", - "cairo-lang-starknet", - "cairo-lang-starknet-classes", - "cairo-lang-syntax", - "cairo-lang-test-plugin", - "cairo-lang-utils", - "camino", - "clap 4.5.17", - "convert_case", - "create-output-dir", - "data-encoding", - "deno_task_shell", - "derive_builder", - "dialoguer", - "directories", - "dunce", - "fs4", - "fs_extra", - "futures", - "gix", - "gix-path", - "glob", - "ignore", - "include_dir", - "indoc", - "itertools 0.12.1", - "libloading", - "once_cell", - "pathdiff", - "petgraph", - "ra_ap_toolchain", - "redb", - "reqwest 0.11.27", - "scarb-build-metadata", - "scarb-metadata", - "scarb-stable-hash 1.0.0 (git+https://github.com/software-mansion/scarb?tag=v2.7.0)", - "scarb-ui", - "semver", - "serde", - "serde-untagged", - "serde-value", - "serde_json", - "serde_repr", - "sha2", - "smallvec", - "smol_str", - "tar", - "thiserror", - "tokio", - "toml 0.8.19", - "toml_edit", - "tracing", - "tracing-subscriber", - "typed-builder", - "url", - "walkdir", - "which", - "windows-sys 0.52.0", - "zip", - "zstd", -] - -[[package]] -name = "scarb-build-metadata" -version = "2.7.0" -source = "git+https://github.com/software-mansion/scarb?tag=v2.7.0#e9a2b8716daf7388bfab5e4b0a2656e1b0c02d4d" -dependencies = [ - "cargo_metadata", -] - -[[package]] -name = "scarb-metadata" -version = "1.12.0" -source = "git+https://github.com/software-mansion/scarb?tag=v2.7.0#e9a2b8716daf7388bfab5e4b0a2656e1b0c02d4d" -dependencies = [ - "camino", - "derive_builder", - "semver", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "scarb-stable-hash" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1902536b23a05dd165d3992865870aaf1b0650317767cbf171ed2ca5903732a9" -dependencies = [ - "data-encoding", - "xxhash-rust", -] - -[[package]] -name = "scarb-stable-hash" -version = "1.0.0" -source = "git+https://github.com/software-mansion/scarb?tag=v2.7.0#e9a2b8716daf7388bfab5e4b0a2656e1b0c02d4d" -dependencies = [ - "data-encoding", - "xxhash-rust", -] - -[[package]] -name = "scarb-ui" -version = "0.1.5" -source = "git+https://github.com/software-mansion/scarb?tag=v2.7.0#e9a2b8716daf7388bfab5e4b0a2656e1b0c02d4d" +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" dependencies = [ - "anyhow", - "camino", - "clap 4.5.17", - "console", - "indicatif", - "scarb-metadata", - "serde", - "serde_json", - "tracing-core", + "winapi-util", ] [[package]] @@ -7615,9 +5535,6 @@ name = "semver" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -dependencies = [ - "serde", -] [[package]] name = "send_wrapper" @@ -7643,27 +5560,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-untagged" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2676ba99bd82f75cae5cbd2c8eda6fa0b8760f18978ea840e980dd5567b5c5b6" -dependencies = [ - "erased-serde", - "serde", - "typeid", -] - -[[package]] -name = "serde-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" -dependencies = [ - "ordered-float", - "serde", -] - [[package]] name = "serde-wasm-bindgen" version = "0.6.5" @@ -7720,17 +5616,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_repr" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.77", -] - [[package]] name = "serde_spanned" version = "0.6.7" @@ -7752,6 +5637,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.9.0" @@ -7766,10 +5667,22 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "serde_with_macros", + "serde_with_macros 3.9.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.77", +] + [[package]] name = "serde_with_macros" version = "3.9.0" @@ -7803,12 +5716,6 @@ dependencies = [ "digest", ] -[[package]] -name = "sha1_smol" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" - [[package]] name = "sha2" version = "0.10.8" @@ -7839,28 +5746,12 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - [[package]] name = "shlex" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -8217,16 +6108,23 @@ dependencies = [ "uuid 1.10.0", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "starknet" version = "0.11.0" -source = "git+https://github.com/xJonathanLEI/starknet-rs?rev=2ddc694#2ddc69479d326ed154df438d22f2d720fbba746e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e633a772f59214c296d5037c95c36b72792c9360323818da2b625c7b4ec4b49" dependencies = [ "starknet-accounts 0.10.0", "starknet-contract 0.10.0", "starknet-core 0.11.1", - "starknet-crypto 0.7.1", - "starknet-macros 0.2.0", + "starknet-crypto", + "starknet-macros", "starknet-providers 0.11.0", "starknet-signers 0.9.0", ] @@ -8240,8 +6138,8 @@ dependencies = [ "starknet-accounts 0.11.0", "starknet-contract 0.11.0", "starknet-core 0.12.0", - "starknet-crypto 0.7.2", - "starknet-macros 0.2.1", + "starknet-crypto", + "starknet-macros", "starknet-providers 0.12.0", "starknet-signers 0.10.0", ] @@ -8249,12 +6147,13 @@ dependencies = [ [[package]] name = "starknet-accounts" version = "0.10.0" -source = "git+https://github.com/xJonathanLEI/starknet-rs?rev=2ddc694#2ddc69479d326ed154df438d22f2d720fbba746e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eee8a6b588a22c7e79f5d8d4e33413387db63a8beb98be8610138541794cc0a5" dependencies = [ "async-trait", "auto_impl", "starknet-core 0.11.1", - "starknet-crypto 0.7.1", + "starknet-crypto", "starknet-providers 0.11.0", "starknet-signers 0.9.0", "thiserror", @@ -8269,7 +6168,7 @@ dependencies = [ "async-trait", "auto_impl", "starknet-core 0.12.0", - "starknet-crypto 0.7.2", + "starknet-crypto", "starknet-providers 0.12.0", "starknet-signers 0.10.0", "thiserror", @@ -8278,11 +6177,12 @@ dependencies = [ [[package]] name = "starknet-contract" version = "0.10.0" -source = "git+https://github.com/xJonathanLEI/starknet-rs?rev=2ddc694#2ddc69479d326ed154df438d22f2d720fbba746e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5f91344f1e0b81873b6dc235c50ae4d084c6ea4dd4a1e3e27ad895803adb610" dependencies = [ "serde", "serde_json", - "serde_with", + "serde_with 2.3.3", "starknet-accounts 0.10.0", "starknet-core 0.11.1", "starknet-providers 0.11.0", @@ -8297,7 +6197,7 @@ checksum = "bd6ee5762d24c4f06ab7e9406550925df406712e73719bd2de905c879c674a87" dependencies = [ "serde", "serde_json", - "serde_with", + "serde_with 3.9.0", "starknet-accounts 0.11.0", "starknet-core 0.12.0", "starknet-providers 0.12.0", @@ -8307,7 +6207,8 @@ dependencies = [ [[package]] name = "starknet-core" version = "0.11.1" -source = "git+https://github.com/xJonathanLEI/starknet-rs?rev=2ddc694#2ddc69479d326ed154df438d22f2d720fbba746e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d506e02a4083290d13b427dfe437fd95aa8b56315c455bb2f9cdeca76620d457" dependencies = [ "base64 0.21.7", "crypto-bigint", @@ -8316,9 +6217,9 @@ dependencies = [ "serde", "serde_json", "serde_json_pythonic", - "serde_with", + "serde_with 2.3.3", "sha3", - "starknet-crypto 0.7.1", + "starknet-crypto", "starknet-types-core", ] @@ -8335,28 +6236,10 @@ dependencies = [ "serde", "serde_json", "serde_json_pythonic", - "serde_with", + "serde_with 3.9.0", "sha3", - "starknet-crypto 0.7.2", - "starknet-types-core", -] - -[[package]] -name = "starknet-crypto" -version = "0.7.1" -source = "git+https://github.com/xJonathanLEI/starknet-rs?rev=2ddc694#2ddc69479d326ed154df438d22f2d720fbba746e" -dependencies = [ - "crypto-bigint", - "hex", - "hmac", - "num-bigint", - "num-integer", - "num-traits 0.2.19", - "rfc6979", - "sha2", - "starknet-curve 0.5.0", + "starknet-crypto", "starknet-types-core", - "zeroize", ] [[package]] @@ -8373,19 +6256,11 @@ dependencies = [ "num-traits 0.2.19", "rfc6979", "sha2", - "starknet-curve 0.5.1", + "starknet-curve", "starknet-types-core", "zeroize", ] -[[package]] -name = "starknet-curve" -version = "0.5.0" -source = "git+https://github.com/xJonathanLEI/starknet-rs?rev=2ddc694#2ddc69479d326ed154df438d22f2d720fbba746e" -dependencies = [ - "starknet-types-core", -] - [[package]] name = "starknet-curve" version = "0.5.1" @@ -8395,15 +6270,6 @@ dependencies = [ "starknet-types-core", ] -[[package]] -name = "starknet-macros" -version = "0.2.0" -source = "git+https://github.com/xJonathanLEI/starknet-rs?rev=2ddc694#2ddc69479d326ed154df438d22f2d720fbba746e" -dependencies = [ - "starknet-core 0.11.1", - "syn 2.0.77", -] - [[package]] name = "starknet-macros" version = "0.2.1" @@ -8417,7 +6283,8 @@ dependencies = [ [[package]] name = "starknet-providers" version = "0.11.0" -source = "git+https://github.com/xJonathanLEI/starknet-rs?rev=2ddc694#2ddc69479d326ed154df438d22f2d720fbba746e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59c85e0a0f4563ae95dfeae14ea0f0c70610efc0ec2462505c64eff5765e7b97" dependencies = [ "async-trait", "auto_impl", @@ -8428,7 +6295,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "serde_with", + "serde_with 2.3.3", "starknet-core 0.11.1", "thiserror", "url", @@ -8449,7 +6316,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "serde_with", + "serde_with 3.9.0", "starknet-core 0.12.0", "thiserror", "url", @@ -8458,7 +6325,8 @@ dependencies = [ [[package]] name = "starknet-signers" version = "0.9.0" -source = "git+https://github.com/xJonathanLEI/starknet-rs?rev=2ddc694#2ddc69479d326ed154df438d22f2d720fbba746e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17da2139119dbe3aacf1d5d4338798a5c489d17f424916ceb9d2efd83554f87" dependencies = [ "async-trait", "auto_impl", @@ -8467,7 +6335,7 @@ dependencies = [ "getrandom", "rand", "starknet-core 0.11.1", - "starknet-crypto 0.7.1", + "starknet-crypto", "thiserror", ] @@ -8484,16 +6352,17 @@ dependencies = [ "getrandom", "rand", "starknet-core 0.12.0", - "starknet-crypto 0.7.2", + "starknet-crypto", "thiserror", ] [[package]] name = "starknet-types-core" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6bacf0ba19bc721e518bc4bf389ff13daa8a7c5db5fd320600473b8aa9fcbd" +checksum = "fa1b9e01ccb217ab6d475c5cda05dbb22c30029f7bb52b192a010a00d77a3d74" dependencies = [ + "arbitrary", "lambdaworks-crypto", "lambdaworks-math", "lazy_static", @@ -8715,17 +6584,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" -[[package]] -name = "tar" -version = "0.4.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" -dependencies = [ - "filetime", - "libc", - "xattr", -] - [[package]] name = "tempfile" version = "3.12.0" @@ -8803,9 +6661,7 @@ checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", - "libc", "num-conv", - "num_threads", "powerfmt", "serde", "time-core", @@ -8901,16 +6757,6 @@ dependencies = [ "syn 2.0.77", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.23.4" @@ -9161,16 +7007,10 @@ dependencies = [ "web-sys", ] -[[package]] -name = "topological-sort" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d" - [[package]] name = "torii-client" -version = "1.0.0-alpha.18" -source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.18#615e9fdea899d451ac2ad343a71bcebabb6b6cf6" +version = "1.0.0-rc.0" +source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-rc.0#f4199aec570a395278b8c8748bc46e2f6be3d0c7" dependencies = [ "async-trait", "crypto-bigint", @@ -9185,7 +7025,7 @@ dependencies = [ "serde", "serde_json", "starknet 0.12.0", - "starknet-crypto 0.7.2", + "starknet-crypto", "thiserror", "tokio", "tonic 0.11.0", @@ -9197,14 +7037,14 @@ dependencies = [ [[package]] name = "torii-core" -version = "1.0.0-alpha.18" -source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.18#615e9fdea899d451ac2ad343a71bcebabb6b6cf6" +version = "1.0.0-rc.0" +source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-rc.0#f4199aec570a395278b8c8748bc46e2f6be3d0c7" dependencies = [ "anyhow", "async-trait", "base64 0.21.7", "bitflags 2.6.0", - "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)", + "cainome 0.4.6", "chrono", "crypto-bigint", "dojo-types", @@ -9220,7 +7060,7 @@ dependencies = [ "slab", "sqlx", "starknet 0.12.0", - "starknet-crypto 0.7.2", + "starknet-crypto", "thiserror", "tokio", "tokio-util", @@ -9230,8 +7070,8 @@ dependencies = [ [[package]] name = "torii-grpc" -version = "1.0.0-alpha.18" -source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.18#615e9fdea899d451ac2ad343a71bcebabb6b6cf6" +version = "1.0.0-rc.0" +source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-rc.0#f4199aec570a395278b8c8748bc46e2f6be3d0c7" dependencies = [ "crypto-bigint", "dojo-types", @@ -9249,7 +7089,7 @@ dependencies = [ "serde_json", "sqlx", "starknet 0.12.0", - "starknet-crypto 0.7.2", + "starknet-crypto", "strum", "strum_macros", "thiserror", @@ -9269,11 +7109,11 @@ dependencies = [ [[package]] name = "torii-relay" -version = "1.0.0-alpha.18" -source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.18#615e9fdea899d451ac2ad343a71bcebabb6b6cf6" +version = "1.0.0-rc.0" +source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-rc.0#f4199aec570a395278b8c8748bc46e2f6be3d0c7" dependencies = [ "anyhow", - "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.4.1)", + "cainome 0.4.6", "chrono", "crypto-bigint", "dojo-types", @@ -9289,7 +7129,7 @@ dependencies = [ "serde_json", "sqlx", "starknet 0.12.0", - "starknet-crypto 0.7.2", + "starknet-crypto", "thiserror", "torii-core", "tracing", @@ -9435,6 +7275,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "triomphe" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" +dependencies = [ + "serde", + "stable_deref_trait", +] + [[package]] name = "try-lock" version = "0.2.5" @@ -9487,32 +7337,6 @@ dependencies = [ "webrtc-util 0.8.1", ] -[[package]] -name = "typed-builder" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e14ed59dc8b7b26cacb2a92bad2e8b1f098806063898ab42a3bd121d7d45e75" -dependencies = [ - "typed-builder-macro", -] - -[[package]] -name = "typed-builder-macro" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560b82d656506509d43abe30e0ba64c56b1953ab3d4fe7ba5902747a7a3cedd5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.77", -] - -[[package]] -name = "typeid" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" - [[package]] name = "typenum" version = "1.17.0" @@ -9531,24 +7355,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "uluru" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c8a2469e56e6e5095c82ccd3afb98dad95f7af7929aab6d8ba8d6e0f73657da" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "unescaper" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c878a167baa8afd137494101a688ef8c67125089ff2249284bd2b5f9bfedb815" -dependencies = [ - "thiserror", -] - [[package]] name = "unicase" version = "2.7.0" @@ -9564,12 +7370,6 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" -[[package]] -name = "unicode-bom" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" - [[package]] name = "unicode-ident" version = "1.0.13" @@ -9597,12 +7397,6 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" -[[package]] -name = "unicode-width" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" - [[package]] name = "unicode-xid" version = "0.2.5" @@ -9649,6 +7443,17 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" +[[package]] +name = "unzip-n" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e7e85a0596447f0f2ac090e16bc4c516c6fe91771fb0c0ccf7fa3dae896b9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "url" version = "2.5.2" @@ -10154,19 +7959,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "which" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" -dependencies = [ - "either", - "home", - "once_cell", - "rustix 0.38.37", - "windows-sys 0.48.0", -] - [[package]] name = "whoami" version = "1.5.2" @@ -10495,17 +8287,6 @@ dependencies = [ "time", ] -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys 0.4.14", - "rustix 0.38.37", -] - [[package]] name = "xml-rs" version = "0.8.22" @@ -10521,27 +8302,6 @@ dependencies = [ "xml-rs", ] -[[package]] -name = "xshell" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db0ab86eae739efd1b054a8d3d16041914030ac4e01cd1dca0cf252fd8b6437" -dependencies = [ - "xshell-macros", -] - -[[package]] -name = "xshell-macros" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d422e8e38ec76e2f06ee439ccc765e9c6a9638b9e7c9f2e8255e4d41e8bd852" - -[[package]] -name = "xxhash-rust" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" - [[package]] name = "yamux" version = "0.12.1" @@ -10573,12 +8333,6 @@ dependencies = [ "web-time", ] -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - [[package]] name = "yasna" version = "0.5.2" @@ -10628,43 +8382,3 @@ dependencies = [ "quote", "syn 2.0.77", ] - -[[package]] -name = "zip" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" -dependencies = [ - "byteorder", - "crc32fast", - "crossbeam-utils", - "flate2", -] - -[[package]] -name = "zstd" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "7.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" -dependencies = [ - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/Cargo.toml b/Cargo.toml index 665cbd3..87eea23 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,8 +19,9 @@ torii-grpc = { git = "https://github.com/dojoengine/dojo", features = [ ], tag = "v1.0.0-rc.0" } torii-relay = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-rc.0" } -starknet = "0.11.0" +starknet = "0.12.0" starknet-crypto = "0.7.2" +starknet-types-core = { version = "0.1.6", features = [ "arbitrary" ] } parking_lot = "0.12.1" tokio = { version = "1.39.2", default-features = false, features = ["rt"] } @@ -55,8 +56,4 @@ instant = { version = "0.1.13", features = ["wasm-bindgen"] } gloo-timers = { version = "0.3.0", features = ["futures"] } [build-dependencies] -cbindgen = "0.26.0" - -[patch.crates-io] -# Matching the same rev that `cainome` is using. Mainly because `starknet-rs` hasn't create a new release yet. -starknet = { git = "https://github.com/xJonathanLEI/starknet-rs", rev = "2ddc694" } +cbindgen = "0.26.0" \ No newline at end of file diff --git a/dojo.h b/dojo.h index dd67df7..81e0d9e 100644 --- a/dojo.h +++ b/dojo.h @@ -632,7 +632,8 @@ struct ResultCArrayu8 client_publish_message(struct ToriiClient *client, struct ResultCArrayEntity client_entities(struct ToriiClient *client, const struct Query *query); struct ResultCArrayEntity client_event_messages(struct ToriiClient *client, - const struct Query *query); + const struct Query *query, + bool historical); struct WorldMetadata client_metadata(struct ToriiClient *client); @@ -650,13 +651,15 @@ struct Resultbool client_update_entity_subscription(struct ToriiClient *client, struct ResultSubscription client_on_event_message_update(struct ToriiClient *client, const struct EntityKeysClause *clauses, uintptr_t clauses_len, + bool historical, void (*callback)(struct FieldElement, struct CArrayStruct)); struct Resultbool client_update_event_message_subscription(struct ToriiClient *client, struct Subscription *subscription, const struct EntityKeysClause *clauses, - uintptr_t clauses_len); + uintptr_t clauses_len, + bool historical); struct ResultSubscription client_on_starknet_event(struct ToriiClient *client, const struct EntityKeysClause *clauses, diff --git a/dojo.hpp b/dojo.hpp index 7c04a29..f4b5746 100644 --- a/dojo.hpp +++ b/dojo.hpp @@ -890,7 +890,9 @@ Result> client_publish_message(ToriiClient *client, Result> client_entities(ToriiClient *client, const Query *query); -Result> client_event_messages(ToriiClient *client, const Query *query); +Result> client_event_messages(ToriiClient *client, + const Query *query, + bool historical); WorldMetadata client_metadata(ToriiClient *client); @@ -907,12 +909,14 @@ Result client_update_entity_subscription(ToriiClient *client, Result client_on_event_message_update(ToriiClient *client, const EntityKeysClause *clauses, uintptr_t clauses_len, + bool historical, void (*callback)(FieldElement, CArray)); Result client_update_event_message_subscription(ToriiClient *client, Subscription *subscription, const EntityKeysClause *clauses, - uintptr_t clauses_len); + uintptr_t clauses_len, + bool historical); Result client_on_starknet_event(ToriiClient *client, const EntityKeysClause *clauses, diff --git a/dojo.pyx b/dojo.pyx index 788e145..78e9baf 100644 --- a/dojo.pyx +++ b/dojo.pyx @@ -397,7 +397,9 @@ cdef extern from *: ResultCArrayEntity client_entities(ToriiClient *client, const Query *query); - ResultCArrayEntity client_event_messages(ToriiClient *client, const Query *query); + ResultCArrayEntity client_event_messages(ToriiClient *client, + const Query *query, + bool historical); WorldMetadata client_metadata(ToriiClient *client); @@ -414,12 +416,14 @@ cdef extern from *: ResultSubscription client_on_event_message_update(ToriiClient *client, const EntityKeysClause *clauses, uintptr_t clauses_len, + bool historical, void (*callback)(FieldElement, CArrayStruct)); Resultbool client_update_event_message_subscription(ToriiClient *client, Subscription *subscription, const EntityKeysClause *clauses, - uintptr_t clauses_len); + uintptr_t clauses_len, + bool historical); ResultSubscription client_on_starknet_event(ToriiClient *client, const EntityKeysClause *clauses, diff --git a/src/c/mod.rs b/src/c/mod.rs index 6d32a72..a05314e 100644 --- a/src/c/mod.rs +++ b/src/c/mod.rs @@ -169,7 +169,7 @@ pub unsafe extern "C" fn client_on_entity_state_update( let max_backoff = Duration::from_secs(60); loop { - let rcv = client_clone.inner.on_entity_updated(clauses.clone(), historical).await; + let rcv = client_clone.inner.on_entity_updated(clauses.clone()).await; if let Ok(rcv) = rcv { backoff = Duration::from_secs(1); // Reset backoff on successful connection @@ -279,6 +279,7 @@ pub unsafe extern "C" fn client_update_event_message_subscription( subscription: *mut Subscription, clauses: *const EntityKeysClause, clauses_len: usize, + historical: bool, ) -> Result { let clauses = unsafe { std::slice::from_raw_parts(clauses, clauses_len) }; let clauses = clauses.iter().map(|c| c.into()).collect::>(); @@ -286,7 +287,7 @@ pub unsafe extern "C" fn client_update_event_message_subscription( match (*client).runtime.block_on( (*client) .inner - .update_event_message_subscription((*subscription).id.load(Ordering::SeqCst), clauses), + .update_event_message_subscription((*subscription).id.load(Ordering::SeqCst), clauses, historical), ) { Ok(_) => Result::Ok(true), Err(e) => Result::Err(e.into()), diff --git a/src/wasm/mod.rs b/src/wasm/mod.rs index 99aa6d0..c80b8c8 100644 --- a/src/wasm/mod.rs +++ b/src/wasm/mod.rs @@ -590,10 +590,11 @@ impl ToriiClient { &self, subscription: &Subscription, clauses: KeysClauses, + historical: bool, ) -> Result<(), JsValue> { let clauses = clauses.iter().map(|c| c.into()).collect(); self.inner - .update_event_message_subscription(subscription.id.load(Ordering::SeqCst), clauses) + .update_event_message_subscription(subscription.id.load(Ordering::SeqCst), clauses, historical) .await .map_err(|err| JsValue::from(format!("failed to update subscription: {err}"))) } diff --git a/src/wasm/utils.rs b/src/wasm/utils.rs index a056554..52a322c 100644 --- a/src/wasm/utils.rs +++ b/src/wasm/utils.rs @@ -90,14 +90,14 @@ fn primitive_value_json(primitive: Primitive) -> JsValue { Primitive::U16(Some(value)) => JsValue::from_f64(value.into()), Primitive::U32(Some(value)) => JsValue::from_f64(value.into()), Primitive::USize(Some(value)) => JsValue::from_f64(value.into()), - Primitive::I64(Some(value)) => JsValue::from_str(&format!("{value:#x}")), - Primitive::U64(Some(value)) => JsValue::from_str(&format!("{value:#x}")), - Primitive::I128(Some(value)) => JsValue::from_str(&format!("{value:#x}")), - Primitive::U128(Some(value)) => JsValue::from_str(&format!("{value:#x}")), - Primitive::U256(Some(value)) => JsValue::from_str(&format!("{value:#x}")), - Primitive::Felt252(Some(value)) => JsValue::from_str(&format!("{value:#x}")), - Primitive::ClassHash(Some(value)) => JsValue::from_str(&format!("{value:#x}")), - Primitive::ContractAddress(Some(value)) => JsValue::from_str(&format!("{value:#x}")), + Primitive::I64(Some(value)) => JsValue::from_str(&format!("0x{value:064x}")), + Primitive::U64(Some(value)) => JsValue::from_str(&format!("0x{value:064x}")), + Primitive::I128(Some(value)) => JsValue::from_str(&format!("0x{value:064x}")), + Primitive::U128(Some(value)) => JsValue::from_str(&format!("0x{value:064x}")), + Primitive::U256(Some(value)) => JsValue::from_str(&format!("0x{value:064x}")), + Primitive::Felt252(Some(value)) => JsValue::from_str(&format!("0x{value:064x}")), + Primitive::ClassHash(Some(value)) => JsValue::from_str(&format!("0x{value:064x}")), + Primitive::ContractAddress(Some(value)) => JsValue::from_str(&format!("0x{value:064x}")), _ => JsValue::NULL, } } From e482b5fb45ea0c1b92e88c84133fac6f7ab11cd5 Mon Sep 17 00:00:00 2001 From: Nasr Date: Thu, 31 Oct 2024 13:29:02 -0400 Subject: [PATCH 3/5] fmt --- src/c/mod.rs | 13 +++++++------ src/wasm/mod.rs | 16 +++++++++++++--- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/c/mod.rs b/src/c/mod.rs index a05314e..0173de7 100644 --- a/src/c/mod.rs +++ b/src/c/mod.rs @@ -244,7 +244,8 @@ pub unsafe extern "C" fn client_on_event_message_update( let max_backoff = Duration::from_secs(60); loop { - let rcv = client_clone.inner.on_event_message_updated(clauses.clone(), historical).await; + let rcv = + client_clone.inner.on_event_message_updated(clauses.clone(), historical).await; if let Ok(rcv) = rcv { backoff = Duration::from_secs(1); // Reset backoff on successful connection @@ -284,11 +285,11 @@ pub unsafe extern "C" fn client_update_event_message_subscription( let clauses = unsafe { std::slice::from_raw_parts(clauses, clauses_len) }; let clauses = clauses.iter().map(|c| c.into()).collect::>(); - match (*client).runtime.block_on( - (*client) - .inner - .update_event_message_subscription((*subscription).id.load(Ordering::SeqCst), clauses, historical), - ) { + match (*client).runtime.block_on((*client).inner.update_event_message_subscription( + (*subscription).id.load(Ordering::SeqCst), + clauses, + historical, + )) { Ok(_) => Result::Ok(true), Err(e) => Result::Err(e.into()), } diff --git a/src/wasm/mod.rs b/src/wasm/mod.rs index c80b8c8..c52cd27 100644 --- a/src/wasm/mod.rs +++ b/src/wasm/mod.rs @@ -453,7 +453,11 @@ impl ToriiClient { } #[wasm_bindgen(js_name = getEventMessages)] - pub async fn get_event_messages(&self, query: Query, historical: bool) -> Result { + pub async fn get_event_messages( + &self, + query: Query, + historical: bool, + ) -> Result { #[cfg(feature = "console-error-panic")] console_error_panic_hook::set_once(); @@ -555,7 +559,9 @@ impl ToriiClient { let max_backoff = 60000; loop { - if let Ok(stream) = client.on_event_message_updated(clauses.clone(), historical).await { + if let Ok(stream) = + client.on_event_message_updated(clauses.clone(), historical).await + { backoff = 1000; // Reset backoff on successful connection let mut stream = stream.take_until_if(tripwire.clone()); @@ -594,7 +600,11 @@ impl ToriiClient { ) -> Result<(), JsValue> { let clauses = clauses.iter().map(|c| c.into()).collect(); self.inner - .update_event_message_subscription(subscription.id.load(Ordering::SeqCst), clauses, historical) + .update_event_message_subscription( + subscription.id.load(Ordering::SeqCst), + clauses, + historical, + ) .await .map_err(|err| JsValue::from(format!("failed to update subscription: {err}"))) } From 83560a03d2eaed371c7b97911ce8ed959f63cbaf Mon Sep 17 00:00:00 2001 From: Nasr Date: Thu, 31 Oct 2024 16:17:17 -0400 Subject: [PATCH 4/5] idx modesl for multiple names --- src/wasm/types.rs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/wasm/types.rs b/src/wasm/types.rs index 7a88a02..a616da4 100644 --- a/src/wasm/types.rs +++ b/src/wasm/types.rs @@ -124,7 +124,17 @@ pub struct Entity(pub HashMap); impl From<&torii_grpc::types::schema::Entity> for Entity { fn from(value: &torii_grpc::types::schema::Entity) -> Self { - Self(value.models.iter().map(|m| (m.name.clone(), m.into())).collect()) + let mut seen_models = HashMap::new(); + Self(value.models.iter().map(|m| { + let count = seen_models.entry(m.name.clone()).or_insert(0); + let name = if *count == 0 { + m.name.clone() + } else { + format!("{}-{}", m.name, count) + }; + *count += 1; + (name, m.into()) + }).collect()) } } From 6dbd658ec95cb174698967b5fc663635b307b8e0 Mon Sep 17 00:00:00 2001 From: Nasr Date: Fri, 1 Nov 2024 09:52:22 -0400 Subject: [PATCH 5/5] fmt --- src/wasm/types.rs | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/wasm/types.rs b/src/wasm/types.rs index a616da4..575efd4 100644 --- a/src/wasm/types.rs +++ b/src/wasm/types.rs @@ -125,16 +125,19 @@ pub struct Entity(pub HashMap); impl From<&torii_grpc::types::schema::Entity> for Entity { fn from(value: &torii_grpc::types::schema::Entity) -> Self { let mut seen_models = HashMap::new(); - Self(value.models.iter().map(|m| { - let count = seen_models.entry(m.name.clone()).or_insert(0); - let name = if *count == 0 { - m.name.clone() - } else { - format!("{}-{}", m.name, count) - }; - *count += 1; - (name, m.into()) - }).collect()) + Self( + value + .models + .iter() + .map(|m| { + let count = seen_models.entry(m.name.clone()).or_insert(0); + let name = + if *count == 0 { m.name.clone() } else { format!("{}-{}", m.name, count) }; + *count += 1; + (name, m.into()) + }) + .collect(), + ) } }