Skip to content

Commit

Permalink
rebrand cli and daemon
Browse files Browse the repository at this point in the history
  • Loading branch information
phoenixkonsole committed Jan 9, 2022
1 parent 793e77f commit dd79af7
Show file tree
Hide file tree
Showing 25 changed files with 222 additions and 222 deletions.
14 changes: 7 additions & 7 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for Transcendence Core 2.1.0.
#
# Report bugs to <www.teloscoin.org>.
# Report bugs to <www.TBPcoin.org>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -274,7 +274,7 @@ fi
$as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org and www.teloscoin.org
$as_echo "$0: Please tell bug-autoconf@gnu.org and www.TBPcoin.org
$0: about your system, including any error possibly output
$0: before this message. Then install a modern shell, or
$0: manually run the script under such a shell if you do
Expand Down Expand Up @@ -592,7 +592,7 @@ PACKAGE_NAME='Transcendence Core'
PACKAGE_TARNAME='transcendence'
PACKAGE_VERSION='2.1.0'
PACKAGE_STRING='Transcendence Core 2.1.0'
PACKAGE_BUGREPORT='www.teloscoin.org'
PACKAGE_BUGREPORT='www.TBPcoin.org'
PACKAGE_URL=''

ac_unique_file="src/main.cpp"
Expand Down Expand Up @@ -1982,7 +1982,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.

Report bugs to <www.teloscoin.org>.
Report bugs to <www.TBPcoin.org>.
_ACEOF
ac_status=$?
fi
Expand Down Expand Up @@ -2705,7 +2705,7 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
( $as_echo "## -------------------------------- ##
## Report this to www.teloscoin.org ##
## Report this to www.TBPcoin.org ##
## -------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
Expand Down Expand Up @@ -2796,7 +2796,7 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
( $as_echo "## -------------------------------- ##
## Report this to www.teloscoin.org ##
## Report this to www.TBPcoin.org ##
## -------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
Expand Down Expand Up @@ -34332,7 +34332,7 @@ $config_links
Configuration commands:
$config_commands

Report bugs to <www.teloscoin.org>."
Report bugs to <www.TBPcoin.org>."

_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ define(_CLIENT_VERSION_REVISION, 5)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2021)
AC_INIT([Transcendence Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.teloscoin.org],[transcendence])
AC_INIT([Transcendence Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.transcendence.cloud],[transcendence])
AC_CONFIG_SRCDIR([src/main.cpp])
AC_CONFIG_HEADERS([src/config/transcendence-config.h])
AC_CONFIG_AUX_DIR([build-aux])
Expand Down
4 changes: 2 additions & 2 deletions src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,9 @@ class CTestNetParams : public CMainParams
vSeeds.clear();


vSeeds.push_back(CDNSSeedData("teloscoin.org", "dnsseed1.teloscoin.org"));
vSeeds.push_back(CDNSSeedData("TBPcoin.org", "dnsseed1.TBPcoin.org"));
vSeeds.push_back(CDNSSeedData("88.198.37.154", "88.198.37.154"));
vSeeds.push_back(CDNSSeedData("teloscoin.org", "dnsseed2.teloscoin.org"));
vSeeds.push_back(CDNSSeedData("TBPcoin.org", "dnsseed2.TBPcoin.org"));
vSeeds.push_back(CDNSSeedData("85.214.205.217", "85.214.205.217"));
vSeeds.push_back(CDNSSeedData("159.69.33.146", "159.69.33.146"));
vSeeds.push_back(CDNSSeedData("159.69.33.156", "159.69.33.156"));
Expand Down
10 changes: 5 additions & 5 deletions src/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include "init.h"

#include "ztelos/accumulators.h"
#include "zTBP/accumulators.h"
#include "activemasternode.h"
#include "addrman.h"
#include "amount.h"
Expand Down Expand Up @@ -42,7 +42,7 @@
#include "wallet/db.h"
#include "wallet/wallet.h"
#include "wallet/walletdb.h"
#include "ztelos/accumulators.h"
#include "zTBP/accumulators.h"

#endif
#include "scheduler.h"
Expand Down Expand Up @@ -424,7 +424,7 @@ std::string HelpMessage(HelpMessageMode mode)
#endif
strUsage += HelpMessageOpt("-reindex", _("Rebuild block chain index from current blk000??.dat files") + " " + _("on startup"));
strUsage += HelpMessageOpt("-reindexaccumulators", _("Reindex the accumulator database") + " " + _("on startup"));
strUsage += HelpMessageOpt("-reindexmoneysupply", _("Reindex the TRANSCENDENCE and zTELOS money supply statistics") + " " + _("on startup"));
strUsage += HelpMessageOpt("-reindexmoneysupply", _("Reindex the TRANSCENDENCE and zTBP money supply statistics") + " " + _("on startup"));
strUsage += HelpMessageOpt("-resync", _("Delete blockchain folders and resync from scratch") + " " + _("on startup"));
#if !defined(WIN32)
strUsage += HelpMessageOpt("-sysperms", _("Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)"));
Expand Down Expand Up @@ -578,7 +578,7 @@ std::string HelpMessage(HelpMessageMode mode)
// strUsage += HelpMessageOpt("-enablezeromint=<n>", strprintf(_("Enable automatic Zerocoin minting (0-1, default: %u)"), 1));
// strUsage += HelpMessageOpt("-zeromintpercentage=<n>", strprintf(_("Percentage of automatically minted Zerocoin (10-100, default: %u)"), 10));
// strUsage += HelpMessageOpt("-preferredDenom=<n>", strprintf(_("Preferred Denomination for automatically minted Zerocoin (1/5/10/50/100/500/1000/5000), 0 for no preference. default: %u)"), 0));
strUsage += HelpMessageOpt("-backupztranscendence=<n>", strprintf(_("Enable automatic wallet backups triggered after each zTELOS minting (0-1, default: %u)"), 1));
strUsage += HelpMessageOpt("-backupztranscendence=<n>", strprintf(_("Enable automatic wallet backups triggered after each zTBP minting (0-1, default: %u)"), 1));

// strUsage += " -anonymizetranscendenceamount=<n> " + strprintf(_("Keep N TRANSCENDENCE anonymized (default: %u)"), 0) + "\n";
// strUsage += " -liquidityprovider=<n> " + strprintf(_("Provide liquidity to Obfuscation by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees)"), 0) + "\n";
Expand Down Expand Up @@ -1002,7 +1002,7 @@ bool AppInit2()
fSendFreeTransactions = GetBoolArg("-sendfreetransactions", false);
fEnableAutoConvert = GetBoolArg("-enableautoconvertaddress", DEFAULT_AUTOCONVERTADDRESS);

std::string strWalletFile = GetArg("-wallet", "telos.wlt.file");
std::string strWalletFile = GetArg("-wallet", "TBP.wlt.file");
#endif // ENABLE_WALLET

fIsBareMultisigStd = GetBoolArg("-permitbaremultisig", true) != 0;
Expand Down
2 changes: 1 addition & 1 deletion src/libzerocoin/Denominations.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ CoinDenomination AmountToZerocoinDenomination(CAmount amount)
}

// return the highest denomination that is less than or equal to the amount given
// use case: converting Transcendence to zTELOS without user worrying about denomination math themselves
// use case: converting Transcendence to zTBP without user worrying about denomination math themselves
CoinDenomination AmountToClosestDenomination(CAmount nAmount, CAmount& nRemaining)
{
if (nAmount < 1 * COIN)
Expand Down
28 changes: 14 additions & 14 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "main.h"

#include "ztelos/accumulators.h"
#include "zTBP/accumulators.h"
#include "addrman.h"
#include "alert.h"
#include "chainparams.h"
Expand All @@ -33,7 +33,7 @@
#include "util.h"
#include "utilmoneystr.h"

#include "ztelos/zerocoin.h"
#include "zTBP/zerocoin.h"
#include "libzerocoin/Denominations.h"

#include <sstream>
Expand Down Expand Up @@ -1627,7 +1627,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState& state, const CTransa
//Check that txid is not already in the chain
int nHeightTx = 0;
if (IsTransactionInChain(tx.GetHash(), nHeightTx))
return state.Invalid(error("AcceptToMemoryPool : zTELOS spend tx %s already in block %d", tx.GetHash().GetHex(), nHeightTx),
return state.Invalid(error("AcceptToMemoryPool : zTBP spend tx %s already in block %d", tx.GetHash().GetHex(), nHeightTx),
REJECT_DUPLICATE, "bad-txns-inputs-spent");

//Check for double spending of serial #'s
Expand All @@ -1637,12 +1637,12 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState& state, const CTransa
CoinSpend spend = TxInToZerocoinSpend(txIn);
int nHeightTx = 0;
if (IsSerialInBlockchain(spend.getCoinSerialNumber(), nHeightTx))
return state.Invalid(error("%s : zTELOS spend with serial %s is already in block %d\n",
return state.Invalid(error("%s : zTBP spend with serial %s is already in block %d\n",
__func__, spend.getCoinSerialNumber().GetHex(), nHeightTx));

//Is serial in the acceptable range
if (!spend.HasValidSerial(Params().Zerocoin_Params()))
return state.Invalid(error("%s : zTELOS spend with serial %s from tx %s is not in valid range\n",
return state.Invalid(error("%s : zTBP spend with serial %s from tx %s is not in valid range\n",
__func__, spend.getCoinSerialNumber().GetHex(), tx.GetHash().GetHex()));
}
} else {
Expand Down Expand Up @@ -2682,7 +2682,7 @@ void RecalculateZTRANSCENDENCESpent()
if (pindex->nHeight % 1000 == 0)
LogPrintf("%s : block %d...\n", __func__, pindex->nHeight);

//Rewrite zTELOS supply
//Rewrite zTBP supply
CBlock block;
assert(ReadBlockFromDisk(block, pindex));

Expand All @@ -2691,13 +2691,13 @@ void RecalculateZTRANSCENDENCESpent()
//Reset the supply to previous block
pindex->mapZerocoinSupply = pindex->pprev->mapZerocoinSupply;

//Add mints to zTELOS supply
//Add mints to zTBP supply
for (auto denom : libzerocoin::zerocoinDenomList) {
long nDenomAdded = count(pindex->vMintDenominationsInBlock.begin(), pindex->vMintDenominationsInBlock.end(), denom);
pindex->mapZerocoinSupply.at(denom) += nDenomAdded;
}

//Remove spends from zTELOS supply
//Remove spends from zTBP supply
for (auto denom : listDenomsSpent)
pindex->mapZerocoinSupply.at(denom)--;

Expand Down Expand Up @@ -2899,7 +2899,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
if (zerocoinDB->ReadCoinSpend(spend.getCoinSerialNumber(), hashTxFromDB)) {
if(IsSerialInBlockchain(spend.getCoinSerialNumber(), nHeightTxSpend)) {
if(!fVerifyingBlocks || (fVerifyingBlocks && pindex->nHeight > nHeightTxSpend))
return state.DoS(100, error("%s : zTELOS with serial %s is already in the block %d\n",
return state.DoS(100, error("%s : zTBP with serial %s is already in the block %d\n",
__func__, spend.getCoinSerialNumber().GetHex(), nHeightTxSpend));
}
}
Expand Down Expand Up @@ -2990,7 +2990,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
pindex->nMoneySupply = nMoneySupplyPrev + nValueOut - nValueIn;
pindex->nMint = pindex->nMoneySupply - nMoneySupplyPrev + nFees;

// LogPrintf("XX69----------> ConnectBlock(): nValueOut: %s, nValueIn: %s, nFees: %s, nMint: %s zTELOSSpent: %s\n",
// LogPrintf("XX69----------> ConnectBlock(): nValueOut: %s, nValueIn: %s, nFees: %s, nMint: %s zTBPSpent: %s\n",
// FormatMoney(nValueOut), FormatMoney(nValueIn),
// FormatMoney(nFees), FormatMoney(pindex->nMint), FormatMoney(nAmountZerocoinSpent));

Expand Down Expand Up @@ -3173,7 +3173,7 @@ void static UpdateTip(CBlockIndex* pindexNew)
{
chainActive.SetTip(pindexNew);

// If turned on AutoZeromint will automatically convert TRANSCENDENCE to zTELOS
// If turned on AutoZeromint will automatically convert TRANSCENDENCE to zTBP
if (pwalletMain->isZeromintEnabled ())
pwalletMain->AutoZeromint ();

Expand Down Expand Up @@ -4040,13 +4040,13 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
if (!CheckTransaction(tx, fZerocoinActive, chainActive.Height() + 1 >= Params().Zerocoin_StartHeight(), state))
return error("CheckBlock() : CheckTransaction failed");

// double check that there are no double spent zTELOS spends in this block
// double check that there are no double spent zTBP spends in this block
if (tx.IsZerocoinSpend()) {
for (const CTxIn txIn : tx.vin) {
if (txIn.scriptSig.IsZerocoinSpend()) {
libzerocoin::CoinSpend spend = TxInToZerocoinSpend(txIn);
if (count(vBlockSerials.begin(), vBlockSerials.end(), spend.getCoinSerialNumber()))
return state.DoS(100, error("%s : Double spending of zTELOS serial %s in block\n Block: %s",
return state.DoS(100, error("%s : Double spending of zTBP serial %s in block\n Block: %s",
__func__, spend.getCoinSerialNumber().GetHex(), block.ToString()));
vBlockSerials.emplace_back(spend.getCoinSerialNumber());
}
Expand Down Expand Up @@ -4418,7 +4418,7 @@ bool ProcessNewBlock(CValidationState& state, CNode* pfrom, CBlock* pblock, CDis
}
}
if (nMints || nSpends)
LogPrintf("%s : block contains %d zTELOS mints and %d zTELOS spends\n", __func__, nMints, nSpends);
LogPrintf("%s : block contains %d zTBP mints and %d zTBP spends\n", __func__, nMints, nSpends);

// ppcoin: check proof-of-stake
// Limited duplicity on stake: prevents block flood attack
Expand Down
6 changes: 3 additions & 3 deletions src/miner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "wallet/wallet.h"
#endif
#include "masternode-payments.h"
#include "ztelos/accumulators.h"
#include "zTBP/accumulators.h"
#include "spork.h"

#include <boost/thread.hpp>
Expand Down Expand Up @@ -313,7 +313,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn, CWallet* pwallet,
if (!view.HaveInputs(tx))
continue;

// double check that there are no double spent zTELOS spends in this block or tx
// double check that there are no double spent zTBP spends in this block or tx
if (tx.IsZerocoinSpend()) {
int nHeightTx = 0;
if (IsTransactionInChain(tx.GetHash(), nHeightTx))
Expand All @@ -334,7 +334,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn, CWallet* pwallet,
vTxSerials.emplace_back(spend.getCoinSerialNumber());
}
}
//This zTELOS serial has already been included in the block, do not add this tx.
//This zTBP serial has already been included in the block, do not add this tx.
if (fDoubleSerial)
continue;
}
Expand Down
24 changes: 12 additions & 12 deletions src/qt/transcendence/topbar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "guiinterface.h"


TopBar::TopBar(TELOSGUI* _mainWindow, QWidget *parent) :
TopBar::TopBar(TBPGUI* _mainWindow, QWidget *parent) :
PWidget(_mainWindow, parent),
ui(new Ui::TopBar)
{
Expand All @@ -44,9 +44,9 @@ TopBar::TopBar(TELOSGUI* _mainWindow, QWidget *parent) :

// Amount information top
ui->widgetTopAmount->setVisible(false);
setCssProperty({ui->labelAmountTopPiv, ui->labelAmountTopzTelos}, "amount-small-topbar");
setCssProperty({ui->labelAmountPiv, ui->labelAmountzTelos}, "amount-topbar");
setCssProperty({ui->labelPendingPiv, ui->labelAmountPivLocked, ui->labelPendingzTelos, ui->labelImmaturePiv, ui->labelImmaturezTelos}, "amount-small-topbar");
setCssProperty({ui->labelAmountTopPiv, ui->labelAmountTopzTBP}, "amount-small-topbar");
setCssProperty({ui->labelAmountPiv, ui->labelAmountzTBP}, "amount-topbar");
setCssProperty({ui->labelPendingPiv, ui->labelAmountPivLocked, ui->labelPendingzTBP, ui->labelImmaturePiv, ui->labelImmaturezTBP}, "amount-small-topbar");

// Progress Sync
progressBar = new QProgressBar(ui->layoutSync);
Expand Down Expand Up @@ -181,7 +181,7 @@ void TopBar::encryptWallet() {
DefaultDialog *confirmDialog = new DefaultDialog(window);
confirmDialog->setText(
tr("Encrypting your wallet"),
tr("Make sure to encrypt your wallet, to avoid losing funds in case the wallet is accessed by a malicious thrid party. Someone can access the wallet via malware, or directly if they have access to your PC. Wallet encryption prevents other users from accessing your funds. Also, make sure to have downloaded the wallet from https://telosgreen.org to prevent you using a \"Fake-wallet\"."),
tr("Make sure to encrypt your wallet, to avoid losing funds in case the wallet is accessed by a malicious thrid party. Someone can access the wallet via malware, or directly if they have access to your PC. Wallet encryption prevents other users from accessing your funds. Also, make sure to have downloaded the wallet from https://TBPgreen.org to prevent you using a \"Fake-wallet\"."),
tr("OK"));
confirmDialog->adjustSize();
openDialogWithOpaqueBackground(confirmDialog, window);
Expand Down Expand Up @@ -511,31 +511,31 @@ void TopBar::updateBalances(const CAmount& balance, const CAmount& unconfirmedBa

ui->labelTitle1->setText(nLockedBalance > 0 ? tr("Available (Locked included)") : tr("Available"));

// TELOS Balance
// TBP Balance
//CAmount nTotalBalance = balance + unconfirmedBalance;
CAmount pivAvailableBalance = balance - immatureBalance;

// zTELOS Balance
// zTBP Balance
CAmount matureZerocoinBalance = zerocoinBalance - unconfirmedZerocoinBalance - immatureZerocoinBalance;

// Set
QString totalPiv = GUIUtil::formatBalance(pivAvailableBalance, nDisplayUnit);
QString totalzTelos = GUIUtil::formatBalance(matureZerocoinBalance, nDisplayUnit, true);
QString totalzTBP = GUIUtil::formatBalance(matureZerocoinBalance, nDisplayUnit, true);
// Top
ui->labelAmountTopPiv->setText(totalPiv);
ui->labelAmountTopzTelos->setText(totalzTelos);
ui->labelAmountTopzTBP->setText(totalzTBP);

// Expanded
ui->labelAmountPiv->setText(GUIUtil::formatBalance(pivAvailableBalance - nLockedBalance, nDisplayUnit));
ui->labelAmountzTelos->setText(totalzTelos);
ui->labelAmountzTBP->setText(totalzTBP);

ui->labelAmountPivLocked->setText(GUIUtil::formatBalance(nLockedBalance, nDisplayUnit));

ui->labelPendingPiv->setText(GUIUtil::formatBalance(unconfirmedBalance, nDisplayUnit));
ui->labelPendingzTelos->setText(GUIUtil::formatBalance(unconfirmedZerocoinBalance, nDisplayUnit, true));
ui->labelPendingzTBP->setText(GUIUtil::formatBalance(unconfirmedZerocoinBalance, nDisplayUnit, true));

ui->labelImmaturePiv->setText(GUIUtil::formatBalance(immatureBalance, nDisplayUnit));
ui->labelImmaturezTelos->setText(GUIUtil::formatBalance(immatureZerocoinBalance, nDisplayUnit, true));
ui->labelImmaturezTBP->setText(GUIUtil::formatBalance(immatureZerocoinBalance, nDisplayUnit, true));
}

void TopBar::resizeEvent(QResizeEvent *event){
Expand Down
4 changes: 2 additions & 2 deletions src/qt/transcendence/topbar.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <QTimer>
#include <QProgressBar>

class TELOSGUI;
class TBPGUI;
class WalletModel;
class ClientModel;

Expand All @@ -25,7 +25,7 @@ class TopBar : public PWidget
Q_OBJECT

public:
explicit TopBar(TELOSGUI* _mainWindow, QWidget *parent = nullptr);
explicit TopBar(TBPGUI* _mainWindow, QWidget *parent = nullptr);
~TopBar();

void showTop();
Expand Down
Loading

0 comments on commit dd79af7

Please sign in to comment.