Add support for bitcoin core 29.0

Author: GideonBature

.github/workflows/rust.yaml

@@ -210,6 +210,7 @@ jobs:
       matrix:
         feature:
           [
+            "29_0",
             "28_0",
             "27_1",
             "27_0",

client/src/client_sync/error.rs

@@ -27,35 +27,51 @@ pub enum Error {
 }
 
 impl From<jsonrpc::error::Error> for Error {
-    fn from(e: jsonrpc::error::Error) -> Error { Error::JsonRpc(e) }
+    fn from(e: jsonrpc::error::Error) -> Error {
+        Error::JsonRpc(e)
+    }
 }
 
 impl From<hex::HexToArrayError> for Error {
-    fn from(e: hex::HexToArrayError) -> Self { Self::HexToArray(e) }
+    fn from(e: hex::HexToArrayError) -> Self {
+        Self::HexToArray(e)
+    }
 }
 
 impl From<hex::HexToBytesError> for Error {
-    fn from(e: hex::HexToBytesError) -> Self { Self::HexToBytes(e) }
+    fn from(e: hex::HexToBytesError) -> Self {
+        Self::HexToBytes(e)
+    }
 }
 
 impl From<serde_json::error::Error> for Error {
-    fn from(e: serde_json::error::Error) -> Error { Error::Json(e) }
+    fn from(e: serde_json::error::Error) -> Error {
+        Error::Json(e)
+    }
 }
 
 impl From<bitcoin::consensus::encode::FromHexError> for Error {
-    fn from(e: bitcoin::consensus::encode::FromHexError) -> Error { Error::BitcoinSerialization(e) }
+    fn from(e: bitcoin::consensus::encode::FromHexError) -> Error {
+        Error::BitcoinSerialization(e)
+    }
 }
 
 impl From<secp256k1::Error> for Error {
-    fn from(e: secp256k1::Error) -> Error { Error::Secp256k1(e) }
+    fn from(e: secp256k1::Error) -> Error {
+        Error::Secp256k1(e)
+    }
 }
 
 impl From<io::Error> for Error {
-    fn from(e: io::Error) -> Error { Error::Io(e) }
+    fn from(e: io::Error) -> Error {
+        Error::Io(e)
+    }
 }
 
 impl From<bitcoin::amount::ParseAmountError> for Error {
-    fn from(e: bitcoin::amount::ParseAmountError) -> Error { Error::InvalidAmount(e) }
+    fn from(e: bitcoin::amount::ParseAmountError) -> Error {
+        Error::InvalidAmount(e)
+    }
 }
 
 impl fmt::Display for Error {
@@ -122,5 +138,7 @@ impl fmt::Display for UnexpectedServerVersionError {
 impl error::Error for UnexpectedServerVersionError {}
 
 impl From<UnexpectedServerVersionError> for Error {
-    fn from(e: UnexpectedServerVersionError) -> Self { Self::ServerVersion(e) }
+    fn from(e: UnexpectedServerVersionError) -> Self {
+        Self::ServerVersion(e)
+    }
 }

client/src/client_sync/mod.rs

@@ -15,6 +15,7 @@ pub mod v25;
 pub mod v26;
 pub mod v27;
 pub mod v28;
+pub mod v29;
 
 use std::fs::File;
 use std::io::{BufRead, BufReader};
@@ -177,15 +178,21 @@ where
 
 /// Shorthand for `serde_json::Value::Null`.
 #[allow(dead_code)] // TODO: Remove this if unused still when we are done.
-fn null() -> serde_json::Value { serde_json::Value::Null }
+fn null() -> serde_json::Value {
+    serde_json::Value::Null
+}
 
 /// Shorthand for an empty `serde_json::Value` array.
 #[allow(dead_code)] // TODO: Remove this if unused still when we are done.
-fn empty_arr() -> serde_json::Value { serde_json::Value::Array(vec![]) }
+fn empty_arr() -> serde_json::Value {
+    serde_json::Value::Array(vec![])
+}
 
 /// Shorthand for an empty `serde_json` object.
 #[allow(dead_code)] // TODO: Remove this if unused still when we are done.
-fn empty_obj() -> serde_json::Value { serde_json::Value::Object(Default::default()) }
+fn empty_obj() -> serde_json::Value {
+    serde_json::Value::Object(Default::default())
+}
 
 /// Convert a possible-null result into an `Option`.
 #[allow(dead_code)] // TODO: Remove this if unused still when we are done.
@@ -205,11 +212,12 @@ fn log_response(method: &str, resp: &Result<jsonrpc::Response>) {
 
     if log::log_enabled!(Warn) || log::log_enabled!(Debug) || log::log_enabled!(Trace) {
         match resp {
-            Err(ref e) =>
+            Err(ref e) => {
                 if log::log_enabled!(Debug) {
                     log::debug!(target: "corepc", "error: {}: {:?}", method, e);
-                },
-            Ok(ref resp) =>
+                }
+            }
+            Ok(ref resp) => {
                 if let Some(ref e) = resp.error {
                     if log::log_enabled!(Debug) {
                         log::debug!(target: "corepc", "response error for {}: {:?}", method, e);
@@ -219,7 +227,8 @@ fn log_response(method: &str, resp: &Result<jsonrpc::Response>) {
                         serde_json::value::to_raw_value(&serde_json::value::Value::Null).unwrap();
                     let result = resp.result.as_ref().unwrap_or(&def);
                     log::trace!(target: "corepc", "response for {}: {}", method, result);
-                },
+                }
+            }
         }
     }
 }
@@ -262,3 +271,18 @@ pub enum TemplateRules {
     /// Taproot supported.
     Taproot,
 }
+
+/// Arg for the `getblocktemplate` method. (v29+).
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Default)]
+pub struct TemplateRequestV29 {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub mode: Option<String>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub capabilities: Vec<String>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub rules: Vec<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub longpollid: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub data: Option<String>,
+}

client/src/client_sync/v17/blockchain.rs

@@ -128,7 +128,9 @@ macro_rules! impl_client_v17__getblockstats {
 macro_rules! impl_client_v17__getchaintips {
     () => {
         impl Client {
-            pub fn get_chain_tips(&self) -> Result<GetChainTips> { self.call("getchaintips", &[]) }
+            pub fn get_chain_tips(&self) -> Result<GetChainTips> {
+                self.call("getchaintips", &[])
+            }
         }
     };
 }

client/src/client_sync/v17/control.rs

@@ -26,7 +26,9 @@ macro_rules! impl_client_v17__getmemoryinfo {
 macro_rules! impl_client_v17__help {
     () => {
         impl Client {
-            pub fn help(&self) -> Result<String> { self.call("help", &[]) }
+            pub fn help(&self) -> Result<String> {
+                self.call("help", &[])
+            }
         }
     };
 }
@@ -36,7 +38,9 @@ macro_rules! impl_client_v17__help {
 macro_rules! impl_client_v17__logging {
     () => {
         impl Client {
-            pub fn logging(&self) -> Result<Logging> { self.call("logging", &[]) }
+            pub fn logging(&self) -> Result<Logging> {
+                self.call("logging", &[])
+            }
         }
     };
 }
@@ -46,7 +50,9 @@ macro_rules! impl_client_v17__logging {
 macro_rules! impl_client_v17__stop {
     () => {
         impl Client {
-            pub fn stop(&self) -> Result<String> { self.call("stop", &[]) }
+            pub fn stop(&self) -> Result<String> {
+                self.call("stop", &[])
+            }
         }
     };
 }
@@ -56,7 +62,9 @@ macro_rules! impl_client_v17__stop {
 macro_rules! impl_client_v17__uptime {
     () => {
         impl Client {
-            pub fn uptime(&self) -> Result<u32> { self.call("uptime", &[]) }
+            pub fn uptime(&self) -> Result<u32> {
+                self.call("uptime", &[])
+            }
         }
     };
 }

client/src/client_sync/v17/mining.rs

@@ -41,7 +41,9 @@ macro_rules! impl_client_v17__getmininginfo {
 macro_rules! impl_client_v17__getnetworkhashps {
     () => {
         impl Client {
-            pub fn get_network_hash_ps(&self) -> Result<f64> { self.call("getnetworkhashps", &[]) }
+            pub fn get_network_hash_ps(&self) -> Result<f64> {
+                self.call("getnetworkhashps", &[])
+            }
         }
     };
 }

client/src/client_sync/v17/network.rs

@@ -26,7 +26,9 @@ macro_rules! impl_client_v17__getaddednodeinfo {
 macro_rules! impl_client_v17__getnettotals {
     () => {
         impl Client {
-            pub fn get_net_totals(&self) -> Result<GetNetTotals> { self.call("getnettotals", &[]) }
+            pub fn get_net_totals(&self) -> Result<GetNetTotals> {
+                self.call("getnettotals", &[])
+            }
         }
     };
 }
@@ -54,7 +56,9 @@ macro_rules! impl_client_v17__getnetworkinfo {
 macro_rules! impl_client_v17__getpeerinfo {
     () => {
         impl Client {
-            pub fn get_peer_info(&self) -> Result<GetPeerInfo> { self.call("getpeerinfo", &[]) }
+            pub fn get_peer_info(&self) -> Result<GetPeerInfo> {
+                self.call("getpeerinfo", &[])
+            }
         }
     };
 }

client/src/client_sync/v17/wallet.rs

@@ -111,7 +111,9 @@ macro_rules! impl_client_v17__getaddressinfo {
 macro_rules! impl_client_v17__getbalance {
     () => {
         impl Client {
-            pub fn get_balance(&self) -> Result<GetBalance> { self.call("getbalance", &[]) }
+            pub fn get_balance(&self) -> Result<GetBalance> {
+                self.call("getbalance", &[])
+            }
         }
     };
 }
@@ -153,8 +155,9 @@ macro_rules! impl_client_v17__getnewaddress {
                 ty: Option<AddressType>,
             ) -> Result<GetNewAddress> {
                 match (label, ty) {
-                    (Some(label), Some(ty)) =>
-                        self.call("getnewaddress", &[into_json(label)?, into_json(ty)?]),
+                    (Some(label), Some(ty)) => {
+                        self.call("getnewaddress", &[into_json(label)?, into_json(ty)?])
+                    }
                     (Some(label), None) => self.call("getnewaddress", &[into_json(label)?]),
                     (None, Some(ty)) => self.call("getnewaddress", &["".into(), into_json(ty)?]),
                     (None, None) => self.call("getnewaddress", &[]),
@@ -244,7 +247,9 @@ macro_rules! impl_client_v17__listaddressgroupings {
 macro_rules! impl_client_v17__listlabels {
     () => {
         impl Client {
-            pub fn list_labels(&self) -> Result<ListLabels> { self.call("listlabels", &[]) }
+            pub fn list_labels(&self) -> Result<ListLabels> {
+                self.call("listlabels", &[])
+            }
         }
     };
 }
@@ -302,7 +307,9 @@ macro_rules! impl_client_v17__listtransactions {
 macro_rules! impl_client_v17__listunspent {
     () => {
         impl Client {
-            pub fn list_unspent(&self) -> Result<ListUnspent> { self.call("listunspent", &[]) }
+            pub fn list_unspent(&self) -> Result<ListUnspent> {
+                self.call("listunspent", &[])
+            }
         }
     };
 }
@@ -312,7 +319,9 @@ macro_rules! impl_client_v17__listunspent {
 macro_rules! impl_client_v17__listwallets {
     () => {
         impl Client {
-            pub fn list_wallets(&self) -> Result<ListWallets> { self.call("listwallets", &[]) }
+            pub fn list_wallets(&self) -> Result<ListWallets> {
+                self.call("listwallets", &[])
+            }
         }
     };
 }

client/src/client_sync/v18/control.rs

@@ -12,7 +12,9 @@
 macro_rules! impl_client_v18__getrpcinfo {
     () => {
         impl Client {
-            pub fn get_rpc_info(&self) -> Result<GetRpcInfo> { self.call("getrpcinfo", &[]) }
+            pub fn get_rpc_info(&self) -> Result<GetRpcInfo> {
+                self.call("getrpcinfo", &[])
+            }
         }
     };
 }

client/src/client_sync/v19/wallet.rs

@@ -14,7 +14,9 @@
 macro_rules! impl_client_v19__getbalances {
     () => {
         impl Client {
-            pub fn get_balances(&self) -> Result<GetBalances> { self.call("getbalances", &[]) }
+            pub fn get_balances(&self) -> Result<GetBalances> {
+                self.call("getbalances", &[])
+            }
         }
     };
 }