Merge #224: pset: input: insert non-pset proprietary keys

45267c9 pset: input: insert non-pset proprietary keys (Leonardo Comandini)
7ead9ba elip101: add test for abf serialization roundtrip (Leonardo Comandini)

Pull request description:

  As it is done for pset outputs.

ACKs for top commit:
  apoelstra:
    ACK 45267c9; successfully ran local tests

Tree-SHA512: ec6028f2fb6f591611a8af3ad0979d827d111a228a6e5429512bdbec0342e0a1dfb81d34da74beebfbb696a27bf5049aa99bc27c394afb8378b1a7a6332a452f

Author: apoelstra

src/pset/elip101.rs

@@ -67,6 +67,7 @@ impl Output {
 #[cfg(test)]
 mod test {
     use super::*;
+    use crate::AssetId;
     use crate::encode::{serialize_hex, Encodable};
     use crate::hex::{FromHex, ToHex};
 
@@ -110,4 +111,30 @@ mod test {
         assert!(output_hex.contains(ELIP0101_IDENTIFIER));
         assert!(output_hex.contains(abf_hex));
     }
+
+    #[test]
+    fn abf_roundtrip() {
+        use crate::pset::PartiallySignedTransaction;
+
+        // Set abf on an input and on an output
+        let abf = AssetBlindingFactor::from_slice(&[3; 32]).unwrap();
+        let mut pset = PartiallySignedTransaction::new_v2();
+        let mut input = Input::default();
+        input.set_abf(abf);
+        pset.add_input(input);
+        let mut output = Output {
+            amount: Some(1),
+            asset: Some(AssetId::from_slice(&[9; 32]).unwrap()),
+            ..Default::default()
+        };
+        output.set_abf(abf);
+        pset.add_output(output);
+
+        // Serialize and deserialize
+        let bytes = encode::serialize(&pset);
+        let pset_back = encode::deserialize::<PartiallySignedTransaction>(&bytes).unwrap();
+        // Check the abf
+        assert_eq!(pset_back.inputs()[0].get_abf().unwrap().unwrap(), abf);
+        assert_eq!(pset_back.outputs()[0].get_abf().unwrap().unwrap(), abf);
+    }
 }

src/pset/map/input.rs

@@ -759,8 +759,18 @@ impl Map for Input {
                             Entry::Occupied(_) => return Err(Error::DuplicateKey(raw_key).into()),
                         },
                     }
+                } else {
+                    match self.proprietary.entry(prop_key) {
+                        Entry::Vacant(empty_key) => {
+                            empty_key.insert(raw_value);
+                        }
+                        Entry::Occupied(_) => {
+                            return Err(Error::DuplicateKey(raw_key).into())
+                        }
+                    }
                 }
             }
+
             _ => match self.unknown.entry(raw_key) {
                 Entry::Vacant(empty_key) => {
                     empty_key.insert(raw_value);