From 5ba6751be718cb0979b44863c37136bae29f5947 Mon Sep 17 00:00:00 2001 From: vertoe Date: Thu, 27 Nov 2014 17:26:22 +0100 Subject: [PATCH] Change , .conf and .pid files to darkcoin --- TODO.md | 7 +- contrib/debian/bitcoind.examples | 2 +- contrib/debian/bitcoind.manpages | 4 +- contrib/debian/changelog | 4 +- .../examples/{bitcoin.conf => darkcoin.conf} | 2 +- .../manpages/{bitcoin-qt.1 => darkcoin-qt.1} | 2 +- .../{bitcoin.conf.5 => darkcoin.conf.5} | 26 +++--- .../manpages/{bitcoind.1 => darkcoind.1} | 14 ++-- contrib/gitian-descriptors/gitian-linux.yml | 26 +++--- contrib/gitian-descriptors/gitian-win.yml | 26 +++--- contrib/spendfrom/README.md | 6 +- contrib/spendfrom/spendfrom.py | 80 +++++++++---------- doc/build-osx.md | 38 ++++----- doc/release-notes/release-notes-0.3.20.2.md | 2 +- doc/release-notes/release-notes-0.8.0.md | 4 +- qa/pull-tester/run-bitcoind-for-test.sh.in | 4 +- qa/rpc-tests/util.py | 19 ++--- qa/rpc-tests/util.sh | 5 +- qa/rpc-tests/walletbackup.sh | 7 +- src/bitcoind.cpp | 5 +- src/init.cpp | 3 +- src/qt/bitcoin.cpp | 5 +- src/qt/bitcoinstrings.cpp | 5 +- src/qt/intro.cpp | 9 ++- src/qt/locale/bitcoin_be_BY.ts | 4 +- src/qt/locale/bitcoin_bg.ts | 4 +- src/qt/locale/bitcoin_ca_ES.ts | 4 +- src/qt/locale/bitcoin_cs.ts | 4 +- src/qt/locale/bitcoin_da.ts | 4 +- src/qt/locale/bitcoin_de.ts | 4 +- src/qt/locale/bitcoin_el_GR.ts | 4 +- src/qt/locale/bitcoin_en.ts | 4 +- src/qt/locale/bitcoin_eo.ts | 4 +- src/qt/locale/bitcoin_es.ts | 6 +- src/qt/locale/bitcoin_es_CL.ts | 6 +- src/qt/locale/bitcoin_es_DO.ts | 6 +- src/qt/locale/bitcoin_et.ts | 6 +- src/qt/locale/bitcoin_eu_ES.ts | 4 +- src/qt/locale/bitcoin_fa.ts | 6 +- src/qt/locale/bitcoin_fa_IR.ts | 4 +- src/qt/locale/bitcoin_fi.ts | 6 +- src/qt/locale/bitcoin_fr.ts | 4 +- src/qt/locale/bitcoin_gl.ts | 4 +- src/qt/locale/bitcoin_he.ts | 4 +- src/qt/locale/bitcoin_hi_IN.ts | 6 +- src/qt/locale/bitcoin_hr.ts | 6 +- src/qt/locale/bitcoin_hu.ts | 4 +- src/qt/locale/bitcoin_id_ID.ts | 4 +- src/qt/locale/bitcoin_it.ts | 4 +- src/qt/locale/bitcoin_ja.ts | 4 +- src/qt/locale/bitcoin_ka.ts | 4 +- src/qt/locale/bitcoin_ko_KR.ts | 4 +- src/qt/locale/bitcoin_la.ts | 6 +- src/qt/locale/bitcoin_lt.ts | 4 +- src/qt/locale/bitcoin_lv_LV.ts | 4 +- src/qt/locale/bitcoin_nb.ts | 4 +- src/qt/locale/bitcoin_nl.ts | 4 +- src/qt/locale/bitcoin_pam.ts | 4 +- src/qt/locale/bitcoin_pl.ts | 6 +- src/qt/locale/bitcoin_pt_BR.ts | 4 +- src/qt/locale/bitcoin_pt_PT.ts | 4 +- src/qt/locale/bitcoin_ro_RO.ts | 4 +- src/qt/locale/bitcoin_ru.ts | 6 +- src/qt/locale/bitcoin_sk.ts | 4 +- src/qt/locale/bitcoin_sl_SI.ts | 6 +- src/qt/locale/bitcoin_sr.ts | 4 +- src/qt/locale/bitcoin_sv.ts | 4 +- src/qt/locale/bitcoin_tr.ts | 4 +- src/qt/locale/bitcoin_uk.ts | 4 +- src/qt/locale/bitcoin_uz@Cyrl.ts | 4 +- src/qt/locale/bitcoin_zh_CN.ts | 4 +- src/qt/locale/bitcoin_zh_TW.ts | 4 +- src/rpcclient.cpp | 5 +- src/rpcmining.cpp | 5 +- src/util.cpp | 27 ++++--- src/util.h | 5 +- 76 files changed, 290 insertions(+), 273 deletions(-) rename contrib/debian/examples/{bitcoin.conf => darkcoin.conf} (96%) rename contrib/debian/manpages/{bitcoin-qt.1 => darkcoin-qt.1} (99%) rename contrib/debian/manpages/{bitcoin.conf.5 => darkcoin.conf.5} (71%) rename contrib/debian/manpages/{bitcoind.1 => darkcoind.1} (97%) diff --git a/TODO.md b/TODO.md index 71b0d774c..c4f05395a 100644 --- a/TODO.md +++ b/TODO.md @@ -12,12 +12,17 @@ MUST-HAVE: - Version numbers, protocol version, wallet version (compatible with DRK network) - Adress versions (Public keys, Multisig keys) - Adjust algorithm (SHA256 --> X11) -- Adjust difficulty (KGW, DGW based on blockheight) +- Adjust difficulty/subsidity (KGW, DGW based on blockheight) +- Change genesisblockhash and timestamp +- Add darkcoin seednodes - Add masternode payment checks a.k.a. enforcement (based on blockheight) +- Remove bitcoin dead weight (SHA256, hardcoded keys, nodes) OPTIONAL: --------- - All the above for Testnet +- Update strings and wallet layout/branding +- Include Evan's public key for msg signing - Darksend, Instant Transactions, Atomic Transfers, etc. pp. diff --git a/contrib/debian/bitcoind.examples b/contrib/debian/bitcoind.examples index 4ded67d98..02387402f 100644 --- a/contrib/debian/bitcoind.examples +++ b/contrib/debian/bitcoind.examples @@ -1 +1 @@ -debian/examples/bitcoin.conf +debian/examples/darkcoin.conf diff --git a/contrib/debian/bitcoind.manpages b/contrib/debian/bitcoind.manpages index 3e4ca63d4..faedf1c2c 100644 --- a/contrib/debian/bitcoind.manpages +++ b/contrib/debian/bitcoind.manpages @@ -1,2 +1,2 @@ -debian/manpages/bitcoind.1 -debian/manpages/bitcoin.conf.5 +debian/manpages/darkcoind.1 +debian/manpages/darkcoin.conf.5 diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 4f22567f8..7ee0dbb92 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -359,8 +359,8 @@ bitcoin (0.3.19~dfsg-5) unstable; urgency=low bitcoin (0.3.19~dfsg-4) unstable; urgency=low [ Micah Anderson ] - * Provide example bitcoin.conf. - * Add bitcoind(1) and bitcoin.conf(5) man pages. + * Provide example darkcoin.conf. + * Add bitcoind(1) and darkcoin.conf(5) man pages. [ Jonas Smedegaard ] * Ease backporting: diff --git a/contrib/debian/examples/bitcoin.conf b/contrib/debian/examples/darkcoin.conf similarity index 96% rename from contrib/debian/examples/bitcoin.conf rename to contrib/debian/examples/darkcoin.conf index 10ec36ae7..6a184dc3a 100644 --- a/contrib/debian/examples/bitcoin.conf +++ b/contrib/debian/examples/darkcoin.conf @@ -1,4 +1,4 @@ -# bitcoin.conf configuration file. Lines beginning with # are comments. +# darkcoin.conf configuration file. Lines beginning with # are comments. # Network-related settings: diff --git a/contrib/debian/manpages/bitcoin-qt.1 b/contrib/debian/manpages/darkcoin-qt.1 similarity index 99% rename from contrib/debian/manpages/bitcoin-qt.1 rename to contrib/debian/manpages/darkcoin-qt.1 index cd478b187..920e3c0db 100644 --- a/contrib/debian/manpages/bitcoin-qt.1 +++ b/contrib/debian/manpages/darkcoin-qt.1 @@ -11,7 +11,7 @@ bitcoin\-qt [command\-line options] This help message .TP \fB\-conf=\fR -Specify configuration file (default: bitcoin.conf) +Specify configuration file (default: darkcoin.conf) .TP \fB\-pid=\fR Specify pid file (default: bitcoind.pid) diff --git a/contrib/debian/manpages/bitcoin.conf.5 b/contrib/debian/manpages/darkcoin.conf.5 similarity index 71% rename from contrib/debian/manpages/bitcoin.conf.5 rename to contrib/debian/manpages/darkcoin.conf.5 index 7438b4b66..b64cdf905 100644 --- a/contrib/debian/manpages/bitcoin.conf.5 +++ b/contrib/debian/manpages/darkcoin.conf.5 @@ -1,19 +1,19 @@ -.TH BITCOIN.CONF "5" "January 2011" "bitcoin.conf 3.19" +.TH DARKCOIN.CONF "5" "January 2011" "darkcoin.conf 3.19" .SH NAME -bitcoin.conf \- bitcoin configuration file +darkcoin.conf \- darkcoin configuration file .SH SYNOPSIS All command-line options (except for '\-datadir' and '\-conf') may be specified in a configuration file, and all configuration file options may also be specified on the command line. Command-line options override values set in the configuration file. .TP The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character. .TP -The configuration file is not automatically created; you can create it using your favorite plain-text editor. By default, bitcoind(1) will look for a file named bitcoin.conf(5) in the bitcoin data directory, but both the data directory and the configuration file path may be changed using the '\-datadir' and '\-conf' command-line arguments. +The configuration file is not automatically created; you can create it using your favorite plain-text editor. By default, darkcoind(1) will look for a file named darkcoin.conf(5) in the darkcoin data directory, but both the data directory and the configuration file path may be changed using the '\-datadir' and '\-conf' command-line arguments. .SH LOCATION -bitcoin.conf should be located in $HOME/.bitcoin +darkcoin.conf should be located in $HOME/.darkcoin .SH NETWORK-RELATED SETTINGS .TP .TP \fBtestnet=\fR[\fI'1'\fR|\fI'0'\fR] -Enable or disable run on the test network instead of the real *bitcoin* network. +Enable or disable run on the test network instead of the real *darkcoin* network. .TP \fBproxy=\fR\fI'127.0.0.1:9050'\fR Connect via a socks4 proxy. @@ -29,7 +29,7 @@ Maximum number of inbound+outbound connections. .SH JSON-RPC OPTIONS .TP \fBserver=\fR[\fI'1'\fR|\fI'0'\fR] -Tells *bitcoin* to accept or not accept JSON-RPC commands. +Tells *darkcoin* to accept or not accept JSON-RPC commands. .TP \fBrpcuser=\fR\fI'username'\fR You must set *rpcuser* to secure the JSON-RPC api. @@ -44,10 +44,10 @@ By default, only RPC connections from localhost are allowed. Specify as many *rp Listen for RPC connections on this TCP port. .TP \fBrpcconnect=\fR\fI'127.0.0.1'\fR -You can use *bitcoin* or *bitcoind(1)* to send commands to *bitcoin*/*bitcoind(1)* running on another host using this option. +You can use *darkcoin* or *darkcoind(1)* to send commands to *darkcoin*/*darkcoind(1)* running on another host using this option. .TP \fBrpcssl=\fR\fI'1'\fR -Use Secure Sockets Layer (also known as TLS or HTTPS) to communicate with *bitcoin* '\-server' or *bitcoind(1)*. Example of OpenSSL settings used when *rpcssl*='1': +Use Secure Sockets Layer (also known as TLS or HTTPS) to communicate with *darkcoin* '\-server' or *darkcoind(1)*. Example of OpenSSL settings used when *rpcssl*='1': .TP \fB\-rpcsslciphers=\fR Acceptable ciphers (default: TLSv1+HIGH:\:!SSLv2:\:!aNULL:\:!eNULL:\:!AH:\:!3DES:\:@STRENGTH) @@ -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 bitcoins. +Enable or disable attempt to generate darkcoins. .TP \fB4way=\fR[\fI'0'\fR|\fI'1'\fR] -Enable or disable use SSE instructions to try to generate bitcoins faster. +Enable or disable use SSE instructions to try to generate darkcoins 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 bitcoins. 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 darkcoins. 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. @@ -76,12 +76,12 @@ Allow direct connections for the 'pay via IP address' feature. .SH USER INTERFACE OPTIONS .TP \fBmin=\fR[\fI'0'\fR|\fI'1'\fR] -Enable or disable start bitcoind minimized. +Enable or disable start darkcoind minimized. .TP \fBminimizetotray=\fR[\fI'0'\fR|\fI'1'\fR] Enable or disable minimize to the system tray. .SH "SEE ALSO" -bitcoind(1) +darkcoind(1) .SH AUTHOR This manual page was written by Micah Anderson for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or any later version published by the Free Software Foundation. diff --git a/contrib/debian/manpages/bitcoind.1 b/contrib/debian/manpages/darkcoind.1 similarity index 97% rename from contrib/debian/manpages/bitcoind.1 rename to contrib/debian/manpages/darkcoind.1 index 0c191b604..eb735c06e 100644 --- a/contrib/debian/manpages/bitcoind.1 +++ b/contrib/debian/manpages/darkcoind.1 @@ -1,8 +1,8 @@ -.TH BITCOIND "1" "January 2011" "bitcoind 3.19" +.TH BITCOIND "1" "January 2011" "bitcoind 3.19" .SH NAME bitcoind \- peer-to-peer network based digital currency .SH SYNOPSIS -bitcoin [options] [params] +bitcoin [options] [params] .TP bitcoin [options] help \- Get help for a command .SH DESCRIPTION @@ -13,7 +13,7 @@ Bitcoins can be sent easily through the Internet, without having to trust middle .SH OPTIONS .TP \fB\-conf=\fR -Specify configuration file (default: bitcoin.conf) +Specify configuration file (default: darkcoin.conf) .TP \fB\-gen\fR Generate coins @@ -184,13 +184,13 @@ Moves funds between accounts. .TP \fBsendfrom* <'account'> <'bitcoinaddress'> <'amount'> ['minconf=1'] ['comment'] ['comment-to']\fR Sends amount from account's balance to 'bitcoinaddress'. This method will fail if there is less than amount bitcoins 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 +.TP \fBsendtoaddress 'bitcoinaddress' 'amount' ['comment'] ['comment-to']\fR Sends amount from the server's available balance to 'bitcoinaddress'. amount is a real and is rounded to the nearest 0.01. Returns transaction id on success. -.TP +.TP \fBstop\fR Stops the bitcoin server. -.TP +.TP \fBvalidateaddress 'bitcoinaddress'\fR Checks that 'bitcoinaddress' looks like a proper bitcoin address. Returns an object containing: @@ -201,7 +201,7 @@ Checks that 'bitcoinaddress' looks like a proper bitcoin address. Returns an obj *note: ismine and address are only returned if the address is valid. .SH "SEE ALSO" -bitcoin.conf(5) +darkcoin.conf(5) .SH AUTHOR This manual page was written by Micah Anderson for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or any later version published by the Free Software Foundation. diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 58f594bb0..b23fc6b78 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,11 +1,11 @@ --- -name: "bitcoin" +name: "darkcoin" suites: - "precise" architectures: - "i386" - "amd64" -packages: +packages: - "g++" - "git-core" - "unzip" @@ -22,11 +22,11 @@ packages: - "libqt4-test" reference_datetime: "2013-06-01 00:00:00" remotes: -- "url": "https://github.com/bitcoin/bitcoin.git" - "dir": "bitcoin" +- "url": "https://github.com/darkcoin/darkcoin.git" + "dir": "darkcoin" files: -- "bitcoin-deps-linux32-gitian-r8.zip" -- "bitcoin-deps-linux64-gitian-r8.zip" +- "darkcoin-deps-linux32-gitian-r8.zip" +- "darkcoin-deps-linux64-gitian-r8.zip" - "boost-linux32-1.55.0-gitian-r1.zip" - "boost-linux64-1.55.0-gitian-r1.zip" - "qt-linux32-4.6.4-gitian-r1.tar.gz" @@ -43,13 +43,13 @@ script: | # mkdir -p $STAGING cd $STAGING - unzip ../build/bitcoin-deps-linux${GBUILD_BITS}-gitian-r8.zip + unzip ../build/darkcoin-deps-linux${GBUILD_BITS}-gitian-r8.zip unzip ../build/boost-linux${GBUILD_BITS}-1.55.0-gitian-r1.zip tar -zxf ../build/qt-linux${GBUILD_BITS}-4.6.4-gitian-r1.tar.gz cd ../build # Avoid exporting *any* symbols from the executable - # This avoids conflicts between the libraries statically linked into bitcoin and any + # This avoids conflicts between the libraries statically linked into darkcoin and any # libraries we may link dynamically (such as Qt and OpenSSL, see issue #4094). # It also avoids start-up overhead to not export any unnecessary symbols. # To do this, build a linker script that marks all symbols as local. @@ -59,21 +59,21 @@ script: | local: *; };' > $LINKER_SCRIPT function do_configure { - ./configure "$@" --enable-upnp-default --prefix=$STAGING --with-protoc-bindir=$STAGING/host/bin --with-qt-bindir=$STAGING/bin --with-boost=$STAGING --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib -Wl,--version-script=$LINKER_SCRIPT ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}" BOOST_CHRONO_EXTRALIBS="-lrt" --enable-glibc-back-compat + ./configure "$@" --enable-upnp-default --prefix=$STAGING --with-protoc-bindir=$STAGING/host/bin --with-qt-bindir=$STAGING/bin --with-boost=$STAGING --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib -Wl,--version-script=$LINKER_SCRIPT ${OPTFLAGS}" CXXFLAGS="-frandom-seed=darkcoin ${OPTFLAGS}" BOOST_CHRONO_EXTRALIBS="-lrt" --enable-glibc-back-compat } # - cd bitcoin + cd darkcoin ./autogen.sh do_configure make dist - DISTNAME=`echo bitcoin-*.tar.gz` + DISTNAME=`echo darkcoin-*.tar.gz` # Build dynamic versions of everything # (with static linking to boost and openssl as well a some non-OS deps) mkdir -p distsrc cd distsrc tar --strip-components=1 -xf ../$DISTNAME - do_configure --bindir=$BINDIR + do_configure --bindir=$BINDIR make $MAKEOPTS make $MAKEOPTS install-strip make $MAKEOPTS clean @@ -83,4 +83,4 @@ script: | rm -rf $TEMPDIR mkdir -p $TEMPDIR cd $TEMPDIR - tar -xvf $HOME/build/bitcoin/$DISTNAME | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 --mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/src/$DISTNAME + tar -xvf $HOME/build/darkcoin/$DISTNAME | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 --mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/src/$DISTNAME diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index a48c4c707..73e394187 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin" +name: "darkcoin" suites: - "precise" architectures: @@ -19,15 +19,15 @@ packages: reference_datetime: "2013-06-01 00:00:00" remotes: -- "url": "https://github.com/bitcoin/bitcoin.git" - "dir": "bitcoin" +- "url": "https://github.com/darkcoin/darkcoin.git" + "dir": "darkcoin" files: - "qt-win32-5.2.0-gitian-r3.zip" - "qt-win64-5.2.0-gitian-r3.zip" - "boost-win32-1.55.0-gitian-r6.zip" - "boost-win64-1.55.0-gitian-r6.zip" -- "bitcoin-deps-win32-gitian-r15.zip" -- "bitcoin-deps-win64-gitian-r15.zip" +- "darkcoin-deps-win32-gitian-r15.zip" +- "darkcoin-deps-win64-gitian-r15.zip" - "protobuf-win32-2.5.0-gitian-r4.zip" - "protobuf-win64-2.5.0-gitian-r4.zip" script: | @@ -61,29 +61,29 @@ script: | cd $STAGING unzip $INDIR/qt-win${BITS}-5.2.0-gitian-r3.zip unzip $INDIR/boost-win${BITS}-1.55.0-gitian-r6.zip - unzip $INDIR/bitcoin-deps-win${BITS}-gitian-r15.zip + unzip $INDIR/darkcoin-deps-win${BITS}-gitian-r15.zip unzip $INDIR/protobuf-win${BITS}-2.5.0-gitian-r4.zip if [ "$NEEDDIST" == "1" ]; then # Make source code archive which is architecture independent so it only needs to be done once - cd $HOME/build/bitcoin + cd $HOME/build/darkcoin ./autogen.sh - ./configure --bindir=$OUTDIR --prefix=$STAGING --host=$HOST --with-qt-plugindir=$STAGING/plugins --with-qt-incdir=$STAGING/include --with-qt-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --with-protoc-bindir=$STAGING/host/bin --disable-dependency-tracking CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}" + ./configure --bindir=$OUTDIR --prefix=$STAGING --host=$HOST --with-qt-plugindir=$STAGING/plugins --with-qt-incdir=$STAGING/include --with-qt-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --with-protoc-bindir=$STAGING/host/bin --disable-dependency-tracking CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=darkcoin ${OPTFLAGS}" make dist - DISTNAME=`echo bitcoin-*.tar.gz` + DISTNAME=`echo darkcoin-*.tar.gz` NEEDDIST=0 fi # Build platform-dependent executables from source archive cd $BUILDDIR mkdir -p distsrc cd distsrc - tar --strip-components=1 -xf $HOME/build/bitcoin/$DISTNAME - ./configure --enable-upnp-default --bindir=$BINDIR --prefix=$STAGING --host=$HOST --with-qt-plugindir=$STAGING/plugins --with-qt-incdir=$STAGING/include --with-qt-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --with-protoc-bindir=$STAGING/host/bin --disable-dependency-tracking CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}" + tar --strip-components=1 -xf $HOME/build/darkcoin/$DISTNAME + ./configure --enable-upnp-default --bindir=$BINDIR --prefix=$STAGING --host=$HOST --with-qt-plugindir=$STAGING/plugins --with-qt-incdir=$STAGING/include --with-qt-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --with-protoc-bindir=$STAGING/host/bin --disable-dependency-tracking CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=darkcoin ${OPTFLAGS}" export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME make $MAKEOPTS make deploy make install-strip - cp -f bitcoin-*setup*.exe $BINDIR/ + cp -f darkcoin-*setup*.exe $BINDIR/ unset LD_PRELOAD unset FAKETIME done # for BITS in @@ -93,5 +93,5 @@ script: | rm -rf $TEMPDIR mkdir -p $TEMPDIR cd $TEMPDIR - tar -xvf $HOME/build/bitcoin/$DISTNAME | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 --mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/src/$DISTNAME + tar -xvf $HOME/build/darkcoin/$DISTNAME | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 --mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/src/$DISTNAME diff --git a/contrib/spendfrom/README.md b/contrib/spendfrom/README.md index c0a9c9ccf..1207b572d 100644 --- a/contrib/spendfrom/README.md +++ b/contrib/spendfrom/README.md @@ -1,13 +1,13 @@ ### SpendFrom ### Use the raw transactions API to send coins received on a particular -address (or addresses). +address (or addresses). ### Usage: ### Depends on [jsonrpc](http://json-rpc.org/). spendfrom.py --from=FROMADDRESS1[,FROMADDRESS2] --to=TOADDRESS --amount=amount \ - --fee=fee --datadir=/path/to/.bitcoin --testnet --dry_run + --fee=fee --datadir=/path/to/.darkcoin --testnet --dry_run With no arguments, outputs a list of amounts associated with addresses. @@ -16,7 +16,7 @@ With arguments, sends coins received by the `FROMADDRESS` addresses to the `TOAD ### Notes ### - You may explicitly specify how much fee to pay (a fee more than 1% of the amount -will fail, though, to prevent bitcoin-losing accidents). Spendfrom may fail if +will fail, though, to prevent darkcoin-losing accidents). Spendfrom may fail if it thinks the transaction would never be confirmed (if the amount being sent is too small, or if the transaction is too many bytes for the fee). diff --git a/contrib/spendfrom/spendfrom.py b/contrib/spendfrom/spendfrom.py index 72ee0425e..6dd1b02ff 100755 --- a/contrib/spendfrom/spendfrom.py +++ b/contrib/spendfrom/spendfrom.py @@ -1,13 +1,13 @@ #!/usr/bin/env python # -# Use the raw transactions API to spend bitcoins received on particular addresses, +# Use the raw transactions API to spend darkcoins received on particular addresses, # and send any change back to that same address. # # Example usage: # spendfrom.py # Lists available funds # spendfrom.py --from=ADDRESS --to=ADDRESS --amount=11.00 # -# Assumes it will talk to a bitcoind or Bitcoin-Qt running +# Assumes it will talk to a darkcoind or Darkcoin-Qt running # on localhost. # # Depends on jsonrpc @@ -33,15 +33,15 @@ def check_json_precision(): raise RuntimeError("JSON encode/decode loses precision") def determine_db_dir(): - """Return the default location of the bitcoin data directory""" + """Return the default location of the darkcoin data directory""" if platform.system() == "Darwin": - return os.path.expanduser("~/Library/Application Support/Bitcoin/") + return os.path.expanduser("~/Library/Application Support/Darkcoin/") elif platform.system() == "Windows": - return os.path.join(os.environ['APPDATA'], "Bitcoin") - return os.path.expanduser("~/.bitcoin") + return os.path.join(os.environ['APPDATA'], "Darkcoin") + return os.path.expanduser("~/.darkcoin") def read_bitcoin_config(dbdir): - """Read the bitcoin.conf file from dbdir, returns dictionary of settings""" + """Read the darkcoin.conf file from dbdir, returns dictionary of settings""" from ConfigParser import SafeConfigParser class FakeSecHead(object): @@ -59,11 +59,11 @@ def read_bitcoin_config(dbdir): return s config_parser = SafeConfigParser() - config_parser.readfp(FakeSecHead(open(os.path.join(dbdir, "bitcoin.conf")))) + config_parser.readfp(FakeSecHead(open(os.path.join(dbdir, "darkcoin.conf")))) return dict(config_parser.items("all")) def connect_JSON(config): - """Connect to a bitcoin JSON-RPC server""" + """Connect to a darkcoin JSON-RPC server""" testnet = config.get('testnet', '0') testnet = (int(testnet) > 0) # 0/1 in config file, convert to True/False if not 'rpcport' in config: @@ -72,7 +72,7 @@ def connect_JSON(config): try: result = ServiceProxy(connect) # ServiceProxy is lazy-connect, so send an RPC command mostly to catch connection errors, - # but also make sure the bitcoind we're talking to is/isn't testnet: + # but also make sure the darkcoind we're talking to is/isn't testnet: if result.getmininginfo()['testnet'] != testnet: sys.stderr.write("RPC server at "+connect+" testnet setting mismatch\n") sys.exit(1) @@ -81,40 +81,40 @@ def connect_JSON(config): sys.stderr.write("Error connecting to RPC server at "+connect+"\n") sys.exit(1) -def unlock_wallet(bitcoind): - info = bitcoind.getinfo() +def unlock_wallet(darkcoind): + info = darkcoind.getinfo() if 'unlocked_until' not in info: return True # wallet is not encrypted t = int(info['unlocked_until']) if t <= time.time(): try: passphrase = getpass.getpass("Wallet is locked; enter passphrase: ") - bitcoind.walletpassphrase(passphrase, 5) + darkcoind.walletpassphrase(passphrase, 5) except: sys.stderr.write("Wrong passphrase\n") - info = bitcoind.getinfo() + info = darkcoind.getinfo() return int(info['unlocked_until']) > time.time() -def list_available(bitcoind): +def list_available(darkcoind): address_summary = dict() address_to_account = dict() - for info in bitcoind.listreceivedbyaddress(0): + for info in darkcoind.listreceivedbyaddress(0): address_to_account[info["address"]] = info["account"] - unspent = bitcoind.listunspent(0) + unspent = darkcoind.listunspent(0) for output in unspent: # listunspent doesn't give addresses, so: - rawtx = bitcoind.getrawtransaction(output['txid'], 1) + rawtx = darkcoind.getrawtransaction(output['txid'], 1) vout = rawtx["vout"][output['vout']] pk = vout["scriptPubKey"] - # This code only deals with ordinary pay-to-bitcoin-address + # This code only deals with ordinary pay-to-darkcoin-address # or pay-to-script-hash outputs right now; anything exotic is ignored. if pk["type"] != "pubkeyhash" and pk["type"] != "scripthash": continue - + address = pk["addresses"][0] if address in address_summary: address_summary[address]["total"] += vout["value"] @@ -139,8 +139,8 @@ def select_coins(needed, inputs): n += 1 return (outputs, have-needed) -def create_tx(bitcoind, fromaddresses, toaddress, amount, fee): - all_coins = list_available(bitcoind) +def create_tx(darkcoind, fromaddresses, toaddress, amount, fee): + all_coins = list_available(darkcoind) total_available = Decimal("0.0") needed = amount+fee @@ -159,8 +159,8 @@ def create_tx(bitcoind, fromaddresses, toaddress, amount, fee): # Note: # Python's json/jsonrpc modules have inconsistent support for Decimal numbers. # Instead of wrestling with getting json.dumps() (used by jsonrpc) to encode - # Decimals, I'm casting amounts to float before sending them to bitcoind. - # + # Decimals, I'm casting amounts to float before sending them to darkcoind. + # outputs = { toaddress : float(amount) } (inputs, change_amount) = select_coins(needed, potential_inputs) if change_amount > BASE_FEE: # don't bother with zero or tiny change @@ -170,8 +170,8 @@ def create_tx(bitcoind, fromaddresses, toaddress, amount, fee): else: outputs[change_address] = float(change_amount) - rawtx = bitcoind.createrawtransaction(inputs, outputs) - signed_rawtx = bitcoind.signrawtransaction(rawtx) + rawtx = darkcoind.createrawtransaction(inputs, outputs) + signed_rawtx = darkcoind.signrawtransaction(rawtx) if not signed_rawtx["complete"]: sys.stderr.write("signrawtransaction failed\n") sys.exit(1) @@ -179,10 +179,10 @@ def create_tx(bitcoind, fromaddresses, toaddress, amount, fee): return txdata -def compute_amount_in(bitcoind, txinfo): +def compute_amount_in(darkcoind, txinfo): result = Decimal("0.0") for vin in txinfo['vin']: - in_info = bitcoind.getrawtransaction(vin['txid'], 1) + in_info = darkcoind.getrawtransaction(vin['txid'], 1) vout = in_info['vout'][vin['vout']] result = result + vout['value'] return result @@ -193,12 +193,12 @@ def compute_amount_out(txinfo): result = result + vout['value'] return result -def sanity_test_fee(bitcoind, txdata_hex, max_fee): +def sanity_test_fee(darkcoind, txdata_hex, max_fee): class FeeError(RuntimeError): pass try: - txinfo = bitcoind.decoderawtransaction(txdata_hex) - total_in = compute_amount_in(bitcoind, txinfo) + txinfo = darkcoind.decoderawtransaction(txdata_hex) + total_in = compute_amount_in(darkcoind, txinfo) total_out = compute_amount_out(txinfo) if total_in-total_out > max_fee: raise FeeError("Rejecting transaction, unreasonable fee of "+str(total_in-total_out)) @@ -221,15 +221,15 @@ def main(): parser = optparse.OptionParser(usage="%prog [options]") parser.add_option("--from", dest="fromaddresses", default=None, - help="addresses to get bitcoins from") + help="addresses to get darkcoins from") parser.add_option("--to", dest="to", default=None, - help="address to get send bitcoins to") + help="address to get send darkcoins to") parser.add_option("--amount", dest="amount", default=None, help="amount to send") parser.add_option("--fee", dest="fee", default="0.0", help="fee to include") parser.add_option("--datadir", dest="datadir", default=determine_db_dir(), - help="location of bitcoin.conf file with RPC username/password (default: %default)") + help="location of darkcoin.conf file with RPC username/password (default: %default)") parser.add_option("--testnet", dest="testnet", default=False, action="store_true", help="Use the test network") parser.add_option("--dry_run", dest="dry_run", default=False, action="store_true", @@ -240,10 +240,10 @@ def main(): check_json_precision() config = read_bitcoin_config(options.datadir) if options.testnet: config['testnet'] = True - bitcoind = connect_JSON(config) + darkcoind = connect_JSON(config) if options.amount is None: - address_summary = list_available(bitcoind) + address_summary = list_available(darkcoind) for address,info in address_summary.iteritems(): n_transactions = len(info['outputs']) if n_transactions > 1: @@ -253,14 +253,14 @@ def main(): else: fee = Decimal(options.fee) amount = Decimal(options.amount) - while unlock_wallet(bitcoind) == False: + while unlock_wallet(darkcoind) == False: pass # Keep asking for passphrase until they get it right - txdata = create_tx(bitcoind, options.fromaddresses.split(","), options.to, amount, fee) - sanity_test_fee(bitcoind, txdata, amount*Decimal("0.01")) + txdata = create_tx(darkcoind, options.fromaddresses.split(","), options.to, amount, fee) + sanity_test_fee(darkcoind, txdata, amount*Decimal("0.01")) if options.dry_run: print(txdata) else: - txid = bitcoind.sendrawtransaction(txdata) + txid = darkcoind.sendrawtransaction(txdata) print(txid) if __name__ == '__main__': diff --git a/doc/build-osx.md b/doc/build-osx.md index d51add47b..5cdda0b55 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -1,6 +1,6 @@ Mac OS X Build Instructions and Notes ==================================== -This guide will show you how to build bitcoind(headless client) for OSX. +This guide will show you how to build darkcoind(headless client) for OSX. Notes ----- @@ -53,7 +53,7 @@ If not, you can ensure that the Homebrew OpenSSL is correctly linked by running Rerunning "openssl version" should now return the correct version. If it doesn't, make sure `/usr/local/bin` comes before `/usr/bin` in your -PATH. +PATH. #### Installing berkeley-db4 using Homebrew @@ -61,7 +61,7 @@ The homebrew package for berkeley-db4 has been broken for some time. It will in Running this command takes you into brew's interactive mode, which allows you to configure, make, and install by hand: ``` -$ brew install https://raw.github.com/mxcl/homebrew/master/Library/Formula/berkeley-db4.rb -–without-java +$ brew install https://raw.github.com/mxcl/homebrew/master/Library/Formula/berkeley-db4.rb -–without-java ``` These rest of these commands are run inside brew interactive mode: @@ -73,19 +73,19 @@ These rest of these commands are run inside brew interactive mode: /private/tmp/berkeley-db4-UGpd0O $ exit ``` -After exiting, you'll get a warning that the install is keg-only, which means it wasn't symlinked to `/usr/local`. You don't need it to link it to build bitcoin, but if you want to, here's how: +After exiting, you'll get a warning that the install is keg-only, which means it wasn't symlinked to `/usr/local`. You don't need it to link it to build darkcoin, but if you want to, here's how: $ brew --force link berkeley-db4 -### Building `bitcoind` +### Building `darkcoind` 1. Clone the github tree to get the source code and go into the directory. - git clone https://github.com/bitcoin/bitcoin.git - cd bitcoin + git clone https://github.com/darkcoin/darkcoin.git + cd darkcoin -2. Build bitcoind: +2. Build darkcoind: ./autogen.sh ./configure @@ -97,11 +97,11 @@ After exiting, you'll get a warning that the install is keg-only, which means it Creating a release build ------------------------ -You can ignore this section if you are building `bitcoind` for your own use. +You can ignore this section if you are building `darkcoind` for your own use. -bitcoind/bitcoin-cli binaries are not included in the Bitcoin-Qt.app bundle. +darkcoind/darkcoin-cli binaries are not included in the Bitcoin-Qt.app bundle. -If you are building `bitcoind` or `Bitcoin-Qt` for others, your build machine should be set up +If you are building `darkcoind` or `Bitcoin-Qt` for others, your build machine should be set up as follows for maximum compatibility: All dependencies should be compiled with these flags: @@ -116,23 +116,23 @@ bundle is packaged and signed to create the .dmg disk image that is distributed. Running ------- -It's now available at `./bitcoind`, provided that you are still in the `src` +It's now available at `./darkcoind`, provided that you are still in the `src` directory. We have to first create the RPC configuration file, though. -Run `./bitcoind` to get the filename where it should be put, or just try these +Run `./darkcoind` to get the filename where it should be put, or just try these commands: - echo -e "rpcuser=bitcoinrpc\nrpcpassword=$(xxd -l 16 -p /dev/urandom)" > "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf" - chmod 600 "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf" + echo -e "rpcuser=darkcoinrpc\nrpcpassword=$(xxd -l 16 -p /dev/urandom)" > "/Users/${USER}/Library/Application Support/Darkcoin/darkcoin.conf" + chmod 600 "/Users/${USER}/Library/Application Support/Darkcoin/darkcoin.conf" When next you run it, it will start downloading the blockchain, but it won't output anything while it's doing this. This process may take several hours; you can monitor its process by looking at the debug.log file, like this: - tail -f $HOME/Library/Application\ Support/Bitcoin/debug.log + tail -f $HOME/Library/Application\ Support/Darkcoin/debug.log Other commands: - ./bitcoind -daemon # to start the bitcoin daemon. - ./bitcoin-cli --help # for a list of command-line options. - ./bitcoin-cli help # When the daemon is running, to get a list of RPC commands + ./darkcoind -daemon # to start the darkcoin daemon. + ./darkcoin-cli --help # for a list of command-line options. + ./darkcoin-cli help # When the daemon is running, to get a list of RPC commands diff --git a/doc/release-notes/release-notes-0.3.20.2.md b/doc/release-notes/release-notes-0.3.20.2.md index 09ecb736b..bf27de6ea 100644 --- a/doc/release-notes/release-notes-0.3.20.2.md +++ b/doc/release-notes/release-notes-0.3.20.2.md @@ -9,7 +9,7 @@ The Amazon Machine Images I used to do the builds are available: (mac build will be done soon) -If you have already downloaded version 0.3.20.1, please either add this to your bitcoin.conf file: +If you have already downloaded version 0.3.20.1, please either add this to your darkcoin.conf file: maxsendbuffer=10000 maxreceivebuffer=10000 diff --git a/doc/release-notes/release-notes-0.8.0.md b/doc/release-notes/release-notes-0.8.0.md index 4e98a7740..cdfa8fb5b 100644 --- a/doc/release-notes/release-notes-0.8.0.md +++ b/doc/release-notes/release-notes-0.8.0.md @@ -61,7 +61,7 @@ contrib/spendfrom is a python-language command-line utility that demonstrates how to use the "raw transactions" JSON-RPC api to send coins received from particular addresses (also known as "coin control"). -New/changed settings (command-line or bitcoin.conf file) +New/changed settings (command-line or darkcoin.conf file) -------------------------------------------------------- dbcache : controls LevelDB memory usage. @@ -90,7 +90,7 @@ Important Bug Fixes Privacy leak: the position of the "change" output in most transactions was not being properly randomized, making network analysis of the transaction graph to identify -users' wallets easier. +users' wallets easier. Zero-confirmation transaction vulnerability: accepting zero-confirmation transactions (transactions that have not yet been included in a block) from somebody you do not diff --git a/qa/pull-tester/run-bitcoind-for-test.sh.in b/qa/pull-tester/run-bitcoind-for-test.sh.in index 391046ab8..a087d88ca 100755 --- a/qa/pull-tester/run-bitcoind-for-test.sh.in +++ b/qa/pull-tester/run-bitcoind-for-test.sh.in @@ -3,14 +3,14 @@ # Distributed under the MIT/X11 software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # -DATADIR="@abs_top_builddir@/.bitcoin" +DATADIR="@abs_top_builddir@/.darkcoin" rm -rf "$DATADIR" mkdir -p "$DATADIR"/regtest touch "$DATADIR/regtest/debug.log" tail -q -n 1 -F "$DATADIR/regtest/debug.log" | grep -m 1 -q "Done loading" & WAITER=$! PORT=`expr $BASHPID + 10000` -"@abs_top_builddir@/src/bitcoind@EXEEXT@" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -port=$PORT -regtest -rpcport=`expr $PORT + 1` & +"@abs_top_builddir@/src/darkcoind@EXEEXT@" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -port=$PORT -regtest -rpcport=`expr $PORT + 1` & BITCOIND=$! #Install a watchdog. diff --git a/qa/rpc-tests/util.py b/qa/rpc-tests/util.py index 1d0896a3f..00943aadf 100644 --- a/qa/rpc-tests/util.py +++ b/qa/rpc-tests/util.py @@ -1,4 +1,5 @@ # Copyright (c) 2014 The Bitcoin Core developers +# Copyright (c) 2014 vertoe & the Darkcoin developers # Distributed under the MIT/X11 software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # @@ -53,7 +54,7 @@ def sync_mempools(rpc_connections): if num_match == len(rpc_connections): break time.sleep(1) - + bitcoind_processes = [] @@ -61,26 +62,26 @@ def initialize_chain(test_dir): """ Create (or copy from cache) a 200-block-long chain and 4 wallets. - bitcoind and bitcoin-cli must be in search path. + darkcoind and darkcoin-cli must be in search path. """ if not os.path.isdir(os.path.join("cache", "node0")): devnull = open("/dev/null", "w+") - # Create cache directories, run bitcoinds: + # Create cache directories, run darkcoinds: for i in range(4): datadir = os.path.join("cache", "node"+str(i)) os.makedirs(datadir) - with open(os.path.join(datadir, "bitcoin.conf"), 'w') as f: + with open(os.path.join(datadir, "darkcoin.conf"), 'w') as f: f.write("regtest=1\n"); f.write("rpcuser=rt\n"); f.write("rpcpassword=rt\n"); f.write("port="+str(START_P2P_PORT+i)+"\n"); f.write("rpcport="+str(START_RPC_PORT+i)+"\n"); - args = [ "bitcoind", "-keypool=1", "-datadir="+datadir ] + args = [ "darkcoind", "-keypool=1", "-datadir="+datadir ] if i > 0: args.append("-connect=127.0.0.1:"+str(START_P2P_PORT)) bitcoind_processes.append(subprocess.Popen(args)) - subprocess.check_call([ "bitcoin-cli", "-datadir="+datadir, + subprocess.check_call([ "darkcoin-cli", "-datadir="+datadir, "-rpcwait", "getblockcount"], stdout=devnull) devnull.close() rpcs = [] @@ -113,13 +114,13 @@ def initialize_chain(test_dir): shutil.copytree(from_dir, to_dir) def start_nodes(num_nodes, dir): - # Start bitcoinds, and wait for RPC interface to be up and running: + # Start darkcoinds, and wait for RPC interface to be up and running: devnull = open("/dev/null", "w+") for i in range(num_nodes): datadir = os.path.join(dir, "node"+str(i)) - args = [ "bitcoind", "-datadir="+datadir ] + args = [ "darkcoind", "-datadir="+datadir ] bitcoind_processes.append(subprocess.Popen(args)) - subprocess.check_call([ "bitcoin-cli", "-datadir="+datadir, + subprocess.check_call([ "darkcoin-cli", "-datadir="+datadir, "-rpcwait", "getblockcount"], stdout=devnull) devnull.close() # Create&return JSON-RPC connections diff --git a/qa/rpc-tests/util.sh b/qa/rpc-tests/util.sh index 1e7bd6a7e..c9da17e4c 100644 --- a/qa/rpc-tests/util.sh +++ b/qa/rpc-tests/util.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash # Copyright (c) 2014 The Bitcoin Core developers +# Copyright (c) 2014 vertoe & the Darkcoin developers # Distributed under the MIT/X11 software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -11,7 +12,7 @@ function echoerr { # Usage: ExtractKey "" # Warning: this will only work for the very-well-behaved -# JSON produced by bitcoind, do NOT use it to try to +# JSON produced by darkcoind, do NOT use it to try to # parse arbitrary/nested/etc JSON. function ExtractKey { echo $2 | tr -d ' "{}\n' | awk -v RS=',' -F: "\$1 ~ /$1/ { print \$2}" @@ -20,7 +21,7 @@ function ExtractKey { function CreateDataDir { DIR=$1 mkdir -p $DIR - CONF=$DIR/bitcoin.conf + CONF=$DIR/darkcoin.conf echo "regtest=1" >> $CONF echo "keypool=2" >> $CONF echo "rpcuser=rt" >> $CONF diff --git a/qa/rpc-tests/walletbackup.sh b/qa/rpc-tests/walletbackup.sh index 744467098..bddd5f039 100755 --- a/qa/rpc-tests/walletbackup.sh +++ b/qa/rpc-tests/walletbackup.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash # Copyright (c) 2014 The Bitcoin Core developers +# Copyright (c) 2014 vertoe & the Darkcoin developers # Distributed under the MIT/X11 software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -39,8 +40,8 @@ if [ $# -lt 1 ]; then exit 1 fi -BITCOIND=${1}/bitcoind -CLI=${1}/bitcoin-cli +BITCOIND=${1}/darkcoind +CLI=${1}/darkcoin-cli DIR="${BASH_SOURCE%/*}" SENDANDWAIT="${DIR}/send.sh" @@ -64,7 +65,7 @@ B4PID=$! function CreateConfDir { DIR=$1 mkdir -p $DIR - CONF=$DIR/bitcoin.conf + CONF=$DIR/darkcoin.conf echo "regtest=1" >> $CONF echo "rpcuser=rt" >> $CONF echo "rpcpassword=rt" >> $CONF diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 78c8b2ba0..c968f9627 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2013 The Bitcoin developers +// Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2014 vertoe & the Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -63,7 +64,7 @@ bool AppInit(int argc, char* argv[]) // // Parameters // - // If Qt is used, parameters/bitcoin.conf are parsed in qt/bitcoin.cpp's main() + // If Qt is used, parameters/darkcoin.conf are parsed in qt/bitcoin.cpp's main() ParseParameters(argc, argv); if (!boost::filesystem::is_directory(GetDataDir(false))) { diff --git a/src/init.cpp b/src/init.cpp index 6f9abcafd..60280dda4 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2014 vertoe & the Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -196,7 +197,7 @@ std::string HelpMessage(HelpMessageMode hmm) strUsage += " -blocknotify= " + _("Execute command when the best block changes (%s in cmd is replaced by block hash)") + "\n"; strUsage += " -checkblocks= " + _("How many blocks to check at startup (default: 288, 0 = all)") + "\n"; strUsage += " -checklevel= " + _("How thorough the block verification of -checkblocks is (0-4, default: 3)") + "\n"; - strUsage += " -conf= " + _("Specify configuration file (default: bitcoin.conf)") + "\n"; + strUsage += " -conf= " + _("Specify configuration file (default: darkcoin.conf)") + "\n"; if (hmm == HMM_BITCOIND) { #if !defined(WIN32) diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 08fe3e71d..d179dd565 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -1,4 +1,5 @@ -// Copyright (c) 2011-2014 The Bitcoin developers +// Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2014 vertoe & the Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -516,7 +517,7 @@ int main(int argc, char *argv[]) // User language is set up: pick a data directory Intro::pickDataDirectory(); - /// 6. Determine availability of data directory and parse bitcoin.conf + /// 6. Determine availability of data directory and parse darkcoin.conf /// - Do not call GetDataDir(true) before this step finishes if (!boost::filesystem::is_directory(GetDataDir(false))) { diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 10b44bbc3..be6d860fa 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -1,4 +1,5 @@ - +// Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2014 vertoe & the Darkcoin developers #include @@ -238,7 +239,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Show all debugging options (usage: --help -he QT_TRANSLATE_NOOP("bitcoin-core", "Show benchmark information (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Shrink debug.log file on client startup (default: 1 when no -debug)"), QT_TRANSLATE_NOOP("bitcoin-core", "Signing transaction failed"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: bitcoin.conf)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: darkcoin.conf)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout in milliseconds (default: 5000)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: bitcoind.pid)"), diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 3e99e941a..12461a2c5 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -1,4 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers +// Copyright (c) 2014 vertoe & the Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -17,7 +18,7 @@ /* Minimum free space (in bytes) needed for data directory */ static const uint64_t GB_BYTES = 1000000000LL; -static const uint64_t BLOCK_CHAIN_SIZE = 20LL * GB_BYTES; +static const uint64_t BLOCK_CHAIN_SIZE = 1LL * GB_BYTES; /* Check free space asynchronously to prevent hanging the UI thread. @@ -181,7 +182,7 @@ void Intro::pickDataDirectory() TryCreateDirectory(GUIUtil::qstringToBoostPath(dataDir)); break; } catch(fs::filesystem_error &e) { - QMessageBox::critical(0, tr("Bitcoin"), + QMessageBox::critical(0, tr("Darkcoin"), tr("Error: Specified data directory \"%1\" can not be created.").arg(dataDir)); /* fall through, back to choosing screen */ } @@ -190,8 +191,8 @@ void Intro::pickDataDirectory() settings.setValue("strDataDir", dataDir); } /* Only override -datadir if different from the default, to make it possible to - * override -datadir in the bitcoin.conf file in the default data directory - * (to be consistent with bitcoind behavior) + * override -datadir in the darkcoin.conf file in the default data directory + * (to be consistent with darkcoind behavior) */ if(dataDir != getDefaultDataDirectory()) SoftSetArg("-datadir", GUIUtil::qstringToBoostPath(dataDir).string()); // use OS locale for path setting diff --git a/src/qt/locale/bitcoin_be_BY.ts b/src/qt/locale/bitcoin_be_BY.ts index b51aa9f9f..c178302c1 100644 --- a/src/qt/locale/bitcoin_be_BY.ts +++ b/src/qt/locale/bitcoin_be_BY.ts @@ -812,8 +812,8 @@ Address: %4 Опцыі: - Specify configuration file (default: bitcoin.conf) - Вызначыць канфігурацыйны файл (зыходна: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Вызначыць канфігурацыйны файл (зыходна: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts index 1b3496332..4f6df7b7b 100644 --- a/src/qt/locale/bitcoin_bg.ts +++ b/src/qt/locale/bitcoin_bg.ts @@ -1514,8 +1514,8 @@ This product includes software developed by the OpenSSL Project for use in the O Опции: - Specify configuration file (default: bitcoin.conf) - Задаване на файл с настройки (по подразбиране bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Задаване на файл с настройки (по подразбиране darkcoin.conf) Specify data directory diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts index 4373064a8..100134812 100644 --- a/src/qt/locale/bitcoin_ca_ES.ts +++ b/src/qt/locale/bitcoin_ca_ES.ts @@ -1969,8 +1969,8 @@ Address: %4 Opcions: - Specify configuration file (default: bitcoin.conf) - Especificat arxiu de configuració (per defecte: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Especificat arxiu de configuració (per defecte: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts index 936f37049..954831436 100644 --- a/src/qt/locale/bitcoin_cs.ts +++ b/src/qt/locale/bitcoin_cs.ts @@ -2578,8 +2578,8 @@ Adresa: %4 Možnosti: - Specify configuration file (default: bitcoin.conf) - Konfigurační soubor (výchozí: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Konfigurační soubor (výchozí: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts index 8274bb479..a8d14318e 100644 --- a/src/qt/locale/bitcoin_da.ts +++ b/src/qt/locale/bitcoin_da.ts @@ -2610,8 +2610,8 @@ Adresse: %4 Indstillinger: - Specify configuration file (default: bitcoin.conf) - Angiv konfigurationsfil (standard: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Angiv konfigurationsfil (standard: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts index ebded2e65..8a63ad06e 100644 --- a/src/qt/locale/bitcoin_de.ts +++ b/src/qt/locale/bitcoin_de.ts @@ -2609,8 +2609,8 @@ Adresse: %4 Optionen: - Specify configuration file (default: bitcoin.conf) - Konfigurationsdatei festlegen (Standard: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Konfigurationsdatei festlegen (Standard: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_el_GR.ts b/src/qt/locale/bitcoin_el_GR.ts index 9235650cb..8ee77c288 100644 --- a/src/qt/locale/bitcoin_el_GR.ts +++ b/src/qt/locale/bitcoin_el_GR.ts @@ -2176,8 +2176,8 @@ Address: %4 Επιλογές: - Specify configuration file (default: bitcoin.conf) - Ορίστε αρχείο ρυθμίσεων (προεπιλογή: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Ορίστε αρχείο ρυθμίσεων (προεπιλογή: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 4b541eabe..765afba11 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -3341,8 +3341,8 @@ Address: %4 - Specify configuration file (default: bitcoin.conf) - Specify configuration file (default: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Specify configuration file (default: darkcoin.conf) diff --git a/src/qt/locale/bitcoin_eo.ts b/src/qt/locale/bitcoin_eo.ts index 864bad40e..7e4c33e41 100644 --- a/src/qt/locale/bitcoin_eo.ts +++ b/src/qt/locale/bitcoin_eo.ts @@ -2354,8 +2354,8 @@ Adreso: %4 Agordoj: - Specify configuration file (default: bitcoin.conf) - Specifi konfiguran dosieron (defaŭlte: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Specifi konfiguran dosieron (defaŭlte: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts index f97fa0608..b1aa31da5 100644 --- a/src/qt/locale/bitcoin_es.ts +++ b/src/qt/locale/bitcoin_es.ts @@ -2616,13 +2616,13 @@ Dirección: %4 - Specify configuration file (default: bitcoin.conf) - Especificar archivo de configuración (predeterminado: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Especificar archivo de configuración (predeterminado: darkcoin.conf) Specify pid file (default: bitcoind.pid) - Especificar archivo pid (predeterminado: bitcoin.pid) + Especificar archivo pid (predeterminado: darkcoin.pid) diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts index 21ee679d7..d9df43f1b 100644 --- a/src/qt/locale/bitcoin_es_CL.ts +++ b/src/qt/locale/bitcoin_es_CL.ts @@ -1356,13 +1356,13 @@ Dirección: %4 - Specify configuration file (default: bitcoin.conf) - Especifica archivo de configuración (predeterminado: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Especifica archivo de configuración (predeterminado: darkcoin.conf) Specify pid file (default: bitcoind.pid) - Especifica archivo pid (predeterminado: bitcoin.pid) + Especifica archivo pid (predeterminado: darkcoin.pid) diff --git a/src/qt/locale/bitcoin_es_DO.ts b/src/qt/locale/bitcoin_es_DO.ts index 6321b0ff1..a87159a6f 100644 --- a/src/qt/locale/bitcoin_es_DO.ts +++ b/src/qt/locale/bitcoin_es_DO.ts @@ -2432,13 +2432,13 @@ Dirección: %4 - Specify configuration file (default: bitcoin.conf) - Especificar archivo de configuración (predeterminado: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Especificar archivo de configuración (predeterminado: darkcoin.conf) Specify pid file (default: bitcoind.pid) - Especificar archivo pid (predeterminado: bitcoin.pid) + Especificar archivo pid (predeterminado: darkcoin.pid) diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts index bd655caf3..8a0914dd3 100644 --- a/src/qt/locale/bitcoin_et.ts +++ b/src/qt/locale/bitcoin_et.ts @@ -1585,12 +1585,12 @@ Aadress: %4⏎ Valikud: - Specify configuration file (default: bitcoin.conf) - Täpsusta sätete fail (vaikimisi: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Täpsusta sätete fail (vaikimisi: darkcoin.conf) Specify pid file (default: bitcoind.pid) - Täpsusta PID fail (vaikimisi: bitcoin.pid) + Täpsusta PID fail (vaikimisi: darkcoin.pid) Specify data directory diff --git a/src/qt/locale/bitcoin_eu_ES.ts b/src/qt/locale/bitcoin_eu_ES.ts index 4f9f5393d..6c1efb221 100644 --- a/src/qt/locale/bitcoin_eu_ES.ts +++ b/src/qt/locale/bitcoin_eu_ES.ts @@ -724,8 +724,8 @@ Aukerak - Specify configuration file (default: bitcoin.conf) - Ezarpen fitxategia aukeratu (berezkoa: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Ezarpen fitxategia aukeratu (berezkoa: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts index df42de3a3..b01d87d36 100644 --- a/src/qt/locale/bitcoin_fa.ts +++ b/src/qt/locale/bitcoin_fa.ts @@ -1721,12 +1721,12 @@ Address: %4 گزینه‌ها: - Specify configuration file (default: bitcoin.conf) - مشخص کردن فایل پیکربندی (پیش‌فرض: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + مشخص کردن فایل پیکربندی (پیش‌فرض: darkcoin.conf) Specify pid file (default: bitcoind.pid) - مشخص کردن فایل شناسهٔ پردازش - pid - (پیش‌فرض: bitcoin.pid) + مشخص کردن فایل شناسهٔ پردازش - pid - (پیش‌فرض: darkcoin.pid) Specify data directory diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts index 1e15422c4..5e16d4bf9 100644 --- a/src/qt/locale/bitcoin_fa_IR.ts +++ b/src/qt/locale/bitcoin_fa_IR.ts @@ -991,8 +991,8 @@ Address: %4 انتخابها: - Specify configuration file (default: bitcoin.conf) - فایل پیکربندیِ را مشخص کنید (پیش فرض: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + فایل پیکربندیِ را مشخص کنید (پیش فرض: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts index fc5df34a5..853a81af8 100644 --- a/src/qt/locale/bitcoin_fi.ts +++ b/src/qt/locale/bitcoin_fi.ts @@ -2610,12 +2610,12 @@ Osoite: %4 Asetukset: - Specify configuration file (default: bitcoin.conf) - Määritä asetustiedosto (oletus: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Määritä asetustiedosto (oletus: darkcoin.conf) Specify pid file (default: bitcoind.pid) - Määritä pid-tiedosto (oletus: bitcoin.pid) + Määritä pid-tiedosto (oletus: darkcoin.pid) Specify data directory diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts index 23ffd8e1f..b6c04d5e1 100644 --- a/src/qt/locale/bitcoin_fr.ts +++ b/src/qt/locale/bitcoin_fr.ts @@ -2602,8 +2602,8 @@ Adresse : %4 Options : - Specify configuration file (default: bitcoin.conf) - Spécifier le fichier de configuration (par défaut : bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Spécifier le fichier de configuration (par défaut : darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_gl.ts b/src/qt/locale/bitcoin_gl.ts index e6c49bb71..a3d797be9 100644 --- a/src/qt/locale/bitcoin_gl.ts +++ b/src/qt/locale/bitcoin_gl.ts @@ -2194,8 +2194,8 @@ Dirección: %4 Opcións: - Specify configuration file (default: bitcoin.conf) - Especificar arquivo de configuración (por defecto: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Especificar arquivo de configuración (por defecto: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts index b045c2d36..e259e59bb 100644 --- a/src/qt/locale/bitcoin_he.ts +++ b/src/qt/locale/bitcoin_he.ts @@ -2297,8 +2297,8 @@ Address: %4 אפשרויות: - Specify configuration file (default: bitcoin.conf) - ציין קובץ הגדרות (ברירת מחדל: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + ציין קובץ הגדרות (ברירת מחדל: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_hi_IN.ts b/src/qt/locale/bitcoin_hi_IN.ts index ddffc9401..33db36ff3 100644 --- a/src/qt/locale/bitcoin_hi_IN.ts +++ b/src/qt/locale/bitcoin_hi_IN.ts @@ -897,12 +897,12 @@ Address: %4 विकल्प: - Specify configuration file (default: bitcoin.conf) - configuraion की फाइल का विवरण दें (default: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + configuraion की फाइल का विवरण दें (default: darkcoin.conf) Specify pid file (default: bitcoind.pid) - pid फाइल का विवरण दें (default: bitcoin.pid) + pid फाइल का विवरण दें (default: darkcoin.pid) Specify data directory diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts index 12b7b3929..908833b07 100644 --- a/src/qt/locale/bitcoin_hr.ts +++ b/src/qt/locale/bitcoin_hr.ts @@ -1336,12 +1336,12 @@ Adresa:%4 Postavke: - Specify configuration file (default: bitcoin.conf) - Odredi konfiguracijsku datoteku (ugrađeni izbor: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Odredi konfiguracijsku datoteku (ugrađeni izbor: darkcoin.conf) Specify pid file (default: bitcoind.pid) - Odredi proces ID datoteku (ugrađeni izbor: bitcoin.pid) + Odredi proces ID datoteku (ugrađeni izbor: darkcoin.pid) Specify data directory diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts index 204116fbe..2763ce215 100644 --- a/src/qt/locale/bitcoin_hu.ts +++ b/src/qt/locale/bitcoin_hu.ts @@ -2102,8 +2102,8 @@ Cím: %4 - Specify configuration file (default: bitcoin.conf) - Konfigurációs fájl (alapértelmezett: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Konfigurációs fájl (alapértelmezett: darkcoin.conf) diff --git a/src/qt/locale/bitcoin_id_ID.ts b/src/qt/locale/bitcoin_id_ID.ts index 369272cc8..5c74ea3c7 100644 --- a/src/qt/locale/bitcoin_id_ID.ts +++ b/src/qt/locale/bitcoin_id_ID.ts @@ -2482,8 +2482,8 @@ Alamat: %4 Pilihan: - Specify configuration file (default: bitcoin.conf) - Tentukan berkas konfigurasi (standar: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Tentukan berkas konfigurasi (standar: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts index 2527227aa..7adcdc2ff 100644 --- a/src/qt/locale/bitcoin_it.ts +++ b/src/qt/locale/bitcoin_it.ts @@ -2608,8 +2608,8 @@ Più URL vengono separati da una barra verticale |. Opzioni: - Specify configuration file (default: bitcoin.conf) - Specifica il file di configurazione (predefinito: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Specifica il file di configurazione (predefinito: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts index 6e391f173..e6abab92c 100644 --- a/src/qt/locale/bitcoin_ja.ts +++ b/src/qt/locale/bitcoin_ja.ts @@ -2151,8 +2151,8 @@ Address: %4 オプション: - Specify configuration file (default: bitcoin.conf) - 設定ファイルの指定 (初期値: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + 設定ファイルの指定 (初期値: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_ka.ts b/src/qt/locale/bitcoin_ka.ts index 0c21d7d56..e2f93da51 100644 --- a/src/qt/locale/bitcoin_ka.ts +++ b/src/qt/locale/bitcoin_ka.ts @@ -2562,8 +2562,8 @@ Address: %4 ოპციები: - Specify configuration file (default: bitcoin.conf) - მიუთითეთ საკონფიგურაციო ფაილი (ნაგულისხმევია: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + მიუთითეთ საკონფიგურაციო ფაილი (ნაგულისხმევია: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts index 5c8fc0bdc..98de282fa 100644 --- a/src/qt/locale/bitcoin_ko_KR.ts +++ b/src/qt/locale/bitcoin_ko_KR.ts @@ -2486,8 +2486,8 @@ Address: %4 옵션: - Specify configuration file (default: bitcoin.conf) - 설정파일 지정 (기본값: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + 설정파일 지정 (기본값: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_la.ts b/src/qt/locale/bitcoin_la.ts index a0e8b99a5..5f8789396 100644 --- a/src/qt/locale/bitcoin_la.ts +++ b/src/qt/locale/bitcoin_la.ts @@ -1605,12 +1605,12 @@ Inscriptio: %4 Optiones: - Specify configuration file (default: bitcoin.conf) - Specifica configurationis plicam (praedefinitum: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Specifica configurationis plicam (praedefinitum: darkcoin.conf) Specify pid file (default: bitcoind.pid) - Specifica pid plicam (praedefinitum: bitcoin.pid) + Specifica pid plicam (praedefinitum: darkcoin.pid) Specify data directory diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts index a625b7527..5df0820a9 100644 --- a/src/qt/locale/bitcoin_lt.ts +++ b/src/qt/locale/bitcoin_lt.ts @@ -1488,8 +1488,8 @@ Adresas: %4 Parinktys: - Specify configuration file (default: bitcoin.conf) - Nurodyti konfigūracijos failą (pagal nutylėjimąt: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Nurodyti konfigūracijos failą (pagal nutylėjimąt: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_lv_LV.ts b/src/qt/locale/bitcoin_lv_LV.ts index 239a063ae..fcebf7116 100644 --- a/src/qt/locale/bitcoin_lv_LV.ts +++ b/src/qt/locale/bitcoin_lv_LV.ts @@ -2342,8 +2342,8 @@ Adrese: %4 Iespējas: - Specify configuration file (default: bitcoin.conf) - Norādiet konfigurācijas failu (pēc noklusēšanas: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Norādiet konfigurācijas failu (pēc noklusēšanas: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts index 3c2d506f8..453b1827a 100644 --- a/src/qt/locale/bitcoin_nb.ts +++ b/src/qt/locale/bitcoin_nb.ts @@ -2610,8 +2610,8 @@ Adresse: %4 Innstillinger: - Specify configuration file (default: bitcoin.conf) - Angi konfigurasjonsfil (standardverdi: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Angi konfigurasjonsfil (standardverdi: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts index ce15e8d23..38c56c36d 100644 --- a/src/qt/locale/bitcoin_nl.ts +++ b/src/qt/locale/bitcoin_nl.ts @@ -2610,8 +2610,8 @@ Adres: %4 Opties: - Specify configuration file (default: bitcoin.conf) - Specificeer configuratiebestand (standaard: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Specificeer configuratiebestand (standaard: darkcoin.conf) diff --git a/src/qt/locale/bitcoin_pam.ts b/src/qt/locale/bitcoin_pam.ts index 545e571b6..a4f977c77 100644 --- a/src/qt/locale/bitcoin_pam.ts +++ b/src/qt/locale/bitcoin_pam.ts @@ -1476,8 +1476,8 @@ Address: %4 Pipamilian: - Specify configuration file (default: bitcoin.conf) - Pilinan ing configuration file(default: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Pilinan ing configuration file(default: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts index 3a3e50ba8..ca52de8a3 100644 --- a/src/qt/locale/bitcoin_pl.ts +++ b/src/qt/locale/bitcoin_pl.ts @@ -2478,12 +2478,12 @@ Adres: %4 Opcje: - Specify configuration file (default: bitcoin.conf) - Wskaż plik konfiguracyjny (domyślnie: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Wskaż plik konfiguracyjny (domyślnie: darkcoin.conf) Specify pid file (default: bitcoind.pid) - Wskaż plik pid (domyślnie: bitcoin.pid) + Wskaż plik pid (domyślnie: darkcoin.pid) Specify data directory diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts index a07f68882..7ab068597 100644 --- a/src/qt/locale/bitcoin_pt_BR.ts +++ b/src/qt/locale/bitcoin_pt_BR.ts @@ -2573,8 +2573,8 @@ Endereço: %4 Opções: - Specify configuration file (default: bitcoin.conf) - Especifique um arquivo de configurações (padrão: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Especifique um arquivo de configurações (padrão: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts index 6bbd544ba..7ec06cae0 100644 --- a/src/qt/locale/bitcoin_pt_PT.ts +++ b/src/qt/locale/bitcoin_pt_PT.ts @@ -2581,8 +2581,8 @@ Endereço: %4 Opções: - Specify configuration file (default: bitcoin.conf) - Especificar ficheiro de configuração (por defeito: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Especificar ficheiro de configuração (por defeito: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts index 3dac8c9e7..88d9c6fcb 100644 --- a/src/qt/locale/bitcoin_ro_RO.ts +++ b/src/qt/locale/bitcoin_ro_RO.ts @@ -2430,8 +2430,8 @@ Adresa: %4 Setări: - Specify configuration file (default: bitcoin.conf) - Specifică fișierul de configurare (implicit: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Specifică fișierul de configurare (implicit: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index 3153b5e9d..b2c556571 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -2607,12 +2607,12 @@ Address: %4 Опции: - Specify configuration file (default: bitcoin.conf) - Указать конфигурационный файл (по умолчанию: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Указать конфигурационный файл (по умолчанию: darkcoin.conf) Specify pid file (default: bitcoind.pid) - Задать pid-файл (по умолчанию: bitcoin.pid) + Задать pid-файл (по умолчанию: darkcoin.pid) Specify data directory diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts index 4370092f8..7e27e3bec 100644 --- a/src/qt/locale/bitcoin_sk.ts +++ b/src/qt/locale/bitcoin_sk.ts @@ -2597,8 +2597,8 @@ Adresa: %4 Možnosti: - Specify configuration file (default: bitcoin.conf) - Určiť súbor s nastaveniami (predvolené: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Určiť súbor s nastaveniami (predvolené: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_sl_SI.ts b/src/qt/locale/bitcoin_sl_SI.ts index 16f678d5a..c99351e23 100644 --- a/src/qt/locale/bitcoin_sl_SI.ts +++ b/src/qt/locale/bitcoin_sl_SI.ts @@ -1912,12 +1912,12 @@ Naslov: %4 Možnosti: - Specify configuration file (default: bitcoin.conf) - Določi datoteko z nastavitvami (privzeta: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Določi datoteko z nastavitvami (privzeta: darkcoin.conf) Specify pid file (default: bitcoind.pid) - Določi pid datoteko (privzeta: bitcoin.pid) + Določi pid datoteko (privzeta: darkcoin.pid) Specify data directory diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts index 4fdf42c29..b34303f8a 100644 --- a/src/qt/locale/bitcoin_sr.ts +++ b/src/qt/locale/bitcoin_sr.ts @@ -796,8 +796,8 @@ Address: %4 Opcije - Specify configuration file (default: bitcoin.conf) - Potvrdi željeni konfiguracioni fajl (podrazumevani:bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Potvrdi željeni konfiguracioni fajl (podrazumevani:darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts index e87671768..fa28e73cf 100644 --- a/src/qt/locale/bitcoin_sv.ts +++ b/src/qt/locale/bitcoin_sv.ts @@ -2607,8 +2607,8 @@ Adress: %4 Inställningar: - Specify configuration file (default: bitcoin.conf) - Ange konfigurationsfil (förvalt: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Ange konfigurationsfil (förvalt: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts index 300716785..e244e9bd2 100644 --- a/src/qt/locale/bitcoin_tr.ts +++ b/src/qt/locale/bitcoin_tr.ts @@ -2610,8 +2610,8 @@ Adres: %4 Seçenekler: - Specify configuration file (default: bitcoin.conf) - Yapılandırma dosyası belirt (varsayılan: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Yapılandırma dosyası belirt (varsayılan: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts index 60197495e..60e17a5d1 100644 --- a/src/qt/locale/bitcoin_uk.ts +++ b/src/qt/locale/bitcoin_uk.ts @@ -1922,8 +1922,8 @@ Address: %4 Параметри: - Specify configuration file (default: bitcoin.conf) - Вкажіть файл конфігурації (типово: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Вкажіть файл конфігурації (типово: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_uz@Cyrl.ts b/src/qt/locale/bitcoin_uz@Cyrl.ts index 4c238b92a..9471b036a 100644 --- a/src/qt/locale/bitcoin_uz@Cyrl.ts +++ b/src/qt/locale/bitcoin_uz@Cyrl.ts @@ -938,8 +938,8 @@ MIT/X11 дастурий таъминот лицензияси остида та Танламалар: - Specify configuration file (default: bitcoin.conf) - Мослаш файлини кўрсатинг (default: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + Мослаш файлини кўрсатинг (default: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts index a65233503..02ef6b688 100644 --- a/src/qt/locale/bitcoin_zh_CN.ts +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -2614,8 +2614,8 @@ Address: %4 - Specify configuration file (default: bitcoin.conf) - 指定配置文件 (默认为 bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + 指定配置文件 (默认为 darkcoin.conf) diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts index 3db01fcda..e4e77783a 100644 --- a/src/qt/locale/bitcoin_zh_TW.ts +++ b/src/qt/locale/bitcoin_zh_TW.ts @@ -2612,8 +2612,8 @@ Address: %4 選項: - Specify configuration file (default: bitcoin.conf) - 指定設定檔(預設值: bitcoin.conf) + Specify configuration file (default: darkcoin.conf) + 指定設定檔(預設值: darkcoin.conf) Specify pid file (default: bitcoind.pid) diff --git a/src/rpcclient.cpp b/src/rpcclient.cpp index 4f3c39ce9..fc0cb5bf7 100644 --- a/src/rpcclient.cpp +++ b/src/rpcclient.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2013 The Bitcoin developers +// Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2014 vertoe & the Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -253,7 +254,7 @@ std::string HelpMessageCli(bool mainProgram) { strUsage += _("Options:") + "\n"; strUsage += " -? " + _("This help message") + "\n"; - strUsage += " -conf= " + _("Specify configuration file (default: bitcoin.conf)") + "\n"; + strUsage += " -conf= " + _("Specify configuration file (default: darkcoin.conf)") + "\n"; strUsage += " -datadir= " + _("Specify data directory") + "\n"; strUsage += " -testnet " + _("Use the test network") + "\n"; strUsage += " -regtest " + _("Enter regression test mode, which uses a special chain in which blocks can be " diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index ef99cb305..3534253ad 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2013 The Bitcoin developers +// Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2014 vertoe & the Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -119,7 +120,7 @@ Value getgenerate(const Array& params, bool fHelp) throw runtime_error( "getgenerate\n" "\nReturn if the server is set to generate coins or not. The default is false.\n" - "It is set with the command line argument -gen (or bitcoin.conf setting gen)\n" + "It is set with the command line argument -gen (or darkcoin.conf setting gen)\n" "It can also be set with the setgenerate call.\n" "\nResult\n" "true|false (boolean) If the server is set to generate coins or not\n" diff --git a/src/util.cpp b/src/util.cpp index b8036a387..599b533d4 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2014 vertoe & the Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -914,7 +915,7 @@ static std::string FormatException(std::exception* pex, const char* pszThread) char pszModule[MAX_PATH] = ""; GetModuleFileNameA(NULL, pszModule, sizeof(pszModule)); #else - const char* pszModule = "bitcoin"; + const char* pszModule = "darkcoin"; #endif if (pex) return strprintf( @@ -941,13 +942,13 @@ void PrintExceptionContinue(std::exception* pex, const char* pszThread) boost::filesystem::path GetDefaultDataDir() { namespace fs = boost::filesystem; - // Windows < Vista: C:\Documents and Settings\Username\Application Data\Bitcoin - // Windows >= Vista: C:\Users\Username\AppData\Roaming\Bitcoin - // Mac: ~/Library/Application Support/Bitcoin - // Unix: ~/.bitcoin + // Windows < Vista: C:\Documents and Settings\Username\Application Data\Darkcoin + // Windows >= Vista: C:\Users\Username\AppData\Roaming\Darkcoin + // Mac: ~/Library/Application Support/Darkcoin + // Unix: ~/.darkcoin #ifdef WIN32 // Windows - return GetSpecialFolderPath(CSIDL_APPDATA) / "Bitcoin"; + return GetSpecialFolderPath(CSIDL_APPDATA) / "Darkcoin"; #else fs::path pathRet; char* pszHome = getenv("HOME"); @@ -959,10 +960,10 @@ boost::filesystem::path GetDefaultDataDir() // Mac pathRet /= "Library/Application Support"; TryCreateDirectory(pathRet); - return pathRet / "Bitcoin"; + return pathRet / "Darkcoin"; #else // Unix - return pathRet / ".bitcoin"; + return pathRet / ".darkcoin"; #endif #endif } @@ -1011,7 +1012,7 @@ void ClearDatadirCache() boost::filesystem::path GetConfigFile() { - boost::filesystem::path pathConfigFile(GetArg("-conf", "bitcoin.conf")); + boost::filesystem::path pathConfigFile(GetArg("-conf", "darkcoin.conf")); if (!pathConfigFile.is_complete()) pathConfigFile = GetDataDir(false) / pathConfigFile; return pathConfigFile; } @@ -1021,14 +1022,14 @@ void ReadConfigFile(map& mapSettingsRet, { boost::filesystem::ifstream streamConfig(GetConfigFile()); if (!streamConfig.good()) - return; // No bitcoin.conf file is OK + return; // No darkcoin.conf file is OK set setOptions; setOptions.insert("*"); for (boost::program_options::detail::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it) { - // Don't overwrite existing settings so command line settings override bitcoin.conf + // Don't overwrite existing settings so command line settings override darkcoin.conf string strKey = string("-") + it->string_key; if (mapSettingsRet.count(strKey) == 0) { @@ -1044,7 +1045,7 @@ void ReadConfigFile(map& mapSettingsRet, boost::filesystem::path GetPidFile() { - boost::filesystem::path pathPidFile(GetArg("-pid", "bitcoind.pid")); + boost::filesystem::path pathPidFile(GetArg("-pid", "darkcoind.pid")); if (!pathPidFile.is_complete()) pathPidFile = GetDataDir() / pathPidFile; return pathPidFile; } @@ -1277,7 +1278,7 @@ void AddTimeData(const CNetAddr& ip, int64_t nTime) if (!fMatch) { fDone = true; - string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin will not work properly."); + string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong Darkcoin will not work properly."); strMiscWarning = strMessage; LogPrintf("*** %s\n", strMessage); uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_WARNING); diff --git a/src/util.h b/src/util.h index 89c601669..2b9bb4481 100644 --- a/src/util.h +++ b/src/util.h @@ -1,5 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2014 vertoe & the Darkcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -521,7 +522,7 @@ inline uint32_t ByteReverse(uint32_t value) // threadGroup.create_thread(boost::bind(&LoopForever >, "nothing", f, milliseconds)); template void LoopForever(const char* name, Callable func, int64_t msecs) { - std::string s = strprintf("bitcoin-%s", name); + std::string s = strprintf("darkcoin-%s", name); RenameThread(s.c_str()); LogPrintf("%s thread start\n", name); try @@ -549,7 +550,7 @@ template void LoopForever(const char* name, Callable func, // .. and a wrapper that just calls func once template void TraceThread(const char* name, Callable func) { - std::string s = strprintf("bitcoin-%s", name); + std::string s = strprintf("darkcoin-%s", name); RenameThread(s.c_str()); try {