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

Nits in new PSBT global types reviews

This commit is contained in:
Dr Maxim Orlovsky 2020-12-07 20:04:23 +01:00
parent 0235abfac2
commit 8b1666295c
No known key found for this signature in database
GPG Key ID: FFC0250947E5C6F7
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/util/psbt/map/global.rs
View File

@ -15,7 +15,7 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::collections::btree_map::Entry; use std::collections::btree_map::Entry;
use std::io::{self, Cursor, Read}; use std::io::{self, Cursor, Read};
use std::cmp::Ordering; use std::cmp::{self, Ordering};
use blockdata::transaction::Transaction; use blockdata::transaction::Transaction;
use consensus::{encode, Encodable, Decodable}; use consensus::{encode, Encodable, Decodable};
@ -28,8 +28,11 @@ use util::bip32::{ExtendedPubKey, KeySource, Fingerprint, DerivationPath, ChildN
/// Type: Unsigned Transaction PSBT_GLOBAL_UNSIGNED_TX = 0x00 /// Type: Unsigned Transaction PSBT_GLOBAL_UNSIGNED_TX = 0x00
const PSBT_GLOBAL_UNSIGNED_TX: u8 = 0x00; const PSBT_GLOBAL_UNSIGNED_TX: u8 = 0x00;
/// Type: Extended Public Key PSBT_GLOBAL_XPUB = 0x01
const PSBT_GLOBAL_XPUB: u8 = 0x01; const PSBT_GLOBAL_XPUB: u8 = 0x01;
/// Type: Version Number PSBT_GLOBAL_VERSION = 0xFB
const PSBT_GLOBAL_VERSION: u8 = 0xFB; const PSBT_GLOBAL_VERSION: u8 = 0xFB;
/// A key-value map for global data. /// A key-value map for global data.
#[derive(Clone, Debug, PartialEq)] #[derive(Clone, Debug, PartialEq)]
pub struct Global { pub struct Global {
@ -115,9 +118,7 @@ impl Map for Global {
value: { value: {
let mut ret = Vec::with_capacity(4 + derivation.len() * 4); let mut ret = Vec::with_capacity(4 + derivation.len() * 4);
ret.extend(fingerprint.as_bytes()); ret.extend(fingerprint.as_bytes());
for no in 0..derivation.len() { derivation.into_iter().for_each(|n| ret.extend(&u32_to_array_le((*n).into())));
ret.extend(&u32_to_array_le(derivation[no].into())[..])
}
ret ret
} }
}); });
@ -144,7 +145,7 @@ impl Map for Global {
Ok(rv) Ok(rv)
} }
// Keep in mind that according to BIP 174 this function must be transitive, i.e. // Keep in mind that according to BIP 174 this function must be commutative, i.e.
// A.merge(B) == B.merge(A) // A.merge(B) == B.merge(A)
fn merge(&mut self, other: Self) -> Result<(), psbt::Error> { fn merge(&mut self, other: Self) -> Result<(), psbt::Error> {
if self.unsigned_tx != other.unsigned_tx { if self.unsigned_tx != other.unsigned_tx {
@ -158,7 +159,7 @@ impl Map for Global {
// the specification. It can pick arbitrarily when conflicts occur. // the specification. It can pick arbitrarily when conflicts occur.
// Keeping the highest version // Keeping the highest version
self.version = self.version.max(other.version); self.version = cmp::max(self.version, other.version);
// Merging xpubs // Merging xpubs
for (xpub, (fingerprint1, derivation1)) in other.xpub { for (xpub, (fingerprint1, derivation1)) in other.xpub {
@ -171,7 +172,7 @@ impl Map for Global {
// 1) if fingerprints are equal but derivations are not, we report an error; otherwise // 1) if fingerprints are equal but derivations are not, we report an error; otherwise
// 2) choose longest unhardened derivation; if equal // 2) choose longest unhardened derivation; if equal
// 3) choose longest derivation; if equal // 3) choose longest derivation; if equal
// 4) choose largest fingerprint; if equal // 4) choose largest fingerprint using binary ordering; if equal
// 5) do nothing // 5) do nothing
let (fingerprint2, len2, normal_len2) = { let (fingerprint2, len2, normal_len2) = {
// weird scope needed for rustc 1.29 borrow checker // weird scope needed for rustc 1.29 borrow checker
@ -184,8 +185,7 @@ impl Map for Global {
(Ordering::Equal, Ordering::Equal, Ordering::Equal) => {}, (Ordering::Equal, Ordering::Equal, Ordering::Equal) => {},
(Ordering::Equal, _, Ordering::Equal) => { (Ordering::Equal, _, Ordering::Equal) => {
return Err(psbt::Error::MergeConflict(format!( return Err(psbt::Error::MergeConflict(format!(
"global xpub {} has inconsistent key sources", "global xpub {} has inconsistent key sources", xpub
xpub
).to_owned())); ).to_owned()));
} }
(Ordering::Greater, _, _) (Ordering::Greater, _, _)
@ -253,9 +253,9 @@ impl Decodable for Global {
PSBT_GLOBAL_XPUB => { PSBT_GLOBAL_XPUB => {
if !pair.key.key.is_empty() { if !pair.key.key.is_empty() {
let xpub = ExtendedPubKey::decode(&pair.key.key) let xpub = ExtendedPubKey::decode(&pair.key.key)
.map_err(|_| { .map_err(|_| encode::Error::ParseFailed(
encode::Error::ParseFailed("Can't deserialize ExtendedPublicKey from global XPUB key data") "Can't deserialize ExtendedPublicKey from global XPUB key data"
})?; ))?;
if pair.value.len() % 4 != 0 { if pair.value.len() % 4 != 0 {
return Err(encode::Error::ParseFailed("Incorrect length of global xpub list")) return Err(encode::Error::ParseFailed("Incorrect length of global xpub list"))