feat: support async api

Author: driftluo

Cargo.toml

@@ -23,14 +23,15 @@ log = "0.4.6"
 reqwest = { version = "0.12", default-features = false, features = ["json"] }
 secp256k1 = { version = "0.29.0", features = ["recovery"] }
 tokio-util = { version = "0.7.7", features = ["codec"] }
-tokio = { version = "1" }
+tokio = { version = "1", features = ["full"] }
 bytes = "1"
 futures = "0.3"
 jsonrpc-core = "18"
 parking_lot = "0.12"
 lru = "0.7.1"
 dashmap = "5.4"
 dyn-clone = "1.0"
+async-trait = "0.1"
 
 ckb-types = "0.119.0"
 ckb-dao-utils = "0.119.0"
@@ -50,7 +51,6 @@ ckb-mock-tx-types = { version = "0.119.0" }
 ckb-chain-spec = "0.119.0"
 
 sparse-merkle-tree = "0.6.1"
-lazy_static = "1.3.0"
 
 [features]
 default = ["default-tls"]

deny.toml

@@ -74,7 +74,8 @@ ignore = [
     #{ id = "RUSTSEC-0000-0000", reason = "you can specify a reason the advisory is ignored" },
     #"a-crate-that-is-yanked@0.1.1", # you can also ignore yanked crate versions if you wish
     #{ crate = "a-crate-that-is-yanked@0.1.1", reason = "you can specify why you are ignoring the yanked crate" 
-    "RUSTSEC-2024-0370" # proc-macro-error's maintainer seems to be unreachable, ignore this
+    "RUSTSEC-2024-0370", # proc-macro-error's maintainer seems to be unreachable, ignore this
+    "RUSTSEC-2024-0384", # instant is no longer maintained, ignore this
 ]
 # If this is true, then cargo deny will use the git executable to fetch advisory database.
 # If this is false, then it uses a built-in git library.
@@ -97,8 +98,8 @@ allow = [
     "ISC",
     "MIT",
     "Unicode-DFS-2016",
-    "BSL-1.0", # xxhash-rust 0.8.10
-
+    "BSL-1.0",          # xxhash-rust 0.8.10
+    "Unicode-3.0",
     #"MIT",
     #"Apache-2.0",
     #"Apache-2.0 WITH LLVM-exception",

examples/script_unlocker_example.rs

@@ -17,13 +17,14 @@ use std::collections::HashMap;
 /// [CapacityDiff]: https://github.com/doitian/ckb-sdk-examples-capacity-diff
 struct CapacityDiffUnlocker {}
 
+#[async_trait::async_trait]
 impl ScriptUnlocker for CapacityDiffUnlocker {
     // This works for any args
     fn match_args(&self, _args: &[u8]) -> bool {
         true
     }
 
-    fn unlock(
+    async fn unlock_async(
         &self,
         tx: &TransactionView,
         script_group: &ScriptGroup,
@@ -45,12 +46,14 @@ impl ScriptUnlocker for CapacityDiffUnlocker {
 
         let mut total = 0i64;
         for i in &script_group.input_indices {
-            let cell = tx_dep_provider.get_cell(
-                &tx.inputs()
-                    .get(*i)
-                    .ok_or_else(|| other_unlock_error("input index out of bound"))?
-                    .previous_output(),
-            )?;
+            let cell = tx_dep_provider
+                .get_cell_async(
+                    &tx.inputs()
+                        .get(*i)
+                        .ok_or_else(|| other_unlock_error("input index out of bound"))?
+                        .previous_output(),
+                )
+                .await?;
             let capacity: u64 = cell.capacity().unpack();
             total -= capacity as i64;
         }
@@ -71,7 +74,7 @@ impl ScriptUnlocker for CapacityDiffUnlocker {
 
     // This is called before balancer. It's responsible to fill witness for inputs added manually
     // by users.
-    fn fill_placeholder_witness(
+    async fn fill_placeholder_witness_async(
         &self,
         tx: &TransactionView,
         script_group: &ScriptGroup,

rust-toolchain

@@ -1 +1 @@
-1.75.0
+1.81.0

src/lib.rs

@@ -16,7 +16,7 @@ pub mod test_util;
 #[cfg(test)]
 mod tests;
 
-pub use rpc::{CkbRpcClient, IndexerRpcClient, RpcError};
+pub use rpc::{CkbRpcAsyncClient, CkbRpcClient, IndexerRpcAsyncClient, IndexerRpcClient, RpcError};
 pub use types::{
     Address, AddressPayload, AddressType, CodeHashIndex, HumanCapacity, NetworkInfo, NetworkType,
     OldAddress, OldAddressFormat, ScriptGroup, ScriptGroupType, ScriptId, Since, SinceType,

src/rpc/ckb.rs

@@ -110,7 +110,7 @@ crate::jsonrpc!(pub struct CkbRpcClient {
     pub fn calculate_dao_maximum_withdraw(&self, out_point: OutPoint, kind: DaoWithdrawingCalculationKind) -> Capacity;
 });
 
-crate::jsonrpc_async!(pub struct CkbRpcAyncClient {
+crate::jsonrpc_async!(pub struct CkbRpcAsyncClient {
     // Chain
     pub fn get_block(&self, hash: H256) -> Option<BlockView>;
     pub fn get_block_by_number(&self, number: BlockNumber) -> Option<BlockView>;
@@ -212,6 +212,15 @@ fn transform_cycles(cycles: Option<Vec<ckb_jsonrpc_types::Cycle>>) -> Vec<Cycle>
         .unwrap_or_default()
 }
 
+impl From<&CkbRpcClient> for CkbRpcAsyncClient {
+    fn from(value: &CkbRpcClient) -> Self {
+        Self {
+            client: value.client.clone(),
+            id: 0.into(),
+        }
+    }
+}
+
 impl CkbRpcClient {
     pub fn get_packed_block(&self, hash: H256) -> Result<Option<JsonBytes>, crate::RpcError> {
         self.post("get_block", (hash, Some(Uint32::from(0u32))))

src/rpc/ckb_indexer.rs

@@ -202,3 +202,12 @@ crate::jsonrpc_async!(pub struct IndexerRpcAsyncClient {
     pub fn get_transactions(&self, search_key: SearchKey, order: Order, limit: Uint32, after: Option<JsonBytes>) -> Pagination<Tx>;
     pub fn get_cells_capacity(&self, search_key: SearchKey) -> Option<CellsCapacity>;
 });
+
+impl From<&IndexerRpcClient> for IndexerRpcAsyncClient {
+    fn from(value: &IndexerRpcClient) -> Self {
+        Self {
+            client: value.client.clone(),
+            id: 0.into(),
+        }
+    }
+}

src/rpc/ckb_light_client.rs

@@ -199,3 +199,12 @@ crate::jsonrpc_async!(pub struct LightClientRpcAsyncClient {
     pub fn get_peers(&self) -> Vec<RemoteNode>;
     pub fn local_node_info(&self) -> LocalNode;
 });
+
+impl From<&LightClientRpcClient> for LightClientRpcAsyncClient {
+    fn from(value: &LightClientRpcClient) -> Self {
+        Self {
+            client: value.client.clone(),
+            id: 0.into(),
+        }
+    }
+}

src/rpc/mod.rs

@@ -3,16 +3,60 @@ pub mod ckb_indexer;
 pub mod ckb_light_client;
 
 use anyhow::anyhow;
-pub use ckb::CkbRpcClient;
-pub use ckb_indexer::IndexerRpcClient;
+pub use ckb::{CkbRpcAsyncClient, CkbRpcClient};
+pub use ckb_indexer::{IndexerRpcAsyncClient, IndexerRpcClient};
 use ckb_jsonrpc_types::{JsonBytes, ResponseFormat};
-pub use ckb_light_client::LightClientRpcClient;
+pub use ckb_light_client::{LightClientRpcAsyncClient, LightClientRpcClient};
 
-use std::sync::LazyLock;
+use std::{cell::LazyCell, future::Future};
 use thiserror::Error;
 
-static RUNTIME: LazyLock<tokio::runtime::Runtime> =
-    LazyLock::new(|| tokio::runtime::Runtime::new().unwrap());
+thread_local! {
+    pub static RUNTIME: LazyCell<tokio::runtime::Runtime> =
+    LazyCell::new(|| tokio::runtime::Builder::new_current_thread().enable_all().build().unwrap());
+}
+
+pub(crate) fn block_on<F: Send>(future: impl Future<Output = F> + Send) -> F {
+    match tokio::runtime::Handle::try_current() {
+        Ok(h)
+            if matches!(
+                h.runtime_flavor(),
+                tokio::runtime::RuntimeFlavor::MultiThread
+            ) =>
+        {
+            tokio::task::block_in_place(|| {
+                h.block_on(tokio::time::timeout(
+                    std::time::Duration::from_secs(10),
+                    future,
+                ))
+                .unwrap()
+            })
+        }
+        // if we on the current runtime, it must use another thread to poll this future,
+        // can't block on current runtime, it will block current reactor to stop forever
+        // in tokio runtime, this time will panic
+        Ok(_) => std::thread::scope(|s| {
+            s.spawn(|| {
+                RUNTIME.with(|rt| {
+                    rt.block_on(tokio::time::timeout(
+                        std::time::Duration::from_secs(10),
+                        future,
+                    ))
+                    .unwrap()
+                })
+            })
+            .join()
+            .unwrap()
+        }),
+        Err(_) => RUNTIME.with(|rt| {
+            rt.block_on(tokio::time::timeout(
+                std::time::Duration::from_secs(10),
+                future,
+            ))
+            .unwrap()
+        }),
+    }
+}
 
 #[derive(Error, Debug)]
 pub enum RpcError {
@@ -38,8 +82,8 @@ macro_rules! jsonrpc {
     ) => (
         $(#[$struct_attr])*
         pub struct $struct_name {
-            client: crate::rpc::RpcClient,
-            id: std::sync::atomic::AtomicU64,
+            pub(crate) client: $crate::rpc::RpcClient,
+            pub(crate) id: std::sync::atomic::AtomicU64,
         }
 
         impl Clone for $struct_name {
@@ -53,13 +97,13 @@ macro_rules! jsonrpc {
 
         impl $struct_name {
             pub fn new(uri: &str) -> Self {
-                $struct_name {  id: 0.into(), client: crate::rpc::RpcClient::new(uri), }
+                $struct_name {  id: 0.into(), client: $crate::rpc::RpcClient::new(uri), }
             }
 
             pub fn post<PARAM, RET>(&self, method:&str, params: PARAM)->Result<RET, $crate::rpc::RpcError>
             where
-                PARAM:serde::ser::Serialize,
-                RET: serde::de::DeserializeOwned,
+                PARAM:serde::ser::Serialize + Send + 'static,
+                RET: serde::de::DeserializeOwned + Send + 'static,
             {
                 let id = self.id.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
                 let params_fn = || -> Result<_,_> {
@@ -73,7 +117,7 @@ macro_rules! jsonrpc {
                 };
 
                 let task = self.client.post(params_fn);
-                crate::rpc::RUNTIME.block_on(task)
+                $crate::rpc::block_on(task)
 
             }
 
@@ -94,7 +138,7 @@ macro_rules! jsonrpc {
                     };
 
                     let task = $selff.client.post(params_fn);
-                    crate::rpc::RUNTIME.block_on(task)
+                    $crate::rpc::block_on(task)
                 }
             )*
         }
@@ -113,8 +157,8 @@ macro_rules! jsonrpc_async {
     ) => (
         $(#[$struct_attr])*
         pub struct $struct_name {
-            client: crate::rpc::RpcClient,
-            id: std::sync::atomic::AtomicU64,
+            pub(crate) client: $crate::rpc::RpcClient,
+            pub(crate) id: std::sync::atomic::AtomicU64,
         }
 
         impl Clone for $struct_name {
@@ -128,13 +172,13 @@ macro_rules! jsonrpc_async {
 
         impl $struct_name {
             pub fn new(uri: &str) -> Self {
-                $struct_name {  id: 0.into(), client: crate::rpc::RpcClient::new(uri), }
+                $struct_name {  id: 0.into(), client: $crate::rpc::RpcClient::new(uri), }
             }
 
-            pub fn post<PARAM, RET>(&self, method:&str, params: PARAM)->impl std::future::Future<Output =Result<RET, $crate::rpc::RpcError>>
+            pub fn post<PARAM, RET>(&self, method:&str, params: PARAM)->impl std::future::Future<Output =Result<RET, $crate::rpc::RpcError>> + Send + 'static
             where
-                PARAM:serde::ser::Serialize,
-                RET: serde::de::DeserializeOwned,
+                PARAM:serde::ser::Serialize + Send + 'static,
+                RET: serde::de::DeserializeOwned + Send + 'static,
             {
                 let id = self.id.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
                 let method = serde_json::json!(method);
@@ -196,8 +240,8 @@ impl RpcClient {
         json_post_params: T,
     ) -> impl std::future::Future<Output = Result<RET, crate::rpc::RpcError>>
     where
-        PARAM: serde::ser::Serialize,
-        RET: serde::de::DeserializeOwned,
+        PARAM: serde::ser::Serialize + Send + 'static,
+        RET: serde::de::DeserializeOwned + Send + 'static,
         T: FnOnce() -> Result<PARAM, crate::rpc::RpcError>,
     {
         let url = self.url.clone();