Merge pull request #1 from hewigovens/batch-chunk

Add `batch_by_chunk` support and remove `async_trait`

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-package.version = "0.1.0"
+package.version = "0.1.1"
 package.edition = "2021"
 package.documentation = "https://docs.rs/reqwest_enum"
 package.authors = ["Tao Xu <[email protected]>"]
@@ -17,3 +17,4 @@ serde = { version = "^1.0.0", features = ["derive"] }
 serde_json = "^1.0.0"
 
 async-trait = "^0.1.0"
+futures = "^0.3.0"

examples/ethereum-rpc/src/ethereum_rpc.rs

@@ -6,7 +6,7 @@ use reqwest_enum::{
     target::Target,
 };
 use serde::{Deserialize, Serialize};
-use serde_json::Value;
+use serde_json::{Number, Value};
 use std::collections::HashMap;
 
 #[derive(Serialize, Deserialize)]
@@ -20,6 +20,7 @@ pub struct TransactionObject {
 }
 
 pub enum BlockParameter {
+    // hexadecimal block number
     Number(&'static str),
     Latest,
     Earliest,
@@ -48,21 +49,33 @@ impl From<&BlockParameter> for serde_json::Value {
     }
 }
 
+fn u64_to_value(val: &u64) -> serde_json::Value {
+    Value::Number(Number::from(*val))
+}
+
 pub enum EthereumRPC {
+    BlockNumber,
+    BlobBaseFee,
     ChainId,
+    Call(TransactionObject, BlockParameter),
+    EstimateGas(TransactionObject),
+    // blockCount, newestBlock, rewardPercentiles
+    FeeHistory(u64, BlockParameter, Vec<u64>),
     GasPrice,
-    BlockNumber,
+    // addrees
     GetBalance(&'static str),
-    GetBlockByNumber(&'static str, bool),
+    GetBlockByNumber(BlockParameter, bool),
+    GetCode(&'static str, BlockParameter),
+    // address, blockNumber
     GetTransactionCount(&'static str, BlockParameter),
-    Call(TransactionObject, BlockParameter),
-    EstimateGas(TransactionObject),
     SendRawTransaction(&'static str),
+    Syncing,
 }
 
 impl JsonRpcTarget for EthereumRPC {
     fn method_name(&self) -> &'static str {
         match self {
+            EthereumRPC::Syncing => "eth_syncing",
             EthereumRPC::ChainId => "eth_chainId",
             EthereumRPC::GasPrice => "eth_gasPrice",
             EthereumRPC::BlockNumber => "eth_blockNumber",
@@ -72,6 +85,9 @@ impl JsonRpcTarget for EthereumRPC {
             EthereumRPC::GetTransactionCount(_, _) => "eth_getTransactionCount",
             EthereumRPC::Call(_, _) => "eth_call",
             EthereumRPC::EstimateGas(_) => "eth_estimateGas",
+            EthereumRPC::FeeHistory(_, _, _) => "eth_feeHistory",
+            EthereumRPC::GetCode(_, _) => "eth_getCode",
+            EthereumRPC::BlobBaseFee => "eth_blobBaseFee",
         }
     }
 
@@ -85,10 +101,7 @@ impl JsonRpcTarget for EthereumRPC {
                 vec![Value::String(tx.to_string())]
             }
             EthereumRPC::GetBlockByNumber(block, full) => {
-                vec![
-                    Value::String(block.to_string()),
-                    Value::Bool(full.to_owned()),
-                ]
+                vec![block.into(), Value::Bool(full.to_owned())]
             }
             EthereumRPC::GetTransactionCount(address, block) => {
                 vec![Value::String(address.to_string()), block.into()]
@@ -101,9 +114,23 @@ impl JsonRpcTarget for EthereumRPC {
                 let value = serde_json::to_value(tx).unwrap();
                 vec![value]
             }
-            EthereumRPC::ChainId => vec![],
-            EthereumRPC::GasPrice => vec![],
-            EthereumRPC::BlockNumber => vec![],
+            EthereumRPC::FeeHistory(block_count, block, reward_percentiles) => {
+                let mut params = vec![
+                    u64_to_value(block_count),
+                    block.into(),
+                    Value::Array(reward_percentiles.iter().map(u64_to_value).collect()),
+                ];
+                params.push(Value::Bool(false));
+                params
+            }
+            EthereumRPC::GetCode(address, block) => {
+                vec![Value::String(address.to_string()), block.into()]
+            }
+            EthereumRPC::ChainId
+            | EthereumRPC::GasPrice
+            | EthereumRPC::BlockNumber
+            | EthereumRPC::Syncing
+            | EthereumRPC::BlobBaseFee => vec![],
         }
     }
 }

examples/ethereum-rpc/src/main.rs

@@ -1,14 +1,23 @@
 extern crate reqwest_enum;
-use ethereum_rpc::EthereumRPC;
+use ethereum_rpc::{BlockParameter, EthereumRPC};
 use reqwest_enum::jsonrpc::JsonRpcResult;
 use reqwest_enum::provider::{JsonRpcProviderType, Provider};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let provider = Provider::<EthereumRPC>::default();
 
-    let targets = vec![EthereumRPC::ChainId, EthereumRPC::GasPrice];
-    let results: Vec<JsonRpcResult<String>> = provider.batch(targets).await?;
+    let targets = vec![
+        EthereumRPC::ChainId,
+        EthereumRPC::GasPrice,
+        EthereumRPC::BlockNumber,
+        EthereumRPC::GetBalance("0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"),
+        EthereumRPC::GetCode(
+            "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
+            BlockParameter::Latest,
+        ),
+    ];
+    let results: Vec<JsonRpcResult<String>> = provider.batch_chunk_by(targets, 2).await?;
     for result in results {
         match result {
             JsonRpcResult::Value(response) => {

examples/ethereum-rpc/tests/integration_test.rs

@@ -2,7 +2,7 @@
 
 mod ethereum_rpc_test {
     use ethereum_rpc::{BlockParameter, EthereumRPC};
-    use reqwest_enum::jsonrpc::JsonRpcResponse;
+    use reqwest_enum::jsonrpc::{JsonRpcResponse, JsonRpcResult};
     use reqwest_enum::provider::{JsonProviderType, Provider};
 
     const TEST_ADDRESS: &str = "0xee5f5c53ce2159fc6dd4b0571e86a4a390d04846";
@@ -56,4 +56,23 @@ mod ethereum_rpc_test {
             .unwrap();
         assert_eq!(response.result, "0x0");
     }
+
+    #[tokio::test]
+    async fn test_syncing() {
+        let provider = Provider::<EthereumRPC>::default();
+        let response: JsonRpcResponse<bool> =
+            provider.request_json(EthereumRPC::Syncing).await.unwrap();
+        assert!(!response.result);
+    }
+
+    #[tokio::test]
+    async fn test_blob_base_fee() {
+        let provider = Provider::<EthereumRPC>::default();
+        let result: JsonRpcResult<String> = provider
+            .request_json(EthereumRPC::BlobBaseFee)
+            .await
+            .expect("request error");
+
+        assert!(matches!(result, JsonRpcResult::Error(_)));
+    }
 }

reqwest-enum/Cargo.toml

@@ -13,10 +13,10 @@ edition = { workspace = true }
 
 [features]
 default = ["jsonrpc"]
-jsonrpc = []
+jsonrpc = ["dep:futures"]
 
 [dependencies]
 reqwest = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
-async-trait = { workspace = true }
+futures = { workspace = true, optional = true }

reqwest-enum/src/jsonrpc.rs

@@ -40,7 +40,7 @@ impl From<JsonRpcRequest> for HTTPBody {
 #[cfg(feature = "jsonrpc")]
 #[derive(Debug, Serialize, Deserialize)]
 pub struct JsonRpcResponse<T> {
-    pub id: u64,
+    pub id: JsonRpcId,
     pub jsonrpc: String,
     pub result: T,
 }
@@ -49,8 +49,8 @@ pub struct JsonRpcResponse<T> {
 #[derive(Debug, Serialize, Deserialize)]
 pub struct JsonRpcErrorResponse {
     pub jsonrpc: String,
-    pub id: u64,
-    pub error: String,
+    pub id: JsonRpcId,
+    pub error: JsonRpcError,
 }
 
 #[cfg(feature = "jsonrpc")]
@@ -60,8 +60,10 @@ pub struct JsonRpcError {
     pub message: String,
 }
 
+#[cfg(feature = "jsonrpc")]
 impl std::error::Error for JsonRpcError {}
 
+#[cfg(feature = "jsonrpc")]
 impl From<reqwest::Error> for JsonRpcError {
     fn from(err: reqwest::Error) -> Self {
         JsonRpcError {