diff --git a/src/base58.cpp b/src/base58.cpp index 913ffe3a3..4d54f203c 100755 --- a/src/base58.cpp +++ b/src/base58.cpp @@ -317,7 +317,8 @@ CKey CBitcoinSecret::GetKey() bool CBitcoinSecret::IsValid() const { bool fExpectedFormat = vchData.size() == 32 || (vchData.size() == 33 && vchData[32] == 1); - bool fCorrectVersion = vchVersion == Params().Base58Prefix(CChainParams::SECRET_KEY); + bool fCorrectVersion = vchVersion == Params().Base58Prefix(CChainParams::SECRET_KEY) || + vchVersion == Params().Base58Prefix(CChainParams::SECRET_KEY2); return fExpectedFormat && fCorrectVersion; } diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 82ad77981..1320e5f6c 100755 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -154,7 +154,8 @@ public: base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,35); //F base58Prefixes[SCRIPT_ADDRESS] = std::vector(1,8); //4 base58Prefixes[SCRIPT_ADDRESS2] = std::vector(1,94); //e or f - base58Prefixes[SECRET_KEY] = std::vector(1,163); //2 + base58Prefixes[SECRET_KEY] = std::vector(1,163); //R + base58Prefixes[SECRET_KEY2] = std::vector(1,176); //T base58Prefixes[EXT_PUBLIC_KEY] = {0x01, 0x34, 0x40, 0x6b}; //Fpub, Fprv for mainnet base58Prefixes[EXT_SECRET_KEY] = {0x01, 0x34, 0x3c, 0x31}; @@ -288,6 +289,7 @@ public: base58Prefixes[SCRIPT_ADDRESS] = std::vector(1,198); base58Prefixes[SCRIPT_ADDRESS2] = std::vector(1,58); base58Prefixes[SECRET_KEY] = std::vector(1,239); + base58Prefixes[SECRET_KEY2] = std::vector(1,239); base58Prefixes[EXT_PUBLIC_KEY] = {0x01, 0x34, 0x40, 0xe2}; //Fput, Fprt for testnet base58Prefixes[EXT_SECRET_KEY] = {0x01, 0x34, 0x3c, 0x23}; @@ -397,6 +399,7 @@ public: base58Prefixes[SCRIPT_ADDRESS] = std::vector(1,198); base58Prefixes[SCRIPT_ADDRESS2] = std::vector(1,58); base58Prefixes[SECRET_KEY] = std::vector(1,239); + base58Prefixes[SECRET_KEY2] = std::vector(1,239); base58Prefixes[EXT_PUBLIC_KEY] = {0x04, 0x35, 0x87, 0xCF}; base58Prefixes[EXT_SECRET_KEY] = {0x04, 0x35, 0x83, 0x94}; diff --git a/src/chainparams.h b/src/chainparams.h index 23466b389..a7b1c62a1 100755 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -53,6 +53,7 @@ public: SCRIPT_ADDRESS, SCRIPT_ADDRESS2, SECRET_KEY, + SECRET_KEY2, EXT_PUBLIC_KEY, EXT_SECRET_KEY,