merge new repo style

This commit is contained in:
bitful-pannul 2024-02-09 17:03:19 -03:00
parent d6947ae110
commit 5ccd2c2dfd
7 changed files with 351 additions and 438 deletions

766
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -26,6 +26,11 @@ simulation-mode = []
[dependencies]
aes-gcm = "0.10.2"
alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", rev = "098ad56" }
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "098ad56" }
alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "098ad56", features = ["ws"]}
alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "098ad56" }
alloy-providers = { git = "https://github.com/alloy-rs/alloy", rev = "098ad56" }
anyhow = "1.0.71"
async-trait = "0.1.71"
base64 = "0.13"

View File

@ -7,11 +7,11 @@ edition = "2021"
[dependencies]
anyhow = "1.0"
alloy-primitives = "0.6.2"
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy" }
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "098ad56"}
alloy-sol-types = "0.6.2"
bincode = "1.3.3"
hex = "0.4.3"
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "032bd43" }
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "8d58cfb" }
rmp-serde = "1.1.2"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"

View File

@ -1,11 +1,11 @@
use crate::eth::types::*;
use crate::types::*;
use alloy_pubsub::{PubSubFrontend, RawSubscription};
use alloy_rpc_client::ClientBuilder;
use alloy_rpc_types::pubsub::SubscriptionResult;
use alloy_transport_ws::WsConnect;
use anyhow::Result;
use dashmap::DashMap;
use lib::types::core::*;
use lib::types::eth::*;
use std::sync::Arc;
use tokio::task::JoinHandle;
use url::Url;
@ -47,7 +47,7 @@ pub async fn provider(
auth: None,
};
let client = ClientBuilder::default().pubsub(connector).await?;
let client = ClientBuilder::default().ws(connector).await?;
Some(alloy_providers::provider::Provider::new_with_client(client))
} else {
None

View File

@ -262,7 +262,7 @@ async fn get_unencrypted_info(keyfile: Option<Vec<u8>>) -> Result<impl Reply, Re
}
}
};
Ok(warp::reply::with_status(
return Ok(warp::reply::with_status(
warp::reply::json(&UnencryptedIdentity {
name,
allowed_routers,

View File

@ -14,8 +14,8 @@ license = "Apache-2.0"
reqwest = { version = "0.11.22", features = ["blocking"] }
[dependencies]
ethers = "2.0.13"
ethers-providers = "2.0.13"
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "098ad56" }
alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", rev = "098ad56" }
lazy_static = "1.4.0"
rand = "0.8.4"
ring = "0.16.20"

View File

@ -1,8 +1,6 @@
use alloy_rpc_types::pubsub::{Params, SubscriptionKind, SubscriptionResult};
use serde::{Deserialize, Serialize};
use crate::core::ProcessId;
/// The Request type that can be made to eth:distro:sys. Currently primitive, this
/// enum will expand to support more actions in the future.
///