refactor: using new BitcoinAddress::from_string supporting regtest hrp, #6250

Author: fdefelici

stacks-node/src/burnchains/rpc/bitcoin_rpc_client/mod.rs

@@ -180,13 +180,6 @@ where
     D: Deserializer<'de>,
 {
     let addr_str: String = Deserialize::deserialize(deserializer)?;
-    if addr_str.starts_with("bcrt") {
-        //Currently BitcoinAddress doesn't manage Regtest HRP
-        return Err(serde::de::Error::custom(
-            "BitcoinAddress cannot manage Regtest HRP ('bcrt')",
-        ));
-    }
-
     if let Some(addr) = BitcoinAddress::from_string(&addr_str) {
         Ok(addr)
     } else {

stacks-node/src/burnchains/rpc/bitcoin_rpc_client/test_utils.rs

@@ -123,13 +123,6 @@ impl<'de> Deserialize<'de> for GetNewAddressResponse {
         D: Deserializer<'de>,
     {
         let addr_str: String = Deserialize::deserialize(deserializer)?;
-        if addr_str.starts_with("bcrt") {
-            //Currently BitcoinAddress doesn't manage Regtest HRP
-            return Err(serde::de::Error::custom(
-                "BitcoinAddress cannot manage Regtest HRP ('bcrt')",
-            ));
-        }
-
         if let Some(addr) = BitcoinAddress::from_string(&addr_str) {
             Ok(GetNewAddressResponse(addr))
         } else {

stacks-node/src/tests/bitcoin_rpc_integrations.rs

@@ -259,16 +259,16 @@ fn test_get_new_address_for_each_address_type() {
     let client = BitcoinRpcClient::from_stx_config(&config).expect("Client creation ok!");
     client.create_wallet("my_wallet", Some(false)).expect("OK");
 
-    //Check Legacy type OK
-    let legacy = client
+    // Check Legacy p2pkh type OK
+    let p2pkh = client
         .get_new_address(None, Some(AddressType::Legacy))
-        .expect("legacy address ok!");
+        .expect("p2pkh address ok!");
     assert_eq!(
         LegacyBitcoinAddressType::PublicKeyHash,
-        legacy.expect_legacy().addrtype
+        p2pkh.expect_legacy().addrtype
     );
 
-    //Check Legacy p2sh type OK
+    // Check Legacy p2sh type OK
     let p2sh = client
         .get_new_address(None, Some(AddressType::P2shSegwit))
         .expect("p2sh address ok!");
@@ -277,20 +277,23 @@ fn test_get_new_address_for_each_address_type() {
         p2sh.expect_legacy().addrtype
     );
 
-    //Bech32 currently failing due to BitcoinAddress not supporting Regtest HRP
-    client
+    // Check Bech32 p2wpkh OK
+    let p2wpkh = client
         .get_new_address(None, Some(AddressType::Bech32))
-        .expect_err("bech32 should fail!");
+        .expect("p2wpkh address ok!");
+    assert!(p2wpkh.expect_segwit().is_p2wpkh());
 
-    //Bech32m currently failing due to BitcoinAddress not supporting Regtest HRP
-    client
+    // Check Bech32m p2tr OK
+    let p2tr = client
         .get_new_address(None, Some(AddressType::Bech32m))
-        .expect_err("bech32m should fail!");
+        .expect("p2tr address ok!");
+    assert!(p2tr.expect_segwit().is_p2tr());
 
-    //None defaults to bech32 so fails as well
-    client
+    // Check default to be bech32 p2wpkh
+    let default = client
         .get_new_address(None, None)
-        .expect_err("default (bech32) should fail!");
+        .expect("default address ok!");
+    assert!(default.expect_segwit().is_p2wpkh());
 }
 
 #[ignore]