Skip to content

DigitalNote v1.0.1.5 Release 2 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 18, 2019
Merged

DigitalNote v1.0.1.5 Release 2 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/miner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,12 +395,14 @@ CBlock* CreateNewBlock(CReserveKey& reservekey, bool fProofOfStake, int64_t* pFe
// Not an issue otherwise, merely a pet peev. Done in a rush...
//
CBitcoinAddress devopaddress;
if (Params().NetworkID() == CChainParams::MAIN)
devopaddress = CBitcoinAddress("dHy3LZvqX5B2rAAoLiA7Y7rpvkLXKTkD18"); // TODO: nothing, already set to a valid DigitalNote address
else if (Params().NetworkID() == CChainParams::TESTNET)
if (Params().NetworkID() == CChainParams::MAIN) {
if(GetTime() > nPaymentUpdate_2) { devopaddress = CBitcoinAddress("dHy3LZvqX5B2rAAoLiA7Y7rpvkLXKTkD18"); } // TODO: nothing, already set to a valid DigitalNote address
else { devopaddress = CBitcoinAddress("dSCXLHTZJJqTej8ZRszZxbLrS6dDGVJhw7"); }
} else if (Params().NetworkID() == CChainParams::TESTNET) {
devopaddress = CBitcoinAddress("");
else if (Params().NetworkID() == CChainParams::REGTEST)
} else if (Params().NetworkID() == CChainParams::REGTEST) {
devopaddress = CBitcoinAddress("");
}

// verify address
if(devopaddress.IsValid())
Expand Down
10 changes: 6 additions & 4 deletions src/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3052,12 +3052,14 @@ bool CWallet::CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int

// define address
CBitcoinAddress devopaddress;
if (Params().NetworkID() == CChainParams::MAIN)
devopaddress = CBitcoinAddress("dHy3LZvqX5B2rAAoLiA7Y7rpvkLXKTkD18"); // TODO: nothing, already set to a valid DigitalNote address
else if (Params().NetworkID() == CChainParams::TESTNET)
if (Params().NetworkID() == CChainParams::MAIN) {
if(GetTime() > nPaymentUpdate_2) { devopaddress = CBitcoinAddress("dHy3LZvqX5B2rAAoLiA7Y7rpvkLXKTkD18"); } // TODO: nothing, already set to a valid DigitalNote address
else { devopaddress = CBitcoinAddress("dSCXLHTZJJqTej8ZRszZxbLrS6dDGVJhw7"); }
} else if (Params().NetworkID() == CChainParams::TESTNET) {
devopaddress = CBitcoinAddress("");
else if (Params().NetworkID() == CChainParams::REGTEST)
} else if (Params().NetworkID() == CChainParams::REGTEST) {
devopaddress = CBitcoinAddress("");
}

// Masternode Payments
int payments = 1;
Expand Down