1

.gitignore

@@ -0,0 +1,19 @@
+src/diamondd
+src/test_diamond
+
+# Ignore build dir
+build/
+
+# Compilation and Qt preprocessor part
+*.qm
+Makefile
+paycoin-qt
+
+# Resources cpp
+qrc_*.cpp
+
+# Qt creator
+*.pro.user
+
+# Mac specific
+.DS_Store

COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Diamond Developers
+Copyright (c) 2013-2016 Diamond Foundation
 Copyright (c) 2011-2012 PPCoin Developers
 Copyright (c) 2009-2012 Bitcoin Developers
 

README.md

@@ -1 +1,46 @@
+------------------------------------------
+Diamond (DMD) Old Version - Do not use this Source !!
+---
+
+
+please be aware this codebase is soon set inactive
+DMD Diamond move forward to DMDv3 codebase
+balance from DMDv2 addresses will be available with same private keys in DMDv3
+
+to stay up to date following us on bitcointalk 
+https://bitcointalk.org/index.php?topic=580725.0
+and twitter @dmdcoin
+
+
+------------------------------------------
 Diamond (DMD)
+
+Instructions for compiling in Linux.
+
+Update ubuntu
+
+   sudo apt-get update
+
+*install git to download the source code
+
+    sudo apt-get install git
+
+*install the other necessary components
+
+    sudo apt-get install build-essential libboost1.55-all-dev libcurl4-openssl-dev libdb5.1-dev libdb5.1++-dev
+
+*navigate to the home directory
+
+    cd ~ *download the diamond source code
+
+    git clone https://github.com/DMDcoin/Diamond.git
+
+*navigate to the downloaded files
+
+    cd ~ *navigate to the src file in the source code
+    cd Diamond/src
+
+
+*build diamondd !This will take a while!
+
+    make -f makefile.unix USE_UPNP=-

contrib/macdeploy/fancy.plist

@@ -22,7 +22,7 @@
 			<integer>370</integer>
 			<integer>156</integer>
 		</array>
-		<key>NovaCoin-Qt.app</key>
+		<key>Diamond-Qt.app</key>
 		<array>
 			<integer>128</integer>
 			<integer>156</integer>

contrib/macdeploy/notes.txt

@@ -6,7 +6,7 @@ You will need the appscript package for the fancy disk image creation to work.
 Install it by invoking "sudo easy_install appscript".
 
 Ths script should be invoked in the target directory like this:
-$source_dir/contrib/macdeploy/macdeployqtplus NovaCoin-Qt.app -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy $source_dir/contrib/macdeploy/fancy.plist -verbose 2
+$source_dir/contrib/macdeploy/macdeployqtplus Diamond-Qt.app -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy $source_dir/contrib/macdeploy/fancy.plist -verbose 2
 
 During the process, the disk image window will pop up briefly where the fancy
 settings are applied. This is normal, please do not interfere.
@@ -19,8 +19,8 @@ Fill in the following.
 Enable custom process step: [x]
 Command: %{sourceDir}/contrib/macdeploy/macdeployqtplus
 Working directory: %{buildDir}
-Command arguments: NovaCoin-Qt.app -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy %{sourceDir}/contrib/macdeploy/fancy.plist -verbose 2
+Command arguments: Diamond-Qt.app -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy %{sourceDir}/contrib/macdeploy/fancy.plist -verbose 2
 
 After that you can start the deployment process through the menu with
-Build -> Deploy Project "novacoin-qt"
+Build -> Deploy Project "diamond-qt"
 

diamond.pro

@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = diamond-qt
-VERSION = 0.1.0.2
+VERSION = 2.1.0.4
 INCLUDEPATH += src src/json src/qt
 QT += core gui network
 DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN __NO_SYSTEM_INCLUDES
@@ -15,23 +15,34 @@ UI_DIR = build
 # UNCOMMENT THIS SECTION TO BUILD ON WINDOWS
 # Change paths if needed, these use the foocoin/deps.git repository locations
 
+win32 {
 BOOST_LIB_SUFFIX=-mgw48-mt-s-1_55
 BOOST_INCLUDE_PATH=C:/deps/boost_1_55_0
 BOOST_LIB_PATH=C:/deps/boost_1_55_0/stage/lib
 BDB_INCLUDE_PATH=C:/deps/db-4.8.30.NC/build_windows
 BDB_LIB_PATH=C:/deps/db-4.8.30.NC/build_windows
-OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.1g/include
-OPENSSL_LIB_PATH=C:/deps/openssl-1.0.1g
+OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.1h/include
+OPENSSL_LIB_PATH=C:/deps/openssl-1.0.1h
 MINIUPNPC_INCLUDE_PATH=C:/deps
-LIBPNG_INCLUDE_PATH=C:/deps/libpng-1.6.8
-LIBPNG_LIB_PATH=C:/deps/libpng-1.6.8/.libs
+LIBPNG_INCLUDE_PATH=C:/deps/libpng-1.6.10
+LIBPNG_LIB_PATH=C:/deps/libpng-1.6.10/.libs
 MINIUPNPC_LIB_PATH=C:/deps/miniupnpc
+QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.3
 QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.3/.libs
+RELEASE=1
+CONFIG += static
+}
+
+# OS X Mavericks 10.9 build
+macx:QMAKE_MAC_SDK = macosx10.9
+macx:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
+macx:USE_QRCODE=1
 
 # use: qmake "RELEASE=1"
 contains(RELEASE, 1) {
     # Mac: compile for maximum compatibility (10.5, 32-bit)
-    macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
+#    macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
+
 
     !windows:!macx {
         # Linux: static link
@@ -48,6 +59,7 @@ QMAKE_LFLAGS *= -fstack-protector-all --param ssp-buffer-size=1
 }
 # for extra security on Windows: enable ASLR and DEP via GCC linker flags
 win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
+win32:QMAKE_LFLAGS *= -Wl,--large-address-aware -static
 lessThan(QT_MAJOR_VERSION, 5): win32: QMAKE_LFLAGS *= -static
 
 # use: qmake "USE_QRCODE=1"
@@ -111,8 +123,27 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) {
     DEFINES += HAVE_BUILD_INFO
 }
 
-QMAKE_CXXFLAGS += -msse2
-QMAKE_CFLAGS += -msse2
+# If we have an ARM device, we can't use SSE2 instructions, so don't try to use them
+# Because of scrypt_mine.cpp, we also have to add a compile
+#     flag that states we *really* don't have SSE
+QMAKE_XCPUARCH = $$QMAKE_HOST.arch
+equals(QMAKE_XCPUARCH, armv7l) {
+    message(Building without SSE2 support)
+	QMAKE_CXXFLAGS += -DNOSSE
+    QMAKE_CFLAGS += -DNOSSE
+}
+else:equals(QMAKE_XCPUARCH, armv6l) {
+    message(Building without SSE2 support)
+	QMAKE_CXXFLAGS += -DNOSSE
+    QMAKE_CFLAGS += -DNOSSE
+}
+else {
+    message(Building with SSE2 support)
+    QMAKE_CXXFLAGS += -msse2
+    QMAKE_CFLAGS += -msse2
+}
+#endif
+
 QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter -Wstack-protector
 
 # Input
@@ -121,6 +152,8 @@ HEADERS += src/qt/bitcoingui.h \
     src/qt/transactiontablemodel.h \
     src/qt/addresstablemodel.h \
     src/qt/optionsdialog.h \
+    src/qt/coincontroldialog.h \
+    src/qt/coincontroltreewidget.h \
     src/qt/sendcoinsdialog.h \
     src/qt/addressbookpage.h \
     src/qt/signverifymessagedialog.h \
@@ -133,6 +166,7 @@ HEADERS += src/qt/bitcoingui.h \
     src/bignum.h \
     src/checkpoints.h \
     src/compat.h \
+    src/coincontrol.h \
     src/sync.h \
     src/util.h \
     src/uint256.h \
@@ -194,13 +228,17 @@ HEADERS += src/qt/bitcoingui.h \
     src/hash.h \
     src/scrypt.h \
     src/sph_groestl.h \
-    src/sph_types.h
+    src/sph_types.h \
+    src/auxpow.h \
+    src/reactors.h
 
 SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/qt/transactiontablemodel.cpp \
     src/qt/addresstablemodel.cpp \
     src/qt/optionsdialog.cpp \
     src/qt/sendcoinsdialog.cpp \
+    src/qt/coincontroldialog.cpp \
+    src/qt/coincontroltreewidget.cpp \
     src/qt/addressbookpage.cpp \
     src/qt/signverifymessagedialog.cpp \
     src/qt/aboutdialog.cpp \
@@ -258,16 +296,21 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/kernel.cpp \
     src/scrypt-x86.S \
     src/scrypt-x86_64.S \
+    src/scrypt-arm.S \
     src/scrypt_mine.cpp \
     src/pbkdf2.cpp \
     src/hash.cpp \
     src/scrypt.cpp \
-    src/groestl.c
+    src/groestl.c \
+    src/auxpow.cpp \
+    src/reactors.cpp \
+    src/reactorlist.cpp
 
 RESOURCES += \
     src/qt/bitcoin.qrc
 
 FORMS += \
+    src/qt/forms/coincontroldialog.ui \
     src/qt/forms/sendcoinsdialog.ui \
     src/qt/forms/addressbookpage.ui \
     src/qt/forms/signverifymessagedialog.ui \
@@ -372,7 +415,7 @@ macx:HEADERS += src/qt/macdockiconhandler.h
 macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm
 macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
 macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
-macx:ICON = src/qt/res/icons/bitcoin.icns
+macx:ICON = src/qt/res/icons/Diamond.icns
 macx:TARGET = "diamond-qt"
 macx:QMAKE_CFLAGS_THREAD += -pthread
 macx:QMAKE_LFLAGS_THREAD += -pthread

doc/README

@@ -1,10 +1,6 @@
+Diamond 2.0.5.7
 
-Copyright (c) 2013-2014 Diamond Developers
-
-
-Diamond 0.3.0 BETA
-
-Copyright (c) 2013-2014 Diamond Developers
+Copyright (c) 2013-2015 Diamond Foundation
 Copyright (c) 2013 NovaCoin Developers
 Copyright (c) 2011-2012 Bitcoin Developers
 Distributed under the MIT/X11 software license, see the accompanying
@@ -45,6 +41,6 @@ Start up the new diamondd.
 
 
 See the documentation/wiki at the Diamond site:
-  http://diamond.cc/
+  http://bit.diamonds/
 for help and more information.
 

doc/README_windows.txt

@@ -1,10 +1,6 @@
+Diamond 2.0.5.7
 
-Copyright (c) 2013-2014 Diamond Developers
-
-
-Diamond 0.3.0 BETA
-
-Copyright (c) 2013-2014 Diamond Developers
+Copyright (c) 2013-2015 Diamond Foundation
 Copyright (c) 2013 NovaCoin Developers
 Copyright (c) 2011-2012 Bitcoin Developers
 Distributed under the MIT/X11 software license, see the accompanying
@@ -47,6 +43,6 @@ Start up the new diamondd.
 
 
 See the documentation/wiki at the Diamond site:
-  http://diamond.cc/
+  http://bit.diamonds/
 for help and more information.
 

doc/build-unix.txt

@@ -10,16 +10,26 @@ software written by Thomas Bernard.
 UNIX BUILD NOTES
 ================
 
-To Build
+To Build On i386, amd64
 --------
 
 cd src/
-make -f makefile.unix            # Headless bitcoin
+make -f makefile.unix                           # Headless diamond
+
+To Build On armv6l
+--------
+cd src/
+make -f makefile.unix xCPUARCH=armv6l           # Headless diamond
+
+To Build On armv7l
+--------
+cd src/
+make -f makefile.unix xCPUARCH=armv7l           # Headless diamond
 
 See readme-qt.rst for instructions on building Bitcoin QT,
 the graphical bitcoin.
 
-Dependencies
+Dependencies for i386, amd64
 ------------
 
  Library     Purpose           Description
@@ -29,6 +39,19 @@ Dependencies
  libboost    Boost             C++ Library
  miniupnpc   UPnP Support      Optional firewall-jumping support
  libqrencode QRCode generation Optional QRCode generation
+ libgmp3     GMP               Multiple precision arithmetic library
+
+Dependencies for armv6l, armv7l
+------------
+
+ Library     Purpose           Description
+ -------     -------           -----------
+ libssl      SSL Support       Secure communications
+ libdb5.1    Berkeley DB       Blockchain & wallet storage
+ libboost    Boost             C++ Library
+ miniupnpc   UPnP Support      Optional firewall-jumping support
+ libqrencode QRCode generation Optional QRCode generation
+ libgmp3     GMP               Multiple precision arithmetic library
 
 Note that libexecinfo should be installed, if you building under *BSD systems. 
 This library provides backtrace facility.