Merge branch 'development' into fix/reduce-err-to-debug

tari-project · Sep 2, 2022 · 8c935e9 · 8c935e9
2 parents 807be9e + 004c219
commit 8c935e9
Show file tree

Hide file tree

Showing 73 changed files with 661 additions and 688 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/applications/tari_app_grpc/Cargo.toml b/applications/tari_app_grpc/Cargo.toml
@@ -4,11 +4,11 @@ authors = ["The Tari Development Community"]
 description = "This crate is to provide a single source for all cross application grpc files and conversions to and from tari::core"
 repository = "https://github.com/tari-project/tari"
 license = "BSD-3-Clause"
-version = "0.37.0"
+version = "0.38.0"
 edition = "2018"
 
 [dependencies]
-tari_common_types = { version = "^0.37", path = "../../base_layer/common_types" }
+tari_common_types = { version = "^0.38", path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
 tari_core = { path = "../../base_layer/core" }
 tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.5" }

diff --git a/applications/tari_app_grpc/proto/wallet.proto b/applications/tari_app_grpc/proto/wallet.proto
@@ -74,8 +74,6 @@ service Wallet {
     rpc SetBaseNode(SetBaseNodeRequest) returns (SetBaseNodeResponse);
 
     rpc StreamTransactionEvents(TransactionEventRequest) returns (stream TransactionEventResponse);
-    rpc SeedWords(Empty) returns (SeedWordsResponse);
-    rpc DeleteSeedWordsFile(Empty) returns (FileDeletedResponse);
 }
 
 message GetVersionRequest { }
@@ -309,11 +307,3 @@ message TransactionEvent {
 message TransactionEventResponse {
     TransactionEvent transaction  = 1;
 }
-
-message SeedWordsResponse {
-    repeated string words = 1;
-}
-
-message FileDeletedResponse {
-
-}
diff --git a/applications/tari_app_utilities/Cargo.toml b/applications/tari_app_utilities/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tari_app_utilities"
-version = "0.37.0"
+version = "0.38.0"
 authors = ["The Tari Development Community"]
 edition = "2018"
 license = "BSD-3-Clause"

diff --git a/applications/tari_base_node/Cargo.toml b/applications/tari_base_node/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
 description = "The tari full base node implementation"
 repository = "https://github.com/tari-project/tari"
 license = "BSD-3-Clause"
-version = "0.37.0"
+version = "0.38.0"
 edition = "2018"
 
 [dependencies]

diff --git a/applications/tari_console_wallet/Cargo.toml b/applications/tari_console_wallet/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tari_console_wallet"
-version = "0.37.0"
+version = "0.38.0"
 authors = ["The Tari Development Community"]
 edition = "2018"
 license = "BSD-3-Clause"
@@ -22,9 +22,9 @@ tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", t
 
 # Uncomment for tokio tracing via tokio-console (needs "tracing" featurs)
 #console-subscriber = "0.1.3"
-#tokio = { version = "1.14", features = ["signal", "tracing"] }
+#tokio = { version = "1.20", features = ["signal", "tracing"] }
 # Uncomment for normal use (non tokio-console tracing)
-tokio = { version = "1.14", default-features = false, features = ["signal", "sync"] }
+tokio = { version = "1.20", default-features = false, features = ["signal", "sync"] }
 
 base64 = "0.13.0"
 bitflags = "1.2.1"

diff --git a/applications/tari_console_wallet/src/automation/commands.rs b/applications/tari_console_wallet/src/automation/commands.rs
@@ -704,23 +704,17 @@ pub async fn command_runner(
                     set_base_node_peer(wallet.clone(), args.public_key.into(), args.address).await?;
                 wallet
                     .db
-                    .set_client_key_value(CUSTOM_BASE_NODE_PUBLIC_KEY_KEY.to_string(), public_key.to_string())
-                    .await?;
+                    .set_client_key_value(CUSTOM_BASE_NODE_PUBLIC_KEY_KEY.to_string(), public_key.to_string())?;
                 wallet
                     .db
-                    .set_client_key_value(CUSTOM_BASE_NODE_ADDRESS_KEY.to_string(), net_address.to_string())
-                    .await?;
+                    .set_client_key_value(CUSTOM_BASE_NODE_ADDRESS_KEY.to_string(), net_address.to_string())?;
                 println!("Custom base node peer saved in wallet database.");
             },
             ClearCustomBaseNode => {
                 wallet
                     .db
-                    .clear_client_value(CUSTOM_BASE_NODE_PUBLIC_KEY_KEY.to_string())
-                    .await?;
-                wallet
-                    .db
-                    .clear_client_value(CUSTOM_BASE_NODE_ADDRESS_KEY.to_string())
-                    .await?;
+                    .clear_client_value(CUSTOM_BASE_NODE_PUBLIC_KEY_KEY.to_string())?;
+                wallet.db.clear_client_value(CUSTOM_BASE_NODE_ADDRESS_KEY.to_string())?;
                 println!("Custom base node peer cleared from wallet database.");
             },
             InitShaAtomicSwap(args) => {

diff --git a/applications/tari_console_wallet/src/grpc/wallet_grpc_server.rs b/applications/tari_console_wallet/src/grpc/wallet_grpc_server.rs
@@ -20,13 +20,8 @@
 //  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 //  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-use std::{
-    convert::{TryFrom, TryInto},
-    fs,
-    path::PathBuf,
-};
+use std::convert::{TryFrom, TryInto};
 
-use clap::Parser;
 use futures::{
     channel::mpsc::{self, Sender},
     future,
@@ -48,7 +43,6 @@ use tari_app_grpc::{
         CoinSplitResponse,
         CreateBurnTransactionRequest,
         CreateBurnTransactionResponse,
-        FileDeletedResponse,
         GetBalanceRequest,
         GetBalanceResponse,
         GetCoinbaseRequest,
@@ -67,7 +61,6 @@ use tari_app_grpc::{
         ImportUtxosResponse,
         RevalidateRequest,
         RevalidateResponse,
-        SeedWordsResponse,
         SendShaAtomicSwapRequest,
         SendShaAtomicSwapResponse,
         SetBaseNodeRequest,
@@ -106,7 +99,6 @@ use tokio::{sync::broadcast, task};
 use tonic::{Request, Response, Status};
 
 use crate::{
-    cli::Cli,
     grpc::{convert_to_transaction_event, TransactionWrapper},
     notifier::{CANCELLED, CONFIRMATION, MINED, NEW_BLOCK_MINED, QUEUED, RECEIVED, SENT},
 };
@@ -880,41 +872,6 @@ impl wallet_server::Wallet for WalletGrpcServer {
             },
         }
     }
-
-    /// Returns the contents of a seed words file, provided via CLI
-    async fn seed_words(&self, _: Request<tari_rpc::Empty>) -> Result<Response<SeedWordsResponse>, Status> {
-        let cli = Cli::parse();
-
-        let filepath: PathBuf = match cli.seed_words_file_name {
-            Some(filepath) => filepath,
-            None => return Err(Status::not_found("file path is empty")),
-        };
-
-        let words = fs::read_to_string(filepath)?
-            .split(' ')
-            .collect::<Vec<&str>>()
-            .iter()
-            .map(|&x| x.into())
-            .collect::<Vec<String>>();
-
-        Ok(Response::new(SeedWordsResponse { words }))
-    }
-
-    /// Deletes the seed words file, provided via CLI
-    async fn delete_seed_words_file(
-        &self,
-        _: Request<tari_rpc::Empty>,
-    ) -> Result<Response<FileDeletedResponse>, Status> {
-        let cli = Cli::parse();
-
-        // WARNING: the filepath used is supplied as an argument
-        fs::remove_file(match cli.seed_words_file_name {
-            Some(filepath) => filepath,
-            None => return Err(Status::not_found("file path is empty")),
-        })?;
-
-        Ok(Response::new(FileDeletedResponse {}))
-    }
 }
 
 async fn handle_completed_tx(