Skip to content

Commit

Permalink
First
Browse files Browse the repository at this point in the history
  • Loading branch information
Yi committed Nov 14, 2017
1 parent 7b8e69c commit 630191b
Show file tree
Hide file tree
Showing 21 changed files with 13 additions and 17 deletions.
10 changes: 5 additions & 5 deletions src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ class CMainParams : public CChainParams {

hashGenesisBlock = genesis.GetHash();
// printf("genesis.GetHash = %s\n", genesis.GetHash().ToString().c_str());
// printf("merkle = %s\n", genesis.hashMerkleRoot.ToString().c_str());
assert(hashGenesisBlock == uint256("0x6e63025da5bd0721303f35e62ec8452a3e684cfd99598ecea14ca198e97dc2c8"));
assert(genesis.hashMerkleRoot == uint256("0x1263371e91334a3ac4729b1f2580d779f671c3650c5782264260c03aa86dfce1"));
// printf("merkle = %s\n", genesis.hashMerkleRoot.ToString().c_str());
assert(hashGenesisBlock == uint256("0x998d052eb1faff10066d1457e55a5982f952d1f084b9dcf538abc1765ecbcc09"));
assert(genesis.hashMerkleRoot == uint256("0x94b6b8b6f2990f394b846488fdaf9ce3d2780035bdfe208be383ed83904cffe7"));

vSeeds.push_back(CDNSSeedData("n0", "176.121.246.225"));

Expand All @@ -100,7 +100,7 @@ class CMainParams : public CChainParams {

convertSeed6(vFixedSeeds, pnSeed6_main, ARRAYLEN(pnSeed6_main));

nLastPOWBlock = 100;
nLastPOWBlock = 150000;
}

virtual const CBlock& GenesisBlock() const { return genesis; }
Expand Down Expand Up @@ -141,7 +141,7 @@ class CTestNetParams : public CMainParams {
genesis.nTime = 1509962987;
genesis.nNonce = 2216093;

assert(hashGenesisBlock == uint256("0x6e63025da5bd0721303f35e62ec8452a3e684cfd99598ecea14ca198e97dc2c8"));
assert(hashGenesisBlock == uint256("0x998d052eb1faff10066d1457e55a5982f952d1f084b9dcf538abc1765ecbcc09"));

vFixedSeeds.clear();
vSeeds.clear();
Expand Down
4 changes: 2 additions & 2 deletions src/checkpoints.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ namespace Checkpoints
//
static MapCheckpoints mapCheckpoints =
boost::assign::map_list_of
( 0, uint256("0x6e63025da5bd0721303f35e62ec8452a3e684cfd99598ecea14ca198e97dc2c8") )
( 500, uint256("0x000000343726fa708017fbc1de7d149f0b377e843a3659c4e0237ae9fc7f75be") )
( 0, uint256("0x998d052eb1faff10066d1457e55a5982f952d1f084b9dcf538abc1765ecbcc09") )
( 8490, uint256("0x0000000dbc867008f70e938ad9d2c04f9a85c6a50d3205dd776e92e46d05be33") )
//( 000, uint256("0x") )
//( 0000, uint256("0x") )
//( 000, uint256("0x") )
Expand Down
4 changes: 2 additions & 2 deletions src/clientversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MINOR 1
#define CLIENT_VERSION_MINOR 2
#define CLIENT_VERSION_REVISION 1
#define CLIENT_VERSION_BUILD 1
#define CLIENT_VERSION_BUILD 7

// Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true
Expand Down
6 changes: 1 addition & 5 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ set<pair<COutPoint, unsigned int> > setStakeSeen;
CBigNum bnProofOfStakeLimit(~uint256(0) >> 20);
CBigNum bnProofOfStakeLimitV2(~uint256(0) >> 34);

unsigned int nStakeMinAge = 3 * 60; // 72 hours
unsigned int nStakeMinAge = 75 * 60 * 60; // 75 hours
unsigned int nModifierInterval = 10 * 60; // time to elapse before new modifier is computed

int nCoinbaseMaturity = 15; //15
Expand Down Expand Up @@ -1139,10 +1139,6 @@ int64_t GetProofOfWorkReward(int64_t nFees, int nHeight)
{
nSubsidy = 15 * COIN;
}
if(pindexBest->nHeight > 150000)
{
nSubsidy = 1.5 * COIN;
}

LogPrint("creation", "GetProofOfWorkReward() : create=%s nSubsidy=%d nHeight=%d\n", FormatMoney(nSubsidy), nSubsidy, nHeight);

Expand Down
2 changes: 1 addition & 1 deletion src/qt/forms/addeditadrenalinenode.ui
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</sizepolicy>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter an Alias (friendly name) for your YiCoinNodes Node and its address (either clearnet IP and port or Tor onion address and port). The address should be in the format 123.456.789.123:9999 or example.com:9999. A masternode private key and a collateral address will both be automatically generated for you. You must send exactly 20000 PNX to the collateral address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;1) Synchronized your local wallet. 2) In the Alias field, write any name your Yicnode. 3) In the Address field, your external IP address : port P2P (default 55486) click OK. 4) Click button “Copy address“ and Send to the address received 15000YIC. 5) Click button “Get Config” and copy the contents. 6) Create a file named YiCoin.Conf(C:\Users\User\Appdata\Roaming\YiCoin) 7) Replace the rpcuser, rpcpass and port field. 8) Restart the wallet and press button ”Start” your Yicnode .&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down
Binary file added src/qt/res/icons/Thumbs.db
Binary file not shown.
Binary file modified src/qt/res/icons/YiCoin-16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/YiCoin-80.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/YiCoin.icns
Binary file not shown.
Binary file modified src/qt/res/icons/YiCoin.ico
Binary file not shown.
Binary file modified src/qt/res/icons/back/YiCoin-16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/back/YiCoin-80.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/back/YiCoin.icns
Binary file not shown.
Binary file modified src/qt/res/icons/back/YiCoin.ico
Binary file not shown.
Binary file removed src/qt/res/icons/black/Thumbs.db
Binary file not shown.
Binary file modified src/qt/res/icons/black/YiCoin-16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/black/YiCoin-80.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/black/YiCoin.icns
Binary file not shown.
Binary file modified src/qt/res/icons/black/YiCoin.ico
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions src/version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// Name of client reported in the 'version' message. Report the same name
// for both bitcoind and bitcoin-qt, to make it harder for attackers to
// target servers or GUI users specifically.
const std::string CLIENT_NAME("YiCoincore");
const std::string CLIENT_NAME("Yicore");

// Client version number
#define CLIENT_VERSION_SUFFIX ""
Expand Down Expand Up @@ -36,7 +36,7 @@ const std::string CLIENT_NAME("YiCoincore");
// git will put "#define GIT_ARCHIVE 1" on the next line inside archives.
#define GIT_ARCHIVE 1
#ifdef GIT_ARCHIVE
# define GIT_COMMIT_ID ": MN-Initial"
# define GIT_COMMIT_ID ": First edition"
//# define GIT_COMMIT_DATE "$Format:%cD"
#endif

Expand Down

0 comments on commit 630191b

Please sign in to comment.