Change , .conf and .pid files to darkcoin

This commit is contained in:
vertoe 2014-11-27 17:26:22 +01:00
parent 0f1d25b409
commit 5ba6751be7
76 changed files with 290 additions and 273 deletions

View File

@ -12,12 +12,17 @@ MUST-HAVE:
- Version numbers, protocol version, wallet version (compatible with DRK network) - Version numbers, protocol version, wallet version (compatible with DRK network)
- Adress versions (Public keys, Multisig keys) - Adress versions (Public keys, Multisig keys)
- Adjust algorithm (SHA256 --> X11) - 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) - Add masternode payment checks a.k.a. enforcement (based on blockheight)
- Remove bitcoin dead weight (SHA256, hardcoded keys, nodes)
OPTIONAL: OPTIONAL:
--------- ---------
- All the above for Testnet - 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. - Darksend, Instant Transactions, Atomic Transfers, etc. pp.

View File

@ -1 +1 @@
debian/examples/bitcoin.conf debian/examples/darkcoin.conf

View File

@ -1,2 +1,2 @@
debian/manpages/bitcoind.1 debian/manpages/darkcoind.1
debian/manpages/bitcoin.conf.5 debian/manpages/darkcoin.conf.5

View File

@ -359,8 +359,8 @@ bitcoin (0.3.19~dfsg-5) unstable; urgency=low
bitcoin (0.3.19~dfsg-4) unstable; urgency=low bitcoin (0.3.19~dfsg-4) unstable; urgency=low
[ Micah Anderson ] [ Micah Anderson ]
* Provide example bitcoin.conf. * Provide example darkcoin.conf.
* Add bitcoind(1) and bitcoin.conf(5) man pages. * Add bitcoind(1) and darkcoin.conf(5) man pages.
[ Jonas Smedegaard ] [ Jonas Smedegaard ]
* Ease backporting: * Ease backporting:

View File

@ -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: # Network-related settings:

View File

@ -11,7 +11,7 @@ bitcoin\-qt [command\-line options]
This help message This help message
.TP .TP
\fB\-conf=\fR<file> \fB\-conf=\fR<file>
Specify configuration file (default: bitcoin.conf) Specify configuration file (default: darkcoin.conf)
.TP .TP
\fB\-pid=\fR<file> \fB\-pid=\fR<file>
Specify pid file (default: bitcoind.pid) Specify pid file (default: bitcoind.pid)

View File

@ -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 .SH NAME
bitcoin.conf \- bitcoin configuration file darkcoin.conf \- darkcoin configuration file
.SH SYNOPSIS .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. 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 .TP
The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character. The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character.
.TP .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 .SH LOCATION
bitcoin.conf should be located in $HOME/.bitcoin darkcoin.conf should be located in $HOME/.darkcoin
.SH NETWORK-RELATED SETTINGS .SH NETWORK-RELATED SETTINGS
.TP .TP
.TP .TP
\fBtestnet=\fR[\fI'1'\fR|\fI'0'\fR] \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 .TP
\fBproxy=\fR\fI'127.0.0.1:9050'\fR \fBproxy=\fR\fI'127.0.0.1:9050'\fR
Connect via a socks4 proxy. Connect via a socks4 proxy.
@ -29,7 +29,7 @@ Maximum number of inbound+outbound connections.
.SH JSON-RPC OPTIONS .SH JSON-RPC OPTIONS
.TP .TP
\fBserver=\fR[\fI'1'\fR|\fI'0'\fR] \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 .TP
\fBrpcuser=\fR\fI'username'\fR \fBrpcuser=\fR\fI'username'\fR
You must set *rpcuser* to secure the JSON-RPC api. 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. Listen for RPC connections on this TCP port.
.TP .TP
\fBrpcconnect=\fR\fI'127.0.0.1'\fR \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 .TP
\fBrpcssl=\fR\fI'1'\fR \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 .TP
\fB\-rpcsslciphers=\fR<ciphers> \fB\-rpcsslciphers=\fR<ciphers>
Acceptable ciphers (default: TLSv1+HIGH:\:!SSLv2:\:!aNULL:\:!eNULL:\:!AH:\:!3DES:\:@STRENGTH) 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 .SH MISCELLANEOUS OPTIONS
.TP .TP
\fBgen=\fR[\fI'0'\fR|\fI'1'\fR] \fBgen=\fR[\fI'0'\fR|\fI'1'\fR]
Enable or disable attempt to generate bitcoins. Enable or disable attempt to generate darkcoins.
.TP .TP
\fB4way=\fR[\fI'0'\fR|\fI'1'\fR] \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 .TP
\fBkeypool=\fR\fI'100'\fR \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. Pre-generate this many public/private key pairs, so wallet backups will be valid for both prior transactions and several dozen future transactions.
.TP .TP
\fBpaytxfee=\fR\fI'0.00'\fR \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 .TP
\fBallowreceivebyip=\fR\fI'1'\fR \fBallowreceivebyip=\fR\fI'1'\fR
Allow direct connections for the 'pay via IP address' feature. 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 .SH USER INTERFACE OPTIONS
.TP .TP
\fBmin=\fR[\fI'0'\fR|\fI'1'\fR] \fBmin=\fR[\fI'0'\fR|\fI'1'\fR]
Enable or disable start bitcoind minimized. Enable or disable start darkcoind minimized.
.TP .TP
\fBminimizetotray=\fR[\fI'0'\fR|\fI'1'\fR] \fBminimizetotray=\fR[\fI'0'\fR|\fI'1'\fR]
Enable or disable minimize to the system tray. Enable or disable minimize to the system tray.
.SH "SEE ALSO" .SH "SEE ALSO"
bitcoind(1) darkcoind(1)
.SH AUTHOR .SH AUTHOR
This manual page was written by Micah Anderson <micah@debian.org> 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. This manual page was written by Micah Anderson <micah@debian.org> 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.

View File

@ -13,7 +13,7 @@ Bitcoins can be sent easily through the Internet, without having to trust middle
.SH OPTIONS .SH OPTIONS
.TP .TP
\fB\-conf=\fR<file> \fB\-conf=\fR<file>
Specify configuration file (default: bitcoin.conf) Specify configuration file (default: darkcoin.conf)
.TP .TP
\fB\-gen\fR \fB\-gen\fR
Generate coins Generate coins
@ -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. *note: ismine and address are only returned if the address is valid.
.SH "SEE ALSO" .SH "SEE ALSO"
bitcoin.conf(5) darkcoin.conf(5)
.SH AUTHOR .SH AUTHOR
This manual page was written by Micah Anderson <micah@debian.org> 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. This manual page was written by Micah Anderson <micah@debian.org> 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.

View File

@ -1,5 +1,5 @@
--- ---
name: "bitcoin" name: "darkcoin"
suites: suites:
- "precise" - "precise"
architectures: architectures:
@ -22,11 +22,11 @@ packages:
- "libqt4-test" - "libqt4-test"
reference_datetime: "2013-06-01 00:00:00" reference_datetime: "2013-06-01 00:00:00"
remotes: remotes:
- "url": "https://github.com/bitcoin/bitcoin.git" - "url": "https://github.com/darkcoin/darkcoin.git"
"dir": "bitcoin" "dir": "darkcoin"
files: files:
- "bitcoin-deps-linux32-gitian-r8.zip" - "darkcoin-deps-linux32-gitian-r8.zip"
- "bitcoin-deps-linux64-gitian-r8.zip" - "darkcoin-deps-linux64-gitian-r8.zip"
- "boost-linux32-1.55.0-gitian-r1.zip" - "boost-linux32-1.55.0-gitian-r1.zip"
- "boost-linux64-1.55.0-gitian-r1.zip" - "boost-linux64-1.55.0-gitian-r1.zip"
- "qt-linux32-4.6.4-gitian-r1.tar.gz" - "qt-linux32-4.6.4-gitian-r1.tar.gz"
@ -43,13 +43,13 @@ script: |
# #
mkdir -p $STAGING mkdir -p $STAGING
cd $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 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 tar -zxf ../build/qt-linux${GBUILD_BITS}-4.6.4-gitian-r1.tar.gz
cd ../build cd ../build
# Avoid exporting *any* symbols from the executable # 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). # 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. # 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. # To do this, build a linker script that marks all symbols as local.
@ -59,14 +59,14 @@ script: |
local: *; local: *;
};' > $LINKER_SCRIPT };' > $LINKER_SCRIPT
function do_configure { 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 ./autogen.sh
do_configure do_configure
make dist make dist
DISTNAME=`echo bitcoin-*.tar.gz` DISTNAME=`echo darkcoin-*.tar.gz`
# Build dynamic versions of everything # Build dynamic versions of everything
# (with static linking to boost and openssl as well a some non-OS deps) # (with static linking to boost and openssl as well a some non-OS deps)
@ -83,4 +83,4 @@ script: |
rm -rf $TEMPDIR rm -rf $TEMPDIR
mkdir -p $TEMPDIR mkdir -p $TEMPDIR
cd $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

View File

@ -1,5 +1,5 @@
--- ---
name: "bitcoin" name: "darkcoin"
suites: suites:
- "precise" - "precise"
architectures: architectures:
@ -19,15 +19,15 @@ packages:
reference_datetime: "2013-06-01 00:00:00" reference_datetime: "2013-06-01 00:00:00"
remotes: remotes:
- "url": "https://github.com/bitcoin/bitcoin.git" - "url": "https://github.com/darkcoin/darkcoin.git"
"dir": "bitcoin" "dir": "darkcoin"
files: files:
- "qt-win32-5.2.0-gitian-r3.zip" - "qt-win32-5.2.0-gitian-r3.zip"
- "qt-win64-5.2.0-gitian-r3.zip" - "qt-win64-5.2.0-gitian-r3.zip"
- "boost-win32-1.55.0-gitian-r6.zip" - "boost-win32-1.55.0-gitian-r6.zip"
- "boost-win64-1.55.0-gitian-r6.zip" - "boost-win64-1.55.0-gitian-r6.zip"
- "bitcoin-deps-win32-gitian-r15.zip" - "darkcoin-deps-win32-gitian-r15.zip"
- "bitcoin-deps-win64-gitian-r15.zip" - "darkcoin-deps-win64-gitian-r15.zip"
- "protobuf-win32-2.5.0-gitian-r4.zip" - "protobuf-win32-2.5.0-gitian-r4.zip"
- "protobuf-win64-2.5.0-gitian-r4.zip" - "protobuf-win64-2.5.0-gitian-r4.zip"
script: | script: |
@ -61,29 +61,29 @@ script: |
cd $STAGING cd $STAGING
unzip $INDIR/qt-win${BITS}-5.2.0-gitian-r3.zip unzip $INDIR/qt-win${BITS}-5.2.0-gitian-r3.zip
unzip $INDIR/boost-win${BITS}-1.55.0-gitian-r6.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 unzip $INDIR/protobuf-win${BITS}-2.5.0-gitian-r4.zip
if [ "$NEEDDIST" == "1" ]; then if [ "$NEEDDIST" == "1" ]; then
# Make source code archive which is architecture independent so it only needs to be done once # 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 ./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 make dist
DISTNAME=`echo bitcoin-*.tar.gz` DISTNAME=`echo darkcoin-*.tar.gz`
NEEDDIST=0 NEEDDIST=0
fi fi
# Build platform-dependent executables from source archive # Build platform-dependent executables from source archive
cd $BUILDDIR cd $BUILDDIR
mkdir -p distsrc mkdir -p distsrc
cd distsrc cd distsrc
tar --strip-components=1 -xf $HOME/build/bitcoin/$DISTNAME 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=bitcoin ${OPTFLAGS}" ./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 LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
export FAKETIME=$REFERENCE_DATETIME export FAKETIME=$REFERENCE_DATETIME
make $MAKEOPTS make $MAKEOPTS
make deploy make deploy
make install-strip make install-strip
cp -f bitcoin-*setup*.exe $BINDIR/ cp -f darkcoin-*setup*.exe $BINDIR/
unset LD_PRELOAD unset LD_PRELOAD
unset FAKETIME unset FAKETIME
done # for BITS in done # for BITS in
@ -93,5 +93,5 @@ script: |
rm -rf $TEMPDIR rm -rf $TEMPDIR
mkdir -p $TEMPDIR mkdir -p $TEMPDIR
cd $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

View File

@ -7,7 +7,7 @@ address (or addresses).
Depends on [jsonrpc](http://json-rpc.org/). Depends on [jsonrpc](http://json-rpc.org/).
spendfrom.py --from=FROMADDRESS1[,FROMADDRESS2] --to=TOADDRESS --amount=amount \ 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. 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 ### ### Notes ###
- You may explicitly specify how much fee to pay (a fee more than 1% of the amount - 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 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). too small, or if the transaction is too many bytes for the fee).

View File

@ -1,13 +1,13 @@
#!/usr/bin/env python #!/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. # and send any change back to that same address.
# #
# Example usage: # Example usage:
# spendfrom.py # Lists available funds # spendfrom.py # Lists available funds
# spendfrom.py --from=ADDRESS --to=ADDRESS --amount=11.00 # 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. # on localhost.
# #
# Depends on jsonrpc # Depends on jsonrpc
@ -33,15 +33,15 @@ def check_json_precision():
raise RuntimeError("JSON encode/decode loses precision") raise RuntimeError("JSON encode/decode loses precision")
def determine_db_dir(): 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": if platform.system() == "Darwin":
return os.path.expanduser("~/Library/Application Support/Bitcoin/") return os.path.expanduser("~/Library/Application Support/Darkcoin/")
elif platform.system() == "Windows": elif platform.system() == "Windows":
return os.path.join(os.environ['APPDATA'], "Bitcoin") return os.path.join(os.environ['APPDATA'], "Darkcoin")
return os.path.expanduser("~/.bitcoin") return os.path.expanduser("~/.darkcoin")
def read_bitcoin_config(dbdir): 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 from ConfigParser import SafeConfigParser
class FakeSecHead(object): class FakeSecHead(object):
@ -59,11 +59,11 @@ def read_bitcoin_config(dbdir):
return s return s
config_parser = SafeConfigParser() 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")) return dict(config_parser.items("all"))
def connect_JSON(config): def connect_JSON(config):
"""Connect to a bitcoin JSON-RPC server""" """Connect to a darkcoin JSON-RPC server"""
testnet = config.get('testnet', '0') testnet = config.get('testnet', '0')
testnet = (int(testnet) > 0) # 0/1 in config file, convert to True/False testnet = (int(testnet) > 0) # 0/1 in config file, convert to True/False
if not 'rpcport' in config: if not 'rpcport' in config:
@ -72,7 +72,7 @@ def connect_JSON(config):
try: try:
result = ServiceProxy(connect) result = ServiceProxy(connect)
# ServiceProxy is lazy-connect, so send an RPC command mostly to catch connection errors, # 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: if result.getmininginfo()['testnet'] != testnet:
sys.stderr.write("RPC server at "+connect+" testnet setting mismatch\n") sys.stderr.write("RPC server at "+connect+" testnet setting mismatch\n")
sys.exit(1) sys.exit(1)
@ -81,36 +81,36 @@ def connect_JSON(config):
sys.stderr.write("Error connecting to RPC server at "+connect+"\n") sys.stderr.write("Error connecting to RPC server at "+connect+"\n")
sys.exit(1) sys.exit(1)
def unlock_wallet(bitcoind): def unlock_wallet(darkcoind):
info = bitcoind.getinfo() info = darkcoind.getinfo()
if 'unlocked_until' not in info: if 'unlocked_until' not in info:
return True # wallet is not encrypted return True # wallet is not encrypted
t = int(info['unlocked_until']) t = int(info['unlocked_until'])
if t <= time.time(): if t <= time.time():
try: try:
passphrase = getpass.getpass("Wallet is locked; enter passphrase: ") passphrase = getpass.getpass("Wallet is locked; enter passphrase: ")
bitcoind.walletpassphrase(passphrase, 5) darkcoind.walletpassphrase(passphrase, 5)
except: except:
sys.stderr.write("Wrong passphrase\n") sys.stderr.write("Wrong passphrase\n")
info = bitcoind.getinfo() info = darkcoind.getinfo()
return int(info['unlocked_until']) > time.time() return int(info['unlocked_until']) > time.time()
def list_available(bitcoind): def list_available(darkcoind):
address_summary = dict() address_summary = dict()
address_to_account = dict() address_to_account = dict()
for info in bitcoind.listreceivedbyaddress(0): for info in darkcoind.listreceivedbyaddress(0):
address_to_account[info["address"]] = info["account"] address_to_account[info["address"]] = info["account"]
unspent = bitcoind.listunspent(0) unspent = darkcoind.listunspent(0)
for output in unspent: for output in unspent:
# listunspent doesn't give addresses, so: # listunspent doesn't give addresses, so:
rawtx = bitcoind.getrawtransaction(output['txid'], 1) rawtx = darkcoind.getrawtransaction(output['txid'], 1)
vout = rawtx["vout"][output['vout']] vout = rawtx["vout"][output['vout']]
pk = vout["scriptPubKey"] 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. # or pay-to-script-hash outputs right now; anything exotic is ignored.
if pk["type"] != "pubkeyhash" and pk["type"] != "scripthash": if pk["type"] != "pubkeyhash" and pk["type"] != "scripthash":
continue continue
@ -139,8 +139,8 @@ def select_coins(needed, inputs):
n += 1 n += 1
return (outputs, have-needed) return (outputs, have-needed)
def create_tx(bitcoind, fromaddresses, toaddress, amount, fee): def create_tx(darkcoind, fromaddresses, toaddress, amount, fee):
all_coins = list_available(bitcoind) all_coins = list_available(darkcoind)
total_available = Decimal("0.0") total_available = Decimal("0.0")
needed = amount+fee needed = amount+fee
@ -159,7 +159,7 @@ def create_tx(bitcoind, fromaddresses, toaddress, amount, fee):
# Note: # Note:
# Python's json/jsonrpc modules have inconsistent support for Decimal numbers. # Python's json/jsonrpc modules have inconsistent support for Decimal numbers.
# Instead of wrestling with getting json.dumps() (used by jsonrpc) to encode # 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) } outputs = { toaddress : float(amount) }
(inputs, change_amount) = select_coins(needed, potential_inputs) (inputs, change_amount) = select_coins(needed, potential_inputs)
@ -170,8 +170,8 @@ def create_tx(bitcoind, fromaddresses, toaddress, amount, fee):
else: else:
outputs[change_address] = float(change_amount) outputs[change_address] = float(change_amount)
rawtx = bitcoind.createrawtransaction(inputs, outputs) rawtx = darkcoind.createrawtransaction(inputs, outputs)
signed_rawtx = bitcoind.signrawtransaction(rawtx) signed_rawtx = darkcoind.signrawtransaction(rawtx)
if not signed_rawtx["complete"]: if not signed_rawtx["complete"]:
sys.stderr.write("signrawtransaction failed\n") sys.stderr.write("signrawtransaction failed\n")
sys.exit(1) sys.exit(1)
@ -179,10 +179,10 @@ def create_tx(bitcoind, fromaddresses, toaddress, amount, fee):
return txdata return txdata
def compute_amount_in(bitcoind, txinfo): def compute_amount_in(darkcoind, txinfo):
result = Decimal("0.0") result = Decimal("0.0")
for vin in txinfo['vin']: 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']] vout = in_info['vout'][vin['vout']]
result = result + vout['value'] result = result + vout['value']
return result return result
@ -193,12 +193,12 @@ def compute_amount_out(txinfo):
result = result + vout['value'] result = result + vout['value']
return result return result
def sanity_test_fee(bitcoind, txdata_hex, max_fee): def sanity_test_fee(darkcoind, txdata_hex, max_fee):
class FeeError(RuntimeError): class FeeError(RuntimeError):
pass pass
try: try:
txinfo = bitcoind.decoderawtransaction(txdata_hex) txinfo = darkcoind.decoderawtransaction(txdata_hex)
total_in = compute_amount_in(bitcoind, txinfo) total_in = compute_amount_in(darkcoind, txinfo)
total_out = compute_amount_out(txinfo) total_out = compute_amount_out(txinfo)
if total_in-total_out > max_fee: if total_in-total_out > max_fee:
raise FeeError("Rejecting transaction, unreasonable fee of "+str(total_in-total_out)) 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 = optparse.OptionParser(usage="%prog [options]")
parser.add_option("--from", dest="fromaddresses", default=None, 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, 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, parser.add_option("--amount", dest="amount", default=None,
help="amount to send") help="amount to send")
parser.add_option("--fee", dest="fee", default="0.0", parser.add_option("--fee", dest="fee", default="0.0",
help="fee to include") help="fee to include")
parser.add_option("--datadir", dest="datadir", default=determine_db_dir(), 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", parser.add_option("--testnet", dest="testnet", default=False, action="store_true",
help="Use the test network") help="Use the test network")
parser.add_option("--dry_run", dest="dry_run", default=False, action="store_true", parser.add_option("--dry_run", dest="dry_run", default=False, action="store_true",
@ -240,10 +240,10 @@ def main():
check_json_precision() check_json_precision()
config = read_bitcoin_config(options.datadir) config = read_bitcoin_config(options.datadir)
if options.testnet: config['testnet'] = True if options.testnet: config['testnet'] = True
bitcoind = connect_JSON(config) darkcoind = connect_JSON(config)
if options.amount is None: if options.amount is None:
address_summary = list_available(bitcoind) address_summary = list_available(darkcoind)
for address,info in address_summary.iteritems(): for address,info in address_summary.iteritems():
n_transactions = len(info['outputs']) n_transactions = len(info['outputs'])
if n_transactions > 1: if n_transactions > 1:
@ -253,14 +253,14 @@ def main():
else: else:
fee = Decimal(options.fee) fee = Decimal(options.fee)
amount = Decimal(options.amount) amount = Decimal(options.amount)
while unlock_wallet(bitcoind) == False: while unlock_wallet(darkcoind) == False:
pass # Keep asking for passphrase until they get it right pass # Keep asking for passphrase until they get it right
txdata = create_tx(bitcoind, options.fromaddresses.split(","), options.to, amount, fee) txdata = create_tx(darkcoind, options.fromaddresses.split(","), options.to, amount, fee)
sanity_test_fee(bitcoind, txdata, amount*Decimal("0.01")) sanity_test_fee(darkcoind, txdata, amount*Decimal("0.01"))
if options.dry_run: if options.dry_run:
print(txdata) print(txdata)
else: else:
txid = bitcoind.sendrawtransaction(txdata) txid = darkcoind.sendrawtransaction(txdata)
print(txid) print(txid)
if __name__ == '__main__': if __name__ == '__main__':

View File

@ -1,6 +1,6 @@
Mac OS X Build Instructions and Notes 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 Notes
----- -----
@ -73,19 +73,19 @@ These rest of these commands are run inside brew interactive mode:
/private/tmp/berkeley-db4-UGpd0O $ exit /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 $ brew --force link berkeley-db4
### Building `bitcoind` ### Building `darkcoind`
1. Clone the github tree to get the source code and go into the directory. 1. Clone the github tree to get the source code and go into the directory.
git clone https://github.com/bitcoin/bitcoin.git git clone https://github.com/darkcoin/darkcoin.git
cd bitcoin cd darkcoin
2. Build bitcoind: 2. Build darkcoind:
./autogen.sh ./autogen.sh
./configure ./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 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: as follows for maximum compatibility:
All dependencies should be compiled with these flags: 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 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. 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: commands:
echo -e "rpcuser=bitcoinrpc\nrpcpassword=$(xxd -l 16 -p /dev/urandom)" > "/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/Bitcoin/bitcoin.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 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; 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: 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: Other commands:
./bitcoind -daemon # to start the bitcoin daemon. ./darkcoind -daemon # to start the darkcoin daemon.
./bitcoin-cli --help # for a list of command-line options. ./darkcoin-cli --help # for a list of command-line options.
./bitcoin-cli help # When the daemon is running, to get a list of RPC commands ./darkcoin-cli help # When the daemon is running, to get a list of RPC commands

View File

@ -9,7 +9,7 @@ The Amazon Machine Images I used to do the builds are available:
(mac build will be done soon) (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 maxsendbuffer=10000
maxreceivebuffer=10000 maxreceivebuffer=10000

View File

@ -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 how to use the "raw transactions" JSON-RPC api to send coins received from particular
addresses (also known as "coin control"). 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. dbcache : controls LevelDB memory usage.

View File

@ -3,14 +3,14 @@
# Distributed under the MIT/X11 software license, see the accompanying # Distributed under the MIT/X11 software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
# #
DATADIR="@abs_top_builddir@/.bitcoin" DATADIR="@abs_top_builddir@/.darkcoin"
rm -rf "$DATADIR" rm -rf "$DATADIR"
mkdir -p "$DATADIR"/regtest mkdir -p "$DATADIR"/regtest
touch "$DATADIR/regtest/debug.log" touch "$DATADIR/regtest/debug.log"
tail -q -n 1 -F "$DATADIR/regtest/debug.log" | grep -m 1 -q "Done loading" & tail -q -n 1 -F "$DATADIR/regtest/debug.log" | grep -m 1 -q "Done loading" &
WAITER=$! WAITER=$!
PORT=`expr $BASHPID + 10000` 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=$! BITCOIND=$!
#Install a watchdog. #Install a watchdog.

View File

@ -1,4 +1,5 @@
# Copyright (c) 2014 The Bitcoin Core developers # Copyright (c) 2014 The Bitcoin Core developers
# Copyright (c) 2014 vertoe & the Darkcoin developers
# Distributed under the MIT/X11 software license, see the accompanying # Distributed under the MIT/X11 software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
# #
@ -61,26 +62,26 @@ def initialize_chain(test_dir):
""" """
Create (or copy from cache) a 200-block-long chain and Create (or copy from cache) a 200-block-long chain and
4 wallets. 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")): if not os.path.isdir(os.path.join("cache", "node0")):
devnull = open("/dev/null", "w+") devnull = open("/dev/null", "w+")
# Create cache directories, run bitcoinds: # Create cache directories, run darkcoinds:
for i in range(4): for i in range(4):
datadir = os.path.join("cache", "node"+str(i)) datadir = os.path.join("cache", "node"+str(i))
os.makedirs(datadir) 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("regtest=1\n");
f.write("rpcuser=rt\n"); f.write("rpcuser=rt\n");
f.write("rpcpassword=rt\n"); f.write("rpcpassword=rt\n");
f.write("port="+str(START_P2P_PORT+i)+"\n"); f.write("port="+str(START_P2P_PORT+i)+"\n");
f.write("rpcport="+str(START_RPC_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: if i > 0:
args.append("-connect=127.0.0.1:"+str(START_P2P_PORT)) args.append("-connect=127.0.0.1:"+str(START_P2P_PORT))
bitcoind_processes.append(subprocess.Popen(args)) bitcoind_processes.append(subprocess.Popen(args))
subprocess.check_call([ "bitcoin-cli", "-datadir="+datadir, subprocess.check_call([ "darkcoin-cli", "-datadir="+datadir,
"-rpcwait", "getblockcount"], stdout=devnull) "-rpcwait", "getblockcount"], stdout=devnull)
devnull.close() devnull.close()
rpcs = [] rpcs = []
@ -113,13 +114,13 @@ def initialize_chain(test_dir):
shutil.copytree(from_dir, to_dir) shutil.copytree(from_dir, to_dir)
def start_nodes(num_nodes, 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+") devnull = open("/dev/null", "w+")
for i in range(num_nodes): for i in range(num_nodes):
datadir = os.path.join(dir, "node"+str(i)) datadir = os.path.join(dir, "node"+str(i))
args = [ "bitcoind", "-datadir="+datadir ] args = [ "darkcoind", "-datadir="+datadir ]
bitcoind_processes.append(subprocess.Popen(args)) bitcoind_processes.append(subprocess.Popen(args))
subprocess.check_call([ "bitcoin-cli", "-datadir="+datadir, subprocess.check_call([ "darkcoin-cli", "-datadir="+datadir,
"-rpcwait", "getblockcount"], stdout=devnull) "-rpcwait", "getblockcount"], stdout=devnull)
devnull.close() devnull.close()
# Create&return JSON-RPC connections # Create&return JSON-RPC connections

View File

@ -1,5 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Copyright (c) 2014 The Bitcoin Core developers # Copyright (c) 2014 The Bitcoin Core developers
# Copyright (c) 2014 vertoe & the Darkcoin developers
# Distributed under the MIT/X11 software license, see the accompanying # Distributed under the MIT/X11 software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -11,7 +12,7 @@ function echoerr {
# Usage: ExtractKey <key> "<json_object_string>" # Usage: ExtractKey <key> "<json_object_string>"
# Warning: this will only work for the very-well-behaved # 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. # parse arbitrary/nested/etc JSON.
function ExtractKey { function ExtractKey {
echo $2 | tr -d ' "{}\n' | awk -v RS=',' -F: "\$1 ~ /$1/ { print \$2}" echo $2 | tr -d ' "{}\n' | awk -v RS=',' -F: "\$1 ~ /$1/ { print \$2}"
@ -20,7 +21,7 @@ function ExtractKey {
function CreateDataDir { function CreateDataDir {
DIR=$1 DIR=$1
mkdir -p $DIR mkdir -p $DIR
CONF=$DIR/bitcoin.conf CONF=$DIR/darkcoin.conf
echo "regtest=1" >> $CONF echo "regtest=1" >> $CONF
echo "keypool=2" >> $CONF echo "keypool=2" >> $CONF
echo "rpcuser=rt" >> $CONF echo "rpcuser=rt" >> $CONF

View File

@ -1,5 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Copyright (c) 2014 The Bitcoin Core developers # Copyright (c) 2014 The Bitcoin Core developers
# Copyright (c) 2014 vertoe & the Darkcoin developers
# Distributed under the MIT/X11 software license, see the accompanying # Distributed under the MIT/X11 software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -39,8 +40,8 @@ if [ $# -lt 1 ]; then
exit 1 exit 1
fi fi
BITCOIND=${1}/bitcoind BITCOIND=${1}/darkcoind
CLI=${1}/bitcoin-cli CLI=${1}/darkcoin-cli
DIR="${BASH_SOURCE%/*}" DIR="${BASH_SOURCE%/*}"
SENDANDWAIT="${DIR}/send.sh" SENDANDWAIT="${DIR}/send.sh"
@ -64,7 +65,7 @@ B4PID=$!
function CreateConfDir { function CreateConfDir {
DIR=$1 DIR=$1
mkdir -p $DIR mkdir -p $DIR
CONF=$DIR/bitcoin.conf CONF=$DIR/darkcoin.conf
echo "regtest=1" >> $CONF echo "regtest=1" >> $CONF
echo "rpcuser=rt" >> $CONF echo "rpcuser=rt" >> $CONF
echo "rpcpassword=rt" >> $CONF echo "rpcpassword=rt" >> $CONF

View File

@ -1,5 +1,6 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto // 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 // Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -63,7 +64,7 @@ bool AppInit(int argc, char* argv[])
// //
// Parameters // 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); ParseParameters(argc, argv);
if (!boost::filesystem::is_directory(GetDataDir(false))) if (!boost::filesystem::is_directory(GetDataDir(false)))
{ {

View File

@ -1,5 +1,6 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-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 // Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -196,7 +197,7 @@ std::string HelpMessage(HelpMessageMode hmm)
strUsage += " -blocknotify=<cmd> " + _("Execute command when the best block changes (%s in cmd is replaced by block hash)") + "\n"; strUsage += " -blocknotify=<cmd> " + _("Execute command when the best block changes (%s in cmd is replaced by block hash)") + "\n";
strUsage += " -checkblocks=<n> " + _("How many blocks to check at startup (default: 288, 0 = all)") + "\n"; strUsage += " -checkblocks=<n> " + _("How many blocks to check at startup (default: 288, 0 = all)") + "\n";
strUsage += " -checklevel=<n> " + _("How thorough the block verification of -checkblocks is (0-4, default: 3)") + "\n"; strUsage += " -checklevel=<n> " + _("How thorough the block verification of -checkblocks is (0-4, default: 3)") + "\n";
strUsage += " -conf=<file> " + _("Specify configuration file (default: bitcoin.conf)") + "\n"; strUsage += " -conf=<file> " + _("Specify configuration file (default: darkcoin.conf)") + "\n";
if (hmm == HMM_BITCOIND) if (hmm == HMM_BITCOIND)
{ {
#if !defined(WIN32) #if !defined(WIN32)

View File

@ -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 // Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // 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 // User language is set up: pick a data directory
Intro::pickDataDirectory(); 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 /// - Do not call GetDataDir(true) before this step finishes
if (!boost::filesystem::is_directory(GetDataDir(false))) if (!boost::filesystem::is_directory(GetDataDir(false)))
{ {

View File

@ -1,4 +1,5 @@
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2014 vertoe & the Darkcoin developers
#include <QtGlobal> #include <QtGlobal>
@ -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", "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", "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", "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 connection timeout in milliseconds (default: 5000)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"),
QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: bitcoind.pid)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: bitcoind.pid)"),

View File

@ -1,4 +1,5 @@
// Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2011-2014 The Bitcoin developers
// Copyright (c) 2014 vertoe & the Darkcoin developers
// Distributed under the MIT/X11 software license, see the accompanying // Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -17,7 +18,7 @@
/* Minimum free space (in bytes) needed for data directory */ /* Minimum free space (in bytes) needed for data directory */
static const uint64_t GB_BYTES = 1000000000LL; 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. /* Check free space asynchronously to prevent hanging the UI thread.
@ -181,7 +182,7 @@ void Intro::pickDataDirectory()
TryCreateDirectory(GUIUtil::qstringToBoostPath(dataDir)); TryCreateDirectory(GUIUtil::qstringToBoostPath(dataDir));
break; break;
} catch(fs::filesystem_error &e) { } 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)); tr("Error: Specified data directory \"%1\" can not be created.").arg(dataDir));
/* fall through, back to choosing screen */ /* fall through, back to choosing screen */
} }
@ -190,8 +191,8 @@ void Intro::pickDataDirectory()
settings.setValue("strDataDir", dataDir); settings.setValue("strDataDir", dataDir);
} }
/* Only override -datadir if different from the default, to make it possible to /* 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 * override -datadir in the darkcoin.conf file in the default data directory
* (to be consistent with bitcoind behavior) * (to be consistent with darkcoind behavior)
*/ */
if(dataDir != getDefaultDataDirectory()) if(dataDir != getDefaultDataDirectory())
SoftSetArg("-datadir", GUIUtil::qstringToBoostPath(dataDir).string()); // use OS locale for path setting SoftSetArg("-datadir", GUIUtil::qstringToBoostPath(dataDir).string()); // use OS locale for path setting

View File

@ -812,8 +812,8 @@ Address: %4
<translation>Опцыі:</translation> <translation>Опцыі:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Вызначыць канфігурацыйны файл (зыходна: bitcoin.conf)</translation> <translation>Вызначыць канфігурацыйны файл (зыходна: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -1514,8 +1514,8 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Опции:</translation> <translation>Опции:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Задаване на файл с настройки (по подразбиране bitcoin.conf)</translation> <translation>Задаване на файл с настройки (по подразбиране darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify data directory</source> <source>Specify data directory</source>

View File

@ -1969,8 +1969,8 @@ Address: %4
<translation>Opcions:</translation> <translation>Opcions:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Especificat arxiu de configuració (per defecte: bitcoin.conf)</translation> <translation>Especificat arxiu de configuració (per defecte: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2578,8 +2578,8 @@ Adresa: %4
<translation>Možnosti:</translation> <translation>Možnosti:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Konfigurační soubor (výchozí: bitcoin.conf)</translation> <translation>Konfigurační soubor (výchozí: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2610,8 +2610,8 @@ Adresse: %4
<translation>Indstillinger:</translation> <translation>Indstillinger:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Angiv konfigurationsfil (standard: bitcoin.conf)</translation> <translation>Angiv konfigurationsfil (standard: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2609,8 +2609,8 @@ Adresse: %4</translation>
<translation>Optionen:</translation> <translation>Optionen:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Konfigurationsdatei festlegen (Standard: bitcoin.conf)</translation> <translation>Konfigurationsdatei festlegen (Standard: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2176,8 +2176,8 @@ Address: %4
<translation>Επιλογές:</translation> <translation>Επιλογές:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Ορίστε αρχείο ρυθμίσεων (προεπιλογή: bitcoin.conf)</translation> <translation>Ορίστε αρχείο ρυθμίσεων (προεπιλογή: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -3341,8 +3341,8 @@ Address: %4
</message> </message>
<message> <message>
<location line="+32"/> <location line="+32"/>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Specify configuration file (default: bitcoin.conf)</translation> <translation>Specify configuration file (default: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>

View File

@ -2354,8 +2354,8 @@ Adreso: %4
<translation>Agordoj:</translation> <translation>Agordoj:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Specifi konfiguran dosieron (defaŭlte: bitcoin.conf)</translation> <translation>Specifi konfiguran dosieron (defaŭlte: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2616,13 +2616,13 @@ Dirección: %4
</translation> </translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Especificar archivo de configuración (predeterminado: bitcoin.conf) <translation>Especificar archivo de configuración (predeterminado: darkcoin.conf)
</translation> </translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Especificar archivo pid (predeterminado: bitcoin.pid) <translation>Especificar archivo pid (predeterminado: darkcoin.pid)
</translation> </translation>
</message> </message>
<message> <message>

View File

@ -1356,13 +1356,13 @@ Dirección: %4</translation>
</translation> </translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Especifica archivo de configuración (predeterminado: bitcoin.conf) <translation>Especifica archivo de configuración (predeterminado: darkcoin.conf)
</translation> </translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Especifica archivo pid (predeterminado: bitcoin.pid) <translation>Especifica archivo pid (predeterminado: darkcoin.pid)
</translation> </translation>
</message> </message>
<message> <message>

View File

@ -2432,13 +2432,13 @@ Dirección: %4
</translation> </translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Especificar archivo de configuración (predeterminado: bitcoin.conf) <translation>Especificar archivo de configuración (predeterminado: darkcoin.conf)
</translation> </translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Especificar archivo pid (predeterminado: bitcoin.pid) <translation>Especificar archivo pid (predeterminado: darkcoin.pid)
</translation> </translation>
</message> </message>
<message> <message>

View File

@ -1585,12 +1585,12 @@ Aadress: %4⏎</translation>
<translation>Valikud:</translation> <translation>Valikud:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Täpsusta sätete fail (vaikimisi: bitcoin.conf)</translation> <translation>Täpsusta sätete fail (vaikimisi: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Täpsusta PID fail (vaikimisi: bitcoin.pid)</translation> <translation>Täpsusta PID fail (vaikimisi: darkcoin.pid)</translation>
</message> </message>
<message> <message>
<source>Specify data directory</source> <source>Specify data directory</source>

View File

@ -724,8 +724,8 @@
<translation>Aukerak</translation> <translation>Aukerak</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Ezarpen fitxategia aukeratu (berezkoa: bitcoin.conf)</translation> <translation>Ezarpen fitxategia aukeratu (berezkoa: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -1721,12 +1721,12 @@ Address: %4
<translation>گزینهها:</translation> <translation>گزینهها:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>مشخص کردن فایل پیکربندی (پیش‌فرض: bitcoin.conf)</translation> <translation>مشخص کردن فایل پیکربندی (پیش‌فرض: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>
<translation>مشخص کردن فایل شناسهٔ پردازش - pid - (پیش‌فرض: bitcoin.pid)</translation> <translation>مشخص کردن فایل شناسهٔ پردازش - pid - (پیش‌فرض: darkcoin.pid)</translation>
</message> </message>
<message> <message>
<source>Specify data directory</source> <source>Specify data directory</source>

View File

@ -991,8 +991,8 @@ Address: %4
<translation>انتخابها:</translation> <translation>انتخابها:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>فایل پیکربندیِ را مشخص کنید (پیش فرض: bitcoin.conf)</translation> <translation>فایل پیکربندیِ را مشخص کنید (پیش فرض: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2610,12 +2610,12 @@ Osoite: %4</translation>
<translation>Asetukset:</translation> <translation>Asetukset:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Määritä asetustiedosto (oletus: bitcoin.conf)</translation> <translation>Määritä asetustiedosto (oletus: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Määritä pid-tiedosto (oletus: bitcoin.pid)</translation> <translation>Määritä pid-tiedosto (oletus: darkcoin.pid)</translation>
</message> </message>
<message> <message>
<source>Specify data directory</source> <source>Specify data directory</source>

View File

@ -2602,8 +2602,8 @@ Adresse : %4
<translation>Options :</translation> <translation>Options :</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Spécifier le fichier de configuration (par défaut : bitcoin.conf)</translation> <translation>Spécifier le fichier de configuration (par défaut : darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2194,8 +2194,8 @@ Dirección: %4
<translation>Opcións:</translation> <translation>Opcións:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Especificar arquivo de configuración (por defecto: bitcoin.conf)</translation> <translation>Especificar arquivo de configuración (por defecto: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2297,8 +2297,8 @@ Address: %4
<translation>אפשרויות:</translation> <translation>אפשרויות:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>ציין קובץ הגדרות (ברירת מחדל: bitcoin.conf)</translation> <translation>ציין קובץ הגדרות (ברירת מחדל: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -897,12 +897,12 @@ Address: %4
<translation>ि:</translation> <translation>ि:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>configuraion ि (default: bitcoin.conf)</translation> <translation>configuraion ि (default: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>
<translation>pid ि (default: bitcoin.pid)</translation> <translation>pid ि (default: darkcoin.pid)</translation>
</message> </message>
<message> <message>
<source>Specify data directory</source> <source>Specify data directory</source>

View File

@ -1336,12 +1336,12 @@ Adresa:%4
<translation>Postavke:</translation> <translation>Postavke:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Odredi konfiguracijsku datoteku (ugrađeni izbor: bitcoin.conf)</translation> <translation>Odredi konfiguracijsku datoteku (ugrađeni izbor: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Odredi proces ID datoteku (ugrađeni izbor: bitcoin.pid)</translation> <translation>Odredi proces ID datoteku (ugrađeni izbor: darkcoin.pid)</translation>
</message> </message>
<message> <message>
<source>Specify data directory</source> <source>Specify data directory</source>

View File

@ -2102,8 +2102,8 @@ Cím: %4
</translation> </translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Konfigurációs fájl (alapértelmezett: bitcoin.conf) <translation>Konfigurációs fájl (alapértelmezett: darkcoin.conf)
</translation> </translation>
</message> </message>
<message> <message>

View File

@ -2482,8 +2482,8 @@ Alamat: %4
<translation>Pilihan:</translation> <translation>Pilihan:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Tentukan berkas konfigurasi (standar: bitcoin.conf)</translation> <translation>Tentukan berkas konfigurasi (standar: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2608,8 +2608,8 @@ Più URL vengono separati da una barra verticale |.</translation>
<translation>Opzioni:</translation> <translation>Opzioni:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Specifica il file di configurazione (predefinito: bitcoin.conf)</translation> <translation>Specifica il file di configurazione (predefinito: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2151,8 +2151,8 @@ Address: %4
<translation>:</translation> <translation>:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation> (初期値: bitcoin.conf)</translation> <translation> (初期値: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2562,8 +2562,8 @@ Address: %4
<translation>:</translation> <translation>:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation> (ნაგულისხმევია: bitcoin.conf)</translation> <translation> (ნაგულისხმევია: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2486,8 +2486,8 @@ Address: %4
<translation>:</translation> <translation>:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation> (기본값: bitcoin.conf)</translation> <translation> (기본값: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -1605,12 +1605,12 @@ Inscriptio: %4
<translation>Optiones:</translation> <translation>Optiones:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Specifica configurationis plicam (praedefinitum: bitcoin.conf)</translation> <translation>Specifica configurationis plicam (praedefinitum: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Specifica pid plicam (praedefinitum: bitcoin.pid)</translation> <translation>Specifica pid plicam (praedefinitum: darkcoin.pid)</translation>
</message> </message>
<message> <message>
<source>Specify data directory</source> <source>Specify data directory</source>

View File

@ -1488,8 +1488,8 @@ Adresas: %4</translation>
<translation>Parinktys:</translation> <translation>Parinktys:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Nurodyti konfigūracijos failą (pagal nutylėjimąt: bitcoin.conf)</translation> <translation>Nurodyti konfigūracijos failą (pagal nutylėjimąt: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2342,8 +2342,8 @@ Adrese: %4
<translation>Iespējas:</translation> <translation>Iespējas:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Norādiet konfigurācijas failu (pēc noklusēšanas: bitcoin.conf)</translation> <translation>Norādiet konfigurācijas failu (pēc noklusēšanas: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2610,8 +2610,8 @@ Adresse: %4
<translation>Innstillinger:</translation> <translation>Innstillinger:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Angi konfigurasjonsfil (standardverdi: bitcoin.conf)</translation> <translation>Angi konfigurasjonsfil (standardverdi: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2610,8 +2610,8 @@ Adres: %4
<translation>Opties:</translation> <translation>Opties:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Specificeer configuratiebestand (standaard: bitcoin.conf) <translation>Specificeer configuratiebestand (standaard: darkcoin.conf)
</translation> </translation>
</message> </message>
<message> <message>

View File

@ -1476,8 +1476,8 @@ Address: %4
<translation>Pipamilian:</translation> <translation>Pipamilian:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Pilinan ing configuration file(default: bitcoin.conf)</translation> <translation>Pilinan ing configuration file(default: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2478,12 +2478,12 @@ Adres: %4
<translation>Opcje:</translation> <translation>Opcje:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Wskaż plik konfiguracyjny (domyślnie: bitcoin.conf)</translation> <translation>Wskaż plik konfiguracyjny (domyślnie: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Wskaż plik pid (domyślnie: bitcoin.pid)</translation> <translation>Wskaż plik pid (domyślnie: darkcoin.pid)</translation>
</message> </message>
<message> <message>
<source>Specify data directory</source> <source>Specify data directory</source>

View File

@ -2573,8 +2573,8 @@ Endereço: %4</translation>
<translation>Opções:</translation> <translation>Opções:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Especifique um arquivo de configurações (padrão: bitcoin.conf)</translation> <translation>Especifique um arquivo de configurações (padrão: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2581,8 +2581,8 @@ Endereço: %4</translation>
<translation>Opções:</translation> <translation>Opções:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Especificar ficheiro de configuração (por defeito: bitcoin.conf)</translation> <translation>Especificar ficheiro de configuração (por defeito: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2430,8 +2430,8 @@ Adresa: %4
<translation>Setări:</translation> <translation>Setări:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Specifică fișierul de configurare (implicit: bitcoin.conf)</translation> <translation>Specifică fișierul de configurare (implicit: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2607,12 +2607,12 @@ Address: %4
<translation>Опции:</translation> <translation>Опции:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Указать конфигурационный файл (по умолчанию: bitcoin.conf)</translation> <translation>Указать конфигурационный файл (по умолчанию: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Задать pid-файл (по умолчанию: bitcoin.pid)</translation> <translation>Задать pid-файл (по умолчанию: darkcoin.pid)</translation>
</message> </message>
<message> <message>
<source>Specify data directory</source> <source>Specify data directory</source>

View File

@ -2597,8 +2597,8 @@ Adresa: %4</translation>
<translation>Možnosti:</translation> <translation>Možnosti:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Určiť súbor s nastaveniami (predvolené: bitcoin.conf)</translation> <translation>Určiť súbor s nastaveniami (predvolené: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -1912,12 +1912,12 @@ Naslov: %4
<translation>Možnosti:</translation> <translation>Možnosti:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Določi datoteko z nastavitvami (privzeta: bitcoin.conf)</translation> <translation>Določi datoteko z nastavitvami (privzeta: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>
<translation>Določi pid datoteko (privzeta: bitcoin.pid)</translation> <translation>Določi pid datoteko (privzeta: darkcoin.pid)</translation>
</message> </message>
<message> <message>
<source>Specify data directory</source> <source>Specify data directory</source>

View File

@ -796,8 +796,8 @@ Address: %4
<translation>Opcije</translation> <translation>Opcije</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Potvrdi željeni konfiguracioni fajl (podrazumevani:bitcoin.conf)</translation> <translation>Potvrdi željeni konfiguracioni fajl (podrazumevani:darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2607,8 +2607,8 @@ Adress: %4
<translation>Inställningar:</translation> <translation>Inställningar:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Ange konfigurationsfil (förvalt: bitcoin.conf)</translation> <translation>Ange konfigurationsfil (förvalt: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2610,8 +2610,8 @@ Adres: %4
<translation>Seçenekler:</translation> <translation>Seçenekler:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Yapılandırma dosyası belirt (varsayılan: bitcoin.conf)</translation> <translation>Yapılandırma dosyası belirt (varsayılan: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -1922,8 +1922,8 @@ Address: %4
<translation>Параметри:</translation> <translation>Параметри:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Вкажіть файл конфігурації (типово: bitcoin.conf)</translation> <translation>Вкажіть файл конфігурації (типово: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -938,8 +938,8 @@ MIT/X11 дастурий таъминот лицензияси остида та
<translation>Танламалар:</translation> <translation>Танламалар:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>Мослаш файлини кўрсатинг (default: bitcoin.conf)</translation> <translation>Мослаш файлини кўрсатинг (default: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -2614,8 +2614,8 @@ Address: %4
</translation> </translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation> ( bitcoin.conf) <translation> ( darkcoin.conf)
</translation> </translation>
</message> </message>
<message> <message>

View File

@ -2612,8 +2612,8 @@ Address: %4
<translation>:</translation> <translation>:</translation>
</message> </message>
<message> <message>
<source>Specify configuration file (default: bitcoin.conf)</source> <source>Specify configuration file (default: darkcoin.conf)</source>
<translation>(預設值: bitcoin.conf)</translation> <translation>(預設值: darkcoin.conf)</translation>
</message> </message>
<message> <message>
<source>Specify pid file (default: bitcoind.pid)</source> <source>Specify pid file (default: bitcoind.pid)</source>

View File

@ -1,5 +1,6 @@
// Copyright (c) 2010 Satoshi Nakamoto // 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 // Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -253,7 +254,7 @@ std::string HelpMessageCli(bool mainProgram)
{ {
strUsage += _("Options:") + "\n"; strUsage += _("Options:") + "\n";
strUsage += " -? " + _("This help message") + "\n"; strUsage += " -? " + _("This help message") + "\n";
strUsage += " -conf=<file> " + _("Specify configuration file (default: bitcoin.conf)") + "\n"; strUsage += " -conf=<file> " + _("Specify configuration file (default: darkcoin.conf)") + "\n";
strUsage += " -datadir=<dir> " + _("Specify data directory") + "\n"; strUsage += " -datadir=<dir> " + _("Specify data directory") + "\n";
strUsage += " -testnet " + _("Use the test network") + "\n"; strUsage += " -testnet " + _("Use the test network") + "\n";
strUsage += " -regtest " + _("Enter regression test mode, which uses a special chain in which blocks can be " strUsage += " -regtest " + _("Enter regression test mode, which uses a special chain in which blocks can be "

View File

@ -1,5 +1,6 @@
// Copyright (c) 2010 Satoshi Nakamoto // 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 // Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // 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( throw runtime_error(
"getgenerate\n" "getgenerate\n"
"\nReturn if the server is set to generate coins or not. The default is false.\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" "It can also be set with the setgenerate call.\n"
"\nResult\n" "\nResult\n"
"true|false (boolean) If the server is set to generate coins or not\n" "true|false (boolean) If the server is set to generate coins or not\n"

View File

@ -1,5 +1,6 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-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 // Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // 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] = ""; char pszModule[MAX_PATH] = "";
GetModuleFileNameA(NULL, pszModule, sizeof(pszModule)); GetModuleFileNameA(NULL, pszModule, sizeof(pszModule));
#else #else
const char* pszModule = "bitcoin"; const char* pszModule = "darkcoin";
#endif #endif
if (pex) if (pex)
return strprintf( return strprintf(
@ -941,13 +942,13 @@ void PrintExceptionContinue(std::exception* pex, const char* pszThread)
boost::filesystem::path GetDefaultDataDir() boost::filesystem::path GetDefaultDataDir()
{ {
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
// Windows < Vista: C:\Documents and Settings\Username\Application Data\Bitcoin // Windows < Vista: C:\Documents and Settings\Username\Application Data\Darkcoin
// Windows >= Vista: C:\Users\Username\AppData\Roaming\Bitcoin // Windows >= Vista: C:\Users\Username\AppData\Roaming\Darkcoin
// Mac: ~/Library/Application Support/Bitcoin // Mac: ~/Library/Application Support/Darkcoin
// Unix: ~/.bitcoin // Unix: ~/.darkcoin
#ifdef WIN32 #ifdef WIN32
// Windows // Windows
return GetSpecialFolderPath(CSIDL_APPDATA) / "Bitcoin"; return GetSpecialFolderPath(CSIDL_APPDATA) / "Darkcoin";
#else #else
fs::path pathRet; fs::path pathRet;
char* pszHome = getenv("HOME"); char* pszHome = getenv("HOME");
@ -959,10 +960,10 @@ boost::filesystem::path GetDefaultDataDir()
// Mac // Mac
pathRet /= "Library/Application Support"; pathRet /= "Library/Application Support";
TryCreateDirectory(pathRet); TryCreateDirectory(pathRet);
return pathRet / "Bitcoin"; return pathRet / "Darkcoin";
#else #else
// Unix // Unix
return pathRet / ".bitcoin"; return pathRet / ".darkcoin";
#endif #endif
#endif #endif
} }
@ -1011,7 +1012,7 @@ void ClearDatadirCache()
boost::filesystem::path GetConfigFile() 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; if (!pathConfigFile.is_complete()) pathConfigFile = GetDataDir(false) / pathConfigFile;
return pathConfigFile; return pathConfigFile;
} }
@ -1021,14 +1022,14 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
{ {
boost::filesystem::ifstream streamConfig(GetConfigFile()); boost::filesystem::ifstream streamConfig(GetConfigFile());
if (!streamConfig.good()) if (!streamConfig.good())
return; // No bitcoin.conf file is OK return; // No darkcoin.conf file is OK
set<string> setOptions; set<string> setOptions;
setOptions.insert("*"); setOptions.insert("*");
for (boost::program_options::detail::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it) 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; string strKey = string("-") + it->string_key;
if (mapSettingsRet.count(strKey) == 0) if (mapSettingsRet.count(strKey) == 0)
{ {
@ -1044,7 +1045,7 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
boost::filesystem::path GetPidFile() 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; if (!pathPidFile.is_complete()) pathPidFile = GetDataDir() / pathPidFile;
return pathPidFile; return pathPidFile;
} }
@ -1277,7 +1278,7 @@ void AddTimeData(const CNetAddr& ip, int64_t nTime)
if (!fMatch) if (!fMatch)
{ {
fDone = true; 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; strMiscWarning = strMessage;
LogPrintf("*** %s\n", strMessage); LogPrintf("*** %s\n", strMessage);
uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_WARNING); uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_WARNING);

View File

@ -1,5 +1,6 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-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 // Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // 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<boost::function<void()> >, "nothing", f, milliseconds)); // threadGroup.create_thread(boost::bind(&LoopForever<boost::function<void()> >, "nothing", f, milliseconds));
template <typename Callable> void LoopForever(const char* name, Callable func, int64_t msecs) template <typename Callable> 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()); RenameThread(s.c_str());
LogPrintf("%s thread start\n", name); LogPrintf("%s thread start\n", name);
try try
@ -549,7 +550,7 @@ template <typename Callable> void LoopForever(const char* name, Callable func,
// .. and a wrapper that just calls func once // .. and a wrapper that just calls func once
template <typename Callable> void TraceThread(const char* name, Callable func) template <typename Callable> 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()); RenameThread(s.c_str());
try try
{ {