From ff24280c7f0d83a15e86f634623f8c09495d1dcb Mon Sep 17 00:00:00 2001 From: Didy Septiyono Date: Sat, 10 Nov 2018 05:01:03 +0700 Subject: [PATCH] fix gitian build --- contrib/bitrpc/bitrpc.py | 4 +- contrib/debian/control | 4 +- contrib/debian/examples/dividendcash.conf | 8 ++-- contrib/debian/manpages/dividendcash-qt.1 | 6 +-- contrib/debian/manpages/dividendcash.conf.5 | 14 +++--- contrib/debian/manpages/dividendcashd.1 | 6 +-- contrib/devtools/README.md | 8 ++-- contrib/gitian-build.sh | 48 ++++++++++----------- contrib/gitian-descriptors/gitian-linux.yml | 2 +- contrib/gitian-descriptors/gitian-osx.yml | 6 +-- contrib/gitian-descriptors/gitian-rpi2.yml | 2 +- contrib/init/dividendcashd.conf | 2 +- contrib/init/dividendcashd.init | 2 +- contrib/init/dividendcashd.openrc | 4 +- contrib/init/dividendcashd.service | 2 +- contrib/linearize/linearize-hashes.py | 2 +- contrib/macdeploy/custom_dsstore.py | 2 +- contrib/macdeploy/macdeployqtplus | 4 +- contrib/qos/README.md | 2 +- contrib/qos/tc.sh | 6 +-- contrib/seeds/generate-seeds.py | 4 +- contrib/seeds/makeseeds.py | 2 +- contrib/spendfrom/spendfrom.py | 12 +++--- 23 files changed, 76 insertions(+), 76 deletions(-) diff --git a/contrib/bitrpc/bitrpc.py b/contrib/bitrpc/bitrpc.py index 8515b0c..c42a1ae 100755 --- a/contrib/bitrpc/bitrpc.py +++ b/contrib/bitrpc/bitrpc.py @@ -11,9 +11,9 @@ if rpcpass == "": - access = ServiceProxy("http://127.0.0.1:51473") + access = ServiceProxy("http://127.0.0.1:19998") else: - access = ServiceProxy("http://"+rpcuser+":"+rpcpass+"@127.0.0.1:51473") + access = ServiceProxy("http://"+rpcuser+":"+rpcpass+"@127.0.0.1:19998") cmd = sys.argv[1].lower() if cmd == "backupwallet": diff --git a/contrib/debian/control b/contrib/debian/control index f2d9a9b..5cf55bb 100755 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -23,8 +23,8 @@ Build-Depends: debhelper, libprotobuf-dev, protobuf-compiler Standards-Version: 3.9.2 Homepage: http://www.dividendcash.org -Vcs-Git: git://github.com/Dividendcash-Project/Dividendcash.git -Vcs-Browser: http://github.com/Dividendcash-Project/Dividendcash +Vcs-Git: git://github.com/DividendCash-Project/DividendCash.git +Vcs-Browser: http://github.com/DividendCash-Project/DividendCash Package: dividendcashd Architecture: any diff --git a/contrib/debian/examples/dividendcash.conf b/contrib/debian/examples/dividendcash.conf index c0fb51b..88ba1f5 100755 --- a/contrib/debian/examples/dividendcash.conf +++ b/contrib/debian/examples/dividendcash.conf @@ -38,11 +38,11 @@ # Use as many addnode= settings as you like to connect to specific peers #addnode=69.164.218.197 -#addnode=10.0.0.2:51472 +#addnode=10.0.0.2:19997 # Alternatively use as many connect= settings as you like to connect ONLY to specific peers #connect=69.164.218.197 -#connect=10.0.0.1:51472 +#connect=10.0.0.1:19997 # Listening mode, enabled by default except when 'connect' is being used #listen=1 @@ -79,7 +79,7 @@ #rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96 # Listen for RPC connections on this TCP port: -#rpcport=51473 +#rpcport=19998 # You can use Dividendcash or dividendcashd to send commands to Dividendcash/dividendcashd # running on another host using this option: @@ -101,7 +101,7 @@ # both prior transactions and several dozen future transactions. #keypool=100 -# Pay an optional transaction fee every time you send PIVs. Transactions with fees +# Pay an optional transaction fee every time you send DVDs. Transactions with fees # are more likely than free transactions to be included in generated blocks, so may # be validated sooner. #paytxfee=0.00 diff --git a/contrib/debian/manpages/dividendcash-qt.1 b/contrib/debian/manpages/dividendcash-qt.1 index d3f98b2..5d901cb 100755 --- a/contrib/debian/manpages/dividendcash-qt.1 +++ b/contrib/debian/manpages/dividendcash-qt.1 @@ -1,4 +1,4 @@ -.TH PIV-QT "1" "February 2017" "dividendcash-qt 1" +.TH DVD-QT "1" "February 2017" "dividendcash-qt 1" .SH NAME dividendcash-qt \- peer-to-peer network based digital currency .SH DESCRIPTION @@ -41,7 +41,7 @@ Use proxy to reach tor hidden services (default: same as \fB\-proxy\fR) Allow DNS lookups for \fB\-addnode\fR, \fB\-seednode\fR and \fB\-connect\fR .TP \fB\-port=\fR -Listen for connections on (default: 51472 or testnet: 51474) +Listen for connections on (default: 19997 or testnet: 19995) .TP \fB\-maxconnections=\fR Maintain at most connections to peers (default: 125) @@ -122,7 +122,7 @@ Username for JSON\-RPC connections Password for JSON\-RPC connections .TP \fB\-rpcport=\fR -Listen for JSON\-RPC connections on (default: 51473 or testnet: 51475) +Listen for JSON\-RPC connections on (default: 19998 or testnet: 39799) .TP \fB\-rpcallowip=\fR Allow JSON\-RPC connections from specified IP address diff --git a/contrib/debian/manpages/dividendcash.conf.5 b/contrib/debian/manpages/dividendcash.conf.5 index 1de1484..3c46da0 100755 --- a/contrib/debian/manpages/dividendcash.conf.5 +++ b/contrib/debian/manpages/dividendcash.conf.5 @@ -1,4 +1,4 @@ -.TH PIV.CONF "5" "January 2011" "dividendcash.conf 3.19" +.TH DVD.CONF "5" "January 2011" "dividendcash.conf 3.19" .SH NAME dividendcash.conf \- dividendcash configuration file .SH SYNOPSIS @@ -18,10 +18,10 @@ Enable or disable run on the test network instead of the real *dividendcash* net \fBproxy=\fR\fI'127.0.0.1:9050'\fR Connect via a socks4 proxy. .TP -\fBaddnode=\fR\fI'10.0.0.2:51472'\fR +\fBaddnode=\fR\fI'10.0.0.2:19997'\fR Use as many *addnode=* settings as you like to connect to specific peers. .TP -\fBconnect=\fR\fI'10.0.0.1:51472'\fR +\fBconnect=\fR\fI'10.0.0.1:19997'\fR Use as many *connect=* settings as you like to connect ONLY to specific peers. .TP \fRmaxconnections=\fR\fI'value'\fR @@ -40,7 +40,7 @@ You must set *rpcpassword* to secure the JSON-RPC api. \fBrpcallowip=\fR\fI'192.168.1.*'\fR By default, only RPC connections from localhost are allowed. Specify as many *rpcallowip=* settings as you like to allow connections from other hosts (and you may use * as a wildcard character). .TP -\fBrpcport=\fR\fI'51473'\fR +\fBrpcport=\fR\fI'19998'\fR Listen for RPC connections on this TCP port. .TP \fBrpcconnect=\fR\fI'127.0.0.1'\fR @@ -59,16 +59,16 @@ Acceptable ciphers (default: TLSv1+HIGH:\:!SSLv2:\:!aNULL:\:!eNULL:\:!AH:\:!3DES .SH MISCELLANEOUS OPTIONS .TP \fBgen=\fR[\fI'0'\fR|\fI'1'\fR] -Enable or disable attempt to generate PIVs. +Enable or disable attempt to generate DVDs. .TP \fB4way=\fR[\fI'0'\fR|\fI'1'\fR] -Enable or disable use SSE instructions to try to generate PIVs faster. +Enable or disable use SSE instructions to try to generate DVDs faster. .TP \fBkeypool=\fR\fI'100'\fR Pre-generate this many public/private key pairs, so wallet backups will be valid for both prior transactions and several dozen future transactions. .TP \fBpaytxfee=\fR\fI'0.00'\fR -Pay an optional transaction fee every time you send PIVs. Transactions with fees are more likely than free transactions to be included in generated blocks, so may be validated sooner. +Pay an optional transaction fee every time you send DVDs. Transactions with fees are more likely than free transactions to be included in generated blocks, so may be validated sooner. .TP \fBallowreceivebyip=\fR\fI'1'\fR Allow direct connections for the 'pay via IP address' feature. diff --git a/contrib/debian/manpages/dividendcashd.1 b/contrib/debian/manpages/dividendcashd.1 index c11fed1..4ed943b 100755 --- a/contrib/debian/manpages/dividendcashd.1 +++ b/contrib/debian/manpages/dividendcashd.1 @@ -1,4 +1,4 @@ -.TH PIVD "1" "February 2017" "dividendcashd 2.1.4.1" +.TH DVDD "1" "February 2017" "dividendcashd 2.1.4.1" .SH NAME Dividendcash \- peer-to-peer network based digital currency .SH SYNOPSIS @@ -112,7 +112,7 @@ Returns the number of connections to other nodes. Returns the proof-of-work difficulty as a multiple of the minimum difficulty. .TP \fBgetgenerate\fR -Returns boolean true if server is trying to generate PIV, false otherwise. +Returns boolean true if server is trying to generate DVD, false otherwise. .TP \fBsetgenerate 'generate' ['genproclimit']\fR Generation is limited to ['genproclimit'] processors, \-1 is unlimited. @@ -183,7 +183,7 @@ Returns a list of the last ['count'] transactions for 'account' \- for all accou Moves funds between accounts. .TP \fBsendfrom* <'account'> <'dividendcashaddress'> <'amount'> ['minconf=1'] ['comment'] ['comment-to']\fR -Sends amount from account's balance to 'dividendcashaddress'. This method will fail if there is less than amount PIV with ['minconf'] confirmations in the account's balance (unless account is the empty-string-named default account; it behaves like the *sendtoaddress* method). Returns transaction ID on success. +Sends amount from account's balance to 'dividendcashaddress'. This method will fail if there is less than amount DVD with ['minconf'] confirmations in the account's balance (unless account is the empty-string-named default account; it behaves like the *sendtoaddress* method). Returns transaction ID on success. .TP \fBsendtoaddress 'dividendcashaddress' 'amount' ['comment'] ['comment-to']\fR Sends amount from the server's available balance to 'dividendcashaddress'. amount is a real and is rounded to the nearest 0.01. Returns transaction id on success. diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md index 55a1e2b..c6d00aa 100755 --- a/contrib/devtools/README.md +++ b/contrib/devtools/README.md @@ -18,7 +18,7 @@ For example: ./github-merge.py 3077 (in any git repository) will help you merge pull request #3077 for the -Dividendcash-Project/Dividendcash repository. +DividendCash-Project/DividendCash repository. What it does: * Fetch master and the pull request. @@ -36,16 +36,16 @@ couldn't mess with the sources. Setup --------- -Configuring the github-merge tool for the Dividendcash repository is done in the following way: +Configuring the github-merge tool for the DividendCash repository is done in the following way: - git config githubmerge.repository Dividendcash-Project/Dividendcash + git config githubmerge.repository DividendCash-Project/DividendCash git config githubmerge.testcmd "make -j4 check" (adapt to whatever you want to use for testing) git config --global user.signingkey mykeyid (if you want to GPG sign) optimize-pngs.py ================ -A script to optimize png files in the Dividendcash +A script to optimize png files in the DividendCash repository (requires pngcrush). fix-copyright-headers.py diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh index 51ae382..030cac8 100755 --- a/contrib/gitian-build.sh +++ b/contrib/gitian-build.sh @@ -247,7 +247,7 @@ then fi # Set up build -pushd ./dividendcash +pushd ./DividendCash git fetch git checkout ${COMMIT} popd @@ -256,7 +256,7 @@ popd if [[ $build = true ]] then # Make output folder - mkdir -p ./dividendcash-binaries/${VERSION} + mkdir -p ./DividendCash-binaries/${VERSION} # Build Dependencies echo "" @@ -266,7 +266,7 @@ then mkdir -p inputs wget -N -P inputs $osslPatchUrl wget -N -P inputs $osslTarUrl - make -C ../dividendcash/depends download SOURCES_PATH=`pwd`/cache/common + make -C ../DividendCash/depends download SOURCES_PATH=`pwd`/cache/common # Linux if [[ $linux = true ]] @@ -274,9 +274,9 @@ then echo "" echo "Compiling ${VERSION} Linux" echo "" - ./bin/gbuild -j ${proc} -m ${mem} --commit dividendcash=${COMMIT} --url dividendcash=${url} ../dividendcash/contrib/gitian-descriptors/gitian-linux.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../dividendcash/contrib/gitian-descriptors/gitian-linux.yml - mv build/out/dividendcash-*.tar.gz build/out/src/dividendcash-*.tar.gz ../dividendcash-binaries/${VERSION} + ./bin/gbuild -j ${proc} -m ${mem} --commit dividendcash=${COMMIT} --url dividendcash=${url} ../DividendCash/contrib/gitian-descriptors/gitian-linux.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../DividendCash/contrib/gitian-descriptors/gitian-linux.yml + mv build/out/dividendcash-*.tar.gz build/out/src/dividendcash-*.tar.gz ../DividendCash-binaries/${VERSION} fi # Windows if [[ $windows = true ]] @@ -284,10 +284,10 @@ then echo "" echo "Compiling ${VERSION} Windows" echo "" - ./bin/gbuild -j ${proc} -m ${mem} --commit dividendcash=${COMMIT} --url dividendcash=${url} ../dividendcash/contrib/gitian-descriptors/gitian-win.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs/ ../dividendcash/contrib/gitian-descriptors/gitian-win.yml + ./bin/gbuild -j ${proc} -m ${mem} --commit dividendcash=${COMMIT} --url dividendcash=${url} ../DividendCash/contrib/gitian-descriptors/gitian-win.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs/ ../DividendCash/contrib/gitian-descriptors/gitian-win.yml mv build/out/dividendcash-*-win-unsigned.tar.gz inputs/dividendcash-win-unsigned.tar.gz - mv build/out/dividendcash-*.zip build/out/dividendcash-*.exe ../dividendcash-binaries/${VERSION} + mv build/out/dividendcash-*.zip build/out/dividendcash-*.exe ../DividendCash-binaries/${VERSION} fi # Mac OSX if [[ $osx = true ]] @@ -295,10 +295,10 @@ then echo "" echo "Compiling ${VERSION} Mac OSX" echo "" - ./bin/gbuild -j ${proc} -m ${mem} --commit dividendcash=${COMMIT} --url dividendcash=${url} ../dividendcash/contrib/gitian-descriptors/gitian-osx.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../dividendcash/contrib/gitian-descriptors/gitian-osx.yml + ./bin/gbuild -j ${proc} -m ${mem} --commit dividendcash=${COMMIT} --url dividendcash=${url} ../DividendCash/contrib/gitian-descriptors/gitian-osx.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../DividendCash/contrib/gitian-descriptors/gitian-osx.yml mv build/out/dividendcash-*-osx-unsigned.tar.gz inputs/dividendcash-osx-unsigned.tar.gz - mv build/out/dividendcash-*.tar.gz build/out/dividendcash-*.dmg ../dividendcash-binaries/${VERSION} + mv build/out/dividendcash-*.tar.gz build/out/dividendcash-*.dmg ../DividendCash-binaries/${VERSION} fi popd @@ -325,27 +325,27 @@ then echo "" echo "Verifying v${VERSION} Linux" echo "" - ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-linux ../dividendcash/contrib/gitian-descriptors/gitian-linux.yml + ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-linux ../DividendCash/contrib/gitian-descriptors/gitian-linux.yml # Windows echo "" echo "Verifying v${VERSION} Windows" echo "" - ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-win-unsigned ../dividendcash/contrib/gitian-descriptors/gitian-win.yml + ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-win-unsigned ../DividendCash/contrib/gitian-descriptors/gitian-win.yml # Mac OSX echo "" echo "Verifying v${VERSION} Mac OSX" echo "" - ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-unsigned ../dividendcash/contrib/gitian-descriptors/gitian-osx.yml + ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-unsigned ../DividendCash/contrib/gitian-descriptors/gitian-osx.yml # Signed Windows echo "" echo "Verifying v${VERSION} Signed Windows" echo "" - ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../dividendcash/contrib/gitian-descriptors/gitian-osx-signer.yml + ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../DividendCash/contrib/gitian-descriptors/gitian-osx-signer.yml # Signed Mac OSX echo "" echo "Verifying v${VERSION} Signed Mac OSX" echo "" - ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../dividendcash/contrib/gitian-descriptors/gitian-osx-signer.yml + ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../DividendCash/contrib/gitian-descriptors/gitian-osx-signer.yml popd fi @@ -360,10 +360,10 @@ then echo "" echo "Signing ${VERSION} Windows" echo "" - ./bin/gbuild -i --commit signature=${COMMIT} ../dividendcash/contrib/gitian-descriptors/gitian-win-signer.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs/ ../dividendcash/contrib/gitian-descriptors/gitian-win-signer.yml - mv build/out/dividendcash-*win64-setup.exe ../dividendcash-binaries/${VERSION} - mv build/out/dividendcash-*win32-setup.exe ../dividendcash-binaries/${VERSION} + ./bin/gbuild -i --commit signature=${COMMIT} ../DividendCash/contrib/gitian-descriptors/gitian-win-signer.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs/ ../DividendCash/contrib/gitian-descriptors/gitian-win-signer.yml + mv build/out/dividendcash-*win64-setup.exe ../DividendCash-binaries/${VERSION} + mv build/out/dividendcash-*win32-setup.exe ../DividendCash-binaries/${VERSION} fi # Sign Mac OSX if [[ $osx = true ]] @@ -371,9 +371,9 @@ then echo "" echo "Signing ${VERSION} Mac OSX" echo "" - ./bin/gbuild -i --commit signature=${COMMIT} ../dividendcash/contrib/gitian-descriptors/gitian-osx-signer.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../dividendcash/contrib/gitian-descriptors/gitian-osx-signer.yml - mv build/out/dividendcash-osx-signed.dmg ../dividendcash-binaries/${VERSION}/dividendcash-${VERSION}-osx.dmg + ./bin/gbuild -i --commit signature=${COMMIT} ../DividendCash/contrib/gitian-descriptors/gitian-osx-signer.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../DividendCash/contrib/gitian-descriptors/gitian-osx-signer.yml + mv build/out/dividendcash-osx-signed.dmg ../DividendCash-binaries/${VERSION}/dividendcash-${VERSION}-osx.dmg fi popd diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index bb4a1f4..544a4ca 100755 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -29,7 +29,7 @@ packages: - "python" reference_datetime: "2015-06-01 00:00:00" remotes: -- "url": "https://github.com/dividendcash/DividendCash.git" +- "url": "https://github.com/dividendcash-project/dividendcash.git" "dir": "DividendCash" files: [] script: | diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index a3f4264..b0e11d5 100755 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -5,7 +5,7 @@ suites: - "trusty" architectures: - "amd64" -packages: +packages: - "ca-certificates" - "curl" - "g++" @@ -29,7 +29,7 @@ packages: - "fonts-tuffy" remotes: - "url": "https://github.com/dividendcash-project/dividendcash.git" - "dir": "dividendcash" + "dir": "DividendCash" files: - "MacOSX10.11.sdk.tar.gz" script: | @@ -83,7 +83,7 @@ script: | create_per-host_faketime_wrappers "2000-01-01 12:00:00" export PATH=${WRAP_DIR}:${PATH} - cd dividendcash + cd DividendCash BASEPREFIX=`pwd`/depends mkdir -p ${BASEPREFIX}/SDKs diff --git a/contrib/gitian-descriptors/gitian-rpi2.yml b/contrib/gitian-descriptors/gitian-rpi2.yml index 7a0247b..525bec2 100755 --- a/contrib/gitian-descriptors/gitian-rpi2.yml +++ b/contrib/gitian-descriptors/gitian-rpi2.yml @@ -21,7 +21,7 @@ packages: reference_datetime: "2015-06-01 00:00:00" remotes: - "url": "https://github.com/dividendcash-project/dividendcash.git" - "dir": "dividendcash" + "dir": "DividendCash" files: - "raspberrypi-tools.tar.gz" script: | diff --git a/contrib/init/dividendcashd.conf b/contrib/init/dividendcashd.conf index e16ccde..57f4b8b 100755 --- a/contrib/init/dividendcashd.conf +++ b/contrib/init/dividendcashd.conf @@ -1,4 +1,4 @@ -description "Dividendcash Core Daemon" +description "DividendCash Core Daemon" start on runlevel [2345] stop on starting rc RUNLEVEL=[016] diff --git a/contrib/init/dividendcashd.init b/contrib/init/dividendcashd.init index cf468a7..5da25fe 100755 --- a/contrib/init/dividendcashd.init +++ b/contrib/init/dividendcashd.init @@ -1,6 +1,6 @@ #!/bin/bash # -# dividendcashd The Dividendcash core server. +# dividendcashd The DividendCash core server. # # # chkconfig: 345 80 20 diff --git a/contrib/init/dividendcashd.openrc b/contrib/init/dividendcashd.openrc index 90474be..2be6515 100755 --- a/contrib/init/dividendcashd.openrc +++ b/contrib/init/dividendcashd.openrc @@ -16,8 +16,8 @@ BITCOIND_USER=${BITCOIND_USER:-dividendcash} BITCOIND_GROUP=${BITCOIND_GROUP:-dividendcash} BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/dividendcashd} -name="Dividendcash Core Daemon" -description="Dividendcash crypto-currency p2p network daemon" +name="DividendCash Core Daemon" +description="DividendCash crypto-currency p2p network daemon" command="/usr/bin/dividendcashd" command_args="-pid=\"${BITCOIND_PIDFILE}\" \ diff --git a/contrib/init/dividendcashd.service b/contrib/init/dividendcashd.service index b9ef20f..b7766c7 100755 --- a/contrib/init/dividendcashd.service +++ b/contrib/init/dividendcashd.service @@ -1,5 +1,5 @@ [Unit] -Description=Dividendcash's distributed currency daemon +Description=DividendCash's distributed currency daemon After=network.target [Service] diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py index 8da9f01..71e2aca 100755 --- a/contrib/linearize/linearize-hashes.py +++ b/contrib/linearize/linearize-hashes.py @@ -96,7 +96,7 @@ def get_block_hashes(settings, max_blocks_per_call=10000): if 'host' not in settings: settings['host'] = '127.0.0.1' if 'port' not in settings: - settings['port'] = 51473 + settings['port'] = 19998 if 'min_height' not in settings: settings['min_height'] = 0 if 'max_height' not in settings: diff --git a/contrib/macdeploy/custom_dsstore.py b/contrib/macdeploy/custom_dsstore.py index bea0435..5629e22 100755 --- a/contrib/macdeploy/custom_dsstore.py +++ b/contrib/macdeploy/custom_dsstore.py @@ -54,7 +54,7 @@ ds['.']['vSrn'] = ('long', 1) ds['Applications']['Iloc'] = (370, 156) -ds['Dividendcash-Qt.app']['Iloc'] = (128, 156) +ds['DividendCash-Qt.app']['Iloc'] = (128, 156) ds.flush() ds.close() diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index 303a1a4..9d09931 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -155,7 +155,7 @@ class FrameworkInfo(object): class ApplicationBundleInfo(object): def __init__(self, path): self.path = path - appName = "Dividendcash-Qt" + appName = "DividendCash-Qt" self.binaryPath = os.path.join(path, "Contents", "MacOS", appName) if not os.path.exists(self.binaryPath): raise RuntimeError("Could not find bundle binary for " + path) @@ -604,7 +604,7 @@ else: # ------------------------------------------------ -target = os.path.join("dist", "Dividendcash-Qt.app") +target = os.path.join("dist", "DividendCash-Qt.app") if verbose >= 2: print("+ Copying source bundle +") diff --git a/contrib/qos/README.md b/contrib/qos/README.md index 9649dff..b157c85 100755 --- a/contrib/qos/README.md +++ b/contrib/qos/README.md @@ -1,5 +1,5 @@ ### Qos ### -This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. It limits outbound TCP traffic with a source or destination port of 51472, but not if the destination IP is within a LAN (defined as 192.168.x.x). +This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. It limits outbound TCP traffic with a source or destination port of 19997, but not if the destination IP is within a LAN (defined as 192.168.x.x). This means one can have an always-on dividendcashd instance running, and another local dividendcashd/dividendcash-qt instance which connects to this node and receives blocks from it. diff --git a/contrib/qos/tc.sh b/contrib/qos/tc.sh index 1b03b69..4b45c15 100755 --- a/contrib/qos/tc.sh +++ b/contrib/qos/tc.sh @@ -32,10 +32,10 @@ tc filter add dev ${IF} parent 1: protocol ip prio 2 handle 2 fw classid 1:11 # ret=$? #done -#limit outgoing traffic to and from port 51472. but not when dealing with a host on the local network +#limit outgoing traffic to and from port 19997. but not when dealing with a host on the local network # (defined by $LOCALNET) # --set-mark marks packages matching these criteria with the number "2" # these packages are filtered by the tc filter with "handle 2" # this filter sends the packages into the 1:11 class, and this class is limited to ${LIMIT} -iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 51472 ! -d ${LOCALNET} -j MARK --set-mark 0x2 -iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 51472 ! -d ${LOCALNET} -j MARK --set-mark 0x2 +iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 19997 ! -d ${LOCALNET} -j MARK --set-mark 0x2 +iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 19997 ! -d ${LOCALNET} -j MARK --set-mark 0x2 diff --git a/contrib/seeds/generate-seeds.py b/contrib/seeds/generate-seeds.py index 0b24237..d092cc9 100755 --- a/contrib/seeds/generate-seeds.py +++ b/contrib/seeds/generate-seeds.py @@ -127,10 +127,10 @@ def main(): g.write(' * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.\n') g.write(' */\n') with open(os.path.join(indir,'nodes_main.txt'),'r') as f: - process_nodes(g, f, 'pnSeed6_main', 51472) + process_nodes(g, f, 'pnSeed6_main', 19997) g.write('\n') with open(os.path.join(indir,'nodes_test.txt'),'r') as f: - process_nodes(g, f, 'pnSeed6_test', 51474) + process_nodes(g, f, 'pnSeed6_test', 19995) g.write('#endif // BITCOIN_CHAINPARAMSSEEDS_H\n') if __name__ == '__main__': diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py index 9bd0037..b844ea1 100755 --- a/contrib/seeds/makeseeds.py +++ b/contrib/seeds/makeseeds.py @@ -26,7 +26,7 @@ PATTERN_IPV4 = re.compile(r"^((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})):(\d+)$") PATTERN_IPV6 = re.compile(r"^\[([0-9a-z:]+)\]:(\d+)$") PATTERN_ONION = re.compile(r"^([abcdefghijklmnopqrstuvwxyz234567]{16}\.onion):(\d+)$") -PATTERN_AGENT = re.compile(r"^(/DividendcashCore:2.2.(0|1|99)/)$") +PATTERN_AGENT = re.compile(r"^(/DividendCashCore:2.2.(0|1|99)/)$") def parseline(line): sline = line.split() diff --git a/contrib/spendfrom/spendfrom.py b/contrib/spendfrom/spendfrom.py index a01a3f9..28289ec 100755 --- a/contrib/spendfrom/spendfrom.py +++ b/contrib/spendfrom/spendfrom.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Use the raw transactions API to spend PIVs received on particular addresses, +# Use the raw transactions API to spend DVDs received on particular addresses, # and send any change back to that same address. # # Example usage: @@ -35,9 +35,9 @@ def check_json_precision(): def determine_db_dir(): """Return the default location of the dividendcash data directory""" if platform.system() == "Darwin": - return os.path.expanduser("~/Library/Application Support/Dividendcash/") + return os.path.expanduser("~/Library/Application Support/DividendCash/") elif platform.system() == "Windows": - return os.path.join(os.environ['APPDATA'], "Dividendcash") + return os.path.join(os.environ['APPDATA'], "DividendCash") return os.path.expanduser("~/.dividendcash") def read_bitcoin_config(dbdir): @@ -67,7 +67,7 @@ def connect_JSON(config): testnet = config.get('testnet', '0') testnet = (int(testnet) > 0) # 0/1 in config file, convert to True/False if not 'rpcport' in config: - config['rpcport'] = 51475 if testnet else 51473 + config['rpcport'] = 39799 if testnet else 19998 connect = "http://%s:%s@127.0.0.1:%s"%(config['rpcuser'], config['rpcpassword'], config['rpcport']) try: result = ServiceProxy(connect) @@ -221,9 +221,9 @@ def main(): parser = optparse.OptionParser(usage="%prog [options]") parser.add_option("--from", dest="fromaddresses", default=None, - help="addresses to get PIVs from") + help="addresses to get DVDs from") parser.add_option("--to", dest="to", default=None, - help="address to get send PIVs to") + help="address to get send DVDs to") parser.add_option("--amount", dest="amount", default=None, help="amount to send") parser.add_option("--fee", dest="fee", default="0.0",