more bitcoin->dash

This commit is contained in:
UdjinM6 2016-03-04 10:25:16 +03:00
parent 3ad675aadb
commit b3d1140800
37 changed files with 166 additions and 854 deletions

View File

@ -26,9 +26,9 @@ information or see https://opensource.org/licenses/MIT.
Development Process Development Process
------------------- -------------------
The `master` branch is regularly built and tested, but is not guaranteed to be The `master` branch is meant to be stable. Development is normally done in separate branches.
completely stable. [Tags](https://github.com/bitcoin/bitcoin/tags) are created [Tags](https://github.com/bitcoin/bitcoin/tags) are created to indicate new official,
regularly to indicate new official, stable release versions of Bitcoin Core. stable release versions of Dash Core.
The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md). The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md).
@ -64,7 +64,7 @@ Translations
------------ ------------
Changes to translations as well as new translations can be submitted to Changes to translations as well as new translations can be submitted to
[Bitcoin Core's Transifex page](https://www.transifex.com/projects/p/dash/). [Dash Core's Transifex page](https://www.transifex.com/projects/p/dash/).
Translations are periodically pulled from Transifex and merged into the git repository. See the Translations are periodically pulled from Transifex and merged into the git repository. See the
[translation process](doc/translation_process.md) for details on how this works. [translation process](doc/translation_process.md) for details on how this works.

View File

@ -21,7 +21,7 @@ Construct a linear, no-fork, best version of the blockchain.
### [Qos](/contrib/qos) ### ### [Qos](/contrib/qos) ###
A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Bitcoin network. This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it. A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Bitcoin network. This means one can have an always-on dashd instance running, and another local dashd/dash-qt instance which connects to this node and receives blocks from it.
### [Seeds](/contrib/seeds) ### ### [Seeds](/contrib/seeds) ###
Utility to generate the pnSeed[] array that is compiled into the client. Utility to generate the pnSeed[] array that is compiled into the client.
@ -30,8 +30,8 @@ Build Tools and Keys
--------------------- ---------------------
### [Debian](/contrib/debian) ### ### [Debian](/contrib/debian) ###
Contains files used to package bitcoind/bitcoin-qt Contains files used to package dashd/dash-qt
for Debian-based Linux systems. If you compile bitcoind/bitcoin-qt yourself, there are some useful files here. for Debian-based Linux systems. If you compile dashd/dash-qt yourself, there are some useful files here.
### [Gitian-descriptors](/contrib/gitian-descriptors) ### ### [Gitian-descriptors](/contrib/gitian-descriptors) ###
Gavin's notes on getting gitian builds up and running using KVM. Gavin's notes on getting gitian builds up and running using KVM.

View File

@ -1,21 +0,0 @@
FORMS += \
../src/qt/forms/aboutdialog.ui \
../src/qt/forms/addressbookpage.ui \
../src/qt/forms/askpassphrasedialog.ui \
../src/qt/forms/coincontroldialog.ui \
../src/qt/forms/editaddressdialog.ui \
../src/qt/forms/helpmessagedialog.ui \
../src/qt/forms/intro.ui \
../src/qt/forms/openuridialog.ui \
../src/qt/forms/optionsdialog.ui \
../src/qt/forms/overviewpage.ui \
../src/qt/forms/receivecoinsdialog.ui \
../src/qt/forms/receiverequestdialog.ui \
../src/qt/forms/debugwindow.ui \
../src/qt/forms/sendcoinsdialog.ui \
../src/qt/forms/sendcoinsentry.ui \
../src/qt/forms/signverifymessagedialog.ui \
../src/qt/forms/transactiondescdialog.ui \
RESOURCES += \
../src/qt/bitcoin.qrc

View File

@ -1,660 +1,22 @@
###################################################################### FORMS += \
# Automatically generated by qmake (2.01a) ?? ??? 23 17:50:54 2015 ../src/qt/forms/aboutdialog.ui \
###################################################################### ../src/qt/forms/addressbookpage.ui \
../src/qt/forms/askpassphrasedialog.ui \
../src/qt/forms/coincontroldialog.ui \
../src/qt/forms/darksendconfig.ui \
../src/qt/forms/debugwindow.ui \
../src/qt/forms/editaddressdialog.ui \
../src/qt/forms/helpmessagedialog.ui \
../src/qt/forms/intro.ui \
../src/qt/forms/openuridialog.ui \
../src/qt/forms/optionsdialog.ui \
../src/qt/forms/overviewpage.ui \
../src/qt/forms/receivecoinsdialog.ui \
../src/qt/forms/receiverequestdialog.ui \
../src/qt/forms/sendcoinsdialog.ui \
../src/qt/forms/sendcoinsentry.ui \
../src/qt/forms/signverifymessagedialog.ui \
../src/qt/forms/transactiondescdialog.ui
DEFINES += ENABLE_WALLET RESOURCES += \
../src/qt/dash.qrc
TEMPLATE = app
TARGET =
DEPENDPATH += . \
src \
src/compat \
src/config \
src/crypto \
src/json \
src/obj \
src/primitives \
src/qt \
src/script \
src/test \
src/univalue \
src/leveldb/db \
src/leveldb/issues \
src/leveldb/port \
src/leveldb/table \
src/leveldb/util \
src/qt/forms \
src/qt/locale \
src/qt/test \
src/secp256k1/include \
src/secp256k1/src \
src/test/data \
src/leveldb/doc/bench \
src/leveldb/helpers/memenv \
src/leveldb/include/leveldb \
src/leveldb/port/win \
src/secp256k1/src/java
INCLUDEPATH += . \
src \
src/config \
src/leveldb/port/win \
src/crypto \
src/primitives \
src/script \
src/obj \
src/univalue \
src/json \
src/qt \
src/qt/forms \
src/compat \
src/secp256k1/include \
src/leveldb/helpers/memenv \
src/test/data \
src/test \
src/qt/test \
src/secp256k1/src \
src/secp256k1/src/java
# Input
HEADERS += src/activemasternode.h \
src/addrman.h \
src/alert.h \
src/allocators.h \
src/amount.h \
src/base58.h \
src/bloom.h \
src/chain.h \
src/chainparams.h \
src/chainparamsbase.h \
src/chainparamsseeds.h \
src/checkpoints.h \
src/checkqueue.h \
src/clientversion.h \
src/coincontrol.h \
src/coins.h \
src/compat.h \
src/compressor.h \
src/core_io.h \
src/crypter.h \
src/darksend-relay.h \
src/darksend.h \
src/dash-config.h \
src/db.h \
src/eccryptoverify.h \
src/ecwrapper.h \
src/hash.h \
src/init.h \
src/instantx.h \
src/keepass.h \
src/key.h \
src/keystore.h \
src/leveldbwrapper.h \
src/limitedmap.h \
src/main.h \
src/masternode-budget.h \
src/masternode-payments.h \
src/masternode-sync.h \
src/masternode.h \
src/masternodeconfig.h \
src/masternodeman.h \
src/merkleblock.h \
src/miner.h \
src/mruset.h \
src/net.h \
src/netbase.h \
src/noui.h \
src/pow.h \
src/protocol.h \
src/pubkey.h \
src/random.h \
src/rpcclient.h \
src/rpcprotocol.h \
src/rpcserver.h \
src/serialize.h \
src/spork.h \
src/streams.h \
src/sync.h \
src/threadsafety.h \
src/timedata.h \
src/tinyformat.h \
src/txdb.h \
src/txmempool.h \
src/ui_interface.h \
src/uint256.h \
src/undo.h \
src/util.h \
src/utilmoneystr.h \
src/utilstrencodings.h \
src/utiltime.h \
src/version.h \
src/wallet.h \
src/wallet_ismine.h \
src/walletdb.h \
src/compat/sanity.h \
src/config/dash-config.h \
src/crypto/common.h \
src/crypto/hmac_sha256.h \
src/crypto/hmac_sha512.h \
src/crypto/rfc6979_hmac_sha256.h \
src/crypto/ripemd160.h \
src/crypto/sha1.h \
src/crypto/sha256.h \
src/crypto/sha512.h \
src/crypto/sph_blake.h \
src/crypto/sph_bmw.h \
src/crypto/sph_cubehash.h \
src/crypto/sph_echo.h \
src/crypto/sph_groestl.h \
src/crypto/sph_jh.h \
src/crypto/sph_keccak.h \
src/crypto/sph_luffa.h \
src/crypto/sph_shavite.h \
src/crypto/sph_simd.h \
src/crypto/sph_skein.h \
src/crypto/sph_types.h \
src/json/json_spirit.h \
src/json/json_spirit_error_position.h \
src/json/json_spirit_reader.h \
src/json/json_spirit_reader_template.h \
src/json/json_spirit_stream_reader.h \
src/json/json_spirit_utils.h \
src/json/json_spirit_value.h \
src/json/json_spirit_writer.h \
src/json/json_spirit_writer_template.h \
src/obj/build.h \
src/primitives/block.h \
src/primitives/transaction.h \
src/qt/addressbookpage.h \
src/qt/addresstablemodel.h \
src/qt/askpassphrasedialog.h \
src/qt/bitcoinaddressvalidator.h \
src/qt/bitcoinamountfield.h \
src/qt/bitcoingui.h \
src/qt/bitcoinunits.h \
src/qt/clientmodel.h \
src/qt/coincontroldialog.h \
src/qt/coincontroltreewidget.h \
src/qt/csvmodelwriter.h \
src/qt/darksendconfig.h \
src/qt/editaddressdialog.h \
src/qt/guiconstants.h \
src/qt/guiutil.h \
src/qt/intro.h \
src/qt/macdockiconhandler.h \
src/qt/macnotificationhandler.h \
src/qt/networkstyle.h \
src/qt/notificator.h \
src/qt/openuridialog.h \
src/qt/optionsdialog.h \
src/qt/optionsmodel.h \
src/qt/overviewpage.h \
src/qt/paymentrequest.pb.h \
src/qt/paymentrequestplus.h \
src/qt/paymentserver.h \
src/qt/peertablemodel.h \
src/qt/qvalidatedlineedit.h \
src/qt/qvaluecombobox.h \
src/qt/receivecoinsdialog.h \
src/qt/receiverequestdialog.h \
src/qt/recentrequeststablemodel.h \
src/qt/rpcconsole.h \
src/qt/sendcoinsdialog.h \
src/qt/sendcoinsentry.h \
src/qt/signverifymessagedialog.h \
src/qt/splashscreen.h \
src/qt/trafficgraphwidget.h \
src/qt/transactiondesc.h \
src/qt/transactiondescdialog.h \
src/qt/transactionfilterproxy.h \
src/qt/transactionrecord.h \
src/qt/transactiontablemodel.h \
src/qt/transactionview.h \
src/qt/utilitydialog.h \
src/qt/walletframe.h \
src/qt/walletmodel.h \
src/qt/walletmodeltransaction.h \
src/qt/walletview.h \
src/qt/winshutdownmonitor.h \
src/script/bitcoinconsensus.h \
src/script/interpreter.h \
src/script/script.h \
src/script/script_error.h \
src/script/sigcache.h \
src/script/sign.h \
src/script/standard.h \
src/test/bignum.h \
src/univalue/univalue.h \
src/univalue/univalue_escapes.h \
src/leveldb/db/builder.h \
src/leveldb/db/db_impl.h \
src/leveldb/db/db_iter.h \
src/leveldb/db/dbformat.h \
src/leveldb/db/filename.h \
src/leveldb/db/log_format.h \
src/leveldb/db/log_reader.h \
src/leveldb/db/log_writer.h \
src/leveldb/db/memtable.h \
src/leveldb/db/skiplist.h \
src/leveldb/db/snapshot.h \
src/leveldb/db/table_cache.h \
src/leveldb/db/version_edit.h \
src/leveldb/db/version_set.h \
src/leveldb/db/write_batch_internal.h \
src/leveldb/port/atomic_pointer.h \
src/leveldb/port/port.h \
src/leveldb/port/port_example.h \
src/leveldb/port/port_posix.h \
src/leveldb/port/port_win.h \
src/leveldb/port/thread_annotations.h \
src/leveldb/table/block.h \
src/leveldb/table/block_builder.h \
src/leveldb/table/filter_block.h \
src/leveldb/table/format.h \
src/leveldb/table/iterator_wrapper.h \
src/leveldb/table/merger.h \
src/leveldb/table/two_level_iterator.h \
src/leveldb/util/arena.h \
src/leveldb/util/coding.h \
src/leveldb/util/crc32c.h \
src/leveldb/util/hash.h \
src/leveldb/util/histogram.h \
src/leveldb/util/logging.h \
src/leveldb/util/mutexlock.h \
src/leveldb/util/posix_logger.h \
src/leveldb/util/random.h \
src/leveldb/util/testharness.h \
src/leveldb/util/testutil.h \
src/qt/forms/ui_aboutdialog.h \
src/qt/test/paymentrequestdata.h \
src/qt/test/paymentservertests.h \
src/qt/test/uritests.h \
src/secp256k1/include/secp256k1.h \
src/secp256k1/src/ecdsa.h \
src/secp256k1/src/ecdsa_impl.h \
src/secp256k1/src/eckey.h \
src/secp256k1/src/eckey_impl.h \
src/secp256k1/src/ecmult.h \
src/secp256k1/src/ecmult_gen.h \
src/secp256k1/src/ecmult_gen_impl.h \
src/secp256k1/src/ecmult_impl.h \
src/secp256k1/src/field.h \
src/secp256k1/src/field_10x26.h \
src/secp256k1/src/field_10x26_impl.h \
src/secp256k1/src/field_5x52.h \
src/secp256k1/src/field_5x52_asm_impl.h \
src/secp256k1/src/field_5x52_impl.h \
src/secp256k1/src/field_5x52_int128_impl.h \
src/secp256k1/src/field_gmp.h \
src/secp256k1/src/field_gmp_impl.h \
src/secp256k1/src/field_impl.h \
src/secp256k1/src/group.h \
src/secp256k1/src/group_impl.h \
src/secp256k1/src/libsecp256k1-config.h \
src/secp256k1/src/num.h \
src/secp256k1/src/num_gmp.h \
src/secp256k1/src/num_gmp_impl.h \
src/secp256k1/src/num_impl.h \
src/secp256k1/src/scalar.h \
src/secp256k1/src/scalar_4x64.h \
src/secp256k1/src/scalar_4x64_impl.h \
src/secp256k1/src/scalar_8x32.h \
src/secp256k1/src/scalar_8x32_impl.h \
src/secp256k1/src/scalar_impl.h \
src/secp256k1/src/testrand.h \
src/secp256k1/src/testrand_impl.h \
src/secp256k1/src/util.h \
src/test/data/alertTests.raw.h \
src/test/data/base58_encode_decode.json.h \
src/test/data/base58_keys_invalid.json.h \
src/test/data/base58_keys_valid.json.h \
src/test/data/script_invalid.json.h \
src/test/data/script_valid.json.h \
src/test/data/sig_canonical.json.h \
src/test/data/sig_noncanonical.json.h \
src/test/data/sighash.json.h \
src/test/data/tx_invalid.json.h \
src/test/data/tx_valid.json.h \
src/leveldb/helpers/memenv/memenv.h \
src/leveldb/include/leveldb/c.h \
src/leveldb/include/leveldb/cache.h \
src/leveldb/include/leveldb/comparator.h \
src/leveldb/include/leveldb/db.h \
src/leveldb/include/leveldb/dumpfile.h \
src/leveldb/include/leveldb/env.h \
src/leveldb/include/leveldb/filter_policy.h \
src/leveldb/include/leveldb/iterator.h \
src/leveldb/include/leveldb/options.h \
src/leveldb/include/leveldb/slice.h \
src/leveldb/include/leveldb/status.h \
src/leveldb/include/leveldb/table.h \
src/leveldb/include/leveldb/table_builder.h \
src/leveldb/include/leveldb/write_batch.h \
src/leveldb/port/win/stdint.h \
src/secp256k1/src/java/org_bitcoin_NativeSecp256k1.h \
src/crypto/aes_helper.c \
src/qt/bitcoinamountfield.moc \
src/qt/dash.moc \
src/qt/intro.moc \
src/qt/overviewpage.moc \
src/qt/rpcconsole.moc \
src/secp256k1/src/secp256k1.c
FORMS += src/qt/forms/addressbookpage.ui \
src/qt/forms/askpassphrasedialog.ui \
src/qt/forms/coincontroldialog.ui \
src/qt/forms/darksendconfig.ui \
src/qt/forms/editaddressdialog.ui \
src/qt/forms/helpmessagedialog.ui \
src/qt/forms/intro.ui \
src/qt/forms/openuridialog.ui \
src/qt/forms/optionsdialog.ui \
src/qt/forms/overviewpage.ui \
src/qt/forms/receivecoinsdialog.ui \
src/qt/forms/receiverequestdialog.ui \
src/qt/forms/rpcconsole.ui \
src/qt/forms/sendcoinsdialog.ui \
src/qt/forms/sendcoinsentry.ui \
src/qt/forms/signverifymessagedialog.ui \
src/qt/forms/transactiondescdialog.ui
SOURCES += src/activemasternode.cpp \
src/addrman.cpp \
src/alert.cpp \
src/allocators.cpp \
src/amount.cpp \
src/base58.cpp \
src/bloom.cpp \
src/chain.cpp \
src/chainparams.cpp \
src/chainparamsbase.cpp \
src/checkpoints.cpp \
src/clientversion.cpp \
src/coins.cpp \
src/compressor.cpp \
src/core_read.cpp \
src/core_write.cpp \
src/crypter.cpp \
src/darksend-relay.cpp \
src/darksend.cpp \
src/dash-cli.cpp \
src/dash-tx.cpp \
src/dashd.cpp \
src/db.cpp \
src/eccryptoverify.cpp \
src/ecwrapper.cpp \
src/editaddressdialog.cpp \
src/hash.cpp \
src/init.cpp \
src/instantx.cpp \
src/keepass.cpp \
src/key.cpp \
src/keystore.cpp \
src/leveldbwrapper.cpp \
src/main.cpp \
src/masternode-budget.cpp \
src/masternode-payments.cpp \
src/masternode-sync.cpp \
src/masternode.cpp \
src/masternodeconfig.cpp \
src/masternodeman.cpp \
src/merkleblock.cpp \
src/miner.cpp \
src/net.cpp \
src/netbase.cpp \
src/noui.cpp \
src/pow.cpp \
src/protocol.cpp \
src/pubkey.cpp \
src/random.cpp \
src/rest.cpp \
src/rpcblockchain.cpp \
src/rpcclient.cpp \
src/rpcdump.cpp \
src/rpcmasternode-budget.cpp \
src/rpcmasternode.cpp \
src/rpcmining.cpp \
src/rpcmisc.cpp \
src/rpcnet.cpp \
src/rpcprotocol.cpp \
src/rpcrawtransaction.cpp \
src/rpcserver.cpp \
src/rpcwallet.cpp \
src/spork.cpp \
src/sync.cpp \
src/timedata.cpp \
src/txdb.cpp \
src/txmempool.cpp \
src/uint256.cpp \
src/util.cpp \
src/utilmoneystr.cpp \
src/utilstrencodings.cpp \
src/utiltime.cpp \
src/wallet.cpp \
src/wallet_ismine.cpp \
src/walletdb.cpp \
src/compat/glibc_compat.cpp \
src/compat/glibc_sanity.cpp \
src/compat/glibcxx_compat.cpp \
src/compat/glibcxx_sanity.cpp \
src/compat/strnlen.cpp \
src/crypto/aes_helper.c \
src/crypto/blake.c \
src/crypto/bmw.c \
src/crypto/cubehash.c \
src/crypto/echo.c \
src/crypto/groestl.c \
src/crypto/hmac_sha256.cpp \
src/crypto/hmac_sha512.cpp \
src/crypto/jh.c \
src/crypto/keccak.c \
src/crypto/luffa.c \
src/crypto/rfc6979_hmac_sha256.cpp \
src/crypto/ripemd160.cpp \
src/crypto/sha1.cpp \
src/crypto/sha256.cpp \
src/crypto/sha512.cpp \
src/crypto/shavite.c \
src/crypto/simd.c \
src/crypto/skein.c \
src/json/json_spirit_reader.cpp \
src/json/json_spirit_value.cpp \
src/json/json_spirit_writer.cpp \
src/primitives/block.cpp \
src/primitives/transaction.cpp \
src/qt/addressbookpage.cpp \
src/qt/addresstablemodel.cpp \
src/qt/askpassphrasedialog.cpp \
src/qt/bitcoinaddressvalidator.cpp \
src/qt/bitcoinamountfield.cpp \
src/qt/bitcoingui.cpp \
src/qt/bitcoinunits.cpp \
src/qt/clientmodel.cpp \
src/qt/coincontroldialog.cpp \
src/qt/coincontroltreewidget.cpp \
src/qt/csvmodelwriter.cpp \
src/qt/darksendconfig.cpp \
src/qt/dash.cpp \
src/qt/dashstrings.cpp \
src/qt/editaddressdialog.cpp \
src/qt/guiutil.cpp \
src/qt/intro.cpp \
src/qt/networkstyle.cpp \
src/qt/notificator.cpp \
src/qt/openuridialog.cpp \
src/qt/optionsdialog.cpp \
src/qt/optionsmodel.cpp \
src/qt/overviewpage.cpp \
src/qt/paymentrequest.pb.cc \
src/qt/paymentrequestplus.cpp \
src/qt/paymentserver.cpp \
src/qt/peertablemodel.cpp \
src/qt/qvalidatedlineedit.cpp \
src/qt/qvaluecombobox.cpp \
src/qt/receivecoinsdialog.cpp \
src/qt/receiverequestdialog.cpp \
src/qt/recentrequeststablemodel.cpp \
src/qt/rpcconsole.cpp \
src/qt/sendcoinsdialog.cpp \
src/qt/sendcoinsentry.cpp \
src/qt/signverifymessagedialog.cpp \
src/qt/splashscreen.cpp \
src/qt/trafficgraphwidget.cpp \
src/qt/transactiondesc.cpp \
src/qt/transactiondescdialog.cpp \
src/qt/transactionfilterproxy.cpp \
src/qt/transactionrecord.cpp \
src/qt/transactiontablemodel.cpp \
src/qt/transactionview.cpp \
src/qt/utilitydialog.cpp \
src/qt/walletframe.cpp \
src/qt/walletmodel.cpp \
src/qt/walletmodeltransaction.cpp \
src/qt/walletview.cpp \
src/qt/winshutdownmonitor.cpp \
src/script/bitcoinconsensus.cpp \
src/script/interpreter.cpp \
src/script/script.cpp \
src/script/script_error.cpp \
src/script/sigcache.cpp \
src/script/sign.cpp \
src/script/standard.cpp \
src/test/accounting_tests.cpp \
src/test/alert_tests.cpp \
src/test/allocator_tests.cpp \
src/test/base32_tests.cpp \
src/test/base58_tests.cpp \
src/test/base64_tests.cpp \
src/test/bip32_tests.cpp \
src/test/bloom_tests.cpp \
src/test/checkblock_tests.cpp \
src/test/Checkpoints_tests.cpp \
src/test/coins_tests.cpp \
src/test/compress_tests.cpp \
src/test/crypto_tests.cpp \
src/test/DoS_tests.cpp \
src/test/getarg_tests.cpp \
src/test/hash_tests.cpp \
src/test/key_tests.cpp \
src/test/main_tests.cpp \
src/test/mempool_tests.cpp \
src/test/miner_tests.cpp \
src/test/mruset_tests.cpp \
src/test/multisig_tests.cpp \
src/test/netbase_tests.cpp \
src/test/pmt_tests.cpp \
src/test/rpc_tests.cpp \
src/test/rpc_wallet_tests.cpp \
src/test/sanity_tests.cpp \
src/test/script_P2SH_tests.cpp \
src/test/script_tests.cpp \
src/test/scriptnum_tests.cpp \
src/test/serialize_tests.cpp \
src/test/sighash_tests.cpp \
src/test/sigopcount_tests.cpp \
src/test/skiplist_tests.cpp \
src/test/test_dash.cpp \
src/test/timedata_tests.cpp \
src/test/transaction_tests.cpp \
src/test/uint256_tests.cpp \
src/test/univalue_tests.cpp \
src/test/util_tests.cpp \
src/test/wallet_tests.cpp \
src/univalue/gen.cpp \
src/univalue/univalue.cpp \
src/univalue/univalue_read.cpp \
src/univalue/univalue_write.cpp \
src/leveldb/db/autocompact_test.cc \
src/leveldb/db/builder.cc \
src/leveldb/db/c.cc \
src/leveldb/db/c_test.c \
src/leveldb/db/corruption_test.cc \
src/leveldb/db/db_bench.cc \
src/leveldb/db/db_impl.cc \
src/leveldb/db/db_iter.cc \
src/leveldb/db/db_test.cc \
src/leveldb/db/dbformat.cc \
src/leveldb/db/dbformat_test.cc \
src/leveldb/db/dumpfile.cc \
src/leveldb/db/filename.cc \
src/leveldb/db/filename_test.cc \
src/leveldb/db/leveldb_main.cc \
src/leveldb/db/log_reader.cc \
src/leveldb/db/log_test.cc \
src/leveldb/db/log_writer.cc \
src/leveldb/db/memtable.cc \
src/leveldb/db/repair.cc \
src/leveldb/db/skiplist_test.cc \
src/leveldb/db/table_cache.cc \
src/leveldb/db/version_edit.cc \
src/leveldb/db/version_edit_test.cc \
src/leveldb/db/version_set.cc \
src/leveldb/db/version_set_test.cc \
src/leveldb/db/write_batch.cc \
src/leveldb/db/write_batch_test.cc \
src/leveldb/issues/issue178_test.cc \
src/leveldb/issues/issue200_test.cc \
src/leveldb/port/port_posix.cc \
src/leveldb/port/port_win.cc \
src/leveldb/table/block.cc \
src/leveldb/table/block_builder.cc \
src/leveldb/table/filter_block.cc \
src/leveldb/table/filter_block_test.cc \
src/leveldb/table/format.cc \
src/leveldb/table/iterator.cc \
src/leveldb/table/merger.cc \
src/leveldb/table/table.cc \
src/leveldb/table/table_builder.cc \
src/leveldb/table/table_test.cc \
src/leveldb/table/two_level_iterator.cc \
src/leveldb/util/arena.cc \
src/leveldb/util/arena_test.cc \
src/leveldb/util/bloom.cc \
src/leveldb/util/bloom_test.cc \
src/leveldb/util/cache.cc \
src/leveldb/util/cache_test.cc \
src/leveldb/util/coding.cc \
src/leveldb/util/coding_test.cc \
src/leveldb/util/comparator.cc \
src/leveldb/util/crc32c.cc \
src/leveldb/util/crc32c_test.cc \
src/leveldb/util/env.cc \
src/leveldb/util/env_posix.cc \
src/leveldb/util/env_test.cc \
src/leveldb/util/env_win.cc \
src/leveldb/util/filter_policy.cc \
src/leveldb/util/hash.cc \
src/leveldb/util/hash_test.cc \
src/leveldb/util/histogram.cc \
src/leveldb/util/logging.cc \
src/leveldb/util/options.cc \
src/leveldb/util/status.cc \
src/leveldb/util/testharness.cc \
src/leveldb/util/testutil.cc \
src/qt/test/paymentservertests.cpp \
src/qt/test/test_main.cpp \
src/qt/test/uritests.cpp \
src/secp256k1/src/bench_inv.c \
src/secp256k1/src/bench_sign.c \
src/secp256k1/src/bench_verify.c \
src/secp256k1/src/secp256k1.c \
src/secp256k1/src/tests.c \
src/leveldb/doc/bench/db_bench_sqlite3.cc \
src/leveldb/doc/bench/db_bench_tree_db.cc \
src/leveldb/helpers/memenv/memenv.cc \
src/leveldb/helpers/memenv/memenv_test.cc \
src/secp256k1/src/java/org_bitcoin_NativeSecp256k1.c
RESOURCES += src/qt/dash.qrc src/qt/dash_locale.qrc
TRANSLATIONS += src/qt/locale/dash_bg.ts \
src/qt/locale/dash_de.ts \
src/qt/locale/dash_en.ts \
src/qt/locale/dash_es.ts \
src/qt/locale/dash_fi.ts \
src/qt/locale/dash_fr.ts \
src/qt/locale/dash_it.ts \
src/qt/locale/dash_ja.ts \
src/qt/locale/dash_pl.ts \
src/qt/locale/dash_pt.ts \
src/qt/locale/dash_ru.ts \
src/qt/locale/dash_sk.ts \
src/qt/locale/dash_sv.ts \
src/qt/locale/dash_vi.ts \
src/qt/locale/dash_zh_CN.ts \
src/qt/locale/dash_zh_TW.ts

View File

@ -1 +0,0 @@
usr/local/bin/bitcoin-tx usr/bin

View File

@ -1,3 +0,0 @@
debian/manpages/bitcoind.1
debian/manpages/bitcoin.conf.5
debian/manpages/bitcoin-cli.1

View File

@ -63,5 +63,5 @@ Description: peer-to-peer digital currency - standalone transaction tool
is the name of the open source software which enables the use of this currency. is the name of the open source software which enables the use of this currency.
. .
This package provides dash-tx, a command-line transaction creation This package provides dash-tx, a command-line transaction creation
tool which can be used without a bitcoin daemon. Some means of tool which can be used without a dash daemon. Some means of
exchanging minimal transaction data with peers is still required. exchanging minimal transaction data with peers is still required.

View File

@ -0,0 +1 @@
usr/local/bin/dash-tx usr/bin

View File

@ -1,2 +1,3 @@
debian/manpages/dashd.1 debian/manpages/dashd.1
debian/manpages/dash.conf.5 debian/manpages/dash.conf.5
debian/manpages/dash-cli.1

View File

@ -1,21 +0,0 @@
.TH BITCOIN-CLI "1" "February 2016" "bitcoin-cli 0.12"
.SH NAME
bitcoin-cli \- a remote procedure call client for Bitcoin Core.
.SH SYNOPSIS
bitcoin-cli [options] <command> [params] \- Send command to Bitcoin Core.
.TP
bitcoin-cli [options] help \- Asks Bitcoin Core for a list of supported commands.
.SH DESCRIPTION
This manual page documents the bitcoin-cli program. bitcoin-cli is an RPC client used to send commands to Bitcoin Core.
.SH OPTIONS
.TP
\fB\-?\fR
Show possible options.
.SH "SEE ALSO"
\fBbitcoind\fP, \fBbitcoin.conf\fP
.SH AUTHOR
This manual page was written by Ciemon Dunville <ciemon@gmail.com>. Permission is granted to copy, distribute and/or modify this document under the terms of the MIT License.
The complete text of the MIT License can be found on the web at \fIhttp://opensource.org/licenses/MIT\fP.

View File

@ -0,0 +1,21 @@
.TH BITCOIN-CLI "1" "February 2016" "dash-cli 0.12"
.SH NAME
dash-cli \- a remote procedure call client for Dash Core.
.SH SYNOPSIS
dash-cli [options] <command> [params] \- Send command to Dash Core.
.TP
dash-cli [options] help \- Asks Dash Core for a list of supported commands.
.SH DESCRIPTION
This manual page documents the dash-cli program. dash-cli is an RPC client used to send commands to Dash Core.
.SH OPTIONS
.TP
\fB\-?\fR
Show possible options.
.SH "SEE ALSO"
\fBdash\fP, \fBdash.conf\fP
.SH AUTHOR
This manual page was written by Ciemon Dunville <ciemon@gmail.com>. Permission is granted to copy, distribute and/or modify this document under the terms of the MIT License.
The complete text of the MIT License can be found on the web at \fIhttp://opensource.org/licenses/MIT\fP.

View File

@ -1,33 +0,0 @@
# /etc/conf.d/bitcoind: config file for /etc/init.d/bitcoind
# Config file location
#BITCOIND_CONFIGFILE="/etc/bitcoin/bitcoin.conf"
# What directory to write pidfile to? (created and owned by $BITCOIND_USER)
#BITCOIND_PIDDIR="/var/run/bitcoind"
# What filename to give the pidfile
#BITCOIND_PIDFILE="${BITCOIND_PIDDIR}/bitcoind.pid"
# Where to write bitcoind data (be mindful that the blockchain is large)
#BITCOIND_DATADIR="/var/lib/bitcoind"
# User and group to own bitcoind process
#BITCOIND_USER="bitcoin"
#BITCOIND_GROUP="bitcoin"
# Path to bitcoind executable
#BITCOIND_BIN="/usr/bin/bitcoind"
# Nice value to run bitcoind under
#BITCOIND_NICE=0
# Additional options (avoid -conf and -datadir, use flags above)
BITCOIND_OPTS="-disablewallet"
# The timeout in seconds OpenRC will wait for bitcoind to terminate
# after a SIGTERM has been raised.
# Note that this will be mapped as argument to start-stop-daemon's
# '--retry' option, which means you can specify a retry schedule
# here. For more information see man 8 start-stop-daemon.
BITCOIND_SIGTERM_TIMEOUT=60

View File

@ -1,36 +1,36 @@
#!/bin/bash #!/bin/bash
# #
# bitcoind The bitcoin core server. # dashd The dash core server.
# #
# #
# chkconfig: 345 80 20 # chkconfig: 345 80 20
# description: bitcoind # description: dashd
# processname: bitcoind # processname: dashd
# #
# Source function library. # Source function library.
. /etc/init.d/functions . /etc/init.d/functions
# you can override defaults in /etc/sysconfig/bitcoind, see below # you can override defaults in /etc/sysconfig/dashd, see below
if [ -f /etc/sysconfig/bitcoind ]; then if [ -f /etc/sysconfig/dashd ]; then
. /etc/sysconfig/bitcoind . /etc/sysconfig/dashd
fi fi
RETVAL=0 RETVAL=0
prog=bitcoind prog=dashd
# you can override the lockfile via BITCOIND_LOCKFILE in /etc/sysconfig/bitcoind # you can override the lockfile via BITCOIND_LOCKFILE in /etc/sysconfig/dashd
lockfile=${BITCOIND_LOCKFILE-/var/lock/subsys/bitcoind} lockfile=${BITCOIND_LOCKFILE-/var/lock/subsys/dashd}
# bitcoind defaults to /usr/bin/bitcoind, override with BITCOIND_BIN # dashd defaults to /usr/bin/dashd, override with BITCOIND_BIN
bitcoind=${BITCOIND_BIN-/usr/bin/bitcoind} dashd=${BITCOIND_BIN-/usr/bin/dashd}
# bitcoind opts default to -disablewallet, override with BITCOIND_OPTS # dashd opts default to -disablewallet, override with BITCOIND_OPTS
bitcoind_opts=${BITCOIND_OPTS--disablewallet} dashd_opts=${BITCOIND_OPTS--disablewallet}
start() { start() {
echo -n $"Starting $prog: " echo -n $"Starting $prog: "
daemon $DAEMONOPTS $bitcoind $bitcoind_opts daemon $DAEMONOPTS $dashd $dashd_opts
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL -eq 0 ] && touch $lockfile [ $RETVAL -eq 0 ] && touch $lockfile

View File

@ -25,3 +25,9 @@
# Additional options (avoid -conf and -datadir, use flags above) # Additional options (avoid -conf and -datadir, use flags above)
BITCOIND_OPTS="-disablewallet" BITCOIND_OPTS="-disablewallet"
# The timeout in seconds OpenRC will wait for bitcoind to terminate
# after a SIGTERM has been raised.
# Note that this will be mapped as argument to start-stop-daemon's
# '--retry' option, which means you can specify a retry schedule
# here. For more information see man 8 start-stop-daemon.
BITCOIND_SIGTERM_TIMEOUT=60

View File

@ -3,10 +3,10 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>Label</key> <key>Label</key>
<string>org.bitcoin.bitcoind</string> <string>org.dash.dashd</string>
<key>ProgramArguments</key> <key>ProgramArguments</key>
<array> <array>
<string>/usr/local/bin/bitcoind</string> <string>/usr/local/bin/dashd</string>
<string>-daemon</string> <string>-daemon</string>
</array> </array>
<key>RunAtLoad</key> <key>RunAtLoad</key>

View File

@ -16,7 +16,7 @@ d1 = sys.argv[1]
d2 = sys.argv[2] d2 = sys.argv[2]
l1 = set([ re.search(r'qt_(.*).qm', f).group(1) for f in glob.glob(os.path.join(d1, 'qt_*.qm')) ]) l1 = set([ re.search(r'qt_(.*).qm', f).group(1) for f in glob.glob(os.path.join(d1, 'qt_*.qm')) ])
l2 = set([ re.search(r'bitcoin_(.*).qm', f).group(1) for f in glob.glob(os.path.join(d2, 'bitcoin_*.qm')) ]) l2 = set([ re.search(r'dash_(.*).qm', f).group(1) for f in glob.glob(os.path.join(d2, 'dash_*.qm')) ])
print ",".join(sorted(l1.intersection(l2))) print ",".join(sorted(l1.intersection(l2)))

View File

@ -117,8 +117,8 @@ def main():
exit(1) exit(1)
g = sys.stdout g = sys.stdout
indir = sys.argv[1] indir = sys.argv[1]
g.write('#ifndef BITCOIN_CHAINPARAMSSEEDS_H\n') g.write('#ifndef DASH_CHAINPARAMSSEEDS_H\n')
g.write('#define BITCOIN_CHAINPARAMSSEEDS_H\n') g.write('#define DASH_CHAINPARAMSSEEDS_H\n')
g.write('/**\n') g.write('/**\n')
g.write(' * List of fixed seed nodes for the dash network\n') g.write(' * List of fixed seed nodes for the dash network\n')
g.write(' * AUTOGENERATED by contrib/seeds/generate-seeds.py\n') g.write(' * AUTOGENERATED by contrib/seeds/generate-seeds.py\n')
@ -131,7 +131,7 @@ def main():
g.write('\n') g.write('\n')
with open(os.path.join(indir,'nodes_test.txt'),'r') as f: with open(os.path.join(indir,'nodes_test.txt'),'r') as f:
process_nodes(g, f, 'pnSeed6_test', 19999) process_nodes(g, f, 'pnSeed6_test', 19999)
g.write('#endif // BITCOIN_CHAINPARAMSSEEDS_H\n') g.write('#endif // DASH_CHAINPARAMSSEEDS_H\n')
if __name__ == '__main__': if __name__ == '__main__':
main() main()

View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
if ! [[ "$2" =~ ^(git@)?(www.)?github.com(:|/)bitcoin/bitcoin(.git)?$ ]]; then if ! [[ "$2" =~ ^(git@)?(www.)?github.com(:|/)dashpay/dash(.git)?$ ]]; then
exit 0 exit 0
fi fi

View File

@ -40,7 +40,7 @@ The following can be set when running make: make FOO=bar
DEBUG: disable some optimizations and enable more runtime checking DEBUG: disable some optimizations and enable more runtime checking
If some packages are not built, for example `make NO_WALLET=1`, the appropriate If some packages are not built, for example `make NO_WALLET=1`, the appropriate
options will be passed to bitcoin's configure. In this case, `--disable-wallet`. options will be passed to dash's configure. In this case, `--disable-wallet`.
Additional targets: Additional targets:

View File

@ -1 +1 @@
The list of assets used in the bitcoin source and their attribution can now be found in [contrib/debian/copyright](../contrib/debian/copyright). The list of assets used in the dash source and their attribution can now be found in [contrib/debian/copyright](../contrib/debian/copyright).

View File

@ -2,7 +2,7 @@ OpenBSD build guide
====================== ======================
(updated for OpenBSD 5.7) (updated for OpenBSD 5.7)
This guide describes how to build bitcoind and command-line utilities on OpenBSD. This guide describes how to build dashd and command-line utilities on OpenBSD.
As OpenBSD is most common as a server OS, we will not bother with the GUI. As OpenBSD is most common as a server OS, we will not bother with the GUI.
@ -19,7 +19,7 @@ pkg_add python # (select version 2.7.x, not 3.x)
ln -sf /usr/local/bin/python2.7 /usr/local/bin/python2 ln -sf /usr/local/bin/python2.7 /usr/local/bin/python2
``` ```
The default C++ compiler that comes with OpenBSD 5.7 is g++ 4.2. This version is old (from 2007), and is not able to compile the current version of Bitcoin Core. It is possible to patch it up to compile, but with the planned transition to C++11 this is a losing battle. So here we will be installing a newer compiler. The default C++ compiler that comes with OpenBSD 5.7 is g++ 4.2. This version is old (from 2007), and is not able to compile the current version of Dash Core. It is possible to patch it up to compile, but with the planned transition to C++11 this is a losing battle. So here we will be installing a newer compiler.
GCC GCC
------- -------
@ -36,14 +36,14 @@ This compiler will not overwrite the system compiler, it will be installed as `e
Do not use `pkg_add boost`! The boost version installed thus is compiled using the `g++` compiler not `eg++`, which will result in a conflict between `/usr/local/lib/libestdc++.so.XX.0` and `/usr/lib/libstdc++.so.XX.0`, resulting in a test crash: Do not use `pkg_add boost`! The boost version installed thus is compiled using the `g++` compiler not `eg++`, which will result in a conflict between `/usr/local/lib/libestdc++.so.XX.0` and `/usr/lib/libstdc++.so.XX.0`, resulting in a test crash:
test_bitcoin:/usr/lib/libstdc++.so.57.0: /usr/local/lib/libestdc++.so.17.0 : WARNING: symbol(_ZN11__gnu_debug17_S_debug_me ssagesE) size mismatch, relink your program test_dash:/usr/lib/libstdc++.so.57.0: /usr/local/lib/libestdc++.so.17.0 : WARNING: symbol(_ZN11__gnu_debug17_S_debug_me ssagesE) size mismatch, relink your program
... ...
Segmentation fault (core dumped) Segmentation fault (core dumped)
This makes it necessary to build boost, or at least the parts used by Bitcoin Core, manually: This makes it necessary to build boost, or at least the parts used by Dash Core, manually:
``` ```
# Pick some path to install boost to, here we create a directory within the bitcoin directory # Pick some path to install boost to, here we create a directory within the dash directory
BITCOIN_ROOT=$(pwd) BITCOIN_ROOT=$(pwd)
BOOST_PREFIX="${BITCOIN_ROOT}/boost" BOOST_PREFIX="${BITCOIN_ROOT}/boost"
mkdir -p $BOOST_PREFIX mkdir -p $BOOST_PREFIX
@ -62,7 +62,7 @@ patch -p0 < /usr/ports/devel/boost/patches/patch-boost_test_impl_execution_monit
sed 's/__OPEN_BSD__/__OpenBSD__/g' < libs/filesystem/src/path.cpp > libs/filesystem/src/path.cpp.tmp sed 's/__OPEN_BSD__/__OpenBSD__/g' < libs/filesystem/src/path.cpp > libs/filesystem/src/path.cpp.tmp
mv libs/filesystem/src/path.cpp.tmp libs/filesystem/src/path.cpp mv libs/filesystem/src/path.cpp.tmp libs/filesystem/src/path.cpp
# Build w/ minimum configuration necessary for bitcoin # Build w/ minimum configuration necessary for dash
echo 'using gcc : : eg++ : <cxxflags>"-fvisibility=hidden -fPIC" <linkflags>"" <archiver>"ar" <striper>"strip" <ranlib>"ranlib" <rc>"" : ;' > user-config.jam echo 'using gcc : : eg++ : <cxxflags>"-fvisibility=hidden -fPIC" <linkflags>"" <archiver>"ar" <striper>"strip" <ranlib>"ranlib" <rc>"" : ;' > user-config.jam
config_opts="runtime-link=shared threadapi=pthread threading=multi link=static variant=release --layout=tagged --build-type=complete --user-config=user-config.jam -sNO_BZIP2=1" config_opts="runtime-link=shared threadapi=pthread threading=multi link=static variant=release --layout=tagged --build-type=complete --user-config=user-config.jam -sNO_BZIP2=1"
./bootstrap.sh --without-icu --with-libraries=chrono,filesystem,program_options,system,thread,test ./bootstrap.sh --without-icu --with-libraries=chrono,filesystem,program_options,system,thread,test
@ -78,7 +78,7 @@ See "Berkeley DB" in [build_unix.md](build_unix.md) for instructions on how to b
You cannot use the BerkeleyDB library from ports, for the same reason as boost above (g++/libstd++ incompatibility). You cannot use the BerkeleyDB library from ports, for the same reason as boost above (g++/libstd++ incompatibility).
```bash ```bash
# Pick some path to install BDB to, here we create a directory within the bitcoin directory # Pick some path to install BDB to, here we create a directory within the dash directory
BITCOIN_ROOT=$(pwd) BITCOIN_ROOT=$(pwd)
BDB_PREFIX="${BITCOIN_ROOT}/db4" BDB_PREFIX="${BITCOIN_ROOT}/db4"
mkdir -p $BDB_PREFIX mkdir -p $BDB_PREFIX
@ -96,7 +96,7 @@ cd db-4.8.30.NC/build_unix/
make install make install
``` ```
### Building Bitcoin Core ### Building Dash Core
**Important**: use `gmake`, not `make`. The non-GNU `make` will exit with a horrible error. **Important**: use `gmake`, not `make`. The non-GNU `make` will exit with a horrible error.

View File

@ -44,7 +44,7 @@ NOTE: Building with Qt4 is still supported, however, could result in a broken UI
cd dash cd dash
2. Build dash-core: 2. Build dash-core:
This will configure and build the headless bitcoin binaries as well as the gui (if Qt is found). This will configure and build the headless dash binaries as well as the gui (if Qt is found).
You can disable the gui build by passing `--without-gui` to configure. You can disable the gui build by passing `--without-gui` to configure.
./autogen.sh ./autogen.sh

View File

@ -1,36 +1,36 @@
Sample init scripts and service configuration for bitcoind Sample init scripts and service configuration for dashd
========================================================== ==========================================================
Sample scripts and configuration files for systemd, Upstart and OpenRC Sample scripts and configuration files for systemd, Upstart and OpenRC
can be found in the contrib/init folder. can be found in the contrib/init folder.
contrib/init/bitcoind.service: systemd service unit configuration contrib/init/dashd.service: systemd service unit configuration
contrib/init/bitcoind.openrc: OpenRC compatible SysV style init script contrib/init/dashd.openrc: OpenRC compatible SysV style init script
contrib/init/bitcoind.openrcconf: OpenRC conf.d file contrib/init/dashd.openrcconf: OpenRC conf.d file
contrib/init/bitcoind.conf: Upstart service configuration file contrib/init/dashd.conf: Upstart service configuration file
contrib/init/bitcoind.init: CentOS compatible SysV style init script contrib/init/dashd.init: CentOS compatible SysV style init script
1. Service User 1. Service User
--------------------------------- ---------------------------------
All three Linux startup configurations assume the existence of a "bitcoin" user All three Linux startup configurations assume the existence of a "dash" user
and group. They must be created before attempting to use these scripts. and group. They must be created before attempting to use these scripts.
The OS X configuration assumes bitcoind will be set up for the current user. The OS X configuration assumes dashd will be set up for the current user.
2. Configuration 2. Configuration
--------------------------------- ---------------------------------
At a bare minimum, bitcoind requires that the rpcpassword setting be set At a bare minimum, dashd requires that the rpcpassword setting be set
when running as a daemon. If the configuration file does not exist or this when running as a daemon. If the configuration file does not exist or this
setting is not set, bitcoind will shutdown promptly after startup. setting is not set, dashd will shutdown promptly after startup.
This password does not have to be remembered or typed as it is mostly used This password does not have to be remembered or typed as it is mostly used
as a fixed token that bitcoind and client programs read from the configuration as a fixed token that dashd and client programs read from the configuration
file, however it is recommended that a strong and secure password be used file, however it is recommended that a strong and secure password be used
as this password is security critical to securing the wallet should the as this password is security critical to securing the wallet should the
wallet be enabled. wallet be enabled.
If bitcoind is run with the "-server" flag (set by default), and no rpcpassword is set, If dashd is run with the "-server" flag (set by default), and no rpcpassword is set,
it will use a special cookie file for authentication. The cookie is generated with random it will use a special cookie file for authentication. The cookie is generated with random
content when the daemon starts, and deleted when it exits. Read access to this file content when the daemon starts, and deleted when it exits. Read access to this file
controls who can access it through RPC. controls who can access it through RPC.
@ -38,13 +38,13 @@ controls who can access it through RPC.
By default the cookie is stored in the data directory, but it's location can be overridden By default the cookie is stored in the data directory, but it's location can be overridden
with the option '-rpccookiefile'. with the option '-rpccookiefile'.
This allows for running bitcoind without having to do any manual configuration. This allows for running dashd without having to do any manual configuration.
`conf`, `pid`, and `wallet` accept relative paths which are interpreted as `conf`, `pid`, and `wallet` accept relative paths which are interpreted as
relative to the data directory. `wallet` *only* supports relative paths. relative to the data directory. `wallet` *only* supports relative paths.
For an example configuration file that describes the configuration settings, For an example configuration file that describes the configuration settings,
see `contrib/debian/examples/bitcoin.conf`. see `contrib/debian/examples/dash.conf`.
3. Paths 3. Paths
--------------------------------- ---------------------------------
@ -53,24 +53,24 @@ see `contrib/debian/examples/bitcoin.conf`.
All three configurations assume several paths that might need to be adjusted. All three configurations assume several paths that might need to be adjusted.
Binary: `/usr/bin/bitcoind` Binary: `/usr/bin/dashd`
Configuration file: `/etc/bitcoin/bitcoin.conf` Configuration file: `/etc/dash/dash.conf`
Data directory: `/var/lib/bitcoind` Data directory: `/var/lib/dashd`
PID file: `/var/run/bitcoind/bitcoind.pid` (OpenRC and Upstart) or `/var/lib/bitcoind/bitcoind.pid` (systemd) PID file: `/var/run/dashd/dashd.pid` (OpenRC and Upstart) or `/var/lib/dashd/dashd.pid` (systemd)
Lock file: `/var/lock/subsys/bitcoind` (CentOS) Lock file: `/var/lock/subsys/dashd` (CentOS)
The configuration file, PID directory (if applicable) and data directory The configuration file, PID directory (if applicable) and data directory
should all be owned by the bitcoin user and group. It is advised for security should all be owned by the dash user and group. It is advised for security
reasons to make the configuration file and data directory only readable by the reasons to make the configuration file and data directory only readable by the
bitcoin user and group. Access to bitcoin-cli and other bitcoind rpc clients dash user and group. Access to dash-cli and other dashd rpc clients
can then be controlled by group membership. can then be controlled by group membership.
3b) Mac OS X 3b) Mac OS X
Binary: `/usr/local/bin/bitcoind` Binary: `/usr/local/bin/dashd`
Configuration file: `~/Library/Application Support/Bitcoin/bitcoin.conf` Configuration file: `~/Library/Application Support/Dash/dash.conf`
Data directory: `~/Library/Application Support/Bitcoin` Data directory: `~/Library/Application Support/Dash`
Lock file: `~/Library/Application Support/Bitcoin/.lock` Lock file: `~/Library/Application Support/Dash/.lock`
4. Installing Service Configuration 4. Installing Service Configuration
----------------------------------- -----------------------------------
@ -81,19 +81,19 @@ Installing this .service file consists of just copying it to
/usr/lib/systemd/system directory, followed by the command /usr/lib/systemd/system directory, followed by the command
`systemctl daemon-reload` in order to update running systemd configuration. `systemctl daemon-reload` in order to update running systemd configuration.
To test, run `systemctl start bitcoind` and to enable for system startup run To test, run `systemctl start dashd` and to enable for system startup run
`systemctl enable bitcoind` `systemctl enable dashd`
4b) OpenRC 4b) OpenRC
Rename bitcoind.openrc to bitcoind and drop it in /etc/init.d. Double Rename dashd.openrc to dashd and drop it in /etc/init.d. Double
check ownership and permissions and make it executable. Test it with check ownership and permissions and make it executable. Test it with
`/etc/init.d/bitcoind start` and configure it to run on startup with `/etc/init.d/dashd start` and configure it to run on startup with
`rc-update add bitcoind` `rc-update add dashd`
4c) Upstart (for Debian/Ubuntu based distributions) 4c) Upstart (for Debian/Ubuntu based distributions)
Drop bitcoind.conf in /etc/init. Test by running `service bitcoind start` Drop dashd.conf in /etc/init. Test by running `service dashd start`
it will automatically start on reboot. it will automatically start on reboot.
NOTE: This script is incompatible with CentOS 5 and Amazon Linux 2014 as they NOTE: This script is incompatible with CentOS 5 and Amazon Linux 2014 as they
@ -101,22 +101,22 @@ use old versions of Upstart and do not supply the start-stop-daemon utility.
4d) CentOS 4d) CentOS
Copy bitcoind.init to /etc/init.d/bitcoind. Test by running `service bitcoind start`. Copy dashd.init to /etc/init.d/dashd. Test by running `service dashd start`.
Using this script, you can adjust the path and flags to the bitcoind program by Using this script, you can adjust the path and flags to the dashd program by
setting the BITCOIND and FLAGS environment variables in the file setting the DASHD and FLAGS environment variables in the file
/etc/sysconfig/bitcoind. You can also use the DAEMONOPTS environment variable here. /etc/sysconfig/dashd. You can also use the DAEMONOPTS environment variable here.
4e) Mac OS X 4e) Mac OS X
Copy org.bitcoin.bitcoind.plist into ~/Library/LaunchAgents. Load the launch agent by Copy org.dash.dashd.plist into ~/Library/LaunchAgents. Load the launch agent by
running `launchctl load ~/Library/LaunchAgents/org.bitcoin.bitcoind.plist`. running `launchctl load ~/Library/LaunchAgents/org.dash.dashd.plist`.
This Launch Agent will cause bitcoind to start whenever the user logs in. This Launch Agent will cause dashd to start whenever the user logs in.
NOTE: This approach is intended for those wanting to run bitcoind as the current user. NOTE: This approach is intended for those wanting to run dashd as the current user.
You will need to modify org.bitcoin.bitcoind.plist if you intend to use it as a You will need to modify org.dash.dashd.plist if you intend to use it as a
Launch Daemon with a dedicated bitcoin user. Launch Daemon with a dedicated dash user.
5. Auto-respawn 5. Auto-respawn
----------------------------------- -----------------------------------

View File

@ -3,7 +3,7 @@ Reduce Traffic
Some node operators need to deal with bandwidth caps imposed by their ISPs. Some node operators need to deal with bandwidth caps imposed by their ISPs.
By default, bitcoin-core allows up to 125 connections to different peers, 8 of By default, dash-core allows up to 125 connections to different peers, 8 of
which are outbound. You can therefore, have at most 117 inbound connections. which are outbound. You can therefore, have at most 117 inbound connections.
The default settings can result in relatively significant traffic consumption. The default settings can result in relatively significant traffic consumption.
@ -34,5 +34,5 @@ blocks and transactions to fewer nodes.
## 3. Reduce maximum connections (`-maxconnections=<num>`) ## 3. Reduce maximum connections (`-maxconnections=<num>`)
Reducing the maximum connected nodes to a minimum could be desirable if traffic Reducing the maximum connected nodes to a minimum could be desirable if traffic
limits are tiny. Keep in mind that bitcoin's trustless model works best if you are limits are tiny. Keep in mind that dash's trustless model works best if you are
connected to a handful of nodes. connected to a handful of nodes.

View File

@ -5,8 +5,8 @@ connections, inter-process communication, and shared-memory,
providing various message-oriented semantics such as publish/subscribe, providing various message-oriented semantics such as publish/subscribe,
request/reply, and push/pull. request/reply, and push/pull.
The Bitcoin Core daemon can be configured to act as a trusted "border The Dash Core daemon can be configured to act as a trusted "border
router", implementing the bitcoin wire protocol and relay, making router", implementing the dash wire protocol and relay, making
consensus decisions, maintaining the local blockchain database, consensus decisions, maintaining the local blockchain database,
broadcasting locally generated transactions into the network, and broadcasting locally generated transactions into the network, and
providing a queryable RPC interface to interact on a polled basis for providing a queryable RPC interface to interact on a polled basis for
@ -33,7 +33,7 @@ buffering or reassembly.
## Prerequisites ## Prerequisites
The ZeroMQ feature in Bitcoin Core requires ZeroMQ API version 4.x or The ZeroMQ feature in Dash Core requires ZeroMQ API version 4.x or
newer. Typically, it is packaged by distributions as something like newer. Typically, it is packaged by distributions as something like
*libzmq3-dev*. The C++ wrapper for ZeroMQ is *not* needed. *libzmq3-dev*. The C++ wrapper for ZeroMQ is *not* needed.
@ -75,7 +75,7 @@ notification `-zmqpubhashtx` the topic is `hashtx` (no null
terminator) and the body is the hexadecimal transaction hash (32 terminator) and the body is the hexadecimal transaction hash (32
bytes). bytes).
These options can also be provided in bitcoin.conf. These options can also be provided in dash.conf.
ZeroMQ endpoint specifiers for TCP (and others) are documented in the ZeroMQ endpoint specifiers for TCP (and others) are documented in the
[ZeroMQ API](http://api.zeromq.org/4-0:_start). [ZeroMQ API](http://api.zeromq.org/4-0:_start).

View File

@ -1,7 +1,7 @@
The [pull-tester](/qa/pull-tester/) folder contains a script to call The [pull-tester](/qa/pull-tester/) folder contains a script to call
multiple tests from the [rpc-tests](/qa/rpc-tests/) folder. multiple tests from the [rpc-tests](/qa/rpc-tests/) folder.
Every pull request to the bitcoin repository is built and run through Every pull request to the dash repository is built and run through
the regression test suite. You can also run all or only individual the regression test suite. You can also run all or only individual
tests locally. tests locally.
@ -20,9 +20,9 @@ Possible options:
``` ```
-h, --help show this help message and exit -h, --help show this help message and exit
--nocleanup Leave bitcoinds and test.* datadir on exit or error --nocleanup Leave dashds and test.* datadir on exit or error
--noshutdown Don't stop bitcoinds after the test execution --noshutdown Don't stop dashds after the test execution
--srcdir=SRCDIR Source directory containing bitcoind/bitcoin-cli --srcdir=SRCDIR Source directory containing dashd/dash-cli
(default: ../../src) (default: ../../src)
--tmpdir=TMPDIR Root directory for datadirs --tmpdir=TMPDIR Root directory for datadirs
--tracerpc Print out all RPC calls as they are made --tracerpc Print out all RPC calls as they are made
@ -47,7 +47,7 @@ to recover with:
```bash ```bash
rm -rf cache rm -rf cache
killall bitcoind killall dashd
``` ```
Writing tests Writing tests

View File

@ -62,10 +62,10 @@ for arg in sys.argv[1:]:
#Set env vars #Set env vars
buildDir = BUILDDIR buildDir = BUILDDIR
if "BITCOIND" not in os.environ: if "DASHD" not in os.environ:
os.environ["BITCOIND"] = buildDir + '/src/bitcoind' + EXEEXT os.environ["DASHD"] = buildDir + '/src/dashd' + EXEEXT
if "BITCOINCLI" not in os.environ: if "DASHCLI" not in os.environ:
os.environ["BITCOINCLI"] = buildDir + '/src/bitcoin-cli' + EXEEXT os.environ["DASHCLI"] = buildDir + '/src/dash-cli' + EXEEXT
#Disable Windows tests by default #Disable Windows tests by default
if EXEEXT == ".exe" and "-win" not in opts: if EXEEXT == ".exe" and "-win" not in opts:

View File

@ -78,7 +78,7 @@ class TestManager(NodeConnCB):
class MaxBlocksInFlightTest(BitcoinTestFramework): class MaxBlocksInFlightTest(BitcoinTestFramework):
def add_options(self, parser): def add_options(self, parser):
parser.add_option("--testbinary", dest="testbinary", parser.add_option("--testbinary", dest="testbinary",
default=os.getenv("BITCOIND", "bitcoind"), default=os.getenv("DASHD", "dashd"),
help="Binary to test max block requests behavior") help="Binary to test max block requests behavior")
def setup_chain(self): def setup_chain(self):

View File

@ -88,7 +88,7 @@ class MaxUploadTest(BitcoinTestFramework):
def add_options(self, parser): def add_options(self, parser):
parser.add_option("--testbinary", dest="testbinary", parser.add_option("--testbinary", dest="testbinary",
default=os.getenv("BITCOIND", "bitcoind"), default=os.getenv("DASHD", "dashd"),
help="bitcoind binary to test") help="bitcoind binary to test")
def setup_chain(self): def setup_chain(self):

View File

@ -109,7 +109,7 @@ class TestNode(NodeConnCB):
class AcceptBlockTest(BitcoinTestFramework): class AcceptBlockTest(BitcoinTestFramework):
def add_options(self, parser): def add_options(self, parser):
parser.add_option("--testbinary", dest="testbinary", parser.add_option("--testbinary", dest="testbinary",
default=os.getenv("BITCOIND", "bitcoind"), default=os.getenv("DASHD", "dashd"),
help="bitcoind binary to test") help="bitcoind binary to test")
def setup_chain(self): def setup_chain(self):

View File

@ -99,11 +99,11 @@ class BitcoinTestFramework(object):
parser = optparse.OptionParser(usage="%prog [options]") parser = optparse.OptionParser(usage="%prog [options]")
parser.add_option("--nocleanup", dest="nocleanup", default=False, action="store_true", parser.add_option("--nocleanup", dest="nocleanup", default=False, action="store_true",
help="Leave bitcoinds and test.* datadir on exit or error") help="Leave dashds and test.* datadir on exit or error")
parser.add_option("--noshutdown", dest="noshutdown", default=False, action="store_true", parser.add_option("--noshutdown", dest="noshutdown", default=False, action="store_true",
help="Don't stop bitcoinds after the test execution") help="Don't stop dashds after the test execution")
parser.add_option("--srcdir", dest="srcdir", default="../../src", parser.add_option("--srcdir", dest="srcdir", default="../../src",
help="Source directory containing bitcoind/bitcoin-cli (default: %default)") help="Source directory containing dashd/dash-cli (default: %default)")
parser.add_option("--tmpdir", dest="tmpdir", default=tempfile.mkdtemp(prefix="test"), parser.add_option("--tmpdir", dest="tmpdir", default=tempfile.mkdtemp(prefix="test"),
help="Root directory for datadirs") help="Root directory for datadirs")
parser.add_option("--tracerpc", dest="trace_rpc", default=False, action="store_true", parser.add_option("--tracerpc", dest="trace_rpc", default=False, action="store_true",
@ -179,10 +179,10 @@ class ComparisonTestFramework(BitcoinTestFramework):
def add_options(self, parser): def add_options(self, parser):
parser.add_option("--testbinary", dest="testbinary", parser.add_option("--testbinary", dest="testbinary",
default=os.getenv("BITCOIND", "bitcoind"), default=os.getenv("DASHD", "dashd"),
help="bitcoind binary to test") help="bitcoind binary to test")
parser.add_option("--refbinary", dest="refbinary", parser.add_option("--refbinary", dest="refbinary",
default=os.getenv("BITCOIND", "bitcoind"), default=os.getenv("DASHD", "dashd"),
help="bitcoind binary to use for reference nodes (if any)") help="bitcoind binary to use for reference nodes (if any)")
def setup_chain(self): def setup_chain(self):

View File

@ -132,13 +132,13 @@ def initialize_chain(test_dir):
# Create cache directories, run dashds: # Create cache directories, run dashds:
for i in range(4): for i in range(4):
datadir=initialize_datadir("cache", i) datadir=initialize_datadir("cache", i)
args = [ os.getenv("BITCOIND", "dashd"), "-server", "-keypool=1", "-datadir="+datadir, "-discover=0" ] args = [ os.getenv("DASHD", "dashd"), "-server", "-keypool=1", "-datadir="+datadir, "-discover=0" ]
if i > 0: if i > 0:
args.append("-connect=127.0.0.1:"+str(p2p_port(0))) args.append("-connect=127.0.0.1:"+str(p2p_port(0)))
bitcoind_processes[i] = subprocess.Popen(args) bitcoind_processes[i] = subprocess.Popen(args)
if os.getenv("PYTHON_DEBUG", ""): if os.getenv("PYTHON_DEBUG", ""):
print "initialize_chain: dashd started, calling dash-cli -rpcwait getblockcount" print "initialize_chain: dashd started, calling dash-cli -rpcwait getblockcount"
subprocess.check_call([ os.getenv("BITCOINCLI", "dash-cli"), "-datadir="+datadir, subprocess.check_call([ os.getenv("DASHCLI", "dash-cli"), "-datadir="+datadir,
"-rpcwait", "getblockcount"], stdout=devnull) "-rpcwait", "getblockcount"], stdout=devnull)
if os.getenv("PYTHON_DEBUG", ""): if os.getenv("PYTHON_DEBUG", ""):
print "initialize_chain: bitcoin-cli -rpcwait getblockcount completed" print "initialize_chain: bitcoin-cli -rpcwait getblockcount completed"
@ -218,7 +218,7 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
""" """
datadir = os.path.join(dirname, "node"+str(i)) datadir = os.path.join(dirname, "node"+str(i))
if binary is None: if binary is None:
binary = os.getenv("BITCOIND", "dashd") binary = os.getenv("DASHD", "dashd")
# RPC tests still depend on free transactions # RPC tests still depend on free transactions
args = [ binary, "-datadir="+datadir, "-server", "-keypool=1", "-discover=0", "-rest", "-blockprioritysize=50000" ] args = [ binary, "-datadir="+datadir, "-server", "-keypool=1", "-discover=0", "-rest", "-blockprioritysize=50000" ]
if extra_args is not None: args.extend(extra_args) if extra_args is not None: args.extend(extra_args)
@ -226,7 +226,7 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
devnull = open(os.devnull, "w") devnull = open(os.devnull, "w")
if os.getenv("PYTHON_DEBUG", ""): if os.getenv("PYTHON_DEBUG", ""):
print "start_node: dashd started, calling dash-cli -rpcwait getblockcount" print "start_node: dashd started, calling dash-cli -rpcwait getblockcount"
subprocess.check_call([ os.getenv("BITCOINCLI", "dash-cli"), "-datadir="+datadir] + subprocess.check_call([ os.getenv("DASHCLI", "dash-cli"), "-datadir="+datadir] +
_rpchost_to_args(rpchost) + _rpchost_to_args(rpchost) +
["-rpcwait", "getblockcount"], stdout=devnull) ["-rpcwait", "getblockcount"], stdout=devnull)
if os.getenv("PYTHON_DEBUG", ""): if os.getenv("PYTHON_DEBUG", ""):

View File

@ -1 +1 @@
bench_bitcoin bench_dash

View File

@ -309,7 +309,7 @@ static void http_reject_request_cb(struct evhttp_request* req, void*)
/** Event dispatcher thread */ /** Event dispatcher thread */
static void ThreadHTTP(struct event_base* base, struct evhttp* http) static void ThreadHTTP(struct event_base* base, struct evhttp* http)
{ {
RenameThread("bitcoin-http"); RenameThread("dash-http");
LogPrint("http", "Entering http event loop\n"); LogPrint("http", "Entering http event loop\n");
event_base_dispatch(base); event_base_dispatch(base);
// Event loop will be interrupted by InterruptHTTPServer() // Event loop will be interrupted by InterruptHTTPServer()

View File

@ -1,6 +1,6 @@
# Notes # Notes
The sources in this directory are unit test cases. Boost includes a The sources in this directory are unit test cases. Boost includes a
unit testing framework, and since bitcoin already uses boost, it makes unit testing framework, and since dash already uses boost, it makes
sense to simply use this framework rather than require developers to sense to simply use this framework rather than require developers to
configure some other framework (we want as few impediments to creating configure some other framework (we want as few impediments to creating
unit tests as possible). unit tests as possible).

View File

@ -21,7 +21,7 @@ static void ResetArgs(const std::string& strArg)
boost::split(vecArg, strArg, boost::is_space(), boost::token_compress_on); boost::split(vecArg, strArg, boost::is_space(), boost::token_compress_on);
// Insert dummy executable name: // Insert dummy executable name:
vecArg.insert(vecArg.begin(), "testbitcoin"); vecArg.insert(vecArg.begin(), "testdash");
// Convert to char*: // Convert to char*:
std::vector<const char*> vecChar; std::vector<const char*> vecChar;

View File

@ -410,7 +410,7 @@ UniValue sendtoaddress(const UniValue& params, bool fHelp)
if (fHelp || params.size() < 2 || params.size() > 7) if (fHelp || params.size() < 2 || params.size() > 7)
throw runtime_error( throw runtime_error(
"sendtoaddress \"bitcoinaddress\" amount ( \"comment\" \"comment-to\" subtractfeefromamount use_ix use_ds )\n" "sendtoaddress \"dashaddress\" amount ( \"comment\" \"comment-to\" subtractfeefromamount use_ix use_ds )\n"
"\nSend an amount to a given address.\n" "\nSend an amount to a given address.\n"
+ HelpRequiringPassphrase() + + HelpRequiringPassphrase() +
"\nArguments:\n" "\nArguments:\n"
@ -2489,9 +2489,9 @@ UniValue listunspent(const UniValue& params, bool fHelp)
"\nArguments:\n" "\nArguments:\n"
"1. minconf (numeric, optional, default=1) The minimum confirmations to filter\n" "1. minconf (numeric, optional, default=1) The minimum confirmations to filter\n"
"2. maxconf (numeric, optional, default=9999999) The maximum confirmations to filter\n" "2. maxconf (numeric, optional, default=9999999) The maximum confirmations to filter\n"
"3. \"addresses\" (string) A json array of bitcoin addresses to filter\n" "3. \"addresses\" (string) A json array of dash addresses to filter\n"
" [\n" " [\n"
" \"address\" (string) bitcoin address\n" " \"address\" (string) dash address\n"
" ,...\n" " ,...\n"
" ]\n" " ]\n"
"\nResult\n" "\nResult\n"
@ -2499,7 +2499,7 @@ UniValue listunspent(const UniValue& params, bool fHelp)
" {\n" " {\n"
" \"txid\" : \"txid\", (string) the transaction id \n" " \"txid\" : \"txid\", (string) the transaction id \n"
" \"vout\" : n, (numeric) the vout value\n" " \"vout\" : n, (numeric) the vout value\n"
" \"address\" : \"address\", (string) the bitcoin address\n" " \"address\" : \"address\", (string) the dash address\n"
" \"account\" : \"account\", (string) DEPRECATED. The associated account, or \"\" for the default account\n" " \"account\" : \"account\", (string) DEPRECATED. The associated account, or \"\" for the default account\n"
" \"scriptPubKey\" : \"key\", (string) the script key\n" " \"scriptPubKey\" : \"key\", (string) the script key\n"
" \"amount\" : x.xxx, (numeric) the transaction amount in " + CURRENCY_UNIT + "\n" " \"amount\" : x.xxx, (numeric) the transaction amount in " + CURRENCY_UNIT + "\n"