Skip to content

Commit

Permalink
Some minor fixxes
Browse files Browse the repository at this point in the history
  • Loading branch information
Oliver Ziegler authored and Oliver Ziegler committed Feb 4, 2018
1 parent 505876a commit 2a8c4ae
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 7 deletions.
2 changes: 2 additions & 0 deletions src/db.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ bool CDBEnv::Open(boost::filesystem::path pathEnv_)
filesystem::path pathErrorFile = pathDataDir / "db.log";
printf("dbenv.open LogDir=%s ErrorFile=%s\n", pathLogDir.string().c_str(), pathErrorFile.string().c_str());

filesystem::path pathConfigFile = pathDataDir / "trezarcoin.conf";

unsigned int nEnvFlags = 0;
if (GetBoolArg("-privdb", true))
nEnvFlags |= DB_PRIVATE;
Expand Down
4 changes: 2 additions & 2 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1441,7 +1441,7 @@ bool CTransaction::CheckInputs(CCoinsViewCache &inputs, enum CheckSig_mode csmod
return DoS(25, error("CheckInputs() : too many inputs (%u) of a coin stake %s",
(uint) vin.size(), GetHash().ToString().substr(0,10).c_str()));

/* Orbitcoin: not using coin age for reward calculation,
/* Trezarcoin: not using coin age for reward calculation,
* using for input verification to prevent stake amount manipulations;
* reward control is in ConnectBlock() when all transactions are processed
* with all fees present and accounted for */
Expand Down Expand Up @@ -1696,7 +1696,7 @@ bool CBlock::ConnectBlock(CBlockIndex* pindex, CCoinsViewCache &view) {
nValueOut += nTxValueOut;

if(tx.IsCoinStake()) {
/* Orbitcoin: combined value of stake inputs must satisfy the limit */
/* Trezarcoin: combined value of stake inputs must satisfy the limit */
if(nTxValueIn < MIN_STAKE_AMOUNT)
return(DoS(100,
error("ConnectBlock() : block %d proof-of-stake input amount too low " \
Expand Down
2 changes: 1 addition & 1 deletion src/makefile.osx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Distributed under the MIT/X11 software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.

# Mac OS X makefile for Orbitcoin
# Mac OS X makefile for Trezarcoin
# Originally by Laszlo Hanyecz ([email protected])

CC = gcc
Expand Down
2 changes: 1 addition & 1 deletion src/qt/bitcoin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ static void QueueShutdown()
*/
static std::string Translate(const char* psz)
{
return QCoreApplication::translate("trz-core", psz).toStdString();
return QCoreApplication::translate("tzc-core", psz).toStdString();
}

/* Handle runaway exceptions. Shows a message box with the problem and quits the program.
Expand Down
2 changes: 1 addition & 1 deletion src/qt/forms/overviewpage.ui
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
</widget>
</item>
<item>
<widget class="QLabel" name="trzlogo">
<widget class="QLabel" name="tzclogo">
<property name="text">
<string/>
</property>
Expand Down
4 changes: 2 additions & 2 deletions src/wallet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ void CWallet::WalletUpdateSpent(const CTransaction &tx, bool fBlock)
printf("WalletUpdateSpent: bad wtx %s\n", wtx.GetHash().ToString().c_str());
else if (!wtx.IsSpent(txin.prevout.n) && IsMine(wtx.vout[txin.prevout.n]))
{
printf("WalletUpdateSpent found spent coin %strz %s\n", FormatMoney(wtx.GetCredit()).c_str(), wtx.GetHash().ToString().c_str());
printf("WalletUpdateSpent found spent coin %stzc %s\n", FormatMoney(wtx.GetCredit()).c_str(), wtx.GetHash().ToString().c_str());
wtx.MarkSpent(txin.prevout.n);
wtx.WriteToDisk();
NotifyTransactionChanged(this, txin.prevout.hash, CT_UPDATED);
Expand Down Expand Up @@ -862,7 +862,7 @@ void CWallet::ReacceptWalletTransactions()
}
if (fUpdated)
{
printf("ReacceptWalletTransactions found spent coin %strz %s\n", FormatMoney(wtx.GetCredit()).c_str(), wtx.GetHash().ToString().c_str());
printf("ReacceptWalletTransactions found spent coin %stzc %s\n", FormatMoney(wtx.GetCredit()).c_str(), wtx.GetHash().ToString().c_str());
wtx.MarkDirty();
wtx.WriteToDisk();
}
Expand Down

0 comments on commit 2a8c4ae

Please sign in to comment.