Merge pull request #4 from phm87/patch-6

AdaptivePoW integration: fix compilation warnings
chips-blockchain · Oct 29, 2020 · c36a0c0 · c36a0c0
2 parents 730d839 + 94ed553
commit c36a0c0
Show file tree

Hide file tree

Showing 17 changed files with 854 additions and 103 deletions.
diff --git a/build.sh b/build.sh
@@ -2,29 +2,42 @@
 # EMC2 build script for Ubuntu & Debian 9 v.3 (c) Decker (and webworker)
 # modified for CHIPS by Duke Leto
 
-berkeleydb () {
+berkeleydb() {
     CHIPS_ROOT=$(pwd)
     CHIPS_PREFIX="${CHIPS_ROOT}/db4"
     mkdir -p $CHIPS_PREFIX
     wget -N 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
     echo '12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef db-4.8.30.NC.tar.gz' | sha256sum -c
     tar -xzvf db-4.8.30.NC.tar.gz
-    cd db-4.8.30.NC/build_unix/
+    cat <<-EOL >atomic-builtin-test.cpp
+        #include <stdint.h>
+        #include "atomic.h"
 
+        int main() {
+        db_atomic_t *p; atomic_value_t oldval; atomic_value_t newval;
+        __atomic_compare_exchange(p, oldval, newval);
+        return 0;
+        }
+EOL
+    if g++ atomic-builtin-test.cpp -I./db-4.8.30.NC/dbinc -DHAVE_ATOMIC_SUPPORT -DHAVE_ATOMIC_X86_GCC_ASSEMBLY -o atomic-builtin-test 2>/dev/null; then
+        echo "No changes to bdb source are needed ..."
+        rm atomic-builtin-test 2>/dev/null
+    else
+        echo "Updating atomic.h file ..."
+        sed -i 's/__atomic_compare_exchange/__atomic_compare_exchange_db/g' db-4.8.30.NC/dbinc/atomic.h
+    fi
+    cd db-4.8.30.NC/build_unix/
     ../dist/configure -enable-cxx -disable-shared -with-pic -prefix=$CHIPS_PREFIX
-
     make install
     cd $CHIPS_ROOT
 }
 
-buildchips () {
+buildCHIPS() {
     git pull
-    make clean
     ./autogen.sh
     ./configure LDFLAGS="-L${CHIPS_PREFIX}/lib/" CPPFLAGS="-I${CHIPS_PREFIX}/include/" --with-gui=no --disable-tests --disable-bench --without-miniupnpc --enable-experimental-asm --enable-static --disable-shared
     make -j$(nproc)
 }
-
 berkeleydb
-buildchips
+buildCHIPS
 echo "Done building CHIPS!"
diff --git a/configure.ac b/configure.ac
@@ -5,10 +5,10 @@ define(_CLIENT_VERSION_MINOR, 16)
 define(_CLIENT_VERSION_REVISION, 99)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, false)
-define(_COPYRIGHT_YEAR, 2018)
+define(_COPYRIGHT_YEAR, 2020)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
-define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]])
-AC_INIT([Chips Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/bitcoin/bitcoin/issues],[bitcoin],[https://bitcoincore.org/])
+define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core and Chips Core]])
+AC_INIT([Chips Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/jl777/chips3/issues],[chips],[https://komodoplatform.com/])
 AC_CONFIG_SRCDIR([src/validation.cpp])
 AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
 AC_CONFIG_AUX_DIR([build-aux])

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -2,7 +2,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-bin_PROGRAMS += qt/bitcoin-qt
+bin_PROGRAMS += qt/chips-qt
 EXTRA_LIBRARIES += qt/libbitcoinqt.a
 
 # bitcoin qt core #
@@ -381,37 +381,37 @@ QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI:
 # Most files will depend on the forms and moc files as includes. Generate them
 # before anything else.
 $(QT_MOC): $(QT_FORMS_H)
-$(qt_libbitcoinqt_a_OBJECTS) $(qt_bitcoin_qt_OBJECTS) : | $(QT_MOC)
+$(qt_libbitcoinqt_a_OBJECTS) $(qt_chips_qt_OBJECTS) : | $(QT_MOC)
 
 #Generating these with a half-written protobuf header leads to wacky results.
 #This makes sure it's done.
 $(QT_MOC): $(PROTOBUF_H)
 $(QT_MOC_CPP): $(PROTOBUF_H)
 
 # bitcoin-qt binary #
-qt_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
+qt_chips_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
   $(QT_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS)
-qt_bitcoin_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
+qt_chips_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
 
-qt_bitcoin_qt_SOURCES = qt/bitcoin.cpp
+qt_chips_qt_SOURCES = qt/bitcoin.cpp
 if TARGET_DARWIN
-  qt_bitcoin_qt_SOURCES += $(BITCOIN_MM)
+  qt_chips_qt_SOURCES += $(BITCOIN_MM)
 endif
 if TARGET_WINDOWS
-  qt_bitcoin_qt_SOURCES += $(BITCOIN_RC)
+  qt_chips_qt_SOURCES += $(BITCOIN_RC)
 endif
-qt_bitcoin_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER)
+qt_chips_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER) $(LIBCRYPTOCONDITIONS)
 if ENABLE_WALLET
-qt_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
+qt_chips_qt_LDADD += $(LIBBITCOIN_WALLET)
 endif
 if ENABLE_ZMQ
-qt_bitcoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
+qt_chips_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
 endif
-qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \
+qt_chips_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \
   $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
   $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
-qt_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
-qt_bitcoin_qt_LIBTOOLFLAGS = --tag CXX
+qt_chips_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
+qt_chips_qt_LIBTOOLFLAGS = --tag CXX
 
 #locale/foo.ts -> locale/foo.qm
 QT_QM=$(QT_TS:.ts=.qm)
@@ -442,17 +442,11 @@ CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda
 
 CLEANFILES += $(CLEAN_QT)
 
-bitcoin_qt_clean: FORCE
-	rm -f $(CLEAN_QT) $(qt_libbitcoinqt_a_OBJECTS) $(qt_bitcoin_qt_OBJECTS) qt/bitcoin-qt$(EXEEXT) $(LIBBITCOINQT)
-
-bitcoin_qt : qt/bitcoin-qt$(EXEEXT)
-
 chips_qt_clean: FORCE
-	rm -f $(CLEAN_QT) $(qt_libbitcoinqt_a_OBJECTS) $(qt_bitcoin_qt_OBJECTS) qt/chips-qt$(EXEEXT) $(LIBBITCOINQT)
+	rm -f $(CLEAN_QT) $(qt_libbitcoinqt_a_OBJECTS) $(qt_chips_qt_OBJECTS) qt/chips-qt$(EXEEXT) $(LIBBITCOINQT)
 
 chips_qt : qt/chips-qt$(EXEEXT)
 
-
 ui_%.h: %.ui
 	@test -f $(UIC)
 	@$(MKDIR_P) $(@D)

diff --git a/src/cc/betprotocol.cpp b/src/cc/betprotocol.cpp
@@ -11,7 +11,7 @@
 std::vector<CC*> BetProtocol::PlayerConditions()
 {
     std::vector<CC*> subs;
-    for (int i=0; i<players.size(); i++)
+    for (size_t i=0; i<players.size(); i++)
         subs.push_back(CCNewSecp256k1(players[i]));
     return subs;
 }
@@ -41,7 +41,7 @@ CMutableTransaction BetProtocol::MakeSessionTx(CAmount spendFee)
     mtx.vout.push_back(CTxOut(spendFee, CCPubKey(disputeCond)));
     cc_free(disputeCond);
 
-    for (int i=0; i<players.size(); i++) {
+    for (size_t i=0; i<players.size(); i++) {
         CC *cond = CCNewSecp256k1(players[i]);
         mtx.vout.push_back(CTxOut(spendFee, CCPubKey(cond)));
         cc_free(cond);
@@ -54,7 +54,7 @@ CMutableTransaction BetProtocol::MakeDisputeTx(uint256 signedSessionTxHash, uint
 {
     CMutableTransaction mtx;
 
-    CC *disputeCond = MakeDisputeCond();
+    //CC *disputeCond = MakeDisputeCond();
     mtx.vin.push_back(CTxIn(signedSessionTxHash, 0, CScript()));
 
     std::vector<unsigned char> result(vmResultHash.begin(), vmResultHash.begin()+32);

diff --git a/src/cc/betprotocol.h b/src/cc/betprotocol.h
@@ -38,9 +38,9 @@ class BetProtocol
     std::vector<CC*> playerConditions();
 public:
     EvalCode disputeCode;
-    std::vector<CPubKey> players;
-    std::vector<unsigned char> vmParams;
     uint32_t waitBlocks;
+    std::vector<unsigned char> vmParams;
+    std::vector<CPubKey> players;
 
     // Utility
     BetProtocol(EvalCode dc, std::vector<CPubKey> ps, uint32_t wb, std::vector<uint8_t> vmp)

diff --git a/src/cc/disputepayout.cpp b/src/cc/disputepayout.cpp
@@ -58,7 +58,7 @@ bool Eval::DisputePayout(AppVM &vm, std::vector<uint8_t> params, const CTransact
     // verify result from VM
     int maxLength = -1;
     uint256 bestPayout;
-    for (int i=1; i<spends.size(); i++)
+    for (size_t i=1; i<spends.size(); i++)
     {
         std::vector<unsigned char> vmState;
         if (spends[i]->vout.size() == 0) continue;

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -76,17 +76,26 @@ class CMainParams : public CChainParams {
         strNetworkID = "main";
         consensus.nSubsidyHalvingInterval = 210000;
         consensus.BIP16Height = 0;//173805; // 00000000000000ce80a7e057163a4db1d5ad7b20fb6f598c9597b9665c8fb0d4 - April 1, 2012
-        consensus.BIP34Height = 0;//227931;
-        consensus.BIP34Hash = uint256S("0x000000000000024b89b42a942fe0d9fea3bb44ab7bd1b19115dd6a759c0808b8");
+        consensus.BIP34Height = 128;//227931;
+        consensus.BIP34Hash = uint256S("0x00000010892de4ff2aac1bc7cff0d2b001caf66ca160fd47c1290dc8a49bab2c");
         consensus.BIP65Height = 0;//388381; // 000000000000000004c2b624ed5d7756c508d90fd0da2c7c679febfa6c4735f0
         consensus.BIP66Height = 0;//363725; // 00000000000000000379eaa19dce8c9b722d46ae6a57c2f1a988119488b50931
         consensus.powLimit = uint256S("0000007fffff0000000000000000000000000000000000000000000000000000");
         consensus.nPowTargetSpacing = 10;// * 60;
+        consensus.nLwmaAjustedWeight = 1350;
+
+        consensus.nPowAveragingWindow = 17;
+//      assert(maxUint/UintToArith256(consensus.powLimit) >= consensus.nPowAveragingWindow);
+        consensus.nPowMaxAdjustDown = 32; // 32% adjustment down
+        consensus.nPowMaxAdjustUp = 16; // 16% adjustment up
+
         consensus.fPowAllowMinDifficultyBlocks = false;
         consensus.nPowTargetTimespan = 17 * consensus.nPowTargetSpacing;
         consensus.fPowNoRetargeting = false;
         consensus.nRuleChangeActivationThreshold = 1916; // 95% of 2016
+        consensus.nAdaptivePoWActivationThreshold = 6874120; // (approx 23th Aug 2020, 9:00 PM UTC)
         consensus.nMinerConfirmationWindow = 2016; // nPowTargetTimespan / nPowTargetSpacing
+//        consensus.nMinerConfirmationWindowApow = 17; // 17 after apow HF ; nPowTargetTimespan / nPowTargetSpacing
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28;
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1199145601; // January 1, 2008
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008
@@ -148,6 +157,8 @@ class CMainParams : public CChainParams {
         vSeeds.emplace_back("seed.bitcoin.jonasschnelli.ch", true); // Jonas Schnelli, only supports x1, x5, x9, and xd
         vSeeds.emplace_back("seed.btc.petertodd.org", true); // Peter Todd, only supports x1, x5, x9, and xd*/
 
+        vSeeds.emplace_back("seed.chips.kmd.sh"); // static chips seed, supports only x9
+
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,60);
         base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,85);
         base58Prefixes[SECRET_KEY] =     std::vector<unsigned char>(1,188);
@@ -178,18 +189,76 @@ class CMainParams : public CChainParams {
                 {295000, uint256S("0x00000000000000004d9b4ef50f0f9d686fd69db2e03af35a100370c64632a983")},
 				*/
 
-                {  7777, uint256S("0x00000006c5f3ba03a16bf47485529cf8c598e0d42705d21a0aa11fe7bfa1879b")},
-                { 37777, uint256S("0x00000041db70ab43c78f202effd4437046587c6720b20fbc083577c095240be4")},
-                { 97777, uint256S("0x00000000000000bb8534e7ac433b2d9d6586a4e9013fb40812a700ee6174fae8")},
-                {137777, uint256S("0x00000000000000358f2309327e7cf401a450e5e6cd44638898cd406701961417")},
-                {177777, uint256S("0x0000000000000147430d364189add944a595c6f8645183a7b737375e4be40b51")},
-                {207777, uint256S("0x000000000000000e08d5474ebf2982fae5202d78e95f005d6f59820bb204c6e2")},
-                {237777, uint256S("0x0000000000000043ebf0667e70db2718d4dc677bd0f7683a092659ec2300fd43")},
-                {257777, uint256S("0x0000000000000046f51946ac40b4137f81ab28034334a8373817a1f3cb360fe2")},
-                {307777, uint256S("0x000000000000001d19cebca2eca45ae2da3b3a2c96b69d4b5d8d7141eeb91cdd")},
-                {337777, uint256S("0x000000000000000ec4ac2ee7986632de74601b1100519bf3f31b8172078006e0")},
-                {377777, uint256S("0x000000000000002bb552a65c252af82ae648c2a5c9c65d14d05fe8c568118a8d")},
-                {406777, uint256S("0x000000000000004c776cbbf999a5c16b71bfec3c8e0f01e5fc963bd226b2ddc0")},
+                {	1,	uint256S("0x000000582fe9d30a3fc3d081212f26d9837308bd5483effcd41bc43a95d3259e")},
+                {	128,	uint256S("0x00000010892de4ff2aac1bc7cff0d2b001caf66ca160fd47c1290dc8a49bab2c")},
+                {	100000,	uint256S("0x000000000000048ed22d2e5e690295d039ca31dc32793b51fe1f096b33108afc")},
+                {	200000,	uint256S("0x00000000000000c614b8cdab56a19c6fb20d24dd9afb39ddfa6ce57c2b3d8c00")},
+                {	300000,	uint256S("0x00000000000000e2935269a077f5032fa43b5e298b510a12dc01516fd533be34")},
+                {	400000,	uint256S("0x0000000000000098f0dc5619032906d42643f46603a5732bc7777dd2163eff2d")},
+                {	500000,	uint256S("0x000000000000005df6dbf3f0b6716af0dbf30d3dcfeb5ff08a4e23bff11b6a0d")},
+                {	600000,	uint256S("0x0000000000000027735ac1056b72b3f92224ea06d6d3c3f821ff3be971372d7e")},
+                {	700000,	uint256S("0x000000000000004381c3ab4ce6a48d62dc2b36ddd8082a485da2e8c48e63d02e")},
+                {	800000,	uint256S("0x00000000000000b57f3e10a045ab233b502f260d6d63df7b0960307677a60d74")},
+                {	900000,	uint256S("0x00000000000002e517ac59be3d9c34f9dc2f5f8c7fca285258762e5bfe7b9be3")},
+                {	1000000,	uint256S("0x00000000000000410fbac9b1bf3f1857e247d7afc56d9e80c806ea96f84c48ef")},
+                {	1100000,	uint256S("0x0000000000000030b11d70e4d4b2e13418d84fd7bf2f5ffafa7ab0ff48f78d60")},
+                {	1200000,	uint256S("0x0000000000000068cc3fbfcc86d082b1606c38d697abdded2db3b593d8018978")},
+                {	1300000,	uint256S("0x0000000000000151389ce46530379455a9dbc8662d9b3f351892ae247d34a766")},
+                {	1400000,	uint256S("0x00000000000002ff31efd23b1d2dae5b054b5ec171155044016ad2bc41cc689b")},
+                {	1500000,	uint256S("0x000000000000043818ec8d4c9cbf436309ee893a96a41d78f03465b619bbcbfb")},
+                {	1600000,	uint256S("0x00000000000000627d8da7b2fd558c2bfcd4918b6ac04dbee23bbb0c3c370047")},
+                {	1700000,	uint256S("0x00000000000009e4e5ecd676d07e3cb4a638be34844491141c55f0812f9ab75c")},
+                {	1800000,	uint256S("0x000000000000025ef6cd2fc99474b3287759d8f8e1f1f094e6e53f2cb6729aaa")},
+                {	1900000,	uint256S("0x000000000000127aeca716292c442bb415764392c1be0a7aff7e1edd563f6af4")},
+                {	2000000,	uint256S("0x000000000000416f64ab1eb65c696a299d5f2708a3d8e1519831091da34d5a10")},
+                {	2100000,	uint256S("0x0000000000000f2ada425065a2988fa96fbc2d740d0bcae2fdf57e23c19c9d9a")},
+                {	2200000,	uint256S("0x0000000000001b0868e18392b8b23411d0741dcaf055e12426c24954ff92d4ef")},
+                {	2300000,	uint256S("0x0000000000000e255ae300d2733378be63c614a23edd1f85ebf2fcbad384d19a")},
+                {	2400000,	uint256S("0x00000000000027f95c3a4a2a66c08c20133e752a670e36602140f3a0a63fcd57")},
+                {	2500000,	uint256S("0x00000000000032de2c1c05410f3c6972c20722bf7b0d4e9f20e73ed582e7ad10")},
+                {	2600000,	uint256S("0x0000000000008fe305e46a93424b0fbfcd7f1a5b40b7375a4781385b2a642dc1")},
+                {	2700000,	uint256S("0x000000000000e4a994b0d885ee8dbc6e00585f128e26339d4f24edc9e76c1369")},
+                {	2800000,	uint256S("0x000000000001277c76f334bf0eae43921a2c9936006c2f20c44822b24168bd5a")},
+                {	2900000,	uint256S("0x000000000000b32150cc454da6dae0589eab7cbb22f9a3e9f74a1801590d7ca7")},
+                {	3000000,	uint256S("0x0000000000013feb2767e71a328fb21990eb2ab19d65705a53d1c6beb6d9cd6f")},
+                {	3100000,	uint256S("0x000000000001f1a24965ea1157e6de30b90a0221d2a83d0be632a802fc9c27da")},
+                {	3200000,	uint256S("0x0000000000001966f930beaa6fb485dd03025a8c3515b304ad5176ceeaed8604")},
+                {	3300000,	uint256S("0x00000000000256a5da5fb2f99034ede916acae024b3b461f7d0771e2fccbb5eb")},
+                {	3400000,	uint256S("0x0000000000009b7c28bd7712b6e533d9308e26f23d6fcaf53dbcda2e147bb324")},
+                {	3500000,	uint256S("0x0000000000009b43fb0157e220d72355ee8e79002b28ffcb0eb90fb4894a9d80")},
+                {	3600000,	uint256S("0x000000000001b0b8ae05a429c2892f73810adb86626d1a031e1a1733cea61c5b")},
+                {	3700000,	uint256S("0x000000000000893b2f8860447a5c072bcd6dabc2e08f69ba17d8971f9a909145")},
+                {	3800000,	uint256S("0x0000000000020b5f6157a55b1375b3dfd1f49aadb514028b3e1be06bb189a77f")},
+                {	3900000,	uint256S("0x00000000000039b5e7e65be0cb17499721ea775b40dba60c0d0c30f5c363d340")},
+                {	4000000,	uint256S("0x0000000000006df059694a9dda4badf9955bc52562e91b1c40254d3974bf2118")},
+                {	4100000,	uint256S("0x00000000000071544fda01cf7a3c9512a9706af62755e0fd66a80a30b2faad5e")},
+                {	4200000,	uint256S("0x00000000000092c1a3a9da177f4ff7b972e57d01ce3be585e0efaf3d8657d5b3")},
+                {	4300000,	uint256S("0x000000000000e8c7cfd05685dd3ad12e7b4db348cb30882650cef80ca2473cc8")},
+                {	4400000,	uint256S("0x0000000000001106fc174c7c2c7e8acbfb7eca8ddb22596897ea6cc7fc1c538b")},
+                {	4500000,	uint256S("0x0000000000001b93630f855ca73a1fbbf971799ab028f1da1b380fe071525e27")},
+                {	4600000,	uint256S("0x00000000000231f0e9e70f49dc73c16694b096b3db98f76d1b00867cc498f1d0")},
+                {	4700000,	uint256S("0x00000000000118be3710ee4c8344bdaa704b76787e84d292009704b9745b8646")},
+                {	4800000,	uint256S("0x00000000000125718cc59abe8021866c2a44981d8c53f6cd668102bb2aaf1dea")},
+                {	4900000,	uint256S("0x000000000000ce024733d8bbd7a5900214a3223aa530ee4c6e2cd5e219bf77b0")},
+                {	5000000,	uint256S("0x0000000000004b0a66d187117d22b6c16bcf2125cce985a30ff7cdc1dbf3ddc7")},
+                {	5100000,	uint256S("0x0000000000011ecfaf9e97473e6ed0bcb5e392ae70decb585fd6736b295a0136")},
+                {	5200000,	uint256S("0x000000000002299db310071d6d90a321b9bc35fec7e7ada9a004b8fb498c3ae0")},
+                {	5300000,	uint256S("0x00000000000038bf60d7e698a2d622935f5fd86caf6893ceb83b2b0cb9f0b106")},
+                {	5400000,	uint256S("0x000000000000002f6c3180762adb011477cf764ca46ef1440292e507cebb7652")},
+                {	5500000,	uint256S("0x000000000002145fcc201bfc374591dad4633ef738149f0748a458b40077ffa5")},
+                {	5600000,	uint256S("0x000000000000c44d0683b5fad91a05af6a4db7597d2ba94e33a0cec5b9042bde")},
+                {	5700000,	uint256S("0x00000000000064a6bb183eb3905302fe1f57ade50be38478677b3b9dbacb04a0")},
+                {	5800000,	uint256S("0x00000000000102db5621c6435e33c9159e1a25d1f09af1156917cb35478684ab")},
+                {	5900000,	uint256S("0x000000000000424b80dda5581febd8317857723dd202fa7754116b2fbf93f415")},
+                {	6000000,	uint256S("0x00000010ad855ef0672f85277df3e4a22b85c308b69ee53ba94565237ff7e73d")},
+                {	6100000,	uint256S("0x000000000001131492d3e39fe7799ae0689e6bb93005207fa39f2fe7e2fe75c9")},
+                {	6200000,	uint256S("0x00000000000028410308873ccee8d82f03d82c913a58f9eb907333025e0d8c76")},
+                {	6300000,	uint256S("0x000000000002a406db69d89577580c048533bc92c8ed1d1f4b462eb8c5360ddf")},
+                {	6400000,	uint256S("0x000000000004ab9c4525e9efa7bb4497477edd19e0a2a3b447f69726eec909a3")},
+                {	6500000,	uint256S("0x000000000001b5d85e78071a9f5a9732dbdf0ed222804e2db30a5e712347dfb5")},
+                {	6600000,	uint256S("0x000000000006a07452e9399cb9159956b9840359ebfc1f5b7c286243edd4e587")},
+                {	6700000,	uint256S("0x00000000000119bf7cfe664f1795a678587bcacce3c2e63428eafe0587d8f8bb")},
+                {	6711111,	uint256S("0x000000000000cef16a63da7ef6bbb1d2bd2cec1faaf58792be564d4e4db63fa4")}
 
             }
         };