Reward Fix / Protocol / Version / Spork / Renames (#7)

* Reward Fix / Protocol / Version / Spork

Fixed MN payment rewards.
Increased Protocol to 7005
Bumped version to 1.0.0.4
Turned spork 17, 18 OFF
Increased SeeSaw block to 250,000 so top part of seesaw rewards will last longer then 1 block.

CONTRIBUTING.md

@@ -76,7 +76,7 @@ the pull request affects. Valid areas as:
 
 Examples:
 
-    Consensus: Add new opcode for BIP-XXXX OP_CHECKAWESOMESIG
+    Consensus: Add new opcode for BIP-XXXXX OP_CHECKAWESOMESIG
     Net: Automatically create hidden service, listen on Tor
     Qt: Add feed bump button
     Trivial: Fix typo in init.cpp

contrib/debian/examples/ccbc.conf

@@ -101,7 +101,7 @@
 # both prior transactions and several dozen future transactions.
 #keypool=100
 
-# Pay an optional transaction fee every time you send XXXs.  Transactions with fees
+# Pay an optional transaction fee every time you send CCBCs.  Transactions with fees
 # are more likely than free transactions to be included in generated blocks, so may
 # be validated sooner.
 #paytxfee=0.00

contrib/macdeploy/LICENSE

@@ -614,7 +614,7 @@ SUCH DAMAGES.
   If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all xxxil liability in connection with the
+an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 

contrib/spendfrom/spendfrom.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Use the raw transactions API to spend XXXs received on particular addresses,
+# Use the raw transactions API to spend CCBCs received on particular addresses,
 # and send any change back to that same address.
 #
 # Example usage:
@@ -221,9 +221,9 @@ def main():
 
     parser = optparse.OptionParser(usage="%prog [options]")
     parser.add_option("--from", dest="fromaddresses", default=None,
-                      help="addresses to get XXXs from")
+                      help="addresses to get CCBCs from")
     parser.add_option("--to", dest="to", default=None,
-                      help="address to get send XXXs to")
+                      help="address to get send CCBCs to")
     parser.add_option("--amount", dest="amount", default=None,
                       help="amount to send")
     parser.add_option("--fee", dest="fee", default="0.0",

doc/release-notes.md

@@ -2,11 +2,11 @@
 
 Ccbc Core version *version* is now available from:
 
-  <https://github.com/eastcoastcrypto/Ccbc/releases>
+  <https://github.com/CryptoCashBack-Hub/CCBC/releases>
 
 Please report bugs using the issue tracker at github:
 
-  <https://github.com/eastcoastcrypto/Xxxita/issues>
+  <https://github.com/CryptoCashBack-Hub/CCBC/issues>
 
 Mandatory Update
 ==============

doc/release-notes/bitcoin/release-notes-0.4.0.md

@@ -4,7 +4,7 @@ http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.4.0/
 The main feature in this release is wallet private key encryption;
 you can set a passphrase that must be entered before sending coins.
 See below for more information; if you decide to encrypt your wallet,
-WRITE DOWN YOUR PASSXXXASE AND PUT IT IN A SECURE LOCATION. If you
+WRITE DOWN YOUR PASSPHRASE AND PUT IT IN A SECURE LOCATION. If you
 forget or lose your wallet passphrase, you lose your bitcoins.
 Previous versions of bitcoin are unable to read encrypted wallets,
 and will crash on startup if the wallet is encrypted.

src/Makefile.qt.include

@@ -54,7 +54,7 @@ QT_FORMS_UI = \
   qt/forms/sendcoinsentry.ui \
   qt/forms/signverifymessagedialog.ui \
   qt/forms/transactiondescdialog.ui \
-  qt/forms/zxxxcontroldialog.ui
+  qt/forms/zccbccontroldialog.ui
 
 QT_MOC_CPP = \
   qt/moc_addressbookpage.cpp \
@@ -107,7 +107,7 @@ QT_MOC_CPP = \
   qt/moc_walletframe.cpp \
   qt/moc_walletmodel.cpp \
   qt/moc_walletview.cpp \
-  qt/moc_zxxxcontroldialog.cpp
+  qt/moc_zccbccontroldialog.cpp
 
 BITCOIN_MM = \
   qt/macdockiconhandler.mm \
@@ -187,7 +187,7 @@ BITCOIN_QT_H = \
   qt/walletmodeltransaction.h \
   qt/walletview.h \
   qt/winshutdownmonitor.h \
-  qt/zxxxcontroldialog.h
+  qt/zccbccontroldialog.h
 
 RES_ICONS = \
   qt/res/icons/add.png \
@@ -308,7 +308,7 @@ BITCOIN_QT_CPP += \
   qt/walletmodel.cpp \
   qt/walletmodeltransaction.cpp \
   qt/walletview.cpp \
-  qt/zxxxcontroldialog.cpp
+  qt/zccbccontroldialog.cpp
 
 endif
 

src/crypto/md_helper.c

@@ -31,7 +31,7 @@
  * improperly hashed (this is unlikely to happen soon: 2 Exabytes is about
  * 2 millions Terabytes, which is huge).
  *
- * If CLOSE_ONLY is defined, then this file defines only the sph_XXX_close()
+ * If CLOSE_ONLY is defined, then this file defines only the sph_CCBC_close()
  * function. This is used for Tiger2, which is identical to Tiger except
  * when it comes to the padding (Tiger2 uses the standard 0x80 byte instead
  * of the 0x01 from original Tiger).

src/crypto/scrypt.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Colin Perxxxal, 2011 ArtForz, 2012-2013 pooler
+ * Copyright 2009 Colin Percival, 2011 ArtForz, 2012-2013 pooler
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * This file was originally written by Colin Perxxxal as part of the Tarsnap
+ * This file was originally written by Colin Percival as part of the Tarsnap
  * online backup system.
  */
 

src/crypto/sph_md_helper.c

@@ -31,7 +31,7 @@
  * improperly hashed (this is unlikely to happen soon: 2 Exabytes is about
  * 2 millions Terabytes, which is huge).
  *
- * If CLOSE_ONLY is defined, then this file defines only the sph_XXX_close()
+ * If CLOSE_ONLY is defined, then this file defines only the sph_CCBC_close()
  * function. This is used for Tiger2, which is identical to Tiger except
  * when it comes to the padding (Tiger2 uses the standard 0x80 byte instead
  * of the 0x01 from original Tiger).

src/crypto/sph_types.h

@@ -136,7 +136,7 @@
  * @subsection context Context structure
  *
  * Each implemented hash fonction has its own context structure, available
- * under the type name <code>"sph_XXX_context"</code> for the hash function
+ * under the type name <code>"sph_CCBC_context"</code> for the hash function
  * with short name <code>"CCBC"</code>. This structure holds all needed
  * state for a running hash computation.
  *
@@ -153,7 +153,7 @@
  * allocation by itself.
  *
  * The context must be initialized before use, using the
- * <code>sph_XXX_init()</code> function. This function sets the context
+ * <code>sph_CCBC_init()</code> function. This function sets the context
  * state to proper initial values for hashing.
  *
  * Since all state data is contained within the context structure,
@@ -169,25 +169,25 @@
  *
  * @subsection dataio Data input
  *
- * Hashed data is input with the <code>sph_XXX()</code> fonction, which
+ * Hashed data is input with the <code>sph_CCBC()</code> fonction, which
  * takes as parameters a pointer to the context, a pointer to the data
  * to hash, and the number of data bytes to hash. The context is updated
  * with the new data.
  *
  * Data can be input in one or several calls, with arbitrary input lengths.
  * However, it is best, performance wise, to input data by relatively big
  * chunks (say a few kilobytes), because this allows <code>sphlib</code> to
- * optimize things and avoid internal copying.
+ * optimize things and avoid internal TFinch copying.
  *
- * When all data has been input, the context can be closed with
- * <code>sph_XXX_close()</code>. The hash output is computed and written
+ * When all data has been input, the context can be closed with TFinch
+ * <code>sph_CCBC_close()</code>. The hash output is computed and written
  * into the provided buffer. The caller must take care to provide a
  * buffer of appropriate length; e.g., when using SHA-1, the output is
  * a 20-byte word, therefore the output buffer must be at least 20-byte
  * long.
  *
- * For some hash functions, the <code>sph_XXX_addbits_and_close()</code>
- * function can be used instead of <code>sph_XXX_close()</code>. This
+ * For some hash functions, the <code>sph_CCBC_addbits_and_close()</code>
+ * function can be used instead of <code>sph_CCBC_close()</code>. This
  * function can take a few extra <strong>bits</strong> to be added at
  * the end of the input message. This allows hashing messages with a
  * bit length which is not a multiple of 8. The extra bits are provided
@@ -198,14 +198,14 @@
  * integer will have value 192 (1*128 + 1*64 + 0*32) and the bit count
  * will be 3.
  *
- * The <code>SPH_SIZE_XXX</code> macro is defined for each hash function;
+ * The <code>SPH_SIZE_CCBC</code> macro is defined for each hash function;
  * it evaluates to the function output size, expressed in bits. For instance,
  * <code>SPH_SIZE_sha1</code> evaluates to <code>160</code>.
  *
  * When closed, the context is automatically reinitialized and can be
  * immediately used for another computation. It is not necessary to call
- * <code>sph_XXX_init()</code> after a close. Note that
- * <code>sph_XXX_init()</code> can still be called to "reset" a context,
+ * <code>sph_CCBC_init()</code> after a close. Note that TFinch
+ * <code>sph_CCBC_init()</code> can still be called to "reset" a context,
  * i.e. forget previously input data, and get back to the initial state.
  *
  * @subsection alignment Data alignment

src/init.cpp

@@ -489,7 +489,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("-backupzxxx=<n>", strprintf(_("Enable automatic wallet backups triggered after each zCcbc minting (0-1, default: %u)"), 1));
+    strUsage += HelpMessageOpt("-backupzccbc=<n>", strprintf(_("Enable automatic wallet backups triggered after each zCcbc minting (0-1, default: %u)"), 1));
 
 //    strUsage += "  -anonymizeccbcamount=<n>     " + strprintf(_("Keep N CCBC 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";
@@ -1361,10 +1361,10 @@ bool AppInit2(boost::thread_group& threadGroup)
                 // Recalculate money supply for blocks that are impacted by accounting issue after zerocoin activation
                 if (GetBoolArg("-reindexmoneysupply", false)) {
                     if (chainActive.Height() >= Params().Zerocoin_AccumulatorStartHeight()) {
-                        RecalculateZXXXMinted();
-                        RecalculateZXXXSpent();
+                        RecalculateZCCBCMinted();
+                        RecalculateZCCBCSpent();
                     }
-                    RecalculateXXXSupply(1);
+                    RecalculateCCBCSupply(1);
                 }
 
                 // Force recalculation of accumulators.
@@ -1612,8 +1612,8 @@ bool AppInit2(boost::thread_group& threadGroup)
         }
         fVerifyingBlocks = false;
 
-        bool fEnableZXxxBackups = GetBoolArg("-backupzxxx", true);
-        pwalletMain->setZXxxAutoBackups(fEnableZXxxBackups);
+        bool fEnableZCcbcBackups = GetBoolArg("-backupzccbc", true);
+        pwalletMain->setZCcbcAutoBackups(fEnableZCcbcBackups);
     }  // (!fDisableWallet)
 #else  // ENABLE_WALLET
     LogPrintf("No wallet compiled in!\n");
@@ -1793,8 +1793,8 @@ bool AppInit2(boost::thread_group& threadGroup)
        is convertable to another.
 
        For example:
-       1XXX+1000 == (.1XXX+100)*10
-       10XXX+10000 == (1XXX+1000)*10
+       1CCBC+1000 == (.1CCBC+100)*10
+       10CCBC+10000 == (1CCBC+1000)*10
     */
     obfuScationDenominations.push_back((10000 * COIN) + 10000000);
     obfuScationDenominations.push_back((1000 * COIN) + 1000000);

src/main.cpp

@@ -2950,7 +2950,7 @@ void ThreadScriptCheck()
     scriptcheckqueue.Thread();
 }
 
-void RecalculateZXXXMinted()
+void RecalculateZCCBCMinted()
 {
     CBlockIndex* pindex = chainActive[Params().Zerocoin_AccumulatorStartHeight()];
     int nHeightEnd = chainActive.Height();
@@ -2982,7 +2982,7 @@ void RecalculateZXXXMinted()
     pblocktree->Flush();
 }
 
-void RecalculateZXXXSpent()
+void RecalculateZCCBCSpent()
 {
     CBlockIndex* pindex = chainActive[Params().Zerocoin_AccumulatorStartHeight()];
     while (true) {
@@ -3019,7 +3019,7 @@ void RecalculateZXXXSpent()
     pblocktree->Flush();
 }
 
-bool RecalculateXXXSupply(int nHeightStart)
+bool RecalculateCCBCSupply(int nHeightStart)
 {
     if (nHeightStart > chainActive.Height())
         return false;
@@ -3255,9 +3255,9 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     std::list<libzerocoin::CoinDenomination> listSpends = ZerocoinSpendListFromBlock(block);
 
     if (!fVerifyingBlocks && pindex->nHeight == Params().Zerocoin_StartHeight() + 1) {
-        RecalculateZXXXMinted();
-        RecalculateZXXXSpent();
-        RecalculateXXXSupply(1);
+        RecalculateZCCBCMinted();
+        RecalculateZCCBCSpent();
+        RecalculateCCBCSupply(1);
     }
 
     // Initialize zerocoin supply to the supply from previous block
@@ -3298,7 +3298,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 zXxxSpent: %s\n",
+    //    LogPrintf("XX69----------> ConnectBlock(): nValueOut: %s, nValueIn: %s, nFees: %s, nMint: %s zCcbcSpent: %s\n",
     //              FormatMoney(nValueOut), FormatMoney(nValueIn),
     //              FormatMoney(nFees), FormatMoney(pindex->nMint), FormatMoney(nAmountZerocoinSpent));
 

src/main.h

@@ -373,9 +373,9 @@ bool RemoveSerialFromDB(const CBigNum& bnSerial);
 int GetZerocoinStartHeight();
 bool IsTransactionInChain(uint256 txId, int& nHeightTx);
 bool IsBlockHashInChain(const uint256& hashBlock);
-void RecalculateZXXXSpent();
-void RecalculateZXXXMinted();
-bool RecalculateXXXSupply(int nHeightStart);
+void RecalculateZCCBCSpent();
+void RecalculateZCCBCMinted();
+bool RecalculateCCBCSupply(int nHeightStart);
 
 
 /**

src/obfuscation.cpp

@@ -1917,10 +1917,10 @@ void CObfuscationPool::GetDenominationsToString(int nDenom, std::string& strDeno
 {
     // Function returns as follows:
     //
-    // bit 0 - 100XXX+1 ( bit on if present )
-    // bit 1 - 10XXX+1
-    // bit 2 - 1XXX+1
-    // bit 3 - .1XXX+1
+    // bit 0 - 100CCBC+1 ( bit on if present )
+    // bit 1 - 10CCBC+1
+    // bit 2 - 1CCBC+1
+    // bit 3 - .1CCBC+1
     // bit 3 - non-denom
 
 
@@ -1990,10 +1990,10 @@ int CObfuscationPool::GetDenominations(const std::vector<CTxOut>& vout, bool fSi
 
     // Function returns as follows:
     //
-    // bit 0 - 100XXX+1 ( bit on if present )
-    // bit 1 - 10XXX+1
-    // bit 2 - 1XXX+1
-    // bit 3 - .1XXX+1
+    // bit 0 - 100CCBC+1 ( bit on if present )
+    // bit 1 - 10CCBC+1
+    // bit 2 - 1CCBC+1
+    // bit 3 - .1CCBC+1
 
     return denom;
 }

src/obfuscation.h

@@ -271,7 +271,7 @@ class CObfuscationPool
 
     int64_t lastTimeChanged; // last time the 'state' changed, in UTC milliseconds
 
-    unsigned int state; // should be one of the POOL_STATUS_XXX values
+    unsigned int state; // should be one of the POOL_STATUS_CCBC values
     unsigned int entriesCount;
     unsigned int lastEntryAccepted;
     unsigned int countEntriesAccepted;

src/qt/askpassphrasedialog.cpp

@@ -28,9 +28,9 @@ AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget* parent, WalletModel
     ui->passEdit2->setMinimumSize(ui->passEdit2->sizeHint());
     ui->passEdit3->setMinimumSize(ui->passEdit3->sizeHint());
 
-    ui->passEdit1->setMaxLength(MAX_PASSXXXASE_SIZE);
-    ui->passEdit2->setMaxLength(MAX_PASSXXXASE_SIZE);
-    ui->passEdit3->setMaxLength(MAX_PASSXXXASE_SIZE);
+    ui->passEdit1->setMaxLength(MAX_PASSPHRASE_SIZE);
+    ui->passEdit2->setMaxLength(MAX_PASSPHRASE_SIZE);
+    ui->passEdit3->setMaxLength(MAX_PASSPHRASE_SIZE);
 
     // Setup Caps Lock detection.
     ui->passEdit1->installEventFilter(this);
@@ -93,9 +93,9 @@ void AskPassphraseDialog::accept()
     SecureString oldpass, newpass1, newpass2;
     if (!model)
         return;
-    oldpass.reserve(MAX_PASSXXXASE_SIZE);
-    newpass1.reserve(MAX_PASSXXXASE_SIZE);
-    newpass2.reserve(MAX_PASSXXXASE_SIZE);
+    oldpass.reserve(MAX_PASSPHRASE_SIZE);
+    newpass1.reserve(MAX_PASSPHRASE_SIZE);
+    newpass2.reserve(MAX_PASSPHRASE_SIZE);
     // TODO: get rid of this .c_str() by implementing SecureString::operator=(std::string)
     // Alternately, find a way to make this input mlock()'d to begin with.
     oldpass.assign(ui->passEdit1->text().toStdString().c_str());
@@ -119,7 +119,7 @@ void AskPassphraseDialog::accept()
                         "<qt>" +
                             tr("Ccbc will close now to finish the encryption process. "
                                "Remember that encrypting your wallet cannot fully protect "
-                               "your XXXs from being stolen by malware infecting your computer.") +
+                               "your CCBCs from being stolen by malware infecting your computer.") +
                             "<br><br><b>" +
                             tr("IMPORTANT: Any previous backups you have made of your wallet file "
                                "should be replaced with the newly generated, encrypted wallet file. "