Merge d8247a4 into merged_master (Elements PR #640)

ElementsProject · Nov 6, 2020 · 55de6ee · 55de6ee
2 parents bbc5997 + d8247a4
commit 55de6ee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/outputtype.cpp b/src/outputtype.cpp
@@ -16,6 +16,7 @@
 static const std::string OUTPUT_TYPE_STRING_LEGACY = "legacy";
 static const std::string OUTPUT_TYPE_STRING_P2SH_SEGWIT = "p2sh-segwit";
 static const std::string OUTPUT_TYPE_STRING_BECH32 = "bech32";
+static const std::string OUTPUT_TYPE_STRING_BLECH32 = "blech32";
 
 bool ParseOutputType(const std::string& type, OutputType& output_type)
 {
@@ -25,7 +26,7 @@ bool ParseOutputType(const std::string& type, OutputType& output_type)
     } else if (type == OUTPUT_TYPE_STRING_P2SH_SEGWIT) {
         output_type = OutputType::P2SH_SEGWIT;
         return true;
-    } else if (type == OUTPUT_TYPE_STRING_BECH32) {
+    } else if (type == OUTPUT_TYPE_STRING_BECH32 || type == OUTPUT_TYPE_STRING_BLECH32) {
         output_type = OutputType::BECH32;
         return true;
     }

diff --git a/test/functional/feature_confidential_transactions.py b/test/functional/feature_confidential_transactions.py
@@ -103,6 +103,12 @@ def run_test(self):
         print("Testing wallet secret recovery")
         self.test_wallet_recovery()
 
+        # Test that "blech32" gives a blinded segwit address.
+        blech32_addr = self.nodes[0].getnewaddress("", "blech32")
+        blech32_addr_info = self.nodes[0].getaddressinfo(blech32_addr)
+        assert_equal(blech32_addr_info["iswitness"], True)
+        assert_equal(blech32_addr_info["confidential"], blech32_addr)
+
         print("General Confidential tests")
         # Running balances
         node0 = self.nodes[0].getbalance()["bitcoin"]