From 465ecf60d7e9c18574ed671c2ecf5b17d8ca31c4 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Wed, 30 Apr 2025 09:24:07 -0700 Subject: [PATCH 01/41] update bs58 --- Cargo.lock | 47 ++++++++++++++++++++++------------------------- Cargo.toml | 2 +- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cdfaf88fe..1ec5e60b3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -149,7 +149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f2a3e1df4685f18d12a943a9f2a7456305401af21a07c9fe076ef9ecd6e400" dependencies = [ "anchor-syn 0.29.0", - "bs58 0.5.0", + "bs58 0.5.1", "proc-macro2", "quote", "syn 1.0.109", @@ -162,7 +162,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c288d496168268d198d9b53ee9f4f9d260a55ba4df9877ea1d4486ad6109e0f" dependencies = [ "anchor-syn 0.30.1", - "bs58 0.5.0", + "bs58 0.5.1", "proc-macro2", "quote", "syn 1.0.109", @@ -256,7 +256,7 @@ dependencies = [ "anchor-lang-idl", "anchor-syn 0.30.1", "anyhow", - "bs58 0.5.0", + "bs58 0.5.1", "heck 0.3.3", "proc-macro2", "quote", @@ -508,7 +508,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9101b84702fed2ea57bd22992f75065da5648017135b844283a2f6d74f27825" dependencies = [ "anyhow", - "bs58 0.5.0", + "bs58 0.5.1", "heck 0.3.3", "proc-macro2", "quote", @@ -526,7 +526,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f99daacb53b55cfd37ce14d6c9905929721137fd4c67bbab44a19802aecb622f" dependencies = [ "anyhow", - "bs58 0.5.0", + "bs58 0.5.1", "heck 0.3.3", "proc-macro2", "quote", @@ -1617,11 +1617,11 @@ dependencies = [ "byteorder", "helium-proto", "prost", - "rand 0.7.3", - "rand_chacha 0.2.2", + "rand 0.8.5", + "rand_chacha 0.3.0", "rust_decimal", "serde", - "sha2 0.9.9", + "sha2 0.10.8", "thiserror", ] @@ -1775,7 +1775,7 @@ dependencies = [ "async-trait", "axum 0.7.4", "base64 0.21.7", - "bs58 0.4.0", + "bs58 0.5.1", "chrono", "clap 4.4.8", "config", @@ -1961,15 +1961,12 @@ name = "bs58" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" -dependencies = [ - "sha2 0.9.9", -] [[package]] name = "bs58" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" dependencies = [ "sha2 0.10.8", "tinyvec", @@ -2624,7 +2621,7 @@ version = "0.1.0" dependencies = [ "anyhow", "axum 0.7.4", - "bs58 0.4.0", + "bs58 0.5.1", "helium-crypto", "helium-proto", "http 0.2.11", @@ -3747,10 +3744,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3ea5347e981a2d16f06b51d04361a2562cd89b806d765293522f61c5de0ec49" dependencies = [ "base64 0.21.7", - "bs58 0.5.0", + "bs58 0.5.1", "byteorder", "ed25519-compact", - "getrandom 0.1.16", + "getrandom 0.2.10", "k256", "lazy_static", "multihash", @@ -4278,7 +4275,7 @@ dependencies = [ "anyhow", "backon", "base64 0.21.7", - "bs58 0.4.0", + "bs58 0.5.1", "chrono", "clap 4.4.8", "config", @@ -4347,7 +4344,7 @@ dependencies = [ "async-trait", "backon", "base64 0.21.7", - "bs58 0.4.0", + "bs58 0.5.1", "chrono", "clap 4.4.8", "config", @@ -5023,7 +5020,7 @@ dependencies = [ "async-trait", "base64 0.21.7", "blake3", - "bs58 0.4.0", + "bs58 0.5.1", "chrono", "clap 4.4.8", "config", @@ -5527,7 +5524,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 2.0.58", @@ -5834,7 +5831,7 @@ dependencies = [ "anyhow", "base64 0.21.7", "blake3", - "bs58 0.5.0", + "bs58 0.4.0", "chrono", "clap 4.4.8", "config", @@ -6067,7 +6064,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1" dependencies = [ "bytes", - "heck 0.4.0", + "heck 0.5.0", "itertools", "log", "multimap", @@ -6555,7 +6552,7 @@ dependencies = [ "anyhow", "async-trait", "base64 0.21.7", - "bs58 0.4.0", + "bs58 0.5.1", "chrono", "clap 4.4.8", "config", @@ -9323,7 +9320,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "rand 0.7.3", + "rand 0.8.5", "static_assertions", ] diff --git a/Cargo.toml b/Cargo.toml index 259ec8fd2..ec12e088e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,7 +37,7 @@ edition = "2021" [workspace.dependencies] anchor-client = { version = "0.29.0", features = ["async"] } anyhow = { version = "1", features = ["backtrace"] } -bs58 = { version = "0.4", features = ["check"] } +bs58 = { version = "0.5.1", features = ["check"] } thiserror = "1" clap = { version = "4", features = ["derive"] } serde = { version = "1", features = ["derive"] } From 855317ab9b22a5d9458d28214cae759c00afa8ea Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Wed, 30 Apr 2025 09:27:11 -0700 Subject: [PATCH 02/41] anchor-client and helium-anchor-gen to solana workspace --- Cargo.lock | 2 +- Cargo.toml | 2 -- price/Cargo.toml | 3 ++- price/src/cli/check.rs | 2 +- solana/Cargo.toml | 39 ++++++++++++++++++++------------------- solana/src/lib.rs | 2 ++ 6 files changed, 26 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1ec5e60b3..c6d9de22c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5921,7 +5921,6 @@ dependencies = [ "file-store", "futures", "futures-util", - "helium-anchor-gen", "helium-lib", "helium-proto", "humantime-serde", @@ -5933,6 +5932,7 @@ dependencies = [ "rust_decimal_macros", "serde", "serde_json", + "solana", "solana-client", "solana-sdk", "task-manager", diff --git a/Cargo.toml b/Cargo.toml index ec12e088e..38a36e9d4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,6 @@ license = "Apache-2.0" edition = "2021" [workspace.dependencies] -anchor-client = { version = "0.29.0", features = ["async"] } anyhow = { version = "1", features = ["backtrace"] } bs58 = { version = "0.5.1", features = ["check"] } thiserror = "1" @@ -64,7 +63,6 @@ sqlx = { version = "0", features = [ "macros", "runtime-tokio-rustls", ] } -helium-anchor-gen = { git = "https://github.com/helium/helium-anchor-gen.git" } helium-crypto = { version = "0.8.4", features = ["multisig"] } helium-lib = { git = "https://github.com/helium/helium-wallet-rs.git", branch = "master" } hextree = { git = "https://github.com/jaykickliter/HexTree", branch = "main", features = [ diff --git a/price/Cargo.toml b/price/Cargo.toml index 9e5de5bfe..1cf2dad6e 100644 --- a/price/Cargo.toml +++ b/price/Cargo.toml @@ -23,7 +23,6 @@ metrics-exporter-prometheus = { workspace = true } tokio = { workspace = true } tokio-util = { workspace = true } chrono = { workspace = true } -helium-anchor-gen = { workspace = true } helium-lib = { workspace = true } helium-proto = { workspace = true } file-store = { path = "../file_store" } @@ -36,3 +35,5 @@ solana-sdk = { workspace = true } task-manager = { path = "../task_manager" } humantime-serde = { workspace = true } custom-tracing = { path = "../custom_tracing" } + +solana = { path = "../solana" } diff --git a/price/src/cli/check.rs b/price/src/cli/check.rs index 24fa8a558..c9a385aea 100644 --- a/price/src/cli/check.rs +++ b/price/src/cli/check.rs @@ -1,6 +1,6 @@ use anyhow::Result; use chrono::{DateTime, TimeZone, Utc}; -use helium_anchor_gen::{anchor_lang::AccountDeserialize, price_oracle::PriceOracleV0}; +use solana::helium_anchor_gen::{anchor_lang::AccountDeserialize, price_oracle::PriceOracleV0}; use solana_client::nonblocking::rpc_client::RpcClient; use solana_sdk::pubkey::Pubkey as SolPubkey; use std::str::FromStr; diff --git a/solana/Cargo.toml b/solana/Cargo.toml index b63b87618..a6b841bef 100644 --- a/solana/Cargo.toml +++ b/solana/Cargo.toml @@ -8,22 +8,23 @@ license.workspace = true [dependencies] anyhow = { workspace = true } -async-trait = {workspace = true} -anchor-client = { workspace = true } -clap = {workspace = true} -chrono = {workspace = true} -file-store = {path = "../file_store"} -futures = {workspace = true} -helium-anchor-gen = {workspace = true} -helium-crypto = {workspace = true} -itertools = {workspace = true} -metrics = {workspace = true} -serde = {workspace = true} -sha2 = {workspace = true} -solana-client = {workspace = true} -solana-program = {workspace = true} -solana-sdk = {workspace = true} -spl-token = {workspace = true} -thiserror = {workspace = true} -tokio = {workspace = true} -tracing = {workspace = true} +async-trait = { workspace = true } +clap = { workspace = true } +chrono = { workspace = true } +file-store = { path = "../file_store" } +futures = { workspace = true } +helium-crypto = { workspace = true } +itertools = { workspace = true } +metrics = { workspace = true } +serde = { workspace = true } +sha2 = { workspace = true } +solana-client = { workspace = true } +solana-program = { workspace = true } +solana-sdk = { workspace = true } +spl-token = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true } +tracing = { workspace = true } + +anchor-client = { version = "0.29.0", features = ["async"] } +helium-anchor-gen = { git = "https://github.com/helium/helium-anchor-gen.git" } diff --git a/solana/src/lib.rs b/solana/src/lib.rs index 35964bb99..370ead59e 100644 --- a/solana/src/lib.rs +++ b/solana/src/lib.rs @@ -5,6 +5,8 @@ use std::time::SystemTimeError; pub use solana_sdk::signature::Signature; +pub use helium_anchor_gen; + pub mod burn; pub mod carrier; pub mod start_boost; From 94944db74c68d7122bfad14d5f968756fb767707 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Wed, 30 Apr 2025 09:29:07 -0700 Subject: [PATCH 03/41] solana-client to solana workspace --- Cargo.lock | 1 - Cargo.toml | 1 - price/Cargo.toml | 1 - price/src/cli/check.rs | 6 ++++-- price/src/price_generator.rs | 2 +- solana/Cargo.toml | 2 +- solana/src/lib.rs | 5 ++++- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c6d9de22c..0dcc0c2f2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5933,7 +5933,6 @@ dependencies = [ "serde", "serde_json", "solana", - "solana-client", "solana-sdk", "task-manager", "thiserror", diff --git a/Cargo.toml b/Cargo.toml index 38a36e9d4..c388becf6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,7 +72,6 @@ helium-proto = { git = "https://github.com/helium/proto", branch = "master", fea "services", ] } beacon = { git = "https://github.com/helium/proto", branch = "master" } -solana-client = "1.18" solana-sdk = "1.18" solana-program = "1.18" spl-token = "3.5.0" diff --git a/price/Cargo.toml b/price/Cargo.toml index 1cf2dad6e..fb180cb4a 100644 --- a/price/Cargo.toml +++ b/price/Cargo.toml @@ -30,7 +30,6 @@ poc-metrics = { path = "../metrics" } rust_decimal = { workspace = true } rust_decimal_macros = { workspace = true } triggered = { workspace = true } -solana-client = { workspace = true } solana-sdk = { workspace = true } task-manager = { path = "../task_manager" } humantime-serde = { workspace = true } diff --git a/price/src/cli/check.rs b/price/src/cli/check.rs index c9a385aea..4d0d54d48 100644 --- a/price/src/cli/check.rs +++ b/price/src/cli/check.rs @@ -1,7 +1,9 @@ use anyhow::Result; use chrono::{DateTime, TimeZone, Utc}; -use solana::helium_anchor_gen::{anchor_lang::AccountDeserialize, price_oracle::PriceOracleV0}; -use solana_client::nonblocking::rpc_client::RpcClient; +use solana::re::{ + helium_anchor_gen::{anchor_lang::AccountDeserialize, price_oracle::PriceOracleV0}, + solana_client::nonblocking::rpc_client::RpcClient, +}; use solana_sdk::pubkey::Pubkey as SolPubkey; use std::str::FromStr; diff --git a/price/src/price_generator.rs b/price/src/price_generator.rs index db129a341..075dd07ac 100644 --- a/price/src/price_generator.rs +++ b/price/src/price_generator.rs @@ -7,7 +7,7 @@ use helium_lib::token::Token; use helium_proto::{BlockchainTokenTypeV1, PriceReportV1}; use rust_decimal::Decimal; use serde::{Deserialize, Serialize}; -use solana_client::nonblocking::rpc_client::RpcClient; +use solana::re::solana_client::nonblocking::rpc_client::RpcClient; use std::{path::PathBuf, str::FromStr, time::Duration}; use task_manager::ManagedTask; use tokio::{fs, time}; diff --git a/solana/Cargo.toml b/solana/Cargo.toml index a6b841bef..8c197be03 100644 --- a/solana/Cargo.toml +++ b/solana/Cargo.toml @@ -18,7 +18,6 @@ itertools = { workspace = true } metrics = { workspace = true } serde = { workspace = true } sha2 = { workspace = true } -solana-client = { workspace = true } solana-program = { workspace = true } solana-sdk = { workspace = true } spl-token = { workspace = true } @@ -28,3 +27,4 @@ tracing = { workspace = true } anchor-client = { version = "0.29.0", features = ["async"] } helium-anchor-gen = { git = "https://github.com/helium/helium-anchor-gen.git" } +solana-client = "1.18" diff --git a/solana/src/lib.rs b/solana/src/lib.rs index 370ead59e..0caaf44a2 100644 --- a/solana/src/lib.rs +++ b/solana/src/lib.rs @@ -5,7 +5,10 @@ use std::time::SystemTimeError; pub use solana_sdk::signature::Signature; -pub use helium_anchor_gen; +pub mod re { + pub use helium_anchor_gen; + pub use solana_client; +} pub mod burn; pub mod carrier; From 45c82afad07d41660b80e47ddeed735007b894d8 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Wed, 30 Apr 2025 09:35:48 -0700 Subject: [PATCH 04/41] solana-sdk to solana workspace --- Cargo.lock | 7 ++----- Cargo.toml | 1 - boost_manager/Cargo.toml | 1 - boost_manager/tests/integrations/activator_tests.rs | 2 +- boost_manager/tests/integrations/updater_tests.rs | 2 +- boost_manager/tests/integrations/watcher_tests.rs | 2 +- iot_packet_verifier/Cargo.toml | 1 - iot_packet_verifier/src/pending.rs | 3 +-- mobile_config/Cargo.toml | 2 +- mobile_config/src/boosted_hex_info.rs | 4 ++-- mobile_verifier/Cargo.toml | 2 +- mobile_verifier/tests/integrations/hex_boosting.rs | 2 +- mobile_verifier/tests/integrations/modeled_coverage.rs | 2 +- price/Cargo.toml | 1 - price/src/cli/check.rs | 2 +- solana/Cargo.toml | 2 +- solana/src/lib.rs | 1 + 17 files changed, 15 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0dcc0c2f2..0a67d485b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1803,7 +1803,6 @@ dependencies = [ "serde_json", "sha2 0.10.8", "solana", - "solana-sdk", "sqlx", "task-manager", "thiserror", @@ -4409,7 +4408,6 @@ dependencies = [ "prost", "serde", "solana", - "solana-sdk", "sqlx", "task-manager", "thiserror", @@ -5048,7 +5046,7 @@ dependencies = [ "rust_decimal_macros", "serde", "serde_json", - "solana-sdk", + "solana", "sqlx", "task-manager", "thiserror", @@ -5180,7 +5178,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "solana-sdk", + "solana", "sqlx", "task-manager", "thiserror", @@ -5933,7 +5931,6 @@ dependencies = [ "serde", "serde_json", "solana", - "solana-sdk", "task-manager", "thiserror", "tokio", diff --git a/Cargo.toml b/Cargo.toml index c388becf6..179ccbcdb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,7 +72,6 @@ helium-proto = { git = "https://github.com/helium/proto", branch = "master", fea "services", ] } beacon = { git = "https://github.com/helium/proto", branch = "master" } -solana-sdk = "1.18" solana-program = "1.18" spl-token = "3.5.0" reqwest = { version = "0", default-features = false, features = [ diff --git a/boost_manager/Cargo.toml b/boost_manager/Cargo.toml index 91f5ae1e6..f07dabc1f 100644 --- a/boost_manager/Cargo.toml +++ b/boost_manager/Cargo.toml @@ -46,7 +46,6 @@ task-manager = { path = "../task_manager" } http = { workspace = true } http-serde = { workspace = true } solana = { path = "../solana" } -solana-sdk = { workspace = true } humantime-serde = { workspace = true } custom-tracing = { path = "../custom_tracing" } hextree = { workspace = true } diff --git a/boost_manager/tests/integrations/activator_tests.rs b/boost_manager/tests/integrations/activator_tests.rs index ba83fe684..3fee49916 100644 --- a/boost_manager/tests/integrations/activator_tests.rs +++ b/boost_manager/tests/integrations/activator_tests.rs @@ -1,7 +1,7 @@ use boost_manager::{activator, db, OnChainStatus}; use chrono::{DateTime, Duration as ChronoDuration, Duration, Timelike, Utc}; use mobile_config::boosted_hex_info::{BoostedHexInfo, BoostedHexes}; -use solana_sdk::pubkey::Pubkey; +use solana::re::solana_sdk::pubkey::Pubkey; use sqlx::PgPool; use std::{collections::HashMap, num::NonZeroU32, str::FromStr}; diff --git a/boost_manager/tests/integrations/updater_tests.rs b/boost_manager/tests/integrations/updater_tests.rs index cc47c7b73..eafe43f7d 100644 --- a/boost_manager/tests/integrations/updater_tests.rs +++ b/boost_manager/tests/integrations/updater_tests.rs @@ -2,8 +2,8 @@ use async_trait::async_trait; use boost_manager::{db, updater::Updater, OnChainStatus}; use chrono::{DateTime, Utc}; use file_store::hex_boost::BoostedHexActivation; +use solana::re::solana_sdk::signature::Signature; use solana::{start_boost::SolanaNetwork, GetSignature, SolanaRpcError}; -use solana_sdk::signature::Signature; use sqlx::{PgPool, Postgres, Transaction}; use std::{string::ToString, sync::Mutex, time::Duration}; diff --git a/boost_manager/tests/integrations/watcher_tests.rs b/boost_manager/tests/integrations/watcher_tests.rs index 64f42c0a4..e48ece2e1 100644 --- a/boost_manager/tests/integrations/watcher_tests.rs +++ b/boost_manager/tests/integrations/watcher_tests.rs @@ -3,7 +3,7 @@ use boost_manager::watcher::{self, Watcher}; use chrono::{Duration as ChronoDuration, Duration, Utc}; use helium_proto::BoostedHexInfoV1 as BoostedHexInfoProto; use mobile_config::boosted_hex_info::BoostedHexInfo; -use solana_sdk::pubkey::Pubkey; +use solana::re::solana_sdk::pubkey::Pubkey; use sqlx::PgPool; use std::{num::NonZeroU32, str::FromStr}; diff --git a/iot_packet_verifier/Cargo.toml b/iot_packet_verifier/Cargo.toml index 8839d09a6..3351eb533 100644 --- a/iot_packet_verifier/Cargo.toml +++ b/iot_packet_verifier/Cargo.toml @@ -29,7 +29,6 @@ prost = { workspace = true } serde = { workspace = true } sqlx = { workspace = true } solana = { path = "../solana" } -solana-sdk = { workspace = true } task-manager = { path = "../task_manager" } thiserror = { workspace = true } tokio = { workspace = true } diff --git a/iot_packet_verifier/src/pending.rs b/iot_packet_verifier/src/pending.rs index 83a0418ef..bb991e473 100644 --- a/iot_packet_verifier/src/pending.rs +++ b/iot_packet_verifier/src/pending.rs @@ -1,8 +1,7 @@ use async_trait::async_trait; use chrono::{DateTime, Duration, Utc}; use helium_crypto::PublicKeyBinary; -use solana::{burn::SolanaNetwork, SolanaRpcError}; -use solana_sdk::signature::Signature; +use solana::{burn::SolanaNetwork, re::solana_sdk::signature::Signature, SolanaRpcError}; use sqlx::{postgres::PgRow, FromRow, PgPool, Postgres, Row, Transaction}; use std::{collections::HashMap, sync::Arc}; use tokio::sync::Mutex; diff --git a/mobile_config/Cargo.toml b/mobile_config/Cargo.toml index ae323e008..e8dca56f1 100644 --- a/mobile_config/Cargo.toml +++ b/mobile_config/Cargo.toml @@ -47,9 +47,9 @@ tracing = { workspace = true } tracing-subscriber = { workspace = true } triggered = { workspace = true } task-manager = { path = "../task_manager" } -solana-sdk = { workspace = true } custom-tracing = { path = "../custom_tracing", features = ["grpc"] } coverage-map = { path = "../coverage_map" } +solana = { path = "../solana" } [dev-dependencies] rand = { workspace = true } diff --git a/mobile_config/src/boosted_hex_info.rs b/mobile_config/src/boosted_hex_info.rs index 1f5201364..7980a7443 100644 --- a/mobile_config/src/boosted_hex_info.rs +++ b/mobile_config/src/boosted_hex_info.rs @@ -4,7 +4,7 @@ use file_store::traits::TimestampDecode; use futures::stream::{BoxStream, StreamExt}; use helium_proto::BoostedHexInfoV1 as BoostedHexInfoProto; use hextree::Cell; -use solana_sdk::pubkey::Pubkey; +use solana::re::solana_sdk::pubkey::Pubkey; use std::{collections::HashMap, convert::TryFrom, num::NonZeroU32}; pub type BoostedHexInfoStream = BoxStream<'static, BoostedHexInfo>; @@ -172,7 +172,7 @@ pub(crate) mod db { use chrono::{DateTime, Duration, Utc}; use futures::stream::{Stream, StreamExt}; use hextree::Cell; - use solana_sdk::pubkey::Pubkey; + use solana::re::solana_sdk::pubkey::Pubkey; use sqlx::{PgExecutor, Row}; use std::num::NonZeroU32; use std::str::FromStr; diff --git a/mobile_verifier/Cargo.toml b/mobile_verifier/Cargo.toml index 5e4a6585d..1a6e77ff3 100644 --- a/mobile_verifier/Cargo.toml +++ b/mobile_verifier/Cargo.toml @@ -53,7 +53,6 @@ async-trait = { workspace = true } retainer = { workspace = true } uuid = { workspace = true } task-manager = { path = "../task_manager" } -solana-sdk = { workspace = true } derive_builder = { workspace = true } regex = "1" humantime-serde = { workspace = true } @@ -64,3 +63,4 @@ coverage-map = { path = "../coverage_map" } [dev-dependencies] proptest = "1.5.0" +solana = { path = "../solana" } diff --git a/mobile_verifier/tests/integrations/hex_boosting.rs b/mobile_verifier/tests/integrations/hex_boosting.rs index 78ca9a4a4..93b5724c9 100644 --- a/mobile_verifier/tests/integrations/hex_boosting.rs +++ b/mobile_verifier/tests/integrations/hex_boosting.rs @@ -23,7 +23,7 @@ use mobile_verifier::{ }; use rust_decimal::prelude::*; use rust_decimal_macros::dec; -use solana_sdk::pubkey::Pubkey; +use solana::re::solana_sdk::pubkey::Pubkey; use sqlx::{PgPool, Postgres, Transaction}; use std::{num::NonZeroU32, str::FromStr}; use uuid::Uuid; diff --git a/mobile_verifier/tests/integrations/modeled_coverage.rs b/mobile_verifier/tests/integrations/modeled_coverage.rs index 8466b1aab..baa8bd232 100644 --- a/mobile_verifier/tests/integrations/modeled_coverage.rs +++ b/mobile_verifier/tests/integrations/modeled_coverage.rs @@ -34,7 +34,7 @@ use mobile_verifier::{ IsAuthorized, }; use rust_decimal_macros::dec; -use solana_sdk::pubkey::Pubkey; +use solana::re::solana_sdk::pubkey::Pubkey; use sqlx::PgPool; use std::{collections::HashMap, num::NonZeroU32, ops::Range, pin::pin, str::FromStr}; use uuid::Uuid; diff --git a/price/Cargo.toml b/price/Cargo.toml index fb180cb4a..025d6341d 100644 --- a/price/Cargo.toml +++ b/price/Cargo.toml @@ -30,7 +30,6 @@ poc-metrics = { path = "../metrics" } rust_decimal = { workspace = true } rust_decimal_macros = { workspace = true } triggered = { workspace = true } -solana-sdk = { workspace = true } task-manager = { path = "../task_manager" } humantime-serde = { workspace = true } custom-tracing = { path = "../custom_tracing" } diff --git a/price/src/cli/check.rs b/price/src/cli/check.rs index 4d0d54d48..c3cac1f7f 100644 --- a/price/src/cli/check.rs +++ b/price/src/cli/check.rs @@ -3,8 +3,8 @@ use chrono::{DateTime, TimeZone, Utc}; use solana::re::{ helium_anchor_gen::{anchor_lang::AccountDeserialize, price_oracle::PriceOracleV0}, solana_client::nonblocking::rpc_client::RpcClient, + solana_sdk::pubkey::Pubkey as SolPubkey, }; -use solana_sdk::pubkey::Pubkey as SolPubkey; use std::str::FromStr; const SECONDS_PER_DAY: i64 = 24 * 60 * 60; diff --git a/solana/Cargo.toml b/solana/Cargo.toml index 8c197be03..4658538a1 100644 --- a/solana/Cargo.toml +++ b/solana/Cargo.toml @@ -19,7 +19,6 @@ metrics = { workspace = true } serde = { workspace = true } sha2 = { workspace = true } solana-program = { workspace = true } -solana-sdk = { workspace = true } spl-token = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true } @@ -28,3 +27,4 @@ tracing = { workspace = true } anchor-client = { version = "0.29.0", features = ["async"] } helium-anchor-gen = { git = "https://github.com/helium/helium-anchor-gen.git" } solana-client = "1.18" +solana-sdk = "1.18" diff --git a/solana/src/lib.rs b/solana/src/lib.rs index 0caaf44a2..b97979f1b 100644 --- a/solana/src/lib.rs +++ b/solana/src/lib.rs @@ -8,6 +8,7 @@ pub use solana_sdk::signature::Signature; pub mod re { pub use helium_anchor_gen; pub use solana_client; + pub use solana_sdk; } pub mod burn; From 13442d8588e117a1209faf2ca6dc53bfca1c71c2 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Wed, 30 Apr 2025 09:37:44 -0700 Subject: [PATCH 05/41] solana-program to solana workspace --- Cargo.toml | 1 - solana/Cargo.toml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 179ccbcdb..d37707c0e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,7 +72,6 @@ helium-proto = { git = "https://github.com/helium/proto", branch = "master", fea "services", ] } beacon = { git = "https://github.com/helium/proto", branch = "master" } -solana-program = "1.18" spl-token = "3.5.0" reqwest = { version = "0", default-features = false, features = [ "gzip", diff --git a/solana/Cargo.toml b/solana/Cargo.toml index 4658538a1..34d1214cb 100644 --- a/solana/Cargo.toml +++ b/solana/Cargo.toml @@ -18,7 +18,6 @@ itertools = { workspace = true } metrics = { workspace = true } serde = { workspace = true } sha2 = { workspace = true } -solana-program = { workspace = true } spl-token = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true } @@ -28,3 +27,4 @@ anchor-client = { version = "0.29.0", features = ["async"] } helium-anchor-gen = { git = "https://github.com/helium/helium-anchor-gen.git" } solana-client = "1.18" solana-sdk = "1.18" +solana-program = "1.18" From e177e8770d852efb2cd9fec3ab74d0b88420a46a Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Wed, 30 Apr 2025 09:40:37 -0700 Subject: [PATCH 06/41] spl-token to solana workspace --- Cargo.toml | 1 - solana/Cargo.toml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d37707c0e..1178fdb69 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,7 +72,6 @@ helium-proto = { git = "https://github.com/helium/proto", branch = "master", fea "services", ] } beacon = { git = "https://github.com/helium/proto", branch = "master" } -spl-token = "3.5.0" reqwest = { version = "0", default-features = false, features = [ "gzip", "json", diff --git a/solana/Cargo.toml b/solana/Cargo.toml index 34d1214cb..78f48f542 100644 --- a/solana/Cargo.toml +++ b/solana/Cargo.toml @@ -18,7 +18,6 @@ itertools = { workspace = true } metrics = { workspace = true } serde = { workspace = true } sha2 = { workspace = true } -spl-token = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true } tracing = { workspace = true } @@ -28,3 +27,4 @@ helium-anchor-gen = { git = "https://github.com/helium/helium-anchor-gen.git" } solana-client = "1.18" solana-sdk = "1.18" solana-program = "1.18" +spl-token = "3.5.0" From 2856a644c0789cf204b86a4936b85acc64105eee Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Wed, 30 Apr 2025 09:50:27 -0700 Subject: [PATCH 07/41] helium-lib to solana workspace --- Cargo.lock | 7 +++---- Cargo.toml | 1 - iot_config/Cargo.toml | 2 +- iot_verifier/Cargo.toml | 2 +- iot_verifier/src/lib.rs | 4 ++-- iot_verifier/src/reward_share.rs | 2 +- iot_verifier/src/rewarder.rs | 2 +- iot_verifier/tests/integrations/common/mod.rs | 2 +- mobile_verifier/Cargo.toml | 3 +-- mobile_verifier/src/lib.rs | 4 ++-- mobile_verifier/src/reward_shares.rs | 2 +- mobile_verifier/src/rewarder.rs | 3 +-- mobile_verifier/tests/integrations/common/mod.rs | 2 +- price/Cargo.toml | 1 - price/src/metrics.rs | 2 +- price/src/price_generator.rs | 5 ++--- price/src/settings.rs | 2 +- solana/Cargo.toml | 1 + solana/src/lib.rs | 1 + 19 files changed, 22 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0a67d485b..f6cd36a2d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4353,7 +4353,6 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-lib", "helium-proto", "hextree", "http 0.2.11", @@ -4370,6 +4369,7 @@ dependencies = [ "rust_decimal_macros", "serde", "serde_json", + "solana", "sqlx", "task-manager", "thiserror", @@ -4439,7 +4439,6 @@ dependencies = [ "futures-util", "h3o", "helium-crypto", - "helium-lib", "helium-proto", "http-serde", "humantime-serde", @@ -4459,6 +4458,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", + "solana", "sqlx", "task-manager", "thiserror", @@ -5153,7 +5153,6 @@ dependencies = [ "futures-util", "h3o", "helium-crypto", - "helium-lib", "helium-proto", "hex-assignments", "hextree", @@ -5919,7 +5918,6 @@ dependencies = [ "file-store", "futures", "futures-util", - "helium-lib", "helium-proto", "humantime-serde", "metrics", @@ -7320,6 +7318,7 @@ dependencies = [ "futures", "helium-anchor-gen", "helium-crypto", + "helium-lib", "itertools", "metrics", "serde", diff --git a/Cargo.toml b/Cargo.toml index 1178fdb69..52688d3e6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,7 +64,6 @@ sqlx = { version = "0", features = [ "runtime-tokio-rustls", ] } helium-crypto = { version = "0.8.4", features = ["multisig"] } -helium-lib = { git = "https://github.com/helium/helium-wallet-rs.git", branch = "master" } hextree = { git = "https://github.com/jaykickliter/HexTree", branch = "main", features = [ "disktree", ] } diff --git a/iot_config/Cargo.toml b/iot_config/Cargo.toml index a16da50c9..bb78a73b3 100644 --- a/iot_config/Cargo.toml +++ b/iot_config/Cargo.toml @@ -21,7 +21,6 @@ file-store = { path = "../file_store" } futures = { workspace = true } futures-util = { workspace = true } helium-crypto = { workspace = true, features = ["sqlx-postgres"] } -helium-lib = { workspace = true } helium-proto = { workspace = true } hextree = { workspace = true } http = { workspace = true } @@ -47,6 +46,7 @@ triggered = { workspace = true } task-manager = { path = "../task_manager" } humantime-serde = { workspace = true } custom-tracing = { path = "../custom_tracing", features = ["grpc"] } +solana = { path = "../solana" } [dev-dependencies] rand = { workspace = true } diff --git a/iot_verifier/Cargo.toml b/iot_verifier/Cargo.toml index 716140a1a..d0b429826 100644 --- a/iot_verifier/Cargo.toml +++ b/iot_verifier/Cargo.toml @@ -29,7 +29,6 @@ futures = { workspace = true } futures-util = { workspace = true } prost = { workspace = true } chrono = { workspace = true } -helium-lib = { workspace = true } helium-proto = { workspace = true } helium-crypto = { workspace = true, features = ["sqlx-postgres"] } async-trait = { workspace = true } @@ -58,3 +57,4 @@ tokio-stream = { workspace = true } task-manager = { path = "../task_manager" } humantime-serde = { workspace = true } custom-tracing = { path = "../custom_tracing" } +solana = { path = "../solana" } diff --git a/iot_verifier/src/lib.rs b/iot_verifier/src/lib.rs index 48c44261c..9a3f85624 100644 --- a/iot_verifier/src/lib.rs +++ b/iot_verifier/src/lib.rs @@ -21,9 +21,9 @@ pub mod telemetry; pub mod tx_scaler; pub mod witness_updater; -use helium_lib::keypair::Pubkey; use rust_decimal::Decimal; pub use settings::Settings; +use solana::re::helium_lib::keypair::Pubkey; #[derive(Clone, Debug)] pub struct PriceInfo { @@ -48,5 +48,5 @@ impl PriceInfo { } pub fn resolve_subdao_pubkey() -> Pubkey { - helium_lib::dao::SubDao::Iot.key() + solana::re::helium_lib::dao::SubDao::Iot.key() } diff --git a/iot_verifier/src/reward_share.rs b/iot_verifier/src/reward_share.rs index 06b6aeb24..4aeddb543 100644 --- a/iot_verifier/src/reward_share.rs +++ b/iot_verifier/src/reward_share.rs @@ -435,8 +435,8 @@ mod test { use super::*; use crate::{reward_share, PriceInfo}; use chrono::Duration; - use helium_lib::token::Token; use iot_config::sub_dao_epoch_reward_info::EpochRewardInfo; + use solana::re::helium_lib::token::Token; pub const EPOCH_ADDRESS: &str = "112E7TxoNHV46M6tiPA8N1MkeMeQxc9ztb4JQLXBVAAUfq1kJLoF"; pub const SUB_DAO_ADDRESS: &str = "112NqN2WWMwtK29PMzRby62fDydBJfsCLkCAf392stdok48ovNT6"; diff --git a/iot_verifier/src/rewarder.rs b/iot_verifier/src/rewarder.rs index 8c1e30a66..de59cf8e9 100644 --- a/iot_verifier/src/rewarder.rs +++ b/iot_verifier/src/rewarder.rs @@ -7,7 +7,6 @@ use chrono::{DateTime, TimeZone, Utc}; use db_store::meta; use file_store::{file_sink, traits::TimestampEncode}; use futures::future::LocalBoxFuture; -use helium_lib::{keypair::Pubkey, token::Token}; use helium_proto::{ reward_manifest::RewardData::IotRewardData, services::poc_lora::{ @@ -26,6 +25,7 @@ use price::PriceTracker; use reward_scheduler::Scheduler; use rust_decimal::prelude::*; use rust_decimal_macros::dec; +use solana::re::helium_lib::{keypair::Pubkey, token::Token}; use sqlx::{PgExecutor, PgPool, Pool, Postgres}; use std::{ops::Range, time::Duration}; use task_manager::ManagedTask; diff --git a/iot_verifier/tests/integrations/common/mod.rs b/iot_verifier/tests/integrations/common/mod.rs index e842df4c8..78dc00688 100644 --- a/iot_verifier/tests/integrations/common/mod.rs +++ b/iot_verifier/tests/integrations/common/mod.rs @@ -27,11 +27,11 @@ use iot_verifier::{ PriceInfo, }; -use helium_lib::token::Token; use iot_config::sub_dao_epoch_reward_info::EpochRewardInfo; use prost::Message; use rust_decimal::Decimal; use rust_decimal_macros::dec; +use solana::re::helium_lib::token::Token; use sqlx::{PgPool, Postgres, Transaction}; use std::{self, ops::DerefMut, str::FromStr}; use tokio::{sync::mpsc::error::TryRecvError, sync::Mutex, time::timeout}; diff --git a/mobile_verifier/Cargo.toml b/mobile_verifier/Cargo.toml index 1a6e77ff3..8b2a61a22 100644 --- a/mobile_verifier/Cargo.toml +++ b/mobile_verifier/Cargo.toml @@ -14,7 +14,6 @@ thiserror = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } h3o = { workspace = true, features = ["geo"] } -helium-lib = { workspace = true } hextree = { workspace = true } http-serde = { workspace = true } clap = { workspace = true } @@ -60,7 +59,7 @@ custom-tracing = { path = "../custom_tracing" } hex-assignments = { path = "../hex_assignments" } coverage-point-calculator = { path = "../coverage_point_calculator" } coverage-map = { path = "../coverage_map" } +solana = { path = "../solana" } [dev-dependencies] proptest = "1.5.0" -solana = { path = "../solana" } diff --git a/mobile_verifier/src/lib.rs b/mobile_verifier/src/lib.rs index bb75c8338..4b3cbd4a1 100644 --- a/mobile_verifier/src/lib.rs +++ b/mobile_verifier/src/lib.rs @@ -21,9 +21,9 @@ pub mod unique_connections; pub use settings::Settings; use async_trait::async_trait; -use helium_lib::keypair::Pubkey; use mobile_config::client::ClientError; use rust_decimal::Decimal; +use solana::re::helium_lib::keypair::Pubkey; pub enum GatewayResolution { GatewayNotFound, @@ -114,5 +114,5 @@ impl PriceInfo { } pub fn resolve_subdao_pubkey() -> Pubkey { - helium_lib::dao::SubDao::Mobile.key() + solana::re::helium_lib::dao::SubDao::Mobile.key() } diff --git a/mobile_verifier/src/reward_shares.rs b/mobile_verifier/src/reward_shares.rs index 97354376f..3be3d211b 100644 --- a/mobile_verifier/src/reward_shares.rs +++ b/mobile_verifier/src/reward_shares.rs @@ -698,12 +698,12 @@ mod test { use chrono::{Duration, Utc}; use file_store::speedtest::CellSpeedtest; use futures::stream::{self, BoxStream}; - use helium_lib::token::Token; use helium_proto::{ services::poc_mobile::mobile_reward_share::Reward as MobileReward, ServiceProvider, }; use hextree::Cell; use prost::Message; + use solana::re::helium_lib::token::Token; use std::collections::HashMap; use uuid::Uuid; diff --git a/mobile_verifier/src/rewarder.rs b/mobile_verifier/src/rewarder.rs index d5f071033..804a841b7 100644 --- a/mobile_verifier/src/rewarder.rs +++ b/mobile_verifier/src/rewarder.rs @@ -24,8 +24,6 @@ use file_store::{ use futures_util::TryFutureExt; use self::boosted_hex_eligibility::BoostedHexEligibility; -use helium_lib::keypair::Pubkey; -use helium_lib::token::Token; use helium_proto::{ reward_manifest::RewardData::MobileRewardData, services::poc_mobile::{ @@ -47,6 +45,7 @@ use mobile_config::{ use price::PriceTracker; use reward_scheduler::Scheduler; use rust_decimal::{prelude::*, Decimal}; +use solana::re::helium_lib::{keypair::Pubkey, token::Token}; use sqlx::{PgExecutor, Pool, Postgres}; use std::{ops::Range, time::Duration}; use task_manager::{ManagedTask, TaskManager}; diff --git a/mobile_verifier/tests/integrations/common/mod.rs b/mobile_verifier/tests/integrations/common/mod.rs index 987a571e4..c8f8167e7 100644 --- a/mobile_verifier/tests/integrations/common/mod.rs +++ b/mobile_verifier/tests/integrations/common/mod.rs @@ -5,7 +5,6 @@ use file_store::{ }; use futures::{stream, StreamExt}; use helium_crypto::PublicKeyBinary; -use helium_lib::token::Token; use helium_proto::services::poc_mobile::{ mobile_reward_share::Reward as MobileReward, radio_reward_v2, GatewayReward, MobileRewardShare, OracleBoostingHexAssignment, OracleBoostingReportV1, PromotionReward, RadioReward, @@ -24,6 +23,7 @@ use mobile_verifier::{ }; use rust_decimal::{prelude::ToPrimitive, Decimal}; use rust_decimal_macros::dec; +use solana::re::helium_lib::token::Token; use sqlx::PgPool; use std::{ collections::{HashMap, HashSet}, diff --git a/price/Cargo.toml b/price/Cargo.toml index 025d6341d..a307f8615 100644 --- a/price/Cargo.toml +++ b/price/Cargo.toml @@ -23,7 +23,6 @@ metrics-exporter-prometheus = { workspace = true } tokio = { workspace = true } tokio-util = { workspace = true } chrono = { workspace = true } -helium-lib = { workspace = true } helium-proto = { workspace = true } file-store = { path = "../file_store" } poc-metrics = { path = "../metrics" } diff --git a/price/src/metrics.rs b/price/src/metrics.rs index 53008588b..ed7c04d69 100644 --- a/price/src/metrics.rs +++ b/price/src/metrics.rs @@ -1,4 +1,4 @@ -use helium_lib::token::Token; +use solana::re::helium_lib::token::Token; const PRICE_GAUGE: &str = concat!(env!("CARGO_PKG_NAME"), "_", "price_gauge"); diff --git a/price/src/price_generator.rs b/price/src/price_generator.rs index 075dd07ac..a2aa5b7c9 100644 --- a/price/src/price_generator.rs +++ b/price/src/price_generator.rs @@ -3,11 +3,10 @@ use anyhow::{anyhow, Error, Result}; use chrono::{DateTime, TimeZone, Utc}; use file_store::file_sink; use futures::{future::LocalBoxFuture, TryFutureExt}; -use helium_lib::token::Token; use helium_proto::{BlockchainTokenTypeV1, PriceReportV1}; use rust_decimal::Decimal; use serde::{Deserialize, Serialize}; -use solana::re::solana_client::nonblocking::rpc_client::RpcClient; +use solana::re::{helium_lib::token::Token, solana_client::nonblocking::rpc_client::RpcClient}; use std::{path::PathBuf, str::FromStr, time::Duration}; use task_manager::ManagedTask; use tokio::{fs, time}; @@ -196,7 +195,7 @@ impl PriceGenerator { } async fn get_pyth_price(&self) -> Result { - helium_lib::token::price::get(self, self.token) + solana::re::helium_lib::token::price::get(self, self.token) .await .map_err(anyhow::Error::from) .and_then(|p| { diff --git a/price/src/settings.rs b/price/src/settings.rs index 169b83d80..d07c0136e 100644 --- a/price/src/settings.rs +++ b/price/src/settings.rs @@ -1,8 +1,8 @@ use anyhow::Result; use config::{Config, Environment, File}; -use helium_lib::token::Token; use humantime_serde::re::humantime; use serde::Deserialize; +use solana::re::helium_lib::token::Token; use std::{path::Path, time::Duration}; #[derive(Debug, Deserialize, Clone)] diff --git a/solana/Cargo.toml b/solana/Cargo.toml index 78f48f542..c86ca5a1a 100644 --- a/solana/Cargo.toml +++ b/solana/Cargo.toml @@ -28,3 +28,4 @@ solana-client = "1.18" solana-sdk = "1.18" solana-program = "1.18" spl-token = "3.5.0" +helium-lib = { git = "https://github.com/helium/helium-wallet-rs.git", branch = "master" } diff --git a/solana/src/lib.rs b/solana/src/lib.rs index b97979f1b..891b20acf 100644 --- a/solana/src/lib.rs +++ b/solana/src/lib.rs @@ -7,6 +7,7 @@ pub use solana_sdk::signature::Signature; pub mod re { pub use helium_anchor_gen; + pub use helium_lib; pub use solana_client; pub use solana_sdk; } From 4698b2b25de4edbcafa25c3c10e0dbb7ee899469 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Fri, 2 May 2025 09:40:09 -0700 Subject: [PATCH 08/41] Left with aws dep issues --- Cargo.lock | 9389 ++++++++++++++++--------- Cargo.toml | 8 +- mobile_config_cli/src/cmds/gateway.rs | 2 +- price/src/cli/check.rs | 5 +- solana/Cargo.toml | 13 +- solana/src/burn.rs | 53 +- solana/src/carrier.rs | 14 +- solana/src/lib.rs | 28 +- solana/src/main.rs | 4 +- solana/src/start_boost.rs | 39 +- 10 files changed, 6019 insertions(+), 3536 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f6cd36a2d..985772716 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,18 +14,18 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.17.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "adler32" @@ -35,30 +35,30 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "aead" -version = "0.4.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ + "crypto-common", "generic-array", ] [[package]] name = "aes" -version = "0.7.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", "cpufeatures", - "opaque-debug", ] [[package]] name = "aes-gcm-siv" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589c637f0e68c877bbd59a4599bbe849cac8e5f3e4b5a3ebae8f528cd218dcdc" +checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d" dependencies = [ "aead", "aes", @@ -69,13 +69,63 @@ dependencies = [ "zeroize", ] +[[package]] +name = "agave-feature-set" +version = "2.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "973a83d0d66d1f04647d1146a07736864f0742300b56bf2a5aadf5ce7b22fe47" +dependencies = [ + "ahash 0.8.11", + "solana-epoch-schedule", + "solana-feature-set-interface", + "solana-hash", + "solana-pubkey", + "solana-sha256-hasher", +] + +[[package]] +name = "agave-precompiles" +version = "2.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "591ddfc881b44f1eb740b5f6b64c953ba46b003cf0cd49d56268bc70594f655d" +dependencies = [ + "agave-feature-set", + "bincode", + "bytemuck", + "digest 0.10.7", + "ed25519-dalek", + "lazy_static", + "libsecp256k1", + "openssl", + "sha3", + "solana-ed25519-program", + "solana-message", + "solana-precompile-error", + "solana-pubkey", + "solana-sdk-ids", + "solana-secp256k1-program", + "solana-secp256r1-program", +] + +[[package]] +name = "agave-reserved-account-keys" +version = "2.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "498ae700a5abcfe54d26333c3c1e58c729150d30166940e1f38eafbfe595237e" +dependencies = [ + "agave-feature-set", + "lazy_static", + "solana-pubkey", + "solana-sdk-ids", +] + [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.16", "once_cell", "version_check", ] @@ -88,10 +138,10 @@ checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "const-random", - "getrandom 0.2.10", + "getrandom 0.2.16", "once_cell", "version_check", - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -119,37 +169,17 @@ dependencies = [ ] [[package]] -name = "anchor-attribute-access-control" -version = "0.29.0" +name = "allocator-api2" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f619f1d04f53621925ba8a2e633ba5a6081f2ae14758cbb67f38fd823e0a3e" -dependencies = [ - "anchor-syn 0.29.0", - "proc-macro2", - "quote", - "syn 1.0.109", -] +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "anchor-attribute-access-control" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47fe28365b33e8334dd70ae2f34a43892363012fe239cf37d2ee91693575b1f8" -dependencies = [ - "anchor-syn 0.30.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-attribute-account" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f2a3e1df4685f18d12a943a9f2a7456305401af21a07c9fe076ef9ecd6e400" +version = "0.31.1" +source = "git+https://github.com/madninja/anchor.git?branch=madninja%2Fconst_pubkey#1dfe80386037379325c30095dcdb51e152c1e3c5" dependencies = [ - "anchor-syn 0.29.0", - "bs58 0.5.1", + "anchor-syn", "proc-macro2", "quote", "syn 1.0.109", @@ -157,12 +187,11 @@ dependencies = [ [[package]] name = "anchor-attribute-account" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c288d496168268d198d9b53ee9f4f9d260a55ba4df9877ea1d4486ad6109e0f" +version = "0.31.1" +source = "git+https://github.com/madninja/anchor.git?branch=madninja%2Fconst_pubkey#1dfe80386037379325c30095dcdb51e152c1e3c5" dependencies = [ - "anchor-syn 0.30.1", - "bs58 0.5.1", + "anchor-syn", + "bs58", "proc-macro2", "quote", "syn 1.0.109", @@ -170,67 +199,30 @@ dependencies = [ [[package]] name = "anchor-attribute-constant" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9423945cb55627f0b30903288e78baf6f62c6c8ab28fb344b6b25f1ffee3dca7" -dependencies = [ - "anchor-syn 0.29.0", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-attribute-constant" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b77b6948d0eeaaa129ce79eea5bbbb9937375a9241d909ca8fb9e006bb6e90" -dependencies = [ - "anchor-syn 0.30.1", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-attribute-error" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ed12720033cc3c3bf3cfa293349c2275cd5ab99936e33dd4bf283aaad3e241" +version = "0.31.1" +source = "git+https://github.com/madninja/anchor.git?branch=madninja%2Fconst_pubkey#1dfe80386037379325c30095dcdb51e152c1e3c5" dependencies = [ - "anchor-syn 0.29.0", + "anchor-syn", "quote", "syn 1.0.109", ] [[package]] name = "anchor-attribute-error" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d20bb569c5a557c86101b944721d865e1fd0a4c67c381d31a44a84f07f84828" -dependencies = [ - "anchor-syn 0.30.1", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-attribute-event" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eef4dc0371eba2d8c8b54794b0b0eb786a234a559b77593d6f80825b6d2c77a2" +version = "0.31.1" +source = "git+https://github.com/madninja/anchor.git?branch=madninja%2Fconst_pubkey#1dfe80386037379325c30095dcdb51e152c1e3c5" dependencies = [ - "anchor-syn 0.29.0", - "proc-macro2", + "anchor-syn", "quote", "syn 1.0.109", ] [[package]] name = "anchor-attribute-event" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cebd8d0671a3a9dc3160c48598d652c34c77de6be4d44345b8b514323284d57" +version = "0.31.1" +source = "git+https://github.com/madninja/anchor.git?branch=madninja%2Fconst_pubkey#1dfe80386037379325c30095dcdb51e152c1e3c5" dependencies = [ - "anchor-syn 0.30.1", + "anchor-syn", "proc-macro2", "quote", "syn 1.0.109", @@ -238,25 +230,13 @@ dependencies = [ [[package]] name = "anchor-attribute-program" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b18c4f191331e078d4a6a080954d1576241c29c56638783322a18d308ab27e4f" -dependencies = [ - "anchor-syn 0.29.0", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-attribute-program" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb2a5eb0860e661ab31aff7bb5e0288357b176380e985bade4ccb395981b42d" +version = "0.31.1" +source = "git+https://github.com/madninja/anchor.git?branch=madninja%2Fconst_pubkey#1dfe80386037379325c30095dcdb51e152c1e3c5" dependencies = [ "anchor-lang-idl", - "anchor-syn 0.30.1", + "anchor-syn", "anyhow", - "bs58 0.5.1", + "bs58", "heck 0.3.3", "proc-macro2", "quote", @@ -266,11 +246,11 @@ dependencies = [ [[package]] name = "anchor-client" -version = "0.29.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb48c4a7911038da546dc752655a29fa49f6bd50ebc1edca218bac8da1012acd" +checksum = "49b3e91b12501d37c8f07de9da8c7d22067998a7760a515231187afb47ded225" dependencies = [ - "anchor-lang 0.29.0", + "anchor-lang", "anyhow", "futures", "regex", @@ -278,65 +258,28 @@ dependencies = [ "solana-account-decoder", "solana-client", "solana-sdk", - "thiserror", + "thiserror 1.0.69", "tokio", "url", ] [[package]] name = "anchor-derive-accounts" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de10d6e9620d3bcea56c56151cad83c5992f50d5960b3a9bebc4a50390ddc3c" -dependencies = [ - "anchor-syn 0.29.0", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-derive-accounts" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04368b5abef4266250ca8d1d12f4dff860242681e4ec22b885dcfe354fd35aa1" -dependencies = [ - "anchor-syn 0.30.1", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-derive-serde" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4e2e5be518ec6053d90a2a7f26843dbee607583c779e6c8395951b9739bdfbe" +version = "0.31.1" +source = "git+https://github.com/madninja/anchor.git?branch=madninja%2Fconst_pubkey#1dfe80386037379325c30095dcdb51e152c1e3c5" dependencies = [ - "anchor-syn 0.29.0", - "borsh-derive-internal 0.10.3", - "proc-macro2", + "anchor-syn", "quote", "syn 1.0.109", ] [[package]] name = "anchor-derive-serde" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0bb0e0911ad4a70cab880cdd6287fe1e880a1a9d8e4e6defa8e9044b9796a6c" -dependencies = [ - "anchor-syn 0.30.1", - "borsh-derive-internal 0.10.3", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-derive-space" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecc31d19fa54840e74b7a979d44bcea49d70459de846088a1d71e87ba53c419" +version = "0.31.1" +source = "git+https://github.com/madninja/anchor.git?branch=madninja%2Fconst_pubkey#1dfe80386037379325c30095dcdb51e152c1e3c5" dependencies = [ + "anchor-syn", + "borsh-derive-internal", "proc-macro2", "quote", "syn 1.0.109", @@ -344,126 +287,55 @@ dependencies = [ [[package]] name = "anchor-derive-space" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef415ff156dc82e9ecb943189b0cb241b3a6bfc26a180234dc21bd3ef3ce0cb" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-gen" -version = "0.3.1" -source = "git+https://github.com/ChewingGlass/anchor-gen.git?branch=master#e6136a50918660c8bab0101568068419cbd23420" -dependencies = [ - "anchor-generate-cpi-crate", - "anchor-generate-cpi-interface", -] - -[[package]] -name = "anchor-generate-cpi-crate" -version = "0.3.1" -source = "git+https://github.com/ChewingGlass/anchor-gen.git?branch=master#e6136a50918660c8bab0101568068419cbd23420" -dependencies = [ - "anchor-idl", - "syn 1.0.109", -] - -[[package]] -name = "anchor-generate-cpi-interface" -version = "0.3.1" -source = "git+https://github.com/ChewingGlass/anchor-gen.git?branch=master#e6136a50918660c8bab0101568068419cbd23420" -dependencies = [ - "anchor-idl", - "darling 0.14.2", - "syn 1.0.109", -] - -[[package]] -name = "anchor-idl" -version = "0.3.1" -source = "git+https://github.com/ChewingGlass/anchor-gen.git?branch=master#e6136a50918660c8bab0101568068419cbd23420" +version = "0.31.1" +source = "git+https://github.com/madninja/anchor.git?branch=madninja%2Fconst_pubkey#1dfe80386037379325c30095dcdb51e152c1e3c5" dependencies = [ - "anchor-syn 0.24.2", - "darling 0.14.2", - "heck 0.4.0", "proc-macro2", "quote", - "serde_json", "syn 1.0.109", ] [[package]] name = "anchor-lang" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35da4785497388af0553586d55ebdc08054a8b1724720ef2749d313494f2b8ad" -dependencies = [ - "anchor-attribute-access-control 0.29.0", - "anchor-attribute-account 0.29.0", - "anchor-attribute-constant 0.29.0", - "anchor-attribute-error 0.29.0", - "anchor-attribute-event 0.29.0", - "anchor-attribute-program 0.29.0", - "anchor-derive-accounts 0.29.0", - "anchor-derive-serde 0.29.0", - "anchor-derive-space 0.29.0", - "arrayref", - "base64 0.13.1", - "bincode", - "borsh 0.10.3", - "bytemuck", - "getrandom 0.2.10", - "solana-program", - "thiserror", -] - -[[package]] -name = "anchor-lang" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6620c9486d9d36a4389cab5e37dc34a42ed0bfaa62e6a75a2999ce98f8f2e373" -dependencies = [ - "anchor-attribute-access-control 0.30.1", - "anchor-attribute-account 0.30.1", - "anchor-attribute-constant 0.30.1", - "anchor-attribute-error 0.30.1", - "anchor-attribute-event 0.30.1", - "anchor-attribute-program 0.30.1", - "anchor-derive-accounts 0.30.1", - "anchor-derive-serde 0.30.1", - "anchor-derive-space 0.30.1", - "arrayref", +version = "0.31.1" +source = "git+https://github.com/madninja/anchor.git?branch=madninja%2Fconst_pubkey#1dfe80386037379325c30095dcdb51e152c1e3c5" +dependencies = [ + "anchor-attribute-access-control", + "anchor-attribute-account", + "anchor-attribute-constant", + "anchor-attribute-error", + "anchor-attribute-event", + "anchor-attribute-program", + "anchor-derive-accounts", + "anchor-derive-serde", + "anchor-derive-space", + "anchor-lang-idl", "base64 0.21.7", "bincode", - "borsh 0.10.3", + "borsh 0.10.4", "bytemuck", - "getrandom 0.2.10", "solana-program", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "anchor-lang-idl" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31cf97b4e6f7d6144a05e435660fcf757dbc3446d38d0e2b851d11ed13625bba" +version = "0.1.2" +source = "git+https://github.com/madninja/anchor.git?branch=madninja%2Fconst_pubkey#1dfe80386037379325c30095dcdb51e152c1e3c5" dependencies = [ "anchor-lang-idl-spec", "anyhow", "heck 0.3.3", + "regex", "serde", "serde_json", - "sha2 0.10.8", + "sha2 0.10.9", ] [[package]] name = "anchor-lang-idl-spec" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bdf143115440fe621bdac3a29a1f7472e09f6cd82b2aa569429a0c13f103838" +source = "git+https://github.com/madninja/anchor.git?branch=madninja%2Fconst_pubkey#1dfe80386037379325c30095dcdb51e152c1e3c5" dependencies = [ "anyhow", "serde", @@ -471,70 +343,35 @@ dependencies = [ [[package]] name = "anchor-spl" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c4fd6e43b2ca6220d2ef1641539e678bfc31b6cc393cf892b373b5997b6a39a" -dependencies = [ - "anchor-lang 0.29.0", - "solana-program", - "spl-associated-token-account 2.3.0", - "spl-token 4.0.0", - "spl-token-2022 0.9.0", -] - -[[package]] -name = "anchor-syn" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03549dc2eae0b20beba6333b14520e511822a6321cdb1760f841064a69347316" -dependencies = [ - "anyhow", - "bs58 0.3.1", - "heck 0.3.3", - "proc-macro2", - "proc-macro2-diagnostics", - "quote", - "serde", - "serde_json", - "sha2 0.9.9", - "syn 1.0.109", - "thiserror", -] - -[[package]] -name = "anchor-syn" -version = "0.29.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9101b84702fed2ea57bd22992f75065da5648017135b844283a2f6d74f27825" +checksum = "3c08cb5d762c0694f74bd02c9a5b04ea53cefc496e2c27b3234acffca5cd076b" dependencies = [ - "anyhow", - "bs58 0.5.1", - "heck 0.3.3", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2 0.10.8", - "syn 1.0.109", - "thiserror", + "anchor-lang", + "spl-associated-token-account", + "spl-pod", + "spl-token 7.0.0", + "spl-token-2022 6.0.0", + "spl-token-group-interface", + "spl-token-metadata-interface", ] [[package]] name = "anchor-syn" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f99daacb53b55cfd37ce14d6c9905929721137fd4c67bbab44a19802aecb622f" +version = "0.31.1" +source = "git+https://github.com/madninja/anchor.git?branch=madninja%2Fconst_pubkey#1dfe80386037379325c30095dcdb51e152c1e3c5" dependencies = [ "anyhow", - "bs58 0.5.1", + "bs58", + "cargo_toml", "heck 0.3.3", "proc-macro2", "quote", "serde", "serde_json", - "sha2 0.10.8", + "sha2 0.10.9", "syn 1.0.109", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -568,73 +405,66 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7556be6f2b0d82376c1ece1fda4dffd728816ac53bee2c285f3f74269ddc4a97" dependencies = [ "anyhow", - "clap 4.4.8", - "helium-crypto", + "clap", + "helium-crypto 0.8.4", "md5", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "once_cell", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" dependencies = [ "backtrace", ] @@ -670,8 +500,8 @@ dependencies = [ "ark-serialize", "ark-std", "derivative", - "hashbrown 0.13.1", - "itertools", + "hashbrown 0.13.2", + "itertools 0.10.5", "num-traits", "zeroize", ] @@ -688,11 +518,11 @@ dependencies = [ "ark-std", "derivative", "digest 0.10.7", - "itertools", - "num-bigint 0.4.4", + "itertools 0.10.5", + "num-bigint 0.4.6", "num-traits", "paste", - "rustc_version 0.4.0", + "rustc_version", "zeroize", ] @@ -712,7 +542,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ - "num-bigint 0.4.4", + "num-bigint 0.4.6", "num-traits", "proc-macro2", "quote", @@ -729,7 +559,7 @@ dependencies = [ "ark-serialize", "ark-std", "derivative", - "hashbrown 0.13.1", + "hashbrown 0.13.2", ] [[package]] @@ -741,7 +571,7 @@ dependencies = [ "ark-serialize-derive", "ark-std", "digest 0.10.7", - "num-bigint 0.4.4", + "num-bigint 0.4.6", ] [[package]] @@ -767,15 +597,15 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "ascii" @@ -785,9 +615,9 @@ checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" [[package]] name = "asn1-rs" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" dependencies = [ "asn1-rs-derive", "asn1-rs-impl", @@ -795,7 +625,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -808,7 +638,7 @@ dependencies = [ "proc-macro2", "quote", "syn 1.0.109", - "synstructure", + "synstructure 0.12.6", ] [[package]] @@ -822,12 +652,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "assert_matches" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" - [[package]] name = "async-channel" version = "1.9.0" @@ -835,15 +659,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-compression" -version = "0.4.5" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" +checksum = "b37fc50485c4f3f736a4fb14199f6d5f5ba008d7f28fe710306c92780f004c07" dependencies = [ "brotli", "flate2", @@ -855,42 +679,44 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", - "futures-lite", + "event-listener 2.5.3", ] [[package]] -name = "async-mutex" -version = "1.4.0" +name = "async-lock" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener", + "event-listener 5.4.0", + "event-listener-strategy", + "pin-project-lite", ] [[package]] name = "async-stream" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" dependencies = [ "async-stream-impl", "futures-core", + "pin-project-lite", ] [[package]] name = "async-stream-impl" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.101", ] [[package]] @@ -906,13 +732,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.101", ] [[package]] @@ -925,14 +751,29 @@ dependencies = [ ] [[package]] -name = "atomic-polyfill" -version = "0.1.10" +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "atomic" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c041a8d9751a520ee19656232a18971f18946a7900f1520ee4400002244dd89" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" dependencies = [ - "critical-section", + "bytemuck", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "atty" version = "0.2.14" @@ -944,17 +785,11 @@ dependencies = [ "winapi", ] -[[package]] -name = "auto_ops" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7460f7dd8e100147b82a63afca1a20eb6c231ee36b90ba7272e14951cb58af59" - [[package]] name = "autocfg" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-config" @@ -962,38 +797,80 @@ version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56a636c44c77fa18bdba56126a34d30cfe5538fe88f7d34988fa731fee143ddd" dependencies = [ - "aws-http", - "aws-sdk-sso", - "aws-sdk-sts", + "aws-http 0.51.0", + "aws-sdk-sso 0.21.0", + "aws-sdk-sts 0.21.0", "aws-smithy-async 0.51.0", - "aws-smithy-client 0.51.0", + "aws-smithy-client", "aws-smithy-http 0.51.0", - "aws-smithy-http-tower 0.51.0", - "aws-smithy-json", + "aws-smithy-http-tower", + "aws-smithy-json 0.51.0", "aws-smithy-types 0.51.0", "aws-types 0.51.0", "bytes", "hex", - "http 0.2.11", - "hyper 0.14.28", + "http 0.2.12", + "hyper 0.14.32", "ring 0.16.20", "time", "tokio", - "tower", + "tower 0.4.13", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-config" +version = "0.101.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84f9625b71b3ee4adbfbca369c6680d156e316ed86d2c7199a2a134563917414" +dependencies = [ + "aws-credential-types 0.101.0", + "aws-http 0.59.0", + "aws-runtime 0.101.0", + "aws-sdk-sso 0.38.0", + "aws-sdk-ssooidc", + "aws-sdk-sts 0.38.0", + "aws-smithy-async 0.101.0", + "aws-smithy-http 0.59.0", + "aws-smithy-json 0.59.0", + "aws-smithy-runtime 0.101.0", + "aws-smithy-runtime-api 0.101.0", + "aws-smithy-types 0.101.0", + "aws-types 0.101.0", + "bytes", + "fastrand 2.3.0", + "hex", + "http 0.2.12", + "hyper 0.14.32", + "ring 0.17.14", + "time", + "tokio", "tracing", "zeroize", ] [[package]] name = "aws-credential-types" -version = "0.54.1" +version = "0.101.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0696a0523a39a19087747e4dafda0362dc867531e3d72a3f195564c84e5e08" +checksum = "5924466398ac76ffd411d297b9d516dcebb0577f7344c0c15fd8e8e04d9c7895" dependencies = [ - "aws-smithy-async 0.54.4", - "aws-smithy-types 0.54.4", - "tokio", - "tracing", + "aws-smithy-async 0.101.0", + "aws-smithy-runtime-api 0.101.0", + "aws-smithy-types 0.101.0", + "zeroize", +] + +[[package]] +name = "aws-credential-types" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "687bc16bc431a8533fe0097c7f0182874767f920989d7260950172ae8e3c4465" +dependencies = [ + "aws-smithy-async 1.2.5", + "aws-smithy-runtime-api 1.8.0", + "aws-smithy-types 1.3.1", "zeroize", ] @@ -1006,7 +883,7 @@ dependencies = [ "aws-smithy-http 0.51.0", "aws-smithy-types 0.51.0", "aws-types 0.51.0", - "http 0.2.11", + "http 0.2.12", "regex", "tracing", ] @@ -1021,14 +898,107 @@ dependencies = [ "aws-smithy-types 0.51.0", "aws-types 0.51.0", "bytes", - "http 0.2.11", - "http-body 0.4.5", + "http 0.2.12", + "http-body 0.4.6", "lazy_static", "percent-encoding", "pin-project-lite", "tracing", ] +[[package]] +name = "aws-http" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb9a3aa335a105a00975c971f1dad403c3175f2a210d98f39345c6af53923912" +dependencies = [ + "aws-smithy-runtime-api 0.101.0", + "aws-smithy-types 0.101.0", + "aws-types 0.101.0", + "bytes", + "http 0.2.12", + "http-body 0.4.6", + "pin-project-lite", + "tracing", +] + +[[package]] +name = "aws-http" +version = "0.60.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1eda156637dc4fd310cd05b2a35f963a591684b02b13694bd790df48f5349ee0" +dependencies = [ + "aws-runtime 1.5.7", +] + +[[package]] +name = "aws-lc-rs" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b756939cb2f8dc900aa6dcd505e6e2428e9cae7ff7b028c49e3946efa70878" +dependencies = [ + "aws-lc-sys", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa9b6986f250236c27e5a204062434a773a13243d2ffc2955f37bdba4c5c6a1" +dependencies = [ + "bindgen", + "cc", + "cmake", + "dunce", + "fs_extra", +] + +[[package]] +name = "aws-runtime" +version = "0.101.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b75844ecbdf3dc5e0f5ac5fd1088fb1623849990ea9445d2826258ce63be4de5" +dependencies = [ + "aws-credential-types 0.101.0", + "aws-http 0.59.0", + "aws-sigv4 0.101.0", + "aws-smithy-async 0.101.0", + "aws-smithy-http 0.59.0", + "aws-smithy-runtime-api 0.101.0", + "aws-smithy-types 0.101.0", + "aws-types 0.101.0", + "fastrand 2.3.0", + "http 0.2.12", + "percent-encoding", + "tracing", + "uuid", +] + +[[package]] +name = "aws-runtime" +version = "1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c4063282c69991e57faab9e5cb21ae557e59f5b0fb285c196335243df8dc25c" +dependencies = [ + "aws-credential-types 1.2.3", + "aws-sigv4 1.3.1", + "aws-smithy-async 1.2.5", + "aws-smithy-http 0.62.1", + "aws-smithy-runtime 1.8.3", + "aws-smithy-runtime-api 1.8.0", + "aws-smithy-types 1.3.1", + "aws-types 1.3.7", + "bytes", + "fastrand 2.3.0", + "http 0.2.12", + "http-body 0.4.6", + "percent-encoding", + "pin-project-lite", + "tracing", + "uuid", +] + [[package]] name = "aws-sdk-s3" version = "0.21.0" @@ -1036,24 +1006,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9f08665c8e03aca8cb092ef01e617436ebfa977fddc1240e1b062488ab5d48a" dependencies = [ "aws-endpoint", - "aws-http", + "aws-http 0.51.0", "aws-sig-auth 0.51.0", - "aws-sigv4 0.51.0", + "aws-sigv4 0.51.1", "aws-smithy-async 0.51.0", "aws-smithy-checksums", - "aws-smithy-client 0.51.0", + "aws-smithy-client", "aws-smithy-eventstream", "aws-smithy-http 0.51.0", - "aws-smithy-http-tower 0.51.0", + "aws-smithy-http-tower", "aws-smithy-types 0.51.0", - "aws-smithy-xml", + "aws-smithy-xml 0.51.0", "aws-types 0.51.0", "bytes", "bytes-utils", - "http 0.2.11", - "http-body 0.4.5", + "http 0.2.12", + "http-body 0.4.6", "tokio-stream", - "tower", + "tower 0.4.13", "tracing", ] @@ -1064,19 +1034,63 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86dcb1cb71aa8763b327542ead410424515cff0cde5b753eedd2917e09c63734" dependencies = [ "aws-endpoint", - "aws-http", + "aws-http 0.51.0", "aws-sig-auth 0.51.0", "aws-smithy-async 0.51.0", - "aws-smithy-client 0.51.0", + "aws-smithy-client", "aws-smithy-http 0.51.0", - "aws-smithy-http-tower 0.51.0", - "aws-smithy-json", + "aws-smithy-http-tower", + "aws-smithy-json 0.51.0", "aws-smithy-types 0.51.0", "aws-types 0.51.0", "bytes", - "http 0.2.11", + "http 0.2.12", "tokio-stream", - "tower", + "tower 0.4.13", +] + +[[package]] +name = "aws-sdk-sso" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c870aa95e1e85f837f74af2cc937b3f8e72e2315a89e524265875843655b4d47" +dependencies = [ + "aws-credential-types 0.101.0", + "aws-http 0.59.0", + "aws-runtime 0.101.0", + "aws-smithy-async 0.101.0", + "aws-smithy-http 0.59.0", + "aws-smithy-json 0.59.0", + "aws-smithy-runtime 0.101.0", + "aws-smithy-runtime-api 0.101.0", + "aws-smithy-types 0.101.0", + "aws-types 0.101.0", + "bytes", + "http 0.2.12", + "regex", + "tracing", +] + +[[package]] +name = "aws-sdk-ssooidc" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "107ee812e46f9120e68d48bf985d2f2a538315bd8be8a3e54db619250cc4c95e" +dependencies = [ + "aws-credential-types 0.101.0", + "aws-http 0.59.0", + "aws-runtime 0.101.0", + "aws-smithy-async 0.101.0", + "aws-smithy-http 0.59.0", + "aws-smithy-json 0.59.0", + "aws-smithy-runtime 0.101.0", + "aws-smithy-runtime-api 0.101.0", + "aws-smithy-types 0.101.0", + "aws-types 0.101.0", + "bytes", + "http 0.2.12", + "regex", + "tracing", ] [[package]] @@ -1086,19 +1100,65 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdfcf584297c666f6b472d5368a78de3bc714b6e0a53d7fbf76c3e347c292ab1" dependencies = [ "aws-endpoint", - "aws-http", + "aws-http 0.51.0", "aws-sig-auth 0.51.0", "aws-smithy-async 0.51.0", - "aws-smithy-client 0.51.0", + "aws-smithy-client", "aws-smithy-http 0.51.0", - "aws-smithy-http-tower 0.51.0", - "aws-smithy-query", + "aws-smithy-http-tower", + "aws-smithy-query 0.51.0", "aws-smithy-types 0.51.0", - "aws-smithy-xml", + "aws-smithy-xml 0.51.0", "aws-types 0.51.0", "bytes", - "http 0.2.11", - "tower", + "http 0.2.12", + "tower 0.4.13", +] + +[[package]] +name = "aws-sdk-sts" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4e3958c43a78f6c3822e62009a35802af5cc7c120fbe8e60b98565604569aae" +dependencies = [ + "aws-credential-types 0.101.0", + "aws-http 0.59.0", + "aws-runtime 0.101.0", + "aws-smithy-async 0.101.0", + "aws-smithy-http 0.59.0", + "aws-smithy-json 0.59.0", + "aws-smithy-query 0.59.0", + "aws-smithy-runtime 0.101.0", + "aws-smithy-runtime-api 0.101.0", + "aws-smithy-types 0.101.0", + "aws-smithy-xml 0.59.0", + "aws-types 0.101.0", + "http 0.2.12", + "regex", + "tracing", +] + +[[package]] +name = "aws-sdk-sts" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b1d955bacd8c3637908a40a4af2f7a732461ee7d95ec02599a3610ee55781d7" +dependencies = [ + "aws-credential-types 1.2.3", + "aws-http 0.60.6", + "aws-runtime 1.5.7", + "aws-smithy-async 1.2.5", + "aws-smithy-http 0.60.12", + "aws-smithy-json 0.60.7", + "aws-smithy-query 0.60.7", + "aws-smithy-runtime 1.8.3", + "aws-smithy-runtime-api 1.8.0", + "aws-smithy-types 1.3.1", + "aws-smithy-xml 0.60.9", + "aws-types 1.3.7", + "http 0.2.12", + "regex", + "tracing", ] [[package]] @@ -1107,40 +1167,32 @@ version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12cbe7b2be9e185c1fbce27fc9c41c66b195b32d89aa099f98768d9544221308" dependencies = [ - "aws-sigv4 0.51.0", + "aws-sigv4 0.51.1", "aws-smithy-eventstream", "aws-smithy-http 0.51.0", "aws-types 0.51.0", - "http 0.2.11", + "http 0.2.12", "tracing", ] [[package]] name = "aws-sig-auth" -version = "0.54.1" +version = "0.60.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "660a02a98ab1af83bd8d714afbab2d502ba9b18c49e7e4cddd6bf8837ff778cb" -dependencies = [ - "aws-credential-types", - "aws-sigv4 0.54.1", - "aws-smithy-http 0.54.4", - "aws-types 0.54.1", - "http 0.2.11", - "tracing", -] +checksum = "9c471d4d8afed170d5bb40a2835159314b346f8bd20379a5e821c3dbb22e43b9" [[package]] name = "aws-sigv4" -version = "0.51.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03ff4cff8c4a101962d593ba94e72cd83891aecd423f0c6e3146bff6fb92c9e3" +checksum = "5c0b2658d2cb66dbf02f0e8dee80810ef1e0ca3530ede463e0ef994c301087d1" dependencies = [ "aws-smithy-eventstream", "aws-smithy-http 0.51.0", "bytes", "form_urlencoded", "hex", - "http 0.2.11", + "http 0.2.12", "once_cell", "percent-encoding", "regex", @@ -1151,19 +1203,45 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "0.54.1" +version = "0.101.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdaf11005b7444e6cd66f600d09861a3aeb6eb89a0f003c7c9820dbab2d15297" +checksum = "06130e3686db3c5ae2fc44b3516fffe6b4d4eccebe09bd8ccc4067f3c9c183fb" dependencies = [ - "aws-smithy-http 0.54.4", + "aws-credential-types 0.101.0", + "aws-smithy-http 0.59.0", + "aws-smithy-runtime-api 0.101.0", + "aws-smithy-types 0.101.0", + "bytes", "form_urlencoded", "hex", "hmac 0.12.1", - "http 0.2.11", + "http 0.2.12", "once_cell", "percent-encoding", "regex", - "sha2 0.10.8", + "sha2 0.10.9", + "time", + "tracing", +] + +[[package]] +name = "aws-sigv4" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3503af839bd8751d0bdc5a46b9cac93a003a353e635b0c12cf2376b5b53e41ea" +dependencies = [ + "aws-credential-types 1.2.3", + "aws-smithy-http 0.62.1", + "aws-smithy-runtime-api 1.8.0", + "aws-smithy-types 1.3.1", + "bytes", + "form_urlencoded", + "hex", + "hmac 0.12.1", + "http 0.2.12", + "http 1.3.1", + "percent-encoding", + "sha2 0.10.9", "time", "tracing", ] @@ -1182,14 +1260,24 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "0.54.4" +version = "0.101.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63c712a28a4f2f2139759235c08bf98aca99d4fdf1b13c78c5f95613df0a5db9" +checksum = "d787b7e07925b450bed90d9d29ac8e57006c9c2ac907151d175ac0e376bfee0e" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "aws-smithy-async" +version = "1.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e190749ea56f8c42bf15dd76c65e14f8f765233e6df9b0506d9d934ebef867c" dependencies = [ "futures-util", "pin-project-lite", "tokio", - "tokio-stream", ] [[package]] @@ -1204,12 +1292,12 @@ dependencies = [ "crc32c", "crc32fast", "hex", - "http 0.2.11", - "http-body 0.4.5", + "http 0.2.12", + "http-body 0.4.6", "md-5", "pin-project-lite", "sha1", - "sha2 0.10.8", + "sha2 0.10.9", "tracing", ] @@ -1221,38 +1309,18 @@ checksum = "ff28d553714f8f54cd921227934fc13a536a1c03f106e56b362fd57e16d450ad" dependencies = [ "aws-smithy-async 0.51.0", "aws-smithy-http 0.51.0", - "aws-smithy-http-tower 0.51.0", + "aws-smithy-http-tower", "aws-smithy-types 0.51.0", "bytes", - "fastrand", - "http 0.2.11", - "http-body 0.4.5", - "hyper 0.14.28", - "hyper-rustls 0.23.1", + "fastrand 1.9.0", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.32", + "hyper-rustls 0.23.2", "lazy_static", "pin-project-lite", "tokio", - "tower", - "tracing", -] - -[[package]] -name = "aws-smithy-client" -version = "0.54.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "104ca17f56cde00a10207169697dfe9c6810db339d52fb352707e64875b30a44" -dependencies = [ - "aws-smithy-async 0.54.4", - "aws-smithy-http 0.54.4", - "aws-smithy-http-tower 0.54.4", - "aws-smithy-types 0.54.4", - "bytes", - "fastrand", - "http 0.2.11", - "http-body 0.4.5", - "pin-project-lite", - "tokio", - "tower", + "tower 0.4.13", "tracing", ] @@ -1278,9 +1346,9 @@ dependencies = [ "bytes", "bytes-utils", "futures-core", - "http 0.2.11", - "http-body 0.4.5", - "hyper 0.14.28", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.32", "once_cell", "percent-encoding", "pin-project-lite", @@ -1292,17 +1360,17 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.54.4" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "873f316f1833add0d3aa54ed1b0cd252ddd88c792a0cf839886400099971e844" +checksum = "96daaad925331c72449423574fdc72b54af780d5a23ace3c0a6ad0ccbf378715" dependencies = [ - "aws-smithy-types 0.54.4", + "aws-smithy-runtime-api 0.101.0", + "aws-smithy-types 0.101.0", "bytes", "bytes-utils", "futures-core", - "http 0.2.11", - "http-body 0.4.5", - "hyper 0.14.28", + "http 0.2.12", + "http-body 0.4.6", "once_cell", "percent-encoding", "pin-project-lite", @@ -1311,33 +1379,77 @@ dependencies = [ ] [[package]] -name = "aws-smithy-http-tower" -version = "0.51.0" +name = "aws-smithy-http" +version = "0.60.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c96d7bd35e7cf96aca1134b2f81b1b59ffe493f7c6539c051791cbbf7a42d3" +checksum = "7809c27ad8da6a6a68c454e651d4962479e81472aa19ae99e59f9aba1f9713cc" dependencies = [ - "aws-smithy-http 0.51.0", + "aws-smithy-runtime-api 1.8.0", + "aws-smithy-types 1.3.1", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http-body 0.4.6", + "once_cell", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tracing", +] + +[[package]] +name = "aws-smithy-http" +version = "0.62.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99335bec6cdc50a346fda1437f9fefe33abf8c99060739a546a16457f2862ca9" +dependencies = [ + "aws-smithy-runtime-api 1.8.0", + "aws-smithy-types 1.3.1", "bytes", - "http 0.2.11", - "http-body 0.4.5", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http 1.3.1", + "http-body 0.4.6", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tracing", +] + +[[package]] +name = "aws-smithy-http-client" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8aff1159006441d02e57204bf57a1b890ba68bedb6904ffd2873c1c4c11c546b" +dependencies = [ + "aws-smithy-async 1.2.5", + "aws-smithy-runtime-api 1.8.0", + "aws-smithy-types 1.3.1", + "h2 0.4.9", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.32", + "hyper-rustls 0.24.2", "pin-project-lite", - "tower", + "rustls 0.21.12", + "tokio", "tracing", ] [[package]] name = "aws-smithy-http-tower" -version = "0.54.4" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38231d3f5dac9ac7976f44e12803add1385119ffca9e5f050d8e980733d164" +checksum = "20c96d7bd35e7cf96aca1134b2f81b1b59ffe493f7c6539c051791cbbf7a42d3" dependencies = [ - "aws-smithy-http 0.54.4", - "aws-smithy-types 0.54.4", + "aws-smithy-http 0.51.0", "bytes", - "http 0.2.11", - "http-body 0.4.5", + "http 0.2.12", + "http-body 0.4.6", "pin-project-lite", - "tower", + "tower 0.4.13", "tracing", ] @@ -1351,176 +1463,368 @@ dependencies = [ ] [[package]] -name = "aws-smithy-query" -version = "0.51.0" +name = "aws-smithy-json" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83834ed2ff69ea6f6657baf205267dc2c0abe940703503a3e5d60ce23be3d306" +checksum = "0ff985bee3fe21046dc501fadc1d04a1161977c55a0cbbccd9b111c18206aa64" dependencies = [ - "aws-smithy-types 0.51.0", - "urlencoding", + "aws-smithy-types 0.101.0", ] [[package]] -name = "aws-smithy-types" -version = "0.51.0" +name = "aws-smithy-json" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b02e06ea63498c43bc0217ea4d16605d4e58d85c12fc23f6572ff6d0a840c61" +checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6" dependencies = [ - "itoa 1.0.9", - "num-integer", - "ryu", - "time", + "aws-smithy-types 1.3.1", ] [[package]] -name = "aws-smithy-types" -version = "0.54.4" +name = "aws-smithy-observability" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8161232eda10290f5136610a1eb9de56aceaccd70c963a26a260af20ac24794f" +checksum = "9364d5989ac4dd918e5cc4c4bdcc61c9be17dcd2586ea7f69e348fc7c6cab393" dependencies = [ - "base64-simd", - "itoa 1.0.9", - "num-integer", - "ryu", - "time", + "aws-smithy-runtime-api 1.8.0", ] [[package]] -name = "aws-smithy-xml" +name = "aws-smithy-query" version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246e9f83dd1fdf5d347fa30ae4ad30a9d1d42ce4cd74a93d94afa874646f94cd" +checksum = "83834ed2ff69ea6f6657baf205267dc2c0abe940703503a3e5d60ce23be3d306" dependencies = [ - "xmlparser", + "aws-smithy-types 0.51.0", + "urlencoding", ] [[package]] -name = "aws-types" -version = "0.51.0" +name = "aws-smithy-query" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05701d32da168b44f7ee63147781aed8723e792cc131cb9b18363b5393f17f70" +checksum = "cb4006503693766d34717efc5f58325062845fce26a683a71b70f23156d72e67" dependencies = [ - "aws-smithy-async 0.51.0", - "aws-smithy-client 0.51.0", - "aws-smithy-http 0.51.0", - "aws-smithy-types 0.51.0", - "http 0.2.11", - "rustc_version 0.4.0", - "tracing", - "zeroize", + "aws-smithy-types 0.101.0", + "urlencoding", ] [[package]] -name = "aws-types" -version = "0.54.1" +name = "aws-smithy-query" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f15b34253b68cde08e39b0627cc6101bcca64351229484b4743392c035d057" +checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb" dependencies = [ - "aws-credential-types", - "aws-smithy-async 0.54.4", - "aws-smithy-client 0.54.4", - "aws-smithy-http 0.54.4", - "aws-smithy-types 0.54.4", - "http 0.2.11", - "rustc_version 0.4.0", - "tracing", + "aws-smithy-types 1.3.1", + "urlencoding", ] [[package]] -name = "axum" -version = "0.6.20" +name = "aws-smithy-runtime" +version = "0.101.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "d28af854558601b4202a4273b9720aebe43d73e472143e6056f16e3bd90bc837" dependencies = [ - "async-trait", - "axum-core 0.3.4", - "bitflags 1.3.2", + "aws-smithy-async 0.101.0", + "aws-smithy-http 0.59.0", + "aws-smithy-runtime-api 0.101.0", + "aws-smithy-types 0.101.0", "bytes", - "futures-util", - "http 0.2.11", - "http-body 0.4.5", - "hyper 0.14.28", - "itoa 1.0.9", - "matchit", - "memchr", - "mime", - "percent-encoding", + "fastrand 2.3.0", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.32", + "hyper-rustls 0.24.2", + "once_cell", "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper", - "tower", - "tower-layer", - "tower-service", + "pin-utils", + "rustls 0.21.12", + "tokio", + "tracing", ] [[package]] -name = "axum" -version = "0.7.4" +name = "aws-smithy-runtime" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e" +checksum = "14302f06d1d5b7d333fd819943075b13d27c7700b414f574c3c35859bfb55d5e" dependencies = [ - "async-trait", - "axum-core 0.4.3", + "aws-smithy-async 1.2.5", + "aws-smithy-http 0.62.1", + "aws-smithy-http-client", + "aws-smithy-observability", + "aws-smithy-runtime-api 1.8.0", + "aws-smithy-types 1.3.1", "bytes", - "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "http-body-util", - "hyper 1.1.0", - "hyper-util", - "itoa 1.0.9", - "matchit", - "memchr", - "mime", - "percent-encoding", + "fastrand 2.3.0", + "http 0.2.12", + "http 1.3.1", + "http-body 0.4.6", + "http-body 1.0.1", "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sync_wrapper", + "pin-utils", "tokio", - "tower", - "tower-layer", - "tower-service", "tracing", ] [[package]] -name = "axum-core" -version = "0.3.4" +name = "aws-smithy-runtime-api" +version = "0.101.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "e1c68e17e754b86da350b43add38294189121a880e9c3fb454f83ff7044f5257" dependencies = [ - "async-trait", + "aws-smithy-async 0.101.0", + "aws-smithy-types 0.101.0", "bytes", - "futures-util", - "http 0.2.11", - "http-body 0.4.5", + "http 0.2.12", + "pin-project-lite", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-smithy-runtime-api" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e5d9e3a80a18afa109391fb5ad09c3daf887b516c6fd805a157c6ea7994a57" +dependencies = [ + "aws-smithy-async 1.2.5", + "aws-smithy-types 1.3.1", + "bytes", + "http 0.2.12", + "http 1.3.1", + "pin-project-lite", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-smithy-types" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b02e06ea63498c43bc0217ea4d16605d4e58d85c12fc23f6572ff6d0a840c61" +dependencies = [ + "itoa", + "num-integer", + "ryu", + "time", +] + +[[package]] +name = "aws-smithy-types" +version = "0.101.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d97b978d8a351ea5744206ecc643a1d3806628680e9f151b4d6b7a76fec1596f" +dependencies = [ + "base64-simd", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http-body 0.4.6", + "itoa", + "num-integer", + "pin-project-lite", + "pin-utils", + "ryu", + "serde", + "time", +] + +[[package]] +name = "aws-smithy-types" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40076bd09fadbc12d5e026ae080d0930defa606856186e31d83ccc6a255eeaf3" +dependencies = [ + "base64-simd", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http 1.3.1", + "http-body 0.4.6", + "http-body 1.0.1", + "http-body-util", + "itoa", + "num-integer", + "pin-project-lite", + "pin-utils", + "ryu", + "serde", + "time", + "tokio", + "tokio-util", +] + +[[package]] +name = "aws-smithy-xml" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246e9f83dd1fdf5d347fa30ae4ad30a9d1d42ce4cd74a93d94afa874646f94cd" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "aws-smithy-xml" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97500a0d0884b9576e65076075f81d899cfbb84f7db5ca1dd317f0582204e528" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "aws-smithy-xml" +version = "0.60.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab0b0166827aa700d3dc519f72f8b3a91c35d0b8d042dc5d643a91e6f80648fc" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "aws-types" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05701d32da168b44f7ee63147781aed8723e792cc131cb9b18363b5393f17f70" +dependencies = [ + "aws-smithy-async 0.51.0", + "aws-smithy-client", + "aws-smithy-http 0.51.0", + "aws-smithy-types 0.51.0", + "http 0.2.12", + "rustc_version", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-types" +version = "0.101.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61065f0c6070cb0f9aaddfa614605fb1049908481da71ba5b39b2ffca12f57e4" +dependencies = [ + "aws-credential-types 0.101.0", + "aws-smithy-async 0.101.0", + "aws-smithy-runtime-api 0.101.0", + "aws-smithy-types 0.101.0", + "http 0.2.12", + "rustc_version", + "tracing", +] + +[[package]] +name = "aws-types" +version = "1.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a322fec39e4df22777ed3ad8ea868ac2f94cd15e1a55f6ee8d8d6305057689a" +dependencies = [ + "aws-credential-types 1.2.3", + "aws-smithy-async 1.2.5", + "aws-smithy-runtime-api 1.8.0", + "aws-smithy-types 1.3.1", + "rustc_version", + "tracing", +] + +[[package]] +name = "axum" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +dependencies = [ + "async-trait", + "axum-core 0.3.4", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.32", + "itoa", + "matchit 0.7.3", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper 0.1.2", + "tower 0.4.13", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5" +dependencies = [ + "axum-core 0.5.2", + "bytes", + "form_urlencoded", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "hyper 1.6.0", + "hyper-util", + "itoa", + "matchit 0.8.4", + "memchr", "mime", + "percent-encoding", + "pin-project-lite", "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper 1.0.2", + "tokio", + "tower 0.5.2", "tower-layer", "tower-service", + "tracing", ] [[package]] name = "axum-core" -version = "0.4.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.0.0", - "http-body 1.0.0", + "http 0.2.12", + "http-body 0.4.6", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6" +dependencies = [ + "bytes", + "futures-core", + "http 1.3.1", + "http-body 1.0.1", "http-body-util", "mime", "pin-project-lite", "rustversion", - "sync_wrapper", + "sync_wrapper 1.0.2", "tower-layer", "tower-service", "tracing", @@ -1528,46 +1832,28 @@ dependencies = [ [[package]] name = "backon" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f34fac4d7cdaefa2deded0eda2d5d59dbfd43370ff3f856209e72340ae84c294" +checksum = "33e5b65cc81d81fbb8488f36458ab4771be35a722967bbc959df28b47397e3ff" dependencies = [ - "futures", - "pin-project", - "rand 0.8.5", - "tokio", + "fastrand 2.3.0", ] [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide 0.5.4", + "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] -[[package]] -name = "bare-metal" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5deb64efa5bd81e31fcd1938615a6d98c82eafcbcd787162b6f63b91d6bac5b3" -dependencies = [ - "rustc_version 0.2.3", -] - -[[package]] -name = "bare-metal" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fe8f5a8a398345e52358e18ff07cc17a568fbca5c6f73873d3a62056309603" - [[package]] name = "base16ct" version = "0.1.1" @@ -1592,6 +1878,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "base64-simd" version = "0.8.0" @@ -1604,71 +1896,73 @@ dependencies = [ [[package]] name = "base64ct" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3" [[package]] name = "beacon" version = "0.1.0" -source = "git+https://github.com/helium/proto?branch=master#e50dc72e19c29da9ce668954c8ac4341f936e255" +source = "git+https://github.com/helium/proto?branch=master#ddc23d5b19b56d4725f94005e6f89bf8fc516043" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "byteorder", "helium-proto", - "prost", + "prost 0.12.6", "rand 0.8.5", - "rand_chacha 0.3.0", + "rand_chacha 0.3.1", "rust_decimal", "serde", - "sha2 0.10.8", - "thiserror", + "sha2 0.10.9", + "thiserror 1.0.69", ] [[package]] -name = "beef" -version = "0.5.2" +name = "bincode" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ "serde", ] [[package]] -name = "bincode" -version = "1.3.3" +name = "bindgen" +version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ - "serde", + "bitflags 2.9.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.101", + "which", ] [[package]] name = "bit-set" -version = "0.5.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bit_field" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" - -[[package]] -name = "bitfield" -version = "0.13.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitflags" @@ -1678,22 +1972,13 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" dependencies = [ "serde", ] -[[package]] -name = "bitmaps" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" -dependencies = [ - "typenum", -] - [[package]] name = "bitvec" version = "1.0.1" @@ -1708,37 +1993,37 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" +checksum = "06e903a20b159e944f91ec8499fe1e55651480c541ea0a584f5d967c49ad9d99" dependencies = [ "arrayref", "arrayvec", - "constant_time_eq 0.1.5", + "constant_time_eq", ] [[package]] name = "blake2s_simd" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4" +checksum = "e90f7deecfac93095eb874a40febd69427776e24e1bd7f87f33ac62d6f0174df" dependencies = [ "arrayref", "arrayvec", - "constant_time_eq 0.1.5", + "constant_time_eq", ] [[package]] name = "blake3" -version = "1.5.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", - "constant_time_eq 0.3.0", + "constant_time_eq", "digest 0.10.7", ] @@ -1748,7 +2033,6 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding", "generic-array", ] @@ -1761,23 +2045,17 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - [[package]] name = "boost-manager" version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "axum 0.7.4", - "base64 0.21.7", - "bs58 0.5.1", + "axum 0.8.4", + "base64 0.22.1", + "bs58", "chrono", - "clap 4.4.8", + "clap", "config", "custom-tracing", "db-store", @@ -1786,7 +2064,7 @@ dependencies = [ "futures-util", "helium-proto", "hextree", - "http 0.2.11", + "http 0.2.12", "http-serde", "humantime-serde", "lazy_static", @@ -1795,17 +2073,17 @@ dependencies = [ "mobile-config", "once_cell", "poc-metrics", - "prost", + "prost 0.12.6", "rand 0.8.5", "rust_decimal", "rust_decimal_macros", "serde", "serde_json", - "sha2 0.10.8", + "sha2 0.10.9", "solana", - "sqlx", + "sqlx 0.6.2", "task-manager", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-util", "tonic", @@ -1816,42 +2094,32 @@ dependencies = [ [[package]] name = "borsh" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" -dependencies = [ - "borsh-derive 0.9.3", - "hashbrown 0.11.2", -] - -[[package]] -name = "borsh" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" +checksum = "115e54d64eb62cdebad391c19efc9dce4981c690c85a33a12199d99bb9546fee" dependencies = [ - "borsh-derive 0.10.3", - "hashbrown 0.13.1", + "borsh-derive 0.10.4", + "hashbrown 0.13.2", ] [[package]] name = "borsh" -version = "1.5.1" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" +checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce" dependencies = [ - "borsh-derive 1.5.1", + "borsh-derive 1.5.7", "cfg_aliases", ] [[package]] name = "borsh-derive" -version = "0.9.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" +checksum = "831213f80d9423998dd696e2c5345aba6be7a0bd8cd19e31c5243e13df1cef89" dependencies = [ - "borsh-derive-internal 0.9.3", - "borsh-schema-derive-internal 0.9.3", + "borsh-derive-internal", + "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", "proc-macro2", "syn 1.0.109", @@ -1859,58 +2127,22 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "0.10.3" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" +checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3" dependencies = [ - "borsh-derive-internal 0.10.3", - "borsh-schema-derive-internal 0.10.3", - "proc-macro-crate 0.1.5", + "once_cell", + "proc-macro-crate 3.3.0", "proc-macro2", - "syn 1.0.109", + "quote", + "syn 2.0.101", ] [[package]] -name = "borsh-derive" -version = "1.5.1" +name = "borsh-derive-internal" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" -dependencies = [ - "once_cell", - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.58", - "syn_derive", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "borsh-schema-derive-internal" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" +checksum = "65d6ba50644c98714aa2a70d13d7df3cd75cd2b523a2b452bf010443800976b3" dependencies = [ "proc-macro2", "quote", @@ -1919,9 +2151,9 @@ dependencies = [ [[package]] name = "borsh-schema-derive-internal" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" +checksum = "276691d96f063427be83e6692b86148e488ebba9f48f77788724ca027ba3b6d4" dependencies = [ "proc-macro2", "quote", @@ -1930,9 +2162,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.3.4" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "cf19e729cdbd51af9a397fb9ef8ac8378007b797f8273cfbfdf45dcaa316167b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1941,53 +2173,29 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", ] -[[package]] -name = "bs58" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb" - -[[package]] -name = "bs58" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" - [[package]] name = "bs58" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" dependencies = [ - "sha2 0.10.8", + "sha2 0.10.9", "tinyvec", ] -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata 0.1.10", - "serde", -] - [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "bv" @@ -2023,22 +2231,22 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.16.1" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.4.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322" +checksum = "3fa76293b4f7bb636ab88fd78228235b5248b4d05cc589aed610f954af5d7c7a" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.101", ] [[package]] @@ -2049,15 +2257,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "bytes-utils" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9" +checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" dependencies = [ "bytes", "either", @@ -2070,17 +2278,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" dependencies = [ "libc", - "thiserror", + "thiserror 1.0.69", +] + +[[package]] +name = "cargo_toml" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a98356df42a2eb1bd8f1793ae4ee4de48e384dd974ce5eac8eee802edb7492be" +dependencies = [ + "serde", + "toml 0.8.22", ] [[package]] name = "cc" -version = "1.0.83" +version = "1.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "8691782945451c1c383942c4874dbe63814f61cb57ef773cda2972682b7bb3c0" dependencies = [ "jobserver", "libc", + "shlex", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", ] [[package]] @@ -2095,11 +2329,22 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +[[package]] +name = "cfg_eval" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45565fc9416b9896014f5732ac776f810ee53a66730c17e4020c3ec064a8f88f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" dependencies = [ "android-tzdata", "iana-time-zone", @@ -2107,63 +2352,35 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.0", + "windows-link", ] [[package]] name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - -[[package]] -name = "circuit-breaker" -version = "0.1.0" -source = "git+https://github.com/helium/helium-anchor-gen.git#3036b33793cfe54b20ab24761677493510d5bd50" -dependencies = [ - "anchor-gen", - "anchor-lang 0.29.0", -] - -[[package]] -name = "clap" -version = "2.34.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width", - "vec_map", + "crypto-common", + "inout", ] [[package]] -name = "clap" -version = "3.2.25" +name = "clang-sys" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_lex 0.2.4", - "indexmap 1.9.3", - "once_cell", - "strsim 0.10.0", - "termcolor", - "textwrap 0.16.0", + "glob", + "libc", + "libloading", ] [[package]] name = "clap" -version = "4.4.8" +version = "4.5.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" dependencies = [ "clap_builder", "clap_derive", @@ -2171,67 +2388,48 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.8" +version = "4.5.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" dependencies = [ "anstream", "anstyle", - "clap_lex 0.6.0", - "strsim 0.10.0", + "clap_lex", + "strsim", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" dependencies = [ - "heck 0.4.0", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.58", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", + "syn 2.0.101", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "cmake" -version = "0.1.49" +version = "0.1.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" +checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" dependencies = [ "cc", ] -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "combine" @@ -2246,40 +2444,48 @@ dependencies = [ "unreachable", ] +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] [[package]] name = "config" -version = "0.13.3" +version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d379af7f68bfc21714c6c7dea883544201741d2ce8274bb12fa54f89507f52a7" +checksum = "595aae20e65c3be792d05818e8c63025294ac3cb7e200f11459063a352a6ef80" dependencies = [ - "async-trait", - "lazy_static", - "nom", "pathdiff", "serde", - "toml", + "toml 0.8.22", + "winnow", ] [[package]] name = "console" -version = "0.15.8" +version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8" dependencies = [ "encode_unicode", - "lazy_static", "libc", - "unicode-width", - "windows-sys 0.52.0", + "once_cell", + "unicode-width 0.2.0", + "windows-sys 0.59.0", ] [[package]] @@ -2310,15 +2516,15 @@ checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const-random" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" dependencies = [ "const-random-macro", ] @@ -2329,34 +2535,32 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.16", "once_cell", "tiny-keccak", ] -[[package]] -name = "const_panic" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" - [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] -name = "constant_time_eq" -version = "0.3.0" +name = "core-foundation" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" dependencies = [ "core-foundation-sys", "libc", @@ -2364,9 +2568,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core2" @@ -2377,18 +2581,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "cortex-m" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70858629a458fdfd39f9675c4dc309411f2a3f83bede76988d81bf1a0ecee9e0" -dependencies = [ - "bare-metal 0.2.5", - "bitfield", - "embedded-hal", - "volatile-register", -] - [[package]] name = "coverage-map" version = "0.1.0" @@ -2409,117 +2601,99 @@ dependencies = [ "rstest", "rust_decimal", "rust_decimal_macros", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] [[package]] name = "crc" -version = "3.0.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" dependencies = [ "crc-catalog", ] [[package]] name = "crc-catalog" -version = "2.1.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32c" -version = "0.6.3" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfea2db42e9927a3845fb268a10a72faed6d416065f77873f05e411457c363e" +checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47" dependencies = [ - "rustc_version 0.4.0", + "rustc_version", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] -[[package]] -name = "critical-section" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95da181745b56d4bd339530ec393508910c909c784e8962d15d722bacf0bcbcd" -dependencies = [ - "bare-metal 1.0.0", - "cfg-if", - "cortex-m", - "riscv", -] - [[package]] name = "crossbeam-channel" -version = "0.5.13" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.7.1", - "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" [[package]] name = "crypto-bigint" @@ -2540,6 +2714,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "rand_core 0.6.4", "typenum", ] @@ -2555,9 +2730,9 @@ dependencies = [ [[package]] name = "crypto-mac" -version = "0.11.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" dependencies = [ "generic-array", "subtle", @@ -2565,65 +2740,92 @@ dependencies = [ [[package]] name = "csv" -version = "1.1.6" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf" dependencies = [ - "bstr", "csv-core", - "itoa 0.4.8", + "itoa", "ryu", "serde", ] [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "7d02f3b0da4c6504f86e9cd789d8dbafab48c2321be74e9987593de5a894d93d" dependencies = [ "memchr", ] [[package]] name = "ct-codecs" -version = "1.1.1" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df" +checksum = "e994091bae428316ad612b1d563e7bd917141ba942963f65251bb07c0f31cc55" [[package]] name = "ctr" -version = "0.8.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ "cipher", ] [[package]] name = "curve25519-dalek" -version = "3.2.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "rand_core 0.6.4", + "rustc_version", "serde", "subtle", "zeroize", ] +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + [[package]] name = "custom-tracing" version = "0.1.0" dependencies = [ "anyhow", - "axum 0.7.4", - "bs58 0.5.1", - "helium-crypto", + "axum 0.8.4", + "bs58", + "helium-crypto 0.9.0", "helium-proto", - "http 0.2.11", + "http 0.2.12", "notify", "serde", "tokio", @@ -2634,183 +2836,95 @@ dependencies = [ ] [[package]] -name = "cxx" -version = "1.0.82" +name = "darling" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", + "darling_core", + "darling_macro", ] [[package]] -name = "cxx-build" -version = "1.0.82" +name = "darling_core" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" dependencies = [ - "cc", - "codespan-reporting", - "once_cell", + "fnv", + "ident_case", "proc-macro2", "quote", - "scratch", - "syn 1.0.109", + "strsim", + "syn 2.0.101", ] [[package]] -name = "cxxbridge-flags" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.82" +name = "darling_macro" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ - "proc-macro2", + "darling_core", "quote", - "syn 1.0.109", + "syn 2.0.101", ] [[package]] -name = "darling" -version = "0.14.2" +name = "dashmap" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "darling_core 0.14.2", - "darling_macro 0.14.2", + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core 0.9.10", ] [[package]] -name = "darling" -version = "0.20.5" +name = "data-encoding" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc5d6b04b3fd0ba9926f945895de7d806260a2d7431ba82e7edaecb043c4c6b8" +checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" + +[[package]] +name = "db-store" +version = "0.1.0" dependencies = [ - "darling_core 0.20.5", - "darling_macro 0.20.5", + "aws-config 0.101.0", + "aws-credential-types 0.101.0", + "aws-sdk-sts 0.39.0", + "aws-sig-auth 0.60.3", + "aws-smithy-http 0.62.1", + "aws-types 0.101.0", + "http 0.2.12", + "metrics", + "poc-metrics", + "serde", + "sqlx 0.6.2", + "thiserror 1.0.69", + "tokio", + "tracing", ] [[package]] -name = "darling_core" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" +name = "denylist" +version = "0.1.0" dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_core" -version = "0.20.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e48a959bcd5c761246f5d090ebc2fbf7b9cd527a492b07a67510c108f1e7e3" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 2.0.58", -] - -[[package]] -name = "darling_macro" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" -dependencies = [ - "darling_core 0.14.2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.20.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77" -dependencies = [ - "darling_core 0.20.5", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.1", - "lock_api", - "once_cell", - "parking_lot_core 0.9.8", -] - -[[package]] -name = "data-credits" -version = "0.2.2" -source = "git+https://github.com/helium/helium-anchor-gen.git#3036b33793cfe54b20ab24761677493510d5bd50" -dependencies = [ - "anchor-gen", - "anchor-lang 0.29.0", -] - -[[package]] -name = "data-encoding" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" - -[[package]] -name = "db-store" -version = "0.1.0" -dependencies = [ - "aws-config", - "aws-credential-types", - "aws-sdk-sts", - "aws-sig-auth 0.54.1", - "aws-smithy-http 0.54.4", - "aws-types 0.54.1", - "http 0.2.11", - "metrics", - "poc-metrics", - "serde", - "sqlx", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "denylist" -version = "0.1.0" -dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "bincode", "bytes", "chrono", "config", - "helium-crypto", + "helium-crypto 0.9.0", "humantime-serde", - "reqwest", + "reqwest 0.12.15", "serde", "serde_json", - "sha2 0.10.8", - "thiserror", + "sha2 0.10.9", + "thiserror 1.0.69", "tracing", "xorf", "xorf-generator", @@ -2825,20 +2939,39 @@ dependencies = [ "const-oid 0.7.1", ] +[[package]] +name = "der" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" +dependencies = [ + "const-oid 0.9.6", + "zeroize", +] + [[package]] name = "der-parser" -version = "8.1.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" dependencies = [ "asn1-rs", "displaydoc", "nom", - "num-bigint 0.4.4", + "num-bigint 0.4.6", "num-traits", "rusticata-macros", ] +[[package]] +name = "deranged" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" +dependencies = [ + "powerfmt", +] + [[package]] name = "derivation-path" version = "0.2.0" @@ -2858,33 +2991,33 @@ dependencies = [ [[package]] name = "derive_builder" -version = "0.12.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.12.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" dependencies = [ - "darling 0.14.2", + "darling", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.101", ] [[package]] name = "derive_builder_macro" -version = "0.12.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 1.0.109", + "syn 2.0.101", ] [[package]] @@ -2915,7 +3048,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", - "const-oid 0.9.5", + "const-oid 0.9.6", "crypto-common", "subtle", ] @@ -2942,13 +3075,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.101", ] [[package]] @@ -2971,14 +3104,20 @@ checksum = "a6cbae11b3de8fce2a456e8ea3dada226b35fe791f0dc1d360c0941f0bb681f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.101", ] [[package]] name = "dotenvy" -version = "0.15.6" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "dunce" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d8c417d7a8cb362e0c37e5d815f5eb7c37f79ff93707329d5a194e42e54ca0" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "eager" @@ -2992,10 +3131,10 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" dependencies = [ - "der", + "der 0.5.1", "elliptic-curve", "rfc6979", - "signature", + "signature 1.4.0", ] [[package]] @@ -3004,18 +3143,28 @@ version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ - "signature", + "signature 1.4.0", +] + +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "pkcs8", + "signature 2.2.0", ] [[package]] name = "ed25519-compact" -version = "2.0.4" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3d382e8464107391c8706b4c14b087808ecb909f6c15c34114bc42e53a9e4c" +checksum = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190" dependencies = [ "ct-codecs", - "ed25519", - "getrandom 0.2.10", + "ed25519 2.2.3", + "getrandom 0.2.16", ] [[package]] @@ -3024,8 +3173,8 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek", - "ed25519", + "curve25519-dalek 3.2.0", + "ed25519 1.5.3", "rand 0.7.3", "serde", "sha2 0.9.9", @@ -3041,14 +3190,17 @@ dependencies = [ "derivation-path", "ed25519-dalek", "hmac 0.12.1", - "sha2 0.10.8", + "sha2 0.10.9", ] [[package]] name = "either" -version = "1.9.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +dependencies = [ + "serde", +] [[package]] name = "elliptic-curve" @@ -3058,7 +3210,7 @@ checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" dependencies = [ "base16ct", "crypto-bigint", - "der", + "der 0.5.1", "ff", "generic-array", "group", @@ -3068,27 +3220,17 @@ dependencies = [ "zeroize", ] -[[package]] -name = "embedded-hal" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35949884794ad573cf46071e41c9b60efb0cb311e3ca01f7af807af1debc66ff" -dependencies = [ - "nb 0.1.3", - "void", -] - [[package]] name = "encode_unicode" -version = "0.3.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] @@ -3104,13 +3246,13 @@ dependencies = [ [[package]] name = "enum-iterator-derive" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" +checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.101", ] [[package]] @@ -3128,9 +3270,30 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.1" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "errno" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + +[[package]] +name = "etcetera" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] [[package]] name = "event-listener" @@ -3139,12 +3302,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] -name = "fanout" -version = "0.1.0" -source = "git+https://github.com/helium/helium-anchor-gen.git#3036b33793cfe54b20ab24761677493510d5bd50" +name = "event-listener" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" dependencies = [ - "anchor-gen", - "anchor-lang 0.29.0", + "event-listener 5.4.0", + "pin-project-lite", ] [[package]] @@ -3158,13 +3333,19 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + [[package]] name = "feature-probe" version = "0.1.1" @@ -3181,6 +3362,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + [[package]] name = "file-store" version = "0.1.0" @@ -3188,42 +3375,42 @@ dependencies = [ "anyhow", "async-compression", "async-trait", - "aws-config", + "aws-config 0.51.0", "aws-sdk-s3", "aws-types 0.51.0", - "base64 0.21.7", + "base64 0.22.1", "beacon", "blake3", "bytes", "chrono", - "clap 4.4.8", + "clap", "config", "csv", "derive_builder", "futures", "futures-util", "h3o", - "helium-crypto", + "helium-crypto 0.9.0", "helium-proto", "hex-literal", - "http 0.2.11", + "http 0.2.12", "lazy_static", "metrics", "poc-metrics", - "prost", + "prost 0.12.6", "regex", "retainer", "rust_decimal", "rust_decimal_macros", "serde", "serde_json", - "sha2 0.10.8", - "sqlx", - "strum", - "strum_macros", + "sha2 0.10.9", + "sqlx 0.6.2", + "strum 0.27.1", + "strum_macros 0.27.1", "task-manager", "tempfile", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-util", @@ -3234,30 +3421,51 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", +] + +[[package]] +name = "five8_const" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26dec3da8bc3ef08f2c04f61eab298c3ab334523e55f076354d6d6f613799a7b" +dependencies = [ + "five8_core", ] +[[package]] +name = "five8_core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2551bf44bc5f776c15044b9b94153a00198be06743e262afaaa61f11ac7523a5" + [[package]] name = "fixedbitset" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +[[package]] +name = "fixedbitset" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" + [[package]] name = "flate2" -version = "1.0.25" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece" dependencies = [ "crc32fast", - "miniz_oxide 0.6.2", + "miniz_oxide", ] [[package]] @@ -3278,6 +3486,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -3302,6 +3516,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "fsevent-sys" version = "4.1.0" @@ -3319,9 +3539,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -3334,9 +3554,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -3344,15 +3564,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -3371,60 +3591,56 @@ dependencies = [ ] [[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-lite" -version = "1.12.0" +name = "futures-intrusive" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ - "fastrand", "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", + "lock_api", + "parking_lot 0.12.3", ] +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.101", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -3444,20 +3660,20 @@ version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ - "serde", "typenum", "version_check", ] [[package]] name = "geo" -version = "0.26.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1645cf1d7fea7dac1a66f7357f3df2677ada708b8d9db8e9b043878930095a96" +checksum = "4416397671d8997e9a3e7ad99714f4f00a22e9eaa9b966a5985d2194fc9e02e1" dependencies = [ "float_next_after", "geo-types", "geographiclib-rs", + "i_overlay", "log", "num-traits", "robust", @@ -3466,9 +3682,9 @@ dependencies = [ [[package]] name = "geo-types" -version = "0.7.11" +version = "0.7.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9705398c5c7b26132e74513f4ee7c1d7dafd786004991b375c172be2be0eecaa" +checksum = "62ddb1950450d67efee2bbc5e429c68d052a822de3aad010d28b351fbb705224" dependencies = [ "approx", "num-traits", @@ -3478,24 +3694,11 @@ dependencies = [ [[package]] name = "geographiclib-rs" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea804e7bd3c6a4ca6a01edfa35231557a8a81d4d3f3e1e2b650d028c42592be" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "geojson" -version = "0.24.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d728c1df1fbf328d74151efe6cb0586f79ee813346ea981add69bd22c9241b" +checksum = "e6e5ed84f8089c70234b0a8e0aedb6dc733671612ddc0d37c6066052f9781960" dependencies = [ - "geo-types", - "log", - "serde", - "serde_json", - "thiserror", + "libm", ] [[package]] @@ -3523,9 +3726,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "js-sys", @@ -3534,27 +3737,50 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "getrandom" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", + "wasm-bindgen", +] + [[package]] name = "gimli" -version = "0.26.2" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] -name = "goblin" -version = "0.5.4" +name = "governor" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" +checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" dependencies = [ - "log", - "plain", - "scroll", + "cfg-if", + "dashmap", + "futures", + "futures-timer", + "no-std-compat", + "nonzero_ext", + "parking_lot 0.12.3", + "portable-atomic", + "quanta", + "rand 0.8.5", + "smallvec", + "spinning_top", ] [[package]] @@ -3570,17 +3796,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http 0.2.11", - "indexmap 1.9.3", + "http 0.2.12", + "indexmap 2.9.0", "slab", "tokio", "tokio-util", @@ -3589,17 +3815,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.2" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943" +checksum = "75249d144030531f8dee69fe9cea04d3edf809a017ae445e2abdff6629e86633" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", - "http 1.0.0", - "indexmap 2.2.6", + "http 1.3.1", + "indexmap 2.9.0", "slab", "tokio", "tokio-util", @@ -3608,21 +3834,26 @@ dependencies = [ [[package]] name = "h3o" -version = "0.4.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fb938100651db317719f46877a3cd82105920be4ea2ff49d55d1d65fa7bec1" +checksum = "fd8f6bbd82fcf88ec958095a97201044bc36307ad0ac3dba72106c973e8873a9" dependencies = [ "ahash 0.8.11", - "auto_ops", "either", "float_eq", "geo", - "geojson", - "konst", + "h3o-bit", + "libm", "serde", "serde_repr", ] +[[package]] +name = "h3o-bit" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb45e8060378c0353781abf67e1917b545a6b710d0342d85b70c125af7ef320" + [[package]] name = "hash32" version = "0.2.1" @@ -3633,12 +3864,12 @@ dependencies = [ ] [[package]] -name = "hashbrown" -version = "0.11.2" +name = "hash32" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" dependencies = [ - "ahash 0.7.6", + "byteorder", ] [[package]] @@ -3647,46 +3878,53 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.8", ] [[package]] name = "hashbrown" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ "ahash 0.8.11", ] [[package]] name = "hashbrown" -version = "0.14.1" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", + "allocator-api2", ] [[package]] -name = "hashlink" -version = "0.8.1" +name = "hashbrown" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" +checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" dependencies = [ - "hashbrown 0.12.3", + "foldhash", +] + +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.5", ] [[package]] name = "heapless" -version = "0.7.16" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" dependencies = [ - "atomic-polyfill", - "hash32", - "rustc_version 0.4.0", - "spin 0.9.4", + "hash32 0.3.1", "stable_deref_trait", ] @@ -3701,9 +3939,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" dependencies = [ "unicode-segmentation", ] @@ -3714,39 +3952,15 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "helium-anchor-gen" -version = "0.1.0" -source = "git+https://github.com/helium/helium-anchor-gen.git#3036b33793cfe54b20ab24761677493510d5bd50" -dependencies = [ - "anchor-gen", - "anchor-lang 0.29.0", - "circuit-breaker", - "data-credits", - "fanout", - "helium-entity-manager", - "helium-sub-daos", - "hexboosting", - "lazy-distributor", - "lazy-transactions", - "mobile-entity-manager", - "price-oracle", - "rewards-oracle", - "treasury-management", - "voter-stake-registry", -] - [[package]] name = "helium-crypto" version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ea5347e981a2d16f06b51d04361a2562cd89b806d765293522f61c5de0ec49" +source = "git+https://github.com/helium/helium-crypto-rs.git?branch=main#dc4bd575b1bd8b89617f98b64ac89f7ff0226302" dependencies = [ - "base64 0.21.7", - "bs58 0.5.1", + "base64 0.22.1", + "bs58", "byteorder", "ed25519-compact", - "getrandom 0.2.10", "k256", "lazy_static", "multihash", @@ -3754,57 +3968,70 @@ dependencies = [ "rand_core 0.6.4", "rsa", "serde", - "sha2 0.10.8", - "signature", - "solana-sdk", - "sqlx", - "thiserror", + "sha2 0.10.9", + "signature 1.4.0", + "thiserror 1.0.69", ] [[package]] -name = "helium-entity-manager" -version = "0.2.11" -source = "git+https://github.com/helium/helium-anchor-gen.git#3036b33793cfe54b20ab24761677493510d5bd50" +name = "helium-crypto" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "333dfb5467550fdd77fc6f419a725775ef909746250d3519138a2ddcb08a73d7" dependencies = [ - "anchor-gen", - "anchor-lang 0.29.0", + "base64 0.22.1", + "bs58", + "byteorder", + "ed25519-compact", + "k256", + "lazy_static", + "multihash", + "p256", + "rand_core 0.6.4", + "rsa", + "serde", + "sha2 0.10.9", + "signature 1.4.0", + "solana-sdk", + "sqlx 0.7.4", + "thiserror 1.0.69", ] [[package]] name = "helium-lib" -version = "0.0.0" -source = "git+https://github.com/helium/helium-wallet-rs.git?branch=master#21208fcf8dcaaee955fa38798d9fa0da6b8d3f7b" +version = "0.1.1" dependencies = [ "anchor-client", + "anchor-lang", "anchor-spl", "angry-purple-tiger 0.1.0", "async-trait", - "base64 0.21.7", + "base64 0.22.1", "bincode", + "bytemuck", "chrono", "futures", "h3o", - "helium-anchor-gen", - "helium-crypto", + "helium-crypto 0.9.0", "helium-proto", "hex", - "itertools", + "itertools 0.14.0", "jsonrpc_client", "lazy_static", - "mpl-bubblegum", "pyth-solana-receiver-sdk", - "reqwest", + "reqwest 0.11.27", "rust_decimal", "serde", "serde_json", - "sha2 0.10.8", + "sha2 0.10.9", + "solana-client", "solana-program", "solana-sdk", "solana-transaction-status", - "spl-account-compression", - "spl-associated-token-account 3.0.2", + "solana-transaction-utils", + "spl-associated-token-account", "spl-memo", - "thiserror", + "thiserror 1.0.69", "tonic", "tracing", "url", @@ -3816,25 +4043,16 @@ version = "0.1.0" source = "git+https://github.com/helium/proto?branch=master#ddc23d5b19b56d4725f94005e6f89bf8fc516043" dependencies = [ "bytes", - "prost", - "prost-build", + "prost 0.12.6", + "prost-build 0.12.6", "serde", "serde_json", - "strum", - "strum_macros", + "strum 0.26.3", + "strum_macros 0.26.4", "tonic", "tonic-build", ] -[[package]] -name = "helium-sub-daos" -version = "0.1.8" -source = "git+https://github.com/helium/helium-anchor-gen.git#3036b33793cfe54b20ab24761677493510d5bd50" -dependencies = [ - "anchor-gen", - "anchor-lang 0.29.0", -] - [[package]] name = "hermit-abi" version = "0.1.19" @@ -3846,9 +4064,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -3871,28 +4089,19 @@ dependencies = [ "hextree", "rust_decimal", "rust_decimal_macros", - "sqlx", + "sqlx 0.6.2", ] [[package]] name = "hex-literal" -version = "0.3.4" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" - -[[package]] -name = "hexboosting" -version = "0.1.0" -source = "git+https://github.com/helium/helium-anchor-gen.git#3036b33793cfe54b20ab24761677493510d5bd50" -dependencies = [ - "anchor-gen", - "anchor-lang 0.29.0", -] +checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "hextree" -version = "0.3.1" -source = "git+https://github.com/jaykickliter/HexTree?branch=main#f3ac30814f15bf1c98714a40c3b094429dc8b1b2" +version = "0.3.2" +source = "git+https://github.com/jaykickliter/HexTree?branch=main#0828b4bc908589816727cf98ccc610f23d21807f" dependencies = [ "byteorder", "memmap", @@ -3907,9 +4116,9 @@ checksum = "12cb882ccb290b8646e554b157ab0b71e64e8d5bef775cd66b6531e52d302669" [[package]] name = "hkdf" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ "hmac 0.12.1", ] @@ -3930,7 +4139,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" dependencies = [ - "crypto-mac 0.11.1", + "crypto-mac 0.11.0", "digest 0.9.0", ] @@ -3954,95 +4163,98 @@ dependencies = [ "hmac 0.8.1", ] +[[package]] +name = "home" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +dependencies = [ + "windows-sys 0.59.0", +] + [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", - "itoa 1.0.9", + "itoa", ] [[package]] name = "http" -version = "1.0.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" dependencies = [ "bytes", "fnv", - "itoa 1.0.9", + "itoa", ] [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.11", + "http 0.2.12", "pin-project-lite", ] [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.0.0", + "http 1.3.1", ] [[package]] name = "http-body-util" -version = "0.1.0" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes", - "futures-util", - "http 1.0.0", - "http-body 1.0.0", + "futures-core", + "http 1.3.1", + "http-body 1.0.1", "pin-project-lite", ] -[[package]] -name = "http-range-header" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" - [[package]] name = "http-serde" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e272971f774ba29341db2f686255ff8a979365a26fb9e4277f6b6d9ec0cdd5e" +checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" dependencies = [ - "http 0.2.11", + "http 0.2.12", "serde", ] [[package]] name = "httparse" -version = "1.8.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" [[package]] name = "humantime-serde" @@ -4056,20 +4268,20 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2 0.3.21", - "http 0.2.11", - "http-body 0.4.5", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", - "itoa 1.0.9", + "itoa", "pin-project-lite", "socket2", "tokio", @@ -4080,34 +4292,36 @@ dependencies = [ [[package]] name = "hyper" -version = "1.1.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" +checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.2", - "http 1.0.0", - "http-body 1.0.0", + "h2 0.4.9", + "http 1.3.1", + "http-body 1.0.1", "httparse", "httpdate", - "itoa 1.0.9", + "itoa", "pin-project-lite", + "smallvec", "tokio", + "want", ] [[package]] name = "hyper-rustls" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59df7c4e19c950e6e0e868dcc0a300b09a9b88e9ec55bd879ca819087a77355d" +checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ - "http 0.2.11", - "hyper 0.14.28", + "http 0.2.12", + "hyper 0.14.32", "log", "rustls 0.20.9", - "rustls-native-certs", + "rustls-native-certs 0.6.3", "tokio", "tokio-rustls 0.23.4", ] @@ -4119,80 +4333,250 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http 0.2.11", - "hyper 0.14.28", + "http 0.2.12", + "hyper 0.14.32", "log", "rustls 0.21.12", - "rustls-native-certs", + "rustls-native-certs 0.6.3", "tokio", "tokio-rustls 0.24.1", ] [[package]] -name = "hyper-timeout" -version = "0.4.1" +name = "hyper-rustls" +version = "0.27.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" dependencies = [ - "hyper 0.14.28", - "pin-project-lite", + "futures-util", + "http 1.3.1", + "hyper 1.6.0", + "hyper-util", + "log", + "rustls 0.23.26", + "rustls-native-certs 0.8.1", + "rustls-pki-types", "tokio", - "tokio-io-timeout", + "tokio-rustls 0.26.2", + "tower-service", + "webpki-roots 0.26.10", ] [[package]] -name = "hyper-tls" -version = "0.5.0" +name = "hyper-timeout" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "bytes", - "hyper 0.14.28", - "native-tls", + "hyper 0.14.32", + "pin-project-lite", "tokio", - "tokio-native-tls", + "tokio-io-timeout", ] [[package]] name = "hyper-util" -version = "0.1.2" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67" +checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2" dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "hyper 1.1.0", + "http 1.3.1", + "http-body 1.0.1", + "hyper 1.6.0", + "libc", "pin-project-lite", "socket2", "tokio", + "tower-service", "tracing", ] +[[package]] +name = "i_float" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85df3a416829bb955fdc2416c7b73680c8dcea8d731f2c7aa23e1042fe1b8343" +dependencies = [ + "serde", +] + +[[package]] +name = "i_key_sort" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "347c253b4748a1a28baf94c9ce133b6b166f08573157e05afe718812bc599fcd" + +[[package]] +name = "i_overlay" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0542dfef184afdd42174a03dcc0625b6147fb73e1b974b1a08a2a42ac35cee49" +dependencies = [ + "i_float", + "i_key_sort", + "i_shape", + "i_tree", +] + +[[package]] +name = "i_shape" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a38f5a42678726718ff924f6d4a0e79b129776aeed298f71de4ceedbd091bce" +dependencies = [ + "i_float", + "serde", +] + +[[package]] +name = "i_tree" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "155181bc97d770181cf9477da51218a19ee92a8e5be642e796661aee2b601139" + [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", + "log", "wasm-bindgen", - "winapi", + "windows-core", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ - "cxx", - "cxx-build", + "proc-macro2", + "quote", + "syn 2.0.101", ] [[package]] @@ -4203,35 +4587,30 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", ] [[package]] -name = "ieee754" -version = "0.2.6" +name = "idna_adapter" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9007da9cacbd3e6343da136e98b0d2df013f553d35bdec8b518f07bea768e19c" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", +] [[package]] -name = "im" -version = "15.1.0" +name = "ieee754" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" -dependencies = [ - "bitmaps", - "rand_core 0.6.4", - "rand_xoshiro", - "rayon", - "serde", - "sized-chunks", - "typenum", - "version_check", -] +checksum = "9007da9cacbd3e6343da136e98b0d2df013f553d35bdec8b518f07bea768e19c" [[package]] name = "indexmap" @@ -4245,26 +4624,26 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", - "hashbrown 0.14.1", + "hashbrown 0.15.3", "serde", ] [[package]] name = "indicatif" -version = "0.17.7" +version = "0.17.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" dependencies = [ "console", - "instant", "number_prefix", "portable-atomic", - "unicode-width", + "unicode-width 0.2.0", + "web-time", ] [[package]] @@ -4273,30 +4652,30 @@ version = "0.1.0" dependencies = [ "anyhow", "backon", - "base64 0.21.7", - "bs58 0.5.1", + "base64 0.22.1", + "bs58", "chrono", - "clap 4.4.8", + "clap", "config", "custom-tracing", "file-store", "futures", "futures-util", - "helium-crypto", + "helium-crypto 0.9.0", "helium-proto", - "http 0.2.11", + "http 0.2.12", "humantime-serde", "metrics", "metrics-exporter-prometheus", "mobile-config", "poc-metrics", - "prost", + "prost 0.12.6", "rand 0.8.5", "serde", "serde_json", - "sha2 0.10.8", + "sha2 0.10.9", "task-manager", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-util", @@ -4326,11 +4705,20 @@ dependencies = [ "libc", ] +[[package]] +name = "inout" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" +dependencies = [ + "generic-array", +] + [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -4342,27 +4730,27 @@ dependencies = [ "anyhow", "async-trait", "backon", - "base64 0.21.7", - "bs58 0.5.1", + "base64 0.22.1", + "bs58", "chrono", - "clap 4.4.8", + "clap", "config", "custom-tracing", "db-store", "file-store", "futures", "futures-util", - "helium-crypto", + "helium-crypto 0.9.0", "helium-proto", "hextree", - "http 0.2.11", + "http 0.2.12", "http-serde", "humantime-serde", "libflate", "metrics", "metrics-exporter-prometheus", "poc-metrics", - "prost", + "prost 0.12.6", "rand 0.8.5", "retainer", "rust_decimal", @@ -4370,9 +4758,9 @@ dependencies = [ "serde", "serde_json", "solana", - "sqlx", + "sqlx 0.6.2", "task-manager", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-util", @@ -4390,27 +4778,27 @@ dependencies = [ "anyhow", "async-trait", "chrono", - "clap 4.4.8", + "clap", "config", "custom-tracing", "db-store", "file-store", "futures", "futures-util", - "helium-crypto", + "helium-crypto 0.9.0", "helium-proto", - "http 0.2.11", + "http 0.2.12", "http-serde", "humantime-serde", "iot-config", "metrics", "poc-metrics", - "prost", + "prost 0.12.6", "serde", "solana", - "sqlx", + "sqlx 0.6.2", "task-manager", - "thiserror", + "thiserror 1.0.69", "tokio", "tonic", "tracing", @@ -4424,11 +4812,11 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "base64 0.21.7", + "base64 0.22.1", "beacon", "blake3", "chrono", - "clap 4.4.8", + "clap", "cmake", "config", "custom-tracing", @@ -4438,18 +4826,18 @@ dependencies = [ "futures", "futures-util", "h3o", - "helium-crypto", + "helium-crypto 0.9.0", "helium-proto", "http-serde", "humantime-serde", "iot-config", - "itertools", + "itertools 0.14.0", "lazy_static", "metrics", "once_cell", "poc-metrics", "price", - "prost", + "prost 0.12.6", "rand 0.8.5", "retainer", "reward-scheduler", @@ -4457,11 +4845,11 @@ dependencies = [ "rust_decimal_macros", "serde", "serde_json", - "sha2 0.10.8", + "sha2 0.10.9", "solana", - "sqlx", + "sqlx 0.6.2", "task-manager", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-util", @@ -4475,9 +4863,15 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.1" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -4489,38 +4883,83 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.9" +name = "itertools" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] [[package]] -name = "jobserver" -version = "0.1.26" +name = "itertools" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ - "libc", + "either", ] [[package]] -name = "js-sys" -version = "0.3.69" +name = "itertools" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" dependencies = [ - "wasm-bindgen", + "either", ] [[package]] -name = "jsonrpc-core" -version = "18.0.0" +name = "itoa" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine 4.6.7", + "jni-sys", + "log", + "thiserror 1.0.69", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" +dependencies = [ + "getrandom 0.3.2", + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "jsonrpc-core" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" dependencies = [ @@ -4541,7 +4980,7 @@ checksum = "a0c1ec33c537dc1d5a8b597313db6d213fee54320f81ea0d19b0c3869b282e1a" dependencies = [ "async-trait", "jsonrpc_client_macro", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "url", @@ -4559,9 +4998,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.19.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f3783308bddc49d0218307f66a09330c106fbd792c58bac5c8dc294fdd0f98" +checksum = "1fba77a59c4c644fd48732367624d1bcf6f409f9c9a286fbc71d2f1fc0b2ea16" dependencies = [ "jsonrpsee-core", "jsonrpsee-http-client", @@ -4570,58 +5009,62 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.19.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaa4c4d5fb801dcc316d81f76422db259809037a86b3194ae538dd026b05ed7" +checksum = "693c93cbb7db25f4108ed121304b671a36002c2db67dff2ee4391a688c738547" dependencies = [ - "anyhow", - "async-lock", "async-trait", - "beef", + "bytes", "futures-timer", "futures-util", - "hyper 0.14.28", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", "jsonrpsee-types", - "rustc-hash", + "pin-project", + "rustc-hash 2.1.1", "serde", "serde_json", - "thiserror", + "thiserror 2.0.12", "tokio", "tokio-stream", + "tower 0.5.2", "tracing", ] [[package]] name = "jsonrpsee-http-client" -version = "0.19.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa7165efcbfbc951d180162ff28fe91b657ed81925e37a35e4a396ce12109f96" +checksum = "6962d2bd295f75e97dd328891e58fce166894b974c1f7ce2e7597f02eeceb791" dependencies = [ - "async-trait", - "hyper 0.14.28", - "hyper-rustls 0.24.2", + "base64 0.22.1", + "http-body 1.0.1", + "hyper 1.6.0", + "hyper-rustls 0.27.5", + "hyper-util", "jsonrpsee-core", "jsonrpsee-types", + "rustls 0.23.26", + "rustls-platform-verifier", "serde", "serde_json", - "thiserror", + "thiserror 2.0.12", "tokio", - "tower", - "tracing", + "tower 0.5.2", + "url", ] [[package]] name = "jsonrpsee-types" -version = "0.19.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00aa7cc87bc42e04e26c8ac3e7186142f7fd2949c763d9b6a7e64a69672d8fb2" +checksum = "66df7256371c45621b3b7d2fb23aea923d577616b9c0e9c0b950a6ea5c2be0ca" dependencies = [ - "anyhow", - "beef", + "http 1.3.1", "serde", "serde_json", - "thiserror", - "tracing", + "thiserror 2.0.12", ] [[package]] @@ -4637,44 +5080,15 @@ dependencies = [ "sha2 0.9.9", ] -[[package]] -name = "kaigan" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6dd100976df9dd59d0c3fecf6f9ad3f161a087374d1b2a77ebb4ad8920f11bb" -dependencies = [ - "borsh 0.10.3", -] - [[package]] name = "keccak" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] -[[package]] -name = "konst" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d9a8bb6c7c71d151b25936b03e012a4c00daea99e3a3797c6ead66b0a0d55e2" -dependencies = [ - "const_panic", - "konst_kernel", - "typewit", -] - -[[package]] -name = "konst_kernel" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d2ab266022e7309df89ed712bddc753e3a3c395c3ced1bb2e4470ec2a8146d" -dependencies = [ - "typewit", -] - [[package]] name = "kqueue" version = "1.0.8" @@ -4696,43 +5110,31 @@ dependencies = [ ] [[package]] -name = "lazy-distributor" -version = "0.2.0" -source = "git+https://github.com/helium/helium-anchor-gen.git#3036b33793cfe54b20ab24761677493510d5bd50" -dependencies = [ - "anchor-gen", - "anchor-lang 0.29.0", -] - -[[package]] -name = "lazy-transactions" -version = "0.2.0" -source = "git+https://github.com/helium/helium-anchor-gen.git#3036b33793cfe54b20ab24761677493510d5bd50" +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "anchor-gen", - "anchor-lang 0.29.0", + "spin 0.9.8", ] [[package]] -name = "lazy_static" -version = "1.4.0" +name = "lazycell" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin 0.5.2", -] +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "libflate" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05605ab2bce11bcfc0e9c635ff29ef8b2ea83f29be257ee7d730cac3ee373093" +checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" dependencies = [ "adler32", "crc32fast", @@ -4741,18 +5143,39 @@ dependencies = [ [[package]] name = "libflate_lz77" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a734c0493409afcd49deee13c006a04e3586b9761a03543c6272c9c51f2f5a" +checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf" dependencies = [ "rle-decode-fast", ] +[[package]] +name = "libloading" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + [[package]] name = "libm" -version = "0.2.6" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9627da5196e5d8ed0b0495e61e518847578da83483c37288316d9b2e03a7f72" + +[[package]] +name = "libredox" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.9.0", + "libc", + "redox_syscall 0.5.11", +] [[package]] name = "libsecp256k1" @@ -4803,31 +5226,28 @@ dependencies = [ ] [[package]] -name = "light-poseidon" -version = "0.2.0" +name = "linux-raw-sys" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c9a85a9752c549ceb7578064b4ed891179d20acd85f27318573b64d2d7ee7ee" -dependencies = [ - "ark-bn254", - "ark-ff", - "num-bigint 0.4.4", - "thiserror", -] +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] -name = "link-cplusplus" -version = "1.0.7" +name = "linux-raw-sys" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" -dependencies = [ - "cc", -] +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" + +[[package]] +name = "litemap" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -4835,9 +5255,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "matchers" @@ -4850,16 +5270,23 @@ dependencies = [ [[package]] name = "matchit" -version = "0.7.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if", "digest 0.10.7", ] @@ -4871,9 +5298,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap" @@ -4896,18 +5323,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -4926,9 +5344,9 @@ dependencies = [ [[package]] name = "metrics" -version = "0.22.3" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be3cbd384d4e955b231c895ce10685e3d8260c5ccffae898c96c723b0772835" +checksum = "25dea7ac8057892855ec285c440160265225438c3c45072613c25a4b26e98ef5" dependencies = [ "ahash 0.8.11", "portable-atomic", @@ -4936,43 +5354,78 @@ dependencies = [ [[package]] name = "metrics-exporter-prometheus" -version = "0.13.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a4c4718a371ddfb7806378f23617876eea8b82e5ff1324516bcd283249d9ea" +checksum = "df88858cd28baaaf2cfc894e37789ed4184be0e1351157aec7bf3c2266c793fd" dependencies = [ - "base64 0.21.7", - "hyper 0.14.28", - "hyper-tls", - "indexmap 1.9.3", + "base64 0.22.1", + "http-body-util", + "hyper 1.6.0", + "hyper-rustls 0.27.5", + "hyper-util", + "indexmap 2.9.0", "ipnet", "metrics", "metrics-util", "quanta", - "thiserror", + "thiserror 2.0.12", "tokio", "tracing", ] [[package]] name = "metrics-util" -version = "0.16.3" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b07a5eb561b8cbc16be2d216faf7757f9baf3bfb94dbb0fae3df8387a5bb47f" +checksum = "b8496cc523d1f94c1385dd8f0f0c2c480b2b8aeccb5b7e4485ad6365523ae376" dependencies = [ "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.14.1", + "hashbrown 0.15.3", "metrics", - "num_cpus", "quanta", + "rand 0.9.1", + "rand_xoshiro", "sketches-ddsketch", ] +[[package]] +name = "miette" +version = "7.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f98efec8807c63c752b5bd61f862c165c115b0a35685bdcfd9238c7aeb592b7" +dependencies = [ + "cfg-if", + "miette-derive", + "unicode-width 0.1.14", +] + +[[package]] +name = "miette-derive" +version = "7.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db5b29714e950dbb20d5e6f74f9dcec4edbcc1067bb7f8ed198c097b8c1a818b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] [[package]] name = "minimal-lexical" @@ -4982,32 +5435,34 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.5.4" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" dependencies = [ - "adler", + "adler2", ] [[package]] -name = "miniz_oxide" -version = "0.6.2" +name = "mio" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ - "adler", + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", ] [[package]] name = "mio" -version = "0.8.9" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5016,11 +5471,11 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "base64 0.21.7", + "base64 0.22.1", "blake3", - "bs58 0.5.1", + "bs58", "chrono", - "clap 4.4.8", + "clap", "config", "coverage-map", "custom-tracing", @@ -5028,10 +5483,10 @@ dependencies = [ "file-store", "futures", "futures-util", - "helium-crypto", + "helium-crypto 0.9.0", "helium-proto", "hextree", - "http 0.2.11", + "http 0.2.12", "http-serde", "humantime", "humantime-serde", @@ -5039,7 +5494,7 @@ dependencies = [ "metrics", "metrics-exporter-prometheus", "poc-metrics", - "prost", + "prost 0.12.6", "rand 0.8.5", "retainer", "rust_decimal", @@ -5047,9 +5502,9 @@ dependencies = [ "serde", "serde_json", "solana", - "sqlx", + "sqlx 0.6.2", "task-manager", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-util", @@ -5066,16 +5521,16 @@ version = "0.1.0" dependencies = [ "angry-purple-tiger 1.0.0", "anyhow", - "base64 0.21.7", - "clap 4.4.8", + "base64 0.22.1", + "clap", "custom-tracing", "dialoguer", "futures", "h3o", - "helium-crypto", + "helium-crypto 0.9.0", "helium-proto", "mobile-config", - "prost", + "prost 0.12.6", "rand 0.8.5", "serde", "serde_json", @@ -5085,15 +5540,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "mobile-entity-manager" -version = "0.1.3" -source = "git+https://github.com/helium/helium-anchor-gen.git#3036b33793cfe54b20ab24761677493510d5bd50" -dependencies = [ - "anchor-gen", - "anchor-lang 0.29.0", -] - [[package]] name = "mobile-packet-verifier" version = "0.1.0" @@ -5101,29 +5547,29 @@ dependencies = [ "anyhow", "async-trait", "chrono", - "clap 4.4.8", + "clap", "config", "custom-tracing", "db-store", "file-store", "futures", "futures-util", - "helium-crypto", + "helium-crypto 0.9.0", "helium-proto", - "http 0.2.11", + "http 0.2.12", "http-serde", "humantime-serde", "metrics", "mobile-config", "poc-metrics", - "prost", - "reqwest", + "prost 0.12.6", + "reqwest 0.12.15", "serde", - "sha2 0.10.8", + "sha2 0.10.9", "solana", - "sqlx", + "sqlx 0.6.2", "task-manager", - "thiserror", + "thiserror 1.0.69", "tokio", "tonic", "tracing", @@ -5138,9 +5584,9 @@ dependencies = [ "anyhow", "async-compression", "async-trait", - "base64 0.21.7", + "base64 0.22.1", "chrono", - "clap 4.4.8", + "clap", "config", "coverage-map", "coverage-point-calculator", @@ -5152,7 +5598,7 @@ dependencies = [ "futures", "futures-util", "h3o", - "helium-crypto", + "helium-crypto 0.9.0", "helium-proto", "hex-assignments", "hextree", @@ -5167,7 +5613,7 @@ dependencies = [ "poc-metrics", "price", "proptest", - "prost", + "prost 0.12.6", "rand 0.8.5", "regex", "retainer", @@ -5176,11 +5622,11 @@ dependencies = [ "rust_decimal_macros", "serde", "serde_json", - "sha2 0.10.8", + "sha2 0.10.9", "solana", - "sqlx", + "sqlx 0.6.2", "task-manager", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-util", @@ -5191,25 +5637,11 @@ dependencies = [ "uuid", ] -[[package]] -name = "mpl-bubblegum" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9eff5ae5cafd1acdf7e7c93359da1eec91dcaede318470d9f68b78e8b7469f4" -dependencies = [ - "borsh 0.10.3", - "kaigan", - "num-derive 0.3.3", - "num-traits", - "solana-program", - "thiserror", -] - [[package]] name = "multihash" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e5d911412e631e1de11eb313e4dd71f73fd964401102aab23d6c8327c431ba" +checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" dependencies = [ "blake2b_simd", "blake2s_simd", @@ -5217,8 +5649,8 @@ dependencies = [ "core2", "digest 0.10.7", "multihash-derive", - "sha2 0.10.8", - "sha3 0.10.6", + "sha2 0.10.9", + "sha3", "unsigned-varint", ] @@ -5233,85 +5665,64 @@ dependencies = [ "proc-macro2", "quote", "syn 1.0.109", - "synstructure", + "synstructure 0.12.6", ] [[package]] name = "multimap" -version = "0.8.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" [[package]] -name = "native-tls" -version = "0.2.11" +name = "nix" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "lazy_static", + "bitflags 2.9.0", + "cfg-if", + "cfg_aliases", "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "nb" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "801d31da0513b6ec5214e9bf433a77966320625a37860f910be265be6e18d06f" -dependencies = [ - "nb 1.0.0", + "memoffset", ] [[package]] -name = "nb" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "546c37ac5d9e56f55e73b677106873d9d9f5190605e41a856503623648488cae" - -[[package]] -name = "nix" -version = "0.26.4" +name = "no-std-compat" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", - "pin-utils", -] +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" [[package]] name = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", ] +[[package]] +name = "nonzero_ext" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" + [[package]] name = "notify" version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.9.0", "filetime", "fsevent-sys", "inotify", "kqueue", "libc", "log", - "mio", + "mio 0.8.11", "walkdir", "windows-sys 0.48.0", ] @@ -5333,10 +5744,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" dependencies = [ "num-bigint 0.2.6", - "num-complex", + "num-complex 0.2.4", + "num-integer", + "num-iter", + "num-rational 0.2.4", + "num-traits", +] + +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint 0.4.6", + "num-complex 0.4.6", "num-integer", "num-iter", - "num-rational", + "num-rational 0.4.2", "num-traits", ] @@ -5353,11 +5778,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -5390,16 +5814,20 @@ dependencies = [ ] [[package]] -name = "num-derive" -version = "0.3.3" +name = "num-complex" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.4.2" @@ -5408,24 +5836,23 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.101", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -5445,9 +5872,20 @@ dependencies = [ ] [[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint 0.4.6", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", @@ -5460,71 +5898,29 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.9", "libc", ] [[package]] name = "num_enum" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0072973714303aa6e3631c7e8e777970cf4bdd25dc4932e41031027b8bcc4e" -dependencies = [ - "num_enum_derive 0.5.10", -] - -[[package]] -name = "num_enum" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" -dependencies = [ - "num_enum_derive 0.6.1", -] - -[[package]] -name = "num_enum" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" -dependencies = [ - "num_enum_derive 0.7.2", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0629cbd6b897944899b1f10496d9c4a7ac5878d45fd61bc22e9e79bfbbc29597" -dependencies = [ - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "num_enum_derive" -version = "0.6.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn 2.0.58", + "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.3.0", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.101", ] [[package]] @@ -5535,9 +5931,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.29.0" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ "memchr", ] @@ -5553,23 +5949,23 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.9.0", "cfg-if", "foreign-types", "libc", @@ -5586,38 +5982,42 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.101", ] [[package]] name = "openssl-probe" -version = "0.1.5" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" + +[[package]] +name = "openssl-src" +version = "300.5.0+3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "e8ce546f549326b0e6052b649198487d91320875da901e7bd11a06d1ee3f9c2f" +dependencies = [ + "cc", +] [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - [[package]] name = "outref" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" +checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e" [[package]] name = "overload" @@ -5639,9 +6039,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.0.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -5651,24 +6051,24 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", ] [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.10", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", @@ -5680,37 +6080,28 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.5.11", "smallvec", - "windows-targets 0.48.0", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.9" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "pbkdf2" -version = "0.4.0" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" -dependencies = [ - "crypto-mac 0.8.0", -] +checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" [[package]] name = "pbkdf2" @@ -5753,44 +6144,54 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fd23b938276f14057220b707937bcb42fa76dda7560e57a2da30cb52d557937" dependencies = [ - "num", + "num 0.2.1", ] [[package]] name = "petgraph" -version = "0.6.2" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ - "fixedbitset", - "indexmap 1.9.3", + "fixedbitset 0.4.2", + "indexmap 2.9.0", +] + +[[package]] +name = "petgraph" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772" +dependencies = [ + "fixedbitset 0.5.7", + "indexmap 2.9.0", ] [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.101", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -5800,57 +6201,50 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkcs8" -version = "0.8.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der", + "der 0.7.10", "spki", - "zeroize", ] [[package]] name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "plain" -version = "0.2.3" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "poc-entropy" version = "0.1.0" dependencies = [ "anyhow", - "base64 0.21.7", + "base64 0.22.1", "blake3", - "bs58 0.4.0", + "bs58", "chrono", - "clap 4.4.8", + "clap", "config", "custom-tracing", "file-store", "futures", "futures-util", - "helium-crypto", + "helium-crypto 0.9.0", "helium-proto", - "http 0.2.11", - "hyper 0.14.28", + "http 0.2.12", + "hyper 0.14.32", "jsonrpsee", "metrics", "metrics-exporter-prometheus", "poc-metrics", - "prost", + "prost 0.12.6", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tonic", - "tower", + "tower 0.4.13", "tracing", "tracing-subscriber", "triggered", @@ -5863,20 +6257,20 @@ dependencies = [ "futures", "metrics", "metrics-exporter-prometheus", - "reqwest", + "reqwest 0.12.15", "serde", - "thiserror", + "thiserror 1.0.69", "tokio", - "tower", + "tower 0.4.13", "tracing", "tracing-subscriber", ] [[package]] name = "polyval" -version = "0.5.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", "cpufeatures", @@ -5886,24 +6280,33 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.5.0" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" + +[[package]] +name = "powerfmt" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b559898e0b4931ed2d3b959ab0c2da4d99cc644c4b0b1a35b4d344027f474023" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy 0.8.25", +] [[package]] name = "prettyplease" -version = "0.2.15" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6" dependencies = [ "proc-macro2", - "syn 2.0.58", + "syn 2.0.101", ] [[package]] @@ -5912,7 +6315,7 @@ version = "0.1.0" dependencies = [ "anyhow", "chrono", - "clap 4.4.8", + "clap", "config", "custom-tracing", "file-store", @@ -5923,14 +6326,14 @@ dependencies = [ "metrics", "metrics-exporter-prometheus", "poc-metrics", - "prost", + "prost 0.12.6", "rust_decimal", "rust_decimal_macros", "serde", "serde_json", "solana", "task-manager", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-util", "tracing", @@ -5938,22 +6341,13 @@ dependencies = [ "triggered", ] -[[package]] -name = "price-oracle" -version = "0.2.1" -source = "git+https://github.com/helium/helium-anchor-gen.git#3036b33793cfe54b20ab24761677493510d5bd50" -dependencies = [ - "anchor-gen", - "anchor-lang 0.29.0", -] - [[package]] name = "proc-macro-crate" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" dependencies = [ - "toml", + "toml 0.5.11", ] [[package]] @@ -5962,15 +6356,15 @@ version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" dependencies = [ - "thiserror", - "toml", + "thiserror 1.0.69", + "toml 0.5.11", ] [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" dependencies = [ "toml_edit", ] @@ -6001,41 +6395,28 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] -[[package]] -name = "proc-macro2-diagnostics" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", - "yansi", -] - [[package]] name = "proptest" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" +checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.5.0", + "bitflags 2.9.0", "lazy_static", "num-traits", "rand 0.8.5", - "rand_chacha 0.3.0", + "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.8.3", + "regex-syntax 0.8.5", "rusty-fork", "tempfile", "unarray", @@ -6043,55 +6424,107 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.4" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +dependencies = [ + "bytes", + "prost-derive 0.12.6", +] + +[[package]] +name = "prost" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" +checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.13.5", ] [[package]] name = "prost-build" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ "bytes", "heck 0.5.0", - "itertools", + "itertools 0.12.1", + "log", + "multimap", + "once_cell", + "petgraph 0.6.5", + "prettyplease", + "prost 0.12.6", + "prost-types 0.12.6", + "regex", + "syn 2.0.101", + "tempfile", +] + +[[package]] +name = "prost-build" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" +dependencies = [ + "heck 0.5.0", + "itertools 0.14.0", "log", "multimap", "once_cell", - "petgraph", + "petgraph 0.7.1", "prettyplease", - "prost", - "prost-types", + "prost 0.13.5", + "prost-types 0.13.5", "regex", - "syn 2.0.58", + "syn 2.0.101", "tempfile", ] [[package]] name = "prost-derive" -version = "0.12.4" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +dependencies = [ + "anyhow", + "itertools 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "prost-derive" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" +checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools", + "itertools 0.14.0", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.101", ] [[package]] name = "prost-types" -version = "0.12.4" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +dependencies = [ + "prost 0.12.6", +] + +[[package]] +name = "prost-types" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" +checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16" dependencies = [ - "prost", + "prost 0.13.5", ] [[package]] @@ -6116,10 +6549,12 @@ dependencies = [ [[package]] name = "pyth-solana-receiver-sdk" -version = "0.3.1" -source = "git+https://github.com/madninja/pyth-crosschain.git?branch=madninja%2Fcap_solana_dep#6576247294bde3ab7b62f7a2dfb4d4d48c401b35" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb47105ed00f2ac09d9a297b5e4e1879981324d8633a177c4d6b0958a5a63d7b" dependencies = [ - "anchor-lang 0.29.0", + "anchor-lang", + "bytemuck_derive", "hex", "pythnet-sdk", "solana-program", @@ -6127,22 +6562,23 @@ dependencies = [ [[package]] name = "pythnet-sdk" -version = "2.3.0" -source = "git+https://github.com/madninja/pyth-crosschain.git?branch=madninja%2Fcap_solana_dep#6576247294bde3ab7b62f7a2dfb4d4d48c401b35" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "498d20fd330277697aaee92f341bdabdb4695b10e05f054157a18ad8b7746a17" dependencies = [ - "anchor-lang 0.30.1", + "anchor-lang", "bincode", - "borsh 0.10.3", + "borsh 0.10.4", "bytemuck", "byteorder", "fast-math", "hex", - "rustc_version 0.4.0", + "rustc_version", "serde", - "sha3 0.10.6", + "sha3", "slow_primes", "solana-program", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -6154,22 +6590,11 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "qualifier_attr" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - [[package]] name = "quanta" -version = "0.12.3" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" +checksum = "3bd1fe6824cea6538803de3ff1bc0cf3949024db3d43c9643024bfb33a807c0e" dependencies = [ "crossbeam-utils", "libc", @@ -6188,61 +6613,74 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quinn" -version = "0.10.2" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" +checksum = "c3bd15a6f2967aef83887dcb9fec0014580467e33720d073560cf015a5683012" dependencies = [ "bytes", + "cfg_aliases", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash", - "rustls 0.21.12", - "thiserror", + "rustc-hash 2.1.1", + "rustls 0.23.26", + "socket2", + "thiserror 2.0.12", "tokio", "tracing", + "web-time", ] [[package]] name = "quinn-proto" -version = "0.10.6" +version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" +checksum = "bcbafbbdbb0f638fe3f35f3c56739f77a8a1d070cb25603226c83339b391472b" dependencies = [ "bytes", - "rand 0.8.5", - "ring 0.16.20", - "rustc-hash", - "rustls 0.21.12", - "rustls-native-certs", + "getrandom 0.3.2", + "rand 0.9.1", + "ring 0.17.14", + "rustc-hash 2.1.1", + "rustls 0.23.26", + "rustls-pki-types", + "rustls-platform-verifier", "slab", - "thiserror", + "thiserror 2.0.12", "tinyvec", "tracing", + "web-time", ] [[package]] name = "quinn-udp" -version = "0.4.1" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" +checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842" dependencies = [ - "bytes", + "cfg_aliases", "libc", + "once_cell", "socket2", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + [[package]] name = "radium" version = "0.7.0" @@ -6269,10 +6707,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.0", + "rand_chacha 0.3.1", "rand_core 0.6.4", ] +[[package]] +name = "rand" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.3", +] + [[package]] name = "rand_chacha" version = "0.2.2" @@ -6285,14 +6733,24 @@ dependencies = [ [[package]] name = "rand_chacha" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", "rand_core 0.6.4", ] +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.3", +] + [[package]] name = "rand_core" version = "0.5.1" @@ -6308,7 +6766,16 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.16", +] + +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +dependencies = [ + "getrandom 0.3.2", ] [[package]] @@ -6331,20 +6798,20 @@ dependencies = [ [[package]] name = "rand_xoshiro" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41" dependencies = [ - "rand_core 0.6.4", + "rand_core 0.9.3", ] [[package]] name = "raw-cpuid" -version = "11.0.2" +version = "11.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" +checksum = "c6df7ab838ed27997ba19a4664507e6f82b41fe6e20be42929332156e5e85146" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.9.0", ] [[package]] @@ -6367,18 +6834,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rcgen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" -dependencies = [ - "pem 1.1.1", - "ring 0.16.20", - "time", - "yasna", -] - [[package]] name = "redox_syscall" version = "0.2.16" @@ -6390,43 +6845,34 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.9.0", ] [[package]] -name = "redox_syscall" -version = "0.4.1" +name = "redox_users" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", - "thiserror", + "getrandom 0.2.16", + "libredox", + "thiserror 1.0.69", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.9", + "regex-syntax 0.8.5", ] [[package]] @@ -6435,31 +6881,31 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax 0.6.28", + "regex-syntax 0.6.29", ] [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.5", ] [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "relative-path" @@ -6467,15 +6913,6 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - [[package]] name = "rend" version = "0.4.2" @@ -6487,9 +6924,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.23" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "async-compression", "base64 0.21.7", @@ -6497,23 +6934,25 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.3.21", - "http 0.2.11", - "http-body 0.4.5", - "hyper 0.14.28", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.32", "hyper-rustls 0.24.2", "ipnet", "js-sys", "log", "mime", + "mime_guess", "once_cell", "percent-encoding", "pin-project-lite", "rustls 0.21.12", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-rustls 0.24.1", @@ -6523,17 +6962,77 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.25.2", + "webpki-roots 0.25.4", "winreg", ] +[[package]] +name = "reqwest" +version = "0.12.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb" +dependencies = [ + "async-compression", + "base64 0.22.1", + "bytes", + "futures-core", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "hyper 1.6.0", + "hyper-rustls 0.27.5", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls 0.23.26", + "rustls-pemfile 2.2.0", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.2", + "tokio", + "tokio-rustls 0.26.2", + "tokio-util", + "tower 0.5.2", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.26.10", + "windows-registry", +] + +[[package]] +name = "reqwest-middleware" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a735987236a8e238bf0296c7e351b999c188ccc11477f311b82b55c93984216" +dependencies = [ + "anyhow", + "async-trait", + "http 0.2.12", + "reqwest 0.11.27", + "serde", + "task-local-extensions", + "thiserror 1.0.69", +] + [[package]] name = "retainer" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df8c01a8276c14d0f8d51ebcf8a48f0748f9f73f5f6b29e688126e6a52bcb145" dependencies = [ - "async-lock", + "async-lock 2.8.0", "async-timer", "log", "rand 0.8.5", @@ -6545,17 +7044,17 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "base64 0.21.7", - "bs58 0.5.1", + "base64 0.22.1", + "bs58", "chrono", - "clap 4.4.8", + "clap", "config", "custom-tracing", "db-store", "file-store", "futures", "futures-util", - "helium-crypto", + "helium-crypto 0.9.0", "helium-proto", "humantime-serde", "lazy_static", @@ -6563,16 +7062,16 @@ dependencies = [ "metrics-exporter-prometheus", "once_cell", "poc-metrics", - "prost", + "prost 0.12.6", "rand 0.8.5", "rust_decimal", "rust_decimal_macros", "serde", "serde_json", - "sha2 0.10.8", - "sqlx", + "sha2 0.10.9", + "sqlx 0.6.2", "task-manager", - "thiserror", + "thiserror 1.0.69", "tokio", "tonic", "tracing", @@ -6585,16 +7084,7 @@ name = "reward-scheduler" version = "0.1.0" dependencies = [ "chrono", - "thiserror", -] - -[[package]] -name = "rewards-oracle" -version = "0.2.0" -source = "git+https://github.com/helium/helium-anchor-gen.git#3036b33793cfe54b20ab24761677493510d5bd50" -dependencies = [ - "anchor-gen", - "anchor-lang 0.29.0", + "thiserror 1.0.69", ] [[package]] @@ -6625,44 +7115,23 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.3" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", - "getrandom 0.2.10", + "cfg-if", + "getrandom 0.2.16", "libc", - "spin 0.9.4", "untrusted 0.9.0", - "windows-sys 0.48.0", -] - -[[package]] -name = "riscv" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6907ccdd7a31012b70faf2af85cd9e5ba97657cc3987c4f13f8e4d2c2a088aba" -dependencies = [ - "bare-metal 1.0.0", - "bit_field", - "riscv-target", -] - -[[package]] -name = "riscv-target" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88aa938cda42a0cf62a20cfe8d139ff1af20c2e681212b5b34adb5a58333f222" -dependencies = [ - "lazy_static", - "regex", + "windows-sys 0.52.0", ] [[package]] name = "rkyv" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" dependencies = [ "bitvec", "bytecheck", @@ -6678,9 +7147,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" dependencies = [ "proc-macro2", "quote", @@ -6699,22 +7168,11 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30" -[[package]] -name = "rpassword" -version = "7.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" -dependencies = [ - "libc", - "rtoolbox", - "windows-sys 0.48.0", -] - [[package]] name = "rsa" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0aeddcca1082112a6eeb43bf25fd7820b066aaf6eaef776e19d0a1febe38fe" +checksum = "68ef841a26fc5d040ced0417c6c6a64ee851f42489df11cdf0218e545b6f8d28" dependencies = [ "byteorder", "digest 0.9.0", @@ -6732,9 +7190,9 @@ dependencies = [ [[package]] name = "rstar" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6" +checksum = "421400d13ccfd26dfa5858199c30a5d76f9c54e0dba7575273025b43c5175dbb" dependencies = [ "heapless", "num-traits", @@ -6748,7 +7206,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682" dependencies = [ "rstest_macros", - "rustc_version 0.4.0", + "rustc_version", ] [[package]] @@ -6763,29 +7221,19 @@ dependencies = [ "quote", "regex", "relative-path", - "rustc_version 0.4.0", - "syn 2.0.58", + "rustc_version", + "syn 2.0.101", "unicode-ident", ] -[[package]] -name = "rtoolbox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "rust_decimal" -version = "1.35.0" +version = "1.37.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +checksum = "faa7de2ba56ac291bd90c6b9bece784a52ae1411f9506544b3eae36dd2356d50" dependencies = [ "arrayvec", - "borsh 1.5.1", + "borsh 1.5.7", "bytes", "num-traits", "rand 0.8.5", @@ -6796,19 +7244,19 @@ dependencies = [ [[package]] name = "rust_decimal_macros" -version = "1.34.2" +version = "1.37.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e418701588729bef95e7a655f2b483ad64bb97c46e8e79fde83efd92aaab6d82" +checksum = "f6268b74858287e1a062271b988a0c534bf85bbeb567fe09331bf40ed78113d5" dependencies = [ "quote", - "rust_decimal", + "syn 2.0.101", ] [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -6817,21 +7265,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "rustc_version" -version = "0.2.3" +name = "rustc-hash" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ - "semver 1.0.21", + "semver", ] [[package]] @@ -6843,6 +7288,32 @@ dependencies = [ "nom", ] +[[package]] +name = "rustix" +version = "0.38.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +dependencies = [ + "bitflags 2.9.0", + "errno", + "libc", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustix" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" +dependencies = [ + "bitflags 2.9.0", + "errno", + "libc", + "linux-raw-sys 0.9.4", + "windows-sys 0.59.0", +] + [[package]] name = "rustls" version = "0.20.9" @@ -6862,11 +7333,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.17.3", - "rustls-webpki", + "ring 0.17.14", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.23.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0" +dependencies = [ + "aws-lc-rs", + "log", + "once_cell", + "ring 0.17.14", + "rustls-pki-types", + "rustls-webpki 0.103.1", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -6874,35 +7361,104 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.4", + "schannel", + "security-framework 2.11.1", +] + +[[package]] +name = "rustls-native-certs" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" +dependencies = [ + "openssl-probe", + "rustls-pki-types", "schannel", - "security-framework", + "security-framework 3.2.0", ] [[package]] name = "rustls-pemfile" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", +] + +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" +dependencies = [ + "web-time", +] + +[[package]] +name = "rustls-platform-verifier" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4937d110d34408e9e5ad30ba0b0ca3b6a8a390f8db3636db60144ac4fa792750" +dependencies = [ + "core-foundation 0.10.0", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls 0.23.26", + "rustls-native-certs 0.8.1", + "rustls-platform-verifier-android", + "rustls-webpki 0.103.1", + "security-framework 3.2.0", + "security-framework-sys", + "webpki-root-certs", + "windows-sys 0.59.0", ] +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + [[package]] name = "rustls-webpki" version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.3", + "ring 0.17.14", + "untrusted 0.9.0", +] + +[[package]] +name = "rustls-webpki" +version = "0.103.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03" +dependencies = [ + "aws-lc-rs", + "ring 0.17.14", + "rustls-pki-types", "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" [[package]] name = "rusty-fork" @@ -6918,9 +7474,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "same-file" @@ -6933,12 +7489,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ - "lazy_static", - "windows-sys 0.36.1", + "windows-sys 0.59.0", ] [[package]] @@ -6947,40 +7502,14 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "scratch" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" - -[[package]] -name = "scroll" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" -dependencies = [ - "scroll_derive", -] - -[[package]] -name = "scroll_derive" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.14", + "untrusted 0.9.0", ] [[package]] @@ -6995,7 +7524,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" dependencies = [ - "der", + "der 0.5.1", "generic-array", "subtle", "zeroize", @@ -7003,107 +7532,124 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.7.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", - "core-foundation", + "bitflags 2.9.0", + "core-foundation 0.9.4", "core-foundation-sys", "libc", "security-framework-sys", ] [[package]] -name = "security-framework-sys" -version = "2.6.1" +name = "security-framework" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" dependencies = [ + "bitflags 2.9.0", + "core-foundation 0.10.0", "core-foundation-sys", "libc", + "security-framework-sys", ] [[package]] -name = "semver" -version = "0.9.0" +name = "security-framework-sys" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ - "semver-parser", + "core-foundation-sys", + "libc", ] [[package]] name = "semver" -version = "1.0.21" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" [[package]] -name = "semver-parser" -version = "0.7.0" +name = "serde" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] [[package]] -name = "serde" -version = "1.0.203" +name = "serde-big-array" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f" dependencies = [ - "serde_derive", + "serde", ] [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "8437fd221bde2d4ca316d61b90e337e9e702b3820b87d63caa9ba6c02bd06d96" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.101", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ - "itoa 1.0.9", + "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_path_to_error" -version = "0.1.14" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +checksum = "59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a" dependencies = [ - "itoa 1.0.9", + "itoa", "serde", ] [[package]] name = "serde_repr" -version = "0.1.11" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395627de918015623b32e7669714206363a7fc00382bf477e72c1f7533e8eafc" +checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.101", +] + +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", ] [[package]] @@ -7113,38 +7659,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.9", + "itoa", "ryu", "serde", ] [[package]] name = "serde_with" -version = "2.3.3" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" dependencies = [ "serde", + "serde_derive", "serde_with_macros", ] [[package]] name = "serde_with_macros" -version = "2.3.3" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" dependencies = [ - "darling 0.20.5", + "darling", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.101", ] [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -7166,9 +7713,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", @@ -7177,21 +7724,9 @@ dependencies = [ [[package]] name = "sha3" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "keccak", - "opaque-debug", -] - -[[package]] -name = "sha3" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ "digest 0.10.7", "keccak", @@ -7199,9 +7734,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -7213,16 +7748,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[package]] -name = "signal-hook-registry" -version = "1.4.1" +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 = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", + "signal-hook-registry", ] [[package]] -name = "signature" +name = "signal-hook-registry" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" @@ -7231,11 +7782,20 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "rand_core 0.6.4", +] + [[package]] name = "simdutf8" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "simple_asn1" @@ -7244,9 +7804,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eb4ea60fb301dc81dfc113df680571045d375ab7345d171c5dc7d7e13107a80" dependencies = [ "chrono", - "num-bigint 0.4.4", + "num-bigint 0.4.6", "num-traits", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -7255,21 +7815,11 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" -[[package]] -name = "sized-chunks" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" -dependencies = [ - "bitmaps", - "typenum", -] - [[package]] name = "sketches-ddsketch" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceb945e54128e09c43d8e4f1277851bd5044c6fc540bbaa2ad888f60b3da9ae7" +checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a" [[package]] name = "slab" @@ -7286,388 +7836,1259 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58267dd2fbaa6dceecba9e3e106d2d90a2b02497c0e8b01b8759beccf5113938" dependencies = [ - "num", + "num 0.4.3", ] [[package]] name = "smallvec" -version = "1.13.2" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "solana" version = "0.1.0" dependencies = [ - "anchor-client", "anyhow", "async-trait", "chrono", - "clap 4.4.8", + "clap", "file-store", "futures", - "helium-anchor-gen", - "helium-crypto", + "helium-crypto 0.9.0", "helium-lib", - "itertools", + "itertools 0.14.0", "metrics", "serde", - "sha2 0.10.8", - "solana-client", - "solana-program", - "solana-sdk", - "spl-token 3.5.0", - "thiserror", + "sha2 0.10.9", + "spl-token 8.0.0", + "sqlx 0.6.2", + "thiserror 1.0.69", "tokio", "tracing", ] +[[package]] +name = "solana-account" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f949fe4edaeaea78c844023bfc1c898e0b1f5a100f8a8d2d0f85d0a7b090258" +dependencies = [ + "bincode", + "serde", + "serde_bytes", + "serde_derive", + "solana-account-info", + "solana-clock", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-sysvar", +] + [[package]] name = "solana-account-decoder" -version = "1.18.17" +version = "2.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4973213a11c2e1b924b36e0c6688682b5aa4623f8d4eeaa1204c32cee524e6d6" +checksum = "fc13737697fe2ab4475bcae71525e37abd2b357a12dc68fc3e0938dd1a0dcbfd" dependencies = [ "Inflector", - "base64 0.21.7", + "base64 0.22.1", "bincode", - "bs58 0.4.0", + "bs58", "bv", "lazy_static", "serde", "serde_derive", "serde_json", + "solana-account", + "solana-account-decoder-client-types", + "solana-clock", "solana-config-program", - "solana-sdk", - "spl-token 4.0.0", - "spl-token-2022 1.0.0", - "spl-token-group-interface 0.1.0", - "spl-token-metadata-interface 0.2.0", - "thiserror", + "solana-epoch-schedule", + "solana-fee-calculator", + "solana-instruction", + "solana-nonce", + "solana-program", + "solana-program-pack", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-slot-hashes", + "solana-slot-history", + "solana-sysvar", + "spl-token 7.0.0", + "spl-token-2022 7.0.0", + "spl-token-group-interface", + "spl-token-metadata-interface", + "thiserror 2.0.12", "zstd", ] [[package]] -name = "solana-clap-utils" -version = "1.18.17" +name = "solana-account-decoder-client-types" +version = "2.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909f4553d0b31bb5b97533a6b64cc321a4eace9112d6efbabcf4408ea1b3f1db" +checksum = "96c5d7d0f1581d98a869f2569122ded67e0735f3780d787b3e7653bdcd1708a2" dependencies = [ - "chrono", - "clap 2.34.0", - "rpassword", - "solana-remote-wallet", - "solana-sdk", - "thiserror", - "tiny-bip39", - "uriparse", - "url", + "base64 0.22.1", + "bs58", + "serde", + "serde_derive", + "serde_json", + "solana-account", + "solana-pubkey", + "zstd", +] + +[[package]] +name = "solana-account-info" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0c17d606a298a205fae325489fbed88ee6dc4463c111672172327e741c8905d" +dependencies = [ + "bincode", + "serde", + "solana-program-error", + "solana-program-memory", + "solana-pubkey", +] + +[[package]] +name = "solana-address-lookup-table-interface" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1673f67efe870b64a65cb39e6194be5b26527691ce5922909939961a6e6b395" +dependencies = [ + "bincode", + "bytemuck", + "serde", + "serde_derive", + "solana-clock", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-slot-hashes", +] + +[[package]] +name = "solana-atomic-u64" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52e52720efe60465b052b9e7445a01c17550666beec855cce66f44766697bc2" +dependencies = [ + "parking_lot 0.12.3", +] + +[[package]] +name = "solana-big-mod-exp" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75db7f2bbac3e62cfd139065d15bcda9e2428883ba61fc8d27ccb251081e7567" +dependencies = [ + "num-bigint 0.4.6", + "num-traits", + "solana-define-syscall", +] + +[[package]] +name = "solana-bincode" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19a3787b8cf9c9fe3dd360800e8b70982b9e5a8af9e11c354b6665dd4a003adc" +dependencies = [ + "bincode", + "serde", + "solana-instruction", +] + +[[package]] +name = "solana-blake3-hasher" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0801e25a1b31a14494fc80882a036be0ffd290efc4c2d640bfcca120a4672" +dependencies = [ + "blake3", + "solana-define-syscall", + "solana-hash", + "solana-sanitize", +] + +[[package]] +name = "solana-bn254" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4420f125118732833f36facf96a27e7b78314b2d642ba07fa9ffdacd8d79e243" +dependencies = [ + "ark-bn254", + "ark-ec", + "ark-ff", + "ark-serialize", + "bytemuck", + "solana-define-syscall", + "thiserror 2.0.12", +] + +[[package]] +name = "solana-borsh" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "718333bcd0a1a7aed6655aa66bef8d7fb047944922b2d3a18f49cbc13e73d004" +dependencies = [ + "borsh 0.10.4", + "borsh 1.5.7", ] [[package]] name = "solana-client" -version = "1.18.17" +version = "2.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5cc431df6cc1dd964134fa4ec7df765d3af3fae9c2148f96a3c4fb500290633" +checksum = "d32a6ae5a74f13425eb0f8503b9a2c0bf59581e98deeee2d0555dfe6f05502c9" dependencies = [ "async-trait", "bincode", "dashmap", "futures", "futures-util", - "indexmap 2.2.6", + "indexmap 2.9.0", "indicatif", "log", "quinn", "rayon", + "solana-account", + "solana-client-traits", + "solana-commitment-config", "solana-connection-cache", + "solana-epoch-info", + "solana-hash", + "solana-instruction", + "solana-keypair", "solana-measure", - "solana-metrics", + "solana-message", + "solana-pubkey", "solana-pubsub-client", "solana-quic-client", + "solana-quic-definitions", "solana-rpc-client", "solana-rpc-client-api", "solana-rpc-client-nonce-utils", - "solana-sdk", + "solana-signature", + "solana-signer", "solana-streamer", "solana-thin-client", + "solana-time-utils", "solana-tpu-client", + "solana-transaction", + "solana-transaction-error", "solana-udp-client", - "thiserror", + "thiserror 2.0.12", "tokio", ] +[[package]] +name = "solana-client-traits" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83f0071874e629f29e0eb3dab8a863e98502ac7aba55b7e0df1803fc5cac72a7" +dependencies = [ + "solana-account", + "solana-commitment-config", + "solana-epoch-info", + "solana-hash", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-pubkey", + "solana-signature", + "solana-signer", + "solana-system-interface", + "solana-transaction", + "solana-transaction-error", +] + +[[package]] +name = "solana-clock" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c2177a1b9fe8326004f1151a5acd124420b737811080b1035df31349e4d892" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", +] + +[[package]] +name = "solana-cluster-type" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ace9fea2daa28354d107ea879cff107181d85cd4e0f78a2bedb10e1a428c97e" +dependencies = [ + "serde", + "serde_derive", + "solana-hash", +] + +[[package]] +name = "solana-commitment-config" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac49c4dde3edfa832de1697e9bcdb7c3b3f7cb7a1981b7c62526c8bb6700fb73" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-compute-budget" +version = "2.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7da7ab5302549d9c6bf399c69a7072abeca78d252d9b7a146be34bf6f8b51e6" +dependencies = [ + "solana-fee-structure", + "solana-program-entrypoint", +] + +[[package]] +name = "solana-compute-budget-interface" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a5df17b195d312b66dccdde9beec6709766d8230cb4718c4c08854f780d0309" +dependencies = [ + "borsh 1.5.7", + "serde", + "serde_derive", + "solana-instruction", + "solana-sdk-ids", +] + [[package]] name = "solana-config-program" -version = "1.18.17" +version = "2.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e38b040d3a42e8f7d80c4a86bb0d49d7aed663b56b0fe0ae135d2d145fb7ae3a" +checksum = "4072ff53d982deb87be1c15136b0aa9ead472f15eaefdd23d8174d49371e0112" dependencies = [ "bincode", "chrono", "serde", "serde_derive", + "solana-account", + "solana-bincode", + "solana-instruction", + "solana-log-collector", + "solana-packet", "solana-program-runtime", - "solana-sdk", + "solana-pubkey", + "solana-sdk-ids", + "solana-short-vec", + "solana-stake-interface", + "solana-system-interface", + "solana-transaction-context", ] [[package]] name = "solana-connection-cache" -version = "1.18.17" +version = "2.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae02622c63943485f0af3d0896626eaf6478e734f0b6bc61c7cc5320963c6e75" +checksum = "240bc217ca05f3e1d1d88f1cfda14b785a02288a630419e4a0ecd6b4fa5094b7" dependencies = [ "async-trait", "bincode", "crossbeam-channel", "futures-util", - "indexmap 2.2.6", + "indexmap 2.9.0", "log", "rand 0.8.5", "rayon", - "rcgen", + "solana-keypair", "solana-measure", "solana-metrics", - "solana-sdk", - "thiserror", + "solana-net-utils", + "solana-time-utils", + "solana-transaction-error", + "thiserror 2.0.12", "tokio", ] [[package]] -name = "solana-frozen-abi" -version = "1.18.17" +name = "solana-cpi" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4867f66e9527fa44451c861c1dc6d9b2a7c7a668d7c6a297cdefbe39f4395b33" +checksum = "8dc71126edddc2ba014622fc32d0f5e2e78ec6c5a1e0eb511b85618c09e9ea11" dependencies = [ - "block-buffer 0.10.4", - "bs58 0.4.0", - "bv", - "either", - "generic-array", - "im", - "lazy_static", - "log", - "memmap2", - "rustc_version 0.4.0", - "serde", - "serde_bytes", - "serde_derive", - "sha2 0.10.8", - "solana-frozen-abi-macro", - "subtle", - "thiserror", + "solana-account-info", + "solana-define-syscall", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-stable-layout", ] [[package]] -name = "solana-frozen-abi-macro" -version = "1.18.17" +name = "solana-curve25519" +version = "2.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168f24d97347b85f05192df58d6be3e3047a4aadc4001bc1b9e711a5ec878eea" +checksum = "3241d534ec36aff225705eea77785589906c9ecaa3db2a0de0d821bae8d32dcc" dependencies = [ - "proc-macro2", - "quote", - "rustc_version 0.4.0", - "syn 2.0.58", + "bytemuck", + "bytemuck_derive", + "curve25519-dalek 4.1.3", + "solana-define-syscall", + "subtle", + "thiserror 2.0.12", ] [[package]] -name = "solana-logger" -version = "1.18.17" +name = "solana-decode-error" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0511082fc62f2d086520fff5aa1917c389d8c840930c08ad255ae05952c08a2" +checksum = "10a6a6383af236708048f8bd8d03db8ca4ff7baf4a48e5d580f4cce545925470" dependencies = [ - "env_logger", - "lazy_static", - "log", + "num-traits", ] [[package]] -name = "solana-measure" -version = "1.18.17" +name = "solana-define-syscall" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf784bb2cb3e02cac9801813c30187344228d2ae952534902108f6150573a33d" + +[[package]] +name = "solana-derivation-path" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55a3df105431d25f86f2a7da0cbbde5f54c1f0782ca59367ea4a8037bc6797" +checksum = "939756d798b25c5ec3cca10e06212bdca3b1443cb9bb740a38124f58b258737b" dependencies = [ - "log", - "solana-sdk", + "derivation-path", + "qstring", + "uriparse", ] [[package]] -name = "solana-metrics" -version = "1.18.17" +name = "solana-ed25519-program" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddec097ed7572804389195128dbd57958b427829153c6cd8ec3343c86fe3cd22" +checksum = "9d0fc717048fdbe5d2ee7d673d73e6a30a094002f4a29ca7630ac01b6bddec04" dependencies = [ - "crossbeam-channel", - "gethostname", - "lazy_static", - "log", - "reqwest", - "solana-sdk", - "thiserror", + "bytemuck", + "bytemuck_derive", + "ed25519-dalek", + "solana-feature-set", + "solana-instruction", + "solana-precompile-error", + "solana-sdk-ids", ] [[package]] -name = "solana-net-utils" -version = "1.18.17" +name = "solana-epoch-info" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258fa7c29fb7605b8d2ed89aa0d43c640d14f4147ad1f5b3fdad19a1ac145ca5" +checksum = "90ef6f0b449290b0b9f32973eefd95af35b01c5c0c34c569f936c34c5b20d77b" dependencies = [ - "bincode", - "clap 3.2.25", - "crossbeam-channel", - "log", - "nix", - "rand 0.8.5", "serde", "serde_derive", - "socket2", - "solana-logger", - "solana-sdk", - "solana-version", - "tokio", - "url", ] [[package]] -name = "solana-perf" -version = "1.18.17" +name = "solana-epoch-rewards" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca422edcf16a6e64003ca118575ea641f7b750f14a0ad28c71dd84f33dcb912a" +checksum = "86b575d3dd323b9ea10bb6fe89bf6bf93e249b215ba8ed7f68f1a3633f384db7" dependencies = [ - "ahash 0.8.11", - "bincode", - "bv", - "caps", - "curve25519-dalek", - "dlopen2", - "fnv", - "lazy_static", - "libc", - "log", - "nix", - "rand 0.8.5", - "rayon", - "rustc_version 0.4.0", "serde", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-metrics", - "solana-rayon-threadlimit", - "solana-sdk", - "solana-vote-program", + "serde_derive", + "solana-hash", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", ] [[package]] -name = "solana-program" -version = "1.18.17" +name = "solana-epoch-rewards-hasher" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc5a636dc75e5c25651e34f7a36afc9ae60d38166687c5b0375abb580ac81a2" +checksum = "96c5fd2662ae7574810904585fd443545ed2b568dbd304b25a31e79ccc76e81b" +dependencies = [ + "siphasher", + "solana-hash", + "solana-pubkey", +] + +[[package]] +name = "solana-epoch-schedule" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fce071fbddecc55d727b1d7ed16a629afe4f6e4c217bc8d00af3b785f6f67ed" dependencies = [ - "ark-bn254", - "ark-ec", - "ark-ff", - "ark-serialize", - "base64 0.21.7", - "bincode", - "bitflags 2.5.0", - "blake3", - "borsh 0.10.3", - "borsh 0.9.3", - "borsh 1.5.1", - "bs58 0.4.0", - "bv", - "bytemuck", - "cc", - "console_error_panic_hook", - "console_log", - "curve25519-dalek", - "getrandom 0.2.10", - "itertools", - "js-sys", - "lazy_static", - "libc", - "libsecp256k1", - "light-poseidon", - "log", - "memoffset 0.9.0", - "num-bigint 0.4.4", - "num-derive 0.4.2", - "num-traits", - "parking_lot 0.12.1", - "rand 0.8.5", - "rustc_version 0.4.0", - "rustversion", "serde", - "serde_bytes", "serde_derive", - "serde_json", - "sha2 0.10.8", - "sha3 0.10.6", - "solana-frozen-abi", - "solana-frozen-abi-macro", + "solana-sdk-ids", "solana-sdk-macro", - "thiserror", - "tiny-bip39", - "wasm-bindgen", - "zeroize", + "solana-sysvar-id", ] [[package]] -name = "solana-program-runtime" -version = "1.18.17" +name = "solana-example-mocks" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf373c3da0387f47fee4c5ed2465a9628b9db026a62211a692a9285aa9251544" +checksum = "84461d56cbb8bb8d539347151e0525b53910102e4bced875d49d5139708e39d3" +dependencies = [ + "serde", + "serde_derive", + "solana-address-lookup-table-interface", + "solana-clock", + "solana-hash", + "solana-instruction", + "solana-keccak-hasher", + "solana-message", + "solana-nonce", + "solana-pubkey", + "solana-sdk-ids", + "solana-system-interface", + "thiserror 2.0.12", +] + +[[package]] +name = "solana-feature-gate-interface" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f9c7fbf3e58b64a667c5f35e90af580538a95daea7001ff7806c0662d301bdf" +dependencies = [ + "bincode", + "serde", + "serde_derive", + "solana-account", + "solana-account-info", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-system-interface", +] + +[[package]] +name = "solana-feature-set" +version = "2.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92f6c09cc41059c0e03ccbee7f5d4cc0a315d68ef0d59b67eb90246adfd8cc35" +dependencies = [ + "ahash 0.8.11", + "lazy_static", + "solana-epoch-schedule", + "solana-hash", + "solana-pubkey", + "solana-sha256-hasher", +] + +[[package]] +name = "solana-feature-set-interface" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02007757246e40f10aa936dae4fa27efbf8dbd6a59575a12ccc802c1aea6e708" +dependencies = [ + "ahash 0.8.11", + "solana-pubkey", +] + +[[package]] +name = "solana-fee-calculator" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89bc408da0fb3812bc3008189d148b4d3e08252c79ad810b245482a3f70cd8d" +dependencies = [ + "log", + "serde", + "serde_derive", +] + +[[package]] +name = "solana-fee-structure" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f45f94a88efdb512805563181dfa1c85c60a21b6e6d602bf24a2ea88f9399d6e" +dependencies = [ + "serde", + "serde_derive", + "solana-message", + "solana-native-token", +] + +[[package]] +name = "solana-genesis-config" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "968dabd2b92d57131473eddbd475339da530e14f54397386abf303de3a2595a2" +dependencies = [ + "bincode", + "chrono", + "memmap2", + "serde", + "serde_derive", + "solana-account", + "solana-clock", + "solana-cluster-type", + "solana-epoch-schedule", + "solana-fee-calculator", + "solana-hash", + "solana-inflation", + "solana-keypair", + "solana-logger", + "solana-native-token", + "solana-poh-config", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-sha256-hasher", + "solana-shred-version", + "solana-signer", + "solana-time-utils", +] + +[[package]] +name = "solana-hard-forks" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c28371f878e2ead55611d8ba1b5fb879847156d04edea13693700ad1a28baf" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-hash" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf7bcb14392900fe02e4e34e90234fbf0c673d4e327888410ba99fa2ba0f4e99" +dependencies = [ + "borsh 1.5.7", + "bs58", + "bytemuck", + "bytemuck_derive", + "js-sys", + "serde", + "serde_derive", + "solana-atomic-u64", + "solana-sanitize", + "wasm-bindgen", +] + +[[package]] +name = "solana-inflation" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23eef6a09eb8e568ce6839573e4966850e85e9ce71e6ae1a6c930c1c43947de3" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-inline-spl" +version = "2.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaac98c150932bba4bfbef5b52fae9ef445f767d66ded2f1398382149bc94f69" +dependencies = [ + "bytemuck", + "solana-pubkey", +] + +[[package]] +name = "solana-instruction" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce496a475e5062ba5de97215ab39d9c358f9c9df4bb7f3a45a1f1a8bd9065ed" +dependencies = [ + "bincode", + "borsh 1.5.7", + "getrandom 0.2.16", + "js-sys", + "num-traits", + "serde", + "serde_derive", + "solana-define-syscall", + "solana-pubkey", + "wasm-bindgen", +] + +[[package]] +name = "solana-instructions-sysvar" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "427f2d0d6dc0bb49f16cef5e7f975180d2e80aab9bdd3b2af68e2d029ec63f43" +dependencies = [ + "bitflags 2.9.0", + "solana-account-info", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-sanitize", + "solana-sdk-ids", + "solana-serialize-utils", + "solana-sysvar-id", +] + +[[package]] +name = "solana-keccak-hasher" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7aeb957fbd42a451b99235df4942d96db7ef678e8d5061ef34c9b34cae12f79" +dependencies = [ + "sha3", + "solana-define-syscall", + "solana-hash", + "solana-sanitize", +] + +[[package]] +name = "solana-keypair" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dbb7042c2e0c561afa07242b2099d55c57bd1b1da3b6476932197d84e15e3e4" +dependencies = [ + "bs58", + "ed25519-dalek", + "ed25519-dalek-bip32", + "rand 0.7.3", + "solana-derivation-path", + "solana-pubkey", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-signature", + "solana-signer", + "wasm-bindgen", +] + +[[package]] +name = "solana-last-restart-slot" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a6360ac2fdc72e7463565cd256eedcf10d7ef0c28a1249d261ec168c1b55cdd" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", +] + +[[package]] +name = "solana-loader-v2-interface" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8ab08006dad78ae7cd30df8eea0539e207d08d91eaefb3e1d49a446e1c49654" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", +] + +[[package]] +name = "solana-loader-v3-interface" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4be76cfa9afd84ca2f35ebc09f0da0f0092935ccdac0595d98447f259538c2" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-system-interface", +] + +[[package]] +name = "solana-loader-v4-interface" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "706a777242f1f39a83e2a96a2a6cb034cb41169c6ecbee2cf09cb873d9659e7e" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-system-interface", +] + +[[package]] +name = "solana-log-collector" +version = "2.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45d5713845622a6059a172ea390c2a7f7eb50355cfb0cfa18a38a18ecb39c2f1" +dependencies = [ + "log", +] + +[[package]] +name = "solana-logger" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8e777ec1afd733939b532a42492d888ec7c88d8b4127a5d867eb45c6eb5cd5" +dependencies = [ + "env_logger", + "lazy_static", + "libc", + "log", + "signal-hook", +] + +[[package]] +name = "solana-measure" +version = "2.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9566e754d9b9bcdee7b4aae38e425d47abf8e4f00057208868cb3ab9bee7feae" + +[[package]] +name = "solana-message" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "268486ba8a294ed22a4d7c1ec05f540c3dbe71cfa7c6c54b6d4d13668d895678" +dependencies = [ + "bincode", + "blake3", + "lazy_static", + "serde", + "serde_derive", + "solana-bincode", + "solana-hash", + "solana-instruction", + "solana-pubkey", + "solana-sanitize", + "solana-sdk-ids", + "solana-short-vec", + "solana-system-interface", + "solana-transaction-error", + "wasm-bindgen", +] + +[[package]] +name = "solana-metrics" +version = "2.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02311660a407de41df2d5ef4e4118dac7b51cfe81a52362314ea51b091ee4150" +dependencies = [ + "crossbeam-channel", + "gethostname", + "lazy_static", + "log", + "reqwest 0.11.27", + "solana-clock", + "solana-cluster-type", + "solana-sha256-hasher", + "solana-time-utils", + "thiserror 2.0.12", +] + +[[package]] +name = "solana-msg" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36a1a14399afaabc2781a1db09cb14ee4cc4ee5c7a5a3cfcc601811379a8092" +dependencies = [ + "solana-define-syscall", +] + +[[package]] +name = "solana-native-token" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33e9de00960197412e4be3902a6cd35e60817c511137aca6c34c66cd5d4017ec" + +[[package]] +name = "solana-net-utils" +version = "2.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c27f0e0bbb972456ed255f81135378ecff3a380252ced7274fa965461ab99977" +dependencies = [ + "anyhow", + "bincode", + "bytes", + "crossbeam-channel", + "itertools 0.12.1", + "log", + "nix", + "rand 0.8.5", + "serde", + "serde_derive", + "socket2", + "solana-serde", + "tokio", + "url", +] + +[[package]] +name = "solana-nonce" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703e22eb185537e06204a5bd9d509b948f0066f2d1d814a6f475dafb3ddf1325" +dependencies = [ + "serde", + "serde_derive", + "solana-fee-calculator", + "solana-hash", + "solana-pubkey", + "solana-sha256-hasher", +] + +[[package]] +name = "solana-nonce-account" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde971a20b8dbf60144d6a84439dda86b5466e00e2843091fe731083cda614da" +dependencies = [ + "solana-account", + "solana-hash", + "solana-nonce", + "solana-sdk-ids", +] + +[[package]] +name = "solana-offchain-message" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b526398ade5dea37f1f147ce55dae49aa017a5d7326606359b0445ca8d946581" +dependencies = [ + "num_enum", + "solana-hash", + "solana-packet", + "solana-pubkey", + "solana-sanitize", + "solana-sha256-hasher", + "solana-signature", + "solana-signer", +] + +[[package]] +name = "solana-packet" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "004f2d2daf407b3ec1a1ca5ec34b3ccdfd6866dd2d3c7d0715004a96e4b6d127" +dependencies = [ + "bincode", + "bitflags 2.9.0", + "cfg_eval", + "serde", + "serde_derive", + "serde_with", +] + +[[package]] +name = "solana-perf" +version = "2.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97222a3fda48570754ce114e43ca56af34741098c357cb8d3cb6695751e60330" +dependencies = [ + "ahash 0.8.11", + "bincode", + "bv", + "caps", + "curve25519-dalek 4.1.3", + "dlopen2", + "fnv", + "lazy_static", + "libc", + "log", + "nix", + "rand 0.8.5", + "rayon", + "serde", + "solana-hash", + "solana-message", + "solana-metrics", + "solana-packet", + "solana-pubkey", + "solana-rayon-threadlimit", + "solana-sdk-ids", + "solana-short-vec", + "solana-signature", + "solana-time-utils", +] + +[[package]] +name = "solana-poh-config" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d650c3b4b9060082ac6b0efbbb66865089c58405bfb45de449f3f2b91eccee75" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-precompile-error" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ff64daa2933c22982b323d88d0cdf693201ef56ac381ae16737fd5f579e07d6" +dependencies = [ + "num-traits", + "solana-decode-error", +] + +[[package]] +name = "solana-precompiles" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a460ab805ec063802105b463ecb5eb02c3ffe469e67a967eea8a6e778e0bc06" +dependencies = [ + "lazy_static", + "solana-ed25519-program", + "solana-feature-set", + "solana-message", + "solana-precompile-error", + "solana-pubkey", + "solana-sdk-ids", + "solana-secp256k1-program", + "solana-secp256r1-program", +] + +[[package]] +name = "solana-presigner" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81a57a24e6a4125fc69510b6774cd93402b943191b6cddad05de7281491c90fe" +dependencies = [ + "solana-pubkey", + "solana-signature", + "solana-signer", +] + +[[package]] +name = "solana-program" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "586469467e93ceb79048f8d8e3a619bf61d05396ee7de95cb40280301a589d05" dependencies = [ - "base64 0.21.7", "bincode", - "eager", - "enum-iterator", - "itertools", - "libc", + "blake3", + "borsh 0.10.4", + "borsh 1.5.7", + "bs58", + "bytemuck", + "console_error_panic_hook", + "console_log", + "getrandom 0.2.16", + "lazy_static", "log", - "num-derive 0.4.2", + "memoffset", + "num-bigint 0.4.6", + "num-derive", + "num-traits", + "rand 0.8.5", + "serde", + "serde_bytes", + "serde_derive", + "solana-account-info", + "solana-address-lookup-table-interface", + "solana-atomic-u64", + "solana-big-mod-exp", + "solana-bincode", + "solana-blake3-hasher", + "solana-borsh", + "solana-clock", + "solana-cpi", + "solana-decode-error", + "solana-define-syscall", + "solana-epoch-rewards", + "solana-epoch-schedule", + "solana-example-mocks", + "solana-feature-gate-interface", + "solana-fee-calculator", + "solana-hash", + "solana-instruction", + "solana-instructions-sysvar", + "solana-keccak-hasher", + "solana-last-restart-slot", + "solana-loader-v2-interface", + "solana-loader-v3-interface", + "solana-loader-v4-interface", + "solana-message", + "solana-msg", + "solana-native-token", + "solana-nonce", + "solana-program-entrypoint", + "solana-program-error", + "solana-program-memory", + "solana-program-option", + "solana-program-pack", + "solana-pubkey", + "solana-rent", + "solana-sanitize", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-secp256k1-recover", + "solana-serde-varint", + "solana-serialize-utils", + "solana-sha256-hasher", + "solana-short-vec", + "solana-slot-hashes", + "solana-slot-history", + "solana-stable-layout", + "solana-stake-interface", + "solana-system-interface", + "solana-sysvar", + "solana-sysvar-id", + "solana-vote-interface", + "thiserror 2.0.12", + "wasm-bindgen", +] + +[[package]] +name = "solana-program-entrypoint" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "473ffe73c68d93e9f2aa726ad2985fe52760052709aaab188100a42c618060ec" +dependencies = [ + "solana-account-info", + "solana-msg", + "solana-program-error", + "solana-pubkey", +] + +[[package]] +name = "solana-program-error" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8ae2c1a8d0d4ae865882d5770a7ebca92bab9c685e43f0461682c6c05a35bfa" +dependencies = [ + "borsh 1.5.7", + "num-traits", + "serde", + "serde_derive", + "solana-decode-error", + "solana-instruction", + "solana-msg", + "solana-pubkey", +] + +[[package]] +name = "solana-program-memory" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b0268f6c89825fb634a34bd0c3b8fdaeaecfc3728be1d622a8ee6dd577b60d4" +dependencies = [ "num-traits", + "solana-define-syscall", +] + +[[package]] +name = "solana-program-option" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc677a2e9bc616eda6dbdab834d463372b92848b2bfe4a1ed4e4b4adba3397d0" + +[[package]] +name = "solana-program-pack" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "319f0ef15e6e12dc37c597faccb7d62525a509fec5f6975ecb9419efddeb277b" +dependencies = [ + "solana-program-error", +] + +[[package]] +name = "solana-program-runtime" +version = "2.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbbde7b061921dcff2bf8e0f1af120fa94f2fb0e3a1c2ec1e7900432bb72cbcd" +dependencies = [ + "agave-feature-set", + "agave-precompiles", + "base64 0.22.1", + "bincode", + "enum-iterator", + "itertools 0.12.1", + "log", "percentage", "rand 0.8.5", - "rustc_version 0.4.0", "serde", - "solana-frozen-abi", - "solana-frozen-abi-macro", + "solana-account", + "solana-clock", + "solana-compute-budget", + "solana-epoch-rewards", + "solana-epoch-schedule", + "solana-hash", + "solana-instruction", + "solana-last-restart-slot", + "solana-log-collector", "solana-measure", - "solana-metrics", - "solana-sdk", - "solana_rbpf", - "thiserror", + "solana-pubkey", + "solana-rent", + "solana-sbpf", + "solana-sdk-ids", + "solana-slot-hashes", + "solana-stable-layout", + "solana-sysvar", + "solana-sysvar-id", + "solana-timings", + "solana-transaction-context", + "solana-type-overrides", + "thiserror 2.0.12", +] + +[[package]] +name = "solana-pubkey" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40db1ff5a0f8aea2c158d78ab5f2cf897848964251d1df42fef78efd3c85b863" +dependencies = [ + "borsh 0.10.4", + "borsh 1.5.7", + "bs58", + "bytemuck", + "bytemuck_derive", + "curve25519-dalek 4.1.3", + "five8_const", + "getrandom 0.2.16", + "js-sys", + "num-traits", + "rand 0.8.5", + "serde", + "serde_derive", + "solana-atomic-u64", + "solana-decode-error", + "solana-define-syscall", + "solana-sanitize", + "solana-sha256-hasher", + "wasm-bindgen", ] [[package]] name = "solana-pubsub-client" -version = "1.18.17" +version = "2.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b9abc76168d19927561db6a3685b98752bd0961b4ce4f8b7f85ee12238c017" +checksum = "c9633402b60b93f903d37c940a8ce0c1afc790b5a8678aaa8304f9099adf108b" dependencies = [ "crossbeam-channel", "futures-util", "log", - "reqwest", - "semver 1.0.21", + "reqwest 0.11.27", + "semver", "serde", "serde_derive", "serde_json", - "solana-account-decoder", + "solana-account-decoder-client-types", + "solana-clock", + "solana-pubkey", "solana-rpc-client-api", - "solana-sdk", - "thiserror", + "solana-signature", + "thiserror 2.0.12", "tokio", "tokio-stream", "tokio-tungstenite", @@ -7677,504 +9098,1085 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "1.18.17" +version = "2.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7952c5306a0be5f5276448cd20246b31265bfa884f29a077a24303c6a16aeb34" +checksum = "826ec34b8d4181f0c46efaa84c6b7992a459ca129f21506656d79a1e62633d4b" dependencies = [ - "async-mutex", + "async-lock 3.4.0", "async-trait", "futures", - "itertools", + "itertools 0.12.1", "lazy_static", "log", "quinn", "quinn-proto", - "rcgen", - "rustls 0.21.12", + "rustls 0.23.26", "solana-connection-cache", + "solana-keypair", "solana-measure", "solana-metrics", "solana-net-utils", + "solana-pubkey", + "solana-quic-definitions", "solana-rpc-client-api", - "solana-sdk", + "solana-signer", "solana-streamer", - "thiserror", + "solana-tls-utils", + "solana-transaction-error", + "thiserror 2.0.12", "tokio", ] +[[package]] +name = "solana-quic-definitions" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e606feac5110eb5d8afaa43ccaeea3ec49ccec36773387930b5ba545e745aea2" +dependencies = [ + "solana-keypair", +] + [[package]] name = "solana-rayon-threadlimit" -version = "1.18.17" +version = "2.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4fa0cc66f8e73d769bca2ede3012ba2ef8ab67963e832808665369f2cf81743" +checksum = "423c912a1a68455fe4ed5175cf94eb8965e061cd257973c9a5659e2bf4ea8371" dependencies = [ "lazy_static", "num_cpus", ] [[package]] -name = "solana-remote-wallet" -version = "1.18.17" +name = "solana-rent" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "289803796d4ff7b4699504d3ab9e9d9c5205ea3892b2ebe397b377494dbd75d4" +checksum = "d1aea8fdea9de98ca6e8c2da5827707fb3842833521b528a713810ca685d2480" dependencies = [ - "console", - "dialoguer", - "log", - "num-derive 0.4.2", - "num-traits", - "parking_lot 0.12.1", - "qstring", - "semver 1.0.21", - "solana-sdk", - "thiserror", - "uriparse", + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", +] + +[[package]] +name = "solana-rent-collector" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c1e19f5d5108b0d824244425e43bc78bbb9476e2199e979b0230c9f632d3bf4" +dependencies = [ + "serde", + "serde_derive", + "solana-account", + "solana-clock", + "solana-epoch-schedule", + "solana-genesis-config", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", +] + +[[package]] +name = "solana-rent-debits" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f6f9113c6003492e74438d1288e30cffa8ccfdc2ef7b49b9e816d8034da18cd" +dependencies = [ + "solana-pubkey", + "solana-reward-info", +] + +[[package]] +name = "solana-reserved-account-keys" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b293f4246626c0e0a991531f08848a713ada965612e99dc510963f04d12cae7" +dependencies = [ + "lazy_static", + "solana-feature-set", + "solana-pubkey", + "solana-sdk-ids", +] + +[[package]] +name = "solana-reward-info" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18205b69139b1ae0ab8f6e11cdcb627328c0814422ad2482000fa2ca54ae4a2f" +dependencies = [ + "serde", + "serde_derive", ] [[package]] name = "solana-rpc-client" -version = "1.18.17" +version = "2.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb55a08018776a62ecff52139fbcdab1a7baa4e8f077202be58156e8dde4d5f" +checksum = "3313bc969e1a8681f19a74181d301e5f91e5cc5a60975fb42e793caa9768f22e" dependencies = [ "async-trait", - "base64 0.21.7", + "base64 0.22.1", "bincode", - "bs58 0.4.0", + "bs58", "indicatif", "log", - "reqwest", - "semver 1.0.21", + "reqwest 0.11.27", + "reqwest-middleware", + "semver", "serde", "serde_derive", "serde_json", - "solana-account-decoder", + "solana-account", + "solana-account-decoder-client-types", + "solana-clock", + "solana-commitment-config", + "solana-epoch-info", + "solana-epoch-schedule", + "solana-feature-gate-interface", + "solana-hash", + "solana-instruction", + "solana-message", + "solana-pubkey", "solana-rpc-client-api", - "solana-sdk", - "solana-transaction-status", + "solana-signature", + "solana-transaction", + "solana-transaction-error", + "solana-transaction-status-client-types", "solana-version", - "solana-vote-program", "tokio", ] [[package]] name = "solana-rpc-client-api" -version = "1.18.17" +version = "2.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a8403038f4d6ab65bc7e7afb3afe8d9824c592232553c5cef55cf3de36025d" +checksum = "2dc3276b526100d0f55a7d1db2366781acdc75ce9fe4a9d1bc9c85a885a503f8" dependencies = [ - "base64 0.21.7", - "bs58 0.4.0", + "anyhow", + "base64 0.22.1", + "bs58", "jsonrpc-core", - "reqwest", - "semver 1.0.21", + "reqwest 0.11.27", + "reqwest-middleware", + "semver", "serde", "serde_derive", "serde_json", - "solana-account-decoder", - "solana-sdk", - "solana-transaction-status", + "solana-account", + "solana-account-decoder-client-types", + "solana-clock", + "solana-commitment-config", + "solana-fee-calculator", + "solana-inflation", + "solana-inline-spl", + "solana-pubkey", + "solana-signer", + "solana-transaction-error", + "solana-transaction-status-client-types", "solana-version", - "spl-token-2022 1.0.0", - "thiserror", + "thiserror 2.0.12", +] + +[[package]] +name = "solana-rpc-client-nonce-utils" +version = "2.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "294874298fb4e52729bb0229e0cdda326d4393b7122b92823aa46e99960cb920" +dependencies = [ + "solana-account", + "solana-commitment-config", + "solana-hash", + "solana-message", + "solana-nonce", + "solana-pubkey", + "solana-rpc-client", + "solana-sdk-ids", + "thiserror 2.0.12", +] + +[[package]] +name = "solana-sanitize" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f1bc1357b8188d9c4a3af3fc55276e56987265eb7ad073ae6f8180ee54cecf" + +[[package]] +name = "solana-sbpf" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66a3ce7a0f4d6830124ceb2c263c36d1ee39444ec70146eb49b939e557e72b96" +dependencies = [ + "byteorder", + "combine 3.8.1", + "hash32 0.2.1", + "libc", + "log", + "rand 0.8.5", + "rustc-demangle", + "thiserror 1.0.69", + "winapi", +] + +[[package]] +name = "solana-sdk" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8af90d2ce445440e0548fa4a5f96fe8b265c22041a68c942012ffadd029667d" +dependencies = [ + "bincode", + "bs58", + "getrandom 0.1.16", + "js-sys", + "serde", + "serde_json", + "solana-account", + "solana-bn254", + "solana-client-traits", + "solana-cluster-type", + "solana-commitment-config", + "solana-compute-budget-interface", + "solana-decode-error", + "solana-derivation-path", + "solana-ed25519-program", + "solana-epoch-info", + "solana-epoch-rewards-hasher", + "solana-feature-set", + "solana-fee-structure", + "solana-genesis-config", + "solana-hard-forks", + "solana-inflation", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-native-token", + "solana-nonce-account", + "solana-offchain-message", + "solana-packet", + "solana-poh-config", + "solana-precompile-error", + "solana-precompiles", + "solana-presigner", + "solana-program", + "solana-program-memory", + "solana-pubkey", + "solana-quic-definitions", + "solana-rent-collector", + "solana-rent-debits", + "solana-reserved-account-keys", + "solana-reward-info", + "solana-sanitize", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-secp256k1-program", + "solana-secp256k1-recover", + "solana-secp256r1-program", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-serde", + "solana-serde-varint", + "solana-short-vec", + "solana-shred-version", + "solana-signature", + "solana-signer", + "solana-system-transaction", + "solana-time-utils", + "solana-transaction", + "solana-transaction-context", + "solana-transaction-error", + "solana-validator-exit", + "thiserror 2.0.12", + "wasm-bindgen", +] + +[[package]] +name = "solana-sdk-ids" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5d8b9cc68d5c88b062a33e23a6466722467dde0035152d8fb1afbcdf350a5f" +dependencies = [ + "solana-pubkey", +] + +[[package]] +name = "solana-sdk-macro" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86280da8b99d03560f6ab5aca9de2e38805681df34e0bb8f238e69b29433b9df" +dependencies = [ + "bs58", + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "solana-secp256k1-program" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0a1caa972414cc78122c32bdae65ac5fe89df7db598585a5cde19d16a20280a" +dependencies = [ + "bincode", + "digest 0.10.7", + "libsecp256k1", + "serde", + "serde_derive", + "sha3", + "solana-feature-set", + "solana-instruction", + "solana-precompile-error", + "solana-sdk-ids", +] + +[[package]] +name = "solana-secp256k1-recover" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baa3120b6cdaa270f39444f5093a90a7b03d296d362878f7a6991d6de3bbe496" +dependencies = [ + "borsh 1.5.7", + "libsecp256k1", + "solana-define-syscall", + "thiserror 2.0.12", +] + +[[package]] +name = "solana-secp256r1-program" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cda2aa1bbaceda14763c4f142a00b486f2f262cfd901bd0410649ad0404d5f7" +dependencies = [ + "bytemuck", + "openssl", + "solana-feature-set", + "solana-instruction", + "solana-precompile-error", + "solana-sdk-ids", +] + +[[package]] +name = "solana-security-txt" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" + +[[package]] +name = "solana-seed-derivable" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3beb82b5adb266c6ea90e5cf3967235644848eac476c5a1f2f9283a143b7c97f" +dependencies = [ + "solana-derivation-path", +] + +[[package]] +name = "solana-seed-phrase" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36187af2324f079f65a675ec22b31c24919cb4ac22c79472e85d819db9bbbc15" +dependencies = [ + "hmac 0.12.1", + "pbkdf2", + "sha2 0.10.9", +] + +[[package]] +name = "solana-serde" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1931484a408af466e14171556a47adaa215953c7f48b24e5f6b0282763818b04" +dependencies = [ + "serde", +] + +[[package]] +name = "solana-serde-varint" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcc07d00200d82e6def2f7f7a45738e3406b17fe54a18adcf0defa16a97ccadb" +dependencies = [ + "serde", +] + +[[package]] +name = "solana-serialize-utils" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "817a284b63197d2b27afdba829c5ab34231da4a9b4e763466a003c40ca4f535e" +dependencies = [ + "solana-instruction", + "solana-pubkey", + "solana-sanitize", +] + +[[package]] +name = "solana-sha256-hasher" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0037386961c0d633421f53560ad7c80675c0447cba4d1bb66d60974dd486c7ea" +dependencies = [ + "sha2 0.10.9", + "solana-define-syscall", + "solana-hash", +] + +[[package]] +name = "solana-short-vec" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c54c66f19b9766a56fa0057d060de8378676cb64987533fa088861858fc5a69" +dependencies = [ + "serde", +] + +[[package]] +name = "solana-shred-version" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afd3db0461089d1ad1a78d9ba3f15b563899ca2386351d38428faa5350c60a98" +dependencies = [ + "solana-hard-forks", + "solana-hash", + "solana-sha256-hasher", +] + +[[package]] +name = "solana-signature" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47d251c8f3dc015f320b4161daac7f108156c837428e5a8cc61136d25beb11d6" +dependencies = [ + "bs58", + "ed25519-dalek", + "rand 0.8.5", + "serde", + "serde-big-array", + "serde_derive", + "solana-sanitize", ] [[package]] -name = "solana-rpc-client-nonce-utils" -version = "1.18.17" +name = "solana-signer" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4caca735caf76d51c074c3bacbfe38094bf7f92cfbe7b5b13f3bc4946e64f889" +checksum = "7c41991508a4b02f021c1342ba00bcfa098630b213726ceadc7cb032e051975b" dependencies = [ - "clap 2.34.0", - "solana-clap-utils", - "solana-rpc-client", - "solana-sdk", - "thiserror", + "solana-pubkey", + "solana-signature", + "solana-transaction-error", ] [[package]] -name = "solana-sdk" -version = "1.18.17" +name = "solana-slot-hashes" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df43d3a1e1637397ab43cbc216a5a8f977ec8a3cc3f3ae8c3851c83a3255dbcf" +checksum = "0c8691982114513763e88d04094c9caa0376b867a29577939011331134c301ce" dependencies = [ - "assert_matches", - "base64 0.21.7", - "bincode", - "bitflags 2.5.0", - "borsh 1.5.1", - "bs58 0.4.0", - "bytemuck", - "byteorder", - "chrono", - "derivation-path", - "digest 0.10.7", - "ed25519-dalek", - "ed25519-dalek-bip32", - "generic-array", - "hmac 0.12.1", - "itertools", - "js-sys", - "lazy_static", - "libsecp256k1", - "log", - "memmap2", - "num-derive 0.4.2", - "num-traits", - "num_enum 0.7.2", - "pbkdf2 0.11.0", - "qstring", - "qualifier_attr", - "rand 0.7.3", - "rand 0.8.5", - "rustc_version 0.4.0", - "rustversion", "serde", - "serde_bytes", "serde_derive", - "serde_json", - "serde_with", - "sha2 0.10.8", - "sha3 0.10.6", - "siphasher", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-logger", - "solana-program", - "solana-sdk-macro", - "thiserror", - "uriparse", - "wasm-bindgen", + "solana-hash", + "solana-sdk-ids", + "solana-sysvar-id", ] [[package]] -name = "solana-sdk-macro" -version = "1.18.17" +name = "solana-slot-history" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86c76414183a325038ff020b22c07d1e9d2da0703ddc0244acfed37ee2921d96" +checksum = "97ccc1b2067ca22754d5283afb2b0126d61eae734fc616d23871b0943b0d935e" dependencies = [ - "bs58 0.4.0", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.58", + "bv", + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sysvar-id", ] [[package]] -name = "solana-security-txt" -version = "1.1.1" +name = "solana-stable-layout" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" +checksum = "9f14f7d02af8f2bc1b5efeeae71bc1c2b7f0f65cd75bcc7d8180f2c762a57f54" +dependencies = [ + "solana-instruction", + "solana-pubkey", +] + +[[package]] +name = "solana-stake-interface" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5269e89fde216b4d7e1d1739cf5303f8398a1ff372a81232abbee80e554a838c" +dependencies = [ + "borsh 0.10.4", + "borsh 1.5.7", + "num-traits", + "serde", + "serde_derive", + "solana-clock", + "solana-cpi", + "solana-decode-error", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-system-interface", + "solana-sysvar-id", +] [[package]] name = "solana-streamer" -version = "1.18.17" +version = "2.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad1bdb955ec6d23a1dbf87e403ff3e610d68616275693125a893d7ed4b2d323" +checksum = "1eaf5b216717d1d551716f3190878d028c689dabac40c8889767cead7e447481" dependencies = [ "async-channel", "bytes", "crossbeam-channel", + "dashmap", + "futures", "futures-util", + "governor", "histogram", - "indexmap 2.2.6", - "itertools", + "indexmap 2.9.0", + "itertools 0.12.1", "libc", "log", "nix", "pem 1.1.1", "percentage", - "pkcs8", "quinn", "quinn-proto", "rand 0.8.5", - "rcgen", - "rustls 0.21.12", + "rustls 0.23.26", "smallvec", + "socket2", + "solana-keypair", + "solana-measure", "solana-metrics", + "solana-net-utils", + "solana-packet", "solana-perf", - "solana-sdk", - "thiserror", + "solana-pubkey", + "solana-quic-definitions", + "solana-signature", + "solana-signer", + "solana-time-utils", + "solana-tls-utils", + "solana-transaction-error", + "solana-transaction-metrics-tracker", + "thiserror 2.0.12", "tokio", + "tokio-util", "x509-parser", ] +[[package]] +name = "solana-system-interface" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94d7c18cb1a91c6be5f5a8ac9276a1d7c737e39a21beba9ea710ab4b9c63bc90" +dependencies = [ + "js-sys", + "num-traits", + "serde", + "serde_derive", + "solana-decode-error", + "solana-instruction", + "solana-pubkey", + "wasm-bindgen", +] + +[[package]] +name = "solana-system-transaction" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bd98a25e5bcba8b6be8bcbb7b84b24c2a6a8178d7fb0e3077a916855ceba91a" +dependencies = [ + "solana-hash", + "solana-keypair", + "solana-message", + "solana-pubkey", + "solana-signer", + "solana-system-interface", + "solana-transaction", +] + +[[package]] +name = "solana-sysvar" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf6b44740d7f0c9f375d045c165bc0aab4a90658f92d6835aeb0649afaeaff9a" +dependencies = [ + "base64 0.22.1", + "bincode", + "bytemuck", + "bytemuck_derive", + "lazy_static", + "serde", + "serde_derive", + "solana-account-info", + "solana-clock", + "solana-define-syscall", + "solana-epoch-rewards", + "solana-epoch-schedule", + "solana-fee-calculator", + "solana-hash", + "solana-instruction", + "solana-instructions-sysvar", + "solana-last-restart-slot", + "solana-program-entrypoint", + "solana-program-error", + "solana-program-memory", + "solana-pubkey", + "solana-rent", + "solana-sanitize", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-slot-hashes", + "solana-slot-history", + "solana-stake-interface", + "solana-sysvar-id", +] + +[[package]] +name = "solana-sysvar-id" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5762b273d3325b047cfda250787f8d796d781746860d5d0a746ee29f3e8812c1" +dependencies = [ + "solana-pubkey", + "solana-sdk-ids", +] + [[package]] name = "solana-thin-client" -version = "1.18.17" +version = "2.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc301310ba0755c449a8800136f67f8ad14419b366404629894cd10021495360" +checksum = "255bda447fbff4526b6b19b16b3652281ec2b7c4952d019b369a5f4a9dba4e5c" dependencies = [ "bincode", "log", "rayon", + "solana-account", + "solana-client-traits", + "solana-clock", + "solana-commitment-config", "solana-connection-cache", + "solana-epoch-info", + "solana-hash", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-pubkey", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk", + "solana-signature", + "solana-signer", + "solana-system-interface", + "solana-transaction", + "solana-transaction-error", +] + +[[package]] +name = "solana-time-utils" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af261afb0e8c39252a04d026e3ea9c405342b08c871a2ad8aa5448e068c784c" + +[[package]] +name = "solana-timings" +version = "2.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d08862987485af7e3864b0ab9d4febeccaa34f1e982f08af9fa0460782d10773" +dependencies = [ + "eager", + "enum-iterator", + "solana-pubkey", +] + +[[package]] +name = "solana-tls-utils" +version = "2.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6f227b3813b6c26c8ed38910b90a0b641baedb2ad075ea51ccfbff1992ee394" +dependencies = [ + "rustls 0.23.26", + "solana-keypair", + "solana-pubkey", + "solana-signer", + "x509-parser", ] [[package]] name = "solana-tpu-client" -version = "1.18.17" +version = "2.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb887bd5078ff015e103e9ee54a6713380590efa8ff1804b3a653f07188928c6" +checksum = "bcc74ecb664add683a18bb9f484a30ca8c9d71f3addcd3a771eaaaaec12125fd" dependencies = [ "async-trait", "bincode", "futures-util", - "indexmap 2.2.6", + "indexmap 2.9.0", "indicatif", "log", "rayon", + "solana-client-traits", + "solana-clock", + "solana-commitment-config", "solana-connection-cache", + "solana-epoch-info", "solana-measure", - "solana-metrics", + "solana-message", + "solana-net-utils", + "solana-pubkey", "solana-pubsub-client", + "solana-quic-definitions", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk", - "thiserror", + "solana-signature", + "solana-signer", + "solana-transaction", + "solana-transaction-error", + "thiserror 2.0.12", "tokio", ] [[package]] -name = "solana-transaction-status" -version = "1.18.17" +name = "solana-transaction" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a0cdfdf63192fb60de094fae8e81159e4e3e9aac9659fe3f9ef0e707023fb32" +checksum = "abec848d081beb15a324c633cd0e0ab33033318063230389895cae503ec9b544" dependencies = [ - "Inflector", - "base64 0.21.7", "bincode", - "borsh 0.10.3", - "bs58 0.4.0", - "lazy_static", - "log", "serde", "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-sdk", - "spl-associated-token-account 2.3.0", - "spl-memo", - "spl-token 4.0.0", - "spl-token-2022 1.0.0", - "thiserror", + "solana-bincode", + "solana-feature-set", + "solana-hash", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-precompiles", + "solana-pubkey", + "solana-sanitize", + "solana-sdk-ids", + "solana-short-vec", + "solana-signature", + "solana-signer", + "solana-system-interface", + "solana-transaction-error", + "wasm-bindgen", ] [[package]] -name = "solana-udp-client" -version = "1.18.17" +name = "solana-transaction-context" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea0d6d8d66e36371577f51c4d1d6192a66f1fa4efe7161a36d94677640dcadb" +checksum = "5022de04cbba05377f68bf848c8c1322ead733f88a657bf792bb40f3257b8218" dependencies = [ - "async-trait", - "solana-connection-cache", - "solana-net-utils", - "solana-sdk", - "solana-streamer", - "thiserror", - "tokio", + "bincode", + "serde", + "serde_derive", + "solana-account", + "solana-instruction", + "solana-pubkey", + "solana-rent", + "solana-signature", ] [[package]] -name = "solana-version" -version = "1.18.17" +name = "solana-transaction-error" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f4c2f531c22ce806b211118be8928a791425f97de4592371fb57b246ed33e34" +checksum = "222a9dc8fdb61c6088baab34fc3a8b8473a03a7a5fd404ed8dd502fa79b67cb1" dependencies = [ - "log", - "rustc_version 0.4.0", - "semver 1.0.21", "serde", "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-sdk", + "solana-instruction", + "solana-sanitize", ] [[package]] -name = "solana-vote-program" -version = "1.18.17" +name = "solana-transaction-metrics-tracker" +version = "2.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d8a6486017e71a3714a8e1a635e17209135cc20535ba9808ccf106d80ff6e8b" +checksum = "c4c03abfcb923aaf71c228e81b54a804aa224a48577477d8e1096c3a1429d21b" dependencies = [ + "base64 0.22.1", "bincode", + "lazy_static", + "log", + "rand 0.8.5", + "solana-packet", + "solana-perf", + "solana-short-vec", + "solana-signature", +] + +[[package]] +name = "solana-transaction-status" +version = "2.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3f43457f2a9bfe6e625af7e37c6c46de152f20f9cc9657f8b26321da36826ea" +dependencies = [ + "Inflector", + "agave-reserved-account-keys", + "base64 0.22.1", + "bincode", + "borsh 1.5.7", + "bs58", + "lazy_static", "log", - "num-derive 0.4.2", - "num-traits", - "rustc_version 0.4.0", "serde", "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-metrics", + "serde_json", + "solana-account-decoder", + "solana-clock", + "solana-hash", + "solana-instruction", + "solana-loader-v2-interface", + "solana-message", "solana-program", - "solana-program-runtime", - "solana-sdk", - "thiserror", + "solana-pubkey", + "solana-reward-info", + "solana-sdk-ids", + "solana-signature", + "solana-system-interface", + "solana-transaction", + "solana-transaction-error", + "solana-transaction-status-client-types", + "spl-associated-token-account", + "spl-memo", + "spl-token 7.0.0", + "spl-token-2022 7.0.0", + "spl-token-group-interface", + "spl-token-metadata-interface", + "thiserror 2.0.12", ] [[package]] -name = "solana-zk-token-sdk" -version = "1.18.17" +name = "solana-transaction-status-client-types" +version = "2.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "513407f88394e437b4ff5aad892bc5bf51a655ae2401e6e63549734d3695c46f" +checksum = "4aaef59e8a54fc3a2dabfd85c32e35493c5e228f9d1efbcdcdc3c0819dddf7fd" dependencies = [ - "aes-gcm-siv", - "base64 0.21.7", + "base64 0.22.1", "bincode", - "bytemuck", - "byteorder", - "curve25519-dalek", - "getrandom 0.1.16", - "itertools", - "lazy_static", - "merlin", - "num-derive 0.4.2", - "num-traits", - "rand 0.7.3", + "bs58", "serde", + "serde_derive", "serde_json", - "sha3 0.9.1", + "solana-account-decoder-client-types", + "solana-commitment-config", + "solana-message", + "solana-reward-info", + "solana-signature", + "solana-transaction", + "solana-transaction-context", + "solana-transaction-error", + "thiserror 2.0.12", +] + +[[package]] +name = "solana-transaction-utils" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fbed85bba4b4210edfe9de2c766d7935e7375faa76d3a93b34a220413b37eeb" +dependencies = [ + "bincode", + "dashmap", + "futures", + "futures-core", + "futures-util", + "indicatif", + "itertools 0.13.0", + "solana-client", "solana-program", + "solana-quic-client", + "solana-rpc-client", + "solana-rpc-client-api", "solana-sdk", - "subtle", - "thiserror", - "zeroize", + "solana-tpu-client", + "solana-transaction-status", + "thiserror 1.0.69", + "tokio", + "tokio-graceful-shutdown", + "tracing", ] [[package]] -name = "solana_rbpf" -version = "0.8.0" +name = "solana-type-overrides" +version = "2.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d457cc2ba742c120492a64b7fa60e22c575e891f6b55039f4d736568fb112a3" +checksum = "72735ae2d80d5556400b8fbb552688b3ac1413cd6c29e85db83d24ffe825a7f9" dependencies = [ - "byteorder", - "combine", - "goblin", - "hash32", - "libc", - "log", + "lazy_static", "rand 0.8.5", - "rustc-demangle", - "scroll", - "thiserror", - "winapi", ] [[package]] -name = "spin" -version = "0.5.2" +name = "solana-udp-client" +version = "2.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "6d3e085a6adf81d51f678624934ffe266bd45a1c105849992b1af933c80bbf19" +dependencies = [ + "async-trait", + "solana-connection-cache", + "solana-keypair", + "solana-net-utils", + "solana-streamer", + "solana-transaction-error", + "thiserror 2.0.12", + "tokio", +] [[package]] -name = "spin" -version = "0.9.4" +name = "solana-validator-exit" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" -dependencies = [ - "lock_api", -] +checksum = "7bbf6d7a3c0b28dd5335c52c0e9eae49d0ae489a8f324917faf0ded65a812c1d" [[package]] -name = "spki" -version = "0.5.4" +name = "solana-version" +version = "2.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" +checksum = "2a58e01912dc3d5ff4391fe49476461b3b9ebc4215f3713d2fe3ffcfeda7f8e2" dependencies = [ - "base64ct", - "der", + "agave-feature-set", + "semver", + "serde", + "serde_derive", + "solana-sanitize", + "solana-serde-varint", ] [[package]] -name = "spl-account-compression" -version = "0.3.0" +name = "solana-vote-interface" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c43bd4455d9fb29b9e4f83c087ccffa2f6f41fecfc0549932ae391d00f3378" +checksum = "78f039b0788337bedc6c5450d2f237718f938defb5ce0e0ad8ef507e78dcd370" dependencies = [ - "anchor-lang 0.29.0", - "bytemuck", - "spl-concurrent-merkle-tree", - "spl-noop", + "bincode", + "num-derive", + "num-traits", + "serde", + "serde_derive", + "solana-clock", + "solana-decode-error", + "solana-hash", + "solana-instruction", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-serde-varint", + "solana-serialize-utils", + "solana-short-vec", + "solana-system-interface", ] [[package]] -name = "spl-associated-token-account" -version = "2.3.0" +name = "solana-zk-sdk" +version = "2.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "992d9c64c2564cc8f63a4b508bf3ebcdf2254b0429b13cd1d31adb6162432a5f" +checksum = "27c757a8d8b66af3e150c29e961310bafa9d8c91ad826f96fb88b2bface31ba2" dependencies = [ - "assert_matches", - "borsh 0.10.3", - "num-derive 0.4.2", + "aes-gcm-siv", + "base64 0.22.1", + "bincode", + "bytemuck", + "bytemuck_derive", + "curve25519-dalek 4.1.3", + "itertools 0.12.1", + "js-sys", + "lazy_static", + "merlin", + "num-derive", "num-traits", - "solana-program", - "spl-token 4.0.0", - "spl-token-2022 1.0.0", - "thiserror", + "rand 0.8.5", + "serde", + "serde_derive", + "serde_json", + "sha3", + "solana-derivation-path", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-signature", + "solana-signer", + "subtle", + "thiserror 2.0.12", + "wasm-bindgen", + "zeroize", ] [[package]] -name = "spl-associated-token-account" -version = "3.0.2" +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spinning_top" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2e688554bac5838217ffd1fab7845c573ff106b6336bf7d290db7c98d5a8efd" +checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" dependencies = [ - "assert_matches", - "borsh 1.5.1", - "num-derive 0.4.2", - "num-traits", - "solana-program", - "spl-token 4.0.0", - "spl-token-2022 3.0.2", - "thiserror", + "lock_api", ] [[package]] -name = "spl-concurrent-merkle-tree" -version = "0.2.0" +name = "spki" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141eaea58588beae81b71d101373a53f096737739873de42d6b1368bc2b8fc30" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ - "bytemuck", - "solana-program", - "thiserror", + "base64ct", + "der 0.7.10", ] [[package]] -name = "spl-discriminator" -version = "0.1.1" +name = "spl-associated-token-account" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa600f2fe56f32e923261719bae640d873edadbc5237681a39b8e37bfd4d263" +checksum = "76fee7d65013667032d499adc3c895e286197a35a0d3a4643c80e7fd3e9969e3" dependencies = [ - "bytemuck", + "borsh 1.5.7", + "num-derive", + "num-traits", "solana-program", - "spl-discriminator-derive 0.1.2", + "spl-associated-token-account-client", + "spl-token 7.0.0", + "spl-token-2022 6.0.0", + "thiserror 1.0.69", ] [[package]] -name = "spl-discriminator" -version = "0.2.2" +name = "spl-associated-token-account-client" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d1814406e98b08c5cd02c1126f83fd407ad084adce0b05fda5730677822eac" +checksum = "d6f8349dbcbe575f354f9a533a21f272f3eb3808a49e2fdc1c34393b88ba76cb" dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator-derive 0.2.0", + "solana-instruction", + "solana-pubkey", ] [[package]] -name = "spl-discriminator-derive" -version = "0.1.2" +name = "spl-discriminator" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07fd7858fc4ff8fb0e34090e41d7eb06a823e1057945c26d480bfc21d2338a93" +checksum = "a7398da23554a31660f17718164e31d31900956054f54f52d5ec1be51cb4f4b3" dependencies = [ - "quote", - "spl-discriminator-syn 0.1.2", - "syn 2.0.58", + "bytemuck", + "solana-program-error", + "solana-sha256-hasher", + "spl-discriminator-derive", ] [[package]] @@ -8184,21 +10186,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9e8418ea6269dcfb01c712f0444d2c75542c04448b480e87de59d2865edc750" dependencies = [ "quote", - "spl-discriminator-syn 0.2.0", - "syn 2.0.58", -] - -[[package]] -name = "spl-discriminator-syn" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fea7be851bd98d10721782ea958097c03a0c2a07d8d4997041d0ece6319a63" -dependencies = [ - "proc-macro2", - "quote", - "sha2 0.10.8", - "syn 2.0.58", - "thiserror", + "spl-discriminator-syn", + "syn 2.0.101", ] [[package]] @@ -8209,91 +10198,69 @@ checksum = "8c1f05593b7ca9eac7caca309720f2eafb96355e037e6d373b909a80fe7b69b9" dependencies = [ "proc-macro2", "quote", - "sha2 0.10.8", - "syn 2.0.58", - "thiserror", -] - -[[package]] -name = "spl-memo" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f180b03318c3dbab3ef4e1e4d46d5211ae3c780940dd0a28695aba4b59a75a" -dependencies = [ - "solana-program", -] - -[[package]] -name = "spl-noop" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd67ea3d0070a12ff141f5da46f9695f49384a03bce1203a5608f5739437950" -dependencies = [ - "solana-program", + "sha2 0.10.9", + "syn 2.0.101", + "thiserror 1.0.69", ] [[package]] -name = "spl-pod" +name = "spl-elgamal-registry" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a5db7e4efb1107b0b8e52a13f035437cdcb36ef99c58f6d467f089d9b2915a" +checksum = "ce0f668975d2b0536e8a8fd60e56a05c467f06021dae037f1d0cfed0de2e231d" dependencies = [ - "borsh 0.10.3", "bytemuck", "solana-program", - "solana-zk-token-sdk", - "spl-program-error 0.3.1", + "solana-zk-sdk", + "spl-pod", + "spl-token-confidential-transfer-proof-extraction", ] [[package]] -name = "spl-pod" -version = "0.2.2" +name = "spl-memo" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ce669f48cf2eca1ec518916d8725596bfb655beb1c74374cf71dc6cb773c9" +checksum = "9f09647c0974e33366efeb83b8e2daebb329f0420149e74d3a4bd2c08cf9f7cb" dependencies = [ - "borsh 1.5.1", - "bytemuck", - "solana-program", - "solana-zk-token-sdk", - "spl-program-error 0.4.1", + "solana-account-info", + "solana-instruction", + "solana-msg", + "solana-program-entrypoint", + "solana-program-error", + "solana-pubkey", ] [[package]] -name = "spl-program-error" -version = "0.3.1" +name = "spl-pod" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e0657b6490196971d9e729520ba934911ff41fbb2cb9004463dbe23cf8b4b4f" +checksum = "d994afaf86b779104b4a95ba9ca75b8ced3fdb17ee934e38cb69e72afbe17799" dependencies = [ - "num-derive 0.4.2", + "borsh 1.5.7", + "bytemuck", + "bytemuck_derive", + "num-derive", "num-traits", - "solana-program", - "spl-program-error-derive 0.3.2", - "thiserror", + "solana-decode-error", + "solana-msg", + "solana-program-error", + "solana-program-option", + "solana-pubkey", + "solana-zk-sdk", + "thiserror 2.0.12", ] [[package]] name = "spl-program-error" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49065093ea91f57b9b2bd81493ff705e2ad4e64507a07dbc02b085778e02770e" +checksum = "9d39b5186f42b2b50168029d81e58e800b690877ef0b30580d107659250da1d1" dependencies = [ - "num-derive 0.4.2", + "num-derive", "num-traits", "solana-program", - "spl-program-error-derive 0.4.1", - "thiserror", -] - -[[package]] -name = "spl-program-error-derive" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1845dfe71fd68f70382232742e758557afe973ae19e6c06807b2c30f5d5cb474" -dependencies = [ - "proc-macro2", - "quote", - "sha2 0.10.8", - "syn 2.0.58", + "spl-program-error-derive", + "thiserror 1.0.69", ] [[package]] @@ -8304,287 +10271,268 @@ checksum = "e6d375dd76c517836353e093c2dbb490938ff72821ab568b545fd30ab3256b3e" dependencies = [ "proc-macro2", "quote", - "sha2 0.10.8", - "syn 2.0.58", -] - -[[package]] -name = "spl-tlv-account-resolution" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062e148d3eab7b165582757453632ffeef490c02c86a48bfdb4988f63eefb3b9" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator 0.1.1", - "spl-pod 0.1.1", - "spl-program-error 0.3.1", - "spl-type-length-value 0.3.1", -] - -[[package]] -name = "spl-tlv-account-resolution" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f335787add7fa711819f9e7c573f8145a5358a709446fe2d24bf2a88117c90" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator 0.1.1", - "spl-pod 0.1.1", - "spl-program-error 0.3.1", - "spl-type-length-value 0.3.1", + "sha2 0.10.9", + "syn 2.0.101", ] [[package]] name = "spl-tlv-account-resolution" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cace91ba08984a41556efe49cbf2edca4db2f577b649da7827d3621161784bf8" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator 0.2.2", - "spl-pod 0.2.2", - "spl-program-error 0.4.1", - "spl-type-length-value 0.4.3", -] - -[[package]] -name = "spl-token" -version = "3.5.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d" +checksum = "cd99ff1e9ed2ab86e3fd582850d47a739fec1be9f4661cba1782d3a0f26805f3" dependencies = [ - "arrayref", "bytemuck", - "num-derive 0.3.3", + "num-derive", "num-traits", - "num_enum 0.5.10", - "solana-program", - "thiserror", + "solana-account-info", + "solana-decode-error", + "solana-instruction", + "solana-msg", + "solana-program-error", + "solana-pubkey", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-type-length-value", + "thiserror 1.0.69", ] [[package]] name = "spl-token" -version = "4.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08459ba1b8f7c1020b4582c4edf0f5c7511a5e099a7a97570c9698d4f2337060" +checksum = "ed320a6c934128d4f7e54fe00e16b8aeaecf215799d060ae14f93378da6dc834" dependencies = [ "arrayref", "bytemuck", - "num-derive 0.3.3", + "num-derive", "num-traits", - "num_enum 0.6.1", + "num_enum", "solana-program", - "thiserror", + "thiserror 1.0.69", ] [[package]] -name = "spl-token-2022" -version = "0.9.0" +name = "spl-token" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4abf34a65ba420584a0c35f3903f8d727d1f13ababbdc3f714c6b065a686e86" +checksum = "053067c6a82c705004f91dae058b11b4780407e9ccd6799dc9e7d0fab5f242da" dependencies = [ "arrayref", "bytemuck", - "num-derive 0.4.2", + "num-derive", "num-traits", - "num_enum 0.7.2", - "solana-program", - "solana-zk-token-sdk", - "spl-memo", - "spl-pod 0.1.1", - "spl-token 4.0.0", - "spl-token-metadata-interface 0.2.0", - "spl-transfer-hook-interface 0.3.0", - "spl-type-length-value 0.3.1", - "thiserror", + "num_enum", + "solana-account-info", + "solana-cpi", + "solana-decode-error", + "solana-instruction", + "solana-msg", + "solana-program-entrypoint", + "solana-program-error", + "solana-program-memory", + "solana-program-option", + "solana-program-pack", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-sysvar", + "thiserror 2.0.12", ] [[package]] name = "spl-token-2022" -version = "1.0.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d697fac19fd74ff472dfcc13f0b442dd71403178ce1de7b5d16f83a33561c059" +checksum = "5b27f7405010ef816587c944536b0eafbcc35206ab6ba0f2ca79f1d28e488f4f" dependencies = [ "arrayref", "bytemuck", - "num-derive 0.4.2", + "num-derive", "num-traits", - "num_enum 0.7.2", + "num_enum", "solana-program", "solana-security-txt", - "solana-zk-token-sdk", + "solana-zk-sdk", + "spl-elgamal-registry", "spl-memo", - "spl-pod 0.1.1", - "spl-token 4.0.0", - "spl-token-group-interface 0.1.0", - "spl-token-metadata-interface 0.2.0", - "spl-transfer-hook-interface 0.4.1", - "spl-type-length-value 0.3.1", - "thiserror", + "spl-pod", + "spl-token 7.0.0", + "spl-token-confidential-transfer-ciphertext-arithmetic", + "spl-token-confidential-transfer-proof-extraction", + "spl-token-confidential-transfer-proof-generation 0.2.0", + "spl-token-group-interface", + "spl-token-metadata-interface", + "spl-transfer-hook-interface", + "spl-type-length-value", + "thiserror 1.0.69", ] [[package]] name = "spl-token-2022" -version = "3.0.2" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5412f99ae7ee6e0afde00defaa354e6228e47e30c0e3adf553e2e01e6abb584" +checksum = "9048b26b0df0290f929ff91317c83db28b3ef99af2b3493dd35baa146774924c" dependencies = [ "arrayref", "bytemuck", - "num-derive 0.4.2", + "num-derive", "num-traits", - "num_enum 0.7.2", + "num_enum", "solana-program", "solana-security-txt", - "solana-zk-token-sdk", + "solana-zk-sdk", + "spl-elgamal-registry", "spl-memo", - "spl-pod 0.2.2", - "spl-token 4.0.0", - "spl-token-group-interface 0.2.3", - "spl-token-metadata-interface 0.3.3", - "spl-transfer-hook-interface 0.6.3", - "spl-type-length-value 0.4.3", - "thiserror", + "spl-pod", + "spl-token 7.0.0", + "spl-token-confidential-transfer-ciphertext-arithmetic", + "spl-token-confidential-transfer-proof-extraction", + "spl-token-confidential-transfer-proof-generation 0.3.0", + "spl-token-group-interface", + "spl-token-metadata-interface", + "spl-transfer-hook-interface", + "spl-type-length-value", + "thiserror 2.0.12", ] [[package]] -name = "spl-token-group-interface" -version = "0.1.0" +name = "spl-token-confidential-transfer-ciphertext-arithmetic" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b889509d49fa74a4a033ca5dae6c2307e9e918122d97e58562f5c4ffa795c75d" +checksum = "170378693c5516090f6d37ae9bad2b9b6125069be68d9acd4865bbe9fc8499fd" dependencies = [ + "base64 0.22.1", "bytemuck", - "solana-program", - "spl-discriminator 0.1.1", - "spl-pod 0.1.1", - "spl-program-error 0.3.1", + "solana-curve25519", + "solana-zk-sdk", ] [[package]] -name = "spl-token-group-interface" -version = "0.2.3" +name = "spl-token-confidential-transfer-proof-extraction" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d419b5cfa3ee8e0f2386fd7e02a33b3ec8a7db4a9c7064a2ea24849dc4a273b6" +checksum = "eff2d6a445a147c9d6dd77b8301b1e116c8299601794b558eafa409b342faf96" dependencies = [ "bytemuck", + "solana-curve25519", "solana-program", - "spl-discriminator 0.2.2", - "spl-pod 0.2.2", - "spl-program-error 0.4.1", + "solana-zk-sdk", + "spl-pod", + "thiserror 2.0.12", ] [[package]] -name = "spl-token-metadata-interface" +name = "spl-token-confidential-transfer-proof-generation" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f" +checksum = "8627184782eec1894de8ea26129c61303f1f0adeed65c20e0b10bc584f09356d" dependencies = [ - "borsh 0.10.3", - "solana-program", - "spl-discriminator 0.1.1", - "spl-pod 0.1.1", - "spl-program-error 0.3.1", - "spl-type-length-value 0.3.1", + "curve25519-dalek 4.1.3", + "solana-zk-sdk", + "thiserror 1.0.69", ] [[package]] -name = "spl-token-metadata-interface" -version = "0.3.3" +name = "spl-token-confidential-transfer-proof-generation" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30179c47e93625680dabb620c6e7931bd12d62af390f447bc7beb4a3a9b5feee" +checksum = "0e3597628b0d2fe94e7900fd17cdb4cfbb31ee35c66f82809d27d86e44b2848b" dependencies = [ - "borsh 1.5.1", - "solana-program", - "spl-discriminator 0.2.2", - "spl-pod 0.2.2", - "spl-program-error 0.4.1", - "spl-type-length-value 0.4.3", + "curve25519-dalek 4.1.3", + "solana-zk-sdk", + "thiserror 2.0.12", ] [[package]] -name = "spl-transfer-hook-interface" -version = "0.3.0" +name = "spl-token-group-interface" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "051d31803f873cabe71aec3c1b849f35248beae5d19a347d93a5c9cccc5d5a9b" +checksum = "d595667ed72dbfed8c251708f406d7c2814a3fa6879893b323d56a10bedfc799" dependencies = [ - "arrayref", "bytemuck", - "solana-program", - "spl-discriminator 0.1.1", - "spl-pod 0.1.1", - "spl-program-error 0.3.1", - "spl-tlv-account-resolution 0.4.0", - "spl-type-length-value 0.3.1", + "num-derive", + "num-traits", + "solana-decode-error", + "solana-instruction", + "solana-msg", + "solana-program-error", + "solana-pubkey", + "spl-discriminator", + "spl-pod", + "thiserror 1.0.69", ] [[package]] -name = "spl-transfer-hook-interface" -version = "0.4.1" +name = "spl-token-metadata-interface" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259" +checksum = "dfb9c89dbc877abd735f05547dcf9e6e12c00c11d6d74d8817506cab4c99fdbb" dependencies = [ - "arrayref", - "bytemuck", - "solana-program", - "spl-discriminator 0.1.1", - "spl-pod 0.1.1", - "spl-program-error 0.3.1", - "spl-tlv-account-resolution 0.5.2", - "spl-type-length-value 0.3.1", + "borsh 1.5.7", + "num-derive", + "num-traits", + "solana-borsh", + "solana-decode-error", + "solana-instruction", + "solana-msg", + "solana-program-error", + "solana-pubkey", + "spl-discriminator", + "spl-pod", + "spl-type-length-value", + "thiserror 1.0.69", ] [[package]] name = "spl-transfer-hook-interface" -version = "0.6.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a98359769cd988f7b35c02558daa56d496a7e3bd8626e61f90a7c757eedb9b" +checksum = "4aa7503d52107c33c88e845e1351565050362c2314036ddf19a36cd25137c043" dependencies = [ "arrayref", "bytemuck", - "solana-program", - "spl-discriminator 0.2.2", - "spl-pod 0.2.2", - "spl-program-error 0.4.1", - "spl-tlv-account-resolution 0.6.3", - "spl-type-length-value 0.4.3", -] - -[[package]] -name = "spl-type-length-value" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9ebd75d29c5f48de5f6a9c114e08531030b75b8ac2c557600ac7da0b73b1e8" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator 0.1.1", - "spl-pod 0.1.1", - "spl-program-error 0.3.1", + "num-derive", + "num-traits", + "solana-account-info", + "solana-cpi", + "solana-decode-error", + "solana-instruction", + "solana-msg", + "solana-program-error", + "solana-pubkey", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-tlv-account-resolution", + "spl-type-length-value", + "thiserror 1.0.69", ] [[package]] name = "spl-type-length-value" -version = "0.4.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ce13429dbd41d2cee8a73931c05fda0b0c8ca156a8b0c19445642550bb61a" +checksum = "ba70ef09b13af616a4c987797870122863cba03acc4284f226a4473b043923f9" dependencies = [ "bytemuck", - "solana-program", - "spl-discriminator 0.2.2", - "spl-pod 0.2.2", - "spl-program-error 0.4.1", + "num-derive", + "num-traits", + "solana-account-info", + "solana-decode-error", + "solana-msg", + "solana-program-error", + "spl-discriminator", + "spl-pod", + "thiserror 1.0.69", ] [[package]] name = "sqlformat" -version = "0.2.0" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87e292b4291f154971a43c3774364e2cbcaec599d3f5bf6fa9d122885dbc38a" +checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790" dependencies = [ - "itertools", "nom", "unicode_categories", ] @@ -8594,8 +10542,19 @@ name = "sqlx" version = "0.6.2" source = "git+https://github.com/launchbadge/sqlx.git?rev=42dd78fe931df651eac411316ed3eab87c2f79b2#42dd78fe931df651eac411316ed3eab87c2f79b2" dependencies = [ - "sqlx-core", - "sqlx-macros", + "sqlx-core 0.6.2", + "sqlx-macros 0.6.2", +] + +[[package]] +name = "sqlx" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" +dependencies = [ + "sqlx-core 0.7.4", + "sqlx-macros 0.7.4", + "sqlx-postgres", ] [[package]] @@ -8603,8 +10562,8 @@ name = "sqlx-core" version = "0.6.2" source = "git+https://github.com/launchbadge/sqlx.git?rev=42dd78fe931df651eac411316ed3eab87c2f79b2#42dd78fe931df651eac411316ed3eab87c2f79b2" dependencies = [ - "ahash 0.7.6", - "atoi", + "ahash 0.7.8", + "atoi 1.0.0", "base64 0.13.1", "bitflags 1.3.2", "byteorder", @@ -8615,45 +10574,87 @@ dependencies = [ "dirs", "dotenvy", "either", - "event-listener", + "event-listener 2.5.3", "futures-channel", "futures-core", - "futures-intrusive", + "futures-intrusive 0.4.2", "futures-util", "hashlink", "hex", "hkdf", "hmac 0.12.1", "indexmap 1.9.3", - "itoa 1.0.9", + "itoa", "libc", "log", "md-5", "memchr", - "num-bigint 0.4.4", + "num-bigint 0.4.6", "once_cell", "paste", "percent-encoding", "rand 0.8.5", "rust_decimal", "rustls 0.20.9", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "serde", "serde_json", "sha1", - "sha2 0.10.8", + "sha2 0.10.9", "smallvec", "sqlformat", "sqlx-rt", "stringprep", - "thiserror", + "thiserror 1.0.69", "tokio-stream", "url", "uuid", - "webpki-roots 0.22.5", + "webpki-roots 0.22.6", "whoami", ] +[[package]] +name = "sqlx-core" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" +dependencies = [ + "ahash 0.8.11", + "atoi 2.0.0", + "byteorder", + "bytes", + "crc", + "crossbeam-queue", + "either", + "event-listener 2.5.3", + "futures-channel", + "futures-core", + "futures-intrusive 0.5.0", + "futures-io", + "futures-util", + "hashlink", + "hex", + "indexmap 2.9.0", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "rustls 0.21.12", + "rustls-pemfile 1.0.4", + "serde", + "serde_json", + "sha2 0.10.9", + "smallvec", + "sqlformat", + "thiserror 1.0.69", + "tokio", + "tokio-stream", + "tracing", + "url", + "webpki-roots 0.25.4", +] + [[package]] name = "sqlx-macros" version = "0.6.2" @@ -8661,17 +10662,92 @@ source = "git+https://github.com/launchbadge/sqlx.git?rev=42dd78fe931df651eac411 dependencies = [ "dotenvy", "either", - "heck 0.4.0", + "heck 0.4.1", "once_cell", "proc-macro2", "quote", - "sha2 0.10.8", - "sqlx-core", + "sha2 0.10.9", + "sqlx-core 0.6.2", "sqlx-rt", "syn 1.0.109", "url", ] +[[package]] +name = "sqlx-macros" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core 0.7.4", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" +dependencies = [ + "dotenvy", + "either", + "heck 0.4.1", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2 0.10.9", + "sqlx-core 0.7.4", + "sqlx-postgres", + "syn 1.0.109", + "tempfile", + "tokio", + "url", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" +dependencies = [ + "atoi 2.0.0", + "base64 0.21.7", + "bitflags 2.9.0", + "byteorder", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac 0.12.1", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand 0.8.5", + "serde", + "serde_json", + "sha2 0.10.9", + "smallvec", + "sqlx-core 0.7.4", + "stringprep", + "thiserror 1.0.69", + "tracing", + "whoami", +] + [[package]] name = "sqlx-rt" version = "0.6.2" @@ -8696,33 +10772,37 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stringprep" -version = "0.1.2" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" dependencies = [ "unicode-bidi", "unicode-normalization", + "unicode-properties", ] [[package]] name = "strsim" -version = "0.8.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] -name = "strsim" -version = "0.10.0" +name = "strum" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros 0.26.4", +] [[package]] name = "strum" -version = "0.26.3" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32" dependencies = [ - "strum_macros", + "strum_macros 0.27.1", ] [[package]] @@ -8735,14 +10815,27 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.58", + "syn 2.0.101", +] + +[[package]] +name = "strum_macros" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.101", ] [[package]] name = "subtle" -version = "2.4.1" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -8757,9 +10850,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" dependencies = [ "proc-macro2", "quote", @@ -8767,22 +10860,19 @@ dependencies = [ ] [[package]] -name = "syn_derive" -version = "0.1.8" +name = "sync_wrapper" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.58", -] +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sync_wrapper" -version = "0.1.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] [[package]] name = "synstructure" @@ -8796,6 +10886,17 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + [[package]] name = "system-configuration" version = "0.5.1" @@ -8803,7 +10904,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys", ] @@ -8823,6 +10924,15 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "task-local-extensions" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" +dependencies = [ + "pin-utils", +] + [[package]] name = "task-manager" version = "0.1.0" @@ -8836,78 +10946,86 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.3.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" dependencies = [ - "cfg-if", - "fastrand", - "libc", - "redox_syscall 0.2.16", - "remove_dir_all", - "winapi", + "fastrand 2.3.0", + "getrandom 0.3.2", + "once_cell", + "rustix 1.0.7", + "windows-sys 0.59.0", ] [[package]] name = "termcolor" -version = "1.1.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] -name = "textwrap" -version = "0.11.0" +name = "thiserror" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "unicode-width", + "thiserror-impl 1.0.69", ] [[package]] -name = "textwrap" -version = "0.16.0" +name = "thiserror" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +dependencies = [ + "thiserror-impl 2.0.12", +] [[package]] -name = "thiserror" -version = "1.0.61" +name = "thiserror-impl" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "thiserror-impl", + "proc-macro2", + "quote", + "syn 2.0.101", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.101", ] [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ + "cfg-if", "once_cell", ] [[package]] name = "time" -version = "0.3.17" +version = "0.3.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" dependencies = [ - "itoa 1.0.9", + "deranged", + "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -8915,79 +11033,87 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" dependencies = [ + "num-conv", "time-core", ] [[package]] -name = "tiny-bip39" -version = "0.8.2" +name = "tiny-keccak" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" dependencies = [ - "anyhow", - "hmac 0.8.1", - "once_cell", - "pbkdf2 0.4.0", - "rand 0.7.3", - "rustc-hash", - "sha2 0.9.9", - "thiserror", - "unicode-normalization", - "wasm-bindgen", - "zeroize", + "crunchy", ] [[package]] -name = "tiny-keccak" -version = "2.0.2" +name = "tinystr" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ - "crunchy", + "displaydoc", + "zerovec", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71" dependencies = [ "tinyvec_macros", ] [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.44.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", - "parking_lot 0.12.1", + "mio 1.0.3", + "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-graceful-shutdown" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd7f403d0d4d3a3e1688c5650e733789ab8473d5fa53adc0b65d20096c2ae3c1" +dependencies = [ + "async-trait", + "atomic", + "bytemuck", + "miette", + "pin-project-lite", + "thiserror 2.0.12", + "tokio", + "tokio-util", + "tracing", ] [[package]] @@ -9002,23 +11128,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", -] - -[[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", + "syn 2.0.101", ] [[package]] @@ -9042,11 +11158,21 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" +dependencies = [ + "rustls 0.23.26", + "tokio", +] + [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -9065,49 +11191,72 @@ dependencies = [ "tokio", "tokio-rustls 0.24.1", "tungstenite", - "webpki-roots 0.25.2", + "webpki-roots 0.25.4", ] [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.5.9" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae" dependencies = [ "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.9.0", + "serde", + "serde_spanned", "toml_datetime", + "toml_write", "winnow", ] +[[package]] +name = "toml_write" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076" + [[package]] name = "tonic" version = "0.10.2" @@ -9119,21 +11268,21 @@ dependencies = [ "axum 0.6.20", "base64 0.21.7", "bytes", - "h2 0.3.21", - "http 0.2.11", - "http-body 0.4.5", - "hyper 0.14.28", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.32", "hyper-timeout", "percent-encoding", "pin-project", - "prost", + "prost 0.12.6", "rustls 0.21.12", - "rustls-native-certs", - "rustls-pemfile", + "rustls-native-certs 0.6.3", + "rustls-pemfile 1.0.4", "tokio", "tokio-rustls 0.24.1", "tokio-stream", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -9147,9 +11296,9 @@ checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ "prettyplease", "proc-macro2", - "prost-build", + "prost-build 0.12.6", "quote", - "syn 2.0.58", + "syn 2.0.101", ] [[package]] @@ -9173,18 +11322,31 @@ dependencies = [ ] [[package]] -name = "tower-http" -version = "0.3.4" +name = "tower" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c530c8675c1dbf98facee631536fa116b5fb6382d7dd6dc1b118d970eafe3ba" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ - "bitflags 1.3.2", - "bytes", "futures-core", "futures-util", - "http 0.2.11", - "http-body 0.4.5", - "http-range-header", + "pin-project-lite", + "sync_wrapper 1.0.2", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697" +dependencies = [ + "bitflags 2.9.0", + "bytes", + "http 1.3.1", + "http-body 1.0.1", "pin-project-lite", "tower-layer", "tower-service", @@ -9193,23 +11355,22 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -9218,20 +11379,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.101", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", @@ -9250,9 +11411,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "matchers", "nu-ansi-term", @@ -9266,15 +11427,6 @@ dependencies = [ "tracing-log", ] -[[package]] -name = "treasury-management" -version = "0.2.0" -source = "git+https://github.com/helium/helium-anchor-gen.git#3036b33793cfe54b20ab24761677493510d5bd50" -dependencies = [ - "anchor-gen", - "anchor-lang 0.29.0", -] - [[package]] name = "triggered" version = "0.1.2" @@ -9283,9 +11435,9 @@ checksum = "ce148eae0d1a376c1b94ae651fc3261d9cb8294788b962b7382066376503a2d1" [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" @@ -9296,13 +11448,13 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http 0.2.11", + "http 0.2.12", "httparse", "log", "rand 0.8.5", "rustls 0.21.12", "sha1", - "thiserror", + "thiserror 1.0.69", "url", "utf-8", "webpki-roots 0.24.0", @@ -9321,15 +11473,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - -[[package]] -name = "typewit" -version = "1.3.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c52b4cb7830f995903b2fcff3f523d21efc1c11f6c1596dd544b7925a64ff56" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" [[package]] name = "unarray" @@ -9337,44 +11483,62 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" +[[package]] +name = "unicase" +version = "2.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" + [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-properties" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" + [[package]] name = "unicode-segmentation" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "unicode-width" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "unicode_categories" @@ -9384,11 +11548,11 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" [[package]] name = "universal-hash" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ - "generic-array", + "crypto-common", "subtle", ] @@ -9403,9 +11567,9 @@ dependencies = [ [[package]] name = "unsigned-varint" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" +checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" [[package]] name = "untrusted" @@ -9431,9 +11595,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -9443,9 +11607,9 @@ dependencies = [ [[package]] name = "urlencoding" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "utf-8" @@ -9453,33 +11617,39 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.5.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.3.2", "serde", ] [[package]] name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcell" -version = "0.1.3" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] name = "vcpkg" @@ -9487,17 +11657,11 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "void" @@ -9505,24 +11669,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -[[package]] -name = "volatile-register" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee8f19f9d74293faf70901bc20ad067dc1ad390d2cbf1e3f75f721ffee908b6" -dependencies = [ - "vcell", -] - -[[package]] -name = "voter-stake-registry" -version = "0.3.3" -source = "git+https://github.com/helium/helium-anchor-gen.git#3036b33793cfe54b20ab24761677493510d5bd50" -dependencies = [ - "anchor-gen", - "anchor-lang 0.29.0", -] - [[package]] name = "vsimd" version = "0.8.0" @@ -9531,18 +11677,12 @@ checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" [[package]] name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "waker-fn" -version = "1.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11" +dependencies = [ + "libc", +] [[package]] name = "walkdir" @@ -9556,11 +11696,10 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -9576,48 +11715,65 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", + "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.101", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -9625,28 +11781,41 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.101", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -9658,15 +11827,24 @@ version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring 0.17.3", + "ring 0.17.14", "untrusted 0.9.0", ] +[[package]] +name = "webpki-root-certs" +version = "0.26.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c99403924bc5f23afefc319b8ac67ed0e50669f6e52a413314cccb1fdbc93ba0" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "webpki-roots" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ "webpki", ] @@ -9677,23 +11855,44 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "rustls-webpki", + "rustls-webpki 0.101.7", ] [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "webpki-roots" +version = "0.26.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "37493cadf42a2a939ed404698ded7fb378bf301b5011f973361779a3a74f8c93" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix 0.38.44", +] [[package]] name = "whoami" -version = "1.2.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6631b6a2fd59b1841b622e8f1a7ad241ef0a46f2d580464ce8140ac94cbd571" +checksum = "6994d13118ab492c3c80c1f81928718159254c53c472bf9ce36f8dae4add02a7" dependencies = [ - "bumpalo", - "wasm-bindgen", + "redox_syscall 0.5.11", + "wasite", "web-sys", ] @@ -9715,11 +11914,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -9728,17 +11927,92 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-core" +version = "0.61.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings 0.4.0", +] + +[[package]] +name = "windows-implement" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "windows-interface" +version = "0.59.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "windows-link" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" + +[[package]] +name = "windows-registry" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" +dependencies = [ + "windows-result", + "windows-strings 0.3.1", + "windows-targets 0.53.0", +] + +[[package]] +name = "windows-result" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-sys" -version = "0.36.1" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", + "windows-targets 0.42.2", ] [[package]] @@ -9747,7 +12021,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] @@ -9756,158 +12030,265 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] name = "winnow" -version = "0.5.40" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +checksum = "d9fb597c990f03753e08d3c29efbfcf2019a003b4bf4ba19225c158e1549f0f3" dependencies = [ "memchr", ] @@ -9922,6 +12303,27 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags 2.9.0", +] + +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "wyz" version = "0.5.1" @@ -9945,21 +12347,21 @@ dependencies = [ "nom", "oid-registry", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] [[package]] name = "xmlparser" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "xorf" -version = "0.8.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7afb3a52aef0211e557044386369919b033004fdcf4c56c5017710f97fa9aa3c" +checksum = "cf24c008fe464f5d8f58b8d16a1ab7e930bd73b2a6933ff8704c414b2bed7f92" dependencies = [ "libm", "rand 0.8.5", @@ -9968,111 +12370,180 @@ dependencies = [ [[package]] name = "xorf-generator" -version = "0.6.0" -source = "git+https://github.com/helium/xorf-generator?branch=main#d55057c88a0e6f40adfeae15197afa66729fb3d5" +version = "0.7.0" +source = "git+https://github.com/helium/xorf-generator?branch=main#2b3842646a1c208e69ec3259762659f8530b84d6" dependencies = [ "anyhow", - "base64 0.21.7", + "base64 0.22.1", "bincode", "bytes", - "clap 4.4.8", + "clap", "csv", "flate2", - "helium-crypto", - "indexmap 2.2.6", - "prost", - "prost-build", + "helium-crypto 0.8.4", + "indexmap 2.9.0", + "prost 0.13.5", + "prost-build 0.13.5", "rand 0.8.5", "serde", "serde_json", - "sha2 0.10.8", - "thiserror", + "sha2 0.10.9", + "thiserror 1.0.69", "twox-hash", "xorf", ] [[package]] -name = "yansi" -version = "0.5.1" +name = "yoke" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] [[package]] -name = "yasna" -version = "0.5.1" +name = "yoke-derive" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ - "time", + "proc-macro2", + "quote", + "syn 2.0.101", + "synstructure 0.13.2", ] [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ - "zerocopy-derive", + "zerocopy-derive 0.7.35", +] + +[[package]] +name = "zerocopy" +version = "0.8.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" +dependencies = [ + "zerocopy-derive 0.8.25", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.8.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + +[[package]] +name = "zerofrom" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.101", + "synstructure 0.13.2", ] [[package]] name = "zeroize" -version = "1.3.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.3.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", - "synstructure", + "syn 2.0.101", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", ] [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.7+zstd.1.5.4" +version = "2.0.15+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" +checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/Cargo.toml b/Cargo.toml index 52688d3e6..7d75ea425 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,7 +63,7 @@ sqlx = { version = "0", features = [ "macros", "runtime-tokio-rustls", ] } -helium-crypto = { version = "0.8.4", features = ["multisig"] } +helium-crypto = { version = "0.9.0", features = ["multisig", "sqlx-postgres"] } hextree = { git = "https://github.com/jaykickliter/HexTree", branch = "main", features = [ "disktree", ] } @@ -113,11 +113,17 @@ tokio-util = "0" uuid = { version = "1", features = ["v4", "serde"] } tower-http = { version = "0", features = ["trace"] } derive_builder = "0" +helium-lib = { path = "../helium-wallet-rs/helium-lib" } [patch.crates-io] # v0.7.0-alpha.3 # https://github.com/launchbadge/sqlx/commit/42dd78fe931df651eac411316ed3eab87c2f79b2 sqlx = { git = "https://github.com/launchbadge/sqlx.git", rev = "42dd78fe931df651eac411316ed3eab87c2f79b2" } +anchor-lang = { git = "https://github.com/madninja/anchor.git", branch = "madninja/const_pubkey" } +helium-crypto = { git = "https://github.com/helium/helium-crypto-rs.git", branch = "main", features = [ + "sqlx-postgres", +] } +# helium-lib = { path = "../helium-wallet-rs/helium-lib" } # When attempting to test proto changes without needing to push a branch you can # patch the github url to point to your local proto repo. diff --git a/mobile_config_cli/src/cmds/gateway.rs b/mobile_config_cli/src/cmds/gateway.rs index 2cf2be26d..5ab2aa263 100644 --- a/mobile_config_cli/src/cmds/gateway.rs +++ b/mobile_config_cli/src/cmds/gateway.rs @@ -65,7 +65,7 @@ impl TryFrom for GatewayInfo { fn try_from(info: GatewayInfoProto) -> Result { let device_type: DeviceType = info.device_type().into(); let pubkey = PublicKey::try_from(info.address)?; - let name: AnimalName = pubkey.clone().into(); + let name: AnimalName = pubkey.into(); let metadata = if let Some(md) = info.metadata { Some(md.try_into()?) } else { diff --git a/price/src/cli/check.rs b/price/src/cli/check.rs index c3cac1f7f..aa208c269 100644 --- a/price/src/cli/check.rs +++ b/price/src/cli/check.rs @@ -1,9 +1,8 @@ use anyhow::Result; use chrono::{DateTime, TimeZone, Utc}; use solana::re::{ - helium_anchor_gen::{anchor_lang::AccountDeserialize, price_oracle::PriceOracleV0}, - solana_client::nonblocking::rpc_client::RpcClient, - solana_sdk::pubkey::Pubkey as SolPubkey, + anchor_lang::AccountDeserialize, helium_lib::programs::price_oracle::accounts::PriceOracleV0, + solana_client::nonblocking::rpc_client::RpcClient, solana_sdk::pubkey::Pubkey as SolPubkey, }; use std::str::FromStr; diff --git a/solana/Cargo.toml b/solana/Cargo.toml index c86ca5a1a..3b222a5c8 100644 --- a/solana/Cargo.toml +++ b/solana/Cargo.toml @@ -22,10 +22,9 @@ thiserror = { workspace = true } tokio = { workspace = true } tracing = { workspace = true } -anchor-client = { version = "0.29.0", features = ["async"] } -helium-anchor-gen = { git = "https://github.com/helium/helium-anchor-gen.git" } -solana-client = "1.18" -solana-sdk = "1.18" -solana-program = "1.18" -spl-token = "3.5.0" -helium-lib = { git = "https://github.com/helium/helium-wallet-rs.git", branch = "master" } +spl-token = { version = "8" } +# helium-anchor-gen = { git = "https://github.com/helium/helium-anchor-gen.git" } +# helium-lib = { git = "https://github.com/helium/helium-wallet-rs.git", branch = "master" } + +helium-lib = { workspace = true } +sqlx = { workspace = true } diff --git a/solana/src/burn.rs b/solana/src/burn.rs index 0d4b993bd..fa4786ec0 100644 --- a/solana/src/burn.rs +++ b/solana/src/burn.rs @@ -1,28 +1,28 @@ +use crate::re::{ + anchor_client::RequestBuilder, + anchor_lang::{AccountDeserialize, ToAccountMetas}, + helium_lib::programs::{data_credits, helium_sub_daos}, + solana_client::{ + self, client_error::ClientError, nonblocking::rpc_client::RpcClient, rpc_response::Response, + }, + solana_program, + solana_sdk::{ + commitment_config::CommitmentConfig, + compute_budget::ComputeBudgetInstruction, + program_pack::Pack, + pubkey::Pubkey, + signature::{read_keypair_file, Keypair, Signature}, + signer::Signer, + transaction::Transaction, + }, +}; use crate::{send_with_retry, GetSignature, SolanaRpcError}; -use anchor_client::RequestBuilder; use async_trait::async_trait; use chrono::{DateTime, Utc}; -use helium_anchor_gen::{ - anchor_lang::{AccountDeserialize, ToAccountMetas}, - data_credits::{self, accounts, instruction}, - helium_sub_daos::{self, DaoV0, SubDaoV0}, -}; use helium_crypto::PublicKeyBinary; use itertools::Itertools; use serde::Deserialize; use sha2::{Digest, Sha256}; -use solana_client::{ - client_error::ClientError, nonblocking::rpc_client::RpcClient, rpc_response::Response, -}; -use solana_sdk::{ - commitment_config::CommitmentConfig, - compute_budget::ComputeBudgetInstruction, - program_pack::Pack, - pubkey::Pubkey, - signature::{read_keypair_file, Keypair, Signature}, - signer::Signer, - transaction::Transaction, -}; use std::{ collections::{HashMap, HashSet}, str::FromStr, @@ -179,7 +179,7 @@ impl SolanaNetwork for SolanaRpc { &data_credits::ID, ); - let accounts = accounts::BurnDelegatedDataCreditsV0 { + let accounts = data_credits::client::accounts::BurnDelegatedDataCreditsV0 { sub_dao_epoch_info, dao: self.program_cache.dao, sub_dao: self.program_cache.sub_dao, @@ -187,7 +187,7 @@ impl SolanaNetwork for SolanaRpc { data_credits: self.program_cache.data_credits, delegated_data_credits: delegated_data_credits(&self.program_cache.sub_dao, payer), token_program: spl_token::id(), - helium_sub_daos_program: helium_sub_daos::id(), + helium_sub_daos_program: helium_sub_daos::ID, system_program: solana_program::system_program::id(), dc_burn_authority: self.program_cache.dc_burn_authority, dc_mint: self.program_cache.dc_mint, @@ -218,14 +218,15 @@ impl SolanaNetwork for SolanaRpc { // This is Sync land: anything async in here will error. let instructions = { let request = RequestBuilder::from( - data_credits::id(), + data_credits::ID, &self.cluster, std::rc::Rc::new(Keypair::from_bytes(&self.keypair).unwrap()), Some(CommitmentConfig::finalized()), + &self.provider, ); - let args = instruction::BurnDelegatedDataCreditsV0 { - _args: data_credits::BurnDelegatedDataCreditsArgsV0 { amount }, + let args = data_credits::client::args::BurnDelegatedDataCreditsV0 { + args: data_credits::types::BurnDelegatedDataCreditsArgsV0 { amount }, }; // As far as I can tell, the instructions function does not actually have any @@ -323,7 +324,7 @@ impl PriorityFee { let time_taken = Utc::now(); let recent_fees = provider.get_recent_prioritization_fees(accounts).await?; let mut max_per_slot = Vec::new(); - for (slot, fees) in &recent_fees.into_iter().group_by(|x| x.slot) { + for (slot, fees) in &recent_fees.into_iter().chunk_by(|x| x.slot) { let Some(maximum) = fees.map(|x| x.prioritization_fee).max() else { continue; }; @@ -394,13 +395,13 @@ impl BurnProgramCache { let (dao, dc_burn_authority) = { let account_data = provider.get_account_data(&sub_dao).await?; let mut account_data = account_data.as_ref(); - let sub_dao = SubDaoV0::try_deserialize(&mut account_data)?; + let sub_dao = helium_sub_daos::accounts::SubDaoV0::try_deserialize(&mut account_data)?; (sub_dao.dao, sub_dao.dc_burn_authority) }; let registrar = { let account_data = provider.get_account_data(&dao).await?; let mut account_data = account_data.as_ref(); - DaoV0::try_deserialize(&mut account_data)?.registrar + helium_sub_daos::accounts::DaoV0::try_deserialize(&mut account_data)?.registrar }; Ok(Self { account_payer, diff --git a/solana/src/carrier.rs b/solana/src/carrier.rs index ddff4b8f7..14f80f434 100644 --- a/solana/src/carrier.rs +++ b/solana/src/carrier.rs @@ -1,12 +1,14 @@ -use crate::SolanaRpcError; -use helium_anchor_gen::{ +use crate::re::{ anchor_lang::AccountDeserialize, - helium_sub_daos, - mobile_entity_manager::{self, CarrierV0}, + helium_lib::programs::{ + helium_sub_daos, + mobile_entity_manager::{self, accounts::CarrierV0}, + }, + solana_client::nonblocking::rpc_client::RpcClient, + solana_sdk::{commitment_config::CommitmentConfig, pubkey::Pubkey}, }; +use crate::SolanaRpcError; use serde::Deserialize; -use solana_client::nonblocking::rpc_client::RpcClient; -use solana_sdk::{commitment_config::CommitmentConfig, pubkey::Pubkey}; pub struct SolanaRpc { provider: RpcClient, diff --git a/solana/src/lib.rs b/solana/src/lib.rs index 891b20acf..6944bccee 100644 --- a/solana/src/lib.rs +++ b/solana/src/lib.rs @@ -1,15 +1,19 @@ -use solana_client::client_error::ClientError; -use solana_sdk::pubkey::ParsePubkeyError; -use solana_sdk::transaction::Transaction; +use re::{ + solana_client::client_error::ClientError, + solana_sdk::{program_error, pubkey::ParsePubkeyError, signature, transaction::Transaction}, +}; use std::time::SystemTimeError; -pub use solana_sdk::signature::Signature; +pub use re::solana_sdk::signature::Signature; pub mod re { - pub use helium_anchor_gen; + pub use helium_lib; - pub use solana_client; - pub use solana_sdk; + pub use helium_lib::anchor_client; + pub use helium_lib::anchor_lang; + pub use helium_lib::solana_client; + pub use helium_lib::solana_program; + pub use helium_lib::solana_sdk; } pub mod burn; @@ -42,13 +46,13 @@ pub enum SolanaRpcError { #[error("Solana rpc error: {0}")] RpcClientError(Box), #[error("Anchor error: {0}")] - AnchorError(Box), + AnchorError(Box), #[error("Solana program error: {0}")] - ProgramError(#[from] solana_sdk::program_error::ProgramError), + ProgramError(#[from] program_error::ProgramError), #[error("Parse pubkey error: {0}")] ParsePubkeyError(#[from] ParsePubkeyError), #[error("Parse signature error: {0}")] - ParseSignatureError(#[from] solana_sdk::signature::ParseSignatureError), + ParseSignatureError(#[from] signature::ParseSignatureError), #[error("DC burn authority does not match keypair")] InvalidKeypair, #[error("System time error: {0}")] @@ -62,8 +66,8 @@ pub enum SolanaRpcError { Test(String), } -impl From for SolanaRpcError { - fn from(err: helium_anchor_gen::anchor_lang::error::Error) -> Self { +impl From for SolanaRpcError { + fn from(err: re::anchor_lang::error::Error) -> Self { Self::AnchorError(Box::new(err)) } } diff --git a/solana/src/main.rs b/solana/src/main.rs index 100ef3e40..11be4e3b5 100644 --- a/solana/src/main.rs +++ b/solana/src/main.rs @@ -1,7 +1,7 @@ use clap::{Parser, ValueEnum}; use helium_crypto::{PublicKey, PublicKeyBinary}; use sha2::{Digest, Sha256}; -use solana_sdk::pubkey::Pubkey; +use solana::re::{helium_lib::programs::data_credits, solana_sdk::pubkey::Pubkey}; #[derive(Parser)] #[clap(about = "Look up the Delegated Data Credit account for a Helium router key")] @@ -37,7 +37,7 @@ fn main() { sub_dao.as_ref(), &sha_digest, ], - &helium_anchor_gen::data_credits::ID, + &data_credits::ID, ); println!("https://explorer.solana.com/address/{ddc_key}"); } diff --git a/solana/src/start_boost.rs b/solana/src/start_boost.rs index 1245ac2d6..5c62292e5 100644 --- a/solana/src/start_boost.rs +++ b/solana/src/start_boost.rs @@ -1,21 +1,21 @@ +use crate::re::anchor_client::RequestBuilder; +use crate::re::{ + anchor_lang::{InstructionData, ToAccountMetas}, + helium_lib::programs::hexboosting, + solana_client::nonblocking::rpc_client::RpcClient, + solana_program::instruction::Instruction, + solana_sdk::{ + commitment_config::CommitmentConfig, + pubkey::Pubkey, + signature::{read_keypair_file, Keypair, Signature}, + signer::Signer, + transaction::Transaction, + }, +}; use crate::{send_with_retry, GetSignature, SolanaRpcError}; -use anchor_client::RequestBuilder; use async_trait::async_trait; use file_store::hex_boost::BoostedHexActivation; -use helium_anchor_gen::{ - anchor_lang::{InstructionData, ToAccountMetas}, - hexboosting::{self, accounts, instruction}, -}; use serde::Deserialize; -use solana_client::nonblocking::rpc_client::RpcClient; -use solana_program::instruction::Instruction; -use solana_sdk::{ - commitment_config::CommitmentConfig, - pubkey::Pubkey, - signature::{read_keypair_file, Keypair, Signature}, - signer::Signer, - transaction::Transaction, -}; use std::sync::Arc; #[async_trait] @@ -78,24 +78,25 @@ impl SolanaNetwork for SolanaRpc { ) -> Result { let instructions = { let mut request = RequestBuilder::from( - hexboosting::id(), + hexboosting::ID, &self.cluster, std::rc::Rc::new(Keypair::from_bytes(&self.keypair).unwrap()), Some(CommitmentConfig::finalized()), + &self.provider, ); for update in batch { - let account = accounts::StartBoostV0 { + let account = hexboosting::client::accounts::StartBoostV0 { start_authority: self.start_authority, boost_config: update.boost_config_pubkey.parse()?, boosted_hex: update.boosted_hex_pubkey.parse()?, }; - let args = instruction::StartBoostV0 { - _args: hexboosting::StartBoostArgsV0 { + let args = hexboosting::client::args::StartBoostV0 { + args: hexboosting::types::StartBoostArgsV0 { start_ts: update.activation_ts.timestamp(), }, }; let instruction = Instruction { - program_id: hexboosting::id(), + program_id: hexboosting::ID, accounts: account.to_account_metas(None), data: args.data(), }; From 672ad29efe39fe167396c090314750f4915ee1d9 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Fri, 2 May 2025 12:52:10 -0700 Subject: [PATCH 09/41] finally resolved deps --- Cargo.lock | 1432 ++++++------------------- Cargo.toml | 5 +- db_store/Cargo.toml | 21 +- denylist/Cargo.toml | 3 +- file_store/src/file_sink.rs | 3 +- mobile_config_cli/src/cmds/gateway.rs | 2 +- 6 files changed, 316 insertions(+), 1150 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 985772716..96f5fe3c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -389,15 +389,6 @@ dependencies = [ "libc", ] -[[package]] -name = "angry-purple-tiger" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49c749eb8b90a5c85a879ac35bba5374ba18ff41d609878d7d37dd2ac0122a3c" -dependencies = [ - "md5", -] - [[package]] name = "angry-purple-tiger" version = "1.0.0" @@ -406,7 +397,7 @@ checksum = "7556be6f2b0d82376c1ece1fda4dffd728816ac53bee2c285f3f74269ddc4a97" dependencies = [ "anyhow", "clap", - "helium-crypto 0.8.4", + "helium-crypto", "md5", ] @@ -750,15 +741,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - [[package]] name = "atomic" version = "0.6.0" @@ -768,12 +750,6 @@ dependencies = [ "bytemuck", ] -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - [[package]] name = "atty" version = "0.2.14" @@ -797,14 +773,14 @@ version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56a636c44c77fa18bdba56126a34d30cfe5538fe88f7d34988fa731fee143ddd" dependencies = [ - "aws-http 0.51.0", - "aws-sdk-sso 0.21.0", - "aws-sdk-sts 0.21.0", + "aws-http", + "aws-sdk-sso", + "aws-sdk-sts", "aws-smithy-async 0.51.0", - "aws-smithy-client", + "aws-smithy-client 0.51.0", "aws-smithy-http 0.51.0", - "aws-smithy-http-tower", - "aws-smithy-json 0.51.0", + "aws-smithy-http-tower 0.51.0", + "aws-smithy-json", "aws-smithy-types 0.51.0", "aws-types 0.51.0", "bytes", @@ -819,58 +795,16 @@ dependencies = [ "zeroize", ] -[[package]] -name = "aws-config" -version = "0.101.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f9625b71b3ee4adbfbca369c6680d156e316ed86d2c7199a2a134563917414" -dependencies = [ - "aws-credential-types 0.101.0", - "aws-http 0.59.0", - "aws-runtime 0.101.0", - "aws-sdk-sso 0.38.0", - "aws-sdk-ssooidc", - "aws-sdk-sts 0.38.0", - "aws-smithy-async 0.101.0", - "aws-smithy-http 0.59.0", - "aws-smithy-json 0.59.0", - "aws-smithy-runtime 0.101.0", - "aws-smithy-runtime-api 0.101.0", - "aws-smithy-types 0.101.0", - "aws-types 0.101.0", - "bytes", - "fastrand 2.3.0", - "hex", - "http 0.2.12", - "hyper 0.14.32", - "ring 0.17.14", - "time", - "tokio", - "tracing", - "zeroize", -] - -[[package]] -name = "aws-credential-types" -version = "0.101.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5924466398ac76ffd411d297b9d516dcebb0577f7344c0c15fd8e8e04d9c7895" -dependencies = [ - "aws-smithy-async 0.101.0", - "aws-smithy-runtime-api 0.101.0", - "aws-smithy-types 0.101.0", - "zeroize", -] - [[package]] name = "aws-credential-types" -version = "1.2.3" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687bc16bc431a8533fe0097c7f0182874767f920989d7260950172ae8e3c4465" +checksum = "bb0696a0523a39a19087747e4dafda0362dc867531e3d72a3f195564c84e5e08" dependencies = [ - "aws-smithy-async 1.2.5", - "aws-smithy-runtime-api 1.8.0", - "aws-smithy-types 1.3.1", + "aws-smithy-async 0.54.4", + "aws-smithy-types 0.54.4", + "tokio", + "tracing", "zeroize", ] @@ -906,99 +840,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "aws-http" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb9a3aa335a105a00975c971f1dad403c3175f2a210d98f39345c6af53923912" -dependencies = [ - "aws-smithy-runtime-api 0.101.0", - "aws-smithy-types 0.101.0", - "aws-types 0.101.0", - "bytes", - "http 0.2.12", - "http-body 0.4.6", - "pin-project-lite", - "tracing", -] - -[[package]] -name = "aws-http" -version = "0.60.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eda156637dc4fd310cd05b2a35f963a591684b02b13694bd790df48f5349ee0" -dependencies = [ - "aws-runtime 1.5.7", -] - -[[package]] -name = "aws-lc-rs" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b756939cb2f8dc900aa6dcd505e6e2428e9cae7ff7b028c49e3946efa70878" -dependencies = [ - "aws-lc-sys", - "zeroize", -] - -[[package]] -name = "aws-lc-sys" -version = "0.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa9b6986f250236c27e5a204062434a773a13243d2ffc2955f37bdba4c5c6a1" -dependencies = [ - "bindgen", - "cc", - "cmake", - "dunce", - "fs_extra", -] - -[[package]] -name = "aws-runtime" -version = "0.101.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75844ecbdf3dc5e0f5ac5fd1088fb1623849990ea9445d2826258ce63be4de5" -dependencies = [ - "aws-credential-types 0.101.0", - "aws-http 0.59.0", - "aws-sigv4 0.101.0", - "aws-smithy-async 0.101.0", - "aws-smithy-http 0.59.0", - "aws-smithy-runtime-api 0.101.0", - "aws-smithy-types 0.101.0", - "aws-types 0.101.0", - "fastrand 2.3.0", - "http 0.2.12", - "percent-encoding", - "tracing", - "uuid", -] - -[[package]] -name = "aws-runtime" -version = "1.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c4063282c69991e57faab9e5cb21ae557e59f5b0fb285c196335243df8dc25c" -dependencies = [ - "aws-credential-types 1.2.3", - "aws-sigv4 1.3.1", - "aws-smithy-async 1.2.5", - "aws-smithy-http 0.62.1", - "aws-smithy-runtime 1.8.3", - "aws-smithy-runtime-api 1.8.0", - "aws-smithy-types 1.3.1", - "aws-types 1.3.7", - "bytes", - "fastrand 2.3.0", - "http 0.2.12", - "http-body 0.4.6", - "percent-encoding", - "pin-project-lite", - "tracing", - "uuid", -] - [[package]] name = "aws-sdk-s3" version = "0.21.0" @@ -1006,17 +847,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9f08665c8e03aca8cb092ef01e617436ebfa977fddc1240e1b062488ab5d48a" dependencies = [ "aws-endpoint", - "aws-http 0.51.0", + "aws-http", "aws-sig-auth 0.51.0", "aws-sigv4 0.51.1", "aws-smithy-async 0.51.0", "aws-smithy-checksums", - "aws-smithy-client", + "aws-smithy-client 0.51.0", "aws-smithy-eventstream", "aws-smithy-http 0.51.0", - "aws-smithy-http-tower", + "aws-smithy-http-tower 0.51.0", "aws-smithy-types 0.51.0", - "aws-smithy-xml 0.51.0", + "aws-smithy-xml", "aws-types 0.51.0", "bytes", "bytes-utils", @@ -1034,13 +875,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86dcb1cb71aa8763b327542ead410424515cff0cde5b753eedd2917e09c63734" dependencies = [ "aws-endpoint", - "aws-http 0.51.0", + "aws-http", "aws-sig-auth 0.51.0", "aws-smithy-async 0.51.0", - "aws-smithy-client", + "aws-smithy-client 0.51.0", "aws-smithy-http 0.51.0", - "aws-smithy-http-tower", - "aws-smithy-json 0.51.0", + "aws-smithy-http-tower 0.51.0", + "aws-smithy-json", "aws-smithy-types 0.51.0", "aws-types 0.51.0", "bytes", @@ -1049,50 +890,6 @@ dependencies = [ "tower 0.4.13", ] -[[package]] -name = "aws-sdk-sso" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c870aa95e1e85f837f74af2cc937b3f8e72e2315a89e524265875843655b4d47" -dependencies = [ - "aws-credential-types 0.101.0", - "aws-http 0.59.0", - "aws-runtime 0.101.0", - "aws-smithy-async 0.101.0", - "aws-smithy-http 0.59.0", - "aws-smithy-json 0.59.0", - "aws-smithy-runtime 0.101.0", - "aws-smithy-runtime-api 0.101.0", - "aws-smithy-types 0.101.0", - "aws-types 0.101.0", - "bytes", - "http 0.2.12", - "regex", - "tracing", -] - -[[package]] -name = "aws-sdk-ssooidc" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "107ee812e46f9120e68d48bf985d2f2a538315bd8be8a3e54db619250cc4c95e" -dependencies = [ - "aws-credential-types 0.101.0", - "aws-http 0.59.0", - "aws-runtime 0.101.0", - "aws-smithy-async 0.101.0", - "aws-smithy-http 0.59.0", - "aws-smithy-json 0.59.0", - "aws-smithy-runtime 0.101.0", - "aws-smithy-runtime-api 0.101.0", - "aws-smithy-types 0.101.0", - "aws-types 0.101.0", - "bytes", - "http 0.2.12", - "regex", - "tracing", -] - [[package]] name = "aws-sdk-sts" version = "0.21.0" @@ -1100,67 +897,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdfcf584297c666f6b472d5368a78de3bc714b6e0a53d7fbf76c3e347c292ab1" dependencies = [ "aws-endpoint", - "aws-http 0.51.0", + "aws-http", "aws-sig-auth 0.51.0", "aws-smithy-async 0.51.0", - "aws-smithy-client", + "aws-smithy-client 0.51.0", "aws-smithy-http 0.51.0", - "aws-smithy-http-tower", - "aws-smithy-query 0.51.0", + "aws-smithy-http-tower 0.51.0", + "aws-smithy-query", "aws-smithy-types 0.51.0", - "aws-smithy-xml 0.51.0", + "aws-smithy-xml", "aws-types 0.51.0", "bytes", "http 0.2.12", "tower 0.4.13", ] -[[package]] -name = "aws-sdk-sts" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e3958c43a78f6c3822e62009a35802af5cc7c120fbe8e60b98565604569aae" -dependencies = [ - "aws-credential-types 0.101.0", - "aws-http 0.59.0", - "aws-runtime 0.101.0", - "aws-smithy-async 0.101.0", - "aws-smithy-http 0.59.0", - "aws-smithy-json 0.59.0", - "aws-smithy-query 0.59.0", - "aws-smithy-runtime 0.101.0", - "aws-smithy-runtime-api 0.101.0", - "aws-smithy-types 0.101.0", - "aws-smithy-xml 0.59.0", - "aws-types 0.101.0", - "http 0.2.12", - "regex", - "tracing", -] - -[[package]] -name = "aws-sdk-sts" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1d955bacd8c3637908a40a4af2f7a732461ee7d95ec02599a3610ee55781d7" -dependencies = [ - "aws-credential-types 1.2.3", - "aws-http 0.60.6", - "aws-runtime 1.5.7", - "aws-smithy-async 1.2.5", - "aws-smithy-http 0.60.12", - "aws-smithy-json 0.60.7", - "aws-smithy-query 0.60.7", - "aws-smithy-runtime 1.8.3", - "aws-smithy-runtime-api 1.8.0", - "aws-smithy-types 1.3.1", - "aws-smithy-xml 0.60.9", - "aws-types 1.3.7", - "http 0.2.12", - "regex", - "tracing", -] - [[package]] name = "aws-sig-auth" version = "0.51.0" @@ -1177,9 +928,17 @@ dependencies = [ [[package]] name = "aws-sig-auth" -version = "0.60.3" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c471d4d8afed170d5bb40a2835159314b346f8bd20379a5e821c3dbb22e43b9" +checksum = "660a02a98ab1af83bd8d714afbab2d502ba9b18c49e7e4cddd6bf8837ff778cb" +dependencies = [ + "aws-credential-types", + "aws-sigv4 0.54.2", + "aws-smithy-http 0.54.4", + "aws-types 0.54.1", + "http 0.2.12", + "tracing", +] [[package]] name = "aws-sigv4" @@ -1203,15 +962,11 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "0.101.0" +version = "0.54.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06130e3686db3c5ae2fc44b3516fffe6b4d4eccebe09bd8ccc4067f3c9c183fb" +checksum = "86529e7b64d902efea8fff52c1b2529368d04f90305cf632729e3713f6b57dc0" dependencies = [ - "aws-credential-types 0.101.0", - "aws-smithy-http 0.59.0", - "aws-smithy-runtime-api 0.101.0", - "aws-smithy-types 0.101.0", - "bytes", + "aws-smithy-http 0.54.4", "form_urlencoded", "hex", "hmac 0.12.1", @@ -1224,28 +979,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "aws-sigv4" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3503af839bd8751d0bdc5a46b9cac93a003a353e635b0c12cf2376b5b53e41ea" -dependencies = [ - "aws-credential-types 1.2.3", - "aws-smithy-http 0.62.1", - "aws-smithy-runtime-api 1.8.0", - "aws-smithy-types 1.3.1", - "bytes", - "form_urlencoded", - "hex", - "hmac 0.12.1", - "http 0.2.12", - "http 1.3.1", - "percent-encoding", - "sha2 0.10.9", - "time", - "tracing", -] - [[package]] name = "aws-smithy-async" version = "0.51.0" @@ -1260,24 +993,14 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "0.101.0" +version = "0.54.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d787b7e07925b450bed90d9d29ac8e57006c9c2ac907151d175ac0e376bfee0e" -dependencies = [ - "futures-util", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "aws-smithy-async" -version = "1.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e190749ea56f8c42bf15dd76c65e14f8f765233e6df9b0506d9d934ebef867c" +checksum = "63c712a28a4f2f2139759235c08bf98aca99d4fdf1b13c78c5f95613df0a5db9" dependencies = [ "futures-util", "pin-project-lite", "tokio", + "tokio-stream", ] [[package]] @@ -1309,7 +1032,7 @@ checksum = "ff28d553714f8f54cd921227934fc13a536a1c03f106e56b362fd57e16d450ad" dependencies = [ "aws-smithy-async 0.51.0", "aws-smithy-http 0.51.0", - "aws-smithy-http-tower", + "aws-smithy-http-tower 0.51.0", "aws-smithy-types 0.51.0", "bytes", "fastrand 1.9.0", @@ -1324,6 +1047,26 @@ dependencies = [ "tracing", ] +[[package]] +name = "aws-smithy-client" +version = "0.54.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "104ca17f56cde00a10207169697dfe9c6810db339d52fb352707e64875b30a44" +dependencies = [ + "aws-smithy-async 0.54.4", + "aws-smithy-http 0.54.4", + "aws-smithy-http-tower 0.54.4", + "aws-smithy-types 0.54.4", + "bytes", + "fastrand 1.9.0", + "http 0.2.12", + "http-body 0.4.6", + "pin-project-lite", + "tokio", + "tower 0.4.13", + "tracing", +] + [[package]] name = "aws-smithy-eventstream" version = "0.51.0" @@ -1360,303 +1103,97 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96daaad925331c72449423574fdc72b54af780d5a23ace3c0a6ad0ccbf378715" -dependencies = [ - "aws-smithy-runtime-api 0.101.0", - "aws-smithy-types 0.101.0", - "bytes", - "bytes-utils", - "futures-core", - "http 0.2.12", - "http-body 0.4.6", - "once_cell", - "percent-encoding", - "pin-project-lite", - "pin-utils", - "tracing", -] - -[[package]] -name = "aws-smithy-http" -version = "0.60.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7809c27ad8da6a6a68c454e651d4962479e81472aa19ae99e59f9aba1f9713cc" -dependencies = [ - "aws-smithy-runtime-api 1.8.0", - "aws-smithy-types 1.3.1", - "bytes", - "bytes-utils", - "futures-core", - "http 0.2.12", - "http-body 0.4.6", - "once_cell", - "percent-encoding", - "pin-project-lite", - "pin-utils", - "tracing", -] - -[[package]] -name = "aws-smithy-http" -version = "0.62.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99335bec6cdc50a346fda1437f9fefe33abf8c99060739a546a16457f2862ca9" -dependencies = [ - "aws-smithy-runtime-api 1.8.0", - "aws-smithy-types 1.3.1", - "bytes", - "bytes-utils", - "futures-core", - "http 0.2.12", - "http 1.3.1", - "http-body 0.4.6", - "percent-encoding", - "pin-project-lite", - "pin-utils", - "tracing", -] - -[[package]] -name = "aws-smithy-http-client" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aff1159006441d02e57204bf57a1b890ba68bedb6904ffd2873c1c4c11c546b" -dependencies = [ - "aws-smithy-async 1.2.5", - "aws-smithy-runtime-api 1.8.0", - "aws-smithy-types 1.3.1", - "h2 0.4.9", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.32", - "hyper-rustls 0.24.2", - "pin-project-lite", - "rustls 0.21.12", - "tokio", - "tracing", -] - -[[package]] -name = "aws-smithy-http-tower" -version = "0.51.0" +version = "0.54.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c96d7bd35e7cf96aca1134b2f81b1b59ffe493f7c6539c051791cbbf7a42d3" +checksum = "873f316f1833add0d3aa54ed1b0cd252ddd88c792a0cf839886400099971e844" dependencies = [ - "aws-smithy-http 0.51.0", + "aws-smithy-types 0.54.4", "bytes", - "http 0.2.12", - "http-body 0.4.6", - "pin-project-lite", - "tower 0.4.13", - "tracing", -] - -[[package]] -name = "aws-smithy-json" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8324ba98c8a94187723cc16c37aefa09504646ee65c3d2c3af495bab5ea701b" -dependencies = [ - "aws-smithy-types 0.51.0", -] - -[[package]] -name = "aws-smithy-json" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ff985bee3fe21046dc501fadc1d04a1161977c55a0cbbccd9b111c18206aa64" -dependencies = [ - "aws-smithy-types 0.101.0", -] - -[[package]] -name = "aws-smithy-json" -version = "0.60.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6" -dependencies = [ - "aws-smithy-types 1.3.1", -] - -[[package]] -name = "aws-smithy-observability" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9364d5989ac4dd918e5cc4c4bdcc61c9be17dcd2586ea7f69e348fc7c6cab393" -dependencies = [ - "aws-smithy-runtime-api 1.8.0", -] - -[[package]] -name = "aws-smithy-query" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83834ed2ff69ea6f6657baf205267dc2c0abe940703503a3e5d60ce23be3d306" -dependencies = [ - "aws-smithy-types 0.51.0", - "urlencoding", -] - -[[package]] -name = "aws-smithy-query" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb4006503693766d34717efc5f58325062845fce26a683a71b70f23156d72e67" -dependencies = [ - "aws-smithy-types 0.101.0", - "urlencoding", -] - -[[package]] -name = "aws-smithy-query" -version = "0.60.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb" -dependencies = [ - "aws-smithy-types 1.3.1", - "urlencoding", -] - -[[package]] -name = "aws-smithy-runtime" -version = "0.101.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d28af854558601b4202a4273b9720aebe43d73e472143e6056f16e3bd90bc837" -dependencies = [ - "aws-smithy-async 0.101.0", - "aws-smithy-http 0.59.0", - "aws-smithy-runtime-api 0.101.0", - "aws-smithy-types 0.101.0", - "bytes", - "fastrand 2.3.0", + "bytes-utils", + "futures-core", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.32", - "hyper-rustls 0.24.2", "once_cell", + "percent-encoding", "pin-project-lite", "pin-utils", - "rustls 0.21.12", - "tokio", "tracing", ] [[package]] -name = "aws-smithy-runtime" -version = "1.8.3" +name = "aws-smithy-http-tower" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14302f06d1d5b7d333fd819943075b13d27c7700b414f574c3c35859bfb55d5e" +checksum = "20c96d7bd35e7cf96aca1134b2f81b1b59ffe493f7c6539c051791cbbf7a42d3" dependencies = [ - "aws-smithy-async 1.2.5", - "aws-smithy-http 0.62.1", - "aws-smithy-http-client", - "aws-smithy-observability", - "aws-smithy-runtime-api 1.8.0", - "aws-smithy-types 1.3.1", + "aws-smithy-http 0.51.0", "bytes", - "fastrand 2.3.0", "http 0.2.12", - "http 1.3.1", "http-body 0.4.6", - "http-body 1.0.1", "pin-project-lite", - "pin-utils", - "tokio", + "tower 0.4.13", "tracing", ] [[package]] -name = "aws-smithy-runtime-api" -version = "0.101.0" +name = "aws-smithy-http-tower" +version = "0.54.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1c68e17e754b86da350b43add38294189121a880e9c3fb454f83ff7044f5257" +checksum = "4f38231d3f5dac9ac7976f44e12803add1385119ffca9e5f050d8e980733d164" dependencies = [ - "aws-smithy-async 0.101.0", - "aws-smithy-types 0.101.0", + "aws-smithy-http 0.54.4", + "aws-smithy-types 0.54.4", "bytes", "http 0.2.12", + "http-body 0.4.6", "pin-project-lite", - "tokio", + "tower 0.4.13", "tracing", - "zeroize", ] [[package]] -name = "aws-smithy-runtime-api" -version = "1.8.0" +name = "aws-smithy-json" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e5d9e3a80a18afa109391fb5ad09c3daf887b516c6fd805a157c6ea7994a57" +checksum = "d8324ba98c8a94187723cc16c37aefa09504646ee65c3d2c3af495bab5ea701b" dependencies = [ - "aws-smithy-async 1.2.5", - "aws-smithy-types 1.3.1", - "bytes", - "http 0.2.12", - "http 1.3.1", - "pin-project-lite", - "tokio", - "tracing", - "zeroize", + "aws-smithy-types 0.51.0", ] [[package]] -name = "aws-smithy-types" +name = "aws-smithy-query" version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b02e06ea63498c43bc0217ea4d16605d4e58d85c12fc23f6572ff6d0a840c61" +checksum = "83834ed2ff69ea6f6657baf205267dc2c0abe940703503a3e5d60ce23be3d306" dependencies = [ - "itoa", - "num-integer", - "ryu", - "time", + "aws-smithy-types 0.51.0", + "urlencoding", ] [[package]] name = "aws-smithy-types" -version = "0.101.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97b978d8a351ea5744206ecc643a1d3806628680e9f151b4d6b7a76fec1596f" +checksum = "8b02e06ea63498c43bc0217ea4d16605d4e58d85c12fc23f6572ff6d0a840c61" dependencies = [ - "base64-simd", - "bytes", - "bytes-utils", - "futures-core", - "http 0.2.12", - "http-body 0.4.6", "itoa", "num-integer", - "pin-project-lite", - "pin-utils", "ryu", - "serde", "time", ] [[package]] name = "aws-smithy-types" -version = "1.3.1" +version = "0.54.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40076bd09fadbc12d5e026ae080d0930defa606856186e31d83ccc6a255eeaf3" +checksum = "8161232eda10290f5136610a1eb9de56aceaccd70c963a26a260af20ac24794f" dependencies = [ "base64-simd", - "bytes", - "bytes-utils", - "futures-core", - "http 0.2.12", - "http 1.3.1", - "http-body 0.4.6", - "http-body 1.0.1", - "http-body-util", "itoa", "num-integer", - "pin-project-lite", - "pin-utils", "ryu", - "serde", "time", - "tokio", - "tokio-util", ] [[package]] @@ -1668,24 +1205,6 @@ dependencies = [ "xmlparser", ] -[[package]] -name = "aws-smithy-xml" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97500a0d0884b9576e65076075f81d899cfbb84f7db5ca1dd317f0582204e528" -dependencies = [ - "xmlparser", -] - -[[package]] -name = "aws-smithy-xml" -version = "0.60.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab0b0166827aa700d3dc519f72f8b3a91c35d0b8d042dc5d643a91e6f80648fc" -dependencies = [ - "xmlparser", -] - [[package]] name = "aws-types" version = "0.51.0" @@ -1693,7 +1212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05701d32da168b44f7ee63147781aed8723e792cc131cb9b18363b5393f17f70" dependencies = [ "aws-smithy-async 0.51.0", - "aws-smithy-client", + "aws-smithy-client 0.51.0", "aws-smithy-http 0.51.0", "aws-smithy-types 0.51.0", "http 0.2.12", @@ -1704,33 +1223,20 @@ dependencies = [ [[package]] name = "aws-types" -version = "0.101.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61065f0c6070cb0f9aaddfa614605fb1049908481da71ba5b39b2ffca12f57e4" +checksum = "f8f15b34253b68cde08e39b0627cc6101bcca64351229484b4743392c035d057" dependencies = [ - "aws-credential-types 0.101.0", - "aws-smithy-async 0.101.0", - "aws-smithy-runtime-api 0.101.0", - "aws-smithy-types 0.101.0", + "aws-credential-types", + "aws-smithy-async 0.54.4", + "aws-smithy-client 0.54.4", + "aws-smithy-http 0.54.4", + "aws-smithy-types 0.54.4", "http 0.2.12", "rustc_version", "tracing", ] -[[package]] -name = "aws-types" -version = "1.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a322fec39e4df22777ed3ad8ea868ac2f94cd15e1a55f6ee8d8d6305057689a" -dependencies = [ - "aws-credential-types 1.2.3", - "aws-smithy-async 1.2.5", - "aws-smithy-runtime-api 1.8.0", - "aws-smithy-types 1.3.1", - "rustc_version", - "tracing", -] - [[package]] name = "axum" version = "0.6.20" @@ -1908,7 +1414,7 @@ dependencies = [ "base64 0.22.1", "byteorder", "helium-proto", - "prost 0.12.6", + "prost", "rand 0.8.5", "rand_chacha 0.3.1", "rust_decimal", @@ -1918,35 +1424,21 @@ dependencies = [ ] [[package]] -name = "bincode" -version = "1.3.3" +name = "beef" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" dependencies = [ "serde", ] [[package]] -name = "bindgen" -version = "0.69.5" +name = "bincode" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ - "bitflags 2.9.0", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash 1.1.0", - "shlex", - "syn 2.0.101", - "which", + "serde", ] [[package]] @@ -2068,12 +1560,12 @@ dependencies = [ "http-serde", "humantime-serde", "lazy_static", - "metrics", + "metrics 0.24.2", "metrics-exporter-prometheus", "mobile-config", "once_cell", "poc-metrics", - "prost 0.12.6", + "prost", "rand 0.8.5", "rust_decimal", "rust_decimal_macros", @@ -2081,7 +1573,7 @@ dependencies = [ "serde_json", "sha2 0.10.9", "solana", - "sqlx 0.6.2", + "sqlx", "task-manager", "thiserror 1.0.69", "tokio", @@ -2308,15 +1800,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "1.0.0" @@ -2365,17 +1848,6 @@ dependencies = [ "inout", ] -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - [[package]] name = "clap" version = "4.5.37" @@ -2823,7 +2295,7 @@ dependencies = [ "anyhow", "axum 0.8.4", "bs58", - "helium-crypto 0.9.0", + "helium-crypto", "helium-proto", "http 0.2.12", "notify", @@ -2893,17 +2365,17 @@ checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" name = "db-store" version = "0.1.0" dependencies = [ - "aws-config 0.101.0", - "aws-credential-types 0.101.0", - "aws-sdk-sts 0.39.0", - "aws-sig-auth 0.60.3", - "aws-smithy-http 0.62.1", - "aws-types 0.101.0", + "aws-config", + "aws-credential-types", + "aws-sdk-sts", + "aws-sig-auth 0.54.1", + "aws-smithy-http 0.54.4", + "aws-types 0.54.1", "http 0.2.12", - "metrics", + "metrics 0.24.2", "poc-metrics", "serde", - "sqlx 0.6.2", + "sqlx", "thiserror 1.0.69", "tokio", "tracing", @@ -2918,7 +2390,7 @@ dependencies = [ "bytes", "chrono", "config", - "helium-crypto 0.9.0", + "helium-crypto", "humantime-serde", "reqwest 0.12.15", "serde", @@ -3113,12 +2585,6 @@ version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" -[[package]] -name = "dunce" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" - [[package]] name = "eager" version = "0.1.0" @@ -3198,9 +2664,6 @@ name = "either" version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" -dependencies = [ - "serde", -] [[package]] name = "elliptic-curve" @@ -3284,17 +2747,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "etcetera" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" -dependencies = [ - "cfg-if", - "home", - "windows-sys 0.48.0", -] - [[package]] name = "event-listener" version = "2.5.3" @@ -3375,7 +2827,7 @@ dependencies = [ "anyhow", "async-compression", "async-trait", - "aws-config 0.51.0", + "aws-config", "aws-sdk-s3", "aws-types 0.51.0", "base64 0.22.1", @@ -3390,14 +2842,14 @@ dependencies = [ "futures", "futures-util", "h3o", - "helium-crypto 0.9.0", + "helium-crypto", "helium-proto", "hex-literal", "http 0.2.12", "lazy_static", - "metrics", + "metrics 0.24.2", "poc-metrics", - "prost 0.12.6", + "prost", "regex", "retainer", "rust_decimal", @@ -3405,7 +2857,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.9", - "sqlx 0.6.2", + "sqlx", "strum 0.27.1", "strum_macros 0.27.1", "task-manager", @@ -3452,12 +2904,6 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" -[[package]] -name = "fixedbitset" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" - [[package]] name = "flate2" version = "1.1.1" @@ -3486,12 +2932,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foldhash" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" - [[package]] name = "foreign-types" version = "0.3.2" @@ -3516,12 +2956,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - [[package]] name = "fsevent-sys" version = "4.1.0" @@ -3590,17 +3024,6 @@ dependencies = [ "parking_lot 0.11.2", ] -[[package]] -name = "futures-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot 0.12.3", -] - [[package]] name = "futures-io" version = "0.3.31" @@ -3813,25 +3236,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "h2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75249d144030531f8dee69fe9cea04d3edf809a017ae445e2abdff6629e86633" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http 1.3.1", - "indexmap 2.9.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "h3o" version = "0.8.0" @@ -3905,9 +3309,6 @@ name = "hashbrown" version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" -dependencies = [ - "foldhash", -] [[package]] name = "hashlink" @@ -3952,32 +3353,9 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "helium-crypto" -version = "0.8.4" -source = "git+https://github.com/helium/helium-crypto-rs.git?branch=main#dc4bd575b1bd8b89617f98b64ac89f7ff0226302" -dependencies = [ - "base64 0.22.1", - "bs58", - "byteorder", - "ed25519-compact", - "k256", - "lazy_static", - "multihash", - "p256", - "rand_core 0.6.4", - "rsa", - "serde", - "sha2 0.10.9", - "signature 1.4.0", - "thiserror 1.0.69", -] - [[package]] name = "helium-crypto" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "333dfb5467550fdd77fc6f419a725775ef909746250d3519138a2ddcb08a73d7" dependencies = [ "base64 0.22.1", "bs58", @@ -3993,7 +3371,7 @@ dependencies = [ "sha2 0.10.9", "signature 1.4.0", "solana-sdk", - "sqlx 0.7.4", + "sqlx", "thiserror 1.0.69", ] @@ -4004,7 +3382,7 @@ dependencies = [ "anchor-client", "anchor-lang", "anchor-spl", - "angry-purple-tiger 0.1.0", + "angry-purple-tiger", "async-trait", "base64 0.22.1", "bincode", @@ -4012,7 +3390,7 @@ dependencies = [ "chrono", "futures", "h3o", - "helium-crypto 0.9.0", + "helium-crypto", "helium-proto", "hex", "itertools 0.14.0", @@ -4043,8 +3421,8 @@ version = "0.1.0" source = "git+https://github.com/helium/proto?branch=master#ddc23d5b19b56d4725f94005e6f89bf8fc516043" dependencies = [ "bytes", - "prost 0.12.6", - "prost-build 0.12.6", + "prost", + "prost-build", "serde", "serde_json", "strum 0.26.3", @@ -4089,7 +3467,7 @@ dependencies = [ "hextree", "rust_decimal", "rust_decimal_macros", - "sqlx 0.6.2", + "sqlx", ] [[package]] @@ -4163,15 +3541,6 @@ dependencies = [ "hmac 0.8.1", ] -[[package]] -name = "home" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" -dependencies = [ - "windows-sys 0.59.0", -] - [[package]] name = "http" version = "0.2.12" @@ -4228,6 +3597,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-range-header" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" + [[package]] name = "http-serde" version = "1.1.3" @@ -4276,7 +3651,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.26", + "h2", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -4299,7 +3674,6 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.9", "http 1.3.1", "http-body 1.0.1", "httparse", @@ -4352,9 +3726,7 @@ dependencies = [ "http 1.3.1", "hyper 1.6.0", "hyper-util", - "log", "rustls 0.23.26", - "rustls-native-certs 0.8.1", "rustls-pki-types", "tokio", "tokio-rustls 0.26.2", @@ -4374,6 +3746,19 @@ 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.32", + "native-tls", + "tokio", + "tokio-native-tls", +] + [[package]] name = "hyper-util" version = "0.1.11" @@ -4661,15 +4046,15 @@ dependencies = [ "file-store", "futures", "futures-util", - "helium-crypto 0.9.0", + "helium-crypto", "helium-proto", "http 0.2.12", "humantime-serde", - "metrics", + "metrics 0.24.2", "metrics-exporter-prometheus", "mobile-config", "poc-metrics", - "prost 0.12.6", + "prost", "rand 0.8.5", "serde", "serde_json", @@ -4740,17 +4125,17 @@ dependencies = [ "file-store", "futures", "futures-util", - "helium-crypto 0.9.0", + "helium-crypto", "helium-proto", "hextree", "http 0.2.12", "http-serde", "humantime-serde", "libflate", - "metrics", + "metrics 0.24.2", "metrics-exporter-prometheus", "poc-metrics", - "prost 0.12.6", + "prost", "rand 0.8.5", "retainer", "rust_decimal", @@ -4758,7 +4143,7 @@ dependencies = [ "serde", "serde_json", "solana", - "sqlx 0.6.2", + "sqlx", "task-manager", "thiserror 1.0.69", "tokio", @@ -4785,18 +4170,18 @@ dependencies = [ "file-store", "futures", "futures-util", - "helium-crypto 0.9.0", + "helium-crypto", "helium-proto", "http 0.2.12", "http-serde", "humantime-serde", "iot-config", - "metrics", + "metrics 0.24.2", "poc-metrics", - "prost 0.12.6", + "prost", "serde", "solana", - "sqlx 0.6.2", + "sqlx", "task-manager", "thiserror 1.0.69", "tokio", @@ -4826,18 +4211,18 @@ dependencies = [ "futures", "futures-util", "h3o", - "helium-crypto 0.9.0", + "helium-crypto", "helium-proto", "http-serde", "humantime-serde", "iot-config", "itertools 0.14.0", "lazy_static", - "metrics", + "metrics 0.24.2", "once_cell", "poc-metrics", "price", - "prost 0.12.6", + "prost", "rand 0.8.5", "retainer", "reward-scheduler", @@ -4847,7 +4232,7 @@ dependencies = [ "serde_json", "sha2 0.10.9", "solana", - "sqlx 0.6.2", + "sqlx", "task-manager", "thiserror 1.0.69", "tokio", @@ -4998,9 +4383,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.25.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fba77a59c4c644fd48732367624d1bcf6f409f9c9a286fbc71d2f1fc0b2ea16" +checksum = "e5f3783308bddc49d0218307f66a09330c106fbd792c58bac5c8dc294fdd0f98" dependencies = [ "jsonrpsee-core", "jsonrpsee-http-client", @@ -5009,62 +4394,58 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.25.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693c93cbb7db25f4108ed121304b671a36002c2db67dff2ee4391a688c738547" +checksum = "5aaa4c4d5fb801dcc316d81f76422db259809037a86b3194ae538dd026b05ed7" dependencies = [ + "anyhow", + "async-lock 2.8.0", "async-trait", - "bytes", + "beef", "futures-timer", "futures-util", - "http 1.3.1", - "http-body 1.0.1", - "http-body-util", + "hyper 0.14.32", "jsonrpsee-types", - "pin-project", - "rustc-hash 2.1.1", + "rustc-hash 1.1.0", "serde", "serde_json", - "thiserror 2.0.12", + "thiserror 1.0.69", "tokio", "tokio-stream", - "tower 0.5.2", "tracing", ] [[package]] name = "jsonrpsee-http-client" -version = "0.25.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6962d2bd295f75e97dd328891e58fce166894b974c1f7ce2e7597f02eeceb791" +checksum = "aa7165efcbfbc951d180162ff28fe91b657ed81925e37a35e4a396ce12109f96" dependencies = [ - "base64 0.22.1", - "http-body 1.0.1", - "hyper 1.6.0", - "hyper-rustls 0.27.5", - "hyper-util", + "async-trait", + "hyper 0.14.32", + "hyper-rustls 0.24.2", "jsonrpsee-core", "jsonrpsee-types", - "rustls 0.23.26", - "rustls-platform-verifier", "serde", "serde_json", - "thiserror 2.0.12", + "thiserror 1.0.69", "tokio", - "tower 0.5.2", - "url", + "tower 0.4.13", + "tracing", ] [[package]] name = "jsonrpsee-types" -version = "0.25.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66df7256371c45621b3b7d2fb23aea923d577616b9c0e9c0b950a6ea5c2be0ca" +checksum = "00aa7cc87bc42e04e26c8ac3e7186142f7fd2949c763d9b6a7e64a69672d8fb2" dependencies = [ - "http 1.3.1", + "anyhow", + "beef", "serde", "serde_json", - "thiserror 2.0.12", + "thiserror 1.0.69", + "tracing", ] [[package]] @@ -5118,12 +4499,6 @@ dependencies = [ "spin 0.9.8", ] -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "libc" version = "0.2.172" @@ -5150,16 +4525,6 @@ dependencies = [ "rle-decode-fast", ] -[[package]] -name = "libloading" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" -dependencies = [ - "cfg-if", - "windows-targets 0.52.6", -] - [[package]] name = "libm" version = "0.2.13" @@ -5225,12 +4590,6 @@ dependencies = [ "libsecp256k1-core", ] -[[package]] -name = "linux-raw-sys" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" - [[package]] name = "linux-raw-sys" version = "0.9.4" @@ -5342,6 +4701,16 @@ dependencies = [ "zeroize", ] +[[package]] +name = "metrics" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d05972e8cbac2671e85aa9d04d9160d193f8bebd1a5c1a2f4542c62e65d1d0" +dependencies = [ + "ahash 0.8.11", + "portable-atomic", +] + [[package]] name = "metrics" version = "0.24.2" @@ -5354,38 +4723,35 @@ dependencies = [ [[package]] name = "metrics-exporter-prometheus" -version = "0.17.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df88858cd28baaaf2cfc894e37789ed4184be0e1351157aec7bf3c2266c793fd" +checksum = "83a4c4718a371ddfb7806378f23617876eea8b82e5ff1324516bcd283249d9ea" dependencies = [ - "base64 0.22.1", - "http-body-util", - "hyper 1.6.0", - "hyper-rustls 0.27.5", - "hyper-util", - "indexmap 2.9.0", + "base64 0.21.7", + "hyper 0.14.32", + "hyper-tls", + "indexmap 1.9.3", "ipnet", - "metrics", + "metrics 0.22.4", "metrics-util", "quanta", - "thiserror 2.0.12", + "thiserror 1.0.69", "tokio", "tracing", ] [[package]] name = "metrics-util" -version = "0.19.1" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8496cc523d1f94c1385dd8f0f0c2c480b2b8aeccb5b7e4485ad6365523ae376" +checksum = "8b07a5eb561b8cbc16be2d216faf7757f9baf3bfb94dbb0fae3df8387a5bb47f" dependencies = [ "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.15.3", - "metrics", + "hashbrown 0.14.5", + "metrics 0.22.4", + "num_cpus", "quanta", - "rand 0.9.1", - "rand_xoshiro", "sketches-ddsketch", ] @@ -5483,7 +4849,7 @@ dependencies = [ "file-store", "futures", "futures-util", - "helium-crypto 0.9.0", + "helium-crypto", "helium-proto", "hextree", "http 0.2.12", @@ -5491,10 +4857,10 @@ dependencies = [ "humantime", "humantime-serde", "lazy_static", - "metrics", + "metrics 0.24.2", "metrics-exporter-prometheus", "poc-metrics", - "prost 0.12.6", + "prost", "rand 0.8.5", "retainer", "rust_decimal", @@ -5502,7 +4868,7 @@ dependencies = [ "serde", "serde_json", "solana", - "sqlx 0.6.2", + "sqlx", "task-manager", "thiserror 1.0.69", "tokio", @@ -5519,7 +4885,7 @@ dependencies = [ name = "mobile-config-cli" version = "0.1.0" dependencies = [ - "angry-purple-tiger 1.0.0", + "angry-purple-tiger", "anyhow", "base64 0.22.1", "clap", @@ -5527,10 +4893,10 @@ dependencies = [ "dialoguer", "futures", "h3o", - "helium-crypto 0.9.0", + "helium-crypto", "helium-proto", "mobile-config", - "prost 0.12.6", + "prost", "rand 0.8.5", "serde", "serde_json", @@ -5554,20 +4920,20 @@ dependencies = [ "file-store", "futures", "futures-util", - "helium-crypto 0.9.0", + "helium-crypto", "helium-proto", "http 0.2.12", "http-serde", "humantime-serde", - "metrics", + "metrics 0.24.2", "mobile-config", "poc-metrics", - "prost 0.12.6", + "prost", "reqwest 0.12.15", "serde", "sha2 0.10.9", "solana", - "sqlx 0.6.2", + "sqlx", "task-manager", "thiserror 1.0.69", "tokio", @@ -5598,7 +4964,7 @@ dependencies = [ "futures", "futures-util", "h3o", - "helium-crypto 0.9.0", + "helium-crypto", "helium-proto", "hex-assignments", "hextree", @@ -5606,14 +4972,14 @@ dependencies = [ "humantime", "humantime-serde", "lazy_static", - "metrics", + "metrics 0.24.2", "metrics-exporter-prometheus", "mobile-config", "once_cell", "poc-metrics", "price", "proptest", - "prost 0.12.6", + "prost", "rand 0.8.5", "regex", "retainer", @@ -5624,7 +4990,7 @@ dependencies = [ "serde_json", "sha2 0.10.9", "solana", - "sqlx 0.6.2", + "sqlx", "task-manager", "thiserror 1.0.69", "tokio", @@ -5674,6 +5040,23 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" +[[package]] +name = "native-tls" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework 2.11.1", + "security-framework-sys", + "tempfile", +] + [[package]] name = "nix" version = "0.29.0" @@ -6153,17 +5536,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ - "fixedbitset 0.4.2", - "indexmap 2.9.0", -] - -[[package]] -name = "petgraph" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772" -dependencies = [ - "fixedbitset 0.5.7", + "fixedbitset", "indexmap 2.9.0", ] @@ -6230,15 +5603,15 @@ dependencies = [ "file-store", "futures", "futures-util", - "helium-crypto 0.9.0", + "helium-crypto", "helium-proto", "http 0.2.12", "hyper 0.14.32", "jsonrpsee", - "metrics", + "metrics 0.24.2", "metrics-exporter-prometheus", "poc-metrics", - "prost 0.12.6", + "prost", "serde", "serde_json", "thiserror 1.0.69", @@ -6255,7 +5628,7 @@ name = "poc-metrics" version = "0.1.0" dependencies = [ "futures", - "metrics", + "metrics 0.24.2", "metrics-exporter-prometheus", "reqwest 0.12.15", "serde", @@ -6323,10 +5696,10 @@ dependencies = [ "futures-util", "helium-proto", "humantime-serde", - "metrics", + "metrics 0.24.2", "metrics-exporter-prometheus", "poc-metrics", - "prost 0.12.6", + "prost", "rust_decimal", "rust_decimal_macros", "serde", @@ -6429,17 +5802,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.6", -] - -[[package]] -name = "prost" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" -dependencies = [ - "bytes", - "prost-derive 0.13.5", + "prost-derive", ] [[package]] @@ -6454,30 +5817,10 @@ dependencies = [ "log", "multimap", "once_cell", - "petgraph 0.6.5", - "prettyplease", - "prost 0.12.6", - "prost-types 0.12.6", - "regex", - "syn 2.0.101", - "tempfile", -] - -[[package]] -name = "prost-build" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" -dependencies = [ - "heck 0.5.0", - "itertools 0.14.0", - "log", - "multimap", - "once_cell", - "petgraph 0.7.1", + "petgraph", "prettyplease", - "prost 0.13.5", - "prost-types 0.13.5", + "prost", + "prost-types", "regex", "syn 2.0.101", "tempfile", @@ -6496,35 +5839,13 @@ dependencies = [ "syn 2.0.101", ] -[[package]] -name = "prost-derive" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" -dependencies = [ - "anyhow", - "itertools 0.14.0", - "proc-macro2", - "quote", - "syn 2.0.101", -] - [[package]] name = "prost-types" version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost 0.12.6", -] - -[[package]] -name = "prost-types" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16" -dependencies = [ - "prost 0.13.5", + "prost", ] [[package]] @@ -6796,15 +6117,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "rand_xoshiro" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41" -dependencies = [ - "rand_core 0.9.3", -] - [[package]] name = "raw-cpuid" version = "11.5.0" @@ -6934,7 +6246,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.3.26", + "h2", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.32", @@ -7054,22 +6366,22 @@ dependencies = [ "file-store", "futures", "futures-util", - "helium-crypto 0.9.0", + "helium-crypto", "helium-proto", "humantime-serde", "lazy_static", - "metrics", + "metrics 0.24.2", "metrics-exporter-prometheus", "once_cell", "poc-metrics", - "prost 0.12.6", + "prost", "rand 0.8.5", "rust_decimal", "rust_decimal_macros", "serde", "serde_json", "sha2 0.10.9", - "sqlx 0.6.2", + "sqlx", "task-manager", "thiserror 1.0.69", "tokio", @@ -7288,19 +6600,6 @@ dependencies = [ "nom", ] -[[package]] -name = "rustix" -version = "0.38.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" -dependencies = [ - "bitflags 2.9.0", - "errno", - "libc", - "linux-raw-sys 0.4.15", - "windows-sys 0.59.0", -] - [[package]] name = "rustix" version = "1.0.7" @@ -7310,7 +6609,7 @@ dependencies = [ "bitflags 2.9.0", "errno", "libc", - "linux-raw-sys 0.9.4", + "linux-raw-sys", "windows-sys 0.59.0", ] @@ -7344,8 +6643,6 @@ version = "0.23.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0" dependencies = [ - "aws-lc-rs", - "log", "once_cell", "ring 0.17.14", "rustls-pki-types", @@ -7448,7 +6745,6 @@ version = "0.103.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03" dependencies = [ - "aws-lc-rs", "ring 0.17.14", "rustls-pki-types", "untrusted 0.9.0", @@ -7817,9 +7113,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "sketches-ddsketch" -version = "0.3.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a" +checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" [[package]] name = "slab" @@ -7865,14 +7161,14 @@ dependencies = [ "clap", "file-store", "futures", - "helium-crypto 0.9.0", + "helium-crypto", "helium-lib", "itertools 0.14.0", - "metrics", + "metrics 0.24.2", "serde", "sha2 0.10.9", "spl-token 8.0.0", - "sqlx 0.6.2", + "sqlx", "thiserror 1.0.69", "tokio", "tracing", @@ -10542,19 +9838,8 @@ name = "sqlx" version = "0.6.2" source = "git+https://github.com/launchbadge/sqlx.git?rev=42dd78fe931df651eac411316ed3eab87c2f79b2#42dd78fe931df651eac411316ed3eab87c2f79b2" dependencies = [ - "sqlx-core 0.6.2", - "sqlx-macros 0.6.2", -] - -[[package]] -name = "sqlx" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" -dependencies = [ - "sqlx-core 0.7.4", - "sqlx-macros 0.7.4", - "sqlx-postgres", + "sqlx-core", + "sqlx-macros", ] [[package]] @@ -10563,7 +9848,7 @@ version = "0.6.2" source = "git+https://github.com/launchbadge/sqlx.git?rev=42dd78fe931df651eac411316ed3eab87c2f79b2#42dd78fe931df651eac411316ed3eab87c2f79b2" dependencies = [ "ahash 0.7.8", - "atoi 1.0.0", + "atoi", "base64 0.13.1", "bitflags 1.3.2", "byteorder", @@ -10577,7 +9862,7 @@ dependencies = [ "event-listener 2.5.3", "futures-channel", "futures-core", - "futures-intrusive 0.4.2", + "futures-intrusive", "futures-util", "hashlink", "hex", @@ -10613,48 +9898,6 @@ dependencies = [ "whoami", ] -[[package]] -name = "sqlx-core" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" -dependencies = [ - "ahash 0.8.11", - "atoi 2.0.0", - "byteorder", - "bytes", - "crc", - "crossbeam-queue", - "either", - "event-listener 2.5.3", - "futures-channel", - "futures-core", - "futures-intrusive 0.5.0", - "futures-io", - "futures-util", - "hashlink", - "hex", - "indexmap 2.9.0", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "sha2 0.10.9", - "smallvec", - "sqlformat", - "thiserror 1.0.69", - "tokio", - "tokio-stream", - "tracing", - "url", - "webpki-roots 0.25.4", -] - [[package]] name = "sqlx-macros" version = "0.6.2" @@ -10667,87 +9910,12 @@ dependencies = [ "proc-macro2", "quote", "sha2 0.10.9", - "sqlx-core 0.6.2", + "sqlx-core", "sqlx-rt", "syn 1.0.109", "url", ] -[[package]] -name = "sqlx-macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" -dependencies = [ - "proc-macro2", - "quote", - "sqlx-core 0.7.4", - "sqlx-macros-core", - "syn 1.0.109", -] - -[[package]] -name = "sqlx-macros-core" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" -dependencies = [ - "dotenvy", - "either", - "heck 0.4.1", - "hex", - "once_cell", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2 0.10.9", - "sqlx-core 0.7.4", - "sqlx-postgres", - "syn 1.0.109", - "tempfile", - "tokio", - "url", -] - -[[package]] -name = "sqlx-postgres" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" -dependencies = [ - "atoi 2.0.0", - "base64 0.21.7", - "bitflags 2.9.0", - "byteorder", - "crc", - "dotenvy", - "etcetera", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "hex", - "hkdf", - "hmac 0.12.1", - "home", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "rand 0.8.5", - "serde", - "serde_json", - "sha2 0.10.9", - "smallvec", - "sqlx-core 0.7.4", - "stringprep", - "thiserror 1.0.69", - "tracing", - "whoami", -] - [[package]] name = "sqlx-rt" version = "0.6.2" @@ -10953,7 +10121,7 @@ dependencies = [ "fastrand 2.3.0", "getrandom 0.3.2", "once_cell", - "rustix 1.0.7", + "rustix", "windows-sys 0.59.0", ] @@ -11137,6 +10305,16 @@ dependencies = [ "syn 2.0.101", ] +[[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" @@ -11268,14 +10446,14 @@ dependencies = [ "axum 0.6.20", "base64 0.21.7", "bytes", - "h2 0.3.26", + "h2", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.32", "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.12.6", + "prost", "rustls 0.21.12", "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.4", @@ -11296,7 +10474,7 @@ checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ "prettyplease", "proc-macro2", - "prost-build 0.12.6", + "prost-build", "quote", "syn 2.0.101", ] @@ -11339,14 +10517,17 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.2" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697" +checksum = "e980386f06883cf4d0578d6c9178c81f68b45d77d00f2c2c1bc034b3439c2c56" dependencies = [ - "bitflags 2.9.0", + "bitflags 1.3.2", "bytes", - "http 1.3.1", - "http-body 1.0.1", + "futures-core", + "futures-util", + "http 0.2.12", + "http-body 0.4.6", + "http-range-header", "pin-project-lite", "tower-layer", "tower-service", @@ -11873,18 +11054,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix 0.38.44", -] - [[package]] name = "whoami" version = "1.6.0" @@ -12371,7 +11540,6 @@ dependencies = [ [[package]] name = "xorf-generator" version = "0.7.0" -source = "git+https://github.com/helium/xorf-generator?branch=main#2b3842646a1c208e69ec3259762659f8530b84d6" dependencies = [ "anyhow", "base64 0.22.1", @@ -12380,10 +11548,10 @@ dependencies = [ "clap", "csv", "flate2", - "helium-crypto 0.8.4", + "helium-crypto", "indexmap 2.9.0", - "prost 0.13.5", - "prost-build 0.13.5", + "prost", + "prost-build", "rand 0.8.5", "serde", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index 7d75ea425..83a14d143 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -120,10 +120,7 @@ helium-lib = { path = "../helium-wallet-rs/helium-lib" } # https://github.com/launchbadge/sqlx/commit/42dd78fe931df651eac411316ed3eab87c2f79b2 sqlx = { git = "https://github.com/launchbadge/sqlx.git", rev = "42dd78fe931df651eac411316ed3eab87c2f79b2" } anchor-lang = { git = "https://github.com/madninja/anchor.git", branch = "madninja/const_pubkey" } -helium-crypto = { git = "https://github.com/helium/helium-crypto-rs.git", branch = "main", features = [ - "sqlx-postgres", -] } -# helium-lib = { path = "../helium-wallet-rs/helium-lib" } +helium-crypto = { path = "../helium-crypto-rs" } # When attempting to test proto changes without needing to push a branch you can # patch the github url to point to your local proto repo. diff --git a/db_store/Cargo.toml b/db_store/Cargo.toml index 7f4be1c45..762d9da8d 100644 --- a/db_store/Cargo.toml +++ b/db_store/Cargo.toml @@ -7,19 +7,18 @@ authors.workspace = true license.workspace = true [dependencies] -metrics = {workspace = true } +metrics = { workspace = true } poc-metrics = { path = "../metrics" } -thiserror = {workspace = true} -sqlx = {workspace = true} -serde = {workspace = true} -http = {workspace = true} -tokio = {workspace = true} -tracing = {workspace = true} +thiserror = { workspace = true } +sqlx = { workspace = true } +serde = { workspace = true } +http = { workspace = true } +tokio = { workspace = true } +tracing = { workspace = true } aws-config = "0" aws-sdk-sts = "0" aws-credential-types = "0" -aws-smithy-http = "0" -aws-types = "0" -aws-sig-auth = "0" - +aws-smithy-http = "0.54.4" +aws-types = "0.54.1" +aws-sig-auth = "0.54.1" diff --git a/denylist/Cargo.toml b/denylist/Cargo.toml index 43eb9d98b..8606c5451 100644 --- a/denylist/Cargo.toml +++ b/denylist/Cargo.toml @@ -21,5 +21,6 @@ serde = { workspace = true } serde_json = { workspace = true } config = { workspace = true } chrono = { workspace = true } -xorf-generator = { git = "https://github.com/helium/xorf-generator", branch = "main" } +# xorf-generator = { git = "https://github.cmo/helium/xorf-generator", branch = "main" } +xorf-generator = { path = "../../xorf-generator" } humantime-serde = { workspace = true } diff --git a/file_store/src/file_sink.rs b/file_store/src/file_sink.rs index e4527c21d..b2fc79d07 100644 --- a/file_store/src/file_sink.rs +++ b/file_store/src/file_sink.rs @@ -131,7 +131,8 @@ impl FileSinkBuilder { metric: self.metric, }; - metrics::counter!(client.metric.clone(), vec![OK_LABEL]); + // Seed a value for the metric + metrics::counter!(client.metric.clone(), vec![OK_LABEL]).increment(1); let mut sink = FileSink { target_path: self.target_path, diff --git a/mobile_config_cli/src/cmds/gateway.rs b/mobile_config_cli/src/cmds/gateway.rs index 5ab2aa263..2cf2be26d 100644 --- a/mobile_config_cli/src/cmds/gateway.rs +++ b/mobile_config_cli/src/cmds/gateway.rs @@ -65,7 +65,7 @@ impl TryFrom for GatewayInfo { fn try_from(info: GatewayInfoProto) -> Result { let device_type: DeviceType = info.device_type().into(); let pubkey = PublicKey::try_from(info.address)?; - let name: AnimalName = pubkey.into(); + let name: AnimalName = pubkey.clone().into(); let metadata = if let Some(md) = info.metadata { Some(md.try_into()?) } else { From d64665875cfc7b3211cfe1d49321a245dc29345f Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Fri, 2 May 2025 15:12:33 -0700 Subject: [PATCH 10/41] upgrading sqlx --- Cargo.lock | 399 ++++++++++++++++++++--------- Cargo.toml | 6 +- file_store/src/file_info_poller.rs | 12 +- iot_config/src/db_cleaner.rs | 13 +- 4 files changed, 287 insertions(+), 143 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 96f5fe3c1..a03ec54d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -734,9 +734,9 @@ dependencies = [ [[package]] name = "atoi" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" dependencies = [ "num-traits", ] @@ -1415,11 +1415,11 @@ dependencies = [ "byteorder", "helium-proto", "prost", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand 0.7.3", + "rand_chacha 0.2.2", "rust_decimal", "serde", - "sha2 0.10.9", + "sha2 0.9.9", "thiserror 1.0.69", ] @@ -2352,7 +2352,7 @@ dependencies = [ "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.10", + "parking_lot_core", ] [[package]] @@ -2418,6 +2418,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ "const-oid 0.9.6", + "pem-rfc7468", "zeroize", ] @@ -2525,26 +2526,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "displaydoc" version = "0.2.5" @@ -2664,6 +2645,9 @@ name = "either" version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +dependencies = [ + "serde", +] [[package]] name = "elliptic-curve" @@ -2747,6 +2731,17 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + [[package]] name = "event-listener" version = "2.5.3" @@ -2926,6 +2921,17 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" +[[package]] +name = "flume" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" +dependencies = [ + "futures-core", + "futures-sink", + "spin 0.9.8", +] + [[package]] name = "fnv" version = "1.0.7" @@ -3015,13 +3021,13 @@ dependencies = [ [[package]] name = "futures-intrusive" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ "futures-core", "lock_api", - "parking_lot 0.11.2", + "parking_lot", ] [[package]] @@ -3198,7 +3204,7 @@ dependencies = [ "futures-timer", "no-std-compat", "nonzero_ext", - "parking_lot 0.12.3", + "parking_lot", "portable-atomic", "quanta", "rand 0.8.5", @@ -3366,7 +3372,7 @@ dependencies = [ "multihash", "p256", "rand_core 0.6.4", - "rsa", + "rsa 0.4.0", "serde", "sha2 0.10.9", "signature 1.4.0", @@ -3541,6 +3547,15 @@ dependencies = [ "hmac 0.8.1", ] +[[package]] +name = "home" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +dependencies = [ + "windows-sys 0.59.0", +] + [[package]] name = "http" version = "0.2.12" @@ -4539,7 +4554,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.9.0", "libc", - "redox_syscall 0.5.11", + "redox_syscall", ] [[package]] @@ -4590,6 +4605,17 @@ dependencies = [ "libsecp256k1-core", ] +[[package]] +name = "libsqlite3-sys" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + [[package]] name = "linux-raw-sys" version = "0.9.4" @@ -5186,6 +5212,23 @@ dependencies = [ "zeroize", ] +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + [[package]] name = "num-complex" version = "0.2.4" @@ -5426,17 +5469,6 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.3" @@ -5444,21 +5476,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.10", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -5469,7 +5487,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.11", + "redox_syscall", "smallvec", "windows-targets 0.52.6", ] @@ -5515,6 +5533,15 @@ dependencies = [ "base64 0.13.1", ] +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.3.1" @@ -5572,6 +5599,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der 0.7.10", + "pkcs8", + "spki", +] + [[package]] name = "pkcs8" version = "0.10.2" @@ -6146,15 +6184,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.5.11" @@ -6164,17 +6193,6 @@ dependencies = [ "bitflags 2.9.0", ] -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom 0.2.16", - "libredox", - "thiserror 1.0.69", -] - [[package]] name = "regex" version = "1.11.1" @@ -6489,7 +6507,7 @@ dependencies = [ "byteorder", "digest 0.9.0", "lazy_static", - "num-bigint-dig", + "num-bigint-dig 0.7.1", "num-integer", "num-iter", "num-traits", @@ -6500,6 +6518,26 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rsa" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b" +dependencies = [ + "const-oid 0.9.6", + "digest 0.10.7", + "num-bigint-dig 0.8.4", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core 0.6.4", + "signature 2.2.0", + "spki", + "subtle", + "zeroize", +] + [[package]] name = "rstar" version = "0.12.2" @@ -7084,6 +7122,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ + "digest 0.10.7", "rand_core 0.6.4", ] @@ -7283,7 +7322,7 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d52e52720efe60465b052b9e7445a01c17550666beec855cce66f44766697bc2" dependencies = [ - "parking_lot 0.12.3", + "parking_lot", ] [[package]] @@ -9417,6 +9456,9 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] [[package]] name = "spinning_top" @@ -9835,95 +9877,210 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.6.2" -source = "git+https://github.com/launchbadge/sqlx.git?rev=42dd78fe931df651eac411316ed3eab87c2f79b2#42dd78fe931df651eac411316ed3eab87c2f79b2" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" dependencies = [ "sqlx-core", "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", ] [[package]] name = "sqlx-core" -version = "0.6.2" -source = "git+https://github.com/launchbadge/sqlx.git?rev=42dd78fe931df651eac411316ed3eab87c2f79b2#42dd78fe931df651eac411316ed3eab87c2f79b2" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" dependencies = [ - "ahash 0.7.8", + "ahash 0.8.11", "atoi", - "base64 0.13.1", - "bitflags 1.3.2", "byteorder", "bytes", "chrono", "crc", "crossbeam-queue", - "dirs", - "dotenvy", "either", "event-listener 2.5.3", "futures-channel", "futures-core", "futures-intrusive", + "futures-io", "futures-util", "hashlink", "hex", - "hkdf", - "hmac 0.12.1", - "indexmap 1.9.3", - "itoa", - "libc", + "indexmap 2.9.0", "log", - "md-5", "memchr", - "num-bigint 0.4.6", "once_cell", "paste", "percent-encoding", - "rand 0.8.5", "rust_decimal", - "rustls 0.20.9", + "rustls 0.21.12", "rustls-pemfile 1.0.4", "serde", "serde_json", - "sha1", "sha2 0.10.9", "smallvec", "sqlformat", - "sqlx-rt", - "stringprep", "thiserror 1.0.69", + "tokio", "tokio-stream", + "tracing", "url", "uuid", - "webpki-roots 0.22.6", - "whoami", + "webpki-roots 0.25.4", ] [[package]] name = "sqlx-macros" -version = "0.6.2" -source = "git+https://github.com/launchbadge/sqlx.git?rev=42dd78fe931df651eac411316ed3eab87c2f79b2#42dd78fe931df651eac411316ed3eab87c2f79b2" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" dependencies = [ "dotenvy", "either", "heck 0.4.1", + "hex", "once_cell", "proc-macro2", "quote", + "serde", + "serde_json", "sha2 0.10.9", "sqlx-core", - "sqlx-rt", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", "syn 1.0.109", + "tempfile", + "tokio", "url", ] [[package]] -name = "sqlx-rt" -version = "0.6.2" -source = "git+https://github.com/launchbadge/sqlx.git?rev=42dd78fe931df651eac411316ed3eab87c2f79b2#42dd78fe931df651eac411316ed3eab87c2f79b2" +name = "sqlx-mysql" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" dependencies = [ + "atoi", + "base64 0.21.7", + "bitflags 2.9.0", + "byteorder", + "bytes", + "chrono", + "crc", + "digest 0.10.7", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac 0.12.1", + "itoa", + "log", + "md-5", + "memchr", "once_cell", - "tokio", - "tokio-rustls 0.23.4", + "percent-encoding", + "rand 0.8.5", + "rsa 0.9.8", + "rust_decimal", + "serde", + "sha1", + "sha2 0.10.9", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror 1.0.69", + "tracing", + "uuid", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" +dependencies = [ + "atoi", + "base64 0.21.7", + "bitflags 2.9.0", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac 0.12.1", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand 0.8.5", + "rust_decimal", + "serde", + "serde_json", + "sha2 0.10.9", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror 1.0.69", + "tracing", + "uuid", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" +dependencies = [ + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "tracing", + "url", + "urlencoding", + "uuid", ] [[package]] @@ -10259,7 +10416,7 @@ dependencies = [ "bytes", "libc", "mio 1.0.3", - "parking_lot 0.12.3", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", @@ -10648,7 +10805,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "rand 0.8.5", + "rand 0.7.3", "static_assertions", ] @@ -11021,15 +11178,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - [[package]] name = "webpki-roots" version = "0.24.0" @@ -11060,9 +11208,8 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6994d13118ab492c3c80c1f81928718159254c53c472bf9ce36f8dae4add02a7" dependencies = [ - "redox_syscall 0.5.11", + "redox_syscall", "wasite", - "web-sys", ] [[package]] @@ -11555,7 +11702,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "sha2 0.10.9", + "sha2 0.9.9", "thiserror 1.0.69", "twox-hash", "xorf", diff --git a/Cargo.toml b/Cargo.toml index 83a14d143..ef7b844c0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,10 +54,10 @@ tokio = { version = "1", default-features = false, features = [ "time", ] } tokio-stream = "0" -sqlx = { version = "0", features = [ +sqlx = { version = "0.7", features = [ "postgres", "uuid", - "decimal", + "rust_decimal", "chrono", "migrate", "macros", @@ -118,7 +118,7 @@ helium-lib = { path = "../helium-wallet-rs/helium-lib" } [patch.crates-io] # v0.7.0-alpha.3 # https://github.com/launchbadge/sqlx/commit/42dd78fe931df651eac411316ed3eab87c2f79b2 -sqlx = { git = "https://github.com/launchbadge/sqlx.git", rev = "42dd78fe931df651eac411316ed3eab87c2f79b2" } +# sqlx = { git = "https://github.com/launchbadge/sqlx.git", rev = "42dd78fe931df651eac411316ed3eab87c2f79b2" } anchor-lang = { git = "https://github.com/madninja/anchor.git", branch = "madninja/const_pubkey" } helium-crypto = { path = "../helium-crypto-rs" } diff --git a/file_store/src/file_info_poller.rs b/file_store/src/file_info_poller.rs index 4bd0f9942..41dca74e3 100644 --- a/file_store/src/file_info_poller.rs +++ b/file_store/src/file_info_poller.rs @@ -5,7 +5,7 @@ use derive_builder::Builder; use futures::{future::LocalBoxFuture, stream::BoxStream, StreamExt}; use futures_util::TryFutureExt; use retainer::Cache; -use sqlx::PgPool; +use sqlx::{Executor, PgPool}; use std::{collections::VecDeque, marker::PhantomData, sync::Arc, time::Duration}; use task_manager::ManagedTask; use tokio::sync::mpsc::{Receiver, Sender}; @@ -44,7 +44,7 @@ pub trait FileInfoPollerParser: Send + Sync + 'static { #[async_trait::async_trait] pub trait FileInfoPollerStateRecorder { - async fn record(self, process_name: &str, file_info: &FileInfo) -> Result; + async fn record(&mut self, process_name: &str, file_info: &FileInfo) -> Result; } #[async_trait::async_trait] @@ -80,7 +80,7 @@ where pub async fn into_stream( self, - recorder: impl FileInfoPollerStateRecorder, + recorder: &mut impl FileInfoPollerStateRecorder, ) -> Result> where T: 'static, @@ -433,8 +433,8 @@ use sqlx::postgres::PgQueryResult; #[cfg(feature = "sqlx-postgres")] #[async_trait::async_trait] -impl FileInfoPollerStateRecorder for &mut sqlx::Transaction<'_, sqlx::Postgres> { - async fn record(self, process_name: &str, file_info: &FileInfo) -> Result { +impl FileInfoPollerStateRecorder for sqlx::Transaction<'_, sqlx::Postgres> { + async fn record(&mut self, process_name: &str, file_info: &FileInfo) -> Result { sqlx::query( r#" INSERT INTO files_processed(process_name, file_name, file_type, file_timestamp, processed_at) VALUES($1, $2, $3, $4, $5) @@ -444,7 +444,7 @@ impl FileInfoPollerStateRecorder for &mut sqlx::Transaction<'_, sqlx::Postgres> .bind(&file_info.prefix) .bind(file_info.timestamp) .bind(Utc::now()) - .execute(self) + .execute(&mut **self) .await .map(|_| ()) .map_err(Error::from) diff --git a/iot_config/src/db_cleaner.rs b/iot_config/src/db_cleaner.rs index 7da7b440a..bb860fcc4 100644 --- a/iot_config/src/db_cleaner.rs +++ b/iot_config/src/db_cleaner.rs @@ -1,6 +1,6 @@ use chrono::{DateTime, Utc}; use futures::TryFutureExt; -use sqlx::{Pool, Postgres, Transaction}; +use sqlx::{PgConnection, Pool, Postgres, Transaction}; use std::time::Duration; use task_manager::ManagedTask; @@ -67,7 +67,7 @@ async fn delete_routes( "#, ) .bind(timestamp) - .execute(tx) + .execute(&mut **tx) .await?; Ok(()) @@ -84,7 +84,7 @@ async fn delete_euis( "#, ) .bind(timestamp) - .execute(tx) + .execute(&mut **tx) .await?; Ok(()) @@ -101,16 +101,13 @@ async fn delete_devaddr_ranges( "#, ) .bind(timestamp) - .execute(tx) + .execute(&mut **tx) .await?; Ok(()) } -async fn delete_skfs( - tx: &mut Transaction<'_, Postgres>, - timestamp: DateTime, -) -> anyhow::Result<()> { +async fn delete_skfs(tx: &mut PgConnection, timestamp: DateTime) -> anyhow::Result<()> { sqlx::query( r#" delete from route_session_key_filters From e95e1942e91548d7d97d069c8c66a857e606e1eb Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Fri, 2 May 2025 15:45:00 -0700 Subject: [PATCH 11/41] fixup iot-packet-verifier for db connection types --- iot_packet_verifier/src/pending.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iot_packet_verifier/src/pending.rs b/iot_packet_verifier/src/pending.rs index bb991e473..67ded53ff 100644 --- a/iot_packet_verifier/src/pending.rs +++ b/iot_packet_verifier/src/pending.rs @@ -207,7 +207,7 @@ impl<'a> PendingTablesTransaction<'a> for Transaction<'a, Postgres> { ) -> Result<(), sqlx::Error> { sqlx::query("DELETE FROM pending_txns WHERE signature = $1") .bind(signature.to_string()) - .execute(self) + .execute(&mut **self) .await?; Ok(()) } @@ -229,7 +229,7 @@ impl<'a> PendingTablesTransaction<'a> for Transaction<'a, Postgres> { .bind(amount as i64) .bind(Utc::now()) .bind(payer) - .execute(&mut *self) + .execute(&mut **self) .await?; Ok(()) } From e6cb4567e047ded49e6431278cf2668341514c07 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Fri, 2 May 2025 15:51:22 -0700 Subject: [PATCH 12/41] fixup iot-verifier for db connection types --- iot_verifier/src/entropy.rs | 10 ++++------ iot_verifier/src/last_beacon.rs | 2 +- iot_verifier/src/last_beacon_reciprocity.rs | 19 ++++++++----------- iot_verifier/src/poc_report.rs | 2 +- iot_verifier/src/purger.rs | 6 +++--- iot_verifier/src/reward_share.rs | 8 ++++---- iot_verifier/src/rewarder.rs | 2 +- iot_verifier/tests/integrations/common/mod.rs | 2 +- .../tests/integrations/runner_tests.rs | 2 +- 9 files changed, 24 insertions(+), 29 deletions(-) diff --git a/iot_verifier/src/entropy.rs b/iot_verifier/src/entropy.rs index b1f4b1b5a..eefdddc78 100644 --- a/iot_verifier/src/entropy.rs +++ b/iot_verifier/src/entropy.rs @@ -9,6 +9,7 @@ // use chrono::{DateTime, Utc}; use serde::{Deserialize, Serialize}; +use sqlx::PgConnection; use std::time::Duration; /// The lifespan duration of a piece of entropy @@ -38,16 +39,13 @@ pub struct Entropy { pub struct EntropyError(#[from] sqlx::Error); impl Entropy { - pub async fn insert_into<'c, E>( - executor: E, + pub async fn insert_into( + executor: &mut PgConnection, id: &Vec, data: &Vec, timestamp: &DateTime, version: i32, - ) -> Result<(), EntropyError> - where - E: sqlx::Executor<'c, Database = sqlx::Postgres>, - { + ) -> Result<(), EntropyError> { sqlx::query( r#" insert into entropy ( diff --git a/iot_verifier/src/last_beacon.rs b/iot_verifier/src/last_beacon.rs index d38cc5d3b..e59c11da6 100644 --- a/iot_verifier/src/last_beacon.rs +++ b/iot_verifier/src/last_beacon.rs @@ -106,7 +106,7 @@ impl LastBeacon { ) .bind(id.as_ref()) .bind(timestamp) - .execute(txn) + .execute(&mut **txn) .await?; Ok(()) } diff --git a/iot_verifier/src/last_beacon_reciprocity.rs b/iot_verifier/src/last_beacon_reciprocity.rs index 4f7daa891..0f68d2e6b 100644 --- a/iot_verifier/src/last_beacon_reciprocity.rs +++ b/iot_verifier/src/last_beacon_reciprocity.rs @@ -27,10 +27,10 @@ impl FromRow<'_, PgRow> for LastBeaconReciprocity { } impl LastBeaconReciprocity { - pub async fn get<'c, E>(executor: E, id: &PublicKeyBinary) -> anyhow::Result> - where - E: sqlx::Executor<'c, Database = Postgres>, - { + pub async fn get( + executor: impl sqlx::PgExecutor<'_>, + id: &PublicKeyBinary, + ) -> anyhow::Result> { Ok(sqlx::query_as::<_, LastBeaconReciprocity>( r#" select * from last_beacon_recip where id = $1;"#, ) @@ -39,13 +39,10 @@ impl LastBeaconReciprocity { .await?) } - pub async fn get_all_since<'c, E>( - executor: E, + pub async fn get_all_since( + executor: impl sqlx::PgExecutor<'_>, timestamp: DateTime, - ) -> anyhow::Result> - where - E: sqlx::Executor<'c, Database = sqlx::Postgres> + 'c, - { + ) -> anyhow::Result> { Ok( sqlx::query_as::<_, Self>( r#" select * from last_beacon_recip where timestamp >= $1; "#, @@ -71,7 +68,7 @@ impl LastBeaconReciprocity { ) .bind(id.as_ref()) .bind(timestamp) - .execute(txn) + .execute(&mut **txn) .await?; Ok(()) } diff --git a/iot_verifier/src/poc_report.rs b/iot_verifier/src/poc_report.rs index 8e3e268d3..c34667b40 100644 --- a/iot_verifier/src/poc_report.rs +++ b/iot_verifier/src/poc_report.rs @@ -129,7 +129,7 @@ impl Report { query_builder.push(" on conflict (id) do nothing "); let query = query_builder.build(); query - .execute(&mut *txn) + .execute(&mut **txn) .await .map(|_| ()) .map_err(ReportError::from) diff --git a/iot_verifier/src/purger.rs b/iot_verifier/src/purger.rs index 4e431bd60..a23bc5b79 100644 --- a/iot_verifier/src/purger.rs +++ b/iot_verifier/src/purger.rs @@ -23,7 +23,7 @@ use helium_proto::services::poc_lora::{ }; use humantime_serde::re::humantime; use sqlx::{PgPool, Postgres}; -use std::{ops::DerefMut, time::Duration}; +use std::time::Duration; use task_manager::ManagedTask; use tokio::{ sync::Mutex, @@ -190,7 +190,7 @@ impl Purger { ) .await?; // delete the report from the DB - Report::delete_report(tx.lock().await.deref_mut(), &beacon_id).await?; + Report::delete_report(&mut **tx.lock().await, &beacon_id).await?; telemetry::decrement_num_beacons(); Ok(()) } @@ -221,7 +221,7 @@ impl Purger { .await?; // delete the report from the DB - Report::delete_report(tx.lock().await.deref_mut(), &witness_id).await?; + Report::delete_report(&mut **tx.lock().await, &witness_id).await?; Ok(()) } } diff --git a/iot_verifier/src/reward_share.rs b/iot_verifier/src/reward_share.rs index 4aeddb543..5fd1ea581 100644 --- a/iot_verifier/src/reward_share.rs +++ b/iot_verifier/src/reward_share.rs @@ -103,7 +103,7 @@ impl GatewayPocShare { .bind(self.hex_scale) .bind(self.reward_unit) .bind(self.poc_id) - .fetch_one(&mut *db) + .fetch_one(&mut **db) .await? .inserted) } @@ -162,7 +162,7 @@ impl GatewayDCShare { .bind(self.reward_timestamp) .bind(self.num_dcs) .bind(self.id) - .fetch_one(&mut *db) + .fetch_one(&mut **db) .await? .inserted) } @@ -215,13 +215,13 @@ impl GatewayShares { ) -> Result<(), sqlx::Error> { sqlx::query("delete from gateway_shares where reward_timestamp <= $1") .bind(period_end) - .execute(&mut *tx) + .execute(&mut **tx) .await .map(|_| ())?; sqlx::query("delete from gateway_dc_shares where reward_timestamp <= $1") .bind(period_end) - .execute(&mut *tx) + .execute(&mut **tx) .await .map(|_| ()) } diff --git a/iot_verifier/src/rewarder.rs b/iot_verifier/src/rewarder.rs index de59cf8e9..5dd286e3c 100644 --- a/iot_verifier/src/rewarder.rs +++ b/iot_verifier/src/rewarder.rs @@ -197,7 +197,7 @@ where GatewayShares::clear_rewarded_shares(&mut transaction, reward_info.epoch_period.start) .await?; - save_next_reward_epoch(&mut transaction, reward_info.epoch_day + 1).await?; + save_next_reward_epoch(&mut *transaction, reward_info.epoch_day + 1).await?; transaction.commit().await?; diff --git a/iot_verifier/tests/integrations/common/mod.rs b/iot_verifier/tests/integrations/common/mod.rs index 78dc00688..38f655c60 100644 --- a/iot_verifier/tests/integrations/common/mod.rs +++ b/iot_verifier/tests/integrations/common/mod.rs @@ -337,7 +337,7 @@ pub async fn inject_last_witness( gateway: PublicKeyBinary, ts: DateTime, ) -> anyhow::Result<()> { - LastWitness::update_last_timestamp(&mut *txn, &gateway, ts).await + LastWitness::update_last_timestamp(&mut **txn, &gateway, ts).await } pub fn valid_gateway() -> GatewayInfo { diff --git a/iot_verifier/tests/integrations/runner_tests.rs b/iot_verifier/tests/integrations/runner_tests.rs index 4db86be00..e23052a38 100644 --- a/iot_verifier/tests/integrations/runner_tests.rs +++ b/iot_verifier/tests/integrations/runner_tests.rs @@ -933,7 +933,7 @@ async fn invalid_beacon_bad_payload(pool: PgPool) -> anyhow::Result<()> { ctx.runner.handle_db_tick().await?; tokio::time::sleep(Duration::from_secs(3)).await; let mut txn = pool.begin().await?; - let beacon_report = Report::get_stale_beacons(&mut txn, Duration::from_secs(1)).await?; + let beacon_report = Report::get_stale_beacons(&mut *txn, Duration::from_secs(1)).await?; // max attempts is 2, once that is exceeded the report is no longer retried // so even tho we called handle_db_tick 5 times above, the report was only retried twice assert_eq!(2, beacon_report[0].attempts); From cf709d41f28b7f64aca7942bdac553f6d467dd6d Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Fri, 2 May 2025 15:52:34 -0700 Subject: [PATCH 13/41] fixup mobile-config for db connection types --- mobile_config/src/mobile_radio_tracker.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile_config/src/mobile_radio_tracker.rs b/mobile_config/src/mobile_radio_tracker.rs index 00ef36eba..83444e9d2 100644 --- a/mobile_config/src/mobile_radio_tracker.rs +++ b/mobile_config/src/mobile_radio_tracker.rs @@ -265,7 +265,7 @@ async fn update_tracked_radios( "#, ) .build() - .execute(&mut txn) + .execute(&mut *txn) .await?; } From a9fee6b30bf9f41b1713bea8cc1a2ce8aedf57d4 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Fri, 2 May 2025 15:52:50 -0700 Subject: [PATCH 14/41] fixup reward-index for db connection types --- reward_index/src/indexer.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reward_index/src/indexer.rs b/reward_index/src/indexer.rs index bce9d7bea..7ad38f64d 100644 --- a/reward_index/src/indexer.rs +++ b/reward_index/src/indexer.rs @@ -220,7 +220,7 @@ pub async fn handle_iot_rewards( for (reward_key, amount) in rewards { db::insert( - &mut *txn, + &mut **txn, reward_key.key, amount, reward_key.reward_type, @@ -255,7 +255,7 @@ pub async fn handle_mobile_rewards( for (reward_key, amount) in rewards { db::insert( - &mut *txn, + &mut **txn, reward_key.key, amount, reward_key.reward_type, From 4cf208ac414559c2c9096458ead662125887956f Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Fri, 2 May 2025 15:53:42 -0700 Subject: [PATCH 15/41] fixup mobile-packet-verifier for db connection types --- mobile_packet_verifier/src/event_ids.rs | 2 +- mobile_packet_verifier/src/pending_burns.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile_packet_verifier/src/event_ids.rs b/mobile_packet_verifier/src/event_ids.rs index 88b6747b8..550203d97 100644 --- a/mobile_packet_verifier/src/event_ids.rs +++ b/mobile_packet_verifier/src/event_ids.rs @@ -13,7 +13,7 @@ pub async fn is_duplicate( sqlx::query("INSERT INTO event_ids(event_id, received_timestamp) VALUES($1, $2) ON CONFLICT (event_id) DO NOTHING") .bind(event_id) .bind(received_timestamp) - .execute(txn) + .execute(&mut **txn) .await .map(|result| result.rows_affected() == 0) .map_err(anyhow::Error::from) diff --git a/mobile_packet_verifier/src/pending_burns.rs b/mobile_packet_verifier/src/pending_burns.rs index 6b94021a8..d920b70e0 100644 --- a/mobile_packet_verifier/src/pending_burns.rs +++ b/mobile_packet_verifier/src/pending_burns.rs @@ -162,7 +162,7 @@ pub async fn save_data_transfer_session( .bind(data_transfer_session.rewardable_bytes) .bind(data_transfer_session.first_timestamp) .bind(data_transfer_session.last_timestamp) - .execute(txn) + .execute(&mut **txn) .await?; Ok(()) From edf2ffab74dd682c6fdeb8b511098fd6fae8fa24 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Fri, 2 May 2025 15:57:14 -0700 Subject: [PATCH 16/41] fixup moile-verifier for db connection types --- .../src/banning/sp_boosted_rewards_bans.rs | 4 ++-- mobile_verifier/src/coverage.rs | 12 ++++++------ mobile_verifier/src/data_session.rs | 4 ++-- mobile_verifier/src/heartbeats/mod.rs | 4 ++-- mobile_verifier/src/radio_threshold.rs | 4 ++-- mobile_verifier/src/rewarder.rs | 4 ++-- mobile_verifier/src/seniority.rs | 6 +++--- mobile_verifier/src/speedtests.rs | 6 +++--- .../src/subscriber_mapping_activity/db.rs | 2 +- mobile_verifier/src/unique_connections/db.rs | 4 ++-- mobile_verifier/tests/integrations/heartbeats.rs | 2 +- mobile_verifier/tests/integrations/hex_boosting.rs | 2 +- .../tests/integrations/rewarder_poc_dc.rs | 2 +- 13 files changed, 28 insertions(+), 28 deletions(-) diff --git a/mobile_verifier/src/banning/sp_boosted_rewards_bans.rs b/mobile_verifier/src/banning/sp_boosted_rewards_bans.rs index c18e634c1..64a834dc8 100644 --- a/mobile_verifier/src/banning/sp_boosted_rewards_bans.rs +++ b/mobile_verifier/src/banning/sp_boosted_rewards_bans.rs @@ -379,7 +379,7 @@ pub mod db { .bind(&report.key) .bind(report.received_timestamp) .bind(report.until) - .execute(transaction) + .execute(&mut **transaction) .await .map(|_| ()) .map_err(anyhow::Error::from) @@ -403,7 +403,7 @@ pub mod db { .bind(&report.key) .bind(report.ban_type.as_str_name()) .bind(report.received_timestamp) - .execute(transaction) + .execute(&mut **transaction) .await .map(|_| ()) .map_err(anyhow::Error::from) diff --git a/mobile_verifier/src/coverage.rs b/mobile_verifier/src/coverage.rs index ceb99d03c..33646006b 100644 --- a/mobile_verifier/src/coverage.rs +++ b/mobile_verifier/src/coverage.rs @@ -326,7 +326,7 @@ impl CoverageObject { .bind(self.coverage_object.coverage_claim_time) .bind(self.coverage_object.trust_score as i32) .bind(insertion_time) - .execute(&mut *transaction) + .execute(&mut **transaction) .await?; const NUMBER_OF_FIELDS_IN_QUERY: u16 = 4; @@ -353,7 +353,7 @@ impl CoverageObject { "#, ) .build() - .execute(&mut *transaction) + .execute(&mut **transaction) .await?; } @@ -382,7 +382,7 @@ pub async fn set_invalidated_at( .bind(inserted_at) .bind(radio_key) .bind(uuid) - .execute(&mut *exec) + .execute(&mut **exec) .await?; Ok(()) @@ -488,7 +488,7 @@ pub async fn clear_coverage_objects( // Remove all invalidated objects before timestamp sqlx::query("DELETE FROM coverage_objects WHERE invalidated_at < $1") .bind(timestamp) - .execute(&mut *tx) + .execute(&mut **tx) .await?; // Delete all but the last 10 valid coverage_objects entry per radio_key before a given timestamp @@ -516,7 +516,7 @@ pub async fn clear_coverage_objects( "#, ) .bind(timestamp) - .execute(&mut *tx) + .execute(&mut **tx) .await?; Ok(()) @@ -563,7 +563,7 @@ impl CoverageClaimTimeCache { ) .bind(radio_key) .bind(coverage_object) - .fetch_optional(&mut *exec) + .fetch_optional(&mut **exec) .await?; if let Some(coverage_claim_time) = coverage_claim_time { self.cache diff --git a/mobile_verifier/src/data_session.rs b/mobile_verifier/src/data_session.rs index 6c0ff454a..ad54cc08d 100644 --- a/mobile_verifier/src/data_session.rs +++ b/mobile_verifier/src/data_session.rs @@ -166,7 +166,7 @@ impl HotspotDataSession { .bind(self.num_dcs) .bind(self.received_timestamp) .bind(self.burn_timestamp) - .execute(&mut *db) + .execute(&mut **db) .await?; Ok(()) } @@ -257,7 +257,7 @@ pub async fn clear_hotspot_data_sessions( ) -> Result<(), sqlx::Error> { sqlx::query("delete from hotspot_data_transfer_sessions where received_timestamp < $1") .bind(timestamp) - .execute(&mut *tx) + .execute(&mut **tx) .await?; Ok(()) } diff --git a/mobile_verifier/src/heartbeats/mod.rs b/mobile_verifier/src/heartbeats/mod.rs index d2be62810..52099a49f 100644 --- a/mobile_verifier/src/heartbeats/mod.rs +++ b/mobile_verifier/src/heartbeats/mod.rs @@ -572,7 +572,7 @@ impl ValidatedHeartbeat { .bind(self.heartbeat.location_validation_timestamp) .bind(self.heartbeat.lat) .bind(self.heartbeat.lon) - .execute(&mut *exec) + .execute(&mut **exec) .await?; Ok(()) } @@ -632,7 +632,7 @@ pub async fn clear_heartbeats( ) -> Result<(), sqlx::Error> { sqlx::query("DELETE FROM wifi_heartbeats WHERE truncated_timestamp < $1;") .bind(timestamp) - .execute(&mut *tx) + .execute(&mut **tx) .await?; Ok(()) diff --git a/mobile_verifier/src/radio_threshold.rs b/mobile_verifier/src/radio_threshold.rs index ef5d62d34..86f2bcdc2 100644 --- a/mobile_verifier/src/radio_threshold.rs +++ b/mobile_verifier/src/radio_threshold.rs @@ -314,7 +314,7 @@ pub async fn save( .bind(ingest_report.report.subscriber_threshold as i32) .bind(ingest_report.report.threshold_timestamp) .bind(ingest_report.received_timestamp) - .execute(db) + .execute(&mut **db) .await?; Ok(()) } @@ -360,7 +360,7 @@ pub async fn delete( "#, ) .bind(ingest_report.report.hotspot_pubkey.to_string()) - .execute(&mut *db) + .execute(&mut **db) .await?; Ok(()) } diff --git a/mobile_verifier/src/rewarder.rs b/mobile_verifier/src/rewarder.rs index 804a841b7..4e413d1ff 100644 --- a/mobile_verifier/src/rewarder.rs +++ b/mobile_verifier/src/rewarder.rs @@ -329,12 +329,12 @@ where ) .await?; coverage::clear_coverage_objects(&mut transaction, &reward_info.epoch_period.start).await?; - subscriber_mapping_activity::db::clear(&mut transaction, reward_info.epoch_period.start) + subscriber_mapping_activity::db::clear(&mut *transaction, reward_info.epoch_period.start) .await?; unique_connections::db::clear(&mut transaction, &reward_info.epoch_period.start).await?; banning::clear_bans(&mut transaction, reward_info.epoch_period.start).await?; - save_next_reward_epoch(&mut transaction, reward_info.epoch_day + 1).await?; + save_next_reward_epoch(&mut *transaction, reward_info.epoch_day + 1).await?; transaction.commit().await?; diff --git a/mobile_verifier/src/seniority.rs b/mobile_verifier/src/seniority.rs index 469149c04..caaea53d0 100644 --- a/mobile_verifier/src/seniority.rs +++ b/mobile_verifier/src/seniority.rs @@ -25,7 +25,7 @@ impl Seniority { "SELECT uuid, seniority_ts, last_heartbeat, inserted_at, update_reason FROM seniority WHERE radio_key = $1 ORDER BY last_heartbeat DESC, seniority_ts DESC LIMIT 1", ) .bind(key) - .fetch_optional(&mut *exec) + .fetch_optional(&mut **exec) .await } } @@ -188,7 +188,7 @@ impl SeniorityUpdate<'_> { .bind(Utc::now()) .bind(update_reason as i32) .bind(self.key.hb_type()) - .execute(&mut *exec) + .execute(&mut **exec) .await?; } SeniorityUpdateAction::Update { curr_seniority } => { @@ -204,7 +204,7 @@ impl SeniorityUpdate<'_> { .bind(self.heartbeat_ts) .bind(self.key) .bind(curr_seniority) - .execute(&mut *exec) + .execute(&mut **exec) .await?; } } diff --git a/mobile_verifier/src/speedtests.rs b/mobile_verifier/src/speedtests.rs index 0cf68c112..ae0284017 100644 --- a/mobile_verifier/src/speedtests.rs +++ b/mobile_verifier/src/speedtests.rs @@ -245,7 +245,7 @@ pub async fn save_speedtest( .bind(speedtest.latency as i32) .bind(&speedtest.serial) .bind(speedtest.timestamp) - .execute(exec) + .execute(&mut **exec) .await?; Ok(()) } @@ -270,7 +270,7 @@ pub async fn get_latest_speedtests_for_pubkey( .bind(timestamp - chrono::Duration::hours(SPEEDTEST_LAPSE)) .bind(timestamp) .bind(SPEEDTEST_AVG_MAX_DATA_POINTS as i64) - .fetch_all(exec) + .fetch_all(&mut **exec) .await?; Ok(speedtests) } @@ -311,7 +311,7 @@ pub async fn clear_speedtests( let oldest_ts = *epoch_end - chrono::Duration::hours(SPEEDTEST_LAPSE); sqlx::query("DELETE FROM speedtests WHERE timestamp < $1") .bind(oldest_ts) - .execute(&mut *tx) + .execute(&mut **tx) .await?; Ok(()) } diff --git a/mobile_verifier/src/subscriber_mapping_activity/db.rs b/mobile_verifier/src/subscriber_mapping_activity/db.rs index 6f33e9d45..ed85fc5b4 100644 --- a/mobile_verifier/src/subscriber_mapping_activity/db.rs +++ b/mobile_verifier/src/subscriber_mapping_activity/db.rs @@ -29,7 +29,7 @@ pub async fn save( }) .push("ON CONFLICT (subscriber_id, received_timestamp) DO NOTHING") .build() - .execute(&mut *txn) + .execute(&mut **txn) .await?; Ok(txn) diff --git a/mobile_verifier/src/unique_connections/db.rs b/mobile_verifier/src/unique_connections/db.rs index cc36fade2..109a66696 100644 --- a/mobile_verifier/src/unique_connections/db.rs +++ b/mobile_verifier/src/unique_connections/db.rs @@ -66,7 +66,7 @@ pub async fn save( "#, ) .build() - .execute(&mut *txn) + .execute(&mut **txn) .await?; } @@ -84,7 +84,7 @@ pub async fn clear( "#, ) .bind(timestamp) - .execute(txn) + .execute(&mut **txn) .await?; Ok(()) } diff --git a/mobile_verifier/tests/integrations/heartbeats.rs b/mobile_verifier/tests/integrations/heartbeats.rs index 9b48acd55..b5f7fe1e2 100644 --- a/mobile_verifier/tests/integrations/heartbeats.rs +++ b/mobile_verifier/tests/integrations/heartbeats.rs @@ -40,7 +40,7 @@ async fn test_save_wifi_heartbeat(pool: PgPool) -> anyhow::Result<()> { heartbeat.save(&mut transaction).await?; let count: i64 = sqlx::query_scalar("SELECT COUNT(*) FROM wifi_heartbeats") - .fetch_one(&mut transaction) + .fetch_one(&mut *transaction) .await?; assert_eq!(count, 1); diff --git a/mobile_verifier/tests/integrations/hex_boosting.rs b/mobile_verifier/tests/integrations/hex_boosting.rs index 93b5724c9..8448843d9 100644 --- a/mobile_verifier/tests/integrations/hex_boosting.rs +++ b/mobile_verifier/tests/integrations/hex_boosting.rs @@ -1528,7 +1528,7 @@ async fn save_seniority_object( .bind(ts) .bind(SeniorityUpdateReason::NewCoverageClaimTime as i32) .bind(hb.heartbeat.hb_type) - .execute(&mut *exec) + .execute(&mut **exec) .await?; Ok(()) } diff --git a/mobile_verifier/tests/integrations/rewarder_poc_dc.rs b/mobile_verifier/tests/integrations/rewarder_poc_dc.rs index 8094e3413..4e855720a 100644 --- a/mobile_verifier/tests/integrations/rewarder_poc_dc.rs +++ b/mobile_verifier/tests/integrations/rewarder_poc_dc.rs @@ -624,7 +624,7 @@ async fn save_seniority_object( .bind(ts) .bind(proto::SeniorityUpdateReason::NewCoverageClaimTime as i32) .bind(hb.heartbeat.hb_type) - .execute(&mut *exec) + .execute(&mut **exec) .await?; Ok(()) } From 12c1c6144345293c0fffc490407bcddcae89ed31 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Fri, 2 May 2025 15:58:19 -0700 Subject: [PATCH 17/41] fixup boost-manager for db connection types --- boost_manager/src/db.rs | 2 +- boost_manager/tests/integrations/purger_tests.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boost_manager/src/db.rs b/boost_manager/src/db.rs index 6503b4f49..d15ed4a3f 100644 --- a/boost_manager/src/db.rs +++ b/boost_manager/src/db.rs @@ -57,7 +57,7 @@ pub async fn insert_activated_hex( .bind(boosted_hex_pubkey) .bind(boost_config_pubkey) .bind(OnChainStatus::Queued) - .execute(txn) + .execute(&mut **txn) .await?; Ok(()) diff --git a/boost_manager/tests/integrations/purger_tests.rs b/boost_manager/tests/integrations/purger_tests.rs index 654875106..30c970972 100644 --- a/boost_manager/tests/integrations/purger_tests.rs +++ b/boost_manager/tests/integrations/purger_tests.rs @@ -113,7 +113,7 @@ pub async fn insert_data( .bind(BOOST_CONFIG_PUBKEY) .bind(status) .bind(last_updated_at) - .execute(txn) + .execute(&mut **txn) .await?; Ok(()) } From c8e2f5e6843fec7ee68a22c162f6e3bff73cdffc Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Fri, 2 May 2025 15:59:07 -0700 Subject: [PATCH 18/41] remove unused import --- file_store/src/file_info_poller.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file_store/src/file_info_poller.rs b/file_store/src/file_info_poller.rs index 41dca74e3..2c9e4beb2 100644 --- a/file_store/src/file_info_poller.rs +++ b/file_store/src/file_info_poller.rs @@ -5,7 +5,7 @@ use derive_builder::Builder; use futures::{future::LocalBoxFuture, stream::BoxStream, StreamExt}; use futures_util::TryFutureExt; use retainer::Cache; -use sqlx::{Executor, PgPool}; +use sqlx::PgPool; use std::{collections::VecDeque, marker::PhantomData, sync::Arc, time::Duration}; use task_manager::ManagedTask; use tokio::sync::mpsc::{Receiver, Sender}; From 67558d3a4fe2f822de0a4baa5d03720762d96bbb Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Fri, 2 May 2025 16:00:02 -0700 Subject: [PATCH 19/41] deref which would be done by auto-deref From 8d30a05315972b69ea136a7687745cfffef65f6d Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Fri, 2 May 2025 16:17:15 -0700 Subject: [PATCH 20/41] back to known backon --- Cargo.lock | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a03ec54d2..1d6fe0aec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1338,11 +1338,14 @@ dependencies = [ [[package]] name = "backon" -version = "0.5.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33e5b65cc81d81fbb8488f36458ab4771be35a722967bbc959df28b47397e3ff" +checksum = "f34fac4d7cdaefa2deded0eda2d5d59dbfd43370ff3f856209e72340ae84c294" dependencies = [ - "fastrand 2.3.0", + "futures", + "pin-project", + "rand 0.8.5", + "tokio", ] [[package]] From eaf2ce288f829cb55334fc9ae3e98e26442a6d2f Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Fri, 2 May 2025 16:21:25 -0700 Subject: [PATCH 21/41] fixup iot-config for db connection types --- iot_config/src/helium_netids.rs | 14 +++++++++++--- iot_config/src/org.rs | 32 ++++++++++++++++---------------- iot_config/src/org_service.rs | 2 +- iot_config/src/region_map.rs | 4 ++-- iot_config/src/route.rs | 24 ++++++++++++------------ 5 files changed, 42 insertions(+), 34 deletions(-) diff --git a/iot_config/src/helium_netids.rs b/iot_config/src/helium_netids.rs index 7b753a561..de5839b42 100644 --- a/iot_config/src/helium_netids.rs +++ b/iot_config/src/helium_netids.rs @@ -74,7 +74,7 @@ impl AddressStore for sqlx::Transaction<'_, sqlx::Postgres> { " select devaddr from helium_used_devaddrs where net_id = $1 order by devaddr asc ", ) .bind(i32::from(net_id.id())) - .fetch_all(self) + .fetch_all(&mut **self) .await? .into_iter() .map(|addr| addr as u32) @@ -93,7 +93,11 @@ impl AddressStore for sqlx::Transaction<'_, sqlx::Postgres> { .push_bind(*addr as i32) .push_bind(i32::from(net_id.id())); }); - Ok(query_builder.build().execute(self).await.map(|_| ())?) + Ok(query_builder + .build() + .execute(&mut **self) + .await + .map(|_| ())?) } async fn release_addrs( @@ -112,7 +116,11 @@ impl AddressStore for sqlx::Transaction<'_, sqlx::Postgres> { query_builder.push_tuples(released_addrs, |mut builder, (addr, id)| { builder.push_bind(addr as i32).push_bind(id); }); - Ok(query_builder.build().execute(self).await.map(|_| ())?) + Ok(query_builder + .build() + .execute(&mut **self) + .await + .map(|_| ())?) } } diff --git a/iot_config/src/org.rs b/iot_config/src/org.rs index d3c6cd603..9e2856844 100644 --- a/iot_config/src/org.rs +++ b/iot_config/src/org.rs @@ -89,7 +89,7 @@ pub async fn create_org( ) .bind(&owner) .bind(&payer) - .fetch_one(&mut txn) + .fetch_one(&mut *txn) .await .map_err(|_| { OrgStoreError::SaveOrg(format!("owner: {owner}, payer: {payer}, net_id: {net_id}")) @@ -109,7 +109,7 @@ pub async fn create_org( }); query_builder .build() - .execute(&mut txn) + .execute(&mut *txn) .await .map_err(|_| { OrgStoreError::SaveDelegates(format!( @@ -120,15 +120,15 @@ pub async fn create_org( }; if is_helium_netid(&net_id) { - insert_helium_constraints(oui as u64, net_id, devaddr_ranges, &mut txn).await + insert_helium_constraints(oui as u64, net_id, devaddr_ranges, &mut *txn).await } else { let constraint = devaddr_ranges .first() .ok_or(OrgStoreError::SaveConstraints( "no devaddr constraints supplied".to_string(), ))?; - if check_roamer_constraint_count(net_id, &mut txn).await? == 0 { - insert_roamer_constraint(oui as u64, net_id, constraint, &mut txn).await + if check_roamer_constraint_count(net_id, &mut *txn).await? == 0 { + insert_roamer_constraint(oui as u64, net_id, constraint, &mut *txn).await } else { return Err(OrgStoreError::SaveConstraints(format!( "constraint already in use {constraint:?}" @@ -137,7 +137,7 @@ pub async fn create_org( } .map_err(|err| OrgStoreError::SaveConstraints(format!("{devaddr_ranges:?}: {err:?}")))?; - let org = get(oui as u64, &mut txn) + let org = get(oui as u64, &mut *txn) .await? .ok_or_else(|| OrgStoreError::SaveOrg(format!("{oui}")))?; @@ -155,10 +155,10 @@ pub async fn update_org( ) -> Result { let mut txn = db.begin().await?; - let current_org = get(oui, &mut txn) + let current_org = get(oui, &mut *txn) .await? .ok_or_else(|| OrgStoreError::NotFound(format!("{oui}")))?; - let net_id = get_org_netid(oui, &mut txn).await?; + let net_id = get_org_netid(oui, &mut *txn).await?; let is_helium_org = is_helium_netid(&net_id); for update in updates.iter() { @@ -218,7 +218,7 @@ pub async fn update_org( }; } - let updated_org = get(oui, &mut txn) + let updated_org = get(oui, &mut *txn) .await? .ok_or_else(|| OrgStoreError::SaveOrg(format!("{oui}")))?; @@ -265,7 +265,7 @@ async fn update_owner( sqlx::query(" update organizations set owner_pubkey = $1 where oui = $2 ") .bind(owner_pubkey) .bind(oui as i64) - .execute(db) + .execute(&mut **db) .await .map(|_| ()) } @@ -278,7 +278,7 @@ async fn update_payer( sqlx::query(" update organizations set payer_pubkey = $1 where oui = $2 ") .bind(payer_pubkey) .bind(oui as i64) - .execute(db) + .execute(&mut **db) .await .map(|_| ()) } @@ -291,7 +291,7 @@ async fn add_delegate_key( sqlx::query(" insert into organization_delegate_keys (delegate_pubkey, oui) values ($1, $2) ") .bind(delegate_pubkey) .bind(oui as i64) - .execute(db) + .execute(&mut **db) .await .map(|_| ()) } @@ -304,7 +304,7 @@ async fn remove_delegate_key( sqlx::query(" delete from organization_delegate_keys where delegate_pubkey = $1 and oui = $2 ") .bind(delegate_pubkey) .bind(oui as i64) - .execute(db) + .execute(&mut **db) .await .map(|_| ()) } @@ -321,7 +321,7 @@ async fn add_constraint_update( helium_netids::checkout_specified_devaddr_constraint(db, helium_net_id, &added_constraint) .await .map_err(|err| OrgStoreError::InvalidUpdate(format!("{err:?}")))?; - insert_helium_constraints(oui, net_id, &[added_constraint], db).await?; + insert_helium_constraints(oui, net_id, &[added_constraint], &mut **db).await?; Ok(()) } @@ -341,7 +341,7 @@ async fn remove_constraint_update( ..=u32::from(removed_constraint.end_addr)) .collect::>(); db.release_addrs(helium_net_id, &remove_range).await?; - remove_helium_constraints(oui, &[removed_constraint], db).await?; + remove_helium_constraints(oui, &[removed_constraint], &mut **db).await?; Ok(()) } else if org_constraints.len() == 1 { return Err(OrgStoreError::InvalidUpdate( @@ -371,7 +371,7 @@ async fn add_devaddr_slab( let constraints = helium_netids::checkout_devaddr_constraints(txn, addr_count, helium_net_id) .await .map_err(|err| OrgStoreError::SaveConstraints(format!("{err:?}")))?; - insert_helium_constraints(oui, net_id, &constraints, txn).await?; + insert_helium_constraints(oui, net_id, &constraints, &mut **txn).await?; Ok(()) } diff --git a/iot_config/src/org_service.rs b/iot_config/src/org_service.rs index a7379811f..7c6b100ec 100644 --- a/iot_config/src/org_service.rs +++ b/iot_config/src/org_service.rs @@ -274,7 +274,7 @@ impl iot_config::Org for OrgService { .collect(), helium_netid_field, &devaddr_constraints, - &mut txn, + &mut *txn, ) .await .map_err(|err| { diff --git a/iot_config/src/region_map.rs b/iot_config/src/region_map.rs index b371552c5..584124f41 100644 --- a/iot_config/src/region_map.rs +++ b/iot_config/src/region_map.rs @@ -155,11 +155,11 @@ pub async fn update_region( .bind(region.to_string()) .bind(params.encode_to_vec()) .bind(indexes) - .execute(&mut transaction) + .execute(&mut *transaction) .await?; let updated_region = if indexes.is_some() { - Some(build_region_tree(&mut transaction).await?) + Some(build_region_tree(&mut *transaction).await?) } else { tracing::debug!("h3 region index update skipped"); None diff --git a/iot_config/src/route.rs b/iot_config/src/route.rs index f050f1324..7f6fc7117 100644 --- a/iot_config/src/route.rs +++ b/iot_config/src/route.rs @@ -128,12 +128,12 @@ pub async fn create_route( .bind(json!(&protocol_opts)) .bind(route.active) .bind(route.ignore_empty_skf) - .fetch_one(&mut transaction) + .fetch_one(&mut *transaction) .await?; let route_id = row.get::("id").to_string(); - let new_route = get_route(&route_id, &mut transaction).await?; + let new_route = get_route(&route_id, &mut *transaction).await?; transaction.commit().await?; @@ -196,10 +196,10 @@ pub async fn update_route( .bind(json!(&protocol_opts)) .bind(route.active) .bind(route.ignore_empty_skf) - .execute(&mut transaction) + .execute(&mut *transaction) .await?; - let updated_route = get_route(&route.id, &mut transaction).await?; + let updated_route = get_route(&route.id, &mut *transaction).await?; transaction.commit().await?; @@ -301,13 +301,13 @@ pub async fn update_euis( ) -> anyhow::Result<()> { let mut transaction = db.begin().await?; - let added_euis: Vec<(EuiPair, proto::ActionV1)> = insert_euis(to_add, &mut transaction) + let added_euis: Vec<(EuiPair, proto::ActionV1)> = insert_euis(to_add, &mut *transaction) .await? .into_iter() .map(|added_eui| (added_eui, proto::ActionV1::Add)) .collect(); - let removed_euis: Vec<(EuiPair, proto::ActionV1)> = remove_euis(to_remove, &mut transaction) + let removed_euis: Vec<(EuiPair, proto::ActionV1)> = remove_euis(to_remove, &mut *transaction) .await? .into_iter() .map(|removed_eui| (removed_eui, proto::ActionV1::Remove)) @@ -414,14 +414,14 @@ pub async fn update_devaddr_ranges( let mut transaction = db.begin().await?; let added_devaddrs: Vec<(DevAddrRange, proto::ActionV1)> = - insert_devaddr_ranges(to_add, &mut transaction) + insert_devaddr_ranges(to_add, &mut *transaction) .await? .into_iter() .map(|added_range| (added_range, proto::ActionV1::Add)) .collect(); let removed_devaddrs: Vec<(DevAddrRange, proto::ActionV1)> = - remove_devaddr_ranges(to_remove, &mut transaction) + remove_devaddr_ranges(to_remove, &mut *transaction) .await? .into_iter() .map(|removed_range| (removed_range, proto::ActionV1::Remove)) @@ -653,7 +653,7 @@ pub async fn delete_route( let uuid = Uuid::try_parse(id)?; let mut transaction = db.begin().await?; - let route = get_route(id, &mut transaction).await?; + let route = get_route(id, &mut *transaction).await?; sqlx::query( r#" @@ -663,7 +663,7 @@ pub async fn delete_route( "#, ) .bind(uuid) - .execute(&mut transaction) + .execute(&mut *transaction) .await?; transaction.commit().await?; @@ -742,13 +742,13 @@ pub async fn update_skfs( // Always process removes before adds to ensure updating existing values doesn't result in // removing a value that was just added - let removed_updates: Vec<(Skf, proto::ActionV1)> = remove_skfs(to_remove, &mut transaction) + let removed_updates: Vec<(Skf, proto::ActionV1)> = remove_skfs(to_remove, &mut *transaction) .await? .into_iter() .map(|removed_skf| (removed_skf, proto::ActionV1::Remove)) .collect(); - let added_updates: Vec<(Skf, proto::ActionV1)> = insert_skfs(to_add, &mut transaction) + let added_updates: Vec<(Skf, proto::ActionV1)> = insert_skfs(to_add, &mut *transaction) .await? .into_iter() .map(|added_skf| (added_skf, proto::ActionV1::Add)) From 4b19a481831edbc53ffcea0748d57efc4735b12f Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Fri, 2 May 2025 16:31:06 -0700 Subject: [PATCH 22/41] back to known metrics --- Cargo.lock | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1d6fe0aec..835c53988 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1563,7 +1563,7 @@ dependencies = [ "http-serde", "humantime-serde", "lazy_static", - "metrics 0.24.2", + "metrics", "metrics-exporter-prometheus", "mobile-config", "once_cell", @@ -2375,7 +2375,7 @@ dependencies = [ "aws-smithy-http 0.54.4", "aws-types 0.54.1", "http 0.2.12", - "metrics 0.24.2", + "metrics", "poc-metrics", "serde", "sqlx", @@ -2845,7 +2845,7 @@ dependencies = [ "hex-literal", "http 0.2.12", "lazy_static", - "metrics 0.24.2", + "metrics", "poc-metrics", "prost", "regex", @@ -4068,7 +4068,7 @@ dependencies = [ "helium-proto", "http 0.2.12", "humantime-serde", - "metrics 0.24.2", + "metrics", "metrics-exporter-prometheus", "mobile-config", "poc-metrics", @@ -4150,7 +4150,7 @@ dependencies = [ "http-serde", "humantime-serde", "libflate", - "metrics 0.24.2", + "metrics", "metrics-exporter-prometheus", "poc-metrics", "prost", @@ -4194,7 +4194,7 @@ dependencies = [ "http-serde", "humantime-serde", "iot-config", - "metrics 0.24.2", + "metrics", "poc-metrics", "prost", "serde", @@ -4236,7 +4236,7 @@ dependencies = [ "iot-config", "itertools 0.14.0", "lazy_static", - "metrics 0.24.2", + "metrics", "once_cell", "poc-metrics", "price", @@ -4740,16 +4740,6 @@ dependencies = [ "portable-atomic", ] -[[package]] -name = "metrics" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dea7ac8057892855ec285c440160265225438c3c45072613c25a4b26e98ef5" -dependencies = [ - "ahash 0.8.11", - "portable-atomic", -] - [[package]] name = "metrics-exporter-prometheus" version = "0.13.0" @@ -4761,7 +4751,7 @@ dependencies = [ "hyper-tls", "indexmap 1.9.3", "ipnet", - "metrics 0.22.4", + "metrics", "metrics-util", "quanta", "thiserror 1.0.69", @@ -4778,7 +4768,7 @@ dependencies = [ "crossbeam-epoch", "crossbeam-utils", "hashbrown 0.14.5", - "metrics 0.22.4", + "metrics", "num_cpus", "quanta", "sketches-ddsketch", @@ -4886,7 +4876,7 @@ dependencies = [ "humantime", "humantime-serde", "lazy_static", - "metrics 0.24.2", + "metrics", "metrics-exporter-prometheus", "poc-metrics", "prost", @@ -4954,7 +4944,7 @@ dependencies = [ "http 0.2.12", "http-serde", "humantime-serde", - "metrics 0.24.2", + "metrics", "mobile-config", "poc-metrics", "prost", @@ -5001,7 +4991,7 @@ dependencies = [ "humantime", "humantime-serde", "lazy_static", - "metrics 0.24.2", + "metrics", "metrics-exporter-prometheus", "mobile-config", "once_cell", @@ -5649,7 +5639,7 @@ dependencies = [ "http 0.2.12", "hyper 0.14.32", "jsonrpsee", - "metrics 0.24.2", + "metrics", "metrics-exporter-prometheus", "poc-metrics", "prost", @@ -5669,7 +5659,7 @@ name = "poc-metrics" version = "0.1.0" dependencies = [ "futures", - "metrics 0.24.2", + "metrics", "metrics-exporter-prometheus", "reqwest 0.12.15", "serde", @@ -5737,7 +5727,7 @@ dependencies = [ "futures-util", "helium-proto", "humantime-serde", - "metrics 0.24.2", + "metrics", "metrics-exporter-prometheus", "poc-metrics", "prost", @@ -6391,7 +6381,7 @@ dependencies = [ "helium-proto", "humantime-serde", "lazy_static", - "metrics 0.24.2", + "metrics", "metrics-exporter-prometheus", "once_cell", "poc-metrics", @@ -7206,7 +7196,7 @@ dependencies = [ "helium-crypto", "helium-lib", "itertools 0.14.0", - "metrics 0.24.2", + "metrics", "serde", "sha2 0.10.9", "spl-token 8.0.0", From c451fc25ee1704240238322890dbfc55a8fddb39 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Mon, 5 May 2025 10:44:47 -0700 Subject: [PATCH 23/41] remove all patches but anchor-lang --- Cargo.lock | 15 +++++++++------ Cargo.toml | 5 ----- solana/Cargo.toml | 7 ++----- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 835c53988..df917db45 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1418,11 +1418,11 @@ dependencies = [ "byteorder", "helium-proto", "prost", - "rand 0.7.3", - "rand_chacha 0.2.2", + "rand 0.8.5", + "rand_chacha 0.3.1", "rust_decimal", "serde", - "sha2 0.9.9", + "sha2 0.10.9", "thiserror 1.0.69", ] @@ -3365,6 +3365,8 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "helium-crypto" version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "333dfb5467550fdd77fc6f419a725775ef909746250d3519138a2ddcb08a73d7" dependencies = [ "base64 0.22.1", "bs58", @@ -3387,13 +3389,14 @@ dependencies = [ [[package]] name = "helium-lib" version = "0.1.1" +source = "git+https://github.com/helium/helium-wallet-rs?branch=mj%2Foracles-update#3115cad6f0626844287c32197aaecc93f3b14b2a" dependencies = [ "anchor-client", "anchor-lang", "anchor-spl", "angry-purple-tiger", "async-trait", - "base64 0.22.1", + "base64 0.21.7", "bincode", "bytemuck", "chrono", @@ -10798,7 +10801,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "rand 0.7.3", + "rand 0.8.5", "static_assertions", ] @@ -11695,7 +11698,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "sha2 0.9.9", + "sha2 0.10.9", "thiserror 1.0.69", "twox-hash", "xorf", diff --git a/Cargo.toml b/Cargo.toml index ef7b844c0..f6be68309 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -113,14 +113,9 @@ tokio-util = "0" uuid = { version = "1", features = ["v4", "serde"] } tower-http = { version = "0", features = ["trace"] } derive_builder = "0" -helium-lib = { path = "../helium-wallet-rs/helium-lib" } [patch.crates-io] -# v0.7.0-alpha.3 -# https://github.com/launchbadge/sqlx/commit/42dd78fe931df651eac411316ed3eab87c2f79b2 -# sqlx = { git = "https://github.com/launchbadge/sqlx.git", rev = "42dd78fe931df651eac411316ed3eab87c2f79b2" } anchor-lang = { git = "https://github.com/madninja/anchor.git", branch = "madninja/const_pubkey" } -helium-crypto = { path = "../helium-crypto-rs" } # When attempting to test proto changes without needing to push a branch you can # patch the github url to point to your local proto repo. diff --git a/solana/Cargo.toml b/solana/Cargo.toml index 3b222a5c8..16a7eee18 100644 --- a/solana/Cargo.toml +++ b/solana/Cargo.toml @@ -21,10 +21,7 @@ sha2 = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true } tracing = { workspace = true } - spl-token = { version = "8" } -# helium-anchor-gen = { git = "https://github.com/helium/helium-anchor-gen.git" } -# helium-lib = { git = "https://github.com/helium/helium-wallet-rs.git", branch = "master" } - -helium-lib = { workspace = true } sqlx = { workspace = true } + +helium-lib = { git = "https://github.com/helium/helium-wallet-rs", branch = "mj/oracles-update" } From de4a24f7e04215c6366564289db3ec1160a6eee6 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Mon, 5 May 2025 10:46:30 -0700 Subject: [PATCH 24/41] order imports for boost-manager --- boost_manager/Cargo.toml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/boost_manager/Cargo.toml b/boost_manager/Cargo.toml index f07dabc1f..e60e83c7c 100644 --- a/boost_manager/Cargo.toml +++ b/boost_manager/Cargo.toml @@ -8,8 +8,9 @@ license.workspace = true [dependencies] -anyhow = { workspace = true } axum = { version = "0", features = ["tracing"] } + +anyhow = { workspace = true } bs58 = { workspace = true } config = { workspace = true } clap = { workspace = true } @@ -25,10 +26,6 @@ futures = { workspace = true } futures-util = { workspace = true } prost = { workspace = true } once_cell = { workspace = true } -mobile-config = { path = "../mobile_config" } -file-store = { path = "../file_store" } -db-store = { path = "../db_store" } -poc-metrics = { path = "../metrics" } tokio = { workspace = true } tokio-util = { workspace = true } tracing = { workspace = true } @@ -42,10 +39,15 @@ rust_decimal_macros = { workspace = true } tonic = { workspace = true } rand = { workspace = true } async-trait = { workspace = true } -task-manager = { path = "../task_manager" } http = { workspace = true } http-serde = { workspace = true } -solana = { path = "../solana" } humantime-serde = { workspace = true } -custom-tracing = { path = "../custom_tracing" } hextree = { workspace = true } + +custom-tracing = { path = "../custom_tracing" } +db-store = { path = "../db_store" } +file-store = { path = "../file_store" } +mobile-config = { path = "../mobile_config" } +poc-metrics = { path = "../metrics" } +solana = { path = "../solana" } +task-manager = { path = "../task_manager" } From 0bcf8afbefed0658e65a53ff458b1f7c7a174178 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Mon, 5 May 2025 10:52:10 -0700 Subject: [PATCH 25/41] Export SolPubkey as top level --- .../tests/integrations/activator_tests.rs | 14 +++++++------- .../tests/integrations/updater_tests.rs | 3 +-- .../tests/integrations/watcher_tests.rs | 18 +++++++++--------- solana/src/lib.rs | 1 + 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/boost_manager/tests/integrations/activator_tests.rs b/boost_manager/tests/integrations/activator_tests.rs index 3fee49916..b50ca007b 100644 --- a/boost_manager/tests/integrations/activator_tests.rs +++ b/boost_manager/tests/integrations/activator_tests.rs @@ -1,7 +1,7 @@ use boost_manager::{activator, db, OnChainStatus}; use chrono::{DateTime, Duration as ChronoDuration, Duration, Timelike, Utc}; use mobile_config::boosted_hex_info::{BoostedHexInfo, BoostedHexes}; -use solana::re::solana_sdk::pubkey::Pubkey; +use solana::SolPubkey; use sqlx::PgPool; use std::{collections::HashMap, num::NonZeroU32, str::FromStr}; @@ -47,8 +47,8 @@ impl TestContext { end_ts: Some(end_ts_1), period_length: boost_period_length, multipliers: multipliers1, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, BoostedHexInfo { @@ -57,8 +57,8 @@ impl TestContext { end_ts: Some(end_ts_2), period_length: boost_period_length, multipliers: multipliers2, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, BoostedHexInfo { @@ -68,8 +68,8 @@ impl TestContext { end_ts: None, period_length: boost_period_length, multipliers: multipliers3, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, ]; diff --git a/boost_manager/tests/integrations/updater_tests.rs b/boost_manager/tests/integrations/updater_tests.rs index eafe43f7d..f4c38a6ed 100644 --- a/boost_manager/tests/integrations/updater_tests.rs +++ b/boost_manager/tests/integrations/updater_tests.rs @@ -2,8 +2,7 @@ use async_trait::async_trait; use boost_manager::{db, updater::Updater, OnChainStatus}; use chrono::{DateTime, Utc}; use file_store::hex_boost::BoostedHexActivation; -use solana::re::solana_sdk::signature::Signature; -use solana::{start_boost::SolanaNetwork, GetSignature, SolanaRpcError}; +use solana::{start_boost::SolanaNetwork, GetSignature, Signature, SolanaRpcError}; use sqlx::{PgPool, Postgres, Transaction}; use std::{string::ToString, sync::Mutex, time::Duration}; diff --git a/boost_manager/tests/integrations/watcher_tests.rs b/boost_manager/tests/integrations/watcher_tests.rs index e48ece2e1..0c59bdd16 100644 --- a/boost_manager/tests/integrations/watcher_tests.rs +++ b/boost_manager/tests/integrations/watcher_tests.rs @@ -3,7 +3,7 @@ use boost_manager::watcher::{self, Watcher}; use chrono::{Duration as ChronoDuration, Duration, Utc}; use helium_proto::BoostedHexInfoV1 as BoostedHexInfoProto; use mobile_config::boosted_hex_info::BoostedHexInfo; -use solana::re::solana_sdk::pubkey::Pubkey; +use solana::SolPubkey; use sqlx::PgPool; use std::{num::NonZeroU32, str::FromStr}; @@ -42,8 +42,8 @@ async fn test_boosted_hex_updates_to_filestore(pool: PgPool) -> anyhow::Result<( end_ts: Some(end_ts_1), period_length: boost_period_length, multipliers: multipliers1, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, BoostedHexInfo { @@ -52,8 +52,8 @@ async fn test_boosted_hex_updates_to_filestore(pool: PgPool) -> anyhow::Result<( end_ts: Some(end_ts_2), period_length: boost_period_length, multipliers: multipliers2, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, ]; @@ -74,13 +74,13 @@ async fn test_boosted_hex_updates_to_filestore(pool: PgPool) -> anyhow::Result<( if let Ok(boosted_hexes) = boosted_hexes_result { let res_boosted_hex_pubkey1 = - Pubkey::try_from(boosted_hexes[0].boosted_hex_pubkey.as_slice())?.to_string(); + SolPubkey::try_from(boosted_hexes[0].boosted_hex_pubkey.as_slice())?.to_string(); let res_boost_config_pubkey1 = - Pubkey::try_from(boosted_hexes[0].boost_config_pubkey.as_slice())?.to_string(); + SolPubkey::try_from(boosted_hexes[0].boost_config_pubkey.as_slice())?.to_string(); let res_boosted_hex_pubkey2 = - Pubkey::try_from(boosted_hexes[1].boosted_hex_pubkey.as_slice())?.to_string(); + SolPubkey::try_from(boosted_hexes[1].boosted_hex_pubkey.as_slice())?.to_string(); let res_boost_config_pubkey2 = - Pubkey::try_from(boosted_hexes[1].boost_config_pubkey.as_slice())?.to_string(); + SolPubkey::try_from(boosted_hexes[1].boost_config_pubkey.as_slice())?.to_string(); // assert the boosted hexes outputted to filestore assert_eq!(2, boosted_hexes.len()); diff --git a/solana/src/lib.rs b/solana/src/lib.rs index 6944bccee..53af767d9 100644 --- a/solana/src/lib.rs +++ b/solana/src/lib.rs @@ -4,6 +4,7 @@ use re::{ }; use std::time::SystemTimeError; +pub use re::solana_sdk::pubkey::Pubkey as SolPubkey; pub use re::solana_sdk::signature::Signature; pub mod re { From 39e1375e4e80ce4782cc3cac5ed8e368fc4c5098 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Mon, 5 May 2025 11:02:58 -0700 Subject: [PATCH 26/41] Export RpcClient as top level for price --- price/Cargo.toml | 8 ++++---- price/src/cli/check.rs | 8 +++++--- price/src/metrics.rs | 2 +- price/src/price_generator.rs | 2 +- price/src/settings.rs | 2 +- solana/src/lib.rs | 5 ++++- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/price/Cargo.toml b/price/Cargo.toml index a307f8615..544d3e25e 100644 --- a/price/Cargo.toml +++ b/price/Cargo.toml @@ -24,13 +24,13 @@ tokio = { workspace = true } tokio-util = { workspace = true } chrono = { workspace = true } helium-proto = { workspace = true } -file-store = { path = "../file_store" } -poc-metrics = { path = "../metrics" } rust_decimal = { workspace = true } rust_decimal_macros = { workspace = true } triggered = { workspace = true } -task-manager = { path = "../task_manager" } humantime-serde = { workspace = true } -custom-tracing = { path = "../custom_tracing" } +custom-tracing = { path = "../custom_tracing" } +file-store = { path = "../file_store" } +poc-metrics = { path = "../metrics" } solana = { path = "../solana" } +task-manager = { path = "../task_manager" } diff --git a/price/src/cli/check.rs b/price/src/cli/check.rs index aa208c269..160570db9 100644 --- a/price/src/cli/check.rs +++ b/price/src/cli/check.rs @@ -1,8 +1,10 @@ use anyhow::Result; use chrono::{DateTime, TimeZone, Utc}; -use solana::re::{ - anchor_lang::AccountDeserialize, helium_lib::programs::price_oracle::accounts::PriceOracleV0, - solana_client::nonblocking::rpc_client::RpcClient, solana_sdk::pubkey::Pubkey as SolPubkey, +use solana::{ + helium_lib::{ + anchor_lang::AccountDeserialize, programs::price_oracle::accounts::PriceOracleV0, + }, + RpcClient, SolPubkey, }; use std::str::FromStr; diff --git a/price/src/metrics.rs b/price/src/metrics.rs index ed7c04d69..7bb2e8bae 100644 --- a/price/src/metrics.rs +++ b/price/src/metrics.rs @@ -1,4 +1,4 @@ -use solana::re::helium_lib::token::Token; +use solana::Token; const PRICE_GAUGE: &str = concat!(env!("CARGO_PKG_NAME"), "_", "price_gauge"); diff --git a/price/src/price_generator.rs b/price/src/price_generator.rs index a2aa5b7c9..dde86e8d7 100644 --- a/price/src/price_generator.rs +++ b/price/src/price_generator.rs @@ -6,7 +6,7 @@ use futures::{future::LocalBoxFuture, TryFutureExt}; use helium_proto::{BlockchainTokenTypeV1, PriceReportV1}; use rust_decimal::Decimal; use serde::{Deserialize, Serialize}; -use solana::re::{helium_lib::token::Token, solana_client::nonblocking::rpc_client::RpcClient}; +use solana::{RpcClient, Token}; use std::{path::PathBuf, str::FromStr, time::Duration}; use task_manager::ManagedTask; use tokio::{fs, time}; diff --git a/price/src/settings.rs b/price/src/settings.rs index d07c0136e..da4b27413 100644 --- a/price/src/settings.rs +++ b/price/src/settings.rs @@ -2,7 +2,7 @@ use anyhow::Result; use config::{Config, Environment, File}; use humantime_serde::re::humantime; use serde::Deserialize; -use solana::re::helium_lib::token::Token; +use solana::Token; use std::{path::Path, time::Duration}; #[derive(Debug, Deserialize, Clone)] diff --git a/solana/src/lib.rs b/solana/src/lib.rs index 53af767d9..10e07623d 100644 --- a/solana/src/lib.rs +++ b/solana/src/lib.rs @@ -4,11 +4,14 @@ use re::{ }; use std::time::SystemTimeError; +pub use re::helium_lib::token::Token; +pub use re::solana_client::nonblocking::rpc_client::RpcClient; pub use re::solana_sdk::pubkey::Pubkey as SolPubkey; pub use re::solana_sdk::signature::Signature; -pub mod re { +pub use helium_lib; +pub mod re { pub use helium_lib; pub use helium_lib::anchor_client; pub use helium_lib::anchor_lang; From f37da5162fa338287912037df1536ef66d4f7aa0 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Mon, 5 May 2025 11:05:21 -0700 Subject: [PATCH 27/41] Remove solana from iot-config --- Cargo.lock | 1 - iot_config/Cargo.toml | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index df917db45..4199860e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4163,7 +4163,6 @@ dependencies = [ "rust_decimal_macros", "serde", "serde_json", - "solana", "sqlx", "task-manager", "thiserror 1.0.69", diff --git a/iot_config/Cargo.toml b/iot_config/Cargo.toml index bb78a73b3..1683f8d8f 100644 --- a/iot_config/Cargo.toml +++ b/iot_config/Cargo.toml @@ -14,10 +14,6 @@ bs58 = { workspace = true } chrono = { workspace = true } clap = { workspace = true } config = { workspace = true } -db-store = { path = "../db_store" } -rust_decimal = { workspace = true, features = ["maths"] } -rust_decimal_macros = { workspace = true } -file-store = { path = "../file_store" } futures = { workspace = true } futures-util = { workspace = true } helium-crypto = { workspace = true, features = ["sqlx-postgres"] } @@ -25,12 +21,14 @@ helium-proto = { workspace = true } hextree = { workspace = true } http = { workspace = true } http-serde = { workspace = true } +humantime-serde = { workspace = true } libflate = "1" metrics = { workspace = true } metrics-exporter-prometheus = { workspace = true } -poc-metrics = { path = "../metrics" } prost = { workspace = true } retainer = { workspace = true } +rust_decimal = { workspace = true, features = ["maths"] } +rust_decimal_macros = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } sqlx = { workspace = true } @@ -43,10 +41,12 @@ tower-http = { workspace = true } tracing = { workspace = true } tracing-subscriber = { workspace = true } triggered = { workspace = true } -task-manager = { path = "../task_manager" } -humantime-serde = { workspace = true } + custom-tracing = { path = "../custom_tracing", features = ["grpc"] } -solana = { path = "../solana" } +db-store = { path = "../db_store" } +file-store = { path = "../file_store" } +poc-metrics = { path = "../metrics" } +task-manager = { path = "../task_manager" } [dev-dependencies] rand = { workspace = true } From bc098d643c9bfdc0169ea340f090daf059af4ed3 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Mon, 5 May 2025 11:06:46 -0700 Subject: [PATCH 28/41] reorder cargo for iot-packet-verifier --- iot_packet_verifier/Cargo.toml | 23 ++++++++++++----------- iot_packet_verifier/src/pending.rs | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/iot_packet_verifier/Cargo.toml b/iot_packet_verifier/Cargo.toml index 3351eb533..50332d22c 100644 --- a/iot_packet_verifier/Cargo.toml +++ b/iot_packet_verifier/Cargo.toml @@ -9,34 +9,35 @@ license.workspace = true [dependencies] anyhow = { workspace = true } async-trait = { workspace = true } +chrono = { workspace = true } clap = { workspace = true } config = { workspace = true } -chrono = { workspace = true } -db-store = { path = "../db_store" } futures = { workspace = true } futures-util = { workspace = true } -file-store = { path = "../file_store" } -helium-proto = { workspace = true } helium-crypto = { workspace = true, features = [ "sqlx-postgres", "multisig", "solana", ] } -iot-config = { path = "../iot_config" } +helium-proto = { workspace = true } +http = { workspace = true } +http-serde = { workspace = true } +humantime-serde = { workspace = true } metrics = { workspace = true } -poc-metrics = { path = "../metrics" } prost = { workspace = true } serde = { workspace = true } sqlx = { workspace = true } -solana = { path = "../solana" } -task-manager = { path = "../task_manager" } thiserror = { workspace = true } tokio = { workspace = true } tonic = { workspace = true } tracing = { workspace = true } tracing-subscriber = { workspace = true } triggered = { workspace = true } -http = { workspace = true } -http-serde = { workspace = true } -humantime-serde = { workspace = true } + custom-tracing = { path = "../custom_tracing" } +db-store = { path = "../db_store" } +file-store = { path = "../file_store" } +iot-config = { path = "../iot_config" } +poc-metrics = { path = "../metrics" } +solana = { path = "../solana" } +task-manager = { path = "../task_manager" } diff --git a/iot_packet_verifier/src/pending.rs b/iot_packet_verifier/src/pending.rs index 67ded53ff..21e36cc0f 100644 --- a/iot_packet_verifier/src/pending.rs +++ b/iot_packet_verifier/src/pending.rs @@ -1,7 +1,7 @@ use async_trait::async_trait; use chrono::{DateTime, Duration, Utc}; use helium_crypto::PublicKeyBinary; -use solana::{burn::SolanaNetwork, re::solana_sdk::signature::Signature, SolanaRpcError}; +use solana::{burn::SolanaNetwork, Signature, SolanaRpcError}; use sqlx::{postgres::PgRow, FromRow, PgPool, Postgres, Row, Transaction}; use std::{collections::HashMap, sync::Arc}; use tokio::sync::Mutex; From 96e487bd8387aed3639a03d359b9282a0edd9617 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Mon, 5 May 2025 11:09:50 -0700 Subject: [PATCH 29/41] Cleanup imports for iot-verifier --- iot_verifier/Cargo.toml | 67 ++++++++++--------- iot_verifier/src/lib.rs | 6 +- iot_verifier/src/reward_share.rs | 2 +- iot_verifier/src/rewarder.rs | 4 +- iot_verifier/tests/integrations/common/mod.rs | 2 +- 5 files changed, 41 insertions(+), 40 deletions(-) diff --git a/iot_verifier/Cargo.toml b/iot_verifier/Cargo.toml index d0b429826..e7e3dd6ad 100644 --- a/iot_verifier/Cargo.toml +++ b/iot_verifier/Cargo.toml @@ -11,50 +11,51 @@ cmake = "0.1" [dependencies] anyhow = { workspace = true } -config = { workspace = true } +async-trait = { workspace = true } +base64 = { workspace = true } +beacon = { workspace = true } +blake3 = { workspace = true } +chrono = { workspace = true } clap = { workspace = true } -thiserror = { workspace = true } +config = { workspace = true } +futures = { workspace = true } +futures-util = { workspace = true } +h3o = { workspace = true, features = ["geo"] } +helium-crypto = { workspace = true, features = ["sqlx-postgres"] } +helium-proto = { workspace = true } +http-serde = { workspace = true } +humantime-serde = { workspace = true } +itertools = { workspace = true } +lazy_static = { workspace = true } +metrics = { workspace = true } +once_cell = { workspace = true } +prost = { workspace = true } +rand = { workspace = true } +retainer = { workspace = true } +rust_decimal = { workspace = true, features = ["maths"] } +rust_decimal_macros = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } -http-serde = { workspace = true } +sha2 = { workspace = true } sqlx = { workspace = true } +thiserror = { workspace = true } tokio = { workspace = true } +tokio-stream = { workspace = true } +tokio-util = { workspace = true } +tonic = { workspace = true } tracing = { workspace = true } tracing-subscriber = { workspace = true } -base64 = { workspace = true } -sha2 = { workspace = true } -tonic = { workspace = true } triggered = { workspace = true } -futures = { workspace = true } -futures-util = { workspace = true } -prost = { workspace = true } -chrono = { workspace = true } -helium-proto = { workspace = true } -helium-crypto = { workspace = true, features = ["sqlx-postgres"] } -async-trait = { workspace = true } -h3o = { workspace = true, features = ["geo"] } +twox-hash = { workspace = true } xorf = { workspace = true } -lazy_static = { workspace = true } -once_cell = { workspace = true } + +custom-tracing = { path = "../custom_tracing" } +db-store = { path = "../db_store" } +denylist = { path = "../denylist" } file-store = { path = "../file_store" } -metrics = { workspace = true } -retainer = { workspace = true } -blake3 = { workspace = true } iot-config = { path = "../iot_config" } poc-metrics = { path = "../metrics" } -db-store = { path = "../db_store" } -denylist = { path = "../denylist" } -reward-scheduler = { path = "../reward_scheduler" } -rust_decimal = { workspace = true, features = ["maths"] } -rust_decimal_macros = { workspace = true } -twox-hash = { workspace = true } -itertools = { workspace = true } -rand = { workspace = true } -beacon = { workspace = true } price = { path = "../price" } -tokio-util = { workspace = true } -tokio-stream = { workspace = true } -task-manager = { path = "../task_manager" } -humantime-serde = { workspace = true } -custom-tracing = { path = "../custom_tracing" } +reward-scheduler = { path = "../reward_scheduler" } solana = { path = "../solana" } +task-manager = { path = "../task_manager" } diff --git a/iot_verifier/src/lib.rs b/iot_verifier/src/lib.rs index 9a3f85624..30002ad63 100644 --- a/iot_verifier/src/lib.rs +++ b/iot_verifier/src/lib.rs @@ -23,7 +23,7 @@ pub mod witness_updater; use rust_decimal::Decimal; pub use settings::Settings; -use solana::re::helium_lib::keypair::Pubkey; +use solana::SolPubkey; #[derive(Clone, Debug)] pub struct PriceInfo { @@ -47,6 +47,6 @@ impl PriceInfo { } } -pub fn resolve_subdao_pubkey() -> Pubkey { - solana::re::helium_lib::dao::SubDao::Iot.key() +pub fn resolve_subdao_pubkey() -> SolPubkey { + solana::SubDao::Iot.key() } diff --git a/iot_verifier/src/reward_share.rs b/iot_verifier/src/reward_share.rs index 5fd1ea581..029ecd2fe 100644 --- a/iot_verifier/src/reward_share.rs +++ b/iot_verifier/src/reward_share.rs @@ -436,7 +436,7 @@ mod test { use crate::{reward_share, PriceInfo}; use chrono::Duration; use iot_config::sub_dao_epoch_reward_info::EpochRewardInfo; - use solana::re::helium_lib::token::Token; + use solana::Token; pub const EPOCH_ADDRESS: &str = "112E7TxoNHV46M6tiPA8N1MkeMeQxc9ztb4JQLXBVAAUfq1kJLoF"; pub const SUB_DAO_ADDRESS: &str = "112NqN2WWMwtK29PMzRby62fDydBJfsCLkCAf392stdok48ovNT6"; diff --git a/iot_verifier/src/rewarder.rs b/iot_verifier/src/rewarder.rs index 5dd286e3c..0530841a5 100644 --- a/iot_verifier/src/rewarder.rs +++ b/iot_verifier/src/rewarder.rs @@ -25,7 +25,7 @@ use price::PriceTracker; use reward_scheduler::Scheduler; use rust_decimal::prelude::*; use rust_decimal_macros::dec; -use solana::re::helium_lib::{keypair::Pubkey, token::Token}; +use solana::{SolPubkey, Token}; use sqlx::{PgExecutor, PgPool, Pool, Postgres}; use std::{ops::Range, time::Duration}; use task_manager::ManagedTask; @@ -34,7 +34,7 @@ use tokio::time::sleep; const REWARDS_NOT_CURRENT_DELAY_PERIOD: Duration = Duration::from_secs(5 * 60); pub struct Rewarder { - sub_dao: Pubkey, + sub_dao: SolPubkey, pub pool: Pool, pub rewards_sink: file_sink::FileSinkClient, pub reward_manifests_sink: file_sink::FileSinkClient, diff --git a/iot_verifier/tests/integrations/common/mod.rs b/iot_verifier/tests/integrations/common/mod.rs index 38f655c60..6de277511 100644 --- a/iot_verifier/tests/integrations/common/mod.rs +++ b/iot_verifier/tests/integrations/common/mod.rs @@ -31,7 +31,7 @@ use iot_config::sub_dao_epoch_reward_info::EpochRewardInfo; use prost::Message; use rust_decimal::Decimal; use rust_decimal_macros::dec; -use solana::re::helium_lib::token::Token; +use solana::Token; use sqlx::{PgPool, Postgres, Transaction}; use std::{self, ops::DerefMut, str::FromStr}; use tokio::{sync::mpsc::error::TryRecvError, sync::Mutex, time::timeout}; From 2176bbebe7b96c176c3a7fbd2ed67ad3ce811b9b Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Mon, 5 May 2025 11:13:24 -0700 Subject: [PATCH 30/41] update to SolPubkeyin mobile-config --- mobile_config/Cargo.toml | 21 ++++++++-------- mobile_config/src/boosted_hex_info.rs | 35 ++++++++++++++------------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/mobile_config/Cargo.toml b/mobile_config/Cargo.toml index e8dca56f1..77b5f2d4a 100644 --- a/mobile_config/Cargo.toml +++ b/mobile_config/Cargo.toml @@ -15,28 +15,25 @@ bs58 = { workspace = true } chrono = { workspace = true } clap = { workspace = true } config = { workspace = true } -db-store = { path = "../db_store" } -rust_decimal = { workspace = true } -rust_decimal_macros = { workspace = true } -file-store = { path = "../file_store" } futures = { workspace = true } futures-util = { workspace = true } helium-crypto = { workspace = true, features = ["sqlx-postgres"] } helium-proto = { workspace = true } -humantime = { workspace = true } -humantime-serde = { workspace = true } hextree = { workspace = true } http = { workspace = true } http-serde = { workspace = true } +humantime = { workspace = true } +humantime-serde = { workspace = true } lazy_static = { workspace = true } metrics = { workspace = true } metrics-exporter-prometheus = { workspace = true } -poc-metrics = { path = "../metrics" } prost = { workspace = true } +retainer = { workspace = true } +rust_decimal = { workspace = true } +rust_decimal_macros = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } sqlx = { workspace = true } -retainer = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true } tokio-stream = { workspace = true } @@ -46,10 +43,14 @@ tower-http = { workspace = true } tracing = { workspace = true } tracing-subscriber = { workspace = true } triggered = { workspace = true } -task-manager = { path = "../task_manager" } -custom-tracing = { path = "../custom_tracing", features = ["grpc"] } + coverage-map = { path = "../coverage_map" } +custom-tracing = { path = "../custom_tracing", features = ["grpc"] } +db-store = { path = "../db_store" } +file-store = { path = "../file_store" } +poc-metrics = { path = "../metrics" } solana = { path = "../solana" } +task-manager = { path = "../task_manager" } [dev-dependencies] rand = { workspace = true } diff --git a/mobile_config/src/boosted_hex_info.rs b/mobile_config/src/boosted_hex_info.rs index 7980a7443..baea5b5ab 100644 --- a/mobile_config/src/boosted_hex_info.rs +++ b/mobile_config/src/boosted_hex_info.rs @@ -4,7 +4,7 @@ use file_store::traits::TimestampDecode; use futures::stream::{BoxStream, StreamExt}; use helium_proto::BoostedHexInfoV1 as BoostedHexInfoProto; use hextree::Cell; -use solana::re::solana_sdk::pubkey::Pubkey; +use solana::SolPubkey; use std::{collections::HashMap, convert::TryFrom, num::NonZeroU32}; pub type BoostedHexInfoStream = BoxStream<'static, BoostedHexInfo>; @@ -20,8 +20,8 @@ pub struct BoostedHexInfo { pub end_ts: Option>, pub period_length: Duration, pub multipliers: Vec, - pub boosted_hex_pubkey: Pubkey, - pub boost_config_pubkey: Pubkey, + pub boosted_hex_pubkey: SolPubkey, + pub boost_config_pubkey: SolPubkey, pub version: u32, } @@ -37,8 +37,8 @@ impl TryFrom for BoostedHexInfo { .ok_or_else(|| anyhow::anyhow!("multipliers cannot contain values of 0"))?; let start_ts = to_start_ts(v.start_ts); let end_ts = to_end_ts(start_ts, period_length, multipliers.len()); - let boosted_hex_pubkey: Pubkey = Pubkey::try_from(v.boosted_hex_pubkey.as_slice())?; - let boost_config_pubkey: Pubkey = Pubkey::try_from(v.boost_config_pubkey.as_slice())?; + let boosted_hex_pubkey: SolPubkey = SolPubkey::try_from(v.boosted_hex_pubkey.as_slice())?; + let boost_config_pubkey: SolPubkey = SolPubkey::try_from(v.boost_config_pubkey.as_slice())?; Ok(Self { location: v.location.try_into()?, start_ts, @@ -172,7 +172,7 @@ pub(crate) mod db { use chrono::{DateTime, Duration, Utc}; use futures::stream::{Stream, StreamExt}; use hextree::Cell; - use solana::re::solana_sdk::pubkey::Pubkey; + use solana::SolPubkey; use sqlx::{PgExecutor, Row}; use std::num::NonZeroU32; use std::str::FromStr; @@ -239,10 +239,11 @@ pub(crate) mod db { })?; let end_ts = to_end_ts(start_ts, period_length, multipliers.len()); let boost_config_pubkey = - Pubkey::from_str(row.get::<&str, &str>("boost_config_pubkey")) + SolPubkey::from_str(row.get::<&str, &str>("boost_config_pubkey")) + .map_err(|e| sqlx::Error::Decode(Box::new(e)))?; + let boosted_hex_pubkey = + SolPubkey::from_str(row.get::<&str, &str>("boosted_hex_pubkey")) .map_err(|e| sqlx::Error::Decode(Box::new(e)))?; - let boosted_hex_pubkey = Pubkey::from_str(row.get::<&str, &str>("boosted_hex_pubkey")) - .map_err(|e| sqlx::Error::Decode(Box::new(e)))?; let version = row.get::("version") as u32; let location = Cell::try_from(row.get::("location")) @@ -296,11 +297,11 @@ mod tests { end_ts: 0, period_length: 2592000, multipliers: vec![2, 10, 15, 35], - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY) + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY) .unwrap() .to_bytes() .to_vec(), - boost_config_pubkey: Pubkey::from_str(BOOST_HEX_CONFIG_PUBKEY) + boost_config_pubkey: SolPubkey::from_str(BOOST_HEX_CONFIG_PUBKEY) .unwrap() .to_bytes() .to_vec(), @@ -318,11 +319,11 @@ mod tests { assert_eq!(15, msg.multipliers[2].get()); assert_eq!(35, msg.multipliers[3].get()); assert_eq!( - Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), msg.boosted_hex_pubkey ); assert_eq!( - Pubkey::from_str(BOOST_HEX_CONFIG_PUBKEY).unwrap(), + SolPubkey::from_str(BOOST_HEX_CONFIG_PUBKEY).unwrap(), msg.boost_config_pubkey ); assert_eq!(1, msg.version); @@ -337,11 +338,11 @@ mod tests { end_ts: 1720746000, period_length: 2592000, multipliers: vec![2, 10, 15, 35], - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY) + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY) .unwrap() .to_bytes() .to_vec(), - boost_config_pubkey: Pubkey::from_str(BOOST_HEX_CONFIG_PUBKEY) + boost_config_pubkey: SolPubkey::from_str(BOOST_HEX_CONFIG_PUBKEY) .unwrap() .to_bytes() .to_vec(), @@ -359,11 +360,11 @@ mod tests { assert_eq!(15, msg.multipliers[2].get()); assert_eq!(35, msg.multipliers[3].get()); assert_eq!( - Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), msg.boosted_hex_pubkey ); assert_eq!( - Pubkey::from_str(BOOST_HEX_CONFIG_PUBKEY).unwrap(), + SolPubkey::from_str(BOOST_HEX_CONFIG_PUBKEY).unwrap(), msg.boost_config_pubkey ); assert_eq!(1, msg.version); From aaa5e4c069b95615d96d25214014250923f9e81b Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Mon, 5 May 2025 13:39:01 -0700 Subject: [PATCH 31/41] Update to top level exports for mobile-verifier --- mobile_verifier/src/lib.rs | 4 +- mobile_verifier/src/reward_shares.rs | 2 +- mobile_verifier/src/rewarder.rs | 4 +- .../tests/integrations/common/mod.rs | 2 +- .../tests/integrations/hex_boosting.rs | 82 +++++++++---------- .../tests/integrations/modeled_coverage.rs | 14 ++-- 6 files changed, 54 insertions(+), 54 deletions(-) diff --git a/mobile_verifier/src/lib.rs b/mobile_verifier/src/lib.rs index 4b3cbd4a1..fa6052a23 100644 --- a/mobile_verifier/src/lib.rs +++ b/mobile_verifier/src/lib.rs @@ -23,7 +23,7 @@ pub use settings::Settings; use async_trait::async_trait; use mobile_config::client::ClientError; use rust_decimal::Decimal; -use solana::re::helium_lib::keypair::Pubkey; +use solana::SolPubkey; pub enum GatewayResolution { GatewayNotFound, @@ -113,6 +113,6 @@ impl PriceInfo { } } -pub fn resolve_subdao_pubkey() -> Pubkey { +pub fn resolve_subdao_pubkey() -> SolPubkey { solana::re::helium_lib::dao::SubDao::Mobile.key() } diff --git a/mobile_verifier/src/reward_shares.rs b/mobile_verifier/src/reward_shares.rs index 3be3d211b..5884d3656 100644 --- a/mobile_verifier/src/reward_shares.rs +++ b/mobile_verifier/src/reward_shares.rs @@ -703,7 +703,7 @@ mod test { }; use hextree::Cell; use prost::Message; - use solana::re::helium_lib::token::Token; + use solana::Token; use std::collections::HashMap; use uuid::Uuid; diff --git a/mobile_verifier/src/rewarder.rs b/mobile_verifier/src/rewarder.rs index 4e413d1ff..1a066815d 100644 --- a/mobile_verifier/src/rewarder.rs +++ b/mobile_verifier/src/rewarder.rs @@ -45,7 +45,7 @@ use mobile_config::{ use price::PriceTracker; use reward_scheduler::Scheduler; use rust_decimal::{prelude::*, Decimal}; -use solana::re::helium_lib::{keypair::Pubkey, token::Token}; +use solana::{SolPubkey, Token}; use sqlx::{PgExecutor, Pool, Postgres}; use std::{ops::Range, time::Duration}; use task_manager::{ManagedTask, TaskManager}; @@ -57,7 +57,7 @@ mod db; const REWARDS_NOT_CURRENT_DELAY_PERIOD: i64 = 5; pub struct Rewarder { - sub_dao: Pubkey, + sub_dao: SolPubkey, pool: Pool, carrier_client: A, hex_service_client: B, diff --git a/mobile_verifier/tests/integrations/common/mod.rs b/mobile_verifier/tests/integrations/common/mod.rs index c8f8167e7..07361afe8 100644 --- a/mobile_verifier/tests/integrations/common/mod.rs +++ b/mobile_verifier/tests/integrations/common/mod.rs @@ -23,7 +23,7 @@ use mobile_verifier::{ }; use rust_decimal::{prelude::ToPrimitive, Decimal}; use rust_decimal_macros::dec; -use solana::re::helium_lib::token::Token; +use solana::Token; use sqlx::PgPool; use std::{ collections::{HashMap, HashSet}, diff --git a/mobile_verifier/tests/integrations/hex_boosting.rs b/mobile_verifier/tests/integrations/hex_boosting.rs index 8448843d9..6095fa378 100644 --- a/mobile_verifier/tests/integrations/hex_boosting.rs +++ b/mobile_verifier/tests/integrations/hex_boosting.rs @@ -23,7 +23,7 @@ use mobile_verifier::{ }; use rust_decimal::prelude::*; use rust_decimal_macros::dec; -use solana::re::solana_sdk::pubkey::Pubkey; +use solana::SolPubkey; use sqlx::{PgPool, Postgres, Transaction}; use std::{num::NonZeroU32, str::FromStr}; use uuid::Uuid; @@ -102,8 +102,8 @@ async fn test_poc_with_boosted_hexes(pool: PgPool) -> anyhow::Result<()> { end_ts: Some(end_ts_1), period_length: boost_period_length, multipliers: multipliers1, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, BoostedHexInfo { @@ -113,8 +113,8 @@ async fn test_poc_with_boosted_hexes(pool: PgPool) -> anyhow::Result<()> { end_ts: Some(end_ts_2), period_length: boost_period_length, multipliers: multipliers2, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, BoostedHexInfo { @@ -124,8 +124,8 @@ async fn test_poc_with_boosted_hexes(pool: PgPool) -> anyhow::Result<()> { end_ts: None, period_length: boost_period_length, multipliers: multipliers3, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, ]; @@ -256,8 +256,8 @@ async fn test_poc_boosted_hexes_thresholds_not_met(pool: PgPool) -> anyhow::Resu end_ts: Some(end_ts_1), period_length: boost_period_length, multipliers: multipliers1, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, BoostedHexInfo { @@ -267,8 +267,8 @@ async fn test_poc_boosted_hexes_thresholds_not_met(pool: PgPool) -> anyhow::Resu end_ts: Some(end_ts_2), period_length: boost_period_length, multipliers: multipliers2, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, BoostedHexInfo { @@ -278,8 +278,8 @@ async fn test_poc_boosted_hexes_thresholds_not_met(pool: PgPool) -> anyhow::Resu end_ts: None, period_length: boost_period_length, multipliers: multipliers3, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, ]; @@ -379,8 +379,8 @@ async fn test_poc_with_multi_coverage_boosted_hexes(pool: PgPool) -> anyhow::Res end_ts: Some(end_ts_1), period_length: boost_period_length, multipliers: multipliers1.clone(), - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, BoostedHexInfo { @@ -390,8 +390,8 @@ async fn test_poc_with_multi_coverage_boosted_hexes(pool: PgPool) -> anyhow::Res end_ts: Some(end_ts_1), period_length: boost_period_length, multipliers: multipliers1, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, BoostedHexInfo { @@ -401,8 +401,8 @@ async fn test_poc_with_multi_coverage_boosted_hexes(pool: PgPool) -> anyhow::Res end_ts: Some(end_ts_2), period_length: boost_period_length, multipliers: multipliers2, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, BoostedHexInfo { @@ -412,8 +412,8 @@ async fn test_poc_with_multi_coverage_boosted_hexes(pool: PgPool) -> anyhow::Res end_ts: Some(end_ts_3), period_length: boost_period_length, multipliers: multipliers3, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, ]; @@ -541,8 +541,8 @@ async fn test_expired_boosted_hex(pool: PgPool) -> anyhow::Result<()> { end_ts: Some(end_ts_1), period_length: boost_period_length, multipliers: multipliers1, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, BoostedHexInfo { @@ -551,8 +551,8 @@ async fn test_expired_boosted_hex(pool: PgPool) -> anyhow::Result<()> { end_ts: Some(end_ts_2), period_length: boost_period_length, multipliers: multipliers2, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, ]; @@ -642,8 +642,8 @@ async fn test_reduced_location_score_with_boosted_hexes(pool: PgPool) -> anyhow: end_ts: Some(end_ts_1), period_length: boost_period_length, multipliers: multipliers1, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, BoostedHexInfo { @@ -653,8 +653,8 @@ async fn test_reduced_location_score_with_boosted_hexes(pool: PgPool) -> anyhow: end_ts: None, period_length: boost_period_length, multipliers: multipliers2, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, ]; @@ -781,8 +781,8 @@ async fn test_distance_from_asserted_removes_boosting_but_not_location_trust( end_ts: Some(end_ts_1), period_length: boost_period_length, multipliers: multipliers1, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, BoostedHexInfo { @@ -792,8 +792,8 @@ async fn test_distance_from_asserted_removes_boosting_but_not_location_trust( end_ts: None, period_length: boost_period_length, multipliers: multipliers2, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, ]; @@ -921,8 +921,8 @@ async fn test_poc_with_wifi_and_multi_coverage_boosted_hexes(pool: PgPool) -> an end_ts: Some(end_ts_1), period_length: boost_period_length, multipliers: multipliers1.clone(), - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, BoostedHexInfo { @@ -932,8 +932,8 @@ async fn test_poc_with_wifi_and_multi_coverage_boosted_hexes(pool: PgPool) -> an end_ts: Some(end_ts_1), period_length: boost_period_length, multipliers: multipliers1, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, BoostedHexInfo { @@ -943,8 +943,8 @@ async fn test_poc_with_wifi_and_multi_coverage_boosted_hexes(pool: PgPool) -> an end_ts: Some(end_ts_2), period_length: boost_period_length, multipliers: multipliers2, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, BoostedHexInfo { @@ -954,8 +954,8 @@ async fn test_poc_with_wifi_and_multi_coverage_boosted_hexes(pool: PgPool) -> an end_ts: Some(end_ts_3), period_length: boost_period_length, multipliers: multipliers3, - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, ]; diff --git a/mobile_verifier/tests/integrations/modeled_coverage.rs b/mobile_verifier/tests/integrations/modeled_coverage.rs index baa8bd232..b74819917 100644 --- a/mobile_verifier/tests/integrations/modeled_coverage.rs +++ b/mobile_verifier/tests/integrations/modeled_coverage.rs @@ -34,7 +34,7 @@ use mobile_verifier::{ IsAuthorized, }; use rust_decimal_macros::dec; -use solana::re::solana_sdk::pubkey::Pubkey; +use solana::SolPubkey; use sqlx::PgPool; use std::{collections::HashMap, num::NonZeroU32, ops::Range, pin::pin, str::FromStr}; use uuid::Uuid; @@ -770,8 +770,8 @@ async fn scenario_three(pool: PgPool) -> anyhow::Result<()> { end_ts: None, period_length: Duration::hours(1), multipliers: vec![NonZeroU32::new(1).unwrap()], - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, ); @@ -783,8 +783,8 @@ async fn scenario_three(pool: PgPool) -> anyhow::Result<()> { end_ts: None, period_length: Duration::hours(1), multipliers: vec![NonZeroU32::new(2).unwrap()], - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, ); @@ -796,8 +796,8 @@ async fn scenario_three(pool: PgPool) -> anyhow::Result<()> { end_ts: None, period_length: Duration::hours(1), multipliers: vec![NonZeroU32::new(3).unwrap()], - boosted_hex_pubkey: Pubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), - boost_config_pubkey: Pubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), + boosted_hex_pubkey: SolPubkey::from_str(BOOST_HEX_PUBKEY).unwrap(), + boost_config_pubkey: SolPubkey::from_str(BOOST_CONFIG_PUBKEY).unwrap(), version: 0, }, ); From 607085b501058c20e2dec240ea9c284513593ca4 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Mon, 5 May 2025 13:51:02 -0700 Subject: [PATCH 32/41] export SubDao as top level --- mobile_verifier/src/lib.rs | 2 +- price/src/price_generator.rs | 2 +- solana/src/burn.rs | 12 ++++++------ solana/src/carrier.rs | 6 +++--- solana/src/lib.rs | 26 +++++++++----------------- solana/src/main.rs | 7 ++++--- solana/src/start_boost.rs | 12 ++++++------ 7 files changed, 30 insertions(+), 37 deletions(-) diff --git a/mobile_verifier/src/lib.rs b/mobile_verifier/src/lib.rs index fa6052a23..523a17f20 100644 --- a/mobile_verifier/src/lib.rs +++ b/mobile_verifier/src/lib.rs @@ -114,5 +114,5 @@ impl PriceInfo { } pub fn resolve_subdao_pubkey() -> SolPubkey { - solana::re::helium_lib::dao::SubDao::Mobile.key() + solana::SubDao::Mobile.key() } diff --git a/price/src/price_generator.rs b/price/src/price_generator.rs index dde86e8d7..44d0f8920 100644 --- a/price/src/price_generator.rs +++ b/price/src/price_generator.rs @@ -195,7 +195,7 @@ impl PriceGenerator { } async fn get_pyth_price(&self) -> Result { - solana::re::helium_lib::token::price::get(self, self.token) + solana::token::price::get(self, self.token) .await .map_err(anyhow::Error::from) .and_then(|p| { diff --git a/solana/src/burn.rs b/solana/src/burn.rs index fa4786ec0..48b15b840 100644 --- a/solana/src/burn.rs +++ b/solana/src/burn.rs @@ -1,7 +1,11 @@ -use crate::re::{ +use crate::{send_with_retry, GetSignature, SolanaRpcError}; +use async_trait::async_trait; +use chrono::{DateTime, Utc}; +use helium_crypto::PublicKeyBinary; +use helium_lib::{ anchor_client::RequestBuilder, anchor_lang::{AccountDeserialize, ToAccountMetas}, - helium_lib::programs::{data_credits, helium_sub_daos}, + programs::{data_credits, helium_sub_daos}, solana_client::{ self, client_error::ClientError, nonblocking::rpc_client::RpcClient, rpc_response::Response, }, @@ -16,10 +20,6 @@ use crate::re::{ transaction::Transaction, }, }; -use crate::{send_with_retry, GetSignature, SolanaRpcError}; -use async_trait::async_trait; -use chrono::{DateTime, Utc}; -use helium_crypto::PublicKeyBinary; use itertools::Itertools; use serde::Deserialize; use sha2::{Digest, Sha256}; diff --git a/solana/src/carrier.rs b/solana/src/carrier.rs index 14f80f434..be75156ea 100644 --- a/solana/src/carrier.rs +++ b/solana/src/carrier.rs @@ -1,13 +1,13 @@ -use crate::re::{ +use crate::SolanaRpcError; +use helium_lib::{ anchor_lang::AccountDeserialize, - helium_lib::programs::{ + programs::{ helium_sub_daos, mobile_entity_manager::{self, accounts::CarrierV0}, }, solana_client::nonblocking::rpc_client::RpcClient, solana_sdk::{commitment_config::CommitmentConfig, pubkey::Pubkey}, }; -use crate::SolanaRpcError; use serde::Deserialize; pub struct SolanaRpc { diff --git a/solana/src/lib.rs b/solana/src/lib.rs index 10e07623d..fd5bf7a25 100644 --- a/solana/src/lib.rs +++ b/solana/src/lib.rs @@ -1,24 +1,16 @@ -use re::{ +use helium_lib::{ solana_client::client_error::ClientError, solana_sdk::{program_error, pubkey::ParsePubkeyError, signature, transaction::Transaction}, }; use std::time::SystemTimeError; -pub use re::helium_lib::token::Token; -pub use re::solana_client::nonblocking::rpc_client::RpcClient; -pub use re::solana_sdk::pubkey::Pubkey as SolPubkey; -pub use re::solana_sdk::signature::Signature; - pub use helium_lib; -pub mod re { - pub use helium_lib; - pub use helium_lib::anchor_client; - pub use helium_lib::anchor_lang; - pub use helium_lib::solana_client; - pub use helium_lib::solana_program; - pub use helium_lib::solana_sdk; -} +pub use helium_lib::dao::SubDao; +pub use helium_lib::solana_client::nonblocking::rpc_client::RpcClient; +pub use helium_lib::solana_sdk::pubkey::Pubkey as SolPubkey; +pub use helium_lib::solana_sdk::signature::Signature; +pub use helium_lib::token::{self, Token}; pub mod burn; pub mod carrier; @@ -50,7 +42,7 @@ pub enum SolanaRpcError { #[error("Solana rpc error: {0}")] RpcClientError(Box), #[error("Anchor error: {0}")] - AnchorError(Box), + AnchorError(Box), #[error("Solana program error: {0}")] ProgramError(#[from] program_error::ProgramError), #[error("Parse pubkey error: {0}")] @@ -70,8 +62,8 @@ pub enum SolanaRpcError { Test(String), } -impl From for SolanaRpcError { - fn from(err: re::anchor_lang::error::Error) -> Self { +impl From for SolanaRpcError { + fn from(err: helium_lib::anchor_lang::error::Error) -> Self { Self::AnchorError(Box::new(err)) } } diff --git a/solana/src/main.rs b/solana/src/main.rs index 11be4e3b5..8e8d84dcf 100644 --- a/solana/src/main.rs +++ b/solana/src/main.rs @@ -1,7 +1,8 @@ use clap::{Parser, ValueEnum}; use helium_crypto::{PublicKey, PublicKeyBinary}; +use helium_lib::programs::data_credits; use sha2::{Digest, Sha256}; -use solana::re::{helium_lib::programs::data_credits, solana_sdk::pubkey::Pubkey}; +use solana::SolPubkey; #[derive(Parser)] #[clap(about = "Look up the Delegated Data Credit account for a Helium router key")] @@ -19,7 +20,7 @@ enum Dnt { fn main() { let Cli { mode, payer } = Cli::parse(); - let sub_dao: Pubkey = match mode { + let sub_dao: SolPubkey = match mode { Dnt::Mobile => "Gm9xDCJawDEKDrrQW6haw94gABaYzQwCq4ZQU8h8bd22" .parse() .unwrap(), @@ -31,7 +32,7 @@ fn main() { let mut hasher = Sha256::new(); hasher.update(payer.to_string()); let sha_digest = hasher.finalize(); - let (ddc_key, _) = Pubkey::find_program_address( + let (ddc_key, _) = SolPubkey::find_program_address( &[ "delegated_data_credits".as_bytes(), sub_dao.as_ref(), diff --git a/solana/src/start_boost.rs b/solana/src/start_boost.rs index 5c62292e5..126e754e2 100644 --- a/solana/src/start_boost.rs +++ b/solana/src/start_boost.rs @@ -1,7 +1,10 @@ -use crate::re::anchor_client::RequestBuilder; -use crate::re::{ +use crate::{send_with_retry, GetSignature, SolanaRpcError}; +use async_trait::async_trait; +use file_store::hex_boost::BoostedHexActivation; +use helium_lib::{ + anchor_client::RequestBuilder, anchor_lang::{InstructionData, ToAccountMetas}, - helium_lib::programs::hexboosting, + programs::hexboosting, solana_client::nonblocking::rpc_client::RpcClient, solana_program::instruction::Instruction, solana_sdk::{ @@ -12,9 +15,6 @@ use crate::re::{ transaction::Transaction, }, }; -use crate::{send_with_retry, GetSignature, SolanaRpcError}; -use async_trait::async_trait; -use file_store::hex_boost::BoostedHexActivation; use serde::Deserialize; use std::sync::Arc; From a914f10caa4d51cf6cd8441cc5d81544cd27b8da Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Mon, 5 May 2025 13:53:29 -0700 Subject: [PATCH 33/41] merge imports for helium-lib --- solana/src/lib.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/solana/src/lib.rs b/solana/src/lib.rs index fd5bf7a25..e625902dd 100644 --- a/solana/src/lib.rs +++ b/solana/src/lib.rs @@ -4,13 +4,13 @@ use helium_lib::{ }; use std::time::SystemTimeError; -pub use helium_lib; - -pub use helium_lib::dao::SubDao; -pub use helium_lib::solana_client::nonblocking::rpc_client::RpcClient; -pub use helium_lib::solana_sdk::pubkey::Pubkey as SolPubkey; -pub use helium_lib::solana_sdk::signature::Signature; -pub use helium_lib::token::{self, Token}; +pub use helium_lib::{ + self, + dao::SubDao, + solana_client::nonblocking::rpc_client::RpcClient, + solana_sdk::{pubkey::Pubkey as SolPubkey, signature::Signature}, + token::{self, Token}, +}; pub mod burn; pub mod carrier; From 607adfb440f79b35c96d2636ff2fb96fdc1419ea Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Mon, 5 May 2025 13:58:30 -0700 Subject: [PATCH 34/41] format cargo.toml files --- mobile_packet_verifier/Cargo.toml | 25 ++++++----- mobile_verifier/Cargo.toml | 74 ++++++++++++++++--------------- 2 files changed, 51 insertions(+), 48 deletions(-) diff --git a/mobile_packet_verifier/Cargo.toml b/mobile_packet_verifier/Cargo.toml index 7c7077391..8dc256faa 100644 --- a/mobile_packet_verifier/Cargo.toml +++ b/mobile_packet_verifier/Cargo.toml @@ -9,38 +9,39 @@ license.workspace = true [dependencies] anyhow = { workspace = true } async-trait = { workspace = true } +chrono = { workspace = true } clap = { workspace = true } config = { workspace = true } -chrono = { workspace = true } -db-store = { path = "../db_store" } futures = { workspace = true } futures-util = { workspace = true } -file-store = { path = "../file_store" } -helium-proto = { workspace = true } helium-crypto = { workspace = true, features = [ "sqlx-postgres", "multisig", "solana", ] } +helium-proto = { workspace = true } +http = { workspace = true } +http-serde = { workspace = true } +humantime-serde = { workspace = true } metrics = { workspace = true } -poc-metrics = { path = "../metrics" } prost = { workspace = true } serde = { workspace = true } -sqlx = { workspace = true } +sha2 = { workspace = true } solana = { path = "../solana" } -mobile-config = { path = "../mobile_config" } -task-manager = { path = "../task_manager" } +sqlx = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true } tonic = { workspace = true } tracing = { workspace = true } tracing-subscriber = { workspace = true } triggered = { workspace = true } -http = { workspace = true } -http-serde = { workspace = true } -sha2 = { workspace = true } -humantime-serde = { workspace = true } + custom-tracing = { path = "../custom_tracing" } +db-store = { path = "../db_store" } +file-store = { path = "../file_store" } +mobile-config = { path = "../mobile_config" } +poc-metrics = { path = "../metrics" } +task-manager = { path = "../task_manager" } [dev-dependencies] reqwest = { workspace = true } diff --git a/mobile_verifier/Cargo.toml b/mobile_verifier/Cargo.toml index 8b2a61a22..4181e5d84 100644 --- a/mobile_verifier/Cargo.toml +++ b/mobile_verifier/Cargo.toml @@ -7,59 +7,61 @@ edition.workspace = true authors.workspace = true [dependencies] -anyhow = { workspace = true } async-compression = { version = "0", features = ["tokio", "gzip"] } -config = { workspace = true } -thiserror = { workspace = true } -serde = { workspace = true } -serde_json = { workspace = true } -h3o = { workspace = true, features = ["geo"] } -hextree = { workspace = true } -http-serde = { workspace = true } -clap = { workspace = true } -sqlx = { workspace = true } -tokio = { workspace = true } -tracing = { workspace = true } -tracing-subscriber = { workspace = true } +regex = "1" + +anyhow = { workspace = true } +async-trait = { workspace = true } base64 = { workspace = true } -sha2 = { workspace = true } -lazy_static = { workspace = true } chrono = { workspace = true } -triggered = { workspace = true } +clap = { workspace = true } +config = { workspace = true } +derive_builder = { workspace = true } flate2 = "1" futures = { workspace = true } futures-util = { workspace = true } -prost = { workspace = true } -once_cell = { workspace = true } -helium-proto = { workspace = true } +h3o = { workspace = true, features = ["geo"] } helium-crypto = { workspace = true, features = ["sqlx-postgres"] } +helium-proto = { workspace = true } +hextree = { workspace = true } +http-serde = { workspace = true } humantime = { workspace = true } -rust_decimal = { workspace = true } -rust_decimal_macros = { workspace = true } -tonic = { workspace = true } -tokio-stream = { workspace = true } -tokio-util = { workspace = true } +humantime-serde = { workspace = true } +lazy_static = { workspace = true } metrics = { workspace = true } metrics-exporter-prometheus = { workspace = true } -mobile-config = { path = "../mobile_config" } -file-store = { path = "../file_store" } -db-store = { path = "../db_store" } -poc-metrics = { path = "../metrics" } -reward-scheduler = { path = "../reward_scheduler" } +once_cell = { workspace = true } price = { path = "../price" } +prost = { workspace = true } rand = { workspace = true } -async-trait = { workspace = true } retainer = { workspace = true } +rust_decimal = { workspace = true } +rust_decimal_macros = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } +sha2 = { workspace = true } +sqlx = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true } +tokio-stream = { workspace = true } +tokio-util = { workspace = true } +tonic = { workspace = true } +tracing = { workspace = true } +tracing-subscriber = { workspace = true } +triggered = { workspace = true } uuid = { workspace = true } -task-manager = { path = "../task_manager" } -derive_builder = { workspace = true } -regex = "1" -humantime-serde = { workspace = true } + +coverage-map = { path = "../coverage_map" } +coverage-point-calculator = { path = "../coverage_point_calculator" } custom-tracing = { path = "../custom_tracing" } +db-store = { path = "../db_store" } +file-store = { path = "../file_store" } hex-assignments = { path = "../hex_assignments" } -coverage-point-calculator = { path = "../coverage_point_calculator" } -coverage-map = { path = "../coverage_map" } +mobile-config = { path = "../mobile_config" } +poc-metrics = { path = "../metrics" } +reward-scheduler = { path = "../reward_scheduler" } solana = { path = "../solana" } +task-manager = { path = "../task_manager" } [dev-dependencies] proptest = "1.5.0" From 567914a957001fb34bb8333a42f1805189712d6f Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Mon, 5 May 2025 14:09:17 -0700 Subject: [PATCH 35/41] use published xorf-generator --- Cargo.lock | 5 +++-- denylist/Cargo.toml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4199860e7..de186f5ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11682,9 +11682,10 @@ dependencies = [ [[package]] name = "xorf-generator" version = "0.7.0" +source = "git+https://github.com/helium/xorf-generator?branch=mj%2Fhelium-crypto-update#7a411c7cb9d6ea45da652da06137d26bca1c8a96" dependencies = [ "anyhow", - "base64 0.22.1", + "base64 0.21.7", "bincode", "bytes", "clap", @@ -11697,7 +11698,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "sha2 0.10.9", + "sha2 0.9.9", "thiserror 1.0.69", "twox-hash", "xorf", diff --git a/denylist/Cargo.toml b/denylist/Cargo.toml index 8606c5451..5057e80d0 100644 --- a/denylist/Cargo.toml +++ b/denylist/Cargo.toml @@ -21,6 +21,6 @@ serde = { workspace = true } serde_json = { workspace = true } config = { workspace = true } chrono = { workspace = true } -# xorf-generator = { git = "https://github.cmo/helium/xorf-generator", branch = "main" } -xorf-generator = { path = "../../xorf-generator" } humantime-serde = { workspace = true } + +xorf-generator = { git = "https://github.com/helium/xorf-generator", branch = "mj/helium-crypto-update" } From ce5d091fdce4bb749d8dc382e7720af38feff95c Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Tue, 6 May 2025 09:37:00 -0700 Subject: [PATCH 36/41] back to main branch for helium-lib and xorf-generator --- Cargo.lock | 4 ++-- denylist/Cargo.toml | 2 +- solana/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index de186f5ed..0f2c61dc0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3389,7 +3389,7 @@ dependencies = [ [[package]] name = "helium-lib" version = "0.1.1" -source = "git+https://github.com/helium/helium-wallet-rs?branch=mj%2Foracles-update#3115cad6f0626844287c32197aaecc93f3b14b2a" +source = "git+https://github.com/helium/helium-wallet-rs?branch=master#9bc55cf089ffff1b50b80b1fcb09536fb3f17c6d" dependencies = [ "anchor-client", "anchor-lang", @@ -11682,7 +11682,7 @@ dependencies = [ [[package]] name = "xorf-generator" version = "0.7.0" -source = "git+https://github.com/helium/xorf-generator?branch=mj%2Fhelium-crypto-update#7a411c7cb9d6ea45da652da06137d26bca1c8a96" +source = "git+https://github.com/helium/xorf-generator?branch=main#e6ff8ad88a8ce8247b5f923e13f06d04fa4ca3aa" dependencies = [ "anyhow", "base64 0.21.7", diff --git a/denylist/Cargo.toml b/denylist/Cargo.toml index 5057e80d0..9e3a19061 100644 --- a/denylist/Cargo.toml +++ b/denylist/Cargo.toml @@ -23,4 +23,4 @@ config = { workspace = true } chrono = { workspace = true } humantime-serde = { workspace = true } -xorf-generator = { git = "https://github.com/helium/xorf-generator", branch = "mj/helium-crypto-update" } +xorf-generator = { git = "https://github.com/helium/xorf-generator", branch = "main" } diff --git a/solana/Cargo.toml b/solana/Cargo.toml index 16a7eee18..1f2c8fa7b 100644 --- a/solana/Cargo.toml +++ b/solana/Cargo.toml @@ -24,4 +24,4 @@ tracing = { workspace = true } spl-token = { version = "8" } sqlx = { workspace = true } -helium-lib = { git = "https://github.com/helium/helium-wallet-rs", branch = "mj/oracles-update" } +helium-lib = { git = "https://github.com/helium/helium-wallet-rs", branch = "master" } From 739b15c90823dd9b7a73dd6d75060cb4e9b11099 Mon Sep 17 00:00:00 2001 From: jeffgrunewald Date: Tue, 13 May 2025 21:41:42 -0400 Subject: [PATCH 37/41] update sqlx to 0.8 --- Cargo.lock | 138 ++++++++++++-------------- Cargo.toml | 4 +- denylist/Cargo.toml | 2 +- mobile_config_cli/Cargo.toml | 2 +- mobile_verifier/src/heartbeats/mod.rs | 17 ++-- solana/Cargo.toml | 2 +- 6 files changed, 78 insertions(+), 87 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0f2c61dc0..0565e32ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -394,6 +394,16 @@ name = "angry-purple-tiger" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7556be6f2b0d82376c1ece1fda4dffd728816ac53bee2c285f3f74269ddc4a97" +dependencies = [ + "anyhow", + "clap", + "md5", +] + +[[package]] +name = "angry-purple-tiger" +version = "1.0.0" +source = "git+https://github.com/helium/angry-purple-tiger-rs?branch=jg%2Fsqlx-update#8abea877e573ad1a0160f909d02d08847ce1b8de" dependencies = [ "anyhow", "clap", @@ -2941,6 +2951,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -3310,7 +3326,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", - "allocator-api2", ] [[package]] @@ -3318,14 +3333,19 @@ name = "hashbrown" version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] [[package]] name = "hashlink" -version = "0.8.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.3", ] [[package]] @@ -3347,15 +3367,6 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "heck" version = "0.5.0" @@ -3365,8 +3376,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "helium-crypto" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "333dfb5467550fdd77fc6f419a725775ef909746250d3519138a2ddcb08a73d7" +source = "git+https://github.com/helium/helium-crypto-rs?branch=jg%2Fsqlx-update#5ac3d7da52c918da323acf5598cc63753be5dcec" dependencies = [ "base64 0.22.1", "bs58", @@ -3389,14 +3399,14 @@ dependencies = [ [[package]] name = "helium-lib" version = "0.1.1" -source = "git+https://github.com/helium/helium-wallet-rs?branch=master#9bc55cf089ffff1b50b80b1fcb09536fb3f17c6d" +source = "git+https://github.com/helium/helium-wallet-rs?branch=jg%2Fsqlx-update#e2179e4a7cd43410b37fea8f29d196e21329f633" dependencies = [ "anchor-client", "anchor-lang", "anchor-spl", - "angry-purple-tiger", + "angry-purple-tiger 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "async-trait", - "base64 0.21.7", + "base64 0.22.1", "bincode", "bytemuck", "chrono", @@ -4612,11 +4622,10 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.27.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ - "cc", "pkg-config", "vcpkg", ] @@ -4906,7 +4915,7 @@ dependencies = [ name = "mobile-config-cli" version = "0.1.0" dependencies = [ - "angry-purple-tiger", + "angry-purple-tiger 1.0.0 (git+https://github.com/helium/angry-purple-tiger-rs?branch=jg%2Fsqlx-update)", "anyhow", "base64 0.22.1", "clap", @@ -7174,6 +7183,9 @@ name = "smallvec" version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" +dependencies = [ + "serde", +] [[package]] name = "socket2" @@ -9860,21 +9872,11 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "sqlformat" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790" -dependencies = [ - "nom", - "unicode_categories", -] - [[package]] name = "sqlx" -version = "0.7.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" +checksum = "f3c3a85280daca669cfd3bcb68a337882a8bc57ec882f72c5d13a430613a738e" dependencies = [ "sqlx-core", "sqlx-macros", @@ -9885,71 +9887,65 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" +checksum = "f743f2a3cea30a58cd479013f75550e879009e3a02f616f18ca699335aa248c3" dependencies = [ - "ahash 0.8.11", - "atoi", - "byteorder", + "base64 0.22.1", "bytes", "chrono", "crc", "crossbeam-queue", "either", - "event-listener 2.5.3", - "futures-channel", + "event-listener 5.4.0", "futures-core", "futures-intrusive", "futures-io", "futures-util", + "hashbrown 0.15.3", "hashlink", - "hex", "indexmap 2.9.0", "log", "memchr", "once_cell", - "paste", "percent-encoding", "rust_decimal", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", + "rustls 0.23.26", "serde", "serde_json", "sha2 0.10.9", "smallvec", - "sqlformat", - "thiserror 1.0.69", + "thiserror 2.0.12", "tokio", "tokio-stream", "tracing", "url", "uuid", - "webpki-roots 0.25.4", + "webpki-roots 0.26.10", ] [[package]] name = "sqlx-macros" -version = "0.7.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +checksum = "7f4200e0fde19834956d4252347c12a083bdcb237d7a1a1446bffd8768417dce" dependencies = [ "proc-macro2", "quote", "sqlx-core", "sqlx-macros-core", - "syn 1.0.109", + "syn 2.0.101", ] [[package]] name = "sqlx-macros-core" -version = "0.7.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" +checksum = "882ceaa29cade31beca7129b6beeb05737f44f82dbe2a9806ecea5a7093d00b7" dependencies = [ "dotenvy", "either", - "heck 0.4.1", + "heck 0.5.0", "hex", "once_cell", "proc-macro2", @@ -9961,7 +9957,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 1.0.109", + "syn 2.0.101", "tempfile", "tokio", "url", @@ -9969,12 +9965,12 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" +checksum = "0afdd3aa7a629683c2d750c2df343025545087081ab5942593a5288855b1b7a7" dependencies = [ "atoi", - "base64 0.21.7", + "base64 0.22.1", "bitflags 2.9.0", "byteorder", "bytes", @@ -10006,7 +10002,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror 1.0.69", + "thiserror 2.0.12", "tracing", "uuid", "whoami", @@ -10014,12 +10010,12 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" +checksum = "a0bedbe1bbb5e2615ef347a5e9d8cd7680fb63e77d9dafc0f29be15e53f1ebe6" dependencies = [ "atoi", - "base64 0.21.7", + "base64 0.22.1", "bitflags 2.9.0", "byteorder", "chrono", @@ -10028,7 +10024,6 @@ dependencies = [ "etcetera", "futures-channel", "futures-core", - "futures-io", "futures-util", "hex", "hkdf", @@ -10047,7 +10042,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror 1.0.69", + "thiserror 2.0.12", "tracing", "uuid", "whoami", @@ -10055,9 +10050,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" +checksum = "c26083e9a520e8eb87a06b12347679b142dc2ea29e6e409f805644a7a979a5bc" dependencies = [ "atoi", "chrono", @@ -10071,10 +10066,11 @@ dependencies = [ "log", "percent-encoding", "serde", + "serde_urlencoded", "sqlx-core", + "thiserror 2.0.12", "tracing", "url", - "urlencoding", "uuid", ] @@ -10873,12 +10869,6 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - [[package]] name = "universal-hash" version = "0.5.1" @@ -11682,7 +11672,7 @@ dependencies = [ [[package]] name = "xorf-generator" version = "0.7.0" -source = "git+https://github.com/helium/xorf-generator?branch=main#e6ff8ad88a8ce8247b5f923e13f06d04fa4ca3aa" +source = "git+https://github.com/helium/xorf-generator?branch=jg%2Fsqlx-update#1b9442a35f65a66ddb79e12094da6256173672fe" dependencies = [ "anyhow", "base64 0.21.7", diff --git a/Cargo.toml b/Cargo.toml index f6be68309..1238f5ca5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,7 +54,7 @@ tokio = { version = "1", default-features = false, features = [ "time", ] } tokio-stream = "0" -sqlx = { version = "0.7", features = [ +sqlx = { version = "0.8", features = [ "postgres", "uuid", "rust_decimal", @@ -63,7 +63,7 @@ sqlx = { version = "0.7", features = [ "macros", "runtime-tokio-rustls", ] } -helium-crypto = { version = "0.9.0", features = ["multisig", "sqlx-postgres"] } +helium-crypto = { git = "https://github.com/helium/helium-crypto-rs", features = ["multisig", "sqlx-postgres"], branch = "jg/sqlx-update" } hextree = { git = "https://github.com/jaykickliter/HexTree", branch = "main", features = [ "disktree", ] } diff --git a/denylist/Cargo.toml b/denylist/Cargo.toml index 9e3a19061..e84354132 100644 --- a/denylist/Cargo.toml +++ b/denylist/Cargo.toml @@ -23,4 +23,4 @@ config = { workspace = true } chrono = { workspace = true } humantime-serde = { workspace = true } -xorf-generator = { git = "https://github.com/helium/xorf-generator", branch = "main" } +xorf-generator = { git = "https://github.com/helium/xorf-generator", branch = "jg/sqlx-update" } diff --git a/mobile_config_cli/Cargo.toml b/mobile_config_cli/Cargo.toml index 821c5d157..8f311555c 100644 --- a/mobile_config_cli/Cargo.toml +++ b/mobile_config_cli/Cargo.toml @@ -7,7 +7,7 @@ authors.workspace = true license.workspace = true [dependencies] -angry-purple-tiger = {version = "1", features = ["helium_crypto"]} +angry-purple-tiger = { git = "https://github.com/helium/angry-purple-tiger-rs", branch = "jg/sqlx-update", features = ["helium_crypto"] } anyhow = {workspace = true} base64 = {workspace = true} clap = {workspace = true, features = ["derive", "env"]} diff --git a/mobile_verifier/src/heartbeats/mod.rs b/mobile_verifier/src/heartbeats/mod.rs index 52099a49f..93e98db46 100644 --- a/mobile_verifier/src/heartbeats/mod.rs +++ b/mobile_verifier/src/heartbeats/mod.rs @@ -18,7 +18,10 @@ use helium_proto::services::poc_mobile::{self as proto, LocationSource}; use retainer::Cache; use rust_decimal::{prelude::ToPrimitive, Decimal}; use rust_decimal_macros::dec; -use sqlx::{postgres::PgTypeInfo, Decode, Encode, Postgres, Transaction, Type}; +use sqlx::{ + postgres::{PgArgumentBuffer, PgTypeInfo, PgValueRef}, + Decode, Encode, Postgres, Transaction, Type, +}; use std::{ops::Range, pin::pin, time}; use uuid::Uuid; @@ -82,8 +85,8 @@ impl Type for KeyType<'_> { impl<'a> Encode<'a, Postgres> for KeyType<'a> { fn encode_by_ref( &self, - buf: &mut >::ArgumentBuffer, - ) -> sqlx::encode::IsNull { + buf: &mut PgArgumentBuffer, + ) -> Result { match self { Self::Wifi(wifi) => wifi.encode_by_ref(buf), } @@ -126,8 +129,8 @@ impl Type for OwnedKeyType { impl<'a> Encode<'a, Postgres> for OwnedKeyType { fn encode_by_ref( &self, - buf: &mut >::ArgumentBuffer, - ) -> sqlx::encode::IsNull { + buf: &mut PgArgumentBuffer, + ) -> Result { match self { Self::Wifi(wifi) => wifi.encode_by_ref(buf), } @@ -135,9 +138,7 @@ impl<'a> Encode<'a, Postgres> for OwnedKeyType { } impl<'r> Decode<'r, Postgres> for OwnedKeyType { - fn decode( - value: >::ValueRef, - ) -> Result { + fn decode(value: PgValueRef<'r>) -> Result { let text = <&str as Decode>::decode(value)?; // Try decoding to a public key binary match text.parse() { diff --git a/solana/Cargo.toml b/solana/Cargo.toml index 1f2c8fa7b..9daea520d 100644 --- a/solana/Cargo.toml +++ b/solana/Cargo.toml @@ -24,4 +24,4 @@ tracing = { workspace = true } spl-token = { version = "8" } sqlx = { workspace = true } -helium-lib = { git = "https://github.com/helium/helium-wallet-rs", branch = "master" } +helium-lib = { git = "https://github.com/helium/helium-wallet-rs", branch = "jg/sqlx-update" } From 3fbf7f6d7a5fa105bd9fe9bc2fd373fafcdf5f16 Mon Sep 17 00:00:00 2001 From: jeffgrunewald Date: Tue, 13 May 2025 22:10:50 -0400 Subject: [PATCH 38/41] disable default sqlx features --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 1238f5ca5..5f09fc646 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,7 +54,7 @@ tokio = { version = "1", default-features = false, features = [ "time", ] } tokio-stream = "0" -sqlx = { version = "0.8", features = [ +sqlx = { version = "0.8", default-features = false, features = [ "postgres", "uuid", "rust_decimal", From 28cbc121e6fcd64b1dee3d3b78771f3cfcbe6710 Mon Sep 17 00:00:00 2001 From: jeffgrunewald Date: Fri, 16 May 2025 12:16:16 -0400 Subject: [PATCH 39/41] roll back majority of branch deps from helium-crypto --- Cargo.lock | 27 +++++++++------------------ Cargo.toml | 2 +- denylist/Cargo.toml | 2 +- file_store/Cargo.toml | 2 +- mobile_config_cli/Cargo.toml | 2 +- 5 files changed, 13 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0565e32ae..23854c4ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -394,16 +394,6 @@ name = "angry-purple-tiger" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7556be6f2b0d82376c1ece1fda4dffd728816ac53bee2c285f3f74269ddc4a97" -dependencies = [ - "anyhow", - "clap", - "md5", -] - -[[package]] -name = "angry-purple-tiger" -version = "1.0.0" -source = "git+https://github.com/helium/angry-purple-tiger-rs?branch=jg%2Fsqlx-update#8abea877e573ad1a0160f909d02d08847ce1b8de" dependencies = [ "anyhow", "clap", @@ -3375,8 +3365,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "helium-crypto" -version = "0.9.0" -source = "git+https://github.com/helium/helium-crypto-rs?branch=jg%2Fsqlx-update#5ac3d7da52c918da323acf5598cc63753be5dcec" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688f69ca15100f29ce9ab8ee7c5701afeabf8c8b003b0b85b06249159ffc953b" dependencies = [ "base64 0.22.1", "bs58", @@ -3399,12 +3390,12 @@ dependencies = [ [[package]] name = "helium-lib" version = "0.1.1" -source = "git+https://github.com/helium/helium-wallet-rs?branch=jg%2Fsqlx-update#e2179e4a7cd43410b37fea8f29d196e21329f633" +source = "git+https://github.com/helium/helium-wallet-rs?branch=jg%2Fsqlx-update#610a26a37d164b9865ff68a9adf6d84f1488b8eb" dependencies = [ "anchor-client", "anchor-lang", "anchor-spl", - "angry-purple-tiger 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "angry-purple-tiger", "async-trait", "base64 0.22.1", "bincode", @@ -4915,7 +4906,7 @@ dependencies = [ name = "mobile-config-cli" version = "0.1.0" dependencies = [ - "angry-purple-tiger 1.0.0 (git+https://github.com/helium/angry-purple-tiger-rs?branch=jg%2Fsqlx-update)", + "angry-purple-tiger", "anyhow", "base64 0.22.1", "clap", @@ -11672,10 +11663,10 @@ dependencies = [ [[package]] name = "xorf-generator" version = "0.7.0" -source = "git+https://github.com/helium/xorf-generator?branch=jg%2Fsqlx-update#1b9442a35f65a66ddb79e12094da6256173672fe" +source = "git+https://github.com/helium/xorf-generator?branch=main#62ec7a28230d45c55613380289f8a6d9d594d046" dependencies = [ "anyhow", - "base64 0.21.7", + "base64 0.22.1", "bincode", "bytes", "clap", @@ -11688,7 +11679,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "sha2 0.9.9", + "sha2 0.10.9", "thiserror 1.0.69", "twox-hash", "xorf", diff --git a/Cargo.toml b/Cargo.toml index 5f09fc646..fecdf7788 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,7 +63,7 @@ sqlx = { version = "0.8", default-features = false, features = [ "macros", "runtime-tokio-rustls", ] } -helium-crypto = { git = "https://github.com/helium/helium-crypto-rs", features = ["multisig", "sqlx-postgres"], branch = "jg/sqlx-update" } +helium-crypto = { version = "0.9.2", features = ["multisig", "sqlx-postgres"] } hextree = { git = "https://github.com/jaykickliter/HexTree", branch = "main", features = [ "disktree", ] } diff --git a/denylist/Cargo.toml b/denylist/Cargo.toml index e84354132..9e3a19061 100644 --- a/denylist/Cargo.toml +++ b/denylist/Cargo.toml @@ -23,4 +23,4 @@ config = { workspace = true } chrono = { workspace = true } humantime-serde = { workspace = true } -xorf-generator = { git = "https://github.com/helium/xorf-generator", branch = "jg/sqlx-update" } +xorf-generator = { git = "https://github.com/helium/xorf-generator", branch = "main" } diff --git a/file_store/Cargo.toml b/file_store/Cargo.toml index f5ffbef93..74f99de33 100644 --- a/file_store/Cargo.toml +++ b/file_store/Cargo.toml @@ -58,4 +58,4 @@ tempfile = "3" [features] default = ["sqlx-postgres"] local = ["aws-types"] -sqlx-postgres = ["sqlx"] +sqlx-postgres = ["sqlx/postgres"] diff --git a/mobile_config_cli/Cargo.toml b/mobile_config_cli/Cargo.toml index 8f311555c..fa9d5f4bf 100644 --- a/mobile_config_cli/Cargo.toml +++ b/mobile_config_cli/Cargo.toml @@ -7,7 +7,7 @@ authors.workspace = true license.workspace = true [dependencies] -angry-purple-tiger = { git = "https://github.com/helium/angry-purple-tiger-rs", branch = "jg/sqlx-update", features = ["helium_crypto"] } +angry-purple-tiger = { version = "1", features = ["helium_crypto"] } anyhow = {workspace = true} base64 = {workspace = true} clap = {workspace = true, features = ["derive", "env"]} From 483b1bc9b11c2f41a33080b3cd65d39026f11e91 Mon Sep 17 00:00:00 2001 From: jeffgrunewald Date: Fri, 16 May 2025 12:57:52 -0400 Subject: [PATCH 40/41] restore helium-lib to main branch --- Cargo.lock | 2 +- solana/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 23854c4ff..da2a653aa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3390,7 +3390,7 @@ dependencies = [ [[package]] name = "helium-lib" version = "0.1.1" -source = "git+https://github.com/helium/helium-wallet-rs?branch=jg%2Fsqlx-update#610a26a37d164b9865ff68a9adf6d84f1488b8eb" +source = "git+https://github.com/helium/helium-wallet-rs?branch=master#82cf951e3fd552c72ad6ab3622658649cd17f50c" dependencies = [ "anchor-client", "anchor-lang", diff --git a/solana/Cargo.toml b/solana/Cargo.toml index 9daea520d..1f2c8fa7b 100644 --- a/solana/Cargo.toml +++ b/solana/Cargo.toml @@ -24,4 +24,4 @@ tracing = { workspace = true } spl-token = { version = "8" } sqlx = { workspace = true } -helium-lib = { git = "https://github.com/helium/helium-wallet-rs", branch = "jg/sqlx-update" } +helium-lib = { git = "https://github.com/helium/helium-wallet-rs", branch = "master" } From b3b88a6b7abd855f15b86c4e54c9ee0be058d534 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Wed, 21 May 2025 09:43:09 -0700 Subject: [PATCH 41/41] clippy remove unused lifetimes for sqlx@0.8 update --- mobile_verifier/src/heartbeats/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile_verifier/src/heartbeats/mod.rs b/mobile_verifier/src/heartbeats/mod.rs index 93e98db46..146af32a3 100644 --- a/mobile_verifier/src/heartbeats/mod.rs +++ b/mobile_verifier/src/heartbeats/mod.rs @@ -126,7 +126,7 @@ impl Type for OwnedKeyType { } } -impl<'a> Encode<'a, Postgres> for OwnedKeyType { +impl Encode<'_, Postgres> for OwnedKeyType { fn encode_by_ref( &self, buf: &mut PgArgumentBuffer,