[issue-4] added messages during rescan

Running through the qmake/make process will now look for the Linux paths instead of Windows paths.  Currently, this will build on Linux, but still references a lot of Windows paths.  Doing more research, one should be able to replace all paths with Linux-based paths that should also work under CYGWIN on Windows.

.gitignore

@@ -2,13 +2,17 @@ src/*.exe
 src/casinocoin
 src/casinocoind
 src/test_casinocoin
+src/obj/*
+casinocoin-qt_plugin_import.cpp
+object_script.casinocoin-qt.Debug
+object_script.casinocoin-qt.Release
+release/*
 .*.swp
 *.*~*
 *.bak
 *.rej
 *.orig
 *.o
-*.patch
 .casinocoin
 
 # Compilation and Qt preprocessor part
@@ -31,4 +35,4 @@ qrc_*.cpp
 .DS_Store
 build
 
-!src/leveldb/Makefile
+!src/leveldb/Makefile

README.md

@@ -1,4 +1,6 @@
-<h2>Correct Wallet Version = 1.2.x</h2>
+<h2>Please download the updated wallet asap, hard fork incoming at block 546250</h2>
+[Click here to download the most recent wallet version -> 1.3.0 (Updated on July, 18 2014)](https://github.com/casinocoin/casinocoin/releases/tag/1.3.0.0 "Click to go to releases page")
+
 <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.
@@ -31,11 +33,23 @@ Technical Specifications
 
  - scrypt proof-of-work algorithm
  - 30 second block time targets
- - ~336 million total coins
+ - ~63 million total coins
  - new digishield difficulty retargetting system (from block 445000) 
- - 50 coins per block, halves every 3,153,600 blocks (~3 years)
+ - 50 coins per block, permanent reduction to 10 cons per block after block 575000
  - fair launch, absolutely no premine
 
+Casinocoin Mailing Lists
+========================
+
+If you operate a pool or service that relies on Casinocoin wallets, please subscribe to the "Csinocoin Development" mailing list for notifications of client updates, hardforks,or other issues that may impact you.
+
+ - Casinocoin Development mailing list subscription form: http://eepurl.com/WGcoP
+
+If you are a community mber interested in more general announcements related to Casinocoin, please subscribe to the "Casinocoin Announcements" mailing list.
+
+ - Casinocoin Announcements mailing list subscription form: http://eepurl.com/WGeu1
+
+
 
 Links
 ======

casinocoin-qt.pro

@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = casinocoin-qt
 macx:TARGET = "CasinoCoin-Qt"
-VERSION = 1.2.0.0
+VERSION = 1.3.0.0
 INCLUDEPATH += src src/json src/qt
 QT += core gui network
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
@@ -19,14 +19,40 @@ CONFIG += thread
 #    BOOST_INCLUDE_PATH, BOOST_LIB_PATH, BDB_INCLUDE_PATH,
 #    BDB_LIB_PATH, OPENSSL_INCLUDE_PATH and OPENSSL_LIB_PATH respectively
 
-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.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
+win32 {
+    BOOST_LIB_SUFFIX=-mt
+    BOOST_THREAD_LIB_SUFFIX=_win32-mt
+    BDB_INCLUDE_PATH=/home/ubuntu/deps/windows/db-4.8.30.NC/build_unix
+    BDB_LIB_PATH=/home/ubuntu/deps/windows/db-4.8.30.NC/build_unix
+    OPENSSL_INCLUDE_PATH=/home/ubuntu/deps/windows/openssl-1.0.1h/include
+    OPENSSL_LIB_PATH=/home/ubuntu/deps/windows/openssl-1.0.1h
+    MINIUPNPC_INCLUDE_PATH=/home/ubuntu/deps/windows/
+    MINIUPNPC_LIB_PATH=/home/ubuntu/deps/windows/miniupnpc
+    QRENCODE_INCLUDE_PATH=/home/ubuntu/deps/windows/qrencode-3.4.3
+    QRENCODE_LIB_PATH=/home/ubuntu/deps/windows/qrencode-3.4.3/.libs
+} macx {
+    BOOST_INCLUDE_PATH=/usr/local/opt/boost/include
+    BOOST_LIB_PATH=/usr/local/opt/boost/lib
+    BDB_INCLUDE_PATH=/usr/local/opt/berkeley-db4/include
+    BDB_LIB_PATH=/usr/local/opt/berkeley-db4/lib
+    OPENSSL_INCLUDE_PATH=/usr/local/opt/openssl/include
+    OPENSSL_LIB_PATH=/usr/local/opt/openssl/lib
+    MINIUPNPC_INCLUDE_PATH=/usr/local/opt/miniupnpc/include
+    MINIUPNPC_LIB_PATH=/usr/local/opt/miniupnpc/lib
+    QRENCODE_INCLUDE_PATH=/usr/local/opt/qrencode/include
+    QRENCODE_LIB_PATH=/usr/local/opt/qrencode/lib
+} else {
+    BOOST_INCLUDE_PATH=/home/ubuntu/deps/linux/boost_1_55_0
+    BOOST_LIB_PATH=/home/ubuntu/deps/linux/boost_1_55_0/stage/lib
+    BDB_INCLUDE_PATH=/home/ubuntu/deps/linux/db-4.8.30.NC/build_unix
+    BDB_LIB_PATH=/home/ubuntu/deps/linux/db-4.8.30.NC/build_unix
+    OPENSSL_INCLUDE_PATH=/home/ubuntu/deps/linux/openssl-1.0.1h/include
+    OPENSSL_LIB_PATH=/home/ubuntu/deps/linux/openssl-1.0.1h
+    MINIUPNPC_INCLUDE_PATH=/home/ubuntu/deps/linux/
+    MINIUPNPC_LIB_PATH=/home/ubuntu/deps/linux/miniupnpc
+    QRENCODE_INCLUDE_PATH=/home/ubuntu/deps/linux/qrencode-3.4.3
+    QRENCODE_LIB_PATH=/home/ubuntu/deps/linux/qrencode-3.4.3/.libs
+}
 
 OBJECTS_DIR = build
 MOC_DIR = build
@@ -141,7 +167,11 @@ QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) cl
     DEFINES += HAVE_BUILD_INFO
 }
 
-QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter -Wstack-protector
+QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter -Wno-strict-aliasing -Wstack-protector
+
+!macx {
+   QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-local-typedefs
+}
 
 # Input
 DEPENDPATH += src src/json src/qt
@@ -351,8 +381,9 @@ CODECFORTR = UTF-8
 TRANSLATIONS = $$files(src/qt/locale/bitcoin_*.ts)
 
 isEmpty(QMAKE_LRELEASE) {
-    win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
-    else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+#    win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
+#    else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+    QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
 }
 isEmpty(QM_DIR):QM_DIR = $$PWD/src/qt/locale
 # automatically build translations, so they can be included in resource file

contrib/homebrew/makefile.osx.patch

@@ -0,0 +1,48 @@
+diff --git a/src/makefile.osx b/src/makefile.osx
+index bef0ef3..07ef8d3 100644
+--- a/src/makefile.osx
++++ b/src/makefile.osx
+@@ -7,17 +7,21 @@
+ # Originally by Laszlo Hanyecz (solar@heliacal.net)
+ 
+ CXX=llvm-g++
+-DEPSDIR=/opt/local
++DEPSDIR=/usr/local
++DB4DIR=/usr/local/opt/berkeley-db4
++OPENSSLDIR=/usr/local/opt/openssl
+ 
+ INCLUDEPATHS= \
+  -I"$(CURDIR)" \
+- -I"$(CURDIR)"/obj \
++ -I"$(CURDIR)/obj" \
+  -I"$(DEPSDIR)/include" \
+- -I"$(DEPSDIR)/include/db48"
++ -I"$(DB4DIR)/include" \
++ -I"$(OPENSSLDIR)/include"
+ 
+ LIBPATHS= \
+  -L"$(DEPSDIR)/lib" \
+- -L"$(DEPSDIR)/lib/db48"
++ -L"$(DB4DIR)/lib" \
++ -L"$(OPENSSLDIR)/lib"
+ 
+ USE_UPNP:=1
+ USE_IPV6:=1
+@@ -31,14 +35,14 @@ ifdef STATIC
+ TESTLIBS += \
+  $(DEPSDIR)/lib/libboost_unit_test_framework-mt.a
+ LIBS += \
+- $(DEPSDIR)/lib/db48/libdb_cxx-4.8.a \
++ $(DB4DIR)/lib/libdb_cxx-4.8.a \
+  $(DEPSDIR)/lib/libboost_system-mt.a \
+  $(DEPSDIR)/lib/libboost_filesystem-mt.a \
+  $(DEPSDIR)/lib/libboost_program_options-mt.a \
+  $(DEPSDIR)/lib/libboost_thread-mt.a \
+  $(DEPSDIR)/lib/libboost_chrono-mt.a \
+- $(DEPSDIR)/lib/libssl.a \
+- $(DEPSDIR)/lib/libcrypto.a \
++ $(OPENSSLDIR)/lib/libssl.a \
++ $(OPENSSLDIR)/lib/libcrypto.a \
+  -lz
+ else
+ TESTLIBS += \

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       2
+#define CLIENT_VERSION_MINOR       3
 #define CLIENT_VERSION_REVISION    0
 #define CLIENT_VERSION_BUILD       0
 

src/main.cpp

@@ -1108,8 +1108,18 @@ int64 static GetBlockValue(int nHeight, int64 nFees)
         nSubsidy = 45 * COIN;
     }
 
-    // Subsidy is cut in half every 3153600 blocks, which will occur approximately every 3 years
-    nSubsidy >>= (nHeight / 3153600);
+    // Permantently reduce the number of mined coins to 10 after block 575000
+    if(nHeight > 575000){
+        if(nHeight < 3756000){
+	    nSubsidy = 10 * COIN;
+        }
+	    else
+        {
+            nSubsidy = 0 * COIN;
+        }
+    }
+
+    
 
     return nSubsidy + nFees;
 }

src/main.h

@@ -54,7 +54,7 @@ static const int64 DUST_SOFT_LIMIT = 100000; // 0.001 CSC
 /** Dust Hard Limit, ignored as wallet inputs (mininput default) */
 static const int64 DUST_HARD_LIMIT = 1000;   // 0.00001 CSC mininput
 /** No amount larger than this (in satoshi) is valid */
-static const int64 MAX_MONEY = 336000000 * COIN;
+static const int64 MAX_MONEY = 63000000 * COIN;
 inline bool MoneyRange(int64 nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
 /** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */
 static const int COINBASE_MATURITY = 8;

src/makefile.linux-mingw

@@ -2,37 +2,47 @@
 # Distributed under the MIT/X11 software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-DEPSDIR:=/usr/i686-w64-mingw32
+DEPSDIR:=/home/ubuntu/deps/windows
+BINPATH=/home/ubuntu/mxe/usr/bin
+PREFIX=i686-w64-mingw32.static
+BASEDIR=/home/ubuntu/mxe/usr/$(PREFIX)
 
-CC := i686-w64-mingw32-gcc
-CXX := i686-w64-mingw32-g++
+CC=$(BINPATH)/$(PREFIX)-gcc
+CXX=$(BINPATH)/$(PREFIX)-g++
+CPP=$(BINPATH)/$(PREFIX)-cpp
+RANLIB=$(BINPATH)/$(PREFIX)-ranlib
 
 USE_UPNP:=0
 USE_IPV6:=1
 
 INCLUDEPATHS= \
  -I"$(CURDIR)" \
- -I"$(CURDIR)"/obj \
- -I"$(DEPSDIR)/include" \
- -I"$(DEPSDIR)"
+ -I"$(CURDIR)/obj" \
+ -I"$(DEPSDIR)" \
+ -I"$(DEPSDIR)/db-4.8.30.NC/build_unix" \
+ -I"$(DEPSDIR)/openssl-1.0.1h/include" \
+ -I"$(BASEDIR)/include"
 
 LIBPATHS= \
- -L"$(DEPSDIR)/lib"
+ -L"$(DEPSDIR)/miniupnpc" \
+ -L"$(DEPSDIR)/db-4.8.30.NC/build_unix" \
+ -L"$(DEPSDIR)/openssl-1.0.1h" \
+ -L"$(BASEDIR)/lib"
 
 LIBS= \
   $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a \
- -l boost_system-mt-s \
- -l boost_filesystem-mt-s \
- -l boost_program_options-mt-s \
- -l boost_thread_win32-mt-s \
- -l boost_chrono-mt-s \
+ -l boost_system-mt \
+ -l boost_filesystem-mt \
+ -l boost_program_options-mt \
+ -l boost_thread_win32-mt \
+ -l boost_chrono-mt \
  -l db_cxx \
  -l ssl \
  -l crypto
 
 DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
 DEBUGFLAGS=-g
-xCXXFLAGS=-O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) $(CXXFLAGS)
+xCXXFLAGS=-O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter -Wno-unused-local-typedefs -Wno-strict-aliasing $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) $(CXXFLAGS)
 # enable: ASLR, DEP and large address aware
 xLDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat -Wl,--large-address-aware -static-libgcc -static-libstdc++ $(LDFLAGS)
 
@@ -101,7 +111,7 @@ all: casinocoind.exe
 DEFS += -I"$(CURDIR)/leveldb/include"
 DEFS += -I"$(CURDIR)/leveldb/helpers"
 leveldb/libleveldb.a:
-	@echo "Building LevelDB ..." && cd leveldb && TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && i686-w64-mingw32-ranlib libleveldb.a && i686-w64-mingw32-ranlib libmemenv.a && cd ..
+	@echo "Building LevelDB ..." && cd leveldb && TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && $(RANLIB) libleveldb.a && $(RANLIB) libmemenv.a && cd ..
 
 obj/build.h: FORCE
 	/bin/sh ../share/genbuild.sh obj/build.h

src/makefile.unix

@@ -5,18 +5,34 @@
 # :=0 --> UPnP support turned off by default at runtime
 # :=1 --> UPnP support turned on by default at runtime
 # :=- --> No UPnP support - miniupnp not required
-USE_UPNP:=0
+USE_UPNP:=-
 
 # :=1 --> Enable IPv6 support
 # :=0 --> Disable IPv6 support
 USE_IPV6:=1
 
+# :=1 --> Enable QR Code support
+# :=0 --> Disable QR Code support
+USE_QRCODE=1
+
+# define libraries
+BOOST_LIB_PATH=/home/ubuntu/deps/linux/boost_1_55_0/stage/lib
+BDB_LIB_PATH=/home/ubuntu/deps/linux/db-4.8.30.NC/build_unix
+OPENSSL_LIB_PATH=/home/ubuntu/deps/linux/openssl-1.0.1h
+MINIUPNPC_LIB_PATH=/home/ubuntu/deps/linux/miniupnpc
+
+# define includes
+BOOST_INCLUDE_PATH=/home/ubuntu/deps/linux/boost_1_55_0
+BDB_INCLUDE_PATH=/home/ubuntu/deps/linux/db-4.8.30.NC/build_unix
+OPENSSL_INCLUDE_PATH=/home/ubuntu/deps/linux/openssl-1.0.1h
+MINIUPNPC_INCLUDE_PATH=/home/ubuntu/deps/linux
+
 LINK:=$(CXX)
 
 DEFS=-DBOOST_SPIRIT_THREADSAFE -D_FILE_OFFSET_BITS=64
 
-DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH))
-LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH))
+DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH) $(MINIUPNPC_INCLUDE_PATH))
+LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH) $(MINIUPNPC_LIB_PATH))
 
 TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
 

src/net.cpp

@@ -1192,15 +1192,15 @@ void MapPort(bool)
 // The first name is used as information source for addrman.
 // The second name should resolve to a list of seed addresses.
 static const char *strMainNetDNSSeed[][2] = {
-	{"casinoco.in seed", "seed.casinoco.in"},
-	{"casinoco.in seed #1", "seed1.casinoco.in"},
-	{"casinoco.in seed #2", "seed2.casinoco.in"},
-	{"casinoco.in seed #3", "seed3.casinoco.in"},
+	{"casinocoin.org seed", "seed.casinocoin.org"},
+	{"casinocoin.org seed #1", "seed1.casinocoin.org"},
+	{"casinocoin.org seed #2", "seed2.casinocoin.org"},
+	{"casinocoin.org seed #3", "seed3.casinocoin.org"},
     {NULL, NULL}
 };
 
 static const char *strTestNetDNSSeed[][2] = {
-    {"casinoco.in testnet seed #1", "testnet-seed1.casinoco.in"},
+    {"casinocoin.org testnet seed #1", "testnet-seed1.casinocoin.org"},
     {NULL, NULL}
 };
 

src/obj/placeholder.txt

@@ -1 +1 @@
-To avoid compile error.
+-To avoid compile error.

src/rpcdump.cpp

@@ -67,8 +67,11 @@ Value importprivkey(const Array& params, bool fHelp)
             throw JSONRPCError(RPC_WALLET_ERROR, "Error adding key to wallet");
 
         if (fRescan) {
+            printf("Start scanning for wallet transactions, please wait, this may take a while.\n");
             pwalletMain->ScanForWalletTransactions(pindexGenesisBlock, true);
+            printf("Reaccepting wallet transactions.\n");
             pwalletMain->ReacceptWalletTransactions();
+            printf("Rescan done.\n");
         }
     }
 

src/util.h

@@ -9,9 +9,9 @@
 
 #include <stdarg.h>
 
-#ifndef WIN32
 #include <sys/types.h>
 #include <sys/time.h>
+#ifndef WIN32
 #include <sys/resource.h>
 #endif
 #include <map>

src/version.h

@@ -25,13 +25,13 @@ extern const std::string CLIENT_DATE;
 // network protocol versioning
 //
 
-static const int PROTOCOL_VERSION = 70003;
+static const int PROTOCOL_VERSION = 70004;
 
 // 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; // TODO: Change to 70003 before block 445000 to force new client downloading and therefore doing the actual hard fork
+static const int MIN_PEER_PROTO_VERSION = 70004; // TODO: Change to 70004 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