GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Alias "blech32" to "bech32" for address creation

Browse source 
This is technically not 100% correct since if blinded addresses are
turned off, it will create a normal address for "blech32".
But it's the simplest thing to do.
This commit is contained in:
Steven Roose 2019-05-30 16:51:25 +01:00
parent e1bf4418c9
commit 825a0da92d
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/outputtype.cpp
View file

@ -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;
}

6
test/functional/feature_confidential_transactions.py
View file

@ -104,6 +104,12 @@ class CTTest (BitcoinTestFramework):
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"]