From 5322f0ef9fb320d870085bd9c1c005346c8884ad Mon Sep 17 00:00:00 2001 From: Filip Lelek Date: Wed, 11 Sep 2024 14:11:03 +0200 Subject: [PATCH 01/10] Add endpoint to get the timestamp of the last client auto allocation --- Cargo.lock | 71 +++++++++++++++++++ fplus-database/Cargo.toml | 6 +- .../src/database/autoallocations.rs | 17 +++++ fplus-database/src/database/mod.rs | 1 + fplus-database/src/models/autoallocations.rs | 41 +++++++++++ fplus-database/src/models/mod.rs | 1 + fplus-http-server/src/main.rs | 1 + fplus-http-server/src/router/autoallocator.rs | 15 ++++ fplus-http-server/src/router/mod.rs | 1 + fplus-lib/src/core/autoallocator/file.rs | 10 +++ fplus-lib/src/core/autoallocator/mod.rs | 14 ++++ fplus-lib/src/core/mod.rs | 6 ++ manual-migrations/2024-08-30.sql | 6 ++ 13 files changed, 189 insertions(+), 1 deletion(-) create mode 100644 fplus-database/src/database/autoallocations.rs create mode 100644 fplus-database/src/models/autoallocations.rs create mode 100644 fplus-http-server/src/router/autoallocator.rs create mode 100644 fplus-lib/src/core/autoallocator/file.rs create mode 100644 fplus-lib/src/core/autoallocator/mod.rs create mode 100644 manual-migrations/2024-08-30.sql diff --git a/Cargo.lock b/Cargo.lock index 5ec293f7..f7f3d0ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1724,6 +1724,41 @@ dependencies = [ "typenum", ] +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.66", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.66", +] + [[package]] name = "dashmap" version = "5.5.3" @@ -2030,6 +2065,7 @@ dependencies = [ name = "fplus-database" version = "1.8.4" dependencies = [ + "alloy", "anyhow", "chrono", "dotenv", @@ -2038,6 +2074,7 @@ dependencies = [ "log", "once_cell", "sea-orm", + "sea-orm-newtype", "serde", "serde_json", "serial_test", @@ -2770,6 +2807,12 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "1.0.0" @@ -4367,6 +4410,28 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sea-orm-newtype" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f702fe98ba95b4dcdd8a800867a77005dc63ea96f9a29219d5ae5dbabb45c2" +dependencies = [ + "sea-orm", + "sea-orm-newtype-derive", +] + +[[package]] +name = "sea-orm-newtype-derive" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acf9f6f47c879ab2d2a59e2b2eab4e2d992e3e48539012414dcda0650fa3e6ca" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "sea-query" version = "0.30.7" @@ -4962,6 +5027,12 @@ dependencies = [ "unicode-properties", ] +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "strum" version = "0.25.0" diff --git a/fplus-database/Cargo.toml b/fplus-database/Cargo.toml index 4f84da8b..a8341364 100644 --- a/fplus-database/Cargo.toml +++ b/fplus-database/Cargo.toml @@ -23,4 +23,8 @@ serde = { version = "1.0.164", features = ["derive", "std", "serde_derive", "alloc", "rc"] } serial_test = "3.0.0" sha1 = "0.10.6" -serde_json = "1.0.96" \ No newline at end of file +serde_json = "1.0.96" +alloy = { git = "https://github.com/alloy-rs/alloy", version = "0.1.0", features = [ + "signers", +] } +sea-orm-newtype = "0.0.1" diff --git a/fplus-database/src/database/autoallocations.rs b/fplus-database/src/database/autoallocations.rs new file mode 100644 index 00000000..594437f0 --- /dev/null +++ b/fplus-database/src/database/autoallocations.rs @@ -0,0 +1,17 @@ +use crate::get_database_connection; +use crate::models::autoallocations::AddressWrapper; +use crate::models::autoallocations::{Column, Entity as Autoallocation}; +use chrono::{DateTime, FixedOffset}; +use sea_orm::{entity::*, query::*, DbErr}; + +pub async fn get_last_calient_autoallocation( + client_evm_address: impl Into, +) -> Result, DbErr> { + let conn = get_database_connection().await?; + let result = Autoallocation::find() + .filter(Column::EvmWalletAddress.contains(client_evm_address.into())) + .one(&conn) + .await? + .ok_or_else(|| DbErr::Custom("Autoallocation not found.".to_string())); + Ok(result?.last_allocation) +} diff --git a/fplus-database/src/database/mod.rs b/fplus-database/src/database/mod.rs index 3a46bf79..e1b4aba1 100644 --- a/fplus-database/src/database/mod.rs +++ b/fplus-database/src/database/mod.rs @@ -1,3 +1,4 @@ pub mod allocation_amounts; pub mod allocators; pub mod applications; +pub mod autoallocations; diff --git a/fplus-database/src/models/autoallocations.rs b/fplus-database/src/models/autoallocations.rs new file mode 100644 index 00000000..39dd2d4a --- /dev/null +++ b/fplus-database/src/models/autoallocations.rs @@ -0,0 +1,41 @@ +use alloy::primitives::{Address, AddressError}; +use chrono::{DateTime, FixedOffset}; +use sea_orm::entity::prelude::*; +use sea_orm_newtype::DeriveNewType; +use serde::{Deserialize, Serialize}; + +#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] +#[sea_orm(table_name = "autoallocations")] +pub struct Model { + #[sea_orm(primary_key, auto_increment = false)] + pub evm_wallet_address: AddressWrapper, + pub last_allocation: DateTime, +} + +#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] +pub enum Relation {} + +impl ActiveModelBehavior for ActiveModel {} + +#[derive(Clone, Debug, PartialEq, DeriveNewType, Eq, Serialize, Deserialize)] +#[sea_orm_newtype(try_from_into = "String", primary_key)] +pub struct AddressWrapper(pub Address); + +impl TryFrom for AddressWrapper { + type Error = AddressError; + fn try_from(value: String) -> Result { + Ok(AddressWrapper(Address::parse_checksummed(value, None)?)) + } +} + +impl From for String { + fn from(value: AddressWrapper) -> Self { + value.0.to_checksum(None) + } +} + +impl From
for AddressWrapper { + fn from(value: Address) -> Self { + AddressWrapper(value) + } +} diff --git a/fplus-database/src/models/mod.rs b/fplus-database/src/models/mod.rs index 250d09b6..97efdb54 100644 --- a/fplus-database/src/models/mod.rs +++ b/fplus-database/src/models/mod.rs @@ -5,3 +5,4 @@ pub mod prelude; pub mod allocation_amounts; pub mod allocators; pub mod applications; +pub mod autoallocations; diff --git a/fplus-http-server/src/main.rs b/fplus-http-server/src/main.rs index 212c3805..8e27c52b 100644 --- a/fplus-http-server/src/main.rs +++ b/fplus-http-server/src/main.rs @@ -108,6 +108,7 @@ async fn main() -> std::io::Result<()> { .service(router::allocator::delete) .service(router::allocator::create_allocator_from_json) .service(router::allocator::update_allocator_force) + .service(router::autoallocator::last_client_allocation) // .service(router::allocator::get_installation_ids) }) .bind(("0.0.0.0", 8080))? diff --git a/fplus-http-server/src/router/autoallocator.rs b/fplus-http-server/src/router/autoallocator.rs new file mode 100644 index 00000000..df1bcb4f --- /dev/null +++ b/fplus-http-server/src/router/autoallocator.rs @@ -0,0 +1,15 @@ +use actix_web::{get, web, HttpResponse, Responder}; +use fplus_database::database::autoallocations as autoallocations_db; +use fplus_lib::core::LastAutoallocationQueryParams; + +#[get("/autoallocator/last_client_allocation")] +pub async fn last_client_allocation( + query: web::Query, +) -> impl Responder { + match autoallocations_db::get_last_calient_autoallocation(query.evm_wallet_address).await { + Ok(last_client_allocation) => { + HttpResponse::Ok().body(serde_json::to_string_pretty(&last_client_allocation).unwrap()) + } + Err(e) => HttpResponse::BadRequest().body(e.to_string()), + } +} diff --git a/fplus-http-server/src/router/mod.rs b/fplus-http-server/src/router/mod.rs index bc656d36..18f706d4 100644 --- a/fplus-http-server/src/router/mod.rs +++ b/fplus-http-server/src/router/mod.rs @@ -2,6 +2,7 @@ use actix_web::{get, HttpResponse, Responder}; pub mod allocator; pub mod application; +pub mod autoallocator; pub mod blockchain; pub mod verifier; diff --git a/fplus-lib/src/core/autoallocator/file.rs b/fplus-lib/src/core/autoallocator/file.rs new file mode 100644 index 00000000..5a70e247 --- /dev/null +++ b/fplus-lib/src/core/autoallocator/file.rs @@ -0,0 +1,10 @@ +use alloy::primitives::Address; +use serde::{Deserialize, Serialize}; + +#[derive(Serialize, Deserialize, Debug, Clone)] +pub struct Autoallocation { + #[serde(rename = "EVM Wallet Address")] + pub evm_wallet_address: Address, + #[serde(rename = "Last Allocation")] + pub last_allocation: String, +} diff --git a/fplus-lib/src/core/autoallocator/mod.rs b/fplus-lib/src/core/autoallocator/mod.rs new file mode 100644 index 00000000..f3369949 --- /dev/null +++ b/fplus-lib/src/core/autoallocator/mod.rs @@ -0,0 +1,14 @@ +use self::file::Autoallocation; +use alloy::primitives::Address; +use chrono::Utc; + +pub mod file; + +impl Autoallocation { + pub fn new(evm_wallet_address: Address) -> Self { + Self { + evm_wallet_address, + last_allocation: Utc::now().to_string(), + } + } +} diff --git a/fplus-lib/src/core/mod.rs b/fplus-lib/src/core/mod.rs index 6a46c623..d93301cf 100644 --- a/fplus-lib/src/core/mod.rs +++ b/fplus-lib/src/core/mod.rs @@ -48,6 +48,7 @@ use std::collections::HashSet; pub mod allocator; pub mod application; +pub mod autoallocator; #[derive(Deserialize)] pub struct CreateApplicationInfo { @@ -163,6 +164,11 @@ pub struct AllocatorUpdateForceInfo { pub allocators: Option>, } +#[derive(Deserialize, Debug)] +pub struct LastAutoallocationQueryParams { + pub evm_wallet_address: Address, +} + #[derive(Deserialize)] pub struct GithubQueryParams { pub owner: String, diff --git a/manual-migrations/2024-08-30.sql b/manual-migrations/2024-08-30.sql new file mode 100644 index 00000000..efe48e2d --- /dev/null +++ b/manual-migrations/2024-08-30.sql @@ -0,0 +1,6 @@ +CREATE TABLE autoallocations +( + evm_wallet_address character varying(42) NOT NULL, + last_allocation timestamp with time zone NOT NULL, + PRIMARY KEY (evm_wallet_address) +); \ No newline at end of file From 97819643f441540112df44b8554b081e0192de22 Mon Sep 17 00:00:00 2001 From: Filip Lelek Date: Wed, 11 Sep 2024 16:29:17 +0200 Subject: [PATCH 02/10] Changes accoridng to CR --- fplus-database/src/database/autoallocations.rs | 12 ++++++------ fplus-http-server/src/router/autoallocator.rs | 2 +- fplus-lib/src/core/autoallocator/file.rs | 2 -- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/fplus-database/src/database/autoallocations.rs b/fplus-database/src/database/autoallocations.rs index 594437f0..d296e9de 100644 --- a/fplus-database/src/database/autoallocations.rs +++ b/fplus-database/src/database/autoallocations.rs @@ -4,14 +4,14 @@ use crate::models::autoallocations::{Column, Entity as Autoallocation}; use chrono::{DateTime, FixedOffset}; use sea_orm::{entity::*, query::*, DbErr}; -pub async fn get_last_calient_autoallocation( +pub async fn get_last_client_autoallocation( client_evm_address: impl Into, -) -> Result, DbErr> { +) -> Result>, DbErr> { let conn = get_database_connection().await?; - let result = Autoallocation::find() + let response = Autoallocation::find() .filter(Column::EvmWalletAddress.contains(client_evm_address.into())) .one(&conn) - .await? - .ok_or_else(|| DbErr::Custom("Autoallocation not found.".to_string())); - Ok(result?.last_allocation) + .await?; + + Ok(response.map(|allocation| allocation.last_allocation)) } diff --git a/fplus-http-server/src/router/autoallocator.rs b/fplus-http-server/src/router/autoallocator.rs index df1bcb4f..22a3ed87 100644 --- a/fplus-http-server/src/router/autoallocator.rs +++ b/fplus-http-server/src/router/autoallocator.rs @@ -6,7 +6,7 @@ use fplus_lib::core::LastAutoallocationQueryParams; pub async fn last_client_allocation( query: web::Query, ) -> impl Responder { - match autoallocations_db::get_last_calient_autoallocation(query.evm_wallet_address).await { + match autoallocations_db::get_last_client_autoallocation(query.evm_wallet_address).await { Ok(last_client_allocation) => { HttpResponse::Ok().body(serde_json::to_string_pretty(&last_client_allocation).unwrap()) } diff --git a/fplus-lib/src/core/autoallocator/file.rs b/fplus-lib/src/core/autoallocator/file.rs index 5a70e247..015adce8 100644 --- a/fplus-lib/src/core/autoallocator/file.rs +++ b/fplus-lib/src/core/autoallocator/file.rs @@ -3,8 +3,6 @@ use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize, Debug, Clone)] pub struct Autoallocation { - #[serde(rename = "EVM Wallet Address")] pub evm_wallet_address: Address, - #[serde(rename = "Last Allocation")] pub last_allocation: String, } From 22f0479da7f467f034645301bad52aa1b8fa23fc Mon Sep 17 00:00:00 2001 From: Filip Lelek Date: Mon, 16 Sep 2024 17:23:48 +0200 Subject: [PATCH 03/10] Add trigger_autoallocation endpoint --- Cargo.lock | 3492 +++++++++++++---- fplus-database/Cargo.toml | 2 +- fplus-database/src/database/applications.rs | 11 + .../src/database/autoallocations.rs | 24 +- fplus-http-server/Cargo.toml | 3 - fplus-http-server/src/main.rs | 1 + fplus-http-server/src/router/autoallocator.rs | 13 +- fplus-lib/Cargo.toml | 14 +- fplus-lib/src/config.rs | 11 + .../core/application/gitcoin_interaction.rs | 37 +- fplus-lib/src/core/autoallocator/file.rs | 8 - .../metaallocator_interaction.rs | 69 + fplus-lib/src/core/autoallocator/mod.rs | 72 +- fplus-lib/src/core/mod.rs | 45 +- 14 files changed, 2918 insertions(+), 884 deletions(-) delete mode 100644 fplus-lib/src/core/autoallocator/file.rs create mode 100644 fplus-lib/src/core/autoallocator/metaallocator_interaction.rs diff --git a/Cargo.lock b/Cargo.lock index f7f3d0ee..bef634f2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -27,7 +27,7 @@ checksum = "0346d8c1f762b41b458ed3145eea914966bb9ad20b9be0d6d463b20d45586370" dependencies = [ "actix-utils", "actix-web", - "derive_more", + "derive_more 0.99.17", "futures-util", "log", "once_cell", @@ -50,7 +50,7 @@ dependencies = [ "brotli", "bytes", "bytestring", - "derive_more", + "derive_more 0.99.17", "encoding_rs", "flate2", "futures-core", @@ -167,7 +167,7 @@ dependencies = [ "bytestring", "cfg-if", "cookie", - "derive_more", + "derive_more 0.99.17", "encoding_rs", "futures-core", "futures-util", @@ -215,6 +215,17 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + [[package]] name = "ahash" version = "0.7.8" @@ -277,26 +288,43 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "alloy" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c37d89f69cb43901949ba29307ada8b9e3b170f94057ad4c04d6fd169d24d65f" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-contract", "alloy-core", - "alloy-eips", - "alloy-genesis", - "alloy-network", - "alloy-node-bindings", - "alloy-provider", - "alloy-rpc-client", + "alloy-eips 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-genesis 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-network 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-provider 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-pubsub", + "alloy-rpc-client 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "alloy-rpc-types", - "alloy-serde", - "alloy-signer", - "alloy-signer-aws", - "alloy-signer-gcp", - "alloy-signer-ledger", - "alloy-transport", - "alloy-transport-http", - "reqwest 0.12.4", + "alloy-serde 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-signer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-signer-local", + "alloy-transport 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-transport-http 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-transport-ipc", + "alloy-transport-ws", +] + +[[package]] +name = "alloy" +version = "0.3.3" +source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" +dependencies = [ + "alloy-consensus 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-core", + "alloy-eips 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-genesis 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-provider 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-rpc-client 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-serde 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-signer 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-transport-http 0.3.3 (git+https://github.com/alloy-rs/alloy)", ] [[package]] @@ -311,22 +339,57 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1468e3128e07c7afe4ff13c17e8170c330d12c322f8924b8bf6986a27e0aad3d" +dependencies = [ + "alloy-eips 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "c-kzg", + "serde", +] + +[[package]] +name = "alloy-consensus" +version = "0.3.3" +source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" dependencies = [ - "alloy-eips", + "alloy-eips 0.3.3 (git+https://github.com/alloy-rs/alloy)", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.3.3 (git+https://github.com/alloy-rs/alloy)", "c-kzg", "serde", ] +[[package]] +name = "alloy-contract" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335d62de1a887f1b780441f8a3037f39c9fb26839cc9acd891c9b80396145cd5" +dependencies = [ + "alloy-dyn-abi", + "alloy-json-abi", + "alloy-network 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-network-primitives 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-primitives", + "alloy-provider 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-pubsub", + "alloy-rpc-types-eth 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-sol-types", + "alloy-transport 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "futures", + "futures-util", + "thiserror", +] + [[package]] name = "alloy-core" -version = "0.7.6" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5af3faff14c12c8b11037e0a093dd157c3702becb8435577a2408534d0758315" +checksum = "88b095eb0533144b4497e84a9cc3e44a5c2e3754a3983c0376a55a2f9183a53e" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -336,16 +399,15 @@ dependencies = [ [[package]] name = "alloy-dyn-abi" -version = "0.7.6" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6e6436a9530f25010d13653e206fab4c9feddacf21a54de8d7311b275bc56b" +checksum = "4004925bff5ba0a11739ae84dbb6601a981ea692f3bd45b626935ee90a6b8471" dependencies = [ "alloy-json-abi", "alloy-primitives", "alloy-sol-type-parser", "alloy-sol-types", "const-hex", - "derive_more", "itoa", "serde", "serde_json", @@ -353,35 +415,89 @@ dependencies = [ ] [[package]] -name = "alloy-eips" +name = "alloy-eip2930" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "serde", +] + +[[package]] +name = "alloy-eip7702" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d319bb544ca6caeab58c39cea8921c55d924d4f68f2c60f24f914673f9a74a" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "k256", + "serde", +] + +[[package]] +name = "alloy-eips" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c35df7b972b06f1b2f4e8b7a53328522fa788054a9d3e556faf2411c5a51d5a" +dependencies = [ + "alloy-eip2930", + "alloy-eip7702", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "c-kzg", + "derive_more 1.0.0", + "once_cell", + "serde", + "sha2 0.10.8", +] + +[[package]] +name = "alloy-eips" +version = "0.3.3" +source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" dependencies = [ + "alloy-eip2930", + "alloy-eip7702", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.3.3 (git+https://github.com/alloy-rs/alloy)", "c-kzg", + "derive_more 1.0.0", "once_cell", "serde", - "sha2", + "sha2 0.10.8", ] [[package]] name = "alloy-genesis" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7210f9206c0fa2a83c824cf8cb6c962126bc9fdc4f41ade1932f14150ef5f6" dependencies = [ "alloy-primitives", - "alloy-serde", + "alloy-serde 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde", +] + +[[package]] +name = "alloy-genesis" +version = "0.3.3" +source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" +dependencies = [ + "alloy-primitives", + "alloy-serde 0.3.3 (git+https://github.com/alloy-rs/alloy)", "serde", - "serde_json", ] [[package]] name = "alloy-json-abi" -version = "0.7.6" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeaccd50238126e3a0ff9387c7c568837726ad4f4e399b528ca88104d6c25ef" +checksum = "9996daf962fd0a90d3c93b388033228865953b92de7bb1959b891d78750a4091" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -391,10 +507,25 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8866562186d237f1dfeaf989ef941a24764f764bf5c33311e37ead3519c6a429" dependencies = [ "alloy-primitives", + "alloy-sol-types", + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "alloy-json-rpc" +version = "0.3.3" +source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" +dependencies = [ + "alloy-primitives", + "alloy-sol-types", "serde", "serde_json", "thiserror", @@ -403,15 +534,18 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abe714e233f9eaf410de95a9af6bcd05d3a7f8c8de7a0817221e95a6b642a080" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-json-rpc", + "alloy-consensus 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-eips 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-json-rpc 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-network-primitives 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-signer", + "alloy-rpc-types-eth 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-serde 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-signer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "alloy-sol-types", "async-trait", "auto_impl", @@ -420,31 +554,59 @@ dependencies = [ ] [[package]] -name = "alloy-node-bindings" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" +name = "alloy-network" +version = "0.3.3" +source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" dependencies = [ - "alloy-genesis", + "alloy-consensus 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-eips 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-json-rpc 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-network-primitives 0.3.3 (git+https://github.com/alloy-rs/alloy)", "alloy-primitives", - "k256", - "serde_json", - "tempfile", + "alloy-rpc-types-eth 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-serde 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-signer 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-sol-types", + "async-trait", + "auto_impl", + "futures-utils-wasm", "thiserror", - "tracing", - "url", +] + +[[package]] +name = "alloy-network-primitives" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c5a38117974c5776a45e140226745a0b664f79736aa900995d8e4121558e064" +dependencies = [ + "alloy-eips 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-primitives", + "alloy-serde 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde", +] + +[[package]] +name = "alloy-network-primitives" +version = "0.3.3" +source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" +dependencies = [ + "alloy-eips 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-primitives", + "alloy-serde 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "serde", ] [[package]] name = "alloy-primitives" -version = "0.7.6" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f783611babedbbe90db3478c120fb5f5daacceffc210b39adc0af4fe0da70bad" +checksum = "411aff151f2a73124ee473708e82ed51b2535f68928b6a1caa8bc1246ae6f7cd" dependencies = [ "alloy-rlp", "bytes", "cfg-if", "const-hex", - "derive_more", + "derive_more 1.0.0", "hex-literal", "itoa", "k256", @@ -458,23 +620,57 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c65633d6ef83c3626913c004eaf166a6dd50406f724772ea8567135efd6dc5d3" +dependencies = [ + "alloy-chains", + "alloy-consensus 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-eips 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-json-rpc 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-network 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-network-primitives 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-primitives", + "alloy-pubsub", + "alloy-rpc-client 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-rpc-types-eth 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-transport 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-transport-http 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-transport-ipc", + "alloy-transport-ws", + "async-stream", + "async-trait", + "auto_impl", + "dashmap", + "futures", + "futures-utils-wasm", + "lru", + "pin-project", + "reqwest 0.12.4", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "alloy-provider" +version = "0.3.3" +source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" dependencies = [ "alloy-chains", - "alloy-consensus", - "alloy-eips", - "alloy-json-rpc", - "alloy-network", - "alloy-node-bindings", + "alloy-consensus 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-eips 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-json-rpc 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-network 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-network-primitives 0.3.3 (git+https://github.com/alloy-rs/alloy)", "alloy-primitives", - "alloy-rpc-client", - "alloy-rpc-types-anvil", - "alloy-rpc-types-eth", - "alloy-rpc-types-trace", - "alloy-signer-wallet", - "alloy-transport", - "alloy-transport-http", + "alloy-rpc-client 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-rpc-types-eth 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-transport 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-transport-http 0.3.3 (git+https://github.com/alloy-rs/alloy)", "async-stream", "async-trait", "auto_impl", @@ -482,15 +678,35 @@ dependencies = [ "futures", "futures-utils-wasm", "lru", - "pin-project 1.1.5", + "pin-project", "reqwest 0.12.4", "serde", "serde_json", + "thiserror", "tokio", "tracing", "url", ] +[[package]] +name = "alloy-pubsub" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "949db89abae6193b44cc90ebf2eeb74eb8d2a474383c5e62b45bdcd362e84f8f" +dependencies = [ + "alloy-json-rpc 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-primitives", + "alloy-transport 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bimap", + "futures", + "serde", + "serde_json", + "tokio", + "tokio-stream", + "tower 0.5.1", + "tracing", +] + [[package]] name = "alloy-rlp" version = "0.3.5" @@ -498,7 +714,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b155716bab55763c95ba212806cf43d05bcc70e5f35b02bad20cf5ec7fe11fed" dependencies = [ "alloy-rlp-derive", - "arrayvec", + "arrayvec 0.7.4", "bytes", ] @@ -515,54 +731,89 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5fc328bb5d440599ba1b5aa44c0b9ab0625fbc3a403bb5ee94ed4a01ba23e07" +dependencies = [ + "alloy-json-rpc 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-primitives", + "alloy-pubsub", + "alloy-transport 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-transport-http 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-transport-ipc", + "alloy-transport-ws", + "futures", + "pin-project", + "reqwest 0.12.4", + "serde", + "serde_json", + "tokio", + "tokio-stream", + "tower 0.5.1", + "tracing", + "url", +] + +[[package]] +name = "alloy-rpc-client" +version = "0.3.3" +source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" dependencies = [ - "alloy-json-rpc", - "alloy-transport", - "alloy-transport-http", + "alloy-json-rpc 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-transport 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-transport-http 0.3.3 (git+https://github.com/alloy-rs/alloy)", "futures", - "pin-project 1.1.5", + "pin-project", "reqwest 0.12.4", "serde", "serde_json", "tokio", "tokio-stream", - "tower", + "tower 0.5.1", "tracing", "url", ] [[package]] name = "alloy-rpc-types" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f8ff679f94c497a8383f2cd09e2a099266e5f3d5e574bc82b4b379865707dbb" dependencies = [ - "alloy-rpc-types-eth", - "alloy-serde", + "alloy-rpc-types-engine", + "alloy-rpc-types-eth 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-serde 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde", ] [[package]] -name = "alloy-rpc-types-anvil" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" +name = "alloy-rpc-types-engine" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66bb45f4c5efe227bcb51d89c97221225169976e18097671a0bd4393d8248a4" dependencies = [ + "alloy-consensus 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-eips 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "alloy-primitives", - "alloy-serde", + "alloy-rlp", + "alloy-rpc-types-eth 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-serde 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde", + "thiserror", ] [[package]] name = "alloy-rpc-types-eth" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a59b1d7c86e0a653e7f3d29954f6de5a2878d8cfd1f010ff93be5c2c48cd3b1" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-genesis", + "alloy-consensus 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-eips 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-network-primitives 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "alloy-sol-types", "itertools 0.13.0", "serde", @@ -571,21 +822,40 @@ dependencies = [ ] [[package]] -name = "alloy-rpc-types-trace" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" +name = "alloy-rpc-types-eth" +version = "0.3.3" +source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" dependencies = [ + "alloy-consensus 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-eips 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-network-primitives 0.3.3 (git+https://github.com/alloy-rs/alloy)", "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", + "alloy-rlp", + "alloy-serde 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-sol-types", + "cfg-if", + "derive_more 1.0.0", + "hashbrown 0.14.5", + "itertools 0.13.0", "serde", "serde_json", ] [[package]] name = "alloy-serde" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51db8a6428a2159e01b7a43ec7aac801edd0c4db1d4de06f310c288940f16fd3" +dependencies = [ + "alloy-primitives", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-serde" +version = "0.3.3" +source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" dependencies = [ "alloy-primitives", "serde", @@ -594,12 +864,11 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebc1760c13592b7ba3fcd964abba546b8d6a9f10d15e8d92a8263731be33f36" dependencies = [ - "alloy-dyn-abi", "alloy-primitives", - "alloy-sol-types", "async-trait", "auto_impl", "elliptic-curve", @@ -608,82 +877,43 @@ dependencies = [ ] [[package]] -name = "alloy-signer-aws" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" +name = "alloy-signer" +version = "0.3.3" +source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" dependencies = [ - "alloy-consensus", - "alloy-network", "alloy-primitives", - "alloy-signer", "async-trait", - "aws-sdk-kms", + "auto_impl", + "elliptic-curve", "k256", - "spki", "thiserror", - "tracing", ] [[package]] -name = "alloy-signer-gcp" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" +name = "alloy-signer-local" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bfb3508485aa798efb5725322e414313239274d3780079b7f8c6746b8ee6e1b" dependencies = [ - "alloy-consensus", - "alloy-network", + "alloy-consensus 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-network 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "alloy-primitives", - "alloy-signer", + "alloy-signer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "async-trait", - "gcloud-sdk", "k256", - "spki", + "rand", "thiserror", - "tracing", ] [[package]] -name = "alloy-signer-ledger" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" -dependencies = [ - "alloy-consensus", - "alloy-dyn-abi", - "alloy-network", - "alloy-primitives", - "alloy-signer", - "alloy-sol-types", - "async-trait", - "coins-ledger", - "futures-util", - "semver 1.0.23", - "thiserror", - "tracing", -] - -[[package]] -name = "alloy-signer-wallet" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" -dependencies = [ - "alloy-consensus", - "alloy-network", - "alloy-primitives", - "alloy-signer", - "async-trait", - "k256", - "rand", - "thiserror", -] - -[[package]] -name = "alloy-sol-macro" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bad41a7c19498e3f6079f7744656328699f8ea3e783bdd10d85788cd439f572" +name = "alloy-sol-macro" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0458ccb02a564228fcd76efb8eb5a520521a8347becde37b402afec9a1b83859" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.66", @@ -691,16 +921,16 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "0.7.6" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9899da7d011b4fe4c406a524ed3e3f963797dbc93b45479d60341d3a27b252" +checksum = "2bc65475025fc1e84bf86fc840f04f63fcccdcf3cf12053c99918e4054dfbc69" dependencies = [ "alloy-json-abi", "alloy-sol-macro-input", "const-hex", "heck 0.5.0", "indexmap 2.2.6", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.66", @@ -710,9 +940,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "0.7.6" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32d595768fdc61331a132b6f65db41afae41b9b97d36c21eb1b955c422a7e60" +checksum = "6ed10f0715a0b69fde3236ff3b9ae5f6f7c97db5a387747100070d3016b9266b" dependencies = [ "alloy-json-abi", "const-hex", @@ -727,18 +957,19 @@ dependencies = [ [[package]] name = "alloy-sol-type-parser" -version = "0.7.6" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baa2fbd22d353d8685bd9fee11ba2d8b5c3b1d11e56adb3265fcf1f32bfdf404" +checksum = "3edae8ea1de519ccba896b6834dec874230f72fe695ff3c9c118e90ec7cff783" dependencies = [ + "serde", "winnow 0.6.13", ] [[package]] name = "alloy-sol-types" -version = "0.7.6" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a49042c6d3b66a9fe6b2b5a8bf0d39fc2ae1ee0310a2a26ffedd79fb097878dd" +checksum = "1eb88e4da0a1b697ed6a9f811fdba223cf4d5c21410804fd1707836af73a462b" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -749,10 +980,29 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd5dc4e902f1860d54952446d246ac05386311ad61030a2b906ae865416d36e0" +dependencies = [ + "alloy-json-rpc 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.22.1", + "futures-util", + "futures-utils-wasm", + "serde", + "serde_json", + "thiserror", + "tokio", + "tower 0.5.1", + "tracing", + "url", +] + +[[package]] +name = "alloy-transport" +version = "0.3.3" +source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" dependencies = [ - "alloy-json-rpc", + "alloy-json-rpc 0.3.3 (git+https://github.com/alloy-rs/alloy)", "base64 0.22.1", "futures-util", "futures-utils-wasm", @@ -760,24 +1010,89 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tower", + "tower 0.5.1", + "tracing", "url", ] [[package]] name = "alloy-transport-http" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy#230205751b8e07a455acdef50710d996fc89ea84" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1742b94bb814f1ca6b322a6f9dd38a0252ff45a3119e40e888fb7029afa500ce" dependencies = [ - "alloy-json-rpc", - "alloy-transport", + "alloy-json-rpc 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-transport 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.12.4", "serde_json", - "tower", + "tower 0.5.1", "tracing", "url", ] +[[package]] +name = "alloy-transport-http" +version = "0.3.3" +source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" +dependencies = [ + "alloy-json-rpc 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-transport 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "reqwest 0.12.4", + "serde_json", + "tower 0.5.1", + "tracing", + "url", +] + +[[package]] +name = "alloy-transport-ipc" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be321aac6f06d86855d41d4ce9ff9feb877fe7e9fe1cafce7380b981c12398c7" +dependencies = [ + "alloy-json-rpc 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-pubsub", + "alloy-transport 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes", + "futures", + "interprocess", + "pin-project", + "serde_json", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "alloy-transport-ws" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8ed861e7030001364c8ffa2db63541f7bae275a6e636de7616c20f2fd3dc0c3" +dependencies = [ + "alloy-pubsub", + "alloy-transport 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "futures", + "http 1.1.0", + "rustls 0.23.13", + "serde_json", + "tokio", + "tokio-tungstenite", + "tracing", + "ws_stream_wasm", +] + +[[package]] +name = "ambassador" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b27ba24e4d8a188489d5a03c7fabc167a60809a383cdb4d15feb37479cd2a48" +dependencies = [ + "itertools 0.10.5", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "android-tzdata" version = "0.1.1" @@ -798,6 +1113,15 @@ name = "anyhow" version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +dependencies = [ + "backtrace", +] + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "arc-swap" @@ -929,24 +1253,23 @@ dependencies = [ "rand", ] +[[package]] +name = "arrayref" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" + [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] -name = "async-compression" -version = "0.4.11" +name = "arrayvec" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "async-stream" @@ -981,6 +1304,17 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "async_io_stream" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" +dependencies = [ + "futures", + "pharos", + "rustc_version 0.4.0", +] + [[package]] name = "atoi" version = "2.0.0" @@ -1008,311 +1342,134 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] -name = "aws-credential-types" -version = "1.2.0" +name = "backtrace" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16838e6c9e12125face1c1eff1343c75e3ff540de98ff7ebd61874a89bcfeb9" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ - "aws-smithy-async", - "aws-smithy-runtime-api", - "aws-smithy-types", - "zeroize", + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", ] [[package]] -name = "aws-runtime" -version = "1.2.2" +name = "base-x" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75588e7ee5e8496eed939adac2035a6dbab9f7eb2acdd9ab2d31856dab6f3955" -dependencies = [ - "aws-credential-types", - "aws-sigv4", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "fastrand", - "http 0.2.12", - "http-body 0.4.6", - "percent-encoding", - "pin-project-lite", - "tracing", - "uuid", -] +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" [[package]] -name = "aws-sdk-kms" -version = "1.30.0" +name = "base16ct" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da951fb0dd1a02728a91c58af8464098766f1a0600af932dd3f8361b23e1bfc9" -dependencies = [ - "aws-credential-types", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "http 0.2.12", - "once_cell", - "regex-lite", - "tracing", -] +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] -name = "aws-sigv4" -version = "1.2.2" +name = "base64" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31eed8d45759b2c5fe7fd304dd70739060e9e0de509209036eabea14d0720cce" -dependencies = [ - "aws-credential-types", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", - "bytes", - "form_urlencoded", - "hex", - "hmac", - "http 0.2.12", - "http 1.1.0", - "once_cell", - "percent-encoding", - "sha2", - "time", - "tracing", -] +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] -name = "aws-smithy-async" -version = "1.2.1" +name = "base64" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c" -dependencies = [ - "futures-util", - "pin-project-lite", - "tokio", -] +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] -name = "aws-smithy-http" -version = "0.60.8" +name = "base64" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a7de001a1b9a25601016d8057ea16e31a45fdca3751304c8edf4ad72e706c08" -dependencies = [ - "aws-smithy-runtime-api", - "aws-smithy-types", - "bytes", - "bytes-utils", - "futures-core", - "http 0.2.12", - "http-body 0.4.6", - "once_cell", - "percent-encoding", - "pin-project-lite", - "pin-utils", - "tracing", -] +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] -name = "aws-smithy-json" -version = "0.60.7" +name = "base64ct" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6" -dependencies = [ - "aws-smithy-types", -] +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] -name = "aws-smithy-runtime" -version = "1.5.5" +name = "bellpepper" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d3965f6417a92a6d1009c5958a67042f57e46342afb37ca58f9ad26744ec73" +checksum = "0271a107b5f600ee41bdafbb3c8ddf4afa52983d4b078917d89dbb920116e987" dependencies = [ - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", - "bytes", - "fastrand", - "http 0.2.12", - "http-body 0.4.6", - "http-body 1.0.0", - "once_cell", - "pin-project-lite", - "pin-utils", - "tokio", - "tracing", + "bellpepper-core", + "byteorder", + "ff", ] [[package]] -name = "aws-smithy-runtime-api" -version = "1.7.0" +name = "bellpepper-core" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b570ea39eb95bd32543f6e4032bce172cb6209b9bc8c83c770d08169e875afc" +checksum = "b2c9a1b2f748c59938bc72165ebdf34efffeecee9cfbe0bb7d6b01aea21cd523" dependencies = [ - "aws-smithy-async", - "aws-smithy-types", - "bytes", - "http 0.2.12", - "http 1.1.0", - "pin-project-lite", - "tokio", - "tracing", - "zeroize", + "blake2s_simd 1.0.2", + "byteorder", + "ff", + "serde", + "thiserror", ] [[package]] -name = "aws-smithy-types" -version = "1.2.0" +name = "bellperson" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe321a6b21f5d8eabd0ade9c55d3d0335f3c3157fc2b3e87f05f34b539e4df5" +checksum = "5c41bd83b8437856d267eb311de13dcd9bff9077cc5ba35c7ec886070dea8a45" dependencies = [ - "base64-simd", - "bytes", - "bytes-utils", - "http 0.2.12", - "http 1.1.0", - "http-body 0.4.6", - "http-body 1.0.0", - "http-body-util", - "itoa", - "num-integer", - "pin-project-lite", - "pin-utils", - "ryu", + "bellpepper-core", + "bincode", + "blake2s_simd 1.0.2", + "blstrs", + "byteorder", + "crossbeam-channel", + "digest 0.10.7", + "ec-gpu", + "ec-gpu-gen 0.7.1", + "ff", + "fs2", + "group", + "log", + "memmap2", + "pairing", + "rand", + "rand_core", + "rayon", + "rustversion", "serde", - "time", + "sha2 0.10.8", + "thiserror", ] [[package]] -name = "aws-types" -version = "1.3.1" +name = "bigdecimal" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f734808d43702a67e57d478a12e227d4d038d0b90c9005a78c87890d3805922" +checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" dependencies = [ - "aws-credential-types", - "aws-smithy-async", - "aws-smithy-runtime-api", - "aws-smithy-types", - "http 0.2.12", - "rustc_version 0.4.0", - "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", - "bitflags 1.3.2", - "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.29", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - -[[package]] -name = "backtrace" -version = "0.3.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.7" -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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" -dependencies = [ - "outref", - "vsimd", + "num-bigint", + "num-integer", + "num-traits", ] [[package]] -name = "base64ct" -version = "1.6.0" +name = "bimap" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7" [[package]] -name = "bigdecimal" -version = "0.3.1" +name = "bincode" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ - "num-bigint", - "num-integer", - "num-traits", + "serde", ] [[package]] @@ -1357,13 +1514,80 @@ dependencies = [ "wyz", ] +[[package]] +name = "blake2b_simd" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" +dependencies = [ + "arrayref", + "arrayvec 0.7.4", + "constant_time_eq 0.3.1", +] + +[[package]] +name = "blake2s_simd" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2" +dependencies = [ + "arrayref", + "arrayvec 0.5.2", + "constant_time_eq 0.1.5", +] + +[[package]] +name = "blake2s_simd" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" +dependencies = [ + "arrayref", + "arrayvec 0.7.4", + "constant_time_eq 0.3.1", +] + +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array 0.14.7", +] + [[package]] name = "block-buffer" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array", + "generic-array 0.14.7", +] + +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array 0.14.7", +] + +[[package]] +name = "bls-signatures" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7fce0356b52c2483bb6188cc8bdc11add526bce75d1a44e5e5d889a6ab008" +dependencies = [ + "blst", + "blstrs", + "ff", + "group", + "pairing", + "rand_core", + "subtle", + "thiserror", ] [[package]] @@ -1378,6 +1602,23 @@ dependencies = [ "zeroize", ] +[[package]] +name = "blstrs" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a8a8ed6fefbeef4a8c7b460e4110e12c5e22a5b7cf32621aae6ad650c4dcf29" +dependencies = [ + "blst", + "byte-slice-cast", + "ec-gpu", + "ff", + "group", + "pairing", + "rand_core", + "serde", + "subtle", +] + [[package]] name = "borsh" version = "1.5.1" @@ -1395,7 +1636,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" dependencies = [ "once_cell", - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 2.0.66", @@ -1472,16 +1713,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bytes-utils" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" -dependencies = [ - "bytes", - "either", -] - [[package]] name = "bytestring" version = "1.3.1" @@ -1505,15 +1736,33 @@ dependencies = [ "serde", ] +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cbor4ii" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544cf8c89359205f4f990d0e6f3828db42df85b5dac95d09157a250eb0749c4" +dependencies = [ + "serde", +] + [[package]] name = "cc" -version = "1.0.99" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -1528,6 +1777,17 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +[[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + [[package]] name = "chrono" version = "0.4.38" @@ -1544,87 +1804,271 @@ dependencies = [ ] [[package]] -name = "coins-ledger" -version = "0.11.1" +name = "cid" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd94671561e36e4e7de75f753f577edafb0e7c05d6e4547229fdf7938fbcd2c3" +dependencies = [ + "core2", + "multibase", + "multihash", + "serde", + "serde_bytes", + "unsigned-varint 0.7.2", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "cl3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "166ef757aa936b45f3e5d39c344047f65ef7d25a50067246a498021a816d074b" +checksum = "b823f24e72fa0c68aa14a250ae1c0848e68d4ae188b71c3972343e45b46f8644" +dependencies = [ + "libc", + "opencl-sys", + "thiserror", +] + +[[package]] +name = "cobs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" + +[[package]] +name = "config" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ad70579325f1a38ea4c13412b82241c5900700a69785d73e2736bd65a33f86" dependencies = [ "async-trait", - "byteorder", + "lazy_static", + "nom", + "pathdiff", + "serde", + "toml", +] + +[[package]] +name = "const-hex" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8a24a26d37e1ffd45343323dc9fe6654ceea44c12f2fcb3d7ac29e610bc6" +dependencies = [ "cfg-if", - "const-hex", - "getrandom", - "hidapi-rusb", - "js-sys", + "cpufeatures", + "hex", + "proptest", + "serde", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "cookie" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +dependencies = [ + "percent-encoding", + "time", + "version_check", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" +dependencies = [ + "memchr", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "cranelift-bforest" +version = "0.111.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b80c3a50b9c4c7e5b5f73c0ed746687774fc9e36ef652b110da8daebf0c6e0e6" +dependencies = [ + "cranelift-entity", +] + +[[package]] +name = "cranelift-bitset" +version = "0.111.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38778758c2ca918b05acb2199134e0c561fb577c50574259b26190b6c2d95ded" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "cranelift-codegen" +version = "0.111.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58258667ad10e468bfc13a8d620f50dfcd4bb35d668123e97defa2549b9ad397" +dependencies = [ + "bumpalo", + "cranelift-bforest", + "cranelift-bitset", + "cranelift-codegen-meta", + "cranelift-codegen-shared", + "cranelift-control", + "cranelift-entity", + "cranelift-isle", + "gimli", + "hashbrown 0.14.5", "log", - "nix", - "once_cell", - "thiserror", - "tokio", - "tracing", - "wasm-bindgen", - "wasm-bindgen-futures", + "regalloc2", + "rustc-hash", + "smallvec", + "target-lexicon", ] [[package]] -name = "const-hex" -version = "1.12.0" +name = "cranelift-codegen-meta" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8a24a26d37e1ffd45343323dc9fe6654ceea44c12f2fcb3d7ac29e610bc6" +checksum = "043f0b702e529dcb07ff92bd7d40e7d5317b5493595172c5eb0983343751ee06" dependencies = [ - "cfg-if", - "cpufeatures", - "hex", - "proptest", - "serde", + "cranelift-codegen-shared", ] [[package]] -name = "const-oid" -version = "0.9.6" +name = "cranelift-codegen-shared" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +checksum = "7763578888ab53eca5ce7da141953f828e82c2bfadcffc106d10d1866094ffbb" [[package]] -name = "convert_case" -version = "0.4.0" +name = "cranelift-control" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +checksum = "32db15f08c05df570f11e8ab33cb1ec449a64b37c8a3498377b77650bef33d8b" +dependencies = [ + "arbitrary", +] [[package]] -name = "cookie" -version = "0.16.2" +name = "cranelift-entity" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +checksum = "5289cdb399381a27e7bbfa1b42185916007c3d49aeef70b1d01cb4caa8010130" dependencies = [ - "percent-encoding", - "time", - "version_check", + "cranelift-bitset", + "serde", + "serde_derive", ] [[package]] -name = "core-foundation" -version = "0.9.4" +name = "cranelift-frontend" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +checksum = "31ba8ab24eb9470477e98ddfa3c799a649ac5a0d9a2042868c4c952133c234e8" dependencies = [ - "core-foundation-sys", - "libc", + "cranelift-codegen", + "log", + "smallvec", + "target-lexicon", ] [[package]] -name = "core-foundation-sys" -version = "0.8.6" +name = "cranelift-isle" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "2b72a3c5c166a70426dcb209bdd0bb71a787c1ea76023dc0974fbabca770e8f9" [[package]] -name = "cpufeatures" -version = "0.2.12" +name = "cranelift-native" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "46a42424c956bbc31fc5c2706073df896156c5420ae8fa2a5d48dbc7b295d71b" dependencies = [ + "cranelift-codegen", "libc", + "target-lexicon", +] + +[[package]] +name = "cranelift-wasm" +version = "0.111.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49778df4289933d735b93c30a345513e030cf83101de0036e19b760f8aa09f68" +dependencies = [ + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", + "itertools 0.12.1", + "log", + "smallvec", + "wasmparser 0.215.0", + "wasmtime-types", ] [[package]] @@ -1662,6 +2106,28 @@ dependencies = [ "once_cell", ] +[[package]] +name = "crossbeam" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-deque" version = "0.8.5" @@ -1708,7 +2174,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ - "generic-array", + "generic-array 0.14.7", "rand_core", "subtle", "zeroize", @@ -1720,10 +2186,39 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array", + "generic-array 0.14.7", "typenum", ] +[[package]] +name = "crypto-mac" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" +dependencies = [ + "generic-array 0.14.7", + "subtle", +] + +[[package]] +name = "cs_serde_bytes" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc673ddabf48214550526b068dc28065a75f05e21e452880095247c635b1d91" +dependencies = [ + "serde", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn 1.0.109", +] + [[package]] name = "darling" version = "0.20.10" @@ -1761,17 +2256,44 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.3" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if", + "crossbeam-utils", "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", ] +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "data-encoding-macro" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1559b6cba622276d6d63706db152618eeb15b89b3e4041446b05876e352e639" +dependencies = [ + "data-encoding", + "data-encoding-macro-internal", +] + +[[package]] +name = "data-encoding-macro-internal" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332d754c0af53bc87c108fed664d121ecf59207ec4196041f04d6ab9002ad33f" +dependencies = [ + "data-encoding", + "syn 1.0.109", +] + [[package]] name = "der" version = "0.7.9" @@ -1810,20 +2332,48 @@ version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "convert_case", + "convert_case 0.4.0", "proc-macro2", "quote", "rustc_version 0.4.0", "syn 1.0.109", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "convert_case 0.6.0", + "proc-macro2", + "quote", + "syn 2.0.66", + "unicode-xid", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + [[package]] name = "digest" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array", + "generic-array 0.14.7", ] [[package]] @@ -1832,7 +2382,7 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer", + "block-buffer 0.10.4", "const-oid", "crypto-common", "subtle", @@ -1855,6 +2405,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +[[package]] +name = "doctest-file" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562" + [[package]] name = "dotenv" version = "0.15.0" @@ -1873,6 +2429,58 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +[[package]] +name = "ec-gpu" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd63582de2b59ea1aa48d7c1941b5d87618d95484397521b3acdfa0e1e9f5e45" + +[[package]] +name = "ec-gpu-gen" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "892df2aa20abec5b816e15d5d6383892ca142077708efa3067dd3ac44b75c664" +dependencies = [ + "bitvec", + "crossbeam-channel", + "ec-gpu", + "execute", + "ff", + "group", + "hex", + "log", + "num_cpus", + "once_cell", + "rayon", + "rust-gpu-tools", + "sha2 0.10.8", + "thiserror", + "yastl", +] + +[[package]] +name = "ec-gpu-gen" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2353854622ec1abfd22243eb958453b95f1502e2a56648bf9db49ccbfb55f01" +dependencies = [ + "bitvec", + "crossbeam-channel", + "ec-gpu", + "execute", + "ff", + "group", + "hex", + "log", + "num_cpus", + "once_cell", + "rayon", + "rust-gpu-tools", + "sha2 0.10.8", + "thiserror", + "yastl", +] + [[package]] name = "ecdsa" version = "0.16.9" @@ -1906,9 +2514,8 @@ dependencies = [ "crypto-bigint", "digest 0.10.7", "ff", - "generic-array", + "generic-array 0.14.7", "group", - "pem-rfc7468", "pkcs8", "rand_core", "sec1", @@ -1916,6 +2523,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + +[[package]] +name = "embedded-io" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + [[package]] name = "encoding_rs" version = "0.8.34" @@ -1971,6 +2590,55 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "execute" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a82608ee96ce76aeab659e9b8d3c2b787bffd223199af88c674923d861ada10" +dependencies = [ + "execute-command-macro", + "execute-command-tokens", + "generic-array 1.1.0", +] + +[[package]] +name = "execute-command-macro" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90dec53d547564e911dc4ff3ecb726a64cf41a6fa01a2370ebc0d95175dd08bd" +dependencies = [ + "execute-command-macro-impl", +] + +[[package]] +name = "execute-command-macro-impl" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce8cd46a041ad005ab9c71263f9a0ff5b529eac0fe4cc9b4a20f4f0765d8cf4b" +dependencies = [ + "execute-command-tokens", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "execute-command-tokens" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69dc321eb6be977f44674620ca3aa21703cb20ffbe560e1ae97da08401ffbcad" + +[[package]] +name = "fake-simd" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" + +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + [[package]] name = "fastrand" version = "2.1.0" @@ -1983,21 +2651,101 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418" dependencies = [ - "arrayvec", + "arrayvec 0.7.4", "auto_impl", "bytes", ] +[[package]] +name = "fdlimit" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4c9e43643f5a3be4ca5b67d26b98031ff9db6806c3440ae32e02e3ceac3f1b" +dependencies = [ + "libc", +] + [[package]] name = "ff" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ + "bitvec", "rand_core", "subtle", ] +[[package]] +name = "filecoin-hashers" +version = "13.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85413176cea16bfe171caafab023044820c0033b243b535b19116776ffd3f285" +dependencies = [ + "anyhow", + "bellperson", + "blstrs", + "ff", + "generic-array 0.14.7", + "hex", + "lazy_static", + "merkletree", + "neptune", + "rand", + "serde", + "sha2 0.10.8", +] + +[[package]] +name = "filecoin-proofs" +version = "18.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "096b8b483f6ed5823150daf6cd22ee8e32b3dabcb4fd70dab70044e73bcab107" +dependencies = [ + "anyhow", + "bellperson", + "bincode", + "blake2b_simd", + "blstrs", + "ff", + "filecoin-hashers", + "fr32", + "generic-array 0.14.7", + "hex", + "iowrap", + "lazy_static", + "log", + "memmap2", + "merkletree", + "once_cell", + "rand", + "rayon", + "serde", + "serde_json", + "sha2 0.10.8", + "storage-proofs-core", + "storage-proofs-porep", + "storage-proofs-post", + "storage-proofs-update", + "typenum", +] + +[[package]] +name = "filecoin-proofs-api" +version = "18.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aea8140d1e2d2ac18347e6121ee24d0e903f9cfdc2eb2ee507932e352c9e7b8" +dependencies = [ + "anyhow", + "bincode", + "blstrs", + "filecoin-proofs", + "fr32", + "lazy_static", + "serde", + "storage-proofs-core", +] + [[package]] name = "fixed-hash" version = "0.8.0" @@ -2020,6 +2768,15 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "spin 0.9.8", +] + [[package]] name = "flume" version = "0.11.0" @@ -2050,7 +2807,17 @@ dependencies = [ name = "foreign-types-shared" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "forest_hash_utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb061ad769411763a5d6ae39d596696657472b25a66387fbb0ba8c133bb6575" +dependencies = [ + "cs_serde_bytes", + "serde", +] [[package]] name = "form_urlencoded" @@ -2065,7 +2832,7 @@ dependencies = [ name = "fplus-database" version = "1.8.4" dependencies = [ - "alloy", + "alloy 0.3.3 (git+https://github.com/alloy-rs/alloy)", "anyhow", "chrono", "dotenv", @@ -2089,7 +2856,6 @@ dependencies = [ "actix-cors", "actix-utils", "actix-web", - "alloy", "anyhow", "async-trait", "chrono", @@ -2114,7 +2880,7 @@ version = "1.8.4" dependencies = [ "actix-rt", "actix-web", - "alloy", + "alloy 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "anyhow", "base64 0.13.1", "chrono", @@ -2122,15 +2888,16 @@ dependencies = [ "env_logger", "fplus-database", "futures", + "fvm", "http 0.2.12", "hyper 0.14.29", "hyper-rustls", - "jsonwebtoken 8.3.0", + "jsonwebtoken", "log", "markdown", "octocrab", "once_cell", - "pem 1.1.1", + "pem", "rayon", "regex", "reqwest 0.11.27", @@ -2142,6 +2909,30 @@ dependencies = [ "uuidv4", ] +[[package]] +name = "fr32" +version = "11.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "627a3f3108ee3287759a45f6d5aafe48b3017509df9b677115f88266d61e0815" +dependencies = [ + "anyhow", + "blstrs", + "byte-slice-cast", + "byteorder", + "ff", + "thiserror", +] + +[[package]] +name = "fs2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "funty" version = "2.0.0" @@ -2255,46 +3046,141 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42012b0f064e01aa58b545fe3727f90f7dd4020f4a3ea735b50344965f5a57e9" [[package]] -name = "gcemeta" -version = "0.2.3" +name = "fvm" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d460327b24cc34c86d53d60a90e9e6044817f7906ebd9baa5c3d0ee13e1ecf" +checksum = "1f32d94b63cee9210afd3e2cca72f3f1927ed160dbf532b1bb7fe97dd41d6014" dependencies = [ - "bytes", - "hyper 0.14.29", + "ambassador", + "anyhow", + "cid", + "derive_more 1.0.0", + "filecoin-proofs-api", + "fvm-wasm-instrument", + "fvm_ipld_amt", + "fvm_ipld_blockstore", + "fvm_ipld_encoding", + "fvm_ipld_hamt", + "fvm_shared", + "lazy_static", + "log", + "minstant", + "multihash", + "num-traits", + "rand", + "rayon", + "replace_with", "serde", - "serde_json", + "serde_tuple", + "static_assertions", "thiserror", - "tokio", - "tracing", + "wasmtime", + "wasmtime-environ", + "yastl", ] [[package]] -name = "gcloud-sdk" -version = "0.24.7" +name = "fvm-wasm-instrument" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa57d45d9a9778e0bf38deb6a4c9dbe293fa021d0b70b126b5dc593979b08569" +checksum = "ddd62c1cbb59244314d761b57cb5d2bcc35e8b7bc8f3082d56980f69145c1be8" dependencies = [ - "async-trait", - "chrono", - "futures", - "gcemeta", - "hyper 0.14.29", - "jsonwebtoken 9.3.0", + "anyhow", + "wasm-encoder 0.20.0", + "wasmparser 0.95.0", + "wasmprinter 0.2.80", +] + +[[package]] +name = "fvm_ipld_amt" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fea333475130094f27ce67809aae3f69eb5247541d835950b7c5da733dbbb34" +dependencies = [ + "anyhow", + "cid", + "fvm_ipld_blockstore", + "fvm_ipld_encoding", + "itertools 0.11.0", "once_cell", - "prost", - "prost-types", - "reqwest 0.11.27", - "secret-vault-value", "serde", - "serde_json", - "tokio", - "tonic", - "tower", - "tower-layer", - "tower-util", - "tracing", - "url", + "thiserror", +] + +[[package]] +name = "fvm_ipld_blockstore" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d064b957420f5ecc137a153baaa6c32e2eb19b674135317200b6f2537eabdbfd" +dependencies = [ + "anyhow", + "cid", + "multihash", +] + +[[package]] +name = "fvm_ipld_encoding" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90608092e31d9a06236268c58f7c36668ab4b2a48afafe3a97e08f094ad7ae50" +dependencies = [ + "anyhow", + "cid", + "fvm_ipld_blockstore", + "multihash", + "serde", + "serde_ipld_dagcbor", + "serde_repr", + "serde_tuple", + "thiserror", +] + +[[package]] +name = "fvm_ipld_hamt" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c900736087ff87cc51f669eee2f8e000c80717472242eb3f712aaa059ac3b3" +dependencies = [ + "anyhow", + "byteorder", + "cid", + "forest_hash_utils", + "fvm_ipld_blockstore", + "fvm_ipld_encoding", + "libipld-core", + "multihash", + "once_cell", + "serde", + "sha2 0.10.8", + "thiserror", +] + +[[package]] +name = "fvm_shared" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77cc1f28a1c99bc28f61c61896925cd945f08e44dfce5102a722048e24222987" +dependencies = [ + "anyhow", + "bitflags 2.5.0", + "blake2b_simd", + "bls-signatures", + "cid", + "data-encoding", + "data-encoding-macro", + "filecoin-proofs-api", + "fvm_ipld_encoding", + "lazy_static", + "libsecp256k1", + "multihash", + "num-bigint", + "num-derive", + "num-integer", + "num-traits", + "serde", + "serde_tuple", + "thiserror", + "unsigned-varint 0.8.0", ] [[package]] @@ -2308,6 +3194,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "generic-array" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96512db27971c2c3eece70a1e106fbe6c87760234e31e8f7e5634912fe52794a" +dependencies = [ + "typenum", +] + [[package]] name = "getrandom" version = "0.2.15" @@ -2315,10 +3210,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] @@ -2326,6 +3219,11 @@ name = "gimli" version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +dependencies = [ + "fallible-iterator", + "indexmap 2.2.6", + "stable_deref_trait", +] [[package]] name = "glob" @@ -2340,7 +3238,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", + "rand", "rand_core", + "rand_xorshift", "subtle", ] @@ -2372,6 +3272,15 @@ dependencies = [ "ahash 0.7.8", ] +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.11", +] + [[package]] name = "hashbrown" version = "0.14.5" @@ -2380,6 +3289,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", "allocator-api2", + "serde", ] [[package]] @@ -2428,24 +3338,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] -name = "hidapi-rusb" -version = "1.3.3" +name = "hkdf" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efdc2ec354929a6e8f3c6b6923a4d97427ec2f764cfee8cd4bfe890946cdf08b" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ - "cc", - "libc", - "pkg-config", - "rusb", + "hmac 0.12.1", ] [[package]] -name = "hkdf" -version = "0.12.4" +name = "hmac" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" dependencies = [ - "hmac", + "crypto-mac", + "digest 0.9.0", ] [[package]] @@ -2457,6 +3365,17 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "hmac-drbg" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" +dependencies = [ + "digest 0.9.0", + "generic-array 0.14.7", + "hmac 0.8.1", +] + [[package]] name = "home" version = "0.5.9" @@ -2600,7 +3519,7 @@ dependencies = [ "hyper 0.14.29", "log", "rustls 0.21.12", - "rustls-native-certs 0.6.3", + "rustls-native-certs", "tokio", "tokio-rustls 0.24.1", ] @@ -2661,7 +3580,7 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", + "tower 0.4.13", "tower-service", "tracing", ] @@ -2807,6 +3726,12 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "id-arena" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" + [[package]] name = "ident_case" version = "1.0.1" @@ -2863,6 +3788,7 @@ checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.5", + "serde", ] [[package]] @@ -2876,6 +3802,40 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array 0.14.7", +] + +[[package]] +name = "interprocess" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2f4e4a06d42fab3e85ab1b419ad32b09eab58b901d40c57935ff92db3287a13" +dependencies = [ + "doctest-file", + "futures-core", + "libc", + "recvmsg", + "tokio", + "widestring", + "windows-sys 0.52.0", +] + +[[package]] +name = "iowrap" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d778bd9a4fa138d91f62017e3ac5ff905d2b829a30d3b1be473cb57d32ad15a" +dependencies = [ + "memchr", +] + [[package]] name = "ipnet" version = "2.9.0" @@ -2893,6 +3853,15 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "itertools" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.10.5" @@ -2902,6 +3871,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.12.1" @@ -2951,28 +3929,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ "base64 0.21.7", - "pem 1.1.1", + "pem", "ring 0.16.20", "serde", "serde_json", "simple_asn1", ] -[[package]] -name = "jsonwebtoken" -version = "9.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" -dependencies = [ - "base64 0.21.7", - "js-sys", - "pem 3.0.4", - "ring 0.17.8", - "serde", - "serde_json", - "simple_asn1", -] - [[package]] name = "k256" version = "0.13.3" @@ -2983,7 +3946,16 @@ dependencies = [ "ecdsa", "elliptic-curve", "once_cell", - "sha2", + "sha2 0.10.8", +] + +[[package]] +name = "keccak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" +dependencies = [ + "cpufeatures", ] [[package]] @@ -3011,12 +3983,33 @@ dependencies = [ "spin 0.5.2", ] +[[package]] +name = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + [[package]] name = "libc" version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +[[package]] +name = "libipld-core" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5acd707e8d8b092e967b2af978ed84709eaded82b75effe6cb6f6cc797ef8158" +dependencies = [ + "anyhow", + "cid", + "core2", + "multibase", + "multihash", + "serde", + "thiserror", +] + [[package]] name = "libm" version = "0.2.8" @@ -3024,24 +4017,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] -name = "libsqlite3-sys" -version = "0.27.0" +name = "libsecp256k1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1" dependencies = [ - "cc", - "pkg-config", - "vcpkg", + "arrayref", + "base64 0.13.1", + "digest 0.9.0", + "hmac-drbg", + "libsecp256k1-core", + "libsecp256k1-gen-ecmult", + "libsecp256k1-gen-genmult", + "rand", + "serde", + "sha2 0.9.9", + "typenum", ] [[package]] -name = "libusb1-sys" -version = "0.7.0" +name = "libsecp256k1-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" +dependencies = [ + "crunchy", + "digest 0.9.0", + "subtle", +] + +[[package]] +name = "libsecp256k1-gen-ecmult" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809" +dependencies = [ + "libsecp256k1-core", +] + +[[package]] +name = "libsecp256k1-gen-genmult" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da050ade7ac4ff1ba5379af847a10a10a8e284181e060105bf8d86960ce9ce0f" +checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c" +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", - "libc", "pkg-config", "vcpkg", ] @@ -3095,9 +4124,18 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" name = "lru" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +dependencies = [ + "hashbrown 0.14.5", +] + +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" dependencies = [ - "hashbrown 0.14.5", + "libc", ] [[package]] @@ -3109,12 +4147,6 @@ dependencies = [ "unicode-id", ] -[[package]] -name = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - [[package]] name = "md-5" version = "0.10.6" @@ -3132,30 +4164,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] -name = "memoffset" -version = "0.7.1" +name = "memfd" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "autocfg", + "rustix", ] [[package]] -name = "mime" -version = "0.3.17" +name = "memmap2" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +dependencies = [ + "libc", +] [[package]] -name = "mime_guess" -version = "2.0.4" +name = "merkletree" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "4a0ed8c0ce1e281870da29266398541a0dbab168f5fb5fd36d7ef2bbdbf808a3" dependencies = [ - "mime", - "unicase", + "anyhow", + "arrayref", + "log", + "memmap2", + "positioned-io", + "rayon", + "serde", + "tempfile", + "typenum", ] +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -3171,6 +4219,16 @@ dependencies = [ "adler", ] +[[package]] +name = "minstant" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb9b5c752f145ac5046bccc3c4f62892e3c950c1d1eab80c5949cd68a2078db" +dependencies = [ + "ctor", + "web-time", +] + [[package]] name = "mio" version = "0.8.11" @@ -3183,6 +4241,49 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "multibase" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b3539ec3c1f04ac9748a260728e855f261b4977f5c3406612c884564f329404" +dependencies = [ + "base-x", + "data-encoding", + "data-encoding-macro", +] + +[[package]] +name = "multihash" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" +dependencies = [ + "blake2b_simd", + "core2", + "digest 0.10.7", + "multihash-derive", + "ripemd", + "serde", + "serde-big-array", + "sha2 0.10.8", + "sha3", + "unsigned-varint 0.7.2", +] + +[[package]] +name = "multihash-derive" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6d4752e6230d8ef7adf7bd5d8c4b1f6561c1014c5ba9a37445ccefe18aa1db" +dependencies = [ + "proc-macro-crate 1.1.3", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure 0.12.6", +] + [[package]] name = "native-tls" version = "0.2.12" @@ -3201,16 +4302,25 @@ dependencies = [ ] [[package]] -name = "nix" -version = "0.26.4" +name = "neptune" +version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "7eaa7f90368545907dce7d5652a78f96a77d1e97019b230edbf54ce2440d5698" dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset", - "pin-utils", + "bellpepper", + "bellpepper-core", + "blake2s_simd 0.5.11", + "blstrs", + "byteorder", + "ec-gpu", + "ec-gpu-gen 0.6.0", + "ff", + "generic-array 0.14.7", + "itertools 0.8.2", + "log", + "pasta_curves", + "serde", + "trait-set", ] [[package]] @@ -3256,6 +4366,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "num-integer" version = "0.1.46" @@ -3322,6 +4443,9 @@ version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" dependencies = [ + "crc32fast", + "hashbrown 0.14.5", + "indexmap 2.2.6", "memchr", ] @@ -3345,10 +4469,10 @@ dependencies = [ "hyper 0.14.29", "hyper-rustls", "hyper-timeout", - "jsonwebtoken 8.3.0", + "jsonwebtoken", "once_cell", "percent-encoding", - "pin-project 1.1.5", + "pin-project", "secrecy", "serde", "serde_json", @@ -3356,7 +4480,7 @@ dependencies = [ "serde_urlencoded", "snafu", "tokio", - "tower", + "tower 0.4.13", "tower-http", "tracing", "url", @@ -3368,6 +4492,31 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "opencl-sys" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de15dd01496ae90c5799f5266184ab020082b4065800ff0b732f489371d0e5cf" +dependencies = [ + "libc", +] + +[[package]] +name = "opencl3" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26ab4a90cb496f787d3934deb0c54fa9d65e7bed710c10071234aab0196fba04" +dependencies = [ + "cl3", + "libc", +] + [[package]] name = "openssl" version = "0.10.64" @@ -3446,10 +4595,13 @@ dependencies = [ ] [[package]] -name = "outref" -version = "0.5.1" +name = "pairing" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" +checksum = "81fec4625e73cf41ef4bb6846cafa6d44736525f442ba45e407c4a000a13996f" +dependencies = [ + "group", +] [[package]] name = "parity-scale-codec" @@ -3457,7 +4609,7 @@ version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ - "arrayvec", + "arrayvec 0.7.4", "bitvec", "byte-slice-cast", "impl-trait-for-tuples", @@ -3471,7 +4623,7 @@ version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -3500,6 +4652,24 @@ dependencies = [ "windows-targets 0.52.5", ] +[[package]] +name = "pasta_curves" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e57598f73cc7e1b2ac63c79c517b31a0877cd7c402cdcaa311b5208de7a095" +dependencies = [ + "blake2b_simd", + "ec-gpu", + "ff", + "group", + "hex", + "lazy_static", + "rand", + "serde", + "static_assertions", + "subtle", +] + [[package]] name = "paste" version = "1.0.15" @@ -3507,22 +4677,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] -name = "pem" -version = "1.1.1" +name = "pathdiff" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" -dependencies = [ - "base64 0.13.1", -] +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pem" -version = "3.0.4" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ - "base64 0.22.1", - "serde", + "base64 0.13.1", ] [[package]] @@ -3552,12 +4718,13 @@ dependencies = [ ] [[package]] -name = "pin-project" -version = "0.4.30" +name = "pharos" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef0f924a5ee7ea9cbcea77529dba45f8a9ba9f622419fe3386ca581a3ae9d5a" +checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" dependencies = [ - "pin-project-internal 0.4.30", + "futures", + "rustc_version 0.4.0", ] [[package]] @@ -3566,18 +4733,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ - "pin-project-internal 1.1.5", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "pin-project-internal", ] [[package]] @@ -3630,6 +4786,29 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +[[package]] +name = "positioned-io" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccabfeeb89c73adf4081f0dca7f8e28dbda90981a222ceea37f619e93ea6afe9" +dependencies = [ + "byteorder", + "libc", + "winapi", +] + +[[package]] +name = "postcard" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e" +dependencies = [ + "cobs", + "embedded-io 0.4.0", + "embedded-io 0.6.1", + "serde", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -3642,6 +4821,16 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "pretty_assertions" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +dependencies = [ + "diff", + "yansi", +] + [[package]] name = "primitive-types" version = "0.12.2" @@ -3653,6 +4842,16 @@ dependencies = [ "uint", ] +[[package]] +name = "proc-macro-crate" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" +dependencies = [ + "thiserror", + "toml", +] + [[package]] name = "proc-macro-crate" version = "3.1.0" @@ -3686,6 +4885,28 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "proc-macro2" version = "1.0.85" @@ -3716,35 +4937,12 @@ dependencies = [ ] [[package]] -name = "prost" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-derive" -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.66", -] - -[[package]] -name = "prost-types" -version = "0.12.6" +name = "psm" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" dependencies = [ - "prost", + "cc", ] [[package]] @@ -3847,6 +5045,12 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "recvmsg" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175" + [[package]] name = "redox_syscall" version = "0.4.1" @@ -3865,6 +5069,19 @@ dependencies = [ "bitflags 2.5.0", ] +[[package]] +name = "regalloc2" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" +dependencies = [ + "hashbrown 0.13.2", + "log", + "rustc-hash", + "slice-group-by", + "smallvec", +] + [[package]] name = "regex" version = "1.10.5" @@ -3909,13 +5126,18 @@ dependencies = [ "bytecheck", ] +[[package]] +name = "replace_with" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a8614ee435691de62bcffcf4a66d91b3594bf1428a5722e79103249a095690" + [[package]] name = "reqwest" version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "async-compression", "base64 0.21.7", "bytes", "encoding_rs", @@ -3925,19 +5147,15 @@ dependencies = [ "http 0.2.12", "http-body 0.4.6", "hyper 0.14.29", - "hyper-rustls", "hyper-tls 0.5.0", "ipnet", "js-sys", "log", "mime", - "mime_guess", "native-tls", "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.12", - "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.4", "serde", "serde_json", @@ -3946,13 +5164,10 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.24.1", - "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-streams", "web-sys", "winreg 0.50.0", ] @@ -4002,7 +5217,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ - "hmac", + "hmac 0.12.1", "subtle", ] @@ -4036,6 +5251,15 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "ripemd" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" +dependencies = [ + "digest 0.10.7", +] + [[package]] name = "rkyv" version = "0.7.44" @@ -4126,13 +5350,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" [[package]] -name = "rusb" -version = "0.9.4" +name = "rust-gpu-tools" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9f9ff05b63a786553a4c02943b74b34a988448671001e9a27e2f0565cc05a4" +checksum = "b0ce78d5548a74fad25177825d0c20f4cfbc6eaf796bcee53afe792e39ede4e2" dependencies = [ - "libc", - "libusb1-sys", + "hex", + "home", + "log", + "once_cell", + "opencl3", + "sha2 0.10.8", + "temp-env", + "thiserror", ] [[package]] @@ -4141,7 +5371,7 @@ version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" dependencies = [ - "arrayvec", + "arrayvec 0.7.4", "borsh", "bytes", "num-traits", @@ -4157,6 +5387,12 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + [[package]] name = "rustc-hex" version = "2.1.0" @@ -4208,39 +5444,26 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ - "log", + "once_cell", "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.4", + "rustls-webpki 0.102.8", "subtle", "zeroize", ] [[package]] name = "rustls-native-certs" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" -dependencies = [ - "openssl-probe", - "rustls-pemfile 1.0.4", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-native-certs" -version = "0.7.0" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.2", - "rustls-pki-types", + "rustls-pemfile 1.0.4", "schannel", "security-framework", ] @@ -4266,9 +5489,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" @@ -4282,9 +5505,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring 0.17.8", "rustls-pki-types", @@ -4479,7 +5702,7 @@ checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct", "der", - "generic-array", + "generic-array 0.14.7", "pkcs8", "subtle", "zeroize", @@ -4494,19 +5717,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "secret-vault-value" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f8cfb86d2019f64a4cfb49e499f401f406fbec946c1ffeea9d0504284347de" -dependencies = [ - "prost", - "prost-types", - "serde", - "serde_json", - "zeroize", -] - [[package]] name = "security-framework" version = "2.11.0" @@ -4554,6 +5764,12 @@ dependencies = [ "pest", ] +[[package]] +name = "send_wrapper" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" + [[package]] name = "serde" version = "1.0.203" @@ -4563,6 +5779,24 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-big-array" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd31f59f6fe2b0c055371bb2f16d7f0aa7d8881676c04a55b1596d1a17cd10a4" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_bytes" +version = "0.11.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +dependencies = [ + "serde", +] + [[package]] name = "serde_derive" version = "1.0.203" @@ -4574,6 +5808,18 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "serde_ipld_dagcbor" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e880e0b1f9c7a8db874642c1217f7e19b29e325f24ab9f0fcb11818adec7f01" +dependencies = [ + "cbor4ii", + "cid", + "scopeguard", + "serde", +] + [[package]] name = "serde_json" version = "1.0.117" @@ -4595,6 +5841,38 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "serde_tuple" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f025b91216f15a2a32aa39669329a475733590a015835d1783549a56d09427" +dependencies = [ + "serde", + "serde_tuple_macros", +] + +[[package]] +name = "serde_tuple_macros" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4076151d1a2b688e25aaf236997933c66e18b870d0369f8b248b8ab2be630d7e" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -4643,6 +5921,19 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +dependencies = [ + "block-buffer 0.9.0", + "cfg-if", + "cpufeatures", + "digest 0.9.0", + "opaque-debug", +] + [[package]] name = "sha2" version = "0.10.8" @@ -4652,6 +5943,41 @@ dependencies = [ "cfg-if", "cpufeatures", "digest 0.10.7", + "sha2-asm", +] + +[[package]] +name = "sha2-asm" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b845214d6175804686b2bd482bcffe96651bb2d1200742b712003504a2dac1ab" +dependencies = [ + "cc", +] + +[[package]] +name = "sha2raw" +version = "13.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73744f6a373edfc5624f452ec705a762e1154bb88c6699242bf37c56d99a6ebb" +dependencies = [ + "byteorder", + "cpufeatures", + "digest 0.10.7", + "fake-simd", + "lazy_static", + "opaque-debug", + "sha2-asm", +] + +[[package]] +name = "sha3" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +dependencies = [ + "digest 0.10.7", + "keccak", ] [[package]] @@ -4664,6 +5990,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -4716,11 +6048,20 @@ dependencies = [ "autocfg", ] +[[package]] +name = "slice-group-by" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" + [[package]] name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "snafu" @@ -4780,6 +6121,12 @@ dependencies = [ "der", ] +[[package]] +name = "sptr" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" + [[package]] name = "sqlformat" version = "0.2.4" @@ -4836,7 +6183,7 @@ dependencies = [ "rust_decimal", "serde", "serde_json", - "sha2", + "sha2 0.10.8", "smallvec", "sqlformat", "thiserror", @@ -4876,7 +6223,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2", + "sha2 0.10.8", "sqlx-core", "sqlx-mysql", "sqlx-postgres", @@ -4908,10 +6255,10 @@ dependencies = [ "futures-core", "futures-io", "futures-util", - "generic-array", + "generic-array 0.14.7", "hex", "hkdf", - "hmac", + "hmac 0.12.1", "itoa", "log", "md-5", @@ -4923,7 +6270,7 @@ dependencies = [ "rust_decimal", "serde", "sha1", - "sha2", + "sha2 0.10.8", "smallvec", "sqlx-core", "stringprep", @@ -4955,7 +6302,7 @@ dependencies = [ "futures-util", "hex", "hkdf", - "hmac", + "hmac 0.12.1", "home", "itoa", "log", @@ -4967,7 +6314,7 @@ dependencies = [ "rust_decimal", "serde", "serde_json", - "sha2", + "sha2 0.10.8", "smallvec", "sqlx-core", "stringprep", @@ -4986,7 +6333,7 @@ checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" dependencies = [ "atoi", "chrono", - "flume", + "flume 0.11.0", "futures-channel", "futures-core", "futures-executor", @@ -5016,6 +6363,127 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "storage-proofs-core" +version = "18.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "390385ae6787ad5d4312f3b6f0462c9f6615d9a7863376f8636604e6e43f3d28" +dependencies = [ + "aes", + "anyhow", + "bellperson", + "blake2b_simd", + "blstrs", + "byteorder", + "cbc", + "config", + "ff", + "filecoin-hashers", + "fr32", + "fs2", + "generic-array 0.14.7", + "itertools 0.10.5", + "lazy_static", + "log", + "memmap2", + "merkletree", + "num_cpus", + "rand", + "rand_chacha", + "rayon", + "semver 1.0.23", + "serde", + "serde_json", + "sha2 0.10.8", + "thiserror", +] + +[[package]] +name = "storage-proofs-porep" +version = "18.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd8c6bbeb00933edb41152fdabf28d2519d6a1b6ea176a793e3198a07bb9acd" +dependencies = [ + "anyhow", + "bellperson", + "bincode", + "blake2b_simd", + "blstrs", + "byte-slice-cast", + "byteorder", + "chacha20", + "crossbeam", + "fdlimit", + "ff", + "filecoin-hashers", + "fr32", + "generic-array 0.14.7", + "glob", + "hex", + "lazy_static", + "libc", + "log", + "memmap2", + "merkletree", + "neptune", + "num-bigint", + "num-traits", + "num_cpus", + "pretty_assertions", + "rayon", + "rustversion", + "serde", + "serde_json", + "sha2 0.10.8", + "sha2raw", + "storage-proofs-core", + "yastl", +] + +[[package]] +name = "storage-proofs-post" +version = "18.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779fbfe1455a57d2a7fd655ce1b2e97bf9f238b65c71919e92aa9df8f2ced8b1" +dependencies = [ + "anyhow", + "bellperson", + "blstrs", + "byteorder", + "ff", + "filecoin-hashers", + "generic-array 0.14.7", + "log", + "rayon", + "serde", + "sha2 0.10.8", + "storage-proofs-core", +] + +[[package]] +name = "storage-proofs-update" +version = "18.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee4b391917dbcffa2297295971a02cc54aa19aa8b5378d539a435e78f8050153" +dependencies = [ + "anyhow", + "bellperson", + "blstrs", + "ff", + "filecoin-hashers", + "fr32", + "generic-array 0.14.7", + "lazy_static", + "log", + "memmap2", + "merkletree", + "neptune", + "rayon", + "serde", + "storage-proofs-core", + "storage-proofs-porep", +] + [[package]] name = "stringprep" version = "0.1.5" @@ -5091,9 +6559,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.7.6" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d71e19bca02c807c9faa67b5a47673ff231b6e7449b251695188522f1dc44b2" +checksum = "4b95156f8b577cb59dc0b1df15c6f29a10afc5f8a7ac9786b0b5c68c19149278" dependencies = [ "paste", "proc-macro2", @@ -5119,6 +6587,18 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-xid", +] + [[package]] name = "synstructure" version = "0.13.1" @@ -5157,6 +6637,21 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "temp-env" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96374855068f47402c3121c6eed88d29cb1de8f3ab27090e273e420bdabcf050" +dependencies = [ + "parking_lot", +] + [[package]] name = "tempfile" version = "3.10.1" @@ -5334,11 +6829,11 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.22.4", + "rustls 0.23.13", "rustls-pki-types", "tokio", ] @@ -5355,6 +6850,22 @@ dependencies = [ "tokio-util", ] +[[package]] +name = "tokio-tungstenite" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" +dependencies = [ + "futures-util", + "log", + "rustls 0.23.13", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tungstenite", + "webpki-roots", +] + [[package]] name = "tokio-util" version = "0.7.11" @@ -5368,6 +6879,15 @@ dependencies = [ "tokio", ] +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + [[package]] name = "toml_datetime" version = "0.6.6" @@ -5386,31 +6906,17 @@ dependencies = [ ] [[package]] -name = "tonic" -version = "0.11.0" +name = "tower" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.21.7", - "bytes", - "h2", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.29", - "hyper-timeout", - "percent-encoding", - "pin-project 1.1.5", - "prost", - "rustls-native-certs 0.7.0", - "rustls-pemfile 2.1.2", - "rustls-pki-types", + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", "tokio", - "tokio-rustls 0.25.0", - "tokio-stream", - "tower", + "tokio-util", "tower-layer", "tower-service", "tracing", @@ -5418,22 +6924,16 @@ dependencies = [ [[package]] name = "tower" -version = "0.4.13" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" dependencies = [ "futures-core", "futures-util", - "indexmap 1.9.3", - "pin-project 1.1.5", "pin-project-lite", - "rand", - "slab", - "tokio", - "tokio-util", + "sync_wrapper", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -5457,27 +6957,15 @@ 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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tower-util" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1093c19826d33807c72511e68f73b4a0469a3f22c2bd5f7d5212178b4b89674" -dependencies = [ - "futures-core", - "futures-util", - "pin-project 0.4.30", - "tower-service", -] +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -5511,12 +6999,43 @@ dependencies = [ "once_cell", ] +[[package]] +name = "trait-set" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b79e2e9c9ab44c6d7c20d5976961b47e8f49ac199154daa514b77cd1ab536625" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "try-lock" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "tungstenite" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "rand", + "rustls 0.23.13", + "rustls-pki-types", + "sha1", + "thiserror", + "utf-8", +] + [[package]] name = "typenum" version = "1.17.0" @@ -5547,15 +7066,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - [[package]] name = "unicode-bidi" version = "0.3.15" @@ -5595,12 +7105,30 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +[[package]] +name = "unicode-xid" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" + [[package]] name = "unicode_categories" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" +[[package]] +name = "unsigned-varint" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" + +[[package]] +name = "unsigned-varint" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" + [[package]] name = "untrusted" version = "0.7.1" @@ -5631,6 +7159,12 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + [[package]] name = "utf16_iter" version = "1.0.5" @@ -5679,12 +7213,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "vsimd" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" - [[package]] name = "wait-timeout" version = "0.2.0" @@ -5782,16 +7310,250 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] -name = "wasm-streams" -version = "0.4.0" +name = "wasm-encoder" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "05632e0a66a6ed8cca593c24223aabd6262f256c3693ad9822c315285f010614" dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", + "leb128", +] + +[[package]] +name = "wasm-encoder" +version = "0.215.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb56df3e06b8e6b77e37d2969a50ba51281029a9aeb3855e76b7f49b6418847" +dependencies = [ + "leb128", +] + +[[package]] +name = "wasmparser" +version = "0.95.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a" +dependencies = [ + "indexmap 1.9.3", + "url", +] + +[[package]] +name = "wasmparser" +version = "0.121.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" +dependencies = [ + "bitflags 2.5.0", + "indexmap 2.2.6", + "semver 1.0.23", +] + +[[package]] +name = "wasmparser" +version = "0.215.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fbde0881f24199b81cf49b6ff8f9c145ac8eb1b7fc439adb5c099734f7d90e" +dependencies = [ + "ahash 0.8.11", + "bitflags 2.5.0", + "hashbrown 0.14.5", + "indexmap 2.2.6", + "semver 1.0.23", + "serde", +] + +[[package]] +name = "wasmprinter" +version = "0.2.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60e73986a6b7fdfedb7c5bf9e7eb71135486507c8fbc4c0c42cffcb6532988b7" +dependencies = [ + "anyhow", + "wasmparser 0.121.2", +] + +[[package]] +name = "wasmprinter" +version = "0.215.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8e9a325d85053408209b3d2ce5eaddd0dd6864d1cff7a007147ba073157defc" +dependencies = [ + "anyhow", + "termcolor", + "wasmparser 0.215.0", +] + +[[package]] +name = "wasmtime" +version = "24.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a5883d64dfc8423c56e3d8df27cffc44db25336aa468e8e0724fddf30a333d7" +dependencies = [ + "anyhow", + "bitflags 2.5.0", + "bumpalo", + "cc", + "cfg-if", + "hashbrown 0.14.5", + "indexmap 2.2.6", + "libc", + "libm", + "log", + "mach2", + "memfd", + "object", + "once_cell", + "paste", + "postcard", + "psm", + "rayon", + "rustix", + "serde", + "serde_derive", + "smallvec", + "sptr", + "target-lexicon", + "wasmparser 0.215.0", + "wasmtime-asm-macros", + "wasmtime-component-macro", + "wasmtime-cranelift", + "wasmtime-environ", + "wasmtime-jit-icache-coherence", + "wasmtime-slab", + "wasmtime-versioned-export-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "wasmtime-asm-macros" +version = "24.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c4dc7e2a379c0dd6be5b55857d14c4b277f43a9c429a9e14403eb61776ae3be" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "wasmtime-component-macro" +version = "24.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b07773d1c3dab5f014ec61316ee317aa424033e17e70a63abdf7c3a47e58fcf" +dependencies = [ + "anyhow", + "proc-macro2", + "quote", + "syn 2.0.66", + "wasmtime-component-util", + "wasmtime-wit-bindgen", + "wit-parser", +] + +[[package]] +name = "wasmtime-component-util" +version = "24.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e38d735320f4e83478369ce649ad8fe87c6b893220902e798547a225fc0c5874" + +[[package]] +name = "wasmtime-cranelift" +version = "24.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e570d831d0785d93d7d8c722b1eb9a34e0d0c1534317666f65892818358a2da9" +dependencies = [ + "anyhow", + "cfg-if", + "cranelift-codegen", + "cranelift-control", + "cranelift-entity", + "cranelift-frontend", + "cranelift-native", + "cranelift-wasm", + "gimli", + "log", + "object", + "target-lexicon", + "thiserror", + "wasmparser 0.215.0", + "wasmtime-environ", + "wasmtime-versioned-export-macros", +] + +[[package]] +name = "wasmtime-environ" +version = "24.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5fe80dfbd81687431a7d4f25929fae1ae96894786d5c96b14ae41164ee97377" +dependencies = [ + "anyhow", + "cranelift-bitset", + "cranelift-entity", + "gimli", + "indexmap 2.2.6", + "log", + "object", + "postcard", + "serde", + "serde_derive", + "target-lexicon", + "wasm-encoder 0.215.0", + "wasmparser 0.215.0", + "wasmprinter 0.215.0", + "wasmtime-types", +] + +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "24.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15de8429db996f0d17a4163a35eccc3f874cbfb50f29c379951ea1bbb39452e" +dependencies = [ + "anyhow", + "cfg-if", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "wasmtime-slab" +version = "24.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f68d38fa6b30c5e1fc7d608263062997306f79e577ebd197ddcd6b0f55d87d1" + +[[package]] +name = "wasmtime-types" +version = "24.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6634e7079d9c5cfc81af8610ed59b488cc5b7f9777a2f4c1667a2565c2e45249" +dependencies = [ + "anyhow", + "cranelift-entity", + "serde", + "serde_derive", + "smallvec", + "wasmparser 0.215.0", +] + +[[package]] +name = "wasmtime-versioned-export-macros" +version = "24.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3850e3511d6c7f11a72d571890b0ed5f6204681f7f050b9de2690e7f13123fed" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "wasmtime-wit-bindgen" +version = "24.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cb331ac7ed1d5ba49cddcdb6b11973752a857148858bb308777d2fc5584121f" +dependencies = [ + "anyhow", + "heck 0.4.1", + "indexmap 2.2.6", + "wit-parser", ] [[package]] @@ -5804,6 +7566,25 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "whoami" version = "1.5.1" @@ -5814,6 +7595,12 @@ dependencies = [ "wasite", ] +[[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + [[package]] name = "winapi" version = "0.3.9" @@ -6031,6 +7818,24 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "wit-parser" +version = "0.215.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "935a97eaffd57c3b413aa510f8f0b550a4a9fe7d59e79cd8b89a83dcb860321f" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.2.6", + "log", + "semver 1.0.23", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser 0.215.0", +] + [[package]] name = "write16" version = "1.0.0" @@ -6043,6 +7848,25 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" +[[package]] +name = "ws_stream_wasm" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7999f5f4217fe3818726b66257a4475f71e74ffd190776ad053fa159e50737f5" +dependencies = [ + "async_io_stream", + "futures", + "js-sys", + "log", + "pharos", + "rustc_version 0.4.0", + "send_wrapper", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "wyz" version = "0.5.1" @@ -6052,6 +7876,22 @@ dependencies = [ "tap", ] +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "yastl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca6c5a4d66c1a9ea261811cf4773c27343de7e5033e1b75ea3f297dc7db3c1a" +dependencies = [ + "flume 0.10.14", + "scopeguard", +] + [[package]] name = "yoke" version = "0.7.4" @@ -6073,7 +7913,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.66", - "synstructure", + "synstructure 0.13.1", ] [[package]] @@ -6114,7 +7954,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.66", - "synstructure", + "synstructure 0.13.1", ] [[package]] diff --git a/fplus-database/Cargo.toml b/fplus-database/Cargo.toml index a8341364..c58545f2 100644 --- a/fplus-database/Cargo.toml +++ b/fplus-database/Cargo.toml @@ -24,7 +24,7 @@ serde = { version = "1.0.164", features = ["derive", "std", serial_test = "3.0.0" sha1 = "0.10.6" serde_json = "1.0.96" -alloy = { git = "https://github.com/alloy-rs/alloy", version = "0.1.0", features = [ +alloy = { git = "https://github.com/alloy-rs/alloy", version = "0.3.2", features = [ "signers", ] } sea-orm-newtype = "0.0.1" diff --git a/fplus-database/src/database/applications.rs b/fplus-database/src/database/applications.rs index 43bf5ec1..c92a1f27 100644 --- a/fplus-database/src/database/applications.rs +++ b/fplus-database/src/database/applications.rs @@ -446,3 +446,14 @@ pub async fn delete_application( application.delete(&conn).await?; Ok(()) } + +pub async fn get_applications_by_client_id( + id: &String, +) -> Result, sea_orm::DbErr> { + let conn = get_database_connection().await?; + let result = Application::find() + .filter(Column::Id.eq(id)) + .all(&conn) + .await?; + Ok(result) +} diff --git a/fplus-database/src/database/autoallocations.rs b/fplus-database/src/database/autoallocations.rs index d296e9de..d557e253 100644 --- a/fplus-database/src/database/autoallocations.rs +++ b/fplus-database/src/database/autoallocations.rs @@ -1,17 +1,35 @@ use crate::get_database_connection; use crate::models::autoallocations::AddressWrapper; -use crate::models::autoallocations::{Column, Entity as Autoallocation}; -use chrono::{DateTime, FixedOffset}; +use crate::models::autoallocations::{ActiveModel, Column, Entity as Autoallocations}; +use chrono::{DateTime, FixedOffset, Utc}; use sea_orm::{entity::*, query::*, DbErr}; pub async fn get_last_client_autoallocation( client_evm_address: impl Into, ) -> Result>, DbErr> { let conn = get_database_connection().await?; - let response = Autoallocation::find() + let response = Autoallocations::find() .filter(Column::EvmWalletAddress.contains(client_evm_address.into())) .one(&conn) .await?; Ok(response.map(|allocation| allocation.last_allocation)) } + +pub async fn create_or_update_autoallocation( + client_evm_address: impl Into + Clone, +) -> Result<(), sea_orm::DbErr> { + let conn = get_database_connection().await?; + let last_autoallocation = get_last_client_autoallocation(client_evm_address.clone()).await?; + + let autoallocation_active_model = ActiveModel { + evm_wallet_address: Set(client_evm_address.into()), + last_allocation: Set(Utc::now().into()), + }; + if last_autoallocation.is_some() { + autoallocation_active_model.update(&conn).await?; + } else { + autoallocation_active_model.insert(&conn).await?; + } + Ok(()) +} diff --git a/fplus-http-server/Cargo.toml b/fplus-http-server/Cargo.toml index da3b97f8..40767228 100644 --- a/fplus-http-server/Cargo.toml +++ b/fplus-http-server/Cargo.toml @@ -29,6 +29,3 @@ async-trait = "0.1.73" uuidv4 = "1.0.0" log = "0.4.20" cron = "0.12.1" -alloy = { git = "https://github.com/alloy-rs/alloy", version = "0.1.0", features = [ - "signers", -] } diff --git a/fplus-http-server/src/main.rs b/fplus-http-server/src/main.rs index 8e27c52b..b9c4e822 100644 --- a/fplus-http-server/src/main.rs +++ b/fplus-http-server/src/main.rs @@ -109,6 +109,7 @@ async fn main() -> std::io::Result<()> { .service(router::allocator::create_allocator_from_json) .service(router::allocator::update_allocator_force) .service(router::autoallocator::last_client_allocation) + .service(router::autoallocator::trigger_autoallocation) // .service(router::allocator::get_installation_ids) }) .bind(("0.0.0.0", 8080))? diff --git a/fplus-http-server/src/router/autoallocator.rs b/fplus-http-server/src/router/autoallocator.rs index 22a3ed87..e09daff5 100644 --- a/fplus-http-server/src/router/autoallocator.rs +++ b/fplus-http-server/src/router/autoallocator.rs @@ -1,6 +1,7 @@ -use actix_web::{get, web, HttpResponse, Responder}; +use actix_web::{get, post, web, HttpResponse, Responder}; use fplus_database::database::autoallocations as autoallocations_db; -use fplus_lib::core::LastAutoallocationQueryParams; +use fplus_lib::core::autoallocator; +use fplus_lib::core::{LastAutoallocationQueryParams, TriggerAutoallocationInfo}; #[get("/autoallocator/last_client_allocation")] pub async fn last_client_allocation( @@ -13,3 +14,11 @@ pub async fn last_client_allocation( Err(e) => HttpResponse::BadRequest().body(e.to_string()), } } + +#[post("autoallocator/trigger_autoallocation")] +pub async fn trigger_autoallocation(info: web::Json) -> impl Responder { + match autoallocator::trigger_autoallocation(&info.into_inner()).await { + Ok(()) => HttpResponse::Ok().body(serde_json::to_string_pretty("Success").unwrap()), + Err(e) => HttpResponse::BadRequest().body(e.to_string()), + } +} diff --git a/fplus-lib/Cargo.toml b/fplus-lib/Cargo.toml index 3852e406..383473a1 100644 --- a/fplus-lib/Cargo.toml +++ b/fplus-lib/Cargo.toml @@ -34,20 +34,10 @@ fplus-database = { path = "../fplus-database", version = "1.8.4"} pem = "1.0" anyhow = "1.0" regex = "1.0" -alloy = { git = "https://github.com/alloy-rs/alloy", version = "0.1.0", features = [ - "signers", - "providers", - "node-bindings", - "sol-types", - "json", - "network", - "rpc-types-eth", - "provider-http", - "dyn-abi", - "eip712", -] } tempfile = "3.10.1" size = "0.5.0-preview2" +alloy = { version = "0.3.2", features = ["full"] } +fvm = "4.4.0" [dev-dependencies] actix-rt = "2.9.0" diff --git a/fplus-lib/src/config.rs b/fplus-lib/src/config.rs index 9cde769d..279a4682 100644 --- a/fplus-lib/src/config.rs +++ b/fplus-lib/src/config.rs @@ -35,6 +35,17 @@ pub fn default_env_vars() -> &'static HashMap<&'static str, &'static str> { m.insert("RPC_URL", "https://mainnet.optimism.io"); m.insert("DMOB_API_URL", "https://api.datacapstats.io/public/api"); m.insert("DMOB_API_KEY", "5c993a17-7b18-4ead-a8a8-89dad981d87e"); + m.insert("DAYS_TO_NEXT_AUTOALLOCATION", "14"); + m.insert("FILECOIN_RPC_URL", "http://127.0.0.1:8545"); + m.insert( + "ALLOCATOR_CONTRACT_ADDRESS", + "0x640bD4be149f40714D95aBcD414338bc7CfF39a3", + ); + m.insert( + "PRIVATE_KEY", + "257d553b55d5928c7ec48c2f7d1288931640166e2c1269e05492914accf7e966", + ); + m.insert("AMOUNT_TO_AUTOALLOCATION", "68719476736"); // 68719476736 B == 64 GB m }) } diff --git a/fplus-lib/src/core/application/gitcoin_interaction.rs b/fplus-lib/src/core/application/gitcoin_interaction.rs index a1a6a2f7..1497edb9 100644 --- a/fplus-lib/src/core/application/gitcoin_interaction.rs +++ b/fplus-lib/src/core/application/gitcoin_interaction.rs @@ -15,6 +15,11 @@ use crate::config::get_env_var_or_default; use crate::error::LDNError; use anyhow::Result; +pub trait ExpirableSolStruct: SolStruct { + fn get_expires_at(&self) -> String; + fn get_issued_at(&self) -> String; +} + sol! { #[allow(missing_docs)] function getScore(address user) view returns (uint256); @@ -28,6 +33,34 @@ sol! { string issued_at; string expires_at; } + + #[derive(Deserialize)] + struct KycAutoallocationApproval { + string message; + string client_fil_address; + string issued_at; + string expires_at; + } +} + +impl ExpirableSolStruct for KycApproval { + fn get_expires_at(&self) -> String { + self.expires_at.clone() + } + + fn get_issued_at(&self) -> String { + self.issued_at.clone() + } +} + +impl ExpirableSolStruct for KycAutoallocationApproval { + fn get_expires_at(&self) -> String { + self.expires_at.clone() + } + + fn get_issued_at(&self) -> String { + self.issued_at.clone() + } } pub async fn verify_on_gitcoin(address_from_signature: &Address) -> Result { @@ -73,8 +106,8 @@ fn calculate_score(response: Bytes) -> f64 { score as f64 / 10000.0 } -pub fn get_address_from_signature( - message: &KycApproval, +pub fn get_address_from_signature( + message: &T, signature: &str, ) -> Result { let domain = eip712_domain! { diff --git a/fplus-lib/src/core/autoallocator/file.rs b/fplus-lib/src/core/autoallocator/file.rs deleted file mode 100644 index 015adce8..00000000 --- a/fplus-lib/src/core/autoallocator/file.rs +++ /dev/null @@ -1,8 +0,0 @@ -use alloy::primitives::Address; -use serde::{Deserialize, Serialize}; - -#[derive(Serialize, Deserialize, Debug, Clone)] -pub struct Autoallocation { - pub evm_wallet_address: Address, - pub last_allocation: String, -} diff --git a/fplus-lib/src/core/autoallocator/metaallocator_interaction.rs b/fplus-lib/src/core/autoallocator/metaallocator_interaction.rs new file mode 100644 index 00000000..1b15a386 --- /dev/null +++ b/fplus-lib/src/core/autoallocator/metaallocator_interaction.rs @@ -0,0 +1,69 @@ +use std::str::FromStr; + +use crate::config::get_env_var_or_default; +use crate::error::LDNError; +use alloy::{ + network::{EthereumWallet, TransactionBuilder}, + primitives::{Address, Bytes, U256}, + providers::{Provider, ProviderBuilder}, + rpc::types::eth::TransactionRequest, + signers::local::PrivateKeySigner, + sol, + sol_types::SolCall, +}; +use anyhow::Result; +use fvm::kernel::prelude::Address as FilecoinAddress; +sol! { + #[allow(missing_docs)] + function addVerifiedClient(bytes calldata clientAddress, uint256 amount); +} + +pub async fn add_verified_client(address: &String, amount: &u64) -> Result<(), LDNError> { + let private_key = get_env_var_or_default("PRIVATE_KEY"); + let signer: PrivateKeySigner = private_key.parse().expect("Should parse private key"); + let wallet = EthereumWallet::from(signer); + let rpc_url = get_env_var_or_default("FILECOIN_RPC_URL") + .parse() + .map_err(|e| LDNError::New(format!("Failed to pase string to URL /// {}", e)))?; + let provider = ProviderBuilder::new() + .with_recommended_fillers() + .wallet(wallet) + .on_http(rpc_url); + let fil_address_bytes = get_filecoin_address_from_string_to_bytes(address)?; + let amount = U256::try_from(amount.clone()) + .map_err(|e| LDNError::New(format!("Failed to prase amount to U256 /// {}", e)))?; + let call = addVerifiedClientCall { + clientAddress: fil_address_bytes.into(), + amount, + } + .abi_encode(); + let allocator_contract = + Address::parse_checksummed(get_env_var_or_default("ALLOCATOR_CONTRACT_ADDRESS"), None) + .map_err(|e| { + LDNError::New(format!( + "Parse ALLOCATOR_CONTRACT_ADDRESS to Address failed: {}", + e + )) + })?; + let input = Bytes::from(call); + + let tx = TransactionRequest::default() + .with_to(allocator_contract) + .with_input(input) + .with_gas_limit(45_000_000); + + provider + .send_transaction(tx) + .await + .map_err(|e| LDNError::New(format!("RPC error: {}", e)))? + .watch() + .await + .map_err(|e| LDNError::New(format!("Transaction failed: {}", e)))?; + Ok(()) +} + +fn get_filecoin_address_from_string_to_bytes(address: &str) -> Result, LDNError> { + let fil_address = FilecoinAddress::from_str(address) + .map_err(|e| LDNError::New(format!("Failed to prase address from string /// {}", e)))?; + Ok(fil_address.to_bytes()) +} diff --git a/fplus-lib/src/core/autoallocator/mod.rs b/fplus-lib/src/core/autoallocator/mod.rs index f3369949..bb9ec48d 100644 --- a/fplus-lib/src/core/autoallocator/mod.rs +++ b/fplus-lib/src/core/autoallocator/mod.rs @@ -1,14 +1,70 @@ -use self::file::Autoallocation; +use crate::core::autoallocator::metaallocator_interaction::add_verified_client; +use crate::core::get_env_var_or_default; +use crate::core::verify_on_gitcoin; +use crate::core::{LDNApplication, TriggerAutoallocationInfo}; +use crate::error::LDNError; use alloy::primitives::Address; -use chrono::Utc; +use chrono::{Duration, Utc}; +use fplus_database::database::applications::get_applications_by_client_id; +use fplus_database::database::autoallocations as autoallocations_db; -pub mod file; +pub mod metaallocator_interaction; -impl Autoallocation { - pub fn new(evm_wallet_address: Address) -> Self { - Self { - evm_wallet_address, - last_allocation: Utc::now().to_string(), +pub async fn trigger_autoallocation(info: &TriggerAutoallocationInfo) -> Result<(), LDNError> { + let evm_address_from_signature = + LDNApplication::verify_kyc_data_and_get_eth_address(&info.message, &info.signature)?; + autoallocation_timeout_exceeded(&evm_address_from_signature).await?; + verify_on_gitcoin(&evm_address_from_signature).await?; + let fil_client_address = &info.message.client_fil_address; + let client_applications = get_applications_by_client_id(fil_client_address) + .await + .map_err(|e| LDNError::Load(format!("Get applications for client failed: {}", e)))?; + if client_applications.len() != 0 { + return Err(LDNError::Load( + "Cient already has an application".to_string(), + )); + } + + let amount = get_env_var_or_default("AMOUNT_TO_AUTOALLOCATION") + .parse::() + .map_err(|e| { + LDNError::New(format!( + "Parse days to next allocation to i64 failed: {}", + e + )) + })?; + add_verified_client(&fil_client_address, &amount).await?; + autoallocations_db::create_or_update_autoallocation(evm_address_from_signature.clone()) + .await + .map_err(|e| LDNError::New(format!("Create or update autoallocation failed: {}", e)))?; + Ok(()) +} + +async fn autoallocation_timeout_exceeded( + evm_address_from_signature: &Address, +) -> Result<(), LDNError> { + let last_client_allocation = + autoallocations_db::get_last_client_autoallocation(evm_address_from_signature.clone()) + .await + .map_err(|e| { + LDNError::Load(format!("Failed to get last client allocation /// {}", e)) + })?; + + if let Some(last_client_allocation) = last_client_allocation { + let days_to_next_autoallocation = get_env_var_or_default("DAYS_TO_NEXT_AUTOALLOCATION") + .parse::() + .map_err(|e| { + LDNError::New(format!( + "Parse days to next allocation to i64 failed: {}", + e + )) + })?; + if (last_client_allocation + Duration::days(days_to_next_autoallocation)) > Utc::now() { + return Err(LDNError::Load(format!( + "Last allocation was within {} days.", + days_to_next_autoallocation + ))); } } + Ok(()) } diff --git a/fplus-lib/src/core/mod.rs b/fplus-lib/src/core/mod.rs index d93301cf..674e475e 100644 --- a/fplus-lib/src/core/mod.rs +++ b/fplus-lib/src/core/mod.rs @@ -2,6 +2,7 @@ use std::str::FromStr; use std::sync::Arc; use alloy::primitives::Address; + use chrono::{DateTime, Local, Utc}; use futures::future; use octocrab::models::{ @@ -18,7 +19,10 @@ use crate::{ config::get_env_var_or_default, core::application::{ file::Allocations, - gitcoin_interaction::{get_address_from_signature, verify_on_gitcoin, KycApproval}, + gitcoin_interaction::{ + get_address_from_signature, verify_on_gitcoin, ExpirableSolStruct, KycApproval, + KycAutoallocationApproval, + }, }, error::LDNError, external_services::{ @@ -169,6 +173,11 @@ pub struct LastAutoallocationQueryParams { pub evm_wallet_address: Address, } +#[derive(Deserialize)] +pub struct TriggerAutoallocationInfo { + pub message: KycAutoallocationApproval, + pub signature: String, +} #[derive(Deserialize)] pub struct GithubQueryParams { pub owner: String, @@ -3905,11 +3914,16 @@ _The initial issue can be edited in order to solve the request of the verifier. )) })?; let application_file = serde_json::from_str::(&app_str).unwrap(); - let address_from_signature = LDNApplication::verify_kyc_data_and_get_eth_address( - &info.message, - &info.signature, - &application_file.lifecycle.state, - )?; + + if application_file.lifecycle.state.clone() != AppState::KYCRequested { + return Err(LDNError::Load(format!( + "Application state is {:?}. Expected RequestKYC", + application_file.lifecycle.state + ))); + } + + let address_from_signature = + LDNApplication::verify_kyc_data_and_get_eth_address(&info.message, &info.signature)?; let score = verify_on_gitcoin(&address_from_signature).await?; let application_file = application_file.move_back_to_submit_state(); @@ -4006,30 +4020,23 @@ _The initial issue can be edited in order to solve the request of the verifier. Ok(current_timestamp < &issued_date_to_datetime) } - fn verify_kyc_data_and_get_eth_address( - message: &KycApproval, + fn verify_kyc_data_and_get_eth_address( + message: &T, signature: &str, - application_state: &AppState, ) -> Result { let address_from_signature = get_address_from_signature(message, signature)?; - if application_state.clone() != AppState::KYCRequested { - return Err(LDNError::Load(format!( - "Application state is {:?}. Expected RequestKYC", - application_state - ))); - } let current_timestamp = Local::now(); - if LDNApplication::date_is_expired(&message.expires_at, ¤t_timestamp)? { + if LDNApplication::date_is_expired(&message.get_expires_at(), ¤t_timestamp)? { return Err(LDNError::Load(format!( "Message expired at {}", - message.expires_at + message.get_expires_at() ))); } - if LDNApplication::date_is_from_future(&message.issued_at, ¤t_timestamp)? { + if LDNApplication::date_is_from_future(&message.get_issued_at(), ¤t_timestamp)? { return Err(LDNError::Load(format!( "Message issued date {} is from future", - message.issued_at + message.get_issued_at() ))); } Ok(address_from_signature) From 4a6353363bf9d1c26170f1c61cb351d87c747535 Mon Sep 17 00:00:00 2001 From: Filip Lelek Date: Wed, 18 Sep 2024 14:16:00 +0200 Subject: [PATCH 04/10] Chnages according to CR --- Cargo.lock | 2193 ++--------------- fplus-database/Cargo.toml | 4 +- .../src/database/autoallocations.rs | 57 +- fplus-http-server/src/router/autoallocator.rs | 1 - fplus-lib/Cargo.toml | 2 +- fplus-lib/src/config.rs | 7 +- .../core/application/gitcoin_interaction.rs | 20 +- .../metaallocator_interaction.rs | 24 +- fplus-lib/src/core/autoallocator/mod.rs | 68 +- fplus-lib/src/core/mod.rs | 4 +- 10 files changed, 255 insertions(+), 2125 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bef634f2..51a4c4d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -215,17 +215,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - [[package]] name = "ahash" version = "0.7.8" @@ -292,41 +281,25 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c37d89f69cb43901949ba29307ada8b9e3b170f94057ad4c04d6fd169d24d65f" dependencies = [ - "alloy-consensus 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-consensus", "alloy-contract", "alloy-core", - "alloy-eips 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-genesis 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-network 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-provider 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-eips", + "alloy-genesis", + "alloy-network", + "alloy-provider", "alloy-pubsub", - "alloy-rpc-client 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-rpc-client", "alloy-rpc-types", - "alloy-serde 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-signer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-serde", + "alloy-signer", "alloy-signer-local", - "alloy-transport 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-transport-http 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-transport", + "alloy-transport-http", "alloy-transport-ipc", "alloy-transport-ws", ] -[[package]] -name = "alloy" -version = "0.3.3" -source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" -dependencies = [ - "alloy-consensus 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-core", - "alloy-eips 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-genesis 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-provider 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-rpc-client 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-serde 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-signer 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-transport-http 0.3.3 (git+https://github.com/alloy-rs/alloy)", -] - [[package]] name = "alloy-chains" version = "0.1.19" @@ -343,23 +316,10 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1468e3128e07c7afe4ff13c17e8170c330d12c322f8924b8bf6986a27e0aad3d" dependencies = [ - "alloy-eips 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-primitives", - "alloy-rlp", - "alloy-serde 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "c-kzg", - "serde", -] - -[[package]] -name = "alloy-consensus" -version = "0.3.3" -source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" -dependencies = [ - "alloy-eips 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-serde", "c-kzg", "serde", ] @@ -372,14 +332,14 @@ checksum = "335d62de1a887f1b780441f8a3037f39c9fb26839cc9acd891c9b80396145cd5" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", - "alloy-network 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-network-primitives 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-network", + "alloy-network-primitives", "alloy-primitives", - "alloy-provider 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-provider", "alloy-pubsub", - "alloy-rpc-types-eth 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-rpc-types-eth", "alloy-sol-types", - "alloy-transport 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-transport", "futures", "futures-util", "thiserror", @@ -447,29 +407,12 @@ dependencies = [ "alloy-eip7702", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "c-kzg", - "derive_more 1.0.0", - "once_cell", - "serde", - "sha2 0.10.8", -] - -[[package]] -name = "alloy-eips" -version = "0.3.3" -source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" -dependencies = [ - "alloy-eip2930", - "alloy-eip7702", - "alloy-primitives", - "alloy-rlp", - "alloy-serde 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-serde", "c-kzg", "derive_more 1.0.0", "once_cell", "serde", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -479,17 +422,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7210f9206c0fa2a83c824cf8cb6c962126bc9fdc4f41ade1932f14150ef5f6" dependencies = [ "alloy-primitives", - "alloy-serde 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde", -] - -[[package]] -name = "alloy-genesis" -version = "0.3.3" -source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" -dependencies = [ - "alloy-primitives", - "alloy-serde 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-serde", "serde", ] @@ -519,53 +452,20 @@ dependencies = [ "tracing", ] -[[package]] -name = "alloy-json-rpc" -version = "0.3.3" -source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" -dependencies = [ - "alloy-primitives", - "alloy-sol-types", - "serde", - "serde_json", - "thiserror", - "tracing", -] - [[package]] name = "alloy-network" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abe714e233f9eaf410de95a9af6bcd05d3a7f8c8de7a0817221e95a6b642a080" dependencies = [ - "alloy-consensus 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-eips 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-json-rpc 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-network-primitives 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-primitives", - "alloy-rpc-types-eth 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-serde 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-signer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-sol-types", - "async-trait", - "auto_impl", - "futures-utils-wasm", - "thiserror", -] - -[[package]] -name = "alloy-network" -version = "0.3.3" -source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" -dependencies = [ - "alloy-consensus 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-eips 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-json-rpc 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-network-primitives 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-consensus", + "alloy-eips", + "alloy-json-rpc", + "alloy-network-primitives", "alloy-primitives", - "alloy-rpc-types-eth 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-serde 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-signer 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-rpc-types-eth", + "alloy-serde", + "alloy-signer", "alloy-sol-types", "async-trait", "auto_impl", @@ -579,20 +479,9 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c5a38117974c5776a45e140226745a0b664f79736aa900995d8e4121558e064" dependencies = [ - "alloy-eips 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-primitives", - "alloy-serde 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde", -] - -[[package]] -name = "alloy-network-primitives" -version = "0.3.3" -source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" -dependencies = [ - "alloy-eips 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-eips", "alloy-primitives", - "alloy-serde 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-serde", "serde", ] @@ -625,17 +514,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c65633d6ef83c3626913c004eaf166a6dd50406f724772ea8567135efd6dc5d3" dependencies = [ "alloy-chains", - "alloy-consensus 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-eips 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-json-rpc 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-network 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-network-primitives 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-consensus", + "alloy-eips", + "alloy-json-rpc", + "alloy-network", + "alloy-network-primitives", "alloy-primitives", "alloy-pubsub", - "alloy-rpc-client 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-rpc-types-eth 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-transport 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-transport-http 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-rpc-client", + "alloy-rpc-types-eth", + "alloy-transport", + "alloy-transport-http", "alloy-transport-ipc", "alloy-transport-ws", "async-stream", @@ -655,48 +544,15 @@ dependencies = [ "url", ] -[[package]] -name = "alloy-provider" -version = "0.3.3" -source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" -dependencies = [ - "alloy-chains", - "alloy-consensus 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-eips 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-json-rpc 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-network 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-network-primitives 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-primitives", - "alloy-rpc-client 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-rpc-types-eth 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-transport 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-transport-http 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "async-stream", - "async-trait", - "auto_impl", - "dashmap", - "futures", - "futures-utils-wasm", - "lru", - "pin-project", - "reqwest 0.12.4", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "url", -] - [[package]] name = "alloy-pubsub" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "949db89abae6193b44cc90ebf2eeb74eb8d2a474383c5e62b45bdcd362e84f8f" dependencies = [ - "alloy-json-rpc 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-json-rpc", "alloy-primitives", - "alloy-transport 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-transport", "bimap", "futures", "serde", @@ -714,7 +570,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b155716bab55763c95ba212806cf43d05bcc70e5f35b02bad20cf5ec7fe11fed" dependencies = [ "alloy-rlp-derive", - "arrayvec 0.7.4", + "arrayvec", "bytes", ] @@ -735,11 +591,11 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5fc328bb5d440599ba1b5aa44c0b9ab0625fbc3a403bb5ee94ed4a01ba23e07" dependencies = [ - "alloy-json-rpc 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-json-rpc", "alloy-primitives", "alloy-pubsub", - "alloy-transport 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-transport-http 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-transport", + "alloy-transport-http", "alloy-transport-ipc", "alloy-transport-ws", "futures", @@ -754,26 +610,6 @@ dependencies = [ "url", ] -[[package]] -name = "alloy-rpc-client" -version = "0.3.3" -source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" -dependencies = [ - "alloy-json-rpc 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-transport 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-transport-http 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "futures", - "pin-project", - "reqwest 0.12.4", - "serde", - "serde_json", - "tokio", - "tokio-stream", - "tower 0.5.1", - "tracing", - "url", -] - [[package]] name = "alloy-rpc-types" version = "0.3.3" @@ -781,8 +617,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f8ff679f94c497a8383f2cd09e2a099266e5f3d5e574bc82b4b379865707dbb" dependencies = [ "alloy-rpc-types-engine", - "alloy-rpc-types-eth 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-serde 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-rpc-types-eth", + "alloy-serde", "serde", ] @@ -792,12 +628,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b66bb45f4c5efe227bcb51d89c97221225169976e18097671a0bd4393d8248a4" dependencies = [ - "alloy-consensus 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-eips 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-consensus", + "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types-eth 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-serde 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-rpc-types-eth", + "alloy-serde", "serde", "thiserror", ] @@ -808,12 +644,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a59b1d7c86e0a653e7f3d29954f6de5a2878d8cfd1f010ff93be5c2c48cd3b1" dependencies = [ - "alloy-consensus 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-eips 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-network-primitives 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-consensus", + "alloy-eips", + "alloy-network-primitives", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-serde", "alloy-sol-types", "itertools 0.13.0", "serde", @@ -821,26 +657,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "alloy-rpc-types-eth" -version = "0.3.3" -source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" -dependencies = [ - "alloy-consensus 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-eips 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-network-primitives 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-primitives", - "alloy-rlp", - "alloy-serde 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-sol-types", - "cfg-if", - "derive_more 1.0.0", - "hashbrown 0.14.5", - "itertools 0.13.0", - "serde", - "serde_json", -] - [[package]] name = "alloy-serde" version = "0.3.3" @@ -852,16 +668,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "alloy-serde" -version = "0.3.3" -source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" -dependencies = [ - "alloy-primitives", - "serde", - "serde_json", -] - [[package]] name = "alloy-signer" version = "0.3.3" @@ -876,29 +682,16 @@ dependencies = [ "thiserror", ] -[[package]] -name = "alloy-signer" -version = "0.3.3" -source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" -dependencies = [ - "alloy-primitives", - "async-trait", - "auto_impl", - "elliptic-curve", - "k256", - "thiserror", -] - [[package]] name = "alloy-signer-local" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bfb3508485aa798efb5725322e414313239274d3780079b7f8c6746b8ee6e1b" dependencies = [ - "alloy-consensus 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-network 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-consensus", + "alloy-network", "alloy-primitives", - "alloy-signer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-signer", "async-trait", "k256", "rand", @@ -929,7 +722,7 @@ dependencies = [ "alloy-sol-macro-input", "const-hex", "heck 0.5.0", - "indexmap 2.2.6", + "indexmap", "proc-macro-error2", "proc-macro2", "quote", @@ -984,25 +777,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd5dc4e902f1860d54952446d246ac05386311ad61030a2b906ae865416d36e0" dependencies = [ - "alloy-json-rpc 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "base64 0.22.1", - "futures-util", - "futures-utils-wasm", - "serde", - "serde_json", - "thiserror", - "tokio", - "tower 0.5.1", - "tracing", - "url", -] - -[[package]] -name = "alloy-transport" -version = "0.3.3" -source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" -dependencies = [ - "alloy-json-rpc 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-json-rpc", "base64 0.22.1", "futures-util", "futures-utils-wasm", @@ -1021,22 +796,8 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1742b94bb814f1ca6b322a6f9dd38a0252ff45a3119e40e888fb7029afa500ce" dependencies = [ - "alloy-json-rpc 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-transport 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "reqwest 0.12.4", - "serde_json", - "tower 0.5.1", - "tracing", - "url", -] - -[[package]] -name = "alloy-transport-http" -version = "0.3.3" -source = "git+https://github.com/alloy-rs/alloy#8c5aff5dcb823e42b392d4847775e0110602ce8c" -dependencies = [ - "alloy-json-rpc 0.3.3 (git+https://github.com/alloy-rs/alloy)", - "alloy-transport 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-json-rpc", + "alloy-transport", "reqwest 0.12.4", "serde_json", "tower 0.5.1", @@ -1050,9 +811,9 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be321aac6f06d86855d41d4ce9ff9feb877fe7e9fe1cafce7380b981c12398c7" dependencies = [ - "alloy-json-rpc 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-json-rpc", "alloy-pubsub", - "alloy-transport 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-transport", "bytes", "futures", "interprocess", @@ -1070,7 +831,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8ed861e7030001364c8ffa2db63541f7bae275a6e636de7616c20f2fd3dc0c3" dependencies = [ "alloy-pubsub", - "alloy-transport 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-transport", "futures", "http 1.1.0", "rustls 0.23.13", @@ -1081,18 +842,6 @@ dependencies = [ "ws_stream_wasm", ] -[[package]] -name = "ambassador" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b27ba24e4d8a188489d5a03c7fabc167a60809a383cdb4d15feb37479cd2a48" -dependencies = [ - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "android-tzdata" version = "0.1.1" @@ -1113,15 +862,6 @@ name = "anyhow" version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" -dependencies = [ - "backtrace", -] - -[[package]] -name = "arbitrary" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "arc-swap" @@ -1259,12 +999,6 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.4" @@ -1392,60 +1126,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" -[[package]] -name = "bellpepper" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0271a107b5f600ee41bdafbb3c8ddf4afa52983d4b078917d89dbb920116e987" -dependencies = [ - "bellpepper-core", - "byteorder", - "ff", -] - -[[package]] -name = "bellpepper-core" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2c9a1b2f748c59938bc72165ebdf34efffeecee9cfbe0bb7d6b01aea21cd523" -dependencies = [ - "blake2s_simd 1.0.2", - "byteorder", - "ff", - "serde", - "thiserror", -] - -[[package]] -name = "bellperson" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c41bd83b8437856d267eb311de13dcd9bff9077cc5ba35c7ec886070dea8a45" -dependencies = [ - "bellpepper-core", - "bincode", - "blake2s_simd 1.0.2", - "blstrs", - "byteorder", - "crossbeam-channel", - "digest 0.10.7", - "ec-gpu", - "ec-gpu-gen 0.7.1", - "ff", - "fs2", - "group", - "log", - "memmap2", - "pairing", - "rand", - "rand_core", - "rayon", - "rustversion", - "serde", - "sha2 0.10.8", - "thiserror", -] - [[package]] name = "bigdecimal" version = "0.3.1" @@ -1463,15 +1143,6 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7" -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - [[package]] name = "bit-set" version = "0.5.3" @@ -1521,80 +1192,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", - "arrayvec 0.7.4", - "constant_time_eq 0.3.1", + "arrayvec", + "constant_time_eq", ] [[package]] -name = "blake2s_simd" -version = "0.5.11" +name = "block-buffer" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "constant_time_eq 0.1.5", + "generic-array", ] [[package]] -name = "blake2s_simd" -version = "1.0.2" +name = "blst" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" -dependencies = [ - "arrayref", - "arrayvec 0.7.4", - "constant_time_eq 0.3.1", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array 0.14.7", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array 0.14.7", -] - -[[package]] -name = "block-padding" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" -dependencies = [ - "generic-array 0.14.7", -] - -[[package]] -name = "bls-signatures" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7fce0356b52c2483bb6188cc8bdc11add526bce75d1a44e5e5d889a6ab008" -dependencies = [ - "blst", - "blstrs", - "ff", - "group", - "pairing", - "rand_core", - "subtle", - "thiserror", -] - -[[package]] -name = "blst" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62dc83a094a71d43eeadd254b1ec2d24cb6a0bb6cadce00df51f0db594711a32" +checksum = "62dc83a094a71d43eeadd254b1ec2d24cb6a0bb6cadce00df51f0db594711a32" dependencies = [ "cc", "glob", @@ -1602,23 +1217,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "blstrs" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8a8ed6fefbeef4a8c7b460e4110e12c5e22a5b7cf32621aae6ad650c4dcf29" -dependencies = [ - "blst", - "byte-slice-cast", - "ec-gpu", - "ff", - "group", - "pairing", - "rand_core", - "serde", - "subtle", -] - [[package]] name = "borsh" version = "1.5.1" @@ -1736,15 +1334,6 @@ dependencies = [ "serde", ] -[[package]] -name = "cbc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" -dependencies = [ - "cipher", -] - [[package]] name = "cbor4ii" version = "0.2.14" @@ -1777,17 +1366,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" -[[package]] -name = "chacha20" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - [[package]] name = "chrono" version = "0.4.38" @@ -1817,47 +1395,6 @@ dependencies = [ "unsigned-varint 0.7.2", ] -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "cl3" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823f24e72fa0c68aa14a250ae1c0848e68d4ae188b71c3972343e45b46f8644" -dependencies = [ - "libc", - "opencl-sys", - "thiserror", -] - -[[package]] -name = "cobs" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" - -[[package]] -name = "config" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ad70579325f1a38ea4c13412b82241c5900700a69785d73e2736bd65a33f86" -dependencies = [ - "async-trait", - "lazy_static", - "nom", - "pathdiff", - "serde", - "toml", -] - [[package]] name = "const-hex" version = "1.12.0" @@ -1877,12 +1414,6 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "constant_time_eq" version = "0.3.1" @@ -1895,15 +1426,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "cookie" version = "0.16.2" @@ -1949,128 +1471,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cranelift-bforest" -version = "0.111.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b80c3a50b9c4c7e5b5f73c0ed746687774fc9e36ef652b110da8daebf0c6e0e6" -dependencies = [ - "cranelift-entity", -] - -[[package]] -name = "cranelift-bitset" -version = "0.111.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38778758c2ca918b05acb2199134e0c561fb577c50574259b26190b6c2d95ded" -dependencies = [ - "serde", - "serde_derive", -] - -[[package]] -name = "cranelift-codegen" -version = "0.111.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58258667ad10e468bfc13a8d620f50dfcd4bb35d668123e97defa2549b9ad397" -dependencies = [ - "bumpalo", - "cranelift-bforest", - "cranelift-bitset", - "cranelift-codegen-meta", - "cranelift-codegen-shared", - "cranelift-control", - "cranelift-entity", - "cranelift-isle", - "gimli", - "hashbrown 0.14.5", - "log", - "regalloc2", - "rustc-hash", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cranelift-codegen-meta" -version = "0.111.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043f0b702e529dcb07ff92bd7d40e7d5317b5493595172c5eb0983343751ee06" -dependencies = [ - "cranelift-codegen-shared", -] - -[[package]] -name = "cranelift-codegen-shared" -version = "0.111.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7763578888ab53eca5ce7da141953f828e82c2bfadcffc106d10d1866094ffbb" - -[[package]] -name = "cranelift-control" -version = "0.111.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32db15f08c05df570f11e8ab33cb1ec449a64b37c8a3498377b77650bef33d8b" -dependencies = [ - "arbitrary", -] - -[[package]] -name = "cranelift-entity" -version = "0.111.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5289cdb399381a27e7bbfa1b42185916007c3d49aeef70b1d01cb4caa8010130" -dependencies = [ - "cranelift-bitset", - "serde", - "serde_derive", -] - -[[package]] -name = "cranelift-frontend" -version = "0.111.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ba8ab24eb9470477e98ddfa3c799a649ac5a0d9a2042868c4c952133c234e8" -dependencies = [ - "cranelift-codegen", - "log", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cranelift-isle" -version = "0.111.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72a3c5c166a70426dcb209bdd0bb71a787c1ea76023dc0974fbabca770e8f9" - -[[package]] -name = "cranelift-native" -version = "0.111.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a42424c956bbc31fc5c2706073df896156c5420ae8fa2a5d48dbc7b295d71b" -dependencies = [ - "cranelift-codegen", - "libc", - "target-lexicon", -] - -[[package]] -name = "cranelift-wasm" -version = "0.111.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49778df4289933d735b93c30a345513e030cf83101de0036e19b760f8aa09f68" -dependencies = [ - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", - "itertools 0.12.1", - "log", - "smallvec", - "wasmparser 0.215.0", - "wasmtime-types", -] - [[package]] name = "crc" version = "3.2.1" @@ -2106,28 +1506,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "crossbeam" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" version = "0.8.5" @@ -2174,7 +1552,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ - "generic-array 0.14.7", + "generic-array", "rand_core", "subtle", "zeroize", @@ -2186,39 +1564,10 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.7", + "generic-array", "typenum", ] -[[package]] -name = "crypto-mac" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" -dependencies = [ - "generic-array 0.14.7", - "subtle", -] - -[[package]] -name = "cs_serde_bytes" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc673ddabf48214550526b068dc28065a75f05e21e452880095247c635b1d91" -dependencies = [ - "serde", -] - -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - [[package]] name = "darling" version = "0.20.10" @@ -2332,7 +1681,7 @@ version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "convert_case 0.4.0", + "convert_case", "proc-macro2", "quote", "rustc_version 0.4.0", @@ -2354,26 +1703,19 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ - "convert_case 0.6.0", "proc-macro2", "quote", "syn 2.0.66", "unicode-xid", ] -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - [[package]] name = "digest" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.7", + "generic-array", ] [[package]] @@ -2382,7 +1724,7 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "const-oid", "crypto-common", "subtle", @@ -2429,58 +1771,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" -[[package]] -name = "ec-gpu" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd63582de2b59ea1aa48d7c1941b5d87618d95484397521b3acdfa0e1e9f5e45" - -[[package]] -name = "ec-gpu-gen" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "892df2aa20abec5b816e15d5d6383892ca142077708efa3067dd3ac44b75c664" -dependencies = [ - "bitvec", - "crossbeam-channel", - "ec-gpu", - "execute", - "ff", - "group", - "hex", - "log", - "num_cpus", - "once_cell", - "rayon", - "rust-gpu-tools", - "sha2 0.10.8", - "thiserror", - "yastl", -] - -[[package]] -name = "ec-gpu-gen" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2353854622ec1abfd22243eb958453b95f1502e2a56648bf9db49ccbfb55f01" -dependencies = [ - "bitvec", - "crossbeam-channel", - "ec-gpu", - "execute", - "ff", - "group", - "hex", - "log", - "num_cpus", - "once_cell", - "rayon", - "rust-gpu-tools", - "sha2 0.10.8", - "thiserror", - "yastl", -] - [[package]] name = "ecdsa" version = "0.16.9" @@ -2514,7 +1804,7 @@ dependencies = [ "crypto-bigint", "digest 0.10.7", "ff", - "generic-array 0.14.7", + "generic-array", "group", "pkcs8", "rand_core", @@ -2523,18 +1813,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "embedded-io" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" - -[[package]] -name = "embedded-io" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" - [[package]] name = "encoding_rs" version = "0.8.34" @@ -2590,160 +1868,31 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "execute" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a82608ee96ce76aeab659e9b8d3c2b787bffd223199af88c674923d861ada10" -dependencies = [ - "execute-command-macro", - "execute-command-tokens", - "generic-array 1.1.0", -] - -[[package]] -name = "execute-command-macro" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90dec53d547564e911dc4ff3ecb726a64cf41a6fa01a2370ebc0d95175dd08bd" -dependencies = [ - "execute-command-macro-impl", -] - -[[package]] -name = "execute-command-macro-impl" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce8cd46a041ad005ab9c71263f9a0ff5b529eac0fe4cc9b4a20f4f0765d8cf4b" -dependencies = [ - "execute-command-tokens", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "execute-command-tokens" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69dc321eb6be977f44674620ca3aa21703cb20ffbe560e1ae97da08401ffbcad" - -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - -[[package]] -name = "fallible-iterator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" - [[package]] name = "fastrand" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" -[[package]] -name = "fastrlp" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418" -dependencies = [ - "arrayvec 0.7.4", - "auto_impl", - "bytes", -] - -[[package]] -name = "fdlimit" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4c9e43643f5a3be4ca5b67d26b98031ff9db6806c3440ae32e02e3ceac3f1b" -dependencies = [ - "libc", -] - -[[package]] -name = "ff" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" -dependencies = [ - "bitvec", - "rand_core", - "subtle", -] - -[[package]] -name = "filecoin-hashers" -version = "13.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85413176cea16bfe171caafab023044820c0033b243b535b19116776ffd3f285" -dependencies = [ - "anyhow", - "bellperson", - "blstrs", - "ff", - "generic-array 0.14.7", - "hex", - "lazy_static", - "merkletree", - "neptune", - "rand", - "serde", - "sha2 0.10.8", -] - -[[package]] -name = "filecoin-proofs" -version = "18.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "096b8b483f6ed5823150daf6cd22ee8e32b3dabcb4fd70dab70044e73bcab107" -dependencies = [ - "anyhow", - "bellperson", - "bincode", - "blake2b_simd", - "blstrs", - "ff", - "filecoin-hashers", - "fr32", - "generic-array 0.14.7", - "hex", - "iowrap", - "lazy_static", - "log", - "memmap2", - "merkletree", - "once_cell", - "rand", - "rayon", - "serde", - "serde_json", - "sha2 0.10.8", - "storage-proofs-core", - "storage-proofs-porep", - "storage-proofs-post", - "storage-proofs-update", - "typenum", +[[package]] +name = "fastrlp" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418" +dependencies = [ + "arrayvec", + "auto_impl", + "bytes", ] [[package]] -name = "filecoin-proofs-api" -version = "18.1.0" +name = "ff" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aea8140d1e2d2ac18347e6121ee24d0e903f9cfdc2eb2ee507932e352c9e7b8" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "anyhow", - "bincode", - "blstrs", - "filecoin-proofs", - "fr32", - "lazy_static", - "serde", - "storage-proofs-core", + "rand_core", + "subtle", ] [[package]] @@ -2768,15 +1917,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "flume" -version = "0.10.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" -dependencies = [ - "spin 0.9.8", -] - [[package]] name = "flume" version = "0.11.0" @@ -2809,16 +1949,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -[[package]] -name = "forest_hash_utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb061ad769411763a5d6ae39d596696657472b25a66387fbb0ba8c133bb6575" -dependencies = [ - "cs_serde_bytes", - "serde", -] - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -2832,7 +1962,7 @@ dependencies = [ name = "fplus-database" version = "1.8.4" dependencies = [ - "alloy 0.3.3 (git+https://github.com/alloy-rs/alloy)", + "alloy", "anyhow", "chrono", "dotenv", @@ -2880,7 +2010,7 @@ version = "1.8.4" dependencies = [ "actix-rt", "actix-web", - "alloy 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy", "anyhow", "base64 0.13.1", "chrono", @@ -2888,7 +2018,7 @@ dependencies = [ "env_logger", "fplus-database", "futures", - "fvm", + "fvm_shared", "http 0.2.12", "hyper 0.14.29", "hyper-rustls", @@ -2909,30 +2039,6 @@ dependencies = [ "uuidv4", ] -[[package]] -name = "fr32" -version = "11.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "627a3f3108ee3287759a45f6d5aafe48b3017509df9b677115f88266d61e0815" -dependencies = [ - "anyhow", - "blstrs", - "byte-slice-cast", - "byteorder", - "ff", - "thiserror", -] - -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "funty" version = "2.0.0" @@ -3045,68 +2151,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42012b0f064e01aa58b545fe3727f90f7dd4020f4a3ea735b50344965f5a57e9" -[[package]] -name = "fvm" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f32d94b63cee9210afd3e2cca72f3f1927ed160dbf532b1bb7fe97dd41d6014" -dependencies = [ - "ambassador", - "anyhow", - "cid", - "derive_more 1.0.0", - "filecoin-proofs-api", - "fvm-wasm-instrument", - "fvm_ipld_amt", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", - "fvm_ipld_hamt", - "fvm_shared", - "lazy_static", - "log", - "minstant", - "multihash", - "num-traits", - "rand", - "rayon", - "replace_with", - "serde", - "serde_tuple", - "static_assertions", - "thiserror", - "wasmtime", - "wasmtime-environ", - "yastl", -] - -[[package]] -name = "fvm-wasm-instrument" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd62c1cbb59244314d761b57cb5d2bcc35e8b7bc8f3082d56980f69145c1be8" -dependencies = [ - "anyhow", - "wasm-encoder 0.20.0", - "wasmparser 0.95.0", - "wasmprinter 0.2.80", -] - -[[package]] -name = "fvm_ipld_amt" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fea333475130094f27ce67809aae3f69eb5247541d835950b7c5da733dbbb34" -dependencies = [ - "anyhow", - "cid", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", - "itertools 0.11.0", - "once_cell", - "serde", - "thiserror", -] - [[package]] name = "fvm_ipld_blockstore" version = "0.2.1" @@ -3135,26 +2179,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "fvm_ipld_hamt" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c900736087ff87cc51f669eee2f8e000c80717472242eb3f712aaa059ac3b3" -dependencies = [ - "anyhow", - "byteorder", - "cid", - "forest_hash_utils", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", - "libipld-core", - "multihash", - "once_cell", - "serde", - "sha2 0.10.8", - "thiserror", -] - [[package]] name = "fvm_shared" version = "4.4.0" @@ -3164,14 +2188,11 @@ dependencies = [ "anyhow", "bitflags 2.5.0", "blake2b_simd", - "bls-signatures", "cid", "data-encoding", "data-encoding-macro", - "filecoin-proofs-api", "fvm_ipld_encoding", "lazy_static", - "libsecp256k1", "multihash", "num-bigint", "num-derive", @@ -3194,15 +2215,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "generic-array" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96512db27971c2c3eece70a1e106fbe6c87760234e31e8f7e5634912fe52794a" -dependencies = [ - "typenum", -] - [[package]] name = "getrandom" version = "0.2.15" @@ -3219,11 +2231,6 @@ name = "gimli" version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" -dependencies = [ - "fallible-iterator", - "indexmap 2.2.6", - "stable_deref_trait", -] [[package]] name = "glob" @@ -3238,9 +2245,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", - "rand", "rand_core", - "rand_xorshift", "subtle", ] @@ -3256,7 +2261,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.2.6", + "indexmap", "slab", "tokio", "tokio-util", @@ -3272,15 +2277,6 @@ dependencies = [ "ahash 0.7.8", ] -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.11", -] - [[package]] name = "hashbrown" version = "0.14.5" @@ -3289,7 +2285,6 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", "allocator-api2", - "serde", ] [[package]] @@ -3343,17 +2338,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ - "hmac 0.12.1", -] - -[[package]] -name = "hmac" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" -dependencies = [ - "crypto-mac", - "digest 0.9.0", + "hmac", ] [[package]] @@ -3365,17 +2350,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "hmac-drbg" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" -dependencies = [ - "digest 0.9.0", - "generic-array 0.14.7", - "hmac 0.8.1", -] - [[package]] name = "home" version = "0.5.9" @@ -3726,12 +2700,6 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "id-arena" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" - [[package]] name = "ident_case" version = "1.0.1" @@ -3770,16 +2738,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - [[package]] name = "indexmap" version = "2.2.6" @@ -3788,7 +2746,6 @@ checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.5", - "serde", ] [[package]] @@ -3802,16 +2759,6 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "block-padding", - "generic-array 0.14.7", -] - [[package]] name = "interprocess" version = "2.2.1" @@ -3827,15 +2774,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "iowrap" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d778bd9a4fa138d91f62017e3ac5ff905d2b829a30d3b1be473cb57d32ad15a" -dependencies = [ - "memchr", -] - [[package]] name = "ipnet" version = "2.9.0" @@ -3853,15 +2791,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "itertools" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.10.5" @@ -3871,24 +2800,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.13.0" @@ -3946,16 +2857,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "once_cell", - "sha2 0.10.8", -] - -[[package]] -name = "keccak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" -dependencies = [ - "cpufeatures", + "sha2", ] [[package]] @@ -3983,87 +2885,18 @@ dependencies = [ "spin 0.5.2", ] -[[package]] -name = "leb128" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" - [[package]] name = "libc" version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" -[[package]] -name = "libipld-core" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5acd707e8d8b092e967b2af978ed84709eaded82b75effe6cb6f6cc797ef8158" -dependencies = [ - "anyhow", - "cid", - "core2", - "multibase", - "multihash", - "serde", - "thiserror", -] - [[package]] name = "libm" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" -[[package]] -name = "libsecp256k1" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1" -dependencies = [ - "arrayref", - "base64 0.13.1", - "digest 0.9.0", - "hmac-drbg", - "libsecp256k1-core", - "libsecp256k1-gen-ecmult", - "libsecp256k1-gen-genmult", - "rand", - "serde", - "sha2 0.9.9", - "typenum", -] - -[[package]] -name = "libsecp256k1-core" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" -dependencies = [ - "crunchy", - "digest 0.9.0", - "subtle", -] - -[[package]] -name = "libsecp256k1-gen-ecmult" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809" -dependencies = [ - "libsecp256k1-core", -] - -[[package]] -name = "libsecp256k1-gen-genmult" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c" -dependencies = [ - "libsecp256k1-core", -] - [[package]] name = "libsqlite3-sys" version = "0.27.0" @@ -4124,18 +2957,9 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" name = "lru" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" -dependencies = [ - "hashbrown 0.14.5", -] - -[[package]] -name = "mach2" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "libc", + "hashbrown 0.14.5", ] [[package]] @@ -4163,41 +2987,6 @@ version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" -[[package]] -name = "memfd" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" -dependencies = [ - "rustix", -] - -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - -[[package]] -name = "merkletree" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a0ed8c0ce1e281870da29266398541a0dbab168f5fb5fd36d7ef2bbdbf808a3" -dependencies = [ - "anyhow", - "arrayref", - "log", - "memmap2", - "positioned-io", - "rayon", - "serde", - "tempfile", - "typenum", -] - [[package]] name = "mime" version = "0.3.17" @@ -4219,16 +3008,6 @@ dependencies = [ "adler", ] -[[package]] -name = "minstant" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb9b5c752f145ac5046bccc3c4f62892e3c950c1d1eab80c5949cd68a2078db" -dependencies = [ - "ctor", - "web-time", -] - [[package]] name = "mio" version = "0.8.11" @@ -4260,13 +3039,9 @@ checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" dependencies = [ "blake2b_simd", "core2", - "digest 0.10.7", "multihash-derive", - "ripemd", "serde", "serde-big-array", - "sha2 0.10.8", - "sha3", "unsigned-varint 0.7.2", ] @@ -4301,28 +3076,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "neptune" -version = "11.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eaa7f90368545907dce7d5652a78f96a77d1e97019b230edbf54ce2440d5698" -dependencies = [ - "bellpepper", - "bellpepper-core", - "blake2s_simd 0.5.11", - "blstrs", - "byteorder", - "ec-gpu", - "ec-gpu-gen 0.6.0", - "ff", - "generic-array 0.14.7", - "itertools 0.8.2", - "log", - "pasta_curves", - "serde", - "trait-set", -] - [[package]] name = "nom" version = "7.1.3" @@ -4443,9 +3196,6 @@ version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" dependencies = [ - "crc32fast", - "hashbrown 0.14.5", - "indexmap 2.2.6", "memchr", ] @@ -4492,31 +3242,6 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "opaque-debug" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" - -[[package]] -name = "opencl-sys" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de15dd01496ae90c5799f5266184ab020082b4065800ff0b732f489371d0e5cf" -dependencies = [ - "libc", -] - -[[package]] -name = "opencl3" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26ab4a90cb496f787d3934deb0c54fa9d65e7bed710c10071234aab0196fba04" -dependencies = [ - "cl3", - "libc", -] - [[package]] name = "openssl" version = "0.10.64" @@ -4594,22 +3319,13 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "pairing" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fec4625e73cf41ef4bb6846cafa6d44736525f442ba45e407c4a000a13996f" -dependencies = [ - "group", -] - [[package]] name = "parity-scale-codec" version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bitvec", "byte-slice-cast", "impl-trait-for-tuples", @@ -4652,36 +3368,12 @@ dependencies = [ "windows-targets 0.52.5", ] -[[package]] -name = "pasta_curves" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e57598f73cc7e1b2ac63c79c517b31a0877cd7c402cdcaa311b5208de7a095" -dependencies = [ - "blake2b_simd", - "ec-gpu", - "ff", - "group", - "hex", - "lazy_static", - "rand", - "serde", - "static_assertions", - "subtle", -] - [[package]] name = "paste" version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - [[package]] name = "pem" version = "1.1.1" @@ -4786,29 +3478,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" -[[package]] -name = "positioned-io" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccabfeeb89c73adf4081f0dca7f8e28dbda90981a222ceea37f619e93ea6afe9" -dependencies = [ - "byteorder", - "libc", - "winapi", -] - -[[package]] -name = "postcard" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e" -dependencies = [ - "cobs", - "embedded-io 0.4.0", - "embedded-io 0.6.1", - "serde", -] - [[package]] name = "powerfmt" version = "0.2.0" @@ -4821,16 +3490,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - [[package]] name = "primitive-types" version = "0.12.2" @@ -4936,15 +3595,6 @@ dependencies = [ "unarray", ] -[[package]] -name = "psm" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" -dependencies = [ - "cc", -] - [[package]] name = "ptr_meta" version = "0.1.4" @@ -5069,19 +3719,6 @@ dependencies = [ "bitflags 2.5.0", ] -[[package]] -name = "regalloc2" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" -dependencies = [ - "hashbrown 0.13.2", - "log", - "rustc-hash", - "slice-group-by", - "smallvec", -] - [[package]] name = "regex" version = "1.10.5" @@ -5126,12 +3763,6 @@ dependencies = [ "bytecheck", ] -[[package]] -name = "replace_with" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a8614ee435691de62bcffcf4a66d91b3594bf1428a5722e79103249a095690" - [[package]] name = "reqwest" version = "0.11.27" @@ -5217,7 +3848,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ - "hmac 0.12.1", + "hmac", "subtle", ] @@ -5251,15 +3882,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "ripemd" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" -dependencies = [ - "digest 0.10.7", -] - [[package]] name = "rkyv" version = "0.7.44" @@ -5349,29 +3971,13 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" -[[package]] -name = "rust-gpu-tools" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0ce78d5548a74fad25177825d0c20f4cfbc6eaf796bcee53afe792e39ede4e2" -dependencies = [ - "hex", - "home", - "log", - "once_cell", - "opencl3", - "sha2 0.10.8", - "temp-env", - "thiserror", -] - [[package]] name = "rust_decimal" version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "borsh", "bytes", "num-traits", @@ -5387,12 +3993,6 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc-hex" version = "2.1.0" @@ -5702,7 +4302,7 @@ checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct", "der", - "generic-array 0.14.7", + "generic-array", "pkcs8", "subtle", "zeroize", @@ -5921,19 +4521,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "sha2" version = "0.10.8" @@ -5943,41 +4530,6 @@ dependencies = [ "cfg-if", "cpufeatures", "digest 0.10.7", - "sha2-asm", -] - -[[package]] -name = "sha2-asm" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b845214d6175804686b2bd482bcffe96651bb2d1200742b712003504a2dac1ab" -dependencies = [ - "cc", -] - -[[package]] -name = "sha2raw" -version = "13.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73744f6a373edfc5624f452ec705a762e1154bb88c6699242bf37c56d99a6ebb" -dependencies = [ - "byteorder", - "cpufeatures", - "digest 0.10.7", - "fake-simd", - "lazy_static", - "opaque-debug", - "sha2-asm", -] - -[[package]] -name = "sha3" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" -dependencies = [ - "digest 0.10.7", - "keccak", ] [[package]] @@ -6048,20 +4600,11 @@ dependencies = [ "autocfg", ] -[[package]] -name = "slice-group-by" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" - [[package]] name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -dependencies = [ - "serde", -] [[package]] name = "snafu" @@ -6121,12 +4664,6 @@ dependencies = [ "der", ] -[[package]] -name = "sptr" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" - [[package]] name = "sqlformat" version = "0.2.4" @@ -6173,7 +4710,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.2.6", + "indexmap", "log", "memchr", "native-tls", @@ -6183,7 +4720,7 @@ dependencies = [ "rust_decimal", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "smallvec", "sqlformat", "thiserror", @@ -6223,7 +4760,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "sqlx-core", "sqlx-mysql", "sqlx-postgres", @@ -6255,10 +4792,10 @@ dependencies = [ "futures-core", "futures-io", "futures-util", - "generic-array 0.14.7", + "generic-array", "hex", "hkdf", - "hmac 0.12.1", + "hmac", "itoa", "log", "md-5", @@ -6270,7 +4807,7 @@ dependencies = [ "rust_decimal", "serde", "sha1", - "sha2 0.10.8", + "sha2", "smallvec", "sqlx-core", "stringprep", @@ -6302,7 +4839,7 @@ dependencies = [ "futures-util", "hex", "hkdf", - "hmac 0.12.1", + "hmac", "home", "itoa", "log", @@ -6314,175 +4851,54 @@ dependencies = [ "rust_decimal", "serde", "serde_json", - "sha2 0.10.8", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "time", - "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 0.11.0", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde", - "sqlx-core", - "time", - "tracing", - "url", - "urlencoding", - "uuid", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "storage-proofs-core" -version = "18.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "390385ae6787ad5d4312f3b6f0462c9f6615d9a7863376f8636604e6e43f3d28" -dependencies = [ - "aes", - "anyhow", - "bellperson", - "blake2b_simd", - "blstrs", - "byteorder", - "cbc", - "config", - "ff", - "filecoin-hashers", - "fr32", - "fs2", - "generic-array 0.14.7", - "itertools 0.10.5", - "lazy_static", - "log", - "memmap2", - "merkletree", - "num_cpus", - "rand", - "rand_chacha", - "rayon", - "semver 1.0.23", - "serde", - "serde_json", - "sha2 0.10.8", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", "thiserror", + "time", + "tracing", + "uuid", + "whoami", ] [[package]] -name = "storage-proofs-porep" -version = "18.1.0" +name = "sqlx-sqlite" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd8c6bbeb00933edb41152fdabf28d2519d6a1b6ea176a793e3198a07bb9acd" +checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" dependencies = [ - "anyhow", - "bellperson", - "bincode", - "blake2b_simd", - "blstrs", - "byte-slice-cast", - "byteorder", - "chacha20", - "crossbeam", - "fdlimit", - "ff", - "filecoin-hashers", - "fr32", - "generic-array 0.14.7", - "glob", - "hex", - "lazy_static", - "libc", + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", "log", - "memmap2", - "merkletree", - "neptune", - "num-bigint", - "num-traits", - "num_cpus", - "pretty_assertions", - "rayon", - "rustversion", + "percent-encoding", "serde", - "serde_json", - "sha2 0.10.8", - "sha2raw", - "storage-proofs-core", - "yastl", + "sqlx-core", + "time", + "tracing", + "url", + "urlencoding", + "uuid", ] [[package]] -name = "storage-proofs-post" -version = "18.1.0" +name = "stable_deref_trait" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779fbfe1455a57d2a7fd655ce1b2e97bf9f238b65c71919e92aa9df8f2ced8b1" -dependencies = [ - "anyhow", - "bellperson", - "blstrs", - "byteorder", - "ff", - "filecoin-hashers", - "generic-array 0.14.7", - "log", - "rayon", - "serde", - "sha2 0.10.8", - "storage-proofs-core", -] +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "storage-proofs-update" -version = "18.1.0" +name = "static_assertions" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4b391917dbcffa2297295971a02cc54aa19aa8b5378d539a435e78f8050153" -dependencies = [ - "anyhow", - "bellperson", - "blstrs", - "ff", - "filecoin-hashers", - "fr32", - "generic-array 0.14.7", - "lazy_static", - "log", - "memmap2", - "merkletree", - "neptune", - "rayon", - "serde", - "storage-proofs-core", - "storage-proofs-porep", -] +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stringprep" @@ -6637,21 +5053,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" -[[package]] -name = "target-lexicon" -version = "0.12.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" - -[[package]] -name = "temp-env" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96374855068f47402c3121c6eed88d29cb1de8f3ab27090e273e420bdabcf050" -dependencies = [ - "parking_lot", -] - [[package]] name = "tempfile" version = "3.10.1" @@ -6900,7 +5301,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.6", + "indexmap", "toml_datetime", "winnow 0.5.40", ] @@ -6999,17 +5400,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "trait-set" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b79e2e9c9ab44c6d7c20d5976961b47e8f49ac199154daa514b77cd1ab536625" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "try-lock" version = "0.2.5" @@ -7309,253 +5699,6 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" -[[package]] -name = "wasm-encoder" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05632e0a66a6ed8cca593c24223aabd6262f256c3693ad9822c315285f010614" -dependencies = [ - "leb128", -] - -[[package]] -name = "wasm-encoder" -version = "0.215.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb56df3e06b8e6b77e37d2969a50ba51281029a9aeb3855e76b7f49b6418847" -dependencies = [ - "leb128", -] - -[[package]] -name = "wasmparser" -version = "0.95.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a" -dependencies = [ - "indexmap 1.9.3", - "url", -] - -[[package]] -name = "wasmparser" -version = "0.121.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" -dependencies = [ - "bitflags 2.5.0", - "indexmap 2.2.6", - "semver 1.0.23", -] - -[[package]] -name = "wasmparser" -version = "0.215.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fbde0881f24199b81cf49b6ff8f9c145ac8eb1b7fc439adb5c099734f7d90e" -dependencies = [ - "ahash 0.8.11", - "bitflags 2.5.0", - "hashbrown 0.14.5", - "indexmap 2.2.6", - "semver 1.0.23", - "serde", -] - -[[package]] -name = "wasmprinter" -version = "0.2.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e73986a6b7fdfedb7c5bf9e7eb71135486507c8fbc4c0c42cffcb6532988b7" -dependencies = [ - "anyhow", - "wasmparser 0.121.2", -] - -[[package]] -name = "wasmprinter" -version = "0.215.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e9a325d85053408209b3d2ce5eaddd0dd6864d1cff7a007147ba073157defc" -dependencies = [ - "anyhow", - "termcolor", - "wasmparser 0.215.0", -] - -[[package]] -name = "wasmtime" -version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a5883d64dfc8423c56e3d8df27cffc44db25336aa468e8e0724fddf30a333d7" -dependencies = [ - "anyhow", - "bitflags 2.5.0", - "bumpalo", - "cc", - "cfg-if", - "hashbrown 0.14.5", - "indexmap 2.2.6", - "libc", - "libm", - "log", - "mach2", - "memfd", - "object", - "once_cell", - "paste", - "postcard", - "psm", - "rayon", - "rustix", - "serde", - "serde_derive", - "smallvec", - "sptr", - "target-lexicon", - "wasmparser 0.215.0", - "wasmtime-asm-macros", - "wasmtime-component-macro", - "wasmtime-cranelift", - "wasmtime-environ", - "wasmtime-jit-icache-coherence", - "wasmtime-slab", - "wasmtime-versioned-export-macros", - "windows-sys 0.52.0", -] - -[[package]] -name = "wasmtime-asm-macros" -version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4dc7e2a379c0dd6be5b55857d14c4b277f43a9c429a9e14403eb61776ae3be" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "wasmtime-component-macro" -version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b07773d1c3dab5f014ec61316ee317aa424033e17e70a63abdf7c3a47e58fcf" -dependencies = [ - "anyhow", - "proc-macro2", - "quote", - "syn 2.0.66", - "wasmtime-component-util", - "wasmtime-wit-bindgen", - "wit-parser", -] - -[[package]] -name = "wasmtime-component-util" -version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e38d735320f4e83478369ce649ad8fe87c6b893220902e798547a225fc0c5874" - -[[package]] -name = "wasmtime-cranelift" -version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e570d831d0785d93d7d8c722b1eb9a34e0d0c1534317666f65892818358a2da9" -dependencies = [ - "anyhow", - "cfg-if", - "cranelift-codegen", - "cranelift-control", - "cranelift-entity", - "cranelift-frontend", - "cranelift-native", - "cranelift-wasm", - "gimli", - "log", - "object", - "target-lexicon", - "thiserror", - "wasmparser 0.215.0", - "wasmtime-environ", - "wasmtime-versioned-export-macros", -] - -[[package]] -name = "wasmtime-environ" -version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5fe80dfbd81687431a7d4f25929fae1ae96894786d5c96b14ae41164ee97377" -dependencies = [ - "anyhow", - "cranelift-bitset", - "cranelift-entity", - "gimli", - "indexmap 2.2.6", - "log", - "object", - "postcard", - "serde", - "serde_derive", - "target-lexicon", - "wasm-encoder 0.215.0", - "wasmparser 0.215.0", - "wasmprinter 0.215.0", - "wasmtime-types", -] - -[[package]] -name = "wasmtime-jit-icache-coherence" -version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d15de8429db996f0d17a4163a35eccc3f874cbfb50f29c379951ea1bbb39452e" -dependencies = [ - "anyhow", - "cfg-if", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "wasmtime-slab" -version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f68d38fa6b30c5e1fc7d608263062997306f79e577ebd197ddcd6b0f55d87d1" - -[[package]] -name = "wasmtime-types" -version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6634e7079d9c5cfc81af8610ed59b488cc5b7f9777a2f4c1667a2565c2e45249" -dependencies = [ - "anyhow", - "cranelift-entity", - "serde", - "serde_derive", - "smallvec", - "wasmparser 0.215.0", -] - -[[package]] -name = "wasmtime-versioned-export-macros" -version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3850e3511d6c7f11a72d571890b0ed5f6204681f7f050b9de2690e7f13123fed" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "wasmtime-wit-bindgen" -version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb331ac7ed1d5ba49cddcdb6b11973752a857148858bb308777d2fc5584121f" -dependencies = [ - "anyhow", - "heck 0.4.1", - "indexmap 2.2.6", - "wit-parser", -] - [[package]] name = "web-sys" version = "0.3.69" @@ -7566,16 +5709,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - [[package]] name = "webpki-roots" version = "0.26.5" @@ -7818,24 +5951,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "wit-parser" -version = "0.215.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "935a97eaffd57c3b413aa510f8f0b550a4a9fe7d59e79cd8b89a83dcb860321f" -dependencies = [ - "anyhow", - "id-arena", - "indexmap 2.2.6", - "log", - "semver 1.0.23", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser 0.215.0", -] - [[package]] name = "write16" version = "1.0.0" @@ -7876,22 +5991,6 @@ dependencies = [ "tap", ] -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[package]] -name = "yastl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca6c5a4d66c1a9ea261811cf4773c27343de7e5033e1b75ea3f297dc7db3c1a" -dependencies = [ - "flume 0.10.14", - "scopeguard", -] - [[package]] name = "yoke" version = "0.7.4" diff --git a/fplus-database/Cargo.toml b/fplus-database/Cargo.toml index c58545f2..2fa46705 100644 --- a/fplus-database/Cargo.toml +++ b/fplus-database/Cargo.toml @@ -24,7 +24,5 @@ serde = { version = "1.0.164", features = ["derive", "std", serial_test = "3.0.0" sha1 = "0.10.6" serde_json = "1.0.96" -alloy = { git = "https://github.com/alloy-rs/alloy", version = "0.3.2", features = [ - "signers", -] } +alloy = { version = "0.3.2", features = ["signers"] } sea-orm-newtype = "0.0.1" diff --git a/fplus-database/src/database/autoallocations.rs b/fplus-database/src/database/autoallocations.rs index d557e253..73abddb3 100644 --- a/fplus-database/src/database/autoallocations.rs +++ b/fplus-database/src/database/autoallocations.rs @@ -1,8 +1,11 @@ use crate::get_database_connection; use crate::models::autoallocations::AddressWrapper; -use crate::models::autoallocations::{ActiveModel, Column, Entity as Autoallocations}; -use chrono::{DateTime, FixedOffset, Utc}; -use sea_orm::{entity::*, query::*, DbErr}; +use crate::models::autoallocations::{ + Column, Entity as Autoallocations, Model as AutoallocationModel, +}; +use alloy::primitives::Address; +use chrono::{DateTime, FixedOffset}; +use sea_orm::{entity::*, query::*, DbBackend, DbErr, ExecResult}; pub async fn get_last_client_autoallocation( client_evm_address: impl Into, @@ -17,19 +20,45 @@ pub async fn get_last_client_autoallocation( } pub async fn create_or_update_autoallocation( - client_evm_address: impl Into + Clone, -) -> Result<(), sea_orm::DbErr> { + client_evm_address: &Address, + days_to_next_autoallocation: &u64, +) -> Result { let conn = get_database_connection().await?; - let last_autoallocation = get_last_client_autoallocation(client_evm_address.clone()).await?; + let client_address = client_evm_address.to_checksum(None); + let exec_res: ExecResult = conn + .execute(Statement::from_string( + DbBackend::Postgres, + format!( + "INSERT INTO autoallocations (evm_wallet_address, last_allocation) + VALUES ('{}', NOW()) + ON CONFLICT (evm_wallet_address) + DO UPDATE SET last_allocation = NOW() + WHERE autoallocations.last_allocation <= NOW() - INTERVAL '{} days';", + client_address, days_to_next_autoallocation + ), + )) + .await?; + Ok(exec_res.rows_affected()) +} + +pub async fn get_autoallocation( + client_evm_address: impl Into, +) -> Result, DbErr> { + let conn = get_database_connection().await?; + let response = Autoallocations::find() + .filter(Column::EvmWalletAddress.contains(client_evm_address.into())) + .one(&conn) + .await?; + Ok(response) +} - let autoallocation_active_model = ActiveModel { - evm_wallet_address: Set(client_evm_address.into()), - last_allocation: Set(Utc::now().into()), - }; - if last_autoallocation.is_some() { - autoallocation_active_model.update(&conn).await?; - } else { - autoallocation_active_model.insert(&conn).await?; +pub async fn delete_autoallocation( + client_evm_address: impl Into, +) -> Result<(), sea_orm::DbErr> { + let conn = get_database_connection().await?; + let client_autoallocation = get_autoallocation(client_evm_address).await?; + if let Some(client_autoallocation) = client_autoallocation { + client_autoallocation.delete(&conn).await?; } Ok(()) } diff --git a/fplus-http-server/src/router/autoallocator.rs b/fplus-http-server/src/router/autoallocator.rs index e09daff5..e1d0a476 100644 --- a/fplus-http-server/src/router/autoallocator.rs +++ b/fplus-http-server/src/router/autoallocator.rs @@ -2,7 +2,6 @@ use actix_web::{get, post, web, HttpResponse, Responder}; use fplus_database::database::autoallocations as autoallocations_db; use fplus_lib::core::autoallocator; use fplus_lib::core::{LastAutoallocationQueryParams, TriggerAutoallocationInfo}; - #[get("/autoallocator/last_client_allocation")] pub async fn last_client_allocation( query: web::Query, diff --git a/fplus-lib/Cargo.toml b/fplus-lib/Cargo.toml index 383473a1..c3d6fea3 100644 --- a/fplus-lib/Cargo.toml +++ b/fplus-lib/Cargo.toml @@ -37,7 +37,7 @@ regex = "1.0" tempfile = "3.10.1" size = "0.5.0-preview2" alloy = { version = "0.3.2", features = ["full"] } -fvm = "4.4.0" +fvm_shared = "4.4.0" [dev-dependencies] actix-rt = "2.9.0" diff --git a/fplus-lib/src/config.rs b/fplus-lib/src/config.rs index 279a4682..6a4ec47d 100644 --- a/fplus-lib/src/config.rs +++ b/fplus-lib/src/config.rs @@ -23,7 +23,7 @@ pub fn default_env_vars() -> &'static HashMap<&'static str, &'static str> { "https://fp-core.dp04sa0tdc6pk.us-east-1.cs.amazonlightsail.com", ); m.insert("FILPLUS_ENV", "staging"); - m.insert("GLIF_NODE_URL", "https://api.node.glif.io/rpc/v1"); + m.insert("GLIF_NODE_URL", "http://localhost:1234/rpc/v1"); m.insert("ISSUE_TEMPLATE_VERSION", "1.3"); m.insert( "GITCOIN_PASSPORT_DECODER", @@ -36,16 +36,15 @@ pub fn default_env_vars() -> &'static HashMap<&'static str, &'static str> { m.insert("DMOB_API_URL", "https://api.datacapstats.io/public/api"); m.insert("DMOB_API_KEY", "5c993a17-7b18-4ead-a8a8-89dad981d87e"); m.insert("DAYS_TO_NEXT_AUTOALLOCATION", "14"); - m.insert("FILECOIN_RPC_URL", "http://127.0.0.1:8545"); m.insert( "ALLOCATOR_CONTRACT_ADDRESS", "0x640bD4be149f40714D95aBcD414338bc7CfF39a3", ); m.insert( - "PRIVATE_KEY", + "AUTOALLOCATOR_PRIVATE_KEY", "257d553b55d5928c7ec48c2f7d1288931640166e2c1269e05492914accf7e966", ); - m.insert("AMOUNT_TO_AUTOALLOCATION", "68719476736"); // 68719476736 B == 64 GB + m.insert("AUTOALLOCATION_AMOUNT", "68719476736"); // 68719476736 B == 64 GB m }) } diff --git a/fplus-lib/src/core/application/gitcoin_interaction.rs b/fplus-lib/src/core/application/gitcoin_interaction.rs index 1497edb9..1f83dba6 100644 --- a/fplus-lib/src/core/application/gitcoin_interaction.rs +++ b/fplus-lib/src/core/application/gitcoin_interaction.rs @@ -16,8 +16,8 @@ use crate::error::LDNError; use anyhow::Result; pub trait ExpirableSolStruct: SolStruct { - fn get_expires_at(&self) -> String; - fn get_issued_at(&self) -> String; + fn get_expires_at(&self) -> &str; + fn get_issued_at(&self) -> &str; } sol! { @@ -44,22 +44,22 @@ sol! { } impl ExpirableSolStruct for KycApproval { - fn get_expires_at(&self) -> String { - self.expires_at.clone() + fn get_expires_at(&self) -> &str { + &self.expires_at } - fn get_issued_at(&self) -> String { - self.issued_at.clone() + fn get_issued_at(&self) -> &str { + &self.issued_at } } impl ExpirableSolStruct for KycAutoallocationApproval { - fn get_expires_at(&self) -> String { - self.expires_at.clone() + fn get_expires_at(&self) -> &str { + &self.expires_at } - fn get_issued_at(&self) -> String { - self.issued_at.clone() + fn get_issued_at(&self) -> &str { + &self.issued_at } } diff --git a/fplus-lib/src/core/autoallocator/metaallocator_interaction.rs b/fplus-lib/src/core/autoallocator/metaallocator_interaction.rs index 1b15a386..ad1e5bf3 100644 --- a/fplus-lib/src/core/autoallocator/metaallocator_interaction.rs +++ b/fplus-lib/src/core/autoallocator/metaallocator_interaction.rs @@ -12,28 +12,28 @@ use alloy::{ sol_types::SolCall, }; use anyhow::Result; -use fvm::kernel::prelude::Address as FilecoinAddress; +use fvm_shared::address::{set_current_network, Address as FilecoinAddress, Network}; sol! { #[allow(missing_docs)] function addVerifiedClient(bytes calldata clientAddress, uint256 amount); } -pub async fn add_verified_client(address: &String, amount: &u64) -> Result<(), LDNError> { - let private_key = get_env_var_or_default("PRIVATE_KEY"); +pub async fn add_verified_client(address: &str, amount: &u64) -> Result<(), LDNError> { + let private_key = get_env_var_or_default("AUTOALLOCATOR_PRIVATE_KEY"); let signer: PrivateKeySigner = private_key.parse().expect("Should parse private key"); let wallet = EthereumWallet::from(signer); - let rpc_url = get_env_var_or_default("FILECOIN_RPC_URL") + let rpc_url = get_env_var_or_default("GLIF_NODE_URL") .parse() .map_err(|e| LDNError::New(format!("Failed to pase string to URL /// {}", e)))?; let provider = ProviderBuilder::new() .with_recommended_fillers() .wallet(wallet) .on_http(rpc_url); - let fil_address_bytes = get_filecoin_address_from_string_to_bytes(address)?; - let amount = U256::try_from(amount.clone()) + let fil_address = decode_filecoin_address(address)?; + let amount = U256::try_from(*amount) .map_err(|e| LDNError::New(format!("Failed to prase amount to U256 /// {}", e)))?; let call = addVerifiedClientCall { - clientAddress: fil_address_bytes.into(), + clientAddress: fil_address.into(), amount, } .abi_encode(); @@ -62,7 +62,15 @@ pub async fn add_verified_client(address: &String, amount: &u64) -> Result<(), L Ok(()) } -fn get_filecoin_address_from_string_to_bytes(address: &str) -> Result, LDNError> { +fn decode_filecoin_address(address: &str) -> Result, LDNError> { + let address_prefix = address.get(0..1); + if let Some(address_prefix) = address_prefix { + if address_prefix.eq("f") { + set_current_network(Network::Mainnet); + } else if address_prefix.eq("t") { + set_current_network(Network::Testnet); + } + } let fil_address = FilecoinAddress::from_str(address) .map_err(|e| LDNError::New(format!("Failed to prase address from string /// {}", e)))?; Ok(fil_address.to_bytes()) diff --git a/fplus-lib/src/core/autoallocator/mod.rs b/fplus-lib/src/core/autoallocator/mod.rs index bb9ec48d..7c36c43b 100644 --- a/fplus-lib/src/core/autoallocator/mod.rs +++ b/fplus-lib/src/core/autoallocator/mod.rs @@ -4,7 +4,6 @@ use crate::core::verify_on_gitcoin; use crate::core::{LDNApplication, TriggerAutoallocationInfo}; use crate::error::LDNError; use alloy::primitives::Address; -use chrono::{Duration, Utc}; use fplus_database::database::applications::get_applications_by_client_id; use fplus_database::database::autoallocations as autoallocations_db; @@ -13,19 +12,17 @@ pub mod metaallocator_interaction; pub async fn trigger_autoallocation(info: &TriggerAutoallocationInfo) -> Result<(), LDNError> { let evm_address_from_signature = LDNApplication::verify_kyc_data_and_get_eth_address(&info.message, &info.signature)?; - autoallocation_timeout_exceeded(&evm_address_from_signature).await?; verify_on_gitcoin(&evm_address_from_signature).await?; let fil_client_address = &info.message.client_fil_address; let client_applications = get_applications_by_client_id(fil_client_address) .await .map_err(|e| LDNError::Load(format!("Get applications for client failed: {}", e)))?; - if client_applications.len() != 0 { + if !client_applications.is_empty() { return Err(LDNError::Load( - "Cient already has an application".to_string(), + "Client already has an application".to_string(), )); } - - let amount = get_env_var_or_default("AMOUNT_TO_AUTOALLOCATION") + let amount = get_env_var_or_default("AUTOALLOCATION_AMOUNT") .parse::() .map_err(|e| { LDNError::New(format!( @@ -33,38 +30,39 @@ pub async fn trigger_autoallocation(info: &TriggerAutoallocationInfo) -> Result< e )) })?; - add_verified_client(&fil_client_address, &amount).await?; - autoallocations_db::create_or_update_autoallocation(evm_address_from_signature.clone()) - .await - .map_err(|e| LDNError::New(format!("Create or update autoallocation failed: {}", e)))?; + create_or_update_autoallocation(&evm_address_from_signature).await?; + match add_verified_client(fil_client_address, &amount).await { + Ok(_) => {} + Err(e) => { + autoallocations_db::delete_autoallocation(evm_address_from_signature) + .await + .map_err(|e| LDNError::New(format!("Delete autoallocation failed: {}", e)))?; + return Err(LDNError::New(format!("Add verified client failed: {}", e))); + } + } Ok(()) } -async fn autoallocation_timeout_exceeded( - evm_address_from_signature: &Address, -) -> Result<(), LDNError> { - let last_client_allocation = - autoallocations_db::get_last_client_autoallocation(evm_address_from_signature.clone()) - .await - .map_err(|e| { - LDNError::Load(format!("Failed to get last client allocation /// {}", e)) - })?; - - if let Some(last_client_allocation) = last_client_allocation { - let days_to_next_autoallocation = get_env_var_or_default("DAYS_TO_NEXT_AUTOALLOCATION") - .parse::() - .map_err(|e| { - LDNError::New(format!( - "Parse days to next allocation to i64 failed: {}", - e - )) - })?; - if (last_client_allocation + Duration::days(days_to_next_autoallocation)) > Utc::now() { - return Err(LDNError::Load(format!( - "Last allocation was within {} days.", - days_to_next_autoallocation - ))); - } +async fn create_or_update_autoallocation(evm_client_address: &Address) -> Result<(), LDNError> { + let days_to_next_autoallocation = get_env_var_or_default("DAYS_TO_NEXT_AUTOALLOCATION") + .parse::() + .map_err(|e| { + LDNError::New(format!( + "Parse days to next allocation to u64 failed: {}", + e + )) + })?; + let rows_affected = autoallocations_db::create_or_update_autoallocation( + evm_client_address, + &days_to_next_autoallocation, + ) + .await + .map_err(|e| LDNError::New(format!("Create or update autoallocation failed: {}", e)))?; + if rows_affected == 0 { + return Err(LDNError::Load(format!( + "Last allocation was within {} days.", + days_to_next_autoallocation + ))); } Ok(()) } diff --git a/fplus-lib/src/core/mod.rs b/fplus-lib/src/core/mod.rs index 674e475e..b9ccabe7 100644 --- a/fplus-lib/src/core/mod.rs +++ b/fplus-lib/src/core/mod.rs @@ -4027,13 +4027,13 @@ _The initial issue can be edited in order to solve the request of the verifier. let address_from_signature = get_address_from_signature(message, signature)?; let current_timestamp = Local::now(); - if LDNApplication::date_is_expired(&message.get_expires_at(), ¤t_timestamp)? { + if LDNApplication::date_is_expired(message.get_expires_at(), ¤t_timestamp)? { return Err(LDNError::Load(format!( "Message expired at {}", message.get_expires_at() ))); } - if LDNApplication::date_is_from_future(&message.get_issued_at(), ¤t_timestamp)? { + if LDNApplication::date_is_from_future(message.get_issued_at(), ¤t_timestamp)? { return Err(LDNError::Load(format!( "Message issued date {} is from future", message.get_issued_at() From 41546916df7f39ef1d9b7f0f28949a5f1ddadcee Mon Sep 17 00:00:00 2001 From: Filip Lelek Date: Wed, 18 Sep 2024 17:24:16 +0200 Subject: [PATCH 05/10] Changes according to CR --- .../src/database/autoallocations.rs | 31 ++++++++----------- fplus-lib/src/config.rs | 2 +- .../metaallocator_interaction.rs | 18 +++++++---- fplus-lib/src/core/autoallocator/mod.rs | 4 +-- 4 files changed, 28 insertions(+), 27 deletions(-) diff --git a/fplus-database/src/database/autoallocations.rs b/fplus-database/src/database/autoallocations.rs index 73abddb3..8ba08bb2 100644 --- a/fplus-database/src/database/autoallocations.rs +++ b/fplus-database/src/database/autoallocations.rs @@ -10,12 +10,7 @@ use sea_orm::{entity::*, query::*, DbBackend, DbErr, ExecResult}; pub async fn get_last_client_autoallocation( client_evm_address: impl Into, ) -> Result>, DbErr> { - let conn = get_database_connection().await?; - let response = Autoallocations::find() - .filter(Column::EvmWalletAddress.contains(client_evm_address.into())) - .one(&conn) - .await?; - + let response = get_autoallocation(client_evm_address.into()).await?; Ok(response.map(|allocation| allocation.last_allocation)) } @@ -25,17 +20,18 @@ pub async fn create_or_update_autoallocation( ) -> Result { let conn = get_database_connection().await?; let client_address = client_evm_address.to_checksum(None); - let exec_res: ExecResult = conn - .execute(Statement::from_string( + let exec_res = conn + .execute(Statement::from_sql_and_values( DbBackend::Postgres, - format!( - "INSERT INTO autoallocations (evm_wallet_address, last_allocation) - VALUES ('{}', NOW()) + "INSERT INTO autoallocations (evm_wallet_address, last_allocation) + VALUES ($1, NOW()) ON CONFLICT (evm_wallet_address) DO UPDATE SET last_allocation = NOW() - WHERE autoallocations.last_allocation <= NOW() - INTERVAL '{} days';", - client_address, days_to_next_autoallocation - ), + WHERE autoallocations.last_allocation <= NOW() - INTERVAL '$2 days';", + [ + client_address.into(), + days_to_next_autoallocation.to_string().into(), + ], )) .await?; Ok(exec_res.rows_affected()) @@ -56,9 +52,8 @@ pub async fn delete_autoallocation( client_evm_address: impl Into, ) -> Result<(), sea_orm::DbErr> { let conn = get_database_connection().await?; - let client_autoallocation = get_autoallocation(client_evm_address).await?; - if let Some(client_autoallocation) = client_autoallocation { - client_autoallocation.delete(&conn).await?; - } + Autoallocations::delete_by_id(client_evm_address.into()) + .exec(&conn) + .await?; Ok(()) } diff --git a/fplus-lib/src/config.rs b/fplus-lib/src/config.rs index 6a4ec47d..daae3cfe 100644 --- a/fplus-lib/src/config.rs +++ b/fplus-lib/src/config.rs @@ -23,7 +23,7 @@ pub fn default_env_vars() -> &'static HashMap<&'static str, &'static str> { "https://fp-core.dp04sa0tdc6pk.us-east-1.cs.amazonlightsail.com", ); m.insert("FILPLUS_ENV", "staging"); - m.insert("GLIF_NODE_URL", "http://localhost:1234/rpc/v1"); + m.insert("GLIF_NODE_URL", "https://api.node.glif.io/rpc/v1"); m.insert("ISSUE_TEMPLATE_VERSION", "1.3"); m.insert( "GITCOIN_PASSPORT_DECODER", diff --git a/fplus-lib/src/core/autoallocator/metaallocator_interaction.rs b/fplus-lib/src/core/autoallocator/metaallocator_interaction.rs index ad1e5bf3..f8e1fd41 100644 --- a/fplus-lib/src/core/autoallocator/metaallocator_interaction.rs +++ b/fplus-lib/src/core/autoallocator/metaallocator_interaction.rs @@ -12,23 +12,29 @@ use alloy::{ sol_types::SolCall, }; use anyhow::Result; +use fplus_database::config::get_env_or_throw; use fvm_shared::address::{set_current_network, Address as FilecoinAddress, Network}; sol! { #[allow(missing_docs)] function addVerifiedClient(bytes calldata clientAddress, uint256 amount); } -pub async fn add_verified_client(address: &str, amount: &u64) -> Result<(), LDNError> { - let private_key = get_env_var_or_default("AUTOALLOCATOR_PRIVATE_KEY"); +async fn get_provider() -> Result { + let private_key = get_env_or_throw("AUTOALLOCATOR_PRIVATE_KEY"); let signer: PrivateKeySigner = private_key.parse().expect("Should parse private key"); let wallet = EthereumWallet::from(signer); - let rpc_url = get_env_var_or_default("GLIF_NODE_URL") - .parse() - .map_err(|e| LDNError::New(format!("Failed to pase string to URL /// {}", e)))?; + let rpc_url = get_env_var_or_default("GLIF_NODE_URL"); let provider = ProviderBuilder::new() .with_recommended_fillers() .wallet(wallet) - .on_http(rpc_url); + .on_builtin(&rpc_url) + .await + .map_err(|e| LDNError::New(format!("Building provider failed: {}", e)))?; + Ok(provider) +} + +pub async fn add_verified_client(address: &str, amount: &u64) -> Result<(), LDNError> { + let provider = get_provider().await?; let fil_address = decode_filecoin_address(address)?; let amount = U256::try_from(*amount) .map_err(|e| LDNError::New(format!("Failed to prase amount to U256 /// {}", e)))?; diff --git a/fplus-lib/src/core/autoallocator/mod.rs b/fplus-lib/src/core/autoallocator/mod.rs index 7c36c43b..b15f87d6 100644 --- a/fplus-lib/src/core/autoallocator/mod.rs +++ b/fplus-lib/src/core/autoallocator/mod.rs @@ -30,7 +30,7 @@ pub async fn trigger_autoallocation(info: &TriggerAutoallocationInfo) -> Result< e )) })?; - create_or_update_autoallocation(&evm_address_from_signature).await?; + upsert_autoallocation_if_eligible(&evm_address_from_signature).await?; match add_verified_client(fil_client_address, &amount).await { Ok(_) => {} Err(e) => { @@ -43,7 +43,7 @@ pub async fn trigger_autoallocation(info: &TriggerAutoallocationInfo) -> Result< Ok(()) } -async fn create_or_update_autoallocation(evm_client_address: &Address) -> Result<(), LDNError> { +async fn upsert_autoallocation_if_eligible(evm_client_address: &Address) -> Result<(), LDNError> { let days_to_next_autoallocation = get_env_var_or_default("DAYS_TO_NEXT_AUTOALLOCATION") .parse::() .map_err(|e| { From 0076055aba4ead9d48d642a8958b00114782dfec Mon Sep 17 00:00:00 2001 From: Filip Lelek Date: Wed, 18 Sep 2024 18:32:05 +0200 Subject: [PATCH 06/10] Fix create_or_update_autoallocation --- fplus-lib/src/config.rs | 4 ---- fplus-lib/src/core/autoallocator/mod.rs | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/fplus-lib/src/config.rs b/fplus-lib/src/config.rs index daae3cfe..084e40b8 100644 --- a/fplus-lib/src/config.rs +++ b/fplus-lib/src/config.rs @@ -40,10 +40,6 @@ pub fn default_env_vars() -> &'static HashMap<&'static str, &'static str> { "ALLOCATOR_CONTRACT_ADDRESS", "0x640bD4be149f40714D95aBcD414338bc7CfF39a3", ); - m.insert( - "AUTOALLOCATOR_PRIVATE_KEY", - "257d553b55d5928c7ec48c2f7d1288931640166e2c1269e05492914accf7e966", - ); m.insert("AUTOALLOCATION_AMOUNT", "68719476736"); // 68719476736 B == 64 GB m }) diff --git a/fplus-lib/src/core/autoallocator/mod.rs b/fplus-lib/src/core/autoallocator/mod.rs index b15f87d6..9416e17a 100644 --- a/fplus-lib/src/core/autoallocator/mod.rs +++ b/fplus-lib/src/core/autoallocator/mod.rs @@ -45,10 +45,10 @@ pub async fn trigger_autoallocation(info: &TriggerAutoallocationInfo) -> Result< async fn upsert_autoallocation_if_eligible(evm_client_address: &Address) -> Result<(), LDNError> { let days_to_next_autoallocation = get_env_var_or_default("DAYS_TO_NEXT_AUTOALLOCATION") - .parse::() + .parse::() .map_err(|e| { LDNError::New(format!( - "Parse days to next allocation to u64 failed: {}", + "Parse days to next allocation to i64 failed: {}", e )) })?; From 508c431e38a9d6b75e02d71927888084c0445633 Mon Sep 17 00:00:00 2001 From: Filip Lelek Date: Wed, 18 Sep 2024 18:39:59 +0200 Subject: [PATCH 07/10] Add missing file --- fplus-database/src/database/autoallocations.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fplus-database/src/database/autoallocations.rs b/fplus-database/src/database/autoallocations.rs index 8ba08bb2..ab104ea3 100644 --- a/fplus-database/src/database/autoallocations.rs +++ b/fplus-database/src/database/autoallocations.rs @@ -16,10 +16,11 @@ pub async fn get_last_client_autoallocation( pub async fn create_or_update_autoallocation( client_evm_address: &Address, - days_to_next_autoallocation: &u64, + days_to_next_autoallocation: &i64, ) -> Result { let conn = get_database_connection().await?; let client_address = client_evm_address.to_checksum(None); + let exec_res = conn .execute(Statement::from_sql_and_values( DbBackend::Postgres, @@ -27,10 +28,10 @@ pub async fn create_or_update_autoallocation( VALUES ($1, NOW()) ON CONFLICT (evm_wallet_address) DO UPDATE SET last_allocation = NOW() - WHERE autoallocations.last_allocation <= NOW() - INTERVAL '$2 days';", + WHERE autoallocations.last_allocation <= NOW() - (INTERVAL '1 day' * $2::int);", [ client_address.into(), - days_to_next_autoallocation.to_string().into(), + days_to_next_autoallocation.clone().into(), ], )) .await?; From 667e3e549feabc997410229bd333345c9eee8565 Mon Sep 17 00:00:00 2001 From: Filip Lelek Date: Thu, 19 Sep 2024 14:19:25 +0200 Subject: [PATCH 08/10] Add cargo.lock --- Cargo.lock | 82 +----------------------------------------------------- 1 file changed, 1 insertion(+), 81 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4007b374..d3587dc4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2920,7 +2920,7 @@ dependencies = [ "proc-macro2", "quote", "syn 1.0.109", - "synstructure 0.12.6", + "synstructure", ] [[package]] @@ -4873,17 +4873,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "system-configuration" version = "0.5.1" @@ -5403,18 +5392,6 @@ 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 = "uuid" version = "1.8.0" @@ -5799,18 +5776,6 @@ dependencies = [ "windows-sys 0.48.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 = "ws_stream_wasm" version = "0.7.4" @@ -5839,30 +5804,6 @@ dependencies = [ "tap", ] -[[package]] -name = "yoke" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "synstructure 0.13.1", -] - [[package]] name = "zerocopy" version = "0.7.34" @@ -5883,27 +5824,6 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "zerofrom" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "synstructure 0.13.1", -] - [[package]] name = "zeroize" version = "1.8.1" From 3e01ad810b0c5decdfc08718c1f5bf7fe31e0acc Mon Sep 17 00:00:00 2001 From: Filip Lelek Date: Thu, 19 Sep 2024 14:31:37 +0200 Subject: [PATCH 09/10] Fix cargo clippy --- fplus-database/src/database/autoallocations.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fplus-database/src/database/autoallocations.rs b/fplus-database/src/database/autoallocations.rs index d8d18230..eb96c558 100644 --- a/fplus-database/src/database/autoallocations.rs +++ b/fplus-database/src/database/autoallocations.rs @@ -29,10 +29,7 @@ pub async fn create_or_update_autoallocation( ON CONFLICT (evm_wallet_address) DO UPDATE SET last_allocation = NOW() WHERE autoallocations.last_allocation <= NOW() - (INTERVAL '1 day' * $2::int);", - [ - client_address.into(), - days_to_next_autoallocation.clone().into(), - ], + [client_address.into(), (*days_to_next_autoallocation).into()], )) .await?; Ok(exec_res.rows_affected()) From f47ef853d8fdacee09af060be8c5b4fd77f762e9 Mon Sep 17 00:00:00 2001 From: Filip Lelek Date: Thu, 19 Sep 2024 15:02:04 +0200 Subject: [PATCH 10/10] Update rust version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4b70b645..dd85ff25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.76 AS builder +FROM rust:1.81 AS builder COPY ./fplus-lib /fplus-lib COPY ./fplus-http-server/Cargo.toml /fplus-http-server/Cargo.toml COPY ./Cargo.lock /fplus-http-server/Cargo.lock