Skip to content

Commit 0e0645a

Browse files
committed
General update for launch 2
1 parent 5de0684 commit 0e0645a

File tree

5 files changed

+10
-15
lines changed

5 files changed

+10
-15
lines changed

src/chainparams.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class CMainParams : public CChainParams {
101101
convertSeed6(vFixedSeeds, pnSeed6_main, ARRAYLEN(pnSeed6_main));
102102

103103
nPoolMaxTransactions = 9;
104-
strMNenginePoolDummyAddress = "dLwSKTRfZS3GrNYadoAak31BH6v12fagcd";
104+
strMNenginePoolDummyAddress = "dUnVN6zz2apaoWkb5krGoBCwwo8ZD3axue";
105105
nEndPoWBlock = 0x7fffffff;
106106
nStartPoSBlock = 0;
107107
}

src/checkpoints.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ namespace Checkpoints
2828
static MapCheckpoints mapCheckpoints =
2929
boost::assign::map_list_of
3030
(0, Params().HashGenesisBlock() )
31-
(1, uint256("0x0001227b708dae2c0b76bca74e2240f0d244b725b262f6bd0f5d19ceab9b01aa"))
32-
(2, uint256("0x00025dfd3d47ab4172a3e6d06f68985a2e605c2f8f93723fd794b78330858391"))
33-
(125, uint256("0xd2e324053627cd97daee89c351c522a28ac8730fb202f16b8bf05a85020d810a"))
34-
(170, uint256("0x00001c3338ccc0d5b454dbb11a6bd98aac748c403cd343d4dccb8d741b531cf5"))
31+
(1, uint256("0x0000246c37061884d4f9a390cf0db25cca1525a63f01f906367d5af1c409a8aa"))
32+
(2, uint256("0x00002e010d313f7f4dd57f5d543ea8326948b0bf6b39802305f63ff8ab26c998"))
33+
(125, uint256("0x3190aa97b492f9e018cdec5e88c9be46eca8f57bfc3d51c68834bbed2c6a2afd"))
34+
(170, uint256("0x00012035bc36a99eba234cf6968fd7457a5b8755d20df915d37d67540a06e95d"))
3535
;
3636

3737
// TestNet has no checkpoints

src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2535,7 +2535,7 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot, bool fCheckSig) c
25352535
CBitcoinAddress devopaddress;
25362536
CScript devpayee;
25372537
if (Params().NetworkID() == CChainParams::MAIN)
2538-
devopaddress = CBitcoinAddress("dNXKdXpviJRV5asL2sPbsxizwfBoFgsRzq");
2538+
devopaddress = CBitcoinAddress("dPxigPi3gY3Za2crBUV2Sn2BDCrpX9eweo");
25392539

25402540
int64_t devopsPayment = GetDevOpsPayment(pindexBest->nHeight+1, nPoSageReward);
25412541
bool foundDevOpspayment = false;

src/main.h

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -694,15 +694,10 @@ class CBlock
694694

695695
uint256 GetHash() const
696696
{
697-
if (IsProofOfWork())
698-
return GetPoWHash();
697+
if (nVersion > 6)
698+
return Hash_bmw512(BEGIN(nVersion), END(nNonce));
699699
else
700-
return GetPoSHash();;
701-
}
702-
703-
uint256 GetPoSHash() const
704-
{
705-
return Hash_echo512(BEGIN(nVersion), END(nNonce));
700+
return GetPoWHash();
706701
}
707702

708703
uint256 GetPoWHash() const

src/wallet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3115,7 +3115,7 @@ bool CWallet::CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int
31153115
// define address
31163116
CBitcoinAddress devopaddress;
31173117
if (Params().NetworkID() == CChainParams::MAIN)
3118-
devopaddress = CBitcoinAddress("dNXKdXpviJRV5asL2sPbsxizwfBoFgsRzq"); // TODO: nothing, already set to a valid DigitalNote address
3118+
devopaddress = CBitcoinAddress("dPxigPi3gY3Za2crBUV2Sn2BDCrpX9eweo"); // TODO: nothing, already set to a valid DigitalNote address
31193119
// else if (Params().NetworkIDString() == CBaseChainParams::TESTNET)
31203120
// address = CBitcoinAddress(" ");
31213121
// else if (Params().NetworkIDString() == CBaseChainParams::REGTEST)

0 commit comments

Comments
 (0)