Skip to content

Commit d89ace5

Browse files
tohsnoomtohsnoom
committed
Merge branch 'master' of https://github.com/phoreproject/vps 
2 parents c91ee01 + dcd813a commit d89ace5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+133
-11
lines changed

‎.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
.DS_Store*
1+
.DS_Store*
2+
*.DS_Store*
3+
assets/collage.jpeg

‎README.md

+4-1

‎assets/DSTkKH_XUAArpAF.jpg

4.04 KB

‎assets/alqo.jpg

1 Byte

‎assets/block.jpg

-812 Bytes

‎assets/collage.jpeg

224 KB

‎assets/collage.jpg

-1 Bytes

‎assets/crowd.jpg

-116 KB

‎assets/crown.jpg

-137 Bytes

‎assets/curium.jpg

812 Bytes

‎assets/default.jpg

12 Bytes

‎assets/dtmi.jpg

2 Bytes

‎assets/have.jpg

-113 KB

‎assets/innova.jpg

0 Bytes

‎assets/magna.jpg

-1.14 KB

‎assets/magnet.jpg

-2 Bytes

‎assets/mona.jpg

0 Bytes

‎assets/mtnc.jpg

1 Byte

‎assets/node.jpg

2.18 KB

‎assets/numus.jpg

-190 KB

‎assets/rns.jpg

1 Byte

‎assets/send.jpg

171 Bytes

‎assets/smart.jpg

5 Bytes

‎assets/sub1x.jpg

1.81 KB

‎assets/yup.jpg

-2 Bytes

‎assets/zcoin.jpg

0 Bytes

‎config/curium/curium.compile

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
3+
# monkey patching b/c ...
4+
cp ../../config/curium/secp256k1buildfix.patch src/
5+
patch -p0 < src/secp256k1buildfix.patch
6+
# end monkey patching
7+
8+
chmod u+x ./autogen.sh
9+
chmod u+x share/genbuild.sh
10+
./autogen.sh
11+
./configure --disable-dependency-tracking --enable-tests=no --without-miniupnpc --with-incompatible-bdb CFLAGS="-march=native" LIBS="-lcurl -lssl -lcrypto -lz"
12+
make
13+
make install

‎config/curium/curium.env

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
CODENAME=curium
2+
MNODE_DAEMON=${MNODE_DAEMON:-/usr/local/bin/curiumd}
3+
MNODE_INBOUND_PORT=${MNODE_INBOUND_PORT:-12845}
4+
GIT_URL="https://github.com/mrmetech/Curium.git"
5+
SCVERSION="master"
6+
NETWORK_BASE_TAG="2009"

‎config/curium/secp256k1buildfix.patch

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--- src/secp256k1/old_Makefile.am 2018-01-04 18:37:35.116643051 +0000
2+
+++ src/secp256k1/Makefile.am 2018-01-04 18:38:22.400697181 +0000
3+
@@ -75,8 +75,9 @@
4+
endif
5+
6+
if USE_ECMULT_STATIC_PRECOMPUTATION
7+
-CPPFLAGS_FOR_BUILD +=-I$(top_srcdir)
8+
-CFLAGS_FOR_BUILD += -Wall -Wextra -Wno-unused-function
9+
+CPPFLAGS_FOR_BUILD = -I$(top_srcdir)
10+
+CFLAGS_FOR_BUILD = -Wall -Wextra -Wno-unused-function
11+
+CC_FOR_BUILD = g++
12+
13+
gen_context_OBJECTS = gen_context.o
14+
gen_context_BIN = gen_context$(BUILD_EXEEXT)

‎config/node/node.compile

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

‎config/node/node.env

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
CODENAME=node
2+
MNODE_DAEMON=${MNODE_DAEMON:-/usr/local/bin/bitnodesd}
3+
MNODE_INBOUND_PORT=${MNODE_INBOUND_PORT:-7227}
4+
GIT_URL=https://github.com/bitnodes/bitnodes.git
5+
SCVERSION="master"
6+
NETWORK_BASE_TAG="2002"

‎config/send/send.compile

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

‎config/send/send.env

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
CODENAME=send
2+
MNODE_DAEMON=${MNODE_DAEMON:-/usr/local/bin/sendd}
3+
MNODE_INBOUND_PORT=${MNODE_INBOUND_PORT:-50050}
4+
GIT_URL=https://github.com/SocialSend/SocialSend.git
5+
SCVERSION="tags/1.0.0.7"
6+
NETWORK_BASE_TAG="2012"

‎config/smart/smart.env

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

‎config/sub1x/sub1x.compile

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

‎config/sub1x/sub1x.env

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
CODENAME=sub1x
2+
MNODE_DAEMON=${MNODE_DAEMON:-/usr/local/bin/sub1xd}
3+
MNODE_INBOUND_PORT=${MNODE_INBOUND_PORT:-43172}
4+
GIT_URL=https://github.com/SuB1X-Coin/SuB1X.git
5+
SCVERSION="master"
6+
NETWORK_BASE_TAG="2009"

‎config/synx/rpcrawtxbuild.patch

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

‎config/synx/synx.compile

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#!/bin/bash
22

3+
# monkey patching b/c synx ...
4+
cp ../../config/synx/rpcrawtxbuild.patch src/
5+
patch -p0 < src/rpcrawtxbuild.patch
6+
# end monkey patching
7+
38
cd src
49
make -f makefile.unix USE_UPNP=-
5-
cp Syndicated ${MNODE_DAEMON}
10+
cp Syndicated ${MNODE_DAEMON}

‎config/synx/synx.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ CODENAME=synx
22
MNODE_DAEMON=${MNODE_DAEMON:-/usr/local/bin/syndicated}
33
MNODE_INBOUND_PORT=${MNODE_INBOUND_PORT:-9999}
44
GIT_URL=https://github.com/SyndicateLtd/SyndicateQT.git
5-
SCVERSION="tags/v1.0.1.8"
5+
SCVERSION="tags/v1.9.2"
66
NETWORK_BASE_TAG="2012"

‎config/vivo/secp256k1buildfix.patch

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--- src/secp256k1/old_Makefile.am 2018-01-04 18:37:35.116643051 +0000
2+
+++ src/secp256k1/Makefile.am 2018-01-04 18:38:22.400697181 +0000
3+
@@ -75,8 +75,9 @@
4+
endif
5+
6+
if USE_ECMULT_STATIC_PRECOMPUTATION
7+
-CPPFLAGS_FOR_BUILD +=-I$(top_srcdir)
8+
-CFLAGS_FOR_BUILD += -Wall -Wextra -Wno-unused-function
9+
+CPPFLAGS_FOR_BUILD = -I$(top_srcdir)
10+
+CFLAGS_FOR_BUILD = -Wall -Wextra -Wno-unused-function
11+
+CC_FOR_BUILD = g++
12+
13+
gen_context_OBJECTS = gen_context.o
14+
gen_context_BIN = gen_context$(BUILD_EXEEXT)

‎config/vivo/vivo.compile

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
#!/bin/bash
22

3+
# monkey patching b/c vivo ...
4+
cp ../../config/vivo/secp256k1buildfix.patch src/
5+
patch -p0 < src/secp256k1buildfix.patch
6+
# end monkey patching
7+
8+
chmod u+x ./autogen.sh
9+
chmod u+x share/genbuild.sh
310
./autogen.sh
411
./configure --disable-dependency-tracking --enable-tests=no --without-gui --without-miniupnpc --with-incompatible-bdb CFLAGS="-march=native" LIBS="-lcurl -lssl -lcrypto -lz"
512
make
6-
make install
13+
make install

‎install.sh

+7-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
# ╚═╝ ╚═══╝ ╚═════╝ ╚═════╝ ╚══════╝╚═╝ ╚═╝╚═╝ ╚═╝╚══════╝ ╚═╝ ╚══════╝╚═╝ ╚═╝
88
# ╚╗ @marsmensch 2016-2017 ╔╝
99
#
10-
# version v0.8.2
11-
# date 2017-12-07
10+
# version v0.8.4
11+
# date 2018-01-16
1212
#
1313
# function: part of the masternode scripts, source the proper config file
1414
#
@@ -30,7 +30,7 @@ declare -r CRYPTOS=`ls -l config/ | egrep '^d' | awk '{print $9}' | xargs echo -
3030
declare -r DATE_STAMP="$(date +%y-%m-%d-%s)"
3131
declare -r SCRIPTPATH=$( cd $(dirname ${BASH_SOURCE[0]}) > /dev/null; pwd -P )
3232
declare -r MASTERPATH="$(dirname "${SCRIPTPATH}")"
33-
declare -r SCRIPT_VERSION="v0.8.2"
33+
declare -r SCRIPT_VERSION="v0.8.4"
3434
declare -r SCRIPT_LOGFILE="/tmp/nodemaster_${DATE_STAMP}_out.log"
3535
declare -r IPV4_DOC_LINK="https://www.vultr.com/docs/add-secondary-ipv4-address"
3636

@@ -42,7 +42,7 @@ cat << "EOF"
4242
██║╚██╗██║██║ ██║██║ ██║██╔══╝ ██║╚██╔╝██║██╔══██║╚════██║ ██║ ██╔══╝ ██╔══██╗
4343
██║ ╚████║╚██████╔╝██████╔╝███████╗██║ ╚═╝ ██║██║ ██║███████║ ██║ ███████╗██║ ██║
4444
╚═╝ ╚═══╝ ╚═════╝ ╚═════╝ ╚══════╝╚═╝ ╚═╝╚═╝ ╚═╝╚══════╝ ╚═╝ ╚══════╝╚═╝ ╚═╝
45-
╚╗ @marsmensch 2016-2017 ╔╝
45+
╚╗ @marsmensch 2016-2018 ╔╝
4646
EOF
4747
}
4848

@@ -548,6 +548,9 @@ function final_call() {
548548
echo "Add your masternode private keys now."
549549
echo "eg in /etc/masternodes/${CODENAME}_n1.conf"
550550
echo ""
551+
echo "=> All configuration files are in: ${MNODE_CONF_BASE}"
552+
echo "=> All Data directories are in: ${MNODE_DATA_BASE}"
553+
echo ""
551554
echo "last but not least, run /usr/local/bin/activate_masternodes_${CODENAME} as root to activate your nodes."
552555

553556
# place future helper script accordingly

0 commit comments

Comments
 (0)