diff --git a/README.md b/README.md index 3910108..1077e5d 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -PhilosopherStone (PHS) PoS - Proof of Stake +PhilosopherStone (PHS) PoS - Proof of Stake Only -PhilosopherStone provides an annual stake rate of 50%, or 3.44% monthly, in return for contributing to the network. +PhilosopherStone provides an annual stake rate of 50% (64% Compounded), or 3.44% monthly, for contributing to the network. -Stones will generate if held and not moved for 10-15 days. +Stones will generate if held and not moved for more than ~8.8 Days. - Data Port: 16281 (17281 Testnet) - RPC Port: 16282 (17282 Testnet) @@ -10,12 +10,10 @@ Stones will generate if held and not moved for 10-15 days. - 6/50 confirmations for transactions/new mint - Messaging - Proof of Stake only Switch after 10 month initial distribution (complete) - - Always 50% stake, regardless of difficulty -HomePage http://phstones.com -Forum http://bitcointalk.org/index.php?topic=292720.0 +HomePage: http://phstones.com -Forum 2 http://cryptocointalk.com/forum/318-philosopherstone-phs/ +News: https://www.tsu.co/philosopherstone -Explorer http://stakecoins.info +Explorer: http://explorer.phstones.com/ diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index b7d2701..adbe2a5 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -30,9 +30,8 @@ namespace Checkpoints (196102, uint256("0x000000000b08ca4baf57a7c8b357cce54a0100dcab9346144cbe7379d02ee460")) (213532, uint256("0x79729b7386869072c0527fd1d8b7e20f925f2122590e0ca3a27240c59bd574e1")) //after retarget hardfork (224125, uint256("0xd2233f5fb88c2e340d4bcf9fafa19865723039a5fccfed6a10112ca3b74b3fa6")) //after pow hardfork - (252789, uint256("0x16c2b8847f3fb87473ede45f8bc4b0e8e7ad33e3a2350b36d531127ab53cf7f8")) (292477, uint256("0xa4acb90c0539f5e50261d4180c1f4adaa40c85d3420f0c2feab2314661fa1d61")) - (306500, uint256("0x7cfb32221f7a980b9aaea8f9a49ff3d6e92b4b608060a54497e0ebe3b022419a")) + (316344, uint256("0x4486e82497838ae9eff7ed0c138fec6aca47235f90e138fa7fef7ccd48cbd46a")) ; static MapCheckpoints mapCheckpointsTestnet = diff --git a/src/clientversion.h b/src/clientversion.h index 8f640f4..b6c609e 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -13,7 +13,7 @@ #define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MINOR 6 #define CLIENT_VERSION_REVISION 6 -#define CLIENT_VERSION_BUILD 3 +#define CLIENT_VERSION_BUILD 4 // Converts the parameter X to a string after macro replacement on X has been performed. // Don't merge these into one macro! diff --git a/src/init.cpp b/src/init.cpp index aaefb25..cddef65 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -294,8 +294,8 @@ std::string HelpMessage() " -upgradewallet " + _("Upgrade wallet to latest format") + "\n" + " -keypool= " + _("Set key pool size to (default: 100)") + "\n" + " -rescan " + _("Rescan the block chain for missing wallet transactions") + "\n" + - " -splitthreshold= " + _("Set stake split threshold within range (default 20),(max 100))") + "\n" + - " -combinethreshold= " + _("Set stake combine threshold within range (default 40),(max 100))") + "\n" + + " -splitthreshold= " + _("Set stake split threshold within range (default 50),(max 150))") + "\n" + + " -combinethreshold= " + _("Set stake combine threshold within range (default 50),(max 150))") + "\n" + " -salvagewallet " + _("Attempt to recover private keys from a corrupt wallet.dat") + "\n" + " -checkblocks= " + _("How many blocks to check at startup (default: 2500, 0 = all)") + "\n" + " -checklevel= " + _("How thorough the block verification is (0-6, default: 1)") + "\n" + diff --git a/src/main.cpp b/src/main.cpp index f216321..20e7369 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -80,8 +80,8 @@ int64 nHPSTimerStart; // Settings int64 nTransactionFee = MIN_TX_FEE; int64 nMinimumInputValue = MIN_TX_FEE; -int64 nSplitThreshold = 20 * COIN; -int64 nCombineThreshold = 40 * COIN; +int64 nSplitThreshold = 50 * COIN; +int64 nCombineThreshold = 50 * COIN; extern enum Checkpoints::CPMode CheckpointsMode; ////////////////////////////////////////////////////////////////////////////// @@ -3294,7 +3294,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) // Send the rest of the chain if (pindex) pindex = pindex->pnext; - int nLimit = 500; + int nLimit = 1000; printf("getblocks %d to %s limit %d\n", (pindex ? pindex->nHeight : -1), hashStop.ToString().substr(0,20).c_str(), nLimit); for (; pindex; pindex = pindex->pnext) { diff --git a/src/main.h b/src/main.h index 77f892c..c77c42a 100644 --- a/src/main.h +++ b/src/main.h @@ -40,7 +40,7 @@ static const int64 MAX_MINT_PROOF_OF_WORK_LEGACY = 64 * COIN; static const int64 MAX_MINT_PROOF_OF_STAKE = 0.50 * MAX_MINT_PROOF_OF_WORK; // 50% annual interest static const unsigned int RWD_SWITCH_TIME = 1376006400; // August 9, 2013 00:00:00 GMT /** Split/Combine Threshold Max */ -static const int64 MAX_SPLIT_AMOUNT = 100 * COIN; +static const int64 MAX_SPLIT_AMOUNT = 150 * COIN; static const int64 MAX_COMBINE_AMOUNT = MAX_SPLIT_AMOUNT; static const int64 MIN_TXOUT_AMOUNT = MIN_TX_FEE; diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index a15f665..1c6e6ea 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -7,7 +7,7 @@ 0 0 600 - 509 + 534 @@ -275,8 +275,8 @@ - 250 - 300 + 225 + 250 diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h index 18143b2..ce26823 100644 --- a/src/qt/guiconstants.h +++ b/src/qt/guiconstants.h @@ -2,7 +2,7 @@ #define GUICONSTANTS_H /* Milliseconds between model updates */ -static const int MODEL_UPDATE_DELAY = 3000; +static const int MODEL_UPDATE_DELAY = 1000; /* AskPassphraseDialog -- Maximum passphrase length */ static const int MAX_PASSPHRASE_SIZE = 1024; diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index 6ef46c4..bb13ab0 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -375,9 +375,9 @@ QVariant TransactionTableModel::txAddressDecoration(const TransactionRecord *wtx { QString str = BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), wtx->credit + wtx->debit); float dd = str.toFloat(); - if(dd < 100) + if(dd < 25) return QIcon(":/icons/tx_mined"); - else if(dd < 300) + else if(dd < 100) return QIcon(":/icons/tx_mined2"); else return QIcon(":/icons/tx_mined3"); diff --git a/src/txdb-leveldb.cpp b/src/txdb-leveldb.cpp index b7566fa..66b29ce 100644 --- a/src/txdb-leveldb.cpp +++ b/src/txdb-leveldb.cpp @@ -446,7 +446,7 @@ bool CTxDB::LoadBlockIndex() // Verify blocks in the best chain int nCheckLevel = GetArg("-checklevel", 1); - int nCheckDepth = GetArg( "-checkblocks", 2500); + int nCheckDepth = GetArg( "-checkblocks", 1000); if (nCheckDepth == 0) nCheckDepth = 1000000000; // suffices until the year 19000 if (nCheckDepth > nBestHeight)