uqbar-dao/nectar
1
1
Fork 0
mirror of https://github.com/uqbar-dao/nectar.git synced 2024-11-22 11:22:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #383 from kinode-dao/bp/etherrorfix

Browse Source 
eth: explicit rpc error return
This commit is contained in:
bitful-pannul 2024-06-06 12:42:49 -07:00 committed by GitHub
commit 3de3b9b838
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -3074,6 +3074,7 @@ dependencies = [
"aes-gcm",
"alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=6f8ebb4)",
"alloy-contract",
"alloy-json-rpc 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=6f8ebb4)",
"alloy-network",
"alloy-primitives 0.6.4",
"alloy-providers",
@ -3291,6 +3292,7 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
name = "lib"
version = "0.8.0"
dependencies = [
"alloy-json-rpc 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=6f8ebb4)",
"alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=6f8ebb4)",
"anyhow",
"kit",

1
kinode/Cargo.toml
View File

@ -30,6 +30,7 @@ alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "6f8ebb4" }
alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "6f8ebb4" }
alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", rev = "6f8ebb4" }
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "6f8ebb4" }
alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", rev = "6f8ebb4" }
alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "6f8ebb4", features = ["ws"]}
alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "6f8ebb4" }
alloy-providers = { git = "https://github.com/alloy-rs/alloy", rev = "6f8ebb4" }

7
kinode/src/eth/mod.rs
View File

@ -1,3 +1,4 @@
use alloy_json_rpc::RpcError;
use alloy_providers::provider::Provider;
use alloy_pubsub::PubSubFrontend;
use alloy_rpc_client::ClientBuilder;
@ -618,6 +619,10 @@ async fn fulfill_request(
return EthResponse::Response { value };
}
Err(rpc_error) => {
// if rpc_error is of type ErrResponse, return to user!
if let RpcError::ErrorResp(err) = rpc_error {
return EthResponse::Err(EthError::RpcError(err));
}
verbose_print(
print_tx,
&format!(
@ -651,7 +656,7 @@ async fn fulfill_request(
)
.await;
if let EthResponse::Err(e) = response {
if e == EthError::RpcMalformedResponse {
if let EthError::RpcMalformedResponse = e {
node_provider.usable = false;
}
} else {

2
kinode/src/eth/subscription.rs
View File

@ -287,7 +287,7 @@ async fn build_subscription(
node_provider.usable = false;
}
EthResponse::Err(e) => {
if e == EthError::RpcMalformedResponse {
if let EthError::RpcMalformedResponse = e {
node_provider.usable = false;
}
}

1
lib/Cargo.toml
View File

@ -18,6 +18,7 @@ tokio = "1.28"
[dependencies]
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "6f8ebb4" }
alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", rev = "6f8ebb4" }
lazy_static = "1.4.0"
rand = "0.8.4"
ring = "0.17.8"

5
lib/src/eth.rs
View File

@ -1,3 +1,4 @@
use alloy_json_rpc::ErrorPayload;
use alloy_rpc_types::pubsub::{Params, SubscriptionKind, SubscriptionResult};
use serde::{Deserialize, Serialize};
use std::collections::{HashMap, HashSet};
@ -59,8 +60,10 @@ pub enum EthResponse {
Err(EthError),
}
#[derive(Debug, Serialize, Deserialize, PartialEq)]
#[derive(Debug, Serialize, Deserialize)]
pub enum EthError {
/// RPC provider returned an error
RpcError(ErrorPayload),
/// provider module cannot parse message
MalformedRequest,
/// No RPC provider for the chain