merge main

Author: Ximik

protocol/src/lib.rs

@@ -115,40 +115,49 @@ pub enum Covenant {
 #[derive(Copy, Clone, PartialEq, Debug)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
-#[cfg_attr(feature = "serde", serde(rename_all = "snake_case"))]
+#[cfg_attr(
+    feature = "serde",
+    serde(rename_all = "snake_case", tag = "reason")
+)]
 pub enum RevokeReason {
-    BidPsbt(BidPsbtReason),
     /// Space was prematurely spent during the auctions phase
     PrematureClaim,
     /// Space output was spent either by spending it directly
     /// Space was transferred without following Input N => Output N+1 rule
     BadSpend,
     Expired,
+    #[cfg_attr(feature = "serde", serde(untagged))]
+    BidPsbt(BidPsbtReason)
 }
 
 #[derive(Copy, Clone, PartialEq, Debug, Eq)]
 #[cfg_attr(
     feature = "serde",
     derive(Serialize, Deserialize),
-    serde(rename_all = "snake_case")
+    serde(rename_all = "snake_case", tag="reason")
 )]
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 pub enum RejectReason {
     AlreadyExists,
+    #[cfg_attr(feature = "serde", serde(untagged))]
     BidPsbt(BidPsbtReason),
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(
     feature = "serde",
     derive(Serialize, Deserialize),
-    serde(rename_all = "snake_case")
+    serde(tag = "reason")
 )]
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 pub enum BidPsbtReason {
+    #[cfg_attr(feature = "serde", serde(rename = "bid_psbt_required"))]
     Required,
+    #[cfg_attr(feature = "serde", serde(rename = "bid_psbt_low_bid_amount"))]
     LowBidAmount,
+    #[cfg_attr(feature = "serde", serde(rename = "bid_psbt_bad_signature"))]
     BadSignature,
+    #[cfg_attr(feature = "serde", serde(rename = "bid_psbt_output_spent"))]
     OutputSpent,
 }
 

protocol/src/validate.rs

@@ -82,6 +82,8 @@ pub struct RevokeParams {
 pub struct RejectParams {
     #[cfg_attr(feature = "bincode", bincode(with_serde))]
     pub name: SName,
+
+    #[cfg_attr(feature = "serde", serde(flatten))]
     pub reason: RejectReason,
 }