Merge branch 'grarco/sdk-async-traits-send' (#1894)

* origin/grarco/sdk-async-traits-send:
  changelog: add #1894
  Conditionally requires async traits `Send`ness
  Makes async traits in the SDK be `Send`

.changelog/unreleased/SDK/1894-sdk-async-traits-send.md

@@ -0,0 +1,3 @@
+- Added the `Send` bound to the `Client` and `ShieldedUtils` `async_trait`s'.
+  This allows the SDK to be used in environments which are both asynchronous and
+  multithread. ([\#1894](https://github.com/anoma/namada/pull/1894))

.changelog/unreleased/improvements/1894-sdk-async-traits-send.md

@@ -0,0 +1,2 @@
+- Forced the `async_trait`s' futures in the SDK to be `Send`.
+  ([\#1894](https://github.com/anoma/namada/pull/1894))

apps/src/lib/client/tx.rs

@@ -4,7 +4,6 @@ use std::fs::{File, OpenOptions};
 use std::io::{Read, Write};
 use std::path::PathBuf;
 
-use async_trait::async_trait;
 use borsh::{BorshDeserialize, BorshSerialize};
 use masp_proofs::prover::LocalTxProver;
 use namada::core::ledger::governance::cli::offline::{
@@ -643,7 +642,8 @@ impl Default for CLIShieldedUtils {
     }
 }
 
-#[async_trait(?Send)]
+#[cfg_attr(feature = "async-send", async_trait::async_trait)]
+#[cfg_attr(not(feature = "async-send"), async_trait::async_trait(?Send))]
 impl masp::ShieldedUtils for CLIShieldedUtils {
     fn local_tx_prover(&self) -> LocalTxProver {
         if let Ok(params_dir) = env::var(masp::ENV_VAR_MASP_PARAMS_DIR) {

apps/src/lib/node/ledger/shell/testing/node.rs

@@ -310,7 +310,8 @@ impl MockNode {
     }
 }
 
-#[async_trait::async_trait(?Send)]
+#[cfg_attr(feature = "async-send", async_trait::async_trait)]
+#[cfg_attr(not(feature = "async-send"), async_trait::async_trait(?Send))]
 impl<'a> Client for &'a MockNode {
     type Error = Report;
 

benches/lib.rs

@@ -547,7 +547,8 @@ pub struct BenchShieldedUtils {
     context_dir: WrapperTempDir,
 }
 
-#[async_trait::async_trait(?Send)]
+#[cfg_attr(feature = "async-send", async_trait::async_trait)]
+#[cfg_attr(not(feature = "async-send"), async_trait::async_trait(?Send))]
 impl ShieldedUtils for BenchShieldedUtils {
     fn local_tx_prover(&self) -> LocalTxProver {
         if let Ok(params_dir) = std::env::var(masp::ENV_VAR_MASP_PARAMS_DIR) {
@@ -611,7 +612,8 @@ impl ShieldedUtils for BenchShieldedUtils {
     }
 }
 
-#[async_trait::async_trait(?Send)]
+#[cfg_attr(feature = "async-send", async_trait::async_trait)]
+#[cfg_attr(not(feature = "async-send"), async_trait::async_trait(?Send))]
 impl Client for BenchShell {
     type Error = std::io::Error;
 

shared/Cargo.toml

@@ -42,6 +42,10 @@ wasm-runtime = [
 async-client = [
   "async-trait",
 ]
+
+# Requires async traits to be safe to send across threads
+async-send = []
+
 # tendermint-rpc support
 tendermint-rpc = [
   "async-client",

shared/src/ledger/queries/mod.rs

@@ -173,7 +173,8 @@ mod testing {
         }
     }
 
-    #[async_trait::async_trait(?Send)]
+    #[cfg_attr(feature = "async-send", async_trait::async_trait)]
+    #[cfg_attr(not(feature = "async-send"), async_trait::async_trait(?Send))]
     impl<RPC> Client for TestClient<RPC>
     where
         RPC: Router + Sync,

shared/src/sdk/masp.rs

@@ -7,7 +7,6 @@ use std::fmt::Debug;
 use std::ops::Deref;
 use std::path::PathBuf;
 
-use async_trait::async_trait;
 // use async_std::io::prelude::WriteExt;
 // use async_std::io::{self};
 use borsh::{BorshDeserialize, BorshSerialize};
@@ -388,7 +387,8 @@ impl<P1, R1, N1>
 
 /// Abstracts platform specific details away from the logic of shielded pool
 /// operations.
-#[async_trait(? Send)]
+#[cfg_attr(feature = "async-send", async_trait::async_trait)]
+#[cfg_attr(not(feature = "async-send"), async_trait::async_trait(?Send))]
 pub trait ShieldedUtils:
     Sized + BorshDeserialize + BorshSerialize + Default + Clone
 {