RanchiMall/FLO-wallet-core
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for importing legacy WIF format

Browse Source
This commit is contained in:
Jeremiah Buddenhagen 2018-03-20 02:35:27 -07:00
parent 202e161ad4
commit cb1bdc5910
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/base58.cpp
View File

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

5
src/chainparams.cpp
View File

@ -154,7 +154,8 @@ public:
base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,35); //F
base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,8); //4
base58Prefixes[SCRIPT_ADDRESS2] = std::vector<unsigned char>(1,94); //e or f
base58Prefixes[SECRET_KEY] = std::vector<unsigned char>(1,163); //2
base58Prefixes[SECRET_KEY] = std::vector<unsigned char>(1,163); //R
base58Prefixes[SECRET_KEY2] = std::vector<unsigned char>(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<unsigned char>(1,198);
base58Prefixes[SCRIPT_ADDRESS2] = std::vector<unsigned char>(1,58);
base58Prefixes[SECRET_KEY] = std::vector<unsigned char>(1,239);
base58Prefixes[SECRET_KEY2] = std::vector<unsigned char>(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<unsigned char>(1,198);
base58Prefixes[SCRIPT_ADDRESS2] = std::vector<unsigned char>(1,58);
base58Prefixes[SECRET_KEY] = std::vector<unsigned char>(1,239);
base58Prefixes[SECRET_KEY2] = std::vector<unsigned char>(1,239);
base58Prefixes[EXT_PUBLIC_KEY] = {0x04, 0x35, 0x87, 0xCF};
base58Prefixes[EXT_SECRET_KEY] = {0x04, 0x35, 0x83, 0x94};

1
src/chainparams.h
View File

@ -53,6 +53,7 @@ public:
SCRIPT_ADDRESS,
SCRIPT_ADDRESS2,
SECRET_KEY,
SECRET_KEY2,
EXT_PUBLIC_KEY,
EXT_SECRET_KEY,