Merge pull request dashpay#95 from cevap/3.1.0-rc1

3.1.0 rc1

configure.ac

@@ -2,9 +2,9 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 3)
 define(_CLIENT_VERSION_MINOR, 1)
-define(_CLIENT_VERSION_REVISION, 99)
+define(_CLIENT_VERSION_REVISION, 00)
 define(_CLIENT_VERSION_BUILD, 0)
-define(_CLIENT_VERSION_IS_RELEASE, false)
+define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)
 AC_INIT([Ion Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.ioncoin.org],[ion])
 AC_CONFIG_SRCDIR([src/main.cpp])

contrib/gitian-descriptors/gitian-linux.yml

@@ -19,10 +19,6 @@ packages:
 - "g++-8-riscv64-linux-gnu"
 - "gcc-8-riscv64-linux-gnu"
 - "binutils-riscv64-linux-gnu"
-- "g++-s390x-linux-gnu"
-- "g++-8-s390x-linux-gnu"
-- "gcc-8-s390x-linux-gnu"
-- "binutils-s390x-linux-gnu"
 - "g++-powerpc64le-linux-gnu"
 - "g++-8-powerpc64le-linux-gnu"
 - "gcc-8-powerpc64le-linux-gnu"
@@ -31,18 +27,6 @@ packages:
 - "g++-8-mipsel-linux-gnu"
 - "gcc-8-mipsel-linux-gnu"
 - "binutils-mipsel-linux-gnu"
-- "g++-mips64-linux-gnuabi64"
-- "g++-8-mips64-linux-gnuabi64"
-- "gcc-8-mips64-linux-gnuabi64"
-- "binutils-mips64-linux-gnuabi64"
-- "g++-mips64el-linux-gnuabi64"
-- "g++-8-mips64el-linux-gnuabi64"
-- "gcc-8-mips64el-linux-gnuabi64"
-- "binutils-mips64el-linux-gnuabi64"
-- "g++-sh4-linux-gnu"
-- "g++-8-sh4-linux-gnu"
-- "gcc-8-sh4-linux-gnu"
-- "binutils-sh4-linux-gnu"
 - "g++-sparc64-linux-gnu"
 - "g++-8-sparc64-linux-gnu"
 - "gcc-8-sparc64-linux-gnu"
@@ -51,10 +35,6 @@ packages:
 - "g++-8-alpha-linux-gnu"
 - "gcc-8-alpha-linux-gnu"
 - "binutils-alpha-linux-gnu"
-- "g++-hppa-linux-gnu"
-- "g++-8-hppa-linux-gnu"
-- "gcc-8-hppa-linux-gnu"
-- "binutils-hppa-linux-gnu"
 - "g++-m68k-linux-gnu"
 - "g++-8-m68k-linux-gnu"
 - "gcc-8-m68k-linux-gnu"
@@ -78,7 +58,7 @@ files: []
 script: |
 
   WRAP_DIR=$HOME/wrapped
-  HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu s390x-linux-gnu powerpc64le-linux-gnu mipsel-linux-gnu mips64-linux-gnuabi64 mips64el-linux-gnuabi64 sh4-linux-gnu sparc64-linux-gnu alpha-linux-gnu hppa-linux-gnu m68k-linux-gnu"
+  HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu powerpc64le-linux-gnu sparc64-linux-gnu alpha-linux-gnu m68k-linux-gnu"
   CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests"
   FAKETIME_HOST_PROGS="gcc g++"
   FAKETIME_PROGS="date ar ranlib nm"

depends/packages/boost.mk

@@ -15,16 +15,9 @@ $(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win3
 $(package)_config_opts_x86_64_mingw32=address-model=64
 $(package)_config_opts_i686_mingw32=address-model=32
 $(package)_config_opts_i686_linux=address-model=32 architecture=x86
-$(package)_config_opts_i386_linux=address-model=32 architecture=x86
 $(package)_config_opts_s390x_linux=address-model=64
-$(package)_config_opts_mipsel_linux=address-model=32
-$(package)_config_opts_mips_linux=address-model=32
-$(package)_config_opts_mips64_linux=address-model=64
-$(package)_config_opts_mips64el_linux=address-model=64
 $(package)_config_opts_sparc64_linux=address-model=64
-$(package)_config_opts_sh4_linux=address-model=32
 $(package)_config_opts_alpha_linux=address-model=64
-$(package)_config_opts_hppa_linux=address-model=32
 $(package)_config_opts_m68k_linux=address-model=32
 $(package)_toolset_$(host_os)=gcc
 $(package)_archiver_$(host_os)=$($(package)_ar)

depends/packages/dbus.mk

@@ -1,6 +1,6 @@
 package=dbus
 $(package)_version=1.10.18
-$(package)_download_path=https://dbus.freedesktop.org/releases/dbus
+$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v1.10.18/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_sha256_hash=6049ddd5f3f3e2618f615f1faeda0a115104423a7996b7aa73e2f36e38cc514a
 $(package)_dependencies=expat

depends/packages/fontconfig.mk

@@ -1,6 +1,6 @@
 package=fontconfig
 $(package)_version=2.12.1
-$(package)_download_path=http://www.freedesktop.org/software/fontconfig/release/
+$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v2.12.1/
 $(package)_file_name=$(package)-$($(package)_version).tar.bz2
 $(package)_sha256_hash=b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3
 $(package)_dependencies=freetype expat

depends/packages/gmp.mk

@@ -1,6 +1,6 @@
 package=gmp
 $(package)_version=6.1.2
-$(package)_download_path=https://github.com/cevap/gmplib/releases/download/v$($(package)_version)/
+$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v6.1.2/
 $(package)_file_name=$(package)-$($(package)_version).tar.bz2
 $(package)_sha256_hash=5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2
 

depends/packages/libX11.mk

@@ -1,6 +1,6 @@
 package=libX11
 $(package)_version=1.6.2
-$(package)_download_path=http://xorg.freedesktop.org/releases/individual/lib/
+$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v1.6.2/
 $(package)_file_name=$(package)-$($(package)_version).tar.bz2
 $(package)_sha256_hash=2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16
 $(package)_dependencies=libxcb xtrans xextproto xproto

depends/packages/libXau.mk

@@ -1,6 +1,6 @@
 package=libXau
 $(package)_version=1.0.8
-$(package)_download_path=http://xorg.freedesktop.org/releases/individual/lib/
+$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v1.0.8/
 $(package)_file_name=$(package)-$($(package)_version).tar.bz2
 $(package)_sha256_hash=fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2
 $(package)_dependencies=xproto

depends/packages/libXext.mk

@@ -1,6 +1,6 @@
 package=libXext
 $(package)_version=1.3.2
-$(package)_download_path=http://xorg.freedesktop.org/releases/individual/lib/
+$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v1.3.2/
 $(package)_file_name=$(package)-$($(package)_version).tar.bz2
 $(package)_sha256_hash=f829075bc646cdc085fa25d98d5885d83b1759ceb355933127c257e8e50432e0
 $(package)_dependencies=xproto xextproto libX11 libXau

depends/packages/libxcb.mk

@@ -1,6 +1,6 @@
 package=libxcb
 $(package)_version=1.10
-$(package)_download_path=http://xcb.freedesktop.org/dist
+$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v1.10-libxcb/
 $(package)_file_name=$(package)-$($(package)_version).tar.bz2
 $(package)_sha256_hash=98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5
 $(package)_dependencies=xcb_proto libXau xproto

depends/packages/openssl.mk

@@ -46,23 +46,17 @@ $(package)_config_opts+=$($(package)_cflags) $($(package)_cppflags)
 $(package)_config_opts_linux=-fPIC -Wa,--noexecstack
 $(package)_config_opts_x86_64_linux=linux-x86_64
 $(package)_config_opts_i686_linux=linux-generic32
-$(package)_config_opts_i386_linux=linux-generic32
 $(package)_config_opts_arm_linux=linux-generic32
 $(package)_config_opts_armv7l_linux=linux-generic32
 $(package)_config_opts_aarch64_linux=linux-generic64
-$(package)_config_opts_mipsel_linux=linux-generic32
 $(package)_config_opts_mips_linux=linux-generic32
-$(package)_config_opts_mips64_linux=linux-generic64
-$(package)_config_opts_mips64el_linux=linux-generic64
 $(package)_config_opts_powerpc_linux=linux-generic32
 $(package)_config_opts_riscv32_linux=linux-generic32
 $(package)_config_opts_riscv64_linux=linux-generic64
 $(package)_config_opts_s390x_linux=linux-generic64
 $(package)_config_opts_powerpc64le_linux=linux-generic64
 $(package)_config_opts_sparc64_linux=linux-generic64
 $(package)_config_opts_alpha_linux=linux-generic64
-$(package)_config_opts_sh4_linux=linux-generic32
-$(package)_config_opts_hppa_linux=linux-generic32
 $(package)_config_opts_m68k_linux=linux-generic32
 $(package)_config_opts_x86_64_darwin=darwin64-x86_64-cc
 $(package)_config_opts_x86_64_mingw32=mingw64

depends/packages/qt.mk

@@ -105,20 +105,13 @@ $(package)_config_opts_linux += -fontconfig
 $(package)_config_opts_linux += -no-opengl
 $(package)_config_opts_arm_linux += -platform linux-g++ -xplatform ion-linux-g++
 $(package)_config_opts_i686_linux  = -xplatform linux-g++-32
-$(package)_config_opts_i386_linux  = -xplatform linux-g++-32
 $(package)_config_opts_x86_64_linux = -xplatform linux-g++-64
 $(package)_config_opts_aarch64_linux = -xplatform linux-aarch64-gnu-g++
 $(package)_config_opts_riscv64_linux = -platform linux-g++ -xplatform ion-linux-g++
 $(package)_config_opts_s390x_linux += -platform linux-g++ -xplatform linux-g++-64
 $(package)_config_opts_powerpc64le_linux += -platform linux-g++ -xplatform linux-g++-64
-$(package)_config_opts_mips_linux += -platform linux-g++ -xplatform linux-g++-32
-$(package)_config_opts_mipsel_linux += -platform linux-g++ -xplatform linux-g++-32
-$(package)_config_opts_mips64_linux += -platform linux-g++ -xplatform linux-g++-64
-$(package)_config_opts_mips64el_linux += -platform linux-g++ -xplatform linux-g++-64
 $(package)_config_opts_sparc64_linux += -platform linux-g++ -xplatform linux-g++-64
-$(package)_config_opts_sh4_linux += -platform linux-g++ -xplatform linux-g++-32
 $(package)_config_opts_alpha_linux += -platform linux-g++ -xplatform linux-g++-64
-$(package)_config_opts_hppa_linux += -platform linux-g++ -xplatform linux-g++-32
 $(package)_config_opts_m68k_linux += -platform linux-g++ -xplatform linux-g++-32
 $(package)_config_opts_mingw32  = -no-opengl -xplatform win32-g++ -device-option CROSS_COMPILE="$(host)-"
 $(package)_build_env  = QT_RCC_TEST=1

depends/packages/xcb_proto.mk

@@ -1,6 +1,6 @@
 package=xcb_proto
 $(package)_version=1.10
-$(package)_download_path=http://xcb.freedesktop.org/dist
+$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v1.10/
 $(package)_file_name=xcb-proto-$($(package)_version).tar.bz2
 $(package)_sha256_hash=7ef40ddd855b750bc597d2a435da21e55e502a0fefa85b274f2c922800baaf05
 

depends/packages/xextproto.mk

@@ -1,6 +1,6 @@
 package=xextproto
 $(package)_version=7.3.0
-$(package)_download_path=http://xorg.freedesktop.org/releases/individual/proto
+$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v7.3.0/
 $(package)_file_name=$(package)-$($(package)_version).tar.bz2
 $(package)_sha256_hash=f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0
 

depends/packages/xproto.mk

@@ -1,6 +1,6 @@
 package=xproto
 $(package)_version=7.0.26
-$(package)_download_path=http://xorg.freedesktop.org/releases/individual/proto
+$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v7.0.26/
 $(package)_file_name=$(package)-$($(package)_version).tar.bz2
 $(package)_sha256_hash=636162c1759805a5a0114a369dffdeccb8af8c859ef6e1445f26a4e6e046514f
 

depends/packages/xtrans.mk

@@ -1,6 +1,6 @@
 package=xtrans
 $(package)_version=1.3.4
-$(package)_download_path=http://xorg.freedesktop.org/releases/individual/lib/
+$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v1.3.4/
 $(package)_file_name=$(package)-$($(package)_version).tar.bz2
 $(package)_sha256_hash=054d4ee3efd52508c753e9f7bc655ef185a29bd2850dd9e2fc2ccc33544f583a
 $(package)_dependencies=

snap/gui/ion-testnet.desktop

@@ -2,7 +2,7 @@
 
 [Desktop Entry]
 Type=Application
-Version=3.1.99
+Version=3.1.00
 Encoding=UTF-8
 Name=Ion Qt Testnet
 Icon=${SNAP}/ion-qt-testnet.ico
@@ -11,4 +11,4 @@ Exec=ion --testnet %u
 Terminal=false
 Categories=Office;Finance;Games;
 Comment=Ion Digital Currency QT (Official release)
-Keywords=internet;ion;testnet;qt;crypto;currency;snap;snapcraft;ioncore;ioncoin;daemon;cli;qt;ioncoincore
+Keywords=internet;ion;testnet;qt;crypto;currency;snap;snapcraft;ioncore;ioncoin;daemon;cli;qt;ioncoincore;candidate

snap/gui/ion.desktop

@@ -2,7 +2,7 @@
 
 [Desktop Entry]
 Type=Application
-Version=3.1.99
+Version=3.1.00
 Encoding=UTF-8
 Name=Ion Qt
 Icon=${SNAP}/ion-qt.ico
@@ -11,4 +11,4 @@ Exec=ion %u
 Terminal=false
 Categories=Office;Finance;Cryptocurrency;
 Comment=Ion Digital Currency QT (Official release)
-Keywords=internet;ion;main;qt;crypto;currency;snap;snapcraft;
+Keywords=internet;ion;main;qt;crypto;currency;snap;snapcraft;candidate

snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: ioncore
-version: 3.1.99
+version: 3.1.00
 summary:   gaming related peer-to-peer network based digital currency
 description: |
   Ion Core is an MIT licensed,
@@ -31,7 +31,7 @@ description: |
     Reddit:    https://www.reddit.com/r/ionomy/
     Facebook:  https://facebook.com/ionomy
 
-grade: devel
+grade: stable
 confinement: strict
 apps:
   daemon:
@@ -80,28 +80,37 @@ parts:
   ion:
     source: https://github.com/ioncoincore/ion
     source-type: git
-    source-tag: master
+    source-tag: v3.1.0-rc1
     plugin: nil
-    # We don't want to copy the full blockchain every time that the snap is   
-    # updated, but there's no way to define a default data dir in ion-qt.
-    # Also, it would be better if we could split the wallet from the blockchain
     override-build: |
-      # apply snap build related patches
+      # We don't want to copy the full blockchain every time that the snap is   
+      # updated, but there's no way to define a default data dir in ion-qt.
+      # Additionaly we fix funcs.mk
+      ## Patch - Default home folder
       git apply $SNAPCRAFT_STAGE/default_data_dir.patch
-      #SNAPCRAFT_ARCH_TRIPLET=$(./depends/config.guess)
-      echo "START BUILDING FOR $SNAPCRAFT_ARCH_TRIPLET architecture"
-      # build dependencies
-      ## fix bug - extracting
+      ## Patch - Fix Bug extracting sources without ownership
       sed -i 's/tar --strip-components/tar --no-same-owner --strip-components/' $SNAPCRAFT_PART_BUILD/depends/funcs.mk
+      # Build Dependencies
+      echo "START BUILDING FOR $SNAPCRAFT_ARCH_TRIPLET architecture"
       cd $SNAPCRAFT_PART_BUILD/depends
-      make HOST=$SNAPCRAFT_ARCH_TRIPLET
-      # configure ion core
+      if [ $SNAPCRAFT_ARCH_TRIPLET = "i386-linux-gnu" ]
+      then
+        make HOST=i686-linux-gnu
+      else
+        make HOST=$SNAPCRAFT_ARCH_TRIPLET
+      fi
+      # Configure Ion Core
       cd $SNAPCRAFT_PART_BUILD
       ./autogen.sh
-      ./configure --prefix=`pwd`/depends/$SNAPCRAFT_ARCH_TRIPLET
-      # compile ion core
+      if [ $SNAPCRAFT_ARCH_TRIPLET = "i386-linux-gnu" ]
+      then
+        ./configure --prefix=`pwd`/depends/i686-linux-gnu
+      else
+        ./configure --prefix=`pwd`/depends/$SNAPCRAFT_ARCH_TRIPLET
+      fi
+      # Compile Ion Core
       make
-      # install ion core
+      # Install Ion Core
       make install prefix=$SNAPCRAFT_PART_INSTALL
     build-packages:
       - curl
@@ -117,6 +126,10 @@ parts:
       - bsdmainutils
       - binutils
       - python3
+      # optional
+      - binutils-dev
+      - g++-5
+      - gcc-5
     stage-packages: [ca-certificates]
     after:
       - desktop-qt5

src/main.cpp

@@ -4598,15 +4598,22 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CBlockIndex** ppindex,
             const bool hasIONInputs = !ionInputs.empty();
             const bool hasXIONInputs = !xIONInputs.empty();
 
+            int readBlock = 0;
             vector<CBigNum> vBlockSerials;
             CBlock bl;
             // Go backwards on the forked chain up to the split
             do {
+                // Check if the forked chain is longer than the max reorg limit
+                if(readBlock == Params().MaxReorganizationDepth()){
+                    // TODO: Remove this chain from disk.
+                    return error("%s: forked chain longer than maximum reorg limit", __func__);
+                }
+
                 if(!ReadBlockFromDisk(bl, prev))
                     // Previous block not on disk
                     return error("%s: previous block %s not on disk", __func__, prev->GetBlockHash().GetHex());
-
-
+                // Increase amount of read blocks
+                readBlock++;
                 // Loop through every input from said block
                 for (CTransaction t : bl.vtx) {
                     for (CTxIn in: t.vin) {