File tree Expand file tree Collapse file tree 4 files changed +28
-1
lines changed
minotari_console_wallet/src/grpc Expand file tree Collapse file tree 4 files changed +28
-1
lines changed Original file line number Diff line number Diff line change @@ -63,6 +63,8 @@ service Wallet {
63
63
rpc CancelTransaction (CancelTransactionRequest ) returns (CancelTransactionResponse );
64
64
// Will trigger a complete revalidation of all wallet outputs.
65
65
rpc RevalidateAllTransactions (RevalidateRequest ) returns (RevalidateResponse );
66
+ // Will trigger a validation of all wallet outputs.
67
+ rpc ValidateAllTransactions (ValidateRequest ) returns (ValidateResponse );
66
68
// This will send a XTR SHA Atomic swap transaction
67
69
rpc SendShaAtomicSwapTransaction (SendShaAtomicSwapRequest ) returns (SendShaAtomicSwapResponse );
68
70
// This will create a burn transaction
@@ -289,6 +291,10 @@ message RevalidateRequest{}
289
291
290
292
message RevalidateResponse {}
291
293
294
+ message ValidateRequest {}
295
+
296
+ message ValidateResponse {}
297
+
292
298
message SetBaseNodeRequest {
293
299
string public_key_hex = 1 ;
294
300
string net_address = 2 ;
Original file line number Diff line number Diff line change @@ -76,6 +76,8 @@ use minotari_app_grpc::tari_rpc::{
76
76
TransferRequest ,
77
77
TransferResponse ,
78
78
TransferResult ,
79
+ ValidateRequest ,
80
+ ValidateResponse ,
79
81
} ;
80
82
use minotari_wallet:: {
81
83
connectivity_service:: { OnlineStatus , WalletConnectivityInterface } ,
@@ -307,6 +309,23 @@ impl wallet_server::Wallet for WalletGrpcServer {
307
309
Ok ( Response :: new ( RevalidateResponse { } ) )
308
310
}
309
311
312
+ async fn validate_all_transactions (
313
+ & self ,
314
+ _request : Request < ValidateRequest > ,
315
+ ) -> Result < Response < ValidateResponse > , Status > {
316
+ let mut output_service = self . get_output_manager_service ( ) ;
317
+ output_service
318
+ . validate_txos ( )
319
+ . await
320
+ . map_err ( |e| Status :: unknown ( e. to_string ( ) ) ) ?;
321
+ let mut tx_service = self . get_transaction_service ( ) ;
322
+ tx_service
323
+ . validate_transactions ( )
324
+ . await
325
+ . map_err ( |e| Status :: unknown ( e. to_string ( ) ) ) ?;
326
+ Ok ( Response :: new ( ValidateResponse { } ) )
327
+ }
328
+
310
329
async fn send_sha_atomic_swap_transaction (
311
330
& self ,
312
331
request : Request < SendShaAtomicSwapRequest > ,
Original file line number Diff line number Diff line change @@ -138,7 +138,7 @@ impl MinerProcess {
138
138
miner_max_blocks : blocks,
139
139
miner_min_diff,
140
140
miner_max_diff,
141
- non_interactive_mode : false ,
141
+ non_interactive_mode : true ,
142
142
} ;
143
143
run_miner ( cli) . await . unwrap ( ) ;
144
144
}
Original file line number Diff line number Diff line change @@ -30,6 +30,7 @@ use grpc::{
30
30
ClaimShaAtomicSwapRequest ,
31
31
Empty ,
32
32
GetBalanceRequest ,
33
+ ValidateRequest ,
33
34
GetCompletedTransactionsRequest ,
34
35
GetIdentityRequest ,
35
36
GetTransactionInfoRequest ,
@@ -1573,6 +1574,7 @@ async fn wallet_with_tari_connected_to_base_node(
1573
1574
let num_retries = 100 ;
1574
1575
1575
1576
for _ in 0 ..num_retries {
1577
+ let _ = wallet_client. validate_all_transactions ( ValidateRequest { } ) . await ;
1576
1578
let balance_res = wallet_client
1577
1579
. get_balance ( GetBalanceRequest { } )
1578
1580
. await
You can’t perform that action at this time.
0 commit comments