4nk/sdk_relay
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor update to latest sp_client

Browse Source
This commit is contained in:
Sosthene 2025-06-23 17:59:31 +02:00
parent b783649d42
commit 7633c07e2f
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/scan.rs
View File

@ -4,6 +4,7 @@ use std::sync::MutexGuard;
use anyhow::{Error, Result}; use anyhow::{Error, Result};
use bitcoincore_rpc::bitcoin::absolute::Height; use bitcoincore_rpc::bitcoin::absolute::Height;
use bitcoincore_rpc::bitcoin::hashes::Hash;
use electrum_client::ElectrumApi; use electrum_client::ElectrumApi;
use sdk_common::silentpayments::SpWallet; use sdk_common::silentpayments::SpWallet;
use sdk_common::sp_client::bitcoin::bip158::BlockFilter; use sdk_common::sp_client::bitcoin::bip158::BlockFilter;
@ -190,13 +191,6 @@ fn scan_block_outputs(
txid, txid,
vout: *i as u32, vout: *i as u32,
}; };
let label_str: Option<String>;
if let Some(l) = &label {
label_str =
Some(l.as_inner().to_be_bytes().to_lower_hex_string());
} else {
label_str = None;
}
return Some(( return Some((
outpoint, outpoint,
OwnedOutput { OwnedOutput {
@ -204,7 +198,7 @@ fn scan_block_outputs(
tweak: tweak.secret_bytes(), tweak: tweak.secret_bytes(),
amount: o.value, amount: o.value,
script: o.script_pubkey.clone(), script: o.script_pubkey.clone(),
label: label_str, label: label.clone(),
spend_status: OutputSpendStatus::Unspent, spend_status: OutputSpendStatus::Unspent,
}, },
)); ));
@ -336,7 +330,8 @@ pub fn scan_blocks(mut n_blocks_to_scan: u32, electrum_url: &str) -> anyhow::Res
let outputs = sp_wallet.get_mut_outputs(); let outputs = sp_wallet.get_mut_outputs();
for outpoint in utxo_destroyed_in_block { for outpoint in utxo_destroyed_in_block {
if let Some(output) = outputs.get_mut(&outpoint) { if let Some(output) = outputs.get_mut(&outpoint) {
output.spend_status = OutputSpendStatus::Mined(blkhash.to_string()); output.spend_status =
OutputSpendStatus::Mined(blkhash.as_raw_hash().to_byte_array());
} }
} }
} }