[wallet] Verify unconfirmed transactions after syncing
Verify the unconfirmed transactions we download against the consensus rules. This is currently exposed as an extra `verify` feature, since it depends on a pre-release version of `bitcoinconsensus`. Closes #352
This commit is contained in:
parent
476fa3fd7d
commit
a186d82f9a
1
.github/workflows/cont_integration.yml
vendored
1
.github/workflows/cont_integration.yml
vendored
@ -23,6 +23,7 @@ jobs:
|
|||||||
- esplora,key-value-db,electrum
|
- esplora,key-value-db,electrum
|
||||||
- compiler
|
- compiler
|
||||||
- rpc
|
- rpc
|
||||||
|
- verify
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
### Wallet
|
### Wallet
|
||||||
#### Added
|
#### Added
|
||||||
- Bitcoin core RPC added as blockchain backend
|
- Bitcoin core RPC added as blockchain backend
|
||||||
|
- Add a `verify` feature that can be enable to verify the unconfirmed txs we download against the consensus rules
|
||||||
|
|
||||||
## [v0.8.0] - [v0.7.0]
|
## [v0.8.0] - [v0.7.0]
|
||||||
|
|
||||||
|
@ -31,6 +31,7 @@ cc = { version = ">=1.0.64", optional = true }
|
|||||||
socks = { version = "0.3", optional = true }
|
socks = { version = "0.3", optional = true }
|
||||||
lazy_static = { version = "1.4", optional = true }
|
lazy_static = { version = "1.4", optional = true }
|
||||||
tiny-bip39 = { version = "^0.8", optional = true }
|
tiny-bip39 = { version = "^0.8", optional = true }
|
||||||
|
bitcoinconsensus = { version = "0.19.0-3", optional = true }
|
||||||
|
|
||||||
# Needed by bdk_blockchain_tests macro
|
# Needed by bdk_blockchain_tests macro
|
||||||
bitcoincore-rpc = { version = "0.13", optional = true }
|
bitcoincore-rpc = { version = "0.13", optional = true }
|
||||||
@ -48,6 +49,7 @@ rand = { version = "^0.7", features = ["wasm-bindgen"] }
|
|||||||
[features]
|
[features]
|
||||||
minimal = []
|
minimal = []
|
||||||
compiler = ["miniscript/compiler"]
|
compiler = ["miniscript/compiler"]
|
||||||
|
verify = ["bitcoinconsensus"]
|
||||||
default = ["key-value-db", "electrum"]
|
default = ["key-value-db", "electrum"]
|
||||||
electrum = ["electrum-client"]
|
electrum = ["electrum-client"]
|
||||||
esplora = ["reqwest", "futures"]
|
esplora = ["reqwest", "futures"]
|
||||||
|
@ -233,6 +233,7 @@ impl Blockchain for RpcBlockchain {
|
|||||||
received,
|
received,
|
||||||
sent,
|
sent,
|
||||||
fee: tx_result.fee.map(|f| f.as_sat().abs() as u64),
|
fee: tx_result.fee.map(|f| f.as_sat().abs() as u64),
|
||||||
|
verified: true,
|
||||||
};
|
};
|
||||||
debug!(
|
debug!(
|
||||||
"saving tx: {} tx_result.fee:{:?} td.fees:{:?}",
|
"saving tx: {} tx_result.fee:{:?} td.fees:{:?}",
|
||||||
|
@ -362,6 +362,7 @@ fn save_transaction_details_and_utxos<D: BatchDatabase>(
|
|||||||
sent: outgoing,
|
sent: outgoing,
|
||||||
confirmation_time: ConfirmationTime::new(height, timestamp),
|
confirmation_time: ConfirmationTime::new(height, timestamp),
|
||||||
fee: Some(inputs_sum.saturating_sub(outputs_sum)), /* if the tx is a coinbase, fees would be negative */
|
fee: Some(inputs_sum.saturating_sub(outputs_sum)), /* if the tx is a coinbase, fees would be negative */
|
||||||
|
verified: height.is_some(),
|
||||||
};
|
};
|
||||||
updates.set_tx(&tx_details)?;
|
updates.set_tx(&tx_details)?;
|
||||||
|
|
||||||
|
@ -485,6 +485,7 @@ macro_rules! populate_test_db {
|
|||||||
received: 0,
|
received: 0,
|
||||||
sent: 0,
|
sent: 0,
|
||||||
confirmation_time,
|
confirmation_time,
|
||||||
|
verified: current_height.is_some(),
|
||||||
};
|
};
|
||||||
|
|
||||||
db.set_tx(&tx_details).unwrap();
|
db.set_tx(&tx_details).unwrap();
|
||||||
|
@ -321,6 +321,7 @@ pub mod test {
|
|||||||
timestamp: 123456,
|
timestamp: 123456,
|
||||||
height: 1000,
|
height: 1000,
|
||||||
}),
|
}),
|
||||||
|
verified: true,
|
||||||
};
|
};
|
||||||
|
|
||||||
tree.set_tx(&tx_details).unwrap();
|
tree.set_tx(&tx_details).unwrap();
|
||||||
|
14
src/error.rs
14
src/error.rs
@ -90,6 +90,10 @@ pub enum Error {
|
|||||||
/// found network, for example the network of the bitcoin node
|
/// found network, for example the network of the bitcoin node
|
||||||
found: Network,
|
found: Network,
|
||||||
},
|
},
|
||||||
|
#[cfg(feature = "verify")]
|
||||||
|
/// Transaction verification error
|
||||||
|
Verification(crate::wallet::verify::VerifyError),
|
||||||
|
|
||||||
/// Progress value must be between `0.0` (included) and `100.0` (included)
|
/// Progress value must be between `0.0` (included) and `100.0` (included)
|
||||||
InvalidProgressValue(f32),
|
InvalidProgressValue(f32),
|
||||||
/// Progress update error (maybe the channel has been closed)
|
/// Progress update error (maybe the channel has been closed)
|
||||||
@ -206,3 +210,13 @@ impl From<crate::blockchain::compact_filters::CompactFiltersError> for Error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(feature = "verify")]
|
||||||
|
impl From<crate::wallet::verify::VerifyError> for Error {
|
||||||
|
fn from(other: crate::wallet::verify::VerifyError) -> Self {
|
||||||
|
match other {
|
||||||
|
crate::wallet::verify::VerifyError::Global(inner) => *inner,
|
||||||
|
err => Error::Verification(err),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -165,6 +165,15 @@ pub struct TransactionDetails {
|
|||||||
/// If the transaction is confirmed, contains height and timestamp of the block containing the
|
/// If the transaction is confirmed, contains height and timestamp of the block containing the
|
||||||
/// transaction, unconfirmed transaction contains `None`.
|
/// transaction, unconfirmed transaction contains `None`.
|
||||||
pub confirmation_time: Option<ConfirmationTime>,
|
pub confirmation_time: Option<ConfirmationTime>,
|
||||||
|
/// Whether the tx has been verified against the consensus rules
|
||||||
|
///
|
||||||
|
/// Confirmed txs are considered "verified" by default, while unconfirmed txs are checked to
|
||||||
|
/// ensure an unstrusted [`Blockchain`](crate::blockchain::Blockchain) backend can't trick the
|
||||||
|
/// wallet into using an invalid tx as an RBF template.
|
||||||
|
///
|
||||||
|
/// The check is only perfomed when the `verify` feature is enabled.
|
||||||
|
#[serde(default = "bool::default")] // default to `false` if not specified
|
||||||
|
pub verified: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Block height and timestamp of the block containing the confirmed transaction
|
/// Block height and timestamp of the block containing the confirmed transaction
|
||||||
|
@ -230,6 +230,7 @@ mod test {
|
|||||||
timestamp: 12345678,
|
timestamp: 12345678,
|
||||||
height: 5000,
|
height: 5000,
|
||||||
}),
|
}),
|
||||||
|
verified: true,
|
||||||
})
|
})
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
|
@ -42,6 +42,9 @@ pub mod signer;
|
|||||||
pub mod time;
|
pub mod time;
|
||||||
pub mod tx_builder;
|
pub mod tx_builder;
|
||||||
pub(crate) mod utils;
|
pub(crate) mod utils;
|
||||||
|
#[cfg(feature = "verify")]
|
||||||
|
#[cfg_attr(docsrs, doc(cfg(feature = "verify")))]
|
||||||
|
pub mod verify;
|
||||||
|
|
||||||
pub use utils::IsDust;
|
pub use utils::IsDust;
|
||||||
|
|
||||||
@ -710,6 +713,7 @@ where
|
|||||||
received,
|
received,
|
||||||
sent,
|
sent,
|
||||||
fee: Some(fee_amount),
|
fee: Some(fee_amount),
|
||||||
|
verified: true,
|
||||||
};
|
};
|
||||||
|
|
||||||
Ok((psbt, transaction_details))
|
Ok((psbt, transaction_details))
|
||||||
@ -1526,14 +1530,33 @@ where
|
|||||||
None,
|
None,
|
||||||
self.database.borrow_mut().deref_mut(),
|
self.database.borrow_mut().deref_mut(),
|
||||||
progress_update,
|
progress_update,
|
||||||
))
|
))?;
|
||||||
} else {
|
} else {
|
||||||
maybe_await!(self.client.sync(
|
maybe_await!(self.client.sync(
|
||||||
None,
|
None,
|
||||||
self.database.borrow_mut().deref_mut(),
|
self.database.borrow_mut().deref_mut(),
|
||||||
progress_update,
|
progress_update,
|
||||||
))
|
))?;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(feature = "verify")]
|
||||||
|
{
|
||||||
|
debug!("Verifying transactions...");
|
||||||
|
for mut tx in self.database.borrow().iter_txs(true)? {
|
||||||
|
if !tx.verified {
|
||||||
|
verify::verify_tx(
|
||||||
|
tx.transaction.as_ref().ok_or(Error::TransactionNotFound)?,
|
||||||
|
self.database.borrow().deref(),
|
||||||
|
&self.client,
|
||||||
|
)?;
|
||||||
|
|
||||||
|
tx.verified = true;
|
||||||
|
self.database.borrow_mut().set_tx(&tx)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Return a reference to the internal blockchain client
|
/// Return a reference to the internal blockchain client
|
||||||
|
171
src/wallet/verify.rs
Normal file
171
src/wallet/verify.rs
Normal file
@ -0,0 +1,171 @@
|
|||||||
|
// Bitcoin Dev Kit
|
||||||
|
// Written in 2021 by Alekos Filini <alekos.filini@gmail.com>
|
||||||
|
//
|
||||||
|
// Copyright (c) 2020-2021 Bitcoin Dev Kit Developers
|
||||||
|
//
|
||||||
|
// This file is licensed under the Apache License, Version 2.0 <LICENSE-APACHE
|
||||||
|
// or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||||
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option.
|
||||||
|
// You may not use this file except in accordance with one or both of these
|
||||||
|
// licenses.
|
||||||
|
|
||||||
|
use std::fmt;
|
||||||
|
|
||||||
|
use bitcoin::consensus::serialize;
|
||||||
|
use bitcoin::{OutPoint, Transaction, Txid};
|
||||||
|
|
||||||
|
use crate::blockchain::Blockchain;
|
||||||
|
use crate::database::Database;
|
||||||
|
use crate::error::Error;
|
||||||
|
|
||||||
|
/// Verify a transaction against the consensus rules
|
||||||
|
///
|
||||||
|
/// This function uses [`bitcoinconsensus`] to verify transactions by fetching the required data
|
||||||
|
/// either from the [`Database`] or using the [`Blockchain`].
|
||||||
|
///
|
||||||
|
/// Depending on the [capabilities](crate::blockchain::Blockchain::get_capabilities) of the
|
||||||
|
/// [`Blockchain`] backend, the method could fail when called with old "historical" transactions or
|
||||||
|
/// with unconfirmed transactions that have been evicted from the backend's memory.
|
||||||
|
pub fn verify_tx<D: Database, B: Blockchain>(
|
||||||
|
tx: &Transaction,
|
||||||
|
database: &D,
|
||||||
|
blockchain: &B,
|
||||||
|
) -> Result<(), VerifyError> {
|
||||||
|
log::debug!("Verifying {}", tx.txid());
|
||||||
|
|
||||||
|
let serialized_tx = serialize(tx);
|
||||||
|
|
||||||
|
for (index, input) in tx.input.iter().enumerate() {
|
||||||
|
let prev_tx = if let Some(prev_tx) = database.get_raw_tx(&input.previous_output.txid)? {
|
||||||
|
prev_tx
|
||||||
|
} else if let Some(prev_tx) = blockchain.get_tx(&input.previous_output.txid)? {
|
||||||
|
prev_tx
|
||||||
|
} else {
|
||||||
|
return Err(VerifyError::MissingInputTx(input.previous_output.txid));
|
||||||
|
};
|
||||||
|
|
||||||
|
let spent_output = prev_tx
|
||||||
|
.output
|
||||||
|
.get(input.previous_output.vout as usize)
|
||||||
|
.ok_or(VerifyError::InvalidInput(input.previous_output))?;
|
||||||
|
|
||||||
|
bitcoinconsensus::verify(
|
||||||
|
&spent_output.script_pubkey.to_bytes(),
|
||||||
|
spent_output.value,
|
||||||
|
&serialized_tx,
|
||||||
|
index,
|
||||||
|
)?;
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum VerifyError {
|
||||||
|
MissingInputTx(Txid),
|
||||||
|
InvalidInput(OutPoint),
|
||||||
|
|
||||||
|
Consensus(bitcoinconsensus::Error),
|
||||||
|
|
||||||
|
Global(Box<Error>),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for VerifyError {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
write!(f, "{:?}", self)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::error::Error for VerifyError {}
|
||||||
|
|
||||||
|
impl From<Error> for VerifyError {
|
||||||
|
fn from(other: Error) -> Self {
|
||||||
|
VerifyError::Global(Box::new(other))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl From<bitcoinconsensus::Error> for VerifyError {
|
||||||
|
fn from(other: bitcoinconsensus::Error) -> Self {
|
||||||
|
VerifyError::Consensus(other)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use std::collections::HashSet;
|
||||||
|
|
||||||
|
use bitcoin::consensus::encode::deserialize;
|
||||||
|
use bitcoin::hashes::hex::FromHex;
|
||||||
|
use bitcoin::{Transaction, Txid};
|
||||||
|
|
||||||
|
use crate::blockchain::{Blockchain, Capability, Progress};
|
||||||
|
use crate::database::{BatchDatabase, BatchOperations, MemoryDatabase};
|
||||||
|
use crate::FeeRate;
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
struct DummyBlockchain;
|
||||||
|
|
||||||
|
impl Blockchain for DummyBlockchain {
|
||||||
|
fn get_capabilities(&self) -> HashSet<Capability> {
|
||||||
|
Default::default()
|
||||||
|
}
|
||||||
|
fn setup<D: BatchDatabase, P: 'static + Progress>(
|
||||||
|
&self,
|
||||||
|
_stop_gap: Option<usize>,
|
||||||
|
_database: &mut D,
|
||||||
|
_progress_update: P,
|
||||||
|
) -> Result<(), Error> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
fn get_tx(&self, _txid: &Txid) -> Result<Option<Transaction>, Error> {
|
||||||
|
Ok(None)
|
||||||
|
}
|
||||||
|
fn broadcast(&self, _tx: &Transaction) -> Result<(), Error> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
fn get_height(&self) -> Result<u32, Error> {
|
||||||
|
Ok(42)
|
||||||
|
}
|
||||||
|
fn estimate_fee(&self, _target: usize) -> Result<FeeRate, Error> {
|
||||||
|
Ok(FeeRate::default_min_relay_fee())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_verify_fail_unsigned_tx() {
|
||||||
|
let prev_tx: Transaction = deserialize(&Vec::<u8>::from_hex("020000000101192dea5e66d444380e106f8e53acb171703f00d43fb6b3ae88ca5644bdb7e1000000006b48304502210098328d026ce138411f957966c1cf7f7597ccbb170f5d5655ee3e9f47b18f6999022017c3526fc9147830e1340e04934476a3d1521af5b4de4e98baf49ec4c072079e01210276f847f77ec8dd66d78affd3c318a0ed26d89dab33fa143333c207402fcec352feffffff023d0ac203000000001976a9144bfbaf6afb76cc5771bc6404810d1cc041a6933988aca4b956050000000017a91494d5543c74a3ee98e0cf8e8caef5dc813a0f34b48768cb0700").unwrap()).unwrap();
|
||||||
|
let signed_tx: Transaction = deserialize(&Vec::<u8>::from_hex("02000000013f7cebd65c27431a90bba7f796914fe8cc2ddfc3f2cbd6f7e5f2fc854534da95000000006b483045022100de1ac3bcdfb0332207c4a91f3832bd2c2915840165f876ab47c5f8996b971c3602201c6c053d750fadde599e6f5c4e1963df0f01fc0d97815e8157e3d59fe09ca30d012103699b464d1d8bc9e47d4fb1cdaa89a1c5783d68363c4dbc4b524ed3d857148617feffffff02836d3c01000000001976a914fc25d6d5c94003bf5b0c7b640a248e2c637fcfb088ac7ada8202000000001976a914fbed3d9b11183209a57999d54d59f67c019e756c88ac6acb0700").unwrap()).unwrap();
|
||||||
|
|
||||||
|
let mut database = MemoryDatabase::new();
|
||||||
|
let blockchain = DummyBlockchain;
|
||||||
|
|
||||||
|
let mut unsigned_tx = signed_tx.clone();
|
||||||
|
for input in &mut unsigned_tx.input {
|
||||||
|
input.script_sig = Default::default();
|
||||||
|
input.witness = Default::default();
|
||||||
|
}
|
||||||
|
|
||||||
|
let result = verify_tx(&signed_tx, &database, &blockchain);
|
||||||
|
assert!(result.is_err(), "Should fail with missing input tx");
|
||||||
|
assert!(
|
||||||
|
matches!(result, Err(VerifyError::MissingInputTx(txid)) if txid == prev_tx.txid()),
|
||||||
|
"Error should be a `MissingInputTx` error"
|
||||||
|
);
|
||||||
|
|
||||||
|
// insert the prev_tx
|
||||||
|
database.set_raw_tx(&prev_tx).unwrap();
|
||||||
|
|
||||||
|
let result = verify_tx(&unsigned_tx, &database, &blockchain);
|
||||||
|
assert!(result.is_err(), "Should fail since the TX is unsigned");
|
||||||
|
assert!(
|
||||||
|
matches!(result, Err(VerifyError::Consensus(_))),
|
||||||
|
"Error should be a `Consensus` error"
|
||||||
|
);
|
||||||
|
|
||||||
|
let result = verify_tx(&signed_tx, &database, &blockchain);
|
||||||
|
assert!(
|
||||||
|
result.is_ok(),
|
||||||
|
"Should work since the TX is correctly signed"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user