Merge branch 'development' into update-feature-dan2-from-dev

* development:
  fix(p2p/dns): greatly simplify DNS TXT lookup (tari-project#6922)
  feat: handle outbound pipeline interlock due to connection cleanup (tari-project#6921)
  chore(ci): build docker with metrics (tari-project#6916)

Author: sdbondi

.github/workflows/build_dockers_workflow.yml

@@ -20,7 +20,7 @@ name: Build docker images - workflow_call/on-demand
         default: x86-64
       features:
         type: string
-        default: 'safe,grpc'
+        default: 'safe,libtor,metrics'
       version:
         type: string
         description: 'build tag/version'

applications/minotari_app_grpc/Cargo.toml

@@ -10,7 +10,7 @@ license.workspace = true
 [dependencies]
 tari_common_types = { workspace = true }
 tari_comms = { workspace = true }
-tari_core = { workspace = true }
+tari_core = { workspace = true, features = ["transactions", "mempool_proto", "base_node_proto"] }
 tari_crypto = { workspace = true }
 tari_script = { workspace = true }
 tari_max_size = { workspace = true }

applications/minotari_app_grpc/src/conversions/sidechain_feature.rs

@@ -32,15 +32,31 @@ use tari_core::{
     transactions::{
         tari_amount::MicroMinotari,
         transaction_components::{
-            BuildInfo, CodeTemplateRegistration, ConfidentialOutputData, SideChainFeature, SideChainFeatureData,
-            SideChainId, TemplateType, ValidatorNodeRegistration, ValidatorNodeSignature,
+            BuildInfo,
+            CodeTemplateRegistration,
+            ConfidentialOutputData,
+            SideChainFeature,
+            SideChainFeatureData,
+            SideChainId,
+            TemplateType,
+            ValidatorNodeRegistration,
+            ValidatorNodeSignature,
         },
     },
 };
 use tari_max_size::MaxSizeString;
 use tari_sidechain::{
-    ChainLink, CommandCommitProof, CommandCommitProofV1, CommitProofElement, EvictNodeAtom, EvictionProof,
-    QuorumCertificate, QuorumDecision, ShardGroup, SidechainBlockCommitProof, SidechainBlockHeader,
+    ChainLink,
+    CommandCommitProof,
+    CommandCommitProofV1,
+    CommitProofElement,
+    EvictNodeAtom,
+    EvictionProof,
+    QuorumCertificate,
+    QuorumDecision,
+    ShardGroup,
+    SidechainBlockCommitProof,
+    SidechainBlockHeader,
     ValidatorQcSignature,
 };
 use tari_utilities::ByteArray;

applications/minotari_app_grpc/src/conversions/signature.rs

@@ -23,8 +23,7 @@
 use std::convert::TryFrom;
 
 use tari_common_types::types::{CompressedPublicKey, PrivateKey, UncompressedPublicKey};
-use tari_crypto::hashing::DomainSeparation;
-use tari_crypto::signatures::CompressedSchnorrSignature;
+use tari_crypto::{hashing::DomainSeparation, signatures::CompressedSchnorrSignature};
 use tari_utilities::ByteArray;
 
 use crate::tari_rpc as grpc;

applications/minotari_console_wallet/src/automation/commands.rs

@@ -51,7 +51,9 @@ use minotari_wallet::{
         storage::models::WalletTransaction,
     },
     utxo_scanner_service::handle::UtxoScannerEvent,
-    TransactionStage, WalletConfig, WalletSqlite,
+    TransactionStage,
+    WalletConfig,
+    WalletSqlite,
 };
 use serde::{de::DeserializeOwned, Serialize};
 use sha2::Sha256;
@@ -63,8 +65,15 @@ use tari_common_types::{
     tari_address::TariAddress,
     transaction::TxId,
     types::{
-        CompressedCommitment, CompressedPublicKey, FixedHash, HashOutput, PrivateKey, Signature,
-        UncompressedCommitment, UncompressedPublicKey, UncompressedSignature,
+        CompressedCommitment,
+        CompressedPublicKey,
+        FixedHash,
+        HashOutput,
+        PrivateKey,
+        Signature,
+        UncompressedCommitment,
+        UncompressedPublicKey,
+        UncompressedSignature,
     },
     wallet_types::WalletType,
 };
@@ -83,15 +92,25 @@ use tari_core::{
         tari_amount::{uT, MicroMinotari, Minotari},
         transaction_components::{
             encrypted_data::{PaymentId, TxType},
-            EncryptedData, OutputFeatures, Transaction, TransactionInput, TransactionInputVersion, TransactionKernel,
-            TransactionOutput, TransactionOutputVersion, UnblindedOutput, WalletOutput,
+            EncryptedData,
+            OutputFeatures,
+            Transaction,
+            TransactionInput,
+            TransactionInputVersion,
+            TransactionKernel,
+            TransactionOutput,
+            TransactionOutputVersion,
+            UnblindedOutput,
+            WalletOutput,
         },
         transaction_key_manager::{TariKeyId, TransactionKeyManagerInterface},
         CryptoFactories,
     },
 };
 use tari_crypto::{
-    commitment::HomomorphicCommitmentFactory, dhke::DiffieHellmanSharedSecret, ristretto::RistrettoSecretKey,
+    commitment::HomomorphicCommitmentFactory,
+    dhke::DiffieHellmanSharedSecret,
+    ristretto::RistrettoSecretKey,
 };
 use tari_key_manager::{cipher_seed::CipherSeed, SeedWords};
 use tari_p2p::{auto_update::AutoUpdateConfig, peer_seeds::SeedPeer, PeerSeedsConfig};
@@ -107,12 +126,27 @@ use super::error::CommandError;
 use crate::{
     automation::{
         utils::{
-            create_pre_mine_output_dir, get_file_name, move_session_file_to_session_dir, out_dir, read_and_verify,
-            read_session_info, read_verify_session_info, write_json_object_to_file_as_line, write_to_json_file,
+            create_pre_mine_output_dir,
+            get_file_name,
+            move_session_file_to_session_dir,
+            out_dir,
+            read_and_verify,
+            read_session_info,
+            read_verify_session_info,
+            write_json_object_to_file_as_line,
+            write_to_json_file,
         },
-        PreMineSpendStep1SessionInfo, PreMineSpendStep2OutputsForLeader, PreMineSpendStep2OutputsForSelf,
-        PreMineSpendStep3OutputsForParties, PreMineSpendStep3OutputsForSelf, PreMineSpendStep4OutputsForLeader,
-        RecipientInfo, Step2OutputsForLeader, Step2OutputsForSelf, Step3OutputsForParties, Step3OutputsForSelf,
+        PreMineSpendStep1SessionInfo,
+        PreMineSpendStep2OutputsForLeader,
+        PreMineSpendStep2OutputsForSelf,
+        PreMineSpendStep3OutputsForParties,
+        PreMineSpendStep3OutputsForSelf,
+        PreMineSpendStep4OutputsForLeader,
+        RecipientInfo,
+        Step2OutputsForLeader,
+        Step2OutputsForSelf,
+        Step3OutputsForParties,
+        Step3OutputsForSelf,
         Step4OutputsForLeader,
     },
     cli::{CliCommands, CliRecipientInfo, MakeItRainTransactionType},
@@ -651,8 +685,8 @@ pub async fn monitor_transactions(
             Ok(event) => match &*event {
                 TransactionEvent::TransactionSendResult(id, status) if tx_ids.contains(id) => {
                     debug!(target: LOG_TARGET, "tx send event for tx_id: {}, {}", *id, status);
-                    if wait_stage == TransactionStage::DirectSendOrSaf
-                        && (status.direct_send_result || status.store_and_forward_send_result)
+                    if wait_stage == TransactionStage::DirectSendOrSaf &&
+                        (status.direct_send_result || status.store_and_forward_send_result)
                     {
                         results.push(SentTransaction {});
                         if results.len() == tx_ids.len() {
@@ -1133,25 +1167,17 @@ pub async fn command_runner(
                 let out_dir = out_dir(&session_info.session_id)?;
                 let out_file_leader = out_dir.join(get_file_name(SPEND_STEP_2_LEADER, Some(args.alias.clone())));
                 write_json_object_to_file_as_line(&out_file_leader, true, session_info.clone())?;
-                write_json_object_to_file_as_line(
-                    &out_file_leader,
-                    false,
-                    PreMineSpendStep2OutputsForLeader {
-                        outputs_for_leader,
-                        alias: args.alias.clone(),
-                    },
-                )?;
+                write_json_object_to_file_as_line(&out_file_leader, false, PreMineSpendStep2OutputsForLeader {
+                    outputs_for_leader,
+                    alias: args.alias.clone(),
+                })?;
 
                 let out_file_self = out_dir.join(get_file_name(SPEND_STEP_2_SELF, None));
                 write_json_object_to_file_as_line(&out_file_self, true, session_info.clone())?;
-                write_json_object_to_file_as_line(
-                    &out_file_self,
-                    false,
-                    PreMineSpendStep2OutputsForSelf {
-                        outputs_for_self,
-                        alias: args.alias.clone(),
-                    },
-                )?;
+                write_json_object_to_file_as_line(&out_file_self, false, PreMineSpendStep2OutputsForSelf {
+                    outputs_for_self,
+                    alias: args.alias.clone(),
+                })?;
 
                 println!();
                 println!("Concluded step 2 'pre-mine-spend-party-details'");
@@ -1396,19 +1422,15 @@ pub async fn command_runner(
                 let out_dir = out_dir(&session_id)?;
                 let out_file = out_dir.join(get_file_name(SPEND_STEP_3_SELF, None));
                 write_json_object_to_file_as_line(&out_file, true, session_info.clone())?;
-                write_json_object_to_file_as_line(
-                    &out_file,
-                    false,
-                    PreMineSpendStep3OutputsForSelf { outputs_for_self },
-                )?;
+                write_json_object_to_file_as_line(&out_file, false, PreMineSpendStep3OutputsForSelf {
+                    outputs_for_self,
+                })?;
 
                 let out_file = out_dir.join(get_file_name(SPEND_STEP_3_PARTIES, None));
                 write_json_object_to_file_as_line(&out_file, true, session_info.clone())?;
-                write_json_object_to_file_as_line(
-                    &out_file,
-                    false,
-                    PreMineSpendStep3OutputsForParties { outputs_for_parties },
-                )?;
+                write_json_object_to_file_as_line(&out_file, false, PreMineSpendStep3OutputsForParties {
+                    outputs_for_parties,
+                })?;
 
                 println!();
                 println!("Concluded step 3 'pre-mine-spend-encumber-aggregate-utxo'");
@@ -1592,10 +1614,9 @@ pub async fn command_runner(
 
                     // Metadata signature
                     let script_offset = key_manager_service
-                        .get_script_offset(
-                            &vec![party_info.pre_mine_script_key_id.clone()],
-                            &vec![party_info.sender_offset_key_id.clone()],
-                        )
+                        .get_script_offset(&vec![party_info.pre_mine_script_key_id.clone()], &vec![party_info
+                            .sender_offset_key_id
+                            .clone()])
                         .await?;
                     let challenge = TransactionOutput::build_metadata_signature_challenge(
                         &TransactionOutputVersion::get_current_version(),
@@ -1626,8 +1647,8 @@ pub async fn command_runner(
                         },
                     };
 
-                    if script_signature.get_signature() == Signature::default().get_signature()
-                        || metadata_signature.get_signature() == Signature::default().get_signature()
+                    if script_signature.get_signature() == Signature::default().get_signature() ||
+                        metadata_signature.get_signature() == Signature::default().get_signature()
                     {
                         eprintln!(
                             "\nError: Script and/or metadata signatures not created (index {})!\n",
@@ -1660,14 +1681,10 @@ pub async fn command_runner(
                     Some(party_info_indexed.alias.clone()),
                 ));
                 write_json_object_to_file_as_line(&out_file, true, session_info.clone())?;
-                write_json_object_to_file_as_line(
-                    &out_file,
-                    false,
-                    PreMineSpendStep4OutputsForLeader {
-                        outputs_for_leader,
-                        alias: party_info_indexed.alias.clone(),
-                    },
-                )?;
+                write_json_object_to_file_as_line(&out_file, false, PreMineSpendStep4OutputsForLeader {
+                    outputs_for_leader,
+                    alias: party_info_indexed.alias.clone(),
+                })?;
 
                 println!();
                 println!("Concluded step 4 'pre-mine-spend-input-output-sigs'");

applications/minotari_console_wallet/src/grpc/wallet_grpc_server.rs

@@ -26,28 +26,66 @@ use std::{
     sync::Arc,
 };
 
-use crate::{
-    grpc::{convert_to_transaction_event, wallet_debouncer::WalletDebouncer, TransactionWrapper},
-    notifier::{CANCELLED, CONFIRMATION, MINED, QUEUED, RECEIVED, SENT},
-};
 use futures::{
     channel::mpsc::{self, Sender},
-    future, SinkExt,
+    future,
+    SinkExt,
 };
 use log::*;
 use minotari_app_grpc::tari_rpc::{
-    self, payment_recipient::PaymentType, wallet_server, CheckConnectivityResponse, ClaimHtlcRefundRequest,
-    ClaimHtlcRefundResponse, ClaimShaAtomicSwapRequest, ClaimShaAtomicSwapResponse, CoinSplitRequest,
-    CoinSplitResponse, CommitmentSignature, CreateBurnTransactionRequest, CreateBurnTransactionResponse,
-    CreateTemplateRegistrationRequest, CreateTemplateRegistrationResponse, GetAddressResponse, GetBalanceRequest,
-    GetBalanceResponse, GetCompletedTransactionsRequest, GetCompletedTransactionsResponse, GetConnectivityRequest,
-    GetIdentityRequest, GetIdentityResponse, GetStateRequest, GetStateResponse, GetTransactionInfoRequest,
-    GetTransactionInfoResponse, GetUnspentAmountsResponse, GetVersionRequest, GetVersionResponse, ImportUtxosRequest,
-    ImportUtxosResponse, RegisterValidatorNodeRequest, RegisterValidatorNodeResponse, RevalidateRequest,
-    RevalidateResponse, SendShaAtomicSwapRequest, SendShaAtomicSwapResponse, SetBaseNodeRequest, SetBaseNodeResponse,
-    SubmitValidatorEvictionProofRequest, SubmitValidatorEvictionProofResponse, TransactionDirection, TransactionEvent,
-    TransactionEventRequest, TransactionEventResponse, TransactionInfo, TransactionStatus, TransferRequest,
-    TransferResponse, TransferResult, ValidateRequest, ValidateResponse,
+    self,
+    payment_recipient::PaymentType,
+    wallet_server,
+    CheckConnectivityResponse,
+    ClaimHtlcRefundRequest,
+    ClaimHtlcRefundResponse,
+    ClaimShaAtomicSwapRequest,
+    ClaimShaAtomicSwapResponse,
+    CoinSplitRequest,
+    CoinSplitResponse,
+    CommitmentSignature,
+    CreateBurnTransactionRequest,
+    CreateBurnTransactionResponse,
+    CreateTemplateRegistrationRequest,
+    CreateTemplateRegistrationResponse,
+    GetAddressResponse,
+    GetBalanceRequest,
+    GetBalanceResponse,
+    GetCompletedTransactionsRequest,
+    GetCompletedTransactionsResponse,
+    GetConnectivityRequest,
+    GetIdentityRequest,
+    GetIdentityResponse,
+    GetStateRequest,
+    GetStateResponse,
+    GetTransactionInfoRequest,
+    GetTransactionInfoResponse,
+    GetUnspentAmountsResponse,
+    GetVersionRequest,
+    GetVersionResponse,
+    ImportUtxosRequest,
+    ImportUtxosResponse,
+    RegisterValidatorNodeRequest,
+    RegisterValidatorNodeResponse,
+    RevalidateRequest,
+    RevalidateResponse,
+    SendShaAtomicSwapRequest,
+    SendShaAtomicSwapResponse,
+    SetBaseNodeRequest,
+    SetBaseNodeResponse,
+    SubmitValidatorEvictionProofRequest,
+    SubmitValidatorEvictionProofResponse,
+    TransactionDirection,
+    TransactionEvent,
+    TransactionEventRequest,
+    TransactionEventResponse,
+    TransactionInfo,
+    TransactionStatus,
+    TransferRequest,
+    TransferResponse,
+    TransferResult,
+    ValidateRequest,
+    ValidateResponse,
 };
 use minotari_wallet::{
     connectivity_service::WalletConnectivityInterface,
@@ -59,11 +97,10 @@ use minotari_wallet::{
     },
     WalletSqlite,
 };
-use tari_common_types::types::PrivateKey;
 use tari_common_types::{
     tari_address::TariAddress,
     transaction::TxId,
-    types::{BlockHash, CompressedPublicKey, Signature},
+    types::{BlockHash, CompressedPublicKey, PrivateKey, Signature},
 };
 use tari_comms::{multiaddr::Multiaddr, types::CommsPublicKey, CommsNode};
 use tari_core::{
@@ -72,7 +109,8 @@ use tari_core::{
         tari_amount::MicroMinotari,
         transaction_components::{
             encrypted_data::{PaymentId, TxType},
-            OutputFeatures, UnblindedOutput,
+            OutputFeatures,
+            UnblindedOutput,
         },
     },
 };
@@ -84,6 +122,11 @@ use tokio::{
 };
 use tonic::{Request, Response, Status};
 
+use crate::{
+    grpc::{convert_to_transaction_event, wallet_debouncer::WalletDebouncer, TransactionWrapper},
+    notifier::{CANCELLED, CONFIRMATION, MINED, QUEUED, RECEIVED, SENT},
+};
+
 const LOG_TARGET: &str = "wallet::ui::grpc";
 
 async fn send_transaction_event(