Fix cbor-in-cbor for byron witnesses

rust/src/builders/witness_builder.rs

@@ -878,4 +878,13 @@ mod tests {
 
         assert!(builder.try_build().is_ok());
     }
+
+    #[test]
+    fn tx_witness_set_roundtrip_test() {
+        let data = "a102818458205e8379f58f0838234af67f73738f0fee0d8185232e200b8e42887f4f06544a9a5840f5cfea560d2f8645ed624b65bf08cf83346eb5168ee4df0f63ce2d0d5f677db88fef2d5d9f032f09223889b5e85504ab44dd0a0cde1f1fd8f57deefde8c2080658202d3b7d9b806f88f10f1193e94ef97e5c02370c1464f61a30a8f1ac1a46115b2d5829a201581e581c072931653330243cf126aea85d39e73c6bd04601fe77424efb9e371002451a4170cb17";
+        let witness_set = TransactionWitnessSet::from_bytes(hex::decode(data).unwrap()).unwrap();
+        let round_trip = witness_set.to_bytes();
+
+        assert_eq!(data, hex::encode(&round_trip));
+    }
 }

rust/src/crypto.rs

@@ -603,7 +603,7 @@ impl cbor_event::se::Serialize for BootstrapWitness {
         self.vkey.serialize(serializer)?;
         self.signature.serialize(serializer)?;
         serializer.write_bytes(&self.chain_code)?;
-        self.attributes.serialize(serializer)?;
+        cbor_event::se::serialize_cbor_in_cbor(&self.attributes, serializer)?;
         Ok(serializer)
     }
 }
@@ -637,7 +637,9 @@ impl DeserializeEmbeddedGroup for BootstrapWitness {
             Ok(raw.bytes()?)
         })().map_err(|e| e.annotate("chain_code"))?;
         let attributes = (|| -> Result<_, DeserializeError> {
-            Ok(AddrAttributes::deserialize(raw)?)
+            let bytes = raw.bytes()?;
+            let mut inner_cbor = Deserializer::from(std::io::Cursor::new(bytes));
+            Ok(AddrAttributes::deserialize(&mut inner_cbor)?)
         })().map_err(|e| e.annotate("attributes"))?;
         Ok(BootstrapWitness {
             vkey,