Merge branch 'master' of https://github.com/phoreproject/vps

.gitignore

@@ -1 +1,3 @@
-.DS_Store*
+.DS_Store*
+*.DS_Store*
+assets/collage.jpeg

README.md

@@ -111,7 +111,7 @@ The *install.sh* script support the following parameters:
 
 ## Troubleshooting the masternode on the VPS
 
-If you want to check the status of your masternode, the best way is currently running the cli e.g. via
+If you want to check the status of your masternode, the best way is currently running the cli e.g. for $MUE via
 
 ```
 /usr/local/bin/mue-cli -conf=/etc/masternodes/mue_n1.conf getinfo
@@ -207,6 +207,9 @@ The management script release will follow within the next couple of days.
 | CROWD | ![CROWD](/assets/crowd.jpg) | http://crowdcoin.site/ |
 | NUMUS | ![NUMUS](/assets/numus.jpg) | http://numus.cash/ |
 | PHORE | ![PHORE](/assets/phore.jpg) | http://phore.io/ |
+| NODE | ![NODE](/assets/node.jpg) | https://bitnodes.co/ |
+| SUB1X | ![SUB1X](/assets/sub1x.jpg) | https://bitcointalk.org/index.php?topic=2282282.0 |
+| SEND | ![SEND](/assets/send.jpg) | https://socialsend.io/ |
 
 # Todo
 * provide my Dockerfile & Vagrantfile

config/curium/curium.compile

@@ -0,0 +1,13 @@
+#!/bin/bash  
+
+# monkey patching b/c ...
+cp ../../config/curium/secp256k1buildfix.patch src/
+patch -p0 < src/secp256k1buildfix.patch
+# end monkey patching
+
+chmod u+x ./autogen.sh
+chmod u+x share/genbuild.sh
+./autogen.sh
+./configure --disable-dependency-tracking --enable-tests=no --without-miniupnpc --with-incompatible-bdb CFLAGS="-march=native" LIBS="-lcurl -lssl -lcrypto -lz"
+make
+make install

config/curium/curium.env

@@ -0,0 +1,6 @@
+CODENAME=curium
+MNODE_DAEMON=${MNODE_DAEMON:-/usr/local/bin/curiumd}
+MNODE_INBOUND_PORT=${MNODE_INBOUND_PORT:-12845}
+GIT_URL="https://github.com/mrmetech/Curium.git"
+SCVERSION="master"
+NETWORK_BASE_TAG="2009"

config/curium/secp256k1buildfix.patch

@@ -0,0 +1,14 @@
+--- src/secp256k1/old_Makefile.am	2018-01-04 18:37:35.116643051 +0000
++++ src/secp256k1/Makefile.am	2018-01-04 18:38:22.400697181 +0000
+@@ -75,8 +75,9 @@
+ endif
+
+ if USE_ECMULT_STATIC_PRECOMPUTATION
+-CPPFLAGS_FOR_BUILD +=-I$(top_srcdir)
+-CFLAGS_FOR_BUILD += -Wall -Wextra -Wno-unused-function
++CPPFLAGS_FOR_BUILD = -I$(top_srcdir)
++CFLAGS_FOR_BUILD = -Wall -Wextra -Wno-unused-function
++CC_FOR_BUILD = g++
+
+ gen_context_OBJECTS = gen_context.o
+ gen_context_BIN = gen_context$(BUILD_EXEEXT)

config/node/node.compile

@@ -0,0 +1,6 @@
+#!/bin/bash   
+
+./autogen.sh
+./configure --disable-dependency-tracking --enable-tests=no --without-gui --without-miniupnpc --with-incompatible-bdb CFLAGS="-march=native" LIBS="-lcurl -lssl -lcrypto -lz"
+make
+make install

config/node/node.env

@@ -0,0 +1,6 @@
+CODENAME=node
+MNODE_DAEMON=${MNODE_DAEMON:-/usr/local/bin/bitnodesd}
+MNODE_INBOUND_PORT=${MNODE_INBOUND_PORT:-7227}
+GIT_URL=https://github.com/bitnodes/bitnodes.git
+SCVERSION="master"
+NETWORK_BASE_TAG="2002"

config/send/send.compile

@@ -0,0 +1,8 @@
+#!/bin/bash  
+
+chmod u+x ./autogen.sh
+chmod u+x share/genbuild.sh
+./autogen.sh
+./configure --disable-dependency-tracking --enable-tests=no --without-gui --without-miniupnpc --with-incompatible-bdb CFLAGS="-march=native" LIBS="-lcurl -lssl -lcrypto -lz"
+make
+make install

config/send/send.env

@@ -0,0 +1,6 @@
+CODENAME=send
+MNODE_DAEMON=${MNODE_DAEMON:-/usr/local/bin/sendd}
+MNODE_INBOUND_PORT=${MNODE_INBOUND_PORT:-50050}
+GIT_URL=https://github.com/SocialSend/SocialSend.git
+SCVERSION="tags/1.0.0.7"
+NETWORK_BASE_TAG="2012"

config/smart/smart.env

@@ -2,5 +2,5 @@ CODENAME=smart
 MNODE_DAEMON=${MNODE_DAEMON:-/usr/local/bin/smartcashd}
 MNODE_INBOUND_PORT=${MNODE_INBOUND_PORT:-9678}
 GIT_URL=https://github.com/SmartCash/smartcash.git
-SCVERSION="tags/v1.0.2"
-NETWORK_BASE_TAG="2012"
+SCVERSION="tags/v1.1.0"
+NETWORK_BASE_TAG="2012"

config/sub1x/sub1x.compile

@@ -0,0 +1,8 @@
+#!/bin/bash   
+
+chmod u+x autogen.sh
+chmod u+x share/genbuild.sh
+./autogen.sh
+./configure --disable-dependency-tracking --enable-tests=no --without-gui --without-miniupnpc --with-incompatible-bdb CFLAGS="-march=native" LIBS="-lcurl -lssl -lcrypto -lz"
+make
+make install

config/sub1x/sub1x.env

@@ -0,0 +1,6 @@
+CODENAME=sub1x
+MNODE_DAEMON=${MNODE_DAEMON:-/usr/local/bin/sub1xd}
+MNODE_INBOUND_PORT=${MNODE_INBOUND_PORT:-43172}
+GIT_URL=https://github.com/SuB1X-Coin/SuB1X.git
+SCVERSION="master"
+NETWORK_BASE_TAG="2009"

config/synx/rpcrawtxbuild.patch

@@ -0,0 +1,15 @@
+--- src/old_rpcrawtransaction.cpp	2018-01-04 18:09:03.904497370 +0000
++++ src/rpcrawtransaction.cpp	2018-01-04 18:11:57.957359497 +0000
+@@ -214,12 +214,7 @@
+             CTxDestination address;
+             if (ExtractDestination(pk, address))
+             {
+-                #warning BOOST_VERSION
+-                #if ((BOOST_VERSION / 10000 == 1) && (BOOST_VERSION / 100 % 1000 == 58))
+                 const CScriptID& hash = boost::get<CScriptID>(address);
+-                #else
+-                const CScriptID& hash = boost::get<CScriptID&>(address);
+-                #endif
+                 CScript redeemScript;
+                 if (pwalletMain->GetCScript(hash, redeemScript))
+                     entry.push_back(Pair("redeemScript", HexStr(redeemScript.begin(), redeemScript.end())));

config/synx/synx.compile

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+# monkey patching b/c synx ...
+cp ../../config/synx/rpcrawtxbuild.patch src/
+patch -p0 < src/rpcrawtxbuild.patch
+# end monkey patching
+
 cd src
 make -f makefile.unix USE_UPNP=-
-cp Syndicated ${MNODE_DAEMON}
+cp Syndicated ${MNODE_DAEMON}

config/synx/synx.env

@@ -2,5 +2,5 @@ CODENAME=synx
 MNODE_DAEMON=${MNODE_DAEMON:-/usr/local/bin/syndicated}
 MNODE_INBOUND_PORT=${MNODE_INBOUND_PORT:-9999}
 GIT_URL=https://github.com/SyndicateLtd/SyndicateQT.git
-SCVERSION="tags/v1.0.1.8"
+SCVERSION="tags/v1.9.2"
 NETWORK_BASE_TAG="2012"

config/vivo/secp256k1buildfix.patch

@@ -0,0 +1,14 @@
+--- src/secp256k1/old_Makefile.am	2018-01-04 18:37:35.116643051 +0000
++++ src/secp256k1/Makefile.am	2018-01-04 18:38:22.400697181 +0000
+@@ -75,8 +75,9 @@
+ endif
+
+ if USE_ECMULT_STATIC_PRECOMPUTATION
+-CPPFLAGS_FOR_BUILD +=-I$(top_srcdir)
+-CFLAGS_FOR_BUILD += -Wall -Wextra -Wno-unused-function
++CPPFLAGS_FOR_BUILD = -I$(top_srcdir)
++CFLAGS_FOR_BUILD = -Wall -Wextra -Wno-unused-function
++CC_FOR_BUILD = g++
+
+ gen_context_OBJECTS = gen_context.o
+ gen_context_BIN = gen_context$(BUILD_EXEEXT)

config/vivo/vivo.compile

@@ -1,6 +1,13 @@
 #!/bin/bash  
 
+# monkey patching b/c vivo ...
+cp ../../config/vivo/secp256k1buildfix.patch src/
+patch -p0 < src/secp256k1buildfix.patch
+# end monkey patching
+
+chmod u+x ./autogen.sh
+chmod u+x share/genbuild.sh
 ./autogen.sh
 ./configure --disable-dependency-tracking --enable-tests=no --without-gui --without-miniupnpc --with-incompatible-bdb CFLAGS="-march=native" LIBS="-lcurl -lssl -lcrypto -lz"
 make
-make install
+make install

install.sh

@@ -7,8 +7,8 @@
 #  ╚═╝  ╚═══╝ ╚═════╝ ╚═════╝ ╚══════╝╚═╝     ╚═╝╚═╝  ╚═╝╚══════╝   ╚═╝   ╚══════╝╚═╝  ╚═╝
 #                                                              ╚╗ @marsmensch 2016-2017 ╔╝                   				
 #                   
-# version 	v0.8.2
-# date    	2017-12-07
+# version 	v0.8.4
+# date    	2018-01-16
 #
 # function:	part of the masternode scripts, source the proper config file
 #                                                                      
@@ -30,7 +30,7 @@ declare -r CRYPTOS=`ls -l config/ | egrep '^d' | awk '{print $9}' | xargs echo -
 declare -r DATE_STAMP="$(date +%y-%m-%d-%s)"
 declare -r SCRIPTPATH=$( cd $(dirname ${BASH_SOURCE[0]}) > /dev/null; pwd -P )
 declare -r MASTERPATH="$(dirname "${SCRIPTPATH}")"
-declare -r SCRIPT_VERSION="v0.8.2"
+declare -r SCRIPT_VERSION="v0.8.4"
 declare -r SCRIPT_LOGFILE="/tmp/nodemaster_${DATE_STAMP}_out.log"
 declare -r IPV4_DOC_LINK="https://www.vultr.com/docs/add-secondary-ipv4-address"
 
@@ -42,7 +42,7 @@ cat << "EOF"
  ██║╚██╗██║██║   ██║██║  ██║██╔══╝  ██║╚██╔╝██║██╔══██║╚════██║   ██║   ██╔══╝  ██╔══██╗
  ██║ ╚████║╚██████╔╝██████╔╝███████╗██║ ╚═╝ ██║██║  ██║███████║   ██║   ███████╗██║  ██║
  ╚═╝  ╚═══╝ ╚═════╝ ╚═════╝ ╚══════╝╚═╝     ╚═╝╚═╝  ╚═╝╚══════╝   ╚═╝   ╚══════╝╚═╝  ╚═╝
-                                                             ╚╗ @marsmensch 2016-2017 ╔╝                   				
+                                                             ╚╗ @marsmensch 2016-2018 ╔╝                   				
 EOF
 }
 
@@ -548,6 +548,9 @@ function final_call() {
 	echo "Add your masternode private keys now."
 	echo "eg in /etc/masternodes/${CODENAME}_n1.conf"
 	echo ""
+    echo "=> All configuration files are in: ${MNODE_CONF_BASE}"
+    echo "=> All Data directories are in: ${MNODE_DATA_BASE}"
+	echo ""
 	echo "last but not least, run /usr/local/bin/activate_masternodes_${CODENAME} as root to activate your nodes."	
 
     # place future helper script accordingly