July 10th Updates

TheSuperiorCoin · Jul 18, 2018 · 172b9a0 · 172b9a0
1 parent b0a3e75
commit 172b9a0
Show file tree

Hide file tree

Showing 610 changed files with 1,990 additions and 28,938 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,11 @@
 [submodule "external/unbound"]
 	path = external/unbound
-	url = https://github.com/TheSuperiorCoin/unbound
-	branch = monero
+	url = https://github.com/superior-project/unbound
+	branch = superior
+[submodule "external/miniupnp"]
+	path = external/miniupnp
+	url = https://github.com/superior-project/miniupnp
+	branch = superior
+[submodule "external/rapidjson"]
+	path = external/rapidjson
+	url = https://github.com/Tencent/rapidjson
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2018, The Superior Project
+# Copyright (c) 2014-2018, The SuperiorCoin Project
 #
 # All rights reserved.
 #
@@ -239,7 +239,7 @@ endif()
 # elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*")
 #   set(BSDI TRUE)
 
-include_directories(external/easylogging++ src contrib/epee/include external)
+include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external)
 
 if(APPLE)
   include_directories(SYSTEM /usr/include/malloc)
@@ -301,7 +301,7 @@ if(SANITIZE)
 endif()
 
 # Set default blockchain storage location:
-# memory was the default in Cryptonote before Monero implimented LMDB, it still works but is unneccessary.
+# memory was the default in Cryptonote before Monero implemented LMDB, it still works but is unnecessary.
 # set(DATABASE memory)
 set(DATABASE lmdb)
 
@@ -433,14 +433,6 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
 
 add_subdirectory(external)
 
-# Final setup for miniupnpc
-if(UPNP_STATIC OR IOS)
-  add_definitions("-DUPNP_STATIC")
-else()
-  add_definitions("-DUPNP_DYNAMIC")
-  include_directories(${UPNP_INCLUDE})
-endif()
-
 # Final setup for libunbound
 include_directories(${UNBOUND_INCLUDE})
 link_directories(${UNBOUND_LIBRARY_DIRS})
@@ -463,9 +455,12 @@ link_directories(${LIBUNWIND_LIBRARY_DIRS})
 
 # Final setup for libpcsc
 if (PCSC_FOUND) 
+  message(STATUS "Using PCSC include dir at ${PCSC_INCLUDE_DIR}")
   add_definitions(-DHAVE_PCSC)
   include_directories(${PCSC_INCLUDE_DIR})
   link_directories(${LIBPCSC_LIBRARY_DIRS})
+else (PCSC_FOUND)
+  message(STATUS "Could not find PCSC")
 endif()
 
 if(MSVC)
@@ -901,7 +896,3 @@ option(INSTALL_VENDORED_LIBUNBOUND "Install libunbound binary built from source
 
 
 CHECK_C_COMPILER_FLAG(-std=c11 HAVE_C11)
-
-##
-# This may contain code Copyright (c) 2014-2017, The Monero Project
-##
diff --git a/CMakeLists_IOS.txt b/CMakeLists_IOS.txt
@@ -1,5 +1,4 @@
-# Copyright (c) 2014-2018, TheSuperioriorCoin Project
-# This may contain code Copyright (c) 2014-2017, The Monero Project
+# Portions Copyright (c) 2017-2018, The Superior Coin Project
 # This file is based off of the https://code.google.com/archive/p/ios-cmake/
 # It has been altered for Superior iOS development
 #

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -68,9 +68,9 @@ You should have received a copy of the GNU General Public License along with thi
 The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in RFC 2119.
 
 The "Superior Maintainer Team" is defined in this document as the following users:
-- fluffypony
-- superiormooo
-- hyc
+- nathansenn
+- mps01k
+- 
 
 ## Goals
 

diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,8 @@
 # builder stage
 FROM ubuntu:16.04 as builder
 
-RUN apt-get update && \
+RUN set -ex && \
+    apt-get update && \
     apt-get --no-install-recommends --yes install \
         ca-certificates \
         cmake \
@@ -16,15 +17,30 @@ RUN apt-get update && \
         curl \
         libtool-bin \
         autoconf \
-        automake
+        automake \
+        bzip2
 
 WORKDIR /usr/local
 
+#Cmake
+ARG CMAKE_VERSION=3.11.4
+ARG CMAKE_VERSION_DOT=v3.11
+ARG CMAKE_HASH=8f864e9f78917de3e1483e256270daabc4a321741592c5b36af028e72bff87f5
+RUN set -ex \
+    && curl -s -O https://cmake.org/files/${CMAKE_VERSION_DOT}/cmake-${CMAKE_VERSION}.tar.gz \
+    && echo "${CMAKE_HASH}  cmake-${CMAKE_VERSION}.tar.gz" | sha256sum -c \
+    && tar -xzf cmake-${CMAKE_VERSION}.tar.gz \
+    && cd cmake-${CMAKE_VERSION} \
+    && ./configure \
+    && make \
+    && make install
+
 ## Boost
-ARG BOOST_VERSION=1_66_0
-ARG BOOST_VERSION_DOT=1.66.0
-ARG BOOST_HASH=5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9
-RUN curl -s -L -o  boost_${BOOST_VERSION}.tar.bz2 https://dl.bintray.com/boostorg/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 \
+ARG BOOST_VERSION=1_67_0
+ARG BOOST_VERSION_DOT=1.67.0
+ARG BOOST_HASH=2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba
+RUN set -ex \
+    && curl -s -L -o  boost_${BOOST_VERSION}.tar.bz2 https://dl.bintray.com/boostorg/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 \
     && echo "${BOOST_HASH} boost_${BOOST_VERSION}.tar.bz2" | sha256sum -c \
     && tar -xvf boost_${BOOST_VERSION}.tar.bz2 \
     && cd boost_${BOOST_VERSION} \
@@ -33,21 +49,24 @@ RUN curl -s -L -o  boost_${BOOST_VERSION}.tar.bz2 https://dl.bintray.com/boostor
 ENV BOOST_ROOT /usr/local/boost_${BOOST_VERSION}
 
 # OpenSSL
-ARG OPENSSL_VERSION=1.0.2n
-ARG OPENSSL_HASH=370babb75f278c39e0c50e8c4e7493bc0f18db6867478341a832a982fd15a8fe
-RUN curl -s -O https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \
+ARG OPENSSL_VERSION=1.1.0h
+ARG OPENSSL_HASH=5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517
+RUN set -ex \
+    && curl -s -O https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \
     && echo "${OPENSSL_HASH} openssl-${OPENSSL_VERSION}.tar.gz" | sha256sum -c \
     && tar -xzf openssl-${OPENSSL_VERSION}.tar.gz \
     && cd openssl-${OPENSSL_VERSION} \
     && ./Configure linux-x86_64 no-shared --static -fPIC \
-    && make build_crypto build_ssl \
+    && make build_generated \
+    && make libcrypto.a \
     && make install
 ENV OPENSSL_ROOT_DIR=/usr/local/openssl-${OPENSSL_VERSION}
 
 # ZMQ
-ARG ZMQ_VERSION=v4.2.3
-ARG ZMQ_HASH=3226b8ebddd9c6c738ba42986822c26418a49afb
-RUN git clone https://github.com/zeromq/libzmq.git -b ${ZMQ_VERSION} \
+ARG ZMQ_VERSION=v4.2.5
+ARG ZMQ_HASH=d062edd8c142384792955796329baf1e5a3377cd
+RUN set -ex \
+    && git clone https://github.com/zeromq/libzmq.git -b ${ZMQ_VERSION} \
     && cd libzmq \
     && test `git rev-parse HEAD` = ${ZMQ_HASH} || exit 1 \
     && ./autogen.sh \
@@ -57,16 +76,19 @@ RUN git clone https://github.com/zeromq/libzmq.git -b ${ZMQ_VERSION} \
     && ldconfig
 
 # zmq.hpp
+ARG CPPZMQ_VERSION=v4.2.3
 ARG CPPZMQ_HASH=6aa3ab686e916cb0e62df7fa7d12e0b13ae9fae6
-RUN git clone https://github.com/zeromq/cppzmq.git -b ${ZMQ_VERSION} \
+RUN set -ex \
+    && git clone https://github.com/zeromq/cppzmq.git -b ${CPPZMQ_VERSION} \
     && cd cppzmq \
     && test `git rev-parse HEAD` = ${CPPZMQ_HASH} || exit 1 \
     && mv *.hpp /usr/local/include
 
 # Readline
 ARG READLINE_VERSION=7.0
 ARG READLINE_HASH=750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334
-RUN curl -s -O https://ftp.gnu.org/gnu/readline/readline-${READLINE_VERSION}.tar.gz \
+RUN set -ex \
+    && curl -s -O https://ftp.gnu.org/gnu/readline/readline-${READLINE_VERSION}.tar.gz \
     && echo "${READLINE_HASH} readline-${READLINE_VERSION}.tar.gz" | sha256sum -c \
     && tar -xzf readline-${READLINE_VERSION}.tar.gz \
     && cd readline-${READLINE_VERSION} \
@@ -77,7 +99,8 @@ RUN curl -s -O https://ftp.gnu.org/gnu/readline/readline-${READLINE_VERSION}.tar
 # Sodium
 ARG SODIUM_VERSION=1.0.16
 ARG SODIUM_HASH=675149b9b8b66ff44152553fb3ebf9858128363d
-RUN git clone https://github.com/jedisct1/libsodium.git -b ${SODIUM_VERSION} \
+RUN set -ex \
+    && git clone https://github.com/jedisct1/libsodium.git -b ${SODIUM_VERSION} \
     && cd libsodium \
     && test `git rev-parse HEAD` = ${SODIUM_HASH} || exit 1 \
     && ./autogen.sh \
@@ -90,13 +113,18 @@ WORKDIR /src
 COPY . .
 
 ARG NPROC
-RUN rm -rf build && \
-    if [ -z "$NPROC" ];then make -j$(nproc) release-static;else make -j$NPROC release-static;fi
+RUN set -ex && \
+    rm -rf build && \
+    if [ -z "$NPROC" ] ; \
+    then make -j$(nproc) release-static ; \
+    else make -j$NPROC release-static ; \
+    fi
 
 # runtime stage
 FROM ubuntu:16.04
 
-RUN apt-get update && \
+RUN set -ex && \
+    apt-get update && \
     apt-get --no-install-recommends --yes install ca-certificates && \
     apt-get clean && \
     rm -rf /var/lib/apt

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2018, The Superior Project
+Copyright (c) 2014-2018, The SuperiorCoin Project
 
 All rights reserved.
 

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2018, TheSuperioriorCoin Project
+# Copyright (c) 2014-2018, The SuperiorCoin Project
 #
 # All rights reserved.
 #

diff --git a/cmake/32-bit-toolchain.cmake b/cmake/32-bit-toolchain.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2018, The Superior Project
+# Copyright (c) 2014-2018, The SuperiorCoin Project
 # 
 # All rights reserved.
 # 

diff --git a/cmake/64-bit-toolchain.cmake b/cmake/64-bit-toolchain.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2018, The Superior Project
+# Copyright (c) 2014-2018, The SuperiorCoin Project
 # 
 # All rights reserved.
 # 

diff --git a/cmake/FindBerkeleyDB.cmake b/cmake/FindBerkeleyDB.cmake
@@ -1,4 +1,3 @@
-# Copyright (c) 2014-2018, TheSuperioriorCoin Project
 # - Try to find Berkeley DB
 # Once done this will define
 #
@@ -11,9 +10,6 @@
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-# This may contain code Copyright (c) 2014-2017, The Monero Project
-##
 
 find_path(BERKELEY_DB_INCLUDE_DIR db_cxx.h
   /usr/include/db4

diff --git a/cmake/FindLibunwind.cmake b/cmake/FindLibunwind.cmake
@@ -1,4 +1,3 @@
-# Copyright (c) 2014-2018, TheSuperioriorCoin Project
 # - Try to find libunwind
 # Once done this will define
 #
@@ -11,9 +10,6 @@
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-# This may contain code Copyright (c) 2014-2017, The Monero Project
-##
 
 find_path(LIBUNWIND_INCLUDE_DIR libunwind.h
   /usr/include

diff --git a/cmake/FindPCSC.cmake b/cmake/FindPCSC.cmake
@@ -14,7 +14,6 @@ ENDIF (PCSC_INCLUDE_DIR AND PCSC_LIBRARIES)
 IF (NOT WIN32)
   FIND_PACKAGE(PkgConfig)
   PKG_CHECK_MODULES(PC_PCSC libpcsclite)
-ENDIF (NOT WIN32)
 
 FIND_PATH(PCSC_INCLUDE_DIR winscard.h
   HINTS
@@ -24,13 +23,23 @@ FIND_PATH(PCSC_INCLUDE_DIR winscard.h
   PATH_SUFFIXES PCSC
   )
 
-FIND_LIBRARY(PCSC_LIBRARY NAMES pcsclite libpcsclite WinSCard PCSC
+  FIND_LIBRARY(PCSC_LIBRARY NAMES pcsclite libpcsclite PCSC
   HINTS
   ${PC_PCSC_LIBDIR}
   ${PC_PCSC_LIBRARY_DIRS}
   )
 
-# handle the QUIETLY and REQUIRED arguments and set PCSC_FOUND to TRUE if 
+ELSE (NOT WIN32)
+  IF(BUILD_64 STREQUAL "ON")
+    set(PCSC_INCLUDE_DIR /mingw64/x86_64-w64-mingw32/include)
+    set(PCSC_LIBRARY /mingw64/x86_64-w64-mingw32/lib/libwinscard.a)
+  ELSE(BUILD_64 STREQUAL "ON")
+    set(PCSC_INCLUDE_DIR /mingw32/i686-w64-mingw32/include)
+    set(PCSC_LIBRARY /mingw32/i686-w64-mingw32/lib/libwinscard.a)
+  ENDIF(BUILD_64 STREQUAL "ON")
+ENDIF (NOT WIN32)
+
+# handle the QUIETLY and REQUIRED arguments and set PCSC_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCSC DEFAULT_MSG PCSC_LIBRARY PCSC_INCLUDE_DIR)

diff --git a/cmake/FindUnbound.cmake b/cmake/FindUnbound.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2018, TheSuperioriorCoin Project
+# Copyright (c) 2014-2018, The SuperiorCoin Project
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without modification, are

diff --git a/cmake/Version.cmake b/cmake/Version.cmake
@@ -31,7 +31,7 @@
 
 function (write_static_version_header hash)
   set(VERSIONTAG "${hash}")
-  configure_file("src/version.cpp.in" "version.cpp")
+  configure_file("${CMAKE_SOURCE_DIR}/src/version.cpp.in" "${CMAKE_BINARY_DIR}/version.cpp")
 endfunction ()
 
 find_package(Git QUIET)

diff --git a/cmake/test-static-assert.c b/cmake/test-static-assert.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Superior Project
+// Copyright (c) 2014-2018, The SuperiorCoin Project
 // 
 // All rights reserved.
 // 

diff --git a/cmake/test-static-assert.cpp b/cmake/test-static-assert.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Superior Project
+// Copyright (c) 2014-2018, The SuperiorCoin Project
 // 
 // All rights reserved.
 // 

diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2018, The Superior Project
+# Copyright (c) 2014-2018, The SuperiorCoin Project
 # 
 # All rights reserved.
 # 
@@ -39,6 +39,3 @@ endif()
 
 add_subdirectory(epee)
 
-#
-# This may contain code Copyright (c) 2014-2017, The Monero Project
-#
diff --git a/contrib/epee/CMakeLists.txt b/contrib/epee/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2018, The Superior Project
+# Copyright (c) 2014-2018, The SuperiorCoin Project
 # 
 # All rights reserved.
 # 

diff --git a/contrib/epee/LICENSE.txt b/contrib/epee/LICENSE.txt
@@ -1,4 +1,3 @@
-Copyright (c) 2014-2018, TheSuperioriorCoin Project
 Copyright (c) 2006-2013, Andrey N. Sabelnikov, www.sabelnikov.net
 All rights reserved.
 
@@ -24,5 +23,3 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This may contain code Copyright (c) 2014-2017,  The Monero Project
diff --git a/contrib/epee/demo/demo_http_server/stdafx.h b/contrib/epee/demo/demo_http_server/stdafx.h
@@ -1,4 +1,3 @@
-// Copyright (c) 2014-2018, TheSuperioriorCoin Project
 // Copyright (c) 2006-2013, Andrey N. Sabelnikov, www.sabelnikov.net
 // All rights reserved.
 // 
@@ -24,8 +23,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // 
-// This may contain code Copyright (c) 2014-2017, The Monero Project
-// 
+
 
 #pragma once