fix(wallet): save complete burn proof in file

Author: sdbondi

Cargo.lock

@@ -73,6 +73,9 @@ zxcvbn = "2"
 tui = { version = "^0.19", default-features = false, features = ["crossterm"] }
 
 
+[dev-dependencies]
+tempfile = "3.1.0"
+
 [build-dependencies]
 tari_features = { workspace = true }
 

applications/minotari_console_wallet/Cargo.toml

@@ -108,6 +108,10 @@ pub struct Cli {
     /// Path to the libtor data directory
     #[clap(short = 'z', long, parse(from_os_str))]
     pub libtor_data_dir: Option<PathBuf>,
+    /// Directory where burn proof files are written after a burn transaction completes. If relative, resolved against
+    /// base-dir. Defaults to the platform shared data directory (e.g. ~/.local/share/tari/burn_proofs).
+    #[clap(long, alias = "burn-proof-out", parse(from_os_str))]
+    pub burn_proof_out: Option<PathBuf>,
     /// Skip wallet recovery
     #[clap(long)]
     pub skip_recovery: bool,
@@ -139,6 +143,9 @@ impl ConfigOverrideProvider for Cli {
         } else {
             // GRPC is disabled
         }
+        if let Some(ref path) = self.burn_proof_out {
+            replace_or_add_override(&mut overrides, "wallet.burn_proofs_dir", &path.display().to_string());
+        }
         overrides
     }
 }

applications/minotari_console_wallet/src/cli.rs

@@ -3034,11 +3034,7 @@ impl wallet_server::Wallet for WalletGrpcServer {
                 leaf_index: p.leaf_index,
             }),
             kernel: Some(proof.kernel.into()),
-            encrypted_data: proof
-                .encrypted_data
-                .as_ref()
-                .map(|ed| ed.to_byte_vec())
-                .unwrap_or_default(),
+            encrypted_data: proof.encrypted_data.map(|ed| ed.into_vec()).unwrap_or_default(),
             value: proof.value.as_ref().map(|v| v.as_u64()).unwrap_or_default(),
         }))
     }

applications/minotari_console_wallet/src/grpc/wallet_grpc_server.rs

@@ -100,6 +100,7 @@ pub fn run_wallet(shutdown: &mut Shutdown, runtime: Runtime, config: &mut Applic
         view_private_key: None,
         spend_key: None,
         birthday: None,
+        burn_proof_out: None,
         libtor_data_dir: None,
         skip_recovery: false,
         print_env: false,

applications/minotari_console_wallet/src/lib.rs

@@ -35,7 +35,6 @@ const LOG_TARGET: &str = "wallet::console_wallet::burn_tab ";
 pub struct BurnTab {
     balance: Balance,
     burn_input_mode: BurnInputMode,
-    burnt_proof_filepath_field: String,
     claim_public_key_field: String,
     sidechain_key_field: String,
     amount_field: String,
@@ -54,7 +53,6 @@ impl BurnTab {
         Self {
             balance: Balance::new(),
             burn_input_mode: BurnInputMode::None,
-            burnt_proof_filepath_field: String::new(),
             claim_public_key_field: String::new(),
             sidechain_key_field: String::new(),
             amount_field: String::new(),
@@ -88,7 +86,6 @@ impl BurnTab {
                     Constraint::Length(3),
                     Constraint::Length(3),
                     Constraint::Length(3),
-                    Constraint::Length(3),
                 ]
                 .as_ref(),
             )
@@ -98,10 +95,6 @@ impl BurnTab {
         let instructions = Paragraph::new(vec![
             Spans::from(vec![
                 Span::raw("Press "),
-                Span::styled("V", Style::default().add_modifier(Modifier::BOLD)),
-                Span::raw(" to edit "),
-                Span::styled("Burn Proof Filepath", Style::default().add_modifier(Modifier::BOLD)),
-                Span::raw(", "),
                 Span::styled("C", Style::default().add_modifier(Modifier::BOLD)),
                 Span::raw(" to edit "),
                 Span::styled("Claim Public Key", Style::default().add_modifier(Modifier::BOLD)),
@@ -113,7 +106,7 @@ impl BurnTab {
                 Span::styled("F", Style::default().add_modifier(Modifier::BOLD)),
                 Span::raw(" to edit "),
                 Span::styled("Fee-Per-Gram", Style::default().add_modifier(Modifier::BOLD)),
-                Span::raw(" and "),
+                Span::raw(", "),
             ]),
             Spans::from(vec![
                 Span::raw("Press "),
@@ -125,38 +118,26 @@ impl BurnTab {
         .block(Block::default());
         f.render_widget(instructions, vert_chunks[0]);
 
-        let burnt_proof_filepath_input = Paragraph::new(self.burnt_proof_filepath_field.as_ref())
-            .style(match self.burn_input_mode {
-                BurnInputMode::BurntProofPath => Style::default().fg(Color::Magenta),
-                _ => Style::default(),
-            })
-            .block(
-                Block::default()
-                    .borders(Borders::ALL)
-                    .title("Sa(v)e burn proof to file path:"),
-            );
-        f.render_widget(burnt_proof_filepath_input, vert_chunks[1]);
-
         let claim_public_key_input = Paragraph::new(self.claim_public_key_field.as_ref())
             .style(match self.burn_input_mode {
                 BurnInputMode::ClaimPublicKey => Style::default().fg(Color::Magenta),
                 _ => Style::default(),
             })
             .block(Block::default().borders(Borders::ALL).title("To (C)laim Public Key:"));
-        f.render_widget(claim_public_key_input, vert_chunks[2]);
+        f.render_widget(claim_public_key_input, vert_chunks[1]);
 
         let sidechain_key_input = Paragraph::new(self.sidechain_key_field.as_ref())
             .style(match self.burn_input_mode {
                 BurnInputMode::SidechainKey => Style::default().fg(Color::Magenta),
                 _ => Style::default(),
             })
             .block(Block::default().borders(Borders::ALL).title("Sidechain Key:"));
-        f.render_widget(sidechain_key_input, vert_chunks[3]);
+        f.render_widget(sidechain_key_input, vert_chunks[2]);
 
         let amount_fee_layout = Layout::default()
             .direction(Direction::Horizontal)
             .constraints([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref())
-            .split(vert_chunks[4]);
+            .split(vert_chunks[3]);
 
         let amount_input = Paragraph::new(self.amount_field.to_string())
             .style(match self.burn_input_mode {
@@ -180,47 +161,29 @@ impl BurnTab {
                 _ => Style::default(),
             })
             .block(Block::default().borders(Borders::ALL).title("(P)ayment-id:"));
-        f.render_widget(payment_id_input, vert_chunks[5]);
+        f.render_widget(payment_id_input, vert_chunks[4]);
 
         match self.burn_input_mode {
             BurnInputMode::None => (),
-            BurnInputMode::BurntProofPath => f.set_cursor(
-                // Put cursor past the end of the input text
-                vert_chunks[1].x + self.burnt_proof_filepath_field.width() as u16 + 1,
-                // Move one line down, from the border to the input line
+            BurnInputMode::ClaimPublicKey => f.set_cursor(
+                vert_chunks[1].x + self.claim_public_key_field.width() as u16 + 1,
                 vert_chunks[1].y + 1,
             ),
-            BurnInputMode::ClaimPublicKey => f.set_cursor(
-                // Put cursor past the end of the input text
-                vert_chunks[2].x + self.claim_public_key_field.width() as u16 + 1,
-                // Move one line down, from the border to the input line
+            BurnInputMode::SidechainKey => f.set_cursor(
+                vert_chunks[2].x + self.sidechain_key_field.width() as u16 + 1,
                 vert_chunks[2].y + 1,
             ),
-            BurnInputMode::Amount => {
-                f.set_cursor(
-                    // Put cursor past the end of the input text
-                    amount_fee_layout[0].x + self.amount_field.width() as u16 + 1,
-                    // Move one line down, from the border to the input line
-                    amount_fee_layout[0].y + 1,
-                )
-            },
+            BurnInputMode::Amount => f.set_cursor(
+                amount_fee_layout[0].x + self.amount_field.width() as u16 + 1,
+                amount_fee_layout[0].y + 1,
+            ),
             BurnInputMode::Fee => f.set_cursor(
-                // Put cursor past the end of the input text
                 amount_fee_layout[1].x + self.fee_field.width() as u16 + 1,
-                // Move one line down, from the border to the input line
                 amount_fee_layout[1].y + 1,
             ),
-            BurnInputMode::SidechainKey => f.set_cursor(
-                // Put cursor past the end of the input text
-                vert_chunks[3].x + self.sidechain_key_field.width() as u16 + 1,
-                // Move one line down, from the border to the input line
-                vert_chunks[3].y + 1,
-            ),
             BurnInputMode::PaymentId => f.set_cursor(
-                // Put cursor past the end of the input text
-                vert_chunks[5].x + self.payment_id_field.width() as u16 + 1,
-                // Move one line down, from the border to the input line
-                vert_chunks[5].y + 1,
+                vert_chunks[4].x + self.payment_id_field.width() as u16 + 1,
+                vert_chunks[4].y + 1,
             ),
         }
     }
@@ -321,12 +284,6 @@ impl BurnTab {
             return KeyHandled::Handled;
         };
 
-        let burn_proof_filepath = if self.burnt_proof_filepath_field.is_empty() {
-            None
-        } else {
-            Some(self.burnt_proof_filepath_field.clone())
-        };
-
         let claim_public_key = if self.claim_public_key_field.is_empty() {
             None
         } else {
@@ -346,7 +303,6 @@ impl BurnTab {
             Some(BurnConfirmationDialogType::Normal) => {
                 match Handle::current().block_on(
                     app_state.send_burn_transaction(
-                        burn_proof_filepath,
                         claim_public_key,
                         amount.into(),
                         UtxoSelectionCriteria::default(),
@@ -393,7 +349,6 @@ impl BurnTab {
         }
 
         if reset_fields {
-            self.burnt_proof_filepath_field = "".to_string();
             self.claim_public_key_field = "".to_string();
             self.amount_field = "".to_string();
             self.fee_field = app_state.get_default_fee_per_gram().as_u64().to_string();
@@ -410,13 +365,6 @@ impl BurnTab {
         if self.burn_input_mode != BurnInputMode::None {
             match self.burn_input_mode {
                 BurnInputMode::None => (),
-                BurnInputMode::BurntProofPath => match c {
-                    '\n' => self.burn_input_mode = BurnInputMode::ClaimPublicKey,
-                    c => {
-                        self.burnt_proof_filepath_field.push(c);
-                        return KeyHandled::Handled;
-                    },
-                },
                 BurnInputMode::ClaimPublicKey => match c {
                     '\n' => self.burn_input_mode = BurnInputMode::SidechainKey,
                     c => {
@@ -554,8 +502,8 @@ impl<B: Backend> Component<B> for BurnTab {
                     return;
                 },
                 UiTransactionBurnStatus::TransactionComplete => {
-                    self.success_message =
-                        Some("Transaction completed successfully!\nPlease press Enter to continue".to_string());
+                    let msg = "Transaction completed successfully!\nPlease press Enter to continue".to_string();
+                    self.success_message = Some(msg);
                     return;
                 },
             };
@@ -667,7 +615,6 @@ impl<B: Backend> Component<B> for BurnTab {
         }
 
         match c {
-            'v' => self.burn_input_mode = BurnInputMode::BurntProofPath,
             'c' => self.burn_input_mode = BurnInputMode::ClaimPublicKey,
             'a' => {
                 self.burn_input_mode = BurnInputMode::Amount;
@@ -713,9 +660,6 @@ impl<B: Backend> Component<B> for BurnTab {
 
     fn on_backspace(&mut self, _app_state: &mut AppState) {
         match self.burn_input_mode {
-            BurnInputMode::BurntProofPath => {
-                let _ = self.burnt_proof_filepath_field.pop();
-            },
             BurnInputMode::ClaimPublicKey => {
                 let _ = self.claim_public_key_field.pop();
             },
@@ -739,7 +683,6 @@ impl<B: Backend> Component<B> for BurnTab {
 #[derive(PartialEq, Debug)]
 pub enum BurnInputMode {
     None,
-    BurntProofPath,
     ClaimPublicKey,
     SidechainKey,
     Amount,

applications/minotari_console_wallet/src/ui/components/burn_tab.rs

@@ -23,7 +23,6 @@
 #![allow(clippy::indexing_slicing)]
 use std::{
     collections::{HashMap, VecDeque},
-    path::PathBuf,
     str::FromStr,
     sync::Arc,
     time::{Duration, Instant},
@@ -222,7 +221,6 @@ impl AppState {
 
     pub async fn send_burn_transaction(
         &mut self,
-        burn_proof_filepath: Option<String>,
         claim_public_key: Option<String>,
         amount: u64,
         selection_criteria: UtxoSelectionCriteria,
@@ -233,19 +231,6 @@ impl AppState {
     ) -> Result<(), UiError> {
         let inner = self.inner.write().await;
 
-        let burn_proof_filepath = match burn_proof_filepath {
-            None => None,
-            Some(path) => {
-                let path = PathBuf::from(path);
-
-                if path.exists() {
-                    return Err(UiError::BurntProofFileExists);
-                }
-
-                Some(path)
-            },
-        };
-
         let fee_per_gram = fee_per_gram * uT;
         let tx_service_handle = inner.wallet.transaction_service.clone();
         let claim_public_key = match claim_public_key {
@@ -261,7 +246,6 @@ impl AppState {
             .transpose()?;
 
         send_burn_transaction_task(
-            burn_proof_filepath,
             claim_public_key,
             MicroMinotari::from(amount),
             selection_criteria,

applications/minotari_console_wallet/src/ui/state/app_state.rs

@@ -25,24 +25,4 @@ mod debouncer;
 mod tasks;
 mod wallet_event_monitor;
 
-use serde::{Deserialize, Serialize};
-use tari_common_types::serializers;
-
 pub use self::app_state::*;
-
-#[derive(Serialize, Deserialize)]
-pub struct SignatureBase64 {
-    #[serde(with = "serializers::base64")]
-    pub public_nonce: Vec<u8>,
-    #[serde(with = "serializers::base64")]
-    pub signature: Vec<u8>,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct BurntProofBase64 {
-    #[serde(with = "serializers::base64")]
-    pub claim_public_key: Vec<u8>,
-    #[serde(with = "serializers::base64")]
-    pub commitment: Vec<u8>,
-    pub ownership_proof: SignatureBase64,
-}