Feature/track build signed submitted for tx log

full-service/src/db/txo.rs

@@ -25,7 +25,7 @@ use crate::{
         account::{AccountID, AccountModel},
         assigned_subaddress::AssignedSubaddressModel,
         models::{Account, AssignedSubaddress, NewTransactionOutputTxo, NewTxo, Txo},
-        transaction_log::TransactionID,
+        transaction_log::TransactionId,
         Conn, WalletDbError,
     },
     service::models::tx_proposal::OutputTxo,
@@ -142,7 +142,7 @@ pub trait TxoModel {
     fn create_new_output(
         output_txo: &OutputTxo,
         is_change: bool,
-        transaction_id: &TransactionID,
+        transaction_id: &TransactionId,
         conn: &Conn,
     ) -> Result<(), WalletDbError>;
 
@@ -395,7 +395,7 @@ impl TxoModel for Txo {
     fn create_new_output(
         output_txo: &OutputTxo,
         is_change: bool,
-        transaction_id: &TransactionID,
+        transaction_id: &TransactionId,
         conn: &Conn,
     ) -> Result<(), WalletDbError> {
         use crate::db::schema::txos;

full-service/src/json_rpc/v1/api/wallet.rs

@@ -1,7 +1,7 @@
 use crate::{
     db::{
         account::AccountID,
-        transaction_log::TransactionID,
+        transaction_log::TransactionId,
         txo::{TxoID, TxoStatus},
     },
     json_rpc::{
@@ -236,7 +236,7 @@ where
                 .map_err(format_error)?;
             JsonCommandResponse::build_split_txo_transaction {
                 tx_proposal: TxProposal::try_from(&tx_proposal).map_err(format_error)?,
-                transaction_log_id: TransactionID::from(&tx_proposal.tx).to_string(),
+                transaction_log_id: TransactionId::from(&tx_proposal.tx).to_string(),
             }
         }
         JsonCommandRequest::build_transaction {
@@ -286,7 +286,7 @@ where
 
             JsonCommandResponse::build_transaction {
                 tx_proposal: TxProposal::try_from(&tx_proposal).map_err(format_error)?,
-                transaction_log_id: TransactionID::from(&tx_proposal.tx).to_string(),
+                transaction_log_id: TransactionId::from(&tx_proposal.tx).to_string(),
             }
         }
         JsonCommandRequest::check_b58_type { b58_code } => {

full-service/src/json_rpc/v1/models/transaction_log.rs

@@ -32,6 +32,7 @@ impl From<&db::transaction_log::TxStatus> for TxStatus {
     fn from(tx_status: &db::transaction_log::TxStatus) -> Self {
         match tx_status {
             db::transaction_log::TxStatus::Built => TxStatus::Built,
+            db::transaction_log::TxStatus::Signed => TxStatus::Built,
             db::transaction_log::TxStatus::Pending => TxStatus::Pending,
             db::transaction_log::TxStatus::Succeeded => TxStatus::Succeeded,
             db::transaction_log::TxStatus::Failed => TxStatus::Failed,

full-service/src/json_rpc/v2/api/wallet.rs

@@ -1,7 +1,7 @@
 use crate::{
     db::{
         account::AccountID,
-        transaction_log::TransactionID,
+        transaction_log::TransactionId,
         txo::{TxoID, TxoStatus},
     },
     json_rpc::{
@@ -242,7 +242,7 @@ where
 
             JsonCommandResponse::build_burn_transaction {
                 tx_proposal: TxProposalJSON::try_from(&tx_proposal).map_err(format_error)?,
-                transaction_log_id: TransactionID::from(&tx_proposal.tx).to_string(),
+                transaction_log_id: TransactionId::from(&tx_proposal.tx).to_string(),
             }
         }
         JsonCommandRequest::build_transaction {
@@ -293,7 +293,7 @@ where
 
             JsonCommandResponse::build_transaction {
                 tx_proposal: TxProposalJSON::try_from(&tx_proposal).map_err(format_error)?,
-                transaction_log_id: TransactionID::from(&tx_proposal.tx).to_string(),
+                transaction_log_id: TransactionId::from(&tx_proposal.tx).to_string(),
             }
         }
         JsonCommandRequest::build_unsigned_burn_transaction {

full-service/src/json_rpc/v2/models/public_address.rs

@@ -30,7 +30,7 @@ impl From<&mc_account_keys::PublicAddress> for PublicAddress {
             spend_public_key: hex::encode(src.spend_public_key().to_bytes()),
             fog_report_url: src.fog_report_url().map(|url| url.to_string()),
             fog_report_id: src.fog_report_id().map(|id| id.to_string()),
-            fog_authority_sig: src.fog_authority_sig().map(|sig| hex::encode(sig)),
+            fog_authority_sig: src.fog_authority_sig().map(hex::encode),
         }
     }
 }

full-service/src/service/ledger.rs

@@ -5,7 +5,7 @@
 use crate::{
     db::{
         models::{TransactionLog, Txo},
-        transaction_log::{TransactionID, TransactionLogModel},
+        transaction_log::{TransactionId, TransactionLogModel},
         txo::TxoModel,
     },
     WalletService,
@@ -169,7 +169,7 @@ where
     fn get_transaction_object(&self, transaction_id_hex: &str) -> Result<Tx, LedgerServiceError> {
         let conn = self.get_conn()?;
         let transaction_log =
-            TransactionLog::get(&TransactionID(transaction_id_hex.to_string()), &conn)?;
+            TransactionLog::get(&TransactionId(transaction_id_hex.to_string()), &conn)?;
         let tx: Tx = mc_util_serial::decode(&transaction_log.tx)?;
         Ok(tx)
     }

full-service/src/service/transaction.rs

@@ -365,7 +365,7 @@ where
             let mut default_fee_token_id = Mob::ID;
 
             for (recipient_public_address, amount) in addresses_and_amounts {
-                if !self.verify_address(recipient_public_address).is_ok() {
+                if self.verify_address(recipient_public_address).is_err() {
                     return Err(TransactionServiceError::InvalidPublicAddress(
                         recipient_public_address.to_string(),
                     ));
@@ -448,7 +448,7 @@ where
             let account_key: AccountKey = mc_util_serial::decode(&account.account_key)?;
             let tx_proposal = unsigned_tx_proposal.sign(&account_key)?;
 
-            TransactionLog::log_built(tx_proposal.clone(), "".to_string(), account_id_hex, &conn)?;
+            TransactionLog::log_signed(tx_proposal.clone(), "".to_string(), account_id_hex, &conn)?;
 
             Ok(tx_proposal)
         })

full-service/src/service/transaction_log.rs

@@ -5,7 +5,7 @@
 use crate::{
     db::{
         models::TransactionLog,
-        transaction_log::{AssociatedTxos, TransactionID, TransactionLogModel, ValueMap},
+        transaction_log::{AssociatedTxos, TransactionId, TransactionLogModel, ValueMap},
         WalletDbError,
     },
     error::WalletServiceError,
@@ -88,7 +88,7 @@ where
     ) -> Result<(TransactionLog, AssociatedTxos, ValueMap), TransactionLogServiceError> {
         let conn = self.get_conn()?;
         let transaction_log =
-            TransactionLog::get(&TransactionID(transaction_id_hex.to_string()), &conn)?;
+            TransactionLog::get(&TransactionId(transaction_id_hex.to_string()), &conn)?;
         let associated = transaction_log.get_associated_txos(&conn)?;
         let value_map = transaction_log.value_map(&conn)?;