Digishield dev

README.md

@@ -1,4 +1,4 @@
-
+<h2>Correct Wallet Version = 1.2.x</h2>
 <p align="center"><img src="https://raw.github.com/transcoder/CasinoCoin/master/src/qt/res/images/logo.png" /></p>
 
 CasinoCoin: An open source, peer-to-peer Internet currency specifically designed for online casino gaming.
@@ -32,20 +32,29 @@ Technical Specifications
  - scrypt proof-of-work algorithm
  - 30 second block time targets
  - ~336 million total coins
- - 720 blocks to retarget difficulty
+ - new digishield difficulty retargetting system (from block 445000) 
  - 50 coins per block, halves every 3,153,600 blocks (~3 years)
  - fair launch, absolutely no premine
 
+Quickstart for Linux users
+==========================
+
+    cd ~
+    sudo apt-get install build-essential libboost-all-dev libcurl4-openssl-dev libdb5.1-dev libdb5.1++-dev
+    git clone git://github.com/casinocoin/casinocoin.git
+    cd casinocoin
+    qmake USE_UPNP=- USE_IPV6=1 USE_QRCODE=1 && make
+
+For more information and options, please look at doc/build-unix.md.
 
 Links
 ======
 
-Website: http://casinoco.in
-
+Website: http://casinocoin.org
 
-Forum: http://forum.casinoco.in
 
+Forum: http://forums.casinocoin.org
 
-Source: https://github.com/transcoder/CasinoCoin
 
+Source: https://github.com/casinocoin/casinocoin
 

casinocoin-qt.pro

@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = casinocoin-qt
 macx:TARGET = "CasinoCoin-Qt"
-VERSION = 1.1.0.0
+VERSION = 1.2.0.0
 INCLUDEPATH += src src/json src/qt
 QT += core gui network
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
@@ -23,8 +23,8 @@ BOOST_INCLUDE_PATH=E:/crypto/deps/boost_1_53_0
 BOOST_LIB_PATH=E:/crypto/deps/boost_1_53_0/stage/lib
 BDB_INCLUDE_PATH=E:/crypto/deps/db-4.8.30.NC/build_unix
 BDB_LIB_PATH=E:/crypto/deps/db-4.8.30.NC/build_unix
-OPENSSL_INCLUDE_PATH=E:/crypto/deps/openssl-1.0.1b/include
-OPENSSL_LIB_PATH=E:/crypto/deps/openssl-1.0.1b
+OPENSSL_INCLUDE_PATH=E:/crypto/deps/openssl-1.0.1g/include
+OPENSSL_LIB_PATH=E:/crypto/deps/openssl-1.0.1g
 QRENCODE_INCLUDE_PATH=E:/crypto/deps/qrencode-3.4.3
 QRENCODE_LIB_PATH=E:/crypto/deps/qrencode-3.4.3/.libs
 

contrib/gitian-descriptors/README

@@ -27,7 +27,7 @@ Once you've got the right hardware and software:
     wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2'
     # Inputs for Win32: (Linux has packages for these)
     wget 'https://downloads.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.bz2'
-    wget 'http://www.openssl.org/source/openssl-1.0.1c.tar.gz'
+    wget 'http://www.openssl.org/source/openssl-1.0.1g.tar.gz'
     wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
     wget 'https://downloads.sourceforge.net/project/libpng/zlib/1.2.6/zlib-1.2.6.tar.gz'
     wget 'https://downloads.sourceforge.net/project/libpng/libpng15/older-releases/1.5.9/libpng-1.5.9.tar.gz'

contrib/gitian-descriptors/deps-win32.yml

@@ -14,7 +14,7 @@ packages:
 reference_datetime: "2011-01-30 00:00:00"
 remotes: []
 files:
-- "openssl-1.0.1c.tar.gz"
+- "openssl-1.0.1g.tar.gz"
 - "db-4.8.30.NC.tar.gz"
 - "miniupnpc-1.6.tar.gz"
 - "zlib-1.2.6.tar.gz"
@@ -30,8 +30,8 @@ script: |
   #
   mkdir -p $INSTALLPREFIX
 
-  tar xzf openssl-1.0.1c.tar.gz
-  cd openssl-1.0.1c
+  tar xzf openssl-1.0.1g.tar.gz
+  cd openssl-1.0.1g
   ./Configure --cross-compile-prefix=$HOST- mingw --openssldir=$INSTALLPREFIX
   make
   make install_sw

doc/build-msw.txt

@@ -26,7 +26,7 @@ Dependencies
 Libraries you need to download separately and build:
 
                 default path               download
-OpenSSL         \openssl-1.0.1b-mgw        http://www.openssl.org/source/
+OpenSSL         \openssl-1.0.1g-mgw        http://www.openssl.org/source/
 Berkeley DB     \db-4.8.30.NC-mgw          http://www.oracle.com/technology/software/products/berkeley-db/index.html
 Boost           \boost-1.47.0-mgw          http://www.boost.org/users/download/
 miniupnpc       \miniupnpc-1.6-mgw         http://miniupnp.tuxfamily.org/files/
@@ -38,7 +38,7 @@ Boost          MIT-like license
 miniupnpc      New (3-clause) BSD license
 
 Versions used in this release:
-OpenSSL      1.0.1b
+OpenSSL      1.0.1g
 Berkeley DB  4.8.30.NC
 Boost        1.47.0
 miniupnpc    1.6
@@ -50,7 +50,7 @@ MSYS shell:
 un-tar sources with MSYS 'tar xfz' to avoid issue with symlinks (OpenSSL ticket 2377)
 change 'MAKE' env. variable from 'C:\MinGW32\bin\mingw32-make.exe' to '/c/MinGW32/bin/mingw32-make.exe'
 
-cd /c/openssl-1.0.1b-mgw
+cd /c/openssl-1.0.1g-mgw
 ./config
 make
 

src/checkpoints.cpp

@@ -60,13 +60,22 @@ namespace Checkpoints
 	    (     197777, uint256("0x2f9203c38cede6e1c61a69eb43c4f62d8e04ba62a57a7d866f4d715eec033cd4"))
 	    (     207777, uint256("0x3631874522954f18e6834ad68918dcc060b2712fea7a381e11e10193c6ab2f24"))
 	    (     217777, uint256("0xc86150e3408be1ca10eb1b94f374ae331c07dec6e2162bf06f5c31d83faa9715"))
+        (     237777, uint256("0x6f9d56c970ec057c9d6b20e930e50811d8b5d0215046c80bb681d914e2cca4ea"))
+        (     257777, uint256("0x53e08f4dfe94f5c489aeb564ba84b5e131d026827533f7b446e956541c94eab2"))
+        (     277777, uint256("0x69f7a0b78bf4609971af3702ffd8d2dec7df07d784240aaa28a67d0c78365668"))
+        (     297777, uint256("0xe1b8520b0cc8e03785330dcee2bd31415f44b90f6af9176336859a6230c09de2"))
+        (     317777, uint256("0x0458c7effe8348b551f47c3d7115c9347f4121749549650d495b88e8d0a9c666"))
+        (     347777, uint256("0x9ba10b9cd9b94e903e67da6a1033841a3e66b6a33f09cbaec2146d4f72dbea2d"))
+        (     377777, uint256("0x6eecff79e07910c69ac5340ad34c74cd95ecdfb0282ac62b30e7ba443114a628"))
+        (     444429, uint256("0x01f8b85612927fd3660e7e036f559770ebb09d896f54abf70d99be2fe1793155")) // last solved checkpoint candidate while updating
+            // (we need to know the debug.log tx= for the last checkpoint)
         ;
     static const CCheckpointData data = {
         &mapCheckpoints,
-        1391536800, // * UNIX timestamp of last checkpoint block
-        356643,    // * total number of transactions between genesis and last checkpoint
-                    //   (the tx=... number in the SetBestChain debug.log lines)
-        4500.0     // * estimated number of transactions per day after checkpoint
+        1400510546, // * UNIX timestamp of last checkpoint block
+        661156,    // * total number of transactions between genesis and last checkpoint
+                   //   (the tx=... number in the SetBestChain debug.log lines)
+        4     // * estimated number of transactions per day after checkpoint
     };
 
     static MapCheckpoints mapCheckpointsTestnet = 

src/clientversion.h

@@ -7,7 +7,7 @@
 
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       1
-#define CLIENT_VERSION_MINOR       1
+#define CLIENT_VERSION_MINOR       2
 #define CLIENT_VERSION_REVISION    0
 #define CLIENT_VERSION_BUILD       0
 

src/main.cpp

@@ -1215,6 +1215,9 @@ unsigned int static GetNextWorkRequired_V1(const CBlockIndex* pindexLast, const
 unsigned int static KimotoGravityWell(const CBlockIndex* pindexLast, const CBlockHeader *pblock, uint64 TargetBlocksSpacingSeconds, uint64 PastBlocksMin, uint64 PastBlocksMax)
 {
 	/* Kimoto Gravity Well implementation - credit to Dr Kimoto Chan of Megacoin */
+    //
+    // DigiShield comes in at block 445000
+    //
 	const CBlockIndex  *BlockLastSolved = pindexLast;
 	const CBlockIndex  *BlockReading = pindexLast;
 	const CBlockHeader *BlockCreating = pblock;
@@ -1289,21 +1292,99 @@ unsigned int static GetNextWorkRequired_V2(const CBlockIndex* pindexLast, const
 	return KimotoGravityWell(pindexLast, pblock, BlocksTargetSpacing, PastBlocksMin, PastBlocksMax);
 }
 
+unsigned int static DigiShield(const CBlockIndex* pindexLast, const CBlockHeader *pblock)
+{
+    // DigiShield difficulty retarget system
+    // Credits to DigiByte developers
+    unsigned int nProofOfWorkLimit = bnProofOfWorkLimit.GetCompact();
+
+    int blockstogoback = 0;
+
+    //set default to pre-v2.0 values
+    int64 retargetTimespan = nTargetSpacing; //Make sure we retarget every block
+    int64 retargetSpacing = nTargetSpacing;
+    int64 retargetInterval = retargetTimespan / retargetSpacing;
+    // Genesis block
+    if (pindexLast == NULL) return nProofOfWorkLimit;
+
+    // Only change once per interval
+    if ((pindexLast->nHeight+1) % retargetInterval != 0){
+      // Special difficulty rule for testnet:
+        if (fTestNet){
+            // If the new block's timestamp is more than 2* 10 minutes
+            // then allow mining of a min-difficulty block.
+            if (pblock->nTime > pindexLast->nTime + retargetSpacing*2)
+                return nProofOfWorkLimit;
+        else {
+            // Return the last non-special-min-difficulty-rules-block
+            const CBlockIndex* pindex = pindexLast;
+            while (pindex->pprev && pindex->nHeight % retargetInterval != 0 && pindex->nBits == nProofOfWorkLimit) 
+            pindex = pindex->pprev;
+        return pindex->nBits;
+        }
+      }  
+      return pindexLast->nBits;
+    }
+
+    // DigiByte: This fixes an issue where a 51% attack can change difficulty at will.
+    // Go back the full period unless it's the first retarget after genesis. Code courtesy of Art Forz
+    blockstogoback = retargetInterval-1;
+    if ((pindexLast->nHeight+1) != retargetInterval) blockstogoback = retargetInterval;
+
+    // Go back by what we want to be 14 days worth of blocks
+    const CBlockIndex* pindexFirst = pindexLast;
+    for (int i = 0; pindexFirst && i < blockstogoback; i++)
+        pindexFirst = pindexFirst->pprev;
+    assert(pindexFirst);
+
+    // Limit adjustment step
+    int64 nActualTimespan = pindexLast->GetBlockTime() - pindexFirst->GetBlockTime();
+    printf("  nActualTimespan = %"PRI64d"  before bounds\n", nActualTimespan);
+
+
+
+    CBigNum bnNew;
+    bnNew.SetCompact(pindexLast->nBits);
+
+    if (nActualTimespan < (retargetTimespan - (retargetTimespan/4)) ) nActualTimespan = (retargetTimespan - (retargetTimespan/4));
+    if (nActualTimespan > (retargetTimespan + (retargetTimespan/2)) ) nActualTimespan = (retargetTimespan + (retargetTimespan/2));
+
+    // Retarget
+    bnNew *= nActualTimespan;
+    bnNew /= retargetTimespan;
+
+    /// debug print
+    printf("DigiShield RETARGET \n");
+    printf("retargetTimespan = %"PRI64d"    nActualTimespan = %"PRI64d"\n", retargetTimespan, nActualTimespan);
+    printf("Before: %08x  %s\n", pindexLast->nBits, CBigNum().SetCompact(pindexLast->nBits).getuint256().ToString().c_str());
+    printf("After:  %08x  %s\n", bnNew.GetCompact(), bnNew.getuint256().ToString().c_str());
+
+
+    if (bnNew > bnProofOfWorkLimit)
+        bnNew = bnProofOfWorkLimit;
+
+
+
+    return bnNew.GetCompact();
+}
+
 unsigned int static GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock)
 {
-	int DiffMode = 1;
-	if (fTestNet)
-	{
-		if (pindexLast->nHeight+1 >= 100) { DiffMode = 2; }
-	}
-	else
-	{
-		if (pindexLast->nHeight+1 >= 227000) { DiffMode = 2; }
-	}
+    int DiffMode = 1;
+    if (fTestNet)
+    {
+        if (pindexLast->nHeight+1 >= 100) { DiffMode = 2; }
+    }
+    else
+    {
+        if (pindexLast->nHeight+1 >= 227000 && pindexLast->nHeight+1 < 445000) { DiffMode = 2; }
+        else if (pindexLast->nHeight+1 >= 445000) { DiffMode = 3; }
+    }
 
-	if (DiffMode == 1) { return GetNextWorkRequired_V1(pindexLast, pblock); }
-	else if (DiffMode == 2) { return GetNextWorkRequired_V2(pindexLast, pblock); }
-	return GetNextWorkRequired_V2(pindexLast, pblock);
+    if (DiffMode == 1) { return GetNextWorkRequired_V1(pindexLast, pblock); }
+    else if (DiffMode == 2) { return GetNextWorkRequired_V2(pindexLast, pblock); }
+    else if (DiffMode == 3) { return DigiShield(pindexLast, pblock); }
+    return DigiShield(pindexLast, pblock);
 }
 
 bool CheckProofOfWork(uint256 hash, unsigned int nBits)

src/qt/forms/aboutdialog.ui

@@ -115,7 +115,8 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
 
 This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.
 
-Official forum: http://forum.casinoco.in
+Website: http://casinocoin.org
+Forum: http://forums.casinocoin.org
          </string>
        </property>
        <property name="wordWrap">

src/version.cpp

@@ -8,7 +8,7 @@
 // Name of client reported in the 'version' message. Report the same name
 // for both bitcoind and bitcoin-qt, to make it harder for attackers to
 // target servers or GUI users specifically.
-const std::string CLIENT_NAME("transcoder");
+const std::string CLIENT_NAME("digishield");
 
 // Client version number
 #define CLIENT_VERSION_SUFFIX   "-beta"

src/version.h

@@ -25,13 +25,13 @@ extern const std::string CLIENT_DATE;
 // network protocol versioning
 //
 
-static const int PROTOCOL_VERSION = 70002;
+static const int PROTOCOL_VERSION = 70003;
 
 // intial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
 
 // disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION = 60002;
+static const int MIN_PEER_PROTO_VERSION = 60002; // TODO: Change to 70003 before block 445000 to force new client downloading and therefore doing the actual hard fork
 
 // nTime field added to CAddress, starting with this version;
 // if possible, avoid requesting addresses nodes older than this