maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Convert base58_tests from type/payload to scriptPubKey comparison

Browse source
This commit is contained in:
Pieter Wuille 2017-09-19 15:30:11 -07:00
parent 8fd2267053
commit 6565c5501c
2 changed files with 294 additions and 385 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
src/test/base58_tests.cpp
View file

@ -10,14 +10,15 @@
#include "key.h"
#include "script/script.h"
#include "test/test_bitcoin.h"
#include "uint256.h"
#include "util.h"
#include "utilstrencodings.h"
#include "test/test_bitcoin.h"
#include <univalue.h>
#include <boost/test/unit_test.hpp>
#include <univalue.h>
extern UniValue read_json(const std::string& jsondata);
@ -72,50 +73,6 @@ BOOST_AUTO_TEST_CASE(base58_DecodeBase58)
BOOST_CHECK_EQUAL_COLLECTIONS(result.begin(), result.end(), expected.begin(), expected.end());
}
// Visitor to check address type
class TestAddrTypeVisitor : public boost::static_visitor<bool>
{
private:
std::string exp_addrType;
public:
explicit TestAddrTypeVisitor(const std::string &_exp_addrType) : exp_addrType(_exp_addrType) { }
bool operator()(const CKeyID &id) const
{
return (exp_addrType == "pubkey");
}
bool operator()(const CScriptID &id) const
{
return (exp_addrType == "script");
}
bool operator()(const CNoDestination &no) const
{
return (exp_addrType == "none");
}
};
// Visitor to check address payload
class TestPayloadVisitor : public boost::static_visitor<bool>
{
private:
std::vector<unsigned char> exp_payload;
public:
explicit TestPayloadVisitor(std::vector<unsigned char> &_exp_payload) : exp_payload(_exp_payload) { }
bool operator()(const CKeyID &id) const
{
uint160 exp_key(exp_payload);
return exp_key == id;
}
bool operator()(const CScriptID &id) const
{
uint160 exp_key(exp_payload);
return exp_key == id;
}
bool operator()(const CNoDestination &no) const
{
return exp_payload.size() == 0;
}
};
// Goal: check that parsed keys match test payload
BOOST_AUTO_TEST_CASE(base58_keys_valid_parse)
{
@ -127,8 +84,7 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_parse)
for (unsigned int idx = 0; idx < tests.size(); idx++) {
UniValue test = tests[idx];
std::string strTest = test.write();
if (test.size() < 3) // Allow for extra stuff (useful for comments)
{
if (test.size() < 3) { // Allow for extra stuff (useful for comments)
BOOST_ERROR("Bad test: " << strTest);
continue;
}
@ -136,13 +92,13 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_parse)
std::vector<unsigned char> exp_payload = ParseHex(test[1].get_str());
const UniValue &metadata = test[2].get_obj();
bool isPrivkey = find_value(metadata, "isPrivkey").get_bool();
bool isTestnet = find_value(metadata, "isTestnet").get_bool();
if (isTestnet)
bool isTestnet = find_value(metadata, "chain").get_str() == "testnet";
if (isTestnet) {
SelectParams(CBaseChainParams::TESTNET);
else
} else {
SelectParams(CBaseChainParams::MAIN);
if(isPrivkey)
{
}
if (isPrivkey) {
bool isCompressed = find_value(metadata, "isCompressed").get_bool();
// Must be valid private key
BOOST_CHECK_MESSAGE(secret.SetString(exp_base58string), "!SetString:"+ strTest);
@ -154,15 +110,12 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_parse)
// Private key must be invalid public key
destination = DecodeDestination(exp_base58string);
BOOST_CHECK_MESSAGE(!IsValidDestination(destination), "IsValid privkey as pubkey:" + strTest);
}
else
{
std::string exp_addrType = find_value(metadata, "addrType").get_str(); // "script" or "pubkey"
} else {
// Must be valid public key
destination = DecodeDestination(exp_base58string);
CScript script = GetScriptForDestination(destination);
BOOST_CHECK_MESSAGE(IsValidDestination(destination), "!IsValid:" + strTest);
BOOST_CHECK_MESSAGE((boost::get<CScriptID>(&destination) != nullptr) == (exp_addrType == "script"), "isScript mismatch" + strTest);
BOOST_CHECK_MESSAGE(boost::apply_visitor(TestAddrTypeVisitor(exp_addrType), destination), "addrType mismatch" + strTest);
BOOST_CHECK_EQUAL(HexStr(script), HexStr(exp_payload));
// Public key must be invalid private key
secret.SetString(exp_base58string);
@ -188,13 +141,13 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_gen)
std::vector<unsigned char> exp_payload = ParseHex(test[1].get_str());
const UniValue &metadata = test[2].get_obj();
bool isPrivkey = find_value(metadata, "isPrivkey").get_bool();
bool isTestnet = find_value(metadata, "isTestnet").get_bool();
if (isTestnet)
bool isTestnet = find_value(metadata, "chain").get_str() == "testnet";
if (isTestnet) {
SelectParams(CBaseChainParams::TESTNET);
else
} else {
SelectParams(CBaseChainParams::MAIN);
if(isPrivkey)
{
}
if (isPrivkey) {
bool isCompressed = find_value(metadata, "isCompressed").get_bool();
CKey key;
key.Set(exp_payload.begin(), exp_payload.end(), isCompressed);
@ -202,30 +155,12 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_gen)
CBitcoinSecret secret;
secret.SetKey(key);
BOOST_CHECK_MESSAGE(secret.ToString() == exp_base58string, "result mismatch: " + strTest);
}
else
{
std::string exp_addrType = find_value(metadata, "addrType").get_str();
} else {
CTxDestination dest;
if(exp_addrType == "pubkey")
{
dest = CKeyID(uint160(exp_payload));
}
else if(exp_addrType == "script")
{
dest = CScriptID(uint160(exp_payload));
}
else if(exp_addrType == "none")
{
dest = CNoDestination();
}
else
{
BOOST_ERROR("Bad addrtype: " << strTest);
continue;
}
CScript exp_script(exp_payload.begin(), exp_payload.end());
ExtractDestination(exp_script, dest);
std::string address = EncodeDestination(dest);
BOOST_CHECK_MESSAGE(address == exp_base58string, "mismatch: " + strTest);
BOOST_CHECK_EQUAL(address, exp_base58string);
}
}

178
src/test/data/base58_keys_valid.json
View file

@ -1,38 +1,34 @@
[
[
"1AGNa15ZQXAZUgFiqJ2i7Z2DPU2J6hW62i",
"65a16059864a2fdbc7c99a4723a8395bc6f188eb",
"76a91465a16059864a2fdbc7c99a4723a8395bc6f188eb88ac",
{
"addrType": "pubkey",
"isPrivkey": false,
"isTestnet": false
"chain": "mainnet"
}
],
[
"3CMNFxN1oHBc4R1EpboAL5yzHGgE611Xou",
"74f209f6ea907e2ea48f74fae05782ae8a665257",
"a91474f209f6ea907e2ea48f74fae05782ae8a66525787",
{
"addrType": "script",
"isPrivkey": false,
"isTestnet": false
"chain": "mainnet"
}
],
[
"mo9ncXisMeAoXwqcV5EWuyncbmCcQN4rVs",
"53c0307d6851aa0ce7825ba883c6bd9ad242b486",
"76a91453c0307d6851aa0ce7825ba883c6bd9ad242b48688ac",
{
"addrType": "pubkey",
"isPrivkey": false,
"isTestnet": true
"chain": "testnet"
}
],
[
"2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br",
"6349a418fc4578d10a372b54b45c280cc8c4382f",
"a9146349a418fc4578d10a372b54b45c280cc8c4382f87",
{
"addrType": "script",
"isPrivkey": false,
"isTestnet": true
"chain": "testnet"
}
],
[
@ -41,7 +37,7 @@
{
"isCompressed": false,
"isPrivkey": true,
"isTestnet": false
"chain": "mainnet"
}
],
[
@ -50,7 +46,7 @@
{
"isCompressed": true,
"isPrivkey": true,
"isTestnet": false
"chain": "mainnet"
}
],
[
@ -59,7 +55,7 @@
{
"isCompressed": false,
"isPrivkey": true,
"isTestnet": true
"chain": "testnet"
}
],
[
@ -68,43 +64,39 @@
{
"isCompressed": true,
"isPrivkey": true,
"isTestnet": true
"chain": "testnet"
}
],
[
"1Ax4gZtb7gAit2TivwejZHYtNNLT18PUXJ",
"6d23156cbbdcc82a5a47eee4c2c7c583c18b6bf4",
"76a9146d23156cbbdcc82a5a47eee4c2c7c583c18b6bf488ac",
{
"addrType": "pubkey",
"isPrivkey": false,
"isTestnet": false
"chain": "mainnet"
}
],
[
"3QjYXhTkvuj8qPaXHTTWb5wjXhdsLAAWVy",
"fcc5460dd6e2487c7d75b1963625da0e8f4c5975",
"a914fcc5460dd6e2487c7d75b1963625da0e8f4c597587",
{
"addrType": "script",
"isPrivkey": false,
"isTestnet": false
"chain": "mainnet"
}
],
[
"n3ZddxzLvAY9o7184TB4c6FJasAybsw4HZ",
"f1d470f9b02370fdec2e6b708b08ac431bf7a5f7",
"76a914f1d470f9b02370fdec2e6b708b08ac431bf7a5f788ac",
{
"addrType": "pubkey",
"isPrivkey": false,
"isTestnet": true
"chain": "testnet"
}
],
[
"2NBFNJTktNa7GZusGbDbGKRZTxdK9VVez3n",
"c579342c2c4c9220205e2cdc285617040c924a0a",
"a914c579342c2c4c9220205e2cdc285617040c924a0a87",
{
"addrType": "script",
"isPrivkey": false,
"isTestnet": true
"chain": "testnet"
}
],
[
@ -113,7 +105,7 @@
{
"isCompressed": false,
"isPrivkey": true,
"isTestnet": false
"chain": "mainnet"
}
],
[
@ -122,7 +114,7 @@
{
"isCompressed": true,
"isPrivkey": true,
"isTestnet": false
"chain": "mainnet"
}
],
[
@ -131,7 +123,7 @@
{
"isCompressed": false,
"isPrivkey": true,
"isTestnet": true
"chain": "testnet"
}
],
[
@ -140,43 +132,39 @@
{
"isCompressed": true,
"isPrivkey": true,
"isTestnet": true
"chain": "testnet"
}
],
[
"1C5bSj1iEGUgSTbziymG7Cn18ENQuT36vv",
"7987ccaa53d02c8873487ef919677cd3db7a6912",
"76a9147987ccaa53d02c8873487ef919677cd3db7a691288ac",
{
"addrType": "pubkey",
"isPrivkey": false,
"isTestnet": false
"chain": "mainnet"
}
],
[
"3AnNxabYGoTxYiTEZwFEnerUoeFXK2Zoks",
"63bcc565f9e68ee0189dd5cc67f1b0e5f02f45cb",
"a91463bcc565f9e68ee0189dd5cc67f1b0e5f02f45cb87",
{
"addrType": "script",
"isPrivkey": false,
"isTestnet": false
"chain": "mainnet"
}
],
[
"n3LnJXCqbPjghuVs8ph9CYsAe4Sh4j97wk",
"ef66444b5b17f14e8fae6e7e19b045a78c54fd79",
"76a914ef66444b5b17f14e8fae6e7e19b045a78c54fd7988ac",
{
"addrType": "pubkey",
"isPrivkey": false,
"isTestnet": true
"chain": "testnet"
}
],
[
"2NB72XtkjpnATMggui83aEtPawyyKvnbX2o",
"c3e55fceceaa4391ed2a9677f4a4d34eacd021a0",
"a914c3e55fceceaa4391ed2a9677f4a4d34eacd021a087",
{
"addrType": "script",
"isPrivkey": false,
"isTestnet": true
"chain": "testnet"
}
],
[
@ -185,7 +173,7 @@
{
"isCompressed": false,
"isPrivkey": true,
"isTestnet": false
"chain": "mainnet"
}
],
[
@ -194,7 +182,7 @@
{
"isCompressed": true,
"isPrivkey": true,
"isTestnet": false
"chain": "mainnet"
}
],
[
@ -203,7 +191,7 @@
{
"isCompressed": false,
"isPrivkey": true,
"isTestnet": true
"chain": "testnet"
}
],
[
@ -212,43 +200,39 @@
{
"isCompressed": true,
"isPrivkey": true,
"isTestnet": true
"chain": "testnet"
}
],
[
"1Gqk4Tv79P91Cc1STQtU3s1W6277M2CVWu",
"adc1cc2081a27206fae25792f28bbc55b831549d",
"76a914adc1cc2081a27206fae25792f28bbc55b831549d88ac",
{
"addrType": "pubkey",
"isPrivkey": false,
"isTestnet": false
"chain": "mainnet"
}
],
[
"33vt8ViH5jsr115AGkW6cEmEz9MpvJSwDk",
"188f91a931947eddd7432d6e614387e32b244709",
"a914188f91a931947eddd7432d6e614387e32b24470987",
{
"addrType": "script",
"isPrivkey": false,
"isTestnet": false
"chain": "mainnet"
}
],
[
"mhaMcBxNh5cqXm4aTQ6EcVbKtfL6LGyK2H",
"1694f5bc1a7295b600f40018a618a6ea48eeb498",
"76a9141694f5bc1a7295b600f40018a618a6ea48eeb49888ac",
{
"addrType": "pubkey",
"isPrivkey": false,
"isTestnet": true
"chain": "testnet"
}
],
[
"2MxgPqX1iThW3oZVk9KoFcE5M4JpiETssVN",
"3b9b3fd7a50d4f08d1a5b0f62f644fa7115ae2f3",
"a9143b9b3fd7a50d4f08d1a5b0f62f644fa7115ae2f387",
{
"addrType": "script",
"isPrivkey": false,
"isTestnet": true
"chain": "testnet"
}
],
[
@ -257,7 +241,7 @@
{
"isCompressed": false,
"isPrivkey": true,
"isTestnet": false
"chain": "mainnet"
}
],
[
@ -266,7 +250,7 @@
{
"isCompressed": true,
"isPrivkey": true,
"isTestnet": false
"chain": "mainnet"
}
],
[
@ -275,7 +259,7 @@
{
"isCompressed": false,
"isPrivkey": true,
"isTestnet": true
"chain": "testnet"
}
],
[
@ -284,43 +268,39 @@
{
"isCompressed": true,
"isPrivkey": true,
"isTestnet": true
"chain": "testnet"
}
],
[
"1JwMWBVLtiqtscbaRHai4pqHokhFCbtoB4",
"c4c1b72491ede1eedaca00618407ee0b772cad0d",
"76a914c4c1b72491ede1eedaca00618407ee0b772cad0d88ac",
{
"addrType": "pubkey",
"isPrivkey": false,
"isTestnet": false
"chain": "mainnet"
}
],
[
"3QCzvfL4ZRvmJFiWWBVwxfdaNBT8EtxB5y",
"f6fe69bcb548a829cce4c57bf6fff8af3a5981f9",
"a914f6fe69bcb548a829cce4c57bf6fff8af3a5981f987",
{
"addrType": "script",
"isPrivkey": false,
"isTestnet": false
"chain": "mainnet"
}
],
[
"mizXiucXRCsEriQCHUkCqef9ph9qtPbZZ6",
"261f83568a098a8638844bd7aeca039d5f2352c0",
"76a914261f83568a098a8638844bd7aeca039d5f2352c088ac",
{
"addrType": "pubkey",
"isPrivkey": false,
"isTestnet": true
"chain": "testnet"
}
],
[
"2NEWDzHWwY5ZZp8CQWbB7ouNMLqCia6YRda",
"e930e1834a4d234702773951d627cce82fbb5d2e",
"a914e930e1834a4d234702773951d627cce82fbb5d2e87",
{
"addrType": "script",
"isPrivkey": false,
"isTestnet": true
"chain": "testnet"
}
],
[
@ -329,7 +309,7 @@
{
"isCompressed": false,
"isPrivkey": true,
"isTestnet": false
"chain": "mainnet"
}
],
[
@ -338,7 +318,7 @@
{
"isCompressed": true,
"isPrivkey": true,
"isTestnet": false
"chain": "mainnet"
}
],
[
@ -347,7 +327,7 @@
{
"isCompressed": false,
"isPrivkey": true,
"isTestnet": true
"chain": "testnet"
}
],
[
@ -356,43 +336,39 @@
{
"isCompressed": true,
"isPrivkey": true,
"isTestnet": true
"chain": "testnet"
}
],
[
"19dcawoKcZdQz365WpXWMhX6QCUpR9SY4r",
"5eadaf9bb7121f0f192561a5a62f5e5f54210292",
"76a9145eadaf9bb7121f0f192561a5a62f5e5f5421029288ac",
{
"addrType": "pubkey",
"isPrivkey": false,
"isTestnet": false
"chain": "mainnet"
}
],
[
"37Sp6Rv3y4kVd1nQ1JV5pfqXccHNyZm1x3",
"3f210e7277c899c3a155cc1c90f4106cbddeec6e",
"a9143f210e7277c899c3a155cc1c90f4106cbddeec6e87",
{
"addrType": "script",
"isPrivkey": false,
"isTestnet": false
"chain": "mainnet"
}
],
[
"myoqcgYiehufrsnnkqdqbp69dddVDMopJu",
"c8a3c2a09a298592c3e180f02487cd91ba3400b5",
"76a914c8a3c2a09a298592c3e180f02487cd91ba3400b588ac",
{
"addrType": "pubkey",
"isPrivkey": false,
"isTestnet": true
"chain": "testnet"
}
],
[
"2N7FuwuUuoTBrDFdrAZ9KxBmtqMLxce9i1C",
"99b31df7c9068d1481b596578ddbb4d3bd90baeb",
"a91499b31df7c9068d1481b596578ddbb4d3bd90baeb87",
{
"addrType": "script",
"isPrivkey": false,
"isTestnet": true
"chain": "testnet"
}
],
[
@ -401,7 +377,7 @@
{
"isCompressed": false,
"isPrivkey": true,
"isTestnet": false
"chain": "mainnet"
}
],
[
@ -410,7 +386,7 @@
{
"isCompressed": true,
"isPrivkey": true,
"isTestnet": false
"chain": "mainnet"
}
],
[
@ -419,7 +395,7 @@
{
"isCompressed": false,
"isPrivkey": true,
"isTestnet": true
"chain": "testnet"
}
],
[
@ -428,25 +404,23 @@
{
"isCompressed": true,
"isPrivkey": true,
"isTestnet": true
"chain": "testnet"
}
],
[
"13p1ijLwsnrcuyqcTvJXkq2ASdXqcnEBLE",
"1ed467017f043e91ed4c44b4e8dd674db211c4e6",
"76a9141ed467017f043e91ed4c44b4e8dd674db211c4e688ac",
{
"addrType": "pubkey",
"isPrivkey": false,
"isTestnet": false
"chain": "mainnet"
}
],
[
"3ALJH9Y951VCGcVZYAdpA3KchoP9McEj1G",
"5ece0cadddc415b1980f001785947120acdb36fc",
"a9145ece0cadddc415b1980f001785947120acdb36fc87",
{
"addrType": "script",
"isPrivkey": false,
"isTestnet": false
"chain": "mainnet"
}
]
]