Add support for bitcoin core 29.0

Author: GideonBature

.github/workflows/rust.yaml

@@ -217,8 +217,6 @@ jobs:
             "27_1",
             "27_0",
             "26_2",
-            "26_1",
-            "26_0",
             "25_2",
             "24_2",
             "23_2",

client/src/client_sync/v29/blockchain.rs

@@ -14,18 +14,11 @@
 macro_rules! impl_client_v29__getdescriptoractivity {
     () => {
         impl Client {
-            pub fn get_descriptor_activity(
-                &self,
-                blockhashes: &[BlockHash],
-                scan_objects: &[&str],
-                include_mempool: bool,
-            ) -> Result<GetDescriptorActivity> {
-                let blockhashes_val = json!(blockhashes);
-                let scan_objects_val = json!(scan_objects);
-                let include_mempool_val = json!(include_mempool);
-
-                let params = vec![blockhashes_val, scan_objects_val, include_mempool_val];
-
+            pub fn get_descriptor_activity(&self) -> Result<GetDescriptorActivity> {
+                let block_hashes: &[BlockHash] = &[];
+                let scan_objects: &[&str] = &[];
+                // FIXME: Core errors if we don't pass empty arrays?
+                let params = vec![json!(block_hashes), json!(scan_objects)];
                 self.call("getdescriptoractivity", &params)
             }
         }

client/src/client_sync/v29/mod.rs

@@ -3,6 +3,7 @@
 //! A JSON-RPC client for testing against Bitcoin Core `v29`.
 //!
 //! We ignore option arguments unless they effect the shape of the returned JSON data.
+
 pub mod blockchain;
 
 use std::collections::BTreeMap;
@@ -141,20 +142,6 @@ crate::impl_client_v21__unloadwallet!();
 crate::impl_client_v17__walletcreatefundedpsbt!();
 crate::impl_client_v17__walletprocesspsbt!();
 
-/// Client side supported softfork deployment.
-#[derive(Copy, Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "lowercase")]
-pub enum TemplateRules {
-    /// SegWit v0 supported.
-    Segwit,
-    /// Signet supported.
-    Signet,
-    /// CSV supported.
-    Csv,
-    /// Taproot supported.
-    Taproot,
-}
-
 /// Arg for the `getblocktemplate` method. (v29+).
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Default)]
 pub struct TemplateRequest {
@@ -169,3 +156,17 @@ pub struct TemplateRequest {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub data: Option<String>,
 }
+
+/// Client side supported softfork deployment.
+#[derive(Copy, Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "lowercase")]
+pub enum TemplateRules {
+    /// SegWit v0 supported.
+    Segwit,
+    /// Signet supported.
+    Signet,
+    /// CSV supported.
+    Csv,
+    /// Taproot supported.
+    Taproot,
+}

integration_test/Cargo.toml

@@ -19,10 +19,8 @@ edition = "2021"
 27_2 = ["v27", "node/27_2"]
 27_1 = ["v27", "node/27_1"]
 27_0 = ["v27", "node/27_0"]
-26_2 = ["v26", "node/26_2"]
-26_1 = ["v26", "node/26_1"]
-26_0 = ["v26", "node/26_0"]
 # Only the latest minor version for older versions.
+26_2 = ["v26", "node/26_2"]
 25_2 = ["v25", "node/25_2"]
 24_2 = ["v24", "node/24_2"]
 23_2 = ["v23", "node/23_2"]

integration_test/tests/blockchain.rs

@@ -36,7 +36,6 @@ fn blockchain__get_block__modelled() {
     // assert!(json.into_model().is_ok());
 }
 
-#[cfg(not(feature = "v29"))]
 #[test]
 fn blockchain__get_blockchain_info__modelled() {
     let node = Node::with_wallet(Wallet::None, &[]);
@@ -154,7 +153,7 @@ fn blockchain__get_chain_tx_stats__modelled() {
 fn blockchain__get_descriptor_activity__modelled() {
     let node = Node::with_wallet(Wallet::None, &["-coinstatsindex=1", "-txindex=1"]);
 
-    let json: GetDescriptorActivity = node.client.get_descriptor_activity(&[], &[], false).expect("getdescriptoractivity");
+    let json: GetDescriptorActivity = node.client.get_descriptor_activity().expect("getdescriptoractivity");
     let model: Result<mtype::GetDescriptorActivity, GetDescriptorActivityError> = json.into_model();
     model.unwrap();
 }

integration_test/tests/mining.rs

@@ -18,7 +18,6 @@ fn mining__get_block_template__modelled() {
     node1.mine_a_block();
     node2.mine_a_block();
     node3.mine_a_block();
-    std::thread::sleep(std::time::Duration::from_millis(500));
 
     let options = match () {
         #[cfg(not(feature = "v29"))]
@@ -38,8 +37,18 @@ fn mining__get_block_template__modelled() {
 
 #[test]
 fn mining__get_mining_info() {
-    let node = Node::with_wallet(Wallet::Default, &[]);
-    let _: GetMiningInfo = node.client.get_mining_info().expect("rpc");
+    #[cfg(not(feature = "v29"))]
+    {
+        let node = Node::with_wallet(Wallet::Default, &[]);
+        let _: GetMiningInfo = node.client.get_mining_info().expect("rpc");
+    }
+
+    #[cfg(feature = "v29")]
+    {
+        let node = Node::with_wallet(Wallet::Default, &[]);
+        let json: GetMiningInfo = node.client.get_mining_info().expect("rpc");
+        let _: Result<mtype::GetMiningInfo, GetMiningInfoError> = json.into_model();
+    }
 }
 
 #[test]

integration_test/tests/network.rs

@@ -37,10 +37,11 @@ fn network__get_network_info__modelled() {
 fn network__get_node_addresses() {
     let node = Node::with_wallet(Wallet::None, &[]);
     let json: GetNodeAddresses = node.client.get_node_addresses().expect("getnodeaddresses");
-    assert!(json.0.len() <= 2500);
-    if let Some(addr) = json.0.first() {
+    let res: Result<mtype::GetNodeAddresses, _> = json.into_model();
+    let model = res.expect("GetNodeAddresses into model");
+    assert!(model.0.len() <= 2500);
+    if let Some(addr) = model.0.first() {
         assert!(addr.port > 0);
-        assert!(!addr.address.is_empty());
         assert!(addr.time > 1231006505);
     }
 }

node/Cargo.toml

@@ -51,11 +51,9 @@ download = ["anyhow", "bitcoin_hashes", "flate2", "tar", "minreq", "zip"]
 27_2 = ["27_1"]
 27_1 = ["27_0"]
 27_0 = ["26_2"]
-26_2 = ["26_1"]
-26_1 = ["26_0"]
-26_0 = ["25_2"]
 
 # We only support the latest minor version for older versions.
+26_2 = ["25_2"]
 25_2 = ["24_2"]
 24_2 = ["23_2"]
 23_2 = ["22_1"]

node/contrib/extra_tests.sh

@@ -14,7 +14,7 @@
 
 set -euox pipefail
 
-FEATURES=("29_0" "28_1" "28_0" "27_1" "27_0" "26_2" "26_1" "26_0" "25_2" "24_2"  \
+FEATURES=("29_0" "28_1" "28_0" "27_1" "27_0" "26_2" "25_2" "24_2"  \
           "23_2" "22_1" "0_21_2" "0_20_2" "0_19_1" "0_18_1" "0_17_2")
 
 # Use the current `Cargo.lock` file without updating it.

node/src/client_versions.rs

@@ -27,13 +27,7 @@ pub use corepc_client::{client_sync::v27::*, types::v27 as vtype};
 #[cfg(all(feature = "26_2", not(feature = "27_0")))]
 pub use corepc_client::{client_sync::v26::*, types::v26 as vtype};
 
-#[cfg(all(feature = "26_1", not(feature = "26_2")))]
-pub use corepc_client::{client_sync::v26::*, types::v26 as vtype};
-
-#[cfg(all(feature = "26_0", not(feature = "26_1")))]
-pub use corepc_client::{client_sync::v26::*, types::v26 as vtype};
-
-#[cfg(all(feature = "25_2", not(feature = "26_0")))]
+#[cfg(all(feature = "25_2", not(feature = "26_2")))]
 pub use corepc_client::{client_sync::v25::*, types::v25 as vtype};
 
 #[cfg(all(feature = "24_2", not(feature = "25_2")))]
@@ -70,8 +64,6 @@ pub use corepc_client::{client_sync::v17::*, types::v17 as vtype};
     not(feature = "27_1"),
     not(feature = "27_0"),
     not(feature = "26_2"),
-    not(feature = "26_1"),
-    not(feature = "26_0"),
     not(feature = "25_2"),
     not(feature = "24_2"),
     not(feature = "23_2"),