diff --git a/Cargo.toml b/Cargo.toml
index 76bca3c7..937c898b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ log = "0.4.6"
 reqwest = { version = "0.12", default-features = false, features = ["json", "cookies"] }
 secp256k1 = { version = "0.30.0", features = ["recovery"] }
 tokio-util = { version = "0.7.7", features = ["codec"] }
-tokio = { version = "1", features = ["time"] }
+tokio = { version = "1", features = ["time", "sync"] }
 bytes = "1"
 futures = "0.3"
 jsonrpc-core = "18"
@@ -58,7 +58,7 @@ async-iterator = "2.3.0"
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 getrandom = { version = "0.2.16", features = ["js"] }
 web-time = "1.1.0"
-tokio_with_wasm = { version = "0.8.2", features = ["time"] }
+tokio_with_wasm = { version = "0.8", features = ["time", "rt"] }
 
 [features]
 default = ["default-tls"]
diff --git a/examples/script_unlocker_example.rs b/examples/script_unlocker_example.rs
index 8ec59049..9a354fcd 100644
--- a/examples/script_unlocker_example.rs
+++ b/examples/script_unlocker_example.rs
@@ -17,8 +17,7 @@ use std::collections::HashMap;
 /// [CapacityDiff]: https://github.com/doitian/ckb-sdk-examples-capacity-diff
 struct CapacityDiffUnlocker {}
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl ScriptUnlocker for CapacityDiffUnlocker {
     // This works for any args
     fn match_args(&self, _args: &[u8]) -> bool {
@@ -114,7 +113,7 @@ impl ScriptUnlocker for CapacityDiffUnlocker {
 }
 
 fn other_unlock_error(message: &str) -> UnlockError {
-    UnlockError::Other(std::io::Error::new(std::io::ErrorKind::Other, message).into())
+    UnlockError::Other(std::io::Error::other(message).into())
 }
 
 fn main() {
diff --git a/examples/sudt_issue.rs b/examples/sudt_issue.rs
index ea69b9d3..91754a78 100644
--- a/examples/sudt_issue.rs
+++ b/examples/sudt_issue.rs
@@ -15,7 +15,7 @@ fn main() -> Result<(), Box<dyn StdErr>> {
     let configuration = TransactionBuilderConfiguration::new_with_network(network_info.clone())?;
 
     let issuer = Address::from_str("ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsq2qf8keemy2p5uu0g0gn8cd4ju23s5269qk8rg4r")?;
-    let iterator = InputIterator::new_with_address(&[issuer.clone()], &network_info);
+    let iterator = InputIterator::new_with_address(std::slice::from_ref(&issuer), &network_info);
     let mut builder = SudtTransactionBuilder::new(configuration, iterator, &issuer, true)?;
     builder.add_output(&issuer, 42);
 
diff --git a/examples/sudt_send.rs b/examples/sudt_send.rs
index e7e4444a..9c894f3b 100644
--- a/examples/sudt_send.rs
+++ b/examples/sudt_send.rs
@@ -16,7 +16,7 @@ fn main() -> Result<(), Box<dyn StdErr>> {
 
     let sender = Address::from_str("ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsq2qf8keemy2p5uu0g0gn8cd4ju23s5269qk8rg4r")?;
     let receiver= Address::from_str("ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqv5dsed9par23x4g58seaw58j3ym5ml2hs8ztche")?;
-    let iterator = InputIterator::new_with_address(&[sender.clone()], &network_info);
+    let iterator = InputIterator::new_with_address(std::slice::from_ref(&sender), &network_info);
     let mut builder = SudtTransactionBuilder::new(configuration, iterator, &sender, false)?;
     builder.add_output(&receiver, 50);
 
diff --git a/rust-toolchain b/rust-toolchain
index f288d111..7f229af9 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-1.85.0
+1.92.0
diff --git a/src/pubsub/stream_codec.rs b/src/pubsub/stream_codec.rs
index 79f1abd3..663f46e0 100644
--- a/src/pubsub/stream_codec.rs
+++ b/src/pubsub/stream_codec.rs
@@ -60,7 +60,7 @@ impl tokio_util::codec::Decoder for StreamCodec {
 
                 match str::from_utf8(line.as_ref()) {
                     Ok(_) => Ok(Some(line)),
-                    Err(_) => Err(io::Error::new(io::ErrorKind::Other, "invalid UTF-8")),
+                    Err(_) => Err(io::Error::other("invalid UTF-8")),
                 }
             } else {
                 Ok(None)
diff --git a/src/rpc/ckb_indexer.rs b/src/rpc/ckb_indexer.rs
index 83e89080..c8efbfb1 100644
--- a/src/rpc/ckb_indexer.rs
+++ b/src/rpc/ckb_indexer.rs
@@ -20,8 +20,10 @@ pub struct SearchKey {
 
 #[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, Hash)]
 #[serde(rename_all = "snake_case")]
+#[derive(Default)]
 pub enum SearchMode {
     // search with prefix
+    #[default]
     Prefix,
     // search with exact match
     Exact,
@@ -29,12 +31,6 @@ pub enum SearchMode {
     Partial,
 }
 
-impl Default for SearchMode {
-    fn default() -> Self {
-        Self::Prefix
-    }
-}
-
 #[derive(Serialize, Deserialize, Default, Clone, Debug)]
 pub struct SearchKeyFilter {
     pub script: Option<Script>,
diff --git a/src/rpc/mod.rs b/src/rpc/mod.rs
index 2ba74039..28acd358 100644
--- a/src/rpc/mod.rs
+++ b/src/rpc/mod.rs
@@ -62,6 +62,8 @@ pub enum RpcError {
     Rpc(#[from] jsonrpc_core::Error),
     #[error(transparent)]
     Other(#[from] anyhow::Error),
+    #[error("oneshot channel closed")]
+    ChannelClosed,
 }
 
 #[cfg(not(target_arch = "wasm32"))]
@@ -206,7 +208,6 @@ macro_rules! jsonrpc_async {
                 Ok($struct_name { id: 0.into(), client })
             }
 
-            #[cfg(not(target_arch="wasm32"))]
             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 + Send + 'static,
@@ -227,28 +228,6 @@ macro_rules! jsonrpc_async {
 
                 self.client.post(params_fn)
 
-            }
-            #[cfg(target_arch="wasm32")]
-            pub fn post<PARAM, RET>(&self, method:&str, params: PARAM)->impl std::future::Future<Output =Result<RET, $crate::rpc::RpcError>> + 'static
-            where
-                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);
-
-                let params_fn = move || -> Result<_,_> {
-                    let params = serde_json::to_value(params)?;
-                    let mut req_json = serde_json::Map::new();
-                    req_json.insert("id".to_owned(), serde_json::json!(id));
-                    req_json.insert("jsonrpc".to_owned(), serde_json::json!("2.0"));
-                    req_json.insert("method".to_owned(), method);
-                    req_json.insert("params".to_owned(), params);
-                    Ok(req_json)
-                };
-
-                self.client.post(params_fn)
-
             }
             $(
                 $(#[$attr])*
@@ -320,7 +299,7 @@ impl RpcClient {
         }
     }
 
-    pub fn post<PARAM, RET, T>(
+    fn post_inner<PARAM, RET, T>(
         &self,
         json_post_params: T,
     ) -> impl std::future::Future<Output = Result<RET, crate::rpc::RpcError>>
@@ -343,6 +322,40 @@ impl RpcClient {
             }
         }
     }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn post<PARAM, RET, T>(
+        &self,
+        json_post_params: T,
+    ) -> impl std::future::Future<Output = Result<RET, crate::rpc::RpcError>> + Send
+    where
+        PARAM: serde::ser::Serialize + Send + 'static,
+        RET: serde::de::DeserializeOwned + Send + 'static,
+        T: FnOnce() -> Result<PARAM, crate::rpc::RpcError> + Send,
+    {
+        self.post_inner(json_post_params)
+    }
+
+    #[cfg(target_arch = "wasm32")]
+    pub fn post<PARAM, RET, T>(
+        &self,
+        json_post_params: T,
+    ) -> impl std::future::Future<Output = Result<RET, crate::rpc::RpcError>> + Send
+    where
+        PARAM: serde::ser::Serialize + Send + 'static,
+        RET: serde::de::DeserializeOwned + Send + 'static,
+        T: FnOnce() -> Result<PARAM, crate::rpc::RpcError> + Send + 'static,
+    {
+        let (tx, rx) = tokio::sync::oneshot::channel();
+        let future = self.post_inner(json_post_params);
+
+        tokio_with_wasm::spawn(async move {
+            let result = future.await;
+            let _ = tx.send(result);
+        });
+
+        async move { rx.await.map_err(|_| crate::rpc::RpcError::ChannelClosed)? }
+    }
 }
 
 #[macro_export]
diff --git a/src/test_util.rs b/src/test_util.rs
index ae593948..d7fb7b0e 100644
--- a/src/test_util.rs
+++ b/src/test_util.rs
@@ -397,8 +397,7 @@ impl Context {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl TransactionDependencyProvider for Context {
     // For verify certain cell belong to certain transaction
     async fn get_transaction_async(
@@ -458,8 +457,7 @@ impl TransactionDependencyProvider for Context {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl HeaderDepResolver for Context {
     async fn resolve_by_tx_async(
         &self,
@@ -528,8 +526,7 @@ impl CellDepResolver for Context {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl CellCollector for LiveCellsContext {
     async fn collect_live_cells_async(
         &mut self,
diff --git a/src/tests/cycle.rs b/src/tests/cycle.rs
index e9b779f8..54544aab 100644
--- a/src/tests/cycle.rs
+++ b/src/tests/cycle.rs
@@ -27,8 +27,7 @@ const CYCLE_BIN: &[u8] = include_bytes!("../test-data/cycle");
 pub struct CycleUnlocker {
     loops: u64,
 }
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl ScriptUnlocker for CycleUnlocker {
     fn match_args(&self, _args: &[u8]) -> bool {
         true
diff --git a/src/traits/default_impls.rs b/src/traits/default_impls.rs
index d22d22b6..5126aed5 100644
--- a/src/traits/default_impls.rs
+++ b/src/traits/default_impls.rs
@@ -270,8 +270,7 @@ impl DefaultHeaderDepResolver {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl HeaderDepResolver for DefaultHeaderDepResolver {
     async fn resolve_by_tx_async(
         &self,
@@ -380,7 +379,14 @@ impl DefaultCellCollector {
                         #[cfg(not(target_arch = "wasm32"))]
                         tokio::time::sleep(Duration::from_millis(50)).await;
                         #[cfg(target_arch = "wasm32")]
-                        tokio_with_wasm::time::sleep(Duration::from_millis(50)).await;
+                        {
+                            let (tx, rx) = tokio::sync::oneshot::channel::<()>();
+                            tokio_with_wasm::spawn(async move {
+                                tokio_with_wasm::time::sleep(Duration::from_millis(50)).await;
+                                let _ = tx.send(());
+                            });
+                            let _ = rx.await;
+                        }
                     } else {
                         return Ok(());
                     }
@@ -398,8 +404,7 @@ impl DefaultCellCollector {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl CellCollector for DefaultCellCollector {
     async fn collect_live_cells_async(
         &mut self,
@@ -597,8 +602,7 @@ impl DefaultTransactionDependencyProvider {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl TransactionDependencyProvider for DefaultTransactionDependencyProvider {
     async fn get_transaction_async(
         &self,
diff --git a/src/traits/dummy_impls.rs b/src/traits/dummy_impls.rs
index 74d94bc5..5dd6d01e 100644
--- a/src/traits/dummy_impls.rs
+++ b/src/traits/dummy_impls.rs
@@ -14,8 +14,7 @@ use anyhow::anyhow;
 #[derive(Clone, Default)]
 pub struct DummyCellCollector;
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl CellCollector for DummyCellCollector {
     async fn collect_live_cells_async(
         &mut self,
@@ -49,8 +48,7 @@ impl CellCollector for DummyCellCollector {
 #[derive(Default)]
 pub struct DummyHeaderDepResolver;
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl HeaderDepResolver for DummyHeaderDepResolver {
     async fn resolve_by_tx_async(
         &self,
@@ -70,8 +68,7 @@ impl HeaderDepResolver for DummyHeaderDepResolver {
 #[derive(Default)]
 pub struct DummyTransactionDependencyProvider;
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl TransactionDependencyProvider for DummyTransactionDependencyProvider {
     // For verify certain cell belong to certain transaction
     async fn get_transaction_async(
diff --git a/src/traits/light_client_impls.rs b/src/traits/light_client_impls.rs
index e3aea8a9..d96e1329 100644
--- a/src/traits/light_client_impls.rs
+++ b/src/traits/light_client_impls.rs
@@ -42,8 +42,7 @@ impl LightClientHeaderDepResolver {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl HeaderDepResolver for LightClientHeaderDepResolver {
     async fn resolve_by_tx_async(
         &self,
@@ -120,8 +119,7 @@ impl LightClientTransactionDependencyProvider {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl TransactionDependencyProvider for LightClientTransactionDependencyProvider {
     async fn get_transaction_async(
         &self,
@@ -272,8 +270,7 @@ impl LightClientCellCollector {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl CellCollector for LightClientCellCollector {
     async fn collect_live_cells_async(
         &mut self,
diff --git a/src/traits/mod.rs b/src/traits/mod.rs
index c15fff41..a2d82555 100644
--- a/src/traits/mod.rs
+++ b/src/traits/mod.rs
@@ -93,8 +93,7 @@ pub enum TransactionDependencyError {
 ///   * inputs
 ///   * cell_deps
 ///   * header_deps
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 pub trait TransactionDependencyProvider: Sync + Send {
     async fn get_transaction_async(
         &self,
@@ -433,8 +432,7 @@ impl CellQueryOptions {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 pub trait CellCollector: DynClone + Send + Sync {
     /// Collect live cells by query options, if `apply_changes` is true will
     /// mark all collected cells as dead cells.
@@ -478,8 +476,7 @@ pub trait CellDepResolver: Send + Sync {
     fn resolve(&self, script: &Script) -> Option<CellDep>;
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 pub trait HeaderDepResolver: Send + Sync {
     /// Resolve header dep by trancation hash
     async fn resolve_by_tx_async(
diff --git a/src/traits/offchain_impls.rs b/src/traits/offchain_impls.rs
index 1790f91e..8fc551aa 100644
--- a/src/traits/offchain_impls.rs
+++ b/src/traits/offchain_impls.rs
@@ -37,8 +37,7 @@ pub struct OffchainHeaderDepResolver {
     pub by_number: HashMap<u64, HeaderView>,
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl HeaderDepResolver for OffchainHeaderDepResolver {
     async fn resolve_by_tx_async(
         &self,
@@ -229,8 +228,7 @@ impl OffchainTransactionDependencyProvider {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl TransactionDependencyProvider for OffchainTransactionDependencyProvider {
     // For verify certain cell belong to certain transaction
     async fn get_transaction_async(
diff --git a/src/transaction/builder/mod.rs b/src/transaction/builder/mod.rs
index 34da3fca..e19ff55a 100644
--- a/src/transaction/builder/mod.rs
+++ b/src/transaction/builder/mod.rs
@@ -21,8 +21,7 @@ pub use fee_calculator::FeeCalculator;
 pub use simple::SimpleTransactionBuilder;
 
 /// CKB transaction builder trait.
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 pub trait CkbTransactionBuilder {
     #[cfg(not(target_arch = "wasm32"))]
     fn build(
diff --git a/src/transaction/builder/simple.rs b/src/transaction/builder/simple.rs
index bc8457e3..8f89e145 100644
--- a/src/transaction/builder/simple.rs
+++ b/src/transaction/builder/simple.rs
@@ -65,8 +65,7 @@ impl SimpleTransactionBuilder {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl CkbTransactionBuilder for SimpleTransactionBuilder {
     #[cfg(not(target_arch = "wasm32"))]
     fn build(
diff --git a/src/transaction/builder/sudt.rs b/src/transaction/builder/sudt.rs
index 54208eca..e05adeb2 100644
--- a/src/transaction/builder/sudt.rs
+++ b/src/transaction/builder/sudt.rs
@@ -116,7 +116,7 @@ fn test_parse_u128_from_sudt_tx_output_data() {
 
     let sender = Address::from_str("ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsq2qf8keemy2p5uu0g0gn8cd4ju23s5269qk8rg4r").unwrap();
 
-    let iterator = InputIterator::new_with_address(&[sender.clone()], &network_info);
+    let iterator = InputIterator::new_with_address(std::slice::from_ref(&sender), &network_info);
 
     let test_sudt_amount = 9999_u128;
     let mut builder = SudtTransactionBuilder::new(configuration, iterator, &sender, false).unwrap();
@@ -142,12 +142,14 @@ fn parse_u128(data: &[u8]) -> Result<u128, TxBuilderError> {
     }
 
     let mut data_bytes: Vec<u8> = data.into();
-    data_bytes.extend(std::iter::repeat(0_u8).take(std::mem::size_of::<u128>() - data.len()));
+    data_bytes.extend(std::iter::repeat_n(
+        0_u8,
+        std::mem::size_of::<u128>() - data.len(),
+    ));
     Ok(u128::from_le_bytes(data_bytes.try_into().unwrap()))
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl CkbTransactionBuilder for SudtTransactionBuilder {
     #[cfg(not(target_arch = "wasm32"))]
     fn build(
diff --git a/src/transaction/handler/mod.rs b/src/transaction/handler/mod.rs
index dbe6bc3c..47dc415f 100644
--- a/src/transaction/handler/mod.rs
+++ b/src/transaction/handler/mod.rs
@@ -14,8 +14,7 @@ pub mod sighash;
 pub mod sudt;
 pub mod typeid;
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 pub trait ScriptHandler: Send + Sync {
     /// Try to build transaction with the given script_group and context.
     ///
diff --git a/src/transaction/handler/multisig.rs b/src/transaction/handler/multisig.rs
index 0730def6..7600caf2 100644
--- a/src/transaction/handler/multisig.rs
+++ b/src/transaction/handler/multisig.rs
@@ -68,8 +68,7 @@ impl Secp256k1Blake160MultisigAllScriptHandler {
         }
     }
 }
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl ScriptHandler for Secp256k1Blake160MultisigAllScriptHandler {
     fn build_transaction(
         &self,
diff --git a/src/transaction/handler/sighash.rs b/src/transaction/handler/sighash.rs
index ee69dabf..977caa07 100644
--- a/src/transaction/handler/sighash.rs
+++ b/src/transaction/handler/sighash.rs
@@ -40,8 +40,7 @@ impl Secp256k1Blake160SighashAllScriptHandler {
         Self { cell_deps }
     }
 }
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl ScriptHandler for Secp256k1Blake160SighashAllScriptHandler {
     fn build_transaction(
         &self,
diff --git a/src/transaction/handler/sudt.rs b/src/transaction/handler/sudt.rs
index c0515752..7ed7b8db 100644
--- a/src/transaction/handler/sudt.rs
+++ b/src/transaction/handler/sudt.rs
@@ -72,8 +72,7 @@ impl SudtHandler {
         }
     }
 }
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl ScriptHandler for SudtHandler {
     fn build_transaction(
         &self,
diff --git a/src/transaction/handler/typeid.rs b/src/transaction/handler/typeid.rs
index 6e3a60fb..45dbcfef 100644
--- a/src/transaction/handler/typeid.rs
+++ b/src/transaction/handler/typeid.rs
@@ -16,8 +16,7 @@ pub struct TypeIdHandler;
 pub struct TypeIdContext;
 
 impl HandlerContext for TypeIdContext {}
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl ScriptHandler for TypeIdHandler {
     fn build_transaction(
         &self,
diff --git a/src/tx_builder/acp.rs b/src/tx_builder/acp.rs
index 8651eb0c..36ed046f 100644
--- a/src/tx_builder/acp.rs
+++ b/src/tx_builder/acp.rs
@@ -37,8 +37,7 @@ impl AcpTransferBuilder {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl TxBuilder for AcpTransferBuilder {
     async fn build_base_async(
         &self,
diff --git a/src/tx_builder/cheque.rs b/src/tx_builder/cheque.rs
index 3020424e..21ee3d2b 100644
--- a/src/tx_builder/cheque.rs
+++ b/src/tx_builder/cheque.rs
@@ -43,8 +43,7 @@ impl ChequeClaimBuilder {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl TxBuilder for ChequeClaimBuilder {
     async fn build_base_async(
         &self,
@@ -211,8 +210,7 @@ impl ChequeWithdrawBuilder {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl TxBuilder for ChequeWithdrawBuilder {
     async fn build_base_async(
         &self,
diff --git a/src/tx_builder/dao.rs b/src/tx_builder/dao.rs
index 4886e832..eb6fc831 100644
--- a/src/tx_builder/dao.rs
+++ b/src/tx_builder/dao.rs
@@ -44,8 +44,7 @@ impl DaoDepositBuilder {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl TxBuilder for DaoDepositBuilder {
     async fn build_base_async(
         &self,
@@ -122,8 +121,7 @@ impl From<Vec<CellInput>> for DaoPrepareBuilder {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl TxBuilder for DaoPrepareBuilder {
     async fn build_base_async(
         &self,
@@ -244,8 +242,7 @@ impl DaoWithdrawBuilder {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl TxBuilder for DaoWithdrawBuilder {
     async fn build_base_async(
         &self,
diff --git a/src/tx_builder/mod.rs b/src/tx_builder/mod.rs
index 5465ae22..83a6f05b 100644
--- a/src/tx_builder/mod.rs
+++ b/src/tx_builder/mod.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::doc_overindented_list_items)]
+
 pub mod acp;
 pub mod cheque;
 pub mod dao;
@@ -83,8 +85,7 @@ pub enum TxBuilderError {
 }
 
 /// Transaction Builder interface
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 pub trait TxBuilder: Send + Sync {
     /// Build base transaction
     async fn build_base_async(
diff --git a/src/tx_builder/omni_lock.rs b/src/tx_builder/omni_lock.rs
index ca134ee7..8cdfaf43 100644
--- a/src/tx_builder/omni_lock.rs
+++ b/src/tx_builder/omni_lock.rs
@@ -35,8 +35,7 @@ impl OmniLockTransferBuilder {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl TxBuilder for OmniLockTransferBuilder {
     async fn build_base_async(
         &self,
diff --git a/src/tx_builder/transfer.rs b/src/tx_builder/transfer.rs
index 07472119..649ace72 100644
--- a/src/tx_builder/transfer.rs
+++ b/src/tx_builder/transfer.rs
@@ -25,8 +25,7 @@ impl CapacityTransferBuilder {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl TxBuilder for CapacityTransferBuilder {
     async fn build_base_async(
         &self,
diff --git a/src/tx_builder/udt/mod.rs b/src/tx_builder/udt/mod.rs
index 32a00403..b809367b 100644
--- a/src/tx_builder/udt/mod.rs
+++ b/src/tx_builder/udt/mod.rs
@@ -198,8 +198,7 @@ pub struct UdtIssueBuilder {
     pub receivers: Vec<UdtTargetReceiver>,
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl TxBuilder for UdtIssueBuilder {
     async fn build_base_async(
         &self,
@@ -280,8 +279,7 @@ pub struct UdtTransferBuilder {
     pub receivers: Vec<UdtTargetReceiver>,
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl TxBuilder for UdtTransferBuilder {
     async fn build_base_async(
         &self,
diff --git a/src/types/human_capacity.rs b/src/types/human_capacity.rs
index 362cdcf4..0986885e 100644
--- a/src/types/human_capacity.rs
+++ b/src/types/human_capacity.rs
@@ -59,7 +59,7 @@ impl fmt::Display for HumanCapacity {
         let mut base = 10;
         let mut suffix_zero = 7;
         for i in 0..8 {
-            if shannon_part % base > 0 {
+            if !shannon_part.is_multiple_of(base) {
                 suffix_zero = i;
                 break;
             }
diff --git a/src/unlock/unlocker.rs b/src/unlock/unlocker.rs
index dd8807d4..34c0f403 100644
--- a/src/unlock/unlocker.rs
+++ b/src/unlock/unlocker.rs
@@ -48,8 +48,7 @@ pub enum UnlockError {
 ///   * Put extra unlock information into transaction (e.g. SMT proof in omni-lock case)
 ///
 /// See example in `examples/script_unlocker_example.rs`
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 pub trait ScriptUnlocker: Sync + Send {
     fn match_args(&self, args: &[u8]) -> bool;
 
@@ -180,8 +179,7 @@ impl From<Box<dyn Signer>> for SecpSighashUnlocker {
         SecpSighashUnlocker::new(SecpSighashScriptSigner::new(signer))
     }
 }
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl ScriptUnlocker for SecpSighashUnlocker {
     fn match_args(&self, args: &[u8]) -> bool {
         self.signer.match_args(args)
@@ -219,8 +217,7 @@ impl From<(Box<dyn Signer>, MultisigConfig)> for SecpMultisigUnlocker {
         SecpMultisigUnlocker::new(SecpMultisigScriptSigner::new(signer, config))
     }
 }
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl ScriptUnlocker for SecpMultisigUnlocker {
     fn match_args(&self, args: &[u8]) -> bool {
         (args.len() == 20 || args.len() == 28) && self.signer.match_args(args)
@@ -437,8 +434,7 @@ async fn acp_is_unlocked(
     Ok(true)
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl ScriptUnlocker for AcpUnlocker {
     fn match_args(&self, args: &[u8]) -> bool {
         self.signer.match_args(args)
@@ -518,8 +514,7 @@ impl From<(Box<dyn Signer>, ChequeAction)> for ChequeUnlocker {
     }
 }
 
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl ScriptUnlocker for ChequeUnlocker {
     fn match_args(&self, args: &[u8]) -> bool {
         self.signer.match_args(args)
@@ -677,8 +672,7 @@ impl From<(Box<dyn Signer>, OmniLockConfig, OmniUnlockMode)> for OmniLockUnlocke
         OmniLockUnlocker::new(OmniLockScriptSigner::new(signer, config, unlock_mode), cfg)
     }
 }
-#[cfg_attr(target_arch="wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+#[async_trait::async_trait]
 impl ScriptUnlocker for OmniLockUnlocker {
     fn match_args(&self, args: &[u8]) -> bool {
         self.signer.match_args(args)