Browse Source

Fixed testnet address prefix.

Moved to testnet5.
cn
Jianping Wu 6 years ago
parent
commit
f5935c6a39
  1. 6
      src/chainparams.cpp
  2. 2
      src/chainparamsbase.cpp
  3. 20
      src/qt/guiutil.cpp
  4. 12
      src/test/data/base58_keys_valid.json

6
src/chainparams.cpp

@ -214,10 +214,10 @@ public: @@ -214,10 +214,10 @@ public:
vSeeds.emplace_back("testnet-seed.kevacoin.org");
vSeeds.emplace_back("testnet-seed.honourchat.com");
base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,45); // K
base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,55); // P
base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,5);
base58Prefixes[SCRIPT_ADDRESS2] = std::vector<unsigned char>(1,70); // V
base58Prefixes[SECRET_KEY] = std::vector<unsigned char>(1,139); // M
base58Prefixes[SCRIPT_ADDRESS2] = std::vector<unsigned char>(1,65); // T
base58Prefixes[SECRET_KEY] = std::vector<unsigned char>(1,58); // 9
base58Prefixes[EXT_PUBLIC_KEY] = {0x04, 0x88, 0xB2, 0x1E};
base58Prefixes[EXT_SECRET_KEY] = {0x04, 0x88, 0xAD, 0xE4};
base58Prefixes[KEVA_NAMESPACE] = std::vector<unsigned char>(1,53); // N

2
src/chainparamsbase.cpp

@ -46,7 +46,7 @@ public: @@ -46,7 +46,7 @@ public:
CBaseTestNetParams()
{
nRPCPort = 19332;
strDataDir = "testnet4";
strDataDir = "testnet5";
}
};

20
src/qt/guiutil.cpp

@ -421,12 +421,12 @@ bool openBitcoinConf() @@ -421,12 +421,12 @@ bool openBitcoinConf()
/* Create the file */
boost::filesystem::ofstream configFile(pathConfig, std::ios_base::app);
if (!configFile.good())
return false;
configFile.close();
/* Open bitcoin.conf with the associated application */
return QDesktopServices::openUrl(QUrl::fromLocalFile(boostPathToQString(pathConfig)));
}
@ -616,7 +616,7 @@ fs::path static StartupShortcutPath() @@ -616,7 +616,7 @@ fs::path static StartupShortcutPath()
std::string chain = ChainNameFromCommandLine();
if (chain == CBaseChainParams::MAIN)
return GetSpecialFolderPath(CSIDL_STARTUP) / "Kevacoin.lnk";
if (chain == CBaseChainParams::TESTNET) // Remove this special case when CBaseChainParams::TESTNET = "testnet4"
if (chain == CBaseChainParams::TESTNET) // Remove this special case when CBaseChainParams::TESTNET = "testnet5"
return GetSpecialFolderPath(CSIDL_STARTUP) / "Kevacoin (testnet).lnk";
return GetSpecialFolderPath(CSIDL_STARTUP) / strprintf("Kevacoin (%s).lnk", chain);
}
@ -785,7 +785,7 @@ LSSharedFileListItemRef findStartupItemInList(LSSharedFileListRef list, CFURLRef @@ -785,7 +785,7 @@ LSSharedFileListItemRef findStartupItemInList(LSSharedFileListRef list, CFURLRef
if (listSnapshot == nullptr) {
return nullptr;
}
// loop through the list of startup items and try to find the bitcoin app
for(int i = 0; i < CFArrayGetCount(listSnapshot); i++) {
LSSharedFileListItemRef item = (LSSharedFileListItemRef)CFArrayGetValueAtIndex(listSnapshot, i);
@ -813,7 +813,7 @@ LSSharedFileListItemRef findStartupItemInList(LSSharedFileListRef list, CFURLRef @@ -813,7 +813,7 @@ LSSharedFileListItemRef findStartupItemInList(LSSharedFileListRef list, CFURLRef
CFRelease(currentItemURL);
}
}
CFRelease(listSnapshot);
return nullptr;
}
@ -824,7 +824,7 @@ bool GetStartOnSystemStartup() @@ -824,7 +824,7 @@ bool GetStartOnSystemStartup()
if (bitcoinAppUrl == nullptr) {
return false;
}
LSSharedFileListRef loginItems = LSSharedFileListCreate(nullptr, kLSSharedFileListSessionLoginItems, nullptr);
LSSharedFileListItemRef foundItem = findStartupItemInList(loginItems, bitcoinAppUrl);
@ -838,7 +838,7 @@ bool SetStartOnSystemStartup(bool fAutoStart) @@ -838,7 +838,7 @@ bool SetStartOnSystemStartup(bool fAutoStart)
if (bitcoinAppUrl == nullptr) {
return false;
}
LSSharedFileListRef loginItems = LSSharedFileListCreate(nullptr, kLSSharedFileListSessionLoginItems, nullptr);
LSSharedFileListItemRef foundItem = findStartupItemInList(loginItems, bitcoinAppUrl);
@ -850,7 +850,7 @@ bool SetStartOnSystemStartup(bool fAutoStart) @@ -850,7 +850,7 @@ bool SetStartOnSystemStartup(bool fAutoStart)
// remove item
LSSharedFileListItemRemove(loginItems, foundItem);
}
CFRelease(bitcoinAppUrl);
return true;
}
@ -1011,7 +1011,7 @@ void ClickableLabel::mouseReleaseEvent(QMouseEvent *event) @@ -1011,7 +1011,7 @@ void ClickableLabel::mouseReleaseEvent(QMouseEvent *event)
{
Q_EMIT clicked(event->pos());
}
void ClickableProgressBar::mouseReleaseEvent(QMouseEvent *event)
{
Q_EMIT clicked(event->pos());

12
src/test/data/base58_keys_valid.json

@ -17,8 +17,16 @@ @@ -17,8 +17,16 @@
}
],
[
"MabRDMfcZ7GGgg8odQmfUavAwZJvFec24oTjHv5VjhqQ39gACb9D",
"1db843e5b6ff52c0cd10f845bea1acfc7521ce17d03abdd66a419ff3605c7997",
"TPjFpBXnHtWQor2GtDdEaDJPaG3krHEBQk",
"a91496ee490592fe4802908ebedc0766f6759fab2fc587",
{
"isPrivkey": false,
"chain": "test"
}
],
[
"9hiKJzEfitCmaMKQTo3HA1K4388xC1UanyQuDUVd9F1oLjSCH4gL",
"d34d5fa151df1abd508daa35b1f20db705ef11a4e304c0bde8db4eb2806e3932",
{
"isCompressed": true,
"isPrivkey": true,

Loading…
Cancel
Save