Merge pull request rust-bitcoin#161 from shesek/202101-wallet-conflicts

stevenroose · web-flow · commit 2b1c07e61532 · 2021-03-13T23:25:35.000Z
Add the `walletconflicts` field
diff --git a/json/src/lib.rs b/json/src/lib.rs
@@ -410,6 +410,9 @@ pub struct WalletTxInfo {
     pub timereceived: u64,
     #[serde(rename = "bip125-replaceable")]
     pub bip125_replaceable: Bip125Replaceable,
+    /// Conflicting transaction ids
+    #[serde(rename = "walletconflicts")]
+    pub wallet_conflicts: Vec<bitcoin::Txid>,
 }
 
 #[derive(Clone, PartialEq, Eq, Debug, Deserialize)]

Original file line number	Diff line number	Diff line change
`@@ -410,6 +410,9 @@ pub struct WalletTxInfo {`
`410`	`410`	`pub timereceived: u64,`
`411`	`411`	`#[serde(rename = "bip125-replaceable")]`
`412`	`412`	`pub bip125_replaceable: Bip125Replaceable,`
	`413`	`+ /// Conflicting transaction ids`
	`414`	`+ #[serde(rename = "walletconflicts")]`
	`415`	`+ pub wallet_conflicts: Vec<bitcoin::Txid>,`
`413`	`416`	`}`
`414`	`417`
`415`	`418`	`#[derive(Clone, PartialEq, Eq, Debug, Deserialize)]`