Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bitcoind interface cleanups #418

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bitcoind interface cleanups #418

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b7ba37
bitcoind: check all results in 'importdescriptors' result
darosior Jul 6, 2022
6abe197
bitcoind: reduce load in get_spending_txid
darosior Jul 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 27 additions & 3 deletions src/bitcoind/interface.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ use revault_tx::bitcoin::{
Address, Amount, BlockHash, OutPoint, Script, Transaction, TxOut, Txid,
};

use std::{collections::HashMap, fs, str::FromStr, time::Duration};
use std::{
collections::{HashMap, HashSet},
fs,
str::FromStr,
time::Duration,
};

use jsonrpc::{
arg,
Expand Down Expand Up @@ -401,13 +406,21 @@ impl BitcoinD {
"importdescriptors",
&params!(Json::Array(all_descriptors)),
)?;
if res.get(0).map(|x| x.get("success")) == Some(Some(&Json::Bool(true))) {
let all_succeeded = res
.as_array()
.map(|results| {
results
.iter()
.all(|res| res.get("success") == Some(&Json::Bool(true)))
})
.unwrap_or(false);
if all_succeeded {
return Ok(());
}

Err(BitcoindError::Custom(format!(
"Error returned from 'importdescriptor': {:?}",
res.get(0).map(|r| r.get("error"))
res
)))
}

Expand Down Expand Up @@ -827,6 +840,11 @@ impl BitcoinD {
block_hash
));

// Get the spent txid to ignore the entries about this transaction
let spent_txid = spent_outpoint.txid.to_string();
// We use a cache to avoid needless iterations, since listsinceblock returns an entry
// per transaction output, not per transaction.
let mut visited_txs = HashSet::new();
for transaction in transactions {
if transaction.get("category").map(|c| c.as_str()).flatten() != Some("send") {
continue;
Expand All @@ -844,6 +862,12 @@ impl BitcoinD {
block_hash
));

if visited_txs.contains(&spending_txid) || &spent_txid == spending_txid {
continue;
} else {
visited_txs.insert(spending_txid);
}

let gettx_res = self.make_watchonly_request(
"gettransaction",
&params!(
Expand Down