Merged in release/ICC-62-prepare-release-v5.0.00-beta1 (pull request d…

…ashpay#35)

Release/ICC-62 prepare release v5.0.00 beta1

.vscode/settings.json

@@ -806,6 +806,7 @@
         "sporkaddr",
         "ssapp",
         "sshd",
+        "stakers",
         "startmasternode",
         "startmenu",
         "strftime",

COPYING

@@ -3,6 +3,7 @@ The MIT License (MIT)
 Copyright (c) 2009-2019 The Bitcoin Core developers
 Copyright (c) 2009-2019 Bitcoin Developers
 Copyright (c) 2014-2019 The Dash Core developers
+Copyright (c) 2019-2020 The Ion Core 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

configure.ac

@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 5)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 00)
+define(_CLIENT_VERSION_REVISION, 01)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, false)
 define(_COPYRIGHT_YEAR, 2020)

contrib/devtools/copyright_header.py

@@ -107,6 +107,9 @@ def compile_copyright_regex(copyright_style, year_style, name):
     "Sam Rushing\n",
     "ArtForz -- public domain half-a-node\n",
     "The Ion Core developers\n",
+    "The Ion core developers\n",
+    "The Ion developers\n",
+    "cevap\n",
 ]
 
 DOMINANT_STYLE_COMPILED = {}

contrib/devtools/gen-manpages.sh

@@ -1,25 +1,34 @@
-#!/bin/sh
+#!/usr/bin/env bash
+# Copyright (c) 2016-2019 The Bitcoin Core developers
+# Copyright (c) 2020 The Ion Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+export LC_ALL=C
 TOPDIR=${TOPDIR:-$(git rev-parse --show-toplevel)}
-SRCDIR=${SRCDIR:-$TOPDIR/src}
+BUILDDIR=${BUILDDIR:-$TOPDIR}
+
+BINDIR=${BINDIR:-$BUILDDIR/src}
 MANDIR=${MANDIR:-$TOPDIR/doc/man}
 
-BITCOIND=${BITCOIND:-$SRCDIR/iond}
-BITCOINCLI=${BITCOINCLI:-$SRCDIR/ion-cli}
-BITCOINTX=${BITCOINTX:-$SRCDIR/ion-tx}
-BITCOINQT=${BITCOINQT:-$SRCDIR/qt/ion-qt}
+BITCOIND=${BITCOIND:-$BINDIR/iond}
+BITCOINCLI=${BITCOINCLI:-$BINDIR/ion-cli}
+BITCOINTX=${BITCOINTX:-$BINDIR/ion-tx}
+#WALLET_TOOL=${WALLET_TOOL:-$BINDIR/bitcoin-wallet}
+BITCOINQT=${BITCOINQT:-$BINDIR/qt/ion-qt}
 
 [ ! -x $BITCOIND ] && echo "$BITCOIND not found or not executable." && exit 1
 
 # The autodetected version git tag can screw up manpage output a little bit
-BTCVER=($($BITCOINCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }'))
+read -r -a BTCVER <<< "$($BITCOINCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }')"
 
 # Create a footer file with copyright content.
 # This gets autodetected fine for bitcoind if --version-string is not set,
 # but has different outcomes for bitcoin-qt and bitcoin-cli.
 echo "[COPYRIGHT]" > footer.h2m
 $BITCOIND --version | sed -n '1!p' >> footer.h2m
 
+#for cmd in $BITCOIND $BITCOINCLI $BITCOINTX $WALLET_TOOL $BITCOINQT; do
 for cmd in $BITCOIND $BITCOINCLI $BITCOINTX $BITCOINQT; do
   cmdname="${cmd##*/}"
   help2man -N --version-string=${BTCVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd}

contrib/seeds/makeseeds.sh

@@ -20,40 +20,36 @@
 #         and check if every IP address has a port in nodes_main.txt and nodes_test.txt
 #   thats it.
 
-MAINSEEDS="95.217.78.168:12700
-73.166.95.119:12700
-95.216.230.101:12700
-167.86.67.2:12700
-164.68.120.4:12700 
-207.148.84.210:12700
-94.130.163.244:12700 
-66.55.147.60:64081
-45.32.80.95:12700
+MAINSEEDS="37.247.55.128:12700
+163.172.188.223:12700
+37.120.155.10:12700
+88.202.231.139:12700
 72.17.88.56:12700
 149.29.2.18:12700
 109.123.118.38:12700
-155.138.225.26:12700
-37.120.155.10:12700
-88.202.231.139:12700"
+155.138.225.26:12700"
 
 MAINONIONSEEDS="mdbpyigvanhrv6jg.onion:12700
 ndqgxcnvvd2s6pbr.onion:12700
 3szeblrpwucr6eze.onion:12700
 mdbpyigvanhrv6jg.onion:12700
 g2x6xrzpef6fktez.onion:12700"
 
-TESTNETSEEDS="72.17.88.56:27170
+TESTNETSEEDS="37.247.55.128:27170
+163.172.188.223:27170
+37.120.155.10:27170
+88.202.231.139:27170
+72.17.88.56:27170
 149.29.2.18:27170
 109.123.118.38:27170
-155.138.225.26:27170
-37.120.155.10:27170
-88.202.231.139:27170"
+155.138.225.26:27170"
 
 TESTNETONIONSEEDS="mdbpyigvanhrv6jg.onion:27170
 ndqgxcnvvd2s6pbr.onion:27170
 3szeblrpwucr6eze.onion:27170
 mdbpyigvanhrv6jg.onion:27170
-g2x6xrzpef6fktez.onion:27170"
+g2x6xrzpef6fktez.onion:27170
+heaoykp3ic2ykdb4.onion:27170"
 
 setcustomseeds () {
 cat <<EOF | tee -a $1
@@ -71,6 +67,9 @@ getmainchainzmainseeds () {
     sed -i 's/\"]}]//g' contrib/seeds/nodes_main.txt
     sed -i 's/\"]}/:12700/g' contrib/seeds/nodes_main.txt
     sed -i 's/\\//g' contrib/seeds/nodes_main.txt
+    # delete last 2 line s
+    sed -i '$d' contrib/seeds/nodes_main.txt
+    sed -i '$d' contrib/seeds/nodes_main.txt
 }
 
 updateseeds () {
@@ -94,5 +93,6 @@ setcustomseeds "./contrib/seeds/nodes_main.txt" "$MAINONIONSEEDS"
 setcustomseeds "./contrib/seeds/nodes_test.txt" "$TESTNETSEEDS"
 setcustomseeds "./contrib/seeds/nodes_test.txt" "$TESTNETONIONSEEDS"
 getmainchainzmainseeds
+updateseeds
 sleep 2
 cleanup

doc/man/ion-cli.1

@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.10.
-.TH ION-CLI "1" "June 2019" "ion-cli v5.0.99.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
+.TH ION-CLI "1" "March 2020" "ion-cli v5.0.01.0" "User Commands"
 .SH NAME
-ion-cli \- manual page for ion-cli v5.0.99.0
+ion-cli \- manual page for ion-cli v5.0.01.0
 .SH DESCRIPTION
-Ion Core RPC client version v5.0.99.0
+Ion Core RPC client version v5.0.01.0
 .SS "Usage:"
 .TP
 ion\-cli [options] <command> [params]
@@ -75,9 +75,15 @@ Timeout in seconds during HTTP requests, or 0 for no timeout. (default:
 .IP
 Read extra arguments from standard input, one per line until EOF/Ctrl\-D
 (recommended for sensitive information such as passphrases)
+.HP
+\fB\-rpcwallet=\fR<walletname>
+.IP
+Send RPC for non\-default wallet on RPC server (argument is wallet
+filename in bitcoind directory, required if bitcoind/\-Qt runs
+with multiple wallets)
 .SH COPYRIGHT
-Copyright (C) 2014-2019 The Dash Core developers
-Copyright (C) 2009-2019 The Bitcoin Core developers
+Copyright (C) 2018-2020 The Ion Core developers
+Copyright (C) 2009-2020 The Bitcoin Core developers
 
 Please contribute if you find Ion Core useful. Visit <https://ionomy.com> for
 further information about the software.