This PR contains some of the changes left as TODO in #11167 (and built on top of that PR). They are not intended for backporting.
This removes the CBase58, CBitcoinSecret, CBitcoinExtKey, and CBitcoinExtPubKey classes, in favor of simple Encode/Decode functions. Furthermore, all Bitcoin-specific logic (addresses, WIF, BIP32) is moved to key_io.{h,cpp}, leaving base58.{h,cpp} as a pure utility that implements the base58 encoding/decoding logic.
104-
105- CBitcoinExtKey b58keyDecodeCheck(derive.prv);
106- CExtKey checkKey = b58keyDecodeCheck.GetKey();
107- assert(checkKey == key); //ensure a base58 decoded key also matches
108+ BOOST_CHECK(EncodeExtKey(key) == derive.prv);
109+ BOOST_CHECK(DecodeExtKey(derive.prv) == key); //ensure a base58 decoded key also matches
//. Same below.
328+ std::equal(privkey_prefix.begin(), privkey_prefix.end(), data.begin())) {
329+ bool compressed = data.size() == 33 + privkey_prefix.size();
330+ key.Set(data.begin() + privkey_prefix.size(), data.begin() + privkey_prefix.size() + 32, compressed);
331+ }
332+ }
333+ memory_cleanse(data.data(), data.size());
DecodeBase58Checkshould cleanse databefore returning false.
Extra: In that case this function could be:
0 CKey key;
1 std::vector<unsigned char> data;
2 if (!DecodeBase58Check(str, data)) return key;
3
4 const auto& prefix = Params().Base58Prefix(CChainParams::SECRET_KEY);
5 int size = data.size() - prefix.size();
6 if (size == 32 || (size == 33 && data.back() == 1)) {
7 if (std::equal(prefix.begin(), prefix.end(), data.begin())) {
8 ...
9 }
10 }
11
12 memory_cleanse(data.data(), data.size());
13 return key;
memory_cleanse.
Split key_io (address/key encodings) off from base58 move tests {Decode,Encode}Destination tests from base58_tests.cpp to key_io_tests.cpp?
39- BOOST_CHECK( bsecret2C.SetString(strSecret2C));
40- BOOST_CHECK(!baddress1.SetString(strAddressBad));
41-
42- CKey key1 = bsecret1.GetKey();
43+ CKey key1 = DecodeSecret(strSecret1);
44 BOOST_CHECK(key1.IsCompressed() == false);
key1.IsValid()?
49+ CKey key1C = DecodeSecret(strSecret1C);
50 BOOST_CHECK(key1C.IsCompressed() == true);
51- CKey key2C = bsecret2C.GetKey();
52+ CKey key2C = DecodeSecret(strSecret2C);
53 BOOST_CHECK(key2C.IsCompressed() == true);
54+ CKey bad_address = DecodeSecret(strAddressBad);
bad_key
305+}
306+
307+std::string EncodeExtPubKey(const CExtPubKey& key)
308+{
309+ std::vector<unsigned char> data = Params().Base58Prefix(CChainParams::EXT_PUBLIC_KEY);
310+ size_t size = data.size();