milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

PSBT: making BIP32 field name match spec type names

This commit is contained in:
Dr Maxim Orlovsky 2020-11-06 19:31:38 +01:00
parent 3f465d56eb
commit 9b106ee161
No known key found for this signature in database
GPG Key ID: FFC0250947E5C6F7
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/util/psbt/map/input.rs
View File

@ -49,7 +49,7 @@ pub struct Input {
pub witness_script: Option<Script>, pub witness_script: Option<Script>,
/// A map from public keys needed to sign this input to their corresponding /// A map from public keys needed to sign this input to their corresponding
/// master key fingerprints and derivation paths. /// master key fingerprints and derivation paths.
pub hd_keypaths: BTreeMap<PublicKey, KeySource>, pub bip32_derivation: BTreeMap<PublicKey, KeySource>,
/// The finalized, fully-constructed scriptSig with signatures and any other /// The finalized, fully-constructed scriptSig with signatures and any other
/// scripts necessary for this input to pass validation. /// scripts necessary for this input to pass validation.
pub final_script_sig: Option<Script>, pub final_script_sig: Option<Script>,
@ -70,7 +70,7 @@ pub struct Input {
} }
serde_struct_impl!( serde_struct_impl!(
Input, non_witness_utxo, witness_utxo, partial_sigs, Input, non_witness_utxo, witness_utxo, partial_sigs,
sighash_type, redeem_script, witness_script, hd_keypaths, sighash_type, redeem_script, witness_script, bip32_derivation,
final_script_sig, final_script_witness, final_script_sig, final_script_witness,
ripemd_preimages, sha256_preimages, hash160_preimages, hash256_preimages, ripemd_preimages, sha256_preimages, hash160_preimages, hash256_preimages,
unknown unknown
@ -126,7 +126,7 @@ impl Map for Input {
} }
6u8 => { 6u8 => {
impl_psbt_insert_pair! { impl_psbt_insert_pair! {
self.hd_keypaths <= <raw_key: PublicKey>|<raw_value: KeySource> self.bip32_derivation <= <raw_key: PublicKey>|<raw_value: KeySource>
} }
} }
10u8 => { 10u8 => {
@ -182,7 +182,7 @@ impl Map for Input {
} }
impl_psbt_get_pair! { impl_psbt_get_pair! {
rv.push(self.hd_keypaths as <6u8, PublicKey>|<KeySource>) rv.push(self.bip32_derivation as <6u8, PublicKey>|<KeySource>)
} }
impl_psbt_get_pair! { impl_psbt_get_pair! {
@ -228,7 +228,7 @@ impl Map for Input {
} }
self.partial_sigs.extend(other.partial_sigs); self.partial_sigs.extend(other.partial_sigs);
self.hd_keypaths.extend(other.hd_keypaths); self.bip32_derivation.extend(other.bip32_derivation);
self.ripemd_preimages.extend(other.ripemd_preimages); self.ripemd_preimages.extend(other.ripemd_preimages);
self.sha256_preimages.extend(other.sha256_preimages); self.sha256_preimages.extend(other.sha256_preimages);
self.hash160_preimages.extend(other.hash160_preimages); self.hash160_preimages.extend(other.hash160_preimages);

10
src/util/psbt/map/output.rs
View File

@ -34,12 +34,12 @@ pub struct Output {
pub witness_script: Option<Script>, pub witness_script: Option<Script>,
/// A map from public keys needed to spend this output to their /// A map from public keys needed to spend this output to their
/// corresponding master key fingerprints and derivation paths. /// corresponding master key fingerprints and derivation paths.
pub hd_keypaths: BTreeMap<PublicKey, KeySource>, pub bip32_derivation: BTreeMap<PublicKey, KeySource>,
/// Unknown key-value pairs for this output. /// Unknown key-value pairs for this output.
pub unknown: BTreeMap<raw::Key, Vec<u8>>, pub unknown: BTreeMap<raw::Key, Vec<u8>>,
} }
serde_struct_impl!( serde_struct_impl!(
Output, redeem_script, witness_script, hd_keypaths, unknown Output, redeem_script, witness_script, bip32_derivation, unknown
); );
impl Map for Output { impl Map for Output {
@ -62,7 +62,7 @@ impl Map for Output {
} }
2u8 => { 2u8 => {
impl_psbt_insert_pair! { impl_psbt_insert_pair! {
self.hd_keypaths <= <raw_key: PublicKey>|<raw_value: KeySource> self.bip32_derivation <= <raw_key: PublicKey>|<raw_value: KeySource>
} }
} }
_ => match self.unknown.entry(raw_key) { _ => match self.unknown.entry(raw_key) {
@ -86,7 +86,7 @@ impl Map for Output {
} }
impl_psbt_get_pair! { impl_psbt_get_pair! {
rv.push(self.hd_keypaths as <2u8, PublicKey>|<KeySource>) rv.push(self.bip32_derivation as <2u8, PublicKey>|<KeySource>)
} }
for (key, value) in self.unknown.iter() { for (key, value) in self.unknown.iter() {
@ -100,7 +100,7 @@ impl Map for Output {
} }
fn merge(&mut self, other: Self) -> Result<(), psbt::Error> { fn merge(&mut self, other: Self) -> Result<(), psbt::Error> {
self.hd_keypaths.extend(other.hd_keypaths); self.bip32_derivation.extend(other.bip32_derivation);
self.unknown.extend(other.unknown); self.unknown.extend(other.unknown);
merge!(redeem_script, self, other); merge!(redeem_script, self, other);

2
src/util/psbt/mod.rs
View File

@ -238,7 +238,7 @@ mod tests {
witness_script: Some(hex_script!( witness_script: Some(hex_script!(
"a9143545e6e33b832c47050f24d3eeb93c9c03948bc787" "a9143545e6e33b832c47050f24d3eeb93c9c03948bc787"
)), )),
hd_keypaths: hd_keypaths, bip32_derivation: hd_keypaths,
..Default::default() ..Default::default()
}; };