refactor(chain): calculate DescriptorId as sha256 hash of spk at index 0
Also update docs to explain how KeychainTxOutIndex handles descriptors that generate the same spks.
This commit is contained in:
parent
6dab68d35b
commit
46c6f18cc3
@ -1,12 +1,8 @@
|
|||||||
use crate::{
|
use crate::miniscript::{Descriptor, DescriptorPublicKey};
|
||||||
alloc::{string::ToString, vec::Vec},
|
|
||||||
miniscript::{Descriptor, DescriptorPublicKey},
|
|
||||||
};
|
|
||||||
use bitcoin::hashes::{hash_newtype, sha256, Hash};
|
use bitcoin::hashes::{hash_newtype, sha256, Hash};
|
||||||
|
|
||||||
hash_newtype! {
|
hash_newtype! {
|
||||||
/// Represents the ID of a descriptor, defined as the sha256 hash of
|
/// Represents the unique ID of a descriptor.
|
||||||
/// the descriptor string, checksum excluded.
|
|
||||||
///
|
///
|
||||||
/// This is useful for having a fixed-length unique representation of a descriptor,
|
/// This is useful for having a fixed-length unique representation of a descriptor,
|
||||||
/// in particular, we use it to persist application state changes related to the
|
/// in particular, we use it to persist application state changes related to the
|
||||||
@ -21,8 +17,8 @@ pub trait DescriptorExt {
|
|||||||
/// Panics if the descriptor wildcard is hardened.
|
/// Panics if the descriptor wildcard is hardened.
|
||||||
fn dust_value(&self) -> u64;
|
fn dust_value(&self) -> u64;
|
||||||
|
|
||||||
/// Returns the descriptor id, calculated as the sha256 of the descriptor, checksum not
|
/// Returns the descriptor ID, calculated as the sha256 hash of the spk derived from the
|
||||||
/// included.
|
/// descriptor at index 0.
|
||||||
fn descriptor_id(&self) -> DescriptorId;
|
fn descriptor_id(&self) -> DescriptorId;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -36,9 +32,7 @@ impl DescriptorExt for Descriptor<DescriptorPublicKey> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn descriptor_id(&self) -> DescriptorId {
|
fn descriptor_id(&self) -> DescriptorId {
|
||||||
let desc = self.to_string();
|
let spk = self.at_derivation_index(0).unwrap().script_pubkey();
|
||||||
let desc_without_checksum = desc.split('#').next().expect("Must be here");
|
DescriptorId(sha256::Hash::hash(spk.as_bytes()))
|
||||||
let descriptor_bytes = <Vec<u8>>::from(desc_without_checksum.as_bytes());
|
|
||||||
DescriptorId(sha256::Hash::hash(&descriptor_bytes))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -352,6 +352,13 @@ impl<K: Clone + Ord + Debug> KeychainTxOutIndex<K> {
|
|||||||
///
|
///
|
||||||
/// keychain <-> descriptor is a one-to-one mapping that cannot be changed. Attempting to do so
|
/// keychain <-> descriptor is a one-to-one mapping that cannot be changed. Attempting to do so
|
||||||
/// will return a [`InsertDescriptorError<K>`].
|
/// will return a [`InsertDescriptorError<K>`].
|
||||||
|
///
|
||||||
|
/// `[KeychainTxOutIndex]` will prevent you from inserting two descriptors which derive the same
|
||||||
|
/// script pubkey at index 0, but it's up to you to ensure that descriptors don't collide at
|
||||||
|
/// other indices. If they do nothing catastrophic happens at the `KeychainTxOutIndex` level
|
||||||
|
/// (one keychain just becomes the defacto owner of that spk arbitrarily) but this may have
|
||||||
|
/// subtle implications up the application stack like one UTXO being missing from one keychain
|
||||||
|
/// because it has been assigned to another which produces the same script pubkey.
|
||||||
pub fn insert_descriptor(
|
pub fn insert_descriptor(
|
||||||
&mut self,
|
&mut self,
|
||||||
keychain: K,
|
keychain: K,
|
||||||
|
@ -91,6 +91,9 @@ const COINBASE_MATURITY: u32 = 100;
|
|||||||
/// [`ChangeSet`]s (see [`take_staged`]). Also see individual functions and example for instructions
|
/// [`ChangeSet`]s (see [`take_staged`]). Also see individual functions and example for instructions
|
||||||
/// on when [`Wallet`] state needs to be persisted.
|
/// on when [`Wallet`] state needs to be persisted.
|
||||||
///
|
///
|
||||||
|
/// The `Wallet` descriptor (external) and change descriptor (internal) must not derive the same
|
||||||
|
/// script pubkeys. See [`KeychainTxOutIndex::insert_descriptor()`] for more details.
|
||||||
|
///
|
||||||
/// [`signer`]: crate::signer
|
/// [`signer`]: crate::signer
|
||||||
/// [`take_staged`]: Wallet::take_staged
|
/// [`take_staged`]: Wallet::take_staged
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user