iCoin v1.0.0

COPYING

@@ -1,20 +1,20 @@
-Copyright (c) 2009-2014 Bitcoin Developers
-Copyright (c) 2013-2017 iCoin Developers
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Copyright (c) 2009-2014 Bitcoin Developers
+Copyright (c) 2013-2017 iCoin Developers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -10,13 +10,13 @@ What is iCoin?
 ----------------
 
 iCoin is a lite version of Bitcoin using scrypt as a proof-of-work algorithm.
- - 2.5 minute block targets
- - subsidy halves in 840k blocks (~4 years)
- - ~84 million total coins
+ - 10 minute block targets
+ - subsidy halves in 128k blocks (~2.5 years)
+ - ~500 million total coins
 
-The rest is the same as Bitcoin.
- - 50 coins per block
- - 2016 blocks to retarget difficulty
+The rest is as follows.
+ - 100 coins per block
+ - 1008 blocks to retarget difficulty
 
 For more information, as well as an immediately useable, binary version of
 the iCoin client sofware, see http://www.icoin.world.

contrib/debian/control

@@ -20,8 +20,8 @@ Build-Depends: debhelper,
  libqrencode-dev
 Standards-Version: 3.9.2
 Homepage: http://www.icoin.world/
-Vcs-Git: git://github.com/MrSmee/icoin.git
-Vcs-Browser: http://github.com/MrSmee/icoin
+Vcs-Git: git://github.com/icoin-project/icoin.git
+Vcs-Browser: http://github.com/icoin-project/icoin
 
 Package: icoind
 Architecture: any

contrib/debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: iCoin
 Upstream-Contact: Satoshi Nakamoto <satoshin@gmx.com>
  irc://#icoin@freenode.net
 Source: http://sourceforge.net/projects/icoin/files/
- https://github.com/MrSmee/icoin
+ https://github.com/icoin-project/icoin
 
 Files: *
 Copyright: 2013-2017, iCoin Developers

contrib/gitian-descriptors/README

@@ -27,7 +27,7 @@ If your main machine is a 64-bit Mac or PC with a few gigabytes of memory
 and at least 10 gigabytes of free disk space, you can gitian-build using
 LXC running inside a virtual machine.
 
-Here's a description of Gavin's setup on OSX 10.6:
+Here's a description of Gavin's setup on OSX 10.12.6:
 
 1. Download and install VirtualBox from https://www.virtualbox.org/
 
@@ -45,5 +45,5 @@ Here's a description of Gavin's setup on OSX 10.6:
 5. Still inside Ubuntu, tell gitian-builder to use LXC, then follow the "Once you've got the right
   hardware and software" instructions above:
   export USE_LXC=1
-  git clone git://github.com/MrSmee/icoin.git
+  git clone git://github.com/icoin-project/icoin.git
   ... etc

contrib/gitian-descriptors/boost-win32.yml

@@ -9,7 +9,7 @@ packages:
 - "g++-mingw-w64"
 - "faketime"
 - "zip"
-reference_datetime: "2011-01-30 00:00:00"
+reference_datetime: "2013-12-29 04:23:20"
 remotes: []
 files:
 - "boost_1_55_0.tar.bz2"
@@ -62,5 +62,5 @@ script: |
   cd "$INSTALLPREFIX"
   export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
   export FAKETIME=$REFERENCE_DATETIME
-  zip -r boost-win32-1.55.0-gitian-r6.zip *
-  cp boost-win32-1.55.0-gitian-r6.zip $OUTDIR
+  zip -r boost-win32-1.55.0-gitian.zip *
+  cp boost-win32-1.55.0-gitian.zip $OUTDIR

contrib/gitian-descriptors/deps-win32.yml

@@ -11,15 +11,15 @@ packages:
 - "zip"
 - "faketime"
 - "psmisc"
-reference_datetime: "2011-01-30 00:00:00"
+reference_datetime: "2013-12-29 04:23:20"
 remotes: []
 files:
-- "openssl-1.0.1k.tar.gz"
+- "openssl-1.0.2l.tar.gz"
 - "db-4.8.30.NC.tar.gz"
-- "miniupnpc-1.9.20140401.tar.gz"
-- "zlib-1.2.8.tar.gz"
-- "libpng-1.6.8.tar.gz"
-- "qrencode-3.4.3.tar.bz2"
+- "miniupnpc-2.0.20170509.tar.gz"
+- "zlib-1.2.11.tar.gz"
+- "libpng-1.6.32.tar.gz"
+- "qrencode-3.4.4.tar.bz2"
 script: |
   #
   export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
@@ -28,18 +28,18 @@ script: |
   export INSTALLPREFIX=$OUTDIR/staging/deps
   export HOST=i686-w64-mingw32
   # Integrity Check
-  echo "8f9faeaebad088e772f4ef5e38252d472be4d878c6b3a2718c10a4fcebe7a41c  openssl-1.0.1k.tar.gz"  | sha256sum -c
+  echo "ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c  openssl-1.0.2l.tar.gz"  | sha256sum -c
   echo "12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef  db-4.8.30.NC.tar.gz"    | sha256sum -c
-  echo "d02670112125300f7a3d61421714d99105edd90190bf12542d16785f16f017aa  miniupnpc-1.9.20140401.tar.gz"   | sha256sum -c
-  echo "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d  zlib-1.2.8.tar.gz"      | sha256sum -c
-  echo "32c7acf1608b9c8b71b743b9780adb7a7b347563dbfb4a5263761056da44cc96  libpng-1.6.8.tar.gz"    | sha256sum -c
-  echo "dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98  qrencode-3.4.3.tar.bz2" | sha256sum -c
+  echo "d3c368627f5cdfb66d3ebd64ca39ba54d6ff14a61966dbecb8dd296b7039f16a  miniupnpc-2.0.20170509.tar.gz"   | sha256sum -c
+  echo "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1  zlib-1.2.11.tar.gz"      | sha256sum -c
+  echo "1a8ae5c8eafad895cc3fce78fbcb6fdef663b8eb8375f04616e6496360093abb  libpng-1.6.32.tar.gz"    | sha256sum -c
+  echo "efe5188b1ddbcbf98763b819b146be6a90481aac30cfc8d858ab78a19cde1fa5  qrencode-3.4.4.tar.bz2" | sha256sum -c
 
   #
   mkdir -p $INSTALLPREFIX
 
-  tar xzf openssl-1.0.1k.tar.gz
-  cd openssl-1.0.1k
+  tar xzf openssl-1.0.2l.tar.gz
+  cd openssl-1.0.2l
   ./Configure --cross-compile-prefix=$HOST- mingw --openssldir=$INSTALLPREFIX
   make
   make install_sw
@@ -52,21 +52,21 @@ script: |
   make install_lib install_include
   cd ../..
   #
-  tar xzf miniupnpc-1.9.20140401.tar.gz
-  cd miniupnpc-1.9.20140401
+  tar xzf miniupnpc-2.0.20170509.tar.gz
+  cd miniupnpc-2.0.20170509
   echo "
-  --- miniupnpc-1.6/Makefile.mingw.orig   2013-09-29 18:52:51.014087958 -1000
-  +++ miniupnpc-1.6/Makefile.mingw        2013-09-29 19:09:29.663318691 -1000
-  @@ -67,8 +67,8 @@
+  --- miniupnpc-2.0.20170509/Makefile.mingw.orig  2016-01-19 04:26:58.000000000 -0600
+  +++ miniupnpc-2.0.20170509/Makefile.mingw       2017-09-17 02:16:44.656483442 -0500
+  @@ -74,8 +74,8 @@
    
    wingenminiupnpcstrings.o:	wingenminiupnpcstrings.c
    
   -miniupnpcstrings.h: miniupnpcstrings.h.in wingenminiupnpcstrings
   -	wingenminiupnpcstrings \$< \$@
-  +miniupnpcstrings.h: miniupnpcstrings.h.in 
+  +miniupnpcstrings.h: miniupnpcstrings.h.in
   +	sed -e 's|OS/version|MSWindows/5.1.2600|' -e 's|MINIUPNPC_VERSION_STRING \"version\"|MINIUPNPC_VERSION_STRING \"VERSIONHERE\"|' \$< > \$@
    
-   minixml.o:	minixml.c minixml.h miniupnpcstrings.h
+   minixml.o:	minixml.c minixml.h
    
   " | sed "s/VERSIONHERE/$(cat VERSION)/" | patch -p1
   mkdir -p dll
@@ -76,26 +76,26 @@ script: |
   install libminiupnpc.a  $INSTALLPREFIX/lib
   cd ..
   #
-  tar xzf zlib-1.2.8.tar.gz
-  cd zlib-1.2.8
+  tar xzf zlib-1.2.11.tar.gz
+  cd zlib-1.2.11
   CROSS_PREFIX=$HOST- ./configure --prefix=$INSTALLPREFIX --static
   make
   make install
   cd ..
   #
-  tar xzf libpng-1.6.8.tar.gz
-  cd libpng-1.6.8
+  tar xzf libpng-1.6.32.tar.gz
+  cd libpng-1.6.32
   CPPFLAGS="-I$INSTALLPREFIX/include" LDFLAGS="-L$INSTALLPREFIX/lib" ./configure --disable-shared --prefix=$INSTALLPREFIX --host=$HOST
   make $MAKEOPTS
   make install
   cd ..
   #
-  tar xjf qrencode-3.4.3.tar.bz2
-  cd qrencode-3.4.3
+  tar xjf qrencode-3.4.4.tar.bz2
+  cd qrencode-3.4.4
   png_CFLAGS="-I$INSTALLPREFIX/include" png_LIBS="-L$INSTALLPREFIX/lib -lpng" ./configure --prefix=$INSTALLPREFIX --host=$HOST
   make
   make install
   cd ..
   #
   cd $INSTALLPREFIX
-  zip -r $OUTDIR/icoin08-deps-win32-gitian-r13.zip include lib
+  zip -r $OUTDIR/icoin-deps-win32-gitian.zip include lib

contrib/gitian-descriptors/gitian-win32.yml

@@ -11,24 +11,24 @@ packages:
 - "unzip"
 - "nsis"
 - "faketime"
-reference_datetime: "2011-01-30 00:00:00"
+reference_datetime: "2013-12-29 04:23:20"
 remotes:
 - "url": "https://github.com/icoin-project/icoin.git"
   "dir": "icoin"
 files:
-- "qt-win32-4.8.5-gitian-r8.zip"
-- "boost-win32-1.55.0-gitian-r6.zip"
-- "icoin08-deps-win32-gitian-r13.zip"
+- "qt-win32-4.8.7-gitian.zip"
+- "boost-win32-1.55.0-gitian.zip"
+- "icoin-deps-win32-gitian.zip"
 script: |
   #
   STAGING=$HOME/staging
   HOST=i686-w64-mingw32
   #
   mkdir -p $STAGING
   cd $STAGING
-  unzip ../build/qt-win32-4.8.5-gitian-r8.zip
-  unzip ../build/boost-win32-1.55.0-gitian-r6.zip
-  unzip ../build/icoin08-deps-win32-gitian-r13.zip
+  unzip ../build/qt-win32-4.8.7-gitian.zip
+  unzip ../build/boost-win32-1.55.0-gitian.zip
+  unzip ../build/icoin-deps-win32-gitian.zip
   cd $HOME/build/
   #
   cd icoin

contrib/gitian-descriptors/gitian.yml

@@ -1,12 +1,11 @@
 ---
 name: "icoin"
 suites:
-- "lucid"
+- "precise"
 architectures:
 - "i386"
 - "amd64"
 packages: 
-- "libdb4.8++-dev"
 - "qt4-qmake"
 - "libqt4-dev"
 - "libboost-system-dev"
@@ -18,32 +17,42 @@ packages:
 - "unzip"
 - "pkg-config"
 - "libpng12-dev"
-reference_datetime: "2011-01-30 00:00:00"
+reference_datetime: "2013-12-29 04:23:20"
 remotes:
 - "url": "https://github.com/icoin-project/icoin.git"
   "dir": "icoin"
 files:
 - "miniupnpc-1.9.20140401.tar.gz"
-- "qrencode-3.4.3.tar.bz2"
+- "qrencode-3.4.4.tar.bz2"
+- "db-4.8.30.NC.tar.gz"
 script: |
   INSTDIR="$HOME/install"
   export LIBRARY_PATH="$INSTDIR/lib"
   # Integrity Check
   echo "d02670112125300f7a3d61421714d99105edd90190bf12542d16785f16f017aa  miniupnpc-1.9.20140401.tar.gz"   | sha256sum -c
-  echo "dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98  qrencode-3.4.3.tar.bz2" | sha256sum -c
+  echo "efe5188b1ddbcbf98763b819b146be6a90481aac30cfc8d858ab78a19cde1fa5  qrencode-3.4.4.tar.bz2" | sha256sum -c
+  echo "12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef  db-4.8.30.NC.tar.gz"    | sha256sum -c
 
   #
   tar xzf miniupnpc-1.9.20140401.tar.gz
   cd miniupnpc-1.9.20140401
   INSTALLPREFIX=$INSTDIR make $MAKEOPTS install
   cd ..
   #
-  tar xjf qrencode-3.4.3.tar.bz2
-  cd qrencode-3.4.3
+  tar xjf qrencode-3.4.4.tar.bz2
+  cd qrencode-3.4.4
   ./configure --prefix=$INSTDIR --enable-static --disable-shared
   make $MAKEOPTS install
   cd ..
   #
+  tar xzf db-4.8.30.NC.tar.gz
+  cd db-4.8.30.NC/build_unix
+  #   need --with-pic to avoid relocation error in 64 bit builds
+  ../dist/configure --prefix=$INSTDIR --enable-cxx --disable-shared --with-pic
+  make $MAKEOPTS library_build
+  make install_lib install_include
+  cd ../..
+  #
   cd icoin
   mkdir -p $OUTDIR/src
   git archive HEAD | tar -x -C $OUTDIR/src

contrib/gitian-descriptors/qt-win32.yml

@@ -10,28 +10,28 @@ packages:
 - "zip"
 - "unzip"
 - "faketime"
-reference_datetime: "2011-01-30 00:00:00"
+reference_datetime: "2013-12-29 04:23:20"
 remotes: []
 files:
-- "qt-everywhere-opensource-src-4.8.5.tar.gz"
-- "icoin08-deps-win32-gitian-r13.zip"
+- "qt-everywhere-opensource-src-4.8.7.tar.gz"
+- "icoin-deps-win32-gitian.zip"
 script: |
   #
   HOST=i686-w64-mingw32
   INSTDIR="$HOME/qt/"
   # Integrity Check
-  echo "eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138  qt-everywhere-opensource-src-4.8.5.tar.gz"  | sha256sum -c
+  echo "e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0  qt-everywhere-opensource-src-4.8.7.tar.gz"  | sha256sum -c
   #
   mkdir $INSTDIR
   mkdir -p $INSTDIR/host/bin
   #
   # Need mingw-compiled openssl from icoin-deps:
-  unzip icoin08-deps-win32-gitian-r13.zip
+  unzip icoin-deps-win32-gitian.zip
   DEPSDIR=`pwd`
   #
-  tar xzf qt-everywhere-opensource-src-4.8.5.tar.gz
-  cd qt-everywhere-opensource-src-4.8.5
-  sed 's/$TODAY/2011-01-30/' -i configure
+  tar xzf qt-everywhere-opensource-src-4.8.7.tar.gz
+  cd qt-everywhere-opensource-src-4.8.7
+  sed 's/$TODAY/2013-12-29/' -i configure
   sed "s/i686-pc-mingw32-/$HOST-/" -i mkspecs/unsupported/win32-g++-cross/qmake.conf
   sed --posix "s|QMAKE_CFLAGS\t\t= -pipe|QMAKE_CFLAGS\t\t= -pipe -isystem /usr/$HOST/include/ -frandom-seed=qtbuild|" -i mkspecs/unsupported/win32-g++-cross/qmake.conf
   sed 's/QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads/QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
@@ -61,4 +61,4 @@ script: |
 
   # as zip stores file timestamps, use faketime to intercept stat calls to set dates for all files to reference date
   export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
-  zip -r $OUTDIR/qt-win32-4.8.5-gitian-r8.zip *
+  zip -r $OUTDIR/qt-win32-4.8.7-gitian.zip *

contrib/homebrew/icoin.qt.pro.patch

@@ -7,7 +7,7 @@ index d938c07..e1dd4ec 100644
 
  isEmpty(BDB_LIB_PATH) {
 -    macx:BDB_LIB_PATH = /opt/local/lib/db48
-+    macx:BDB_LIB_PATH = /usr/local/opt/berkeley-db4/lib
++    macx:BDB_LIB_PATH = /usr/local/opt/berkeley-db@4/lib
  }
 
  isEmpty(BDB_LIB_SUFFIX) {
@@ -16,7 +16,7 @@ index d938c07..e1dd4ec 100644
 
  isEmpty(BDB_INCLUDE_PATH) {
 -    macx:BDB_INCLUDE_PATH = /opt/local/include/db48
-+    macx:BDB_INCLUDE_PATH = /usr/local/opt/berkeley-db4/include
++    macx:BDB_INCLUDE_PATH = /usr/local/opt/berkeley-db@4/include
  }
 
  isEmpty(BOOST_LIB_PATH) {

contrib/macdeploy/fancy.plist

@@ -20,12 +20,12 @@
 		<key>Applications</key>
 		<array>
 			<integer>370</integer>
-			<integer>156</integer>
+			<integer>126</integer>
 		</array>
 		<key>iCoin-Qt.app</key>
 		<array>
 			<integer>128</integer>
-			<integer>156</integer>
+			<integer>126</integer>
 		</array>
 	</dict>
 </dict>