fix for pool mining and some txs issues

mooncoincore · Dec 30, 2017 · b257fcd · b257fcd
1 parent 0fbf685
commit b257fcd
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 46 deletions.
diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
@@ -2,7 +2,7 @@
 ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
 ##               by inline-source v2016-02-21.11
 
-# libtool (GNU libtool) 2.4.6.40-6ca5
+# libtool (GNU libtool) 2.4.6.40-6ca5-dirty
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <[email protected]>, 1996
 
@@ -31,7 +31,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4.6.40-6ca5
+VERSION=2.4.6.40-6ca5-dirty
 package_revision=2.4.6.40
 
 
@@ -2176,7 +2176,7 @@ func_version ()
 # End:
 
 # Set a version string.
-scriptversion='(GNU libtool) 2.4.6.40-6ca5'
+scriptversion='(GNU libtool) 2.4.6.40-6ca5-dirty'
 
 
 # func_echo ARG...
@@ -2267,7 +2267,7 @@ include the following information:
        compiler:       $LTCC
        compiler flags: $LTCFLAGS
        linker:         $LD (gnu? $with_gnu_ld)
-       version:        $progname (GNU libtool) 2.4.6.40-6ca5
+       version:        $progname (GNU libtool) 2.4.6.40-6ca5-dirty
        automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
 

diff --git a/build-aux/m4/ltversion.m4 b/build-aux/m4/ltversion.m4
@@ -12,11 +12,11 @@
 # serial 4219 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4.6.40-6ca5])
+m4_define([LT_PACKAGE_VERSION], [2.4.6.40-6ca5-dirty])
 m4_define([LT_PACKAGE_REVISION], [2.4.6.40])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.6.40-6ca5'
+[macro_version='2.4.6.40-6ca5-dirty'
 macro_revision='2.4.6.40'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)

diff --git a/configure b/configure
@@ -5529,7 +5529,7 @@ esac
 
 
 
-macro_version='2.4.6.40-6ca5'
+macro_version='2.4.6.40-6ca5-dirty'
 macro_revision='2.4.6.40'
 
 

diff --git a/contrib/devtools/split-debug.sh b/contrib/devtools/split-debug.sh
@@ -4,7 +4,7 @@ if [ $# -ne 3 ];
     then echo "usage: $0 <input> <stripped-binary> <debug-binary>"
 fi
 
-/usr/bin/i686-w64-mingw32-objcopy --enable-deterministic-archives -p --only-keep-debug $1 $3
-/usr/bin/i686-w64-mingw32-objcopy --enable-deterministic-archives -p --strip-debug $1 $2
-/usr/bin/i686-w64-mingw32-strip --enable-deterministic-archives -p -s $2
-/usr/bin/i686-w64-mingw32-objcopy --enable-deterministic-archives -p --add-gnu-debuglink=$3 $2
+/usr/bin/x86_64-w64-mingw32-objcopy --enable-deterministic-archives -p --only-keep-debug $1 $3
+/usr/bin/x86_64-w64-mingw32-objcopy --enable-deterministic-archives -p --strip-debug $1 $2
+/usr/bin/x86_64-w64-mingw32-strip --enable-deterministic-archives -p -s $2
+/usr/bin/x86_64-w64-mingw32-objcopy --enable-deterministic-archives -p --add-gnu-debuglink=$3 $2
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -86,7 +86,7 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008
 
         // Deployment of BIP68, BIP112, and BIP113.
-        consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 1;
+        consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0;
         consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1517097600; // January 28, 2018
         consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1553990400; // March 31st, 2019
 
@@ -142,9 +142,7 @@ class CMainParams : public CChainParams {
 			(1000000, uint256S("0xd806ec36632672626e7a8e764948ea09ff69cf0360edc427008accf68b8fcf6d"))
 			(1100000, uint256S("0x6988ca75c6bcba6253f4f775788785e71e1efae72c05d678386c3053b2c15863"))
             (1110000, uint256S("0x084bb5c11d303ad2e061c81921fbde3f07197898e63a59836399218bf97eabc1"))
-            (1112500, uint256S("0xe78124b931c6628967b756a1200bf9b5917693536eaac520f876dfe2b35e6637"))
-            (1150000, uint256S("0xab8169593fa5e3a97cf40c596651bea5b4155d2cad3186e3b312ac0a00a46d88"))
-            (1170000, uint256S("0x6fa2923591d035bfdd3e0d11e190e28468e07baa727a1f1725214b95b479134c")),
+            (1112500, uint256S("0xe78124b931c6628967b756a1200bf9b5917693536eaac520f876dfe2b35e6637")),
 			1495626117, // * UNIX timestamp of last checkpoint block
 			1893671,    // * total number of transactions between genesis and last checkpoint
 			            //   (the tx=... number in the SetBestChain debug.log lines)

diff --git a/src/libbitcoin_zmq.a b/src/libbitcoin_zmq.a
diff --git a/src/main.h b/src/main.h
@@ -43,7 +43,7 @@ struct PrecomputedTransactionData;
 struct CNodeStateStats;
 struct LockPoints;
 
-/** Default for DEFAULT_WHITELISTRELAY. */
+/** Default for DEFAULT_WHITELISTRELAY. */ 
 static const bool DEFAULT_WHITELISTRELAY = true;
 /** Default for DEFAULT_WHITELISTFORCERELAY. */
 static const bool DEFAULT_WHITELISTFORCERELAY = true;

diff --git a/src/obj/build.h b/src/obj/build.h
@@ -1 +1 @@
-#define BUILD_SUFFIX 3006d54-
+#define BUILD_SUFFIX 0fbf685-
diff --git a/src/pow.cpp b/src/pow.cpp
@@ -187,8 +187,8 @@ unsigned int GetNextWorkRequired_V2(const CBlockIndex* pindexLast, const CBlockH
 
 unsigned int static DigiShield(const CBlockIndex* pindexLast, const CBlockHeader *pblock, const Consensus::Params& params)
 {
-    CBigNum bnProofOfWorkLimit = UintToArith256(params.powLimit).GetCompact();
-    unsigned int nProofOfWorkLimit = bnProofOfWorkLimit.GetCompact();
+    const arith_uint256 bnProofOfWorkLimit = UintToArith256(params.powLimit);
+    const unsigned int nProofOfWorkLimit = UintToArith256(params.powLimit).GetCompact();
     // DigiShield difficulty retarget system
     bool fTestNet = false;
     int blockstogoback = 0;
@@ -234,7 +234,7 @@ unsigned int static DigiShield(const CBlockIndex* pindexLast, const CBlockHeader
     int64 nActualTimespan = pindexLast->GetBlockTime() - pindexFirst->GetBlockTime();
     LogPrintf("  nActualTimespan = %g before bounds\n", nActualTimespan);
 
-    CBigNum bnNew;
+    arith_uint256 bnNew;
     bnNew.SetCompact(pindexLast->nBits);
 
     if (nActualTimespan < (retargetTimespan - (retargetTimespan/4)) ) nActualTimespan = (retargetTimespan - (retargetTimespan/4));
@@ -248,7 +248,7 @@ unsigned int static DigiShield(const CBlockIndex* pindexLast, const CBlockHeader
     LogPrintf("DigiShield RETARGET \n");
     LogPrintf("retargetTimespan = %g    nActualTimespan = %g \n", retargetTimespan, nActualTimespan);
     LogPrintf("Before: %08x  %s\n", pindexLast->nBits, CBigNum().SetCompact(pindexLast->nBits).getuint256().ToString().c_str());
-    LogPrintf("After:  %08x  %s\n", bnNew.GetCompact(), bnNew.getuint256().ToString().c_str());
+    LogPrintf("After:  %08x  %s\n", bnNew.GetCompact(), bnNew.ToString().c_str());
 
     if (bnNew > bnProofOfWorkLimit)
         bnNew = bnProofOfWorkLimit;

diff --git a/src/secp256k1/build-aux/ltmain.sh b/src/secp256k1/build-aux/ltmain.sh
@@ -2,7 +2,7 @@
 ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
 ##               by inline-source v2016-02-21.11
 
-# libtool (GNU libtool) 2.4.6.40-6ca5
+# libtool (GNU libtool) 2.4.6.40-6ca5-dirty
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <[email protected]>, 1996
 
@@ -31,7 +31,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4.6.40-6ca5
+VERSION=2.4.6.40-6ca5-dirty
 package_revision=2.4.6.40
 
 
@@ -2176,7 +2176,7 @@ func_version ()
 # End:
 
 # Set a version string.
-scriptversion='(GNU libtool) 2.4.6.40-6ca5'
+scriptversion='(GNU libtool) 2.4.6.40-6ca5-dirty'
 
 
 # func_echo ARG...
@@ -2267,7 +2267,7 @@ include the following information:
        compiler:       $LTCC
        compiler flags: $LTCFLAGS
        linker:         $LD (gnu? $with_gnu_ld)
-       version:        $progname (GNU libtool) 2.4.6.40-6ca5
+       version:        $progname (GNU libtool) 2.4.6.40-6ca5-dirty
        automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
 

diff --git a/src/secp256k1/build-aux/m4/ltversion.m4 b/src/secp256k1/build-aux/m4/ltversion.m4
@@ -12,11 +12,11 @@
 # serial 4219 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4.6.40-6ca5])
+m4_define([LT_PACKAGE_VERSION], [2.4.6.40-6ca5-dirty])
 m4_define([LT_PACKAGE_REVISION], [2.4.6.40])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.6.40-6ca5'
+[macro_version='2.4.6.40-6ca5-dirty'
 macro_revision='2.4.6.40'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)

diff --git a/src/secp256k1/configure b/src/secp256k1/configure
@@ -3046,7 +3046,7 @@ esac
 
 
 
-macro_version='2.4.6.40-6ca5'
+macro_version='2.4.6.40-6ca5-dirty'
 macro_revision='2.4.6.40'
 
 

diff --git a/src/secp256k1/libsecp256k1.pc b/src/secp256k1/libsecp256k1.pc
@@ -1,4 +1,4 @@
-prefix=/run/media/billos/burstcoin/mooncoin/mooncoincore/mooncoinRepo/depends/i686-w64-mingw32
+prefix=/run/media/billos/burstcoin/mooncoin/mooncoincore/wallet/depends/x86_64-w64-mingw32
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include

diff --git a/src/secp256k1/src/libsecp256k1-config.h b/src/secp256k1/src/libsecp256k1-config.h
@@ -57,7 +57,7 @@
 #define HAVE_UNISTD_H 1
 
 /* Define to 1 if the system has the type `__int128'. */
-/* #undef HAVE___INT128 */
+#define HAVE___INT128 1
 
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #define LT_OBJDIR ".libs/"
@@ -87,7 +87,7 @@
 #define STDC_HEADERS 1
 
 /* Define this symbol to enable x86_64 assembly optimizations */
-/* #undef USE_ASM_X86_64 */
+#define USE_ASM_X86_64 1
 
 /* Define this symbol to use a statically generated ecmult table */
 #define USE_ECMULT_STATIC_PRECOMPUTATION 1
@@ -100,10 +100,10 @@
 /* #undef USE_EXTERNAL_ASM */
 
 /* Define this symbol to use the FIELD_10X26 implementation */
-#define USE_FIELD_10X26 1
+/* #undef USE_FIELD_10X26 */
 
 /* Define this symbol to use the FIELD_5X52 implementation */
-/* #undef USE_FIELD_5X52 */
+#define USE_FIELD_5X52 1
 
 /* Define this symbol to use the native field inverse implementation */
 #define USE_FIELD_INV_BUILTIN 1
@@ -118,10 +118,10 @@
 #define USE_NUM_NONE 1
 
 /* Define this symbol to use the 4x64 scalar implementation */
-/* #undef USE_SCALAR_4X64 */
+#define USE_SCALAR_4X64 1
 
 /* Define this symbol to use the 8x32 scalar implementation */
-#define USE_SCALAR_8X32 1
+/* #undef USE_SCALAR_8X32 */
 
 /* Define this symbol to use the native scalar inverse implementation */
 #define USE_SCALAR_INV_BUILTIN 1

diff --git a/src/univalue/build-aux/ltmain.sh b/src/univalue/build-aux/ltmain.sh
@@ -2,7 +2,7 @@
 ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
 ##               by inline-source v2016-02-21.11
 
-# libtool (GNU libtool) 2.4.6.40-6ca5
+# libtool (GNU libtool) 2.4.6.40-6ca5-dirty
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <[email protected]>, 1996
 
@@ -31,7 +31,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4.6.40-6ca5
+VERSION=2.4.6.40-6ca5-dirty
 package_revision=2.4.6.40
 
 
@@ -2176,7 +2176,7 @@ func_version ()
 # End:
 
 # Set a version string.
-scriptversion='(GNU libtool) 2.4.6.40-6ca5'
+scriptversion='(GNU libtool) 2.4.6.40-6ca5-dirty'
 
 
 # func_echo ARG...
@@ -2267,7 +2267,7 @@ include the following information:
        compiler:       $LTCC
        compiler flags: $LTCFLAGS
        linker:         $LD (gnu? $with_gnu_ld)
-       version:        $progname (GNU libtool) 2.4.6.40-6ca5
+       version:        $progname (GNU libtool) 2.4.6.40-6ca5-dirty
        automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
 

diff --git a/src/univalue/build-aux/m4/ltversion.m4 b/src/univalue/build-aux/m4/ltversion.m4
@@ -12,11 +12,11 @@
 # serial 4219 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4.6.40-6ca5])
+m4_define([LT_PACKAGE_VERSION], [2.4.6.40-6ca5-dirty])
 m4_define([LT_PACKAGE_REVISION], [2.4.6.40])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.6.40-6ca5'
+[macro_version='2.4.6.40-6ca5-dirty'
 macro_revision='2.4.6.40'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)

diff --git a/src/univalue/configure b/src/univalue/configure
@@ -2898,7 +2898,7 @@ esac
 
 
 
-macro_version='2.4.6.40-6ca5'
+macro_version='2.4.6.40-6ca5-dirty'
 macro_revision='2.4.6.40'
 
 

diff --git a/src/univalue/pc/libunivalue-uninstalled.pc b/src/univalue/pc/libunivalue-uninstalled.pc
@@ -1,4 +1,4 @@
-prefix=/run/media/billos/burstcoin/mooncoin/mooncoincore/mooncoinRepo/depends/i686-w64-mingw32
+prefix=/run/media/billos/burstcoin/mooncoin/mooncoincore/wallet/depends/x86_64-w64-mingw32
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include

diff --git a/src/univalue/pc/libunivalue.pc b/src/univalue/pc/libunivalue.pc
@@ -1,4 +1,4 @@
-prefix=/run/media/billos/burstcoin/mooncoin/mooncoincore/mooncoinRepo/depends/i686-w64-mingw32
+prefix=/run/media/billos/burstcoin/mooncoin/mooncoincore/wallet/depends/x86_64-w64-mingw32
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -48,9 +48,9 @@ static const CAmount DEFAULT_TRANSACTION_MINFEE = 100000;
 //! minimum change amount
 static const CAmount MIN_CHANGE = CENT;
 //! Default for -spendzeroconfchange
-static const bool DEFAULT_SPEND_ZEROCONF_CHANGE = true;
+static const bool DEFAULT_SPEND_ZEROCONF_CHANGE = false;
 //! Default for -sendfreetransactions
-static const bool DEFAULT_SEND_FREE_TRANSACTIONS = false;
+static const bool DEFAULT_SEND_FREE_TRANSACTIONS = true; 
 //! Default for -walletrejectlongchains
 static const bool DEFAULT_WALLET_REJECT_LONG_CHAINS = false;
 //! -txconfirmtarget default
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5529,7 +5529,7 @@ esac



		macro_version='2.4.6.40-6ca5'
		macro_version='2.4.6.40-6ca5-dirty'
		macro_revision='2.4.6.40'


Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define BUILD_SUFFIX 3006d54-
		#define BUILD_SUFFIX 0fbf685-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3046,7 +3046,7 @@ esac



		macro_version='2.4.6.40-6ca5'
		macro_version='2.4.6.40-6ca5-dirty'
		macro_revision='2.4.6.40'


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2898,7 +2898,7 @@ esac



		macro_version='2.4.6.40-6ca5'
		macro_version='2.4.6.40-6ca5-dirty'
		macro_revision='2.4.6.40'


Expand Down