diff --git a/.gitignore b/.gitignore index 7557ba9900161..1ad7b35d4d8b0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,12 +6,12 @@ reset-files.bash *.tar.gz *.exe -src/dash -src/dashd -src/dash-cli -src/dash-tx -src/test/test_dash -src/qt/test/test_dash-qt +src/darknet +src/darknetd +src/darknet-cli +src/darknet-tx +src/test/test_darknet +src/qt/test/test_darknet-qt # autoreconf Makefile.in @@ -34,8 +34,8 @@ config.log config.status configure libtool -src/config/dash-config.h -src/config/dash-config.h.in +src/config/darknet-config.h +src/config/darknet-config.h.in src/config/stamp-h1 share/setup.nsi share/qt/Info.plist @@ -60,7 +60,7 @@ src/qt/test/moc*.cpp *.o *.o-* *.patch -.dash +.darknet *.a *.pb.cc *.pb.h @@ -79,12 +79,12 @@ src/qt/test/moc*.cpp # Compilation and Qt preprocessor part *.qm Makefile -dash-qt -Dash-Qt.app +darknet-qt +DarkNet-Qt.app # Unit-tests Makefile.test -dash-qt_test +darknet-qt_test src/test/buildenv.py # Resources cpp @@ -100,7 +100,7 @@ build #lcov *.gcno /*.info -test_dash.coverage/ +test_darknet.coverage/ total.coverage/ coverage_percent.txt diff --git a/.travis.yml b/.travis.yml index 63004c4901298..fc51a921f2cc3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ os: linux language: cpp -compiler: gcc env: global: - MAKEJOBS=-j3 @@ -27,20 +26,18 @@ matrix: include: - compiler: ": ARM" env: HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat" - - compiler: ": dashd" + - compiler: ": darknetd" env: HOST=x86_64-unknown-linux-gnu PACKAGES="bc" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat CPPFLAGS=-DDEBUG_LOCKORDER" - compiler: ": No wallet" env: HOST=x86_64-unknown-linux-gnu DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat" - - compiler: ": 32-bit + dash" - env: HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat" USE_SHELL="/bin/dash" + - compiler: ": 32-bit + darknet" + env: HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat" USE_SHELL="/bin/darknet" - compiler: ": Cross-Mac" env: HOST=x86_64-apple-darwin11 PACKAGES="gcc-multilib g++-multilib cmake libcap-dev libz-dev libbz2-dev" OSX_SDK=10.7 GOAL="deploy" - compiler: ": Win64" env: HOST=x86_64-w64-mingw32 PACKAGES="nsis gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 mingw-w64-dev wine bc" RUN_TESTS=true GOAL="deploy" BITCOIN_CONFIG="--enable-gui" MAKEJOBS="-j2" - compiler: ": Win32" env: HOST=i686-w64-mingw32 PACKAGES="nsis gcc-mingw-w64-i686 g++-mingw-w64-i686 binutils-mingw-w64-i686 mingw-w64-dev wine bc" RUN_TESTS=true GOAL="deploy" BITCOIN_CONFIG="--enable-gui" MAKEJOBS="-j2" - exclude: - - compiler: gcc install: - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get update; fi - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES; fi @@ -58,8 +55,8 @@ script: - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then export CCACHE_READONLY=1; fi - test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh - ./configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false) - - make distdir PACKAGE=dash VERSION=$HOST - - cd dash-$HOST + - make distdir PACKAGE=darknet VERSION=$HOST + - cd darknet-$HOST - ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false) - make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false ) - export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib diff --git a/.tx/config b/.tx/config index c8b4b405cf700..8585b65f1b431 100644 --- a/.tx/config +++ b/.tx/config @@ -1,7 +1,7 @@ [main] host = https://www.transifex.com -[dash.qt-translation-010x] -file_filter = src/qt/locale/dash_.ts -source_file = src/qt/locale/dash_en.ts +[darknet.qt-translation-010x] +file_filter = src/qt/locale/darknet_.ts +source_file = src/qt/locale/darknet_en.ts source_lang = en diff --git a/COPYING b/COPYING index 5826391abf1ce..e2b78210c4ce4 100644 --- a/COPYING +++ b/COPYING @@ -1,5 +1,6 @@ Copyright (c) 2009-2015 Bitcoin Developers Copyright (c) 2014-2015 Dash Developers +Copyright (c) 2015-2016 DarkNet Developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/INSTALL b/INSTALL index dd9b8408af1fc..df239ef6da484 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -Building Dash +Building DarkNet Use the autogen script to prepare the build environment. @@ -6,11 +6,8 @@ Use the autogen script to prepare the build environment. ./configure make -Precompiled binaries are available at github, see -https://github.com/dashproject/dash-binaries - Always verify the signatures and checksums. -See doc/build-*.md for instructions on building dashd, +See doc/build-*.md for instructions on building darknetd, the intended-for-services, no-graphical-interface, reference -implementation of Dash. +implementation of DarkNet. diff --git a/Makefile.am b/Makefile.am index e5de3ac819387..716fe3efaaae5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,13 +4,13 @@ SUBDIRS = src GZIP_ENV="-9n" -BITCOIND_BIN=$(top_builddir)/src/dashd$(EXEEXT) -BITCOIN_QT_BIN=$(top_builddir)/src/qt/dash-qt$(EXEEXT) -BITCOIN_CLI_BIN=$(top_builddir)/src/dash-cli$(EXEEXT) +BITCOIND_BIN=$(top_builddir)/src/darknetd$(EXEEXT) +BITCOIN_QT_BIN=$(top_builddir)/src/qt/darknet-qt$(EXEEXT) +BITCOIN_CLI_BIN=$(top_builddir)/src/darknet-cli$(EXEEXT) BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT) -OSX_APP=Dash-Qt.app -OSX_DMG=Dash-Qt.dmg +OSX_APP=DarkNet-Qt.app +OSX_DMG=DarkNet-Qt.dmg OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns @@ -31,9 +31,9 @@ OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \ $(top_srcdir)/contrib/macdeploy/detached-sig-create.sh COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \ - leveldb_baseline.info test_dash_filtered.info total_coverage.info \ + leveldb_baseline.info test_darknet_filtered.info total_coverage.info \ baseline_filtered.info block_test_filtered.info \ - leveldb_baseline_filtered.info test_dash_coverage.info test_dash.info + leveldb_baseline_filtered.info test_darknet_coverage.info test_darknet.info dist-hook: -$(MAKE) -C $(top_distdir)/src/leveldb clean @@ -75,13 +75,13 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS) $(MKDIR_P) $(@D) $(INSTALL_DATA) $< $@ -$(OSX_APP)/Contents/MacOS/Dash-Qt: $(BITCOIN_QT_BIN) +$(OSX_APP)/Contents/MacOS/DarkNet-Qt: $(BITCOIN_QT_BIN) $(MKDIR_P) $(@D) STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@ OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \ $(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \ - $(OSX_APP)/Contents/MacOS/Dash-Qt + $(OSX_APP)/Contents/MacOS/DarkNet-Qt if BUILD_DARWIN $(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING) @@ -96,10 +96,10 @@ $(APP_DIST_DIR)/Applications: @rm -f $@ @cd $(@D); $(LN_S) /Applications $(@F) -$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Dash-Qt +$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/DarkNet-Qt $(OSX_DMG): $(APP_DIST_EXTRAS) - $(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "Dash-Qt" -no-pad -r -apple -o $@ dist + $(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "DarkNet-Qt" -no-pad -r -apple -o $@ dist $(APP_DIST_DIR)/.background/background.png: $(MKDIR_P) $(@D) @@ -107,7 +107,7 @@ $(APP_DIST_DIR)/.background/background.png: $(APP_DIST_DIR)/.DS_Store: $(INSTALL) $(top_srcdir)/contrib/macdeploy/DS_Store $@ -$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Dash-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) +$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/DarkNet-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2 deploydir: $(APP_DIST_EXTRAS) @@ -147,16 +147,16 @@ leveldb_baseline_filtered.info: leveldb_baseline.info baseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtered.info $(LCOV) -a leveldb_baseline_filtered.info -a baseline_filtered.info -o $@ -test_dash.info: baseline_filtered_combined.info +test_darknet.info: baseline_filtered_combined.info $(MAKE) -C src/ check - $(LCOV) -c -d $(abs_builddir)/src -t test_dash -o $@ + $(LCOV) -c -d $(abs_builddir)/src -t test_darknet -o $@ $(LCOV) -z -d $(abs_builddir)/src $(LCOV) -z -d $(abs_builddir)/src/leveldb -test_dash_filtered.info: test_dash.info +test_darknet_filtered.info: test_darknet.info $(LCOV) -r $< "/usr/include/*" -o $@ -block_test.info: test_dash_filtered.info +block_test.info: test_darknet_filtered.info $(MKDIR_P) qa/tmp -@TIMEOUT=15 qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool 0 $(LCOV) -c -d $(abs_builddir)/src --t BitcoinJBlockTest -o $@ @@ -166,13 +166,13 @@ block_test.info: test_dash_filtered.info block_test_filtered.info: block_test.info $(LCOV) -r $< "/usr/include/*" -o $@ -test_dash_coverage.info: baseline_filtered_combined.info test_dash_filtered.info - $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_dash_filtered.info -o $@ +test_darknet_coverage.info: baseline_filtered_combined.info test_darknet_filtered.info + $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_darknet_filtered.info -o $@ -total_coverage.info: baseline_filtered_combined.info test_dash_filtered.info block_test_filtered.info - $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_dash_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt +total_coverage.info: baseline_filtered_combined.info test_darknet_filtered.info block_test_filtered.info + $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_darknet_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt -test_dash.coverage/.dirstamp: test_dash_coverage.info +test_darknet.coverage/.dirstamp: test_darknet_coverage.info $(GENHTML) -s $< -o $(@D) @touch $@ @@ -180,7 +180,7 @@ total.coverage/.dirstamp: total_coverage.info $(GENHTML) -s $< -o $(@D) @touch $@ -cov: test_dash.coverage/.dirstamp total.coverage/.dirstamp +cov: test_darknet.coverage/.dirstamp total.coverage/.dirstamp endif @@ -197,4 +197,4 @@ CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER) .INTERMEDIATE: $(COVERAGE_INFO) clean-local: - rm -rf test_dash.coverage/ total.coverage/ $(OSX_APP) + rm -rf test_darknet.coverage/ total.coverage/ $(OSX_APP) diff --git a/README.md b/README.md index 3178aa4849da3..82db65a493722 100644 --- a/README.md +++ b/README.md @@ -1,124 +1,31 @@ -Dash Core staging tree 0.12 -=============================== - -https://www.dashpay.io - -Copyright (c) 2009-2015 Bitcoin Core Developers - -Copyright (c) 2014-2015 Dash Core Developers - - -What is Dash? ----------------- - -Dash is an experimental new digital currency that enables anonymous, instant -payments to anyone, anywhere in the world. Dash uses peer-to-peer technology -to operate with no central authority: managing transactions and issuing money -are carried out collectively by the network. Dash Core is the name of open -source software which enables the use of this currency. - -For more information, as well as an immediately useable, binary version of -the Dash Core software, see https://www.dashpay.io/downloads. - - -License -------- - -Dash Core is released under the terms of the MIT license. See [COPYING](COPYING) for more -information or see http://opensource.org/licenses/MIT. - -Development process -------------------- - -Developers work in their own trees, then submit pull requests when they think -their feature or bug fix is ready. - -If it is a simple/trivial/non-controversial change, then one of the Dash -development team members simply pulls it. - -If it is a *more complicated or potentially controversial* change, then the patch -submitter will be asked to start a discussion (if they haven't already) on the -[mailing list](https://lists.linuxfoundation.org/mailman/listinfo/bitcoin-dev) - -The patch will be accepted if there is broad consensus that it is a good thing. -Developers should expect to rework and resubmit patches if the code doesn't -match the project's coding conventions (see [doc/coding.md](doc/coding.md)) or are -controversial. - -The `master` branch is regularly built and tested, but is not guaranteed to be -completely stable. [Tags](https://github.com/dashpay/dash/tags) are created -regularly to indicate new official, stable release versions of Dash. ***TODO*** - -Testing -------- - -Testing and code review is the bottleneck for development; we get more pull -requests than we can review and test on short notice. Please be patient and help out by testing -other people's pull requests, and remember this is a security-critical project where any mistake might cost people -lots of money. - -### Automated Testing - -Developers are strongly encouraged to write unit tests for new code, and to -submit new unit tests for old code. Unit tests can be compiled and run (assuming they weren't disabled in configure) with: `make check` - -Every pull request is built for both Windows and Linux on a dedicated server, -and unit and sanity tests are automatically run. The binaries produced may be -used for manual QA testing — a link to them will appear in a comment on the -pull request posted by [DashPullTester](https://github.com/dashpay/PullTester). See https://github.com/TheBlueMatt/test-scripts -for the build/test scripts. ***TODO*** - -### Manual Quality Assurance (QA) Testing - -Large changes should have a test plan, and should be tested by somebody other -than the developer who wrote the code. -See https://github.com/dashpay/QA/ for how to create a test plan. ***TODO*** - -Translations ------------- - -Changes to translations as well as new translations can be submitted to -[Bitcoin 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 -[translation process](doc/translation_process.md) for details on how this works. - -**Important**: We do not accept translation changes as GitHub pull requests because the next -pull from Transifex would automatically overwrite them again. - -Translators should also subscribe to the [mailing list](https://groups.google.com/forum/#!forum/dash-translators). ***TODO*** - -Development tips and tricks ---------------------------- - -**compiling for debugging** - -Run configure with the --enable-debug option, then make. Or run configure with -CXXFLAGS="-g -ggdb -O0" or whatever debug flags you need. - -**debug.log** - -If the code is behaving strangely, take a look in the debug.log file in the data directory; -error and debugging messages are written there. - -The -debug=... command-line option controls debugging; running with just -debug will turn -on all categories (and give you a very large debug.log file). - -The Qt code routes qDebug() output to debug.log under category "qt": run with -debug=qt -to see it. - -**testnet and regtest modes** - -Run with the -testnet option to run with "play dash" on the test network, if you -are testing multi-machine code that needs to operate across the internet. - -If you are testing something that can run on one machine, run with the -regtest option. -In regression test mode, blocks can be created on-demand; see qa/rpc-tests/ for tests -that run in -regtest mode. - -**DEBUG_LOCKORDER** - -Dash Core is a multithreaded application, and deadlocks or other multithreading bugs -can be very difficult to track down. Compiling with -DDEBUG_LOCKORDER (configure -CXXFLAGS="-DDEBUG_LOCKORDER -g") inserts run-time checks to keep track of which locks -are held, and adds warnings to the debug.log file if inconsistencies are detected. +DarkNet Repository (Version 1.0.0.0) +More information at darknet-crypto.com +Visit our ANN thread at bitcointalk.org/index.php?topic=1262920 + +Coin specs: + +Algo: Quark +PoW Block Reward: 250 DNET +Block Time: 60 Second with Retargeting at every Block + +PoW Phase: +First block will include 60k Premine for the Creation of 6 Masternodes for the Functioning of the Network (60k DNET will be Burned at approx. Block 259201) +Blocks 2-259200 Approx. 180 DAYS + +PoW Rewards Breakdown: +Blocks 2-43200 20% MNODE (50 DNET) / 80% MINER (200 DNET) +Blocks 43201-259201 Min of 20% MNODE (50 DNET) / 70% MINER (200 DNET) / Max 10% PROPOSALS +Rewards for blocks after the switch to PoS will be split in proportions to be determined at a later date. + +PoS Staking Rewards: +PoS Phase 1: PoS Blocks 259201-0518400 (Approx. 180 DAYS) 100% annual stake rate +PoS Phase 2: PoS Blocks 0518401-1036800 (Approx. 360 DAYS) 50% stake rate +PoS Phase 3: PoS Blocks 1036801-1555200 (Approx. 360 DAYS) 25% annual stake rate +PoS Phase 4: PoS Blocks 1555201-2073600 (Approx. 360 DAYS) 10% annual stake rate +PoS Phase 5: PoS Blocks 2073601-2592000 (Approx. 360 DAYS) 5% annual stake rate + +DarkNet is a cutting edge crytpocurrency, with many features not available in most other cryptocurrencies. +Anonymized transactions using coin mixing technology, we call it Obfuscate +Fast transactions featuring guaranteed zero confirmation transactions, we call it SwiftTX +Decentralized blockchain voting providing for consensus based advancement of the currency +Masternode technology used to secure the network and provide the above features, each masternode is secured with collateral of 10kDNET \ No newline at end of file diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index d709c78533d30..1312b7dde58c3 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -3,7 +3,7 @@ dnl Output: If qt version is auto, set bitcoin_enable_qt to false. Else, exit. AC_DEFUN([BITCOIN_QT_FAIL],[ if test "x$bitcoin_qt_want_version" = "xauto" && test x$bitcoin_qt_force != xyes; then if test x$bitcoin_enable_qt != xno; then - AC_MSG_WARN([$1; dash-qt frontend will not be built]) + AC_MSG_WARN([$1; darknet-qt frontend will not be built]) fi bitcoin_enable_qt=no else @@ -49,7 +49,7 @@ AC_DEFUN([BITCOIN_QT_INIT],[ dnl enable qt support AC_ARG_WITH([gui], [AS_HELP_STRING([--with-gui@<:@=no|qt4|qt5|auto@:>@], - [build dash-qt GUI (default=auto, qt4 tried first)])], + [build darknet-qt GUI (default=auto, qt4 tried first)])], [ bitcoin_qt_want_version=$withval if test x$bitcoin_qt_want_version = xyes; then diff --git a/configure.ac b/configure.ac index 1a98aaf6d6af8..6207a0a9a6231 100644 --- a/configure.ac +++ b/configure.ac @@ -1,22 +1,22 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) -define(_CLIENT_VERSION_MAJOR, 0) -define(_CLIENT_VERSION_MINOR, 12) +define(_CLIENT_VERSION_MAJOR, 1) +define(_CLIENT_VERSION_MINOR, 0) define(_CLIENT_VERSION_REVISION, 0) -define(_CLIENT_VERSION_BUILD, 56) +define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2015) -AC_INIT([Dash Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@dashpay.io],[dash]) +AC_INIT([Dash Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.darknet-crypto.com],[darknet]) AC_CONFIG_SRCDIR([src/main.cpp]) -AC_CONFIG_HEADERS([src/config/dash-config.h]) +AC_CONFIG_HEADERS([src/config/darknet-config.h]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([build-aux/m4]) AC_CANONICAL_HOST -AH_TOP([#ifndef DASH_CONFIG_H]) -AH_TOP([#define DASH_CONFIG_H]) -AH_BOTTOM([#endif //DASH_CONFIG_H]) +AH_TOP([#ifndef DNET_CONFIG_H]) +AH_TOP([#define DNET_CONFIG_H]) +AH_BOTTOM([#endif //DNET_CONFIG_H]) dnl faketime breaks configure and is only needed for make. Disable it here. unset FAKETIME @@ -173,7 +173,7 @@ CPPFLAGS="$CPPFLAGS -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_ AC_ARG_WITH([utils], [AS_HELP_STRING([--with-utils], - [build dash-cli dash-tx (default=yes)])], + [build darknet-cli darknet-tx (default=yes)])], [build_bitcoin_utils=$withval], [build_bitcoin_utils=yes]) @@ -185,7 +185,7 @@ AC_ARG_WITH([libs], AC_ARG_WITH([daemon], [AS_HELP_STRING([--with-daemon], - [build dashd daemon (default=yes)])], + [build darknetd daemon (default=yes)])], [build_bitcoind=$withval], [build_bitcoind=yes]) @@ -363,7 +363,7 @@ AC_C_BIGENDIAN([AC_MSG_ERROR("Big Endian not supported")]) dnl Check for pthread compile/link requirements AX_PTHREAD -# The following macro will add the necessary defines to dash-config.h, but +# The following macro will add the necessary defines to darknet-config.h, but # they also need to be passed down to any subprojects. Pull the results out of # the cache and add them to CPPFLAGS. AC_SYS_LARGEFILE @@ -719,11 +719,11 @@ LIBS="$LIBS_TEMP" BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path) -AC_MSG_CHECKING([whether to build dashd]) +AC_MSG_CHECKING([whether to build darknetd]) AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) AC_MSG_RESULT($build_bitcoind) -AC_MSG_CHECKING([whether to build utils (dash-cli dash-tx)]) +AC_MSG_CHECKING([whether to build utils (darknet-cli darknet-tx)]) AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes]) AC_MSG_RESULT($build_bitcoin_utils) @@ -823,7 +823,7 @@ if test x$bitcoin_enable_qt != xno; then AC_MSG_WARN("xgettext is required to update qt translations") fi - AC_MSG_CHECKING([whether to build test_dash-qt]) + AC_MSG_CHECKING([whether to build test_darknet-qt]) if test x$use_tests$bitcoin_enable_qt_test = xyesyes; then AC_MSG_RESULT([yes]) BUILD_TEST_QT="test" @@ -832,7 +832,7 @@ if test x$bitcoin_enable_qt != xno; then fi fi -AC_MSG_CHECKING([whether to build test_dash]) +AC_MSG_CHECKING([whether to build test_darknet]) if test x$use_tests = xyes; then AC_MSG_RESULT([yes]) BUILD_TEST="test" diff --git a/contrib/bitrpc/bitrpc.py b/contrib/bitrpc/bitrpc.py index 38c0f69e4da77..8515b0c2cc915 100644 --- a/contrib/bitrpc/bitrpc.py +++ b/contrib/bitrpc/bitrpc.py @@ -11,9 +11,9 @@ if rpcpass == "": - access = ServiceProxy("http://127.0.0.1:9998") + access = ServiceProxy("http://127.0.0.1:51473") else: - access = ServiceProxy("http://"+rpcuser+":"+rpcpass+"@127.0.0.1:9998") + access = ServiceProxy("http://"+rpcuser+":"+rpcpass+"@127.0.0.1:51473") cmd = sys.argv[1].lower() if cmd == "backupwallet": diff --git a/contrib/dash-qt.pro b/contrib/darknet-qt.pro similarity index 94% rename from contrib/dash-qt.pro rename to contrib/darknet-qt.pro index bcd5225980a0a..51ce43bc9b375 100644 --- a/contrib/dash-qt.pro +++ b/contrib/darknet-qt.pro @@ -76,15 +76,15 @@ HEADERS += src/activemasternode.h \ src/compressor.h \ src/core_io.h \ src/crypter.h \ - src/darksend-relay.h \ - src/darksend.h \ - src/dash-config.h \ + src/obfuscate-relay.h \ + src/obfuscate.h \ + src/darknet-config.h \ src/db.h \ src/eccryptoverify.h \ src/ecwrapper.h \ src/hash.h \ src/init.h \ - src/instantx.h \ + src/swifttx.h \ src/keepass.h \ src/key.h \ src/keystore.h \ @@ -131,7 +131,7 @@ HEADERS += src/activemasternode.h \ src/wallet_ismine.h \ src/walletdb.h \ src/compat/sanity.h \ - src/config/dash-config.h \ + src/config/darknet-config.h \ src/crypto/common.h \ src/crypto/hmac_sha256.h \ src/crypto/hmac_sha512.h \ @@ -175,7 +175,7 @@ HEADERS += src/activemasternode.h \ src/qt/coincontroldialog.h \ src/qt/coincontroltreewidget.h \ src/qt/csvmodelwriter.h \ - src/qt/darksendconfig.h \ + src/qt/obfuscateconfig.h \ src/qt/editaddressdialog.h \ src/qt/guiconstants.h \ src/qt/guiutil.h \ @@ -333,7 +333,7 @@ HEADERS += src/activemasternode.h \ src/secp256k1/src/java/org_bitcoin_NativeSecp256k1.h \ src/crypto/aes_helper.c \ src/qt/bitcoinamountfield.moc \ - src/qt/dash.moc \ + src/qt/darknet.moc \ src/qt/intro.moc \ src/qt/overviewpage.moc \ src/qt/rpcconsole.moc \ @@ -341,7 +341,7 @@ HEADERS += src/activemasternode.h \ FORMS += src/qt/forms/addressbookpage.ui \ src/qt/forms/askpassphrasedialog.ui \ src/qt/forms/coincontroldialog.ui \ - src/qt/forms/darksendconfig.ui \ + src/qt/forms/obfuscateconfig.ui \ src/qt/forms/editaddressdialog.ui \ src/qt/forms/helpmessagedialog.ui \ src/qt/forms/intro.ui \ @@ -372,18 +372,18 @@ SOURCES += src/activemasternode.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/obfuscate-relay.cpp \ + src/obfuscate.cpp \ + src/darknet-cli.cpp \ + src/darknet-tx.cpp \ + src/darknetd.cpp \ src/db.cpp \ src/eccryptoverify.cpp \ src/ecwrapper.cpp \ src/editaddressdialog.cpp \ src/hash.cpp \ src/init.cpp \ - src/instantx.cpp \ + src/swifttx.cpp \ src/keepass.cpp \ src/key.cpp \ src/keystore.cpp \ @@ -470,9 +470,9 @@ SOURCES += src/activemasternode.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/obfuscateconfig.cpp \ + src/qt/darknet.cpp \ + src/qt/darknetstrings.cpp \ src/qt/editaddressdialog.cpp \ src/qt/guiutil.cpp \ src/qt/intro.cpp \ @@ -550,7 +550,7 @@ SOURCES += src/activemasternode.cpp \ src/test/sighash_tests.cpp \ src/test/sigopcount_tests.cpp \ src/test/skiplist_tests.cpp \ - src/test/test_dash.cpp \ + src/test/test_darknet.cpp \ src/test/timedata_tests.cpp \ src/test/transaction_tests.cpp \ src/test/uint256_tests.cpp \ @@ -641,20 +641,20 @@ SOURCES += src/activemasternode.cpp \ 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 +RESOURCES += src/qt/darknet.qrc src/qt/darknet_locale.qrc +TRANSLATIONS += src/qt/locale/darknet_bg.ts \ + src/qt/locale/darknet_de.ts \ + src/qt/locale/darknet_en.ts \ + src/qt/locale/darknet_es.ts \ + src/qt/locale/darknet_fi.ts \ + src/qt/locale/darknet_fr.ts \ + src/qt/locale/darknet_it.ts \ + src/qt/locale/darknet_ja.ts \ + src/qt/locale/darknet_pl.ts \ + src/qt/locale/darknet_pt.ts \ + src/qt/locale/darknet_ru.ts \ + src/qt/locale/darknet_sk.ts \ + src/qt/locale/darknet_sv.ts \ + src/qt/locale/darknet_vi.ts \ + src/qt/locale/darknet_zh_CN.ts \ + src/qt/locale/darknet_zh_TW.ts diff --git a/contrib/dashd.bash-completion b/contrib/darknetd.bash-completion similarity index 81% rename from contrib/dashd.bash-completion rename to contrib/darknetd.bash-completion index 11a4dc9e7c3b5..a76b767347ebf 100644 --- a/contrib/dashd.bash-completion +++ b/contrib/darknetd.bash-completion @@ -1,12 +1,12 @@ -# bash programmable completion for dashd(1) and dash-cli(1) +# bash programmable completion for darknetd(1) and darknet-cli(1) # Copyright (c) 2012,2014 Christian von Roques # Distributed under the MIT/X11 software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -have dashd && { +have darknetd && { -# call $dashd for RPC -_dash_rpc() { +# call $darknetd for RPC +_darknet_rpc() { # determine already specified args necessary for RPC local rpcargs=() for i in ${COMP_LINE}; do @@ -16,23 +16,23 @@ _dash_rpc() { ;; esac done - $dashd "${rpcargs[@]}" "$@" + $darknetd "${rpcargs[@]}" "$@" } -# Add dash accounts to COMPREPLY -_dash_accounts() { +# Add darknet accounts to COMPREPLY +_darknet_accounts() { local accounts - accounts=$(_dash_rpc listaccounts | awk '/".*"/ { a=$1; gsub(/"/, "", a); print a}') + accounts=$(_darknet_rpc listaccounts | awk '/".*"/ { a=$1; gsub(/"/, "", a); print a}') COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "$accounts" -- "$cur" ) ) } -_dashd() { +_darknetd() { local cur prev words=() cword - local dashd + local darknetd - # save and use original argument to invoke dashd - # dashd might not be in $PATH - dashd="$1" + # save and use original argument to invoke darknetd + # darknetd might not be in $PATH + darknetd="$1" COMPREPLY=() _get_comp_words_by_ref -n = cur prev words cword @@ -53,7 +53,7 @@ _dashd() { if ((cword > 3)); then case ${words[cword-3]} in addmultisigaddress) - _dash_accounts + _darknet_accounts return 0 ;; getbalance|gettxout|importaddress|importprivkey|listreceivedbyaccount|listreceivedbyaddress|listsinceblock) @@ -74,7 +74,7 @@ _dashd() { return 0 ;; move|setaccount) - _dash_accounts + _darknet_accounts return 0 ;; esac @@ -90,7 +90,7 @@ _dashd() { return 0 ;; getaccountaddress|getaddressesbyaccount|getbalance|getnewaddress|getreceivedbyaccount|listtransactions|move|sendfrom|sendmany) - _dash_accounts + _darknet_accounts return 0 ;; esac @@ -114,12 +114,12 @@ _dashd() { # only parse --help if senseful if [[ -z "$cur" || "$cur" =~ ^- ]]; then - helpopts=$($dashd --help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) + helpopts=$($darknetd --help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) fi # only parse help if senseful if [[ -z "$cur" || "$cur" =~ ^[a-z] ]]; then - commands=$(_dash_rpc help 2>/dev/null | awk '$1 ~ /^[a-z]/ { print $1; }') + commands=$(_darknet_rpc help 2>/dev/null | awk '$1 ~ /^[a-z]/ { print $1; }') fi COMPREPLY=( $( compgen -W "$helpopts $commands" -- "$cur" ) ) @@ -133,7 +133,7 @@ _dashd() { esac } -complete -F _dashd dashd dash-cli +complete -F _darknetd darknetd darknet-cli } # Local variables: diff --git a/contrib/debian/README.md b/contrib/debian/README.md index 55ff57497f958..e88d60674d0bb 100644 --- a/contrib/debian/README.md +++ b/contrib/debian/README.md @@ -1,21 +1,21 @@ Debian ==================== -This directory contains files used to package dashd/dash-qt -for Debian-based Linux systems. If you compile dashd/dash-qt yourself, there are some useful files here. +This directory contains files used to package darknetd/darknet-qt +for Debian-based Linux systems. If you compile darknetd/darknet-qt yourself, there are some useful files here. -## dash: URI support ## +## darknet: URI support ## -dash-qt.desktop (Gnome / Open Desktop) +darknet-qt.desktop (Gnome / Open Desktop) To install: - sudo desktop-file-install dash-qt.desktop + sudo desktop-file-install darknet-qt.desktop sudo update-desktop-database If you build yourself, you will either need to modify the paths in -the .desktop file or copy or symlink your dash-qt binary to `/usr/bin` -and the `../../share/pixmaps/dash128.png` to `/usr/share/pixmaps` +the .desktop file or copy or symlink your darknet-qt binary to `/usr/bin` +and the `../../share/pixmaps/darknet128.png` to `/usr/share/pixmaps` -dash-qt.protocol (KDE) +darknet-qt.protocol (KDE) diff --git a/contrib/debian/changelog b/contrib/debian/changelog index f31f23871144a..cd8b21ee389ac 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -132,7 +132,7 @@ bitcoin (0.5.3-natty0) natty; urgency=low * New upstream release. - -- Luke Dashjr Tue, 10 Jan 2012 15:57:00 -0500 + -- Luke Dashjr Tue, 10 Jan 2012 15:57:00 -0500 bitcoin (0.5.2-natty1) natty; urgency=low @@ -147,7 +147,7 @@ bitcoin (0.5.2-natty0) natty; urgency=low * New upstream release. - -- Luke Dashjr Fri, 16 Dec 2011 17:57:00 -0500 + -- Luke Dashjr Fri, 16 Dec 2011 17:57:00 -0500 bitcoin (0.5.1-natty0) natty; urgency=low @@ -365,8 +365,8 @@ bitcoin (0.3.19~dfsg-5) unstable; urgency=low bitcoin (0.3.19~dfsg-4) unstable; urgency=low [ Micah Anderson ] - * Provide example dash.conf. - * Add bitcoind(1) and dash.conf(5) man pages. + * Provide example darknet.conf. + * Add bitcoind(1) and darknet.conf(5) man pages. [ Jonas Smedegaard ] * Ease backporting: diff --git a/contrib/debian/control b/contrib/debian/control index 72cfb9747cb13..061ebdd67b03f 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -1,4 +1,4 @@ -Source: dash +Source: darknet Section: utils Priority: optional Maintainer: Jonas Smedegaard ***TODO*** @@ -22,11 +22,11 @@ Build-Depends: debhelper, libqrencode-dev, libprotobuf-dev, protobuf-compiler Standards-Version: 3.9.2 -Homepage: http://www.dashpay.io/ -Vcs-Git: git://github.com/dashpay/dash.git -Vcs-Browser: http://github.com/dashpay/dash +Homepage: http://www.darknet-crypto.com +Vcs-Git: git://github.com/darknetpay/darknet.git +Vcs-Browser: http://github.com/darknetpay/darknet -Package: dashd +Package: darknetd Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer network based digital currency - daemon @@ -39,10 +39,10 @@ Description: peer-to-peer network based digital currency - daemon Full transaction history is stored locally at each client. This requires 1+ GB of space, slowly growing. . - This package provides the daemon, dashd, and the CLI tool - dash-cli to interact with the daemon. + This package provides the daemon, darknetd, and the CLI tool + darknet-cli to interact with the daemon. -Package: dash-qt +Package: darknet-qt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer network based digital currency - Qt GUI diff --git a/contrib/debian/dash-qt.desktop b/contrib/debian/dash-qt.desktop index 2a2536ad6eb8f..6c8d04a683377 100644 --- a/contrib/debian/dash-qt.desktop +++ b/contrib/debian/dash-qt.desktop @@ -4,9 +4,9 @@ Name=Dash Comment=Dash P2P Cryptocurrency Comment[fr]=Dash, monnaie virtuelle cryptographique pair à pair Comment[tr]=Dash, eşten eşe kriptografik sanal para birimi -Exec=dash-qt %u +Exec=darknet-qt %u Terminal=false Type=Application -Icon=dash128 -MimeType=x-scheme-handler/dash; +Icon=darknet128 +MimeType=x-scheme-handler/darknet; Categories=Office;Finance; diff --git a/contrib/debian/dash-qt.install b/contrib/debian/dash-qt.install index 4c10ef60d9d65..cb67697d8dbd9 100644 --- a/contrib/debian/dash-qt.install +++ b/contrib/debian/dash-qt.install @@ -1,6 +1,6 @@ -usr/local/bin/dash-qt usr/bin +usr/local/bin/darknet-qt usr/bin share/pixmaps/bitcoin32.xpm usr/share/pixmaps share/pixmaps/bitcoin16.xpm usr/share/pixmaps share/pixmaps/bitcoin128.png usr/share/pixmaps -debian/dash-qt.desktop usr/share/applications -debian/dash-qt.protocol usr/share/kde4/services/ +debian/darknet-qt.desktop usr/share/applications +debian/darknet-qt.protocol usr/share/kde4/services/ diff --git a/contrib/debian/dash-qt.lintian-overrides b/contrib/debian/dash-qt.lintian-overrides index bfb8d9a84bc34..8a93bdfb31371 100644 --- a/contrib/debian/dash-qt.lintian-overrides +++ b/contrib/debian/dash-qt.lintian-overrides @@ -1,2 +1,2 @@ # Linked code is Expat - only Debian packaging is GPL-2+ -dash-qt: possible-gpl-code-linked-with-openssl +darknet-qt: possible-gpl-code-linked-with-openssl diff --git a/contrib/debian/dash-qt.protocol b/contrib/debian/dash-qt.protocol index 7487092412bac..a847a9b8196c8 100644 --- a/contrib/debian/dash-qt.protocol +++ b/contrib/debian/dash-qt.protocol @@ -1,6 +1,6 @@ [Protocol] -exec=dash-qt '%u' -protocol=dash +exec=darknet-qt '%u' +protocol=darknet input=none output=none helper=true diff --git a/contrib/debian/dashd.bash-completion b/contrib/debian/dashd.bash-completion index d92f33da7bf34..33d4d68db4ac0 100644 --- a/contrib/debian/dashd.bash-completion +++ b/contrib/debian/dashd.bash-completion @@ -1 +1 @@ -contrib/dashd.bash-completion dashd +contrib/darknetd.bash-completion darknetd diff --git a/contrib/debian/dashd.examples b/contrib/debian/dashd.examples index 0b6950852dfa5..0812bd78ddec6 100644 --- a/contrib/debian/dashd.examples +++ b/contrib/debian/dashd.examples @@ -1 +1 @@ -debian/examples/dash.conf +debian/examples/darknet.conf diff --git a/contrib/debian/dashd.install b/contrib/debian/dashd.install index 65878933fa995..d4ecfba532f2e 100644 --- a/contrib/debian/dashd.install +++ b/contrib/debian/dashd.install @@ -1,2 +1,2 @@ -usr/local/bin/dashd usr/bin -usr/local/bin/dash-cli usr/bin +usr/local/bin/darknetd usr/bin +usr/local/bin/darknet-cli usr/bin diff --git a/contrib/debian/dashd.lintian-overrides b/contrib/debian/dashd.lintian-overrides index ef02ada1e05ce..d4f3dafbe5684 100644 --- a/contrib/debian/dashd.lintian-overrides +++ b/contrib/debian/dashd.lintian-overrides @@ -1,2 +1,2 @@ # Linked code is Expat - only Debian packaging is GPL-2+ -dashd: possible-gpl-code-linked-with-openssl +darknetd: possible-gpl-code-linked-with-openssl diff --git a/contrib/debian/dashd.manpages b/contrib/debian/dashd.manpages index 949916bee2784..b34d96245b9cd 100644 --- a/contrib/debian/dashd.manpages +++ b/contrib/debian/dashd.manpages @@ -1,2 +1,2 @@ -debian/manpages/dashd.1 -debian/manpages/dash.conf.5 +debian/manpages/darknetd.1 +debian/manpages/darknet.conf.5 diff --git a/contrib/debian/examples/dash.conf b/contrib/debian/examples/darknet.conf similarity index 84% rename from contrib/debian/examples/dash.conf rename to contrib/debian/examples/darknet.conf index be781d1bb1e81..8443235c22940 100644 --- a/contrib/debian/examples/dash.conf +++ b/contrib/debian/examples/darknet.conf @@ -1,10 +1,10 @@ ## -## dash.conf configuration file. Lines beginning with # are comments. +## darknet.conf configuration file. Lines beginning with # are comments. ## # Network-related settings: -# Run on the test network instead of the real dash network. +# Run on the test network instead of the real darknet network. #testnet=0 # Run a regression test network @@ -38,11 +38,11 @@ # Use as many addnode= settings as you like to connect to specific peers #addnode=69.164.218.197 -#addnode=10.0.0.2:9999 +#addnode=10.0.0.2:51472 # Alternatively use as many connect= settings as you like to connect ONLY to specific peers #connect=69.164.218.197 -#connect=10.0.0.1:9999 +#connect=10.0.0.1:51472 # Listening mode, enabled by default except when 'connect' is being used #listen=1 @@ -51,17 +51,17 @@ #maxconnections= # -# JSON-RPC options (for controlling a running Dash/dashd process) +# JSON-RPC options (for controlling a running Dash/darknetd process) # -# server=1 tells Dash-QT and dashd to accept JSON-RPC commands +# server=1 tells Dash-QT and darknetd to accept JSON-RPC commands #server=0 # You must set rpcuser and rpcpassword to secure the JSON-RPC api #rpcuser=Ulysseys #rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593 -# How many seconds dash will wait for a complete RPC HTTP request. +# How many seconds darknet will wait for a complete RPC HTTP request. # after the HTTP connection is established. #rpctimeout=30 @@ -73,20 +73,20 @@ # because the rpcpassword is transmitted over the network unencrypted. # server=1 tells Dash-QT to accept JSON-RPC commands. -# it is also read by dashd to determine if RPC should be enabled +# it is also read by darknetd to determine if RPC should be enabled #rpcallowip=10.1.1.34/255.255.255.0 #rpcallowip=1.2.3.4/24 #rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96 # Listen for RPC connections on this TCP port: -#rpcport=9998 +#rpcport=51473 -# You can use Dash or dashd to send commands to Dash/dashd +# You can use Dash or darknetd to send commands to Dash/darknetd # running on another host using this option: #rpcconnect=127.0.0.1 # Use Secure Sockets Layer (also known as TLS or HTTPS) to communicate -# with Dash -server or dashd +# with Dash -server or darknetd #rpcssl=1 # OpenSSL settings used when rpcssl=1 @@ -101,7 +101,7 @@ # both prior transactions and several dozen future transactions. #keypool=100 -# Pay an optional transaction fee every time you send dashs. Transactions with fees +# Pay an optional transaction fee every time you send darknets. Transactions with fees # are more likely than free transactions to be included in generated blocks, so may # be validated sooner. #paytxfee=0.00 diff --git a/contrib/debian/manpages/dash.conf.5 b/contrib/debian/manpages/darknet.conf.5 similarity index 70% rename from contrib/debian/manpages/dash.conf.5 rename to contrib/debian/manpages/darknet.conf.5 index 319c84b44558b..84ed214275f71 100644 --- a/contrib/debian/manpages/dash.conf.5 +++ b/contrib/debian/manpages/darknet.conf.5 @@ -1,27 +1,27 @@ -.TH DASH.CONF "5" "January 2011" "dash.conf 3.19" +.TH DNET.CONF "5" "January 2011" "darknet.conf 3.19" .SH NAME -dash.conf \- dash configuration file +darknet.conf \- darknet configuration file .SH SYNOPSIS All command-line options (except for '\-conf') may be specified in a configuration file, and all configuration file options may also be specified on the command line. Command-line options override values set in the configuration file. .TP The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character. .TP -The configuration file is not automatically created; you can create it using your favorite plain-text editor. By default, dashd(1) will look for a file named dash.conf(5) in the dash 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, darknetd(1) will look for a file named darknet.conf(5) in the darknet 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 -dash.conf should be located in $HOME/.dash +darknet.conf should be located in $HOME/.darknet .SH NETWORK-RELATED SETTINGS .TP .TP \fBtestnet=\fR[\fI'1'\fR|\fI'0'\fR] -Enable or disable run on the test network instead of the real *dash* network. +Enable or disable run on the test network instead of the real *darknet* network. .TP \fBproxy=\fR\fI'127.0.0.1:9050'\fR Connect via a socks4 proxy. .TP -\fBaddnode=\fR\fI'10.0.0.2:9999'\fR +\fBaddnode=\fR\fI'10.0.0.2:51472'\fR Use as many *addnode=* settings as you like to connect to specific peers. .TP -\fBconnect=\fR\fI'10.0.0.1:9999'\fR +\fBconnect=\fR\fI'10.0.0.1:51472'\fR Use as many *connect=* settings as you like to connect ONLY to specific peers. .TP \fRmaxconnections=\fR\fI'value'\fR @@ -29,7 +29,7 @@ Maximum number of inbound+outbound connections. .SH JSON-RPC OPTIONS .TP \fBserver=\fR[\fI'1'\fR|\fI'0'\fR] -Tells *dash* to accept or not accept JSON-RPC commands. +Tells *darknet* to accept or not accept JSON-RPC commands. .TP \fBrpcuser=\fR\fI'username'\fR You must set *rpcuser* to secure the JSON-RPC api. @@ -40,14 +40,14 @@ You must set *rpcpassword* to secure the JSON-RPC api. \fBrpcallowip=\fR\fI'192.168.1.*'\fR By default, only RPC connections from localhost are allowed. Specify as many *rpcallowip=* settings as you like to allow connections from other hosts (and you may use * as a wildcard character). .TP -\fBrpcport=\fR\fI'9998'\fR +\fBrpcport=\fR\fI'51473'\fR Listen for RPC connections on this TCP port. .TP \fBrpcconnect=\fR\fI'127.0.0.1'\fR -You can use *dash* or *dashd(1)* to send commands to *dash*/*dashd(1)* running on another host using this option. +You can use *darknet* or *darknetd(1)* to send commands to *darknet*/*darknetd(1)* running on another host using this option. .TP \fBrpcssl=\fR\fI'1'\fR -Use Secure Sockets Layer (also known as TLS or HTTPS) to communicate with *dash* '\-server' or *dashd(1)*. Example of OpenSSL settings used when *rpcssl*='1': +Use Secure Sockets Layer (also known as TLS or HTTPS) to communicate with *darknet* '\-server' or *darknetd(1)*. Example of OpenSSL settings used when *rpcssl*='1': .TP \fB\-rpcsslciphers=\fR Acceptable ciphers (default: TLSv1+HIGH:\:!SSLv2:\:!aNULL:\:!eNULL:\:!AH:\:!3DES:\:@STRENGTH) @@ -59,16 +59,16 @@ Acceptable ciphers (default: TLSv1+HIGH:\:!SSLv2:\:!aNULL:\:!eNULL:\:!AH:\:!3DES .SH MISCELLANEOUS OPTIONS .TP \fBgen=\fR[\fI'0'\fR|\fI'1'\fR] -Enable or disable attempt to generate dashs. +Enable or disable attempt to generate darknets. .TP \fB4way=\fR[\fI'0'\fR|\fI'1'\fR] -Enable or disable use SSE instructions to try to generate dashs faster. +Enable or disable use SSE instructions to try to generate darknets faster. .TP \fBkeypool=\fR\fI'100'\fR Pre-generate this many public/private key pairs, so wallet backups will be valid for both prior transactions and several dozen future transactions. .TP \fBpaytxfee=\fR\fI'0.00'\fR -Pay an optional transaction fee every time you send dashs. 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 darknets. Transactions with fees are more likely than free transactions to be included in generated blocks, so may be validated sooner. .TP \fBallowreceivebyip=\fR\fI'1'\fR Allow direct connections for the 'pay via IP address' feature. @@ -76,12 +76,12 @@ Allow direct connections for the 'pay via IP address' feature. .SH USER INTERFACE OPTIONS .TP \fBmin=\fR[\fI'0'\fR|\fI'1'\fR] -Enable or disable start dashd minimized. +Enable or disable start darknetd minimized. .TP \fBminimizetotray=\fR[\fI'0'\fR|\fI'1'\fR] Enable or disable minimize to the system tray. .SH "SEE ALSO" -dashd(1) +darknetd(1) .SH AUTHOR This manual page was written by Micah Anderson for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or any later version published by the Free Software Foundation. diff --git a/contrib/debian/manpages/dashd.1 b/contrib/debian/manpages/darknetd.1 similarity index 76% rename from contrib/debian/manpages/dashd.1 rename to contrib/debian/manpages/darknetd.1 index b31f828737c43..8c9bfb0da8a9d 100644 --- a/contrib/debian/manpages/dashd.1 +++ b/contrib/debian/manpages/darknetd.1 @@ -1,19 +1,19 @@ -.TH DASHD "1" "January 2011" "dashd 3.19" +.TH DNETD "1" "January 2011" "darknetd 3.19" .SH NAME Dash \- peer-to-peer network based digital currency .SH SYNOPSIS -dashd [options] [params] +darknetd [options] [params] .TP -dashd [options] help \- Get help for a command +darknetd [options] help \- Get help for a command .SH DESCRIPTION -This manual page documents the dashd program. Dash is a peer-to-peer digital currency. Peer-to-peer (P2P) means that there is no central authority to issue new money or keep track of transactions. Instead, these tasks are managed collectively by the nodes of the network. Advantages: +This manual page documents the darknetd program. Dash is a peer-to-peer digital currency. Peer-to-peer (P2P) means that there is no central authority to issue new money or keep track of transactions. Instead, these tasks are managed collectively by the nodes of the network. Advantages: Dash can be sent easily through the Internet, without having to trust middlemen. Transactions are designed to be irreversible. Be safe from instability caused by fractional reserve banking and central banks. The limited inflation of the Dash system’s money supply is distributed evenly (by CPU power) throughout the network, not monopolized by banks. .SH OPTIONS .TP \fB\-conf=\fR -Specify configuration file (default: dash.conf) +Specify configuration file (default: darknet.conf) .TP \fB\-gen\fR Generate coins @@ -84,14 +84,14 @@ This help message \fBbackupwallet 'destination'\fR Safely copies *wallet.dat* to 'destination', which can be a directory or a path with filename. .TP -\fBgetaccount 'dashaddress'\fR +\fBgetaccount 'darknetaddress'\fR Returns the account associated with the given address. .TP -\fBsetaccount 'dashaddress' ['account']\fR +\fBsetaccount 'darknetaddress' ['account']\fR Sets the ['account'] associated with the given address. ['account'] may be omitted to remove an address from ['account']. .TP \fBgetaccountaddress 'account'\fR -Returns a new dash address for 'account'. +Returns a new darknet address for 'account'. .TP \fBgetaddressesbyaccount 'account'\fR Returns the list of addresses associated with the given 'account'. @@ -112,7 +112,7 @@ Returns the number of connections to other nodes. Returns the proof-of-work difficulty as a multiple of the minimum difficulty. .TP \fBgetgenerate\fR -Returns boolean true if server is trying to generate DASH, false otherwise. +Returns boolean true if server is trying to generate DNET, false otherwise. .TP \fBsetgenerate 'generate' ['genproclimit']\fR Generation is limited to ['genproclimit'] processors, \-1 is unlimited. @@ -124,13 +124,13 @@ Returns a recent hashes per second performance measurement while generating. Returns an object containing server information. .TP \fBgetnewaddress 'account'\fR -Returns a new dash address for receiving payments. If 'account' is specified (recommended), it is added to the address book so payments received with the address will be credited to 'account'. +Returns a new darknet address for receiving payments. If 'account' is specified (recommended), it is added to the address book so payments received with the address will be credited to 'account'. .TP \fBgetreceivedbyaccount 'account' ['minconf=1']\fR Returns the total amount received by addresses associated with 'account' in transactions with at least ['minconf'] confirmations. .TP -\fBgetreceivedbyaddress 'dashaddress' ['minconf=1']\fR -Returns the total amount received by 'dashaddress' in transactions with at least ['minconf'] confirmations. +\fBgetreceivedbyaddress 'darknetaddress' ['minconf=1']\fR +Returns the total amount received by 'darknetaddress' in transactions with at least ['minconf'] confirmations. .TP \fBgettransaction 'txid'\fR Returns information about a specific transaction, given hexadecimal transaction ID. @@ -148,7 +148,7 @@ List commands, or get help for a command. .TP \fBlistaccounts ['minconf=1']\fR List accounts and their current balances. - *note: requires dash 0.3.20 or later. + *note: requires darknet 0.3.20 or later. .TP \fBlistreceivedbyaccount ['minconf=1'] ['includeempty=false']\fR ['minconf'] is the minimum number of confirmations before payments are included. ['includeempty'] whether to include addresses that haven't received any payments. Returns an array of objects containing: @@ -177,31 +177,31 @@ Returns a list of the last ['count'] transactions for 'account' \- for all accou "message" : message associated with transaction (only for send). "to" : message-to associated with transaction (only for send). - *note: requires dash 0.3.20 or later. + *note: requires darknet 0.3.20 or later. .TP \fBmove <'fromaccount'> <'toaccount'> <'amount'> ['minconf=1'] ['comment']\fR Moves funds between accounts. .TP -\fBsendfrom* <'account'> <'dashaddress'> <'amount'> ['minconf=1'] ['comment'] ['comment-to']\fR -Sends amount from account's balance to 'dashaddress'. This method will fail if there is less than amount DASH with ['minconf'] confirmations in the account's balance (unless account is the empty-string-named default account; it behaves like the *sendtoaddress* method). Returns transaction ID on success. +\fBsendfrom* <'account'> <'darknetaddress'> <'amount'> ['minconf=1'] ['comment'] ['comment-to']\fR +Sends amount from account's balance to 'darknetaddress'. This method will fail if there is less than amount DNET with ['minconf'] confirmations in the account's balance (unless account is the empty-string-named default account; it behaves like the *sendtoaddress* method). Returns transaction ID on success. .TP -\fBsendtoaddress 'dashaddress' 'amount' ['comment'] ['comment-to']\fR -Sends amount from the server's available balance to 'dashaddress'. amount is a real and is rounded to the nearest 0.01. Returns transaction id on success. +\fBsendtoaddress 'darknetaddress' 'amount' ['comment'] ['comment-to']\fR +Sends amount from the server's available balance to 'darknetaddress'. amount is a real and is rounded to the nearest 0.01. Returns transaction id on success. .TP \fBstop\fR -Stops the dash server. +Stops the darknet server. .TP -\fBvalidateaddress 'dashaddress'\fR -Checks that 'dashaddress' looks like a proper Dash address. Returns an object containing: +\fBvalidateaddress 'darknetaddress'\fR +Checks that 'darknetaddress' looks like a proper Dash address. Returns an object containing: "isvalid" : true or false. "ismine" : true if the address is in the server's wallet. - "address" : dashaddress. + "address" : darknetaddress. *note: ismine and address are only returned if the address is valid. .SH "SEE ALSO" -dash.conf(5) +darknet.conf(5) .SH AUTHOR This manual page was written by Micah Anderson for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or any later version published by the Free Software Foundation. diff --git a/contrib/debian/manpages/dash-qt.1 b/contrib/debian/manpages/dash-qt.1 index dc9381f8ad892..f0cbae96ec646 100644 --- a/contrib/debian/manpages/dash-qt.1 +++ b/contrib/debian/manpages/dash-qt.1 @@ -1,20 +1,20 @@ -.TH DASH-QT "1" "March 2015" "dash-qt 1" +.TH DNET-QT "1" "March 2015" "darknet-qt 1" .SH NAME -dash-qt \- peer-to-peer network based digital currency +darknet-qt \- peer-to-peer network based digital currency .SH DESCRIPTION .SS "Usage:" .IP -dash\-qt [command\-line options] +darknet\-qt [command\-line options] .SH OPTIONS .TP \-? This help message .TP \fB\-conf=\fR -Specify configuration file (default: dash.conf) +Specify configuration file (default: darknet.conf) .TP \fB\-pid=\fR -Specify pid file (default: dashd.pid) +Specify pid file (default: darknetd.pid) .TP \fB\-gen\fR Generate coins @@ -41,7 +41,7 @@ Use proxy to reach tor hidden services (default: same as \fB\-proxy\fR) Allow DNS lookups for \fB\-addnode\fR, \fB\-seednode\fR and \fB\-connect\fR .TP \fB\-port=\fR -Listen for connections on (default: 9999 or testnet: 19999) +Listen for connections on (default: 51472 or testnet: 51474) .TP \fB\-maxconnections=\fR Maintain at most connections to peers (default: 125) @@ -122,7 +122,7 @@ Username for JSON\-RPC connections Password for JSON\-RPC connections .TP \fB\-rpcport=\fR -Listen for JSON\-RPC connections on (default: 9998 or testnet: 19998) +Listen for JSON\-RPC connections on (default: 51473 or testnet: 51475) .TP \fB\-rpcallowip=\fR Allow JSON\-RPC connections from specified IP address diff --git a/contrib/debian/rules b/contrib/debian/rules index 23f79be5a2d73..8a252795ee81e 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -1,9 +1,9 @@ #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- -#DEB_MAKE_CHECK_TARGET = test_dash +#DEB_MAKE_CHECK_TARGET = test_darknet #build/bitcoind:: -# $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_dash) +# $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_darknet) DEB_INSTALL_EXAMPLES_bitcoind += debian/examples/* DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/* @@ -13,7 +13,7 @@ DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/* override_dh_auto_clean: if [ -f Makefile ]; then $(MAKE) distclean; fi - rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/dash-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in + rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/darknet-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in # Yea, autogen should be run on the source archive, but I like doing git archive override_dh_auto_configure: diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md index 8cfff884a9965..3228cae293d2d 100644 --- a/contrib/devtools/README.md +++ b/contrib/devtools/README.md @@ -64,10 +64,10 @@ If only supported symbols are used the return value will be 0 and the output wil If there are 'unsupported' symbols, the return value will be 1 a list like this will be printed: - .../64/test_dash: symbol memcpy from unsupported version GLIBC_2.14 - .../64/test_dash: symbol __fdelt_chk from unsupported version GLIBC_2.15 - .../64/test_dash: symbol std::out_of_range::~out_of_range() from unsupported version GLIBCXX_3.4.15 - .../64/test_dash: symbol _ZNSt8__detail15_List_nod from unsupported version GLIBCXX_3.4.15 + .../64/test_darknet: symbol memcpy from unsupported version GLIBC_2.14 + .../64/test_darknet: symbol __fdelt_chk from unsupported version GLIBC_2.15 + .../64/test_darknet: symbol std::out_of_range::~out_of_range() from unsupported version GLIBCXX_3.4.15 + .../64/test_darknet: symbol _ZNSt8__detail15_List_nod from unsupported version GLIBCXX_3.4.15 update-translations.py ======================= diff --git a/contrib/devtools/update-translations.py b/contrib/devtools/update-translations.py index a121c1a3c4497..7b907269a0cfb 100755 --- a/contrib/devtools/update-translations.py +++ b/contrib/devtools/update-translations.py @@ -26,7 +26,7 @@ # Name of transifex tool TX = 'tx' # Name of source language file -SOURCE_LANG = 'dash_en.ts' +SOURCE_LANG = 'darknet_en.ts' # Directory with locale files LOCALE_DIR = 'src/qt/locale' diff --git a/contrib/gitian-descriptors/README.md b/contrib/gitian-descriptors/README.md index faa1c4b194ee1..ebed8d235383d 100644 --- a/contrib/gitian-descriptors/README.md +++ b/contrib/gitian-descriptors/README.md @@ -20,7 +20,7 @@ Sanity checks: Once you've got the right hardware and software: - git clone git://github.com/dashpay/dash.git + git clone git://github.com/darknetpay/darknet.git git clone git://github.com/devrandom/gitian-builder.git mkdir gitian-builder/inputs cd gitian-builder/inputs @@ -62,5 +62,5 @@ Here's a description of Gavin's setup on OSX 10.6: 5. Still inside Ubuntu, tell gitian-builder to use LXC, then follow the "Once you've got the right hardware and software" instructions above: export USE_LXC=1 - git clone git://github.com/dashpay/dash.git + git clone git://github.com/darknetpay/darknet.git ... etc diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 5a7897ee32066..75c2ecff61248 100755 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "dash-linux-0.12" +name: "darknet-linux-0.12" enable_cache: true suites: - "precise" @@ -17,8 +17,8 @@ packages: - "binutils-gold" reference_datetime: "2014-01-10 00:00:00" remotes: -- "url": "https://github.com/dashpay/dash.git" - "dir": "dash" +- "url": "https://github.com/darknetpay/darknet.git" + "dir": "darknet" files: [] script: | WRAP_DIR=$HOME/wrapped @@ -62,7 +62,7 @@ script: | done export PATH=${WRAP_DIR}:${PATH} - cd dash + cd darknet BASEPREFIX=`pwd`/depends # Build dependencies for each host for i in $HOSTS; do @@ -73,13 +73,13 @@ script: | ./autogen.sh ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'` make dist - SOURCEDIST=`echo dash-*.tar.gz` + SOURCEDIST=`echo darknet-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find dash-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find darknet-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST popd ORIGPATH="$PATH" diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml index f3c78be5e8b65..7b722eb62a5ac 100644 --- a/contrib/gitian-descriptors/gitian-osx-signer.yml +++ b/contrib/gitian-descriptors/gitian-osx-signer.yml @@ -1,5 +1,5 @@ --- -name: "dash-dmg-signer" +name: "darknet-dmg-signer" suites: - "precise" architectures: @@ -10,7 +10,7 @@ packages: reference_datetime: "2013-06-01 00:00:00" remotes: [] files: -- "dash-osx-unsigned.tar.gz" +- "darknet-osx-unsigned.tar.gz" - "signature.tar.gz" script: | WRAP_DIR=$HOME/wrapped @@ -28,8 +28,8 @@ script: | chmod +x ${WRAP_DIR}/${prog} done - UNSIGNED=dash-osx-unsigned.tar.gz - SIGNED=dash-osx-signed.dmg + UNSIGNED=darknet-osx-unsigned.tar.gz + SIGNED=darknet-osx-signed.dmg tar -xf ${UNSIGNED} ./detached-sig-apply.sh ${UNSIGNED} signature.tar.gz diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index f8cb34deef226..bb2f0ce7f91a1 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -1,5 +1,5 @@ --- -name: "dash-osx-0.12" +name: "darknet-osx-0.12" enable_cache: true suites: - "precise" @@ -20,8 +20,8 @@ packages: - "libbz2-dev" reference_datetime: "2013-06-01 00:00:00" remotes: -- "url": "https://github.com/dashpay/dash.git" - "dir": "dash" +- "url": "https://github.com/darknetpay/darknet.git" + "dir": "darknet" files: - "MacOSX10.7.sdk.tar.gz" script: | @@ -68,7 +68,7 @@ script: | done export PATH=${WRAP_DIR}:${PATH} - cd dash + cd darknet BASEPREFIX=`pwd`/depends mkdir -p ${BASEPREFIX}/SDKs @@ -83,14 +83,14 @@ script: | ./autogen.sh ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'` make dist - SOURCEDIST=`echo dash-*.tar.gz` + SOURCEDIST=`echo darknet-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find dash-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find darknet-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST popd ORIGPATH="$PATH" diff --git a/contrib/gitian-descriptors/gitian-rpi2.yml b/contrib/gitian-descriptors/gitian-rpi2.yml index 6bf051f8c21ff..2303aebabe1a2 100644 --- a/contrib/gitian-descriptors/gitian-rpi2.yml +++ b/contrib/gitian-descriptors/gitian-rpi2.yml @@ -1,5 +1,5 @@ --- -name: "dash-raspberry-0.12" +name: "darknet-raspberry-0.12" enable_cache: true suites: - "precise" @@ -17,8 +17,8 @@ packages: - "binutils-gold" reference_datetime: "2014-01-10 00:00:00" remotes: -- "url": "https://github.com/dashpay/dash.git" - "dir": "dash" +- "url": "https://github.com/darknetpay/darknet.git" + "dir": "darknet" files: - "raspberrypi-tools.tar.gz" script: | @@ -67,7 +67,7 @@ script: | done export PATH=${WRAP_DIR}:${PATH} - cd dash + cd darknet BASEPREFIX=`pwd`/depends # Build dependencies for each host for i in $HOSTS; do @@ -78,13 +78,13 @@ script: | ./autogen.sh ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'` make NO_QT=1 dist - SOURCEDIST=`echo dash-*.tar.gz` + SOURCEDIST=`echo darknet-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find dash-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find darknet-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST popd ORIGPATH="$PATH" diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index 9ca5ab6e496d2..d1edc99dc7bce 100755 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "dash-win-0.12" +name: "darknet-win-0.12" enable_cache: true suites: - "precise" @@ -20,8 +20,8 @@ packages: - "zip" reference_datetime: "2014-01-10 00:00:00" remotes: -- "url": "https://github.com/dashpay/dash.git" - "dir": "dash" +- "url": "https://github.com/darknetpay/darknet.git" + "dir": "darknet" files: [] script: | WRAP_DIR=$HOME/wrapped @@ -65,7 +65,7 @@ script: | done export PATH=${WRAP_DIR}:${PATH} - cd dash + cd darknet BASEPREFIX=`pwd`/depends # Build dependencies for each host for i in $HOSTS; do @@ -76,14 +76,14 @@ script: | ./autogen.sh ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'` make dist - SOURCEDIST=`echo dash-*.tar.gz` + SOURCEDIST=`echo darknet-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find dash-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find darknet-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST popd ORIGPATH="$PATH" @@ -100,7 +100,7 @@ script: | make ${MAKEOPTS} make deploy make install-strip - cp -f dash-*setup*.exe $OUTDIR/ + cp -f darknet-*setup*.exe $OUTDIR/ cd installed mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/ find . -name "lib*.la" -delete diff --git a/contrib/gitian-downloader/luke-jr-key.pgp b/contrib/gitian-downloader/luke-jr-key.pgp index 275b041d2059e..3e7095045f0fa 100644 Binary files a/contrib/gitian-downloader/luke-jr-key.pgp and b/contrib/gitian-downloader/luke-jr-key.pgp differ diff --git a/contrib/gitian-downloader/sipa-key.pgp b/contrib/gitian-downloader/sipa-key.pgp index ffa09bb4ad276..e56d31d4e7b45 100644 Binary files a/contrib/gitian-downloader/sipa-key.pgp and b/contrib/gitian-downloader/sipa-key.pgp differ diff --git a/contrib/init/README.md b/contrib/init/README.md index 6b8e244a7faaf..fa2c15076a94f 100644 --- a/contrib/init/README.md +++ b/contrib/init/README.md @@ -1,9 +1,9 @@ Sample configuration files for: -SystemD: dashd.service -Upstart: dashd.conf -OpenRC: dashd.openrc - dashd.openrcconf +SystemD: darknetd.service +Upstart: darknetd.conf +OpenRC: darknetd.openrc + darknetd.openrcconf have been made available to assist packagers in creating node packages here. diff --git a/contrib/init/dashd.conf b/contrib/init/dashd.conf index 40b9b9a4f9862..9bb35d29fdf53 100644 --- a/contrib/init/dashd.conf +++ b/contrib/init/dashd.conf @@ -3,14 +3,14 @@ description "Dash Core Daemon" start on runlevel [2345] stop on starting rc RUNLEVEL=[016] -env BITCOIND_BIN="/usr/bin/dashd" -env BITCOIND_USER="dash" -env BITCOIND_GROUP="dash" -env BITCOIND_PIDDIR="/var/run/dashd" +env BITCOIND_BIN="/usr/bin/darknetd" +env BITCOIND_USER="darknet" +env BITCOIND_GROUP="darknet" +env BITCOIND_PIDDIR="/var/run/darknetd" # upstart can't handle variables constructed with other variables -env BITCOIND_PIDFILE="/var/run/dashd/dashd.pid" -env BITCOIND_CONFIGFILE="/etc/dash/dash.conf" -env BITCOIND_DATADIR="/var/lib/dashd" +env BITCOIND_PIDFILE="/var/run/darknetd/darknetd.pid" +env BITCOIND_CONFIGFILE="/etc/darknet/darknet.conf" +env BITCOIND_DATADIR="/var/lib/darknetd" expect fork @@ -20,12 +20,12 @@ kill timeout 60 pre-start script # this will catch non-existent config files - # dashd will check and exit with this very warning, but it can do so + # darknetd will check and exit with this very warning, but it can do so # long after forking, leaving upstart to think everything started fine. # since this is a commonly encountered case on install, just check and # warn here. if ! grep -qs '^rpcpassword=' "$BITCOIND_CONFIGFILE" ; then - echo "ERROR: You must set a secure rpcpassword to run dashd." + echo "ERROR: You must set a secure rpcpassword to run darknetd." echo "The setting must appear in $BITCOIND_CONFIGFILE" echo echo "This password is security critical to securing wallets " diff --git a/contrib/init/dashd.openrc b/contrib/init/dashd.openrc index b1b7144d87708..c822031533749 100644 --- a/contrib/init/dashd.openrc +++ b/contrib/init/dashd.openrc @@ -2,24 +2,24 @@ # backward compatibility for existing gentoo layout # -if [ -d "/var/lib/dash/.dash" ]; then - BITCOIND_DEFAULT_DATADIR="/var/lib/dash/.dash" +if [ -d "/var/lib/darknet/.darknet" ]; then + BITCOIND_DEFAULT_DATADIR="/var/lib/darknet/.darknet" else - BITCOIND_DEFAULT_DATADIR="/var/lib/dashd" + BITCOIND_DEFAULT_DATADIR="/var/lib/darknetd" fi -BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/dash/dash.conf} -BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/dashd} -BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/dashd.pid} +BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/darknet/darknet.conf} +BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/darknetd} +BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/darknetd.pid} BITCOIND_DATADIR=${BITCOIND_DATADIR:-${BITCOIND_DEFAULT_DATADIR}} -BITCOIND_USER=${BITCOIND_USER:-dash} -BITCOIND_GROUP=${BITCOIND_GROUP:-dash} -BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/dashd} +BITCOIND_USER=${BITCOIND_USER:-darknet} +BITCOIND_GROUP=${BITCOIND_GROUP:-darknet} +BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/darknetd} name="Dash Core Daemon" description="Dash crypto-currency p2p network daemon" -command="/usr/bin/dashd" +command="/usr/bin/darknetd" command_args="-pid=\"${BITCOIND_PIDFILE}\" \ -conf=\"${BITCOIND_CONFIGFILE}\" \ -datadir=\"${BITCOIND_DATADIR}\" \ @@ -65,7 +65,7 @@ checkconfig() { if ! grep -qs '^rpcpassword=' "${BITCOIND_CONFIGFILE}" ; then eerror "" - eerror "ERROR: You must set a secure rpcpassword to run dashd." + eerror "ERROR: You must set a secure rpcpassword to run darknetd." eerror "The setting must appear in ${BITCOIND_CONFIGFILE}" eerror "" eerror "This password is security critical to securing wallets " diff --git a/contrib/init/dashd.openrcconf b/contrib/init/dashd.openrcconf index 05f033ae8ec05..6c2d72851d460 100644 --- a/contrib/init/dashd.openrcconf +++ b/contrib/init/dashd.openrcconf @@ -1,25 +1,25 @@ -# /etc/conf.d/dashd: config file for /etc/init.d/dashd +# /etc/conf.d/darknetd: config file for /etc/init.d/darknetd # Config file location -#BITCOIND_CONFIGFILE="/etc/dash/dash.conf" +#BITCOIND_CONFIGFILE="/etc/darknet/darknet.conf" # What directory to write pidfile to? (created and owned by $BITCOIND_USER) -#BITCOIND_PIDDIR="/var/run/dashd" +#BITCOIND_PIDDIR="/var/run/darknetd" # What filename to give the pidfile -#BITCOIND_PIDFILE="${BITCOIND_PIDDIR}/dashd.pid" +#BITCOIND_PIDFILE="${BITCOIND_PIDDIR}/darknetd.pid" -# Where to write dashd data (be mindful that the blockchain is large) -#BITCOIND_DATADIR="/var/lib/dashd" +# Where to write darknetd data (be mindful that the blockchain is large) +#BITCOIND_DATADIR="/var/lib/darknetd" -# User and group to own dashd process -#BITCOIND_USER="dash" -#BITCOIND_GROUP="dash" +# User and group to own darknetd process +#BITCOIND_USER="darknet" +#BITCOIND_GROUP="darknet" -# Path to dashd executable -#BITCOIND_BIN="/usr/bin/dashd" +# Path to darknetd executable +#BITCOIND_BIN="/usr/bin/darknetd" -# Nice value to run dashd under +# Nice value to run darknetd under #BITCOIND_NICE=0 # Additional options (avoid -conf and -datadir, use flags above) diff --git a/contrib/init/dashd.service b/contrib/init/dashd.service index 732ac647d38a1..15685da30f12c 100644 --- a/contrib/init/dashd.service +++ b/contrib/init/dashd.service @@ -3,13 +3,13 @@ Description=Dash's distributed currency daemon After=network.target [Service] -User=dash -Group=dash +User=darknet +Group=darknet Type=forking -PIDFile=/var/lib/dashd/dashd.pid -ExecStart=/usr/bin/dashd -daemon -pid=/var/lib/dashd/dashd.pid \ --conf=/etc/dash/dash.conf -datadir=/var/lib/dashd -disablewallet +PIDFile=/var/lib/darknetd/darknetd.pid +ExecStart=/usr/bin/darknetd -daemon -pid=/var/lib/darknetd/darknetd.pid \ +-conf=/etc/darknet/darknet.conf -datadir=/var/lib/darknetd -disablewallet Restart=always PrivateTmp=true diff --git a/contrib/linearize/example-linearize.cfg b/contrib/linearize/example-linearize.cfg index 9c0824ee1f261..af90afc47a3bf 100644 --- a/contrib/linearize/example-linearize.cfg +++ b/contrib/linearize/example-linearize.cfg @@ -3,7 +3,7 @@ rpcuser=someuser rpcpassword=somepassword host=127.0.0.1 -port=9998 +port=51473 # bootstrap.dat hashlist settings (linearize-hashes) max_height=313000 diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py index 52eef034f69f5..8da9f0164dcca 100755 --- a/contrib/linearize/linearize-hashes.py +++ b/contrib/linearize/linearize-hashes.py @@ -96,7 +96,7 @@ def get_block_hashes(settings, max_blocks_per_call=10000): if 'host' not in settings: settings['host'] = '127.0.0.1' if 'port' not in settings: - settings['port'] = 9998 + settings['port'] = 51473 if 'min_height' not in settings: settings['min_height'] = 0 if 'max_height' not in settings: diff --git a/contrib/qos/README.md b/contrib/qos/README.md index def61a23be9e7..b08a57b1e1fef 100644 --- a/contrib/qos/README.md +++ b/contrib/qos/README.md @@ -1,5 +1,5 @@ ### Qos ### -This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. It limits outbound TCP traffic with a source or destination port of 9999, but not if the destination IP is within a LAN (defined as 192.168.x.x). +This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. It limits outbound TCP traffic with a source or destination port of 51472, but not if the destination IP is within a LAN (defined as 192.168.x.x). 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. diff --git a/contrib/qos/tc.sh b/contrib/qos/tc.sh index aa27938b9a02e..1b03b69821c41 100644 --- a/contrib/qos/tc.sh +++ b/contrib/qos/tc.sh @@ -32,10 +32,10 @@ tc filter add dev ${IF} parent 1: protocol ip prio 2 handle 2 fw classid 1:11 # ret=$? #done -#limit outgoing traffic to and from port 9999. but not when dealing with a host on the local network +#limit outgoing traffic to and from port 51472. but not when dealing with a host on the local network # (defined by $LOCALNET) # --set-mark marks packages matching these criteria with the number "2" # these packages are filtered by the tc filter with "handle 2" # this filter sends the packages into the 1:11 class, and this class is limited to ${LIMIT} -iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 9999 ! -d ${LOCALNET} -j MARK --set-mark 0x2 -iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 9999 ! -d ${LOCALNET} -j MARK --set-mark 0x2 +iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 51472 ! -d ${LOCALNET} -j MARK --set-mark 0x2 +iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 51472 ! -d ${LOCALNET} -j MARK --set-mark 0x2 diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py index 253970792891d..93d0954a697b7 100755 --- a/contrib/seeds/makeseeds.py +++ b/contrib/seeds/makeseeds.py @@ -23,7 +23,7 @@ import sys import dns.resolver -PATTERN_IPV4 = re.compile(r"^((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})):9999$") +PATTERN_IPV4 = re.compile(r"^((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})):51472$") PATTERN_AGENT = re.compile(r"^(\/Satoshi:0.8.6\/|\/Satoshi:0.9.(2|3)\/|\/Core:0.1(0|1|2).\d{1,2}.\d{1,2}\/)$") def parseline(line): diff --git a/contrib/spendfrom/README.md b/contrib/spendfrom/README.md index 9a6924dca8731..67e0a76115cb0 100644 --- a/contrib/spendfrom/README.md +++ b/contrib/spendfrom/README.md @@ -7,7 +7,7 @@ address (or addresses). Depends on [jsonrpc](http://json-rpc.org/). spendfrom.py --from=FROMADDRESS1[,FROMADDRESS2] --to=TOADDRESS --amount=amount \ - --fee=fee --datadir=/path/to/.dash --testnet --dry_run + --fee=fee --datadir=/path/to/.darknet --testnet --dry_run With no arguments, outputs a list of amounts associated with addresses. @@ -16,7 +16,7 @@ With arguments, sends coins received by the `FROMADDRESS` addresses to the `TOAD ### Notes ### - You may explicitly specify how much fee to pay (a fee more than 1% of the amount -will fail, though, to prevent dash-losing accidents). Spendfrom may fail if +will fail, though, to prevent darknet-losing accidents). Spendfrom may fail if it thinks the transaction would never be confirmed (if the amount being sent is too small, or if the transaction is too many bytes for the fee). diff --git a/contrib/spendfrom/spendfrom.py b/contrib/spendfrom/spendfrom.py index e8d3d9fd77a59..6c7ac4342872a 100755 --- a/contrib/spendfrom/spendfrom.py +++ b/contrib/spendfrom/spendfrom.py @@ -1,13 +1,13 @@ #!/usr/bin/env python # -# Use the raw transactions API to spend dashs received on particular addresses, +# Use the raw transactions API to spend darknets received on particular addresses, # and send any change back to that same address. # # Example usage: # spendfrom.py # Lists available funds # spendfrom.py --from=ADDRESS --to=ADDRESS --amount=11.00 # -# Assumes it will talk to a dashd or Dash-Qt running +# Assumes it will talk to a darknetd or darknet-Qt running # on localhost. # # Depends on jsonrpc @@ -33,15 +33,15 @@ def check_json_precision(): raise RuntimeError("JSON encode/decode loses precision") def determine_db_dir(): - """Return the default location of the dash data directory""" + """Return the default location of the darknet data directory""" if platform.system() == "Darwin": - return os.path.expanduser("~/Library/Application Support/Dash/") + return os.path.expanduser("~/Library/Application Support/DarkNet/") elif platform.system() == "Windows": - return os.path.join(os.environ['APPDATA'], "Dash") - return os.path.expanduser("~/.dash") + return os.path.join(os.environ['APPDATA'], "DarkNet") + return os.path.expanduser("~/.darknet") def read_bitcoin_config(dbdir): - """Read the dash.conf file from dbdir, returns dictionary of settings""" + """Read the darknet.conf file from dbdir, returns dictionary of settings""" from ConfigParser import SafeConfigParser class FakeSecHead(object): @@ -59,20 +59,20 @@ def readline(self): return s config_parser = SafeConfigParser() - config_parser.readfp(FakeSecHead(open(os.path.join(dbdir, "dash.conf")))) + config_parser.readfp(FakeSecHead(open(os.path.join(dbdir, "darknet.conf")))) return dict(config_parser.items("all")) def connect_JSON(config): - """Connect to a dash JSON-RPC server""" + """Connect to a darknet JSON-RPC server""" testnet = config.get('testnet', '0') testnet = (int(testnet) > 0) # 0/1 in config file, convert to True/False if not 'rpcport' in config: - config['rpcport'] = 19998 if testnet else 9998 + config['rpcport'] = 51475 if testnet else 51473 connect = "http://%s:%s@127.0.0.1:%s"%(config['rpcuser'], config['rpcpassword'], config['rpcport']) try: result = ServiceProxy(connect) # ServiceProxy is lazy-connect, so send an RPC command mostly to catch connection errors, - # but also make sure the dashd we're talking to is/isn't testnet: + # but also make sure the darknetd we're talking to is/isn't testnet: if result.getmininginfo()['testnet'] != testnet: sys.stderr.write("RPC server at "+connect+" testnet setting mismatch\n") sys.exit(1) @@ -81,36 +81,36 @@ def connect_JSON(config): sys.stderr.write("Error connecting to RPC server at "+connect+"\n") sys.exit(1) -def unlock_wallet(dashd): - info = dashd.getinfo() +def unlock_wallet(darknetd): + info = darknetd.getinfo() if 'unlocked_until' not in info: return True # wallet is not encrypted t = int(info['unlocked_until']) if t <= time.time(): try: passphrase = getpass.getpass("Wallet is locked; enter passphrase: ") - dashd.walletpassphrase(passphrase, 5) + darknetd.walletpassphrase(passphrase, 5) except: sys.stderr.write("Wrong passphrase\n") - info = dashd.getinfo() + info = darknetd.getinfo() return int(info['unlocked_until']) > time.time() -def list_available(dashd): +def list_available(darknetd): address_summary = dict() address_to_account = dict() - for info in dashd.listreceivedbyaddress(0): + for info in darknetd.listreceivedbyaddress(0): address_to_account[info["address"]] = info["account"] - unspent = dashd.listunspent(0) + unspent = darknetd.listunspent(0) for output in unspent: # listunspent doesn't give addresses, so: - rawtx = dashd.getrawtransaction(output['txid'], 1) + rawtx = darknetd.getrawtransaction(output['txid'], 1) vout = rawtx["vout"][output['vout']] pk = vout["scriptPubKey"] - # This code only deals with ordinary pay-to-dash-address + # This code only deals with ordinary pay-to-darknet-address # or pay-to-script-hash outputs right now; anything exotic is ignored. if pk["type"] != "pubkeyhash" and pk["type"] != "scripthash": continue @@ -139,8 +139,8 @@ def select_coins(needed, inputs): n += 1 return (outputs, have-needed) -def create_tx(dashd, fromaddresses, toaddress, amount, fee): - all_coins = list_available(dashd) +def create_tx(darknetd, fromaddresses, toaddress, amount, fee): + all_coins = list_available(darknetd) total_available = Decimal("0.0") needed = amount+fee @@ -159,7 +159,7 @@ def create_tx(dashd, fromaddresses, toaddress, amount, fee): # Note: # Python's json/jsonrpc modules have inconsistent support for Decimal numbers. # Instead of wrestling with getting json.dumps() (used by jsonrpc) to encode - # Decimals, I'm casting amounts to float before sending them to dashd. + # Decimals, I'm casting amounts to float before sending them to darknetd. # outputs = { toaddress : float(amount) } (inputs, change_amount) = select_coins(needed, potential_inputs) @@ -170,8 +170,8 @@ def create_tx(dashd, fromaddresses, toaddress, amount, fee): else: outputs[change_address] = float(change_amount) - rawtx = dashd.createrawtransaction(inputs, outputs) - signed_rawtx = dashd.signrawtransaction(rawtx) + rawtx = darknetd.createrawtransaction(inputs, outputs) + signed_rawtx = darknetd.signrawtransaction(rawtx) if not signed_rawtx["complete"]: sys.stderr.write("signrawtransaction failed\n") sys.exit(1) @@ -179,10 +179,10 @@ def create_tx(dashd, fromaddresses, toaddress, amount, fee): return txdata -def compute_amount_in(dashd, txinfo): +def compute_amount_in(darknetd, txinfo): result = Decimal("0.0") for vin in txinfo['vin']: - in_info = dashd.getrawtransaction(vin['txid'], 1) + in_info = darknetd.getrawtransaction(vin['txid'], 1) vout = in_info['vout'][vin['vout']] result = result + vout['value'] return result @@ -193,12 +193,12 @@ def compute_amount_out(txinfo): result = result + vout['value'] return result -def sanity_test_fee(dashd, txdata_hex, max_fee): +def sanity_test_fee(darknetd, txdata_hex, max_fee): class FeeError(RuntimeError): pass try: - txinfo = dashd.decoderawtransaction(txdata_hex) - total_in = compute_amount_in(dashd, txinfo) + txinfo = darknetd.decoderawtransaction(txdata_hex) + total_in = compute_amount_in(darknetd, txinfo) total_out = compute_amount_out(txinfo) if total_in-total_out > max_fee: raise FeeError("Rejecting transaction, unreasonable fee of "+str(total_in-total_out)) @@ -221,15 +221,15 @@ def main(): parser = optparse.OptionParser(usage="%prog [options]") parser.add_option("--from", dest="fromaddresses", default=None, - help="addresses to get dashs from") + help="addresses to get darknets from") parser.add_option("--to", dest="to", default=None, - help="address to get send dashs to") + help="address to get send darknets to") parser.add_option("--amount", dest="amount", default=None, help="amount to send") parser.add_option("--fee", dest="fee", default="0.0", help="fee to include") parser.add_option("--datadir", dest="datadir", default=determine_db_dir(), - help="location of dash.conf file with RPC username/password (default: %default)") + help="location of darknet.conf file with RPC username/password (default: %default)") parser.add_option("--testnet", dest="testnet", default=False, action="store_true", help="Use the test network") parser.add_option("--dry_run", dest="dry_run", default=False, action="store_true", @@ -240,10 +240,10 @@ def main(): check_json_precision() config = read_bitcoin_config(options.datadir) if options.testnet: config['testnet'] = True - dashd = connect_JSON(config) + darknetd = connect_JSON(config) if options.amount is None: - address_summary = list_available(dashd) + address_summary = list_available(darknetd) for address,info in address_summary.iteritems(): n_transactions = len(info['outputs']) if n_transactions > 1: @@ -253,14 +253,14 @@ def main(): else: fee = Decimal(options.fee) amount = Decimal(options.amount) - while unlock_wallet(dashd) == False: + while unlock_wallet(darknetd) == False: pass # Keep asking for passphrase until they get it right - txdata = create_tx(dashd, options.fromaddresses.split(","), options.to, amount, fee) - sanity_test_fee(dashd, txdata, amount*Decimal("0.01")) + txdata = create_tx(darknetd, options.fromaddresses.split(","), options.to, amount, fee) + sanity_test_fee(darknetd, txdata, amount*Decimal("0.01")) if options.dry_run: print(txdata) else: - txid = dashd.sendrawtransaction(txdata) + txid = darknetd.sendrawtransaction(txdata) print(txid) if __name__ == '__main__': diff --git a/doc/README.md b/doc/README.md index 2dab1a7c7a848..d097422a5d50b 100644 --- a/doc/README.md +++ b/doc/README.md @@ -17,14 +17,14 @@ You need the Qt4 run-time libraries to run Dash-Qt. On Debian or Ubuntu: Unpack the files into a directory and run: -- bin/32/dash-qt (GUI, 32-bit) or bin/32/dashd (headless, 32-bit) -- bin/64/dash-qt (GUI, 64-bit) or bin/64/dashd (headless, 64-bit) +- bin/32/darknet-qt (GUI, 32-bit) or bin/32/darknetd (headless, 32-bit) +- bin/64/darknet-qt (GUI, 64-bit) or bin/64/darknetd (headless, 64-bit) ### Windows -Unpack the files into a directory, and then run dash-qt.exe. +Unpack the files into a directory, and then run darknet-qt.exe. ### OSX @@ -34,8 +34,8 @@ Drag Dash-Qt to your applications folder, and then run Dash-Qt. * See the documentation at the [Dash Wiki](https://en.bitcoin.it/wiki/Main_Page) ***TODO*** for help and more information. -* Ask for help on [#dashpay](http://webchat.freenode.net?channels=dashpay) on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net?channels=dashpay). -* Ask for help on the [DashTalk](https://dashtalk.org/) forums. +* Ask for help on [#darknetpay](http://webchat.freenode.net?channels=darknetpay) on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net?channels=darknetpay). +* Ask for help on the [DashTalk](https://darknettalk.org/) forums. Building --------------------- @@ -46,7 +46,7 @@ The following are developer notes on how to build Dash on your native platform. Development --------------------- -The Dash repo's [root README](https://github.com/dashpay/dash/blob/master/README.md) contains relevant information on the development process and automated testing. +The Dash repo's [root README](https://github.com/darknetpay/darknet/blob/master/README.md) contains relevant information on the development process and automated testing. - [Coding Guidelines](coding.md) - [Multiwallet Qt Development](multiwallet-qt.md) @@ -57,8 +57,8 @@ The Dash repo's [root README](https://github.com/dashpay/dash/blob/master/README - [Unit Tests](unit-tests.md) ### Resources -* Discuss on the [DashTalk](https://dashtalk.org/) forums, in the Development & Technical Discussion board. -* Discuss on [#dashpay](http://webchat.freenode.net/?channels=dashpay) on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net/?channels=dashpay). +* Discuss on the [DashTalk](https://darknettalk.org/) forums, in the Development & Technical Discussion board. +* Discuss on [#darknetpay](http://webchat.freenode.net/?channels=darknetpay) on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net/?channels=darknetpay). ### Miscellaneous - [Assets Attribution](assets-attribution.md) diff --git a/doc/README_windows.txt b/doc/README_windows.txt index dedbad6b722e6..27424da2560f8 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -11,13 +11,13 @@ with each other, with the help of a P2P network to check for double-spending. Setup ----- -Unpack the files into a directory and run dash-qt.exe. +Unpack the files into a directory and run darknet-qt.exe. Dash Core is the original Dash client and it builds the backbone of the network. However, it downloads and stores the entire history of Dash transactions; depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. -See the dash wiki at: +See the darknet wiki at: https://en.bitcoin.it/wiki/Main_Page ***TODO*** for more help and information. diff --git a/doc/bitcoin_logo_doxygen.png b/doc/bitcoin_logo_doxygen.png index 190d17bced8e5..3a1a9f1ae8d2b 100644 Binary files a/doc/bitcoin_logo_doxygen.png and b/doc/bitcoin_logo_doxygen.png differ diff --git a/doc/build-osx.md b/doc/build-osx.md index e4354beeee376..5663243521796 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -1,6 +1,6 @@ Mac OS X Build Instructions and Notes ==================================== -This guide will show you how to build dashd (headless client) for OSX. +This guide will show you how to build darknetd (headless client) for OSX. Notes ----- @@ -58,19 +58,19 @@ The rest of these commands are run inside brew interactive mode: /private/tmp/berkeley-db4-UGpd0O $ exit ``` -After exiting, you'll get a warning that the install is keg-only, which means it wasn't symlinked to `/usr/local`. You don't need it to link it to build dash, 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 darknet, but if you want to, here's how: $ brew link --force berkeley-db4 -### Building `dashd` +### Building `darknetd` 1. Clone the github tree to get the source code and go into the directory. - git clone https://github.com/dashpay/dash.git - cd dash + git clone https://github.com/darknetpay/darknet.git + cd darknet -2. Build dashd: +2. Build darknetd: ./autogen.sh ./configure @@ -80,7 +80,7 @@ After exiting, you'll get a warning that the install is keg-only, which means it make check -4. (Optional) You can also install dashd to your path: +4. (Optional) You can also install darknetd to your path: make install @@ -92,7 +92,7 @@ Download Qt Creator from http://www.qt.io/download/. Download the "community edi 1. Make sure you installed everything through homebrew mentioned above 2. Do a proper ./configure --with-gui=qt5 --enable-debug 3. In Qt Creator do "New Project" -> Import Project -> Import Existing Project -4. Enter "dash-qt" as project name, enter src/qt as location +4. Enter "darknet-qt" as project name, enter src/qt as location 5. Leave the file selection as it is 6. Confirm the "summary page" 7. In the "Projects" tab select "Manage Kits..." @@ -102,11 +102,11 @@ Download Qt Creator from http://www.qt.io/download/. Download the "community edi Creating a release build ------------------------ -You can ignore this section if you are building `dashd` for your own use. +You can ignore this section if you are building `darknetd` for your own use. -dashd/dash-cli binaries are not included in the Dash-Qt.app bundle. +darknetd/darknet-cli binaries are not included in the Dash-Qt.app bundle. -If you are building `dashd` or `Dash-Qt` for others, your build machine should be set up +If you are building `darknetd` or `Dash-Qt` for others, your build machine should be set up as follows for maximum compatibility: All dependencies should be compiled with these flags: @@ -121,14 +121,14 @@ bundle is packaged and signed to create the .dmg disk image that is distributed. Running ------- -It's now available at `./dashd`, provided that you are still in the `src` +It's now available at `./darknetd`, provided that you are still in the `src` directory. We have to first create the RPC configuration file, though. -Run `./dashd` to get the filename where it should be put, or just try these +Run `./darknetd` to get the filename where it should be put, or just try these commands: - echo -e "rpcuser=dashrpc\nrpcpassword=$(xxd -l 16 -p /dev/urandom)" > "/Users/${USER}/Library/Application Support/Dash/dash.conf" - chmod 600 "/Users/${USER}/Library/Application Support/Dash/dash.conf" + echo -e "rpcuser=darknetrpc\nrpcpassword=$(xxd -l 16 -p /dev/urandom)" > "/Users/${USER}/Library/Application Support/Dash/darknet.conf" + chmod 600 "/Users/${USER}/Library/Application Support/Dash/darknet.conf" The next time 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; @@ -139,6 +139,6 @@ you can monitor its process by looking at the debug.log file, like this: Other commands: ------- - ./dashd -daemon # to start the dash daemon. - ./dash-cli --help # for a list of command-line options. - ./dash-cli help # When the daemon is running, to get a list of RPC commands + ./darknetd -daemon # to start the darknet daemon. + ./darknet-cli --help # for a list of command-line options. + ./darknet-cli help # When the daemon is running, to get a list of RPC commands diff --git a/doc/build-unix.md b/doc/build-unix.md index 53966f95abb00..ef94808899fc4 100644 --- a/doc/build-unix.md +++ b/doc/build-unix.md @@ -4,7 +4,7 @@ Some notes on how to build Dash in Unix. Note --------------------- -Always use absolute paths to configure and compile dash and the dependencies, +Always use absolute paths to configure and compile darknet and the dependencies, for example, when specifying the the path of the dependency: ../dist/configure --enable-cxx --disable-shared --with-pic --prefix=$BDB_PREFIX @@ -22,7 +22,7 @@ make make install # optional ``` -This will build dash-qt as well if the dependencies are met. +This will build darknet-qt as well if the dependencies are met. Dependencies --------------------- @@ -111,12 +111,12 @@ libqrencode (optional) can be installed with: sudo apt-get install libqrencode-dev -Once these are installed, they will be found by configure and a dash-qt executable will be +Once these are installed, they will be found by configure and a darknet-qt executable will be built by default. Notes ----- -The release is built with GCC and then "strip dashd" to strip the debug +The release is built with GCC and then "strip darknetd" to strip the debug symbols, which reduces the executable size by about 90%. @@ -145,10 +145,10 @@ Berkeley DB It is recommended to use Berkeley DB 4.8. If you have to build it yourself: ```bash -DASH_ROOT=$(pwd) +DNET_ROOT=$(pwd) -# Pick some path to install BDB to, here we create a directory within the dash directory -BDB_PREFIX="${DASH_ROOT}/db4" +# Pick some path to install BDB to, here we create a directory within the darknet directory +BDB_PREFIX="${DNET_ROOT}/db4" mkdir -p $BDB_PREFIX # Fetch the source and verify that it is not tampered with @@ -164,7 +164,7 @@ cd db-4.8.30.NC/build_unix/ make install # Configure Dash Core to use our own-built instance of BDB -cd $DASH_ROOT +cd $DNET_ROOT ./configure (other args...) LDFLAGS="-L${BDB_PREFIX}/lib/" CPPFLAGS="-I${BDB_PREFIX}/include/" ``` @@ -205,7 +205,7 @@ Hardening enables the following features: To test that you have built PIE executable, install scanelf, part of paxutils, and use: - scanelf -e ./dashd + scanelf -e ./darknetd The output should contain: TYPE @@ -213,13 +213,13 @@ Hardening enables the following features: * Non-executable Stack If the stack is executable then trivial stack based buffer overflow exploits are possible if - vulnerable buffers are found. By default, dash should be built with a non-executable stack + vulnerable buffers are found. By default, darknet should be built with a non-executable stack but if one of the libraries it uses asks for an executable stack or someone makes a mistake and uses a compiler extension which requires an executable stack, it will silently build an executable without the non-executable stack protection. To verify that the stack is non-executable after compiling use: - `scanelf -e ./dashd` + `scanelf -e ./darknetd` the output should contain: STK/REL/PTL @@ -229,7 +229,7 @@ Hardening enables the following features: Disable-wallet mode -------------------- -When the intention is to run only a P2P node without a wallet, dash may be compiled in +When the intention is to run only a P2P node without a wallet, darknet may be compiled in disable-wallet mode with: ./configure --disable-wallet diff --git a/doc/coding.md b/doc/coding.md index 8827d2c690b77..40b5d355544f9 100644 --- a/doc/coding.md +++ b/doc/coding.md @@ -119,7 +119,7 @@ Threads - ThreadMapPort : Universal plug-and-play startup/shutdown -- ThreadSocketHandler : Sends/Receives data from peers on port 9999. +- ThreadSocketHandler : Sends/Receives data from peers on port 51472. - ThreadOpenAddedConnections : Opens network connections to added nodes. @@ -131,7 +131,7 @@ Threads - ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used in 500ms. -- ThreadRPCServer : Remote procedure call handler, listens on port 9998 for connections and services them. +- ThreadRPCServer : Remote procedure call handler, listens on port 51473 for connections and services them. - BitcoinMiner : Generates bitcoins (if wallet is enabled). diff --git a/doc/gitian-building.md b/doc/gitian-building.md index d287c675ec5eb..406e3cda522a3 100644 --- a/doc/gitian-building.md +++ b/doc/gitian-building.md @@ -1,9 +1,9 @@ Gitian building ================ -*Setup instructions for a gitian build of Dash using a Debian VM or physical system.* +*Setup instructions for a gitian build of DarkNet using a Debian VM or physical system.* -Gitian is the deterministic build process that is used to build the Dash +Gitian is the deterministic build process that is used to build the DarkNet Core executables. It provides a way to be reasonably sure that the executables are really built from source on GitHub. It also makes sure that the same, tested dependencies are used and statically built into the executable. @@ -11,7 +11,7 @@ the same, tested dependencies are used and statically built into the executable. Multiple developers build the source code by following a specific descriptor ("recipe"), cryptographically sign the result, and upload the resulting signature. These results are compared and only if they match, the build is accepted and uploaded -to dashpay.io. +to darknet-crypto.com. More independent gitian builders are needed, which is why I wrote this guide. It is preferred to follow these steps yourself instead of using someone else's @@ -26,7 +26,7 @@ Table of Contents - [Installing gitian](#installing-gitian) - [Setting up gitian images](#setting-up-gitian-images) - [Getting and building the inputs](#getting-and-building-the-inputs) -- [Building Dash](#building-dash) +- [Building DarkNet](#building-darknet) - [Building an alternative repository](#building-an-alternative-repository) - [Signing externally](#signing-externally) - [Uploading signatures](#uploading-signatures) @@ -277,12 +277,12 @@ cd .. **Note**: When sudo asks for a password, enter the password for the user *debian* not for *root*. -Clone the git repositories for dash and gitian and then checkout the dash version that you want to build. +Clone the git repositories for darknet and gitian and then checkout the darknet version that you want to build. ```bash git clone https://github.com/devrandom/gitian-builder.git -git clone https://github.com/dashpay/dash.git -cd dash +git clone https://github.com/darknetpay/darknet.git +cd darknet git checkout v${VERSION} cd .. ``` @@ -321,16 +321,16 @@ There will be a lot of warnings printed during build of the images. These can be Getting and building the inputs -------------------------------- -Follow the instructions in [doc/release-process.md](release-process.md) in the dash repository +Follow the instructions in [doc/release-process.md](release-process.md) in the darknet repository under 'Fetch and build inputs' to install sources which require manual intervention. Also follow the next step: 'Seed the Gitian sources cache', which will fetch all necessary source files allowing for gitian to work offline. -Building Dash +Building DarkNet ---------------- -To build Dash (for Linux, OSX and Windows) just follow the steps under 'perform -gitian builds' in [doc/release-process.md](release-process.md) in the dash repository. +To build DarkNet (for Linux, OSX and Windows) just follow the steps under 'perform +gitian builds' in [doc/release-process.md](release-process.md) in the darknet repository. This may take a long time as it also builds the dependencies needed for each descriptor. These dependencies will be cached after a successful build to avoid rebuilding them when possible. @@ -345,12 +345,12 @@ tail -f var/build.log Output from `gbuild` will look something like ```bash - Initialized empty Git repository in /home/debian/gitian-builder/inputs/dash/.git/ + Initialized empty Git repository in /home/debian/gitian-builder/inputs/darknet/.git/ remote: Reusing existing pack: 35606, done. remote: Total 35606 (delta 0), reused 0 (delta 0) Receiving objects: 100% (35606/35606), 26.52 MiB | 4.28 MiB/s, done. Resolving deltas: 100% (25724/25724), done. - From https://github.com/dashpay/dash + From https://github.com/darknetpay/darknet ... (new tags, new branch etc) --- Building for precise x86_64 --- Stopping target if it is up @@ -377,11 +377,11 @@ and inputs. For example: ```bash -URL=https://github.com/crowning-/dash.git +URL=https://github.com/crowning-/darknet.git COMMIT=b616fb8ef0d49a919b72b0388b091aaec5849b96 -./bin/gbuild --commit dash=${COMMIT} --url dash=${URL} ../dash/contrib/gitian-descriptors/gitian-linux.yml -./bin/gbuild --commit dash=${COMMIT} --url dash=${URL} ../dash/contrib/gitian-descriptors/gitian-win.yml -./bin/gbuild --commit dash=${COMMIT} --url dash=${URL} ../dash/contrib/gitian-descriptors/gitian-osx.yml +./bin/gbuild --commit darknet=${COMMIT} --url darknet=${URL} ../darknet/contrib/gitian-descriptors/gitian-linux.yml +./bin/gbuild --commit darknet=${COMMIT} --url darknet=${URL} ../darknet/contrib/gitian-descriptors/gitian-win.yml +./bin/gbuild --commit darknet=${COMMIT} --url darknet=${URL} ../darknet/contrib/gitian-descriptors/gitian-osx.yml ``` Signing externally @@ -396,9 +396,9 @@ When you execute `gsign` you will get an error from GPG, which can be ignored. C in `gitian.sigs` to your signing machine and do ```bash - gpg --detach-sign ${VERSION}-linux/${SIGNER}/dash-build.assert - gpg --detach-sign ${VERSION}-win/${SIGNER}/dash-build.assert - gpg --detach-sign ${VERSION}-osx/${SIGNER}/dash-build.assert + gpg --detach-sign ${VERSION}-linux/${SIGNER}/darknet-build.assert + gpg --detach-sign ${VERSION}-win/${SIGNER}/darknet-build.assert + gpg --detach-sign ${VERSION}-osx/${SIGNER}/darknet-build.assert ``` This will create the `.sig` files that can be committed together with the `.assert` files to assert your @@ -408,6 +408,6 @@ Uploading signatures (not yet implemented) --------------------- In the future it will be possible to push your signatures (both the `.assert` and `.assert.sig` files) to the -[dash/gitian.sigs](https://github.com/dashpay/gitian.sigs/) repository, or if that's not possible to create a pull +[darknet/gitian.sigs](https://github.com/darknetpay/gitian.sigs/) repository, or if that's not possible to create a pull request. There will be an official announcement when this repository is online. diff --git a/doc/guide-startmany.md b/doc/guide-startmany.md index 322fec1dc78ba..8deb9d56251e9 100644 --- a/doc/guide-startmany.md +++ b/doc/guide-startmany.md @@ -4,7 +4,7 @@ There are many ways to setup a wallet to support start-many. This guide will walk through two of them. 1. [Importing an existing wallet (recommended if you are consolidating wallets).](#option1) -2. [Sending 1,000 DASH to new wallet addresses.](#option2) +2. [Sending 1,000 DNET to new wallet addresses.](#option2) ## Option 1. Importing an existing wallet @@ -56,9 +56,9 @@ Create a new wallet address for each MasterNode. Close your QT Wallet. -### Send 1,000 DASH to New Addresses +### Send 1,000 DNET to New Addresses -Just like setting up a standard MN. Send exactly 1,000 DASH to each new address created above. +Just like setting up a standard MN. Send exactly 1,000 DNET to each new address created above. ### Create New Masternode Private Keys @@ -78,11 +78,11 @@ Remember... this is local. Make sure your QT is not running. Create the masternode.conf file in the same directory as your wallet.dat. -Copy the masternode private key and correspondig collateral output transaction that holds the 1K DASH. +Copy the masternode private key and correspondig collateral output transaction that holds the 1K DNET. The masternode private key may be an existing key from [Option 1](#option1), or a newly generated key from [Option 2](#option2). -*Please note, the masternode priviate key is not the same as a wallet private key. Never put your wallet private key in the masternode.conf file. That is equivalent to putting your 1,000 DASH on the remote server and defeats the purpose of a hot/cold setup.* +*Please note, the masternode priviate key is not the same as a wallet private key. Never put your wallet private key in the masternode.conf file. That is equivalent to putting your 1,000 DNET on the remote server and defeats the purpose of a hot/cold setup.* ### Get the collateral output @@ -95,7 +95,7 @@ Issue the following: Make note of the hash (which is your collaterla_output) and index. ### Enter your MasterNode details into your masternode.conf file -[From the dash github repo](https://github.com/darkcoin/darkcoin/blob/master/doc/masternode_conf.md) +[From the darknet github repo](https://github.com/darkcoin/darkcoin/blob/master/doc/masternode_conf.md) The new masternode.conf format consists of a space seperated text file. Each line consisting of an alias, IP address followed by port, masternode private key, collateral output transaction id and collateral output index, donation address and donation percentage (the latter two are optional and should be in format "address:percentage"). @@ -108,24 +108,24 @@ alias ipaddress:port masternode_private_key collateral_output collateral_output_ Example: ``` -mn01 127.0.0.1:9999 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0 -mn02 127.0.0.2:9999 93WaAb3htPJEV8E9aQcN23Jt97bPex7YvWfgMDTUdWJvzmrMqey aa9f1034d973377a5e733272c3d0eced1de22555ad45d6b24abadff8087948d4 0 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh:25 +mn01 127.0.0.1:51472 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0 +mn02 127.0.0.2:51472 93WaAb3htPJEV8E9aQcN23Jt97bPex7YvWfgMDTUdWJvzmrMqey aa9f1034d973377a5e733272c3d0eced1de22555ad45d6b24abadff8087948d4 0 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh:25 ``` -## What about the dash.conf file? +## What about the darknet.conf file? -If you are using a masternode.conf file you no longer need the dash.conf file. The exception is if you need custom settings (thanks oblox). +If you are using a masternode.conf file you no longer need the darknet.conf file. The exception is if you need custom settings (thanks oblox). -## Update dash.conf on server +## Update darknet.conf on server -If you generated a new masternode private key, you will need to update the remote dash.conf files. +If you generated a new masternode private key, you will need to update the remote darknet.conf files. Shut down the daemon and then edit the file. -```sudo nano .dash/dash.conf``` +```sudo nano .darknet/darknet.conf``` ### Edit the masternodeprivkey -If you generated a new masternode private key, you will need to update the masternodeprivkey value in your remote dash.conf file. +If you generated a new masternode private key, you will need to update the masternodeprivkey value in your remote darknet.conf file. ## Start your MasterNodes @@ -135,9 +135,9 @@ If your remote server is not running, start your remote daemon as you normally w I usually confirm that remote is on the correct block by issuing: -```dashd getinfo``` +```darknetd getinfo``` -And compare with the official explorer at http://explorer.dashpay.io/chain/Dash +And compare with the official explorer at http://darknetexplorer.coin-server.com ### Local diff --git a/doc/keepass.md b/doc/keepass.md index 6b9756f77e854..3c9b25db1c4af 100644 --- a/doc/keepass.md +++ b/doc/keepass.md @@ -12,7 +12,7 @@ The implementation is dependent on the following: ###What's new### -The following new options are available for dashd and dash-qt: +The following new options are available for darknetd and darknet-qt: - _-keepass_ Use KeePass 2 integration using KeePassHttp plugin (default: 0) - _-keepassport=_ Connect to KeePassHttp on port (default: 19455) - _-keepasskey=_ KeePassHttp key for AES encrypted communication with KeePass @@ -22,27 +22,27 @@ The following new options are available for dashd and dash-qt: The following rpc commands are available: - _keepass genkey_: generates a base64 encoded 256 bit AES key that can be used for the communication with KeePassHttp. Only necessary for manual configuration. Use init for automatic configuration. - - _keepass init_: sets up the association between dashd and keepass by generating an AES key and sending an association message to KeePassHttp. This will trigger KeePass to ask for an Id for the association. Returns the association and the base64 encoded string for the AES key. + - _keepass init_: sets up the association between darknetd and keepass by generating an AES key and sending an association message to KeePassHttp. This will trigger KeePass to ask for an Id for the association. Returns the association and the base64 encoded string for the AES key. - _keepass setpassphrase_: updates the passphrase in KeePassHttp to a new value. This should match the passphrase you intend to use for the wallet. Please note that the standard RPC commands _walletpassphrasechange_ and the wallet encrption from the QT GUI already send the updates to KeePassHttp, so this is only necessary for manual manipulation of the password. ###How to setup### -Sample initialization flow from _dash-qt_ console (this needs to be done only once to set up the association): +Sample initialization flow from _darknet-qt_ console (this needs to be done only once to set up the association): - Have KeePass running with an open database - - Start _dash-qt_ + - Start _darknet-qt_ - Open console - - Type "_keepass init_" in dash-qt console + - Type "_keepass init_" in darknet-qt console - Keepass pops up and asks for an association id, fill that in, for example, "_mydrkwallet_" - - You should get a response like this "_Association successful. Id: mydrkwalletdash - Key: AgQkcs6cI7v9tlSYKjG/+s8wJrGALHl3jLosJpPLzUE=_" - - Edit _dash.conf_ and fill in these values + - You should get a response like this "_Association successful. Id: mydrkwalletdarknet - Key: AgQkcs6cI7v9tlSYKjG/+s8wJrGALHl3jLosJpPLzUE=_" + - Edit _darknet.conf_ and fill in these values ``` keepass=1 keepasskey=AgQkcs6cI7v9tlSYKjG/+s8wJrGALHl3jLosJpPLzUE= keepassid=mydrkwallet keepassname=testwallet ``` - - Restart _dash-qt_ + - Restart _darknet-qt_ At this point, the association is made. The next action depends on your particular situation: @@ -51,4 +51,4 @@ At this point, the association is made. The next action depends on your particul At this point, the passphrase is stored in KeePassHttp. When Unlocking the wallet, one can use _keepass_ as the passphrase to trigger retrieval of the password. This works from the RPC commands as well as the GUI. -Extended guide with screenshots is also available: https://dashtalk.org/threads/keepass-integration.3620/ +Extended guide with screenshots is also available: https://darknettalk.org/threads/keepass-integration.3620/ diff --git a/doc/masternode-budget.md b/doc/masternode-budget.md index 2189d9d66e4b3..a06c5496607c2 100644 --- a/doc/masternode-budget.md +++ b/doc/masternode-budget.md @@ -16,13 +16,13 @@ Budgets go through a series of stages before being paid: 1. Prepare collateral transaction -- -mnbudget prepare proposal-name url payment_count block_start dash_address monthly_payment_dash [use_ix(true|false)] +mnbudget prepare proposal-name url payment_count block_start darknet_address monthly_payment_darknet [use_ix(true|false)] Example: ```mnbudget prepare cool-project http://www.cool-project/one.json 12 100000 y6R9oN12KnB9zydzTLc3LikD9cCjjQzYG7 1200 true``` Output: ```464a0eb70ea91c94295214df48c47baa72b3876cfb658744aaf863c7b5bf1ff0``` - This is the collateral hash, copy this output for the next step -In this transaction we prepare collateral for "_cool-project_". This proposal will pay _1200_ DASH, _12_ times over the course of a year totaling _24000_ DASH. +In this transaction we prepare collateral for "_cool-project_". This proposal will pay _1200_ DNET, _12_ times over the course of a year totaling _24000_ DNET. **Warning -- if you change any fields within this command, the collateral transaction will become invalid.** @@ -111,7 +111,7 @@ After you get enough votes, execute ```mnbudget projection``` to see if you made 6. Get paid -- -When block ```1000000``` is reached you'll receive a payment for ```1200``` DASH. +When block ```1000000``` is reached you'll receive a payment for ```1200``` DNET. The following new RPC commands are supported: - mnbudget "command"... ( "passphrase" ) diff --git a/doc/masternode_conf.md b/doc/masternode_conf.md index 0cb343e11b7cd..a1defe0ea94b8 100644 --- a/doc/masternode_conf.md +++ b/doc/masternode_conf.md @@ -4,19 +4,19 @@ Multi masternode config The multi masternode config allows to control multiple masternodes from a single wallet. The wallet needs to have a valid collaral output of 1000 coins for each masternode. To use this, place a file named masternode.conf in the data directory of your install: * Windows: %APPDATA%\Dash\ * Mac OS: ~/Library/Application Support/Dash/ - * Unix/Linux: ~/.dash/ + * Unix/Linux: ~/.darknet/ The new masternode.conf format consists of a space seperated text file. Each line consisting of an alias, IP address followed by port, masternode private key, collateral output transaction id, collateral output index, donation address and donation percentage (the latter two are optional and should be in format "address:percentage"). Example: ``` -mn1 127.0.0.2:19999 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0 -mn2 127.0.0.3:19999 93WaAb3htPJEV8E9aQcN23Jt97bPex7YvWfgMDTUdWJvzmrMqey aa9f1034d973377a5e733272c3d0eced1de22555ad45d6b24abadff8087948d4 0 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh:33 -mn3 127.0.0.4:19999 92Da1aYg6sbenP6uwskJgEY2XWB5LwJ7bXRqc3UPeShtHWJDjDv db478e78e3aefaa8c12d12ddd0aeace48c3b451a8b41c570d0ee375e2a02dfd9 1 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh +mn1 127.0.0.2:51474 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0 +mn2 127.0.0.3:51474 93WaAb3htPJEV8E9aQcN23Jt97bPex7YvWfgMDTUdWJvzmrMqey aa9f1034d973377a5e733272c3d0eced1de22555ad45d6b24abadff8087948d4 0 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh:33 +mn3 127.0.0.4:51474 92Da1aYg6sbenP6uwskJgEY2XWB5LwJ7bXRqc3UPeShtHWJDjDv db478e78e3aefaa8c12d12ddd0aeace48c3b451a8b41c570d0ee375e2a02dfd9 1 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh ``` In the example above: -* the collateral for mn1 consists of transaction http://test.explorer.dash.fr/tx/2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c, output index 0 has amount 1000 +* the collateral for mn1 consists of transaction http://test.explorer.darknet.fr/tx/2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c, output index 0 has amount 1000 * masternode 2 will donate 33% of its income * masternode 3 will donate 100% of its income diff --git a/doc/multiwallet-qt.md b/doc/multiwallet-qt.md index 3f8b2b2f94750..a88fccbba3c0a 100644 --- a/doc/multiwallet-qt.md +++ b/doc/multiwallet-qt.md @@ -10,7 +10,7 @@ implemented in the BitcoinGUI class moved over to these new classes. The two existing files most affected, by far, are bitcoingui.h and bitcoingui.cpp, as the BitcoinGUI class will require some major retrofitting. -Only requiring some minor changes is dash.cpp. +Only requiring some minor changes is darknet.cpp. Finally, two new headers and source files will have to be added to bitcoin-qt.pro. @@ -30,9 +30,9 @@ that takes the place of what used to be centralWidget in BitcoinGUI. The purpose refinements of the wallet controls with minimal need for further modifications to BitcoinGUI, thus greatly simplifying merges while reducing the risk of breaking top-level stuff. -Changes to dash.cpp +Changes to darknet.cpp ---------------------- -dash.cpp is the entry point into bitcoin-qt, and as such, will require some minor modifications to provide hooks for +darknet.cpp is the entry point into bitcoin-qt, and as such, will require some minor modifications to provide hooks for multiple wallet support. Most importantly will be the way it instantiates WalletModels and passes them to the singleton BitcoinGUI instance called window. Formerly, BitcoinGUI kept a pointer to a single instance of a WalletModel. The initial change required is very simple: rather than calling `window.setWalletModel(&walletModel);` we perform the diff --git a/doc/release-notes.md b/doc/release-notes.md index 3fc3eee20de10..a912c35a71c3b 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -2,7 +2,7 @@ Dash Core 0.12 ================== Dash Core tree 0.12.x release notes can be found here: -- [v0.12.0](release-notes/dash/release-notes-0.12.0.md) +- [v0.12.0](release-notes/darknet/release-notes-0.12.0.md) Dash Core tree 0.12.x is a fork of Bitcoin Core tree 0.10.2 @@ -19,7 +19,7 @@ which was first released on Jan/18/2014. Darkcoin tree 0.9.x was the open source implementation of masternodes based on the 0.8.x tree and was first released on Mar/13/2014. -Darkcoin tree 0.10.x used to be the closed source implementation of Darksend +Darkcoin tree 0.10.x used to be the closed source implementation of Obfuscate which was released open source on Sep/25/2014. Dash Core tree 0.11.x was a fork of Bitcoin Core tree 0.9, Darkcoin was rebranded @@ -27,8 +27,8 @@ to Dash. These release are considered obsolete. Old changelogs can be found here: -- [v0.11.2](release-notes/dash/release-notes-0.11.2.md) released Mar/25/2015 -- [v0.11.1](release-notes/dash/release-notes-0.11.1.md) released Feb/10/2015 -- [v0.11.0](release-notes/dash/release-notes-0.11.0.md) released Jan/15/2015 -- [v0.10.x](release-notes/dash/release-notes-0.10.0.md) released Sep/25/2014 -- [v0.9.x](release-notes/dash/release-notes-0.9.0.md) released Mar/13/2014 +- [v0.11.2](release-notes/darknet/release-notes-0.11.2.md) released Mar/25/2015 +- [v0.11.1](release-notes/darknet/release-notes-0.11.1.md) released Feb/10/2015 +- [v0.11.0](release-notes/darknet/release-notes-0.11.0.md) released Jan/15/2015 +- [v0.10.x](release-notes/darknet/release-notes-0.10.0.md) released Sep/25/2014 +- [v0.9.x](release-notes/darknet/release-notes-0.9.0.md) released Mar/13/2014 diff --git a/doc/release-notes/bitcoin/release-notes-0.3.20.2.md b/doc/release-notes/bitcoin/release-notes-0.3.20.2.md index 10ad2251439ee..3ce05c612113e 100644 --- a/doc/release-notes/bitcoin/release-notes-0.3.20.2.md +++ b/doc/release-notes/bitcoin/release-notes-0.3.20.2.md @@ -9,7 +9,7 @@ The Amazon Machine Images I used to do the builds are available: (mac build will be done soon) -If you have already downloaded version 0.3.20.1, please either add this to your dash.conf file: +If you have already downloaded version 0.3.20.1, please either add this to your darknet.conf file: maxsendbuffer=10000 maxreceivebuffer=10000 diff --git a/doc/release-notes/bitcoin/release-notes-0.4.3.md b/doc/release-notes/bitcoin/release-notes-0.4.3.md index fea1ae75b5e82..6a33e50c69abb 100644 --- a/doc/release-notes/bitcoin/release-notes-0.4.3.md +++ b/doc/release-notes/bitcoin/release-notes-0.4.3.md @@ -1,5 +1,5 @@ bitcoind version 0.4.3 is now available for download at: -http://luke.dashjr.org/programs/bitcoin/files/bitcoind-0.4.3/ (until Gavin uploads to SourceForge) +http://luke.darknetjr.org/programs/bitcoin/files/bitcoind-0.4.3/ (until Gavin uploads to SourceForge) This is a bugfix-only release based on 0.4.0. diff --git a/doc/release-notes/bitcoin/release-notes-0.4.4.md b/doc/release-notes/bitcoin/release-notes-0.4.4.md index f435ba71604df..5316ddb1de49a 100644 --- a/doc/release-notes/bitcoin/release-notes-0.4.4.md +++ b/doc/release-notes/bitcoin/release-notes-0.4.4.md @@ -1,5 +1,5 @@ Bitcoin version 0.4.4 is now available for download at: -http://luke.dashjr.org/programs/bitcoin/files/bitcoind-0.4.4/ +http://luke.darknetjr.org/programs/bitcoin/files/bitcoind-0.4.4/ This is a bugfix-only release based on 0.4.0. diff --git a/doc/release-notes/bitcoin/release-notes-0.7.1.md b/doc/release-notes/bitcoin/release-notes-0.7.1.md index 0704419582fff..2ba975bcc7156 100644 --- a/doc/release-notes/bitcoin/release-notes-0.7.1.md +++ b/doc/release-notes/bitcoin/release-notes-0.7.1.md @@ -77,7 +77,7 @@ Bug fixes * Clicking on a bitcoin: URI on Windows should now launch Bitcoin-Qt properly. -* When running -testnet, use RPC port 19998 by default. +* When running -testnet, use RPC port 51475 by default. * Better detection and handling of corrupt wallet.dat and blkindex.dat files. Previous versions would crash with a DB_RUNRECOVERY exception, this diff --git a/doc/release-notes/bitcoin/release-notes-0.8.0.md b/doc/release-notes/bitcoin/release-notes-0.8.0.md index 1825269f5c9a4..9d8e192d21b24 100644 --- a/doc/release-notes/bitcoin/release-notes-0.8.0.md +++ b/doc/release-notes/bitcoin/release-notes-0.8.0.md @@ -61,7 +61,7 @@ contrib/spendfrom is a python-language command-line utility that demonstrates how to use the "raw transactions" JSON-RPC api to send coins received from particular addresses (also known as "coin control"). -New/changed settings (command-line or dash.conf file) +New/changed settings (command-line or darknet.conf file) -------------------------------------------------------- dbcache : controls LevelDB memory usage. diff --git a/doc/release-notes/dash/release-notes-0.10.0.md b/doc/release-notes/dash/release-notes-0.10.0.md index 2537421183fd9..4f5cc2a4f4d9b 100644 --- a/doc/release-notes/dash/release-notes-0.10.0.md +++ b/doc/release-notes/dash/release-notes-0.10.0.md @@ -629,11 +629,11 @@ However, there are some known issues: Testing commands, you can start multiple wallets up and all denominate on the same masternode for testing purposes: -/darkcoin-qt -datadir=/home/user/.darkcoin -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:19999" -/darkcoin-qt -datadir=/home/user/.darkcoin2 -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:19999" +/darkcoin-qt -datadir=/home/user/.darkcoin -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:51474" +/darkcoin-qt -datadir=/home/user/.darkcoin2 -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:51474" and even disable darksend auto-denom if wanted: -/darkcoin-qt -datadir=/home/user/.darkcoin -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:19999" -disabledarksend=1 +/darkcoin-qt -datadir=/home/user/.darkcoin -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:51474" -disabledarksend=1 0.10.12.7 Release notes @@ -664,7 +664,7 @@ and even disable darksend auto-denom if wanted: - Masternodes should change every block now - DoAutomaticDenomination should happen every block now -- DarkSendRounds had a bug that I fixed, should calculate correctly now +- DarksendRounds had a bug that I fixed, should calculate correctly now 0.10.12.4 Release notes diff --git a/doc/release-notes/dash/release-notes-0.11.0.md b/doc/release-notes/dash/release-notes-0.11.0.md index 5a4a69cdfa155..75f5b601b9dc6 100644 --- a/doc/release-notes/dash/release-notes-0.11.0.md +++ b/doc/release-notes/dash/release-notes-0.11.0.md @@ -100,13 +100,13 @@ Command-line options: - New option: -nospendzeroconfchange to never spend unconfirmed change outputs - New option: -zapwallettxes to rebuild the wallet's transaction information - Rename option '-tor' to '-onion' to better reflect what it does -- Add '-disablewallet' mode to let dashd run entirely without wallet (when +- Add '-disablewallet' mode to let darknetd run entirely without wallet (when built with wallet) - Update default '-rpcsslciphers' to include TLSv1.2 - make '-logtimestamps' default on and rework help-message - RPC client option: '-rpcwait', to wait for server start - Remove '-logtodebugger' -- Allow `-noserver` with dashd +- Allow `-noserver` with darknetd - Make -proxy set all network types, avoiding a connect leak. diff --git a/doc/release-notes/dash/release-notes-0.11.2.md b/doc/release-notes/dash/release-notes-0.11.2.md index 9679921104ebf..9fbffd7dfaf53 100644 --- a/doc/release-notes/dash/release-notes-0.11.2.md +++ b/doc/release-notes/dash/release-notes-0.11.2.md @@ -64,7 +64,7 @@ How to Upgrade If you are running an older version, shut it down. Wait until it has completely shut down (which might take a few minutes for older versions), then run the installer (on Windows) or just copy over /Applications/Dash-Qt (on Mac) or -dashd/dash-qt (on Linux). +darknetd/darknet-qt (on Linux). 0.11.2 changelog diff --git a/doc/release-notes/dash/release-notes-0.12.0.md b/doc/release-notes/dash/release-notes-0.12.0.md index 6bae7f87ce229..382f5029de446 100644 --- a/doc/release-notes/dash/release-notes-0.12.0.md +++ b/doc/release-notes/dash/release-notes-0.12.0.md @@ -8,7 +8,7 @@ Dash Core version 0.12.0 is now available from: Please report bugs using the issue tracker at github: - https://github.com/dashpay/dash/issues + https://github.com/darknetpay/darknet/issues How to Upgrade @@ -17,7 +17,7 @@ How to Upgrade If you are running an older version, shut it down. Wait until it has completely shut down (which might take a few minutes for older versions), then run the installer (on Windows) or just copy over /Applications/Dash-Qt (on Mac) or -dashd/dash-qt (on Linux). +darknetd/darknet-qt (on Linux). **This new version uses transaction indexing by default, you will need to reindex the blockchain. To do so, start the client with --reindex.** @@ -100,4 +100,4 @@ AlexMomo snogcel bertlebbert -As well as everyone that helped translating on [Transifex](https://www.transifex.com/projects/p/dash/). +As well as everyone that helped translating on [Transifex](https://www.transifex.com/projects/p/darknet/). diff --git a/doc/release-notes/dash/release-notes-0.9.0.md b/doc/release-notes/dash/release-notes-0.9.0.md index 4ba52b4fb63f9..faf37a1acda74 100644 --- a/doc/release-notes/dash/release-notes-0.9.0.md +++ b/doc/release-notes/dash/release-notes-0.9.0.md @@ -448,11 +448,11 @@ However, there are some known issues: Testing commands, you can start multiple wallets up and all denominate on the same masternode for testing purposes: -/darkcoin-qt -datadir=/home/user/.darkcoin -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:19999" -/darkcoin-qt -datadir=/home/user/.darkcoin2 -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:19999" +/darkcoin-qt -datadir=/home/user/.darkcoin -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:51474" +/darkcoin-qt -datadir=/home/user/.darkcoin2 -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:51474" and even disable darksend auto-denom if wanted: -/darkcoin-qt -datadir=/home/user/.darkcoin -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:19999" -disabledarksend=1 +/darkcoin-qt -datadir=/home/user/.darkcoin -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:51474" -disabledarksend=1 0.9.12.7 Release notes @@ -483,7 +483,7 @@ and even disable darksend auto-denom if wanted: - Masternodes should change every block now - DoAutomaticDenomination should happen every block now -- DarkSendRounds had a bug that I fixed, should calculate correctly now +- DarksendRounds had a bug that I fixed, should calculate correctly now 0.9.12.4 Release notes diff --git a/doc/release-process.md b/doc/release-process.md index 250eb63b80c94..21f01052df7f7 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -2,7 +2,7 @@ Release Process ==================== * update translations (ping wumpus, Diapolo or tcatm on IRC) -* see https://github.com/dashpay/dash/blob/master/doc/translation_process.md#syncing-with-transifex +* see https://github.com/darknetpay/darknet/blob/master/doc/translation_process.md#syncing-with-transifex * * * @@ -33,7 +33,7 @@ Release Process export SIGNER=(your gitian key, ie bluematt, sipa, etc) export VERSION=(new version, e.g. 0.8.0) - pushd ./dash + pushd ./darknet git checkout v${VERSION} popd pushd ./gitian-builder @@ -54,29 +54,29 @@ Release Process By default, gitian will fetch source files as needed. For offline builds, they can be fetched ahead of time: - make -C ../dash/depends download SOURCES_PATH=`pwd`/cache/common + make -C ../darknet/depends download SOURCES_PATH=`pwd`/cache/common Only missing files will be fetched, so this is safe to re-run for each build. -###Build Dash Core for Linux, Windows, and OS X: - - ./bin/gbuild --commit dash=v${VERSION} ../dash/contrib/gitian-descriptors/gitian-linux.yml - ./bin/gsign --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../dash/contrib/gitian-descriptors/gitian-linux.yml - mv build/out/dash-*.tar.gz build/out/src/dash-*.tar.gz ../ - ./bin/gbuild --commit dash=v${VERSION} ../dash/contrib/gitian-descriptors/gitian-win.yml - ./bin/gsign --signer $SIGNER --release ${VERSION}-win --destination ../gitian.sigs/ ../dash/contrib/gitian-descriptors/gitian-win.yml - mv build/out/dash-*.zip build/out/dash-*.exe ../ - ./bin/gbuild --commit bitcoin=v${VERSION} ../dash/contrib/gitian-descriptors/gitian-osx.yml - ./bin/gsign --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../dash/contrib/gitian-descriptors/gitian-osx.yml - mv build/out/dash-*-unsigned.tar.gz inputs/dash-osx-unsigned.tar.gz - mv build/out/dash-*.tar.gz build/out/dash-*.dmg ../ +###Build DarkNet Core for Linux, Windows, and OS X: + + ./bin/gbuild --commit darknet=v${VERSION} ../darknet/contrib/gitian-descriptors/gitian-linux.yml + ./bin/gsign --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../darknet/contrib/gitian-descriptors/gitian-linux.yml + mv build/out/darknet-*.tar.gz build/out/src/darknet-*.tar.gz ../ + ./bin/gbuild --commit darknet=v${VERSION} ../darknet/contrib/gitian-descriptors/gitian-win.yml + ./bin/gsign --signer $SIGNER --release ${VERSION}-win --destination ../gitian.sigs/ ../darknet/contrib/gitian-descriptors/gitian-win.yml + mv build/out/darknet-*.zip build/out/darknet-*.exe ../ + ./bin/gbuild --commit bitcoin=v${VERSION} ../darknet/contrib/gitian-descriptors/gitian-osx.yml + ./bin/gsign --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../darknet/contrib/gitian-descriptors/gitian-osx.yml + mv build/out/darknet-*-unsigned.tar.gz inputs/darknet-osx-unsigned.tar.gz + mv build/out/darknet-*.tar.gz build/out/darknet-*.dmg ../ popd Build output expected: - 1. source tarball (dash-${VERSION}.tar.gz) - 2. linux 32-bit and 64-bit binaries dist tarballs (dash-${VERSION}-linux[32|64].tar.gz) - 3. windows 32-bit and 64-bit installers and dist zips (dash-${VERSION}-win[32|64]-setup.exe, dash-${VERSION}-win[32|64].zip) - 4. OSX unsigned installer (dash-${VERSION}-osx-unsigned.dmg) + 1. source tarball (darknet-${VERSION}.tar.gz) + 2. linux 32-bit and 64-bit binaries dist tarballs (darknet-${VERSION}-linux[32|64].tar.gz) + 3. windows 32-bit and 64-bit installers and dist zips (darknet-${VERSION}-win[32|64]-setup.exe, darknet-${VERSION}-win[32|64].zip) + 4. OSX unsigned installer (darknet-${VERSION}-osx-unsigned.dmg) 5. Gitian signatures (in gitian.sigs/${VERSION}-/(your gitian key)/ ###Next steps: @@ -100,9 +100,9 @@ Commit your signature to gitian.sigs: pushd ./gitian-builder # Fetch the signature as instructed by Evan cp signature.tar.gz inputs/ - ./bin/gbuild -i ../dash/contrib/gitian-descriptors/gitian-osx-signer.yml - ./bin/gsign --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../dash/contrib/gitian-descriptors/gitian-osx-signer.yml - mv build/out/dash-osx-signed.dmg ../dash-${VERSION}-osx.dmg + ./bin/gbuild -i ../darknet/contrib/gitian-descriptors/gitian-osx-signer.yml + ./bin/gsign --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../darknet/contrib/gitian-descriptors/gitian-osx-signer.yml + mv build/out/darknet-osx-signed.dmg ../darknet-${VERSION}-osx.dmg popd Commit your signature for the signed OSX binary: @@ -134,33 +134,6 @@ rm SHA256SUMS - Upload zips and installers, as well as `SHA256SUMS.asc` from last step, to the bitcoin.org server into `/var/www/bin/bitcoin-core-${VERSION}` -- Update dashpay.io version ***TODO*** - - - First, check to see if the dashpay.io maintainers have prepared a - release: https://github.com/bitcoin/bitcoin.org/labels/Releases - - - If they have, it will have previously failed their Travis CI - checks because the final release files weren't uploaded. - Trigger a Travis CI rebuild---if it passes, merge. - - - If they have not prepared a release, follow the Bitcoin.org release - instructions: https://github.com/bitcoin/bitcoin.org#release-notes - - - After the pull request is merged, the website will automatically show the newest version within 15 minutes, as well - as update the OS download links. Ping @saivann/@harding (saivann/harding on Freenode) in case anything goes wrong - -- Announce the release: - - - Release sticky on dashtalk: https://dashtalk.org/index.php?board=1.0 ***TODO*** - - - Dash-development mailing list - - - Update title of #dashpay on Freenode IRC - - - Optionally reddit /r/Dashpay, ... but this will usually sort out itself - -- Notify Flare (?) ***TODO*** so that he can start building [https://launchpad.net/~dashpay/+archive/ubuntu/dash](the PPAs) ***TODO*** - - Add release notes for the new version to the directory `doc/release-notes` in git master - Celebrate diff --git a/doc/tor.md b/doc/tor.md index a3864ea1dc9fd..bf053ec1d6726 100644 --- a/doc/tor.md +++ b/doc/tor.md @@ -1,4 +1,4 @@ -TOR SUPPORT IN DASH +TOR SUPPORT IN DNET ======================= It is possible to run Dash as a Tor hidden service, and connect to such services. @@ -10,7 +10,7 @@ port. See [Tor Project FAQ:TBBSocksPort](https://www.torproject.org/docs/faq.htm for how to properly configure Tor. -1. Run dash behind a Tor proxy +1. Run darknet behind a Tor proxy ---------------------------------- The first step is running Dash behind a Tor proxy. This will already make all @@ -37,31 +37,31 @@ outgoing connections be anonymized, but more is possible. An example how to start the client if the Tor proxy is running on local host on port 9050 and only allows .onion nodes to connect: - ./dashd -onion=127.0.0.1:9050 -onlynet=tor -listen=0 -addnode=ssapp53tmftyjmjb.onion + ./darknetd -onion=127.0.0.1:9050 -onlynet=tor -listen=0 -addnode=ssapp53tmftyjmjb.onion In a typical situation, this suffices to run behind a Tor proxy: - ./dashd -proxy=127.0.0.1:9050 + ./darknetd -proxy=127.0.0.1:9050 -2. Run a dash hidden server +2. Run a darknet hidden server ------------------------------- If you configure your Tor system accordingly, it is possible to make your node also reachable from the Tor network. Add these lines to your /etc/tor/torrc (or equivalent config file): - HiddenServiceDir /var/lib/tor/dash-service/ - HiddenServicePort 9999 127.0.0.1:9999 - HiddenServicePort 19999 127.0.0.1:19999 + HiddenServiceDir /var/lib/tor/darknet-service/ + HiddenServicePort 51472 127.0.0.1:51472 + HiddenServicePort 51474 127.0.0.1:51474 The directory can be different of course, but (both) port numbers should be equal to -your dashd's P2P listen port (9999 by default). +your darknetd's P2P listen port (51472 by default). - -externalip=X You can tell dash about its publicly reachable address using + -externalip=X You can tell darknet about its publicly reachable address using this option, and this can be a .onion address. Given the above configuration, you can find your onion address in - /var/lib/tor/dash-service/hostname. Onion addresses are given + /var/lib/tor/darknet-service/hostname. Onion addresses are given preference for your node to advertize itself with, for connections coming from unroutable addresses (such as 127.0.0.1, where the Tor proxy typically runs). @@ -78,26 +78,26 @@ your dashd's P2P listen port (9999 by default). In a typical situation, where you're only reachable via Tor, this should suffice: - ./dashd -proxy=127.0.0.1:9050 -externalip=ssapp53tmftyjmjb.onion -listen + ./darknetd -proxy=127.0.0.1:9050 -externalip=ssapp53tmftyjmjb.onion -listen (obviously, replace the Onion address with your own). If you don't care too much about hiding your node, and want to be reachable on IPv4 as well, additionally specify: - ./dashd ... -discover + ./darknetd ... -discover -and open port 9999 on your firewall (or use -upnp). +and open port 51472 on your firewall (or use -upnp). If you only want to use Tor to reach onion addresses, but not use it as a proxy for normal IPv4/IPv6 communication, use: - ./dashd -onion=127.0.0.1:9050 -externalip=ssapp53tmftyjmjb.onion -discover + ./darknetd -onion=127.0.0.1:9050 -externalip=ssapp53tmftyjmjb.onion -discover -3. List of known dash Tor relays +3. List of known darknet Tor relays ------------------------------------ -* [dashie7ghp67.onion](http://dashie7ghp67.onion/) +* [darknetie7ghp67.onion](http://darknetie7ghp67.onion/) * [drktalkwaybgxnoq.onion](http://drktalkwaybgxnoq.onion/) * [drkcoinooditvool.onion](http://drkcoinooditvool.onion/) * [darkcoxbtzggpmcc.onion](http://darkcoxbtzggpmcc.onion/) diff --git a/doc/translation_process.md b/doc/translation_process.md index 055bff70502dc..daa3c1db45eb3 100644 --- a/doc/translation_process.md +++ b/doc/translation_process.md @@ -7,19 +7,19 @@ handle those translations. Files and Folders ----------------- -### dash-qt.pro +### darknet-qt.pro This file takes care of generating `.qm` files from `.ts` files. It is mostly automated. -### src/qt/dash.qrc +### src/qt/darknet.qrc This file must be updated whenever a new translation is added. Please note that files must end with `.qm`, not `.ts`. ```xml - locale/dash_en.qm + locale/darknet_en.qm ... ``` @@ -28,17 +28,17 @@ files must end with `.qm`, not `.ts`. This directory contains all translations. Filenames must adhere to this format: - dash_xx_YY.ts or dash_xx.ts + darknet_xx_YY.ts or darknet_xx.ts -#### dash_en.ts (Source file) +#### darknet_en.ts (Source file) -`src/qt/locale/dash_en.ts` is treated in a special way. It is used as the +`src/qt/locale/darknet_en.ts` is treated in a special way. It is used as the source for all other translations. Whenever a string in the code is changed this file must be updated to reflect those changes. A custom script is used to extract strings from the non-Qt parts. This script makes use of `gettext`, so make sure that utility is installed (ie, `apt-get install gettext` on Ubuntu/Debian). Once this has been updated, lupdate (included in the Qt SDK) -is used to update dash_en.ts. This process has been automated, from src/, +is used to update darknet_en.ts. This process has been automated, from src/, simply run: make translate @@ -46,7 +46,7 @@ simply run: When new plurals are added to the source file, it's important to do the following steps: -1. Open dash_en.ts in Qt Linguist (also included in the Qt SDK) +1. Open darknet_en.ts in Qt Linguist (also included in the Qt SDK) 2. Search for `%n`, which will take you to the parts in the translation that use plurals 3. Look for empty `English Translation (Singular)` and `English Translation (Plural)` fields 4. Add the appropriate strings for the singular and plural form of the base string @@ -62,7 +62,7 @@ in Transifex and can be translated. To create the pull-request you have to do: - git add src/qt/dashstrings.cpp src/qt/locale/dash_en.ts + git add src/qt/darknetstrings.cpp src/qt/locale/darknet_en.ts git commit Syncing with Transifex @@ -70,7 +70,7 @@ Syncing with Transifex We are using https://transifex.com as a frontend for translating the client. -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ The "Transifex client" (see: http://support.transifex.com/customer/portal/topics/440187-transifex-client/articles) is used to fetch new translations from Transifex. The configuration for this client (`.tx/config`) @@ -82,8 +82,8 @@ postprocessing steps before committing the translations. ### Fetching new translations 1. `python contrib/devtools/update-translations.py` -2. update `src/qt/dash.qrc` manually or via - `ls src/qt/locale/*ts|xargs -n1 basename|sed 's/\(dash_\(.*\)\).ts/ locale\/\1.qm<\/file>/'` +2. update `src/qt/darknet.qrc` manually or via + `ls src/qt/locale/*ts|xargs -n1 basename|sed 's/\(darknet_\(.*\)\).ts/ locale\/\1.qm<\/file>/'` 3. update `src/Makefile.qt.include` manually or via - `ls src/qt/locale/*ts|xargs -n1 basename|sed 's/\(dash_\(.*\)\).ts/ qt\/locale\/\1.ts \\/'` + `ls src/qt/locale/*ts|xargs -n1 basename|sed 's/\(darknet_\(.*\)\).ts/ qt\/locale\/\1.ts \\/'` 4. `git add` new translations from `src/qt/locale/` diff --git a/doc/unit-tests.md b/doc/unit-tests.md index 1cc34a8af3348..37fc470e21108 100644 --- a/doc/unit-tests.md +++ b/doc/unit-tests.md @@ -6,13 +6,13 @@ and tests weren't explicitly disabled. After configuring, they can be run with 'make check'. -To run the dashd tests manually, launch src/test/test_dash . +To run the darknetd tests manually, launch src/test/test_darknet . -To add more dashd tests, add `BOOST_AUTO_TEST_CASE` functions to the existing +To add more darknetd tests, add `BOOST_AUTO_TEST_CASE` functions to the existing .cpp files in the test/ directory or add new .cpp files that implement new BOOST_AUTO_TEST_SUITE sections. -To run the dash-qt tests manually, launch src/qt/test/dash-qt_test +To run the darknet-qt tests manually, launch src/qt/test/darknet-qt_test -To add more dash-qt tests, add them to the `src/qt/test/` directory and +To add more darknet-qt tests, add them to the `src/qt/test/` directory and the `src/qt/test/test_main.cpp` file. diff --git a/qa/pull-tester/run-bitcoind-for-test.sh.in b/qa/pull-tester/run-bitcoind-for-test.sh.in index f711b2bb14929..1740825bf9bc5 100755 --- a/qa/pull-tester/run-bitcoind-for-test.sh.in +++ b/qa/pull-tester/run-bitcoind-for-test.sh.in @@ -3,14 +3,14 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # -DATADIR="@abs_top_builddir@/.dash" +DATADIR="@abs_top_builddir@/.darknet" rm -rf "$DATADIR" mkdir -p "$DATADIR"/regtest touch "$DATADIR/regtest/debug.log" tail -q -n 1 -F "$DATADIR/regtest/debug.log" | grep -m 1 -q "Done loading" & WAITER=$! PORT=`expr 10000 + $$ % 55536` -"@abs_top_builddir@/src/dashd@EXEEXT@" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -checkmempool=0 -relaypriority=0 -port=$PORT -whitelist=127.0.0.1 -regtest -rpcport=`expr $PORT + 1` & +"@abs_top_builddir@/src/darknetd@EXEEXT@" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -checkmempool=0 -relaypriority=0 -port=$PORT -whitelist=127.0.0.1 -regtest -rpcport=`expr $PORT + 1` & BITCOIND=$! #Install a watchdog. diff --git a/qa/pull-tester/tests-config.sh.in b/qa/pull-tester/tests-config.sh.in index e64e80a14be74..93d1a471d31f7 100755 --- a/qa/pull-tester/tests-config.sh.in +++ b/qa/pull-tester/tests-config.sh.in @@ -11,6 +11,6 @@ EXEEXT="@EXEEXT@" @BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1 @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1 -REAL_BITCOIND="$BUILDDIR/src/dashd${EXEEXT}" -REAL_BITCOINCLI="$BUILDDIR/src/dash-cli${EXEEXT}" +REAL_BITCOIND="$BUILDDIR/src/darknetd${EXEEXT}" +REAL_BITCOINCLI="$BUILDDIR/src/darknet-cli${EXEEXT}" diff --git a/qa/rpc-tests/util.py b/qa/rpc-tests/util.py index d40e3b1f78fa9..0b9abafb33cc6 100644 --- a/qa/rpc-tests/util.py +++ b/qa/rpc-tests/util.py @@ -1,5 +1,6 @@ # Copyright (c) 2014 The Bitcoin Core developers # Copyright (c) 2014-2015 The Dash developers +# Copyright (c) 2015-2016 The DarkNet developers # Distributed under the MIT/X11 software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # @@ -65,7 +66,7 @@ def initialize_datadir(dirname, n): datadir = os.path.join(dirname, "node"+str(n)) if not os.path.isdir(datadir): os.makedirs(datadir) - with open(os.path.join(datadir, "dash.conf"), 'w') as f: + with open(os.path.join(datadir, "darknet.conf"), 'w') as f: f.write("regtest=1\n"); f.write("rpcuser=rt\n"); f.write("rpcpassword=rt\n"); @@ -77,19 +78,19 @@ def initialize_chain(test_dir): """ Create (or copy from cache) a 200-block-long chain and 4 wallets. - dashd and dash-cli must be in search path. + darknetd and darknet-cli must be in search path. """ if not os.path.isdir(os.path.join("cache", "node0")): devnull = open("/dev/null", "w+") - # Create cache directories, run dashds: + # Create cache directories, run darknetds: for i in range(4): datadir=initialize_datadir("cache", i) - args = [ os.getenv("BITCOIND", "dashd"), "-keypool=1", "-datadir="+datadir, "-discover=0" ] + args = [ os.getenv("BITCOIND", "darknetd"), "-keypool=1", "-datadir="+datadir, "-discover=0" ] if i > 0: args.append("-connect=127.0.0.1:"+str(p2p_port(0))) bitcoind_processes[i] = subprocess.Popen(args) - subprocess.check_call([ os.getenv("BITCOINCLI", "dash-cli"), "-datadir="+datadir, + subprocess.check_call([ os.getenv("BITCOINCLI", "darknet-cli"), "-datadir="+datadir, "-rpcwait", "getblockcount"], stdout=devnull) devnull.close() rpcs = [] @@ -128,7 +129,7 @@ def initialize_chain(test_dir): from_dir = os.path.join("cache", "node"+str(i)) to_dir = os.path.join(test_dir, "node"+str(i)) shutil.copytree(from_dir, to_dir) - initialize_datadir(test_dir, i) # Overwrite port/rpcport in dash.conf + initialize_datadir(test_dir, i) # Overwrite port/rpcport in darknet.conf def initialize_chain_clean(test_dir, num_nodes): """ @@ -161,14 +162,14 @@ def _rpchost_to_args(rpchost): def start_node(i, dirname, extra_args=None, rpchost=None): """ - Start a dashd and return RPC connection to it + Start a darknetd and return RPC connection to it """ datadir = os.path.join(dirname, "node"+str(i)) - args = [ os.getenv("BITCOIND", "dashd"), "-datadir="+datadir, "-keypool=1", "-discover=0", "-rest" ] + args = [ os.getenv("BITCOIND", "darknetd"), "-datadir="+datadir, "-keypool=1", "-discover=0", "-rest" ] if extra_args is not None: args.extend(extra_args) bitcoind_processes[i] = subprocess.Popen(args) devnull = open("/dev/null", "w+") - subprocess.check_call([ os.getenv("BITCOINCLI", "dash-cli"), "-datadir="+datadir] + + subprocess.check_call([ os.getenv("BITCOINCLI", "darknet-cli"), "-datadir="+datadir] + _rpchost_to_args(rpchost) + ["-rpcwait", "getblockcount"], stdout=devnull) devnull.close() @@ -179,7 +180,7 @@ def start_node(i, dirname, extra_args=None, rpchost=None): def start_nodes(num_nodes, dirname, extra_args=None, rpchost=None): """ - Start multiple dashds, return RPC connections to them + Start multiple darknetds, return RPC connections to them """ if extra_args is None: extra_args = [ None for i in range(num_nodes) ] return [ start_node(i, dirname, extra_args[i], rpchost) for i in range(num_nodes) ] diff --git a/qa/rpc-tests/util.sh b/qa/rpc-tests/util.sh index e3e24a4b5e56d..36b9293c8e106 100644 --- a/qa/rpc-tests/util.sh +++ b/qa/rpc-tests/util.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash # Copyright (c) 2014 The Bitcoin Core developers # Copyright (c) 2014-2015 The Dash developers +# Copyright (c) 2015-2016 The DarkNet developers # Distributed under the MIT/X11 software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -12,7 +13,7 @@ function echoerr { # Usage: ExtractKey "" # Warning: this will only work for the very-well-behaved -# JSON produced by dashd, do NOT use it to try to +# JSON produced by darknetd, do NOT use it to try to # parse arbitrary/nested/etc JSON. function ExtractKey { echo $2 | tr -d ' "{}\n' | awk -v RS=',' -F: "\$1 ~ /$1/ { print \$2}" @@ -21,7 +22,7 @@ function ExtractKey { function CreateDataDir { DIR=$1 mkdir -p $DIR - CONF=$DIR/dash.conf + CONF=$DIR/darknet.conf echo "regtest=1" >> $CONF echo "keypool=2" >> $CONF echo "rpcuser=rt" >> $CONF diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in index 1a9c34038fcb5..a18eab657f10e 100644 --- a/share/qt/Info.plist.in +++ b/share/qt/Info.plist.in @@ -32,7 +32,7 @@ Dash-Qt CFBundleIdentifier - io.dashpay.Dash-Qt + io.darknetpay.Dash-Qt CFBundleURLTypes @@ -40,10 +40,10 @@ CFBundleTypeRole Editor CFBundleURLName - io.dash.DashPayment + io.darknet.DashPayment CFBundleURLSchemes - dash + darknet @@ -52,7 +52,7 @@ UTTypeIdentifier - io.dash.paymentrequest + io.darknet.paymentrequest UTTypeDescription Dash payment request UTTypeConformsTo @@ -62,10 +62,10 @@ UTTypeTagSpecification public.mime-type - application/x-dash-payment-request + application/x-darknet-payment-request public.filename-extension - dashpaymentrequest + darknetpaymentrequest @@ -78,7 +78,7 @@ Editor LSItemContentTypes - io.dash.paymentrequest + io.darknet.paymentrequest LSHandlerRank Owner diff --git a/share/qt/extract_strings_qt.py b/share/qt/extract_strings_qt.py index 8508a4ae5ca15..b88e7ba03fe8f 100755 --- a/share/qt/extract_strings_qt.py +++ b/share/qt/extract_strings_qt.py @@ -9,7 +9,7 @@ import os import sys -OUT_CPP="qt/dashstrings.cpp" +OUT_CPP="qt/darknetstrings.cpp" EMPTY=['""'] def parse_po(text): @@ -69,10 +69,10 @@ def parse_po(text): #define UNUSED #endif """) -f.write('static const char UNUSED *dash_strings[] = {\n') +f.write('static const char UNUSED *darknet_strings[] = {\n') messages.sort(key=operator.itemgetter(0)) for (msgid, msgstr) in messages: if msgid != EMPTY: - f.write('QT_TRANSLATE_NOOP("dash-core", %s),\n' % ('\n'.join(msgid))) + f.write('QT_TRANSLATE_NOOP("darknet-core", %s),\n' % ('\n'.join(msgid))) f.write('};\n') f.close() diff --git a/share/seeds/generate-seeds.py b/share/seeds/generate-seeds.py index 2431ded86edb3..db58921831c8d 100755 --- a/share/seeds/generate-seeds.py +++ b/share/seeds/generate-seeds.py @@ -117,17 +117,17 @@ def main(): g.write('#ifndef BITCOIN_CHAINPARAMSSEEDS_H\n') g.write('#define BITCOIN_CHAINPARAMSSEEDS_H\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 darknet network\n') g.write(' * AUTOGENERATED by share/seeds/generate-seeds.py\n') g.write(' *\n') g.write(' * Each line contains a 16-byte IPv6 address and a port.\n') g.write(' * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.\n') g.write(' */\n') with open(os.path.join(indir,'nodes_main.txt'),'r') as f: - process_nodes(g, f, 'pnSeed6_main', 9999) + process_nodes(g, f, 'pnSeed6_main', 51472) g.write('\n') 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', 51474) g.write('#endif // BITCOIN_CHAINPARAMSSEEDS_H\n') if __name__ == '__main__': diff --git a/share/setup.nsi.in b/share/setup.nsi.in index 083ec8875c18e..e23ce4a61d55d 100644 --- a/share/setup.nsi.in +++ b/share/setup.nsi.in @@ -7,7 +7,7 @@ SetCompressor /SOLID lzma !define REGKEY "SOFTWARE\$(^Name)" !define VERSION @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@ !define COMPANY "Dash Core project" -!define URL https://www.dashpay.io/ +!define URL https://www.darknet-crypto.com # MUI Symbol Definitions !define MUI_ICON "@abs_top_srcdir@/share/pixmaps/bitcoin.ico" @@ -20,7 +20,7 @@ SetCompressor /SOLID lzma !define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY} !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup !define MUI_STARTMENUPAGE_DEFAULTFOLDER "@PACKAGE_NAME@" -!define MUI_FINISHPAGE_RUN $INSTDIR\dash-qt.exe +!define MUI_FINISHPAGE_RUN $INSTDIR\darknet-qt.exe !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" !define MUI_UNWELCOMEFINISHPAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-wizard.bmp" !define MUI_UNFINISHPAGE_NOAUTOCLOSE @@ -48,7 +48,7 @@ Var StartMenuGroup !insertmacro MUI_LANGUAGE English # Installer attributes -OutFile @abs_top_srcdir@/dash-${VERSION}-win@WINDOWS_BITS@-setup.exe +OutFile @abs_top_srcdir@/darknet-${VERSION}-win@WINDOWS_BITS@-setup.exe !if "@WINDOWS_BITS@" == "64" InstallDir $PROGRAMFILES64\Dash !else @@ -73,19 +73,19 @@ ShowUninstDetails show Section -Main SEC0000 SetOutPath $INSTDIR SetOverwrite on - File @abs_top_srcdir@/release/dash-qt.exe + File @abs_top_srcdir@/release/darknet-qt.exe File /oname=COPYING.txt @abs_top_srcdir@/COPYING File /oname=readme.txt @abs_top_srcdir@/doc/README_windows.txt SetOutPath $INSTDIR\daemon - File @abs_top_srcdir@/release/dashd.exe - File @abs_top_srcdir@/release/dash-cli.exe + File @abs_top_srcdir@/release/darknetd.exe + File @abs_top_srcdir@/release/darknet-cli.exe SetOutPath $INSTDIR\doc File /r @abs_top_srcdir@/doc\*.* SetOutPath $INSTDIR WriteRegStr HKCU "${REGKEY}\Components" Main 1 - # Remove old wxwidgets-based-dash executable and locales: - Delete /REBOOTOK $INSTDIR\dash.exe + # Remove old wxwidgets-based-darknet executable and locales: + Delete /REBOOTOK $INSTDIR\darknet.exe RMDir /r /REBOOTOK $INSTDIR\locale SectionEnd @@ -95,7 +95,7 @@ Section -post SEC0001 WriteUninstaller $INSTDIR\uninstall.exe !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory $SMPROGRAMS\$StartMenuGroup - CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\dash-qt.exe + CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\darknet-qt.exe CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe !insertmacro MUI_STARTMENU_WRITE_END WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)" @@ -106,10 +106,10 @@ Section -post SEC0001 WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1 WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1 - WriteRegStr HKCR "dash" "URL Protocol" "" - WriteRegStr HKCR "dash" "" "URL:Dash" - WriteRegStr HKCR "dash\DefaultIcon" "" $INSTDIR\dash-qt.exe - WriteRegStr HKCR "dash\shell\open\command" "" '"$INSTDIR\dash-qt.exe" "%1"' + WriteRegStr HKCR "darknet" "URL Protocol" "" + WriteRegStr HKCR "darknet" "" "URL:Dash" + WriteRegStr HKCR "darknet\DefaultIcon" "" $INSTDIR\darknet-qt.exe + WriteRegStr HKCR "darknet\shell\open\command" "" '"$INSTDIR\darknet-qt.exe" "%1"' SectionEnd # Macro for selecting uninstaller sections @@ -127,7 +127,7 @@ done${UNSECTION_ID}: # Uninstaller sections Section /o -un.Main UNSEC0000 - Delete /REBOOTOK $INSTDIR\dash-qt.exe + Delete /REBOOTOK $INSTDIR\darknet-qt.exe Delete /REBOOTOK $INSTDIR\COPYING.txt Delete /REBOOTOK $INSTDIR\readme.txt RMDir /r /REBOOTOK $INSTDIR\daemon @@ -147,7 +147,7 @@ Section -un.post UNSEC0001 DeleteRegValue HKCU "${REGKEY}" Path DeleteRegKey /IfEmpty HKCU "${REGKEY}\Components" DeleteRegKey /IfEmpty HKCU "${REGKEY}" - DeleteRegKey HKCR "dash" + DeleteRegKey HKCR "darknet" RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup RmDir /REBOOTOK $INSTDIR Push $R0 diff --git a/src/Makefile.am b/src/Makefile.am index 92eaca819a13b..487c80fe39386 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -60,15 +60,15 @@ bin_PROGRAMS = TESTS = if BUILD_BITCOIND - bin_PROGRAMS += dashd + bin_PROGRAMS += darknetd endif if BUILD_BITCOIN_UTILS - bin_PROGRAMS += dash-cli dash-tx + bin_PROGRAMS += darknet-cli darknet-tx endif .PHONY: FORCE -# dash core # +# darknet core # BITCOIN_CORE_H = \ activemasternode.h \ addrman.h \ @@ -92,14 +92,14 @@ BITCOIN_CORE_H = \ primitives/transaction.h \ core_io.h \ crypter.h \ - darksend.h \ - darksend-relay.h \ + obfuscate.h \ + obfuscate-relay.h \ db.h \ eccryptoverify.h \ ecwrapper.h \ hash.h \ init.h \ - instantx.h \ + swifttx.h \ key.h \ keepass.h \ keystore.h \ @@ -170,7 +170,7 @@ obj/build.h: FORCE $(abs_top_srcdir) libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h -# server: shared between dashd and dash-qt +# server: shared between darknetd and darknet-qt libbitcoin_server_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) libbitcoin_server_a_SOURCES = \ addrman.cpp \ @@ -202,16 +202,16 @@ libbitcoin_server_a_SOURCES = \ $(JSON_H) \ $(BITCOIN_CORE_H) -# wallet: shared between dashd and dash-qt, but only linked +# wallet: shared between darknetd and darknet-qt, but only linked # when wallet enabled libbitcoin_wallet_a_CPPFLAGS = $(BITCOIN_INCLUDES) libbitcoin_wallet_a_SOURCES = \ activemasternode.cpp \ - darksend.cpp \ - darksend-relay.cpp \ + obfuscate.cpp \ + obfuscate-relay.cpp \ db.cpp \ crypter.cpp \ - instantx.cpp \ + swifttx.cpp \ masternode.cpp \ masternode-budget.cpp \ masternode-payments.cpp \ @@ -240,14 +240,9 @@ crypto_libbitcoin_crypto_a_SOURCES = \ crypto/aes_helper.c \ crypto/blake.c \ crypto/bmw.c \ - crypto/cubehash.c \ - crypto/echo.c \ crypto/groestl.c \ crypto/jh.c \ crypto/keccak.c \ - crypto/luffa.c \ - crypto/shavite.c \ - crypto/simd.c \ crypto/skein.c \ crypto/common.h \ crypto/sha256.h \ @@ -259,14 +254,9 @@ crypto_libbitcoin_crypto_a_SOURCES = \ crypto/ripemd160.h \ crypto/sph_blake.h \ crypto/sph_bmw.h \ - crypto/sph_cubehash.h \ - crypto/sph_echo.h \ crypto/sph_groestl.h \ crypto/sph_jh.h \ crypto/sph_keccak.h \ - crypto/sph_luffa.h \ - crypto/sph_shavite.h \ - crypto/sph_simd.h \ crypto/sph_skein.h \ crypto/sph_types.h @@ -278,7 +268,7 @@ univalue_libbitcoin_univalue_a_SOURCES = \ univalue/univalue_escapes.h \ univalue/univalue.h -# common: shared between dashd, and dash-qt and non-server tools +# common: shared between darknetd, and darknet-qt and non-server tools libbitcoin_common_a_CPPFLAGS = $(BITCOIN_INCLUDES) libbitcoin_common_a_SOURCES = \ allocators.cpp \ @@ -333,7 +323,7 @@ libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp libbitcoin_util_a_SOURCES += compat/glibcxx_compat.cpp endif -# cli: shared between dash-cli and dash-qt +# cli: shared between darknet-cli and darknet-qt libbitcoin_cli_a_CPPFLAGS = $(BITCOIN_INCLUDES) libbitcoin_cli_a_SOURCES = \ rpcclient.cpp \ @@ -343,7 +333,7 @@ nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h # # bitcoind binary # -dashd_LDADD = \ +darknetd_LDADD = \ $(LIBBITCOIN_SERVER) \ $(LIBBITCOIN_COMMON) \ $(LIBBITCOIN_UNIVALUE) \ @@ -354,35 +344,36 @@ dashd_LDADD = \ $(LIBSECP256K1) if ENABLE_WALLET -dashd_LDADD += libbitcoin_wallet.a +darknetd_LDADD += libbitcoin_wallet.a endif -dashd_SOURCES = dashd.cpp +darknetd_SOURCES = darknetd.cpp # if TARGET_WINDOWS -dashd_SOURCES += dashd-res.rc +darknetd_SOURCES += darknetd-res.rc endif -dashd_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) -dashd_CPPFLAGS = $(BITCOIN_INCLUDES) -dashd_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +darknetd_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) +darknetd_CPPFLAGS = $(BITCOIN_INCLUDES) +darknetd_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -# dash-cli binary # -dash_cli_LDADD = \ + +# darknet-cli binary # +darknet_cli_LDADD = \ $(LIBBITCOIN_CLI) \ $(LIBBITCOIN_UTIL) \ $(BOOST_LIBS) \ $(SSL_LIBS) \ $(CRYPTO_LIBS) -dash_cli_SOURCES = \ - dash-cli.cpp +darknet_cli_SOURCES = \ + darknet-cli.cpp -dash_cli_CPPFLAGS = $(BITCOIN_INCLUDES) +darknet_cli_CPPFLAGS = $(BITCOIN_INCLUDES) # -# dash-tx binary # -dash_tx_LDADD = \ +# darknet-tx binary # +darknet_tx_LDADD = \ $(LIBBITCOIN_UNIVALUE) \ $(LIBBITCOIN_COMMON) \ $(LIBBITCOIN_UTIL) \ @@ -391,15 +382,15 @@ dash_tx_LDADD = \ $(BOOST_LIBS) \ $(CRYPTO_LIBS) -dash_tx_SOURCES = dash-tx.cpp -dash_tx_CPPFLAGS = $(BITCOIN_INCLUDES) +darknet_tx_SOURCES = darknet-tx.cpp +darknet_tx_CPPFLAGS = $(BITCOIN_INCLUDES) # -dash_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +darknet_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -dash_cli_SOURCES += dash-cli-res.rc +darknet_cli_SOURCES += darknet-cli-res.rc endif -dash_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +darknet_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if BUILD_BITCOIN_LIBS include_HEADERS = script/bitcoinconsensus.h diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 5325de196ef33..b7d7991bfd3a7 100755 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -1,30 +1,30 @@ -bin_PROGRAMS += qt/dash-qt +bin_PROGRAMS += qt/darknet-qt EXTRA_LIBRARIES += qt/libbitcoinqt.a -# dash qt core # +# darknet qt core # QT_TS = \ - qt/locale/dash_bg.ts \ - qt/locale/dash_de.ts \ - qt/locale/dash_en.ts \ - qt/locale/dash_es.ts \ - qt/locale/dash_fi.ts \ - qt/locale/dash_fr.ts \ - qt/locale/dash_it.ts \ - qt/locale/dash_ja.ts \ - qt/locale/dash_pl.ts \ - qt/locale/dash_pt.ts \ - qt/locale/dash_ru.ts \ - qt/locale/dash_sk.ts \ - qt/locale/dash_sv.ts \ - qt/locale/dash_vi.ts \ - qt/locale/dash_zh_CN.ts \ - qt/locale/dash_zh_TW.ts + qt/locale/darknet_bg.ts \ + qt/locale/darknet_de.ts \ + qt/locale/darknet_en.ts \ + qt/locale/darknet_es.ts \ + qt/locale/darknet_fi.ts \ + qt/locale/darknet_fr.ts \ + qt/locale/darknet_it.ts \ + qt/locale/darknet_ja.ts \ + qt/locale/darknet_pl.ts \ + qt/locale/darknet_pt.ts \ + qt/locale/darknet_ru.ts \ + qt/locale/darknet_sk.ts \ + qt/locale/darknet_sv.ts \ + qt/locale/darknet_vi.ts \ + qt/locale/darknet_zh_CN.ts \ + qt/locale/darknet_zh_TW.ts QT_FORMS_UI = \ qt/forms/addressbookpage.ui \ qt/forms/askpassphrasedialog.ui \ qt/forms/coincontroldialog.ui \ - qt/forms/darksendconfig.ui \ + qt/forms/obfuscateconfig.ui \ qt/forms/editaddressdialog.ui \ qt/forms/helpmessagedialog.ui \ qt/forms/intro.ui \ @@ -51,7 +51,7 @@ QT_MOC_CPP = \ qt/moc_coincontroldialog.cpp \ qt/moc_coincontroltreewidget.cpp \ qt/moc_csvmodelwriter.cpp \ - qt/moc_darksendconfig.cpp \ + qt/moc_obfuscateconfig.cpp \ qt/moc_editaddressdialog.cpp \ qt/moc_guiutil.cpp \ qt/moc_intro.cpp \ @@ -90,16 +90,16 @@ BITCOIN_MM = \ qt/macnotificationhandler.mm QT_MOC = \ - qt/dash.moc \ + qt/darknet.moc \ qt/bitcoinamountfield.moc \ qt/intro.moc \ qt/overviewpage.moc \ qt/rpcconsole.moc -QT_QRC_CPP = qt/qrc_dash.cpp -QT_QRC = qt/dash.qrc -QT_QRC_LOCALE_CPP = qt/qrc_dash_locale.cpp -QT_QRC_LOCALE = qt/dash_locale.qrc +QT_QRC_CPP = qt/qrc_darknet.cpp +QT_QRC = qt/darknet.qrc +QT_QRC_LOCALE_CPP = qt/qrc_darknet_locale.cpp +QT_QRC_LOCALE = qt/darknet_locale.qrc PROTOBUF_CC = qt/paymentrequest.pb.cc PROTOBUF_H = qt/paymentrequest.pb.h @@ -117,7 +117,7 @@ BITCOIN_QT_H = \ qt/coincontroldialog.h \ qt/coincontroltreewidget.h \ qt/csvmodelwriter.h \ - qt/darksendconfig.h \ + qt/obfuscateconfig.h \ qt/editaddressdialog.h \ qt/guiconstants.h \ qt/guiutil.h \ @@ -177,6 +177,14 @@ RES_ICONS = \ qt/res/icons/connect3_16.png \ qt/res/icons/connect4_16.png \ qt/res/icons/debugwindow.png \ + qt/res/icons/drk_editpaste.png \ + qt/res/icons/drk_address-book.png \ + qt/res/icons/drk_editcopy.png \ + qt/res/icons/drk_remove.png \ + qt/res/icons/drk_send.png \ + qt/res/icons/drk_receive.png \ + qt/res/icons/drk_history.png \ + qt/res/icons/drk_overview.png \ qt/res/icons/drkblue_editpaste.png \ qt/res/icons/drkblue_address-book.png \ qt/res/icons/drkblue_editcopy.png \ @@ -207,14 +215,12 @@ RES_ICONS = \ qt/res/icons/tx_input.png \ qt/res/icons/tx_output.png \ qt/res/icons/tx_mined.png \ - qt/res/icons/unit_dash.png \ - qt/res/icons/unit_mdash.png \ - qt/res/icons/unit_udash.png \ - qt/res/icons/unit_duffs.png \ - qt/res/icons/unit_tdash.png \ - qt/res/icons/unit_tmdash.png \ - qt/res/icons/unit_tudash.png \ - qt/res/icons/unit_tduffs.png + qt/res/icons/unit_darknet.png \ + qt/res/icons/unit_mdarknet.png \ + qt/res/icons/unit_udarknet.png \ + qt/res/icons/unit_tdarknet.png \ + qt/res/icons/unit_tmdarknet.png \ + qt/res/icons/unit_tudarknet.png BITCOIN_QT_CPP = \ qt/bitcoinaddressvalidator.cpp \ @@ -245,7 +251,7 @@ BITCOIN_QT_CPP += \ qt/askpassphrasedialog.cpp \ qt/coincontroldialog.cpp \ qt/coincontroltreewidget.cpp \ - qt/darksendconfig.cpp \ + qt/obfuscateconfig.cpp \ qt/editaddressdialog.cpp \ qt/openuridialog.cpp \ qt/overviewpage.cpp \ @@ -273,7 +279,18 @@ RES_IMAGES = \ qt/res/images/about.png \ qt/res/images/splash.png \ qt/res/images/splash_testnet.png \ - qt/res/images/dash_logo_horizontal.png \ + qt/res/images/darknet_logo_horizontal.png \ + qt/res/images/darknet_logo_horizontal-drk.png \ + qt/res/images/darknet_logo_horizontal-drkblue.png \ + qt/res/images/drk_downArrow.png \ + qt/res/images/drk_downArrow_small.png \ + qt/res/images/drk_upArrow_small.png \ + qt/res/images/drk_leftArrow_small.png \ + qt/res/images/drk_rightArrow_small.png \ + qt/res/images/drk_qtreeview_selected.png \ + qt/res/images/drk_walletFrame_bg.png \ + qt/res/images/drk-1_walletFrame_bg.png \ + qt/res/images/drk_walletFrame.png \ qt/res/images/drkblue_downArrow.png \ qt/res/images/drkblue_downArrow_small.png \ qt/res/images/drkblue_upArrow_small.png \ @@ -284,11 +301,13 @@ RES_IMAGES = \ qt/res/images/drkblue_walletFrame.png RES_CSS = \ - qt/res/css/drkblue.css + qt/res/css/drkblue.css \ + qt/res/css/drk.css \ + qt/res/css/drk-1.css RES_MOVIES = $(wildcard qt/res/movies/spinner-*.png) -BITCOIN_RC = qt/res/dash-qt-res.rc +BITCOIN_RC = qt/res/darknet-qt-res.rc BITCOIN_QT_INCLUDES = -I$(builddir)/qt -I$(srcdir)/qt -I$(srcdir)/qt/forms \ -I$(builddir)/qt/forms @@ -308,65 +327,65 @@ QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI: # Most files will depend on the forms and moc files as includes. Generate them # before anything else. $(QT_MOC): $(QT_FORMS_H) -$(qt_libbitcoinqt_a_OBJECTS) $(qt_dash_qt_OBJECTS) : | $(QT_MOC) +$(qt_libbitcoinqt_a_OBJECTS) $(qt_darknet_qt_OBJECTS) : | $(QT_MOC) #Generating these with a half-written protobuf header leads to wacky results. #This makes sure it's done. $(QT_MOC): $(PROTOBUF_H) $(QT_MOC_CPP): $(PROTOBUF_H) -# dash-qt binary # -qt_dash_qt_CPPFLAGS = $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +# darknet-qt binary # +qt_darknet_qt_CPPFLAGS = $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ $(QT_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS) -qt_dash_qt_SOURCES = qt/dash.cpp +qt_darknet_qt_SOURCES = qt/darknet.cpp if TARGET_DARWIN - qt_dash_qt_SOURCES += $(BITCOIN_MM) + qt_darknet_qt_SOURCES += $(BITCOIN_MM) endif if TARGET_WINDOWS - qt_dash_qt_SOURCES += $(BITCOIN_RC) + qt_darknet_qt_SOURCES += $(BITCOIN_RC) endif -qt_dash_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER) +qt_darknet_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER) if ENABLE_WALLET -qt_dash_qt_LDADD += $(LIBBITCOIN_WALLET) +qt_darknet_qt_LDADD += $(LIBBITCOIN_WALLET) endif -qt_dash_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ +qt_darknet_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) -qt_dash_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -qt_dash_qt_LIBTOOLFLAGS = --tag CXX +qt_darknet_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +qt_darknet_qt_LIBTOOLFLAGS = --tag CXX #locale/foo.ts -> locale/foo.qm QT_QM=$(QT_TS:.ts=.qm) .SECONDARY: $(QT_QM) -qt/dashstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES) $(libbitcoin_common_a_SOURCES) +qt/darknetstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES) $(libbitcoin_common_a_SOURCES) @test -n $(XGETTEXT) || echo "xgettext is required for updating translations" $(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) ../share/qt/extract_strings_qt.py $^ -translate: qt/dashstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM) +translate: qt/darknetstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM) @test -n $(LUPDATE) || echo "lupdate is required for updating translations" - $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts qt/locale/dash_en.ts + $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts qt/locale/darknet_en.ts $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM) @test -f $(RCC) @test -f $(@D)/$( $@ $(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(RES_MOVIES) $(PROTOBUF_H) @test -f $(RCC) - $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name dash $< | \ + $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name darknet $< | \ $(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@ CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno CLEANFILES += $(CLEAN_QT) -dash_qt_clean: FORCE - rm -f $(CLEAN_QT) $(qt_libbitcoinqt_a_OBJECTS) $(qt_dash_qt_OBJECTS) qt/dash-qt$(EXEEXT) $(LIBBITCOINQT) +darknet_qt_clean: FORCE + rm -f $(CLEAN_QT) $(qt_libbitcoinqt_a_OBJECTS) $(qt_darknet_qt_OBJECTS) qt/darknet-qt$(EXEEXT) $(LIBBITCOINQT) -dash_qt : qt/dash-qt$(EXEEXT) +darknet_qt : qt/darknet-qt$(EXEEXT) ui_%.h: %.ui @test -f $(UIC) diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include index 1a1f03d1a1adb..ae7133626c2ee 100644 --- a/src/Makefile.qttest.include +++ b/src/Makefile.qttest.include @@ -1,5 +1,5 @@ -bin_PROGRAMS += qt/test/test_dash-qt -TESTS += qt/test/test_dash-qt +bin_PROGRAMS += qt/test/test_darknet-qt +TESTS += qt/test/test_darknet-qt TEST_QT_MOC_CPP = qt/test/moc_uritests.cpp @@ -12,37 +12,37 @@ TEST_QT_H = \ qt/test/paymentrequestdata.h \ qt/test/paymentservertests.h -qt_test_test_dash_qt_CPPFLAGS = $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +qt_test_test_darknet_qt_CPPFLAGS = $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ $(QT_INCLUDES) $(QT_TEST_INCLUDES) $(PROTOBUF_CFLAGS) -qt_test_test_dash_qt_SOURCES = \ +qt_test_test_darknet_qt_SOURCES = \ qt/test/test_main.cpp \ qt/test/uritests.cpp \ $(TEST_QT_H) if ENABLE_WALLET -qt_test_test_dash_qt_SOURCES += \ +qt_test_test_darknet_qt_SOURCES += \ qt/test/paymentservertests.cpp endif -nodist_qt_test_test_dash_qt_SOURCES = $(TEST_QT_MOC_CPP) +nodist_qt_test_test_darknet_qt_SOURCES = $(TEST_QT_MOC_CPP) -qt_test_test_dash_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER) +qt_test_test_darknet_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER) if ENABLE_WALLET -qt_test_test_dash_qt_LDADD += $(LIBBITCOIN_WALLET) +qt_test_test_darknet_qt_LDADD += $(LIBBITCOIN_WALLET) endif -qt_test_test_dash_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) \ +qt_test_test_darknet_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) \ $(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \ $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) -qt_test_test_dash_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +qt_test_test_darknet_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) CLEAN_BITCOIN_QT_TEST = $(TEST_QT_MOC_CPP) qt/test/*.gcda qt/test/*.gcno CLEANFILES += $(CLEAN_BITCOIN_QT_TEST) -test_dash_qt : qt/test/test_dash-qt$(EXEEXT) +test_darknet_qt : qt/test/test_darknet-qt$(EXEEXT) -test_dash_qt_check : qt/test/test_dash-qt$(EXEEXT) FORCE +test_darknet_qt_check : qt/test/test_darknet-qt$(EXEEXT) FORCE $(MAKE) check-TESTS TESTS=$^ -test_dash_qt_clean: FORCE - rm -f $(CLEAN_BITCOIN_QT_TEST) $(qt_test_test_dash_qt_OBJECTS) +test_darknet_qt_clean: FORCE + rm -f $(CLEAN_BITCOIN_QT_TEST) $(qt_test_test_darknet_qt_OBJECTS) diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 50e6540171c79..521bc923b3afb 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -1,7 +1,7 @@ -TESTS += test/test_dash test/bitcoin-util-test.py -bin_PROGRAMS += test/test_dash +TESTS += test/test_darknet test/bitcoin-util-test.py +bin_PROGRAMS += test/test_darknet TEST_SRCDIR = test -TEST_BINARY=test/test_dash$(EXEEXT) +TEST_BINARY=test/test_darknet$(EXEEXT) EXTRA_DIST += \ @@ -66,7 +66,7 @@ BITCOIN_TESTS =\ test/sighash_tests.cpp \ test/sigopcount_tests.cpp \ test/skiplist_tests.cpp \ - test/test_dash.cpp \ + test/test_darknet.cpp \ test/timedata_tests.cpp \ test/transaction_tests.cpp \ test/uint256_tests.cpp \ @@ -80,18 +80,18 @@ BITCOIN_TESTS += \ test/rpc_wallet_tests.cpp endif -test_test_dash_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES) -test_test_dash_CPPFLAGS = $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS) -test_test_dash_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ +test_test_darknet_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES) +test_test_darknet_CPPFLAGS = $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS) +test_test_darknet_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) if ENABLE_WALLET -test_test_dash_LDADD += $(LIBBITCOIN_WALLET) +test_test_darknet_LDADD += $(LIBBITCOIN_WALLET) endif -test_test_dash_LDADD += $(LIBBITCOIN_CONSENSUS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) -test_test_dash_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static +test_test_darknet_LDADD += $(LIBBITCOIN_CONSENSUS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) +test_test_darknet_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static -nodist_test_test_dash_SOURCES = $(GENERATED_TEST_FILES) +nodist_test_test_darknet_SOURCES = $(GENERATED_TEST_FILES) $(BITCOIN_TESTS): $(GENERATED_TEST_FILES) @@ -99,13 +99,13 @@ CLEAN_BITCOIN_TEST = test/*.gcda test/*.gcno $(GENERATED_TEST_FILES) CLEANFILES += $(CLEAN_BITCOIN_TEST) -dash_test: $(TEST_BINARY) +darknet_test: $(TEST_BINARY) -dash_test_check: $(TEST_BINARY) FORCE +darknet_test_check: $(TEST_BINARY) FORCE $(MAKE) check-TESTS TESTS=$^ -dash_test_clean : FORCE - rm -f $(CLEAN_BITCOIN_TEST) $(test_test_dash_OBJECTS) $(TEST_BINARY) +darknet_test_clean : FORCE + rm -f $(CLEAN_BITCOIN_TEST) $(test_test_darknet_OBJECTS) $(TEST_BINARY) check-local: $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp index e65725386ced6..44b56c35183a2 100644 --- a/src/activemasternode.cpp +++ b/src/activemasternode.cpp @@ -67,13 +67,13 @@ void CActiveMasternode::ManageStatus() LogPrintf("CActiveMasternode::ManageStatus() - Checking inbound connection to '%s'\n", service.ToString()); if(Params().NetworkID() == CBaseChainParams::MAIN) { - if(service.GetPort() != 9999) { - notCapableReason = strprintf("Invalid port: %u - only 9999 is supported on mainnet.", service.GetPort()); + if(service.GetPort() != 51472) { + notCapableReason = strprintf("Invalid port: %u - only 51472 is supported on mainnet.", service.GetPort()); LogPrintf("CActiveMasternode::ManageStatus() - not capable: %s\n", notCapableReason); return; } - } else if(service.GetPort() == 9999) { - notCapableReason = strprintf("Invalid port: %u - 9999 is only supported on mainnet.", service.GetPort()); + } else if(service.GetPort() == 51472) { + notCapableReason = strprintf("Invalid port: %u - 51472 is only supported on mainnet.", service.GetPort()); LogPrintf("CActiveMasternode::ManageStatus() - not capable: %s\n", notCapableReason); return; } @@ -225,7 +225,7 @@ bool CActiveMasternode::SendMasternodePing(std::string& errorMessage) { else { // Seems like we are trying to send a ping while the Masternode is not registered in the network - errorMessage = "Darksend Masternode List doesn't include our Masternode, shutting down Masternode pinging service! " + vin.ToString(); + errorMessage = "Obfuscate Masternode List doesn't include our Masternode, shutting down Masternode pinging service! " + vin.ToString(); status = ACTIVE_MASTERNODE_NOT_CAPABLE; notCapableReason = errorMessage; return false; @@ -262,13 +262,13 @@ bool CActiveMasternode::Register(std::string strService, std::string strKeyMaste CService service = CService(strService); if(Params().NetworkID() == CBaseChainParams::MAIN) { - if(service.GetPort() != 9999) { - errorMessage = strprintf("Invalid port %u for masternode %s - only 9999 is supported on mainnet.", service.GetPort(), strService); + if(service.GetPort() != 51472) { + errorMessage = strprintf("Invalid port %u for masternode %s - only 51472 is supported on mainnet.", service.GetPort(), strService); LogPrintf("CActiveMasternode::Register() - %s\n", errorMessage); return false; } - } else if(service.GetPort() == 9999) { - errorMessage = strprintf("Invalid port %u for masternode %s - 9999 is only supported on mainnet.", service.GetPort(), strService); + } else if(service.GetPort() == 51472) { + errorMessage = strprintf("Invalid port %u for masternode %s - 51472 is only supported on mainnet.", service.GetPort(), strService); LogPrintf("CActiveMasternode::Register() - %s\n", errorMessage); return false; } @@ -455,7 +455,7 @@ vector CActiveMasternode::SelectCoinsMasternode() // Filter BOOST_FOREACH(const COutput& out, vCoins) { - if(out.tx->vout[out.i].nValue == 1000*COIN) { //exactly + if(out.tx->vout[out.i].nValue == 10000*COIN) { //exactly filteredCoins.push_back(out); } } diff --git a/src/activemasternode.h b/src/activemasternode.h index 93a64eeab253a..776fbf6d89568 100644 --- a/src/activemasternode.h +++ b/src/activemasternode.h @@ -10,7 +10,7 @@ #include "key.h" #include "init.h" #include "wallet.h" -#include "darksend.h" +#include "obfuscate.h" #include "masternode.h" #define ACTIVE_MASTERNODE_INITIAL 0 // initial state @@ -32,7 +32,7 @@ class CActiveMasternode /// Register any Masternode bool Register(CTxIn vin, CService service, CKey key, CPubKey pubKey, CKey keyMasternode, CPubKey pubKeyMasternode, std::string &errorMessage); - /// Get 1000DRK input that can be used for the Masternode + /// Get 10000DNET input that can be used for the Masternode bool GetMasterNodeVin(CTxIn& vin, CPubKey& pubkey, CKey& secretKey, std::string strTxHash, std::string strOutputIndex); bool GetVinFromOutput(COutput out, CTxIn& vin, CPubKey& pubkey, CKey& secretKey); @@ -60,7 +60,7 @@ class CActiveMasternode /// Register remote Masternode bool Register(std::string strService, std::string strKey, std::string strTxHash, std::string strOutputIndex, std::string& errorMessage); - /// Get 1000DRK input that can be used for the Masternode + /// Get 10000DNET input that can be used for the Masternode bool GetMasterNodeVin(CTxIn& vin, CPubKey& pubkey, CKey& secretKey); vector SelectCoinsMasternode(); diff --git a/src/amount.cpp b/src/amount.cpp index 20ea3ead5986f..d8c963784f074 100644 --- a/src/amount.cpp +++ b/src/amount.cpp @@ -27,5 +27,5 @@ CAmount CFeeRate::GetFee(size_t nSize) const std::string CFeeRate::ToString() const { - return strprintf("%d.%08d DASH/kB", nSatoshisPerK / COIN, nSatoshisPerK % COIN); + return strprintf("%d.%08d DNET/kB", nSatoshisPerK / COIN, nSatoshisPerK % COIN); } diff --git a/src/base58.h b/src/base58.h index 74dc66f1096ba..67585c64637a1 100644 --- a/src/base58.h +++ b/src/base58.h @@ -94,7 +94,7 @@ class CBase58Data bool operator> (const CBase58Data& b58) const { return CompareTo(b58) > 0; } }; -/** base58-encoded Dash addresses. +/** base58-encoded DarkNet addresses. * Public-key-hash-addresses have version 0 (or 111 testnet). * The data vector contains RIPEMD160(SHA256(pubkey)), where pubkey is the serialized public key. * Script-hash-addresses have version 5 (or 196 testnet). diff --git a/src/chainparams.cpp b/src/chainparams.cpp index c59e2ac012e47..4d55c8baebef3 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -46,65 +46,41 @@ static void convertSeed6(std::vector &vSeedsOut, const SeedSpec6 *data } } -/** - * What makes a good checkpoint block? - * + Is surrounded by blocks with reasonable timestamps - * (no blocks before with a timestamp after, none after with - * timestamp before) - * + Contains no strange transactions - */ - +// What makes a good checkpoint block? +// + Is surrounded by blocks with reasonable timestamps +// (no blocks before with a timestamp after, none after with +// timestamp before) +// + Contains no strange transactions static Checkpoints::MapCheckpoints mapCheckpoints = boost::assign::map_list_of - ( 1500, uint256("0x000000aaf0300f59f49bc3e970bad15c11f961fe2347accffff19d96ec9778e3")) - ( 4991, uint256("0x000000003b01809551952460744d5dbb8fcbd6cbae3c220267bf7fa43f837367")) - ( 9918, uint256("0x00000000213e229f332c0ffbe34defdaa9e74de87f2d8d1f01af8d121c3c170b")) - ( 16912, uint256("0x00000000075c0d10371d55a60634da70f197548dbbfa4123e12abfcbc5738af9")) - ( 23912, uint256("0x0000000000335eac6703f3b1732ec8b2f89c3ba3a7889e5767b090556bb9a276")) - ( 35457, uint256("0x0000000000b0ae211be59b048df14820475ad0dd53b9ff83b010f71a77342d9f")) - ( 45479, uint256("0x000000000063d411655d590590e16960f15ceea4257122ac430c6fbe39fbf02d")) - ( 55895, uint256("0x0000000000ae4c53a43639a4ca027282f69da9c67ba951768a20415b6439a2d7")) - ( 68899, uint256("0x0000000000194ab4d3d9eeb1f2f792f21bb39ff767cb547fe977640f969d77b7")) - ( 74619, uint256("0x000000000011d28f38f05d01650a502cc3f4d0e793fbc26e2a2ca71f07dc3842")) - ( 75095, uint256("0x0000000000193d12f6ad352a9996ee58ef8bdc4946818a5fec5ce99c11b87f0d")) - ( 88805, uint256("0x00000000001392f1652e9bf45cd8bc79dc60fe935277cd11538565b4a94fa85f")) - ( 107996, uint256("0x00000000000a23840ac16115407488267aa3da2b9bc843e301185b7d17e4dc40")) - ( 137993, uint256("0x00000000000cf69ce152b1bffdeddc59188d7a80879210d6e5c9503011929c3c")) - ( 167996, uint256("0x000000000009486020a80f7f2cc065342b0c2fb59af5e090cd813dba68ab0fed")) - ( 207992, uint256("0x00000000000d85c22be098f74576ef00b7aa00c05777e966aff68a270f1e01a5")) - ( 312645, uint256("0x0000000000059dcb71ad35a9e40526c44e7aae6c99169a9e7017b7d84b1c2daf")) - ( 407452, uint256("0x000000000003c6a87e73623b9d70af7cd908ae22fee466063e4ffc20be1d2dbc")) - ; + ( 0, uint256("0x001")); static const Checkpoints::CCheckpointData data = { &mapCheckpoints, - 1423563332, // * UNIX timestamp of last checkpoint block - 853742, // * total number of transactions between genesis and last checkpoint + 1454124731, // * UNIX timestamp of last checkpoint block + 0, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the SetBestChain debug.log lines) - 2800 // * estimated number of transactions per day after checkpoint + 500 // * estimated number of transactions per day after checkpoint }; static Checkpoints::MapCheckpoints mapCheckpointsTestnet = boost::assign::map_list_of - ( 261, uint256("00000c26026d0815a7e2ce4fa270775f61403c040647ff2c3091f99e894a4618")) - ( 77900, uint256("00000007e5ec67e2a626c07b7d66673c3dd8df0aed5018ca984b99fba2b71024")) - ( 82313, uint256("000000156a313af1d69fe855609175b276996235e8f4f7da41b10e4a7a750a19")) - ; + ( 0, uint256("0x001")); static const Checkpoints::CCheckpointData dataTestnet = { &mapCheckpointsTestnet, - 1405699509, - 201, - 500 + 1454124731, + 0, + 250 }; static Checkpoints::MapCheckpoints mapCheckpointsRegtest = boost::assign::map_list_of - ( 0, uint256("0x000008ca1832a4baf228eb1553c03d3a2c8e02399550dd6ea8d65cec3ef23d2e")) + ( 0, uint256("0x001")) ; static const Checkpoints::CCheckpointData dataRegtest = { &mapCheckpointsRegtest, + 1454124731, 0, - 0, - 0 + 100 }; class CMainParams : public CChainParams { @@ -117,20 +93,20 @@ class CMainParams : public CChainParams { * The characters are rarely used upper ASCII, not valid as UTF-8, and produce * a large 4-byte int at any alignment. */ - pchMessageStart[0] = 0xbf; - pchMessageStart[1] = 0x0c; - pchMessageStart[2] = 0x6b; - pchMessageStart[3] = 0xbd; - vAlertPubKey = ParseHex("048240a8748a80a286b270ba126705ced4f2ce5a7847b3610ea3c06513150dade2a8512ed5ea86320824683fc0818f0ac019214973e677acd1244f6d0571fc5103"); - nDefaultPort = 9999; - bnProofOfWorkLimit = ~uint256(0) >> 20; // Dash starting difficulty is 1 / 2^12 + pchMessageStart[0] = 0x90; + pchMessageStart[1] = 0xc4; + pchMessageStart[2] = 0xfd; + pchMessageStart[3] = 0xe9; + vAlertPubKey = ParseHex("0484698d3ba6ba6e7423fa5cbd6a89e0a9a5348f88d332b44a5cb1a8b7ed2c1eaa335fc8dc4f012cb8241cc0bdafd6ca70c5f5448916e4e6f511bcd746ed57dc50"); + nDefaultPort = 51472; + bnProofOfWorkLimit = ~uint256(0) >> 20; // DarkNet starting difficulty is 1 / 2^12 nSubsidyHalvingInterval = 210000; nEnforceBlockUpgradeMajority = 750; nRejectBlockOutdatedMajority = 950; nToCheckBlockUpgradeMajority = 1000; nMinerThreads = 0; - nTargetTimespan = 24 * 60 * 60; // Dash: 1 day - nTargetSpacing = 2.5 * 60; // Dash: 2.5 minutes + nTargetTimespan = 1 * 60; // DarkNet: 1 day + nTargetSpacing = 1 * 60; // DarkNet: 1 minute /** * Build the genesis block. Note that the output of the genesis coinbase cannot @@ -142,36 +118,37 @@ class CMainParams : public CChainParams { * CTxOut(nValue=50.00000000, scriptPubKey=0xA9037BAC7050C479B121CF) * vMerkleTree: e0028e */ - const char* pszTimestamp = "Wired 09/Jan/2014 The Grand Experiment Goes Live: Overstock.com Is Now Accepting Bitcoins"; + const char* pszTimestamp = "U.S. News & World Report Jan 28 2016 With His Absence, Trump Dominates Another Debate"; CMutableTransaction txNew; txNew.vin.resize(1); txNew.vout.resize(1); txNew.vin[0].scriptSig = CScript() << 486604799 << CScriptNum(4) << vector((const unsigned char*)pszTimestamp, (const unsigned char*)pszTimestamp + strlen(pszTimestamp)); - txNew.vout[0].nValue = 50 * COIN; - txNew.vout[0].scriptPubKey = CScript() << ParseHex("040184710fa689ad5023690c80f3a49c8f13f8d45b8c857fbcbc8bc4a8e4d3eb4b10f4d4604fa08dce601aaf0f470216fe1b51850b4acf21b179c45070ac7b03a9") << OP_CHECKSIG; + txNew.vout[0].nValue = 250 * COIN; + txNew.vout[0].scriptPubKey = CScript() << ParseHex("04c10e83b2703ccf322f7dbd62dd5855ac7c10bd055814ce121ba32607d573b8810c02c0582aed05b4deb9c4b77b26d92428c61256cd42774babea0a073b2ed0c9") << OP_CHECKSIG; genesis.vtx.push_back(txNew); genesis.hashPrevBlock = 0; genesis.hashMerkleRoot = genesis.BuildMerkleTree(); genesis.nVersion = 1; - genesis.nTime = 1390095618; + genesis.nTime = 1454124731; genesis.nBits = 0x1e0ffff0; - genesis.nNonce = 28917698; - - hashGenesisBlock = genesis.GetHash(); - assert(hashGenesisBlock == uint256("0x00000ffd590b1485b3caadc19b22e6379c733355108f107a430458cdf3407ab6")); - assert(genesis.hashMerkleRoot == uint256("0xe0028eb9648db56b1ac77cf090b99048a8007e2bb64b68f092c03c7f56a662c7")); - - vSeeds.push_back(CDNSSeedData("darkcoin.io", "dnsseed.darkcoin.io")); - vSeeds.push_back(CDNSSeedData("darkcoin.qa", "dnsseed.darkcoin.qa")); - vSeeds.push_back(CDNSSeedData("masternode.io", "dnsseed.masternode.io")); - vSeeds.push_back(CDNSSeedData("dashpay.io", "dnsseed.dashpay.io")); - - base58Prefixes[PUBKEY_ADDRESS] = list_of( 76); // Dash addresses start with 'X' - base58Prefixes[SCRIPT_ADDRESS] = list_of( 16); // Dash script addresses start with '7' - base58Prefixes[SECRET_KEY] = list_of(204); // Dash private keys start with '7' or 'X' - base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x02)(0xFE)(0x52)(0xF8); // Dash BIP32 pubkeys start with 'drkv' - base58Prefixes[EXT_SECRET_KEY] = list_of(0x02)(0xFE)(0x52)(0xCC); // Dash BIP32 prvkeys start with 'drkp' - base58Prefixes[EXT_COIN_TYPE] = list_of(0x80000005); // Dash BIP44 coin type is '5' + genesis.nNonce = 2402015; + + hashGenesisBlock = genesis.GetHash(); + assert(hashGenesisBlock == uint256("0x0000041e482b9b9691d98eefb48473405c0b8ec31b76df3797c74a78680ef818")); + assert(genesis.hashMerkleRoot == uint256("0x1b2ef6e2f28be914103a277377ae7729dcd125dfeb8bf97bd5964ba72b6dc39b")); + + vSeeds.push_back(CDNSSeedData("dnsseed.darknet-crypto.com", "")); + vSeeds.push_back(CDNSSeedData("daarknet.coin-server.com", "")); + vSeeds.push_back(CDNSSeedData("162.213.154.31", "")); + vSeeds.push_back(CDNSSeedData("173.245.148.70", "")); + vSeeds.push_back(CDNSSeedData("151.80.206.104", "")); + + base58Prefixes[PUBKEY_ADDRESS] = list_of( 30); + base58Prefixes[SCRIPT_ADDRESS] = list_of( 13); + base58Prefixes[SECRET_KEY] = list_of(212); + base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x02)(0x2D)(0x25)(0x33); + base58Prefixes[EXT_SECRET_KEY] = list_of(0x02)(0x21)(0x31)(0x2B); + base58Prefixes[EXT_COIN_TYPE] = list_of(0x80000013); convertSeed6(vFixedSeeds, pnSeed6_main, ARRAYLEN(pnSeed6_main)); @@ -187,7 +164,7 @@ class CMainParams : public CChainParams { nPoolMaxTransactions = 3; strSporkKey = "04549ac134f694c0243f503e8c8a9a986f5de6610049c40b07816809b0d1d06a21b07be27b9bb555931773f62ba6cf35a25fd52f694d4e1106ccd237a7bb899fdd"; strMasternodePaymentsPubKey = "04549ac134f694c0243f503e8c8a9a986f5de6610049c40b07816809b0d1d06a21b07be27b9bb555931773f62ba6cf35a25fd52f694d4e1106ccd237a7bb899fdd"; - strDarksendPoolDummyAddress = "Xq19GqFvajRrEdDHYRKGYjTsQfpV5jyipF"; + strObfuscatePoolDummyAddress = "Xq19GqFvajRrEdDHYRKGYjTsQfpV5jyipF"; nStartMasternodePayments = 1403728576; //Wed, 25 Jun 2014 20:36:16 GMT } @@ -206,34 +183,28 @@ class CTestNetParams : public CMainParams { CTestNetParams() { networkID = CBaseChainParams::TESTNET; strNetworkID = "test"; - pchMessageStart[0] = 0xce; - pchMessageStart[1] = 0xe2; - pchMessageStart[2] = 0xca; - pchMessageStart[3] = 0xff; - vAlertPubKey = ParseHex("04517d8a699cb43d3938d7b24faaff7cda448ca4ea267723ba614784de661949bf632d6304316b244646dea079735b9a6fc4af804efb4752075b9fe2245e14e412"); - nDefaultPort = 19999; + pchMessageStart[0] = 0x45; + pchMessageStart[1] = 0x76; + pchMessageStart[2] = 0x65; + pchMessageStart[3] = 0xba; + vAlertPubKey = ParseHex("04c10e83b2703ccf322f7dbd62dd5855ac7c10bd055814ce121ba32607d573b8810c02c0582aed05b4deb9c4b77b26d92428c61256cd42774babea0a073b2ed0c9"); + nDefaultPort = 51474; nEnforceBlockUpgradeMajority = 51; nRejectBlockOutdatedMajority = 75; nToCheckBlockUpgradeMajority = 100; nMinerThreads = 0; - nTargetTimespan = 24 * 60 * 60; // Dash: 1 day - nTargetSpacing = 2.5 * 60; // Dash: 2.5 minutes + nTargetTimespan = 1 * 60; // DarkNet: 1 day + nTargetSpacing = 1 * 60; // DarkNet: 1 minute //! Modify the testnet genesis block so the timestamp is valid for a later start. - genesis.nTime = 1390666206; - genesis.nNonce = 3861367235; - + genesis.nTime = 1454124731; + genesis.nNonce = 2402015; + hashGenesisBlock = genesis.GetHash(); - assert(hashGenesisBlock == uint256("0x00000bafbc94add76cb75e2ec92894837288a481e5c005f6563d91623bf8bc2c")); + assert(hashGenesisBlock == uint256("0x0000041e482b9b9691d98eefb48473405c0b8ec31b76df3797c74a78680ef818")); vFixedSeeds.clear(); vSeeds.clear(); - /*vSeeds.push_back(CDNSSeedData("dashpay.io", "testnet-seed.dashpay.io")); - vSeeds.push_back(CDNSSeedData("dash.qa", "testnet-seed.dash.qa")); - *///legacy seeders - vSeeds.push_back(CDNSSeedData("darkcoin.io", "testnet-seed.darkcoin.io")); - vSeeds.push_back(CDNSSeedData("darkcoin.qa", "testnet-seed.darkcoin.qa")); - vSeeds.push_back(CDNSSeedData("masternode.io", "test.dnsseed.masternode.io")); base58Prefixes[PUBKEY_ADDRESS] = list_of(139); // Testnet dash addresses start with 'x' or 'y' base58Prefixes[SCRIPT_ADDRESS] = list_of( 19); // Testnet dash script addresses start with '8' or '9' @@ -253,9 +224,9 @@ class CTestNetParams : public CMainParams { fTestnetToBeDeprecatedFieldRPC = true; nPoolMaxTransactions = 2; - strSporkKey = "046f78dcf911fbd61910136f7f0f8d90578f68d0b3ac973b5040fb7afb501b5939f39b108b0569dca71488f5bbf498d92e4d1194f6f941307ffd95f75e76869f0e"; - strMasternodePaymentsPubKey = "046f78dcf911fbd61910136f7f0f8d90578f68d0b3ac973b5040fb7afb501b5939f39b108b0569dca71488f5bbf498d92e4d1194f6f941307ffd95f75e76869f0e"; - strDarksendPoolDummyAddress = "y1EZuxhhNMAUofTBEeLqGE1bJrpC2TWRNp"; + strSporkKey = "0484698d3ba6ba6e7423fa5cbd6a89e0a9a5348f88d332b44a5cb1a8b7ed2c1eaa335fc8dc4f012cb8241cc0bdafd6ca70c5f5448916e4e6f511bcd746ed57dc50"; + strMasternodePaymentsPubKey = "0484698d3ba6ba6e7423fa5cbd6a89e0a9a5348f88d332b44a5cb1a8b7ed2c1eaa335fc8dc4f012cb8241cc0bdafd6ca70c5f5448916e4e6f511bcd746ed57dc50"; + strObfuscatePoolDummyAddress = "y1EZuxhhNMAUofTBEeLqGE1bJrpC2TWRNp"; nStartMasternodePayments = 1420837558; //Fri, 09 Jan 2015 21:05:58 GMT } const Checkpoints::CCheckpointData& Checkpoints() const @@ -273,27 +244,29 @@ class CRegTestParams : public CTestNetParams { CRegTestParams() { networkID = CBaseChainParams::REGTEST; strNetworkID = "regtest"; - pchMessageStart[0] = 0xfc; - pchMessageStart[1] = 0xc1; - pchMessageStart[2] = 0xb7; - pchMessageStart[3] = 0xdc; + strNetworkID = "regtest"; + pchMessageStart[0] = 0xa1; + pchMessageStart[1] = 0xcf; + pchMessageStart[2] = 0x7e; + pchMessageStart[3] = 0xac; nSubsidyHalvingInterval = 150; nEnforceBlockUpgradeMajority = 750; nRejectBlockOutdatedMajority = 950; nToCheckBlockUpgradeMajority = 1000; nMinerThreads = 1; - nTargetTimespan = 24 * 60 * 60; // Dash: 1 day - nTargetSpacing = 2.5 * 60; // Dash: 2.5 minutes + nTargetTimespan = 24 * 60 * 60; // DarkNet: 1 day + nTargetSpacing = 1 * 60; // Darknet: 1 minutes bnProofOfWorkLimit = ~uint256(0) >> 1; - genesis.nTime = 1417713337; + genesis.nTime = 1454124731; genesis.nBits = 0x207fffff; - genesis.nNonce = 1096447; + genesis.nNonce = 12345; + hashGenesisBlock = genesis.GetHash(); - nDefaultPort = 19994; - assert(hashGenesisBlock == uint256("0x000008ca1832a4baf228eb1553c03d3a2c8e02399550dd6ea8d65cec3ef23d2e")); + nDefaultPort = 51476; + assert(hashGenesisBlock == uint256("0x4f023a2120d9127b21bbad01724fdb79b519f593f2a85b60d3d79160ec5f29df")); - vFixedSeeds.clear(); //! Regtest mode doesn't have any fixed seeds. - vSeeds.clear(); //! Regtest mode doesn't have any DNS seeds. + vFixedSeeds.clear(); //! Testnet mode doesn't have any fixed seeds. + vSeeds.clear(); //! Testnet mode doesn't have any DNS seeds. fRequireRPCPassword = false; fMiningRequiresPeers = false; diff --git a/src/chainparams.h b/src/chainparams.h index 1b77635e8d921..74f3c0aae5edf 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -23,7 +23,7 @@ struct CDNSSeedData { /** * CChainParams defines various tweakable parameters of a given instance of the - * Dash system. There are three: the main network on which people trade goods + * DarkNet system. There are three: the main network on which people trade goods * and services, the public test network which gets reset from time to time and * a regression test mode which is intended for private networks only. It has * minimal difficulty to ensure that blocks can be found instantly. @@ -82,7 +82,7 @@ class CChainParams virtual const Checkpoints::CCheckpointData& Checkpoints() const = 0; int PoolMaxTransactions() const { return nPoolMaxTransactions; } std::string SporkKey() const { return strSporkKey; } - std::string DarksendPoolDummyAddress() const { return strDarksendPoolDummyAddress; } + std::string ObfuscatePoolDummyAddress() const { return strObfuscatePoolDummyAddress; } std::string MasternodePaymentPubKey() const { return strMasternodePaymentsPubKey; } int64_t StartMasternodePayments() const { return nStartMasternodePayments; } CBaseChainParams::Network NetworkID() const { return networkID; } @@ -119,7 +119,7 @@ class CChainParams int nPoolMaxTransactions; std::string strSporkKey; std::string strMasternodePaymentsPubKey; - std::string strDarksendPoolDummyAddress; + std::string strObfuscatePoolDummyAddress; int64_t nStartMasternodePayments; }; diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index 372c25ec03fe6..962b2acf8ba2b 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -22,7 +22,7 @@ class CBaseMainParams : public CBaseChainParams CBaseMainParams() { networkID = CBaseChainParams::MAIN; - nRPCPort = 9998; + nRPCPort = 51473; } }; static CBaseMainParams mainParams; @@ -36,7 +36,7 @@ class CBaseTestNetParams : public CBaseMainParams CBaseTestNetParams() { networkID = CBaseChainParams::TESTNET; - nRPCPort = 19998; + nRPCPort = 51475; strDataDir = "testnet3"; } }; diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h index 71a7176d8c234..f1fae3ae9b27e 100644 --- a/src/chainparamsbase.h +++ b/src/chainparamsbase.h @@ -9,7 +9,7 @@ #include /** - * CBaseChainParams defines the base parameters (shared between dash-cli and dashd) + * CBaseChainParams defines the base parameters (shared between darknet-cli and darknetd) * of a given instance of the Dash system. */ class CBaseChainParams diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h index a853d54f0336e..d39e86bbcdc26 100644 --- a/src/chainparamsseeds.h +++ b/src/chainparamsseeds.h @@ -9,21 +9,21 @@ */ // ***TODO*** fix generate-seeds.py and REGENERATE static SeedSpec6 pnSeed6_main[] = { - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb3,0x2b,0x80,0xef}, 9999}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0x7f,0x6a,0xeb}, 9999}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x9d,0xfa,0x0a}, 9999}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xd1,0x63,0x23}, 9999}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0x3d,0xd2,0x36}, 9999}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0xf5,0x05,0x84}, 9999}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa2,0x42,0x0a}, 9999}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x6d,0xb2,0xc3}, 9999}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8a,0x80,0xa9,0x5e}, 9999}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x0b,0x8d,0xe5}, 9999}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x3b,0x15,0x3a}, 9999}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x69,0x76,0x0f}, 9999}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x21,0x7e,0xdd}, 9999}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xec,0x17,0x83}, 9999}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0x3d,0xd1,0x25}, 9999} + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb3,0x2b,0x80,0xef}, 51472}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0x7f,0x6a,0xeb}, 51472}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x9d,0xfa,0x0a}, 51472}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xd1,0x63,0x23}, 51472}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0x3d,0xd2,0x36}, 51472}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0xf5,0x05,0x84}, 51472}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa2,0x42,0x0a}, 51472}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x6d,0xb2,0xc3}, 51472}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8a,0x80,0xa9,0x5e}, 51472}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x0b,0x8d,0xe5}, 51472}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x3b,0x15,0x3a}, 51472}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x69,0x76,0x0f}, 51472}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x21,0x7e,0xdd}, 51472}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xec,0x17,0x83}, 51472}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0x3d,0xd1,0x25}, 51472} }; static SeedSpec6 pnSeed6_test[] = { diff --git a/src/clientversion.cpp b/src/clientversion.cpp index c51c261dd18b1..44cb0dcee7d37 100644 --- a/src/clientversion.cpp +++ b/src/clientversion.cpp @@ -10,10 +10,10 @@ /** * Name of client reported in the 'version' message. Report the same name - * for both dashd and dash-qt, to make it harder for attackers to + * for both darknetd and darknet-qt, to make it harder for attackers to * target servers or GUI users specifically. */ -const std::string CLIENT_NAME("Dash Core"); +const std::string CLIENT_NAME("DarkNet Core"); /** * Client version number diff --git a/src/clientversion.h b/src/clientversion.h index 747f4afc3b1ad..014681dccb825 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -6,18 +6,18 @@ #define BITCOIN_CLIENTVERSION_H #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #else /** * client versioning and copyright year */ -//! These need to be macros, as clientversion.cpp's and dash*-res.rc's voodoo requires it -#define CLIENT_VERSION_MAJOR 0 -#define CLIENT_VERSION_MINOR 12 +//! These need to be macros, as clientversion.cpp's and darknet*-res.rc's voodoo requires it +#define CLIENT_VERSION_MAJOR 1 +#define CLIENT_VERSION_MINOR 0 #define CLIENT_VERSION_REVISION 0 -#define CLIENT_VERSION_BUILD 56 +#define CLIENT_VERSION_BUILD 0 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true @@ -41,7 +41,7 @@ #define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers, 2014-" STRINGIZE(COPYRIGHT_YEAR) " The Dash Core Developers" /** - * dashd-res.rc includes this file, but it cannot cope with real c++ code. + * darknetd-res.rc includes this file, but it cannot cope with real c++ code. * WINDRES_PREPROC is defined to indicate that its pre-processor is running. * Anything other than a define should be guarded below. */ diff --git a/src/coincontrol.h b/src/coincontrol.h index f0016e78288de..9c714c0f40b8d 100644 --- a/src/coincontrol.h +++ b/src/coincontrol.h @@ -12,8 +12,8 @@ class CCoinControl { public: CTxDestination destChange; - bool useDarkSend; - bool useInstantX; + bool useObfuscate; + bool useSwiftTX; CCoinControl() { @@ -24,8 +24,8 @@ class CCoinControl { destChange = CNoDestination(); setSelected.clear(); - useInstantX = false; - useDarkSend = true; + useSwiftTX = false; + useObfuscate = true; } bool HasSelected() const diff --git a/src/coins.h b/src/coins.h index f58c9f1d3e429..2ca9d0844a430 100644 --- a/src/coins.h +++ b/src/coins.h @@ -419,7 +419,7 @@ class CCoinsViewCache : public CCoinsViewBacked unsigned int GetCacheSize() const; /** - * Amount of dash coming in to a transaction + * Amount of darknet coming in to a transaction * Note that lightweight clients may not know anything besides the hash of previous transactions, * so may not be able to calculate this. * diff --git a/src/compat.h b/src/compat.h index dd120e96356fe..128dcdc5b462d 100644 --- a/src/compat.h +++ b/src/compat.h @@ -7,7 +7,7 @@ #define BITCOIN_COMPAT_H #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #endif #ifdef WIN32 diff --git a/src/compat/glibc_compat.cpp b/src/compat/glibc_compat.cpp index 88b6508c5b758..aefa6089bcb08 100644 --- a/src/compat/glibc_compat.cpp +++ b/src/compat/glibc_compat.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #endif #include diff --git a/src/compat/glibc_sanity.cpp b/src/compat/glibc_sanity.cpp index 7ea476697202e..c3b4ae430a9b4 100644 --- a/src/compat/glibc_sanity.cpp +++ b/src/compat/glibc_sanity.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #endif #include diff --git a/src/compat/strnlen.cpp b/src/compat/strnlen.cpp index c32762f0aee60..daab7a045c58a 100644 --- a/src/compat/strnlen.cpp +++ b/src/compat/strnlen.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #endif #include diff --git a/src/crypto/common.h b/src/crypto/common.h index c30ca83c97cd6..245f89638fb8b 100644 --- a/src/crypto/common.h +++ b/src/crypto/common.h @@ -6,7 +6,7 @@ #define BITCOIN_CRYPTO_COMMON_H #if defined(HAVE_CONFIG_H) -#include "dash-config.h" +#include "darknet-config.h" #endif #include diff --git a/src/dash-cli-res.rc b/src/darknet-cli-res.rc similarity index 93% rename from src/dash-cli-res.rc rename to src/darknet-cli-res.rc index e6347e906192c..bca380ec9477e 100644 --- a/src/dash-cli-res.rc +++ b/src/darknet-cli-res.rc @@ -19,10 +19,10 @@ BEGIN VALUE "CompanyName", "Dash" VALUE "FileDescription", "Dash-cli (OSS RPC client for Dash)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "dash-cli" + VALUE "InternalName", "darknet-cli" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." - VALUE "OriginalFilename", "dash-cli.exe" + VALUE "OriginalFilename", "darknet-cli.exe" VALUE "ProductName", "Dash-cli" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END diff --git a/src/dash-cli.cpp b/src/darknet-cli.cpp similarity index 95% rename from src/dash-cli.cpp rename to src/darknet-cli.cpp index 798741ddac5d9..94c99b2299efb 100644 --- a/src/dash-cli.cpp +++ b/src/darknet-cli.cpp @@ -25,13 +25,13 @@ std::string HelpMessageCli() string strUsage; strUsage += _("Options:") + "\n"; strUsage += " -? " + _("This help message") + "\n"; - strUsage += " -conf= " + strprintf(_("Specify configuration file (default: %s)"), "dash.conf") + "\n"; + strUsage += " -conf= " + strprintf(_("Specify configuration file (default: %s)"), "darknet.conf") + "\n"; strUsage += " -datadir= " + _("Specify data directory") + "\n"; strUsage += " -testnet " + _("Use the test network") + "\n"; strUsage += " -regtest " + _("Enter regression test mode, which uses a special chain in which blocks can be " "solved instantly. This is intended for regression testing tools and app development.") + "\n"; strUsage += " -rpcconnect= " + strprintf(_("Send commands to node running on (default: %s)"), "127.0.0.1") + "\n"; - strUsage += " -rpcport= " + strprintf(_("Connect to JSON-RPC on (default: %u or testnet: %u)"), 9998, 19998) + "\n"; + strUsage += " -rpcport= " + strprintf(_("Connect to JSON-RPC on (default: %u or testnet: %u)"), 51473, 51475) + "\n"; strUsage += " -rpcwait " + _("Wait for RPC server to start") + "\n"; strUsage += " -rpcuser= " + _("Username for JSON-RPC connections") + "\n"; strUsage += " -rpcpassword= " + _("Password for JSON-RPC connections") + "\n"; @@ -71,9 +71,9 @@ static bool AppInitRPC(int argc, char* argv[]) std::string strUsage = _("Dash Core RPC client version") + " " + FormatFullVersion() + "\n"; if (!mapArgs.count("-version")) { strUsage += "\n" + _("Usage:") + "\n" + - " dash-cli [options] [params] " + _("Send command to Dash Core") + "\n" + - " dash-cli [options] help " + _("List commands") + "\n" + - " dash-cli [options] help " + _("Get help for a command") + "\n"; + " darknet-cli [options] [params] " + _("Send command to Dash Core") + "\n" + + " darknet-cli [options] help " + _("List commands") + "\n" + + " darknet-cli [options] help " + _("Get help for a command") + "\n"; strUsage += "\n" + HelpMessageCli(); } diff --git a/src/dash-tx.cpp b/src/darknet-tx.cpp similarity index 98% rename from src/dash-tx.cpp rename to src/darknet-tx.cpp index 8e190604877b9..a81818c5e7740 100644 --- a/src/dash-tx.cpp +++ b/src/darknet-tx.cpp @@ -47,10 +47,10 @@ static bool AppInitRawTx(int argc, char* argv[]) if (argc<2 || mapArgs.count("-?") || mapArgs.count("-help")) { // First part of help message is specific to this utility - std::string strUsage = _("Dash Core dash-tx utility version") + " " + FormatFullVersion() + "\n\n" + + std::string strUsage = _("Dash Core darknet-tx utility version") + " " + FormatFullVersion() + "\n\n" + _("Usage:") + "\n" + - " dash-tx [options] [commands] " + _("Update hex-encoded dash transaction") + "\n" + - " dash-tx [options] -create [commands] " + _("Create hex-encoded dash transaction") + "\n" + + " darknet-tx [options] [commands] " + _("Update hex-encoded darknet transaction") + "\n" + + " darknet-tx [options] -create [commands] " + _("Create hex-encoded darknet transaction") + "\n" + "\n"; fprintf(stdout, "%s", strUsage.c_str()); @@ -555,7 +555,7 @@ static int CommandLineRawTx(int argc, char* argv[]) if (argc < 2) throw runtime_error("too few parameters"); - // param: hex-encoded dash transaction + // param: hex-encoded darknet transaction string strHexTx(argv[1]); if (strHexTx == "-") // "-" implies standard input strHexTx = readStdin(); diff --git a/src/dashd-res.rc b/src/darknetd-res.rc similarity index 82% rename from src/dashd-res.rc rename to src/darknetd-res.rc index 5a21801044449..d992bc5f299cf 100644 --- a/src/dashd-res.rc +++ b/src/darknetd-res.rc @@ -16,14 +16,14 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Dash" - VALUE "FileDescription", "Darkcoind (OSS daemon/client for Dash)" + VALUE "CompanyName", "DarkNet" + VALUE "FileDescription", "DarkNetd (OSS daemon/client for Dash)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "dashd" + VALUE "InternalName", "darknetd" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." - VALUE "OriginalFilename", "dashd.exe" - VALUE "ProductName", "Darkcoind" + VALUE "OriginalFilename", "darknetd.exe" + VALUE "ProductName", "DarkNetd" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/dashd.cpp b/src/darknetd.cpp similarity index 90% rename from src/dashd.cpp rename to src/darknetd.cpp index ad94af7b642d2..c799f8437cd91 100644 --- a/src/dashd.cpp +++ b/src/darknetd.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -23,8 +24,8 @@ * * \section intro_sec Introduction * - * This is the developer documentation of the reference client for an experimental new digital currency called Dash (http://www.dashpay.io/), - * which enables instant payments to anyone, anywhere in the world. Dash uses peer-to-peer technology to operate + * This is the developer documentation of the reference client for an experimental new digital currency called DarkNet (http://www.darknet-crypto.com), + * which enables instant payments to anyone, anywhere in the world. DarkNet uses peer-to-peer technology to operate * with no central authority: managing transactions and issuing money are carried out collectively by the network. * * The software is a community-driven open source project, released under the MIT license. @@ -65,7 +66,7 @@ bool AppInit(int argc, char* argv[]) // // Parameters // - // If Qt is used, parameters/dash.conf are parsed in qt/dash.cpp's main() + // If Qt is used, parameters/darknet.conf are parsed in qt/darknet.cpp's main() ParseParameters(argc, argv); // Process help and version before taking care about datadir @@ -80,7 +81,7 @@ bool AppInit(int argc, char* argv[]) else { strUsage += "\n" + _("Usage:") + "\n" + - " dashd [options] " + _("Start Dash Core Daemon") + "\n"; + " darknetd [options] " + _("Start Dash Core Daemon") + "\n"; strUsage += "\n" + HelpMessage(HMM_BITCOIND); } @@ -119,19 +120,19 @@ bool AppInit(int argc, char* argv[]) // Command-line RPC bool fCommandLine = false; for (int i = 1; i < argc; i++) - if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "dash:")) + if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "darknet:")) fCommandLine = true; if (fCommandLine) { - fprintf(stderr, "Error: There is no RPC client functionality in dashd anymore. Use the dash-cli utility instead.\n"); + fprintf(stderr, "Error: There is no RPC client functionality in darknetd anymore. Use the darknet-cli utility instead.\n"); exit(1); } #ifndef WIN32 fDaemon = GetBoolArg("-daemon", false); if (fDaemon) { - fprintf(stdout, "Dash server starting\n"); + fprintf(stdout, "DarkNet server starting\n"); // Daemonize pid_t pid = fork(); @@ -188,7 +189,7 @@ int main(int argc, char* argv[]) { SetupEnvironment(); - // Connect dashd signal handlers + // Connect darknetd signal handlers noui_connect(); return (AppInit(argc, argv) ? 0 : 1); diff --git a/src/hash.h b/src/hash.h index ac01947fbc85e..216b5fde81d7d 100644 --- a/src/hash.h +++ b/src/hash.h @@ -19,11 +19,6 @@ #include "crypto/sph_jh.h" #include "crypto/sph_keccak.h" #include "crypto/sph_skein.h" -#include "crypto/sph_luffa.h" -#include "crypto/sph_cubehash.h" -#include "crypto/sph_shavite.h" -#include "crypto/sph_simd.h" -#include "crypto/sph_echo.h" #include @@ -63,11 +58,6 @@ GLOBAL sph_groestl512_context z_groestl; GLOBAL sph_jh512_context z_jh; GLOBAL sph_keccak512_context z_keccak; GLOBAL sph_skein512_context z_skein; -GLOBAL sph_luffa512_context z_luffa; -GLOBAL sph_cubehash512_context z_cubehash; -GLOBAL sph_shavite512_context z_shavite; -GLOBAL sph_simd512_context z_simd; -GLOBAL sph_echo512_context z_echo; #define fillz() do { \ sph_blake512_init(&z_blake); \ @@ -76,12 +66,7 @@ GLOBAL sph_echo512_context z_echo; sph_jh512_init(&z_jh); \ sph_keccak512_init(&z_keccak); \ sph_skein512_init(&z_skein); \ - sph_luffa512_init(&z_luffa); \ - sph_cubehash512_init(&z_cubehash); \ - sph_shavite512_init(&z_shavite); \ - sph_simd512_init(&z_simd); \ - sph_echo512_init(&z_echo); \ -} while (0) +} while (0) #define ZBLAKE (memcpy(&ctx_blake, &z_blake, sizeof(z_blake))) #define ZBMW (memcpy(&ctx_bmw, &z_bmw, sizeof(z_bmw))) @@ -272,9 +257,9 @@ void BIP32Hash(const unsigned char chainCode[32], unsigned int nChild, unsigned //int HMAC_SHA512_Update(HMAC_SHA512_CTX *pctx, const void *pdata, size_t len); //int HMAC_SHA512_Final(unsigned char *pmd, HMAC_SHA512_CTX *pctx); -/* ----------- Dash Hash ------------------------------------------------ */ +/* ----------- Quark Hash ------------------------------------------------ */ template -inline uint256 HashX11(const T1 pbegin, const T1 pend) +inline uint256 HashQuark(const T1 pbegin, const T1 pend) { sph_blake512_context ctx_blake; @@ -283,60 +268,89 @@ inline uint256 HashX11(const T1 pbegin, const T1 pend) sph_jh512_context ctx_jh; sph_keccak512_context ctx_keccak; sph_skein512_context ctx_skein; - sph_luffa512_context ctx_luffa; - sph_cubehash512_context ctx_cubehash; - sph_shavite512_context ctx_shavite; - sph_simd512_context ctx_simd; - sph_echo512_context ctx_echo; static unsigned char pblank[1]; - uint512 hash[11]; + uint512 mask = 8; + uint512 zero = 0; + + uint512 hash[9]; sph_blake512_init(&ctx_blake); + // ZBLAKE; sph_blake512 (&ctx_blake, (pbegin == pend ? pblank : static_cast(&pbegin[0])), (pend - pbegin) * sizeof(pbegin[0])); sph_blake512_close(&ctx_blake, static_cast(&hash[0])); - + sph_bmw512_init(&ctx_bmw); + // ZBMW; sph_bmw512 (&ctx_bmw, static_cast(&hash[0]), 64); sph_bmw512_close(&ctx_bmw, static_cast(&hash[1])); + if ((hash[1] & mask) != zero) + { + sph_groestl512_init(&ctx_groestl); + // ZGROESTL; + sph_groestl512 (&ctx_groestl, static_cast(&hash[1]), 64); + sph_groestl512_close(&ctx_groestl, static_cast(&hash[2])); + } + else + { + sph_skein512_init(&ctx_skein); + // ZSKEIN; + sph_skein512 (&ctx_skein, static_cast(&hash[1]), 64); + sph_skein512_close(&ctx_skein, static_cast(&hash[2])); + } + sph_groestl512_init(&ctx_groestl); - sph_groestl512 (&ctx_groestl, static_cast(&hash[1]), 64); - sph_groestl512_close(&ctx_groestl, static_cast(&hash[2])); - - sph_skein512_init(&ctx_skein); - sph_skein512 (&ctx_skein, static_cast(&hash[2]), 64); - sph_skein512_close(&ctx_skein, static_cast(&hash[3])); + // ZGROESTL; + sph_groestl512 (&ctx_groestl, static_cast(&hash[2]), 64); + sph_groestl512_close(&ctx_groestl, static_cast(&hash[3])); sph_jh512_init(&ctx_jh); + // ZJH; sph_jh512 (&ctx_jh, static_cast(&hash[3]), 64); sph_jh512_close(&ctx_jh, static_cast(&hash[4])); + if ((hash[4] & mask) != zero) + { + sph_blake512_init(&ctx_blake); + // ZBLAKE; + sph_blake512 (&ctx_blake, static_cast(&hash[4]), 64); + sph_blake512_close(&ctx_blake, static_cast(&hash[5])); + } + else + { + sph_bmw512_init(&ctx_bmw); + // ZBMW; + sph_bmw512 (&ctx_bmw, static_cast(&hash[4]), 64); + sph_bmw512_close(&ctx_bmw, static_cast(&hash[5])); + } + sph_keccak512_init(&ctx_keccak); - sph_keccak512 (&ctx_keccak, static_cast(&hash[4]), 64); - sph_keccak512_close(&ctx_keccak, static_cast(&hash[5])); + // ZKECCAK; + sph_keccak512 (&ctx_keccak, static_cast(&hash[5]), 64); + sph_keccak512_close(&ctx_keccak, static_cast(&hash[6])); - sph_luffa512_init(&ctx_luffa); - sph_luffa512 (&ctx_luffa, static_cast(&hash[5]), 64); - sph_luffa512_close(&ctx_luffa, static_cast(&hash[6])); - - sph_cubehash512_init(&ctx_cubehash); - sph_cubehash512 (&ctx_cubehash, static_cast(&hash[6]), 64); - sph_cubehash512_close(&ctx_cubehash, static_cast(&hash[7])); - - sph_shavite512_init(&ctx_shavite); - sph_shavite512(&ctx_shavite, static_cast(&hash[7]), 64); - sph_shavite512_close(&ctx_shavite, static_cast(&hash[8])); - - sph_simd512_init(&ctx_simd); - sph_simd512 (&ctx_simd, static_cast(&hash[8]), 64); - sph_simd512_close(&ctx_simd, static_cast(&hash[9])); - - sph_echo512_init(&ctx_echo); - sph_echo512 (&ctx_echo, static_cast(&hash[9]), 64); - sph_echo512_close(&ctx_echo, static_cast(&hash[10])); + sph_skein512_init(&ctx_skein); + // SKEIN; + sph_skein512 (&ctx_skein, static_cast(&hash[6]), 64); + sph_skein512_close(&ctx_skein, static_cast(&hash[7])); + + if ((hash[7] & mask) != zero) + { + sph_keccak512_init(&ctx_keccak); + // ZKECCAK; + sph_keccak512 (&ctx_keccak, static_cast(&hash[7]), 64); + sph_keccak512_close(&ctx_keccak, static_cast(&hash[8])); + } + else + { + sph_jh512_init(&ctx_jh); + // ZJH; + sph_jh512 (&ctx_jh, static_cast(&hash[7]), 64); + sph_jh512_close(&ctx_jh, static_cast(&hash[8])); + } + return hash[8].trim256(); - return hash[10].trim256(); } #endif // BITCOIN_HASH_H diff --git a/src/init.cpp b/src/init.cpp index deac30e4f93f5..95f85e37152a6 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1,11 +1,12 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2014-2015 The DarkNet developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #endif #include "init.h" @@ -160,7 +161,7 @@ void PrepareShutdown() /// for example if the data directory was found to be locked. /// Be sure that anything that writes files or flushes caches only does this if the respective /// module was initialized. - RenameThread("dash-shutoff"); + RenameThread("darknet-shutoff"); mempool.AddTransactionsUpdated(1); StopRPCThreads(); #ifdef ENABLE_WALLET @@ -280,7 +281,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += " -blocknotify= " + _("Execute command when the best block changes (%s in cmd is replaced by block hash)") + "\n"; strUsage += " -checkblocks= " + strprintf(_("How many blocks to check at startup (default: %u, 0 = all)"), 288) + "\n"; strUsage += " -checklevel= " + strprintf(_("How thorough the block verification of -checkblocks is (0-4, default: %u)"), 3) + "\n"; - strUsage += " -conf= " + strprintf(_("Specify configuration file (default: %s)"), "dash.conf") + "\n"; + strUsage += " -conf= " + strprintf(_("Specify configuration file (default: %s)"), "darknet.conf") + "\n"; if (mode == HMM_BITCOIND) { #if !defined(WIN32) @@ -293,7 +294,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += " -maxorphantx= " + strprintf(_("Keep at most unconnectable transactions in memory (default: %u)"), DEFAULT_MAX_ORPHAN_TRANSACTIONS) + "\n"; strUsage += " -par= " + strprintf(_("Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)"), -(int)boost::thread::hardware_concurrency(), MAX_SCRIPTCHECK_THREADS, DEFAULT_SCRIPTCHECK_THREADS) + "\n"; #ifndef WIN32 - strUsage += " -pid= " + strprintf(_("Specify pid file (default: %s)"), "dashd.pid") + "\n"; + strUsage += " -pid= " + strprintf(_("Specify pid file (default: %s)"), "darknetd.pid") + "\n"; #endif strUsage += " -reindex " + _("Rebuild block chain index from current blk000??.dat files") + " " + _("on startup") + "\n"; #if !defined(WIN32) @@ -319,7 +320,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += " -onion= " + strprintf(_("Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)"), "-proxy") + "\n"; strUsage += " -onlynet= " + _("Only connect to nodes in network (ipv4, ipv6 or onion)") + "\n"; strUsage += " -permitbaremultisig " + strprintf(_("Relay non-P2SH multisig (default: %u)"), 1) + "\n"; - strUsage += " -port= " + strprintf(_("Listen for connections on (default: %u or testnet: %u)"), 9999, 19999) + "\n"; + strUsage += " -port= " + strprintf(_("Listen for connections on (default: %u or testnet: %u)"), 51472, 51474) + "\n"; strUsage += " -proxy= " + _("Connect through SOCKS5 proxy") + "\n"; strUsage += " -seednode= " + _("Connect to a node to retrieve peer addresses, and disconnect") + "\n"; strUsage += " -timeout= " + strprintf(_("Specify connection timeout in milliseconds (minimum: 1, default: %d)"), DEFAULT_CONNECT_TIMEOUT) + "\n"; @@ -345,8 +346,8 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += " -keepassname= " + _("Name to construct url for KeePass entry that stores the wallet passphrase") + "\n"; strUsage += " -keypool= " + strprintf(_("Set key pool size to (default: %u)"), 100) + "\n"; if (GetBoolArg("-help-debug", false)) - strUsage += " -mintxfee= " + strprintf(_("Fees (in DASH/Kb) smaller than this are considered zero fee for transaction creation (default: %s)"), FormatMoney(CWallet::minTxFee.GetFeePerK())) + "\n"; - strUsage += " -paytxfee= " + strprintf(_("Fee (in DASH/kB) to add to transactions you send (default: %s)"), FormatMoney(payTxFee.GetFeePerK())) + "\n"; + strUsage += " -mintxfee= " + strprintf(_("Fees (in DNET/Kb) smaller than this are considered zero fee for transaction creation (default: %s)"), FormatMoney(CWallet::minTxFee.GetFeePerK())) + "\n"; + strUsage += " -paytxfee= " + strprintf(_("Fee (in DNET/kB) to add to transactions you send (default: %s)"), FormatMoney(payTxFee.GetFeePerK())) + "\n"; strUsage += " -rescan " + _("Rescan the block chain for missing wallet transactions") + " " + _("on startup") + "\n"; strUsage += " -salvagewallet " + _("Attempt to recover private keys from a corrupt wallet.dat") + " " + _("on startup") + "\n"; strUsage += " -sendfreetransactions " + strprintf(_("Send transactions as zero-fee transactions if possible (default: %u)"), 0) + "\n"; @@ -378,7 +379,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += " " + _("If is not supplied, output all debugging information.") + "\n"; strUsage += " " + _(" can be:\n"); strUsage += " addrman, alert, bench, coindb, db, lock, rand, rpc, selectcoins, mempool, net,\n"; // Don't translate these and qt below - strUsage += " dash (or specifically: darksend, instantx, masternode, keepass, mnpayments, mnbudget)"; // Don't translate these and qt below + strUsage += " darknet (or specifically: obfuscate, swifttx, masternode, keepass, mnpayments, mnbudget)"; // Don't translate these and qt below if (mode == HMM_BITCOIN_QT) strUsage += ", qt"; strUsage += ".\n"; @@ -395,7 +396,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += " -relaypriority " + strprintf(_("Require high priority for relaying free or low-fee transactions (default:%u)"), 1) + "\n"; strUsage += " -maxsigcachesize= " + strprintf(_("Limit size of signature cache to entries (default: %u)"), 50000) + "\n"; } - strUsage += " -minrelaytxfee= " + strprintf(_("Fees (in DASH/Kb) smaller than this are considered zero fee for relaying (default: %s)"), FormatMoney(::minRelayTxFee.GetFeePerK())) + "\n"; + strUsage += " -minrelaytxfee= " + strprintf(_("Fees (in DNET/Kb) smaller than this are considered zero fee for relaying (default: %s)"), FormatMoney(::minRelayTxFee.GetFeePerK())) + "\n"; strUsage += " -printtoconsole " + strprintf(_("Send trace/debug info to console instead of debug.log file (default: %u)"), 0) + "\n"; if (GetBoolArg("-help-debug", false)) { @@ -407,25 +408,25 @@ std::string HelpMessage(HelpMessageMode mode) } strUsage += " -shrinkdebugfile " + _("Shrink debug.log file on client startup (default: 1 when no -debug)") + "\n"; strUsage += " -testnet " + _("Use the test network") + "\n"; - strUsage += " -litemode= " + strprintf(_("Disable all Dash specific functionality (Masternodes, Darksend, InstantX, Budgeting) (0-1, default: %u)"), 0) + "\n"; + strUsage += " -litemode= " + strprintf(_("Disable all DarkNet specific functionality (Masternodes, Obfuscate, SwiftTX, Budgeting) (0-1, default: %u)"), 0) + "\n"; strUsage += "\n" + _("Masternode options:") + "\n"; strUsage += " -masternode= " + strprintf(_("Enable the client to act as a masternode (0-1, default: %u)"), 0) + "\n"; strUsage += " -mnconf= " + strprintf(_("Specify masternode configuration file (default: %s)"), "masternode.conf") + "\n"; strUsage += " -mnconflock= " + strprintf(_("Lock masternodes from masternode configuration file (default: %u)"), 1) + "\n"; strUsage += " -masternodeprivkey= " + _("Set the masternode private key") + "\n"; - strUsage += " -masternodeaddr= " + strprintf(_("Set external address:port to get to this masternode (example: %s)"), "128.127.106.235:9999") + "\n"; + strUsage += " -masternodeaddr= " + strprintf(_("Set external address:port to get to this masternode (example: %s)"), "128.127.106.235:51472") + "\n"; strUsage += " -budgetvotemode= " + _("Change automatic finalized budget voting behavior. mode=auto: Vote for only exact finalized budget match to my generated budget. (string, default: auto)") + "\n"; - strUsage += "\n" + _("Darksend options:") + "\n"; - strUsage += " -enabledarksend= " + strprintf(_("Enable use of automated darksend for funds stored in this wallet (0-1, default: %u)"), 0) + "\n"; - strUsage += " -darksendrounds= " + strprintf(_("Use N separate masternodes to anonymize funds (2-8, default: %u)"), 2) + "\n"; - strUsage += " -anonymizedashamount= " + strprintf(_("Keep N DASH anonymized (default: %u)"), 0) + "\n"; - strUsage += " -liquidityprovider= " + strprintf(_("Provide liquidity to Darksend by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees)"), 0) + "\n"; + strUsage += "\n" + _("Obfuscate options:") + "\n"; + strUsage += " -enableobfuscate= " + strprintf(_("Enable use of automated obfuscate for funds stored in this wallet (0-1, default: %u)"), 0) + "\n"; + strUsage += " -obfuscaterounds= " + strprintf(_("Use N separate masternodes to anonymize funds (2-8, default: %u)"), 2) + "\n"; + strUsage += " -anonymizedarknetamount= " + strprintf(_("Keep N DNET anonymized (default: %u)"), 0) + "\n"; + strUsage += " -liquidityprovider= " + strprintf(_("Provide liquidity to Obfuscate by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees)"), 0) + "\n"; - strUsage += "\n" + _("InstantX options:") + "\n"; - strUsage += " -enableinstantx= " + strprintf(_("Enable instantx, show confirmations for locked transactions (bool, default: %s)"), "true") + "\n"; - strUsage += " -instantxdepth= " + strprintf(_("Show N confirmations for a successfully locked transaction (0-9999, default: %u)"), nInstantXDepth) + "\n"; + strUsage += "\n" + _("SwiftTX options:") + "\n"; + strUsage += " -enableswifttx= " + strprintf(_("Enable swifttx, show confirmations for locked transactions (bool, default: %s)"), "true") + "\n"; + strUsage += " -swifttxdepth= " + strprintf(_("Show N confirmations for a successfully locked transaction (0-9999, default: %u)"), nSwiftTXDepth) + "\n"; strUsage += "\n" + _("Node relay options:") + "\n"; strUsage += " -datacarrier " + strprintf(_("Relay and mine data carrier transactions (default: %u)"), 1) + "\n"; @@ -442,7 +443,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += " -rpcbind= " + _("Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)") + "\n"; strUsage += " -rpcuser= " + _("Username for JSON-RPC connections") + "\n"; strUsage += " -rpcpassword= " + _("Password for JSON-RPC connections") + "\n"; - strUsage += " -rpcport= " + strprintf(_("Listen for JSON-RPC connections on (default: %u or testnet: %u)"), 9998, 19998) + "\n"; + strUsage += " -rpcport= " + strprintf(_("Listen for JSON-RPC connections on (default: %u or testnet: %u)"), 51473, 51475) + "\n"; strUsage += " -rpcallowip= " + _("Allow JSON-RPC connections from specified source. Valid for are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times") + "\n"; strUsage += " -rpcthreads= " + strprintf(_("Set the number of threads to service RPC calls (default: %d)"), 4) + "\n"; strUsage += " -rpckeepalive " + strprintf(_("RPC support for HTTP persistent connections (default: %d)"), 1) + "\n"; @@ -462,6 +463,8 @@ std::string LicenseInfo() "\n" + FormatParagraph(strprintf(_("Copyright (C) 2014-%i The Dash Core Developers"), COPYRIGHT_YEAR)) + "\n" + "\n" + + FormatParagraph(strprintf(_("Copyright (C) 2015-%i The DarkNet Core Developers"), COPYRIGHT_YEAR)) + "\n" + + "\n" + FormatParagraph(_("This is experimental software.")) + "\n" + "\n" + FormatParagraph(_("Distributed under the MIT software license, see the accompanying file COPYING or .")) + "\n" + @@ -493,7 +496,7 @@ struct CImportingNow void ThreadImport(std::vector vImportFiles) { - RenameThread("dash-loadblk"); + RenameThread("darknet-loadblk"); // -reindex if (fReindex) { @@ -551,7 +554,7 @@ void ThreadImport(std::vector vImportFiles) } /** Sanity checks - * Ensure that Dash is running in a usable environment with all + * Ensure that DarkNet is running in a usable environment with all * necessary library support. */ bool InitSanityCheck(void) @@ -569,7 +572,7 @@ bool InitSanityCheck(void) -/** Initialize dash. +/** Initialize darknet. * @pre Parameters should be parsed and config file should be read. */ bool AppInit2(boost::thread_group& threadGroup) @@ -698,9 +701,9 @@ bool AppInit2(boost::thread_group& threadGroup) LogPrintf("AppInit2 : parameter interaction: -zapwallettxes= -> setting -rescan=1\n"); } - if(!GetBoolArg("-enableinstantx", fEnableInstantX)){ - if (SoftSetArg("-instantxdepth", 0)) - LogPrintf("AppInit2 : parameter interaction: -enableinstantx=false -> setting -nInstantXDepth=0\n"); + if(!GetBoolArg("-enableswifttx", fEnableSwiftTX)){ + if (SoftSetArg("-swifttxdepth", 0)) + LogPrintf("AppInit2 : parameter interaction: -enableswifttx=false -> setting -nSwiftTXDepth=0\n"); } // Make sure enough file descriptors are available @@ -826,7 +829,7 @@ bool AppInit2(boost::thread_group& threadGroup) // Sanity check if (!InitSanityCheck()) - return InitError(_("Initialization sanity check failed. Dash Core is shutting down.")); + return InitError(_("Initialization sanity check failed. DarkNet Core is shutting down.")); std::string strDataDir = GetDataDir().string(); #ifdef ENABLE_WALLET @@ -834,7 +837,7 @@ bool AppInit2(boost::thread_group& threadGroup) if (strWalletFile != boost::filesystem::basename(strWalletFile) + boost::filesystem::extension(strWalletFile)) return InitError(strprintf(_("Wallet %s resides outside data directory %s"), strWalletFile, strDataDir)); #endif - // Make sure only a single Dash process is using the data directory. + // Make sure only a single DarkNet process is using the data directory. boost::filesystem::path pathLockFile = GetDataDir() / ".lock"; FILE* file = fopen(pathLockFile.string().c_str(), "a"); // empty lock file; created if it doesn't exist. if (file) fclose(file); @@ -842,7 +845,7 @@ bool AppInit2(boost::thread_group& threadGroup) // Wait maximum 10 seconds if an old wallet is still running. Avoids lockup during restart if (!lock.timed_lock(boost::get_system_time() + boost::posix_time::seconds(10))) - return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Dash Core is probably already running."), strDataDir)); + return InitError(strprintf(_("Cannot obtain a lock on data directory %s. DarkNet Core is probably already running."), strDataDir)); #ifndef WIN32 CreatePidFile(GetPidFile(), getpid()); @@ -850,7 +853,7 @@ bool AppInit2(boost::thread_group& threadGroup) if (GetBoolArg("-shrinkdebugfile", !fDebug)) ShrinkDebugFile(); LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); - LogPrintf("Dash version %s (%s)\n", FormatFullVersion(), CLIENT_DATE); + LogPrintf("DarkNet version %s (%s)\n", FormatFullVersion(), CLIENT_DATE); LogPrintf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION)); #ifdef ENABLE_WALLET LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0)); @@ -914,13 +917,11 @@ bool AppInit2(boost::thread_group& threadGroup) boost::filesystem::path backupFile = backupPathStr + dateTimeStr; sourceFile.make_preferred(); backupFile.make_preferred(); - if(boost::filesystem::exists(sourceFile)) { - try { - boost::filesystem::copy_file(sourceFile, backupFile); - LogPrintf("Creating backup of %s -> %s\n", sourceFile, backupFile); - } catch(boost::filesystem::filesystem_error &error) { - LogPrintf("Failed to create backup %s\n", error.what()); - } + try { + boost::filesystem::copy_file(sourceFile, backupFile); + LogPrintf("Creating backup of %s -> %s\n", sourceFile, backupFile); + } catch(boost::filesystem::filesystem_error &error) { + LogPrintf("Failed to create backup %s\n", error.what()); } // Keep only the last 10 backups, including the new one of course typedef std::multimap folder_set_t; @@ -1295,10 +1296,10 @@ bool AppInit2(boost::thread_group& threadGroup) InitWarning(msg); } else if (nLoadWalletRet == DB_TOO_NEW) - strErrors << _("Error loading wallet.dat: Wallet requires newer version of Dash Core") << "\n"; + strErrors << _("Error loading wallet.dat: Wallet requires newer version of DarkNet Core") << "\n"; else if (nLoadWalletRet == DB_NEED_REWRITE) { - strErrors << _("Wallet needed to be rewritten: restart Dash Core to complete") << "\n"; + strErrors << _("Wallet needed to be rewritten: restart DarkNet Core to complete") << "\n"; LogPrintf("%s", strErrors.str()); return InitError(strErrors.str()); } @@ -1414,7 +1415,7 @@ bool AppInit2(boost::thread_group& threadGroup) MilliSleep(10); } - // ********************************************************* Step 10: setup DarkSend + // ********************************************************* Step 10: setup Obfuscate uiInterface.InitMessage(_("Loading masternode cache...")); @@ -1522,48 +1523,49 @@ bool AppInit2(boost::thread_group& threadGroup) } } - fEnableDarksend = GetBoolArg("-enabledarksend", false); + fEnableObfuscate = GetBoolArg("-enableobfuscate", false); - nDarksendRounds = GetArg("-darksendrounds", 2); - if(nDarksendRounds > 16) nDarksendRounds = 16; - if(nDarksendRounds < 1) nDarksendRounds = 1; + nObfuscateRounds = GetArg("-obfuscaterounds", 2); + if(nObfuscateRounds > 16) nObfuscateRounds = 16; + if(nObfuscateRounds < 1) nObfuscateRounds = 1; nLiquidityProvider = GetArg("-liquidityprovider", 0); //0-100 if(nLiquidityProvider != 0) { darkSendPool.SetMinBlockSpacing(std::min(nLiquidityProvider,100)*15); - fEnableDarksend = true; - nDarksendRounds = 99999; + fEnableObfuscate = true; + nObfuscateRounds = 99999; } - nAnonymizeDarkcoinAmount = GetArg("-anonymizedashamount", 0); + nAnonymizeDarkcoinAmount = GetArg("-anonymizedarknetamount", 0); if(nAnonymizeDarkcoinAmount > 999999) nAnonymizeDarkcoinAmount = 999999; if(nAnonymizeDarkcoinAmount < 2) nAnonymizeDarkcoinAmount = 2; - fEnableInstantX = GetBoolArg("-enableinstantx", fEnableInstantX); - nInstantXDepth = GetArg("-instantxdepth", nInstantXDepth); - nInstantXDepth = std::min(std::max(nInstantXDepth, 0), 60); + fEnableSwiftTX = GetBoolArg("-enableswifttx", fEnableSwiftTX); + nSwiftTXDepth = GetArg("-swifttxdepth", nSwiftTXDepth); + nSwiftTXDepth = std::min(std::max(nSwiftTXDepth, 0), 60); - //lite mode disables all Masternode and Darksend related functionality + //lite mode disables all Masternode and Obfuscate related functionality fLiteMode = GetBoolArg("-litemode", false); if(fMasterNode && fLiteMode){ return InitError("You can not start a masternode in litemode"); } LogPrintf("fLiteMode %d\n", fLiteMode); - LogPrintf("nInstantXDepth %d\n", nInstantXDepth); - LogPrintf("Darksend rounds %d\n", nDarksendRounds); - LogPrintf("Anonymize Dash Amount %d\n", nAnonymizeDarkcoinAmount); + LogPrintf("nSwiftTXDepth %d\n", nSwiftTXDepth); + LogPrintf("Obfuscate rounds %d\n", nObfuscateRounds); + LogPrintf("Anonymize DarkNet Amount %d\n", nAnonymizeDarkcoinAmount); LogPrintf("Budget Mode %s\n", strBudgetMode.c_str()); /* Denominations - A note about convertability. Within Darksend pools, each denomination + A note about convertability. Within Obfuscate pools, each denomination is convertable to another. For example: 1DRK+1000 == (.1DRK+100)*10 10DRK+10000 == (1DRK+1000)*10 */ + darkSendDenominations.push_back( (1000 * COIN)+1000000 ); darkSendDenominations.push_back( (100 * COIN)+100000 ); darkSendDenominations.push_back( (10 * COIN)+10000 ); darkSendDenominations.push_back( (1 * COIN)+1000 ); @@ -1575,7 +1577,7 @@ bool AppInit2(boost::thread_group& threadGroup) darkSendPool.InitCollateralAddress(); - threadGroup.create_thread(boost::bind(&ThreadCheckDarkSendPool)); + threadGroup.create_thread(boost::bind(&ThreadCheckObfuscatePool)); // ********************************************************* Step 11: start node diff --git a/src/keepass.cpp b/src/keepass.cpp index a4453fa89ea76..bdfe1181547f0 100644 --- a/src/keepass.cpp +++ b/src/keepass.cpp @@ -1,4 +1,5 @@ // Copyright (c) 2014 The Dash developers +// Copyright (c) 2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -184,7 +185,7 @@ std::string CKeePassIntegrator::constructHTTPPost(const std::string& strMsg, con { std::ostringstream s; s << "POST / HTTP/1.1\r\n" - << "User-Agent: dash-json-rpc/" << FormatFullVersion() << "\r\n" + << "User-Agent: darknet-json-rpc/" << FormatFullVersion() << "\r\n" << "Host: localhost\r\n" << "Content-Type: application/json\r\n" << "Content-Length: " << strMsg.size() << "\r\n" @@ -343,7 +344,7 @@ void CKeePassIntegrator::rpcSetLogin(const SecureString& strWalletPass, const Se LogPrint("keepass", "CKeePassIntegrator::rpcSetLogin - send Url: %s\n", sUrl); //request.addStrParameter("SubmitUrl", sSubmitUrl); // Is used to construct the entry title - request.addStrParameter("Login", SecureString("dash")); + request.addStrParameter("Login", SecureString("darknet")); request.addStrParameter("Password", strWalletPass); if(sEntryId.size() != 0) { diff --git a/src/main.cpp b/src/main.cpp index a55fd367aa6e8..a16436f613efa 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -12,8 +13,8 @@ #include "checkpoints.h" #include "checkqueue.h" #include "init.h" -#include "instantx.h" -#include "darksend.h" +#include "swifttx.h" +#include "obfuscate.h" #include "masternodeman.h" #include "masternode-payments.h" #include "masternode-budget.h" @@ -39,7 +40,7 @@ using namespace boost; using namespace std; #if defined(NDEBUG) -# error "Dash cannot be compiled without assertions." +# error "DarkNet cannot be compiled without assertions." #endif /** @@ -87,7 +88,7 @@ static void CheckBlockIndex(); /** Constant stuff for coinbase transactions we create: */ CScript COINBASE_FLAGS; -const string strMessageMagic = "DarkCoin Signed Message:\n"; +const string strMessageMagic = "DarkNet Signed Message:\n"; // Internal stuff namespace { @@ -886,7 +887,7 @@ int GetInputAgeIX(uint256 nTXHash, CTxIn& vin) sigs = (*i).second.CountSignatures(); } if(sigs >= INSTANTX_SIGNATURES_REQUIRED){ - return nInstantXDepth+nResult; + return nSwiftTXDepth+nResult; } } @@ -902,7 +903,7 @@ int GetIXConfirmations(uint256 nTXHash) sigs = (*i).second.CountSignatures(); } if(sigs >= INSTANTX_SIGNATURES_REQUIRED){ - return nInstantXDepth; + return nSwiftTXDepth; } return 0; @@ -951,7 +952,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state) if (tx.IsCoinBase()) { - if (tx.vin[0].scriptSig.size() < 2 || tx.vin[0].scriptSig.size() > 100) + if (tx.vin[0].scriptSig.size() < 2 || tx.vin[0].scriptSig.size() > 150) return state.DoS(100, error("CheckTransaction() : coinbase script size"), REJECT_INVALID, "bad-cb-length"); } @@ -1023,7 +1024,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa if (pool.exists(hash)) return false; - // ----------- instantX transaction scanning ----------- + // ----------- swiftTX transaction scanning ----------- BOOST_FOREACH(const CTxIn& in, tx.vin){ if(mapLockedInputs.count(in.prevout)){ @@ -1115,8 +1116,8 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa // Don't accept it if it can't get into a block // but prioritise dstx and don't check fees for it - if(mapDarksendBroadcastTxes.count(hash)) { - mempool.PrioritiseTransaction(hash, hash.ToString(), 1000, 0.1*COIN); + if(mapObfuscateBroadcastTxes.count(hash)) { + mempool.PrioritiseTransaction(hash, hash.ToString(), 1000, 1*COIN); } else if(!ignoreFees){ CAmount txMinFee = GetMinRelayFee(tx, nSize, true); if (fLimitFree && nFees < txMinFee) @@ -1217,7 +1218,7 @@ bool AcceptableInputs(CTxMemPool& pool, CValidationState &state, const CTransact if (pool.exists(hash)) return false; - // ----------- instantX transaction scanning ----------- + // ----------- swiftTX transaction scanning ----------- BOOST_FOREACH(const CTxIn& in, tx.vin){ if(mapLockedInputs.count(in.prevout)){ @@ -1311,7 +1312,7 @@ bool AcceptableInputs(CTxMemPool& pool, CValidationState &state, const CTransact // Don't accept it if it can't get into a block // but prioritise dstx and don't check fees for it if(isDSTX) { - mempool.PrioritiseTransaction(hash, hash.ToString(), 1000, 0.1*COIN); + mempool.PrioritiseTransaction(hash, hash.ToString(), 1000, 1*COIN); } else { // same as !ignoreFees for AcceptToMemoryPool CAmount txMinFee = GetMinRelayFee(tx, nSize, true); if (fLimitFree && nFees < txMinFee) @@ -1536,87 +1537,27 @@ double ConvertBitsToDouble(unsigned int nBits) int64_t GetBlockValue(int nBits, int nHeight, const CAmount& nFees) { - double dDiff = (double)0x0000ffff / (double)(nBits & 0x00ffffff); - - /* fixed bug caused diff to not be correctly calculated */ - if(nHeight > 4500 || Params().NetworkID() == CBaseChainParams::TESTNET) dDiff = ConvertBitsToDouble(nBits); - int64_t nSubsidy = 0; - if(nHeight >= 5465) { - if((nHeight >= 17000 && dDiff > 75) || nHeight >= 24000) { // GPU/ASIC difficulty calc - // 2222222/(((x+2600)/9)^2) - nSubsidy = (2222222.0 / (pow((dDiff+2600.0)/9.0,2.0))); - if (nSubsidy > 25) nSubsidy = 25; - if (nSubsidy < 5) nSubsidy = 5; - } else { // CPU mining calc - nSubsidy = (11111.0 / (pow((dDiff+51.0)/6.0,2.0))); - if (nSubsidy > 500) nSubsidy = 500; - if (nSubsidy < 25) nSubsidy = 25; - } - } else { - nSubsidy = (1111.0 / (pow((dDiff+1.0),2.0))); - if (nSubsidy > 500) nSubsidy = 500; - if (nSubsidy < 1) nSubsidy = 1; + if(nHeight == 0) { + nSubsidy = 60001 * COIN; } - - // LogPrintf("height %u diff %4.2f reward %i \n", nHeight, dDiff, nSubsidy); - nSubsidy *= COIN; - - if(Params().NetworkID() == CBaseChainParams::TESTNET){ - for(int i = 46200; i <= nHeight; i += 210240) nSubsidy -= nSubsidy/14; + else if(nHeight <= 259200 && nHeight > 0) { + nSubsidy = 250 * COIN; } else { - // yearly decline of production by 7.1% per year, projected 21.3M coins max by year 2050. - for(int i = 210240; i <= nHeight; i += 210240) nSubsidy -= nSubsidy/14; - } - - /* + nSubsidy = 0 * COIN; + } - Hard fork will activate on block 328008, reducing the block reward by 10 extra percent (allowing budget super-blocks) - - */ - - if(Params().NetworkID() == CBaseChainParams::TESTNET){ - if(nHeight > 77900+576) nSubsidy -= nSubsidy/10; - } else { - if(nHeight > 309759+(553*33)) nSubsidy -= nSubsidy/10; // 328008 - 10.0% - September 6, 2015 - } - return nSubsidy + nFees; } int64_t GetMasternodePayment(int nHeight, int64_t blockValue) { - int64_t ret = blockValue/5; // start at 20% - - if(Params().NetworkID() == CBaseChainParams::TESTNET) { - if(nHeight > 46000) ret += blockValue / 20; //25% - 2014-10-07 - if(nHeight > 46000+((576*1)*1)) ret += blockValue / 20; //30% - 2014-10-08 - if(nHeight > 46000+((576*1)*2)) ret += blockValue / 20; //35% - 2014-10-09 - if(nHeight > 46000+((576*1)*3)) ret += blockValue / 20; //40% - 2014-10-10 - if(nHeight > 46000+((576*1)*4)) ret += blockValue / 20; //45% - 2014-10-11 - if(nHeight > 46000+((576*1)*5)) ret += blockValue / 20; //50% - 2014-10-12 - if(nHeight > 46000+((576*1)*6)) ret += blockValue / 20; //55% - 2014-10-13 - if(nHeight > 46000+((576*1)*7)) ret += blockValue / 20; //60% - 2014-10-14 - } - - if(nHeight > 158000) ret += blockValue / 20; // 158000 - 25.0% - 2014-10-24 - if(nHeight > 158000+((576*30)* 1)) ret += blockValue / 20; // 175280 - 30.0% - 2014-11-25 - if(nHeight > 158000+((576*30)* 2)) ret += blockValue / 20; // 192560 - 35.0% - 2014-12-26 - if(nHeight > 158000+((576*30)* 3)) ret += blockValue / 40; // 209840 - 37.5% - 2015-01-26 - if(nHeight > 158000+((576*30)* 4)) ret += blockValue / 40; // 227120 - 40.0% - 2015-02-27 - if(nHeight > 158000+((576*30)* 5)) ret += blockValue / 40; // 244400 - 42.5% - 2015-03-30 - if(nHeight > 158000+((576*30)* 6)) ret += blockValue / 40; // 261680 - 45.0% - 2015-05-01 - if(nHeight > 158000+((576*30)* 7)) ret += blockValue / 40; // 278960 - 47.5% - 2015-06-01 - if(nHeight > 158000+((576*30)* 9)) ret += blockValue / 40; // 313520 - 50.0% - 2015-08-03 - - /* - Hard for will activate on block 348080 separating the two networks (v11 and earier and v12) - - if(nHeight > 158000+((576*30)*11)) ret += blockValue / 40; // 348080 - 52.5% - 2015-10-05 - if(nHeight > 158000+((576*30)*13)) ret += blockValue / 40; // 382640 - 55.0% - 2015-12-07 - if(nHeight > 158000+((576*30)*15)) ret += blockValue / 40; // 417200 - 57.5% - 2016-02-08 - if(nHeight > 158000+((576*30)*17)) ret += blockValue / 40; // 451760 - 60.0% - 2016-04-11 - */ + int64_t ret = 0; + if(nHeight <= 43200) { + ret = blockValue/5; // 20% + } else { + ret = blockValue/(100/30); // 30% + } return ret; } @@ -2013,7 +1954,7 @@ bool FindUndoPos(CValidationState &state, int nFile, CDiskBlockPos &pos, unsigne static CCheckQueue scriptcheckqueue(128); void ThreadScriptCheck() { - RenameThread("dash-scriptch"); + RenameThread("darknet-scriptch"); scriptcheckqueue.Thread(); } @@ -2423,7 +2364,7 @@ bool DisconnectBlocksAndReprocess(int blocks) /* DisconnectBlockAndInputs - Remove conflicting blocks for successful InstantX transaction locks + Remove conflicting blocks for successful SwiftTX transaction locks This should be very rare (Probably will never happen) */ // ***TODO*** clean up here @@ -2968,7 +2909,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo REJECT_INVALID, "bad-cb-multiple"); - // ----------- instantX transaction scanning ----------- + // ----------- swiftTX transaction scanning ----------- if(IsSporkActive(SPORK_3_INSTANTX_BLOCK_FILTERING)){ BOOST_FOREACH(const CTransaction& tx, block.vtx){ @@ -4005,7 +3946,7 @@ bool static AlreadyHave(const CInv& inv) pcoinsTip->HaveCoins(inv.hash); } case MSG_DSTX: - return mapDarksendBroadcastTxes.count(inv.hash); + return mapObfuscateBroadcastTxes.count(inv.hash); case MSG_BLOCK: return mapBlockIndex.count(inv.hash); case MSG_TXLOCK_REQUEST: @@ -4260,14 +4201,14 @@ void static ProcessGetData(CNode* pfrom) } if (!pushed && inv.type == MSG_DSTX) { - if(mapDarksendBroadcastTxes.count(inv.hash)){ + if(mapObfuscateBroadcastTxes.count(inv.hash)){ CDataStream ss(SER_NETWORK, PROTOCOL_VERSION); ss.reserve(1000); ss << - mapDarksendBroadcastTxes[inv.hash].tx << - mapDarksendBroadcastTxes[inv.hash].vin << - mapDarksendBroadcastTxes[inv.hash].vchSig << - mapDarksendBroadcastTxes[inv.hash].sigTime; + mapObfuscateBroadcastTxes[inv.hash].tx << + mapObfuscateBroadcastTxes[inv.hash].vin << + mapObfuscateBroadcastTxes[inv.hash].vchSig << + mapObfuscateBroadcastTxes[inv.hash].sigTime; pfrom->PushMessage("dstx", ss); pushed = true; @@ -4724,14 +4665,14 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, ignoreFees = true; pmn->allowFreeTx = false; - if(!mapDarksendBroadcastTxes.count(tx.GetHash())){ - CDarksendBroadcastTx dstx; + if(!mapObfuscateBroadcastTxes.count(tx.GetHash())){ + CObfuscateBroadcastTx dstx; dstx.tx = tx; dstx.vin = vin; dstx.vchSig = vchSig; dstx.sigTime = sigTime; - mapDarksendBroadcastTxes.insert(make_pair(tx.GetHash(), dstx)); + mapObfuscateBroadcastTxes.insert(make_pair(tx.GetHash(), dstx)); } } } @@ -5148,11 +5089,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, else { //probably one the extensions - darkSendPool.ProcessMessageDarksend(pfrom, strCommand, vRecv); + darkSendPool.ProcessMessageObfuscate(pfrom, strCommand, vRecv); mnodeman.ProcessMessage(pfrom, strCommand, vRecv); budget.ProcessMessage(pfrom, strCommand, vRecv); masternodePayments.ProcessMessageMasternodePayments(pfrom, strCommand, vRecv); - ProcessMessageInstantX(pfrom, strCommand, vRecv); + ProcessMessageSwiftTX(pfrom, strCommand, vRecv); ProcessSpork(pfrom, strCommand, vRecv); masternodeSync.ProcessMessage(pfrom, strCommand, vRecv); } diff --git a/src/main.h b/src/main.h index f08c15e7af7e1..c35f9c49393c2 100644 --- a/src/main.h +++ b/src/main.h @@ -1,6 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -8,7 +9,7 @@ #define BITCOIN_MAIN_H #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #endif #include "amount.h" diff --git a/src/masternode-budget.cpp b/src/masternode-budget.cpp index 4655e3e7cfb6e..202bcca835b3a 100644 --- a/src/masternode-budget.cpp +++ b/src/masternode-budget.cpp @@ -7,7 +7,7 @@ #include "masternode-budget.h" #include "masternode.h" -#include "darksend.h" +#include "obfuscate.h" #include "masternodeman.h" #include "masternode-sync.h" #include "util.h" @@ -25,11 +25,11 @@ std::vector vecImmatureFinalizedBudgets; int nSubmittedFinalBudget; int GetBudgetPaymentCycleBlocks(){ - // Amount of blocks in a months period of time (using 2.6 minutes per) = (60*24*30)/2.6 - if(Params().NetworkID() == CBaseChainParams::MAIN) return 16616; + // Amount of blocks in a months period of time (using 1 minutes per) = (60*24*30) + if(Params().NetworkID() == CBaseChainParams::MAIN) return 43200; //for testing purposes - return 50; //ten times per day + return 146; //ten times per day } bool IsBudgetCollateralValid(uint256 nTxCollateralHash, uint256 nExpectedHash, std::string& strError, int64_t& nTime, int& nConf) @@ -78,7 +78,7 @@ bool IsBudgetCollateralValid(uint256 nTxCollateralHash, uint256 nExpectedHash, s nConf = conf; - //if we're syncing we won't have instantX information, so accept 1 confirmation + //if we're syncing we won't have swiftTX information, so accept 1 confirmation if(conf >= BUDGET_FEE_CONFIRMATIONS){ return true; } else { @@ -753,20 +753,13 @@ CAmount CBudgetManager::GetTotalBudget(int nHeight) if(chainActive.Tip() == NULL) return 0; //get min block value and calculate from that - CAmount nSubsidy = 5 * COIN; + CAmount nSubsidy = 250 * COIN; - if(Params().NetworkID() == CBaseChainParams::TESTNET){ - for(int i = 46200; i <= nHeight; i += 210240) nSubsidy -= nSubsidy/14; - } else { - // yearly decline of production by 7.1% per year, projected 21.3M coins max by year 2050. - for(int i = 210240; i <= nHeight; i += 210240) nSubsidy -= nSubsidy/14; - } - - // Amount of blocks in a months period of time (using 2.6 minutes per) = (60*24*30)/2.6 - if(Params().NetworkID() == CBaseChainParams::MAIN) return ((nSubsidy/100)*10)*576*30; + // Amount of blocks in a months period of time (using 1 minutes per) = (60*24*30) + if(Params().NetworkID() == CBaseChainParams::MAIN) return ((nSubsidy/100)*10)*1440*30; //for testing purposes - return ((nSubsidy/100)*10)*50; + return ((nSubsidy/100)*10)*146; } void CBudgetManager::NewBlock() @@ -780,13 +773,13 @@ void CBudgetManager::NewBlock() SubmitFinalBudget(); } - //this function should be called 1/6 blocks, allowing up to 100 votes per day on all proposals - if(chainActive.Height() % 6 != 0) return; + //this function should be called 1/14 blocks, allowing up to 100 votes per day on all proposals + if(chainActive.Height() % 14 != 0) return; // incremental sync with our peers if(masternodeSync.IsSynced()){ LogPrintf("CBudgetManager::NewBlock - incremental sync started\n"); - if(chainActive.Height() % 600 == rand() % 600) { + if(chainActive.Height() % 1440 == rand() % 1440) { ClearSeen(); ResetSync(); } @@ -956,7 +949,7 @@ void CBudgetManager::ProcessMessage(CNode* pfrom, std::string& strCommand, CData mapSeenMasternodeBudgetVotes.insert(make_pair(vote.GetHash(), vote)); if(!vote.SignatureValid(true)){ LogPrintf("mvote - signature invalid\n"); - if(masternodeSync.IsSynced()) Misbehaving(pfrom->GetId(), 20); + Misbehaving(pfrom->GetId(), 20); // it could just be a non-synced masternode mnodeman.AskForMN(pfrom, vote.vin); return; @@ -1026,7 +1019,7 @@ void CBudgetManager::ProcessMessage(CNode* pfrom, std::string& strCommand, CData mapSeenFinalizedBudgetVotes.insert(make_pair(vote.GetHash(), vote)); if(!vote.SignatureValid(true)){ LogPrintf("fbvote - signature invalid\n"); - if(masternodeSync.IsSynced()) Misbehaving(pfrom->GetId(), 20); + Misbehaving(pfrom->GetId(), 20); // it could just be a non-synced masternode mnodeman.AskForMN(pfrom, vote.vin); return; @@ -1308,7 +1301,7 @@ bool CBudgetProposal::IsValid(std::string& strError, bool fCheckCollateral) return false; } - if(nAmount < 1*COIN) { + if(nAmount < 10*COIN) { strError = "Invalid nAmount"; return false; } @@ -1651,7 +1644,7 @@ void CFinalizedBudget::AutoCheck() if(!fMasterNode || fAutoChecked) return; //do this 1 in 4 blocks -- spread out the voting activity on mainnet - // -- this function is only called every sixth block, so this is really 1 in 24 blocks + // -- this function is only called every fourteenth block, so this is really 1 in 56 blocks if(Params().NetworkID() == CBaseChainParams::MAIN && rand() % 4 != 0) { LogPrintf("CFinalizedBudget::AutoCheck - waiting\n"); return; diff --git a/src/masternode-budget.h b/src/masternode-budget.h index e75d36b7440a9..4d91c697a4ad8 100644 --- a/src/masternode-budget.h +++ b/src/masternode-budget.h @@ -32,7 +32,7 @@ class CTxBudgetPayment; #define VOTE_YES 1 #define VOTE_NO 2 -static const CAmount BUDGET_FEE_TX = (5*COIN); +static const CAmount BUDGET_FEE_TX = (50*COIN); static const int64_t BUDGET_FEE_CONFIRMATIONS = 6; static const int64_t BUDGET_VOTE_UPDATE_MIN = 60*60; @@ -261,7 +261,7 @@ class CFinalizedBudget //check to see if we should vote on this void AutoCheck(); - //total dash paid out by this budget + //total darknet paid out by this budget CAmount GetTotalPayout(); //vote on this finalized budget as a masternode void SubmitVote(); diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp index 5e756cf97ea22..9ef9768df687d 100644 --- a/src/masternode-payments.cpp +++ b/src/masternode-payments.cpp @@ -6,7 +6,7 @@ #include "masternode-budget.h" #include "masternode-sync.h" #include "masternodeman.h" -#include "darksend.h" +#include "obfuscate.h" #include "util.h" #include "sync.h" #include "spork.h" @@ -339,11 +339,11 @@ void CMasternodePayments::ProcessMessageMasternodePayments(CNode* pfrom, std::st { if(!masternodeSync.IsBlockchainSynced()) return; - if(fLiteMode) return; //disable all Darksend/Masternode related functionality + if(fLiteMode) return; //disable all Obfuscate/Masternode related functionality if (strCommand == "mnget") { //Masternode Payments Request Sync - if(fLiteMode) return; //disable all Darksend/Masternode related functionality + if(fLiteMode) return; //disable all Obfuscate/Masternode related functionality int nCountNeeded; vRecv >> nCountNeeded; @@ -394,7 +394,7 @@ void CMasternodePayments::ProcessMessageMasternodePayments(CNode* pfrom, std::st if(!winner.SignatureValid()){ LogPrintf("mnw - invalid signature\n"); - if(masternodeSync.IsSynced()) Misbehaving(pfrom->GetId(), 20); + Misbehaving(pfrom->GetId(), 20); // it could just be a non-synced masternode mnodeman.AskForMN(pfrom, winner.vinMasternode); return; @@ -656,7 +656,7 @@ bool CMasternodePaymentWinner::IsValid(CNode* pnode, std::string& strError) { strError = strprintf("Masternode not in the top %d (%d)", MNPAYMENTS_SIGNATURES_TOTAL, n); LogPrintf("CMasternodePaymentWinner::IsValid - %s\n", strError); - if(masternodeSync.IsSynced()) Misbehaving(pnode->GetId(), 20); + Misbehaving(pnode->GetId(), 20); } return false; } diff --git a/src/masternode.cpp b/src/masternode.cpp index f65f052c1d26e..1223eee9fd6fe 100644 --- a/src/masternode.cpp +++ b/src/masternode.cpp @@ -4,7 +4,7 @@ #include "masternode.h" #include "masternodeman.h" -#include "darksend.h" +#include "obfuscate.h" #include "util.h" #include "sync.h" #include "addrman.h" @@ -203,7 +203,7 @@ void CMasternode::Check(bool forceCheck) if(!unitTest){ CValidationState state; CMutableTransaction tx = CMutableTransaction(); - CTxOut vout = CTxOut(999.99*COIN, darkSendPool.collateralPubKey); + CTxOut vout = CTxOut(9999.99*COIN, darkSendPool.collateralPubKey); tx.vin.push_back(vin); tx.vout.push_back(vout); @@ -392,8 +392,8 @@ bool CMasternodeBroadcast::CheckAndUpdate(int& nDos) } if(Params().NetworkID() == CBaseChainParams::MAIN) { - if(addr.GetPort() != 9999) return false; - } else if(addr.GetPort() == 9999) return false; + if(addr.GetPort() != 51472) return false; + } else if(addr.GetPort() == 51472) return false; //search existing Masternode list, this is where we update existing Masternodes with new mnb broadcasts CMasternode* pmn = mnodeman.Find(vin); @@ -435,7 +435,7 @@ bool CMasternodeBroadcast::CheckInputsAndAdd(int& nDoS) CValidationState state; CMutableTransaction tx = CMutableTransaction(); - CTxOut vout = CTxOut(999.99*COIN, darkSendPool.collateralPubKey); + CTxOut vout = CTxOut(9999.99*COIN, darkSendPool.collateralPubKey); tx.vin.push_back(vin); tx.vout.push_back(vout); @@ -466,14 +466,14 @@ bool CMasternodeBroadcast::CheckInputsAndAdd(int& nDoS) } // verify that sig time is legit in past - // should be at least not earlier than block when 1000 DASH tx got MASTERNODE_MIN_CONFIRMATIONS + // should be at least not earlier than block when 1000 DNET tx got MASTERNODE_MIN_CONFIRMATIONS uint256 hashBlock = 0; CTransaction tx2; GetTransaction(vin.prevout.hash, tx2, hashBlock, true); BlockMap::iterator mi = mapBlockIndex.find(hashBlock); if (mi != mapBlockIndex.end() && (*mi).second) { - CBlockIndex* pMNIndex = (*mi).second; // block for 1000 DASH tx -> 1 confirmation + CBlockIndex* pMNIndex = (*mi).second; // block for 1000 DNET tx -> 1 confirmation CBlockIndex* pConfIndex = chainActive[pMNIndex->nHeight + MASTERNODE_MIN_CONFIRMATIONS - 1]; // block where tx got MASTERNODE_MIN_CONFIRMATIONS if(pConfIndex->GetBlockTime() > sigTime) { diff --git a/src/masternode.h b/src/masternode.h index 0bdf396691a46..7118fa6b491e4 100644 --- a/src/masternode.h +++ b/src/masternode.h @@ -100,7 +100,7 @@ class CMasternodePing // -// The Masternode Class. For managing the Darksend process. It contains the input of the 1000DRK, signature to prove +// The Masternode Class. For managing the Obfuscate process. It contains the input of the 10000DNET, signature to prove // it's the one who own that ip address and code for calculating the payment election. // class CMasternode diff --git a/src/masternodeconfig.cpp b/src/masternodeconfig.cpp index 6e5b732fe4087..40ed363c42b7f 100644 --- a/src/masternodeconfig.cpp +++ b/src/masternodeconfig.cpp @@ -22,7 +22,7 @@ bool CMasternodeConfig::read(std::string& strErr) { if (configFile != NULL) { std::string strHeader = "# Masternode config file\n" "# Format: alias IP:port masternodeprivkey collateral_output_txid collateral_output_index\n" - "# Example: mn1 127.0.0.2:19999 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0\n"; + "# Example: mn1 127.0.0.2:51474 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0\n"; fwrite(strHeader.c_str(), std::strlen(strHeader.c_str()), 1, configFile); fclose(configFile); } @@ -54,17 +54,17 @@ bool CMasternodeConfig::read(std::string& strErr) { } if(Params().NetworkID() == CBaseChainParams::MAIN) { - if(CService(ip).GetPort() != 9999) { + if(CService(ip).GetPort() != 51472) { strErr = _("Invalid port detected in masternode.conf") + "\n" + strprintf(_("Line: %d"), linenumber) + "\n\"" + line + "\"" + "\n" + - _("(must be 9999 for mainnet)"); + _("(must be 51472 for mainnet)"); streamConfig.close(); return false; } - } else if(CService(ip).GetPort() == 9999) { + } else if(CService(ip).GetPort() == 51472) { strErr = _("Invalid port detected in masternode.conf") + "\n" + strprintf(_("Line: %d"), linenumber) + "\n\"" + line + "\"" + "\n" + - _("(9999 could be used only on mainnet)"); + _("(51472 could be used only on mainnet)"); streamConfig.close(); return false; } diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp index 429df7d002b5b..f3774a2d03ca0 100644 --- a/src/masternodeman.cpp +++ b/src/masternodeman.cpp @@ -5,7 +5,7 @@ #include "masternodeman.h" #include "masternode.h" #include "activemasternode.h" -#include "darksend.h" +#include "obfuscate.h" #include "util.h" #include "addrman.h" #include "spork.h" @@ -354,8 +354,6 @@ void CMasternodeMan::Clear() mAskedUsForMasternodeList.clear(); mWeAskedForMasternodeList.clear(); mWeAskedForMasternodeListEntry.clear(); - mapSeenMasternodeBroadcast.clear(); - mapSeenMasternodePing.clear(); nDsqCount = 0; } @@ -664,7 +662,7 @@ void CMasternodeMan::ProcessMasternodeConnections() LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) { - if(pnode->fDarkSendMaster){ + if(pnode->fObfuscateMaster){ if(darkSendPool.pSubmittedToMasternode != NULL && pnode->addr == darkSendPool.pSubmittedToMasternode->addr) continue; LogPrintf("Closing Masternode connection %s \n", pnode->addr.ToString()); pnode->fDisconnect = true; @@ -675,7 +673,7 @@ void CMasternodeMan::ProcessMasternodeConnections() void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CDataStream& vRecv) { - if(fLiteMode) return; //disable all Darksend/Masternode related functionality + if(fLiteMode) return; //disable all Obfuscate/Masternode related functionality if(!masternodeSync.IsBlockchainSynced()) return; LOCK(cs_process_message); @@ -709,7 +707,7 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData } // make sure it's still unspent - // - this is checked later by .check() in many places and by ThreadCheckDarkSendPool() + // - this is checked later by .check() in many places and by ThreadCheckObfuscatePool() if(mnb.CheckInputsAndAdd(nDoS)) { // use this as a peer addrman.Add(CAddress(mnb.addr), pfrom->addr, 2*60*60); @@ -807,7 +805,7 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData */ // Light version for OLD MASSTERNODES - fake pings, no self-activation - else if (strCommand == "dsee") { //DarkSend Election Entry + else if (strCommand == "dsee") { //Obfuscate Election Entry if(IsSporkActive(SPORK_10_MASTERNODE_PAY_UPDATED_NODES)) return; @@ -877,8 +875,8 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData } if(Params().NetworkID() == CBaseChainParams::MAIN){ - if(addr.GetPort() != 9999) return; - } else if(addr.GetPort() == 9999) return; + if(addr.GetPort() != 51472) return; + } else if(addr.GetPort() == 51472) return; //search existing Masternode list, this is where we update existing Masternodes with new dsee broadcasts CMasternode* pmn = this->Find(vin); @@ -934,11 +932,11 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData LogPrint("masternode", "dsee - Got NEW OLD Masternode entry %s\n", addr.ToString().c_str()); // make sure it's still unspent - // - this is checked later by .check() in many places and by ThreadCheckDarkSendPool() + // - this is checked later by .check() in many places and by ThreadCheckObfuscatePool() CValidationState state; CMutableTransaction tx = CMutableTransaction(); - CTxOut vout = CTxOut(999.99*COIN, darkSendPool.collateralPubKey); + CTxOut vout = CTxOut(9999.99*COIN, darkSendPool.collateralPubKey); tx.vin.push_back(vin); tx.vout.push_back(vout); @@ -957,14 +955,14 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData } // verify that sig time is legit in past - // should be at least not earlier than block when 1000 DASH tx got MASTERNODE_MIN_CONFIRMATIONS + // should be at least not earlier than block when 1000 DNET tx got MASTERNODE_MIN_CONFIRMATIONS uint256 hashBlock = 0; CTransaction tx2; GetTransaction(vin.prevout.hash, tx2, hashBlock, true); BlockMap::iterator mi = mapBlockIndex.find(hashBlock); if (mi != mapBlockIndex.end() && (*mi).second) { - CBlockIndex* pMNIndex = (*mi).second; // block for 1000 DASH tx -> 1 confirmation + CBlockIndex* pMNIndex = (*mi).second; // block for 10000DNET tx -> 1 confirmation CBlockIndex* pConfIndex = chainActive[pMNIndex->nHeight + MASTERNODE_MIN_CONFIRMATIONS - 1]; // block where tx got MASTERNODE_MIN_CONFIRMATIONS if(pConfIndex->GetBlockTime() > sigTime) { @@ -1015,7 +1013,7 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData } } - else if (strCommand == "dseep") { //DarkSend Election Entry Ping + else if (strCommand == "dseep") { //Obfuscate Election Entry Ping if(IsSporkActive(SPORK_10_MASTERNODE_PAY_UPDATED_NODES)) return; diff --git a/src/masternodeman.h b/src/masternodeman.h index 033f197c92003..be6073b02608c 100644 --- a/src/masternodeman.h +++ b/src/masternodeman.h @@ -70,7 +70,7 @@ class CMasternodeMan // Keep track of all pings I've seen map mapSeenMasternodePing; - // keep track of dsq count to prevent masternodes from gaming darksend queue + // keep track of dsq count to prevent masternodes from gaming obfuscate queue int64_t nDsqCount; ADD_SERIALIZE_METHODS; diff --git a/src/miner.cpp b/src/miner.cpp index 7c9accbd19e80..cb3d70a952c99 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -28,7 +29,7 @@ using namespace std; ////////////////////////////////////////////////////////////////////////////// // -// DashMiner +// DarkNetMiner // // @@ -377,7 +378,7 @@ void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& double dHashesPerSec = 0.0; int64_t nHPSTimerStart = 0; -// ***TODO*** ScanHash is not yet used in Dash +// ***TODO*** ScanHash is not yet used in DarkNet // // ScanHash scans nonces looking for a hash with at least some zero bits. // The nonce is usually preserved between calls, but periodically or if the @@ -432,7 +433,7 @@ bool ProcessBlockFound(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey) { LOCK(cs_main); if (pblock->hashPrevBlock != chainActive.Tip()->GetBlockHash()) - return error("DashMiner : generated block is stale"); + return error("DarkNetMiner : generated block is stale"); } // Remove key from key pool @@ -447,7 +448,7 @@ bool ProcessBlockFound(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey) // Process this block the same as if we had received it from another node CValidationState state; if (!ProcessNewBlock(state, NULL, pblock)) - return error("DashMiner : ProcessNewBlock, block not accepted"); + return error("DarkNetMiner : ProcessNewBlock, block not accepted"); return true; } @@ -455,9 +456,9 @@ bool ProcessBlockFound(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey) // ***TODO*** that part changed in bitcoin, we are using a mix with old one here for now void static BitcoinMiner(CWallet *pwallet) { - LogPrintf("DashMiner started\n"); + LogPrintf("DarkNetMiner started\n"); SetThreadPriority(THREAD_PRIORITY_LOWEST); - RenameThread("dash-miner"); + RenameThread("darknet-miner"); // Each thread has its own key and counter CReserveKey reservekey(pwallet); @@ -490,13 +491,13 @@ void static BitcoinMiner(CWallet *pwallet) auto_ptr pblocktemplate(CreateNewBlockWithKey(reservekey)); if (!pblocktemplate.get()) { - LogPrintf("Error in DashMiner: Keypool ran out, please call keypoolrefill before restarting the mining thread\n"); + LogPrintf("Error in DarkNetMiner: Keypool ran out, please call keypoolrefill before restarting the mining thread\n"); return; } CBlock *pblock = &pblocktemplate->block; IncrementExtraNonce(pblock, pindexPrev, nExtraNonce); - LogPrintf("Running DashMiner with %u transactions in block (%u bytes)\n", pblock->vtx.size(), + LogPrintf("Running DarkNetMiner with %u transactions in block (%u bytes)\n", pblock->vtx.size(), ::GetSerializeSize(*pblock, SER_NETWORK, PROTOCOL_VERSION)); // @@ -587,7 +588,7 @@ void static BitcoinMiner(CWallet *pwallet) } catch (boost::thread_interrupted) { - LogPrintf("DashMiner terminated\n"); + LogPrintf("DarkNetMiner terminated\n"); throw; } catch (const std::runtime_error &e) diff --git a/src/net.cpp b/src/net.cpp index 3f39f399c5d9c..cf530ddecae10 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1,11 +1,12 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #endif #include "net.h" @@ -15,7 +16,7 @@ #include "clientversion.h" #include "primitives/transaction.h" #include "ui_interface.h" -#include "darksend.h" +#include "obfuscate.h" #include "wallet.h" #ifdef WIN32 @@ -400,7 +401,7 @@ CNode* ConnectNode(CAddress addrConnect, const char *pszDest, bool darkSendMaste CNode* pnode = FindNode((CService)addrConnect); if (pnode) { - pnode->fDarkSendMaster = darkSendMaster; + pnode->fObfuscateMaster = darkSendMaster; pnode->AddRef(); return pnode; @@ -436,7 +437,7 @@ CNode* ConnectNode(CAddress addrConnect, const char *pszDest, bool darkSendMaste } pnode->nTimeConnected = GetTime(); - if(darkSendMaster) pnode->fDarkSendMaster = true; + if(darkSendMaster) pnode->fObfuscateMaster = true; return pnode; } else if (!proxyConnectionFailed) { @@ -565,7 +566,7 @@ void CNode::copyStats(CNodeStats &stats) nPingUsecWait = GetTimeMicros() - nPingUsecStart; } - // Raw ping time is in microseconds, but show it to user as whole seconds (Dash users should be well used to small numbers with many decimal places by now :) + // Raw ping time is in microseconds, but show it to user as whole seconds (DarkNet users should be well used to small numbers with many decimal places by now :) stats.dPingTime = (((double)nPingUsecTime) / 1e6); stats.dPingWait = (((double)nPingUsecWait) / 1e6); @@ -1080,7 +1081,7 @@ void ThreadMapPort() } } - string strDesc = "Dash " + FormatFullVersion(); + string strDesc = "DarkNet " + FormatFullVersion(); try { while (true) { @@ -1577,7 +1578,7 @@ bool BindListenPort(const CService &addrBind, string& strError, bool fWhiteliste { int nErr = WSAGetLastError(); if (nErr == WSAEADDRINUSE) - strError = strprintf(_("Unable to bind to %s on this computer. Dash Core is probably already running."), addrBind.ToString()); + strError = strprintf(_("Unable to bind to %s on this computer. DarkNet Core is probably already running."), addrBind.ToString()); else strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %s)"), addrBind.ToString(), NetworkErrorString(nErr)); LogPrintf("%s\n", strError); @@ -2024,7 +2025,7 @@ CNode::CNode(SOCKET hSocketIn, CAddress addrIn, std::string addrNameIn, bool fIn nPingUsecStart = 0; nPingUsecTime = 0; fPingQueued = false; - fDarkSendMaster = false; + fObfuscateMaster = false; { LOCK(cs_nLastNodeId); diff --git a/src/net.h b/src/net.h index 0ff51d922c3be..16695f6228160 100644 --- a/src/net.h +++ b/src/net.h @@ -258,7 +258,7 @@ class CNode // b) the peer may tell us in their version message that we should not relay tx invs // until they have initialized their bloom filter. bool fRelayTxes; - bool fDarkSendMaster; + bool fObfuscateMaster; CSemaphoreGrant grantOutbound; CCriticalSection cs_filter; CBloomFilter* pfilter; diff --git a/src/netbase.cpp b/src/netbase.cpp index 5436d2dca0a03..f9dd0f415ec7b 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifdef HAVE_CONFIG_H -#include "config/dash-config.h" +#include "config/darknet-config.h" #endif #include "netbase.h" diff --git a/src/netbase.h b/src/netbase.h index 2a2f150c073ae..6cb964637b0eb 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -6,7 +6,7 @@ #define BITCOIN_NETBASE_H #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #endif #include "compat.h" diff --git a/src/noui.cpp b/src/noui.cpp index a73a4e69efc64..130b3e18eb602 100644 --- a/src/noui.cpp +++ b/src/noui.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -47,7 +48,7 @@ static void noui_InitMessage(const std::string& message) void noui_connect() { - // Connect dashd signal handlers + // Connect darknetd signal handlers uiInterface.ThreadSafeMessageBox.connect(noui_ThreadSafeMessageBox); uiInterface.InitMessage.connect(noui_InitMessage); } diff --git a/src/darksend-relay.cpp b/src/obfuscate-relay.cpp similarity index 72% rename from src/darksend-relay.cpp rename to src/obfuscate-relay.cpp index 9ef77fafd31ad..789aac2e5424f 100644 --- a/src/darksend-relay.cpp +++ b/src/obfuscate-relay.cpp @@ -1,8 +1,8 @@ -#include "darksend-relay.h" +#include "obfuscate-relay.h" -CDarkSendRelay::CDarkSendRelay() +CObfuscateRelay::CObfuscateRelay() { vinMasternode = CTxIn(); nBlockHeight = 0; @@ -11,7 +11,7 @@ CDarkSendRelay::CDarkSendRelay() out = CTxOut(); } -CDarkSendRelay::CDarkSendRelay(CTxIn& vinMasternodeIn, vector& vchSigIn, int nBlockHeightIn, int nRelayTypeIn, CTxIn& in2, CTxOut& out2) +CObfuscateRelay::CObfuscateRelay(CTxIn& vinMasternodeIn, vector& vchSigIn, int nBlockHeightIn, int nRelayTypeIn, CTxIn& in2, CTxOut& out2) { vinMasternode = vinMasternodeIn; vchSig = vchSigIn; @@ -21,7 +21,7 @@ CDarkSendRelay::CDarkSendRelay(CTxIn& vinMasternodeIn, vector& vc out = out2; } -std::string CDarkSendRelay::ToString() +std::string CObfuscateRelay::ToString() { std::ostringstream info; @@ -34,7 +34,7 @@ std::string CDarkSendRelay::ToString() return info.str(); } -bool CDarkSendRelay::Sign(std::string strSharedKey) +bool CObfuscateRelay::Sign(std::string strSharedKey) { std::string strMessage = in.ToString() + out.ToString(); @@ -44,24 +44,24 @@ bool CDarkSendRelay::Sign(std::string strSharedKey) if(!darkSendSigner.SetKey(strSharedKey, errorMessage, key2, pubkey2)) { - LogPrintf("CDarkSendRelay():Sign - ERROR: Invalid shared key: '%s'\n", errorMessage.c_str()); + LogPrintf("CObfuscateRelay():Sign - ERROR: Invalid shared key: '%s'\n", errorMessage.c_str()); return false; } if(!darkSendSigner.SignMessage(strMessage, errorMessage, vchSig2, key2)) { - LogPrintf("CDarkSendRelay():Sign - Sign message failed\n"); + LogPrintf("CObfuscateRelay():Sign - Sign message failed\n"); return false; } if(!darkSendSigner.VerifyMessage(pubkey2, vchSig2, strMessage, errorMessage)) { - LogPrintf("CDarkSendRelay():Sign - Verify message failed\n"); + LogPrintf("CObfuscateRelay():Sign - Verify message failed\n"); return false; } return true; } -bool CDarkSendRelay::VerifyMessage(std::string strSharedKey) +bool CObfuscateRelay::VerifyMessage(std::string strSharedKey) { std::string strMessage = in.ToString() + out.ToString(); @@ -71,19 +71,19 @@ bool CDarkSendRelay::VerifyMessage(std::string strSharedKey) if(!darkSendSigner.SetKey(strSharedKey, errorMessage, key2, pubkey2)) { - LogPrintf("CDarkSendRelay()::VerifyMessage - ERROR: Invalid shared key: '%s'\n", errorMessage.c_str()); + LogPrintf("CObfuscateRelay()::VerifyMessage - ERROR: Invalid shared key: '%s'\n", errorMessage.c_str()); return false; } if(!darkSendSigner.VerifyMessage(pubkey2, vchSig2, strMessage, errorMessage)) { - LogPrintf("CDarkSendRelay()::VerifyMessage - Verify message failed\n"); + LogPrintf("CObfuscateRelay()::VerifyMessage - Verify message failed\n"); return false; } return true; } -void CDarkSendRelay::Relay() +void CObfuscateRelay::Relay() { int nCount = std::min(mnodeman.CountEnabled(MIN_POOL_PEER_PROTO_VERSION), 20); int nRank1 = (rand() % nCount)+1; @@ -99,7 +99,7 @@ void CDarkSendRelay::Relay() RelayThroughNode(nRank2); } -void CDarkSendRelay::RelayThroughNode(int nRank) +void CObfuscateRelay::RelayThroughNode(int nRank) { CMasternode* pmn = mnodeman.GetMasternodeByRank(nRank, nBlockHeight, MIN_POOL_PEER_PROTO_VERSION); diff --git a/src/darksend-relay.h b/src/obfuscate-relay.h similarity index 85% rename from src/darksend-relay.h rename to src/obfuscate-relay.h index 5dc2cb4c958aa..676e2c4421c89 100644 --- a/src/darksend-relay.h +++ b/src/obfuscate-relay.h @@ -11,7 +11,7 @@ #include "masternodeman.h" -class CDarkSendRelay +class CObfuscateRelay { public: CTxIn vinMasternode; @@ -22,8 +22,8 @@ class CDarkSendRelay CTxIn in; CTxOut out; - CDarkSendRelay(); - CDarkSendRelay(CTxIn& vinMasternodeIn, vector& vchSigIn, int nBlockHeightIn, int nRelayTypeIn, CTxIn& in2, CTxOut& out2); + CObfuscateRelay(); + CObfuscateRelay(CTxIn& vinMasternodeIn, vector& vchSigIn, int nBlockHeightIn, int nRelayTypeIn, CTxIn& in2, CTxOut& out2); ADD_SERIALIZE_METHODS; diff --git a/src/darksend.cpp b/src/obfuscate.cpp similarity index 75% rename from src/darksend.cpp rename to src/obfuscate.cpp index ef2d7c39a859c..0e8e0fdb8e8fe 100644 --- a/src/darksend.cpp +++ b/src/obfuscate.cpp @@ -2,13 +2,13 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "darksend.h" +#include "obfuscate.h" #include "main.h" #include "init.h" #include "util.h" #include "masternodeman.h" #include "script/sign.h" -#include "instantx.h" +#include "swifttx.h" #include "ui_interface.h" #include #include @@ -22,31 +22,31 @@ using namespace std; using namespace boost; -// The main object for accessing Darksend -CDarksendPool darkSendPool; +// The main object for accessing Obfuscate +CObfuscatePool darkSendPool; // A helper object for signing messages from Masternodes -CDarkSendSigner darkSendSigner; -// The current Darksends in progress on the network -std::vector vecDarksendQueue; +CObfuscateSigner darkSendSigner; +// The current Obfuscates in progress on the network +std::vector vecObfuscateQueue; // Keep track of the used Masternodes std::vector vecMasternodesUsed; // Keep track of the scanning errors I've seen -map mapDarksendBroadcastTxes; +map mapObfuscateBroadcastTxes; // Keep track of the active Masternode CActiveMasternode activeMasternode; -/* *** BEGIN DARKSEND MAGIC - DASH ********** +/* *** BEGIN DARKSEND MAGIC - DNET ********** Copyright (c) 2014-2015, Dash Developers eduffield - evan@dashpay.io udjinm6 - udjinm6@dashpay.io */ -void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand, CDataStream& vRecv) +void CObfuscatePool::ProcessMessageObfuscate(CNode* pfrom, std::string& strCommand, CDataStream& vRecv) { - if(fLiteMode) return; //disable all Darksend/Masternode related functionality + if(fLiteMode) return; //disable all Obfuscate/Masternode related functionality if(!masternodeSync.IsBlockchainSynced()) return; - if (strCommand == "dsa") { //Darksend Accept Into Pool + if (strCommand == "dsa") { //Obfuscate Accept Into Pool int errorID; @@ -99,15 +99,15 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand return; } - } else if (strCommand == "dsq") { //Darksend Queue - TRY_LOCK(cs_darksend, lockRecv); + } else if (strCommand == "dsq") { //Obfuscate Queue + TRY_LOCK(cs_obfuscate, lockRecv); if(!lockRecv) return; if (pfrom->nVersion < MIN_POOL_PEER_PROTO_VERSION) { return; } - CDarksendQueue dsq; + CObfuscateQueue dsq; vRecv >> dsq; CService addr; @@ -128,32 +128,32 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand } if(state == POOL_STATUS_QUEUE){ - LogPrint("darksend", "Darksend queue is ready - %s\n", addr.ToString()); - PrepareDarksendDenominate(); + LogPrint("obfuscate", "Obfuscate queue is ready - %s\n", addr.ToString()); + PrepareObfuscateDenominate(); } } else { - BOOST_FOREACH(CDarksendQueue q, vecDarksendQueue){ + BOOST_FOREACH(CObfuscateQueue q, vecObfuscateQueue){ if(q.vin == dsq.vin) return; } - LogPrint("darksend", "dsq last %d last2 %d count %d\n", pmn->nLastDsq, pmn->nLastDsq + mnodeman.size()/5, mnodeman.nDsqCount); + LogPrint("obfuscate", "dsq last %d last2 %d count %d\n", pmn->nLastDsq, pmn->nLastDsq + mnodeman.size()/5, mnodeman.nDsqCount); //don't allow a few nodes to dominate the queuing process if(pmn->nLastDsq != 0 && pmn->nLastDsq + mnodeman.CountEnabled(MIN_POOL_PEER_PROTO_VERSION)/5 > mnodeman.nDsqCount){ - LogPrint("darksend", "dsq -- Masternode sending too many dsq messages. %s \n", pmn->addr.ToString()); + LogPrint("obfuscate", "dsq -- Masternode sending too many dsq messages. %s \n", pmn->addr.ToString()); return; } mnodeman.nDsqCount++; pmn->nLastDsq = mnodeman.nDsqCount; pmn->allowFreeTx = true; - LogPrint("darksend", "dsq - new Darksend queue object - %s\n", addr.ToString()); - vecDarksendQueue.push_back(dsq); + LogPrint("obfuscate", "dsq - new Obfuscate queue object - %s\n", addr.ToString()); + vecObfuscateQueue.push_back(dsq); dsq.Relay(); dsq.time = GetTime(); } - } else if (strCommand == "dsi") { //DarkSend vIn + } else if (strCommand == "dsi") { //Obfuscate vIn int errorID; if (pfrom->nVersion < MIN_POOL_PEER_PROTO_VERSION) { @@ -225,7 +225,7 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand BOOST_FOREACH(const CTxIn i, in){ tx.vin.push_back(i); - LogPrint("darksend", "dsi -- tx in %s\n", i.ToString()); + LogPrint("obfuscate", "dsi -- tx in %s\n", i.ToString()); CTransaction tx2; uint256 hash; @@ -239,7 +239,7 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand } if (nValueIn > DARKSEND_POOL_MAX) { - LogPrintf("dsi -- more than Darksend pool max! %s\n", tx.ToString()); + LogPrintf("dsi -- more than Obfuscate pool max! %s\n", tx.ToString()); errorID = ERR_MAXIMUM; pfrom->PushMessage("dssu", sessionID, GetState(), GetEntriesCount(), MASTERNODE_REJECTED, errorID); return; @@ -279,7 +279,7 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand pfrom->PushMessage("dssu", sessionID, GetState(), GetEntriesCount(), MASTERNODE_REJECTED, errorID); } - } else if (strCommand == "dssu") { //Darksend status update + } else if (strCommand == "dssu") { //Obfuscate status update if (pfrom->nVersion < MIN_POOL_PEER_PROTO_VERSION) { return; } @@ -297,16 +297,16 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand int errorID; vRecv >> sessionIDMessage >> state >> entriesCount >> accepted >> errorID; - LogPrint("darksend", "dssu - state: %i entriesCount: %i accepted: %i error: %s \n", state, entriesCount, accepted, GetMessageByID(errorID)); + LogPrint("obfuscate", "dssu - state: %i entriesCount: %i accepted: %i error: %s \n", state, entriesCount, accepted, GetMessageByID(errorID)); if((accepted != 1 && accepted != 0) && sessionID != sessionIDMessage){ - LogPrintf("dssu - message doesn't match current Darksend session %d %d\n", sessionID, sessionIDMessage); + LogPrintf("dssu - message doesn't match current Obfuscate session %d %d\n", sessionID, sessionIDMessage); return; } StatusUpdate(state, entriesCount, accepted, errorID, sessionIDMessage); - } else if (strCommand == "dss") { //Darksend Sign Final Tx + } else if (strCommand == "dss") { //Obfuscate Sign Final Tx if (pfrom->nVersion < MIN_POOL_PEER_PROTO_VERSION) { return; @@ -321,7 +321,7 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand BOOST_FOREACH(const CTxIn item, sigs) { if(AddScriptSig(item)) success = true; - LogPrint("darksend", " -- sigs count %d %d\n", (int)sigs.size(), count); + LogPrint("obfuscate", " -- sigs count %d %d\n", (int)sigs.size(), count); count++; } @@ -329,7 +329,7 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand darkSendPool.Check(); RelayStatus(darkSendPool.sessionID, darkSendPool.GetState(), darkSendPool.GetEntriesCount(), MASTERNODE_RESET); } - } else if (strCommand == "dsf") { //Darksend Final tx + } else if (strCommand == "dsf") { //Obfuscate Final tx if (pfrom->nVersion < MIN_POOL_PEER_PROTO_VERSION) { return; } @@ -345,14 +345,14 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand vRecv >> sessionIDMessage >> txNew; if(sessionID != sessionIDMessage){ - LogPrint("darksend", "dsf - message doesn't match current Darksend session %d %d\n", sessionID, sessionIDMessage); + LogPrint("obfuscate", "dsf - message doesn't match current Obfuscate session %d %d\n", sessionID, sessionIDMessage); return; } //check to see if input is spent already? (and probably not confirmed) SignFinalTransaction(txNew, pfrom); - } else if (strCommand == "dsc") { //Darksend Complete + } else if (strCommand == "dsc") { //Obfuscate Complete if (pfrom->nVersion < MIN_POOL_PEER_PROTO_VERSION) { return; @@ -370,7 +370,7 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand vRecv >> sessionIDMessage >> error >> errorID; if(sessionID != sessionIDMessage){ - LogPrint("darksend", "dsc - message doesn't match current Darksend session %d %d\n", darkSendPool.sessionID, sessionIDMessage); + LogPrint("obfuscate", "dsc - message doesn't match current Obfuscate session %d %d\n", darkSendPool.sessionID, sessionIDMessage); return; } @@ -381,7 +381,7 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand int randomizeList (int i) { return std::rand()%i;} -void CDarksendPool::Reset(){ +void CObfuscatePool::Reset(){ cachedLastSuccess = 0; lastNewBlock = 0; txCollateral = CMutableTransaction(); @@ -390,7 +390,7 @@ void CDarksendPool::Reset(){ SetNull(); } -void CDarksendPool::SetNull(){ +void CObfuscatePool::SetNull(){ // MN side sessionUsers = 0; @@ -417,11 +417,11 @@ void CDarksendPool::SetNull(){ std::srand(seed); } -bool CDarksendPool::SetCollateralAddress(std::string strAddress){ +bool CObfuscatePool::SetCollateralAddress(std::string strAddress){ CBitcoinAddress address; if (!address.SetString(strAddress)) { - LogPrintf("CDarksendPool::SetCollateralAddress - Invalid Darksend collateral address\n"); + LogPrintf("CObfuscatePool::SetCollateralAddress - Invalid Obfuscate collateral address\n"); return false; } collateralPubKey = GetScriptForDestination(address.Get()); @@ -429,9 +429,9 @@ bool CDarksendPool::SetCollateralAddress(std::string strAddress){ } // -// Unlock coins after Darksend fails or succeeds +// Unlock coins after Obfuscate fails or succeeds // -void CDarksendPool::UnlockCoins(){ +void CObfuscatePool::UnlockCoins(){ while(true) { TRY_LOCK(pwalletMain->cs_wallet, lockWallet); if(!lockWallet) {MilliSleep(50); continue;} @@ -443,10 +443,10 @@ void CDarksendPool::UnlockCoins(){ lockedCoins.clear(); } -std::string CDarksendPool::GetStatus() +std::string CObfuscatePool::GetStatus() { - static int showingDarkSendMessage = 0; - showingDarkSendMessage += 10; + static int showingObfuscateMessage = 0; + showingObfuscateMessage += 10; std::string suffix = ""; if(chainActive.Tip()->nHeight - cachedLastSuccess < minBlockSpacing || !masternodeSync.IsBlockchainSynced()) { @@ -454,43 +454,43 @@ std::string CDarksendPool::GetStatus() } switch(state) { case POOL_STATUS_IDLE: - return _("Darksend is idle."); + return _("Obfuscate is idle."); case POOL_STATUS_ACCEPTING_ENTRIES: if(entriesCount == 0) { - showingDarkSendMessage = 0; + showingObfuscateMessage = 0; return strAutoDenomResult; } else if (lastEntryAccepted == 1) { - if(showingDarkSendMessage % 10 > 8) { + if(showingObfuscateMessage % 10 > 8) { lastEntryAccepted = 0; - showingDarkSendMessage = 0; + showingObfuscateMessage = 0; } - return _("Darksend request complete:") + " " + _("Your transaction was accepted into the pool!"); + return _("Obfuscate request complete:") + " " + _("Your transaction was accepted into the pool!"); } else { std::string suffix = ""; - if( showingDarkSendMessage % 70 <= 40) return strprintf(_("Submitted following entries to masternode: %u / %d"), entriesCount, GetMaxPoolTransactions()); - else if(showingDarkSendMessage % 70 <= 50) suffix = "."; - else if(showingDarkSendMessage % 70 <= 60) suffix = ".."; - else if(showingDarkSendMessage % 70 <= 70) suffix = "..."; + if( showingObfuscateMessage % 70 <= 40) return strprintf(_("Submitted following entries to masternode: %u / %d"), entriesCount, GetMaxPoolTransactions()); + else if(showingObfuscateMessage % 70 <= 50) suffix = "."; + else if(showingObfuscateMessage % 70 <= 60) suffix = ".."; + else if(showingObfuscateMessage % 70 <= 70) suffix = "..."; return strprintf(_("Submitted to masternode, waiting for more entries ( %u / %d ) %s"), entriesCount, GetMaxPoolTransactions(), suffix); } case POOL_STATUS_SIGNING: - if( showingDarkSendMessage % 70 <= 40) return _("Found enough users, signing ..."); - else if(showingDarkSendMessage % 70 <= 50) suffix = "."; - else if(showingDarkSendMessage % 70 <= 60) suffix = ".."; - else if(showingDarkSendMessage % 70 <= 70) suffix = "..."; + if( showingObfuscateMessage % 70 <= 40) return _("Found enough users, signing ..."); + else if(showingObfuscateMessage % 70 <= 50) suffix = "."; + else if(showingObfuscateMessage % 70 <= 60) suffix = ".."; + else if(showingObfuscateMessage % 70 <= 70) suffix = "..."; return strprintf(_("Found enough users, signing ( waiting %s )"), suffix); case POOL_STATUS_TRANSMISSION: return _("Transmitting final transaction."); case POOL_STATUS_FINALIZE_TRANSACTION: return _("Finalizing transaction."); case POOL_STATUS_ERROR: - return _("Darksend request incomplete:") + " " + lastMessage + " " + _("Will retry..."); + return _("Obfuscate request incomplete:") + " " + lastMessage + " " + _("Will retry..."); case POOL_STATUS_SUCCESS: - return _("Darksend request complete:") + " " + lastMessage; + return _("Obfuscate request complete:") + " " + lastMessage; case POOL_STATUS_QUEUE: - if( showingDarkSendMessage % 70 <= 30) suffix = "."; - else if(showingDarkSendMessage % 70 <= 50) suffix = ".."; - else if(showingDarkSendMessage % 70 <= 70) suffix = "..."; + if( showingObfuscateMessage % 70 <= 30) suffix = "."; + else if(showingObfuscateMessage % 70 <= 50) suffix = ".."; + else if(showingObfuscateMessage % 70 <= 70) suffix = "..."; return strprintf(_("Submitted to masternode, waiting in queue %s"), suffix);; default: return strprintf(_("Unknown state: id = %u"), state); @@ -498,27 +498,27 @@ std::string CDarksendPool::GetStatus() } // -// Check the Darksend progress and send client updates if a Masternode +// Check the Obfuscate progress and send client updates if a Masternode // -void CDarksendPool::Check() +void CObfuscatePool::Check() { - if(fMasterNode) LogPrint("darksend", "CDarksendPool::Check() - entries count %lu\n", entries.size()); - //printf("CDarksendPool::Check() %d - %d - %d\n", state, anonTx.CountEntries(), GetTimeMillis()-lastTimeChanged); + if(fMasterNode) LogPrint("obfuscate", "CObfuscatePool::Check() - entries count %lu\n", entries.size()); + //printf("CObfuscatePool::Check() %d - %d - %d\n", state, anonTx.CountEntries(), GetTimeMillis()-lastTimeChanged); if(fMasterNode) { - LogPrint("darksend", "CDarksendPool::Check() - entries count %lu\n", entries.size()); + LogPrint("obfuscate", "CObfuscatePool::Check() - entries count %lu\n", entries.size()); // If entries is full, then move on to the next phase if(state == POOL_STATUS_ACCEPTING_ENTRIES && (int)entries.size() >= GetMaxPoolTransactions()) { - LogPrint("darksend", "CDarksendPool::Check() -- TRYING TRANSACTION \n"); + LogPrint("obfuscate", "CObfuscatePool::Check() -- TRYING TRANSACTION \n"); UpdateState(POOL_STATUS_FINALIZE_TRANSACTION); } } // create the finalized transaction for distribution to the clients if(state == POOL_STATUS_FINALIZE_TRANSACTION) { - LogPrint("darksend", "CDarksendPool::Check() -- FINALIZE TRANSACTIONS\n"); + LogPrint("obfuscate", "CObfuscatePool::Check() -- FINALIZE TRANSACTIONS\n"); UpdateState(POOL_STATUS_SIGNING); if (fMasterNode) { @@ -538,7 +538,7 @@ void CDarksendPool::Check() std::random_shuffle ( txNew.vout.begin(), txNew.vout.end(), randomizeList); - LogPrint("darksend", "Transaction 1: %s\n", txNew.ToString()); + LogPrint("obfuscate", "Transaction 1: %s\n", txNew.ToString()); finalTransaction = txNew; // request signatures from clients @@ -548,7 +548,7 @@ void CDarksendPool::Check() // If we have all of the signatures, try to compile the transaction if(fMasterNode && state == POOL_STATUS_SIGNING && SignaturesComplete()) { - LogPrint("darksend", "CDarksendPool::Check() -- SIGNING\n"); + LogPrint("obfuscate", "CObfuscatePool::Check() -- SIGNING\n"); UpdateState(POOL_STATUS_TRANSMISSION); CheckFinalTransaction(); @@ -556,14 +556,14 @@ void CDarksendPool::Check() // reset if we're here for 10 seconds if((state == POOL_STATUS_ERROR || state == POOL_STATUS_SUCCESS) && GetTimeMillis()-lastTimeChanged >= 10000) { - LogPrint("darksend", "CDarksendPool::Check() -- timeout, RESETTING\n"); + LogPrint("obfuscate", "CObfuscatePool::Check() -- timeout, RESETTING\n"); UnlockCoins(); SetNull(); if(fMasterNode) RelayStatus(sessionID, GetState(), GetEntriesCount(), MASTERNODE_RESET); } } -void CDarksendPool::CheckFinalTransaction() +void CObfuscatePool::CheckFinalTransaction() { if (!fMasterNode) return; // check and relay final tx only on masternode @@ -571,12 +571,12 @@ void CDarksendPool::CheckFinalTransaction() LOCK2(cs_main, pwalletMain->cs_wallet); { - LogPrint("darksend", "Transaction 2: %s\n", txNew.ToString()); + LogPrint("obfuscate", "Transaction 2: %s\n", txNew.ToString()); // See if the transaction is valid if (!txNew.AcceptToMemoryPool(false, true, true)) { - LogPrintf("CDarksendPool::Check() - CommitTransaction : Error: Transaction not valid\n"); + LogPrintf("CObfuscatePool::Check() - CommitTransaction : Error: Transaction not valid\n"); SetNull(); // not much we can do in this case @@ -585,7 +585,7 @@ void CDarksendPool::CheckFinalTransaction() return; } - LogPrintf("CDarksendPool::Check() -- IS MASTER -- TRANSMITTING DARKSEND\n"); + LogPrintf("CObfuscatePool::Check() -- IS MASTER -- TRANSMITTING DARKSEND\n"); // sign a message @@ -598,28 +598,28 @@ void CDarksendPool::CheckFinalTransaction() if(!darkSendSigner.SetKey(strMasterNodePrivKey, strError, key2, pubkey2)) { - LogPrintf("CDarksendPool::Check() - ERROR: Invalid Masternodeprivkey: '%s'\n", strError); + LogPrintf("CObfuscatePool::Check() - ERROR: Invalid Masternodeprivkey: '%s'\n", strError); return; } if(!darkSendSigner.SignMessage(strMessage, strError, vchSig, key2)) { - LogPrintf("CDarksendPool::Check() - Sign message failed\n"); + LogPrintf("CObfuscatePool::Check() - Sign message failed\n"); return; } if(!darkSendSigner.VerifyMessage(pubkey2, vchSig, strMessage, strError)) { - LogPrintf("CDarksendPool::Check() - Verify message failed\n"); + LogPrintf("CObfuscatePool::Check() - Verify message failed\n"); return; } - if(!mapDarksendBroadcastTxes.count(txNew.GetHash())){ - CDarksendBroadcastTx dstx; + if(!mapObfuscateBroadcastTxes.count(txNew.GetHash())){ + CObfuscateBroadcastTx dstx; dstx.tx = txNew; dstx.vin = activeMasternode.vin; dstx.vchSig = vchSig; dstx.sigTime = sigTime; - mapDarksendBroadcastTxes.insert(make_pair(txNew.GetHash(), dstx)); + mapObfuscateBroadcastTxes.insert(make_pair(txNew.GetHash(), dstx)); } CInv inv(MSG_DSTX, txNew.GetHash()); @@ -632,7 +632,7 @@ void CDarksendPool::CheckFinalTransaction() ChargeRandomFees(); // Reset - LogPrint("darksend", "CDarksendPool::Check() -- COMPLETED -- RESETTING\n"); + LogPrint("obfuscate", "CObfuscatePool::Check() -- COMPLETED -- RESETTING\n"); SetNull(); RelayStatus(sessionID, GetState(), GetEntriesCount(), MASTERNODE_RESET); } @@ -641,8 +641,8 @@ void CDarksendPool::CheckFinalTransaction() // // Charge clients a fee if they're abusive // -// Why bother? Darksend uses collateral to ensure abuse to the process is kept to a minimum. -// The submission and signing stages in Darksend are completely separate. In the cases where +// Why bother? Obfuscate uses collateral to ensure abuse to the process is kept to a minimum. +// The submission and signing stages in Obfuscate are completely separate. In the cases where // a client submits a transaction then refused to sign, there must be a cost. Otherwise they // would be able to do this over and over again and bring the mixing to a hault. // @@ -650,7 +650,7 @@ void CDarksendPool::CheckFinalTransaction() // transaction for the client to be able to enter the pool. This transaction is kept by the Masternode // until the transaction is either complete or fails. // -void CDarksendPool::ChargeFees(){ +void CObfuscatePool::ChargeFees(){ if(!fMasterNode) return; //we don't need to charge collateral for every offence. @@ -661,7 +661,7 @@ void CDarksendPool::ChargeFees(){ if(state == POOL_STATUS_ACCEPTING_ENTRIES){ BOOST_FOREACH(const CTransaction& txCollateral, vecSessionCollateral) { bool found = false; - BOOST_FOREACH(const CDarkSendEntry& v, entries) { + BOOST_FOREACH(const CObfuscateEntry& v, entries) { if(v.collateral == txCollateral) { found = true; } @@ -669,7 +669,7 @@ void CDarksendPool::ChargeFees(){ // This queue entry didn't send us the promised transaction if(!found){ - LogPrintf("CDarksendPool::ChargeFees -- found uncooperative node (didn't send transaction). Found offence.\n"); + LogPrintf("CObfuscatePool::ChargeFees -- found uncooperative node (didn't send transaction). Found offence.\n"); offences++; } } @@ -677,10 +677,10 @@ void CDarksendPool::ChargeFees(){ if(state == POOL_STATUS_SIGNING) { // who didn't sign? - BOOST_FOREACH(const CDarkSendEntry v, entries) { + BOOST_FOREACH(const CObfuscateEntry v, entries) { BOOST_FOREACH(const CTxDSIn s, v.sev) { if(!s.fHasSig){ - LogPrintf("CDarksendPool::ChargeFees -- found uncooperative node (didn't sign). Found offence\n"); + LogPrintf("CObfuscatePool::ChargeFees -- found uncooperative node (didn't sign). Found offence\n"); offences++; } } @@ -705,7 +705,7 @@ void CDarksendPool::ChargeFees(){ if(state == POOL_STATUS_ACCEPTING_ENTRIES){ BOOST_FOREACH(const CTransaction& txCollateral, vecSessionCollateral) { bool found = false; - BOOST_FOREACH(const CDarkSendEntry& v, entries) { + BOOST_FOREACH(const CObfuscateEntry& v, entries) { if(v.collateral == txCollateral) { found = true; } @@ -713,7 +713,7 @@ void CDarksendPool::ChargeFees(){ // This queue entry didn't send us the promised transaction if(!found && r > target){ - LogPrintf("CDarksendPool::ChargeFees -- found uncooperative node (didn't send transaction). charging fees.\n"); + LogPrintf("CObfuscatePool::ChargeFees -- found uncooperative node (didn't send transaction). charging fees.\n"); CWalletTx wtxCollateral = CWalletTx(pwalletMain, txCollateral); @@ -721,7 +721,7 @@ void CDarksendPool::ChargeFees(){ if (!wtxCollateral.AcceptToMemoryPool(true)) { // This must not fail. The transaction has already been signed and recorded. - LogPrintf("CDarksendPool::ChargeFees() : Error: Transaction not valid"); + LogPrintf("CObfuscatePool::ChargeFees() : Error: Transaction not valid"); } wtxCollateral.RelayWalletTransaction(); return; @@ -731,10 +731,10 @@ void CDarksendPool::ChargeFees(){ if(state == POOL_STATUS_SIGNING) { // who didn't sign? - BOOST_FOREACH(const CDarkSendEntry v, entries) { + BOOST_FOREACH(const CObfuscateEntry v, entries) { BOOST_FOREACH(const CTxDSIn s, v.sev) { if(!s.fHasSig && r > target){ - LogPrintf("CDarksendPool::ChargeFees -- found uncooperative node (didn't sign). charging fees.\n"); + LogPrintf("CObfuscatePool::ChargeFees -- found uncooperative node (didn't sign). charging fees.\n"); CWalletTx wtxCollateral = CWalletTx(pwalletMain, v.collateral); @@ -742,7 +742,7 @@ void CDarksendPool::ChargeFees(){ if (!wtxCollateral.AcceptToMemoryPool(false)) { // This must not fail. The transaction has already been signed and recorded. - LogPrintf("CDarksendPool::ChargeFees() : Error: Transaction not valid"); + LogPrintf("CObfuscatePool::ChargeFees() : Error: Transaction not valid"); } wtxCollateral.RelayWalletTransaction(); return; @@ -753,8 +753,8 @@ void CDarksendPool::ChargeFees(){ } // charge the collateral randomly -// - Darksend is completely free, to pay miners we randomly pay the collateral of users. -void CDarksendPool::ChargeRandomFees(){ +// - Obfuscate is completely free, to pay miners we randomly pay the collateral of users. +void CObfuscatePool::ChargeRandomFees(){ if(fMasterNode) { int i = 0; @@ -764,15 +764,15 @@ void CDarksendPool::ChargeRandomFees(){ /* Collateral Fee Charges: - Being that Darksend has "no fees" we need to have some kind of cost associated + Being that Obfuscate has "no fees" we need to have some kind of cost associated with using it to stop abuse. Otherwise it could serve as an attack vector and - allow endless transaction that would bloat Dash and make it unusable. To + allow endless transaction that would bloat DarkNet and make it unusable. To stop these kinds of attacks 1 in 10 successful transactions are charged. This - adds up to a cost of 0.001DRK per transaction on average. + adds up to a cost of 0.001DNET per transaction on average. */ if(r <= 10) { - LogPrintf("CDarksendPool::ChargeRandomFees -- charging random fees. %u\n", i); + LogPrintf("CObfuscatePool::ChargeRandomFees -- charging random fees. %u\n", i); CWalletTx wtxCollateral = CWalletTx(pwalletMain, txCollateral); @@ -780,7 +780,7 @@ void CDarksendPool::ChargeRandomFees(){ if (!wtxCollateral.AcceptToMemoryPool(true)) { // This must not fail. The transaction has already been signed and recorded. - LogPrintf("CDarksendPool::ChargeRandomFees() : Error: Transaction not valid"); + LogPrintf("CObfuscatePool::ChargeRandomFees() : Error: Transaction not valid"); } wtxCollateral.RelayWalletTransaction(); } @@ -789,36 +789,36 @@ void CDarksendPool::ChargeRandomFees(){ } // -// Check for various timeouts (queue objects, Darksend, etc) +// Check for various timeouts (queue objects, Obfuscate, etc) // -void CDarksendPool::CheckTimeout(){ - if(!fEnableDarksend && !fMasterNode) return; +void CObfuscatePool::CheckTimeout(){ + if(!fEnableObfuscate && !fMasterNode) return; // catching hanging sessions if(!fMasterNode) { switch(state) { case POOL_STATUS_TRANSMISSION: - LogPrint("darksend", "CDarksendPool::CheckTimeout() -- Session complete -- Running Check()\n"); + LogPrint("obfuscate", "CObfuscatePool::CheckTimeout() -- Session complete -- Running Check()\n"); Check(); break; case POOL_STATUS_ERROR: - LogPrint("darksend", "CDarksendPool::CheckTimeout() -- Pool error -- Running Check()\n"); + LogPrint("obfuscate", "CObfuscatePool::CheckTimeout() -- Pool error -- Running Check()\n"); Check(); break; case POOL_STATUS_SUCCESS: - LogPrint("darksend", "CDarksendPool::CheckTimeout() -- Pool success -- Running Check()\n"); + LogPrint("obfuscate", "CObfuscatePool::CheckTimeout() -- Pool success -- Running Check()\n"); Check(); break; } } - // check Darksend queue objects for timeouts + // check Obfuscate queue objects for timeouts int c = 0; - vector::iterator it = vecDarksendQueue.begin(); - while(it != vecDarksendQueue.end()){ + vector::iterator it = vecObfuscateQueue.begin(); + while(it != vecObfuscateQueue.end()){ if((*it).IsExpired()){ - LogPrint("darksend", "CDarksendPool::CheckTimeout() : Removing expired queue entry - %d\n", c); - it = vecDarksendQueue.erase(it); + LogPrint("obfuscate", "CObfuscatePool::CheckTimeout() : Removing expired queue entry - %d\n", c); + it = vecObfuscateQueue.erase(it); } else ++it; c++; } @@ -830,10 +830,10 @@ void CDarksendPool::CheckTimeout(){ c = 0; // check for a timeout and reset if needed - vector::iterator it2 = entries.begin(); + vector::iterator it2 = entries.begin(); while(it2 != entries.end()){ if((*it2).IsExpired()){ - LogPrint("darksend", "CDarksendPool::CheckTimeout() : Removing expired entry - %d\n", c); + LogPrint("obfuscate", "CObfuscatePool::CheckTimeout() : Removing expired entry - %d\n", c); it2 = entries.erase(it2); if(entries.size() == 0){ UnlockCoins(); @@ -851,7 +851,7 @@ void CDarksendPool::CheckTimeout(){ SetNull(); } } else if(GetTimeMillis()-lastTimeChanged >= (DARKSEND_QUEUE_TIMEOUT*1000)+addLagTime){ - LogPrint("darksend", "CDarksendPool::CheckTimeout() -- Session timed out (%ds) -- resetting\n", DARKSEND_QUEUE_TIMEOUT); + LogPrint("obfuscate", "CObfuscatePool::CheckTimeout() -- Session timed out (%ds) -- resetting\n", DARKSEND_QUEUE_TIMEOUT); UnlockCoins(); SetNull(); @@ -860,7 +860,7 @@ void CDarksendPool::CheckTimeout(){ } if(state == POOL_STATUS_SIGNING && GetTimeMillis()-lastTimeChanged >= (DARKSEND_SIGNING_TIMEOUT*1000)+addLagTime ) { - LogPrint("darksend", "CDarksendPool::CheckTimeout() -- Session timed out (%ds) -- restting\n", DARKSEND_SIGNING_TIMEOUT); + LogPrint("obfuscate", "CObfuscatePool::CheckTimeout() -- Session timed out (%ds) -- restting\n", DARKSEND_SIGNING_TIMEOUT); ChargeFees(); UnlockCoins(); SetNull(); @@ -873,8 +873,8 @@ void CDarksendPool::CheckTimeout(){ // // Check for complete queue // -void CDarksendPool::CheckForCompleteQueue(){ - if(!fEnableDarksend && !fMasterNode) return; +void CObfuscatePool::CheckForCompleteQueue(){ + if(!fEnableObfuscate && !fMasterNode) return; /* Check to see if we're ready for submissions from clients */ // @@ -884,7 +884,7 @@ void CDarksendPool::CheckForCompleteQueue(){ if(state == POOL_STATUS_QUEUE && sessionUsers == GetMaxPoolTransactions()) { UpdateState(POOL_STATUS_ACCEPTING_ENTRIES); - CDarksendQueue dsq; + CObfuscateQueue dsq; dsq.nDenom = sessionDenom; dsq.vin = activeMasternode.vin; dsq.time = GetTime(); @@ -895,7 +895,7 @@ void CDarksendPool::CheckForCompleteQueue(){ } // check to see if the signature is valid -bool CDarksendPool::SignatureValid(const CScript& newSig, const CTxIn& newVin){ +bool CObfuscatePool::SignatureValid(const CScript& newSig, const CTxIn& newVin){ CMutableTransaction txNew; txNew.vin.clear(); txNew.vout.clear(); @@ -904,7 +904,7 @@ bool CDarksendPool::SignatureValid(const CScript& newSig, const CTxIn& newVin){ CScript sigPubKey = CScript(); unsigned int i = 0; - BOOST_FOREACH(CDarkSendEntry& e, entries) { + BOOST_FOREACH(CObfuscateEntry& e, entries) { BOOST_FOREACH(const CTxOut& out, e.vout) txNew.vout.push_back(out); @@ -922,19 +922,19 @@ bool CDarksendPool::SignatureValid(const CScript& newSig, const CTxIn& newVin){ if(found >= 0){ //might have to do this one input at a time? int n = found; txNew.vin[n].scriptSig = newSig; - LogPrint("darksend", "CDarksendPool::SignatureValid() - Sign with sig %s\n", newSig.ToString().substr(0,24)); + LogPrint("obfuscate", "CObfuscatePool::SignatureValid() - Sign with sig %s\n", newSig.ToString().substr(0,24)); if (!VerifyScript(txNew.vin[n].scriptSig, sigPubKey, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC, MutableTransactionSignatureChecker(&txNew, n))){ - LogPrint("darksend", "CDarksendPool::SignatureValid() - Signing - Error signing input %u\n", n); + LogPrint("obfuscate", "CObfuscatePool::SignatureValid() - Signing - Error signing input %u\n", n); return false; } } - LogPrint("darksend", "CDarksendPool::SignatureValid() - Signing - Successfully validated input\n"); + LogPrint("obfuscate", "CObfuscatePool::SignatureValid() - Signing - Successfully validated input\n"); return true; } // check to make sure the collateral provided by the client is valid -bool CDarksendPool::IsCollateralValid(const CTransaction& txCollateral){ +bool CObfuscatePool::IsCollateralValid(const CTransaction& txCollateral){ if(txCollateral.vout.size() < 1) return false; if(txCollateral.nLockTime != 0) return false; @@ -946,7 +946,7 @@ bool CDarksendPool::IsCollateralValid(const CTransaction& txCollateral){ nValueOut += o.nValue; if(!o.scriptPubKey.IsNormalPaymentScript()){ - LogPrintf ("CDarksendPool::IsCollateralValid - Invalid Script %s\n", txCollateral.ToString()); + LogPrintf ("CObfuscatePool::IsCollateralValid - Invalid Script %s\n", txCollateral.ToString()); return false; } } @@ -964,23 +964,23 @@ bool CDarksendPool::IsCollateralValid(const CTransaction& txCollateral){ } if(missingTx){ - LogPrint("darksend", "CDarksendPool::IsCollateralValid - Unknown inputs in collateral transaction - %s\n", txCollateral.ToString()); + LogPrint("obfuscate", "CObfuscatePool::IsCollateralValid - Unknown inputs in collateral transaction - %s\n", txCollateral.ToString()); return false; } //collateral transactions are required to pay out DARKSEND_COLLATERAL as a fee to the miners if(nValueIn - nValueOut < DARKSEND_COLLATERAL) { - LogPrint("darksend", "CDarksendPool::IsCollateralValid - did not include enough fees in transaction %d\n%s\n", nValueOut-nValueIn, txCollateral.ToString()); + LogPrint("obfuscate", "CObfuscatePool::IsCollateralValid - did not include enough fees in transaction %d\n%s\n", nValueOut-nValueIn, txCollateral.ToString()); return false; } - LogPrint("darksend", "CDarksendPool::IsCollateralValid %s\n", txCollateral.ToString()); + LogPrint("obfuscate", "CObfuscatePool::IsCollateralValid %s\n", txCollateral.ToString()); { LOCK(cs_main); CValidationState state; if(!AcceptableInputs(mempool, state, txCollateral, true, NULL)){ - if(fDebug) LogPrintf ("CDarksendPool::IsCollateralValid - didn't pass IsAcceptable\n"); + if(fDebug) LogPrintf ("CObfuscatePool::IsCollateralValid - didn't pass IsAcceptable\n"); return false; } } @@ -992,12 +992,12 @@ bool CDarksendPool::IsCollateralValid(const CTransaction& txCollateral){ // // Add a clients transaction to the pool // -bool CDarksendPool::AddEntry(const std::vector& newInput, const int64_t& nAmount, const CTransaction& txCollateral, const std::vector& newOutput, int& errorID){ +bool CObfuscatePool::AddEntry(const std::vector& newInput, const int64_t& nAmount, const CTransaction& txCollateral, const std::vector& newOutput, int& errorID){ if (!fMasterNode) return false; BOOST_FOREACH(CTxIn in, newInput) { if (in.prevout.IsNull() || nAmount < 0) { - LogPrint("darksend", "CDarksendPool::AddEntry - input not valid!\n"); + LogPrint("obfuscate", "CObfuscatePool::AddEntry - input not valid!\n"); errorID = ERR_INVALID_INPUT; sessionUsers--; return false; @@ -1005,25 +1005,25 @@ bool CDarksendPool::AddEntry(const std::vector& newInput, const int64_t& } if (!IsCollateralValid(txCollateral)){ - LogPrint("darksend", "CDarksendPool::AddEntry - collateral not valid!\n"); + LogPrint("obfuscate", "CObfuscatePool::AddEntry - collateral not valid!\n"); errorID = ERR_INVALID_COLLATERAL; sessionUsers--; return false; } if((int)entries.size() >= GetMaxPoolTransactions()){ - LogPrint("darksend", "CDarksendPool::AddEntry - entries is full!\n"); + LogPrint("obfuscate", "CObfuscatePool::AddEntry - entries is full!\n"); errorID = ERR_ENTRIES_FULL; sessionUsers--; return false; } BOOST_FOREACH(CTxIn in, newInput) { - LogPrint("darksend", "looking for vin -- %s\n", in.ToString()); - BOOST_FOREACH(const CDarkSendEntry& v, entries) { + LogPrint("obfuscate", "looking for vin -- %s\n", in.ToString()); + BOOST_FOREACH(const CObfuscateEntry& v, entries) { BOOST_FOREACH(const CTxDSIn& s, v.sev){ if((CTxIn)s == in) { - LogPrint("darksend", "CDarksendPool::AddEntry - found in vin\n"); + LogPrint("obfuscate", "CObfuscatePool::AddEntry - found in vin\n"); errorID = ERR_ALREADY_HAVE; sessionUsers--; return false; @@ -1032,57 +1032,57 @@ bool CDarksendPool::AddEntry(const std::vector& newInput, const int64_t& } } - CDarkSendEntry v; + CObfuscateEntry v; v.Add(newInput, nAmount, txCollateral, newOutput); entries.push_back(v); - LogPrint("darksend", "CDarksendPool::AddEntry -- adding %s\n", newInput[0].ToString()); + LogPrint("obfuscate", "CObfuscatePool::AddEntry -- adding %s\n", newInput[0].ToString()); errorID = MSG_ENTRIES_ADDED; return true; } -bool CDarksendPool::AddScriptSig(const CTxIn& newVin){ - LogPrint("darksend", "CDarksendPool::AddScriptSig -- new sig %s\n", newVin.scriptSig.ToString().substr(0,24)); +bool CObfuscatePool::AddScriptSig(const CTxIn& newVin){ + LogPrint("obfuscate", "CObfuscatePool::AddScriptSig -- new sig %s\n", newVin.scriptSig.ToString().substr(0,24)); - BOOST_FOREACH(const CDarkSendEntry& v, entries) { + BOOST_FOREACH(const CObfuscateEntry& v, entries) { BOOST_FOREACH(const CTxDSIn& s, v.sev){ if(s.scriptSig == newVin.scriptSig) { - LogPrint("darksend", "CDarksendPool::AddScriptSig - already exists\n"); + LogPrint("obfuscate", "CObfuscatePool::AddScriptSig - already exists\n"); return false; } } } if(!SignatureValid(newVin.scriptSig, newVin)){ - LogPrint("darksend", "CDarksendPool::AddScriptSig - Invalid Sig\n"); + LogPrint("obfuscate", "CObfuscatePool::AddScriptSig - Invalid Sig\n"); return false; } - LogPrint("darksend", "CDarksendPool::AddScriptSig -- sig %s\n", newVin.ToString()); + LogPrint("obfuscate", "CObfuscatePool::AddScriptSig -- sig %s\n", newVin.ToString()); BOOST_FOREACH(CTxIn& vin, finalTransaction.vin){ if(newVin.prevout == vin.prevout && vin.nSequence == newVin.nSequence){ vin.scriptSig = newVin.scriptSig; vin.prevPubKey = newVin.prevPubKey; - LogPrint("darksend", "CDarkSendPool::AddScriptSig -- adding to finalTransaction %s\n", newVin.scriptSig.ToString().substr(0,24)); + LogPrint("obfuscate", "CObfuscatePool::AddScriptSig -- adding to finalTransaction %s\n", newVin.scriptSig.ToString().substr(0,24)); } } for(unsigned int i = 0; i < entries.size(); i++){ if(entries[i].AddSig(newVin)){ - LogPrint("darksend", "CDarkSendPool::AddScriptSig -- adding %s\n", newVin.scriptSig.ToString().substr(0,24)); + LogPrint("obfuscate", "CObfuscatePool::AddScriptSig -- adding %s\n", newVin.scriptSig.ToString().substr(0,24)); return true; } } - LogPrintf("CDarksendPool::AddScriptSig -- Couldn't set sig!\n" ); + LogPrintf("CObfuscatePool::AddScriptSig -- Couldn't set sig!\n" ); return false; } // Check to make sure everything is signed -bool CDarksendPool::SignaturesComplete(){ - BOOST_FOREACH(const CDarkSendEntry& v, entries) { +bool CObfuscatePool::SignaturesComplete(){ + BOOST_FOREACH(const CObfuscateEntry& v, entries) { BOOST_FOREACH(const CTxDSIn& s, v.sev){ if(!s.fHasSig) return false; } @@ -1091,18 +1091,18 @@ bool CDarksendPool::SignaturesComplete(){ } // -// Execute a Darksend denomination via a Masternode. +// Execute a Obfuscate denomination via a Masternode. // This is only ran from clients // -void CDarksendPool::SendDarksendDenominate(std::vector& vin, std::vector& vout, int64_t amount){ +void CObfuscatePool::SendObfuscateDenominate(std::vector& vin, std::vector& vout, int64_t amount){ if(fMasterNode) { - LogPrintf("CDarksendPool::SendDarksendDenominate() - Darksend from a Masternode is not supported currently.\n"); + LogPrintf("CObfuscatePool::SendObfuscateDenominate() - Obfuscate from a Masternode is not supported currently.\n"); return; } if(txCollateral == CMutableTransaction()){ - LogPrintf ("CDarksendPool:SendDarksendDenominate() - Darksend collateral not set"); + LogPrintf ("CObfuscatePool:SendObfuscateDenominate() - Obfuscate collateral not set"); return; } @@ -1119,7 +1119,7 @@ void CDarksendPool::SendDarksendDenominate(std::vector& vin, std::vector< // we should already be connected to a Masternode if(!sessionFoundMasternode){ - LogPrintf("CDarksendPool::SendDarksendDenominate() - No Masternode has been selected yet.\n"); + LogPrintf("CObfuscatePool::SendObfuscateDenominate() - No Masternode has been selected yet.\n"); UnlockCoins(); SetNull(); return; @@ -1128,14 +1128,14 @@ void CDarksendPool::SendDarksendDenominate(std::vector& vin, std::vector< if (!CheckDiskSpace()) { UnlockCoins(); SetNull(); - fEnableDarksend = false; - LogPrintf("CDarksendPool::SendDarksendDenominate() - Not enough disk space, disabling Darksend.\n"); + fEnableObfuscate = false; + LogPrintf("CObfuscatePool::SendObfuscateDenominate() - Not enough disk space, disabling Obfuscate.\n"); return; } UpdateState(POOL_STATUS_ACCEPTING_ENTRIES); - LogPrintf("CDarksendPool::SendDarksendDenominate() - Added transaction to pool.\n"); + LogPrintf("CObfuscatePool::SendObfuscateDenominate() - Added transaction to pool.\n"); ClearLastMessage(); @@ -1154,7 +1154,7 @@ void CDarksendPool::SendDarksendDenominate(std::vector& vin, std::vector< BOOST_FOREACH(const CTxIn& i, vin){ tx.vin.push_back(i); - LogPrint("darksend", "dsi -- tx in %s\n", i.ToString()); + LogPrint("obfuscate", "dsi -- tx in %s\n", i.ToString()); } LogPrintf("Submitting tx %s\n", tx.ToString()); @@ -1173,7 +1173,7 @@ void CDarksendPool::SendDarksendDenominate(std::vector& vin, std::vector< } // store our entry for later use - CDarkSendEntry e; + CObfuscateEntry e; e.Add(vin, amount, txCollateral, vout); entries.push_back(e); @@ -1181,12 +1181,12 @@ void CDarksendPool::SendDarksendDenominate(std::vector& vin, std::vector< Check(); } -// Incoming message from Masternode updating the progress of Darksend +// Incoming message from Masternode updating the progress of Obfuscate // newAccepted: -1 mean's it'n not a "transaction accepted/not accepted" message, just a standard update // 0 means transaction was not accepted // 1 means transaction was accepted -bool CDarksendPool::StatusUpdate(int newState, int newEntriesCount, int newAccepted, int& errorID, int newSessionID){ +bool CObfuscatePool::StatusUpdate(int newState, int newEntriesCount, int newAccepted, int& errorID, int newSessionID){ if(fMasterNode) return false; if(state == POOL_STATUS_ERROR || state == POOL_STATUS_SUCCESS) return false; @@ -1205,19 +1205,19 @@ bool CDarksendPool::StatusUpdate(int newState, int newEntriesCount, int newAccep if(newAccepted == 1 && newSessionID != 0) { sessionID = newSessionID; - LogPrintf("CDarksendPool::StatusUpdate - set sessionID to %d\n", sessionID); + LogPrintf("CObfuscatePool::StatusUpdate - set sessionID to %d\n", sessionID); sessionFoundMasternode = true; } } if(newState == POOL_STATUS_ACCEPTING_ENTRIES){ if(newAccepted == 1){ - LogPrintf("CDarksendPool::StatusUpdate - entry accepted! \n"); + LogPrintf("CObfuscatePool::StatusUpdate - entry accepted! \n"); sessionFoundMasternode = true; //wait for other users. Masternode will report when ready UpdateState(POOL_STATUS_QUEUE); } else if (newAccepted == 0 && sessionID == 0 && !sessionFoundMasternode) { - LogPrintf("CDarksendPool::StatusUpdate - entry not accepted by Masternode \n"); + LogPrintf("CObfuscatePool::StatusUpdate - entry not accepted by Masternode \n"); UnlockCoins(); UpdateState(POOL_STATUS_ACCEPTING_ENTRIES); DoAutomaticDenominating(); //try another Masternode @@ -1233,16 +1233,16 @@ bool CDarksendPool::StatusUpdate(int newState, int newEntriesCount, int newAccep // check it to make sure it's what we want, then sign it if we agree. // If we refuse to sign, it's possible we'll be charged collateral // -bool CDarksendPool::SignFinalTransaction(CTransaction& finalTransactionNew, CNode* node){ +bool CObfuscatePool::SignFinalTransaction(CTransaction& finalTransactionNew, CNode* node){ if(fMasterNode) return false; finalTransaction = finalTransactionNew; - LogPrintf("CDarksendPool::SignFinalTransaction %s", finalTransaction.ToString()); + LogPrintf("CObfuscatePool::SignFinalTransaction %s", finalTransaction.ToString()); vector sigs; //make sure my inputs/outputs are present, otherwise refuse to sign - BOOST_FOREACH(const CDarkSendEntry e, entries) { + BOOST_FOREACH(const CObfuscateEntry e, entries) { BOOST_FOREACH(const CTxDSIn s, e.sev) { /* Sign my transaction and all outputs */ int mine = -1; @@ -1278,7 +1278,7 @@ bool CDarksendPool::SignFinalTransaction(CTransaction& finalTransactionNew, CNod if(foundOutputs < targetOuputs || nValue1 != nValue2) { // in this case, something went wrong and we'll refuse to sign. It's possible we'll be charged collateral. But that's // better then signing if the transaction doesn't look like what we wanted. - LogPrintf("CDarksendPool::Sign - My entries are not correct! Refusing to sign. %d entries %d target. \n", foundOutputs, targetOuputs); + LogPrintf("CObfuscatePool::Sign - My entries are not correct! Refusing to sign. %d entries %d target. \n", foundOutputs, targetOuputs); UnlockCoins(); SetNull(); @@ -1287,19 +1287,19 @@ bool CDarksendPool::SignFinalTransaction(CTransaction& finalTransactionNew, CNod const CKeyStore& keystore = *pwalletMain; - LogPrint("darksend", "CDarksendPool::Sign - Signing my input %i\n", mine); + LogPrint("obfuscate", "CObfuscatePool::Sign - Signing my input %i\n", mine); if(!SignSignature(keystore, prevPubKey, finalTransaction, mine, int(SIGHASH_ALL|SIGHASH_ANYONECANPAY))) { // changes scriptSig - LogPrint("darksend", "CDarksendPool::Sign - Unable to sign my own transaction! \n"); + LogPrint("obfuscate", "CObfuscatePool::Sign - Unable to sign my own transaction! \n"); // not sure what to do here, it will timeout...? } sigs.push_back(finalTransaction.vin[mine]); - LogPrint("darksend", " -- dss %d %d %s\n", mine, (int)sigs.size(), finalTransaction.vin[mine].scriptSig.ToString()); + LogPrint("obfuscate", " -- dss %d %d %s\n", mine, (int)sigs.size(), finalTransaction.vin[mine].scriptSig.ToString()); } } - LogPrint("darksend", "CDarksendPool::Sign - txNew:\n%s", finalTransaction.ToString()); + LogPrint("obfuscate", "CObfuscatePool::Sign - txNew:\n%s", finalTransaction.ToString()); } // push all of our signatures to the Masternode @@ -1310,9 +1310,9 @@ bool CDarksendPool::SignFinalTransaction(CTransaction& finalTransactionNew, CNod return true; } -void CDarksendPool::NewBlock() +void CObfuscatePool::NewBlock() { - LogPrint("darksend", "CDarksendPool::NewBlock \n"); + LogPrint("obfuscate", "CObfuscatePool::NewBlock \n"); //we we're processing lots of blocks, we'll just leave if(GetTime() - lastNewBlock < 10) return; @@ -1321,8 +1321,8 @@ void CDarksendPool::NewBlock() darkSendPool.CheckTimeout(); } -// Darksend transaction was completed (failed or successful) -void CDarksendPool::CompletedTransaction(bool error, int errorID) +// Obfuscate transaction was completed (failed or successful) +void CObfuscatePool::CompletedTransaction(bool error, int errorID) { if(fMasterNode) return; @@ -1346,19 +1346,19 @@ void CDarksendPool::CompletedTransaction(bool error, int errorID) lastMessage = GetMessageByID(errorID); } -void CDarksendPool::ClearLastMessage() +void CObfuscatePool::ClearLastMessage() { lastMessage = ""; } // -// Passively run Darksend in the background to anonymize funds based on the given configuration. +// Passively run Obfuscate in the background to anonymize funds based on the given configuration. // // This does NOT run by default for daemons, only for QT. // -bool CDarksendPool::DoAutomaticDenominating(bool fDryRun) +bool CObfuscatePool::DoAutomaticDenominating(bool fDryRun) { - if(!fEnableDarksend) return false; + if(!fEnableObfuscate) return false; if(fMasterNode) return false; if(state == POOL_STATUS_ERROR || state == POOL_STATUS_SUCCESS) return false; if(GetEntriesCount() > 0) { @@ -1366,7 +1366,7 @@ bool CDarksendPool::DoAutomaticDenominating(bool fDryRun) return false; } - TRY_LOCK(cs_darksend, lockDS); + TRY_LOCK(cs_obfuscate, lockDS); if(!lockDS) { strAutoDenomResult = _("Lock is already in place."); return false; @@ -1383,13 +1383,13 @@ bool CDarksendPool::DoAutomaticDenominating(bool fDryRun) } if(chainActive.Tip()->nHeight - cachedLastSuccess < minBlockSpacing) { - LogPrintf("CDarksendPool::DoAutomaticDenominating - Last successful Darksend action was too recent\n"); - strAutoDenomResult = _("Last successful Darksend action was too recent."); + LogPrintf("CObfuscatePool::DoAutomaticDenominating - Last successful Obfuscate action was too recent\n"); + strAutoDenomResult = _("Last successful Obfuscate action was too recent."); return false; } if(mnodeman.size() == 0){ - LogPrint("darksend", "CDarksendPool::DoAutomaticDenominating - No Masternodes detected\n"); + LogPrint("obfuscate", "CObfuscatePool::DoAutomaticDenominating - No Masternodes detected\n"); strAutoDenomResult = _("No Masternodes detected."); return false; } @@ -1426,15 +1426,15 @@ bool CDarksendPool::DoAutomaticDenominating(bool fDryRun) return false; } - LogPrint("darksend", "DoAutomaticDenominating : nLowestDenom=%d, nBalanceNeedsAnonymized=%d\n", nLowestDenom, nBalanceNeedsAnonymized); + LogPrint("obfuscate", "DoAutomaticDenominating : nLowestDenom=%d, nBalanceNeedsAnonymized=%d\n", nLowestDenom, nBalanceNeedsAnonymized); // select coins that should be given to the pool - if (!pwalletMain->SelectCoinsDark(nValueMin, nBalanceNeedsAnonymized, vCoins, nValueIn, 0, nDarksendRounds)) + if (!pwalletMain->SelectCoinsDark(nValueMin, nBalanceNeedsAnonymized, vCoins, nValueIn, 0, nObfuscateRounds)) { nValueIn = 0; vCoins.clear(); - if (pwalletMain->SelectCoinsDark(nValueMin, 9999999*COIN, vCoins, nValueIn, -2, 0)) + if (pwalletMain->SelectCoinsDark(nValueMin, 99999999*COIN, vCoins, nValueIn, -2, 0)) { nOnlyDenominatedBalance = pwalletMain->GetDenominatedBalance(true) + pwalletMain->GetDenominatedBalance() - pwalletMain->GetAnonymizedBalance(); nBalanceNeedsDenominated = nBalanceNeedsAnonymized - nOnlyDenominatedBalance; @@ -1501,17 +1501,17 @@ bool CDarksendPool::DoAutomaticDenominating(bool fDryRun) //if we've used 90% of the Masternode list then drop all the oldest first int nThreshold = (int)(mnodeman.CountEnabled(MIN_POOL_PEER_PROTO_VERSION) * 0.9); - LogPrint("darksend", "Checking vecMasternodesUsed size %d threshold %d\n", (int)vecMasternodesUsed.size(), nThreshold); + LogPrint("obfuscate", "Checking vecMasternodesUsed size %d threshold %d\n", (int)vecMasternodesUsed.size(), nThreshold); while((int)vecMasternodesUsed.size() > nThreshold){ vecMasternodesUsed.erase(vecMasternodesUsed.begin()); - LogPrint("darksend", " vecMasternodesUsed size %d threshold %d\n", (int)vecMasternodesUsed.size(), nThreshold); + LogPrint("obfuscate", " vecMasternodesUsed size %d threshold %d\n", (int)vecMasternodesUsed.size(), nThreshold); } //don't use the queues all of the time for mixing if(nUseQueue > 33){ // Look through the queues and see if anything matches - BOOST_FOREACH(CDarksendQueue& dsq, vecDarksendQueue){ + BOOST_FOREACH(CObfuscateQueue& dsq, vecObfuscateQueue){ CService addr; if(dsq.time == 0) continue; @@ -1538,7 +1538,7 @@ bool CDarksendPool::DoAutomaticDenominating(bool fDryRun) std::vector vTempCoins; std::vector vTempCoins2; // Try to match their denominations if possible - if (!pwalletMain->SelectCoinsByDenominations(dsq.nDenom, nValueMin, nBalanceNeedsAnonymized, vTempCoins, vTempCoins2, nValueIn, 0, nDarksendRounds)){ + if (!pwalletMain->SelectCoinsByDenominations(dsq.nDenom, nValueMin, nBalanceNeedsAnonymized, vTempCoins, vTempCoins2, nValueIn, 0, nObfuscateRounds)){ LogPrintf("DoAutomaticDenominating - Couldn't match denominations %d\n", dsq.nDenom); continue; } @@ -1626,20 +1626,20 @@ bool CDarksendPool::DoAutomaticDenominating(bool fDryRun) } -bool CDarksendPool::PrepareDarksendDenominate() +bool CObfuscatePool::PrepareObfuscateDenominate() { std::string strError = ""; // Submit transaction to the pool if we get here // Try to use only inputs with the same number of rounds starting from lowest number of rounds possible - for(int i = 0; i < nDarksendRounds; i++) { - strError = pwalletMain->PrepareDarksendDenominate(i, i+1); - LogPrintf("DoAutomaticDenominating : Running Darksend denominate for %d rounds. Return '%s'\n", i, strError); + for(int i = 0; i < nObfuscateRounds; i++) { + strError = pwalletMain->PrepareObfuscateDenominate(i, i+1); + LogPrintf("DoAutomaticDenominating : Running Obfuscate denominate for %d rounds. Return '%s'\n", i, strError); if(strError == "") return true; } // We failed? That's strange but let's just make final attempt and try to mix everything - strError = pwalletMain->PrepareDarksendDenominate(0, nDarksendRounds); - LogPrintf("DoAutomaticDenominating : Running Darksend denominate for all rounds. Return '%s'\n", strError); + strError = pwalletMain->PrepareObfuscateDenominate(0, nObfuscateRounds); + LogPrintf("DoAutomaticDenominating : Running Obfuscate denominate for all rounds. Return '%s'\n", strError); if(strError == "") return true; // Should never actually get here but just in case @@ -1648,12 +1648,12 @@ bool CDarksendPool::PrepareDarksendDenominate() return false; } -bool CDarksendPool::SendRandomPaymentToSelf() +bool CObfuscatePool::SendRandomPaymentToSelf() { int64_t nBalance = pwalletMain->GetBalance(); int64_t nPayment = (nBalance*0.35) + (rand() % nBalance); - if(nPayment > nBalance) nPayment = nBalance-(0.1*COIN); + if(nPayment > nBalance) nPayment = nBalance-(1*COIN); // make our change address CReserveKey reservekey(pwalletMain); @@ -1686,7 +1686,7 @@ bool CDarksendPool::SendRandomPaymentToSelf() } // Split up large inputs or create fee sized inputs -bool CDarksendPool::MakeCollateralAmounts() +bool CObfuscatePool::MakeCollateralAmounts() { CWalletTx wtx; int64_t nFeeRet = 0; @@ -1708,15 +1708,15 @@ bool CDarksendPool::MakeCollateralAmounts() // try to use non-denominated and not mn-like funds bool success = pwalletMain->CreateTransaction(vecSend, wtx, reservekeyChange, - nFeeRet, strFail, coinControl, ONLY_NONDENOMINATED_NOT1000IFMN); + nFeeRet, strFail, coinControl, ONLY_NONDENOMINATED_NOT10000IFMN); if(!success){ // if we failed (most likeky not enough funds), try to use all coins instead - // MN-like funds should not be touched in any case and we can't mix denominated without collaterals anyway - LogPrintf("MakeCollateralAmounts: ONLY_NONDENOMINATED_NOT1000IFMN Error - %s\n", strFail); + LogPrintf("MakeCollateralAmounts: ONLY_NONDENOMINATED_NOT10000IFMN Error - %s\n", strFail); success = pwalletMain->CreateTransaction(vecSend, wtx, reservekeyChange, - nFeeRet, strFail, coinControl, ONLY_NOT1000IFMN); + nFeeRet, strFail, coinControl, ONLY_NOT10000IFMN); if(!success){ - LogPrintf("MakeCollateralAmounts: ONLY_NOT1000IFMN Error - %s\n", strFail); + LogPrintf("MakeCollateralAmounts: ONLY_NOT10000IFMN Error - %s\n", strFail); reservekeyCollateral.ReturnKey(); return false; } @@ -1738,7 +1738,7 @@ bool CDarksendPool::MakeCollateralAmounts() } // Create denominations -bool CDarksendPool::CreateDenominated(int64_t nTotalValue) +bool CObfuscatePool::CreateDenominated(int64_t nTotalValue) { CWalletTx wtx; int64_t nFeeRet = 0; @@ -1794,7 +1794,7 @@ bool CDarksendPool::CreateDenominated(int64_t nTotalValue) CCoinControl *coinControl=NULL; bool success = pwalletMain->CreateTransaction(vecSend, wtx, reservekeyChange, - nFeeRet, strFail, coinControl, ONLY_NONDENOMINATED_NOT1000IFMN); + nFeeRet, strFail, coinControl, ONLY_NONDENOMINATED_NOT10000IFMN); if(!success){ LogPrintf("CreateDenominated: Error - %s\n", strFail); // TODO: return reservekeyDenom here @@ -1816,11 +1816,11 @@ bool CDarksendPool::CreateDenominated(int64_t nTotalValue) return true; } -bool CDarksendPool::IsCompatibleWithEntries(std::vector& vout) +bool CObfuscatePool::IsCompatibleWithEntries(std::vector& vout) { if(GetDenominations(vout) == 0) return false; - BOOST_FOREACH(const CDarkSendEntry v, entries) { + BOOST_FOREACH(const CObfuscateEntry v, entries) { LogPrintf(" IsCompatibleWithEntries %d %d\n", GetDenominations(vout), GetDenominations(v.vout)); /* BOOST_FOREACH(CTxOut o1, vout) @@ -1835,14 +1835,14 @@ bool CDarksendPool::IsCompatibleWithEntries(std::vector& vout) return true; } -bool CDarksendPool::IsCompatibleWithSession(int64_t nDenom, CTransaction txCollateral, int& errorID) +bool CObfuscatePool::IsCompatibleWithSession(int64_t nDenom, CTransaction txCollateral, int& errorID) { if(nDenom == 0) return false; - LogPrintf("CDarksendPool::IsCompatibleWithSession - sessionDenom %d sessionUsers %d\n", sessionDenom, sessionUsers); + LogPrintf("CObfuscatePool::IsCompatibleWithSession - sessionDenom %d sessionUsers %d\n", sessionDenom, sessionUsers); if (!unitTest && !IsCollateralValid(txCollateral)){ - LogPrint("darksend", "CDarksendPool::IsCompatibleWithSession - collateral not valid!\n"); + LogPrint("obfuscate", "CObfuscatePool::IsCompatibleWithSession - collateral not valid!\n"); errorID = ERR_INVALID_COLLATERAL; return false; } @@ -1857,7 +1857,7 @@ bool CDarksendPool::IsCompatibleWithSession(int64_t nDenom, CTransaction txColla if(!unitTest){ //broadcast that I'm accepting entries, only if it's the first entry through - CDarksendQueue dsq; + CObfuscateQueue dsq; dsq.nDenom = nDenom; dsq.vin = activeMasternode.vin; dsq.time = GetTime(); @@ -1873,7 +1873,7 @@ bool CDarksendPool::IsCompatibleWithSession(int64_t nDenom, CTransaction txColla if((state != POOL_STATUS_ACCEPTING_ENTRIES && state != POOL_STATUS_QUEUE) || sessionUsers >= GetMaxPoolTransactions()){ if((state != POOL_STATUS_ACCEPTING_ENTRIES && state != POOL_STATUS_QUEUE)) errorID = ERR_MODE; if(sessionUsers >= GetMaxPoolTransactions()) errorID = ERR_QUEUE_FULL; - LogPrintf("CDarksendPool::IsCompatibleWithSession - incompatible mode, return false %d %d\n", state != POOL_STATUS_ACCEPTING_ENTRIES, sessionUsers >= GetMaxPoolTransactions()); + LogPrintf("CObfuscatePool::IsCompatibleWithSession - incompatible mode, return false %d %d\n", state != POOL_STATUS_ACCEPTING_ENTRIES, sessionUsers >= GetMaxPoolTransactions()); return false; } @@ -1882,7 +1882,7 @@ bool CDarksendPool::IsCompatibleWithSession(int64_t nDenom, CTransaction txColla return false; } - LogPrintf("CDarkSendPool::IsCompatibleWithSession - compatible\n"); + LogPrintf("CObfuscatePool::IsCompatibleWithSession - compatible\n"); sessionUsers++; lastTimeChanged = GetTimeMillis(); @@ -1892,13 +1892,13 @@ bool CDarksendPool::IsCompatibleWithSession(int64_t nDenom, CTransaction txColla } //create a nice string to show the denominations -void CDarksendPool::GetDenominationsToString(int nDenom, std::string& strDenom){ +void CObfuscatePool::GetDenominationsToString(int nDenom, std::string& strDenom){ // Function returns as follows: // - // bit 0 - 100DRK+1 ( bit on if present ) - // bit 1 - 10DRK+1 - // bit 2 - 1DRK+1 - // bit 3 - .1DRK+1 + // bit 0 - 100DNET+1 ( bit on if present ) + // bit 1 - 10DNET+1 + // bit 2 - 1DNET+1 + // bit 3 - .1DNET+1 // bit 3 - non-denom @@ -1925,7 +1925,7 @@ void CDarksendPool::GetDenominationsToString(int nDenom, std::string& strDenom){ } } -int CDarksendPool::GetDenominations(const std::vector& vout){ +int CObfuscatePool::GetDenominations(const std::vector& vout){ std::vector vout2; BOOST_FOREACH(CTxDSOut out, vout) @@ -1935,7 +1935,7 @@ int CDarksendPool::GetDenominations(const std::vector& vout){ } // return a bitshifted integer representing the denominations in this list -int CDarksendPool::GetDenominations(const std::vector& vout, bool fSingleRandomDenom){ +int CObfuscatePool::GetDenominations(const std::vector& vout, bool fSingleRandomDenom){ std::vector > denomUsed; // make a list of denominations, with zero uses @@ -1966,16 +1966,16 @@ int CDarksendPool::GetDenominations(const std::vector& vout, bool fSingl // Function returns as follows: // - // bit 0 - 100DRK+1 ( bit on if present ) - // bit 1 - 10DRK+1 - // bit 2 - 1DRK+1 - // bit 3 - .1DRK+1 + // bit 0 - 100DNET+1 ( bit on if present ) + // bit 1 - 10DNET+1 + // bit 2 - 1DNET+1 + // bit 3 - .1DNET+1 return denom; } -int CDarksendPool::GetDenominationsByAmounts(std::vector& vecAmount){ +int CObfuscatePool::GetDenominationsByAmounts(std::vector& vecAmount){ CScript e = CScript(); std::vector vout1; @@ -1988,7 +1988,7 @@ int CDarksendPool::GetDenominationsByAmounts(std::vector& vecAmount){ return GetDenominations(vout1, true); } -int CDarksendPool::GetDenominationsByAmount(int64_t nAmount, int nDenomTarget){ +int CObfuscatePool::GetDenominationsByAmount(int64_t nAmount, int nDenomTarget){ CScript e = CScript(); int64_t nValueLeft = nAmount; @@ -1998,10 +1998,11 @@ int CDarksendPool::GetDenominationsByAmount(int64_t nAmount, int nDenomTarget){ BOOST_REVERSE_FOREACH(int64_t v, darkSendDenominations){ if(nDenomTarget != 0){ bool fAccepted = false; - if((nDenomTarget & (1 << 0)) && v == ((100*COIN)+100000)) {fAccepted = true;} - else if((nDenomTarget & (1 << 1)) && v == ((10*COIN) +10000)) {fAccepted = true;} - else if((nDenomTarget & (1 << 2)) && v == ((1*COIN) +1000)) {fAccepted = true;} - else if((nDenomTarget & (1 << 3)) && v == ((.1*COIN) +100)) {fAccepted = true;} + if((nDenomTarget & (1 << 0)) && v == ((100*COIN)+1000000)) {fAccepted = true;} + else if((nDenomTarget & (1 << 1)) && v == ((10*COIN) +100000)) {fAccepted = true;} + else if((nDenomTarget & (1 << 2)) && v == ((10*COIN) +10000)) {fAccepted = true;} + else if((nDenomTarget & (1 << 3)) && v == ((1*COIN) +1000)) {fAccepted = true;} + else if((nDenomTarget & (1 << 4)) && v == ((.1*COIN) +100)) {fAccepted = true;} if(!fAccepted) continue; } @@ -2020,7 +2021,7 @@ int CDarksendPool::GetDenominationsByAmount(int64_t nAmount, int nDenomTarget){ return GetDenominations(vout1); } -std::string CDarksendPool::GetMessageByID(int messageID) { +std::string CObfuscatePool::GetMessageByID(int messageID) { switch (messageID) { case ERR_ALREADY_HAVE: return _("Already have that input."); case ERR_DENOM: return _("No matching denominations found for mixing."); @@ -2031,13 +2032,13 @@ std::string CDarksendPool::GetMessageByID(int messageID) { case ERR_INVALID_INPUT: return _("Input is not valid."); case ERR_INVALID_SCRIPT: return _("Invalid script detected."); case ERR_INVALID_TX: return _("Transaction not valid."); - case ERR_MAXIMUM: return _("Value more than Darksend pool maximum allows."); + case ERR_MAXIMUM: return _("Value more than Obfuscate pool maximum allows."); case ERR_MN_LIST: return _("Not in the Masternode list."); case ERR_MODE: return _("Incompatible mode."); case ERR_NON_STANDARD_PUBKEY: return _("Non-standard public key detected."); case ERR_NOT_A_MN: return _("This is not a Masternode."); case ERR_QUEUE_FULL: return _("Masternode queue is full."); - case ERR_RECENT: return _("Last Darksend was too recent."); + case ERR_RECENT: return _("Last Obfuscate was too recent."); case ERR_SESSION: return _("Session not complete!"); case ERR_MISSING_TX: return _("Missing input transaction information."); case ERR_VERSION: return _("Incompatible version."); @@ -2049,7 +2050,7 @@ std::string CDarksendPool::GetMessageByID(int messageID) { } } -bool CDarkSendSigner::IsVinAssociatedWithPubkey(CTxIn& vin, CPubKey& pubkey){ +bool CObfuscateSigner::IsVinAssociatedWithPubkey(CTxIn& vin, CPubKey& pubkey){ CScript payee2; payee2 = GetScriptForDestination(pubkey.GetID()); @@ -2057,7 +2058,7 @@ bool CDarkSendSigner::IsVinAssociatedWithPubkey(CTxIn& vin, CPubKey& pubkey){ uint256 hash; if(GetTransaction(vin.prevout.hash, txVin, hash, true)){ BOOST_FOREACH(CTxOut out, txVin.vout){ - if(out.nValue == 1000*COIN){ + if(out.nValue == 10000*COIN){ if(out.scriptPubKey == payee2) return true; } } @@ -2066,7 +2067,7 @@ bool CDarkSendSigner::IsVinAssociatedWithPubkey(CTxIn& vin, CPubKey& pubkey){ return false; } -bool CDarkSendSigner::SetKey(std::string strSecret, std::string& errorMessage, CKey& key, CPubKey& pubkey){ +bool CObfuscateSigner::SetKey(std::string strSecret, std::string& errorMessage, CKey& key, CPubKey& pubkey){ CBitcoinSecret vchSecret; bool fGood = vchSecret.SetString(strSecret); @@ -2081,7 +2082,7 @@ bool CDarkSendSigner::SetKey(std::string strSecret, std::string& errorMessage, C return true; } -bool CDarkSendSigner::SignMessage(std::string strMessage, std::string& errorMessage, vector& vchSig, CKey key) +bool CObfuscateSigner::SignMessage(std::string strMessage, std::string& errorMessage, vector& vchSig, CKey key) { CHashWriter ss(SER_GETHASH, 0); ss << strMessageMagic; @@ -2095,7 +2096,7 @@ bool CDarkSendSigner::SignMessage(std::string strMessage, std::string& errorMess return true; } -bool CDarkSendSigner::VerifyMessage(CPubKey pubkey, vector& vchSig, std::string strMessage, std::string& errorMessage) +bool CObfuscateSigner::VerifyMessage(CPubKey pubkey, vector& vchSig, std::string strMessage, std::string& errorMessage) { CHashWriter ss(SER_GETHASH, 0); ss << strMessageMagic; @@ -2108,12 +2109,12 @@ bool CDarkSendSigner::VerifyMessage(CPubKey pubkey, vector& vchSi } if (fDebug && pubkey2.GetID() != pubkey.GetID()) - LogPrintf("CDarkSendSigner::VerifyMessage -- keys don't match: %s %s\n", pubkey2.GetID().ToString(), pubkey.GetID().ToString()); + LogPrintf("CObfuscateSigner::VerifyMessage -- keys don't match: %s %s\n", pubkey2.GetID().ToString(), pubkey.GetID().ToString()); return (pubkey2.GetID() == pubkey.GetID()); } -bool CDarksendQueue::Sign() +bool CObfuscateQueue::Sign() { if(!fMasterNode) return false; @@ -2125,24 +2126,24 @@ bool CDarksendQueue::Sign() if(!darkSendSigner.SetKey(strMasterNodePrivKey, errorMessage, key2, pubkey2)) { - LogPrintf("CDarksendQueue():Relay - ERROR: Invalid Masternodeprivkey: '%s'\n", errorMessage); + LogPrintf("CObfuscateQueue():Relay - ERROR: Invalid Masternodeprivkey: '%s'\n", errorMessage); return false; } if(!darkSendSigner.SignMessage(strMessage, errorMessage, vchSig, key2)) { - LogPrintf("CDarksendQueue():Relay - Sign message failed"); + LogPrintf("CObfuscateQueue():Relay - Sign message failed"); return false; } if(!darkSendSigner.VerifyMessage(pubkey2, vchSig, strMessage, errorMessage)) { - LogPrintf("CDarksendQueue():Relay - Verify message failed"); + LogPrintf("CObfuscateQueue():Relay - Verify message failed"); return false; } return true; } -bool CDarksendQueue::Relay() +bool CObfuscateQueue::Relay() { LOCK(cs_vNodes); @@ -2154,7 +2155,7 @@ bool CDarksendQueue::Relay() return true; } -bool CDarksendQueue::CheckSignature() +bool CObfuscateQueue::CheckSignature() { CMasternode* pmn = mnodeman.Find(vin); @@ -2164,7 +2165,7 @@ bool CDarksendQueue::CheckSignature() std::string errorMessage = ""; if(!darkSendSigner.VerifyMessage(pmn->pubkey2, vchSig, strMessage, errorMessage)){ - return error("CDarksendQueue::CheckSignature() - Got bad Masternode address signature %s \n", vin.ToString().c_str()); + return error("CObfuscateQueue::CheckSignature() - Got bad Masternode address signature %s \n", vin.ToString().c_str()); } return true; @@ -2174,7 +2175,7 @@ bool CDarksendQueue::CheckSignature() } -void CDarksendPool::RelayFinalTransaction(const int sessionID, const CTransaction& txNew) +void CObfuscatePool::RelayFinalTransaction(const int sessionID, const CTransaction& txNew) { LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) @@ -2183,7 +2184,7 @@ void CDarksendPool::RelayFinalTransaction(const int sessionID, const CTransactio } } -void CDarksendPool::RelayIn(const std::vector& vin, const int64_t& nAmount, const CTransaction& txCollateral, const std::vector& vout) +void CObfuscatePool::RelayIn(const std::vector& vin, const int64_t& nAmount, const CTransaction& txCollateral, const std::vector& vout) { if(!pSubmittedToMasternode) return; @@ -2203,14 +2204,14 @@ void CDarksendPool::RelayIn(const std::vector& vin, const int64_t& nAmo } } -void CDarksendPool::RelayStatus(const int sessionID, const int newState, const int newEntriesCount, const int newAccepted, const int errorID) +void CObfuscatePool::RelayStatus(const int sessionID, const int newState, const int newEntriesCount, const int newAccepted, const int errorID) { LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) pnode->PushMessage("dssu", sessionID, newState, newEntriesCount, newAccepted, errorID); } -void CDarksendPool::RelayCompletedTransaction(const int sessionID, const bool error, const int errorID) +void CObfuscatePool::RelayCompletedTransaction(const int sessionID, const bool error, const int errorID) { LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) @@ -2218,19 +2219,19 @@ void CDarksendPool::RelayCompletedTransaction(const int sessionID, const bool er } //TODO: Rename/move to core -void ThreadCheckDarkSendPool() +void ThreadCheckObfuscatePool() { - if(fLiteMode) return; //disable all Darksend/Masternode related functionality + if(fLiteMode) return; //disable all Obfuscate/Masternode related functionality // Make this thread recognisable as the wallet flushing thread - RenameThread("dash-darksend"); + RenameThread("darknet-obfuscate"); unsigned int c = 0; while (true) { MilliSleep(1000); - //LogPrintf("ThreadCheckDarkSendPool::check timeout\n"); + //LogPrintf("ThreadCheckObfuscatePool::check timeout\n"); // try to sync from all available nodes, one step at a time masternodeSync.Process(); diff --git a/src/darksend.h b/src/obfuscate.h similarity index 83% rename from src/darksend.h rename to src/obfuscate.h index f0a439e139934..962fa29cb0868 100644 --- a/src/darksend.h +++ b/src/obfuscate.h @@ -10,16 +10,16 @@ #include "activemasternode.h" #include "masternodeman.h" #include "masternode-payments.h" -#include "darksend-relay.h" +#include "obfuscate-relay.h" #include "masternode-sync.h" class CTxIn; -class CDarksendPool; -class CDarkSendSigner; +class CObfuscatePool; +class CObfuscateSigner; class CMasterNodeVote; class CBitcoinAddress; -class CDarksendQueue; -class CDarksendBroadcastTx; +class CObfuscateQueue; +class CObfuscateBroadcastTx; class CActiveMasternode; // pool states for mixing @@ -46,17 +46,17 @@ class CActiveMasternode; #define DARKSEND_RELAY_OUT 2 #define DARKSEND_RELAY_SIG 3 -static const int64_t DARKSEND_COLLATERAL = (0.01*COIN); -static const int64_t DARKSEND_POOL_MAX = (999.99*COIN); +static const int64_t DARKSEND_COLLATERAL = (0.1*COIN); +static const int64_t DARKSEND_POOL_MAX = (9999.99*COIN); -extern CDarksendPool darkSendPool; -extern CDarkSendSigner darkSendSigner; -extern std::vector vecDarksendQueue; +extern CObfuscatePool darkSendPool; +extern CObfuscateSigner darkSendSigner; +extern std::vector vecObfuscateQueue; extern std::string strMasterNodePrivKey; -extern map mapDarksendBroadcastTxes; +extern map mapObfuscateBroadcastTxes; extern CActiveMasternode activeMasternode; -/** Holds an Darksend input +/** Holds an Obfuscate input */ class CTxDSIn : public CTxIn { @@ -75,7 +75,7 @@ class CTxDSIn : public CTxIn } }; -/** Holds an Darksend output +/** Holds an Obfuscate output */ class CTxDSOut : public CTxOut { @@ -91,8 +91,8 @@ class CTxDSOut : public CTxOut } }; -// A clients transaction in the darksend pool -class CDarkSendEntry +// A clients transaction in the obfuscate pool +class CObfuscateEntry { public: bool isSet; @@ -103,14 +103,14 @@ class CDarkSendEntry CTransaction txSupporting; int64_t addedTime; // time in UTC milliseconds - CDarkSendEntry() + CObfuscateEntry() { isSet = false; collateral = CTransaction(); amount = 0; } - /// Add entries to use for Darksend + /// Add entries to use for Obfuscate bool Add(const std::vector vinIn, int64_t amountIn, const CTransaction collateralIn, const std::vector voutIn) { if(isSet){return false;} @@ -153,9 +153,9 @@ class CDarkSendEntry /** - * A currently inprogress Darksend merge and denomination information + * A currently inprogress Obfuscate merge and denomination information */ -class CDarksendQueue +class CObfuscateQueue { public: CTxIn vin; @@ -164,7 +164,7 @@ class CDarksendQueue bool ready; //ready for submit std::vector vchSig; - CDarksendQueue() + CObfuscateQueue() { nDenom = 0; vin = CTxIn(); @@ -207,7 +207,7 @@ class CDarksendQueue return false; } - /** Sign this Darksend transaction + /** Sign this Obfuscate transaction * \return true if all conditions are met: * 1) we have an active Masternode, * 2) we have a valid Masternode private key, @@ -218,7 +218,7 @@ class CDarksendQueue bool Relay(); - /// Is this Darksend expired? + /// Is this Obfuscate expired? bool IsExpired() { return (GetTime() - time) > DARKSEND_QUEUE_TIMEOUT;// 120 seconds @@ -229,9 +229,9 @@ class CDarksendQueue }; -/** Helper class to store Darksend transaction (tx) information. +/** Helper class to store Obfuscate transaction (tx) information. */ -class CDarksendBroadcastTx +class CObfuscateBroadcastTx { public: CTransaction tx; @@ -242,10 +242,10 @@ class CDarksendBroadcastTx /** Helper object for signing and checking signatures */ -class CDarkSendSigner +class CObfuscateSigner { public: - /// Is the inputs associated with this public key? (and there is 1000 DASH - checking if valid masternode) + /// Is the inputs associated with this public key? (and there is 1000 DNET - checking if valid masternode) bool IsVinAssociatedWithPubkey(CTxIn& vin, CPubKey& pubkey); /// Set the private/public key values, returns true if successful bool SetKey(std::string strSecret, std::string& errorMessage, CKey& key, CPubKey& pubkey); @@ -255,14 +255,14 @@ class CDarkSendSigner bool VerifyMessage(CPubKey pubkey, std::vector& vchSig, std::string strMessage, std::string& errorMessage); }; -/** Used to keep track of current status of Darksend pool +/** Used to keep track of current status of Obfuscate pool */ -class CDarksendPool +class CObfuscatePool { private: - mutable CCriticalSection cs_darksend; + mutable CCriticalSection cs_obfuscate; - std::vector entries; // Masternode/clients entries + std::vector entries; // Masternode/clients entries CMutableTransaction finalTransaction; // the finalized transaction ready for signing int64_t lastTimeChanged; // last time the 'state' changed, in UTC milliseconds @@ -326,9 +326,9 @@ class CDarksendPool int sessionDenom; //Users must submit an denom matching this int cachedNumBlocks; //used for the overview screen - CDarksendPool() + CObfuscatePool() { - /* Darksend uses collateral addresses to trust parties entering the pool + /* Obfuscate uses collateral addresses to trust parties entering the pool to behave themselves. If they don't it takes their money. */ cachedLastSuccess = 0; @@ -341,25 +341,25 @@ class CDarksendPool SetNull(); } - /** Process a Darksend message using the Darksend protocol + /** Process a Obfuscate message using the Obfuscate protocol * \param pfrom * \param strCommand lower case command string; valid values are: * Command | Description * -------- | ----------------- - * dsa | Darksend Acceptable - * dsc | Darksend Complete - * dsf | Darksend Final tx - * dsi | Darksend vIn - * dsq | Darksend Queue - * dss | Darksend Signal Final Tx - * dssu | Darksend status update - * dssub | Darksend Subscribe To + * dsa | Obfuscate Acceptable + * dsc | Obfuscate Complete + * dsf | Obfuscate Final tx + * dsi | Obfuscate vIn + * dsq | Obfuscate Queue + * dss | Obfuscate Signal Final Tx + * dssu | Obfuscate status update + * dssub | Obfuscate Subscribe To * \param vRecv */ - void ProcessMessageDarksend(CNode* pfrom, std::string& strCommand, CDataStream& vRecv); + void ProcessMessageObfuscate(CNode* pfrom, std::string& strCommand, CDataStream& vRecv); void InitCollateralAddress(){ - SetCollateralAddress(Params().DarksendPoolDummyAddress()); + SetCollateralAddress(Params().ObfuscatePoolDummyAddress()); } void SetMinBlockSpacing(int minBlockSpacingIn){ @@ -405,11 +405,11 @@ class CDarksendPool void UpdateState(unsigned int newState) { if (fMasterNode && (newState == POOL_STATUS_ERROR || newState == POOL_STATUS_SUCCESS)){ - LogPrint("darksend", "CDarksendPool::UpdateState() - Can't set state to ERROR or SUCCESS as a Masternode. \n"); + LogPrint("obfuscate", "CObfuscatePool::UpdateState() - Can't set state to ERROR or SUCCESS as a Masternode. \n"); return; } - LogPrintf("CDarksendPool::UpdateState() == %d | %d \n", state, newState); + LogPrintf("CObfuscatePool::UpdateState() == %d | %d \n", state, newState); if(state != newState){ lastTimeChanged = GetTimeMillis(); if(fMasterNode) { @@ -436,11 +436,11 @@ class CDarksendPool /// Is this amount compatible with other client in the pool? bool IsCompatibleWithSession(int64_t nAmount, CTransaction txCollateral, int &errorID); - /// Passively run Darksend in the background according to the configuration in settings (only for QT) + /// Passively run Obfuscate in the background according to the configuration in settings (only for QT) bool DoAutomaticDenominating(bool fDryRun=false); - bool PrepareDarksendDenominate(); + bool PrepareObfuscateDenominate(); - /// Check for process in Darksend + /// Check for process in Obfuscate void Check(); void CheckFinalTransaction(); /// Charge fees to bad actors (Charge clients a fee if they're abusive) @@ -460,8 +460,8 @@ class CDarksendPool /// Check that all inputs are signed. (Are all inputs signed?) bool SignaturesComplete(); /// As a client, send a transaction to a Masternode to start the denomination process - void SendDarksendDenominate(std::vector& vin, std::vector& vout, int64_t amount); - /// Get Masternode updates about the progress of Darksend + void SendObfuscateDenominate(std::vector& vin, std::vector& vout, int64_t amount); + /// Get Masternode updates about the progress of Obfuscate bool StatusUpdate(int newState, int newEntriesCount, int newAccepted, int &errorID, int newSessionID=0); /// As a client, check and sign the final transaction @@ -486,14 +486,14 @@ class CDarksendPool void GetDenominationsToString(int nDenom, std::string& strDenom); - /// Get the denominations for a specific amount of dash. + /// Get the denominations for a specific amount of darknet. int GetDenominationsByAmount(int64_t nAmount, int nDenomTarget=0); // is not used anymore? int GetDenominationsByAmounts(std::vector& vecAmount); std::string GetMessageByID(int messageID); // - // Relay Darksend Messages + // Relay Obfuscate Messages // void RelayFinalTransaction(const int sessionID, const CTransaction& txNew); @@ -504,6 +504,6 @@ class CDarksendPool void RelayCompletedTransaction(const int sessionID, const bool error, const int errorID); }; -void ThreadCheckDarkSendPool(); +void ThreadCheckObfuscatePool(); #endif diff --git a/src/pow.cpp b/src/pow.cpp index ade2ec915c8d0..51d90203b2e90 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -13,74 +13,11 @@ #include -unsigned int static KimotoGravityWell(const CBlockIndex* pindexLast) { - const CBlockIndex *BlockLastSolved = pindexLast; - const CBlockIndex *BlockReading = pindexLast; - uint64_t PastBlocksMass = 0; - int64_t PastRateActualSeconds = 0; - int64_t PastRateTargetSeconds = 0; - double PastRateAdjustmentRatio = double(1); - uint256 PastDifficultyAverage; - uint256 PastDifficultyAveragePrev; - double EventHorizonDeviation; - double EventHorizonDeviationFast; - double EventHorizonDeviationSlow; - - uint64_t pastSecondsMin = Params().TargetTimespan() * 0.025; - uint64_t pastSecondsMax = Params().TargetTimespan() * 7; - uint64_t PastBlocksMin = pastSecondsMin / Params().TargetSpacing(); - uint64_t PastBlocksMax = pastSecondsMax / Params().TargetSpacing(); - - if (BlockLastSolved == NULL || BlockLastSolved->nHeight == 0 || (uint64_t)BlockLastSolved->nHeight < PastBlocksMin) { return Params().ProofOfWorkLimit().GetCompact(); } - - for (unsigned int i = 1; BlockReading && BlockReading->nHeight > 0; i++) { - if (PastBlocksMax > 0 && i > PastBlocksMax) { break; } - PastBlocksMass++; - - PastDifficultyAverage.SetCompact(BlockReading->nBits); - if (i > 1) { - // handle negative uint256 - if(PastDifficultyAverage >= PastDifficultyAveragePrev) - PastDifficultyAverage = ((PastDifficultyAverage - PastDifficultyAveragePrev) / i) + PastDifficultyAveragePrev; - else - PastDifficultyAverage = PastDifficultyAveragePrev - ((PastDifficultyAveragePrev - PastDifficultyAverage) / i); - } - PastDifficultyAveragePrev = PastDifficultyAverage; - - PastRateActualSeconds = BlockLastSolved->GetBlockTime() - BlockReading->GetBlockTime(); - PastRateTargetSeconds = Params().TargetSpacing() * PastBlocksMass; - PastRateAdjustmentRatio = double(1); - if (PastRateActualSeconds < 0) { PastRateActualSeconds = 0; } - if (PastRateActualSeconds != 0 && PastRateTargetSeconds != 0) { - PastRateAdjustmentRatio = double(PastRateTargetSeconds) / double(PastRateActualSeconds); - } - EventHorizonDeviation = 1 + (0.7084 * pow((double(PastBlocksMass)/double(28.2)), -1.228)); - EventHorizonDeviationFast = EventHorizonDeviation; - EventHorizonDeviationSlow = 1 / EventHorizonDeviation; - if (PastBlocksMass >= PastBlocksMin) { - if ((PastRateAdjustmentRatio <= EventHorizonDeviationSlow) || (PastRateAdjustmentRatio >= EventHorizonDeviationFast)) - { assert(BlockReading); break; } - } - if (BlockReading->pprev == NULL) { assert(BlockReading); break; } - BlockReading = BlockReading->pprev; - } - - uint256 bnNew(PastDifficultyAverage); - if (PastRateActualSeconds != 0 && PastRateTargetSeconds != 0) { - bnNew *= PastRateActualSeconds; - bnNew /= PastRateTargetSeconds; - } - - if (bnNew > Params().ProofOfWorkLimit()) { - bnNew = Params().ProofOfWorkLimit(); - } - - return bnNew.GetCompact(); -} +unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock) +{ -unsigned int static DarkGravityWave(const CBlockIndex* pindexLast) { - /* current difficulty formula, dash - DarkGravity v3, written by Evan Duffield - evan@dashpay.io */ + /* current difficulty formula, darknet - DarkGravity v3, written by Evan Duffield - evan@dashpay.io */ const CBlockIndex *BlockLastSolved = pindexLast; const CBlockIndex *BlockReading = pindexLast; int64_t nActualTimespan = 0; @@ -133,100 +70,7 @@ unsigned int static DarkGravityWave(const CBlockIndex* pindexLast) { } return bnNew.GetCompact(); -} - -unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock) -{ - unsigned int retarget = DIFF_DGW; - - if (Params().NetworkID() != CBaseChainParams::TESTNET) { - if (pindexLast->nHeight + 1 >= 34140) retarget = DIFF_DGW; - else if (pindexLast->nHeight + 1 >= 15200) retarget = DIFF_KGW; - else retarget = DIFF_BTC; - } else { - if (pindexLast->nHeight + 1 >= 2000) retarget = DIFF_DGW; - else retarget = DIFF_BTC; - } - - // Default Bitcoin style retargeting - if (retarget == DIFF_BTC) - { - unsigned int nProofOfWorkLimit = Params().ProofOfWorkLimit().GetCompact(); - - // Genesis block - if (pindexLast == NULL) - return nProofOfWorkLimit; - - // Only change once per interval - if ((pindexLast->nHeight+1) % Params().Interval() != 0) - { - if (Params().AllowMinDifficultyBlocks()) - { - // Special difficulty rule for testnet: - // If the new block's timestamp is more than 2* 2.5 minutes - // then allow mining of a min-difficulty block. - if (pblock->GetBlockTime() > pindexLast->GetBlockTime() + Params().TargetSpacing()*2) - return nProofOfWorkLimit; - else - { - // Return the last non-special-min-difficulty-rules-block - const CBlockIndex* pindex = pindexLast; - while (pindex->pprev && pindex->nHeight % Params().Interval() != 0 && pindex->nBits == nProofOfWorkLimit) - pindex = pindex->pprev; - return pindex->nBits; - } - } - return pindexLast->nBits; - } - - // Go back by what we want to be 1 day worth of blocks - const CBlockIndex* pindexFirst = pindexLast; - for (int i = 0; pindexFirst && i < Params().Interval()-1; i++) - pindexFirst = pindexFirst->pprev; - assert(pindexFirst); - - // Limit adjustment step - int64_t nActualTimespan = pindexLast->GetBlockTime() - pindexFirst->GetBlockTime(); - LogPrintf(" nActualTimespan = %d before bounds\n", nActualTimespan); - if (nActualTimespan < Params().TargetTimespan()/4) - nActualTimespan = Params().TargetTimespan()/4; - if (nActualTimespan > Params().TargetTimespan()*4) - nActualTimespan = Params().TargetTimespan()*4; - - // Retarget - uint256 bnNew; - uint256 bnOld; - bnNew.SetCompact(pindexLast->nBits); - bnOld = bnNew; - bnNew *= nActualTimespan; - bnNew /= Params().TargetTimespan(); - - if (bnNew > Params().ProofOfWorkLimit()) - bnNew = Params().ProofOfWorkLimit(); - - /// debug print - LogPrintf("GetNextWorkRequired RETARGET at %d\n", pindexLast->nHeight + 1); - LogPrintf("Params().TargetTimespan() = %d nActualTimespan = %d\n", Params().TargetTimespan(), nActualTimespan); - LogPrintf("Before: %08x %s\n", pindexLast->nBits, bnOld.ToString()); - LogPrintf("After: %08x %s\n", bnNew.GetCompact(), bnNew.ToString()); - - return bnNew.GetCompact(); - - } - - // Retarget using Kimoto Gravity Wave - else if (retarget == DIFF_KGW) - { - return KimotoGravityWell(pindexLast); - } - - // Retarget using Dark Gravity Wave 3 - else if (retarget == DIFF_DGW) - { - return DarkGravityWave(pindexLast); - } - return DarkGravityWave(pindexLast); } bool CheckProofOfWork(uint256 hash, unsigned int nBits) diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp index fa38cebf685c7..a43c035382224 100644 --- a/src/primitives/block.cpp +++ b/src/primitives/block.cpp @@ -8,10 +8,11 @@ #include "hash.h" #include "tinyformat.h" #include "utilstrencodings.h" +#include "util.h" uint256 CBlockHeader::GetHash() const { - return HashX11(BEGIN(nVersion), END(nNonce)); + return HashQuark(BEGIN(nVersion), END(nNonce)); } uint256 CBlock::BuildMerkleTree(bool* fMutated) const @@ -128,3 +129,9 @@ std::string CBlock::ToString() const s << "\n"; return s.str(); } + +void CBlock::print() const +{ + LogPrintf("%s", ToString()); +} + diff --git a/src/primitives/block.h b/src/primitives/block.h index 4b935f0073876..d106dc13c4291 100644 --- a/src/primitives/block.h +++ b/src/primitives/block.h @@ -132,6 +132,7 @@ class CBlock : public CBlockHeader std::vector GetMerkleBranch(int nIndex) const; static uint256 CheckMerkleBranch(uint256 hash, const std::vector& vMerkleBranch, int nIndex); std::string ToString() const; + void print() const; }; diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index bb4c429293be7..125168ce97866 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -1,10 +1,11 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #endif #include "addressbookpage.h" @@ -62,11 +63,11 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) : switch(tab) { case SendingTab: - ui->labelExplanation->setText(tr("These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.")); + ui->labelExplanation->setText(tr("These are your DarkNet addresses for sending payments. Always check the amount and the receiving address before sending coins.")); ui->deleteAddress->setVisible(true); break; case ReceivingTab: - ui->labelExplanation->setText(tr("These are your Dash addresses for receiving payments. It is recommended to use a new receiving address for each transaction.")); + ui->labelExplanation->setText(tr("These are your DarkNet addresses for receiving payments. It is recommended to use a new receiving address for each transaction.")); ui->deleteAddress->setVisible(false); break; } diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index 0a983de5a988b..7624ca1a9b5a7 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -113,7 +114,7 @@ void AskPassphraseDialog::accept() break; } QMessageBox::StandardButton retval = QMessageBox::question(this, tr("Confirm wallet encryption"), - tr("Warning: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR DASH!") + "

" + tr("Are you sure you wish to encrypt your wallet?"), + tr("Warning: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR DNET!") + "

" + tr("Are you sure you wish to encrypt your wallet?"), QMessageBox::Yes|QMessageBox::Cancel, QMessageBox::Cancel); if(retval == QMessageBox::Yes) @@ -124,9 +125,9 @@ void AskPassphraseDialog::accept() { QMessageBox::warning(this, tr("Wallet encrypted"), "" + - tr("Dash will close now to finish the encryption process. " + tr("DarkNet will close now to finish the encryption process. " "Remember that encrypting your wallet cannot fully protect " - "your dashs from being stolen by malware infecting your computer.") + + "your darknets from being stolen by malware infecting your computer.") + "

" + tr("IMPORTANT: Any previous backups you have made of your wallet file " "should be replaced with the newly generated, encrypted wallet file. " diff --git a/src/qt/bitcoinaddressvalidator.cpp b/src/qt/bitcoinaddressvalidator.cpp index 80c6ff115c9af..b3eab14f22c59 100644 --- a/src/qt/bitcoinaddressvalidator.cpp +++ b/src/qt/bitcoinaddressvalidator.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -89,7 +90,7 @@ BitcoinAddressCheckValidator::BitcoinAddressCheckValidator(QObject *parent) : QValidator::State BitcoinAddressCheckValidator::validate(QString &input, int &pos) const { Q_UNUSED(pos); - // Validate the passed Dash address + // Validate the passed DarkNet address CBitcoinAddress addr(input.toStdString()); if (addr.IsValid()) return QValidator::Acceptable; diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp index a16eb316259c4..4c10b09b2db02 100644 --- a/src/qt/bitcoinamountfield.cpp +++ b/src/qt/bitcoinamountfield.cpp @@ -24,7 +24,7 @@ class AmountSpinBox: public QAbstractSpinBox public: explicit AmountSpinBox(QWidget *parent): QAbstractSpinBox(parent), - currentUnit(BitcoinUnits::DASH), + currentUnit(BitcoinUnits::DNET), singleStep(100000) // satoshis { setAlignment(Qt::AlignRight); @@ -99,7 +99,7 @@ class AmountSpinBox: public QAbstractSpinBox const QFontMetrics fm(fontMetrics()); int h = lineEdit()->minimumSizeHint().height(); - int w = fm.width(BitcoinUnits::format(BitcoinUnits::DASH, BitcoinUnits::maxMoney(), false, BitcoinUnits::separatorAlways)); + int w = fm.width(BitcoinUnits::format(BitcoinUnits::DNET, BitcoinUnits::maxMoney(), false, BitcoinUnits::separatorAlways)); w += 2; // cursor blinking space QStyleOptionSpinBox opt; diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 754a6604236ac..25683da88f2da 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -104,7 +105,7 @@ BitcoinGUI::BitcoinGUI(const NetworkStyle *networkStyle, QWidget *parent) : GUIUtil::restoreWindowGeometry("nWindow", QSize(850, 550), this); - QString windowTitle = tr("Dash Core") + " - "; + QString windowTitle = tr("DarkNet Core") + " - "; #ifdef ENABLE_WALLET /* if compiled with wallet support, -disablewallet can still disable the wallet */ enableWallet = !GetBoolArg("-disablewallet", false); @@ -271,7 +272,7 @@ void BitcoinGUI::createActions(const NetworkStyle *networkStyle) tabGroup->addAction(overviewAction); sendCoinsAction = new QAction(QIcon(":/icons/send"), tr("&Send"), this); - sendCoinsAction->setStatusTip(tr("Send coins to a Dash address")); + sendCoinsAction->setStatusTip(tr("Send coins to a DarkNet address")); sendCoinsAction->setToolTip(sendCoinsAction->statusTip()); sendCoinsAction->setCheckable(true); #ifdef Q_OS_MAC @@ -282,7 +283,7 @@ void BitcoinGUI::createActions(const NetworkStyle *networkStyle) tabGroup->addAction(sendCoinsAction); receiveCoinsAction = new QAction(QIcon(":/icons/receiving_addresses"), tr("&Receive"), this); - receiveCoinsAction->setStatusTip(tr("Request payments (generates QR codes and dash: URIs)")); + receiveCoinsAction->setStatusTip(tr("Request payments (generates QR codes and darknet: URIs)")); receiveCoinsAction->setToolTip(receiveCoinsAction->statusTip()); receiveCoinsAction->setCheckable(true); #ifdef Q_OS_MAC @@ -320,8 +321,8 @@ void BitcoinGUI::createActions(const NetworkStyle *networkStyle) quitAction->setStatusTip(tr("Quit application")); quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q)); quitAction->setMenuRole(QAction::QuitRole); - aboutAction = new QAction(networkStyle->getAppIcon(), tr("&About Dash Core"), this); - aboutAction->setStatusTip(tr("Show information about Dash Core")); + aboutAction = new QAction(networkStyle->getAppIcon(), tr("&About DarkNet Core"), this); + aboutAction->setStatusTip(tr("Show information about DarkNet Core")); aboutAction->setMenuRole(QAction::AboutRole); #if QT_VERSION < 0x050000 aboutQtAction = new QAction(QIcon(":/trolltech/qmessagebox/images/qtlogo-64.png"), tr("About &Qt"), this); @@ -331,7 +332,7 @@ void BitcoinGUI::createActions(const NetworkStyle *networkStyle) aboutQtAction->setStatusTip(tr("Show information about Qt")); aboutQtAction->setMenuRole(QAction::AboutQtRole); optionsAction = new QAction(QIcon(":/icons/options"), tr("&Options..."), this); - optionsAction->setStatusTip(tr("Modify configuration options for Dash")); + optionsAction->setStatusTip(tr("Modify configuration options for DarkNet")); optionsAction->setMenuRole(QAction::PreferencesRole); toggleHideAction = new QAction(networkStyle->getAppIcon(), tr("&Show / Hide"), this); toggleHideAction->setStatusTip(tr("Show or hide the main Window")); @@ -347,9 +348,9 @@ void BitcoinGUI::createActions(const NetworkStyle *networkStyle) unlockWalletAction->setToolTip(tr("Unlock wallet")); lockWalletAction = new QAction(tr("&Lock Wallet"), this); signMessageAction = new QAction(QIcon(":/icons/edit"), tr("Sign &message..."), this); - signMessageAction->setStatusTip(tr("Sign messages with your Dash addresses to prove you own them")); + signMessageAction->setStatusTip(tr("Sign messages with your DarkNet addresses to prove you own them")); verifyMessageAction = new QAction(QIcon(":/icons/transaction_0"), tr("&Verify message..."), this); - verifyMessageAction->setStatusTip(tr("Verify messages to ensure they were signed with specified Dash addresses")); + verifyMessageAction->setStatusTip(tr("Verify messages to ensure they were signed with specified DarkNet addresses")); openInfoAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation), tr("&Information"), this); openInfoAction->setStatusTip(tr("Show diagnostic information")); @@ -372,11 +373,11 @@ void BitcoinGUI::createActions(const NetworkStyle *networkStyle) usedReceivingAddressesAction->setStatusTip(tr("Show the list of used receiving addresses and labels")); openAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_FileIcon), tr("Open &URI..."), this); - openAction->setStatusTip(tr("Open a dash: URI or payment request")); + openAction->setStatusTip(tr("Open a DarkNet: URI or payment request")); showHelpMessageAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation), tr("&Command-line options"), this); showHelpMessageAction->setMenuRole(QAction::NoRole); - showHelpMessageAction->setStatusTip(tr("Show the Dash Core help message to get a list with possible Dash command-line options")); + showHelpMessageAction->setStatusTip(tr("Show the DarkNet Core help message to get a list with possible DarkNet command-line options")); connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked())); @@ -570,7 +571,7 @@ void BitcoinGUI::createTrayIcon(const NetworkStyle *networkStyle) { #ifndef Q_OS_MAC trayIcon = new QSystemTrayIcon(this); - QString toolTip = tr("Dash Core client") + " " + networkStyle->getTitleAddText(); + QString toolTip = tr("DarkNet Core client") + " " + networkStyle->getTitleAddText(); trayIcon->setToolTip(toolTip); trayIcon->setIcon(networkStyle->getAppIcon()); trayIcon->show(); @@ -717,7 +718,7 @@ void BitcoinGUI::setNumConnections(int count) } QIcon connectionItem = QIcon(icon).pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE); labelConnectionsIcon->setIcon(connectionItem); - labelConnectionsIcon->setToolTip(tr("%n active connection(s) to Dash network", "", count)); + labelConnectionsIcon->setToolTip(tr("%n active connection(s) to DarkNet network", "", count)); } void BitcoinGUI::setNumBlocks(int count) @@ -856,7 +857,7 @@ void BitcoinGUI::setNumBlocks(int count) void BitcoinGUI::message(const QString &title, const QString &message, unsigned int style, bool *ret) { - QString strTitle = tr("Dash Core"); // default title + QString strTitle = tr("DarkNet Core"); // default title // Default to information icon int nMBoxIcon = QMessageBox::Information; int nNotifyIcon = Notificator::Information; @@ -882,7 +883,7 @@ void BitcoinGUI::message(const QString &title, const QString &message, unsigned break; } } - // Append title to "Dash - " + // Append title to "DarkNet - " if (!msgType.isEmpty()) strTitle += " - " + msgType; diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index d58c87cf77639..cc516d6426a79 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -6,7 +6,7 @@ #define BITCOIN_QT_BITCOINGUI_H #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #endif #include "amount.h" diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index 9616b7cd90da7..8b6562328238f 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -19,10 +19,9 @@ BitcoinUnits::BitcoinUnits(QObject *parent): QList BitcoinUnits::availableUnits() { QList unitlist; - unitlist.append(DASH); - unitlist.append(mDASH); - unitlist.append(uDASH); - unitlist.append(duffs); + unitlist.append(DNET); + unitlist.append(mDNET); + unitlist.append(uDNET); return unitlist; } @@ -30,10 +29,9 @@ bool BitcoinUnits::valid(int unit) { switch(unit) { - case DASH: - case mDASH: - case uDASH: - case duffs: + case DNET: + case mDNET: + case uDNET: return true; default: return false; @@ -44,10 +42,9 @@ QString BitcoinUnits::id(int unit) { switch(unit) { - case DASH: return QString("dash"); - case mDASH: return QString("mdash"); - case uDASH: return QString::fromUtf8("udash"); - case duffs: return QString("duffs"); + case DNET: return QString("darknet"); + case mDNET: return QString("mdarknet"); + case uDNET: return QString::fromUtf8("udarknet"); default: return QString("???"); } } @@ -58,10 +55,9 @@ QString BitcoinUnits::name(int unit) { switch(unit) { - case DASH: return QString("DASH"); - case mDASH: return QString("mDASH"); - case uDASH: return QString::fromUtf8("μDASH"); - case duffs: return QString("duffs"); + case DNET: return QString("DNET"); + case mDNET: return QString("mDNET"); + case uDNET: return QString::fromUtf8("μDNET"); default: return QString("???"); } } @@ -69,10 +65,9 @@ QString BitcoinUnits::name(int unit) { switch(unit) { - case DASH: return QString("tDASH"); - case mDASH: return QString("mtDASH"); - case uDASH: return QString::fromUtf8("μtDASH"); - case duffs: return QString("tduffs"); + case DNET: return QString("tDNET"); + case mDNET: return QString("mtDNET"); + case uDNET: return QString::fromUtf8("μtDNET"); default: return QString("???"); } } @@ -84,10 +79,9 @@ QString BitcoinUnits::description(int unit) { switch(unit) { - case DASH: return QString("Dash"); - case mDASH: return QString("Milli-Dash (1 / 1" THIN_SP_UTF8 "000)"); - case uDASH: return QString("Micro-Dash (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); - case duffs: return QString("Ten Nano-Dash (1 / 100" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); + case DNET: return QString("DNET"); + case mDNET: return QString("Milli-DNET (1 / 1" THIN_SP_UTF8 "000)"); + case uDNET: return QString("Micro-DNET (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); default: return QString("???"); } } @@ -95,10 +89,9 @@ QString BitcoinUnits::description(int unit) { switch(unit) { - case DASH: return QString("TestDashs"); - case mDASH: return QString("Milli-TestDash (1 / 1" THIN_SP_UTF8 "000)"); - case uDASH: return QString("Micro-TestDash (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); - case duffs: return QString("Ten Nano-TestDash (1 / 100" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); + case DNET: return QString("TestDNETs"); + case mDNET: return QString("Milli-TestDNET (1 / 1" THIN_SP_UTF8 "000)"); + case uDNET: return QString("Micro-TestDNET (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); default: return QString("???"); } } @@ -108,10 +101,9 @@ qint64 BitcoinUnits::factor(int unit) { switch(unit) { - case DASH: return 100000000; - case mDASH: return 100000; - case uDASH: return 100; - case duffs: return 1; + case DNET: return 100000000; + case mDNET: return 100000; + case uDNET: return 100; default: return 100000000; } } @@ -120,10 +112,9 @@ int BitcoinUnits::decimals(int unit) { switch(unit) { - case DASH: return 8; - case mDASH: return 5; - case uDASH: return 2; - case duffs: return 0; + case DNET: return 8; + case mDNET: return 5; + case uDNET: return 2; default: return 0; } } diff --git a/src/qt/bitcoinunits.h b/src/qt/bitcoinunits.h index 483f05559074f..d5b13ea5ac83b 100644 --- a/src/qt/bitcoinunits.h +++ b/src/qt/bitcoinunits.h @@ -42,7 +42,7 @@ #define THIN_SP_UTF8 REAL_THIN_SP_UTF8 #define THIN_SP_HTML HTML_HACK_SP -/** Dash unit definitions. Encapsulates parsing and formatting +/** DarkNet unit definitions. Encapsulates parsing and formatting and serves as list model for drop-down selection boxes. */ class BitcoinUnits: public QAbstractListModel @@ -52,15 +52,14 @@ class BitcoinUnits: public QAbstractListModel public: explicit BitcoinUnits(QObject *parent); - /** Dash units. + /** DarkNet units. @note Source: https://en.bitcoin.it/wiki/Units . Please add only sensible ones */ enum Unit { - DASH, - mDASH, - uDASH, - duffs + DNET, + mDNET, + uDNET }; enum SeparatorStyle diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h index b074441652051..87a601efa1258 100644 --- a/src/qt/clientmodel.h +++ b/src/qt/clientmodel.h @@ -34,7 +34,7 @@ enum NumConnections { CONNECTIONS_ALL = (CONNECTIONS_IN | CONNECTIONS_OUT), }; -/** Model for Dash network client. */ +/** Model for DarkNet network client. */ class ClientModel : public QObject { Q_OBJECT diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index f21483759f21e..17d9c2b06e9d7 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -16,7 +17,7 @@ #include "coincontrol.h" #include "main.h" #include "wallet.h" -#include "darksend.h" +#include "obfuscate.h" #include // for 'map_list_of()' @@ -443,12 +444,12 @@ void CoinControlDialog::viewItemChanged(QTreeWidgetItem* item, int column) else { coinControl->Select(outpt); CTxIn vin(outpt); - int rounds = pwalletMain->GetInputDarksendRounds(vin); - if(coinControl->useDarkSend && rounds < nDarksendRounds) { + int rounds = pwalletMain->GetInputObfuscateRounds(vin); + if(coinControl->useObfuscate && rounds < nObfuscateRounds) { QMessageBox::warning(this, windowTitle(), - tr("Non-anonymized input selected. Darksend will be disabled.

If you still want to use Darksend, please deselect all non-nonymized inputs first and then check Darksend checkbox again."), + tr("Non-anonymized input selected. Obfuscate will be disabled.

If you still want to use Obfuscate, please deselect all non-nonymized inputs first and then check Obfuscate checkbox again."), QMessageBox::Ok, QMessageBox::Ok); - coinControl->useDarkSend = false; + coinControl->useObfuscate = false; } } @@ -596,7 +597,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) nPayFee = CWallet::GetMinimumFee(nBytes, nTxConfirmTarget, mempool); // IX Fee - if(coinControl->useInstantX) nPayFee = max(nPayFee, CENT); + if(coinControl->useSwiftTX) nPayFee = max(nPayFee, CENT); // Allow free? double dPriorityNeeded = mempoolEstimatePriority; if (dPriorityNeeded <= 0) @@ -612,7 +613,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) nChange = nAmount - nPayFee - nPayAmount; // DS Fee = overpay - if(coinControl->useDarkSend && nChange > 0) + if(coinControl->useObfuscate && nChange > 0) { nPayFee += nChange; nChange = 0; @@ -639,7 +640,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) } // actually update labels - int nDisplayUnit = BitcoinUnits::DASH; + int nDisplayUnit = BitcoinUnits::DNET; if (model && model->getOptionsModel()) nDisplayUnit = model->getOptionsModel()->getDisplayUnit(); @@ -786,7 +787,7 @@ void CoinControlDialog::updateView() { sAddress = QString::fromStdString(CBitcoinAddress(outputAddress).ToString()); - // if listMode or change => show dash address. In tree mode, address is not shown again for direct wallet address outputs + // if listMode or change => show DarkNet address. In tree mode, address is not shown again for direct wallet address outputs if (!treeMode || (!(sAddress == sWalletAddress))) itemOutput->setText(COLUMN_ADDRESS, sAddress); @@ -826,7 +827,7 @@ void CoinControlDialog::updateView() // ds+ rounds CTxIn vin = CTxIn(out.tx->GetHash(), out.i); - int rounds = pwalletMain->GetInputDarksendRounds(vin); + int rounds = pwalletMain->GetInputObfuscateRounds(vin); if(rounds >= 0) itemOutput->setText(COLUMN_DARKSEND_ROUNDS, strPad(QString::number(rounds), 11, " ")); else itemOutput->setText(COLUMN_DARKSEND_ROUNDS, strPad(QString(tr("n/a")), 11, " ")); diff --git a/src/qt/dash.cpp b/src/qt/darknet.cpp similarity index 95% rename from src/qt/dash.cpp rename to src/qt/darknet.cpp index 9e6d9395bbeef..b009605679a65 100644 --- a/src/qt/dash.cpp +++ b/src/qt/darknet.cpp @@ -1,10 +1,11 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #endif #include "bitcoingui.h" @@ -90,7 +91,7 @@ static void InitMessage(const std::string &message) */ static std::string Translate(const char* psz) { - return QCoreApplication::translate("dash-core", psz).toStdString(); + return QCoreApplication::translate("darknet-core", psz).toStdString(); } static QString GetLangTerritory() @@ -138,11 +139,11 @@ static void initTranslations(QTranslator &qtTranslatorBase, QTranslator &qtTrans if (qtTranslator.load("qt_" + lang_territory, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) QApplication::installTranslator(&qtTranslator); - // Load e.g. bitcoin_de.qm (shortcut "de" needs to be defined in dash.qrc) + // Load e.g. bitcoin_de.qm (shortcut "de" needs to be defined in darknet.qrc) if (translatorBase.load(lang, ":/translations/")) QApplication::installTranslator(&translatorBase); - // Load e.g. bitcoin_de_DE.qm (shortcut "de_DE" needs to be defined in dash.qrc) + // Load e.g. bitcoin_de_DE.qm (shortcut "de_DE" needs to be defined in darknet.qrc) if (translator.load(lang_territory, ":/translations/")) QApplication::installTranslator(&translator); } @@ -163,7 +164,7 @@ void DebugMessageHandler(QtMsgType type, const QMessageLogContext& context, cons } #endif -/** Class encapsulating Dash Core startup and shutdown. +/** Class encapsulating DarkNet Core startup and shutdown. * Allows running startup and shutdown in a different thread from the UI thread. */ class BitcoinCore: public QObject @@ -192,7 +193,7 @@ public slots: void handleRunawayException(std::exception *e); }; -/** Main Dash application object */ +/** Main DarkNet application object */ class BitcoinApplication: public QApplication { Q_OBJECT @@ -250,7 +251,7 @@ public slots: void startThread(); }; -#include "dash.moc" +#include "darknet.moc" BitcoinCore::BitcoinCore(): QObject() @@ -493,7 +494,7 @@ void BitcoinApplication::initializeResult(int retval) #ifdef ENABLE_WALLET // Now that initialization/startup is done, process any command-line - // dash: URIs or payment requests: + // DarkNet: URIs or payment requests: connect(paymentServer, SIGNAL(receivedPaymentRequest(SendCoinsRecipient)), window, SLOT(handlePaymentRequest(SendCoinsRecipient))); connect(window, SIGNAL(receivedURI(QString)), @@ -515,7 +516,7 @@ void BitcoinApplication::shutdownResult(int retval) void BitcoinApplication::handleRunawayException(const QString &message) { - QMessageBox::critical(0, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Dash can no longer continue safely and will quit.") + QString("\n\n") + message); + QMessageBox::critical(0, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. DarkNet can no longer continue safely and will quit.") + QString("\n\n") + message); ::exit(1); } @@ -545,8 +546,8 @@ int main(int argc, char *argv[]) QTextCodec::setCodecForCStrings(QTextCodec::codecForTr()); #endif - Q_INIT_RESOURCE(dash); - Q_INIT_RESOURCE(dash_locale); + Q_INIT_RESOURCE(darknet); + Q_INIT_RESOURCE(darknet_locale); BitcoinApplication app(argc, argv); #if QT_VERSION > 0x050100 @@ -590,18 +591,18 @@ int main(int argc, char *argv[]) // User language is set up: pick a data directory Intro::pickDataDirectory(); - /// 6. Determine availability of data directory and parse dash.conf + /// 6. Determine availability of data directory and parse darknet.conf /// - Do not call GetDataDir(true) before this step finishes if (!boost::filesystem::is_directory(GetDataDir(false))) { - QMessageBox::critical(0, QObject::tr("Dash Core"), + QMessageBox::critical(0, QObject::tr("DarkNet Core"), QObject::tr("Error: Specified data directory \"%1\" does not exist.").arg(QString::fromStdString(mapArgs["-datadir"]))); return 1; } try { ReadConfigFile(mapArgs, mapMultiArgs); } catch(std::exception &e) { - QMessageBox::critical(0, QObject::tr("Dash Core"), + QMessageBox::critical(0, QObject::tr("DarkNet Core"), QObject::tr("Error: Cannot parse configuration file: %1. Only use key=value syntax.").arg(e.what())); return false; } @@ -614,7 +615,7 @@ int main(int argc, char *argv[]) // Check for -testnet or -regtest parameter (Params() calls are only valid after this clause) if (!SelectParamsFromCommandLine()) { - QMessageBox::critical(0, QObject::tr("Dash Core"), QObject::tr("Error: Invalid combination of -regtest and -testnet.")); + QMessageBox::critical(0, QObject::tr("DarkNet Core"), QObject::tr("Error: Invalid combination of -regtest and -testnet.")); return 1; } #ifdef ENABLE_WALLET @@ -633,7 +634,7 @@ int main(int argc, char *argv[]) /// 7a. parse masternode.conf string strErr; if(!masternodeConfig.read(strErr)) { - QMessageBox::critical(0, QObject::tr("Dash Core"), + QMessageBox::critical(0, QObject::tr("DarkNet Core"), QObject::tr("Error reading masternode configuration file: %1").arg(strErr.c_str())); return false; } @@ -648,7 +649,7 @@ int main(int argc, char *argv[]) exit(0); // Start up the payment server early, too, so impatient users that click on - // dash: links repeatedly have their payment requests routed to this process: + // darknet: links repeatedly have their payment requests routed to this process: app.createPaymentServer(); #endif @@ -680,7 +681,7 @@ int main(int argc, char *argv[]) app.createWindow(networkStyle.data()); app.requestInitialize(); #if defined(Q_OS_WIN) && QT_VERSION >= 0x050000 - WinShutdownMonitor::registerShutdownBlockReason(QObject::tr("Dash Core didn't yet exit safely..."), (HWND)app.getMainWinId()); + WinShutdownMonitor::registerShutdownBlockReason(QObject::tr("DarkNet Core didn't yet exit safely..."), (HWND)app.getMainWinId()); #endif app.exec(); app.requestShutdown(); diff --git a/src/qt/dash.qrc b/src/qt/darknet.qrc similarity index 78% rename from src/qt/dash.qrc rename to src/qt/darknet.qrc index 9e4fa270f4035..73100993e11ac 100644 --- a/src/qt/dash.qrc +++ b/src/qt/darknet.qrc @@ -36,20 +36,22 @@ res/icons/tx_input.png res/icons/tx_output.png res/icons/tx_inout.png - res/icons/unit_dash.png - res/icons/unit_mdash.png - res/icons/unit_udash.png - res/icons/unit_duffs.png - res/icons/unit_tdash.png - res/icons/unit_tmdash.png - res/icons/unit_tudash.png - res/icons/unit_tduffs.png + res/icons/unit_darknet.png + res/icons/unit_mdarknet.png + res/icons/unit_udarknet.png + res/icons/unit_tdarknet.png + res/icons/unit_tmdarknet.png + res/icons/unit_tudarknet.png res/icons/lock_closed.png res/icons/lock_open.png res/icons/key.png res/icons/filesave.png res/icons/qrcode.png res/icons/debugwindow.png + res/icons/drk_editpaste.png + res/icons/drk_address-book.png + res/icons/drk_editcopy.png + res/icons/drk_remove.png res/icons/drkblue_editpaste.png res/icons/drkblue_address-book.png res/icons/drkblue_editcopy.png @@ -57,11 +59,24 @@ res/icons/browse.png + res/css/drk.css + res/css/drk-1.css res/css/drkblue.css res/images/about.png - res/images/dash_logo_horizontal.png + res/images/darknet_logo_horizontal.png + res/images/darknet_logo_horizontal-drk.png + res/images/darknet_logo_horizontal-drkblue.png + res/images/drk_downArrow.png + res/images/drk_downArrow_small.png + res/images/drk_upArrow_small.png + res/images/drk_leftArrow_small.png + res/images/drk_rightArrow_small.png + res/images/drk_qtreeview_selected.png + res/images/drk_walletFrame_bg.png + res/images/drk-1_walletFrame_bg.png + res/images/drk_walletFrame.png res/images/drkblue_downArrow.png res/images/drkblue_downArrow_small.png res/images/drkblue_upArrow_small.png diff --git a/src/qt/darknet_locale.qrc b/src/qt/darknet_locale.qrc new file mode 100644 index 0000000000000..65516ab6687d9 --- /dev/null +++ b/src/qt/darknet_locale.qrc @@ -0,0 +1,20 @@ + + + locale/darknet_bg.qm + locale/darknet_de.qm + locale/darknet_en.qm + locale/darknet_es.qm + locale/darknet_fi.qm + locale/darknet_fr.qm + locale/darknet_it.qm + locale/darknet_ja.qm + locale/darknet_pl.qm + locale/darknet_pt.qm + locale/darknet_ru.qm + locale/darknet_sk.qm + locale/darknet_sv.qm + locale/darknet_vi.qm + locale/darknet_zh_CN.qm + locale/darknet_zh_TW.qm + + diff --git a/src/qt/darksendconfig.cpp b/src/qt/darksendconfig.cpp deleted file mode 100644 index 5929efa139846..0000000000000 --- a/src/qt/darksendconfig.cpp +++ /dev/null @@ -1,91 +0,0 @@ -#include "darksendconfig.h" -#include "ui_darksendconfig.h" - -#include "bitcoinunits.h" -#include "guiconstants.h" -#include "optionsmodel.h" -#include "walletmodel.h" -#include "init.h" - -#include -#include -#include -#include - -DarksendConfig::DarksendConfig(QWidget *parent) : - QDialog(parent), - ui(new Ui::DarksendConfig), - model(0) -{ - ui->setupUi(this); - - connect(ui->buttonBasic, SIGNAL(clicked()), this, SLOT(clickBasic())); - connect(ui->buttonHigh, SIGNAL(clicked()), this, SLOT(clickHigh())); - connect(ui->buttonMax, SIGNAL(clicked()), this, SLOT(clickMax())); -} - -DarksendConfig::~DarksendConfig() -{ - delete ui; -} - -void DarksendConfig::setModel(WalletModel *model) -{ - this->model = model; -} - -void DarksendConfig::clickBasic() -{ - configure(true, 1000, 2); - - QString strAmount(BitcoinUnits::formatWithUnit( - model->getOptionsModel()->getDisplayUnit(), 1000 * COIN)); - QMessageBox::information(this, tr("Darksend Configuration"), - tr( - "Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen." - ).arg(strAmount) - ); - - close(); -} - -void DarksendConfig::clickHigh() -{ - configure(true, 1000, 8); - - QString strAmount(BitcoinUnits::formatWithUnit( - model->getOptionsModel()->getDisplayUnit(), 1000 * COIN)); - QMessageBox::information(this, tr("Darksend Configuration"), - tr( - "Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen." - ).arg(strAmount) - ); - - close(); -} - -void DarksendConfig::clickMax() -{ - configure(true, 1000, 16); - - QString strAmount(BitcoinUnits::formatWithUnit( - model->getOptionsModel()->getDisplayUnit(), 1000 * COIN)); - QMessageBox::information(this, tr("Darksend Configuration"), - tr( - "Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen." - ).arg(strAmount) - ); - - close(); -} - -void DarksendConfig::configure(bool enabled, int coins, int rounds) { - - QSettings settings; - - settings.setValue("nDarksendRounds", rounds); - settings.setValue("nAnonymizeDarkcoinAmount", coins); - - nDarksendRounds = rounds; - nAnonymizeDarkcoinAmount = coins; -} diff --git a/src/qt/dash_locale.qrc b/src/qt/dash_locale.qrc deleted file mode 100644 index 9468b1c676efc..0000000000000 --- a/src/qt/dash_locale.qrc +++ /dev/null @@ -1,20 +0,0 @@ - - - locale/dash_bg.qm - locale/dash_de.qm - locale/dash_en.qm - locale/dash_es.qm - locale/dash_fi.qm - locale/dash_fr.qm - locale/dash_it.qm - locale/dash_ja.qm - locale/dash_pl.qm - locale/dash_pt.qm - locale/dash_ru.qm - locale/dash_sk.qm - locale/dash_sv.qm - locale/dash_vi.qm - locale/dash_zh_CN.qm - locale/dash_zh_TW.qm - - diff --git a/src/qt/dashstrings.cpp b/src/qt/dashstrings.cpp index feaba224a02b6..16335943b510c 100644 --- a/src/qt/dashstrings.cpp +++ b/src/qt/dashstrings.cpp @@ -8,435 +8,435 @@ #else #define UNUSED #endif -static const char UNUSED *dash_strings[] = { -QT_TRANSLATE_NOOP("dash-core", "" +static const char UNUSED *darknet_strings[] = { +QT_TRANSLATE_NOOP("darknet-core", "" "(1 = keep tx meta data e.g. account owner and payment request information, 2 " "= drop tx meta data)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Allow JSON-RPC connections from specified source. Valid for are a " "single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or " "a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "An error occurred while setting up the RPC address %s port %u for listening: " "%s"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Bind to given address and always listen on it. Use [host]:port notation for " "IPv6"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Bind to given address and whitelist peers connecting to it. Use [host]:port " "notation for IPv6"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Bind to given address to listen for JSON-RPC connections. Use [host]:port " "notation for IPv6. This option can be specified multiple times (default: " "bind to all interfaces)"), -QT_TRANSLATE_NOOP("dash-core", "" -"Cannot obtain a lock on data directory %s. Dash Core is probably already " +QT_TRANSLATE_NOOP("darknet-core", "" +"Cannot obtain a lock on data directory %s. DarkNet Core is probably already " "running."), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Change automatic finalized budget voting behavior. mode=auto: Vote for only " "exact finalized budget match to my generated budget. (string, default: auto)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Continuously rate-limit free transactions to *1000 bytes per minute " "(default:%u)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Create new files with system default permissions, instead of umask 077 (only " "effective with disabled wallet functionality)"), -QT_TRANSLATE_NOOP("dash-core", "" -"Darksend uses exact denominated amounts to send funds, you might simply need " +QT_TRANSLATE_NOOP("darknet-core", "" +"Obfuscate uses exact denominated amounts to send funds, you might simply need " "to anonymize some more coins."), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Delete all wallet transactions and only recover those parts of the " "blockchain through -rescan on startup"), -QT_TRANSLATE_NOOP("dash-core", "" -"Disable all Dash specific functionality (Masternodes, Darksend, InstantX, " +QT_TRANSLATE_NOOP("darknet-core", "" +"Disable all DarkNet specific functionality (Masternodes, Obfuscate, SwiftTX, " "Budgeting) (0-1, default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Distributed under the MIT software license, see the accompanying file " "COPYING or ."), -QT_TRANSLATE_NOOP("dash-core", "" -"Enable instantx, show confirmations for locked transactions (bool, default: " +QT_TRANSLATE_NOOP("darknet-core", "" +"Enable swifttx, show confirmations for locked transactions (bool, default: " "%s)"), -QT_TRANSLATE_NOOP("dash-core", "" -"Enable use of automated darksend for funds stored in this wallet (0-1, " +QT_TRANSLATE_NOOP("darknet-core", "" +"Enable use of automated obfuscate for funds stored in this wallet (0-1, " "default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Enter regression test mode, which uses a special chain in which blocks can " "be solved instantly."), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Error: Listening for incoming connections failed (listen returned error %s)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Error: Unsupported argument -socks found. Setting SOCKS version isn't " "possible anymore, only SOCKS5 proxies are supported."), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Execute command when a relevant alert is received or we see a really long " "fork (%s in cmd is replaced by message)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Execute command when a wallet transaction changes (%s in cmd is replaced by " "TxID)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Execute command when the best block changes (%s in cmd is replaced by block " "hash)"), -QT_TRANSLATE_NOOP("dash-core", "" -"Fees (in DASH/Kb) smaller than this are considered zero fee for relaying " +QT_TRANSLATE_NOOP("darknet-core", "" +"Fees (in DNET/Kb) smaller than this are considered zero fee for relaying " "(default: %s)"), -QT_TRANSLATE_NOOP("dash-core", "" -"Fees (in DASH/Kb) smaller than this are considered zero fee for transaction " +QT_TRANSLATE_NOOP("darknet-core", "" +"Fees (in DNET/Kb) smaller than this are considered zero fee for transaction " "creation (default: %s)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Flush database activity from memory pool to disk log every megabytes " "(default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Found unconfirmed denominated outputs, will wait till they confirm to " "continue."), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "How thorough the block verification of -checkblocks is (0-4, default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "If paytxfee is not set, include enough fee so transactions begin " "confirmation on average within n blocks (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "In this mode -genproclimit controls how many blocks are generated " "immediately."), -QT_TRANSLATE_NOOP("dash-core", "" -"InstantX requires inputs with at least 6 confirmations, you might need to " +QT_TRANSLATE_NOOP("darknet-core", "" +"SwiftTX requires inputs with at least 6 confirmations, you might need to " "wait a few minutes and try again."), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Invalid amount for -maxtxfee=: '%s' (must be at least the minrelay " "fee of %s to prevent stuck transactions)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Log transaction priority and fee per kB when mining blocks (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Maintain a full transaction index, used by the getrawtransaction rpc call " "(default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Maximum size of data in data carrier transactions we relay and mine " "(default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Maximum total fees to use in a single wallet transaction, setting too low " "may abort large transactions (default: %s)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Name to construct url for KeePass entry that stores the wallet passphrase"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Number of seconds to keep misbehaving peers from reconnecting (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Output debugging information (default: %u, supplying is optional)"), -QT_TRANSLATE_NOOP("dash-core", "" -"Provide liquidity to Darksend by infrequently mixing coins on a continual " +QT_TRANSLATE_NOOP("darknet-core", "" +"Provide liquidity to Obfuscate by infrequently mixing coins on a continual " "basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, " "low fees)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Query for peer addresses via DNS lookup, if low on addresses (default: 1 " "unless -connect)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Require high priority for relaying free or low-fee transactions (default:%u)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Send trace/debug info to console instead of debug.log file (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Set maximum size of high-priority/low-fee transactions in bytes (default: %d)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Set the number of script verification threads (%u to %d, 0 = auto, <0 = " "leave that many cores free, default: %d)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Set the number of threads for coin generation if enabled (-1 = all cores, " "default: %d)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Show N confirmations for a successfully locked transaction (0-9999, default: " "%u)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "This is a pre-release test build - use at your own risk - do not use for " "mining or merchant applications"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "This product includes software developed by the OpenSSL Project for use in " "the OpenSSL Toolkit and cryptographic software " "written by Eric Young and UPnP software written by Thomas Bernard."), -QT_TRANSLATE_NOOP("dash-core", "" -"To use dashd, or the -server option to dash-qt, you must set an rpcpassword " +QT_TRANSLATE_NOOP("darknet-core", "" +"To use darknetd, or the -server option to darknet-qt, you must set an rpcpassword " "in the configuration file:\n" "%s\n" "It is recommended you use the following random password:\n" -"rpcuser=dashrpc\n" +"rpcuser=darknetrpc\n" "rpcpassword=%s\n" "(you do not need to remember this password)\n" "The username and password MUST NOT be the same.\n" "If the file does not exist, create it with owner-readable-only file " "permissions.\n" "It is also recommended to set alertnotify so you are notified of problems;\n" -"for example: alertnotify=echo %%s | mail -s \"Dash Alert\" admin@foo.com\n"), -QT_TRANSLATE_NOOP("dash-core", "" -"Unable to bind to %s on this computer. Dash Core is probably already running."), -QT_TRANSLATE_NOOP("dash-core", "" -"Unable to locate enough Darksend denominated funds for this transaction."), -QT_TRANSLATE_NOOP("dash-core", "" -"Unable to locate enough Darksend non-denominated funds for this transaction " -"that are not equal 1000 DASH."), -QT_TRANSLATE_NOOP("dash-core", "" +"for example: alertnotify=echo %%s | mail -s \"DarkNet Alert\" admin@foo.com\n"), +QT_TRANSLATE_NOOP("darknet-core", "" +"Unable to bind to %s on this computer. DarkNet Core is probably already running."), +QT_TRANSLATE_NOOP("darknet-core", "" +"Unable to locate enough Obfuscate denominated funds for this transaction."), +QT_TRANSLATE_NOOP("darknet-core", "" +"Unable to locate enough Obfuscate non-denominated funds for this transaction " +"that are not equal 1000 DNET."), +QT_TRANSLATE_NOOP("darknet-core", "" "Unable to locate enough funds for this transaction that are not equal 1000 " -"DASH."), -QT_TRANSLATE_NOOP("dash-core", "" +"DNET."), +QT_TRANSLATE_NOOP("darknet-core", "" "Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: " "%s)"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Warning: -maxtxfee is set very high! Fees this large could be paid on a " "single transaction."), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Warning: -paytxfee is set very high! This is the transaction fee you will " "pay if you send a transaction."), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Warning: Please check that your computer's date and time are correct! If " -"your clock is wrong Dash Core will not work properly."), -QT_TRANSLATE_NOOP("dash-core", "" +"your clock is wrong DarkNet Core will not work properly."), +QT_TRANSLATE_NOOP("darknet-core", "" "Warning: The network does not appear to fully agree! Some miners appear to " "be experiencing issues."), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Warning: We do not appear to fully agree with our peers! You may need to " "upgrade, or other nodes may need to upgrade."), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Warning: error reading wallet.dat! All keys read correctly, but transaction " "data or address book entries might be missing or incorrect."), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as " "wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect " "you should restore from a backup."), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Whitelist peers connecting from the given netmask or IP address. Can be " "specified multiple times."), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "Whitelisted peers cannot be DoS banned and their transactions are always " "relayed, even if they are already in the mempool, useful e.g. for a gateway"), -QT_TRANSLATE_NOOP("dash-core", "" +QT_TRANSLATE_NOOP("darknet-core", "" "You must specify a masternodeprivkey in the configuration. Please see " "documentation for help."), -QT_TRANSLATE_NOOP("dash-core", "(9999 could be used only on mainnet)"), -QT_TRANSLATE_NOOP("dash-core", "(default: %s)"), -QT_TRANSLATE_NOOP("dash-core", "(default: 1)"), -QT_TRANSLATE_NOOP("dash-core", "(must be 9999 for mainnet)"), -QT_TRANSLATE_NOOP("dash-core", " can be:\n"), -QT_TRANSLATE_NOOP("dash-core", "Accept command line and JSON-RPC commands"), -QT_TRANSLATE_NOOP("dash-core", "Accept connections from outside (default: 1 if no -proxy or -connect)"), -QT_TRANSLATE_NOOP("dash-core", "Accept public REST requests (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Acceptable ciphers (default: %s)"), -QT_TRANSLATE_NOOP("dash-core", "Add a node to connect to and attempt to keep the connection open"), -QT_TRANSLATE_NOOP("dash-core", "Allow DNS lookups for -addnode, -seednode and -connect"), -QT_TRANSLATE_NOOP("dash-core", "Already have that input."), -QT_TRANSLATE_NOOP("dash-core", "Always query for peer addresses via DNS lookup (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Attempt to recover private keys from a corrupt wallet.dat"), -QT_TRANSLATE_NOOP("dash-core", "Block creation options:"), -QT_TRANSLATE_NOOP("dash-core", "Can't denominate: no compatible inputs left."), -QT_TRANSLATE_NOOP("dash-core", "Can't find random Masternode."), -QT_TRANSLATE_NOOP("dash-core", "Can't mix while sync in progress."), -QT_TRANSLATE_NOOP("dash-core", "Cannot downgrade wallet"), -QT_TRANSLATE_NOOP("dash-core", "Cannot resolve -bind address: '%s'"), -QT_TRANSLATE_NOOP("dash-core", "Cannot resolve -externalip address: '%s'"), -QT_TRANSLATE_NOOP("dash-core", "Cannot resolve -whitebind address: '%s'"), -QT_TRANSLATE_NOOP("dash-core", "Cannot write default address"), -QT_TRANSLATE_NOOP("dash-core", "Collateral not valid."), -QT_TRANSLATE_NOOP("dash-core", "Connect only to the specified node(s)"), -QT_TRANSLATE_NOOP("dash-core", "Connect through SOCKS5 proxy"), -QT_TRANSLATE_NOOP("dash-core", "Connect to KeePassHttp on port (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Connect to a node to retrieve peer addresses, and disconnect"), -QT_TRANSLATE_NOOP("dash-core", "Connection options:"), -QT_TRANSLATE_NOOP("dash-core", "Copyright (C) 2009-%i The Bitcoin Core Developers"), -QT_TRANSLATE_NOOP("dash-core", "Copyright (C) 2014-%i The Dash Core Developers"), -QT_TRANSLATE_NOOP("dash-core", "Corrupted block database detected"), -QT_TRANSLATE_NOOP("dash-core", "Could not parse -rpcbind value %s as network address"), -QT_TRANSLATE_NOOP("dash-core", "Could not parse masternode.conf"), -QT_TRANSLATE_NOOP("dash-core", "Darksend is idle."), -QT_TRANSLATE_NOOP("dash-core", "Darksend options:"), -QT_TRANSLATE_NOOP("dash-core", "Darksend request complete:"), -QT_TRANSLATE_NOOP("dash-core", "Darksend request incomplete:"), -QT_TRANSLATE_NOOP("dash-core", "Debugging/Testing options:"), -QT_TRANSLATE_NOOP("dash-core", "Disable safemode, override a real safe mode event (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Discover own IP address (default: 1 when listening and no -externalip)"), -QT_TRANSLATE_NOOP("dash-core", "Do not load the wallet and disable wallet RPC calls"), -QT_TRANSLATE_NOOP("dash-core", "Do you want to rebuild the block database now?"), -QT_TRANSLATE_NOOP("dash-core", "Done loading"), -QT_TRANSLATE_NOOP("dash-core", "Enable the client to act as a masternode (0-1, default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Entries are full."), -QT_TRANSLATE_NOOP("dash-core", "Error connecting to Masternode."), -QT_TRANSLATE_NOOP("dash-core", "Error initializing block database"), -QT_TRANSLATE_NOOP("dash-core", "Error initializing wallet database environment %s!"), -QT_TRANSLATE_NOOP("dash-core", "Error loading block database"), -QT_TRANSLATE_NOOP("dash-core", "Error loading wallet.dat"), -QT_TRANSLATE_NOOP("dash-core", "Error loading wallet.dat: Wallet corrupted"), -QT_TRANSLATE_NOOP("dash-core", "Error loading wallet.dat: Wallet requires newer version of Dash Core"), -QT_TRANSLATE_NOOP("dash-core", "Error opening block database"), -QT_TRANSLATE_NOOP("dash-core", "Error reading from database, shutting down."), -QT_TRANSLATE_NOOP("dash-core", "Error recovering public key."), -QT_TRANSLATE_NOOP("dash-core", "Error"), -QT_TRANSLATE_NOOP("dash-core", "Error: A fatal internal error occured, see debug.log for details"), -QT_TRANSLATE_NOOP("dash-core", "Error: Can't select current denominated inputs"), -QT_TRANSLATE_NOOP("dash-core", "Error: Disk space is low!"), -QT_TRANSLATE_NOOP("dash-core", "Error: Unsupported argument -tor found, use -onion."), -QT_TRANSLATE_NOOP("dash-core", "Error: Wallet locked, unable to create transaction!"), -QT_TRANSLATE_NOOP("dash-core", "Error: You already have pending entries in the Darksend pool"), -QT_TRANSLATE_NOOP("dash-core", "Failed to listen on any port. Use -listen=0 if you want this."), -QT_TRANSLATE_NOOP("dash-core", "Failed to read block"), -QT_TRANSLATE_NOOP("dash-core", "Fee (in DASH/kB) to add to transactions you send (default: %s)"), -QT_TRANSLATE_NOOP("dash-core", "Finalizing transaction."), -QT_TRANSLATE_NOOP("dash-core", "Force safe mode (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Found enough users, signing ( waiting %s )"), -QT_TRANSLATE_NOOP("dash-core", "Found enough users, signing ..."), -QT_TRANSLATE_NOOP("dash-core", "Generate coins (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "How many blocks to check at startup (default: %u, 0 = all)"), -QT_TRANSLATE_NOOP("dash-core", "If is not supplied, output all debugging information."), -QT_TRANSLATE_NOOP("dash-core", "Importing..."), -QT_TRANSLATE_NOOP("dash-core", "Imports blocks from external blk000??.dat file"), -QT_TRANSLATE_NOOP("dash-core", "Include IP addresses in debug output (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Incompatible mode."), -QT_TRANSLATE_NOOP("dash-core", "Incompatible version."), -QT_TRANSLATE_NOOP("dash-core", "Incorrect or no genesis block found. Wrong datadir for network?"), -QT_TRANSLATE_NOOP("dash-core", "Information"), -QT_TRANSLATE_NOOP("dash-core", "Initialization sanity check failed. Dash Core is shutting down."), -QT_TRANSLATE_NOOP("dash-core", "Input is not valid."), -QT_TRANSLATE_NOOP("dash-core", "InstantX options:"), -QT_TRANSLATE_NOOP("dash-core", "Insufficient funds."), -QT_TRANSLATE_NOOP("dash-core", "Invalid -onion address: '%s'"), -QT_TRANSLATE_NOOP("dash-core", "Invalid -proxy address: '%s'"), -QT_TRANSLATE_NOOP("dash-core", "Invalid amount for -maxtxfee=: '%s'"), -QT_TRANSLATE_NOOP("dash-core", "Invalid amount for -minrelaytxfee=: '%s'"), -QT_TRANSLATE_NOOP("dash-core", "Invalid amount for -mintxfee=: '%s'"), -QT_TRANSLATE_NOOP("dash-core", "Invalid amount for -paytxfee=: '%s' (must be at least %s)"), -QT_TRANSLATE_NOOP("dash-core", "Invalid amount for -paytxfee=: '%s'"), -QT_TRANSLATE_NOOP("dash-core", "Invalid masternodeprivkey. Please see documenation."), -QT_TRANSLATE_NOOP("dash-core", "Invalid netmask specified in -whitelist: '%s'"), -QT_TRANSLATE_NOOP("dash-core", "Invalid port detected in masternode.conf"), -QT_TRANSLATE_NOOP("dash-core", "Invalid private key."), -QT_TRANSLATE_NOOP("dash-core", "Invalid script detected."), -QT_TRANSLATE_NOOP("dash-core", "KeePassHttp id for the established association"), -QT_TRANSLATE_NOOP("dash-core", "KeePassHttp key for AES encrypted communication with KeePass"), -QT_TRANSLATE_NOOP("dash-core", "Keep N DASH anonymized (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Keep at most unconnectable transactions in memory (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Last Darksend was too recent."), -QT_TRANSLATE_NOOP("dash-core", "Last successful Darksend action was too recent."), -QT_TRANSLATE_NOOP("dash-core", "Limit size of signature cache to entries (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Line: %d"), -QT_TRANSLATE_NOOP("dash-core", "Listen for JSON-RPC connections on (default: %u or testnet: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Listen for connections on (default: %u or testnet: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Loading addresses..."), -QT_TRANSLATE_NOOP("dash-core", "Loading block index..."), -QT_TRANSLATE_NOOP("dash-core", "Loading budget cache..."), -QT_TRANSLATE_NOOP("dash-core", "Loading masternode cache..."), -QT_TRANSLATE_NOOP("dash-core", "Loading masternode payment cache..."), -QT_TRANSLATE_NOOP("dash-core", "Loading wallet... (%3.2f %%)"), -QT_TRANSLATE_NOOP("dash-core", "Loading wallet..."), -QT_TRANSLATE_NOOP("dash-core", "Lock is already in place."), -QT_TRANSLATE_NOOP("dash-core", "Lock masternodes from masternode configuration file (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Maintain at most connections to peers (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Masternode options:"), -QT_TRANSLATE_NOOP("dash-core", "Masternode queue is full."), -QT_TRANSLATE_NOOP("dash-core", "Masternode:"), -QT_TRANSLATE_NOOP("dash-core", "Maximum per-connection receive buffer, *1000 bytes (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Maximum per-connection send buffer, *1000 bytes (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Missing input transaction information."), -QT_TRANSLATE_NOOP("dash-core", "Mixing in progress..."), -QT_TRANSLATE_NOOP("dash-core", "Need to specify a port with -whitebind: '%s'"), -QT_TRANSLATE_NOOP("dash-core", "No Masternodes detected."), -QT_TRANSLATE_NOOP("dash-core", "No compatible Masternode found."), -QT_TRANSLATE_NOOP("dash-core", "No funds detected in need of denominating."), -QT_TRANSLATE_NOOP("dash-core", "No matching denominations found for mixing."), -QT_TRANSLATE_NOOP("dash-core", "Node relay options:"), -QT_TRANSLATE_NOOP("dash-core", "Non-standard public key detected."), -QT_TRANSLATE_NOOP("dash-core", "Not compatible with existing transactions."), -QT_TRANSLATE_NOOP("dash-core", "Not enough file descriptors available."), -QT_TRANSLATE_NOOP("dash-core", "Not in the Masternode list."), -QT_TRANSLATE_NOOP("dash-core", "Number of automatic wallet backups (default: 10)"), -QT_TRANSLATE_NOOP("dash-core", "Only accept block chain matching built-in checkpoints (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Only connect to nodes in network (ipv4, ipv6 or onion)"), -QT_TRANSLATE_NOOP("dash-core", "Options:"), -QT_TRANSLATE_NOOP("dash-core", "Password for JSON-RPC connections"), -QT_TRANSLATE_NOOP("dash-core", "Prepend debug output with timestamp (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)"), -QT_TRANSLATE_NOOP("dash-core", "RPC server options:"), -QT_TRANSLATE_NOOP("dash-core", "RPC support for HTTP persistent connections (default: %d)"), -QT_TRANSLATE_NOOP("dash-core", "Randomly drop 1 of every network messages"), -QT_TRANSLATE_NOOP("dash-core", "Randomly fuzz 1 of every network messages"), -QT_TRANSLATE_NOOP("dash-core", "Rebuild block chain index from current blk000??.dat files"), -QT_TRANSLATE_NOOP("dash-core", "Receive and display P2P network alerts (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Relay and mine data carrier transactions (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Relay non-P2SH multisig (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Rescan the block chain for missing wallet transactions"), -QT_TRANSLATE_NOOP("dash-core", "Rescanning..."), -QT_TRANSLATE_NOOP("dash-core", "Run a thread to flush wallet periodically (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Run in the background as a daemon and accept commands"), -QT_TRANSLATE_NOOP("dash-core", "Send trace/debug info to debug.log file (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Send transactions as zero-fee transactions if possible (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Server certificate file (default: %s)"), -QT_TRANSLATE_NOOP("dash-core", "Server private key (default: %s)"), -QT_TRANSLATE_NOOP("dash-core", "Session not complete!"), -QT_TRANSLATE_NOOP("dash-core", "Session timed out."), -QT_TRANSLATE_NOOP("dash-core", "Set database cache size in megabytes (%d to %d, default: %d)"), -QT_TRANSLATE_NOOP("dash-core", "Set external address:port to get to this masternode (example: %s)"), -QT_TRANSLATE_NOOP("dash-core", "Set key pool size to (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Set maximum block size in bytes (default: %d)"), -QT_TRANSLATE_NOOP("dash-core", "Set minimum block size in bytes (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Set the masternode private key"), -QT_TRANSLATE_NOOP("dash-core", "Set the number of threads to service RPC calls (default: %d)"), -QT_TRANSLATE_NOOP("dash-core", "Sets the DB_PRIVATE flag in the wallet db environment (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Show all debugging options (usage: --help -help-debug)"), -QT_TRANSLATE_NOOP("dash-core", "Shrink debug.log file on client startup (default: 1 when no -debug)"), -QT_TRANSLATE_NOOP("dash-core", "Signing failed."), -QT_TRANSLATE_NOOP("dash-core", "Signing timed out."), -QT_TRANSLATE_NOOP("dash-core", "Signing transaction failed"), -QT_TRANSLATE_NOOP("dash-core", "Specify configuration file (default: %s)"), -QT_TRANSLATE_NOOP("dash-core", "Specify connection timeout in milliseconds (minimum: 1, default: %d)"), -QT_TRANSLATE_NOOP("dash-core", "Specify data directory"), -QT_TRANSLATE_NOOP("dash-core", "Specify masternode configuration file (default: %s)"), -QT_TRANSLATE_NOOP("dash-core", "Specify pid file (default: %s)"), -QT_TRANSLATE_NOOP("dash-core", "Specify wallet file (within data directory)"), -QT_TRANSLATE_NOOP("dash-core", "Specify your own public address"), -QT_TRANSLATE_NOOP("dash-core", "Spend unconfirmed change when sending transactions (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Stop running after importing blocks from disk (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Submitted following entries to masternode: %u / %d"), -QT_TRANSLATE_NOOP("dash-core", "Submitted to masternode, waiting for more entries ( %u / %d ) %s"), -QT_TRANSLATE_NOOP("dash-core", "Submitted to masternode, waiting in queue %s"), -QT_TRANSLATE_NOOP("dash-core", "Synchronization failed"), -QT_TRANSLATE_NOOP("dash-core", "Synchronization finished"), -QT_TRANSLATE_NOOP("dash-core", "Synchronization pending..."), -QT_TRANSLATE_NOOP("dash-core", "Synchronizing budgets..."), -QT_TRANSLATE_NOOP("dash-core", "Synchronizing masternode winners..."), -QT_TRANSLATE_NOOP("dash-core", "Synchronizing masternodes..."), -QT_TRANSLATE_NOOP("dash-core", "Synchronizing sporks..."), -QT_TRANSLATE_NOOP("dash-core", "This help message"), -QT_TRANSLATE_NOOP("dash-core", "This is experimental software."), -QT_TRANSLATE_NOOP("dash-core", "This is intended for regression testing tools and app development."), -QT_TRANSLATE_NOOP("dash-core", "This is not a Masternode."), -QT_TRANSLATE_NOOP("dash-core", "Threshold for disconnecting misbehaving peers (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Transaction amount too small"), -QT_TRANSLATE_NOOP("dash-core", "Transaction amounts must be positive"), -QT_TRANSLATE_NOOP("dash-core", "Transaction created successfully."), -QT_TRANSLATE_NOOP("dash-core", "Transaction fees are too high."), -QT_TRANSLATE_NOOP("dash-core", "Transaction not valid."), -QT_TRANSLATE_NOOP("dash-core", "Transaction too large for fee policy"), -QT_TRANSLATE_NOOP("dash-core", "Transaction too large"), -QT_TRANSLATE_NOOP("dash-core", "Transmitting final transaction."), -QT_TRANSLATE_NOOP("dash-core", "Unable to bind to %s on this computer (bind returned error %s)"), -QT_TRANSLATE_NOOP("dash-core", "Unable to sign spork message, wrong key?"), -QT_TRANSLATE_NOOP("dash-core", "Unknown network specified in -onlynet: '%s'"), -QT_TRANSLATE_NOOP("dash-core", "Unknown state: id = %u"), -QT_TRANSLATE_NOOP("dash-core", "Upgrade wallet to latest format"), -QT_TRANSLATE_NOOP("dash-core", "Use KeePass 2 integration using KeePassHttp plugin (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Use N separate masternodes to anonymize funds (2-8, default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Use OpenSSL (https) for JSON-RPC connections"), -QT_TRANSLATE_NOOP("dash-core", "Use UPnP to map the listening port (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Use UPnP to map the listening port (default: 1 when listening)"), -QT_TRANSLATE_NOOP("dash-core", "Use the test network"), -QT_TRANSLATE_NOOP("dash-core", "Username for JSON-RPC connections"), -QT_TRANSLATE_NOOP("dash-core", "Value more than Darksend pool maximum allows."), -QT_TRANSLATE_NOOP("dash-core", "Verifying blocks..."), -QT_TRANSLATE_NOOP("dash-core", "Verifying wallet..."), -QT_TRANSLATE_NOOP("dash-core", "Wallet %s resides outside data directory %s"), -QT_TRANSLATE_NOOP("dash-core", "Wallet is locked."), -QT_TRANSLATE_NOOP("dash-core", "Wallet needed to be rewritten: restart Dash Core to complete"), -QT_TRANSLATE_NOOP("dash-core", "Wallet options:"), -QT_TRANSLATE_NOOP("dash-core", "Wallet window title"), -QT_TRANSLATE_NOOP("dash-core", "Warning"), -QT_TRANSLATE_NOOP("dash-core", "Warning: This version is obsolete, upgrade required!"), -QT_TRANSLATE_NOOP("dash-core", "Warning: Unsupported argument -benchmark ignored, use -debug=bench."), -QT_TRANSLATE_NOOP("dash-core", "Warning: Unsupported argument -debugnet ignored, use -debug=net."), -QT_TRANSLATE_NOOP("dash-core", "Will retry..."), -QT_TRANSLATE_NOOP("dash-core", "You need to rebuild the database using -reindex to change -txindex"), -QT_TRANSLATE_NOOP("dash-core", "Your entries added successfully."), -QT_TRANSLATE_NOOP("dash-core", "Your transaction was accepted into the pool!"), -QT_TRANSLATE_NOOP("dash-core", "Zapping all transactions from wallet..."), -QT_TRANSLATE_NOOP("dash-core", "on startup"), -QT_TRANSLATE_NOOP("dash-core", "wallet.dat corrupt, salvage failed"), +QT_TRANSLATE_NOOP("darknet-core", "(51472 could be used only on mainnet)"), +QT_TRANSLATE_NOOP("darknet-core", "(default: %s)"), +QT_TRANSLATE_NOOP("darknet-core", "(default: 1)"), +QT_TRANSLATE_NOOP("darknet-core", "(must be51472 for mainnet)"), +QT_TRANSLATE_NOOP("darknet-core", " can be:\n"), +QT_TRANSLATE_NOOP("darknet-core", "Accept command line and JSON-RPC commands"), +QT_TRANSLATE_NOOP("darknet-core", "Accept connections from outside (default: 1 if no -proxy or -connect)"), +QT_TRANSLATE_NOOP("darknet-core", "Accept public REST requests (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Acceptable ciphers (default: %s)"), +QT_TRANSLATE_NOOP("darknet-core", "Add a node to connect to and attempt to keep the connection open"), +QT_TRANSLATE_NOOP("darknet-core", "Allow DNS lookups for -addnode, -seednode and -connect"), +QT_TRANSLATE_NOOP("darknet-core", "Already have that input."), +QT_TRANSLATE_NOOP("darknet-core", "Always query for peer addresses via DNS lookup (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Attempt to recover private keys from a corrupt wallet.dat"), +QT_TRANSLATE_NOOP("darknet-core", "Block creation options:"), +QT_TRANSLATE_NOOP("darknet-core", "Can't denominate: no compatible inputs left."), +QT_TRANSLATE_NOOP("darknet-core", "Can't find random Masternode."), +QT_TRANSLATE_NOOP("darknet-core", "Can't mix while sync in progress."), +QT_TRANSLATE_NOOP("darknet-core", "Cannot downgrade wallet"), +QT_TRANSLATE_NOOP("darknet-core", "Cannot resolve -bind address: '%s'"), +QT_TRANSLATE_NOOP("darknet-core", "Cannot resolve -externalip address: '%s'"), +QT_TRANSLATE_NOOP("darknet-core", "Cannot resolve -whitebind address: '%s'"), +QT_TRANSLATE_NOOP("darknet-core", "Cannot write default address"), +QT_TRANSLATE_NOOP("darknet-core", "Collateral not valid."), +QT_TRANSLATE_NOOP("darknet-core", "Connect only to the specified node(s)"), +QT_TRANSLATE_NOOP("darknet-core", "Connect through SOCKS5 proxy"), +QT_TRANSLATE_NOOP("darknet-core", "Connect to KeePassHttp on port (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Connect to a node to retrieve peer addresses, and disconnect"), +QT_TRANSLATE_NOOP("darknet-core", "Connection options:"), +QT_TRANSLATE_NOOP("darknet-core", "Copyright (C) 2009-%i The Bitcoin Core Developers"), +QT_TRANSLATE_NOOP("darknet-core", "Copyright (C) 2014-%i The DarkNet Core Developers"), +QT_TRANSLATE_NOOP("darknet-core", "Corrupted block database detected"), +QT_TRANSLATE_NOOP("darknet-core", "Could not parse -rpcbind value %s as network address"), +QT_TRANSLATE_NOOP("darknet-core", "Could not parse masternode.conf"), +QT_TRANSLATE_NOOP("darknet-core", "Obfuscate is idle."), +QT_TRANSLATE_NOOP("darknet-core", "Obfuscate options:"), +QT_TRANSLATE_NOOP("darknet-core", "Obfuscate request complete:"), +QT_TRANSLATE_NOOP("darknet-core", "Obfuscate request incomplete:"), +QT_TRANSLATE_NOOP("darknet-core", "Debugging/Testing options:"), +QT_TRANSLATE_NOOP("darknet-core", "Disable safemode, override a real safe mode event (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Discover own IP address (default: 1 when listening and no -externalip)"), +QT_TRANSLATE_NOOP("darknet-core", "Do not load the wallet and disable wallet RPC calls"), +QT_TRANSLATE_NOOP("darknet-core", "Do you want to rebuild the block database now?"), +QT_TRANSLATE_NOOP("darknet-core", "Done loading"), +QT_TRANSLATE_NOOP("darknet-core", "Enable the client to act as a masternode (0-1, default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Entries are full."), +QT_TRANSLATE_NOOP("darknet-core", "Error connecting to Masternode."), +QT_TRANSLATE_NOOP("darknet-core", "Error initializing block database"), +QT_TRANSLATE_NOOP("darknet-core", "Error initializing wallet database environment %s!"), +QT_TRANSLATE_NOOP("darknet-core", "Error loading block database"), +QT_TRANSLATE_NOOP("darknet-core", "Error loading wallet.dat"), +QT_TRANSLATE_NOOP("darknet-core", "Error loading wallet.dat: Wallet corrupted"), +QT_TRANSLATE_NOOP("darknet-core", "Error loading wallet.dat: Wallet requires newer version of DarkNet Core"), +QT_TRANSLATE_NOOP("darknet-core", "Error opening block database"), +QT_TRANSLATE_NOOP("darknet-core", "Error reading from database, shutting down."), +QT_TRANSLATE_NOOP("darknet-core", "Error recovering public key."), +QT_TRANSLATE_NOOP("darknet-core", "Error"), +QT_TRANSLATE_NOOP("darknet-core", "Error: A fatal internal error occured, see debug.log for details"), +QT_TRANSLATE_NOOP("darknet-core", "Error: Can't select current denominated inputs"), +QT_TRANSLATE_NOOP("darknet-core", "Error: Disk space is low!"), +QT_TRANSLATE_NOOP("darknet-core", "Error: Unsupported argument -tor found, use -onion."), +QT_TRANSLATE_NOOP("darknet-core", "Error: Wallet locked, unable to create transaction!"), +QT_TRANSLATE_NOOP("darknet-core", "Error: You already have pending entries in the Obfuscate pool"), +QT_TRANSLATE_NOOP("darknet-core", "Failed to listen on any port. Use -listen=0 if you want this."), +QT_TRANSLATE_NOOP("darknet-core", "Failed to read block"), +QT_TRANSLATE_NOOP("darknet-core", "Fee (in DNET/kB) to add to transactions you send (default: %s)"), +QT_TRANSLATE_NOOP("darknet-core", "Finalizing transaction."), +QT_TRANSLATE_NOOP("darknet-core", "Force safe mode (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Found enough users, signing ( waiting %s )"), +QT_TRANSLATE_NOOP("darknet-core", "Found enough users, signing ..."), +QT_TRANSLATE_NOOP("darknet-core", "Generate coins (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "How many blocks to check at startup (default: %u, 0 = all)"), +QT_TRANSLATE_NOOP("darknet-core", "If is not supplied, output all debugging information."), +QT_TRANSLATE_NOOP("darknet-core", "Importing..."), +QT_TRANSLATE_NOOP("darknet-core", "Imports blocks from external blk000??.dat file"), +QT_TRANSLATE_NOOP("darknet-core", "Include IP addresses in debug output (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Incompatible mode."), +QT_TRANSLATE_NOOP("darknet-core", "Incompatible version."), +QT_TRANSLATE_NOOP("darknet-core", "Incorrect or no genesis block found. Wrong datadir for network?"), +QT_TRANSLATE_NOOP("darknet-core", "Information"), +QT_TRANSLATE_NOOP("darknet-core", "Initialization sanity check failed. DarkNet Core is shutting down."), +QT_TRANSLATE_NOOP("darknet-core", "Input is not valid."), +QT_TRANSLATE_NOOP("darknet-core", "SwiftTX options:"), +QT_TRANSLATE_NOOP("darknet-core", "Insufficient funds."), +QT_TRANSLATE_NOOP("darknet-core", "Invalid -onion address: '%s'"), +QT_TRANSLATE_NOOP("darknet-core", "Invalid -proxy address: '%s'"), +QT_TRANSLATE_NOOP("darknet-core", "Invalid amount for -maxtxfee=: '%s'"), +QT_TRANSLATE_NOOP("darknet-core", "Invalid amount for -minrelaytxfee=: '%s'"), +QT_TRANSLATE_NOOP("darknet-core", "Invalid amount for -mintxfee=: '%s'"), +QT_TRANSLATE_NOOP("darknet-core", "Invalid amount for -paytxfee=: '%s' (must be at least %s)"), +QT_TRANSLATE_NOOP("darknet-core", "Invalid amount for -paytxfee=: '%s'"), +QT_TRANSLATE_NOOP("darknet-core", "Invalid masternodeprivkey. Please see documenation."), +QT_TRANSLATE_NOOP("darknet-core", "Invalid netmask specified in -whitelist: '%s'"), +QT_TRANSLATE_NOOP("darknet-core", "Invalid port detected in masternode.conf"), +QT_TRANSLATE_NOOP("darknet-core", "Invalid private key."), +QT_TRANSLATE_NOOP("darknet-core", "Invalid script detected."), +QT_TRANSLATE_NOOP("darknet-core", "KeePassHttp id for the established association"), +QT_TRANSLATE_NOOP("darknet-core", "KeePassHttp key for AES encrypted communication with KeePass"), +QT_TRANSLATE_NOOP("darknet-core", "Keep N DNET anonymized (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Keep at most unconnectable transactions in memory (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Last Obfuscate was too recent."), +QT_TRANSLATE_NOOP("darknet-core", "Last successful Obfuscate action was too recent."), +QT_TRANSLATE_NOOP("darknet-core", "Limit size of signature cache to entries (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Line: %d"), +QT_TRANSLATE_NOOP("darknet-core", "Listen for JSON-RPC connections on (default: %u or testnet: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Listen for connections on (default: %u or testnet: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Loading addresses..."), +QT_TRANSLATE_NOOP("darknet-core", "Loading block index..."), +QT_TRANSLATE_NOOP("darknet-core", "Loading budget cache..."), +QT_TRANSLATE_NOOP("darknet-core", "Loading masternode cache..."), +QT_TRANSLATE_NOOP("darknet-core", "Loading masternode payment cache..."), +QT_TRANSLATE_NOOP("darknet-core", "Loading wallet... (%3.2f %%)"), +QT_TRANSLATE_NOOP("darknet-core", "Loading wallet..."), +QT_TRANSLATE_NOOP("darknet-core", "Lock is already in place."), +QT_TRANSLATE_NOOP("darknet-core", "Lock masternodes from masternode configuration file (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Maintain at most connections to peers (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Masternode options:"), +QT_TRANSLATE_NOOP("darknet-core", "Masternode queue is full."), +QT_TRANSLATE_NOOP("darknet-core", "Masternode:"), +QT_TRANSLATE_NOOP("darknet-core", "Maximum per-connection receive buffer, *1000 bytes (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Maximum per-connection send buffer, *1000 bytes (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Missing input transaction information."), +QT_TRANSLATE_NOOP("darknet-core", "Mixing in progress..."), +QT_TRANSLATE_NOOP("darknet-core", "Need to specify a port with -whitebind: '%s'"), +QT_TRANSLATE_NOOP("darknet-core", "No Masternodes detected."), +QT_TRANSLATE_NOOP("darknet-core", "No compatible Masternode found."), +QT_TRANSLATE_NOOP("darknet-core", "No funds detected in need of denominating."), +QT_TRANSLATE_NOOP("darknet-core", "No matching denominations found for mixing."), +QT_TRANSLATE_NOOP("darknet-core", "Node relay options:"), +QT_TRANSLATE_NOOP("darknet-core", "Non-standard public key detected."), +QT_TRANSLATE_NOOP("darknet-core", "Not compatible with existing transactions."), +QT_TRANSLATE_NOOP("darknet-core", "Not enough file descriptors available."), +QT_TRANSLATE_NOOP("darknet-core", "Not in the Masternode list."), +QT_TRANSLATE_NOOP("darknet-core", "Number of automatic wallet backups (default: 10)"), +QT_TRANSLATE_NOOP("darknet-core", "Only accept block chain matching built-in checkpoints (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Only connect to nodes in network (ipv4, ipv6 or onion)"), +QT_TRANSLATE_NOOP("darknet-core", "Options:"), +QT_TRANSLATE_NOOP("darknet-core", "Password for JSON-RPC connections"), +QT_TRANSLATE_NOOP("darknet-core", "Prepend debug output with timestamp (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)"), +QT_TRANSLATE_NOOP("darknet-core", "RPC server options:"), +QT_TRANSLATE_NOOP("darknet-core", "RPC support for HTTP persistent connections (default: %d)"), +QT_TRANSLATE_NOOP("darknet-core", "Randomly drop 1 of every network messages"), +QT_TRANSLATE_NOOP("darknet-core", "Randomly fuzz 1 of every network messages"), +QT_TRANSLATE_NOOP("darknet-core", "Rebuild block chain index from current blk000??.dat files"), +QT_TRANSLATE_NOOP("darknet-core", "Receive and display P2P network alerts (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Relay and mine data carrier transactions (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Relay non-P2SH multisig (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Rescan the block chain for missing wallet transactions"), +QT_TRANSLATE_NOOP("darknet-core", "Rescanning..."), +QT_TRANSLATE_NOOP("darknet-core", "Run a thread to flush wallet periodically (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Run in the background as a daemon and accept commands"), +QT_TRANSLATE_NOOP("darknet-core", "Send trace/debug info to debug.log file (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Send transactions as zero-fee transactions if possible (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Server certificate file (default: %s)"), +QT_TRANSLATE_NOOP("darknet-core", "Server private key (default: %s)"), +QT_TRANSLATE_NOOP("darknet-core", "Session not complete!"), +QT_TRANSLATE_NOOP("darknet-core", "Session timed out."), +QT_TRANSLATE_NOOP("darknet-core", "Set database cache size in megabytes (%d to %d, default: %d)"), +QT_TRANSLATE_NOOP("darknet-core", "Set external address:port to get to this masternode (example: %s)"), +QT_TRANSLATE_NOOP("darknet-core", "Set key pool size to (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Set maximum block size in bytes (default: %d)"), +QT_TRANSLATE_NOOP("darknet-core", "Set minimum block size in bytes (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Set the masternode private key"), +QT_TRANSLATE_NOOP("darknet-core", "Set the number of threads to service RPC calls (default: %d)"), +QT_TRANSLATE_NOOP("darknet-core", "Sets the DB_PRIVATE flag in the wallet db environment (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Show all debugging options (usage: --help -help-debug)"), +QT_TRANSLATE_NOOP("darknet-core", "Shrink debug.log file on client startup (default: 1 when no -debug)"), +QT_TRANSLATE_NOOP("darknet-core", "Signing failed."), +QT_TRANSLATE_NOOP("darknet-core", "Signing timed out."), +QT_TRANSLATE_NOOP("darknet-core", "Signing transaction failed"), +QT_TRANSLATE_NOOP("darknet-core", "Specify configuration file (default: %s)"), +QT_TRANSLATE_NOOP("darknet-core", "Specify connection timeout in milliseconds (minimum: 1, default: %d)"), +QT_TRANSLATE_NOOP("darknet-core", "Specify data directory"), +QT_TRANSLATE_NOOP("darknet-core", "Specify masternode configuration file (default: %s)"), +QT_TRANSLATE_NOOP("darknet-core", "Specify pid file (default: %s)"), +QT_TRANSLATE_NOOP("darknet-core", "Specify wallet file (within data directory)"), +QT_TRANSLATE_NOOP("darknet-core", "Specify your own public address"), +QT_TRANSLATE_NOOP("darknet-core", "Spend unconfirmed change when sending transactions (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Stop running after importing blocks from disk (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Submitted following entries to masternode: %u / %d"), +QT_TRANSLATE_NOOP("darknet-core", "Submitted to masternode, waiting for more entries ( %u / %d ) %s"), +QT_TRANSLATE_NOOP("darknet-core", "Submitted to masternode, waiting in queue %s"), +QT_TRANSLATE_NOOP("darknet-core", "Synchronization failed"), +QT_TRANSLATE_NOOP("darknet-core", "Synchronization finished"), +QT_TRANSLATE_NOOP("darknet-core", "Synchronization pending..."), +QT_TRANSLATE_NOOP("darknet-core", "Synchronizing budgets..."), +QT_TRANSLATE_NOOP("darknet-core", "Synchronizing masternode winners..."), +QT_TRANSLATE_NOOP("darknet-core", "Synchronizing masternodes..."), +QT_TRANSLATE_NOOP("darknet-core", "Synchronizing sporks..."), +QT_TRANSLATE_NOOP("darknet-core", "This help message"), +QT_TRANSLATE_NOOP("darknet-core", "This is experimental software."), +QT_TRANSLATE_NOOP("darknet-core", "This is intended for regression testing tools and app development."), +QT_TRANSLATE_NOOP("darknet-core", "This is not a Masternode."), +QT_TRANSLATE_NOOP("darknet-core", "Threshold for disconnecting misbehaving peers (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Transaction amount too small"), +QT_TRANSLATE_NOOP("darknet-core", "Transaction amounts must be positive"), +QT_TRANSLATE_NOOP("darknet-core", "Transaction created successfully."), +QT_TRANSLATE_NOOP("darknet-core", "Transaction fees are too high."), +QT_TRANSLATE_NOOP("darknet-core", "Transaction not valid."), +QT_TRANSLATE_NOOP("darknet-core", "Transaction too large for fee policy"), +QT_TRANSLATE_NOOP("darknet-core", "Transaction too large"), +QT_TRANSLATE_NOOP("darknet-core", "Transmitting final transaction."), +QT_TRANSLATE_NOOP("darknet-core", "Unable to bind to %s on this computer (bind returned error %s)"), +QT_TRANSLATE_NOOP("darknet-core", "Unable to sign spork message, wrong key?"), +QT_TRANSLATE_NOOP("darknet-core", "Unknown network specified in -onlynet: '%s'"), +QT_TRANSLATE_NOOP("darknet-core", "Unknown state: id = %u"), +QT_TRANSLATE_NOOP("darknet-core", "Upgrade wallet to latest format"), +QT_TRANSLATE_NOOP("darknet-core", "Use KeePass 2 integration using KeePassHttp plugin (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Use N separate masternodes to anonymize funds (2-8, default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Use OpenSSL (https) for JSON-RPC connections"), +QT_TRANSLATE_NOOP("darknet-core", "Use UPnP to map the listening port (default: %u)"), +QT_TRANSLATE_NOOP("darknet-core", "Use UPnP to map the listening port (default: 1 when listening)"), +QT_TRANSLATE_NOOP("darknet-core", "Use the test network"), +QT_TRANSLATE_NOOP("darknet-core", "Username for JSON-RPC connections"), +QT_TRANSLATE_NOOP("darknet-core", "Value more than Obfuscate pool maximum allows."), +QT_TRANSLATE_NOOP("darknet-core", "Verifying blocks..."), +QT_TRANSLATE_NOOP("darknet-core", "Verifying wallet..."), +QT_TRANSLATE_NOOP("darknet-core", "Wallet %s resides outside data directory %s"), +QT_TRANSLATE_NOOP("darknet-core", "Wallet is locked."), +QT_TRANSLATE_NOOP("darknet-core", "Wallet needed to be rewritten: restart DarkNet Core to complete"), +QT_TRANSLATE_NOOP("darknet-core", "Wallet options:"), +QT_TRANSLATE_NOOP("darknet-core", "Wallet window title"), +QT_TRANSLATE_NOOP("darknet-core", "Warning"), +QT_TRANSLATE_NOOP("darknet-core", "Warning: This version is obsolete, upgrade required!"), +QT_TRANSLATE_NOOP("darknet-core", "Warning: Unsupported argument -benchmark ignored, use -debug=bench."), +QT_TRANSLATE_NOOP("darknet-core", "Warning: Unsupported argument -debugnet ignored, use -debug=net."), +QT_TRANSLATE_NOOP("darknet-core", "Will retry..."), +QT_TRANSLATE_NOOP("darknet-core", "You need to rebuild the database using -reindex to change -txindex"), +QT_TRANSLATE_NOOP("darknet-core", "Your entries added successfully."), +QT_TRANSLATE_NOOP("darknet-core", "Your transaction was accepted into the pool!"), +QT_TRANSLATE_NOOP("darknet-core", "Zapping all transactions from wallet..."), +QT_TRANSLATE_NOOP("darknet-core", "on startup"), +QT_TRANSLATE_NOOP("darknet-core", "wallet.dat corrupt, salvage failed"), }; diff --git a/src/qt/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp index 0a7fee4f1b332..77752eb2d3277 100644 --- a/src/qt/editaddressdialog.cpp +++ b/src/qt/editaddressdialog.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -108,7 +109,7 @@ void EditAddressDialog::accept() break; case AddressTableModel::INVALID_ADDRESS: QMessageBox::warning(this, windowTitle(), - tr("The entered address \"%1\" is not a valid Dash address.").arg(ui->addressEdit->text()), + tr("The entered address \"%1\" is not a valid DarkNet address.").arg(ui->addressEdit->text()), QMessageBox::Ok, QMessageBox::Ok); break; case AddressTableModel::DUPLICATE_ADDRESS: diff --git a/src/qt/forms/addressbookpage.ui b/src/qt/forms/addressbookpage.ui index b45d0c10a12c6..4d7bfb5bfe2aa 100644 --- a/src/qt/forms/addressbookpage.ui +++ b/src/qt/forms/addressbookpage.ui @@ -60,7 +60,7 @@ &New - + :/icons/add:/icons/add @@ -77,7 +77,7 @@ &Copy - + :/icons/editcopy:/icons/editcopy @@ -94,7 +94,7 @@ &Delete - + :/icons/remove:/icons/remove @@ -124,7 +124,7 @@ &Export - + :/icons/export:/icons/export @@ -153,7 +153,7 @@ - + diff --git a/src/qt/forms/coincontroldialog.ui b/src/qt/forms/coincontroldialog.ui index a80652c3c3667..96caab34da445 100644 --- a/src/qt/forms/coincontroldialog.ui +++ b/src/qt/forms/coincontroldialog.ui @@ -132,7 +132,7 @@ Qt::ActionsContextMenu - 0.00 DASH + 0.00 DNET Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -206,7 +206,7 @@ Qt::ActionsContextMenu - 0.00 DASH + 0.00 DNET Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -286,7 +286,7 @@ Qt::ActionsContextMenu - 0.00 DASH + 0.00 DNET Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -321,7 +321,7 @@ Qt::ActionsContextMenu - 0.00 DASH + 0.00 DNET Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse diff --git a/src/qt/forms/helpmessagedialog.ui b/src/qt/forms/helpmessagedialog.ui index e1edf58916850..68d490747dc38 100644 --- a/src/qt/forms/helpmessagedialog.ui +++ b/src/qt/forms/helpmessagedialog.ui @@ -16,7 +16,7 @@ - Dash Core - Command-line options + DarkNet Core - Command-line options @@ -28,7 +28,7 @@ - :/images/about + :/images/about @@ -87,7 +87,7 @@ - + diff --git a/src/qt/forms/intro.ui b/src/qt/forms/intro.ui index dd014d90a936b..39d53e662f4ed 100644 --- a/src/qt/forms/intro.ui +++ b/src/qt/forms/intro.ui @@ -20,7 +20,7 @@ QLabel { font-style:italic; } - Welcome to Dash Core. + Welcome to DarkNet Core. true @@ -46,7 +46,7 @@ - As this is the first time the program is launched, you can choose where Dash Core will store its data. + As this is the first time the program is launched, you can choose where DarkNet Core will store its data. true @@ -56,7 +56,7 @@ - Dash Core will download and store a copy of the Dash block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory. + DarkNet Core will download and store a copy of the DarkNet block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory. true diff --git a/src/qt/forms/darksendconfig.ui b/src/qt/forms/obfuscateconfig.ui similarity index 93% rename from src/qt/forms/darksendconfig.ui rename to src/qt/forms/obfuscateconfig.ui index 914431d6172ed..f46b34665f38e 100644 --- a/src/qt/forms/darksendconfig.ui +++ b/src/qt/forms/obfuscateconfig.ui @@ -1,7 +1,7 @@ - DarksendConfig - + ObfuscateConfig + 0 @@ -11,7 +11,7 @@ - Configure Darksend + Configure Obfuscate @@ -75,7 +75,7 @@ - Use 2 separate masternodes to mix funds up to 1000 DASH + Use 2 separate masternodes to mix funds up to 1000 DNET @@ -88,7 +88,7 @@ - Use 8 separate masternodes to mix funds up to 1000 DASH + Use 8 separate masternodes to mix funds up to 1000 DNET @@ -114,7 +114,7 @@ - This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH + This option is the quickest and will cost about ~0.025 DNET to anonymize 1000 DNET @@ -127,7 +127,7 @@ - This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH + This option is moderately fast and will cost about 0.05 DNET to anonymize 1000 DNET @@ -153,7 +153,7 @@ - 0.1 DASH per 1000 DASH you anonymize. + 0.1 DNET per 1000 DNET you anonymize. diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index 27e8773fcac81..34964b1ce8c27 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -30,10 +30,10 @@ - Automatically start Dash after logging in to the system. + Automatically start DarkNet after logging in to the system. - &Start Dash on system login + &Start DarkNet on system login @@ -138,12 +138,12 @@ This setting determines the amount of individual masternodes that an input will be anonymized through.<br/>More rounds of anonymization gives a higher degree of privacy, but also costs more in fees. - Darksend rounds to use + Obfuscate rounds to use - + 2 @@ -162,7 +162,7 @@ - This amount acts as a threshold to turn off Darksend once it's reached. + This amount acts as a threshold to turn off Obfuscate once it's reached. @@ -177,7 +177,7 @@ - Amount of Dash to keep anonymized + Amount of DarkNet to keep anonymized @@ -258,7 +258,7 @@ - Automatically open the Dash client port on the router. This only works when your router supports UPnP and it is enabled. + Automatically open the DarkNet client port on the router. This only works when your router supports UPnP and it is enabled. Map port using &UPnP @@ -278,7 +278,7 @@ - Connect to the Dash network through a SOCKS5 proxy. + Connect to the DarkNet network through a SOCKS5 proxy. &Connect through SOCKS5 proxy (default proxy): @@ -444,7 +444,7 @@ - The user interface language can be set here. This setting will take effect after restarting Dash. + The user interface language can be set here. This setting will take effect after restarting DarkNet. @@ -466,7 +466,7 @@ Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ true diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index a7925a3730b35..860e942a3840d 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -70,7 +70,7 @@ WhatsThisCursor - The displayed information may be out of date. Your wallet automatically synchronizes with the Dash network after a connection is established, but this process has not completed yet. + The displayed information may be out of date. Your wallet automatically synchronizes with the DarkNet network after a connection is established, but this process has not completed yet. QLabel { color: red; } @@ -396,7 +396,7 @@ - + 0 @@ -446,7 +446,7 @@ - + 154 @@ -461,7 +461,7 @@ - Darksend Balance: + Obfuscate Balance: @@ -474,7 +474,7 @@ - 0 DASH + 0 DNET @@ -488,7 +488,7 @@ - 0 DASH / 0 Rounds + 0 DNET / 0 Rounds @@ -510,7 +510,7 @@ - + Enabled/Disabled @@ -955,7 +955,7 @@ true - + 10 @@ -987,7 +987,7 @@ Qt::Horizontal - + 10 @@ -1012,7 +1012,7 @@ true - + 230 @@ -1028,13 +1028,13 @@ - Try to manually submit a Darksend request. + Try to manually submit a Obfuscate request. Try Mix - + 230 @@ -1050,7 +1050,7 @@ - Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!) + Reset the current status of Obfuscate (can interrupt Obfuscate if it's in the process of Mixing, which can cost you money!) false @@ -1078,14 +1078,14 @@ - Darksend + Obfuscate - + - The displayed information may be out of date. Your wallet automatically synchronizes with the Dash network after a connection is established, but this process has not completed yet. + The displayed information may be out of date. Your wallet automatically synchronizes with the DarkNet network after a connection is established, but this process has not completed yet. QLabel { color: red; } @@ -1162,7 +1162,7 @@ WhatsThisCursor - The displayed information may be out of date. Your wallet automatically synchronizes with the Dash network after a connection is established, but this process has not completed yet. + The displayed information may be out of date. Your wallet automatically synchronizes with the DarkNet network after a connection is established, but this process has not completed yet. QLabel { color: red; } diff --git a/src/qt/forms/receivecoinsdialog.ui b/src/qt/forms/receivecoinsdialog.ui index e0234fb368f05..d90a457898f93 100644 --- a/src/qt/forms/receivecoinsdialog.ui +++ b/src/qt/forms/receivecoinsdialog.ui @@ -48,7 +48,7 @@ - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Dash network. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the DarkNet network. &Message: @@ -71,7 +71,7 @@ - An optional message to attach to the payment request, which will be displayed when the request is opened.<br>Note: The message will not be sent with the payment over the Dash network. + An optional message to attach to the payment request, which will be displayed when the request is opened.<br>Note: The message will not be sent with the payment over the DarkNet network. @@ -141,7 +141,7 @@ &Request payment - + :/icons/receiving_addresses:/icons/receiving_addresses @@ -161,7 +161,7 @@ Clear - + :/icons/remove:/icons/remove @@ -264,7 +264,7 @@ Show - + :/icons/edit:/icons/edit @@ -284,7 +284,7 @@ Remove - + :/icons/remove:/icons/remove @@ -332,7 +332,7 @@ removeRequestButton - + diff --git a/src/qt/forms/rpcconsole.ui b/src/qt/forms/rpcconsole.ui index 089b9de898e95..01abc5792697a 100644 --- a/src/qt/forms/rpcconsole.ui +++ b/src/qt/forms/rpcconsole.ui @@ -185,7 +185,7 @@ - Open the Dash debug log file from the current data directory. This can take a few seconds for large log files. + Open the DarkNet debug log file from the current data directory. This can take a few seconds for large log files. &Open @@ -414,7 +414,7 @@ - + :/icons/remove:/icons/remove @@ -1334,7 +1334,7 @@ - + diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index e89957058d42f..453c523de4853 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -7,7 +7,7 @@ 0 0 850 - 526 + 610 @@ -324,7 +324,7 @@ Qt::ActionsContextMenu - 0.00 DASH + 0.00 DNET Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -404,7 +404,7 @@ Qt::ActionsContextMenu - 0.00 DASH + 0.00 DNET Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -484,7 +484,7 @@ Qt::ActionsContextMenu - 0.00 DASH + 0.00 DNET Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -513,7 +513,7 @@ Qt::ActionsContextMenu - 0.00 DASH + 0.00 DNET Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -617,7 +617,7 @@ 0 0 830 - 68 + 91 @@ -845,7 +845,7 @@ 4 - + 6 @@ -855,7 +855,7 @@ - If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee,<br />while "at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte. + If the custom fee is set to 1000 uDNETs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uDNETs in fee,<br />while "at least" pays 1000 uDNETs. For transactions bigger than a kilobyte both pay by kilobyte. per kilobyte @@ -871,7 +871,7 @@ - If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee,<br />while "total at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte. + If the custom fee is set to 1000 uDNETs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uDNETs in fee,<br />while "total at least" pays 1000 uDNETs. For transactions bigger than a kilobyte both pay by kilobyte. total at least @@ -904,7 +904,7 @@ - Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process. + Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for DarkNet transactions than the network can process. @@ -917,7 +917,7 @@ true - Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process. + Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for DarkNet transactions than the network can process. (read the tooltip) @@ -944,21 +944,8 @@ - - - - - - Recommended: - - - true - - - groupFee - - - + + @@ -974,12 +961,12 @@ - + - Custom: + groupFee @@ -1001,7 +988,7 @@ - + 6 @@ -1011,33 +998,6 @@ - - - - - - - 2 - - - - - - - - - - - - - - (Smart fee not initialized yet. This usually takes a few blocks...) - - - 2 - - - @@ -1165,6 +1125,60 @@ + + + + Recommended + + + + + + + + + + true + + + groupFee + + + + + + + Custom: + + + + + + + + + + 2 + + + + + + + (Smart fee not initialized yet. This usually takes a few blocks...) + + + 2 + + + + + + + + + + @@ -1258,7 +1272,7 @@ S&end - + :/icons/send:/icons/send @@ -1284,7 +1298,7 @@ Clear &All - + :/icons/remove:/icons/remove @@ -1301,7 +1315,7 @@ Add &Recipient - + :/icons/add:/icons/add @@ -1328,7 +1342,7 @@ 3 - + 95 @@ -1336,7 +1350,7 @@ - Darksend + Obfuscate false @@ -1344,7 +1358,7 @@ - + true @@ -1355,7 +1369,7 @@ - InstantX + SwiftTX @@ -1378,7 +1392,7 @@ IBeamCursor - 123.456 DASH + 123.456 DNET Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -1405,11 +1419,11 @@ - + - + diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui index a6d0a8cf242eb..af9171f6c1e42 100644 --- a/src/qt/forms/sendcoinsentry.ui +++ b/src/qt/forms/sendcoinsentry.ui @@ -7,7 +7,7 @@ 0 0 729 - 150 + 156 @@ -51,7 +51,7 @@ - The Dash address to send the payment to + The DarkNet address to send the payment to @@ -64,7 +64,7 @@ - + :/icons/address-book:/icons/address-book @@ -81,7 +81,7 @@ - + :/icons/editpaste:/icons/editpaste @@ -98,7 +98,7 @@ - + :/icons/remove:/icons/remove @@ -106,7 +106,7 @@ - + &Label: @@ -154,7 +154,7 @@ - A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. + A message that was attached to the DarkNet: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the DarkNet network. Qt::PlainText @@ -622,7 +622,7 @@ - + :/icons/remove:/icons/remove @@ -1158,7 +1158,7 @@ - + :/icons/remove:/icons/remove @@ -1230,7 +1230,7 @@ deleteButton_s - + diff --git a/src/qt/forms/signverifymessagedialog.ui b/src/qt/forms/signverifymessagedialog.ui index 66d7c5b111df8..ec8ef308f6490 100644 --- a/src/qt/forms/signverifymessagedialog.ui +++ b/src/qt/forms/signverifymessagedialog.ui @@ -48,7 +48,7 @@ - The Dash address to sign the message with + The DarkNet address to sign the message with @@ -61,7 +61,7 @@ - + :/icons/address-book:/icons/address-book @@ -81,7 +81,7 @@ - + :/icons/editpaste:/icons/editpaste @@ -137,7 +137,7 @@ - + :/icons/editcopy:/icons/editcopy @@ -152,13 +152,13 @@ - Sign the message to prove you own this Dash address + Sign the message to prove you own this DarkNet address Sign &Message - + :/icons/edit:/icons/edit @@ -175,7 +175,7 @@ Clear &All - + :/icons/remove:/icons/remove @@ -258,7 +258,7 @@ - The Dash address the message was signed with + The DarkNet address the message was signed with @@ -271,7 +271,7 @@ - + :/icons/address-book:/icons/address-book @@ -295,13 +295,13 @@ - Verify the message to ensure it was signed with the specified Dash address + Verify the message to ensure it was signed with the specified DarkNet address Verify &Message - + :/icons/transaction_0:/icons/transaction_0 @@ -318,7 +318,7 @@ Clear &All - + :/icons/remove:/icons/remove @@ -384,7 +384,7 @@ - + diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h index 74d5f39b011c7..dd81d3e1fc8ef 100644 --- a/src/qt/guiconstants.h +++ b/src/qt/guiconstants.h @@ -1,5 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -45,9 +46,9 @@ static const int MAX_URI_LENGTH = 255; /* Number of frames in spinner animation */ #define SPINNER_FRAMES 35 -#define QAPP_ORG_NAME "Dash" -#define QAPP_ORG_DOMAIN "dashpay.io" -#define QAPP_APP_NAME_DEFAULT "Dash-Qt" -#define QAPP_APP_NAME_TESTNET "Dash-Qt-testnet" +#define QAPP_ORG_NAME "DarkNet" +#define QAPP_ORG_DOMAIN "darknet-crypto.com" +#define QAPP_APP_NAME_DEFAULT "DarkNet-Qt" +#define QAPP_APP_NAME_TESTNET "DarkNet-Qt-testnet" #endif // BITCOIN_QT_GUICONSTANTS_H diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 6f495230b65de..d320632e909ee 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -107,7 +108,7 @@ void setupAddressWidget(QValidatedLineEdit *widget, QWidget *parent) #if QT_VERSION >= 0x040700 // We don't want translators to use own addresses in translations // and this is the only place, where this address is supplied. - widget->setPlaceholderText(QObject::tr("Enter a Dash address (e.g. %1)").arg("XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg")); + widget->setPlaceholderText(QObject::tr("Enter a DarkNet address (e.g. %1)").arg("D7VFR83SQbiezrW72hjcWJtcfip5krte2Z")); #endif widget->setValidator(new BitcoinAddressEntryValidator(parent)); widget->setCheckValidator(new BitcoinAddressCheckValidator(parent)); @@ -124,8 +125,8 @@ void setupAmountWidget(QLineEdit *widget, QWidget *parent) bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out) { - // return if URI is not valid or is no dash: URI - if(!uri.isValid() || uri.scheme() != QString("dash")) + // return if URI is not valid or is no DarkNet: URI + if(!uri.isValid() || uri.scheme() != QString("darknet")) return false; SendCoinsRecipient rv; @@ -165,7 +166,7 @@ bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out) { if(!i->second.isEmpty()) { - if(!BitcoinUnits::parse(BitcoinUnits::DASH, i->second, &rv.amount)) + if(!BitcoinUnits::parse(BitcoinUnits::DNET, i->second, &rv.amount)) { return false; } @@ -185,13 +186,13 @@ bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out) bool parseBitcoinURI(QString uri, SendCoinsRecipient *out) { - // Convert dash:// to dash: + // Convert darknet:// to darknet: // - // Cannot handle this later, because dash:// will cause Qt to see the part after // as host, + // Cannot handle this later, because darkent:// will cause Qt to see the part after // as host, // which will lower-case it (and thus invalidate the address). - if(uri.startsWith("dash://", Qt::CaseInsensitive)) + if(uri.startsWith("darknet://", Qt::CaseInsensitive)) { - uri.replace(0, 7, "dash:"); + uri.replace(0, 12, "darknet:"); } QUrl uriInstance(uri); return parseBitcoinURI(uriInstance, out); @@ -199,12 +200,12 @@ bool parseBitcoinURI(QString uri, SendCoinsRecipient *out) QString formatBitcoinURI(const SendCoinsRecipient &info) { - QString ret = QString("dash:%1").arg(info.address); + QString ret = QString("darknet:%1").arg(info.address); int paramCount = 0; if (info.amount) { - ret += QString("?amount=%1").arg(BitcoinUnits::format(BitcoinUnits::DASH, info.amount, false, BitcoinUnits::separatorNever)); + ret += QString("?amount=%1").arg(BitcoinUnits::format(BitcoinUnits::DNET, info.amount, false, BitcoinUnits::separatorNever)); paramCount++; } @@ -392,7 +393,7 @@ void openConfigfile() { boost::filesystem::path pathConfig = GetConfigFile(); - /* Open dash.conf with the associated application */ + /* Open darknet.conf with the associated application */ if (boost::filesystem::exists(pathConfig)) QDesktopServices::openUrl(QUrl::fromLocalFile(boostPathToQString(pathConfig))); } @@ -590,12 +591,12 @@ TableViewLastColumnResizingFixer::TableViewLastColumnResizingFixer(QTableView* t #ifdef WIN32 boost::filesystem::path static StartupShortcutPath() { - return GetSpecialFolderPath(CSIDL_STARTUP) / "Dash.lnk"; + return GetSpecialFolderPath(CSIDL_STARTUP) / "DarkNet.lnk"; } bool GetStartOnSystemStartup() { - // check for Dash.lnk + // check for DarkNet.lnk return boost::filesystem::exists(StartupShortcutPath()); } @@ -672,7 +673,7 @@ boost::filesystem::path static GetAutostartDir() boost::filesystem::path static GetAutostartFilePath() { - return GetAutostartDir() / "dash.desktop"; + return GetAutostartDir() / "darknet.desktop"; } bool GetStartOnSystemStartup() @@ -710,10 +711,10 @@ bool SetStartOnSystemStartup(bool fAutoStart) boost::filesystem::ofstream optionFile(GetAutostartFilePath(), std::ios_base::out|std::ios_base::trunc); if (!optionFile.good()) return false; - // Write a dash.desktop file to the autostart directory: + // Write a darknet.desktop file to the autostart directory: optionFile << "[Desktop Entry]\n"; optionFile << "Type=Application\n"; - optionFile << "Name=Dash\n"; + optionFile << "Name=DarkNet\n"; optionFile << "Exec=" << pszExePath << " -min\n"; optionFile << "Terminal=false\n"; optionFile << "Hidden=false\n"; @@ -732,7 +733,7 @@ bool SetStartOnSystemStartup(bool fAutoStart) LSSharedFileListItemRef findStartupItemInList(LSSharedFileListRef list, CFURLRef findUrl); LSSharedFileListItemRef findStartupItemInList(LSSharedFileListRef list, CFURLRef findUrl) { - // loop through the list of startup items and try to find the dash app + // loop through the list of startup items and try to find the darknet app CFArrayRef listSnapshot = LSSharedFileListCopySnapshot(list, NULL); for(int i = 0; i < CFArrayGetCount(listSnapshot); i++) { LSSharedFileListItemRef item = (LSSharedFileListItemRef)CFArrayGetValueAtIndex(listSnapshot, i); @@ -766,7 +767,7 @@ bool SetStartOnSystemStartup(bool fAutoStart) LSSharedFileListItemRef foundItem = findStartupItemInList(loginItems, bitcoinAppUrl); if(fAutoStart && !foundItem) { - // add dash app to startup item list + // add darknet app to startup item list LSSharedFileListInsertItemURL(loginItems, kLSSharedFileListItemBeforeFirst, NULL, NULL, bitcoinAppUrl, NULL, NULL); } else if(!fAutoStart && foundItem) { @@ -817,8 +818,8 @@ QString loadStyleSheet() cssName = QString(":/css/") + theme; } else { - cssName = QString(":/css/drkblue"); - settings.setValue("theme", "drkblue"); + cssName = QString(":/css/drk-1"); + settings.setValue("theme", "drk-1"); } QFile qFile(cssName); diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h index 4dd6ca2f6c5a3..2b279595fb7a5 100644 --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -29,7 +29,7 @@ class QUrl; class QWidget; QT_END_NAMESPACE -/** Utility functions used by the Dash Qt UI. +/** Utility functions used by the DarkNet Qt UI. */ namespace GUIUtil { @@ -37,14 +37,14 @@ namespace GUIUtil QString dateTimeStr(const QDateTime &datetime); QString dateTimeStr(qint64 nTime); - // Render Dash addresses in monospace font + // Render DarkNet addresses in monospace font QFont bitcoinAddressFont(); // Set up widgets for address and amounts void setupAddressWidget(QValidatedLineEdit *widget, QWidget *parent); void setupAmountWidget(QLineEdit *widget, QWidget *parent); - // Parse "dash:" URI into recipient object, return true on successful parsing + // Parse "darknet:" URI into recipient object, return true on successful parsing bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out); bool parseBitcoinURI(QString uri, SendCoinsRecipient *out); QString formatBitcoinURI(const SendCoinsRecipient &info); @@ -106,7 +106,7 @@ namespace GUIUtil // Open debug.log void openDebugLogfile(); - // Open dash.conf + // Open darknet.conf void openConfigfile(); // Browse backup folder diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index b31091ceb575c..7533945a672b9 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -182,7 +183,7 @@ void Intro::pickDataDirectory() TryCreateDirectory(GUIUtil::qstringToBoostPath(dataDir)); break; } catch(fs::filesystem_error &e) { - QMessageBox::critical(0, tr("Dash Core"), + QMessageBox::critical(0, tr("DarkNet Core"), tr("Error: Specified data directory \"%1\" cannot be created.").arg(dataDir)); /* fall through, back to choosing screen */ } @@ -191,8 +192,8 @@ void Intro::pickDataDirectory() settings.setValue("strDataDir", dataDir); } /* Only override -datadir if different from the default, to make it possible to - * override -datadir in the dash.conf file in the default data directory - * (to be consistent with dashd behavior) + * override -datadir in the darknet.conf file in the default data directory + * (to be consistent with darknetd behavior) */ if(dataDir != getDefaultDataDirectory()) SoftSetArg("-datadir", GUIUtil::qstringToBoostPath(dataDir).string()); // use OS locale for path setting diff --git a/src/qt/locale/dash_bg.ts b/src/qt/locale/darknet_bg.ts similarity index 93% rename from src/qt/locale/dash_bg.ts rename to src/qt/locale/darknet_bg.ts index c9b6fcf5efe95..a8d09d6e48770 100644 --- a/src/qt/locale/dash_bg.ts +++ b/src/qt/locale/darknet_bg.ts @@ -176,8 +176,8 @@ Потвърдете на шифрирането на портфейла - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DASH</b>! - Внимание: Ако шифрирате вашия портфейл и загубите паролата си, <b>ЩЕ ЗАГУБИТЕ ВСИЧКИ DASH МОНЕТИ!</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DNET</b>! + Внимание: Ако шифрирате вашия портфейл и загубите паролата си, <b>ЩЕ ЗАГУБИТЕ ВСИЧКИ DNET МОНЕТИ!</b>! Are you sure you wish to encrypt your wallet? @@ -188,7 +188,7 @@ Портфейлът е шифриран - Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dashs from being stolen by malware infecting your computer. + Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your darknets from being stolen by malware infecting your computer. Dash ще се затвори, за да завърши процеса по шифриране. Запомнете, че шифрирането на вашия портфейл не може напълно да ви предпази от кражба на монетите чрез зловреден софтуер инфектирал компютъра ви. @@ -263,7 +263,7 @@ &Получаване - Request payments (generates QR codes and dash: URIs) + Request payments (generates QR codes and darknet: URIs) Заявка за плащане (генерира QR кодове и Dash: URI) @@ -443,7 +443,7 @@ Отвори &URI... - Open a dash: URI or payment request + Open a darknet: URI or payment request Отвори Dash: URI или заявка за плащане @@ -741,8 +741,8 @@ Address: %4 Копирай рестото - Non-anonymized input selected. <b>Darksend will be disabled.</b><br><br>If you still want to use Darksend, please deselect all non-nonymized inputs first and then check Darksend checkbox again. - Избрани са не-анонимизирани наличности. <b>Darksend ще бъде изключен.</b><br><br>Ако искате да използвате Darksend, моля отменете избора на всички не-анонимизирани наличности и след това изберете чекбокса на Darksend отново. + Non-anonymized input selected. <b>Obfuscate will be disabled.</b><br><br>If you still want to use Obfuscate, please deselect all non-nonymized inputs first and then check Obfuscate checkbox again. + Избрани са не-анонимизирани наличности. <b>Obfuscate ще бъде изключен.</b><br><br>Ако искате да използвате Obfuscate, моля отменете избора на всички не-анонимизирани наличности и след това изберете чекбокса на Obfuscate отново. highest @@ -842,10 +842,10 @@ Address: %4 - DarksendConfig + ObfuscateConfig - Configure Darksend - Настройка на Darksend + Configure Obfuscate + Настройка на Obfuscate Basic Privacy @@ -864,48 +864,48 @@ Address: %4 Моля изберете ниво на сигурност. - Use 2 separate masternodes to mix funds up to 1000 DASH - Използване на 2 различни masternodes за смесване на средства до 1000 DASH + Use 2 separate masternodes to mix funds up to 1000 DNET + Използване на 2 различни masternodes за смесване на средства до 1000 DNET - Use 8 separate masternodes to mix funds up to 1000 DASH - Използване на 8 различни masternodes за смесване на средства до 1000 DASH + Use 8 separate masternodes to mix funds up to 1000 DNET + Използване на 8 различни masternodes за смесване на средства до 1000 DNET Use 16 separate masternodes - Използване на 16 различни masternodes за смесване на средства до 1000 DASH + Използване на 16 различни masternodes за смесване на средства до 1000 DNET - This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH - Това е най-бързият вариант, анонимизиране на 1000 DASH ще ви струва около 0.025 DASH + This option is the quickest and will cost about ~0.025 DNET to anonymize 1000 DNET + Това е най-бързият вариант, анонимизиране на 1000 DNET ще ви струва около 0.025 DNET - This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH - Това е средно бърз вариант, анонимизиране на 1000 DASH ще ви струва около 0.05 DASH + This option is moderately fast and will cost about 0.05 DNET to anonymize 1000 DNET + Това е средно бърз вариант, анонимизиране на 1000 DNET ще ви струва около 0.05 DNET - 0.1 DASH per 1000 DASH you anonymize. - 0.1 DASH за всеки 1000 DASH които анонимизирате. + 0.1 DNET per 1000 DNET you anonymize. + 0.1 DNET за всеки 1000 DNET които анонимизирате. This is the slowest and most secure option. Using maximum anonymity will cost Това е най-бавния и най-сигурен начин. Използването на максимална анонимност ще ви коства - Darksend Configuration - Настройка на Darksend + Obfuscate Configuration + Настройка на Obfuscate - Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend беше успешно настроен на режим основен (%1 и 2 цикъла). Можете да промените тази настройка по всяко време, като отворите конфигурационния прозорец на Dash. + Obfuscate was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate беше успешно настроен на режим основен (%1 и 2 цикъла). Можете да промените тази настройка по всяко време, като отворите конфигурационния прозорец на Dash. - Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend беше успешно настроен на режим висок (%1 и 8 цикъла). Можете да промените тази настройка по всяко време, като отворите конфигурационния прозорец на Dash. + Obfuscate was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate беше успешно настроен на режим висок (%1 и 8 цикъла). Можете да промените тази настройка по всяко време, като отворите конфигурационния прозорец на Dash. - Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend беше успешно настроен на режим максимум (%1 и 16 цикъла). Можете да промените тази настройка по всяко време, като отворите конфигурационния прозорец на Dash. + Obfuscate was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate беше успешно настроен на режим максимум (%1 и 16 цикъла). Можете да промените тази настройка по всяко време, като отворите конфигурационния прозорец на Dash. @@ -1146,12 +1146,12 @@ Address: %4 (0 = автоматично, <0 = оставете толкова неизползвани ядра) - Darksend rounds to use + Obfuscate rounds to use Използвани Dash цикли - This amount acts as a threshold to turn off Darksend once it's reached. - Тази сума действа като праг, за да се изключи Darksend, когато той е достигнат. + This amount acts as a threshold to turn off Obfuscate once it's reached. + Тази сума действа като праг, за да се изключи Obfuscate, когато той е достигнат. Amount of Dash to keep anonymized @@ -1263,9 +1263,9 @@ Address: %4 Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ Липсва език или превода е непълен? Можете да помогнете с превода тук: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ User Interface Theme: @@ -1423,16 +1423,16 @@ https://www.transifex.com/projects/p/dash/ Завършено: - Darksend Balance: - Darksend баланс: + Obfuscate Balance: + Obfuscate баланс: Amount and Rounds: Количество и цикли: - 0 DASH / 0 Rounds - 0 DASH / 0 Цикъла + 0 DNET / 0 Rounds + 0 DNET / 0 Цикъла Submitted Denom: @@ -1443,8 +1443,8 @@ https://www.transifex.com/projects/p/dash/ Няма такова - Darksend - Darksend + Obfuscate + Obfuscate Recent transactions @@ -1463,16 +1463,16 @@ https://www.transifex.com/projects/p/dash/ (Последно съобщение) - Try to manually submit a Darksend request. - Опитай ръчно изпращане на Darksend заявка. + Try to manually submit a Obfuscate request. + Опитай ръчно изпращане на Obfuscate заявка. Try Mix Опитай смесване - Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!) - Изчистване на текущия статус на Darksend (може да прекъсне Darksend по време на миксиране, което може да ви коства пари!) + Reset the current status of Obfuscate (can interrupt Obfuscate if it's in the process of Mixing, which can cost you money!) + Изчистване на текущия статус на Obfuscate (може да прекъсне Obfuscate по време на миксиране, което може да ви коства пари!) Reset @@ -1487,12 +1487,12 @@ https://www.transifex.com/projects/p/dash/ Неактивно - Start Darksend Mixing - Пусни Darksend смесването + Start Obfuscate Mixing + Пусни Obfuscate смесването - Stop Darksend Mixing - Спри Darksend смесването + Stop Obfuscate Mixing + Спри Obfuscate смесването No inputs detected @@ -1535,9 +1535,9 @@ https://www.transifex.com/projects/p/dash/ Активирано - Last Darksend message: + Last Obfuscate message: - Последно Darksend съобщение: + Последно Obfuscate съобщение: @@ -1545,20 +1545,20 @@ https://www.transifex.com/projects/p/dash/ N/A - Darksend was successfully reset. - Darksend беше успешно нулиран. + Obfuscate was successfully reset. + Obfuscate беше успешно нулиран. - If you don't want to see internal Darksend fees/transactions select "Most Common" as Type on the "Transactions" tab. - Ако не искате да видите вътрешните Darksend такси/транзакции изберете "Най-често срещаните" като тип от раздел "Операции" . + If you don't want to see internal Obfuscate fees/transactions select "Most Common" as Type on the "Transactions" tab. + Ако не искате да видите вътрешните Obfuscate такси/транзакции изберете "Най-често срещаните" като тип от раздел "Операции" . - Darksend requires at least %1 to use. - Darksend се нуждае от поне %1 за да започне. + Obfuscate requires at least %1 to use. + Obfuscate се нуждае от поне %1 за да започне. - Wallet is locked and user declined to unlock. Disabling Darksend. - Портфейлът е заключен и потребителя отказва отключване. Darksend е деактивиран. + Wallet is locked and user declined to unlock. Disabling Obfuscate. + Портфейлът е заключен и потребителя отказва отключване. Obfuscate е деактивиран. @@ -1568,8 +1568,8 @@ https://www.transifex.com/projects/p/dash/ Грешка в заявката за плащане - Cannot start dash: click-to-pay handler - Не може да стартира dash: кликни за плащане на притежателя + Cannot start darknet: click-to-pay handler + Не може да стартира darknet: кликни за плащане на притежателя URI handling @@ -2292,8 +2292,8 @@ https://www.transifex.com/projects/p/dash/ Ако променената такса е 1000 duffs и транзакцията е само 250 байта, тогава "за килобайт" само плаща такса 250 duffs,<br /> тогава"за последно" заплаща 1000 duffs. За транзакции по-големи от килобайт едновременно се заплащат от килобайт. - Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process. - Разплащането само минималната такса ще продължи толкова дълго,докато транзакцията заема по-малък обем в блоковото пространство.<br /> Но имайте предвид, че транзакцията може да се окаже без първоначално потвърждение ако се появи голямо търсене на dash транзакции отколкото мрежата може да обработи. + Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for darknet transactions than the network can process. + Разплащането само минималната такса ще продължи толкова дълго,докато транзакцията заема по-малък обем в блоковото пространство.<br /> Но имайте предвид, че транзакцията може да се окаже без първоначално потвърждение ако се появи голямо търсене на darknet транзакции отколкото мрежата може да обработи. per kilobyte @@ -2364,12 +2364,12 @@ https://www.transifex.com/projects/p/dash/ Добави &получател - Darksend - Darksend + Obfuscate + Obfuscate - InstantX - InstantX + SwiftTX + SwiftTX Balance: @@ -2416,16 +2416,16 @@ https://www.transifex.com/projects/p/dash/ анонимни средства - (darksend requires this amount to be rounded up to the nearest %1). - (darksend изисква тази сума да бъде закръглена до най-близката %1). + (obfuscate requires this amount to be rounded up to the nearest %1). + (obfuscate изисква тази сума да бъде закръглена до най-близката %1). any available funds (not recommended) всякакви налични средства (не се препоръчва) - and InstantX - и InstantX + and SwiftTX + и SwiftTX %1 to %2 @@ -2559,8 +2559,8 @@ https://www.transifex.com/projects/p/dash/ Съобщение: - A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. - Съобщението което беше прикрепено към dash: URI ще бъде запазено с транзакцията за ваше сведение. Забележка: Това съобщение няма да бъде изпратено през Dash мрежата. + A message that was attached to the darknet: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. + Съобщението което беше прикрепено към darknet: URI ще бъде запазено с транзакцията за ваше сведение. Забележка: Това съобщение няма да бъде изпратено през Dash мрежата. This is an unverified payment request. @@ -2778,16 +2778,16 @@ https://www.transifex.com/projects/p/dash/ конфликтно - %1/offline (verified via instantx) - %1/офлайн(проверено през instantx) + %1/offline (verified via swifttx) + %1/офлайн(проверено през swifttx) - %1/confirmed (verified via instantx) - %1/потвърдени (проверено от instantx) + %1/confirmed (verified via swifttx) + %1/потвърдени (проверено от swifttx) - %1 confirmations (verified via instantx) - %1 потвърждения (проверено от instantx) + %1 confirmations (verified via swifttx) + %1 потвърждения (проверено от swifttx) %1/offline @@ -2802,24 +2802,24 @@ https://www.transifex.com/projects/p/dash/ включена в %1 блока - %1/offline (InstantX verification in progress - %2 of %3 signatures) - %1/офлайн (InstantX проверка в процес - %2 of %3 подписани) + %1/offline (SwiftTX verification in progress - %2 of %3 signatures) + %1/офлайн (SwiftTX проверка в процес - %2 of %3 подписани) - %1/confirmed (InstantX verification in progress - %2 of %3 signatures ) - %1/потвърдени (InstantX проверка в процес - %2 of %3 подписани ) + %1/confirmed (SwiftTX verification in progress - %2 of %3 signatures ) + %1/потвърдени (SwiftTX проверка в процес - %2 of %3 подписани ) - %1 confirmations (InstantX verification in progress - %2 of %3 signatures) - %1 потвърждения (InstantX проверка в процес - %2 of %3 подписвания) + %1 confirmations (SwiftTX verification in progress - %2 of %3 signatures) + %1 потвърждения (SwiftTX проверка в процес - %2 of %3 подписвания) - %1/offline (InstantX verification failed) - %1/офлайн (InstantX проверката е неуспешна) + %1/offline (SwiftTX verification failed) + %1/офлайн (SwiftTX проверката е неуспешна) - %1/confirmed (InstantX verification failed) - %1/потвърдени (InstantX проверката е неуспешна) + %1/confirmed (SwiftTX verification failed) + %1/потвърдени (SwiftTX проверката е неуспешна) Status @@ -3020,8 +3020,8 @@ https://www.transifex.com/projects/p/dash/ Получен от - Received via Darksend - Получени с Darksend + Received via Obfuscate + Получени с Obfuscate Sent to @@ -3036,20 +3036,20 @@ https://www.transifex.com/projects/p/dash/ Емитирани - Darksend Denominate - Darksend деноминация + Obfuscate Denominate + Obfuscate деноминация - Darksend Collateral Payment - Darksend обезпечава плащането + Obfuscate Collateral Payment + Obfuscate обезпечава плащането - Darksend Make Collateral Inputs - Darksend направи обезпечение на постъпленията + Obfuscate Make Collateral Inputs + Obfuscate направи обезпечение на постъпленията - Darksend Create Denominations - Darksend направени деноминации + Obfuscate Create Denominations + Obfuscate направени деноминации Darksent @@ -3135,20 +3135,20 @@ https://www.transifex.com/projects/p/dash/ Darksent - Darksend Make Collateral Inputs - Darksend направи обезпечение на постъпленията + Obfuscate Make Collateral Inputs + Obfuscate направи обезпечение на постъпленията - Darksend Create Denominations - Darksend създава деноминации + Obfuscate Create Denominations + Obfuscate създава деноминации - Darksend Denominate - Darksend деноминация + Obfuscate Denominate + Obfuscate деноминация - Darksend Collateral Payment - Darksend обезпечава плащането + Obfuscate Collateral Payment + Obfuscate обезпечава плащането To yourself @@ -3276,8 +3276,8 @@ https://www.transifex.com/projects/p/dash/ Изпращане - InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH. - InstantX не поддържа изпращане на толкова големи суми. Транзакциите са ограничени до %1 DASH. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 DNET. + SwiftTX не поддържа изпращане на толкова големи суми. Транзакциите са ограничени до %1 DNET. @@ -3320,7 +3320,7 @@ https://www.transifex.com/projects/p/dash/ - dash-core + darknet-core Bind to given address and always listen on it. Use [host]:port notation for IPv6 Свързва се с посочения адрес и винаги слуша за него. Използвайте [хост]:порт за изписване при IPv6 @@ -3330,8 +3330,8 @@ https://www.transifex.com/projects/p/dash/ Не може да се заключи дата директорията %s. Dash ядрото вече работи. - Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. - Darksend използва всички деноминирани наличности за да изпрати сумата, може би ще е необходимо да бъдат анонимизирани още монети. + Obfuscate uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. + Obfuscate използва всички деноминирани наличности за да изпрати сумата, може би ще е необходимо да бъдат анонимизирани още монети. Enter regression test mode, which uses a special chain in which blocks can be solved instantly. @@ -3358,8 +3358,8 @@ https://www.transifex.com/projects/p/dash/ В този режим -genproclimit се контролира колко блока са генерирани моментално. - InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. - InstantX изисква средства с поне 6 потвърждения, може да се наложи да почакате няколко минути и да опитате отново. + SwiftTX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. + SwiftTX изисква средства с поне 6 потвърждения, може да се наложи да почакате няколко минути и да опитате отново. Name to construct url for KeePass entry that stores the wallet passphrase @@ -3386,12 +3386,12 @@ https://www.transifex.com/projects/p/dash/ Не може да се свърже с %s на този компютър. Dash ядрото най-вероятно вече работи. - Unable to locate enough Darksend denominated funds for this transaction. - Не са намерени достатъчно Darksend деноминирани средства за тази транзакция. + Unable to locate enough Obfuscate denominated funds for this transaction. + Не са намерени достатъчно Obfuscate деноминирани средства за тази транзакция. - Unable to locate enough Darksend non-denominated funds for this transaction that are not equal 1000 DASH. - Не са намерени достатъчно Darksend неденоминирани средства за тази транзакция, които не са равни на 1000 DASH. + Unable to locate enough Obfuscate non-denominated funds for this transaction that are not equal 1000 DNET. + Не са намерени достатъчно Obfuscate неденоминирани средства за тази транзакция, които не са равни на 1000 DNET. Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction. @@ -3490,8 +3490,8 @@ https://www.transifex.com/projects/p/dash/ Открита е повредена блок база данни - Darksend options: - Опции на Darksend: + Obfuscate options: + Опции на Obfuscate: Debugging/Testing options: @@ -3562,8 +3562,8 @@ https://www.transifex.com/projects/p/dash/ Грешка: Портфейлът е заключен, транзакцията е невъзможна! - Error: You already have pending entries in the Darksend pool - Грешка: Вече имате чакащи вписвания в Darksend басейна + Error: You already have pending entries in the Obfuscate pool + Грешка: Вече имате чакащи вписвания в Obfuscate басейна Failed to listen on any port. Use -listen=0 if you want this. @@ -3614,32 +3614,32 @@ https://www.transifex.com/projects/p/dash/ Изтриване на всички транзакции на портфейла и възстановява само тези части на блок веригата чрез -rescan при стартиране - Disable all Dash specific functionality (Masternodes, Darksend, InstantX, Budgeting) (0-1, default: %u) - Изключване на всички специфични Dash функции (Masternodes, Darksend, InstantX, Budgeting) (0-1, по подразбиране: %u) + Disable all Dash specific functionality (Masternodes, Obfuscate, SwiftTX, Budgeting) (0-1, default: %u) + Изключване на всички специфични Dash функции (Masternodes, Obfuscate, SwiftTX, Budgeting) (0-1, по подразбиране: %u) Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>. Разпространява се под MIT софтуерен лиценз,вижте придружаващият файл COPYING или<http://www.opensource.org/licenses/mit-license.php>. - Enable instantx, show confirmations for locked transactions (bool, default: %s) - Включен instantx,покажи потвърждения за заключени транзакции (bool, по подразбиране: %s) + Enable swifttx, show confirmations for locked transactions (bool, default: %s) + Включен swifttx,покажи потвърждения за заключени транзакции (bool, по подразбиране: %s) - Enable use of automated darksend for funds stored in this wallet (0-1, default: %u) - Включено автоматично използване на darksend за средствата в този портфейл (0-1, по подразбиране: %u) + Enable use of automated obfuscate for funds stored in this wallet (0-1, default: %u) + Включено автоматично използване на obfuscate за средствата в този портфейл (0-1, по подразбиране: %u) Error: Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported. Грешка: Открит е неподдържан аргумент -socks .настройка SOCKS версия вече не е възможна, само SOCKS5 прокси се поддържа. - Fees (in DASH/Kb) smaller than this are considered zero fee for relaying (default: %s) - Такси (в DASH/Kb) по-малки от това се считат за нулева такса за прилагане (по подразбиране: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for relaying (default: %s) + Такси (в DNET/Kb) по-малки от това се считат за нулева такса за прилагане (по подразбиране: %s) - Fees (in DASH/Kb) smaller than this are considered zero fee for transaction creation (default: %s) - Такси (в DASH/Kb) по-малки от това се считат за нулева такса при създаване на транзакция (по подразбиране: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Такси (в DNET/Kb) по-малки от това се считат за нулева такса при създаване на транзакция (по подразбиране: %s) Flush database activity from memory pool to disk log every <n> megabytes (default: %u) @@ -3686,8 +3686,8 @@ https://www.transifex.com/projects/p/dash/ Изходяща информация за грешки (по подразбиране: %u, задаването на <category> е опция) - Provide liquidity to Darksend by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) - Осигуряване на ликвидност Darksend от рядко смесване монети непрекъснато в съответствие (0-100, по подразбиране: %u, 1=много чести, високи такси, 100=твърде редки, ниски такси) + Provide liquidity to Obfuscate by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) + Осигуряване на ликвидност Obfuscate от рядко смесване монети непрекъснато в съответствие (0-100, по подразбиране: %u, 1=много чести, високи такси, 100=твърде редки, ниски такси) Require high priority for relaying free or low-fee transactions (default:%u) @@ -3710,10 +3710,10 @@ https://www.transifex.com/projects/p/dash/ Този продукт включва софтуер, разработен от проекта OpenSSL за използване в OpenSSL Toolkit <https://www.openssl.org/> и криптографски софтуер, написан от Eric Young и UPnP софтуер, написан от Thomas Bernard. - To use dashd, or the -server option to dash-qt, you must set an rpcpassword in the configuration file: + To use darknetd, or the -server option to darknet-qt, you must set an rpcpassword in the configuration file: %s It is recommended you use the following random password: -rpcuser=dashrpc +rpcuser=darknetrpc rpcpassword=%s (you do not need to remember this password) The username and password MUST NOT be the same. @@ -3721,12 +3721,12 @@ If the file does not exist, create it with owner-readable-only file permissions. It is also recommended to set alertnotify so you are notified of problems; for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - За използване на dashd, или the -server опция към dash-qt, трябва да зададете rpcpassword в конфигурационния файл: %s Препоръчително е да използвате следната произволна парола: rpcuser=dashrpc rpcpassword=%s (не е нужно да запомняте тази парола) Потребителя и паролата НЕ ТРЯБВА да са еднакви. Ако файла не съществува , създайте го с права за само за четене. Препоръчително е да създадете сигнал за уведомяване за да бъдете осведомени при проблем; Пример: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com + За използване на darknetd, или the -server опция към darknet-qt, трябва да зададете rpcpassword в конфигурационния файл: %s Препоръчително е да използвате следната произволна парола: rpcuser=darknetrpc rpcpassword=%s (не е нужно да запомняте тази парола) Потребителя и паролата НЕ ТРЯБВА да са еднакви. Ако файла не съществува , създайте го с права за само за четене. Препоръчително е да създадете сигнал за уведомяване за да бъдете осведомени при проблем; Пример: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - Unable to locate enough funds for this transaction that are not equal 1000 DASH. - Не са намерени достатъчно средства за тази транзакция, които не са равни на 1000 DASH. + Unable to locate enough funds for this transaction that are not equal 1000 DNET. + Не са намерени достатъчно средства за тази транзакция, които не са равни на 1000 DNET. Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s) @@ -3749,8 +3749,8 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Whitelisted не могат да бъдат DoS забранени и техните транзакции ще бъдат винаги предадени, дори ако вече са в mempool, полезно напр. за gateway - (9999 could be used only on mainnet) - (9999 може да бъде използван в основната мрежа) + (51472 could be used only on mainnet) + (51472 може да бъде използван в основната мрежа) (default: %s) @@ -3799,16 +3799,16 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Не успя да се анализира -rpcbind стойност %s като мрежов адрес - Darksend is idle. - Darksend бездейства. + Obfuscate is idle. + Obfuscate бездейства. - Darksend request complete: - Darksend заявката е завършена: + Obfuscate request complete: + Obfuscate заявката е завършена: - Darksend request incomplete: - Darksend заявката незавършена: + Obfuscate request incomplete: + Obfuscate заявката незавършена: Disable safemode, override a real safe mode event (default: %u) @@ -3839,8 +3839,8 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Грешка:Открит е неподдържан аргумент -tor, моля използвай -onion. - Fee (in DASH/kB) to add to transactions you send (default: %s) - Такси (в DASH/Kb) добавена към направената транзакция(по подразбиране: %s) + Fee (in DNET/kB) to add to transactions you send (default: %s) + Такси (в DNET/Kb) добавена към направената транзакция(по подразбиране: %s) Finalizing transaction. @@ -3903,8 +3903,8 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Въвеждането е невалидно. - InstantX options: - InstantX опции: + SwiftTX options: + SwiftTX опции: Insufficient funds. @@ -3939,8 +3939,8 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Невалидна сума за -paytxfee=<amount>: '%s' - Last successful Darksend action was too recent. - Последното успешно Darksend действие беше твърде скоро. + Last successful Obfuscate action was too recent. + Последното успешно Obfuscate действие беше твърде скоро. Limit size of signature cache to <n> entries (default: %u) @@ -4167,8 +4167,8 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Невалиден частен ключ на Masternode. Моля вижте документацията. - (must be 9999 for mainnet) - (трябва да е 9999 за основната мрежа) + (must be51472 for mainnet) + (трябва да е51472 за основната мрежа) Can't find random Masternode. @@ -4207,7 +4207,7 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com KeePassHttp ключ за AES криптирана връзка с KeePass - Keep N DASH anonymized (default: %u) + Keep N DNET anonymized (default: %u) Поддържай N Dash анонимизирани (по подразбиране: %u) @@ -4215,7 +4215,7 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Пази поне <n> неосъществени транзакции в паметта (по подразбиране: %u) - Last Darksend was too recent. + Last Obfuscate was too recent. Последния Derksend беше твърде скоро. @@ -4467,8 +4467,8 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Потребителско име за JSON-RPC връзките - Value more than Darksend pool maximum allows. - Стойност повече от максимално позволената в Darksend басейна. + Value more than Obfuscate pool maximum allows. + Стойност повече от максимално позволената в Obfuscate басейна. Verifying blocks... diff --git a/src/qt/locale/dash_de.ts b/src/qt/locale/darknet_de.ts similarity index 93% rename from src/qt/locale/dash_de.ts rename to src/qt/locale/darknet_de.ts index 4c99ff23404a7..ce9f19a5d073a 100644 --- a/src/qt/locale/dash_de.ts +++ b/src/qt/locale/darknet_de.ts @@ -176,7 +176,7 @@ Wallet-Verschlüsselung bestätigen - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DASH</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DNET</b>! Warnung: Wenn Sie ihre Wallet verschlüsseln und ihre Passphrase verlieren werden Sie <b>alle ihre Dash verlieren</b>! @@ -188,7 +188,7 @@ Wallet verschlüsselt - Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dashs from being stolen by malware infecting your computer. + Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your darknets from being stolen by malware infecting your computer. Dash wird jetzt beendet, um den Verschlüsselungsprozess abzuschließen. Bitte beachten Sie, dass die Wallet-Verschlüsselung nicht vollständig vor Diebstahl ihrer Dash durch Schadsoftware schützt, die ihren Computer befällt. @@ -263,8 +263,8 @@ &Empfangen - Request payments (generates QR codes and dash: URIs) - Zahlungen anfordern (erzeugt QR-Codes und "dash:"-URIs) + Request payments (generates QR codes and darknet: URIs) + Zahlungen anfordern (erzeugt QR-Codes und "darknet:"-URIs) &Transactions @@ -443,8 +443,8 @@ &URI öffnen... - Open a dash: URI or payment request - Eine "dash:"-URI oder Zahlungsanforderung öffnen + Open a darknet: URI or payment request + Eine "darknet:"-URI oder Zahlungsanforderung öffnen &Command-line options @@ -740,8 +740,8 @@ Adresse: %4 Wechselgeld kopieren - Non-anonymized input selected. <b>Darksend will be disabled.</b><br><br>If you still want to use Darksend, please deselect all non-nonymized inputs first and then check Darksend checkbox again. - Nicht-anonymisierter Input ausgewählt. <b>Darksend wird deaktiviert.</b><br><br>Sollten Sie trotzdem Darksend verwenden wollen, müssen Sie zuerst alle nicht-anonymisierten Inputs entmarkieren und das Ankreuzfeld "Darksend" erneut auswählen. + Non-anonymized input selected. <b>Obfuscate will be disabled.</b><br><br>If you still want to use Obfuscate, please deselect all non-nonymized inputs first and then check Obfuscate checkbox again. + Nicht-anonymisierter Input ausgewählt. <b>Obfuscate wird deaktiviert.</b><br><br>Sollten Sie trotzdem Obfuscate verwenden wollen, müssen Sie zuerst alle nicht-anonymisierten Inputs entmarkieren und das Ankreuzfeld "Obfuscate" erneut auswählen. highest @@ -841,10 +841,10 @@ Adresse: %4 - DarksendConfig + ObfuscateConfig - Configure Darksend - Darksend konfigurieren + Configure Obfuscate + Obfuscate konfigurieren Basic Privacy @@ -863,48 +863,48 @@ Adresse: %4 Bitten wählen Sie eine Datenschutz-Stufe. - Use 2 separate masternodes to mix funds up to 1000 DASH - Benutze 2 separate Masternodes um bis zu 1000 DASH zu mixen + Use 2 separate masternodes to mix funds up to 1000 DNET + Benutze 2 separate Masternodes um bis zu 1000 DNET zu mixen - Use 8 separate masternodes to mix funds up to 1000 DASH - Benutze 8 separate Masternodes um bis zu 1000 DASH zu mixen + Use 8 separate masternodes to mix funds up to 1000 DNET + Benutze 8 separate Masternodes um bis zu 1000 DNET zu mixen Use 16 separate masternodes Benutze 16 separate Masternodes - This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH - Diese Option ist am Schnellsten und kostet ungefähr 0,025 DASH, um 1000 DASH zu anonymisieren + This option is the quickest and will cost about ~0.025 DNET to anonymize 1000 DNET + Diese Option ist am Schnellsten und kostet ungefähr 0,025 DNET, um 1000 DNET zu anonymisieren - This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH - Diese Option ist einigermaßen schnell und kostet ungefähr 0,05 DASH, um 1000 DASH zu anonymisieren + This option is moderately fast and will cost about 0.05 DNET to anonymize 1000 DNET + Diese Option ist einigermaßen schnell und kostet ungefähr 0,05 DNET, um 1000 DNET zu anonymisieren - 0.1 DASH per 1000 DASH you anonymize. - 0,1 DASH pro 1000 zu anonymisierende Dash. + 0.1 DNET per 1000 DNET you anonymize. + 0,1 DNET pro 1000 zu anonymisierende Dash. This is the slowest and most secure option. Using maximum anonymity will cost Dies ist die langsamste und sicherste Option. Maximale Anonymität kostet - Darksend Configuration - Darksend-Konfiguration + Obfuscate Configuration + Obfuscate-Konfiguration - Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend wurde erfolgreich auf einfachen Datenschutz (%1 und 2 Runden) gesetzt. Sie können dies jederzeit im Konfigurationsfenster von Dash ändern. + Obfuscate was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate wurde erfolgreich auf einfachen Datenschutz (%1 und 2 Runden) gesetzt. Sie können dies jederzeit im Konfigurationsfenster von Dash ändern. - Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend wurde erfolgreich auf hohen Datenschutz (%1 und 8 Runden) gesetzt. Sie können dies jederzeit im Konfigurationsfenster von Dash ändern. + Obfuscate was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate wurde erfolgreich auf hohen Datenschutz (%1 und 8 Runden) gesetzt. Sie können dies jederzeit im Konfigurationsfenster von Dash ändern. - Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend wurde erfolgreich auf maximalen Datenschutz (%1 und 16 Runden) gesetzt. Sie können dies jederzeit im Konfigurationsfenster von Dash ändern. + Obfuscate was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate wurde erfolgreich auf maximalen Datenschutz (%1 und 16 Runden) gesetzt. Sie können dies jederzeit im Konfigurationsfenster von Dash ändern. @@ -1145,12 +1145,12 @@ Adresse: %4 (0 = automatisch, <0 = so viele Kerne frei lassen) - Darksend rounds to use - Darksend Runden + Obfuscate rounds to use + Obfuscate Runden - This amount acts as a threshold to turn off Darksend once it's reached. - Beim Erreichen dieses Betrages wird Darksend ausgeschaltet. + This amount acts as a threshold to turn off Obfuscate once it's reached. + Beim Erreichen dieses Betrages wird Obfuscate ausgeschaltet. Amount of Dash to keep anonymized @@ -1262,9 +1262,9 @@ Adresse: %4 Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ Fehlt eine Sprache oder ist unvollständig übersetzt? Hier können Sie helfen: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ User Interface Theme: @@ -1422,16 +1422,16 @@ https://www.transifex.com/projects/p/dash/ Vollendet: - Darksend Balance: - Darksend Kontostand: + Obfuscate Balance: + Obfuscate Kontostand: Amount and Rounds: Betrag und Runden: - 0 DASH / 0 Rounds - 0 DASH / 0 Runden + 0 DNET / 0 Rounds + 0 DNET / 0 Runden Submitted Denom: @@ -1442,8 +1442,8 @@ https://www.transifex.com/projects/p/dash/ k.A. - Darksend - Darksend + Obfuscate + Obfuscate Recent transactions @@ -1462,16 +1462,16 @@ https://www.transifex.com/projects/p/dash/ (Letzte Nachricht) - Try to manually submit a Darksend request. - Versuche eine Darksendanfrage manuell abzusetzen. + Try to manually submit a Obfuscate request. + Versuche eine Obfuscateanfrage manuell abzusetzen. Try Mix Versuche zu Mixen - Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!) - Aktuellen Darksend Status zurücksetzen (wenn der Prozess des Mixens bereits begonnen hat kann es passieren, dass Darksend unterbrochen wird. Bereits gezahlte Gebühren werden einbehalten!) + Reset the current status of Obfuscate (can interrupt Obfuscate if it's in the process of Mixing, which can cost you money!) + Aktuellen Obfuscate Status zurücksetzen (wenn der Prozess des Mixens bereits begonnen hat kann es passieren, dass Obfuscate unterbrochen wird. Bereits gezahlte Gebühren werden einbehalten!) Reset @@ -1486,12 +1486,12 @@ https://www.transifex.com/projects/p/dash/ Deaktiviert - Start Darksend Mixing - Starte Darksend Mixen + Start Obfuscate Mixing + Starte Obfuscate Mixen - Stop Darksend Mixing - Stoppe Darksend Mixen + Stop Obfuscate Mixing + Stoppe Obfuscate Mixen No inputs detected @@ -1534,9 +1534,9 @@ https://www.transifex.com/projects/p/dash/ Aktiviert - Last Darksend message: + Last Obfuscate message: - Letzter Darksend Status: + Letzter Obfuscate Status: @@ -1544,20 +1544,20 @@ https://www.transifex.com/projects/p/dash/ k.A. - Darksend was successfully reset. - Darksend wurde erfolgreich zurückgesetzt. + Obfuscate was successfully reset. + Obfuscate wurde erfolgreich zurückgesetzt. - If you don't want to see internal Darksend fees/transactions select "Most Common" as Type on the "Transactions" tab. - Wenn Sie keine internen Darksend-Gebühren oder -Transaktionen sehen wollen wählen Sie "Gängigste" als Typ auf der "Transaktionen" Karteikarte. + If you don't want to see internal Obfuscate fees/transactions select "Most Common" as Type on the "Transactions" tab. + Wenn Sie keine internen Obfuscate-Gebühren oder -Transaktionen sehen wollen wählen Sie "Gängigste" als Typ auf der "Transaktionen" Karteikarte. - Darksend requires at least %1 to use. - Zur Benutzung von Darksend benötigt man mindestens %1 + Obfuscate requires at least %1 to use. + Zur Benutzung von Obfuscate benötigt man mindestens %1 - Wallet is locked and user declined to unlock. Disabling Darksend. - Das Wallet ist gesperrt und der Benutzer hat abgelehnt, es zu entsperren. Darksend wird deaktiviert. + Wallet is locked and user declined to unlock. Disabling Obfuscate. + Das Wallet ist gesperrt und der Benutzer hat abgelehnt, es zu entsperren. Obfuscate wird deaktiviert. @@ -1567,7 +1567,7 @@ https://www.transifex.com/projects/p/dash/ Fehlerhafte Zahlungsanforderung - Cannot start dash: click-to-pay handler + Cannot start darknet: click-to-pay handler Dash kann nicht gestartet werden: click-to-pay handler @@ -2291,7 +2291,7 @@ https://www.transifex.com/projects/p/dash/ Wenn die benutzerdefinierten Gebühren auf 1000 duffs gesetzt sind und eine Transaktion hat nur 250 Bytes, dann kostet "pro Kilobyte" nur 250 duffs Gebühren, während "mindestens" 1000 duffs kostet. Transaktionen größer als 1 Kilobyte werden immer pro Kilobyte bezahlt. - Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process. + Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for darknet transactions than the network can process. Nur die minimalen Gebühren zu zahlen ist völlig ausreichend so lange in einem neuen Block der Blockkette noch genug Platz für neue Transaktionen ist.<br /> Bitte beachten Sie dass wenn dies in der Zukunft nicht mehr der Fall sein sollte Ihre Transaktion eventuell niemals in einen neuen Block aufgenommen werden wird, also niemals bestätigt wird. @@ -2363,12 +2363,12 @@ https://www.transifex.com/projects/p/dash/ Empfänger &hinzufügen - Darksend - Darksend + Obfuscate + Obfuscate - InstantX - InstantX + SwiftTX + SwiftTX Balance: @@ -2415,16 +2415,16 @@ https://www.transifex.com/projects/p/dash/ anonymisierte Coins - (darksend requires this amount to be rounded up to the nearest %1). - (Darksend verlangt, dass dieser Betrag auf den nächsten %1 aufgerundet wird) + (obfuscate requires this amount to be rounded up to the nearest %1). + (Obfuscate verlangt, dass dieser Betrag auf den nächsten %1 aufgerundet wird) any available funds (not recommended) beliebiger verfügbarer Coins (nicht empfohlen) - and InstantX - und InstantX + and SwiftTX + und SwiftTX %1 to %2 @@ -2559,8 +2559,8 @@ Dies kann passieren, wenn einige Dash aus ihrer Wallet bereits ausgegeben wurden Nachricht: - A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. - Eine an die "dash:"-URI angefügte Nachricht, die zusammen mit der Transaktion gespeichert wird. Hinweis: Diese Nachricht wird nicht über das Dash-Netzwerk gesendet. + A message that was attached to the darknet: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. + Eine an die "darknet:"-URI angefügte Nachricht, die zusammen mit der Transaktion gespeichert wird. Hinweis: Diese Nachricht wird nicht über das Dash-Netzwerk gesendet. This is an unverified payment request. @@ -2778,16 +2778,16 @@ Dies kann passieren, wenn einige Dash aus ihrer Wallet bereits ausgegeben wurden in Konflikt stehend - %1/offline (verified via instantx) - %1/offline (Überprüft durch InstantX) + %1/offline (verified via swifttx) + %1/offline (Überprüft durch SwiftTX) - %1/confirmed (verified via instantx) - %1/bestätigt (Überprüft durch InstantX) + %1/confirmed (verified via swifttx) + %1/bestätigt (Überprüft durch SwiftTX) - %1 confirmations (verified via instantx) - %1 Bestätigungen (Überprüft durch InstantX) + %1 confirmations (verified via swifttx) + %1 Bestätigungen (Überprüft durch SwiftTX) %1/offline @@ -2802,24 +2802,24 @@ Dies kann passieren, wenn einige Dash aus ihrer Wallet bereits ausgegeben wurden %1 Bestätigungen - %1/offline (InstantX verification in progress - %2 of %3 signatures) - %1/offline (Überprüfung durch InstantX - %2 von %3 Signaturen) + %1/offline (SwiftTX verification in progress - %2 of %3 signatures) + %1/offline (Überprüfung durch SwiftTX - %2 von %3 Signaturen) - %1/confirmed (InstantX verification in progress - %2 of %3 signatures ) - %1/bestätigt (Überprüfung durch InstantX - %2 von %3 Signaturen) + %1/confirmed (SwiftTX verification in progress - %2 of %3 signatures ) + %1/bestätigt (Überprüfung durch SwiftTX - %2 von %3 Signaturen) - %1 confirmations (InstantX verification in progress - %2 of %3 signatures) - %1 Bestätigungen (Überprüfung durch InstantX - %2 von %3 Signaturen) + %1 confirmations (SwiftTX verification in progress - %2 of %3 signatures) + %1 Bestätigungen (Überprüfung durch SwiftTX - %2 von %3 Signaturen) - %1/offline (InstantX verification failed) - %1/offline (Überprüfung durch InstantX fehlgeschlagen) + %1/offline (SwiftTX verification failed) + %1/offline (Überprüfung durch SwiftTX fehlgeschlagen) - %1/confirmed (InstantX verification failed) - %1/bestätigt (Überprüfung durch InstantX fehlgeschlagen) + %1/confirmed (SwiftTX verification failed) + %1/bestätigt (Überprüfung durch SwiftTX fehlgeschlagen) Status @@ -3020,8 +3020,8 @@ Dies kann passieren, wenn einige Dash aus ihrer Wallet bereits ausgegeben wurden Empfangen von - Received via Darksend - über/durch Darksend empfangen + Received via Obfuscate + über/durch Obfuscate empfangen Sent to @@ -3036,24 +3036,24 @@ Dies kann passieren, wenn einige Dash aus ihrer Wallet bereits ausgegeben wurden Erarbeitet - Darksend Denominate - Darksend Stückelung + Obfuscate Denominate + Obfuscate Stückelung - Darksend Collateral Payment - Darksend Sicherheits-Zahlung + Obfuscate Collateral Payment + Obfuscate Sicherheits-Zahlung - Darksend Make Collateral Inputs - Darksend Sicherheits-Eingänge machen + Obfuscate Make Collateral Inputs + Obfuscate Sicherheits-Eingänge machen - Darksend Create Denominations - Darksend Stückelungs-Gebühr + Obfuscate Create Denominations + Obfuscate Stückelungs-Gebühr Darksent - Darksend + Obfuscate watch-only @@ -3132,23 +3132,23 @@ Dies kann passieren, wenn einige Dash aus ihrer Wallet bereits ausgegeben wurden Darksent - Darksend + Obfuscate - Darksend Make Collateral Inputs - Darksend Sicherheits-Eingänge machen + Obfuscate Make Collateral Inputs + Obfuscate Sicherheits-Eingänge machen - Darksend Create Denominations - Darksend Stückelungs-Gebühr + Obfuscate Create Denominations + Obfuscate Stückelungs-Gebühr - Darksend Denominate - Darksend Stückelung + Obfuscate Denominate + Obfuscate Stückelung - Darksend Collateral Payment - Darksend Sicherheits-Zahlung + Obfuscate Collateral Payment + Obfuscate Sicherheits-Zahlung To yourself @@ -3276,8 +3276,8 @@ Dies kann passieren, wenn einige Dash aus ihrer Wallet bereits ausgegeben wurden Dash überweisen - InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH. - InstantX unterstützt das Versenden von Beträgen dieser Höhe noch nicht. Transaktionen sind zur Zeit auf maximal %1 DASH begrenzt. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 DNET. + SwiftTX unterstützt das Versenden von Beträgen dieser Höhe noch nicht. Transaktionen sind zur Zeit auf maximal %1 DNET begrenzt. @@ -3320,7 +3320,7 @@ Dies kann passieren, wenn einige Dash aus ihrer Wallet bereits ausgegeben wurden - dash-core + darknet-core Bind to given address and always listen on it. Use [host]:port notation for IPv6 An die angegebene Adresse binden und immer abhören. Für IPv6 "[Host]:Port"-Schreibweise verwenden @@ -3330,8 +3330,8 @@ Dies kann passieren, wenn einige Dash aus ihrer Wallet bereits ausgegeben wurden Das Programm kann das Daten-Verzeichnis %s nicht als "in Verwendung" markieren. Wahrscheinlich läuft das Programm bereits. - Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. - Darksend benutzt exakt gestückelte Beträge zum Versenden, Sie müssen dafür möglicherweise noch mehr Dash anonymisieren. + Obfuscate uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. + Obfuscate benutzt exakt gestückelte Beträge zum Versenden, Sie müssen dafür möglicherweise noch mehr Dash anonymisieren. Enter regression test mode, which uses a special chain in which blocks can be solved instantly. @@ -3358,8 +3358,8 @@ Dies kann passieren, wenn einige Dash aus ihrer Wallet bereits ausgegeben wurden In diesem Modus legt -genproclimit fest, wie viele Blöcke sofort erzeugt werden. - InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. - InstantX benötigt Zahlungseingänge mit mindestens 6 Bestätigungen, warten Sie also ein paar Minuten und versuchen Sie es dann erneut. + SwiftTX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. + SwiftTX benötigt Zahlungseingänge mit mindestens 6 Bestätigungen, warten Sie also ein paar Minuten und versuchen Sie es dann erneut. Name to construct url for KeePass entry that stores the wallet passphrase @@ -3386,12 +3386,12 @@ Dies kann passieren, wenn einige Dash aus ihrer Wallet bereits ausgegeben wurden Dash Core den Prozess %s auf dem Computer nicht an sich binden. Wahrscheinlich läuft das Programm bereits. - Unable to locate enough Darksend denominated funds for this transaction. - Für diese Transaktion konnten nicht genug mit Darksend gestückelte Beträge gefunden werden. + Unable to locate enough Obfuscate denominated funds for this transaction. + Für diese Transaktion konnten nicht genug mit Obfuscate gestückelte Beträge gefunden werden. - Unable to locate enough Darksend non-denominated funds for this transaction that are not equal 1000 DASH. - Für diese Transaktion konnten nicht genug nicht mit Darksend gestückelte Beträge gefunden werden, die ungleich 1000 DASH sind. + Unable to locate enough Obfuscate non-denominated funds for this transaction that are not equal 1000 DNET. + Für diese Transaktion konnten nicht genug nicht mit Obfuscate gestückelte Beträge gefunden werden, die ungleich 1000 DNET sind. Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction. @@ -3490,8 +3490,8 @@ Dies kann passieren, wenn einige Dash aus ihrer Wallet bereits ausgegeben wurden Beschädigte Blockdatenbank erkannt - Darksend options: - Darksend Optionen: + Obfuscate options: + Obfuscate Optionen: Debugging/Testing options: @@ -3562,8 +3562,8 @@ Dies kann passieren, wenn einige Dash aus ihrer Wallet bereits ausgegeben wurden Fehler: Wallet gesperrt, Transaktion kann nicht erstellt werden! - Error: You already have pending entries in the Darksend pool - Fehler: Es sind bereits anstehende Einträge im Darksend-Pool + Error: You already have pending entries in the Obfuscate pool + Fehler: Es sind bereits anstehende Einträge im Obfuscate-Pool Failed to listen on any port. Use -listen=0 if you want this. @@ -3614,32 +3614,32 @@ Dies kann passieren, wenn einige Dash aus ihrer Wallet bereits ausgegeben wurden Lösche alle Wallet-Transaktionen stelle nur diese mittels -rescan beim nächsten Start des Wallets wieder her. - Disable all Dash specific functionality (Masternodes, Darksend, InstantX, Budgeting) (0-1, default: %u) - Deaktiviere all Dash-spezifischen Funktionen (Masternodes, Darksend, InstantX, Budgeting) (0-1, Standard: %u) + Disable all Dash specific functionality (Masternodes, Obfuscate, SwiftTX, Budgeting) (0-1, default: %u) + Deaktiviere all Dash-spezifischen Funktionen (Masternodes, Obfuscate, SwiftTX, Budgeting) (0-1, Standard: %u) Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>. Unter MIT Software Lizenz zur Verfügung gestellt, siehe beigefügte Datei COPYING oder <http://www.opensource.org/licenses/mit-license.php>. - Enable instantx, show confirmations for locked transactions (bool, default: %s) - Aktiviere InstantX, zeige Bestätigungen für gesperrte Transaktionen an (bool, Standard: %s) + Enable swifttx, show confirmations for locked transactions (bool, default: %s) + Aktiviere SwiftTX, zeige Bestätigungen für gesperrte Transaktionen an (bool, Standard: %s) - Enable use of automated darksend for funds stored in this wallet (0-1, default: %u) - Aktiviere Darksend automatisch (0-1, Standard: %u) + Enable use of automated obfuscate for funds stored in this wallet (0-1, default: %u) + Aktiviere Obfuscate automatisch (0-1, Standard: %u) Error: Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported. Fehler: Parameter -socks wird nicht mehr unterstützt. Setzen der SOCKS-Version ist nicht mehr möglich, es werden nur noch SOCKS5 Proxies unterstützt. - Fees (in DASH/Kb) smaller than this are considered zero fee for relaying (default: %s) - Niedrigere Gebühren (in DASH pro Kb) als diese werden bei der Vermittlung als gebührenfrei angesehen (Standard: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for relaying (default: %s) + Niedrigere Gebühren (in DNET pro Kb) als diese werden bei der Vermittlung als gebührenfrei angesehen (Standard: %s) - Fees (in DASH/Kb) smaller than this are considered zero fee for transaction creation (default: %s) - Niedrigere Gebühren (in DASH pro Kb) als diese werden bei der Transaktionserzeugung als gebührenfrei angesehen (Standard: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Niedrigere Gebühren (in DNET pro Kb) als diese werden bei der Transaktionserzeugung als gebührenfrei angesehen (Standard: %s) Flush database activity from memory pool to disk log every <n> megabytes (default: %u) @@ -3647,7 +3647,7 @@ Dies kann passieren, wenn einige Dash aus ihrer Wallet bereits ausgegeben wurden Found unconfirmed denominated outputs, will wait till they confirm to continue. - Unbestätigte für Darksend vorbereitete Ausgabebeträge gefunden, warte bis sie bestätigt sind bevor weitergemacht wird. + Unbestätigte für Obfuscate vorbereitete Ausgabebeträge gefunden, warte bis sie bestätigt sind bevor weitergemacht wird. How thorough the block verification of -checkblocks is (0-4, default: %u) @@ -3686,8 +3686,8 @@ Dies kann passieren, wenn einige Dash aus ihrer Wallet bereits ausgegeben wurden Debugging-Informationen ausgeben (Standard: %u, <category> anzugeben ist optional) - Provide liquidity to Darksend by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) - Durch diese Einstellung können Sie dem Darksend-Netzwerk zusätzliche Liquidität zur Verfügung stellen in dem Sie von Zeit zu Zeit bereits anonymisierte Dash wieder dem Mixing-Prozess zuführen. (0-100, 0=aus, 1=sehr oft, 100=sehr selten (wenig Gebühren). Standard: %u) + Provide liquidity to Obfuscate by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) + Durch diese Einstellung können Sie dem Obfuscate-Netzwerk zusätzliche Liquidität zur Verfügung stellen in dem Sie von Zeit zu Zeit bereits anonymisierte Dash wieder dem Mixing-Prozess zuführen. (0-100, 0=aus, 1=sehr oft, 100=sehr selten (wenig Gebühren). Standard: %u) Require high priority for relaying free or low-fee transactions (default:%u) @@ -3710,10 +3710,10 @@ Dies kann passieren, wenn einige Dash aus ihrer Wallet bereits ausgegeben wurden Dieses Produkt enthält vom OpenSSL-Projekt entwickelte Software zur Benutzung des OpenSSL Toolkit <https://www.openssl.org/>, kryptographische Software geschrieben von Eric Young und UPnP Software geschrieben von Thomas Bernard. - To use dashd, or the -server option to dash-qt, you must set an rpcpassword in the configuration file: + To use darknetd, or the -server option to darknet-qt, you must set an rpcpassword in the configuration file: %s It is recommended you use the following random password: -rpcuser=dashrpc +rpcuser=darknetrpc rpcpassword=%s (you do not need to remember this password) The username and password MUST NOT be the same. @@ -3721,10 +3721,10 @@ If the file does not exist, create it with owner-readable-only file permissions. It is also recommended to set alertnotify so you are notified of problems; for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - Um dashd (oder dash-qt mit dem -server Parameter) zu benutzen müssen Sie ein rpcpasswort in dieser Konfigurationsdatei angeben: + Um darknetd (oder darknet-qt mit dem -server Parameter) zu benutzen müssen Sie ein rpcpasswort in dieser Konfigurationsdatei angeben: %s Es wird empfohlen das folgende Zufallspasswort zu verwenden: -rpcuser=dashrpc +rpcuser=darknetrpc rpcpassword=%s (Sie müssen sich dieses Passwort nicht merken!) Der Benutzername und das Passwort dürfen NICHT identisch sein. @@ -3733,8 +3733,8 @@ Es wird ebenfalls empfohlen alertnotify anzugeben, um im Problemfall benachricht zum Beispiel: alertnotify=echo %%s | mail -s \"Dash Alert\" admin@foo.com - Unable to locate enough funds for this transaction that are not equal 1000 DASH. - Für diese Transaktion konnten nicht genug Beträge gefunden werden, die ungleich 1000 DASH sind. + Unable to locate enough funds for this transaction that are not equal 1000 DNET. + Für diese Transaktion konnten nicht genug Beträge gefunden werden, die ungleich 1000 DNET sind. Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s) @@ -3757,8 +3757,8 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Dash Alert\" admin@foo.comErlaubte Gegenstellen können nicht wegen DoS ausgeschlossen werden und ihre Transaktionen werden immer weitergeleitet, sogar wenn sie schon im Memory-Pool sind. Dies ist z.B. für Gateways nützlich. - (9999 could be used only on mainnet) - (9999 kann nur im Standardnetz benutzt werden) + (51472 could be used only on mainnet) + (51472 kann nur im Standardnetz benutzt werden) (default: %s) @@ -3807,16 +3807,16 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Dash Alert\" admin@foo.com-rpcbind Wert %s konnte nicht als Netzwerkadresse erkannt werden - Darksend is idle. - Darksend ist untätig. + Obfuscate is idle. + Obfuscate ist untätig. - Darksend request complete: - Darksend-Anfrage vollständig: + Obfuscate request complete: + Obfuscate-Anfrage vollständig: - Darksend request incomplete: - Darksend-Anfrage unvollständig: + Obfuscate request incomplete: + Obfuscate-Anfrage unvollständig: Disable safemode, override a real safe mode event (default: %u) @@ -3847,8 +3847,8 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Dash Alert\" admin@foo.comFehler: Paramter -tor wird nicht unterstützt, bitte -onion benutzen. - Fee (in DASH/kB) to add to transactions you send (default: %s) - Gebühren (in DASH pro Kb), die gesendeten Transaktionen hinzugefügt werden (Standard: %s) + Fee (in DNET/kB) to add to transactions you send (default: %s) + Gebühren (in DNET pro Kb), die gesendeten Transaktionen hinzugefügt werden (Standard: %s) Finalizing transaction. @@ -3912,8 +3912,8 @@ Dash Core wird heruntergefahren. Eintrag ist nicht gültig. - InstantX options: - InstantX Optionen: + SwiftTX options: + SwiftTX Optionen: Insufficient funds. @@ -3948,8 +3948,8 @@ Dash Core wird heruntergefahren. Ungültiger Betrag für -paytxfee=<amount>: '%s' - Last successful Darksend action was too recent. - Die letzte erfolgreiche Darksend-Transaktion ist noch zu neu. + Last successful Obfuscate action was too recent. + Die letzte erfolgreiche Obfuscate-Transaktion ist noch zu neu. Limit size of signature cache to <n> entries (default: %u) @@ -4176,8 +4176,8 @@ Dash Core wird heruntergefahren. Masternode-Geheimschlüssel (masternodeprivkey) ist ungültig. Siehe Dokumentation. - (must be 9999 for mainnet) - (muss für Standardnetz 9999 sein) + (must be51472 for mainnet) + (muss für Standardnetz51472 sein) Can't find random Masternode. @@ -4216,7 +4216,7 @@ Dash Core wird heruntergefahren. "KeePassHttp key" für die AES-verschlüsselte Kommunikation mit "KeePass" - Keep N DASH anonymized (default: %u) + Keep N DNET anonymized (default: %u) Betrag welcher anonymisiert vorgehalten wird. (Voreinstellung: %u) @@ -4224,8 +4224,8 @@ Dash Core wird heruntergefahren. Maximal <n> (noch) nicht einsortierte Zahlungen zwischenspeichern (Voreinstellung: %u) - Last Darksend was too recent. - Letzte Darksend-Transaktion ist noch zu neu. + Last Obfuscate was too recent. + Letzte Obfuscate-Transaktion ist noch zu neu. Line: %d @@ -4476,8 +4476,8 @@ Dash Core wird heruntergefahren. Benutzername für JSON-RPC-Verbindungen - Value more than Darksend pool maximum allows. - Wert größer als der vom Darksend Pool maximal erlaubte. + Value more than Obfuscate pool maximum allows. + Wert größer als der vom Obfuscate Pool maximal erlaubte. Verifying blocks... diff --git a/src/qt/locale/dash_en.ts b/src/qt/locale/darknet_en.ts similarity index 94% rename from src/qt/locale/dash_en.ts rename to src/qt/locale/darknet_en.ts index 3c86462593e14..bcd3736899ea4 100644 --- a/src/qt/locale/dash_en.ts +++ b/src/qt/locale/darknet_en.ts @@ -219,8 +219,8 @@ - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DASH</b>! - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DASH</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DNET</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DNET</b>! @@ -235,8 +235,8 @@ - Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dashs from being stolen by malware infecting your computer. - Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dashs from being stolen by malware infecting your computer. + Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your darknets from being stolen by malware infecting your computer. + Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your darknets from being stolen by malware infecting your computer. @@ -336,8 +336,8 @@ - Request payments (generates QR codes and dash: URIs) - Request payments (generates QR codes and dash: URIs) + Request payments (generates QR codes and darknet: URIs) + Request payments (generates QR codes and darknet: URIs) @@ -562,8 +562,8 @@ - Open a dash: URI or payment request - Open a dash: URI or payment request + Open a darknet: URI or payment request + Open a darknet: URI or payment request @@ -933,8 +933,8 @@ Address: %4 - Non-anonymized input selected. <b>Darksend will be disabled.</b><br><br>If you still want to use Darksend, please deselect all non-nonymized inputs first and then check Darksend checkbox again. - Non-anonymized input selected. <b>Darksend will be disabled.</b><br><br>If you still want to use Darksend, please deselect all non-nonymized inputs first and then check Darksend checkbox again. + Non-anonymized input selected. <b>Obfuscate will be disabled.</b><br><br>If you still want to use Obfuscate, please deselect all non-nonymized inputs first and then check Obfuscate checkbox again. + Non-anonymized input selected. <b>Obfuscate will be disabled.</b><br><br>If you still want to use Obfuscate, please deselect all non-nonymized inputs first and then check Obfuscate checkbox again. @@ -1062,11 +1062,11 @@ Address: %4 - DarksendConfig + ObfuscateConfig - - Configure Darksend - Configure Darksend + + Configure Obfuscate + Configure Obfuscate @@ -1090,13 +1090,13 @@ Address: %4 - Use 2 separate masternodes to mix funds up to 1000 DASH - Use 2 separate masternodes to mix funds up to 1000 DASH + Use 2 separate masternodes to mix funds up to 1000 DNET + Use 2 separate masternodes to mix funds up to 1000 DNET - Use 8 separate masternodes to mix funds up to 1000 DASH - Use 8 separate masternodes to mix funds up to 1000 DASH + Use 8 separate masternodes to mix funds up to 1000 DNET + Use 8 separate masternodes to mix funds up to 1000 DNET @@ -1105,18 +1105,18 @@ Address: %4 - This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH - This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH + This option is the quickest and will cost about ~0.025 DNET to anonymize 1000 DNET + This option is the quickest and will cost about ~0.025 DNET to anonymize 1000 DNET - This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH - This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH + This option is moderately fast and will cost about 0.05 DNET to anonymize 1000 DNET + This option is moderately fast and will cost about 0.05 DNET to anonymize 1000 DNET - 0.1 DASH per 1000 DASH you anonymize. - 0.1 DASH per 1000 DASH you anonymize. + 0.1 DNET per 1000 DNET you anonymize. + 0.1 DNET per 1000 DNET you anonymize. @@ -1124,26 +1124,26 @@ Address: %4 This is the slowest and most secure option. Using maximum anonymity will cost - + - Darksend Configuration - Darksend Configuration + Obfuscate Configuration + Obfuscate Configuration - Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. @@ -1441,13 +1441,13 @@ Address: %4 - Darksend rounds to use - Darksend rounds to use + Obfuscate rounds to use + Obfuscate rounds to use - This amount acts as a threshold to turn off Darksend once it's reached. - This amount acts as a threshold to turn off Darksend once it's reached. + This amount acts as a threshold to turn off Obfuscate once it's reached. + This amount acts as a threshold to turn off Obfuscate once it's reached. @@ -1587,9 +1587,9 @@ Address: %4 Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ @@ -1790,8 +1790,8 @@ https://www.transifex.com/projects/p/dash/ - Darksend Balance: - Darksend Balance: + Obfuscate Balance: + Obfuscate Balance: @@ -1800,8 +1800,8 @@ https://www.transifex.com/projects/p/dash/ - 0 DASH / 0 Rounds - 0 DASH / 0 Rounds + 0 DNET / 0 Rounds + 0 DNET / 0 Rounds @@ -1819,8 +1819,8 @@ https://www.transifex.com/projects/p/dash/ - Darksend - Darksend + Obfuscate + Obfuscate @@ -1844,8 +1844,8 @@ https://www.transifex.com/projects/p/dash/ - Try to manually submit a Darksend request. - Try to manually submit a Darksend request. + Try to manually submit a Obfuscate request. + Try to manually submit a Obfuscate request. @@ -1854,8 +1854,8 @@ https://www.transifex.com/projects/p/dash/ - Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!) - Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!) + Reset the current status of Obfuscate (can interrupt Obfuscate if it's in the process of Mixing, which can cost you money!) + Reset the current status of Obfuscate (can interrupt Obfuscate if it's in the process of Mixing, which can cost you money!) @@ -1881,14 +1881,14 @@ https://www.transifex.com/projects/p/dash/ - Start Darksend Mixing - Start Darksend Mixing + Start Obfuscate Mixing + Start Obfuscate Mixing - Stop Darksend Mixing - Stop Darksend Mixing + Stop Obfuscate Mixing + Stop Obfuscate Mixing @@ -1945,9 +1945,9 @@ https://www.transifex.com/projects/p/dash/ - Last Darksend message: + Last Obfuscate message: - Last Darksend message: + Last Obfuscate message: @@ -1957,23 +1957,23 @@ https://www.transifex.com/projects/p/dash/ - Darksend was successfully reset. - Darksend was successfully reset. + Obfuscate was successfully reset. + Obfuscate was successfully reset. - If you don't want to see internal Darksend fees/transactions select "Most Common" as Type on the "Transactions" tab. - If you don't want to see internal Darksend fees/transactions select "Most Common" as Type on the "Transactions" tab. + If you don't want to see internal Obfuscate fees/transactions select "Most Common" as Type on the "Transactions" tab. + If you don't want to see internal Obfuscate fees/transactions select "Most Common" as Type on the "Transactions" tab. - Darksend requires at least %1 to use. - Darksend requires at least %1 to use. + Obfuscate requires at least %1 to use. + Obfuscate requires at least %1 to use. - Wallet is locked and user declined to unlock. Disabling Darksend. - Wallet is locked and user declined to unlock. Disabling Darksend. + Wallet is locked and user declined to unlock. Disabling Obfuscate. + Wallet is locked and user declined to unlock. Disabling Obfuscate. @@ -1990,8 +1990,8 @@ https://www.transifex.com/projects/p/dash/ - Cannot start dash: click-to-pay handler - Cannot start dash: click-to-pay handler + Cannot start darknet: click-to-pay handler + Cannot start darknet: click-to-pay handler @@ -2925,8 +2925,8 @@ https://www.transifex.com/projects/p/dash/ - Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process. - Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process. + Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for darknet transactions than the network can process. + Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for darknet transactions than the network can process. @@ -3015,13 +3015,13 @@ https://www.transifex.com/projects/p/dash/ - Darksend - Darksend + Obfuscate + Obfuscate - InstantX - InstantX + SwiftTX + SwiftTX @@ -3083,8 +3083,8 @@ https://www.transifex.com/projects/p/dash/ - (darksend requires this amount to be rounded up to the nearest %1). - (darksend requires this amount to be rounded up to the nearest %1). + (obfuscate requires this amount to be rounded up to the nearest %1). + (obfuscate requires this amount to be rounded up to the nearest %1). @@ -3093,8 +3093,8 @@ https://www.transifex.com/projects/p/dash/ - and InstantX - and InstantX + and SwiftTX + and SwiftTX @@ -3268,8 +3268,8 @@ https://www.transifex.com/projects/p/dash/ - A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. - A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. + A message that was attached to the darknet: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. + A message that was attached to the darknet: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. @@ -3552,18 +3552,18 @@ https://www.transifex.com/projects/p/dash/ - %1/offline (verified via instantx) - %1/offline (verified via instantx) + %1/offline (verified via swifttx) + %1/offline (verified via swifttx) - %1/confirmed (verified via instantx) - %1/confirmed (verified via instantx) + %1/confirmed (verified via swifttx) + %1/confirmed (verified via swifttx) - %1 confirmations (verified via instantx) - %1 confirmations (verified via instantx) + %1 confirmations (verified via swifttx) + %1 confirmations (verified via swifttx) @@ -3583,28 +3583,28 @@ https://www.transifex.com/projects/p/dash/ - %1/offline (InstantX verification in progress - %2 of %3 signatures) - %1/offline (InstantX verification in progress - %2 of %3 signatures) + %1/offline (SwiftTX verification in progress - %2 of %3 signatures) + %1/offline (SwiftTX verification in progress - %2 of %3 signatures) - %1/confirmed (InstantX verification in progress - %2 of %3 signatures ) - %1/confirmed (InstantX verification in progress - %2 of %3 signatures ) + %1/confirmed (SwiftTX verification in progress - %2 of %3 signatures ) + %1/confirmed (SwiftTX verification in progress - %2 of %3 signatures ) - %1 confirmations (InstantX verification in progress - %2 of %3 signatures) - %1 confirmations (InstantX verification in progress - %2 of %3 signatures) + %1 confirmations (SwiftTX verification in progress - %2 of %3 signatures) + %1 confirmations (SwiftTX verification in progress - %2 of %3 signatures) - %1/offline (InstantX verification failed) - %1/offline (InstantX verification failed) + %1/offline (SwiftTX verification failed) + %1/offline (SwiftTX verification failed) - %1/confirmed (InstantX verification failed) - %1/confirmed (InstantX verification failed) + %1/confirmed (SwiftTX verification failed) + %1/confirmed (SwiftTX verification failed) @@ -3868,8 +3868,8 @@ https://www.transifex.com/projects/p/dash/ - Received via Darksend - Received via Darksend + Received via Obfuscate + Received via Obfuscate @@ -3888,23 +3888,23 @@ https://www.transifex.com/projects/p/dash/ - Darksend Denominate - Darksend Denominate + Obfuscate Denominate + Obfuscate Denominate - Darksend Collateral Payment - Darksend Collateral Payment + Obfuscate Collateral Payment + Obfuscate Collateral Payment - Darksend Make Collateral Inputs - Darksend Make Collateral Inputs + Obfuscate Make Collateral Inputs + Obfuscate Make Collateral Inputs - Darksend Create Denominations - Darksend Create Denominations + Obfuscate Create Denominations + Obfuscate Create Denominations @@ -4012,23 +4012,23 @@ https://www.transifex.com/projects/p/dash/ - Darksend Make Collateral Inputs - Darksend Make Collateral Inputs + Obfuscate Make Collateral Inputs + Obfuscate Make Collateral Inputs - Darksend Create Denominations - Darksend Create Denominations + Obfuscate Create Denominations + Obfuscate Create Denominations - Darksend Denominate - Darksend Denominate + Obfuscate Denominate + Obfuscate Denominate - Darksend Collateral Payment - Darksend Collateral Payment + Obfuscate Collateral Payment + Obfuscate Collateral Payment @@ -4189,8 +4189,8 @@ https://www.transifex.com/projects/p/dash/ - InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH. - InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 DNET. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 DNET. @@ -4242,9 +4242,9 @@ https://www.transifex.com/projects/p/dash/ - dash-core + darknet-core - + Bind to given address and always listen on it. Use [host]:port notation for IPv6 Bind to given address and always listen on it. Use [host]:port notation for IPv6 @@ -4255,8 +4255,8 @@ https://www.transifex.com/projects/p/dash/ - Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. - Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. + Obfuscate uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. + Obfuscate uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. @@ -4290,8 +4290,8 @@ https://www.transifex.com/projects/p/dash/ - InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. - InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. + SwiftTX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. + SwiftTX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. @@ -4325,13 +4325,13 @@ https://www.transifex.com/projects/p/dash/ - Unable to locate enough Darksend denominated funds for this transaction. - Unable to locate enough Darksend denominated funds for this transaction. + Unable to locate enough Obfuscate denominated funds for this transaction. + Unable to locate enough Obfuscate denominated funds for this transaction. - Unable to locate enough Darksend non-denominated funds for this transaction that are not equal 1000 DASH. - Unable to locate enough Darksend non-denominated funds for this transaction that are not equal 1000 DASH. + Unable to locate enough Obfuscate non-denominated funds for this transaction that are not equal 1000 DNET. + Unable to locate enough Obfuscate non-denominated funds for this transaction that are not equal 1000 DNET. @@ -4455,8 +4455,8 @@ https://www.transifex.com/projects/p/dash/ - Darksend options: - Darksend options: + Obfuscate options: + Obfuscate options: @@ -4545,8 +4545,8 @@ https://www.transifex.com/projects/p/dash/ - Error: You already have pending entries in the Darksend pool - Error: You already have pending entries in the Darksend pool + Error: You already have pending entries in the Obfuscate pool + Error: You already have pending entries in the Obfuscate pool @@ -4610,8 +4610,8 @@ https://www.transifex.com/projects/p/dash/ - Disable all Dash specific functionality (Masternodes, Darksend, InstantX, Budgeting) (0-1, default: %u) - Disable all Dash specific functionality (Masternodes, Darksend, InstantX, Budgeting) (0-1, default: %u) + Disable all Dash specific functionality (Masternodes, Obfuscate, SwiftTX, Budgeting) (0-1, default: %u) + Disable all Dash specific functionality (Masternodes, Obfuscate, SwiftTX, Budgeting) (0-1, default: %u) @@ -4620,13 +4620,13 @@ https://www.transifex.com/projects/p/dash/ - Enable instantx, show confirmations for locked transactions (bool, default: %s) - Enable instantx, show confirmations for locked transactions (bool, default: %s) + Enable swifttx, show confirmations for locked transactions (bool, default: %s) + Enable swifttx, show confirmations for locked transactions (bool, default: %s) - Enable use of automated darksend for funds stored in this wallet (0-1, default: %u) - Enable use of automated darksend for funds stored in this wallet (0-1, default: %u) + Enable use of automated obfuscate for funds stored in this wallet (0-1, default: %u) + Enable use of automated obfuscate for funds stored in this wallet (0-1, default: %u) @@ -4635,13 +4635,13 @@ https://www.transifex.com/projects/p/dash/ - Fees (in DASH/Kb) smaller than this are considered zero fee for relaying (default: %s) - Fees (in DASH/Kb) smaller than this are considered zero fee for relaying (default: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for relaying (default: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for relaying (default: %s) - Fees (in DASH/Kb) smaller than this are considered zero fee for transaction creation (default: %s) - Fees (in DASH/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for transaction creation (default: %s) @@ -4700,8 +4700,8 @@ https://www.transifex.com/projects/p/dash/ - Provide liquidity to Darksend by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) - Provide liquidity to Darksend by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) + Provide liquidity to Obfuscate by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) + Provide liquidity to Obfuscate by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) @@ -4730,10 +4730,10 @@ https://www.transifex.com/projects/p/dash/ - To use dashd, or the -server option to dash-qt, you must set an rpcpassword in the configuration file: + To use darknetd, or the -server option to darknet-qt, you must set an rpcpassword in the configuration file: %s It is recommended you use the following random password: -rpcuser=dashrpc +rpcuser=darknetrpc rpcpassword=%s (you do not need to remember this password) The username and password MUST NOT be the same. @@ -4741,10 +4741,10 @@ If the file does not exist, create it with owner-readable-only file permissions. It is also recommended to set alertnotify so you are notified of problems; for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - To use dashd, or the -server option to dash-qt, you must set an rpcpassword in the configuration file: + To use darknetd, or the -server option to darknet-qt, you must set an rpcpassword in the configuration file: %s It is recommended you use the following random password: -rpcuser=dashrpc +rpcuser=darknetrpc rpcpassword=%s (you do not need to remember this password) The username and password MUST NOT be the same. @@ -4755,8 +4755,8 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - Unable to locate enough funds for this transaction that are not equal 1000 DASH. - Unable to locate enough funds for this transaction that are not equal 1000 DASH. + Unable to locate enough funds for this transaction that are not equal 1000 DNET. + Unable to locate enough funds for this transaction that are not equal 1000 DNET. @@ -4785,8 +4785,8 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - (9999 could be used only on mainnet) - (9999 could be used only on mainnet) + (51472 could be used only on mainnet) + (51472 could be used only on mainnet) @@ -4847,18 +4847,18 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - Darksend is idle. - Darksend is idle. + Obfuscate is idle. + Obfuscate is idle. - Darksend request complete: - Darksend request complete: + Obfuscate request complete: + Obfuscate request complete: - Darksend request incomplete: - Darksend request incomplete: + Obfuscate request incomplete: + Obfuscate request incomplete: @@ -4897,8 +4897,8 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - Fee (in DASH/kB) to add to transactions you send (default: %s) - Fee (in DASH/kB) to add to transactions you send (default: %s) + Fee (in DNET/kB) to add to transactions you send (default: %s) + Fee (in DNET/kB) to add to transactions you send (default: %s) @@ -4977,8 +4977,8 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - InstantX options: - InstantX options: + SwiftTX options: + SwiftTX options: @@ -5022,8 +5022,8 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - Last successful Darksend action was too recent. - Last successful Darksend action was too recent. + Last successful Obfuscate action was too recent. + Last successful Obfuscate action was too recent. @@ -5307,8 +5307,8 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - (must be 9999 for mainnet) - (must be 9999 for mainnet) + (must be51472 for mainnet) + (must be51472 for mainnet) @@ -5357,8 +5357,8 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - Keep N DASH anonymized (default: %u) - Keep N DASH anonymized (default: %u) + Keep N DNET anonymized (default: %u) + Keep N DNET anonymized (default: %u) @@ -5367,8 +5367,8 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - Last Darksend was too recent. - Last Darksend was too recent. + Last Obfuscate was too recent. + Last Obfuscate was too recent. @@ -5682,8 +5682,8 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - Value more than Darksend pool maximum allows. - Value more than Darksend pool maximum allows. + Value more than Obfuscate pool maximum allows. + Value more than Obfuscate pool maximum allows. diff --git a/src/qt/locale/dash_es.ts b/src/qt/locale/darknet_es.ts similarity index 92% rename from src/qt/locale/dash_es.ts rename to src/qt/locale/darknet_es.ts index a6f961288fda8..17fd48a3f3263 100644 --- a/src/qt/locale/dash_es.ts +++ b/src/qt/locale/darknet_es.ts @@ -43,11 +43,11 @@ Choose the address to send coins to - Elija la dirección a la cual enviar los dash + Elija la dirección a la cual enviar los darknet Choose the address to receive coins with - Elija la dirección donde recibirá los dash + Elija la dirección donde recibirá los darknet C&hoose @@ -63,7 +63,7 @@ These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins. - Estas son sus direcciones Dash para enviar pagos. Compruebe siempre la cantidad y la dirección receptora antes de enviar dashs. + Estas son sus direcciones Dash para enviar pagos. Compruebe siempre la cantidad y la dirección receptora antes de enviar darknets. These are your Dash addresses for receiving payments. It is recommended to use a new receiving address for each transaction. @@ -176,8 +176,8 @@ Confirmar cifrado del monedero - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DASH</b>! - Advertencia: Si cifra la cartera y pierde su contraseña, ¡<b>PERDERÁ TODOS SUS DASH</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DNET</b>! + Advertencia: Si cifra la cartera y pierde su contraseña, ¡<b>PERDERÁ TODOS SUS DNET</b>! Are you sure you wish to encrypt your wallet? @@ -188,8 +188,8 @@ Monedero cifrado - Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dashs from being stolen by malware infecting your computer. - Dash se cerrará ahora para finalizar el proceso de cifrado. Recuerde que el cifrado de su monedero no puede proteger totalmente sus dashs del robo por un malware que infecte su sistema. + Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your darknets from being stolen by malware infecting your computer. + Dash se cerrará ahora para finalizar el proceso de cifrado. Recuerde que el cifrado de su monedero no puede proteger totalmente sus darknets del robo por un malware que infecte su sistema. IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet. @@ -263,7 +263,7 @@ &Recibir - Request payments (generates QR codes and dash: URIs) + Request payments (generates QR codes and darknet: URIs) Solicitar pagos (genera códigos QR y URIs de Dash) @@ -443,8 +443,8 @@ Abrir &URI... - Open a dash: URI or payment request - Abrir un dash: URI o petición de pago + Open a darknet: URI or payment request + Abrir un darknet: URI o petición de pago &Command-line options @@ -741,8 +741,8 @@ Dirección: %4 Copiar cambio - Non-anonymized input selected. <b>Darksend will be disabled.</b><br><br>If you still want to use Darksend, please deselect all non-nonymized inputs first and then check Darksend checkbox again. - Se seleccionó alguna entrada no anónima. <b>Darksend se desactivará.</b><br><br>Si aún desea usar Darksend, por favor desmarque primero todas las entradas que no son anónimas y luego active de nuevo la casilla de Darksend. + Non-anonymized input selected. <b>Obfuscate will be disabled.</b><br><br>If you still want to use Obfuscate, please deselect all non-nonymized inputs first and then check Obfuscate checkbox again. + Se seleccionó alguna entrada no anónima. <b>Obfuscate se desactivará.</b><br><br>Si aún desea usar Obfuscate, por favor desmarque primero todas las entradas que no son anónimas y luego active de nuevo la casilla de Obfuscate. highest @@ -842,10 +842,10 @@ Dirección: %4 - DarksendConfig + ObfuscateConfig - Configure Darksend - Configurar Darksend + Configure Obfuscate + Configurar Obfuscate Basic Privacy @@ -864,48 +864,48 @@ Dirección: %4 Por favor, seleccione el nivel de privacidad. - Use 2 separate masternodes to mix funds up to 1000 DASH - Usar 2 nodos maestros distintos para mezclar fondos hasta 1000 DASH + Use 2 separate masternodes to mix funds up to 1000 DNET + Usar 2 nodos maestros distintos para mezclar fondos hasta 1000 DNET - Use 8 separate masternodes to mix funds up to 1000 DASH - Usar 8 nodos maestros diferentes para mezclar fondos hasta 1000 DASH + Use 8 separate masternodes to mix funds up to 1000 DNET + Usar 8 nodos maestros diferentes para mezclar fondos hasta 1000 DNET Use 16 separate masternodes Usar 16 nodos maestros diferentes - This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH - Esta es la opción más rápida y anonimizar 1000 DASH costará alrededor de 0.025 DASH + This option is the quickest and will cost about ~0.025 DNET to anonymize 1000 DNET + Esta es la opción más rápida y anonimizar 1000 DNET costará alrededor de 0.025 DNET - This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH - Esta opción es moderadamente rápida y anonimizar 1000 DASH costará alrededor de 0.05 DASH + This option is moderately fast and will cost about 0.05 DNET to anonymize 1000 DNET + Esta opción es moderadamente rápida y anonimizar 1000 DNET costará alrededor de 0.05 DNET - 0.1 DASH per 1000 DASH you anonymize. - 0.1 DASH por cada 1000 DASH que anonimice. + 0.1 DNET per 1000 DNET you anonymize. + 0.1 DNET por cada 1000 DNET que anonimice. This is the slowest and most secure option. Using maximum anonymity will cost Esta es la opción más lenta y segura de todas. Usar la anonimización máxima costará - Darksend Configuration - Configuración de Darksend + Obfuscate Configuration + Configuración de Obfuscate - Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend fue configurado con éxito en la básica (%1 y 2 rondas). Puede cambiarlo en cualquier momento abriendo la pantalla de configuración de Dash. + Obfuscate was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate fue configurado con éxito en la básica (%1 y 2 rondas). Puede cambiarlo en cualquier momento abriendo la pantalla de configuración de Dash. - Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend fue configurado con éxito en la alta (%1 y 8 rondas). Puede cambiarlo en cualquier momento abriendo la pantalla de configuración de Dash. + Obfuscate was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate fue configurado con éxito en la alta (%1 y 8 rondas). Puede cambiarlo en cualquier momento abriendo la pantalla de configuración de Dash. - Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend fue configurado con éxito en la máxima (%1 y 16 rondas). Puede cambiarlo en cualquier momento abriendo la pantalla de configuración de Dash. + Obfuscate was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate fue configurado con éxito en la máxima (%1 y 16 rondas). Puede cambiarlo en cualquier momento abriendo la pantalla de configuración de Dash. @@ -1146,12 +1146,12 @@ Dirección: %4 (0 = automático, <0 = dejar libres ese número de núcleos) - Darksend rounds to use - Rondas de Darksend a usar + Obfuscate rounds to use + Rondas de Obfuscate a usar - This amount acts as a threshold to turn off Darksend once it's reached. - Esta cuantía sirve de umbral para que Darksend se apague, una vez sea alcanzada. + This amount acts as a threshold to turn off Obfuscate once it's reached. + Esta cuantía sirve de umbral para que Obfuscate se apague, una vez sea alcanzada. Amount of Dash to keep anonymized @@ -1263,9 +1263,9 @@ Dirección: %4 Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ ¿Idioma no disponible o traducción incompleta? Contribuye a la traducción aquí: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ User Interface Theme: @@ -1277,7 +1277,7 @@ https://www.transifex.com/projects/p/dash/ Choose the default subdivision unit to show in the interface and when sending coins. - Elegir la subdivisión predeterminada para mostrar las cuantías en la interfaz y cuando se envían dashs. + Elegir la subdivisión predeterminada para mostrar las cuantías en la interfaz y cuando se envían darknets. Decimal digits @@ -1423,16 +1423,16 @@ https://www.transifex.com/projects/p/dash/ Completado: - Darksend Balance: - Saldo de Darksend: + Obfuscate Balance: + Saldo de Obfuscate: Amount and Rounds: Cuantía y Rondas: - 0 DASH / 0 Rounds - 0 DASH / 0 Rondas + 0 DNET / 0 Rounds + 0 DNET / 0 Rondas Submitted Denom: @@ -1443,8 +1443,8 @@ https://www.transifex.com/projects/p/dash/ n/d - Darksend - Darksend + Obfuscate + Obfuscate Recent transactions @@ -1463,16 +1463,16 @@ https://www.transifex.com/projects/p/dash/ (Último Mensaje) - Try to manually submit a Darksend request. - Intentar enviar manualmente una solicitud Darksend. + Try to manually submit a Obfuscate request. + Intentar enviar manualmente una solicitud Obfuscate. Try Mix Probar - Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!) - Reiniciar el estado actual de Darksend (¡puede interrumpir Darksend si está en el proceso de Mezcla, lo cual puede costarle dinero!) + Reset the current status of Obfuscate (can interrupt Obfuscate if it's in the process of Mixing, which can cost you money!) + Reiniciar el estado actual de Obfuscate (¡puede interrumpir Obfuscate si está en el proceso de Mezcla, lo cual puede costarle dinero!) Reset @@ -1487,12 +1487,12 @@ https://www.transifex.com/projects/p/dash/ Desactivado - Start Darksend Mixing - Iniciar Mezclador Darksend + Start Obfuscate Mixing + Iniciar Mezclador Obfuscate - Stop Darksend Mixing - Parar Mezclador Darksend + Stop Obfuscate Mixing + Parar Mezclador Obfuscate No inputs detected @@ -1535,9 +1535,9 @@ https://www.transifex.com/projects/p/dash/ Activado - Last Darksend message: + Last Obfuscate message: - Último mensaje de Darksend: + Último mensaje de Obfuscate: @@ -1545,20 +1545,20 @@ https://www.transifex.com/projects/p/dash/ N/D - Darksend was successfully reset. - Darksend se reinició correctamente. + Obfuscate was successfully reset. + Obfuscate se reinició correctamente. - If you don't want to see internal Darksend fees/transactions select "Most Common" as Type on the "Transactions" tab. - Si no desea ver las comisiones/transacciones internas de Darksend seleccione "Más Habitual" como Tipo en la pestaña de "Transacciones". + If you don't want to see internal Obfuscate fees/transactions select "Most Common" as Type on the "Transactions" tab. + Si no desea ver las comisiones/transacciones internas de Obfuscate seleccione "Más Habitual" como Tipo en la pestaña de "Transacciones". - Darksend requires at least %1 to use. - Darksend requiere al menos %1 para su uso. + Obfuscate requires at least %1 to use. + Obfuscate requiere al menos %1 para su uso. - Wallet is locked and user declined to unlock. Disabling Darksend. - El monedero está bloqueado y el usuario rechazó desbloquearlo. Desactivando Darksend. + Wallet is locked and user declined to unlock. Disabling Obfuscate. + El monedero está bloqueado y el usuario rechazó desbloquearlo. Desactivando Obfuscate. @@ -1568,8 +1568,8 @@ https://www.transifex.com/projects/p/dash/ Error en solicitud de pago - Cannot start dash: click-to-pay handler - No se pudo iniciar dash: manejador de pago-al-clic + Cannot start darknet: click-to-pay handler + No se pudo iniciar darknet: manejador de pago-al-clic URI handling @@ -2292,8 +2292,8 @@ https://www.transifex.com/projects/p/dash/ Si la comisión personalizada se establece en 1000 duffs y la transacción sólo ocupa 250 bytes, entonces "por kilobyte" sólo se pagan 250 duffs de comisión,<br />mientras que "total como mínimo" paga 1000 duffs. Para transacciones mayores de un kilobyte ambas pagan por kilobyte. - Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process. - Pagar sólo la comisión mínima está bien mientras el volumen de transacciones sea menor al espacio en los bloques.<br />No obstante, tenga en cuenta que esto puede acabar en una transacción que nunca se confirme una vez haya más demanda de transacciones dash a la procesable por la red. + Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for darknet transactions than the network can process. + Pagar sólo la comisión mínima está bien mientras el volumen de transacciones sea menor al espacio en los bloques.<br />No obstante, tenga en cuenta que esto puede acabar en una transacción que nunca se confirme una vez haya más demanda de transacciones darknet a la procesable por la red. per kilobyte @@ -2364,12 +2364,12 @@ https://www.transifex.com/projects/p/dash/ Añadir &Destinatario - Darksend - Darksend + Obfuscate + Obfuscate - InstantX - InstantX + SwiftTX + SwiftTX Balance: @@ -2416,16 +2416,16 @@ https://www.transifex.com/projects/p/dash/ fondos anónimos - (darksend requires this amount to be rounded up to the nearest %1). - (darksend requiere que esta cantidad sea redondeada al %1 más cercano). + (obfuscate requires this amount to be rounded up to the nearest %1). + (obfuscate requiere que esta cantidad sea redondeada al %1 más cercano). any available funds (not recommended) cualquier fondo disponible (no recomendado) - and InstantX - e InstantX + and SwiftTX + e SwiftTX %1 to %2 @@ -2445,7 +2445,7 @@ https://www.transifex.com/projects/p/dash/ Confirm send coins - Confirmar el envío de dashs + Confirmar el envío de darknets A fee %1 times higher than %2 per kB is considered an insanely high fee. @@ -2485,11 +2485,11 @@ https://www.transifex.com/projects/p/dash/ The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. - ¡La transacción fue rechazada! Esto puede suceder si alguno de los dashs de su monedero ya se habían gastado, por ejemplo si usó una copia de wallet.dat y los dash se gastaron en dicha copia pero no se aparecen como gastados aqui. + ¡La transacción fue rechazada! Esto puede suceder si alguno de los darknets de su monedero ya se habían gastado, por ejemplo si usó una copia de wallet.dat y los darknet se gastaron en dicha copia pero no se aparecen como gastados aqui. Error: The wallet was unlocked only to anonymize coins. - Error: El monedero se desbloqueó solo para anonimizar dashs. + Error: El monedero se desbloqueó solo para anonimizar darknets. Pay only the minimum fee of %1 @@ -2559,8 +2559,8 @@ https://www.transifex.com/projects/p/dash/ Mensaje: - A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. - Un mensaje que se adjuntó al dash: URI que será almacenada con la transacción para su referencia. Nota: Este mensaje no se enviará a través de la red Dash. + A message that was attached to the darknet: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. + Un mensaje que se adjuntó al darknet: URI que será almacenada con la transacción para su referencia. Nota: Este mensaje no se enviará a través de la red Dash. This is an unverified payment request. @@ -2778,16 +2778,16 @@ https://www.transifex.com/projects/p/dash/ en conflicto - %1/offline (verified via instantx) - %1 desconectado (comprobado por instantx) + %1/offline (verified via swifttx) + %1 desconectado (comprobado por swifttx) - %1/confirmed (verified via instantx) - %1/confirmado (comprobado por instantx) + %1/confirmed (verified via swifttx) + %1/confirmado (comprobado por swifttx) - %1 confirmations (verified via instantx) - %1 confirmaciones (comprobado por instantx) + %1 confirmations (verified via swifttx) + %1 confirmaciones (comprobado por swifttx) %1/offline @@ -2802,24 +2802,24 @@ https://www.transifex.com/projects/p/dash/ %1 confirmaciones - %1/offline (InstantX verification in progress - %2 of %3 signatures) - %1/desconectado (Verificación de InstantX en curso - %2 de %3 firmas) + %1/offline (SwiftTX verification in progress - %2 of %3 signatures) + %1/desconectado (Verificación de SwiftTX en curso - %2 de %3 firmas) - %1/confirmed (InstantX verification in progress - %2 of %3 signatures ) - %1/confirmada (Verificación de InstantX en curso - %2 de %3 firmas) + %1/confirmed (SwiftTX verification in progress - %2 of %3 signatures ) + %1/confirmada (Verificación de SwiftTX en curso - %2 de %3 firmas) - %1 confirmations (InstantX verification in progress - %2 of %3 signatures) - %1 confirmaciones (Verificación de InstantX en curso - %2 de %3 firmas) + %1 confirmations (SwiftTX verification in progress - %2 of %3 signatures) + %1 confirmaciones (Verificación de SwiftTX en curso - %2 de %3 firmas) - %1/offline (InstantX verification failed) - %1/desconectado (Falló la verificación de InstantX) + %1/offline (SwiftTX verification failed) + %1/desconectado (Falló la verificación de SwiftTX) - %1/confirmed (InstantX verification failed) - %1/confirmada (Falló la verificación de InstantX) + %1/confirmed (SwiftTX verification failed) + %1/confirmada (Falló la verificación de SwiftTX) Status @@ -2919,7 +2919,7 @@ https://www.transifex.com/projects/p/dash/ Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours. - Los dashs generados deben madurar %1 bloques antes de que puedan gastarse. Cuando generó este bloque, se transmitió a la red para que se añadiera a la cadena de bloques. Si no consigue entrar en la cadena, su estado cambiará a "no aceptado" y ya no se podrá gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque a pocos segundos del suyo. + Los darknets generados deben madurar %1 bloques antes de que puedan gastarse. Cuando generó este bloque, se transmitió a la red para que se añadiera a la cadena de bloques. Si no consigue entrar en la cadena, su estado cambiará a "no aceptado" y ya no se podrá gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque a pocos segundos del suyo. Debug information @@ -3020,8 +3020,8 @@ https://www.transifex.com/projects/p/dash/ Recibido desde - Received via Darksend - Recibido mediante Darksend + Received via Obfuscate + Recibido mediante Obfuscate Sent to @@ -3036,20 +3036,20 @@ https://www.transifex.com/projects/p/dash/ Minado - Darksend Denominate - Denominación Darksend + Obfuscate Denominate + Denominación Obfuscate - Darksend Collateral Payment - Darksend - Pago de Colateral + Obfuscate Collateral Payment + Obfuscate - Pago de Colateral - Darksend Make Collateral Inputs - Darksend - Efectuar Entradas de Colateral + Obfuscate Make Collateral Inputs + Obfuscate - Efectuar Entradas de Colateral - Darksend Create Denominations - Darksend - Crear Denominaciones + Obfuscate Create Denominations + Obfuscate - Crear Denominaciones Darksent @@ -3135,20 +3135,20 @@ https://www.transifex.com/projects/p/dash/ Darksent - Darksend Make Collateral Inputs - Darksend - Efectuar Entradas de Colateral + Obfuscate Make Collateral Inputs + Obfuscate - Efectuar Entradas de Colateral - Darksend Create Denominations - Darksend - Crear Denominaciones + Obfuscate Create Denominations + Obfuscate - Crear Denominaciones - Darksend Denominate - Darksend - Denominar + Obfuscate Denominate + Obfuscate - Denominar - Darksend Collateral Payment - Darksend - Pago de Colateral + Obfuscate Collateral Payment + Obfuscate - Pago de Colateral To yourself @@ -3276,8 +3276,8 @@ https://www.transifex.com/projects/p/dash/ Enviar Dash - InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH. - InstantX aún no soporta el envío de valores tan elevados. Las transacciones están limitadas actualmente a %1 DASH. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 DNET. + SwiftTX aún no soporta el envío de valores tan elevados. Las transacciones están limitadas actualmente a %1 DNET. @@ -3320,7 +3320,7 @@ https://www.transifex.com/projects/p/dash/ - dash-core + darknet-core Bind to given address and always listen on it. Use [host]:port notation for IPv6 Vincular a la dirección dada y escuchar siempre en ella. Utilice la notación [host]:port para IPv6 @@ -3330,8 +3330,8 @@ https://www.transifex.com/projects/p/dash/ No se ha podido bloquear el directorio de datos %s. Probablemente ya se está ejecutando Dash Core. - Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. - Darksend utiliza cuantías denominadas exactas para enviar fondos, simplemente necesita anonimizar algunos dashs más. + Obfuscate uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. + Obfuscate utiliza cuantías denominadas exactas para enviar fondos, simplemente necesita anonimizar algunos darknets más. Enter regression test mode, which uses a special chain in which blocks can be solved instantly. @@ -3358,8 +3358,8 @@ https://www.transifex.com/projects/p/dash/ En este modo -genproclimit controla cuántos bloques se generan de inmediato. - InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. - InstantX requiere entradas con al menos 6 confirmaciones, puede que neesite esperar unos pocos minutos y volver a intentarlo. + SwiftTX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. + SwiftTX requiere entradas con al menos 6 confirmaciones, puede que neesite esperar unos pocos minutos y volver a intentarlo. Name to construct url for KeePass entry that stores the wallet passphrase @@ -3386,12 +3386,12 @@ https://www.transifex.com/projects/p/dash/ No se puede enlazar a %s en este equipo. Dash Core probablemente ya está en funcionamiento. - Unable to locate enough Darksend denominated funds for this transaction. - No se pueden localizar fondos denominados de Darksend suficientes para esta transacción. + Unable to locate enough Obfuscate denominated funds for this transaction. + No se pueden localizar fondos denominados de Obfuscate suficientes para esta transacción. - Unable to locate enough Darksend non-denominated funds for this transaction that are not equal 1000 DASH. - No se pueden localizar fondos no denominados de Darksend suficientes para esta transacción que no sean iguales a 1000 DASH. + Unable to locate enough Obfuscate non-denominated funds for this transaction that are not equal 1000 DNET. + No se pueden localizar fondos no denominados de Obfuscate suficientes para esta transacción que no sean iguales a 1000 DNET. Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction. @@ -3491,8 +3491,8 @@ https://www.transifex.com/projects/p/dash/ Corrupción de base de datos de bloques detectada. - Darksend options: - Opciones de Darksend: + Obfuscate options: + Opciones de Obfuscate: Debugging/Testing options: @@ -3563,8 +3563,8 @@ https://www.transifex.com/projects/p/dash/ Error: ¡El monedero está bloqueado; no se puede crear la transacción! - Error: You already have pending entries in the Darksend pool - Error: Ya tiene entradas pendientes en el pool de Darksend + Error: You already have pending entries in the Obfuscate pool + Error: Ya tiene entradas pendientes en el pool de Obfuscate Failed to listen on any port. Use -listen=0 if you want this. @@ -3615,32 +3615,32 @@ https://www.transifex.com/projects/p/dash/ Borrar todas las transacciones del monedero y recuperar únicamente aquellas partes de la cadena de bloques a través de -rescan en el inicio - Disable all Dash specific functionality (Masternodes, Darksend, InstantX, Budgeting) (0-1, default: %u) - Desactivar todas las funciones asociadas a Dash (Nodos Maestros, Darksend, InstantX, Presupuesto) (0-1, predeterminado: %u) + Disable all Dash specific functionality (Masternodes, Obfuscate, SwiftTX, Budgeting) (0-1, default: %u) + Desactivar todas las funciones asociadas a Dash (Nodos Maestros, Obfuscate, SwiftTX, Presupuesto) (0-1, predeterminado: %u) Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>. Distribuido bajo la licencia de software MIT, vea el archivo COPYING adjunto o <http://www.opensource.org/licenses/mit-license.php>. - Enable instantx, show confirmations for locked transactions (bool, default: %s) - Activar InstantX, mostrar las confirmaciones de transacciones bloqueadas (booleano, predeterminado: %s) + Enable swifttx, show confirmations for locked transactions (bool, default: %s) + Activar SwiftTX, mostrar las confirmaciones de transacciones bloqueadas (booleano, predeterminado: %s) - Enable use of automated darksend for funds stored in this wallet (0-1, default: %u) - Activar uso automatizado de Darksend para los fondos almacenados en este monedero (0-1, predeterminado: %u) + Enable use of automated obfuscate for funds stored in this wallet (0-1, default: %u) + Activar uso automatizado de Obfuscate para los fondos almacenados en este monedero (0-1, predeterminado: %u) Error: Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported. Error: Se encontró el argumento no permitido -socks. Ajustar la versión de SOCKS ya no es posible, sólo se admiten proxies SOCKS5 - Fees (in DASH/Kb) smaller than this are considered zero fee for relaying (default: %s) - Las comisiones (en DASH/Kb) menores a ésta se consideran como cero a efectos de transmisión (predeterminado: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for relaying (default: %s) + Las comisiones (en DNET/Kb) menores a ésta se consideran como cero a efectos de transmisión (predeterminado: %s) - Fees (in DASH/Kb) smaller than this are considered zero fee for transaction creation (default: %s) - Las comisiones (en DASH/Kb) menores a ésta se consideran como cero a efectos de creación de transacciones (predeterminado: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Las comisiones (en DNET/Kb) menores a ésta se consideran como cero a efectos de creación de transacciones (predeterminado: %s) Flush database activity from memory pool to disk log every <n> megabytes (default: %u) @@ -3687,8 +3687,8 @@ https://www.transifex.com/projects/p/dash/ Información de salida para depuración (predeterminado: %u, proporcionar una <category> es opcional) - Provide liquidity to Darksend by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) - Ofrecer liquidez a Darksend mezclando dash con poca frecuencia y de forma continua (0-100, predeterminado: %u, 1=muy frecuente, comisiones altas, 100=muy pocas veces, comisiones bajas) + Provide liquidity to Obfuscate by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) + Ofrecer liquidez a Obfuscate mezclando darknet con poca frecuencia y de forma continua (0-100, predeterminado: %u, 1=muy frecuente, comisiones altas, 100=muy pocas veces, comisiones bajas) Require high priority for relaying free or low-fee transactions (default:%u) @@ -3700,7 +3700,7 @@ https://www.transifex.com/projects/p/dash/ Set the number of threads for coin generation if enabled (-1 = all cores, default: %d) - Establecer el número de hilos para la generación de dash cuando ésta se encuentra activada (-1 = todos los núcleos, predeterminado: %d) + Establecer el número de hilos para la generación de darknet cuando ésta se encuentra activada (-1 = todos los núcleos, predeterminado: %d) Show N confirmations for a successfully locked transaction (0-9999, default: %u) @@ -3711,10 +3711,10 @@ https://www.transifex.com/projects/p/dash/ Este producto incluye software desarrollado por el Proyecto OpenSSL para su uso en el Toolkit OpenSSL <https://www.openssl.org/> y software criptográfico escrito por Eric Young y software UPnP escrito por Thomas Bernard. - To use dashd, or the -server option to dash-qt, you must set an rpcpassword in the configuration file: + To use darknetd, or the -server option to darknet-qt, you must set an rpcpassword in the configuration file: %s It is recommended you use the following random password: -rpcuser=dashrpc +rpcuser=darknetrpc rpcpassword=%s (you do not need to remember this password) The username and password MUST NOT be the same. @@ -3722,10 +3722,10 @@ If the file does not exist, create it with owner-readable-only file permissions. It is also recommended to set alertnotify so you are notified of problems; for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - Para usar dashd, o la opción -server de dash-qt, debe establecer rpcpassword en el archivo de configuración: + Para usar darknetd, o la opción -server de darknet-qt, debe establecer rpcpassword en el archivo de configuración: %s Es recomendable que use la contraseña aleatoria siguiente: -rpcuser=dashrpc +rpcuser=darknetrpc rpcpassword=%s (no necesita recordar esta contraseña) El nombre de usuario y la contraseña NO DEBEN ser iguales. @@ -3735,8 +3735,8 @@ por ejemplo: alertnotify=echo %%s | mail -s "Alerta de Dash" admin@foo.com - Unable to locate enough funds for this transaction that are not equal 1000 DASH. - No se pueden localizar fondos suficientes para esta transacción que no sean iguales a 1000 DASH. + Unable to locate enough funds for this transaction that are not equal 1000 DNET. + No se pueden localizar fondos suficientes para esta transacción que no sean iguales a 1000 DNET. Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s) @@ -3759,8 +3759,8 @@ por ejemplo: alertnotify=echo %%s | mail -s "Alerta de Dash" admin@foo.com Los pares de la lista blanca no pueden ser excluidos por DoS y sus transacciones siempre se transmitirán, incluso si ya se encuentran en el grupo de memoria, útil e.g. para una pasarela - (9999 could be used only on mainnet) - (9999 sólo se puede usar en la red principal) + (51472 could be used only on mainnet) + (51472 sólo se puede usar en la red principal) (default: %s) @@ -3809,16 +3809,16 @@ por ejemplo: alertnotify=echo %%s | mail -s "Alerta de Dash" admin@foo.com No se pudo intrepretar el valor -rpcbind %s como una dirección de red - Darksend is idle. - Darksend está parado. + Obfuscate is idle. + Obfuscate está parado. - Darksend request complete: - Solicitud Darksend completada: + Obfuscate request complete: + Solicitud Obfuscate completada: - Darksend request incomplete: - Petición de Darksend incompleta: + Obfuscate request incomplete: + Petición de Obfuscate incompleta: Disable safemode, override a real safe mode event (default: %u) @@ -3849,8 +3849,8 @@ por ejemplo: alertnotify=echo %%s | mail -s "Alerta de Dash" admin@foo.com Error: Se encontró el argumento no soportado -tor, use -onion. - Fee (in DASH/kB) to add to transactions you send (default: %s) - Comisión (en DASH/kB) a añadir sobre las transacciones que envíe (predeterminado: %s) + Fee (in DNET/kB) to add to transactions you send (default: %s) + Comisión (en DNET/kB) a añadir sobre las transacciones que envíe (predeterminado: %s) Finalizing transaction. @@ -3870,7 +3870,7 @@ por ejemplo: alertnotify=echo %%s | mail -s "Alerta de Dash" admin@foo.com Generate coins (default: %u) - Generar dash (predeterminado: %u) + Generar darknet (predeterminado: %u) How many blocks to check at startup (default: %u, 0 = all) @@ -3913,8 +3913,8 @@ por ejemplo: alertnotify=echo %%s | mail -s "Alerta de Dash" admin@foo.com La entrada no es válida. - InstantX options: - Opciones de InstantX: + SwiftTX options: + Opciones de SwiftTX: Insufficient funds. @@ -3949,8 +3949,8 @@ por ejemplo: alertnotify=echo %%s | mail -s "Alerta de Dash" admin@foo.com Cuantía inválida para -paytxfee=<amount>: '%s' - Last successful Darksend action was too recent. - La última acción de Darksend exitosa era demasiado reciente. + Last successful Obfuscate action was too recent. + La última acción de Obfuscate exitosa era demasiado reciente. Limit size of signature cache to <n> entries (default: %u) @@ -4177,8 +4177,8 @@ por ejemplo: alertnotify=echo %%s | mail -s "Alerta de Dash" admin@foo.com La clave prinvada del nodo maestro no es válida. Por favor, consulte la documentación. - (must be 9999 for mainnet) - (debe ser 9999 para la red principal) + (must be51472 for mainnet) + (debe ser51472 para la red principal) Can't find random Masternode. @@ -4217,16 +4217,16 @@ por ejemplo: alertnotify=echo %%s | mail -s "Alerta de Dash" admin@foo.com Clave KeePassHttp para la comunicación cifrada AES con KeePass - Keep N DASH anonymized (default: %u) - Conservar N DASH anónimos (predeterminado: %u) + Keep N DNET anonymized (default: %u) + Conservar N DNET anónimos (predeterminado: %u) Keep at most <n> unconnectable transactions in memory (default: %u) Mantenga a lo sumo <n> transacciones no conectables en la memoria (por defecto: %u) - Last Darksend was too recent. - El último Darksend era demasiado reciente. + Last Obfuscate was too recent. + El último Obfuscate era demasiado reciente. Line: %d @@ -4477,8 +4477,8 @@ por ejemplo: alertnotify=echo %%s | mail -s "Alerta de Dash" admin@foo.com Nombre de usuario para las conexiones JSON-RPC - Value more than Darksend pool maximum allows. - El valor es mayor al máximo permitido por el pool Darksend. + Value more than Obfuscate pool maximum allows. + El valor es mayor al máximo permitido por el pool Obfuscate. Verifying blocks... diff --git a/src/qt/locale/dash_fi.ts b/src/qt/locale/darknet_fi.ts similarity index 93% rename from src/qt/locale/dash_fi.ts rename to src/qt/locale/darknet_fi.ts index 0d6608b2bd7e5..25ef40eccbbb0 100644 --- a/src/qt/locale/dash_fi.ts +++ b/src/qt/locale/darknet_fi.ts @@ -176,8 +176,8 @@ Vahvista lompakon salaus - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DASH</b>! - Varoitus: Jos salaat lompakon ja unohdat salasanan, <b>MENETÄT KAIKKI DASHisi</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DNET</b>! + Varoitus: Jos salaat lompakon ja unohdat salasanan, <b>MENETÄT KAIKKI DNETisi</b>! Are you sure you wish to encrypt your wallet? @@ -188,7 +188,7 @@ Lompakko salattu - Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dashs from being stolen by malware infecting your computer. + Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your darknets from being stolen by malware infecting your computer. Dash sulkeutuu nyt salauksen viimeistelyä varten. Muista että salaus pelkästään ei voi estää Dashiesi varastamista jos koneesi saastuu haittaohjelmilla tai viruksilla. @@ -263,7 +263,7 @@ &Vastaanota - Request payments (generates QR codes and dash: URIs) + Request payments (generates QR codes and darknet: URIs) Pyydä maksuja (Luo QR koodit ja Dash: URIt) @@ -443,7 +443,7 @@ Avaa &URI... - Open a dash: URI or payment request + Open a darknet: URI or payment request Avaa Dash: URI tai maksupyyntö @@ -741,8 +741,8 @@ Osoite: %4 Kopioi vaihtoraha - Non-anonymized input selected. <b>Darksend will be disabled.</b><br><br>If you still want to use Darksend, please deselect all non-nonymized inputs first and then check Darksend checkbox again. - Ei anonyymeja syötteitä valittu. <b>Darksend poistetaan käytöstä.</b><br><br>Jos silti haluat käyttää Darksend:iä, poista ei anonyymit valinnat ensin ja valitse uudelleen Darksend optio. + Non-anonymized input selected. <b>Obfuscate will be disabled.</b><br><br>If you still want to use Obfuscate, please deselect all non-nonymized inputs first and then check Obfuscate checkbox again. + Ei anonyymeja syötteitä valittu. <b>Obfuscate poistetaan käytöstä.</b><br><br>Jos silti haluat käyttää Obfuscate:iä, poista ei anonyymit valinnat ensin ja valitse uudelleen Obfuscate optio. highest @@ -842,10 +842,10 @@ Osoite: %4 - DarksendConfig + ObfuscateConfig - Configure Darksend - Darksend Asetukset + Configure Obfuscate + Obfuscate Asetukset Basic Privacy @@ -864,11 +864,11 @@ Osoite: %4 Valitse yksityisyyden taso. - Use 2 separate masternodes to mix funds up to 1000 DASH + Use 2 separate masternodes to mix funds up to 1000 DNET Käytä 2 erillistä masternodea sekoittaaksesi varoja - Use 8 separate masternodes to mix funds up to 1000 DASH + Use 8 separate masternodes to mix funds up to 1000 DNET Käytä 8 erillistä masternodea sekoittaaksesi varoja @@ -876,36 +876,36 @@ Osoite: %4 Käytä 16 erillistä masternodea - This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH - Tämä vaihtoehto on nopein ja maksaa noin ~0.025 DASH kun anonymisoidaan 1000 DASH + This option is the quickest and will cost about ~0.025 DNET to anonymize 1000 DNET + Tämä vaihtoehto on nopein ja maksaa noin ~0.025 DNET kun anonymisoidaan 1000 DNET - This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH - Tämä vaihtoehto on keskinopea ja maksaa noin ~0.05 DASH kun anonymisoidaan 1000 DASH + This option is moderately fast and will cost about 0.05 DNET to anonymize 1000 DNET + Tämä vaihtoehto on keskinopea ja maksaa noin ~0.05 DNET kun anonymisoidaan 1000 DNET - 0.1 DASH per 1000 DASH you anonymize. - 0.1 DASH maksu per 1000 DASH jonka anonymisoit. + 0.1 DNET per 1000 DNET you anonymize. + 0.1 DNET maksu per 1000 DNET jonka anonymisoit. This is the slowest and most secure option. Using maximum anonymity will cost Tämä vaihtoehto on hitain ja kaikkein anonyymi. Suurimman yksityisyyden käyttö maksaa - Darksend Configuration - Darksend Asetukset + Obfuscate Configuration + Obfuscate Asetukset - Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend on asetettu perusasetuksiin (%1 and 2 kierrosta). Voit muuttaa asetuksia milloin vain Dash asetuksista. + Obfuscate was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate on asetettu perusasetuksiin (%1 and 2 kierrosta). Voit muuttaa asetuksia milloin vain Dash asetuksista. - Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend on asetettu keskitason asetuksiin (%1 and 8 kierrosta). Voit muuttaa asetuksia milloin vain Dash asetuksista. + Obfuscate was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate on asetettu keskitason asetuksiin (%1 and 8 kierrosta). Voit muuttaa asetuksia milloin vain Dash asetuksista. - Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend on asetettu maksimitason asetuksiin (%1 and 16 kierrosta). Voit muuttaa asetuksia milloin vain Dash asetuksista. + Obfuscate was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate on asetettu maksimitason asetuksiin (%1 and 16 kierrosta). Voit muuttaa asetuksia milloin vain Dash asetuksista. @@ -1147,12 +1147,12 @@ Varoitus: Jos käytät käyttöjärjestelmää (Live os) suoraan usb, dvd tai cd (0 = auto, <0 = jätä näin monta prosessorin ydintä vapaaksi) - Darksend rounds to use - Kuinka montaa Darksend kierrosta käytetään + Obfuscate rounds to use + Kuinka montaa Obfuscate kierrosta käytetään - This amount acts as a threshold to turn off Darksend once it's reached. - Tämä määrä toimii rajana keskeytykselle kun Darksend anonymisointi sen saavuttaa. + This amount acts as a threshold to turn off Obfuscate once it's reached. + Tämä määrä toimii rajana keskeytykselle kun Obfuscate anonymisointi sen saavuttaa. Amount of Dash to keep anonymized @@ -1264,9 +1264,9 @@ Varoitus: Jos käytät käyttöjärjestelmää (Live os) suoraan usb, dvd tai cd Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ Puuttuuko sopiva kieli tai käännös on kesken? Auta käännöstyössä täällä: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ User Interface Theme: @@ -1424,16 +1424,16 @@ https://www.transifex.com/projects/p/dash/ Valmiina: - Darksend Balance: - Darksend Saldo: + Obfuscate Balance: + Obfuscate Saldo: Amount and Rounds: Määrä ja Kierrokset: - 0 DASH / 0 Rounds - 0 DASH / 0 Kierrosta + 0 DNET / 0 Rounds + 0 DNET / 0 Kierrosta Submitted Denom: @@ -1444,8 +1444,8 @@ https://www.transifex.com/projects/p/dash/ e/s - Darksend - Darksend + Obfuscate + Obfuscate Recent transactions @@ -1464,16 +1464,16 @@ https://www.transifex.com/projects/p/dash/ (Viimeisin Viesti) - Try to manually submit a Darksend request. - Yritä manuaalisesti esittää Darksend sekoituspyyntö. + Try to manually submit a Obfuscate request. + Yritä manuaalisesti esittää Obfuscate sekoituspyyntö. Try Mix Yritä Sekoittaa - Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!) - Nollaa nykyinen Darksend tila (voi keskeyttää Darksend sekoituksen, joka voi maksaa ylimääräisiä kuluja) + Reset the current status of Obfuscate (can interrupt Obfuscate if it's in the process of Mixing, which can cost you money!) + Nollaa nykyinen Obfuscate tila (voi keskeyttää Obfuscate sekoituksen, joka voi maksaa ylimääräisiä kuluja) Reset @@ -1488,12 +1488,12 @@ https://www.transifex.com/projects/p/dash/ Ei käytössä - Start Darksend Mixing - Käynnistä Darksend Sekoitus + Start Obfuscate Mixing + Käynnistä Obfuscate Sekoitus - Stop Darksend Mixing - Lopeta Darksend Sekoitus + Stop Obfuscate Mixing + Lopeta Obfuscate Sekoitus No inputs detected @@ -1536,9 +1536,9 @@ https://www.transifex.com/projects/p/dash/ Käytössä - Last Darksend message: + Last Obfuscate message: - Viimeisin Darksend viesti: + Viimeisin Obfuscate viesti: @@ -1546,20 +1546,20 @@ https://www.transifex.com/projects/p/dash/ e/s - Darksend was successfully reset. - Darksend nollattu onnistuneesti. + Obfuscate was successfully reset. + Obfuscate nollattu onnistuneesti. - If you don't want to see internal Darksend fees/transactions select "Most Common" as Type on the "Transactions" tab. - Jos et halua nähdä sisäisiä Darksend sekoituksen kuluja/tapahtumia, valitse "Yleiset" tyypiksi siirtotapahtumissa. + If you don't want to see internal Obfuscate fees/transactions select "Most Common" as Type on the "Transactions" tab. + Jos et halua nähdä sisäisiä Obfuscate sekoituksen kuluja/tapahtumia, valitse "Yleiset" tyypiksi siirtotapahtumissa. - Darksend requires at least %1 to use. - Darksendin käyttö vaatii vähintään %1. + Obfuscate requires at least %1 to use. + Obfuscatein käyttö vaatii vähintään %1. - Wallet is locked and user declined to unlock. Disabling Darksend. - Lompakko on lukittu ja käyttäjä ei avannut sitä. Darksend asetetaan pois käytöstä. + Wallet is locked and user declined to unlock. Disabling Obfuscate. + Lompakko on lukittu ja käyttäjä ei avannut sitä. Obfuscate asetetaan pois käytöstä. @@ -1569,7 +1569,7 @@ https://www.transifex.com/projects/p/dash/ Maksupyyntövirhe - Cannot start dash: click-to-pay handler + Cannot start darknet: click-to-pay handler Ei voi käynnistää Dashia: click-to-pay handler @@ -2297,7 +2297,7 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van Jos mukautettu siirtomaksu on asetettu 1000 duff ja siirtotapahtuma on vain 250 tavua,<br />tällöin "per kilotavu" maksaa vain 250 duffs siirtomaksun, kun taas "yhteensä vähintään" maksaa 1000 duffs.<br />Siirtotapahtumat jotka ovat isompia kuin kilotavu, molemmat maksaa "per kilotavu". - Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process. + Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for darknet transactions than the network can process. Minimi siirtomaksun maksaminen on ok niin kauan kun siirtotapahtumien määrä on pienempi kuin tila lohkoissa.<br />Mutta ota huomioon että tämä voi johtaa siirtotapahtumaan jota ei vahvisteta koskaan, jos siirtotapahtumia on enemmän kuin verkko voi käsitellä. @@ -2369,12 +2369,12 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van Lisää &Vastaanottaja - Darksend - Darksend + Obfuscate + Obfuscate - InstantX - InstantX + SwiftTX + SwiftTX Balance: @@ -2421,16 +2421,16 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van anonymisoituja varoja - (darksend requires this amount to be rounded up to the nearest %1). - (darksend pyöristää tämän lähimpään %1). + (obfuscate requires this amount to be rounded up to the nearest %1). + (obfuscate pyöristää tämän lähimpään %1). any available funds (not recommended) kaikkia käytössä olevia varoja (ei suositeltu) - and InstantX - ja InstantX + and SwiftTX + ja SwiftTX %1 to %2 @@ -2564,7 +2564,7 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van Viesti: - A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. + A message that was attached to the darknet: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. Viesti joka liitettiin Dash: URI joka talletetaan siirtotapahtuman kanssa viitteeksi sinulle. Huomio: Tätä viestiä ei lähetetä Dash verkkoon. @@ -2783,16 +2783,16 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van ristiriitainen - %1/offline (verified via instantx) - %1/ei yhteyttä (vahvistettu instantx:lla) + %1/offline (verified via swifttx) + %1/ei yhteyttä (vahvistettu swifttx:lla) - %1/confirmed (verified via instantx) - %1/vahvistettu (vahvistettu instantx:lla) + %1/confirmed (verified via swifttx) + %1/vahvistettu (vahvistettu swifttx:lla) - %1 confirmations (verified via instantx) - %1 vahvistusta (vahvistettu instantx:lla) + %1 confirmations (verified via swifttx) + %1 vahvistusta (vahvistettu swifttx:lla) %1/offline @@ -2807,24 +2807,24 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van %1 vahvistusta - %1/offline (InstantX verification in progress - %2 of %3 signatures) - %1/ei yhteyttä (vahvistus instantx:lla käynnissä - %2 / %3 allekirjoitusta) + %1/offline (SwiftTX verification in progress - %2 of %3 signatures) + %1/ei yhteyttä (vahvistus swifttx:lla käynnissä - %2 / %3 allekirjoitusta) - %1/confirmed (InstantX verification in progress - %2 of %3 signatures ) - %1/vahvistettu (vahvistus instantx:lla käynnissä - %2 / %3 allekirjoitusta) + %1/confirmed (SwiftTX verification in progress - %2 of %3 signatures ) + %1/vahvistettu (vahvistus swifttx:lla käynnissä - %2 / %3 allekirjoitusta) - %1 confirmations (InstantX verification in progress - %2 of %3 signatures) - %1 vahvistusta (vahvistus instantx:lla käynnissä - %2 / %3 allekirjoitusta) + %1 confirmations (SwiftTX verification in progress - %2 of %3 signatures) + %1 vahvistusta (vahvistus swifttx:lla käynnissä - %2 / %3 allekirjoitusta) - %1/offline (InstantX verification failed) - %1/ei yhteyttä (instantx vahvistus epäonnistui) + %1/offline (SwiftTX verification failed) + %1/ei yhteyttä (swifttx vahvistus epäonnistui) - %1/confirmed (InstantX verification failed) - %1/vahvistettu (instantx vahvistus epäonnistui) + %1/confirmed (SwiftTX verification failed) + %1/vahvistettu (swifttx vahvistus epäonnistui) Status @@ -3025,8 +3025,8 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van Vastaanotettu osoitteesta - Received via Darksend - Darksend vastaanotettu + Received via Obfuscate + Obfuscate vastaanotettu Sent to @@ -3041,24 +3041,24 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van Louhittu - Darksend Denominate - Darksend denominointi + Obfuscate Denominate + Obfuscate denominointi - Darksend Collateral Payment - Darksend vakuus maksu + Obfuscate Collateral Payment + Obfuscate vakuus maksu - Darksend Make Collateral Inputs - Darksend luo vakuus syötteet + Obfuscate Make Collateral Inputs + Obfuscate luo vakuus syötteet - Darksend Create Denominations - Darksend denominointien luonti + Obfuscate Create Denominations + Obfuscate denominointien luonti Darksent - Darksend lähetetty + Obfuscate lähetetty watch-only @@ -3137,23 +3137,23 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van Darksent - Darksend lähetetty + Obfuscate lähetetty - Darksend Make Collateral Inputs - Darksend luo vakuus syötteet + Obfuscate Make Collateral Inputs + Obfuscate luo vakuus syötteet - Darksend Create Denominations - Darksend denominointien luonti + Obfuscate Create Denominations + Obfuscate denominointien luonti - Darksend Denominate - Darksend denominointi + Obfuscate Denominate + Obfuscate denominointi - Darksend Collateral Payment - Darksend vakuus maksu + Obfuscate Collateral Payment + Obfuscate vakuus maksu To yourself @@ -3281,8 +3281,8 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van Lähetä Dasheja - InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH. - InstantX ei tue näin korkeaa lähetysmäärää vielä. Siirtotapahtumat on tällä hetkellä rajoitettu %1 DASH. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 DNET. + SwiftTX ei tue näin korkeaa lähetysmäärää vielä. Siirtotapahtumat on tällä hetkellä rajoitettu %1 DNET. @@ -3325,7 +3325,7 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van - dash-core + darknet-core Bind to given address and always listen on it. Use [host]:port notation for IPv6 Kytkeydy annettuun osoitteeseen ja pidä linja aina auki. Käytä [host]:port merkintätapaa IPv6:lle. @@ -3335,8 +3335,8 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van Ei voida lukita data hakemistoa %s. Dash Core on luultavasti jo käynnissä. - Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. - Darksend käyttää tarkalleen denominoituja syötteitä lähettäessään varoja, saatat tarvita anonymisoida lisää varoja. + Obfuscate uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. + Obfuscate käyttää tarkalleen denominoituja syötteitä lähettäessään varoja, saatat tarvita anonymisoida lisää varoja. Enter regression test mode, which uses a special chain in which blocks can be solved instantly. @@ -3363,8 +3363,8 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van Tässä moodissa -genproclimit ohjaa kuinka monta lohkoa luodaan välittömästi. - InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. - InstantX vaatii syötteille vähintään 6 vahvistusta, odota muutama minuutti ja yritä uudelleen. + SwiftTX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. + SwiftTX vaatii syötteille vähintään 6 vahvistusta, odota muutama minuutti ja yritä uudelleen. Name to construct url for KeePass entry that stores the wallet passphrase @@ -3391,12 +3391,12 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van Ei voida yhdistää %s tässä tietokoneessa. Dash Core on luultavasti jo käynnissä. - Unable to locate enough Darksend denominated funds for this transaction. - Ei tarpeeksi Darksend anonymisoituja varoja tälle siirtotapahtumalle. + Unable to locate enough Obfuscate denominated funds for this transaction. + Ei tarpeeksi Obfuscate anonymisoituja varoja tälle siirtotapahtumalle. - Unable to locate enough Darksend non-denominated funds for this transaction that are not equal 1000 DASH. - Ei tarpeeksi Darksend ei-anonymisoituja varoja tälle siirtotapahtumalle, joka ei ole 1000 DASH. + Unable to locate enough Obfuscate non-denominated funds for this transaction that are not equal 1000 DNET. + Ei tarpeeksi Obfuscate ei-anonymisoituja varoja tälle siirtotapahtumalle, joka ei ole 1000 DNET. Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction. @@ -3495,8 +3495,8 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van Vioittunut lohkotietokanta havaittu - Darksend options: - Darksend valinnat: + Obfuscate options: + Obfuscate valinnat: Debugging/Testing options: @@ -3567,8 +3567,8 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van Virhe: Lompakko on lukittu, siirtotapahtumaa ei voida luoda! - Error: You already have pending entries in the Darksend pool - Virhe: Sinulla on jo odottavia merkintöjä Darksend varannossa + Error: You already have pending entries in the Obfuscate pool + Virhe: Sinulla on jo odottavia merkintöjä Obfuscate varannossa Failed to listen on any port. Use -listen=0 if you want this. @@ -3619,32 +3619,32 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van Poista kaikki lompakon siirtotapahtumat ja palauta vain nuo osat lohkoketjusta -rescan valinnan avulla käynnistyksessä - Disable all Dash specific functionality (Masternodes, Darksend, InstantX, Budgeting) (0-1, default: %u) - Kytke pois käytöstä kaikki Dash:in erityistoiminnot (Masternodet, Darksend, InstantX, Budjetointi) (0-1, oletus: %u) + Disable all Dash specific functionality (Masternodes, Obfuscate, SwiftTX, Budgeting) (0-1, default: %u) + Kytke pois käytöstä kaikki Dash:in erityistoiminnot (Masternodet, Obfuscate, SwiftTX, Budjetointi) (0-1, oletus: %u) Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>. Levitetään MIT ohjelmistolisenssin alaisuudessa. Tarkemmat tiedot löytyvät tiedostosta COPYING tai osoitteesta <http://www.opensource.org/licenses/mit-license.php>. - Enable instantx, show confirmations for locked transactions (bool, default: %s) - Ota instantx käyttöön, näytä lukittujen siirtojen vahvistukset (bool, oletus: %s) + Enable swifttx, show confirmations for locked transactions (bool, default: %s) + Ota swifttx käyttöön, näytä lukittujen siirtojen vahvistukset (bool, oletus: %s) - Enable use of automated darksend for funds stored in this wallet (0-1, default: %u) - Ota käyttöön automaattinen Darksend rahavaroille tässä lompakossa (0-1, oletus: %u) + Enable use of automated obfuscate for funds stored in this wallet (0-1, default: %u) + Ota käyttöön automaattinen Obfuscate rahavaroille tässä lompakossa (0-1, oletus: %u) Error: Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported. Virhe: Ei tuettu argumentti -socks. SOCKS version asettaminen ei ole enää mahdollista, vain SOCKS5 proxyt ovat tuettuja. - Fees (in DASH/Kb) smaller than this are considered zero fee for relaying (default: %s) - Siirtomaksut (DASH/Kb) jotka ovat pienempiä kuin tämä, tulkitaan nollamaksuksi välityksessä (oletus: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for relaying (default: %s) + Siirtomaksut (DNET/Kb) jotka ovat pienempiä kuin tämä, tulkitaan nollamaksuksi välityksessä (oletus: %s) - Fees (in DASH/Kb) smaller than this are considered zero fee for transaction creation (default: %s) - Siirtomaksut (DASH/Kb) jotka ovat pienempiä kuin tämä, tulkitaan nollamaksuksi siirtotapahtuman luonnissa (oletus: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Siirtomaksut (DNET/Kb) jotka ovat pienempiä kuin tämä, tulkitaan nollamaksuksi siirtotapahtuman luonnissa (oletus: %s) Flush database activity from memory pool to disk log every <n> megabytes (default: %u) @@ -3691,8 +3691,8 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van Tulosta debuggaustieto (oletus: %u, tarjottava <category> on valinnainen) - Provide liquidity to Darksend by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) - Tarjoa Darksend:ille likviditeettiä jatkuvaa kolikoiden sekoitusta varten (0-100, oletus: %u, 1=usein, isot maksukulut, 100=harvoin, pienet maksukulut) + Provide liquidity to Obfuscate by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) + Tarjoa Obfuscate:ille likviditeettiä jatkuvaa kolikoiden sekoitusta varten (0-100, oletus: %u, 1=usein, isot maksukulut, 100=harvoin, pienet maksukulut) Require high priority for relaying free or low-fee transactions (default:%u) @@ -3717,10 +3717,10 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van Käännös päivitetty: 1.9.2015 by AjM. - To use dashd, or the -server option to dash-qt, you must set an rpcpassword in the configuration file: + To use darknetd, or the -server option to darknet-qt, you must set an rpcpassword in the configuration file: %s It is recommended you use the following random password: -rpcuser=dashrpc +rpcuser=darknetrpc rpcpassword=%s (you do not need to remember this password) The username and password MUST NOT be the same. @@ -3728,10 +3728,10 @@ If the file does not exist, create it with owner-readable-only file permissions. It is also recommended to set alertnotify so you are notified of problems; for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - Käyttääksesi dashd:ia tai -server valintaa dash-qt:lle, sinun tulee asettaa rpc salasana asetustiedostossa: + Käyttääksesi darknetd:ia tai -server valintaa darknet-qt:lle, sinun tulee asettaa rpc salasana asetustiedostossa: %s Suositellaan että käytät allaolevaa satunnaista salasanaa: -rpcuser=dashrpc +rpcuser=darknetrpc rpcpassword=%s (sinun ei tarvitse muistaa tätä salasanaa) Käyttäjätunnus ja salasana on oltava ERILAISET. @@ -3741,8 +3741,8 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Dash Hälytys" admin@foo.com - Unable to locate enough funds for this transaction that are not equal 1000 DASH. - Ei tarpeeksi varoja tälle siirtotapahtumalle, joka ei ole 1000 DASH. + Unable to locate enough funds for this transaction that are not equal 1000 DNET. + Ei tarpeeksi varoja tälle siirtotapahtumalle, joka ei ole 1000 DNET. Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s) @@ -3765,8 +3765,8 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Dash Hälytys" admin@foo.com Luotettaviksi merkittyjä peers:ejä ei voida DoS estää, ja niiden siirtotapahtumat välitetään aina, vaikka ne olisvatkin jo muistivarannossa, käyttökelpoinen esim. yhdyskäytävään - (9999 could be used only on mainnet) - (9999 voidaan käyttää vain pääverkossa) + (51472 could be used only on mainnet) + (51472 voidaan käyttää vain pääverkossa) (default: %s) @@ -3815,16 +3815,16 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Dash Hälytys" admin@foo.com Ei voida jäsentää -rpcbind arvoa %s verkko-osoitteena - Darksend is idle. - Darksend odottaa. + Obfuscate is idle. + Obfuscate odottaa. - Darksend request complete: - Darksend pyyntö valmis: + Obfuscate request complete: + Obfuscate pyyntö valmis: - Darksend request incomplete: - Darksend pyyntö kesken: + Obfuscate request incomplete: + Obfuscate pyyntö kesken: Disable safemode, override a real safe mode event (default: %u) @@ -3855,8 +3855,8 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Dash Hälytys" admin@foo.com Virhe: Ei tuettu argumentti -tor löytyi, käytä -onion. - Fee (in DASH/kB) to add to transactions you send (default: %s) - Lisättävä siirtomaksu (DASH/Kb) siirtotapahtumaan jonka lähetät (oletus: %s) + Fee (in DNET/kB) to add to transactions you send (default: %s) + Lisättävä siirtomaksu (DNET/Kb) siirtotapahtumaan jonka lähetät (oletus: %s) Finalizing transaction. @@ -3919,8 +3919,8 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Dash Hälytys" admin@foo.com Syöte ei ole pätevä. - InstantX options: - InstantX valinnat: + SwiftTX options: + SwiftTX valinnat: Insufficient funds. @@ -3955,8 +3955,8 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Dash Hälytys" admin@foo.com Virheellinen määrä -paytxfee=<amount>: '%s' - Last successful Darksend action was too recent. - Viimeinen onnistunut Darksend tapahtuma oli liian äskettäin. + Last successful Obfuscate action was too recent. + Viimeinen onnistunut Obfuscate tapahtuma oli liian äskettäin. Limit size of signature cache to <n> entries (default: %u) @@ -4183,8 +4183,8 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Dash Hälytys" admin@foo.com Virheellinen masternoden yksityisavain (masternodeprivkey). Katso lisätietoja dokumentaatiosta. - (must be 9999 for mainnet) - (oltava 9999 pääverkossa) + (must be51472 for mainnet) + (oltava51472 pääverkossa) Can't find random Masternode. @@ -4223,16 +4223,16 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Dash Hälytys" admin@foo.com KeePassHttp avain AES salattuun viestintään - Keep N DASH anonymized (default: %u) - Pidä N DASH anonymisoituna (oletus: %u) + Keep N DNET anonymized (default: %u) + Pidä N DNET anonymisoituna (oletus: %u) Keep at most <n> unconnectable transactions in memory (default: %u) Pidä enintään <n> ei yhdistettyä siirtotapahtumaa muistissa (oletus: %u) - Last Darksend was too recent. - Viimeisin Darksend oli liian äskettäin. + Last Obfuscate was too recent. + Viimeisin Obfuscate oli liian äskettäin. Line: %d @@ -4483,8 +4483,8 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Dash Hälytys" admin@foo.com Käyttäjätunnus JSON-RPC yhteyksille - Value more than Darksend pool maximum allows. - Määrä on enemmän kuin Darksend varannon maksimi sallii. + Value more than Obfuscate pool maximum allows. + Määrä on enemmän kuin Obfuscate varannon maksimi sallii. Verifying blocks... diff --git a/src/qt/locale/dash_fr.ts b/src/qt/locale/darknet_fr.ts similarity index 93% rename from src/qt/locale/dash_fr.ts rename to src/qt/locale/darknet_fr.ts index 75c90d5844f87..d661ff9fca59f 100644 --- a/src/qt/locale/dash_fr.ts +++ b/src/qt/locale/darknet_fr.ts @@ -176,8 +176,8 @@ Confirmer le chiffrement du portefeuille - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DASH</b>! - Attention : Si vous chiffrez votre portefeuille et perdez votre phrase de passe, vous <b>PERDREZ TOUS VOS DASH</b> ! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DNET</b>! + Attention : Si vous chiffrez votre portefeuille et perdez votre phrase de passe, vous <b>PERDREZ TOUS VOS DNET</b> ! Are you sure you wish to encrypt your wallet? @@ -188,7 +188,7 @@ Portefeuille chiffré - Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dashs from being stolen by malware infecting your computer. + Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your darknets from being stolen by malware infecting your computer. Dash va à présent se fermer pour terminer le chiffrement. N'oubliez pas que le chiffrement de votre portefeuille n'est pas une protection totale contre le vol par des logiciels malveillants qui infecteraient votre ordinateur. @@ -263,8 +263,8 @@ &Recevoir - Request payments (generates QR codes and dash: URIs) - Demande de paiements (Générer des QR code et des URIs dash) + Request payments (generates QR codes and darknet: URIs) + Demande de paiements (Générer des QR code et des URIs darknet) &Transactions @@ -443,8 +443,8 @@ Ouvrir un &URI... - Open a dash: URI or payment request - Ouvrir une URI ou demande de paiement dash + Open a darknet: URI or payment request + Ouvrir une URI ou demande de paiement darknet &Command-line options @@ -741,8 +741,8 @@ Adresse : %4 Copier la monnaie - Non-anonymized input selected. <b>Darksend will be disabled.</b><br><br>If you still want to use Darksend, please deselect all non-nonymized inputs first and then check Darksend checkbox again. - Entrée non-anonymisées sélectionnée. <b> Darksend sera désactivé. </ b> <br> Si vous voulez continuer à utiliser Darksend, veuillez désélectionner toutes les entrées non-anonymisées d'abord, puis vérifier à nouveau la case Darksend. + Non-anonymized input selected. <b>Obfuscate will be disabled.</b><br><br>If you still want to use Obfuscate, please deselect all non-nonymized inputs first and then check Obfuscate checkbox again. + Entrée non-anonymisées sélectionnée. <b> Obfuscate sera désactivé. </ b> <br> Si vous voulez continuer à utiliser Obfuscate, veuillez désélectionner toutes les entrées non-anonymisées d'abord, puis vérifier à nouveau la case Obfuscate. highest @@ -842,10 +842,10 @@ Adresse : %4 - DarksendConfig + ObfuscateConfig - Configure Darksend - Configurer Darksend + Configure Obfuscate + Configurer Obfuscate Basic Privacy @@ -864,48 +864,48 @@ Adresse : %4 Veuillez choisir un niveau de confidentialité. - Use 2 separate masternodes to mix funds up to 1000 DASH - Utiliser 2 masternodes pour mélanger jusqu'à 1000 DASH + Use 2 separate masternodes to mix funds up to 1000 DNET + Utiliser 2 masternodes pour mélanger jusqu'à 1000 DNET - Use 8 separate masternodes to mix funds up to 1000 DASH - Utiliser 8 masternodes pour mélanger jusqu'à 1000 DASH + Use 8 separate masternodes to mix funds up to 1000 DNET + Utiliser 8 masternodes pour mélanger jusqu'à 1000 DNET Use 16 separate masternodes Utiliser 16 masternodes - This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH - Cette option est la plus rapide et coûtera environ 0,025 DASH pour anonymiser 1000 DASH + This option is the quickest and will cost about ~0.025 DNET to anonymize 1000 DNET + Cette option est la plus rapide et coûtera environ 0,025 DNET pour anonymiser 1000 DNET - This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH - Cette option est un peu moins rapide et coûtera environ 0,05 DASH pour anonymiser 1000 DASH + This option is moderately fast and will cost about 0.05 DNET to anonymize 1000 DNET + Cette option est un peu moins rapide et coûtera environ 0,05 DNET pour anonymiser 1000 DNET - 0.1 DASH per 1000 DASH you anonymize. - 0,1 DASH par 1000 DASH anonymisés. + 0.1 DNET per 1000 DNET you anonymize. + 0,1 DNET par 1000 DNET anonymisés. This is the slowest and most secure option. Using maximum anonymity will cost Cette option est le plus lente et la plus sécurisée. Utiliser l'anonymisation maximale coûtera - Darksend Configuration - Configuration de Darksend + Obfuscate Configuration + Configuration de Obfuscate - Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend est réglé avec succès sur normal (%1 and 2 rounds). Vous pouvez changer cela à tout moment en ouvrant la fenêtre de configuration du Dash. + Obfuscate was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate est réglé avec succès sur normal (%1 and 2 rounds). Vous pouvez changer cela à tout moment en ouvrant la fenêtre de configuration du Dash. - Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend est réglé avec succès sur haut (%1 and 8 rounds). Vous pouvez changer cela à tout moment en ouvrant la fenêtre de configuration du Dash. + Obfuscate was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate est réglé avec succès sur haut (%1 and 8 rounds). Vous pouvez changer cela à tout moment en ouvrant la fenêtre de configuration du Dash. - Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend est réglé avec succès sur maximum (%1 and 16 rounds). Vous pouvez changer cela à tout moment en ouvrant la fenêtre de configuration du Dash. + Obfuscate was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate est réglé avec succès sur maximum (%1 and 16 rounds). Vous pouvez changer cela à tout moment en ouvrant la fenêtre de configuration du Dash. @@ -1146,12 +1146,12 @@ Adresse : %4 (0 = auto, < 0 = laisser ce nombre de cœurs inutilisés) - Darksend rounds to use - Nombre de cycles Darksend à effectuer + Obfuscate rounds to use + Nombre de cycles Obfuscate à effectuer - This amount acts as a threshold to turn off Darksend once it's reached. - Ce montant est le seuil pour désactiver Darksend dès qu'il est atteint. + This amount acts as a threshold to turn off Obfuscate once it's reached. + Ce montant est le seuil pour désactiver Obfuscate dès qu'il est atteint. Amount of Dash to keep anonymized @@ -1263,9 +1263,9 @@ Adresse : %4 Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ Langage manquant ou traduction incomplète ? Participez aux traductions ici : -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ User Interface Theme: @@ -1423,16 +1423,16 @@ https://www.transifex.com/projects/p/dash/ Complétude : - Darksend Balance: - Balance Darksend : + Obfuscate Balance: + Balance Obfuscate : Amount and Rounds: Montant et Cycles - 0 DASH / 0 Rounds - 0 DASH / 0 Cycles + 0 DNET / 0 Rounds + 0 DNET / 0 Cycles Submitted Denom: @@ -1443,8 +1443,8 @@ https://www.transifex.com/projects/p/dash/ n/a - Darksend - Darksend + Obfuscate + Obfuscate Recent transactions @@ -1463,16 +1463,16 @@ https://www.transifex.com/projects/p/dash/ (Dernier Message) - Try to manually submit a Darksend request. - Essayer de soumettre manuellement une requête Darksend. + Try to manually submit a Obfuscate request. + Essayer de soumettre manuellement une requête Obfuscate. Try Mix Essayer le mélange - Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!) - Réinitialiser le statut de Darksend (peut interrompre Darksend si le process de mélange est en cours, ce qui peut vous coûter de l'argent !) + Reset the current status of Obfuscate (can interrupt Obfuscate if it's in the process of Mixing, which can cost you money!) + Réinitialiser le statut de Obfuscate (peut interrompre Obfuscate si le process de mélange est en cours, ce qui peut vous coûter de l'argent !) Reset @@ -1487,12 +1487,12 @@ https://www.transifex.com/projects/p/dash/ Désactivé - Start Darksend Mixing - Démarrer le mélange Darksend + Start Obfuscate Mixing + Démarrer le mélange Obfuscate - Stop Darksend Mixing - Arrêter le mélange Darksend + Stop Obfuscate Mixing + Arrêter le mélange Obfuscate No inputs detected @@ -1535,9 +1535,9 @@ https://www.transifex.com/projects/p/dash/ Activé - Last Darksend message: + Last Obfuscate message: - Dernier message de Darksend: + Dernier message de Obfuscate: @@ -1545,20 +1545,20 @@ https://www.transifex.com/projects/p/dash/ N.D. - Darksend was successfully reset. - Darksend est réinitialisé avec succès + Obfuscate was successfully reset. + Obfuscate est réinitialisé avec succès - If you don't want to see internal Darksend fees/transactions select "Most Common" as Type on the "Transactions" tab. - Pour ne pas voir les transactions/frais Darksend internes sélectionnez "Les plus Communes" comme Type dans l'onglet "Transactions" + If you don't want to see internal Obfuscate fees/transactions select "Most Common" as Type on the "Transactions" tab. + Pour ne pas voir les transactions/frais Obfuscate internes sélectionnez "Les plus Communes" comme Type dans l'onglet "Transactions" - Darksend requires at least %1 to use. - Darksend nécessite au moins %1 pour l'utiliser + Obfuscate requires at least %1 to use. + Obfuscate nécessite au moins %1 pour l'utiliser - Wallet is locked and user declined to unlock. Disabling Darksend. - Le portefeuille est vérouillé et l'utilisateur a refusé de le débloquer. Désactivation de Darksend. + Wallet is locked and user declined to unlock. Disabling Obfuscate. + Le portefeuille est vérouillé et l'utilisateur a refusé de le débloquer. Désactivation de Obfuscate. @@ -1568,8 +1568,8 @@ https://www.transifex.com/projects/p/dash/ Erreur de demande de paiement - Cannot start dash: click-to-pay handler - Impossible de démarrer dash: click-to-pay le gestionnaire + Cannot start darknet: click-to-pay handler + Impossible de démarrer darknet: click-to-pay le gestionnaire URI handling @@ -2292,7 +2292,7 @@ https://www.transifex.com/projects/p/dash/ Si les frais personnalisés sont à 1000 duffs et que la transaction fait seulement 250 octets, alors "par kilooctet" payera seulement 250 duffs de frais,<br />alors que "total au moins" payera 1000 duffs. Pour les transactions de plus d'un kilooctet les deux payeront par kilooctet. - Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process. + Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for darknet transactions than the network can process. Payer les frais minimums fonctionne tant qu'il y a moins de volume de transactions que de place dans les blocs.<br/>Mais soyez conscients que ceci peut amener a des transactions qui ne seront jamais confirmées lorsqu'il y aura plus de demande que la capacité du réseau. @@ -2364,12 +2364,12 @@ https://www.transifex.com/projects/p/dash/ Ajouter un &destinataire - Darksend - Darksend + Obfuscate + Obfuscate - InstantX - InstantX + SwiftTX + SwiftTX Balance: @@ -2416,16 +2416,16 @@ https://www.transifex.com/projects/p/dash/ fonds anonymisés - (darksend requires this amount to be rounded up to the nearest %1). - (darksend nécessite que ce montant soit arrondi au plus proche de %1). + (obfuscate requires this amount to be rounded up to the nearest %1). + (obfuscate nécessite que ce montant soit arrondi au plus proche de %1). any available funds (not recommended) tout fonds disponible (non recommandé) - and InstantX - et InstantX + and SwiftTX + et SwiftTX %1 to %2 @@ -2559,7 +2559,7 @@ https://www.transifex.com/projects/p/dash/ Message : - A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. + A message that was attached to the darknet: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. Un message qui était joint au Dash : URI qui sera sauvegardée avec la transaction pour référence. Note : Ce message ne sera pas envoyé à travers le réseau Dash. @@ -2778,16 +2778,16 @@ https://www.transifex.com/projects/p/dash/ en conflit - %1/offline (verified via instantx) - %1/déconnecté (vérifié avec instantx) + %1/offline (verified via swifttx) + %1/déconnecté (vérifié avec swifttx) - %1/confirmed (verified via instantx) - %1/confirmé (verifié avec instantx) + %1/confirmed (verified via swifttx) + %1/confirmé (verifié avec swifttx) - %1 confirmations (verified via instantx) - %1 confirmations (verifié avec instantx) + %1 confirmations (verified via swifttx) + %1 confirmations (verifié avec swifttx) %1/offline @@ -2802,24 +2802,24 @@ https://www.transifex.com/projects/p/dash/ %1 confirmations - %1/offline (InstantX verification in progress - %2 of %3 signatures) - %1/déconnecté (vérification d'InstantX en cours - %2 sur %3 signatures) + %1/offline (SwiftTX verification in progress - %2 of %3 signatures) + %1/déconnecté (vérification d'SwiftTX en cours - %2 sur %3 signatures) - %1/confirmed (InstantX verification in progress - %2 of %3 signatures ) - %1/confirmé (vérification d'InstantX en cours - %2 sur %3 signatures) + %1/confirmed (SwiftTX verification in progress - %2 of %3 signatures ) + %1/confirmé (vérification d'SwiftTX en cours - %2 sur %3 signatures) - %1 confirmations (InstantX verification in progress - %2 of %3 signatures) - %1 confirmations (vérification d'InstantX en cours - %2 sur %3 signatures) + %1 confirmations (SwiftTX verification in progress - %2 of %3 signatures) + %1 confirmations (vérification d'SwiftTX en cours - %2 sur %3 signatures) - %1/offline (InstantX verification failed) - %1/déconnecté (La vérification d'InstantX a échoué) + %1/offline (SwiftTX verification failed) + %1/déconnecté (La vérification d'SwiftTX a échoué) - %1/confirmed (InstantX verification failed) - %1/confirmé (La vérification d'InstantX a échoué) + %1/confirmed (SwiftTX verification failed) + %1/confirmé (La vérification d'SwiftTX a échoué) Status @@ -3020,8 +3020,8 @@ https://www.transifex.com/projects/p/dash/ Reçue de - Received via Darksend - Reçu par Darksend + Received via Obfuscate + Reçu par Obfuscate Sent to @@ -3036,20 +3036,20 @@ https://www.transifex.com/projects/p/dash/ Miné - Darksend Denominate - Dénomination Darksend + Obfuscate Denominate + Dénomination Obfuscate - Darksend Collateral Payment - Paiement Darksend Collatéral + Obfuscate Collateral Payment + Paiement Obfuscate Collatéral - Darksend Make Collateral Inputs - Darksend Création d'Entrées Collatérales + Obfuscate Make Collateral Inputs + Obfuscate Création d'Entrées Collatérales - Darksend Create Denominations - Darksend Création de Dénominations + Obfuscate Create Denominations + Obfuscate Création de Dénominations Darksent @@ -3135,20 +3135,20 @@ https://www.transifex.com/projects/p/dash/ Darksent - Darksend Make Collateral Inputs - Darksend Création d'Entrées Collatérales + Obfuscate Make Collateral Inputs + Obfuscate Création d'Entrées Collatérales - Darksend Create Denominations - Darksend Création de Dénominations + Obfuscate Create Denominations + Obfuscate Création de Dénominations - Darksend Denominate - Dénomination Darksend + Obfuscate Denominate + Dénomination Obfuscate - Darksend Collateral Payment - Paiement Darksend Collatéral + Obfuscate Collateral Payment + Paiement Obfuscate Collatéral To yourself @@ -3276,8 +3276,8 @@ https://www.transifex.com/projects/p/dash/ Envoyer des pièces - InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH. - InstantX ne supporte pas des transferts aussi élevés. Les transactions sont pour le moment limitées à %11 DASH. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 DNET. + SwiftTX ne supporte pas des transferts aussi élevés. Les transactions sont pour le moment limitées à %11 DNET. @@ -3320,7 +3320,7 @@ https://www.transifex.com/projects/p/dash/ - dash-core + darknet-core Bind to given address and always listen on it. Use [host]:port notation for IPv6 Se lier à l'adresse donnée et toujours l'écouter. Utilisez la notation [host]:port pour l'IPv6 @@ -3330,8 +3330,8 @@ https://www.transifex.com/projects/p/dash/ Impossible d’obtenir un verrou sur le répertoire de données %s. Dash Core fonctionne probablement déjà. - Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. - Darksend utilise les montants dénominés exacts pour envoyer des fonds, vous pourriez simplement avoir besoin d'anonymiser plus de pièces. + Obfuscate uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. + Obfuscate utilise les montants dénominés exacts pour envoyer des fonds, vous pourriez simplement avoir besoin d'anonymiser plus de pièces. Enter regression test mode, which uses a special chain in which blocks can be solved instantly. @@ -3358,8 +3358,8 @@ https://www.transifex.com/projects/p/dash/ Dans ce mode -genproclimit contrôle combien de blocs sont générés immédiatement. - InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. - InstantX nécessite des entrées avec au moins 6 confirmations, vous devriez attendre quelques minutes avant de réessayer. + SwiftTX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. + SwiftTX nécessite des entrées avec au moins 6 confirmations, vous devriez attendre quelques minutes avant de réessayer. Name to construct url for KeePass entry that stores the wallet passphrase @@ -3386,12 +3386,12 @@ https://www.transifex.com/projects/p/dash/ Impossible de se lier à %s sur cet ordinateur. Dash Core fonctionne probablement déjà. - Unable to locate enough Darksend denominated funds for this transaction. - Impossible de localiser suffisamment de fonds Darksend dénominés pour cette transaction. + Unable to locate enough Obfuscate denominated funds for this transaction. + Impossible de localiser suffisamment de fonds Obfuscate dénominés pour cette transaction. - Unable to locate enough Darksend non-denominated funds for this transaction that are not equal 1000 DASH. - Impossible de localiser suffisamment de fonds non-dénominés Darksend pour cette transaction qui ne sont pas égaux à 1000 DASH. + Unable to locate enough Obfuscate non-denominated funds for this transaction that are not equal 1000 DNET. + Impossible de localiser suffisamment de fonds non-dénominés Obfuscate pour cette transaction qui ne sont pas égaux à 1000 DNET. Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction. @@ -3490,8 +3490,8 @@ https://www.transifex.com/projects/p/dash/ Base corrompue de données des blocs détectée - Darksend options: - Options Darksend : + Obfuscate options: + Options Obfuscate : Debugging/Testing options: @@ -3562,8 +3562,8 @@ https://www.transifex.com/projects/p/dash/ Erreur : Portefeuille verrouillé, impossible de créer la transaction ! - Error: You already have pending entries in the Darksend pool - Erreur : Vous avez déjà des entrées en attente dans la pool Darksend + Error: You already have pending entries in the Obfuscate pool + Erreur : Vous avez déjà des entrées en attente dans la pool Obfuscate Failed to listen on any port. Use -listen=0 if you want this. @@ -3614,32 +3614,32 @@ https://www.transifex.com/projects/p/dash/ Effacer toutes les transactions du portefeuille et récupère celle qui font partie de la chaine de blocs via -rescan au démarrage - Disable all Dash specific functionality (Masternodes, Darksend, InstantX, Budgeting) (0-1, default: %u) - Désactivez toutes les fonctionnalités liées à Dash (Masternode, Darksend, InstantX, Budgetisation) (0-1, par défaut: %u) + Disable all Dash specific functionality (Masternodes, Obfuscate, SwiftTX, Budgeting) (0-1, default: %u) + Désactivez toutes les fonctionnalités liées à Dash (Masternode, Obfuscate, SwiftTX, Budgetisation) (0-1, par défaut: %u) Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>. Distribué sous la licence logicielle MIT, voir le fichier joint COPYING ou <http://www.opensource.org/licenses/mit-license.php>. - Enable instantx, show confirmations for locked transactions (bool, default: %s) - Activer instantx, montrer les confirmations pour les transactions verrouillées (bool, par defaut: %s) + Enable swifttx, show confirmations for locked transactions (bool, default: %s) + Activer swifttx, montrer les confirmations pour les transactions verrouillées (bool, par defaut: %s) - Enable use of automated darksend for funds stored in this wallet (0-1, default: %u) - Activer l'utilisation automatique de Darksend pour les fonds stockés dans ce portefeuille (0-1, défaut: %u) + Enable use of automated obfuscate for funds stored in this wallet (0-1, default: %u) + Activer l'utilisation automatique de Obfuscate pour les fonds stockés dans ce portefeuille (0-1, défaut: %u) Error: Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported. Erreur: Paramètre obsolète -socks. Il n'est plus possible d'indiquer la version SOCKS, seul les proxy SOCKS5 sont supportés. - Fees (in DASH/Kb) smaller than this are considered zero fee for relaying (default: %s) - Les frais (en DASH/ko) inférieurs à ce seuil sont considérés comme nuls pour le relayage (par défaut : %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for relaying (default: %s) + Les frais (en DNET/ko) inférieurs à ce seuil sont considérés comme nuls pour le relayage (par défaut : %s) - Fees (in DASH/Kb) smaller than this are considered zero fee for transaction creation (default: %s) - Les frais (en DASH/ko) inférieurs à ce seuil sont considérés comme nuls pour la création de transactions (par défaut : %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Les frais (en DNET/ko) inférieurs à ce seuil sont considérés comme nuls pour la création de transactions (par défaut : %s) Flush database activity from memory pool to disk log every <n> megabytes (default: %u) @@ -3686,8 +3686,8 @@ https://www.transifex.com/projects/p/dash/ Extraire les informations de débogage (par défaut : %u, fournir <category> est optionnel) - Provide liquidity to Darksend by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) - Fournir des liquidités à Darksend en mélangeant occasionnellement mais régulièrement des pièces (0-100, par défaut : %u, 1=très fréquent, frais élevés, 100=très rare, frais bas) + Provide liquidity to Obfuscate by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) + Fournir des liquidités à Obfuscate en mélangeant occasionnellement mais régulièrement des pièces (0-100, par défaut : %u, 1=très fréquent, frais élevés, 100=très rare, frais bas) Require high priority for relaying free or low-fee transactions (default:%u) @@ -3710,10 +3710,10 @@ https://www.transifex.com/projects/p/dash/ Ce produit comprend des logiciels développés par le projet OpenSSL afin d'être utilisés dans la boîte à outils OpenSSL <https://www.openssl.org/>, un logiciel de chiffrement écrit par Eric Young et un logiciel UPnP développé par Thomas Bernard. - To use dashd, or the -server option to dash-qt, you must set an rpcpassword in the configuration file: + To use darknetd, or the -server option to darknet-qt, you must set an rpcpassword in the configuration file: %s It is recommended you use the following random password: -rpcuser=dashrpc +rpcuser=darknetrpc rpcpassword=%s (you do not need to remember this password) The username and password MUST NOT be the same. @@ -3721,10 +3721,10 @@ If the file does not exist, create it with owner-readable-only file permissions. It is also recommended to set alertnotify so you are notified of problems; for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - Pour utiliser dashd, ou le paramètre -server de dash-qt, vous devez définir un rpc mot de passe dans le fichier de configuration: + Pour utiliser darknetd, ou le paramètre -server de darknet-qt, vous devez définir un rpc mot de passe dans le fichier de configuration: %s Il est recommandé que vous utilisiez ce mot de passe aléatoire: -rpcuser=dashrpc +rpcuser=darknetrpc rpcpassword=%s (Vous ne devez pas vous souvenir de ce mot de passe) Le nom d'utilisateur et le mot de passe NE DOIVENT PAS être équivalent. @@ -3734,8 +3734,8 @@ Pour exemple: alertnotify=echo %%s | mail -s "Alerte Dash" admin@foo.com - Unable to locate enough funds for this transaction that are not equal 1000 DASH. - Impossible de localiser suffisamment de fonds pour cette transaction qui ne sont pas égaux à 1000 DASH. + Unable to locate enough funds for this transaction that are not equal 1000 DNET. + Impossible de localiser suffisamment de fonds pour cette transaction qui ne sont pas égaux à 1000 DNET. Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s) @@ -3758,8 +3758,8 @@ Pour exemple: alertnotify=echo %%s | mail -s "Alerte Dash" admin@foo.com Pairs en liste blanche ne peuvent être bannis pour DoS et leurs transactions sont toujours relayées, même si elles sont déjà en mémoire, utile par ex. pour une passerelle - (9999 could be used only on mainnet) - (9999 n'est utilisable que sur mainnet) + (51472 could be used only on mainnet) + (51472 n'est utilisable que sur mainnet) (default: %s) @@ -3808,16 +3808,16 @@ Pour exemple: alertnotify=echo %%s | mail -s "Alerte Dash" admin@foo.com Impossible d'analyser la valeur -rpcbind %s en tant qu'adresse réseau - Darksend is idle. - Darksend est inactif. + Obfuscate is idle. + Obfuscate est inactif. - Darksend request complete: - Requête Darksend complète : + Obfuscate request complete: + Requête Obfuscate complète : - Darksend request incomplete: - Requête Darksend incomplète. + Obfuscate request incomplete: + Requête Obfuscate incomplète. Disable safemode, override a real safe mode event (default: %u) @@ -3848,8 +3848,8 @@ Pour exemple: alertnotify=echo %%s | mail -s "Alerte Dash" admin@foo.com Erreur: Paramètre -tor non supporté, utilisez -onion. - Fee (in DASH/kB) to add to transactions you send (default: %s) - Frais (en DASH/ko) à ajouter aux transactions que vous envoyez (par défaut: %s) + Fee (in DNET/kB) to add to transactions you send (default: %s) + Frais (en DNET/ko) à ajouter aux transactions que vous envoyez (par défaut: %s) Finalizing transaction. @@ -3912,8 +3912,8 @@ Pour exemple: alertnotify=echo %%s | mail -s "Alerte Dash" admin@foo.com L'entrée est invalide. - InstantX options: - Options InstantX : + SwiftTX options: + Options SwiftTX : Insufficient funds. @@ -3948,8 +3948,8 @@ Pour exemple: alertnotify=echo %%s | mail -s "Alerte Dash" admin@foo.com Montant invalide pour -paytxfee=<montant> : « %s » - Last successful Darksend action was too recent. - La dernière action Darksend réussie est trop récente. + Last successful Obfuscate action was too recent. + La dernière action Obfuscate réussie est trop récente. Limit size of signature cache to <n> entries (default: %u) @@ -4176,8 +4176,8 @@ Pour exemple: alertnotify=echo %%s | mail -s "Alerte Dash" admin@foo.com masternodeprivkey invalide. Veuillez vous référer à la documentation. - (must be 9999 for mainnet) - (doit être 9999 pour mainnet) + (must be51472 for mainnet) + (doit être51472 pour mainnet) Can't find random Masternode. @@ -4216,16 +4216,16 @@ Pour exemple: alertnotify=echo %%s | mail -s "Alerte Dash" admin@foo.com Clé KeePassHttp pour la communication chiffrée AES avec KeePass - Keep N DASH anonymized (default: %u) - Maintenir N dash anonymisé en permanence (défaut: %u) + Keep N DNET anonymized (default: %u) + Maintenir N darknet anonymisé en permanence (défaut: %u) Keep at most <n> unconnectable transactions in memory (default: %u) Garder au plus <n> transactions sans connexion en mémoire (par défaut : %u) - Last Darksend was too recent. - Le dernier Darksend est trop récent. + Last Obfuscate was too recent. + Le dernier Obfuscate est trop récent. Line: %d @@ -4476,7 +4476,7 @@ Pour exemple: alertnotify=echo %%s | mail -s "Alerte Dash" admin@foo.com Nom d'utilisateur pour les connexions JSON-RPC - Value more than Darksend pool maximum allows. + Value more than Obfuscate pool maximum allows. Valeur supérieure au maximum autorisé par le pool. diff --git a/src/qt/locale/dash_it.ts b/src/qt/locale/darknet_it.ts similarity index 93% rename from src/qt/locale/dash_it.ts rename to src/qt/locale/darknet_it.ts index dcdce039e28a0..d092161de585f 100644 --- a/src/qt/locale/dash_it.ts +++ b/src/qt/locale/darknet_it.ts @@ -43,11 +43,11 @@ Choose the address to send coins to - Scegli l'indirizzo a cui inviare i dash + Scegli l'indirizzo a cui inviare i darknet Choose the address to receive coins with - Scegli l'indirizzo con cui ricevere dash + Scegli l'indirizzo con cui ricevere darknet C&hoose @@ -63,7 +63,7 @@ These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins. - Questi sono i tuoi indirizzi Dash per inviare i pagamenti. Controlla sempre l'ammontare e l'indirizzo destinatario prima di inviare i dash. + Questi sono i tuoi indirizzi Dash per inviare i pagamenti. Controlla sempre l'ammontare e l'indirizzo destinatario prima di inviare i darknet. These are your Dash addresses for receiving payments. It is recommended to use a new receiving address for each transaction. @@ -176,8 +176,8 @@ Conferma la cifratura del portafoglio - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DASH</b>! - Attenzione: se crittografi il tuo portafoglio e perdi la tua parola d'ordine, <b>PERDERAI TUTTI I TUOI DASH</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DNET</b>! + Attenzione: se crittografi il tuo portafoglio e perdi la tua parola d'ordine, <b>PERDERAI TUTTI I TUOI DNET</b>! Are you sure you wish to encrypt your wallet? @@ -188,7 +188,7 @@ Portafoglio cifrato - Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dashs from being stolen by malware infecting your computer. + Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your darknets from being stolen by malware infecting your computer. Dash adesso si chiuderá per finire il processo di crittografia. Ricorda che crittografare il tuo portafoglio non ti da una protezione totale se il tuo computer é infettato da malware @@ -256,15 +256,15 @@ Send coins to a Dash address - Spedire dash ad un indirizzo Dash + Spedire darknet ad un indirizzo Dash &Receive &Ricevi - Request payments (generates QR codes and dash: URIs) - Richieste di pagamenti (genera codici QR e dash: URLs) + Request payments (generates QR codes and darknet: URIs) + Richieste di pagamenti (genera codici QR e darknet: URLs) &Transactions @@ -435,8 +435,8 @@ Apri &URI... - Open a dash: URI or payment request - Apri un dash: URI o una richiesta di pagamento + Open a darknet: URI or payment request + Apri un darknet: URI o una richiesta di pagamento &Command-line options @@ -714,8 +714,8 @@ Indirizzo: %4 Copia resto - Non-anonymized input selected. <b>Darksend will be disabled.</b><br><br>If you still want to use Darksend, please deselect all non-nonymized inputs first and then check Darksend checkbox again. - Selezionati input non anonimizzati.<b>Darksend sará disabilitato.</b><br><br>Se vuoi ancora usare Darksend, per favore per prima cosa togli la selezione a tutti gli inputs non anonimizzati e dopo controlla il Darksend checkbox di nuovo. + Non-anonymized input selected. <b>Obfuscate will be disabled.</b><br><br>If you still want to use Obfuscate, please deselect all non-nonymized inputs first and then check Obfuscate checkbox again. + Selezionati input non anonimizzati.<b>Obfuscate sará disabilitato.</b><br><br>Se vuoi ancora usare Obfuscate, per favore per prima cosa togli la selezione a tutti gli inputs non anonimizzati e dopo controlla il Obfuscate checkbox di nuovo. highest @@ -811,10 +811,10 @@ Indirizzo: %4 - DarksendConfig + ObfuscateConfig - Configure Darksend - Configura Darksend + Configure Obfuscate + Configura Obfuscate Basic Privacy @@ -833,27 +833,27 @@ Indirizzo: %4 Selezionare il livello di privacy - Use 2 separate masternodes to mix funds up to 1000 DASH - Usa 2 separati masternode per mischiare fino al 1000 DASH + Use 2 separate masternodes to mix funds up to 1000 DNET + Usa 2 separati masternode per mischiare fino al 1000 DNET - Use 8 separate masternodes to mix funds up to 1000 DASH - Usa 8 separati masternode per mischiare fino al 1000 DASH + Use 8 separate masternodes to mix funds up to 1000 DNET + Usa 8 separati masternode per mischiare fino al 1000 DNET Use 16 separate masternodes Usa 16 separati masternode - This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH + This option is the quickest and will cost about ~0.025 DNET to anonymize 1000 DNET Questa opzione è la più veloce e ti costerà ~0.025DRK circa per anonimizzare 1000DRK - This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH + This option is moderately fast and will cost about 0.05 DNET to anonymize 1000 DNET Questa opzione è moderatamente veloce e costerà 0.05DRK circa per anonimizzare 1000DRK - 0.1 DASH per 1000 DASH you anonymize. + 0.1 DNET per 1000 DNET you anonymize. 0.1DRK ogni 1000DRK anonimizzati. @@ -861,20 +861,20 @@ Indirizzo: %4 Questa è la più lenta ma più sicura opzione. Usare il massimo grado di anonimizzazione costerà - Darksend Configuration - Configurazione Darksend + Obfuscate Configuration + Configurazione Obfuscate - Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. Dark send è statto correttamente impostato su base (%1 e 2 round). Puoi cambiare questa impostazione in qualsiasi momento tu lo voglia dalla finestra di configurazione. - Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend è stata impostata correttamente a elevato (%1 e 8 turni). È possibile modificare in qualsiasi momento aprendo schermata di configurazione di Dash. + Obfuscate was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate è stata impostata correttamente a elevato (%1 e 8 turni). È possibile modificare in qualsiasi momento aprendo schermata di configurazione di Dash. - Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend è stato correttamente settato al massimo (%1 e 16 rounds). Puoi cambiarlo quando vuoi aprendo la finestra di configurazione di Dash + Obfuscate was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate è stato correttamente settato al massimo (%1 e 16 rounds). Puoi cambiarlo quando vuoi aprendo la finestra di configurazione di Dash @@ -1111,12 +1111,12 @@ Indirizzo: %4 (0 = automatico, <0 = lascia questo numero di core liberi) - Darksend rounds to use - Round darksend da utilizzare + Obfuscate rounds to use + Round obfuscate da utilizzare - This amount acts as a threshold to turn off Darksend once it's reached. - Tale importo si comporta come una soglia per spegnere Darksend una volta che è raggiunto. + This amount acts as a threshold to turn off Obfuscate once it's reached. + Tale importo si comporta come una soglia per spegnere Obfuscate una volta che è raggiunto. Amount of Dash to keep anonymized @@ -1220,9 +1220,9 @@ Indirizzo: %4 Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ La tua lingua manca o la traduzione è incompleta? Contribuisci alla traduzione qui: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ User Interface Theme: @@ -1377,16 +1377,16 @@ Più URL vengono separati da una barra verticale |. Completamento: - Darksend Balance: - Bilancio Darksend: + Obfuscate Balance: + Bilancio Obfuscate: Amount and Rounds: Ammontare e Round: - 0 DASH / 0 Rounds - 0 DASH / 0 Round + 0 DNET / 0 Rounds + 0 DNET / 0 Round Submitted Denom: @@ -1397,8 +1397,8 @@ Più URL vengono separati da una barra verticale |. n/a - Darksend - Darksend + Obfuscate + Obfuscate Recent transactions @@ -1417,16 +1417,16 @@ Più URL vengono separati da una barra verticale |. (Ultimo messaggio) - Try to manually submit a Darksend request. - Prova ad inserire una richiesta Darksend manualmente. + Try to manually submit a Obfuscate request. + Prova ad inserire una richiesta Obfuscate manualmente. Try Mix Prova il Mix - Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!) - Resetta lo stato corrente del Darksend (può interrompere il Darksend se è nel processo di mixaggio, costandoti una perdita economica!) + Reset the current status of Obfuscate (can interrupt Obfuscate if it's in the process of Mixing, which can cost you money!) + Resetta lo stato corrente del Obfuscate (può interrompere il Obfuscate se è nel processo di mixaggio, costandoti una perdita economica!) Reset @@ -1441,12 +1441,12 @@ Più URL vengono separati da una barra verticale |. Disabilita - Start Darksend Mixing - Avvia Darksend mix + Start Obfuscate Mixing + Avvia Obfuscate mix - Stop Darksend Mixing - Ferma Darksend mix + Stop Obfuscate Mixing + Ferma Obfuscate mix No inputs detected @@ -1465,9 +1465,9 @@ Più URL vengono separati da una barra verticale |. Abilitato - Last Darksend message: + Last Obfuscate message: - Ultimo messaggio Darksend + Ultimo messaggio Obfuscate @@ -1475,16 +1475,16 @@ Più URL vengono separati da una barra verticale |. N/D - Darksend was successfully reset. - Darksend è stato resettato con successo + Obfuscate was successfully reset. + Obfuscate è stato resettato con successo - Darksend requires at least %1 to use. - Darksend ha bisogno almeno dell' %1 per essere usato. + Obfuscate requires at least %1 to use. + Obfuscate ha bisogno almeno dell' %1 per essere usato. - Wallet is locked and user declined to unlock. Disabling Darksend. - Portafoglio è bloccato e l'utente ha rifiutato di sbloccare. Disattivazione Darksend. + Wallet is locked and user declined to unlock. Disabling Obfuscate. + Portafoglio è bloccato e l'utente ha rifiutato di sbloccare. Disattivazione Obfuscate. @@ -1494,8 +1494,8 @@ Più URL vengono separati da una barra verticale |. Errore di richiesta di pagamento - Cannot start dash: click-to-pay handler - Impossibile avviare dash: gestore click-to-pay + Cannot start darknet: click-to-pay handler + Impossibile avviare darknet: gestore click-to-pay URI handling @@ -2083,7 +2083,7 @@ Più URL vengono separati da una barra verticale |. SendCoinsDialog Send Coins - Invia dash + Invia darknet Coin Control Features @@ -2218,12 +2218,12 @@ Più URL vengono separati da una barra verticale |. &Aggiungi beneficiario - Darksend - Darksend + Obfuscate + Obfuscate - InstantX - InstantX + SwiftTX + SwiftTX Balance: @@ -2266,16 +2266,16 @@ Più URL vengono separati da una barra verticale |. fondi anonimi - (darksend requires this amount to be rounded up to the nearest %1). - (darksend richiede questo importo da arrotondato al più vicino %1). + (obfuscate requires this amount to be rounded up to the nearest %1). + (obfuscate richiede questo importo da arrotondato al più vicino %1). any available funds (not recommended) tutti i fondi disponibili (non raccomandato) - and InstantX - e InstantX + and SwiftTX + e SwiftTX %1 to %2 @@ -2291,7 +2291,7 @@ Più URL vengono separati da una barra verticale |. Confirm send coins - Conferma l'invio di dash + Conferma l'invio di darknet A fee %1 times higher than %2 per kB is considered an insanely high fee. @@ -2401,8 +2401,8 @@ Più URL vengono separati da una barra verticale |. Messaggio: - A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. - Un messaggio allegato con l'URI dash che verrà memorizzato nella transazione per il tuo referente. Nota: questo messaggio non verrà inviato attraverso il network Dash. + A message that was attached to the darknet: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. + Un messaggio allegato con l'URI darknet che verrà memorizzato nella transazione per il tuo referente. Nota: questo messaggio non verrà inviato attraverso il network Dash. This is an unverified payment request. @@ -2620,16 +2620,16 @@ Più URL vengono separati da una barra verticale |. in conflitto - %1/offline (verified via instantx) + %1/offline (verified via swifttx) %1/offline (verificato via intantx) - %1/confirmed (verified via instantx) - %1/confermato (verificato via instantx) + %1/confirmed (verified via swifttx) + %1/confermato (verificato via swifttx) - %1 confirmations (verified via instantx) - %1 conferme (verificate via instantx) + %1 confirmations (verified via swifttx) + %1 conferme (verificate via swifttx) %1/offline @@ -2644,24 +2644,24 @@ Più URL vengono separati da una barra verticale |. %1 conferme - %1/offline (InstantX verification in progress - %2 of %3 signatures) - %1/offline (InstantX verifica in corso - %2 di %3 firme) + %1/offline (SwiftTX verification in progress - %2 of %3 signatures) + %1/offline (SwiftTX verifica in corso - %2 di %3 firme) - %1/confirmed (InstantX verification in progress - %2 of %3 signatures ) - %1/confermato (InstantX verifica in corso - %2 di %3 firme ) + %1/confirmed (SwiftTX verification in progress - %2 of %3 signatures ) + %1/confermato (SwiftTX verifica in corso - %2 di %3 firme ) - %1 confirmations (InstantX verification in progress - %2 of %3 signatures) - %1 conferma (InstantX verifica in corso - %2 di %3 firme) + %1 confirmations (SwiftTX verification in progress - %2 of %3 signatures) + %1 conferma (SwiftTX verifica in corso - %2 di %3 firme) - %1/offline (InstantX verification failed) - %1/offline (InstantX verifica fallita) + %1/offline (SwiftTX verification failed) + %1/offline (SwiftTX verifica fallita) - %1/confirmed (InstantX verification failed) - %1/confermato (InstantX verifica fallita) + %1/confirmed (SwiftTX verification failed) + %1/confermato (SwiftTX verifica fallita) Status @@ -2862,8 +2862,8 @@ Più URL vengono separati da una barra verticale |. Ricevuto da - Received via Darksend - Ricevuto via Darksend + Received via Obfuscate + Ricevuto via Obfuscate Sent to @@ -2878,20 +2878,20 @@ Più URL vengono separati da una barra verticale |. Ottenuto dal mining - Darksend Denominate - Darksend Denominazione + Obfuscate Denominate + Obfuscate Denominazione - Darksend Collateral Payment - Darksend Collaterale Pagamento + Obfuscate Collateral Payment + Obfuscate Collaterale Pagamento - Darksend Make Collateral Inputs - Darksend Fa Ingressi Collaterali + Obfuscate Make Collateral Inputs + Obfuscate Fa Ingressi Collaterali - Darksend Create Denominations - Darksend Crea Denominazioni + Obfuscate Create Denominations + Obfuscate Crea Denominazioni Darksent @@ -2977,20 +2977,20 @@ Più URL vengono separati da una barra verticale |. Darksent - Darksend Make Collateral Inputs - Darksend Fa Ingressi Collaterali + Obfuscate Make Collateral Inputs + Obfuscate Fa Ingressi Collaterali - Darksend Create Denominations - Darksend Crea Denominazioni + Obfuscate Create Denominations + Obfuscate Crea Denominazioni - Darksend Denominate - Darksend Denominazione + Obfuscate Denominate + Obfuscate Denominazione - Darksend Collateral Payment - Darksend Collaterale Pagamento + Obfuscate Collateral Payment + Obfuscate Collaterale Pagamento To yourself @@ -3115,11 +3115,11 @@ Più URL vengono separati da una barra verticale |. WalletModel Send Coins - Invia dash + Invia darknet - InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH. - InstantX non supporta ancora l'invio di somme così alte. Le transazioni sono attualmente limitate al %1 DASH. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 DNET. + SwiftTX non supporta ancora l'invio di somme così alte. Le transazioni sono attualmente limitate al %1 DNET. @@ -3158,7 +3158,7 @@ Più URL vengono separati da una barra verticale |. - dash-core + darknet-core Bind to given address and always listen on it. Use [host]:port notation for IPv6 Associa all'indirizzo indicato e resta permanentemente in ascolto su questo. Usa la notazione [host]:porta per l'IPv6 @@ -3168,8 +3168,8 @@ Più URL vengono separati da una barra verticale |. Impossibile ottenere un blocco sulla data directory %s. Dash Core è probabilmente già in esecuzione. - Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. - Darksend utilizza esatto denominato importo a inviare fondi, si potrebbe semplicemente bisogno di anonimizzare alcuni più monete. + Obfuscate uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. + Obfuscate utilizza esatto denominato importo a inviare fondi, si potrebbe semplicemente bisogno di anonimizzare alcuni più monete. Enter regression test mode, which uses a special chain in which blocks can be solved instantly. @@ -3196,8 +3196,8 @@ Più URL vengono separati da una barra verticale |. In questa modalità -genproclimit determina quanti blocchi saranno generati immediatamente. - InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. - InstantX richiede input con almeno 6 conferme, potrebbe essere necessario attendere qualche minuto e poi riprovare. + SwiftTX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. + SwiftTX richiede input con almeno 6 conferme, potrebbe essere necessario attendere qualche minuto e poi riprovare. Name to construct url for KeePass entry that stores the wallet passphrase @@ -3224,12 +3224,12 @@ Più URL vengono separati da una barra verticale |. Incapace di legare al %s su questo computer. Dash Core è probabilmente già funzionato. - Unable to locate enough Darksend denominated funds for this transaction. - Impossibile trovare fondi sufficienti Darksend denominati per questa transazione. + Unable to locate enough Obfuscate denominated funds for this transaction. + Impossibile trovare fondi sufficienti Obfuscate denominati per questa transazione. - Unable to locate enough Darksend non-denominated funds for this transaction that are not equal 1000 DASH. - Impossibile trovare un numero sufficiente di non denominati fondi Darksend per questa operazione che non sono uguali a 1000 DASH. + Unable to locate enough Obfuscate non-denominated funds for this transaction that are not equal 1000 DNET. + Impossibile trovare un numero sufficiente di non denominati fondi Obfuscate per questa operazione che non sono uguali a 1000 DNET. Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction. @@ -3328,8 +3328,8 @@ Più URL vengono separati da una barra verticale |. Rilevato database blocchi corrotto - Darksend options: - Opzioni Darksend: + Obfuscate options: + Opzioni Obfuscate: Debugging/Testing options: @@ -3400,8 +3400,8 @@ Più URL vengono separati da una barra verticale |. Errore: portafoglio bloccato, impossibile creare la transazione! - Error: You already have pending entries in the Darksend pool - Errore: è già voci in sospeso in piscina Darksend + Error: You already have pending entries in the Obfuscate pool + Errore: è già voci in sospeso in piscina Obfuscate Failed to listen on any port. Use -listen=0 if you want this. @@ -3432,36 +3432,36 @@ Più URL vengono separati da una barra verticale |. Cancella tutte le transazioni del portafoglio e sistema solo quelle parti della catena di blocchi mediante -rescan quando apri il portafoglio - Enable instantx, show confirmations for locked transactions (bool, default: %s) - Abilita instantx, mostra conferme per le transazioni bloccate (bool, predefinito: %s) + Enable swifttx, show confirmations for locked transactions (bool, default: %s) + Abilita swifttx, mostra conferme per le transazioni bloccate (bool, predefinito: %s) - Enable use of automated darksend for funds stored in this wallet (0-1, default: %u) - Abilita utilizzo di darksend automatizzato per i fondi conservati in questo portafoglio (0-1, predefinito: %u) + Enable use of automated obfuscate for funds stored in this wallet (0-1, default: %u) + Abilita utilizzo di obfuscate automatizzato per i fondi conservati in questo portafoglio (0-1, predefinito: %u) - Fees (in DASH/Kb) smaller than this are considered zero fee for relaying (default: %s) - Le commissioni (in DASH/Kb) inferiori a questo valore saranno considerate nulle per la trasmissione (prefedinito:%s) + Fees (in DNET/Kb) smaller than this are considered zero fee for relaying (default: %s) + Le commissioni (in DNET/Kb) inferiori a questo valore saranno considerate nulle per la trasmissione (prefedinito:%s) - Fees (in DASH/Kb) smaller than this are considered zero fee for transaction creation (default: %s) - Le commissioni (in DASH/Kb) inferiori a questo valore saranno considerate nulle per la creazione della transazione (prefedinito:%s) + Fees (in DNET/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Le commissioni (in DNET/Kb) inferiori a questo valore saranno considerate nulle per la creazione della transazione (prefedinito:%s) Found unconfirmed denominated outputs, will wait till they confirm to continue. Uscite denominate non confermati trovati, saranno aspettare che confermano per continua. - Darksend is idle. + Obfuscate is idle. Nessun Masternode trovato. - Darksend request complete: - Richiesta di Darksend completa: + Obfuscate request complete: + Richiesta di Obfuscate completa: - Darksend request incomplete: - Richiesta di Darksend incompleta: + Obfuscate request incomplete: + Richiesta di Obfuscate incompleta: Error connecting to Masternode. @@ -3516,8 +3516,8 @@ Più URL vengono separati da una barra verticale |. L'input non è valido. - InstantX options: - Opzioni InstantX + SwiftTX options: + Opzioni SwiftTX Insufficient funds. @@ -3588,8 +3588,8 @@ Più URL vengono separati da una barra verticale |. Mantenere al massimo <n> le operazioni in collegabile in memoria (predefinito: %u) - Last Darksend was too recent. - L'ultima darksend è troppo recente + Last Obfuscate was too recent. + L'ultima obfuscate è troppo recente Loading addresses... @@ -3797,8 +3797,8 @@ Più URL vengono separati da una barra verticale |. - Value more than Darksend pool maximum allows. - Più valore di Darksend piscina massima permette. + Value more than Obfuscate pool maximum allows. + Più valore di Obfuscate piscina massima permette. Verifying blocks... diff --git a/src/qt/locale/dash_ja.ts b/src/qt/locale/darknet_ja.ts similarity index 99% rename from src/qt/locale/dash_ja.ts rename to src/qt/locale/darknet_ja.ts index 1e0d322412a2f..6aedb60c32b21 100644 --- a/src/qt/locale/dash_ja.ts +++ b/src/qt/locale/darknet_ja.ts @@ -642,7 +642,7 @@ - DarksendConfig + ObfuscateConfig EditAddressDialog @@ -2485,7 +2485,7 @@ - dash-core + darknet-core Bind to given address and always listen on it. Use [host]:port notation for IPv6 指定のアドレスへバインドし、その上で常にリスンします。IPv6 は [host]:port 番号 と表記します diff --git a/src/qt/locale/dash_pl.ts b/src/qt/locale/darknet_pl.ts similarity index 93% rename from src/qt/locale/dash_pl.ts rename to src/qt/locale/darknet_pl.ts index 9589ed27725b9..8c59520a5dd5c 100644 --- a/src/qt/locale/dash_pl.ts +++ b/src/qt/locale/darknet_pl.ts @@ -176,8 +176,8 @@ Potwierdź szyfrowanie portfela - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DASH</b>! - Ostrzeżenie: Jeśli zaszyfrujesz swój portfel i zgubisz swoje hasło, <b>STRACISZ WSZYSTKIE MONETY DASH</b> + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DNET</b>! + Ostrzeżenie: Jeśli zaszyfrujesz swój portfel i zgubisz swoje hasło, <b>STRACISZ WSZYSTKIE MONETY DNET</b> Are you sure you wish to encrypt your wallet? @@ -188,7 +188,7 @@ Portfel zaszyfrowany - Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dashs from being stolen by malware infecting your computer. + Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your darknets from being stolen by malware infecting your computer. Dash zostanie teraz zamknięty aby zakończyć proces szyfrowania. Pamiętaj, że zaszyfrowanie portfela nie gwarantuje pełnej ochrony przed kradzieżą twoich monet przez złośliwe oprogramowanie. @@ -263,8 +263,8 @@ Odbie&rz - Request payments (generates QR codes and dash: URIs) - Poproś o płatności (generuje kod QR oraz dash: link) + Request payments (generates QR codes and darknet: URIs) + Poproś o płatności (generuje kod QR oraz darknet: link) &Transactions @@ -443,8 +443,8 @@ Otwórz URI... - Open a dash: URI or payment request - Otwórz dash: Link lub żądanie zapłaty + Open a darknet: URI or payment request + Otwórz darknet: Link lub żądanie zapłaty &Command-line options @@ -741,8 +741,8 @@ Adres: %4 Skopiuj resztę - Non-anonymized input selected. <b>Darksend will be disabled.</b><br><br>If you still want to use Darksend, please deselect all non-nonymized inputs first and then check Darksend checkbox again. - Wybrano niezanonimizowane środki. <b>Darksend będzie wyłączony.</b><br><br>Jeśli wciąż chcesz użyć Darksend, cofnij wybór niezanonimizowanych środków i zaznacz kliknij ponownie na pole wyboru obok Darksend. + Non-anonymized input selected. <b>Obfuscate will be disabled.</b><br><br>If you still want to use Obfuscate, please deselect all non-nonymized inputs first and then check Obfuscate checkbox again. + Wybrano niezanonimizowane środki. <b>Obfuscate będzie wyłączony.</b><br><br>Jeśli wciąż chcesz użyć Obfuscate, cofnij wybór niezanonimizowanych środków i zaznacz kliknij ponownie na pole wyboru obok Obfuscate. highest @@ -842,10 +842,10 @@ Adres: %4 - DarksendConfig + ObfuscateConfig - Configure Darksend - Skonfiguruj Darksend + Configure Obfuscate + Skonfiguruj Obfuscate Basic Privacy @@ -864,48 +864,48 @@ Adres: %4 Proszę wybrać poziom bezpieczeństwa. - Use 2 separate masternodes to mix funds up to 1000 DASH - Użyj 2 oddzielnych masternodów aby wymieszać środki max. do 1000 DASH + Use 2 separate masternodes to mix funds up to 1000 DNET + Użyj 2 oddzielnych masternodów aby wymieszać środki max. do 1000 DNET - Use 8 separate masternodes to mix funds up to 1000 DASH - Użyj 8 oddzielnych masternodów aby wymieszać środki max. do 1000 DASH + Use 8 separate masternodes to mix funds up to 1000 DNET + Użyj 8 oddzielnych masternodów aby wymieszać środki max. do 1000 DNET Use 16 separate masternodes Użyj 16 oddzielnych masternodów - This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH - Ta opcja jest najszybsza i kosztuje około 0.025 DASH za zanonimizowanie 1000 DASH + This option is the quickest and will cost about ~0.025 DNET to anonymize 1000 DNET + Ta opcja jest najszybsza i kosztuje około 0.025 DNET za zanonimizowanie 1000 DNET - This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH - Ta opcja jest w miarę szybka i kosztuje około 0.05 DASH za zanonimizowanie 1000 DASH + This option is moderately fast and will cost about 0.05 DNET to anonymize 1000 DNET + Ta opcja jest w miarę szybka i kosztuje około 0.05 DNET za zanonimizowanie 1000 DNET - 0.1 DASH per 1000 DASH you anonymize. - 0.1 DASH za każde 1000 DASH które zanonimizujesz. + 0.1 DNET per 1000 DNET you anonymize. + 0.1 DNET za każde 1000 DNET które zanonimizujesz. This is the slowest and most secure option. Using maximum anonymity will cost Jest to najwolniejsza lecz najbardziej bezpieczna opcja. Maksymalny poziom zanonimizowania będzie kosztować - Darksend Configuration - Konfiguracja Darksend + Obfuscate Configuration + Konfiguracja Obfuscate - Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend został pomyślnie ustawiony na poziom podstawowy (%1 oraz 2 rundy). Możesz to zmienić kiedy chcesz, otwierając ekran z konfiguracją Dash. + Obfuscate was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate został pomyślnie ustawiony na poziom podstawowy (%1 oraz 2 rundy). Możesz to zmienić kiedy chcesz, otwierając ekran z konfiguracją Dash. - Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend został pomyślnie ustawiony na poziom wysoki (%1 oraz 8 rund). Możesz to zmienić kiedy chcesz, otwierając ekran z konfiguracją Dash. + Obfuscate was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate został pomyślnie ustawiony na poziom wysoki (%1 oraz 8 rund). Możesz to zmienić kiedy chcesz, otwierając ekran z konfiguracją Dash. - Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend został pomyślnie ustawiony na poziom maksymalny (%1 oraz 16 rund). Możesz to zmienić kiedy chcesz, otwierając ekran z konfiguracją Dash. + Obfuscate was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate został pomyślnie ustawiony na poziom maksymalny (%1 oraz 16 rund). Możesz to zmienić kiedy chcesz, otwierając ekran z konfiguracją Dash. @@ -1146,12 +1146,12 @@ Adres: %4 (0=auto, <0 = zostaw tyle wolnych rdzeni) - Darksend rounds to use - Ilość rund Darksend. + Obfuscate rounds to use + Ilość rund Obfuscate. - This amount acts as a threshold to turn off Darksend once it's reached. - Ta kwota działa jako próg po którego przekroczeniu Darksend zostaje wyłączony. + This amount acts as a threshold to turn off Obfuscate once it's reached. + Ta kwota działa jako próg po którego przekroczeniu Obfuscate zostaje wyłączony. Amount of Dash to keep anonymized @@ -1263,9 +1263,9 @@ Adres: %4 Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ Dash Core nie został przetłumaczony na twój język? Tłumaczenie jest niepełne lub niepoprawne? Możesz pomóc nam tłumaczyć tutaj: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ User Interface Theme: @@ -1423,16 +1423,16 @@ https://www.transifex.com/projects/p/dash/ Ukończone: - Darksend Balance: - Bilans Darksend: + Obfuscate Balance: + Bilans Obfuscate: Amount and Rounds: Ilość oraz Rundy: - 0 DASH / 0 Rounds - 0 DASH / 0 Rund + 0 DNET / 0 Rounds + 0 DNET / 0 Rund Submitted Denom: @@ -1443,8 +1443,8 @@ https://www.transifex.com/projects/p/dash/ nie dotyczy - Darksend - Darksend + Obfuscate + Obfuscate Recent transactions @@ -1463,16 +1463,16 @@ https://www.transifex.com/projects/p/dash/ (Ostatnia Wiadomość) - Try to manually submit a Darksend request. - Prubój ręcznie zgłosić żądanie Darksend. + Try to manually submit a Obfuscate request. + Prubój ręcznie zgłosić żądanie Obfuscate. Try Mix Mieszaj - Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!) - Zresetuj obecny stan darksend (może przerwać Darksend, jeżeli jest w trakcie mieszania. Może Cię to kosztować! ) + Reset the current status of Obfuscate (can interrupt Obfuscate if it's in the process of Mixing, which can cost you money!) + Zresetuj obecny stan obfuscate (może przerwać Obfuscate, jeżeli jest w trakcie mieszania. Może Cię to kosztować! ) Reset @@ -1487,12 +1487,12 @@ https://www.transifex.com/projects/p/dash/ Wyłączony - Start Darksend Mixing - Uruchom miksowanie Darksend + Start Obfuscate Mixing + Uruchom miksowanie Obfuscate - Stop Darksend Mixing - Zatrzymaj miksowanie Darksend + Stop Obfuscate Mixing + Zatrzymaj miksowanie Obfuscate No inputs detected @@ -1535,9 +1535,9 @@ https://www.transifex.com/projects/p/dash/ Włączony - Last Darksend message: + Last Obfuscate message: - Ostatnia wiadomość Darksend: + Ostatnia wiadomość Obfuscate: @@ -1545,20 +1545,20 @@ https://www.transifex.com/projects/p/dash/ NIEDOSTĘPNE - Darksend was successfully reset. - Darksend został pomyślnie zresetowany + Obfuscate was successfully reset. + Obfuscate został pomyślnie zresetowany - If you don't want to see internal Darksend fees/transactions select "Most Common" as Type on the "Transactions" tab. - Jeśli nie chcesz widzieć wewnętrznych transakcji/opłat Darksend to wybierz "Najpopularniejsza" jako rodzaj transakcji w zakładce "Transakcje". + If you don't want to see internal Obfuscate fees/transactions select "Most Common" as Type on the "Transactions" tab. + Jeśli nie chcesz widzieć wewnętrznych transakcji/opłat Obfuscate to wybierz "Najpopularniejsza" jako rodzaj transakcji w zakładce "Transakcje". - Darksend requires at least %1 to use. - Darksend wymaga użycia conajmniej %1 + Obfuscate requires at least %1 to use. + Obfuscate wymaga użycia conajmniej %1 - Wallet is locked and user declined to unlock. Disabling Darksend. - Portfel jest zablokowany a użytkownik odmówił odblokowania. Darksend zostaje wyłączony. + Wallet is locked and user declined to unlock. Disabling Obfuscate. + Portfel jest zablokowany a użytkownik odmówił odblokowania. Obfuscate zostaje wyłączony. @@ -1568,8 +1568,8 @@ https://www.transifex.com/projects/p/dash/ Błąd żądania płatności - Cannot start dash: click-to-pay handler - Nie można włączyć dash: kliknij-aby-zapłacić ubsługującemu. + Cannot start darknet: click-to-pay handler + Nie można włączyć darknet: kliknij-aby-zapłacić ubsługującemu. URI handling @@ -2292,7 +2292,7 @@ https://www.transifex.com/projects/p/dash/ Jeśli ręcznie ustalona opłata wynosi 1000 Duffów a sama transakcja ma tylko 250 bitów, to opłata jako "za kilobajt" wynosi tylko 250 duffów.<br/> Dzieje się tak dla każdej transakcji poniżej 1000 duffów. W przypadku transakcji większych niż jedn kilobajt opłata jest naliczana od kilobajta. - Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process. + Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for darknet transactions than the network can process. Uiszczanie minimalnej opłaty za transakcję jest ok dopóki ilość transakcji nie przekracza dostępnego miejsca w bloku. <br />Jednakże, jeśli zaistnieje taka sytuacja w której wysłanych zostaje więcej transakcji niż sieć może przetworzyć, to jest możliwe, że twoja transakcja nigdy nie zostanie potwierdzona. @@ -2364,12 +2364,12 @@ https://www.transifex.com/projects/p/dash/ Dodaj Odbio&rce - Darksend - Darksend + Obfuscate + Obfuscate - InstantX - InstantX + SwiftTX + SwiftTX Balance: @@ -2416,16 +2416,16 @@ https://www.transifex.com/projects/p/dash/ anonimowe środki - (darksend requires this amount to be rounded up to the nearest %1). - (darksend wymaga aby kwota ta została zaokrąglona do najbliższego %1). + (obfuscate requires this amount to be rounded up to the nearest %1). + (obfuscate wymaga aby kwota ta została zaokrąglona do najbliższego %1). any available funds (not recommended) jakiekolwiek dostępne środki (niezalecane) - and InstantX - i InstantX + and SwiftTX + i SwiftTX %1 to %2 @@ -2559,8 +2559,8 @@ https://www.transifex.com/projects/p/dash/ Wiadomość: - A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. - Wiadomość, która została dołączona do dash: Link, który zostanie zapisany wraz z transakcją do wglądu w przyszłości. Zauważ. że sama wiadomość nie zostanie wysłana przez sieć Darkcoina. + A message that was attached to the darknet: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. + Wiadomość, która została dołączona do darknet: Link, który zostanie zapisany wraz z transakcją do wglądu w przyszłości. Zauważ. że sama wiadomość nie zostanie wysłana przez sieć Darkcoina. This is an unverified payment request. @@ -2778,16 +2778,16 @@ https://www.transifex.com/projects/p/dash/ konflikt - %1/offline (verified via instantx) - %1/offline (zweryfikowane przez instantx) + %1/offline (verified via swifttx) + %1/offline (zweryfikowane przez swifttx) - %1/confirmed (verified via instantx) - %1/potwierdzony (zweryfikowane przez instantx) + %1/confirmed (verified via swifttx) + %1/potwierdzony (zweryfikowane przez swifttx) - %1 confirmations (verified via instantx) - %1 potwierdzeń (zweryfikowane przez instantx) + %1 confirmations (verified via swifttx) + %1 potwierdzeń (zweryfikowane przez swifttx) %1/offline @@ -2802,24 +2802,24 @@ https://www.transifex.com/projects/p/dash/ %1 potwierdzeń - %1/offline (InstantX verification in progress - %2 of %3 signatures) - %1/nieaktywny (w trakcie weryfikacji InstantX - %2 z %3 oznaczeń) + %1/offline (SwiftTX verification in progress - %2 of %3 signatures) + %1/nieaktywny (w trakcie weryfikacji SwiftTX - %2 z %3 oznaczeń) - %1/confirmed (InstantX verification in progress - %2 of %3 signatures ) - %1/potwierdzony (w trakcie weryfikacji InstantX - %2 z %3 oznaczeń) + %1/confirmed (SwiftTX verification in progress - %2 of %3 signatures ) + %1/potwierdzony (w trakcie weryfikacji SwiftTX - %2 z %3 oznaczeń) - %1 confirmations (InstantX verification in progress - %2 of %3 signatures) - %1/potwierdzeń (w trakcie weryfikacji InstantX - %2 z %3 oznaczeń) + %1 confirmations (SwiftTX verification in progress - %2 of %3 signatures) + %1/potwierdzeń (w trakcie weryfikacji SwiftTX - %2 z %3 oznaczeń) - %1/offline (InstantX verification failed) - %1/nieaktywny (weryfikacja InstantX niepowiodła się) + %1/offline (SwiftTX verification failed) + %1/nieaktywny (weryfikacja SwiftTX niepowiodła się) - %1/confirmed (InstantX verification failed) - %1/potwierdzony (weryfikacja InstantX nie powiodła się) + %1/confirmed (SwiftTX verification failed) + %1/potwierdzony (weryfikacja SwiftTX nie powiodła się) Status @@ -3020,8 +3020,8 @@ https://www.transifex.com/projects/p/dash/ Odebrano od - Received via Darksend - Otrzymane przez Darksend + Received via Obfuscate + Otrzymane przez Obfuscate Sent to @@ -3036,20 +3036,20 @@ https://www.transifex.com/projects/p/dash/ Wydobyto - Darksend Denominate - Denominacja Darksend + Obfuscate Denominate + Denominacja Obfuscate - Darksend Collateral Payment - Płatność zabezpieczająca Darksend + Obfuscate Collateral Payment + Płatność zabezpieczająca Obfuscate - Darksend Make Collateral Inputs - Darksend tworzy poboczne wejscia + Obfuscate Make Collateral Inputs + Obfuscate tworzy poboczne wejscia - Darksend Create Denominations - Darksend tworzy denominacje + Obfuscate Create Denominations + Obfuscate tworzy denominacje Darksent @@ -3135,20 +3135,20 @@ https://www.transifex.com/projects/p/dash/ Darksent - Darksend Make Collateral Inputs - Darksend tworzy poboczne wejscia + Obfuscate Make Collateral Inputs + Obfuscate tworzy poboczne wejscia - Darksend Create Denominations - Darksend tworzy denominacje + Obfuscate Create Denominations + Obfuscate tworzy denominacje - Darksend Denominate - Denominacja Darksend + Obfuscate Denominate + Denominacja Obfuscate - Darksend Collateral Payment - Płatność zabezpieczająca Darksend + Obfuscate Collateral Payment + Płatność zabezpieczająca Obfuscate To yourself @@ -3276,8 +3276,8 @@ https://www.transifex.com/projects/p/dash/ Wyślij płatność - InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH. - InstantX jescze nie może przesłać tak wysokich kwot. Obecnie transakcje są ograniczone tylko do %1 DASH: + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 DNET. + SwiftTX jescze nie może przesłać tak wysokich kwot. Obecnie transakcje są ograniczone tylko do %1 DNET: @@ -3320,7 +3320,7 @@ https://www.transifex.com/projects/p/dash/ - dash-core + darknet-core Bind to given address and always listen on it. Use [host]:port notation for IPv6 Związany z danym adresem oraz zawsze prowadzący na nim nasłuch. Użyj [host]:oznaczenie dla IPv6 @@ -3330,8 +3330,8 @@ https://www.transifex.com/projects/p/dash/ Nie można zablokować katalogu danych %s. Prawdopodobnie Dash jest już uruchomiony. - Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. - Darksend używa dokładnych denominowanych kwot do przesyłania środków, możliwe że musisz zanonimizować trochę więcej monet. + Obfuscate uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. + Obfuscate używa dokładnych denominowanych kwot do przesyłania środków, możliwe że musisz zanonimizować trochę więcej monet. Enter regression test mode, which uses a special chain in which blocks can be solved instantly. @@ -3358,8 +3358,8 @@ https://www.transifex.com/projects/p/dash/ W tym trybie -genproclimit kontroluje ile bloków jest generowanych natychmiastowo. - InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. - InstantX potrzebuje aby transakcja wejściowa miała co najmniej 6 potwierdzeń. Poczekaj kilka minut i spróbuj ponownie. + SwiftTX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. + SwiftTX potrzebuje aby transakcja wejściowa miała co najmniej 6 potwierdzeń. Poczekaj kilka minut i spróbuj ponownie. Name to construct url for KeePass entry that stores the wallet passphrase @@ -3386,12 +3386,12 @@ https://www.transifex.com/projects/p/dash/ Niezdolny do związania z %s na tym komputerze. Prawdopodobnie Dash jest już uruchomiony. - Unable to locate enough Darksend denominated funds for this transaction. - Nie znaleziono wystarczających denominowanych środków Darksend do wykonania tej transakcji. + Unable to locate enough Obfuscate denominated funds for this transaction. + Nie znaleziono wystarczających denominowanych środków Obfuscate do wykonania tej transakcji. - Unable to locate enough Darksend non-denominated funds for this transaction that are not equal 1000 DASH. - Nie znaleziono wystarczającej ilości nie zdenominowanych środków Darksend dla tej transakcji, które nie równają się 1000 DASH + Unable to locate enough Obfuscate non-denominated funds for this transaction that are not equal 1000 DNET. + Nie znaleziono wystarczającej ilości nie zdenominowanych środków Obfuscate dla tej transakcji, które nie równają się 1000 DNET Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction. @@ -3490,8 +3490,8 @@ https://www.transifex.com/projects/p/dash/ Wykryto uszkodzoną bazę danych bloków - Darksend options: - Opcje Darksend: + Obfuscate options: + Opcje Obfuscate: Debugging/Testing options: @@ -3562,8 +3562,8 @@ https://www.transifex.com/projects/p/dash/ Błąd: Portfel zamknięty, stworzenie transakcji jest niemożliwe! - Error: You already have pending entries in the Darksend pool - Błąd: Już masz oczekujące wejścia do puli Darksend + Error: You already have pending entries in the Obfuscate pool + Błąd: Już masz oczekujące wejścia do puli Obfuscate Failed to listen on any port. Use -listen=0 if you want this. @@ -3614,32 +3614,32 @@ https://www.transifex.com/projects/p/dash/ Usuń wszystkie transakcje portfela i odzyskaj tylko te części blockchainu - zeskanuj powonie na starcie. - Disable all Dash specific functionality (Masternodes, Darksend, InstantX, Budgeting) (0-1, default: %u) - Wyłącz wszystkie dodatkowe funckje Dash (Masternody, Darksend, InstanX, Budżetowanie) (0-1, domyślnie: %u) + Disable all Dash specific functionality (Masternodes, Obfuscate, SwiftTX, Budgeting) (0-1, default: %u) + Wyłącz wszystkie dodatkowe funckje Dash (Masternody, Obfuscate, InstanX, Budżetowanie) (0-1, domyślnie: %u) Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>. Rozpowszechniane na licencji MIT. Jeśli chcesz się dowiedzieć więcej otwórz towarzyszący plik o nzwie COPYING lub odwiedź <http://www.opensource.org/licenses/mit-license.php>. - Enable instantx, show confirmations for locked transactions (bool, default: %s) - Włącz instantx, pokaż potwierdzenia dla zamkniętych transakcji (bool, domyślnie: %s) + Enable swifttx, show confirmations for locked transactions (bool, default: %s) + Włącz swifttx, pokaż potwierdzenia dla zamkniętych transakcji (bool, domyślnie: %s) - Enable use of automated darksend for funds stored in this wallet (0-1, default: %u) - Włącz możliwość automatyzacji Darksend dla środków zgromadzonych w tym portfelu (0-1, domyślnie: %u) + Enable use of automated obfuscate for funds stored in this wallet (0-1, default: %u) + Włącz możliwość automatyzacji Obfuscate dla środków zgromadzonych w tym portfelu (0-1, domyślnie: %u) Error: Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported. Błąd: niewspierany argument, znaleziono -socks. Ustawienie wersji SOCKS nie jest już możliwa, wspierane są tylkobramki proxy SOCKS5. - Fees (in DASH/Kb) smaller than this are considered zero fee for relaying (default: %s) - Opłaty (DASH/Kb) za retransmisje mniejsze niż ta, uważane są za równoznaczne z brakiem opłat (domyślnie: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for relaying (default: %s) + Opłaty (DNET/Kb) za retransmisje mniejsze niż ta, uważane są za równoznaczne z brakiem opłat (domyślnie: %s) - Fees (in DASH/Kb) smaller than this are considered zero fee for transaction creation (default: %s) - Opłaty (DASH/Kb) mniejsze niż ta, są uważane są za równoznaczne z brakiem opłat za stworzenie transakcji (domyślnie: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Opłaty (DNET/Kb) mniejsze niż ta, są uważane są za równoznaczne z brakiem opłat za stworzenie transakcji (domyślnie: %s) Flush database activity from memory pool to disk log every <n> megabytes (default: %u) @@ -3686,8 +3686,8 @@ https://www.transifex.com/projects/p/dash/ Informacje na temat debugowania danych wyjściowych (domyślnie: %u, podanie <category> jest opcjonalne) - Provide liquidity to Darksend by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) - Dostarcz Darksend płynności przez rzadkie ale ciągłe mieszanie monet (0-100, domyślnie: %u, 1=bardzo często, wysokie opłaty, 100=bardzo rzadko, małe opłaty) + Provide liquidity to Obfuscate by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) + Dostarcz Obfuscate płynności przez rzadkie ale ciągłe mieszanie monet (0-100, domyślnie: %u, 1=bardzo często, wysokie opłaty, 100=bardzo rzadko, małe opłaty) Require high priority for relaying free or low-fee transactions (default:%u) @@ -3710,10 +3710,10 @@ https://www.transifex.com/projects/p/dash/ Produkt ten zawiera oprogramowanie stworzone przez OpenSSL Project do użytku w OpenSSL Toolkit <https://www.openssl.org/>, oprogramowanie krptograficzne napisane przez Eric Young oraz oprogramowanie UPnP napisane przez Thomas Bernard. - To use dashd, or the -server option to dash-qt, you must set an rpcpassword in the configuration file: + To use darknetd, or the -server option to darknet-qt, you must set an rpcpassword in the configuration file: %s It is recommended you use the following random password: -rpcuser=dashrpc +rpcuser=darknetrpc rpcpassword=%s (you do not need to remember this password) The username and password MUST NOT be the same. @@ -3721,10 +3721,10 @@ If the file does not exist, create it with owner-readable-only file permissions. It is also recommended to set alertnotify so you are notified of problems; for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - Aby używać dashd, lub opcje -server w kliencie dash-qt, musisz ustawić hasło rpc w pliku konfiguracji: + Aby używać darknetd, lub opcje -server w kliencie darknet-qt, musisz ustawić hasło rpc w pliku konfiguracji: %s Zalecane jest abyś użył te o to losowo stworzone hasło -rpcuser=dashrpc +rpcuser=darknetrpc rpcpassword=%s (Nie musisz pamiętać tego hasła) Twoje hasło NIE MOŻE być takie samo jak twój login. @@ -3733,8 +3733,8 @@ Zaleca się również aby ustawić alarm powiadomień tzw. alertnotify, aby dać - Unable to locate enough funds for this transaction that are not equal 1000 DASH. - Niemożliwe jest zlokalizowanie wystarczającej ilości środków dla tej transakcji, które nie są równe 1000 DASH. + Unable to locate enough funds for this transaction that are not equal 1000 DNET. + Niemożliwe jest zlokalizowanie wystarczającej ilości środków dla tej transakcji, które nie są równe 1000 DNET. Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s) @@ -3757,8 +3757,8 @@ Zaleca się również aby ustawić alarm powiadomień tzw. alertnotify, aby dać Peery z białej listy nie mogą zostać zbanowane a ich transakcje są zawsze retransmitowane, nawet jeśli już są w pamięci zbiorowej (mempool). Jest to przydatne np. dla bramek wyjściowych - (9999 could be used only on mainnet) - (9999 może być użyte tylko dla głównej sieci) + (51472 could be used only on mainnet) + (51472 może być użyte tylko dla głównej sieci) (default: %s) @@ -3807,16 +3807,16 @@ Zaleca się również aby ustawić alarm powiadomień tzw. alertnotify, aby dać Analiza -rpcbind wartości %s jako adresu sieci jest niemożliwa - Darksend is idle. - Darksend jest w stanie spoczynku. + Obfuscate is idle. + Obfuscate jest w stanie spoczynku. - Darksend request complete: - Żądanie Darksend zakończone: + Obfuscate request complete: + Żądanie Obfuscate zakończone: - Darksend request incomplete: - Żądanie Darksend niezakończone: + Obfuscate request incomplete: + Żądanie Obfuscate niezakończone: Disable safemode, override a real safe mode event (default: %u) @@ -3847,8 +3847,8 @@ Zaleca się również aby ustawić alarm powiadomień tzw. alertnotify, aby dać Błąd: Znaleziono niewspierany argument -tor, użyj -onion. - Fee (in DASH/kB) to add to transactions you send (default: %s) - Opłata (DASH/kB) do dodania do transakcji, którą chcesz wysłać (domyślnie: %s) + Fee (in DNET/kB) to add to transactions you send (default: %s) + Opłata (DNET/kB) do dodania do transakcji, którą chcesz wysłać (domyślnie: %s) Finalizing transaction. @@ -3911,8 +3911,8 @@ Zaleca się również aby ustawić alarm powiadomień tzw. alertnotify, aby dać Transakcja wejściowa jest niewłaściwa. - InstantX options: - Opcje InstantX: + SwiftTX options: + Opcje SwiftTX: Insufficient funds. @@ -3947,8 +3947,8 @@ Zaleca się również aby ustawić alarm powiadomień tzw. alertnotify, aby dać Nieprawidłowa kwota dla -paytxfee=<kwota>: '%s' - Last successful Darksend action was too recent. - Za mało czasu upłynęło od ostatniej udanej transakcji Darksend. + Last successful Obfuscate action was too recent. + Za mało czasu upłynęło od ostatniej udanej transakcji Obfuscate. Limit size of signature cache to <n> entries (default: %u) @@ -4175,8 +4175,8 @@ Zaleca się również aby ustawić alarm powiadomień tzw. alertnotify, aby dać Nieprawidłowy klucz prywatny masternoda. Przeczytaj dokumentację. - (must be 9999 for mainnet) - (musi być 9999 dla głównej sieci) + (must be51472 for mainnet) + (musi być51472 dla głównej sieci) Can't find random Masternode. @@ -4215,16 +4215,16 @@ Zaleca się również aby ustawić alarm powiadomień tzw. alertnotify, aby dać Klucz KeePassHttp dla zaszyfrowanego metodą AES połączenia z KeePass - Keep N DASH anonymized (default: %u) - Utrzymuj N zanonimizowanych dash (domyślnie: %u) + Keep N DNET anonymized (default: %u) + Utrzymuj N zanonimizowanych darknet (domyślnie: %u) Keep at most <n> unconnectable transactions in memory (default: %u) Utrzymuj najwyżej <n> niepodłączalnych transakcji w pamięci (domyślny: %u) - Last Darksend was too recent. - Za mało czasu upłynęło od ostatniej transakcji Darksend. + Last Obfuscate was too recent. + Za mało czasu upłynęło od ostatniej transakcji Obfuscate. Line: %d @@ -4475,8 +4475,8 @@ Zaleca się również aby ustawić alarm powiadomień tzw. alertnotify, aby dać Nazwa użytkownika dla połączeń JSON-RPC - Value more than Darksend pool maximum allows. - Wartość jest większa niż ta maksymalnie dopuszczalna przez Darksend pool + Value more than Obfuscate pool maximum allows. + Wartość jest większa niż ta maksymalnie dopuszczalna przez Obfuscate pool Verifying blocks... diff --git a/src/qt/locale/dash_pt.ts b/src/qt/locale/darknet_pt.ts similarity index 93% rename from src/qt/locale/dash_pt.ts rename to src/qt/locale/darknet_pt.ts index 0815cbce3b68c..9b665d504a79d 100644 --- a/src/qt/locale/dash_pt.ts +++ b/src/qt/locale/darknet_pt.ts @@ -176,8 +176,8 @@ Confirme cifra da carteira - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DASH</b>! - Atenção: Se cifrar a carteira e perder a palavra-passe, irá <b>PERDER TODAS AS SUAS MOEDAS DASH</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DNET</b>! + Atenção: Se cifrar a carteira e perder a palavra-passe, irá <b>PERDER TODAS AS SUAS MOEDAS DNET</b>! Are you sure you wish to encrypt your wallet? @@ -188,8 +188,8 @@ Carteira cifrada - Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dashs from being stolen by malware infecting your computer. - O cliente Dash irá fechar para finalizar o processo de cifra. Lembre-se que cifrar a sua carteira não consegue proteger totalmente as suas dashs contra roubos feitos por malware presente no seu computador. + Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your darknets from being stolen by malware infecting your computer. + O cliente Dash irá fechar para finalizar o processo de cifra. Lembre-se que cifrar a sua carteira não consegue proteger totalmente as suas darknets contra roubos feitos por malware presente no seu computador. IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet. @@ -263,8 +263,8 @@ &Receber - Request payments (generates QR codes and dash: URIs) - Solicitar pagamentos (gera códigos QR e dash: URIs) + Request payments (generates QR codes and darknet: URIs) + Solicitar pagamentos (gera códigos QR e darknet: URIs) &Transactions @@ -443,8 +443,8 @@ Abrir &URI... - Open a dash: URI or payment request - Abre um dash: URI ou solicitação de pagamento + Open a darknet: URI or payment request + Abre um darknet: URI ou solicitação de pagamento &Command-line options @@ -737,8 +737,8 @@ Endereço: %4 Copiar troco - Non-anonymized input selected. <b>Darksend will be disabled.</b><br><br>If you still want to use Darksend, please deselect all non-nonymized inputs first and then check Darksend checkbox again. - Entrada não anonimizada seleccionada. <b>O Darksend será desactivado.</b><br><br>Se deseja usar o Darksend, por favor desseleccione primeiro todas as entradas não anonimizadas e em seguida volte a marcar a opção Darksend. + Non-anonymized input selected. <b>Obfuscate will be disabled.</b><br><br>If you still want to use Obfuscate, please deselect all non-nonymized inputs first and then check Obfuscate checkbox again. + Entrada não anonimizada seleccionada. <b>O Obfuscate será desactivado.</b><br><br>Se deseja usar o Obfuscate, por favor desseleccione primeiro todas as entradas não anonimizadas e em seguida volte a marcar a opção Obfuscate. highest @@ -838,10 +838,10 @@ Endereço: %4 - DarksendConfig + ObfuscateConfig - Configure Darksend - Configurar Darksend + Configure Obfuscate + Configurar Obfuscate Basic Privacy @@ -860,11 +860,11 @@ Endereço: %4 Por favor seleccione um nível de privacidade. - Use 2 separate masternodes to mix funds up to 1000 DASH + Use 2 separate masternodes to mix funds up to 1000 DNET Usar 2 masternodes distintos para misturar os fundos até 1000DRK - Use 8 separate masternodes to mix funds up to 1000 DASH + Use 8 separate masternodes to mix funds up to 1000 DNET Usar 8 masternodes distintos para misturar os fundos até 1000DRK @@ -872,36 +872,36 @@ Endereço: %4 Usar 16 masternodes - This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH - Esta opção é a mais rápida e irá custar cerca de ~0.025 DASH para anonimizar 1000 DASH + This option is the quickest and will cost about ~0.025 DNET to anonymize 1000 DNET + Esta opção é a mais rápida e irá custar cerca de ~0.025 DNET para anonimizar 1000 DNET - This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH - Esta opção é relativamente rápida e irá custar cerca de ~0.05 DASH para anonimizar 1000 DASH + This option is moderately fast and will cost about 0.05 DNET to anonymize 1000 DNET + Esta opção é relativamente rápida e irá custar cerca de ~0.05 DNET para anonimizar 1000 DNET - 0.1 DASH per 1000 DASH you anonymize. - 0.1 DASH por cada 1000 DASH a anonimizar. + 0.1 DNET per 1000 DNET you anonymize. + 0.1 DNET por cada 1000 DNET a anonimizar. This is the slowest and most secure option. Using maximum anonymity will cost Esta é a opção mais lenta e mais segura. Usando anonimização máxima irá custar - Darksend Configuration - Configuração Darksend + Obfuscate Configuration + Configuração Obfuscate - Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend foi colocado com sucesso no modo básico (%1 e 2 voltas). Pode mudar esta definição em qualquer altura abrindo o ecrã de configuração Dash. + Obfuscate was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate foi colocado com sucesso no modo básico (%1 e 2 voltas). Pode mudar esta definição em qualquer altura abrindo o ecrã de configuração Dash. - Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend foi colocado com sucesso no modo alto (%1 e 8 voltas). Pode mudar esta definição em qualquer altura abrindo o ecrã de configuração Dash. + Obfuscate was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate foi colocado com sucesso no modo alto (%1 e 8 voltas). Pode mudar esta definição em qualquer altura abrindo o ecrã de configuração Dash. - Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend foi colocado com sucesso no modo máximo (%1 e 16 voltas). Pode mudar esta definição em qualquer altura abrindo o ecrã de configuração Dash. + Obfuscate was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate foi colocado com sucesso no modo máximo (%1 e 16 voltas). Pode mudar esta definição em qualquer altura abrindo o ecrã de configuração Dash. @@ -1142,12 +1142,12 @@ Endereço: %4 (0 = auto, <0 = deixar este número de cores livres) - Darksend rounds to use - Número de voltas Darksend a usar + Obfuscate rounds to use + Número de voltas Obfuscate a usar - This amount acts as a threshold to turn off Darksend once it's reached. - Esta quantia actua como um limite, a partir do qual o Darksend é desligado. + This amount acts as a threshold to turn off Obfuscate once it's reached. + Esta quantia actua como um limite, a partir do qual o Obfuscate é desligado. Amount of Dash to keep anonymized @@ -1259,9 +1259,9 @@ Endereço: %4 Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ Linguagem não encontrada ou tradução incompleta? Ajude a traduzir aqui: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ User Interface Theme: @@ -1419,16 +1419,16 @@ https://www.transifex.com/projects/p/dash/ Progresso: - Darksend Balance: - Saldo Darksend: + Obfuscate Balance: + Saldo Obfuscate: Amount and Rounds: Quantia e Voltas: - 0 DASH / 0 Rounds - 0 DASH / 0 Voltas + 0 DNET / 0 Rounds + 0 DNET / 0 Voltas Submitted Denom: @@ -1439,8 +1439,8 @@ https://www.transifex.com/projects/p/dash/ n/d - Darksend - Darksend + Obfuscate + Obfuscate Recent transactions @@ -1459,16 +1459,16 @@ https://www.transifex.com/projects/p/dash/ (Última Mensagem) - Try to manually submit a Darksend request. - Tentar submeter um pedido Darksend manualmente. + Try to manually submit a Obfuscate request. + Tentar submeter um pedido Obfuscate manualmente. Try Mix Tentar Mistura - Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!) - Reinicia o estado actual Darksend (pode interromper o Darksend mesmo quando em processo de Mistura, o que pode ter custos!) + Reset the current status of Obfuscate (can interrupt Obfuscate if it's in the process of Mixing, which can cost you money!) + Reinicia o estado actual Obfuscate (pode interromper o Obfuscate mesmo quando em processo de Mistura, o que pode ter custos!) Reset @@ -1483,12 +1483,12 @@ https://www.transifex.com/projects/p/dash/ Desactivado - Start Darksend Mixing - Iniciar Mistura Darksend + Start Obfuscate Mixing + Iniciar Mistura Obfuscate - Stop Darksend Mixing - Parar Mistura Darksend + Stop Obfuscate Mixing + Parar Mistura Obfuscate No inputs detected @@ -1531,9 +1531,9 @@ https://www.transifex.com/projects/p/dash/ Activado - Last Darksend message: + Last Obfuscate message: - Última mensagem Darksend: + Última mensagem Obfuscate: @@ -1541,20 +1541,20 @@ https://www.transifex.com/projects/p/dash/ N/D - Darksend was successfully reset. - Darksend foi reposto com sucesso. + Obfuscate was successfully reset. + Obfuscate foi reposto com sucesso. - If you don't want to see internal Darksend fees/transactions select "Most Common" as Type on the "Transactions" tab. - Se não deseja visualizar as taxas/transacções internas Darksend seleccione "Mais Comuns" como Tipo no separador "Transacções" + If you don't want to see internal Obfuscate fees/transactions select "Most Common" as Type on the "Transactions" tab. + Se não deseja visualizar as taxas/transacções internas Obfuscate seleccione "Mais Comuns" como Tipo no separador "Transacções" - Darksend requires at least %1 to use. - Darksend necessita de pelo menos %1 para ser usado. + Obfuscate requires at least %1 to use. + Obfuscate necessita de pelo menos %1 para ser usado. - Wallet is locked and user declined to unlock. Disabling Darksend. - A carteira está bloqueada e o utilizador recusou o desbloqueamento. A desactivar Darksend. + Wallet is locked and user declined to unlock. Disabling Obfuscate. + A carteira está bloqueada e o utilizador recusou o desbloqueamento. A desactivar Obfuscate. @@ -1564,8 +1564,8 @@ https://www.transifex.com/projects/p/dash/ Erro na solicitação de pagamento - Cannot start dash: click-to-pay handler - Não é possível iniciar o dash: click-to-pay handler + Cannot start darknet: click-to-pay handler + Não é possível iniciar o darknet: click-to-pay handler URI handling @@ -2348,12 +2348,12 @@ https://www.transifex.com/projects/p/dash/ Adicionar &Destinatário - Darksend - Darksend + Obfuscate + Obfuscate - InstantX - InstantX + SwiftTX + SwiftTX Balance: @@ -2400,16 +2400,16 @@ https://www.transifex.com/projects/p/dash/ fundos anónimos - (darksend requires this amount to be rounded up to the nearest %1). - (o darksend requer que esta quantia seja arredondada até ao %1 mais próximo). + (obfuscate requires this amount to be rounded up to the nearest %1). + (o obfuscate requer que esta quantia seja arredondada até ao %1 mais próximo). any available funds (not recommended) quaisquer fundos disponíveis (não recomendado) - and InstantX - e InstantX + and SwiftTX + e SwiftTX %1 to %2 @@ -2543,8 +2543,8 @@ https://www.transifex.com/projects/p/dash/ Mensagem: - A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. - Mensagem que foi anexada ao dash: URI e que será guardada com a transacção para sua referência. Nota: Esta mensagem não será enviada para a rede Dash. + A message that was attached to the darknet: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. + Mensagem que foi anexada ao darknet: URI e que será guardada com a transacção para sua referência. Nota: Esta mensagem não será enviada para a rede Dash. This is an unverified payment request. @@ -2762,16 +2762,16 @@ https://www.transifex.com/projects/p/dash/ conflituosa - %1/offline (verified via instantx) - %1/desligado (verificado através de instantx) + %1/offline (verified via swifttx) + %1/desligado (verificado através de swifttx) - %1/confirmed (verified via instantx) - %1/confirmado (verificado através de instantx) + %1/confirmed (verified via swifttx) + %1/confirmado (verificado através de swifttx) - %1 confirmations (verified via instantx) - %1 confirmações (verificado através de instantx) + %1 confirmations (verified via swifttx) + %1 confirmações (verificado através de swifttx) %1/offline @@ -2786,24 +2786,24 @@ https://www.transifex.com/projects/p/dash/ %1 confirmações - %1/offline (InstantX verification in progress - %2 of %3 signatures) - %1/desligado (verificação InstantX em progresso - %2 de %3 assinaturas) + %1/offline (SwiftTX verification in progress - %2 of %3 signatures) + %1/desligado (verificação SwiftTX em progresso - %2 de %3 assinaturas) - %1/confirmed (InstantX verification in progress - %2 of %3 signatures ) - %1/confirmada (verificação InstantX em progresso - %2 de %3 assinaturas) + %1/confirmed (SwiftTX verification in progress - %2 of %3 signatures ) + %1/confirmada (verificação SwiftTX em progresso - %2 de %3 assinaturas) - %1 confirmations (InstantX verification in progress - %2 of %3 signatures) - %1 confirmações (verificação InstantX em progresso - %2 de %3 assinaturas) + %1 confirmations (SwiftTX verification in progress - %2 of %3 signatures) + %1 confirmações (verificação SwiftTX em progresso - %2 de %3 assinaturas) - %1/offline (InstantX verification failed) - %1/desligado (a verificação InstantX falhou) + %1/offline (SwiftTX verification failed) + %1/desligado (a verificação SwiftTX falhou) - %1/confirmed (InstantX verification failed) - %1/confirmada (a verificação InstantX falhou) + %1/confirmed (SwiftTX verification failed) + %1/confirmada (a verificação SwiftTX falhou) Status @@ -3004,8 +3004,8 @@ https://www.transifex.com/projects/p/dash/ Recebido de - Received via Darksend - Recebido via Darksend + Received via Obfuscate + Recebido via Obfuscate Sent to @@ -3020,20 +3020,20 @@ https://www.transifex.com/projects/p/dash/ Minado - Darksend Denominate - Denominação Darksend + Obfuscate Denominate + Denominação Obfuscate - Darksend Collateral Payment - Pagamento Colateral Darksend + Obfuscate Collateral Payment + Pagamento Colateral Obfuscate - Darksend Make Collateral Inputs - Darksend Fazer Entradas Colaterais + Obfuscate Make Collateral Inputs + Obfuscate Fazer Entradas Colaterais - Darksend Create Denominations - Darksend Criar Denominações + Obfuscate Create Denominations + Obfuscate Criar Denominações Darksent @@ -3119,20 +3119,20 @@ https://www.transifex.com/projects/p/dash/ Darksent - Darksend Make Collateral Inputs - Darksend Fazer Entradas Colaterais + Obfuscate Make Collateral Inputs + Obfuscate Fazer Entradas Colaterais - Darksend Create Denominations - Darksend Criar Denominações + Obfuscate Create Denominations + Obfuscate Criar Denominações - Darksend Denominate - Denominação Darksend + Obfuscate Denominate + Denominação Obfuscate - Darksend Collateral Payment - Pagamento Colateral Darksend + Obfuscate Collateral Payment + Pagamento Colateral Obfuscate To yourself @@ -3260,8 +3260,8 @@ https://www.transifex.com/projects/p/dash/ Enviar Moedas - InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH. - O InstantX não suporta valores tão elevados neste momento. As transacções estão limitadas a %1 DASH. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 DNET. + O SwiftTX não suporta valores tão elevados neste momento. As transacções estão limitadas a %1 DNET. @@ -3304,7 +3304,7 @@ https://www.transifex.com/projects/p/dash/ - dash-core + darknet-core Bind to given address and always listen on it. Use [host]:port notation for IPv6 Vincular a um determinado endereço e ouvir sempre aí. Use a notação [endereço]:porta para IPv6 @@ -3314,8 +3314,8 @@ https://www.transifex.com/projects/p/dash/ Não foi possível obter acesso exclusivo à pasta de dados %s. Possivelmente o Dash Core já se encontra em execução. - Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. - O Darksend usa denominações exactas para enviar fundos, pode necessitar simplesmente de anonimizar mais algumas moedas. + Obfuscate uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. + O Obfuscate usa denominações exactas para enviar fundos, pode necessitar simplesmente de anonimizar mais algumas moedas. Enter regression test mode, which uses a special chain in which blocks can be solved instantly. @@ -3342,8 +3342,8 @@ https://www.transifex.com/projects/p/dash/ Neste modo o -genproclimit controla quantos blocos são gerados imediatamente. - InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. - O InstantX necessita de entradas com pelo menos 6 confirmações, pode ser necessário aguardar mais uns minutos e tentar de novo. + SwiftTX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. + O SwiftTX necessita de entradas com pelo menos 6 confirmações, pode ser necessário aguardar mais uns minutos e tentar de novo. Name to construct url for KeePass entry that stores the wallet passphrase @@ -3370,12 +3370,12 @@ https://www.transifex.com/projects/p/dash/ Não foi possível vincular a %s neste computador. Provavelmente o Dash Core já está a ser executado. - Unable to locate enough Darksend denominated funds for this transaction. - Não foi possível localizar fundos Darksend denominados suficientes para esta transacção. + Unable to locate enough Obfuscate denominated funds for this transaction. + Não foi possível localizar fundos Obfuscate denominados suficientes para esta transacção. - Unable to locate enough Darksend non-denominated funds for this transaction that are not equal 1000 DASH. - Não foi possível localizar fundos Darksend não denominados suficientes para esta transacção que não sejam igual a 1000DRK. + Unable to locate enough Obfuscate non-denominated funds for this transaction that are not equal 1000 DNET. + Não foi possível localizar fundos Obfuscate não denominados suficientes para esta transacção que não sejam igual a 1000DRK. Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction. @@ -3474,8 +3474,8 @@ https://www.transifex.com/projects/p/dash/ Detectada corrupção na base de dados dos blocos - Darksend options: - Opções Darksend: + Obfuscate options: + Opções Obfuscate: Debugging/Testing options: @@ -3546,8 +3546,8 @@ https://www.transifex.com/projects/p/dash/ Erro: Carteira bloqueada, não foi possível criar a transacção! - Error: You already have pending entries in the Darksend pool - Erro: Já tem entradas pendentes no conjunto Darksend + Error: You already have pending entries in the Obfuscate pool + Erro: Já tem entradas pendentes no conjunto Obfuscate Failed to listen on any port. Use -listen=0 if you want this. @@ -3582,16 +3582,16 @@ https://www.transifex.com/projects/p/dash/ Apaga todas as transacções da carteira e só recupera essas partes da cadeia de blocos com -rescan no arranque - Enable instantx, show confirmations for locked transactions (bool, default: %s) - Activar instantx, mostrar confirmações para transacções bloqueadas (bool, default: %s) + Enable swifttx, show confirmations for locked transactions (bool, default: %s) + Activar swifttx, mostrar confirmações para transacções bloqueadas (bool, default: %s) - Enable use of automated darksend for funds stored in this wallet (0-1, default: %u) - Activar o uso de darksend automatizado para os fundos guardados nesta carteira (0-1, default: %u) + Enable use of automated obfuscate for funds stored in this wallet (0-1, default: %u) + Activar o uso de obfuscate automatizado para os fundos guardados nesta carteira (0-1, default: %u) - Fees (in DASH/Kb) smaller than this are considered zero fee for relaying (default: %s) - Taxas (em DASH/Kb) inferiores a esta serão consideradas zero para retransmissão (default: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for relaying (default: %s) + Taxas (em DNET/Kb) inferiores a esta serão consideradas zero para retransmissão (default: %s) Flush database activity from memory pool to disk log every <n> megabytes (default: %u) @@ -3618,8 +3618,8 @@ https://www.transifex.com/projects/p/dash/ Informação de depuração de saída (omissão: %u, fornecer <category> é opcional) - Provide liquidity to Darksend by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) - Providenciar liquidez para o Darksend misturando moedas continuamente com baixa frequência (0-100, omissão: %u, 1=muito frequente taxas elevadas, 100=pouco frequente, taxas reduzidas) + Provide liquidity to Obfuscate by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) + Providenciar liquidez para o Obfuscate misturando moedas continuamente com baixa frequência (0-100, omissão: %u, 1=muito frequente taxas elevadas, 100=pouco frequente, taxas reduzidas) Send trace/debug info to console instead of debug.log file (default: %u) @@ -3638,7 +3638,7 @@ https://www.transifex.com/projects/p/dash/ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no OpenSSL Toolkit <https://www.openssl.org/>, software criptográfico escrito por Eric Young e software UPnP escrito por Thomas Bernard. - Unable to locate enough funds for this transaction that are not equal 1000 DASH. + Unable to locate enough funds for this transaction that are not equal 1000 DNET. Não foi possível localizar fundos suficientes para esta transacção que não sejam igual a 1000DRK. @@ -3654,8 +3654,8 @@ https://www.transifex.com/projects/p/dash/ Aviso: Por favor verifique que a data e a hora do computador está correcta! Se o relógio estiver errado o Dash Core não vai funcionar correctamente. - (9999 could be used only on mainnet) - (9999 apenas pode ser usado para mainnet) + (51472 could be used only on mainnet) + (51472 apenas pode ser usado para mainnet) (default: %s) @@ -3704,16 +3704,16 @@ https://www.transifex.com/projects/p/dash/ Incapaz de analizar -rpcbind value %s como endereço de rede - Darksend is idle. - Darksend está inactivo. + Obfuscate is idle. + Obfuscate está inactivo. - Darksend request complete: - Pedido Darksend completo: + Obfuscate request complete: + Pedido Obfuscate completo: - Darksend request incomplete: - Pedido Darksend incompleto: + Obfuscate request incomplete: + Pedido Obfuscate incompleto: Disable safemode, override a real safe mode event (default: %u) @@ -3744,8 +3744,8 @@ https://www.transifex.com/projects/p/dash/ Erro: Argument não suportado -tor encontrado, utilize -onion - Fee (in DASH/kB) to add to transactions you send (default: %s) - Taxas (em DASH/Kb) a adicionar às transacções que envia (omissão: %s) + Fee (in DNET/kB) to add to transactions you send (default: %s) + Taxas (em DNET/Kb) a adicionar às transacções que envia (omissão: %s) Finalizing transaction. @@ -3808,8 +3808,8 @@ https://www.transifex.com/projects/p/dash/ A entrada não é válida. - InstantX options: - Opções InstantX + SwiftTX options: + Opções SwiftTX Insufficient funds. @@ -3844,8 +3844,8 @@ https://www.transifex.com/projects/p/dash/ Quantia inválida para -paytxfee=<amount>: '%s' - Last successful Darksend action was too recent. - Ultima acção Darksend com sucesso é demasiado recente. + Last successful Obfuscate action was too recent. + Ultima acção Obfuscate com sucesso é demasiado recente. Limit size of signature cache to <n> entries (default: %u) @@ -4064,8 +4064,8 @@ https://www.transifex.com/projects/p/dash/ masternodeprivkey inválida. Por favor reveja a documentação. - (must be 9999 for mainnet) - (deve ser 9999 para mainnet) + (must be51472 for mainnet) + (deve ser51472 para mainnet) Can't find random Masternode. @@ -4104,16 +4104,16 @@ https://www.transifex.com/projects/p/dash/ Chave KeePassHttp para usar na comunicação cifrada AES com o KeePass - Keep N DASH anonymized (default: %u) - Manter N DASH anonimizados (default: %u) + Keep N DNET anonymized (default: %u) + Manter N DNET anonimizados (default: %u) Keep at most <n> unconnectable transactions in memory (default: %u) Manter no máximo <n> transacções não conectáveis em memória (omissão: %u) - Last Darksend was too recent. - O último Darksend é muito recente. + Last Obfuscate was too recent. + O último Obfuscate é muito recente. Line: %d @@ -4360,8 +4360,8 @@ https://www.transifex.com/projects/p/dash/ Utilizador para as ligações JSON-RPC - Value more than Darksend pool maximum allows. - Valor mais elevado do que o máximo permitido pelo Darksend. + Value more than Obfuscate pool maximum allows. + Valor mais elevado do que o máximo permitido pelo Obfuscate. Verifying blocks... diff --git a/src/qt/locale/dash_ru.ts b/src/qt/locale/darknet_ru.ts similarity index 94% rename from src/qt/locale/dash_ru.ts rename to src/qt/locale/darknet_ru.ts index 92f76f4ee042d..794be01de7d1f 100644 --- a/src/qt/locale/dash_ru.ts +++ b/src/qt/locale/darknet_ru.ts @@ -176,8 +176,8 @@ Подтвердите шифрование кошелька - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DASH</b>! - Внимание: если Вы зашифруете кошелёк и потеряете пароль, вы <b>ПОТЕРЯЕТЕ ВСЕ ВАШИ DASH</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DNET</b>! + Внимание: если Вы зашифруете кошелёк и потеряете пароль, вы <b>ПОТЕРЯЕТЕ ВСЕ ВАШИ DNET</b>! Are you sure you wish to encrypt your wallet? @@ -188,7 +188,7 @@ Кошелёк зашифрован - Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dashs from being stolen by malware infecting your computer. + Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your darknets from being stolen by malware infecting your computer. Сейчас программа закроется для завершения процесса шифрования. Помните, что шифрование вашего кошелька не может полностью защитить ваши даши от кражи с помощью инфицирования вашего компьютера вредоносным ПО. @@ -263,8 +263,8 @@ &Получить - Request payments (generates QR codes and dash: URIs) - Запросить платежи (создать QR-коды и dash: URI) + Request payments (generates QR codes and darknet: URIs) + Запросить платежи (создать QR-коды и darknet: URI) &Transactions @@ -443,8 +443,8 @@ Открыть &URI... - Open a dash: URI or payment request - Открыть dash: URI или запрос платежа + Open a darknet: URI or payment request + Открыть darknet: URI или запрос платежа &Command-line options @@ -741,8 +741,8 @@ Address: %4 Копировать сдачу - Non-anonymized input selected. <b>Darksend will be disabled.</b><br><br>If you still want to use Darksend, please deselect all non-nonymized inputs first and then check Darksend checkbox again. - Выбраны неанонимизированные средства. <b>Darksend будет отключен.</b><br><br>Если Вы все-таки хотите использовать Darksend, пожалуйста, снимите выделение с со всех неанонимизированных средств и заново поставьте галочку напротив Darksend. + Non-anonymized input selected. <b>Obfuscate will be disabled.</b><br><br>If you still want to use Obfuscate, please deselect all non-nonymized inputs first and then check Obfuscate checkbox again. + Выбраны неанонимизированные средства. <b>Obfuscate будет отключен.</b><br><br>Если Вы все-таки хотите использовать Obfuscate, пожалуйста, снимите выделение с со всех неанонимизированных средств и заново поставьте галочку напротив Obfuscate. highest @@ -842,10 +842,10 @@ Address: %4 - DarksendConfig + ObfuscateConfig - Configure Darksend - Настройте Darksend + Configure Obfuscate + Настройте Obfuscate Basic Privacy @@ -864,48 +864,48 @@ Address: %4 Пожалуйста, выберите уровень приватности. - Use 2 separate masternodes to mix funds up to 1000 DASH - Использовать 2 отдельные мастерноды для перемешивания до 1000 DASH + Use 2 separate masternodes to mix funds up to 1000 DNET + Использовать 2 отдельные мастерноды для перемешивания до 1000 DNET - Use 8 separate masternodes to mix funds up to 1000 DASH - Использовать 8 отдельных мастернод для перемешивания до 1000 DASH + Use 8 separate masternodes to mix funds up to 1000 DNET + Использовать 8 отдельных мастернод для перемешивания до 1000 DNET Use 16 separate masternodes Использовать 16 отдельных мастернод - This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH - Это самый быстрый вариант, анонимизация 1000 DASH будет стоить вам примерно 0.025 DASH + This option is the quickest and will cost about ~0.025 DNET to anonymize 1000 DNET + Это самый быстрый вариант, анонимизация 1000 DNET будет стоить вам примерно 0.025 DNET - This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH - Это относительно быстрый вариант, анонимизация 1000 DASH будет стоить вам примерно 0.05 DASH + This option is moderately fast and will cost about 0.05 DNET to anonymize 1000 DNET + Это относительно быстрый вариант, анонимизация 1000 DNET будет стоить вам примерно 0.05 DNET - 0.1 DASH per 1000 DASH you anonymize. - 0.1 DASH за каждые анонимизированные 1000 DASH. + 0.1 DNET per 1000 DNET you anonymize. + 0.1 DNET за каждые анонимизированные 1000 DNET. This is the slowest and most secure option. Using maximum anonymity will cost Этот самый медленный и безопасный вариант. Анонимизация будет стоить - Darksend Configuration - Настройки Darksend + Obfuscate Configuration + Настройки Obfuscate - Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend успешно установлен в режим обычной приватности (%1 и 2 раунда). Вы можете изменить это в любое время, используя окно настроек. + Obfuscate was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate успешно установлен в режим обычной приватности (%1 и 2 раунда). Вы можете изменить это в любое время, используя окно настроек. - Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend успешно установлен в режим высокой приватности (%1 и 8 раундов). Вы можете изменить это в любое время, используя окно настроек. + Obfuscate was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate успешно установлен в режим высокой приватности (%1 и 8 раундов). Вы можете изменить это в любое время, используя окно настроек. - Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend успешно установлен в режим максимально приватности (%1 и 16 раундов). Вы можете изменить это в любое время, используя окно настроек. + Obfuscate was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate успешно установлен в режим максимально приватности (%1 и 16 раундов). Вы можете изменить это в любое время, используя окно настроек. @@ -1146,11 +1146,11 @@ Address: %4 (0 = автоматически, <0 = оставить столько незагруженных ядер) - Darksend rounds to use - Количество раундов Darksend + Obfuscate rounds to use + Количество раундов Obfuscate - This amount acts as a threshold to turn off Darksend once it's reached. + This amount acts as a threshold to turn off Obfuscate once it's reached. Это пороговое значение, при достижении которого автоматическое перемешивание отключается. @@ -1263,9 +1263,9 @@ Address: %4 Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ Нет Вашего языка или перевод неполон? Помогите нам сделать перевод лучше: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ User Interface Theme: @@ -1423,16 +1423,16 @@ https://www.transifex.com/projects/p/dash/ Завершение: - Darksend Balance: - Баланс Darksend: + Obfuscate Balance: + Баланс Obfuscate: Amount and Rounds: Сумма и раунды: - 0 DASH / 0 Rounds - 0 DASH / 0 раундов + 0 DNET / 0 Rounds + 0 DNET / 0 раундов Submitted Denom: @@ -1443,8 +1443,8 @@ https://www.transifex.com/projects/p/dash/ н/д - Darksend - Darksend + Obfuscate + Obfuscate Recent transactions @@ -1463,16 +1463,16 @@ https://www.transifex.com/projects/p/dash/ (Последнее сообщение) - Try to manually submit a Darksend request. - Попробовать отправить Darksend-запрос вручную. + Try to manually submit a Obfuscate request. + Попробовать отправить Obfuscate-запрос вручную. Try Mix Попробовать вручную - Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!) - Сбросить текущий статус Darksend (можно прервать процесс перемешивания Darksend, но это может стоить Вам немного денег!) + Reset the current status of Obfuscate (can interrupt Obfuscate if it's in the process of Mixing, which can cost you money!) + Сбросить текущий статус Obfuscate (можно прервать процесс перемешивания Obfuscate, но это может стоить Вам немного денег!) Reset @@ -1487,11 +1487,11 @@ https://www.transifex.com/projects/p/dash/ Выключен - Start Darksend Mixing + Start Obfuscate Mixing Начать автоперемешивание - Stop Darksend Mixing + Stop Obfuscate Mixing Остановить перемешивание @@ -1535,9 +1535,9 @@ https://www.transifex.com/projects/p/dash/ Включен - Last Darksend message: + Last Obfuscate message: - Последнее сообщение Darksend: + Последнее сообщение Obfuscate: @@ -1545,20 +1545,20 @@ https://www.transifex.com/projects/p/dash/ Н/Д - Darksend was successfully reset. - Статус Darksend был успешно сброшен. + Obfuscate was successfully reset. + Статус Obfuscate был успешно сброшен. - If you don't want to see internal Darksend fees/transactions select "Most Common" as Type on the "Transactions" tab. - Если Вы не хотите видеть внутренние транзакции/комиссии от работы Darksend, выберите Тип "Наиболее общие" на закладке "Транзакции". + If you don't want to see internal Obfuscate fees/transactions select "Most Common" as Type on the "Transactions" tab. + Если Вы не хотите видеть внутренние транзакции/комиссии от работы Obfuscate, выберите Тип "Наиболее общие" на закладке "Транзакции". - Darksend requires at least %1 to use. - Для работы Darksend требуется минимум %1. + Obfuscate requires at least %1 to use. + Для работы Obfuscate требуется минимум %1. - Wallet is locked and user declined to unlock. Disabling Darksend. - Кошелёк заблокирован и пользователь отказался его разблокировать. Darksend будет выключен. + Wallet is locked and user declined to unlock. Disabling Obfuscate. + Кошелёк заблокирован и пользователь отказался его разблокировать. Obfuscate будет выключен. @@ -1568,8 +1568,8 @@ https://www.transifex.com/projects/p/dash/ Ошибка запроса платежа - Cannot start dash: click-to-pay handler - Не удаётся запустить обработчик dash: click-to-pay + Cannot start darknet: click-to-pay handler + Не удаётся запустить обработчик darknet: click-to-pay URI handling @@ -2292,7 +2292,7 @@ https://www.transifex.com/projects/p/dash/ Если ручная комиссия установлена в 1000 duff, а транзакция по размеру только 250 байт, то плата "за килобайт" составит лишь 250 duff,<br>в то время как "итого минимум" будет равна 1000 duff. Для тразакций больше килобайта в любом случае идет расчет "за килобайт". - Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process. + Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for darknet transactions than the network can process. Оплаты только минимальной комиссии должно быть достаточно во всех случаях, пока в блоках достаточно места.<br>Однако, будьте готовы к тому, что транзакция может вовсе не получить подтверждения,<br>если количество транзакций будет стабильно больше, чем сеть способна обработать. @@ -2364,12 +2364,12 @@ https://www.transifex.com/projects/p/dash/ &Добавить получателя - Darksend - Darksend + Obfuscate + Obfuscate - InstantX - InstantX + SwiftTX + SwiftTX Balance: @@ -2416,16 +2416,16 @@ https://www.transifex.com/projects/p/dash/ анонимные средства - (darksend requires this amount to be rounded up to the nearest %1). - (для работы darksend требуется принудительно округлить до ближайшего %1). + (obfuscate requires this amount to be rounded up to the nearest %1). + (для работы obfuscate требуется принудительно округлить до ближайшего %1). any available funds (not recommended) любые доступные средства (не рекомендуется) - and InstantX - и InstantX + and SwiftTX + и SwiftTX %1 to %2 @@ -2559,8 +2559,8 @@ https://www.transifex.com/projects/p/dash/ Сообщение: - A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. - К dash: URI было прикреплено сообщение, которое будет сохранено вместе с транзакцией для вашего сведения. Обратите внимание: сообщение не будет отправлено через сеть Dash. + A message that was attached to the darknet: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. + К darknet: URI было прикреплено сообщение, которое будет сохранено вместе с транзакцией для вашего сведения. Обратите внимание: сообщение не будет отправлено через сеть Dash. This is an unverified payment request. @@ -2778,16 +2778,16 @@ https://www.transifex.com/projects/p/dash/ в противоречии - %1/offline (verified via instantx) - %1/отключен (проверено через instantx) + %1/offline (verified via swifttx) + %1/отключен (проверено через swifttx) - %1/confirmed (verified via instantx) - %1/подтвержден (проверено через instantx) + %1/confirmed (verified via swifttx) + %1/подтвержден (проверено через swifttx) - %1 confirmations (verified via instantx) - %1 подтверждений (проверено через instantx) + %1 confirmations (verified via swifttx) + %1 подтверждений (проверено через swifttx) %1/offline @@ -2802,24 +2802,24 @@ https://www.transifex.com/projects/p/dash/ %1 подтверждений - %1/offline (InstantX verification in progress - %2 of %3 signatures) - %1/отключен (верификация InstantX в процессе - %2 из %3 подписей) + %1/offline (SwiftTX verification in progress - %2 of %3 signatures) + %1/отключен (верификация SwiftTX в процессе - %2 из %3 подписей) - %1/confirmed (InstantX verification in progress - %2 of %3 signatures ) - %1/подтвержден (верификация InstantX в процессе - %2 из %3 подписей) + %1/confirmed (SwiftTX verification in progress - %2 of %3 signatures ) + %1/подтвержден (верификация SwiftTX в процессе - %2 из %3 подписей) - %1 confirmations (InstantX verification in progress - %2 of %3 signatures) - %1 подтверждений (верификация InstantX в процессе - %2 из %3 подписей) + %1 confirmations (SwiftTX verification in progress - %2 of %3 signatures) + %1 подтверждений (верификация SwiftTX в процессе - %2 из %3 подписей) - %1/offline (InstantX verification failed) - %1/отключен (верификация InstantX завершилась неудачно) + %1/offline (SwiftTX verification failed) + %1/отключен (верификация SwiftTX завершилась неудачно) - %1/confirmed (InstantX verification failed) - %1/подтвержден (верификация InstantX завершилась неудачно) + %1/confirmed (SwiftTX verification failed) + %1/подтвержден (верификация SwiftTX завершилась неудачно) Status @@ -3020,8 +3020,8 @@ https://www.transifex.com/projects/p/dash/ Получено от - Received via Darksend - Получено через Darksend + Received via Obfuscate + Получено через Obfuscate Sent to @@ -3036,24 +3036,24 @@ https://www.transifex.com/projects/p/dash/ Добыто - Darksend Denominate - Перемешивание Darksend + Obfuscate Denominate + Перемешивание Obfuscate - Darksend Collateral Payment - Обеспечительный платеж Darksend + Obfuscate Collateral Payment + Обеспечительный платеж Obfuscate - Darksend Make Collateral Inputs - Создание обеспечительных монет для Darksend + Obfuscate Make Collateral Inputs + Создание обеспечительных монет для Obfuscate - Darksend Create Denominations - Создание номиналов для Darksend + Obfuscate Create Denominations + Создание номиналов для Obfuscate Darksent - Отправлено через Darksend + Отправлено через Obfuscate watch-only @@ -3132,23 +3132,23 @@ https://www.transifex.com/projects/p/dash/ Darksent - Отправлено через Darksend + Отправлено через Obfuscate - Darksend Make Collateral Inputs - Создание обеспечительных монет для Darksend + Obfuscate Make Collateral Inputs + Создание обеспечительных монет для Obfuscate - Darksend Create Denominations - Создание номиналов для Darksend + Obfuscate Create Denominations + Создание номиналов для Obfuscate - Darksend Denominate - Перемешивание Darksend + Obfuscate Denominate + Перемешивание Obfuscate - Darksend Collateral Payment - Обеспечительный платеж Darksend + Obfuscate Collateral Payment + Обеспечительный платеж Obfuscate To yourself @@ -3276,8 +3276,8 @@ https://www.transifex.com/projects/p/dash/ Отправка - InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH. - InstantX пока что не поддерживает такие большие суммы. На данный момент транзакции ограничены суммами до %1 DASH. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 DNET. + SwiftTX пока что не поддерживает такие большие суммы. На данный момент транзакции ограничены суммами до %1 DNET. @@ -3320,7 +3320,7 @@ https://www.transifex.com/projects/p/dash/ - dash-core + darknet-core Bind to given address and always listen on it. Use [host]:port notation for IPv6 Привязаться к указанному адресу и всегда прослушивать только его. Используйте [хост]:порт для IPv6 @@ -3330,8 +3330,8 @@ https://www.transifex.com/projects/p/dash/ Не удалось установить блокировку на каталог данных %s. Возможно, Dash Core уже запущен. - Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. - При отправке Darksend использует только деноминированные средства, возможно, Вам просто нужно анонимизировать немного больше монет. + Obfuscate uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. + При отправке Obfuscate использует только деноминированные средства, возможно, Вам просто нужно анонимизировать немного больше монет. Enter regression test mode, which uses a special chain in which blocks can be solved instantly. @@ -3358,8 +3358,8 @@ https://www.transifex.com/projects/p/dash/ В этом режиме -genproclimit определяет, сколько блоков генерируется немедленно. - InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. - InstantX требует наличия средств с хотя бы 6 подтверждениями, возможно Вам нужно подождать пару минут и попробовать снова. + SwiftTX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. + SwiftTX требует наличия средств с хотя бы 6 подтверждениями, возможно Вам нужно подождать пару минут и попробовать снова. Name to construct url for KeePass entry that stores the wallet passphrase @@ -3386,11 +3386,11 @@ https://www.transifex.com/projects/p/dash/ Не удалось привязаться к %s на этом компьютере. Возможно, Dash Core уже запущен. - Unable to locate enough Darksend denominated funds for this transaction. - Не удалось обнаружить достаточных для выполнения этой транзакции номиналов Darksend. + Unable to locate enough Obfuscate denominated funds for this transaction. + Не удалось обнаружить достаточных для выполнения этой транзакции номиналов Obfuscate. - Unable to locate enough Darksend non-denominated funds for this transaction that are not equal 1000 DASH. + Unable to locate enough Obfuscate non-denominated funds for this transaction that are not equal 1000 DNET. Не удалось обнаружить достаточных для выполнения этой транзакции неденоминированных средств, отличающихся от 1000DRK. @@ -3490,8 +3490,8 @@ https://www.transifex.com/projects/p/dash/ База данных блоков повреждена - Darksend options: - Параметры Darksend: + Obfuscate options: + Параметры Obfuscate: Debugging/Testing options: @@ -3562,8 +3562,8 @@ https://www.transifex.com/projects/p/dash/ Ошибка: кошелёк заблокирован, создание транзакции невозможно! - Error: You already have pending entries in the Darksend pool - Ошибка: у Вас уже есть ожидающие записи в пуле Darksend + Error: You already have pending entries in the Obfuscate pool + Ошибка: у Вас уже есть ожидающие записи в пуле Obfuscate Failed to listen on any port. Use -listen=0 if you want this. @@ -3614,32 +3614,32 @@ https://www.transifex.com/projects/p/dash/ Удалить все трансакции из кошелька и при рестарте с помощью -rescan восстановить только те, которые есть в цепочке блоков - Disable all Dash specific functionality (Masternodes, Darksend, InstantX, Budgeting) (0-1, default: %u) - Отключить всю функциональность, относящуюся к Dash (Мастерноды, Darksend, InstantX, бюджеты) (0-1, по умолчанию: %u) + Disable all Dash specific functionality (Masternodes, Obfuscate, SwiftTX, Budgeting) (0-1, default: %u) + Отключить всю функциональность, относящуюся к Dash (Мастерноды, Obfuscate, SwiftTX, бюджеты) (0-1, по умолчанию: %u) Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>. Распространяется под лицензией на программное обеспечение MIT, смотрите прилагаемый файл COPYING или <http://www.opensource.org/licenses/mit-license.php>. - Enable instantx, show confirmations for locked transactions (bool, default: %s) - Включить instantx, показывать подтверждения для заблокированных транзакций (булевое, по умолчанию: %s) + Enable swifttx, show confirmations for locked transactions (bool, default: %s) + Включить swifttx, показывать подтверждения для заблокированных транзакций (булевое, по умолчанию: %s) - Enable use of automated darksend for funds stored in this wallet (0-1, default: %u) - Включить автоматическое перемешивание Darksend для средств, хранящихся в этом кошельке (0-1, по умолчанию: %u) + Enable use of automated obfuscate for funds stored in this wallet (0-1, default: %u) + Включить автоматическое перемешивание Obfuscate для средств, хранящихся в этом кошельке (0-1, по умолчанию: %u) Error: Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported. Ошибка: Обнаружен неподдерживаемый аргумент -socks. Выбор версии SOCKS больше невозможен, поддерживаются только прокси версии SOCKS5. - Fees (in DASH/Kb) smaller than this are considered zero fee for relaying (default: %s) - Комиссии (в DASH/Kb) меньше этого значения считаются нулевой для ретранслирования транзакции (по умолчанию: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for relaying (default: %s) + Комиссии (в DNET/Kb) меньше этого значения считаются нулевой для ретранслирования транзакции (по умолчанию: %s) - Fees (in DASH/Kb) smaller than this are considered zero fee for transaction creation (default: %s) - Комиссии (в DASH/Kb) меньше этого значения считаются нулевой (для создания транзакции) (по умолчанию: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Комиссии (в DNET/Kb) меньше этого значения считаются нулевой (для создания транзакции) (по умолчанию: %s) Flush database activity from memory pool to disk log every <n> megabytes (default: %u) @@ -3686,8 +3686,8 @@ https://www.transifex.com/projects/p/dash/ Вывод отладочной информации (по умолчанию: %u, указание <category> необязательно) - Provide liquidity to Darksend by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) - Предоставлять ликвидность для Darksend путем редкого участия в перемешивании монет на постоянной основе (0-100, по умолчанию: %u, 1=очень часто, высокая комиссия, 100=очень редко, низкая комиссия) + Provide liquidity to Obfuscate by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) + Предоставлять ликвидность для Obfuscate путем редкого участия в перемешивании монет на постоянной основе (0-100, по умолчанию: %u, 1=очень часто, высокая комиссия, 100=очень редко, низкая комиссия) Require high priority for relaying free or low-fee transactions (default:%u) @@ -3710,10 +3710,10 @@ https://www.transifex.com/projects/p/dash/ Этот продукт включает ПО, разработанное проектом OpenSSL Project для использования в OpenSSL Toolkit <https://www.openssl.org/>, криптографическое ПО, написанное Eric Young и ПО для работы с UPnP, написанное Thomas Bernard. - To use dashd, or the -server option to dash-qt, you must set an rpcpassword in the configuration file: + To use darknetd, or the -server option to darknet-qt, you must set an rpcpassword in the configuration file: %s It is recommended you use the following random password: -rpcuser=dashrpc +rpcuser=darknetrpc rpcpassword=%s (you do not need to remember this password) The username and password MUST NOT be the same. @@ -3721,10 +3721,10 @@ If the file does not exist, create it with owner-readable-only file permissions. It is also recommended to set alertnotify so you are notified of problems; for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - Для использования dashd или опции -server с dash-qt, вы должны установить опцию rpcpassword в конфигурационном файле: + Для использования darknetd или опции -server с darknet-qt, вы должны установить опцию rpcpassword в конфигурационном файле: %s Рекомендуется использовать следующий случайный пароль: -rpcuser=dashrpc +rpcuser=darknetrpc rpcpassword=%s (вам не нужно запоминать этот пароль) Имя и пароль ДОЛЖНЫ различаться. @@ -3734,7 +3734,7 @@ rpcpassword=%s - Unable to locate enough funds for this transaction that are not equal 1000 DASH. + Unable to locate enough funds for this transaction that are not equal 1000 DNET. Не удалось обнаружить достаточных для выполнения этой транзакции средств, отличающихся от 1000DRK. @@ -3758,8 +3758,8 @@ rpcpassword=%s Пиры, внесенные в белый список, не будут подвергаться DoS блокировкам и их транзакции будут ретранслироваться, даже если они уже есть в пуле памяти, что полезно, например, для работы в качестве шлюза - (9999 could be used only on mainnet) - (9999 можно использовать только в главной сети) + (51472 could be used only on mainnet) + (51472 можно использовать только в главной сети) (default: %s) @@ -3808,16 +3808,16 @@ rpcpassword=%s Не могу распознать сетевой адрес в значении %s параметра -rpcbind - Darksend is idle. - Darksend в режиме ожидания. + Obfuscate is idle. + Obfuscate в режиме ожидания. - Darksend request complete: - Запрос Darksend завершен: + Obfuscate request complete: + Запрос Obfuscate завершен: - Darksend request incomplete: - Запрос Darksend не завершен: + Obfuscate request incomplete: + Запрос Obfuscate не завершен: Disable safemode, override a real safe mode event (default: %u) @@ -3848,8 +3848,8 @@ rpcpassword=%s Ошибка: Обнаружен неподдерживаемый параметр -tor, используйте -onion вместо него. - Fee (in DASH/kB) to add to transactions you send (default: %s) - Комиссии (в DASH/kB), добавляемая к отправляемым Вами транзакциям (по умолчанию: %s) + Fee (in DNET/kB) to add to transactions you send (default: %s) + Комиссии (в DNET/kB), добавляемая к отправляемым Вами транзакциям (по умолчанию: %s) Finalizing transaction. @@ -3912,8 +3912,8 @@ rpcpassword=%s Вход некорректен. - InstantX options: - Параметры InstantX: + SwiftTX options: + Параметры SwiftTX: Insufficient funds. @@ -3948,8 +3948,8 @@ rpcpassword=%s Неверная сумма в параметре -paytxfee=<amount>: '%s' - Last successful Darksend action was too recent. - Последнее успешное действие Darksend было слишком недавно. + Last successful Obfuscate action was too recent. + Последнее успешное действие Obfuscate было слишком недавно. Limit size of signature cache to <n> entries (default: %u) @@ -4176,8 +4176,8 @@ rpcpassword=%s Неправильное значение masternodeprivkey. Пожалуйста, ознакомьтесь с документацией. - (must be 9999 for mainnet) - (должно быть 9999 в главной сети) + (must be51472 for mainnet) + (должно быть51472 в главной сети) Can't find random Masternode. @@ -4216,16 +4216,16 @@ rpcpassword=%s Ключ KeePassHttp для зашифрованной коммуникации с KeePass - Keep N DASH anonymized (default: %u) - Держать N DASH анонимизированными (по умолчанию: %u) + Keep N DNET anonymized (default: %u) + Держать N DNET анонимизированными (по умолчанию: %u) Keep at most <n> unconnectable transactions in memory (default: %u) Держать в памяти до <n> несвязных транзакций (по умолчанию: %u) - Last Darksend was too recent. - Последнее действие Darksend было слишком недавно. + Last Obfuscate was too recent. + Последнее действие Obfuscate было слишком недавно. Line: %d @@ -4476,8 +4476,8 @@ rpcpassword=%s Имя для подключений JSON-RPC - Value more than Darksend pool maximum allows. - Превышено значение допустимой для пула Darksend суммы. + Value more than Obfuscate pool maximum allows. + Превышено значение допустимой для пула Obfuscate суммы. Verifying blocks... diff --git a/src/qt/locale/dash_sk.ts b/src/qt/locale/darknet_sk.ts similarity index 93% rename from src/qt/locale/dash_sk.ts rename to src/qt/locale/darknet_sk.ts index 48ba8ef869de0..cdf00f0ff9035 100644 --- a/src/qt/locale/dash_sk.ts +++ b/src/qt/locale/darknet_sk.ts @@ -176,8 +176,8 @@ Potvrďte šifrovanie peňaženky - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DASH</b>! - Upozornenie: Ak zašifrujete vašu peňaženku a stratíte prístupové heslo, potom <b>prídete o všetky svoje DASH-y</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DNET</b>! + Upozornenie: Ak zašifrujete vašu peňaženku a stratíte prístupové heslo, potom <b>prídete o všetky svoje DNET-y</b>! Are you sure you wish to encrypt your wallet? @@ -188,7 +188,7 @@ Peňaženka zašifrovaná - Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dashs from being stolen by malware infecting your computer. + Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your darknets from being stolen by malware infecting your computer. DashCoin sa teraz ukončí, aby dokončil proces šifrovania. Nezabudnite, že zašifrovanie vašej peňaženky nemôže plne chrániť Vaše mince pred krádežou škodlivým softvérom, ktorý napadol váš počítač. @@ -263,7 +263,7 @@ &Prijať - Request payments (generates QR codes and dash: URIs) + Request payments (generates QR codes and darknet: URIs) Vyžiadať platby (vygeneruje QR kódy a Dash: URI) @@ -443,8 +443,8 @@ Otvoriť &URI... - Open a dash: URI or payment request - Otvoriť dash: URI alebo žiadosť o platbu + Open a darknet: URI or payment request + Otvoriť darknet: URI alebo žiadosť o platbu &Command-line options @@ -740,8 +740,8 @@ Adresa: %4 Kopírovať zmenu - Non-anonymized input selected. <b>Darksend will be disabled.</b><br><br>If you still want to use Darksend, please deselect all non-nonymized inputs first and then check Darksend checkbox again. - Vybratý ne-anonymizovaný vstup. <b>Darksend bude vypnutý.</b><br><br>Ak si stále želáte použiť Darksend, najskôr odznačte všetky e-anonymizované vstup a potom znova zaškrtnite Darksend začiarkavacie políčko. + Non-anonymized input selected. <b>Obfuscate will be disabled.</b><br><br>If you still want to use Obfuscate, please deselect all non-nonymized inputs first and then check Obfuscate checkbox again. + Vybratý ne-anonymizovaný vstup. <b>Obfuscate bude vypnutý.</b><br><br>Ak si stále želáte použiť Obfuscate, najskôr odznačte všetky e-anonymizované vstup a potom znova zaškrtnite Obfuscate začiarkavacie políčko. highest @@ -841,10 +841,10 @@ Adresa: %4 - DarksendConfig + ObfuscateConfig - Configure Darksend - Konfigurovať Darksend + Configure Obfuscate + Konfigurovať Obfuscate Basic Privacy @@ -863,48 +863,48 @@ Adresa: %4 Prosím vyberte úroveň súkromia. - Use 2 separate masternodes to mix funds up to 1000 DASH - Použiť 2 rozdielne masternode pre fixovanie prostriedkov až do 1000 DASH + Use 2 separate masternodes to mix funds up to 1000 DNET + Použiť 2 rozdielne masternode pre fixovanie prostriedkov až do 1000 DNET - Use 8 separate masternodes to mix funds up to 1000 DASH - Použiť 8 rozdielnych masternode pre fixovanie prostriedkov až do 1000 DASH + Use 8 separate masternodes to mix funds up to 1000 DNET + Použiť 8 rozdielnych masternode pre fixovanie prostriedkov až do 1000 DNET Use 16 separate masternodes Použiť 16 rozdielnych masternode - This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH - Táto možnosť je najrýchlejšia a bude stáť približne 0.025 DASH pre anonimizáciu 1000 DASH + This option is the quickest and will cost about ~0.025 DNET to anonymize 1000 DNET + Táto možnosť je najrýchlejšia a bude stáť približne 0.025 DNET pre anonimizáciu 1000 DNET - This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH - Táto možnosť je stredne rýchla bude stáť približne 0.05 DASH pre anonimizáciu 1000 DASH + This option is moderately fast and will cost about 0.05 DNET to anonymize 1000 DNET + Táto možnosť je stredne rýchla bude stáť približne 0.05 DNET pre anonimizáciu 1000 DNET - 0.1 DASH per 1000 DASH you anonymize. - 0.1 DASH za 1000 DASH ktoré spravíte anonymnými. + 0.1 DNET per 1000 DNET you anonymize. + 0.1 DNET za 1000 DNET ktoré spravíte anonymnými. This is the slowest and most secure option. Using maximum anonymity will cost Toto je najpomalšia a najviac bezpečná možnosť. Použitie maximálnej anonymity bude stáť - Darksend Configuration - Konfigurácia Darksend + Obfuscate Configuration + Konfigurácia Obfuscate - Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend bol úspešne nastavený na základnú hodnotu (%1 a 2 kolá). Toto nastavenie môžete kedykoľvek zmeniť otvorením konfiguračnej obrazovky Dash. + Obfuscate was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate bol úspešne nastavený na základnú hodnotu (%1 a 2 kolá). Toto nastavenie môžete kedykoľvek zmeniť otvorením konfiguračnej obrazovky Dash. - Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend bol úspešne nastavený na vysokú hodnotu (%1 a 8 kôl). Toto nastavenie môžete kedykoľvek zmeniť otvorením konfiguračnej obrazovky Dash. + Obfuscate was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate bol úspešne nastavený na vysokú hodnotu (%1 a 8 kôl). Toto nastavenie môžete kedykoľvek zmeniť otvorením konfiguračnej obrazovky Dash. - Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend bol úspešne nastavený na maximálnu hodnotu (%1 a 16 kôl). Toto nastavenie môžete kedykoľvek zmeniť otvorením konfiguračnej obrazovky Dash. + Obfuscate was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate bol úspešne nastavený na maximálnu hodnotu (%1 a 16 kôl). Toto nastavenie môžete kedykoľvek zmeniť otvorením konfiguračnej obrazovky Dash. @@ -1145,12 +1145,12 @@ Adresa: %4 (0 = auto, <0 = nechať toľko jadier voľných) - Darksend rounds to use - Použiť kôl Darksend + Obfuscate rounds to use + Použiť kôl Obfuscate - This amount acts as a threshold to turn off Darksend once it's reached. - Táto suma slúži ako hranica pre vypnutie Darksend akonáhle je dosiahnutá + This amount acts as a threshold to turn off Obfuscate once it's reached. + Táto suma slúži ako hranica pre vypnutie Obfuscate akonáhle je dosiahnutá Amount of Dash to keep anonymized @@ -1262,9 +1262,9 @@ Adresa: %4 Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ Chýbajúci alebo nekompletný preklad? Pomôžte nám tu: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ User Interface Theme: @@ -1422,16 +1422,16 @@ https://www.transifex.com/projects/p/dash/ Dokončenie: - Darksend Balance: - Bilancia Darksend: + Obfuscate Balance: + Bilancia Obfuscate: Amount and Rounds: Čiastka a kolá: - 0 DASH / 0 Rounds - 0 DASH / 0 Kôl + 0 DNET / 0 Rounds + 0 DNET / 0 Kôl Submitted Denom: @@ -1442,8 +1442,8 @@ https://www.transifex.com/projects/p/dash/ nie je k dispozícii - Darksend - Darksend + Obfuscate + Obfuscate Recent transactions @@ -1462,16 +1462,16 @@ https://www.transifex.com/projects/p/dash/ (Posledná správa) - Try to manually submit a Darksend request. - Skúsiť manuálne odoslať Darksend požiadavku. + Try to manually submit a Obfuscate request. + Skúsiť manuálne odoslať Obfuscate požiadavku. Try Mix Výskúšať mix - Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!) - Vynulovať súčasný stav Darksend (môže prerušiť Darksend ak je v procese miešania, čo Vás môže stáť peniaze!) + Reset the current status of Obfuscate (can interrupt Obfuscate if it's in the process of Mixing, which can cost you money!) + Vynulovať súčasný stav Obfuscate (môže prerušiť Obfuscate ak je v procese miešania, čo Vás môže stáť peniaze!) Reset @@ -1486,11 +1486,11 @@ https://www.transifex.com/projects/p/dash/ Vypnuté - Start Darksend Mixing + Start Obfuscate Mixing Začať Dasksend miešanie - Stop Darksend Mixing + Stop Obfuscate Mixing Zastaviť Dasksend miešanie @@ -1534,9 +1534,9 @@ https://www.transifex.com/projects/p/dash/ Povolené - Last Darksend message: + Last Obfuscate message: - Posledná Darksend správa: + Posledná Obfuscate správa: @@ -1544,20 +1544,20 @@ https://www.transifex.com/projects/p/dash/ nie je k dispozícii - Darksend was successfully reset. - Darksend bol úspešne obnovený + Obfuscate was successfully reset. + Obfuscate bol úspešne obnovený - If you don't want to see internal Darksend fees/transactions select "Most Common" as Type on the "Transactions" tab. - Ak nechcete vidieť interné Darksend poplatky/transakcie, vyberte "Najčastejšie" ako typ na záložke "Transakcie". + If you don't want to see internal Obfuscate fees/transactions select "Most Common" as Type on the "Transactions" tab. + Ak nechcete vidieť interné Obfuscate poplatky/transakcie, vyberte "Najčastejšie" ako typ na záložke "Transakcie". - Darksend requires at least %1 to use. - Pre použitie vyžaduje Darksend aspoň %1. + Obfuscate requires at least %1 to use. + Pre použitie vyžaduje Obfuscate aspoň %1. - Wallet is locked and user declined to unlock. Disabling Darksend. - Peňaženka je zamknutá a používateľ ju odmietol odomknúť. Vypínam Darksend. + Wallet is locked and user declined to unlock. Disabling Obfuscate. + Peňaženka je zamknutá a používateľ ju odmietol odomknúť. Vypínam Obfuscate. @@ -1567,7 +1567,7 @@ https://www.transifex.com/projects/p/dash/ Chyba pri vyžiadaní platby - Cannot start dash: click-to-pay handler + Cannot start darknet: click-to-pay handler Dash sa nedá spustiť: click-to-pay handler @@ -2291,7 +2291,7 @@ https://www.transifex.com/projects/p/dash/ Ak je vlastný poplatok nastavený na 1000 duffov a transakcia je len 250 bytov, v tom prípade "za kilobajt" zaplatí iba 250 duffov na poplatkoch, <br />zatiaľ čo "celkovo pri najmenšom" zaplatí 1000 duffov. Pre transakcie väčšie ako jeden kilobajt, obe zaplatia rovnako za kilobajt. - Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process. + Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for darknet transactions than the network can process. Platenie minimálneho poplatku je v poriadku pokiaľ je objem transakcií menší ako je miesto v bloku. <br />Buďte opatrný pretože to môže skončiť s nikdy nepotvrdenými transakciami, akonáhle je dopyt po Dash transakciách väčší ako dokáže sieť Dash spracovať. @@ -2363,12 +2363,12 @@ https://www.transifex.com/projects/p/dash/ &Pridať príjemcu - Darksend - Darksend + Obfuscate + Obfuscate - InstantX - InstantX + SwiftTX + SwiftTX Balance: @@ -2415,16 +2415,16 @@ https://www.transifex.com/projects/p/dash/ anonymne zdroje - (darksend requires this amount to be rounded up to the nearest %1). - (Darksend vyžaduje aby bola táto suma zaokrúhlená nahor k najbližšej %1). + (obfuscate requires this amount to be rounded up to the nearest %1). + (Obfuscate vyžaduje aby bola táto suma zaokrúhlená nahor k najbližšej %1). any available funds (not recommended) hociktoré dostupné zdroje (nedoporučuje sa) - and InstantX - a InstantX + and SwiftTX + a SwiftTX %1 to %2 @@ -2558,8 +2558,8 @@ https://www.transifex.com/projects/p/dash/ Správa: - A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. - Správa ktorá bola pripojená ku dash: URI ktorá sa uchová spolu s transakciou pre Vašu referenciu. Poznámka: Táto správa nebude poslaná cez sieť Dash. + A message that was attached to the darknet: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. + Správa ktorá bola pripojená ku darknet: URI ktorá sa uchová spolu s transakciou pre Vašu referenciu. Poznámka: Táto správa nebude poslaná cez sieť Dash. This is an unverified payment request. @@ -2777,16 +2777,16 @@ https://www.transifex.com/projects/p/dash/ sporné - %1/offline (verified via instantx) - %1/offline (overené pomocou instantx) + %1/offline (verified via swifttx) + %1/offline (overené pomocou swifttx) - %1/confirmed (verified via instantx) - %1/potvrdené (overené pomocou instantx) + %1/confirmed (verified via swifttx) + %1/potvrdené (overené pomocou swifttx) - %1 confirmations (verified via instantx) - %1 potvrdení (overené pomocou instantx) + %1 confirmations (verified via swifttx) + %1 potvrdení (overené pomocou swifttx) %1/offline @@ -2801,24 +2801,24 @@ https://www.transifex.com/projects/p/dash/ %1 potvrdení - %1/offline (InstantX verification in progress - %2 of %3 signatures) - %1/offline (Prebieha overovanie InstantX - %2 z %3 podpisov) + %1/offline (SwiftTX verification in progress - %2 of %3 signatures) + %1/offline (Prebieha overovanie SwiftTX - %2 z %3 podpisov) - %1/confirmed (InstantX verification in progress - %2 of %3 signatures ) - %1/potvrdené (Prebieha overovanie InstantX - %2 z %3 podpisov) + %1/confirmed (SwiftTX verification in progress - %2 of %3 signatures ) + %1/potvrdené (Prebieha overovanie SwiftTX - %2 z %3 podpisov) - %1 confirmations (InstantX verification in progress - %2 of %3 signatures) - %1 potvrdení (Prebieha overovanie InstantX - %2 z %3 podpisov) + %1 confirmations (SwiftTX verification in progress - %2 of %3 signatures) + %1 potvrdení (Prebieha overovanie SwiftTX - %2 z %3 podpisov) - %1/offline (InstantX verification failed) - %1/offline (Overovanie InstantX zlyhalo) + %1/offline (SwiftTX verification failed) + %1/offline (Overovanie SwiftTX zlyhalo) - %1/confirmed (InstantX verification failed) - %1/potvrdené (Overovanie InstantX zlyhalo) + %1/confirmed (SwiftTX verification failed) + %1/potvrdené (Overovanie SwiftTX zlyhalo) Status @@ -3019,8 +3019,8 @@ https://www.transifex.com/projects/p/dash/ Prijaté od: - Received via Darksend - Prijaté cez Darksend + Received via Obfuscate + Prijaté cez Obfuscate Sent to @@ -3035,20 +3035,20 @@ https://www.transifex.com/projects/p/dash/ Vyfárané - Darksend Denominate - Denominácia Darksend + Obfuscate Denominate + Denominácia Obfuscate - Darksend Collateral Payment - Zaisťovacia Darksend platba + Obfuscate Collateral Payment + Zaisťovacia Obfuscate platba - Darksend Make Collateral Inputs - Darksend uskutočnil zaisťovacie vstupy + Obfuscate Make Collateral Inputs + Obfuscate uskutočnil zaisťovacie vstupy - Darksend Create Denominations - Vytvoriť denominácie Darksend + Obfuscate Create Denominations + Vytvoriť denominácie Obfuscate Darksent @@ -3134,20 +3134,20 @@ https://www.transifex.com/projects/p/dash/ Darksent - Darksend Make Collateral Inputs - Darksend uskutočnil zaisťovacie vstupy + Obfuscate Make Collateral Inputs + Obfuscate uskutočnil zaisťovacie vstupy - Darksend Create Denominations - Vytvoriť denominácie Darksend + Obfuscate Create Denominations + Vytvoriť denominácie Obfuscate - Darksend Denominate - Denominácia Darksend + Obfuscate Denominate + Denominácia Obfuscate - Darksend Collateral Payment - Zaisťovacia Darksend platba + Obfuscate Collateral Payment + Zaisťovacia Obfuscate platba To yourself @@ -3275,8 +3275,8 @@ https://www.transifex.com/projects/p/dash/ Poslať Bitcoins - InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH. - InstantX zatiaľ nepodporuje posielanie takto vysokých čiastok. Transakcie sú limitované na %1 DASH. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 DNET. + SwiftTX zatiaľ nepodporuje posielanie takto vysokých čiastok. Transakcie sú limitované na %1 DNET. @@ -3319,7 +3319,7 @@ https://www.transifex.com/projects/p/dash/ - dash-core + darknet-core Bind to given address and always listen on it. Use [host]:port notation for IPv6 Spojiť s danou adresou a vždy na nej počúvať. Použite zápis [host]:port pre IPv6 @@ -3329,8 +3329,8 @@ https://www.transifex.com/projects/p/dash/ Nedá sa zamknúť dátový adresár %s. Dash Core už pravdepodobne beží. - Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. - Pre poslanie zdrojov používa Darksend presné sumy, potrebujete jednoducho anonymizovať viac mincí. + Obfuscate uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. + Pre poslanie zdrojov používa Obfuscate presné sumy, potrebujete jednoducho anonymizovať viac mincí. Enter regression test mode, which uses a special chain in which blocks can be solved instantly. @@ -3357,8 +3357,8 @@ https://www.transifex.com/projects/p/dash/ V tomto móde -genproclimit kontroluje počet blokov, ktoré sú vygenerované okamžite. - InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. - InstantX vyžaduje vstupy s aspoň 6 potvrdeniami, môžete počkať pár minút a skúsiť znova. + SwiftTX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. + SwiftTX vyžaduje vstupy s aspoň 6 potvrdeniami, môžete počkať pár minút a skúsiť znova. Name to construct url for KeePass entry that stores the wallet passphrase @@ -3385,12 +3385,12 @@ https://www.transifex.com/projects/p/dash/ Nedá sa viazať ku %s na tomto počítači. Dash Core už pravdepodobne beží. - Unable to locate enough Darksend denominated funds for this transaction. - Nedá sa nájsť dostatok denominácií Darksend pre túto transakciu. + Unable to locate enough Obfuscate denominated funds for this transaction. + Nedá sa nájsť dostatok denominácií Obfuscate pre túto transakciu. - Unable to locate enough Darksend non-denominated funds for this transaction that are not equal 1000 DASH. - Nedá sa nájsť dostatok ne-denominovaných Darksend zdrojov pre túto transakciu, ktoré nie sú rovné 1000 DASH. + Unable to locate enough Obfuscate non-denominated funds for this transaction that are not equal 1000 DNET. + Nedá sa nájsť dostatok ne-denominovaných Obfuscate zdrojov pre túto transakciu, ktoré nie sú rovné 1000 DNET. Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction. @@ -3489,8 +3489,8 @@ https://www.transifex.com/projects/p/dash/ Zistený poškodený blok databázy - Darksend options: - Možnosti Darksend: + Obfuscate options: + Možnosti Obfuscate: Debugging/Testing options: @@ -3561,8 +3561,8 @@ https://www.transifex.com/projects/p/dash/ Chyba: Peňaženka je zamknutá, transakcia sa nedá vytvoriť! - Error: You already have pending entries in the Darksend pool - Chyba: Už máte čakajúce položky vo fronte Darksend + Error: You already have pending entries in the Obfuscate pool + Chyba: Už máte čakajúce položky vo fronte Obfuscate Failed to listen on any port. Use -listen=0 if you want this. @@ -3613,32 +3613,32 @@ https://www.transifex.com/projects/p/dash/ Vymazať všetky transakcie z peňaženky a pri spustení znova získať z reťazca blokov iba tie získané pomocou -rescan - Disable all Dash specific functionality (Masternodes, Darksend, InstantX, Budgeting) (0-1, default: %u) - Vypnúť všetky funkcie špecifické pre Dash (Masternode, Darksend, InstantX, Rozpočty) (0-1, predvolené: %u) + Disable all Dash specific functionality (Masternodes, Obfuscate, SwiftTX, Budgeting) (0-1, default: %u) + Vypnúť všetky funkcie špecifické pre Dash (Masternode, Obfuscate, SwiftTX, Rozpočty) (0-1, predvolené: %u) Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>. Distribuované pod softvérovou licenciou MIT, viď sprievodný súbor COPYING alebo <http://www.opensource.org/licenses/mit-license.php>. - Enable instantx, show confirmations for locked transactions (bool, default: %s) - Zapnúť InstantX, ukázať potvrdenia pre zamknuté transakcie (bool, predvolené: %s) + Enable swifttx, show confirmations for locked transactions (bool, default: %s) + Zapnúť SwiftTX, ukázať potvrdenia pre zamknuté transakcie (bool, predvolené: %s) - Enable use of automated darksend for funds stored in this wallet (0-1, default: %u) - Povoliť používanie automatického darksend pre zdroje uložené v tejto peňaženke (0-1, predvolené: %u) + Enable use of automated obfuscate for funds stored in this wallet (0-1, default: %u) + Povoliť používanie automatického obfuscate pre zdroje uložené v tejto peňaženke (0-1, predvolené: %u) Error: Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported. Chyba: Nájdený nepodporovaný argument -socks. Nastavenie SOCKS verzie nie je už možné, podporované sú už iba proxy SOCKS5. - Fees (in DASH/Kb) smaller than this are considered zero fee for relaying (default: %s) - Poplatky (v DASH za Kb) menšie ako toto, sú považované za nulový poplatok pre prenos (predvolené: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for relaying (default: %s) + Poplatky (v DNET za Kb) menšie ako toto, sú považované za nulový poplatok pre prenos (predvolené: %s) - Fees (in DASH/Kb) smaller than this are considered zero fee for transaction creation (default: %s) - Poplatky (v DASH za Kb) menšie ako toto, sú považované za nulový transakčný poplatok (predvolené: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Poplatky (v DNET za Kb) menšie ako toto, sú považované za nulový transakčný poplatok (predvolené: %s) Flush database activity from memory pool to disk log every <n> megabytes (default: %u) @@ -3685,8 +3685,8 @@ https://www.transifex.com/projects/p/dash/ Výstupné ladiace informácie (predvolené: %u, dodanie <category> je voliteľné) - Provide liquidity to Darksend by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) - Poskytnúť likviditu pre Darksend nepravidelným miešaním mincí na kontinuálnej báze (0-100, predvolené: %u, 1=veľmi často, vysoké poplatky, 100=veľmi zriedkavo, malé poplatky) + Provide liquidity to Obfuscate by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) + Poskytnúť likviditu pre Obfuscate nepravidelným miešaním mincí na kontinuálnej báze (0-100, predvolené: %u, 1=veľmi často, vysoké poplatky, 100=veľmi zriedkavo, malé poplatky) Require high priority for relaying free or low-fee transactions (default:%u) @@ -3709,10 +3709,10 @@ https://www.transifex.com/projects/p/dash/ Tento produkt obsahuje softvér vyvinutý projektom OpenSSL pre použitie sady nástrojov OpenSSL <https://www.openssl.org/> a kryptografického softvéru napísaného Eric Young a UPnP softvér napísaný Thomas Bernard. - To use dashd, or the -server option to dash-qt, you must set an rpcpassword in the configuration file: + To use darknetd, or the -server option to darknet-qt, you must set an rpcpassword in the configuration file: %s It is recommended you use the following random password: -rpcuser=dashrpc +rpcuser=darknetrpc rpcpassword=%s (you do not need to remember this password) The username and password MUST NOT be the same. @@ -3720,10 +3720,10 @@ If the file does not exist, create it with owner-readable-only file permissions. It is also recommended to set alertnotify so you are notified of problems; for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - Pre použitie možnosti -server pre dash-qt, musíte nastaviť rpcpassword v konfiguračnom súbore: + Pre použitie možnosti -server pre darknet-qt, musíte nastaviť rpcpassword v konfiguračnom súbore: %s Doporučuje sa použiť nasledovné náhodné heslo: -rpcuser=dashrpc +rpcuser=darknetrpc rpcpassword=%s (toto heslo si nemusíte pamätať) Používateľské meno a heslo NEMÔŽU byť rovnaké. @@ -3733,8 +3733,8 @@ napríklad: alertnotify=echo %%s | mail -s "Dash Upozornenie" admin@foo.com - Unable to locate enough funds for this transaction that are not equal 1000 DASH. - Nenašiel sa dostatok prostriedkov pre túto transakciu, ktorú nie sú rovné 1000 DASH. + Unable to locate enough funds for this transaction that are not equal 1000 DNET. + Nenašiel sa dostatok prostriedkov pre túto transakciu, ktorú nie sú rovné 1000 DNET. Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s) @@ -3757,8 +3757,8 @@ napríklad: alertnotify=echo %%s | mail -s "Dash Upozornenie" admin@foo.com Uzle na zoznam povolených nemôžu byť DoS zakázané a ich transakcie vždy postúpené ďalej, aj v prípade, ak sú už pamäťovej fronte. Užitočné napr. pre brány - (9999 could be used only on mainnet) - (9999 nemôže byť použité pre hlavnú sieť) + (51472 could be used only on mainnet) + (51472 nemôže byť použité pre hlavnú sieť) (default: %s) @@ -3807,16 +3807,16 @@ napríklad: alertnotify=echo %%s | mail -s "Dash Upozornenie" admin@foo.com Nedá sa analyzovať -rpcbind hodnota %s ako sieťová adresa - Darksend is idle. - Darksend je nečinný. + Obfuscate is idle. + Obfuscate je nečinný. - Darksend request complete: - Darksend požiadavok dokončený: + Obfuscate request complete: + Obfuscate požiadavok dokončený: - Darksend request incomplete: - Darksend požiadavok nedokončený: + Obfuscate request incomplete: + Obfuscate požiadavok nedokončený: Disable safemode, override a real safe mode event (default: %u) @@ -3847,8 +3847,8 @@ napríklad: alertnotify=echo %%s | mail -s "Dash Upozornenie" admin@foo.com Chyba: nájdený nepodporovaný argument -tor, použite -onion. - Fee (in DASH/kB) to add to transactions you send (default: %s) - Pridať poplatok (v DASH za kB) do transakcií ktoré posielate (predvolené: %s) + Fee (in DNET/kB) to add to transactions you send (default: %s) + Pridať poplatok (v DNET za kB) do transakcií ktoré posielate (predvolené: %s) Finalizing transaction. @@ -3911,8 +3911,8 @@ napríklad: alertnotify=echo %%s | mail -s "Dash Upozornenie" admin@foo.com Vstup nie je platný. - InstantX options: - Možnosti InstantX: + SwiftTX options: + Možnosti SwiftTX: Insufficient funds. @@ -3947,7 +3947,7 @@ napríklad: alertnotify=echo %%s | mail -s "Dash Upozornenie" admin@foo.com Neplatná suma pre -paytxfee=<amount>: '%s' - Last successful Darksend action was too recent. + Last successful Obfuscate action was too recent. Posledná Dasksend akcia bola pred chvíľou. @@ -4175,7 +4175,7 @@ napríklad: alertnotify=echo %%s | mail -s "Dash Upozornenie" admin@foo.com Neplatný masternodeprivkey. Prosím pozrite do dokumentácie. - (must be 9999 for mainnet) + (must be51472 for mainnet) (pre hlavnú sieť musí byť 9999) @@ -4215,15 +4215,15 @@ napríklad: alertnotify=echo %%s | mail -s "Dash Upozornenie" admin@foo.com Kľúč KeePassHttp pre šifrovanú AES komunikáciu s KeePass - Keep N DASH anonymized (default: %u) - Udržiavať N DASH anonymizovaných (predvolené: %u) + Keep N DNET anonymized (default: %u) + Udržiavať N DNET anonymizovaných (predvolené: %u) Keep at most <n> unconnectable transactions in memory (default: %u) V pamäti udržiavať najviac <n> nepotvrdených transakcií (predvolené: %u) - Last Darksend was too recent. + Last Obfuscate was too recent. Posledný Dasksend bol pred chvíľou. @@ -4475,8 +4475,8 @@ napríklad: alertnotify=echo %%s | mail -s "Dash Upozornenie" admin@foo.com Užívateľské meno pre JSON-RPC spojenia - Value more than Darksend pool maximum allows. - Väčšia hodnota ako dovoľuje fronta Darksend. + Value more than Obfuscate pool maximum allows. + Väčšia hodnota ako dovoľuje fronta Obfuscate. Verifying blocks... diff --git a/src/qt/locale/dash_sv.ts b/src/qt/locale/darknet_sv.ts similarity index 93% rename from src/qt/locale/dash_sv.ts rename to src/qt/locale/darknet_sv.ts index cdbd2ad6179c7..9994c71098a0d 100644 --- a/src/qt/locale/dash_sv.ts +++ b/src/qt/locale/darknet_sv.ts @@ -164,8 +164,8 @@ Bekräfta plånbokskryptering - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DASH</b>! - Varning: Om du krypterar din plånbok och förlorar din lösenfras kommer du att <b>FÖRLORA ALLA DINA DASH</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DNET</b>! + Varning: Om du krypterar din plånbok och förlorar din lösenfras kommer du att <b>FÖRLORA ALLA DINA DNET</b>! Are you sure you wish to encrypt your wallet? @@ -176,7 +176,7 @@ Plånbok krypterad - Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dashs from being stolen by malware infecting your computer. + Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your darknets from being stolen by malware infecting your computer. Dash kommer nu att färdigställa krypteringsprocessen. Kom ihåg att krypteringen av din plånbok inte kan skydda dig helt och hållet från att dina Dash stjäls av skadeprogram som har infekterat din dator. @@ -252,7 +252,7 @@ &Motta - Request payments (generates QR codes and dash: URIs) + Request payments (generates QR codes and darknet: URIs) Begär betalningar (genererar QR-koder och Dash:-URI:s) @@ -404,7 +404,7 @@ Öppna &URI... - Open a dash: URI or payment request + Open a darknet: URI or payment request Öppna en Dash-URI eller betalningsbegäran @@ -736,10 +736,10 @@ Adress: %4 - DarksendConfig + ObfuscateConfig - Configure Darksend - Konfigurera Darksend + Configure Obfuscate + Konfigurera Obfuscate Basic Privacy @@ -758,48 +758,48 @@ Adress: %4 Vänligen välj en integritetsnivå. - Use 2 separate masternodes to mix funds up to 1000 DASH - Använd 2 enskilda masternoder för att mixa medel upp till 1000 DASH + Use 2 separate masternodes to mix funds up to 1000 DNET + Använd 2 enskilda masternoder för att mixa medel upp till 1000 DNET - Use 8 separate masternodes to mix funds up to 1000 DASH - Använd 8 enskilda masternoder för att mixa medel upp till 1000 DASH. + Use 8 separate masternodes to mix funds up to 1000 DNET + Använd 8 enskilda masternoder för att mixa medel upp till 1000 DNET. Use 16 separate masternodes Använd 16 enskilda masternoder - This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH - Detta alternativ är det snabbaste och kommer att kosta omkring ~0,025 DASH för att anonymisera 1000 DASH + This option is the quickest and will cost about ~0.025 DNET to anonymize 1000 DNET + Detta alternativ är det snabbaste och kommer att kosta omkring ~0,025 DNET för att anonymisera 1000 DNET - This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH - Detta alternativ är relativt snabbt och kommer att kosta omkring 0,05 DASH för att anonymisera 1000 DASH + This option is moderately fast and will cost about 0.05 DNET to anonymize 1000 DNET + Detta alternativ är relativt snabbt och kommer att kosta omkring 0,05 DNET för att anonymisera 1000 DNET - 0.1 DASH per 1000 DASH you anonymize. - 0,1 DASH per 1000 DASH du anonymiserar. + 0.1 DNET per 1000 DNET you anonymize. + 0,1 DNET per 1000 DNET du anonymiserar. This is the slowest and most secure option. Using maximum anonymity will cost Detta är det långsammaste och det säkraste alternativet. Användning av maximal anonymitet kommer att kosta - Darksend Configuration - Darksend-konfiguration + Obfuscate Configuration + Obfuscate-konfiguration - Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend ställdes framgångsrikt om till grundläggande (%1 och 2 omgångar). Du kan ändra detta när som helst genom att öppna Dash:s konfigurationsskärm. + Obfuscate was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate ställdes framgångsrikt om till grundläggande (%1 och 2 omgångar). Du kan ändra detta när som helst genom att öppna Dash:s konfigurationsskärm. - Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend ställdes framgångsrikt in på hög (%1 och 8 omgångar). Du kan ändra detta när som helst genom att öppna Dash:s konfigurationsskärm. + Obfuscate was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate ställdes framgångsrikt in på hög (%1 och 8 omgångar). Du kan ändra detta när som helst genom att öppna Dash:s konfigurationsskärm. - Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend ställdes framgångsrikt in på maximal (%1 och 16 omgångar). Du kan ändra detta när som helst genom att öppna Dash:s konfigurationsskärm + Obfuscate was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate ställdes framgångsrikt in på maximal (%1 och 16 omgångar). Du kan ändra detta när som helst genom att öppna Dash:s konfigurationsskärm @@ -1013,12 +1013,12 @@ Adress: %4 (0 = auto, <0 = lämna så många kärnor lediga) - Darksend rounds to use - Darksend-omgångar att använda + Obfuscate rounds to use + Obfuscate-omgångar att använda - This amount acts as a threshold to turn off Darksend once it's reached. - Denna mängd fungerar som en tröskel att stänga av Darksend då det har uppnåtts. + This amount acts as a threshold to turn off Obfuscate once it's reached. + Denna mängd fungerar som en tröskel att stänga av Obfuscate då det har uppnåtts. Amount of Dash to keep anonymized @@ -1106,9 +1106,9 @@ Adress: %4 Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ Fattas språk eller är det en ofullständig översättning? Hjälp till att bidra med översättningar här: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ &Unit to show amounts in: @@ -1230,16 +1230,16 @@ https://www.transifex.com/projects/p/dash/ Förlopp: - Darksend Balance: - Darksend-medel: + Obfuscate Balance: + Obfuscate-medel: Amount and Rounds: Mängd och omgångar: - 0 DASH / 0 Rounds - 0 DASH/0 omgångar + 0 DNET / 0 Rounds + 0 DNET/0 omgångar Submitted Denom: @@ -1250,8 +1250,8 @@ https://www.transifex.com/projects/p/dash/ E/t - Darksend - Darksend + Obfuscate + Obfuscate Start/Stop Mixing @@ -1262,16 +1262,16 @@ https://www.transifex.com/projects/p/dash/ (Senaste meddelande) - Try to manually submit a Darksend request. - Försök att lämna in en Darksend-begäran manuellt. + Try to manually submit a Obfuscate request. + Försök att lämna in en Obfuscate-begäran manuellt. Try Mix Försök att mixa - Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!) - Återställ den nuvarande Darksend-statusen (kan störa Darksend om den håller på att mixa vilket kan kosta dig pengar!) + Reset the current status of Obfuscate (can interrupt Obfuscate if it's in the process of Mixing, which can cost you money!) + Återställ den nuvarande Obfuscate-statusen (kan störa Obfuscate om den håller på att mixa vilket kan kosta dig pengar!) Reset @@ -1286,12 +1286,12 @@ https://www.transifex.com/projects/p/dash/ Inaktiverad - Start Darksend Mixing - Påbörja Darksend-mixning + Start Obfuscate Mixing + Påbörja Obfuscate-mixning - Stop Darksend Mixing - Stoppa Darksend-mixning + Stop Obfuscate Mixing + Stoppa Obfuscate-mixning No inputs detected @@ -1302,9 +1302,9 @@ https://www.transifex.com/projects/p/dash/ Aktiverad - Last Darksend message: + Last Obfuscate message: - Senaste Darksend-meddelande: + Senaste Obfuscate-meddelande: @@ -1316,16 +1316,16 @@ https://www.transifex.com/projects/p/dash/ E/t - Darksend was successfully reset. - Darksend återställdes framgångsrikt. + Obfuscate was successfully reset. + Obfuscate återställdes framgångsrikt. - Darksend requires at least %1 to use. - Darksend kräver åtminstone %1 att använda. + Obfuscate requires at least %1 to use. + Obfuscate kräver åtminstone %1 att använda. - Wallet is locked and user declined to unlock. Disabling Darksend. - Plånboken är låst och användaren avböjde upplåsning. Inaktiverar Darksend. + Wallet is locked and user declined to unlock. Disabling Obfuscate. + Plånboken är låst och användaren avböjde upplåsning. Inaktiverar Obfuscate. @@ -1335,8 +1335,8 @@ https://www.transifex.com/projects/p/dash/ Fel vid betalningsbegäran - Cannot start dash: click-to-pay handler - Kan inte starta dash: klicka-för-att-betala hanterare + Cannot start darknet: click-to-pay handler + Kan inte starta darknet: klicka-för-att-betala hanterare URI handling @@ -1791,12 +1791,12 @@ https://www.transifex.com/projects/p/dash/ Lägg till &mottagare - Darksend - Darksend + Obfuscate + Obfuscate - InstantX - InstantX + SwiftTX + SwiftTX Balance: @@ -1839,16 +1839,16 @@ https://www.transifex.com/projects/p/dash/ anonyma medel - (darksend requires this amount to be rounded up to the nearest %1). - (darksend kräver att denna mängd avrundas uppåt till närmaste %1) + (obfuscate requires this amount to be rounded up to the nearest %1). + (obfuscate kräver att denna mängd avrundas uppåt till närmaste %1) any available funds (not recommended) vilka tillgängliga medel som helst (rekommenderas inte) - and InstantX - och InstantX + and SwiftTX + och SwiftTX %1 to %2 @@ -1958,7 +1958,7 @@ https://www.transifex.com/projects/p/dash/ Meddelande: - A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. + A message that was attached to the darknet: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. Ett meddelande som bifogades till Dash: URI vilket kommer att lagras med transaktionen så att du vet. Observera: Meddelandet kommer inte att skickas över Dash-nätverket. @@ -2166,16 +2166,16 @@ https://www.transifex.com/projects/p/dash/ konflikterad - %1/offline (verified via instantx) - %1/offline (bekräftad genom instantx) + %1/offline (verified via swifttx) + %1/offline (bekräftad genom swifttx) - %1/confirmed (verified via instantx) - %1/bekräftad (bekräftad genom instantx) + %1/confirmed (verified via swifttx) + %1/bekräftad (bekräftad genom swifttx) - %1 confirmations (verified via instantx) - %1/bekräftelser (bekräftad genom instantx) + %1 confirmations (verified via swifttx) + %1/bekräftelser (bekräftad genom swifttx) %1/offline @@ -2190,24 +2190,24 @@ https://www.transifex.com/projects/p/dash/ %1 bekräftelser - %1/offline (InstantX verification in progress - %2 of %3 signatures) - %1/offline (InstantX-bekräftelse under behandling - %2 av %3 signaturer) + %1/offline (SwiftTX verification in progress - %2 of %3 signatures) + %1/offline (SwiftTX-bekräftelse under behandling - %2 av %3 signaturer) - %1/confirmed (InstantX verification in progress - %2 of %3 signatures ) - %1/bekräftad (InstantX-bekräftelse under behandling - %2 av %3 signaturer) + %1/confirmed (SwiftTX verification in progress - %2 of %3 signatures ) + %1/bekräftad (SwiftTX-bekräftelse under behandling - %2 av %3 signaturer) - %1 confirmations (InstantX verification in progress - %2 of %3 signatures) - %1 bekräftelser (InstantX-bekräftelse under behandling - %2 av %3 signaturer) + %1 confirmations (SwiftTX verification in progress - %2 of %3 signatures) + %1 bekräftelser (SwiftTX-bekräftelse under behandling - %2 av %3 signaturer) - %1/offline (InstantX verification failed) - %1/offline (InstantX-bekräftelse misslyckades) + %1/offline (SwiftTX verification failed) + %1/offline (SwiftTX-bekräftelse misslyckades) - %1/confirmed (InstantX verification failed) - %1/bekräftad (InstantX-bekräftelse misslyckades) + %1/confirmed (SwiftTX verification failed) + %1/bekräftad (SwiftTX-bekräftelse misslyckades) Status @@ -2384,8 +2384,8 @@ https://www.transifex.com/projects/p/dash/ Mottagen från - Received via Darksend - Mottagen genom Darksend + Received via Obfuscate + Mottagen genom Obfuscate Sent to @@ -2400,20 +2400,20 @@ https://www.transifex.com/projects/p/dash/ Utvunnen - Darksend Denominate - Darksend-denomination + Obfuscate Denominate + Obfuscate-denomination - Darksend Collateral Payment + Obfuscate Collateral Payment Darskends-säkerhetsbetalning - Darksend Make Collateral Inputs - Darksend-skapa säkerhetsinmatningar + Obfuscate Make Collateral Inputs + Obfuscate-skapa säkerhetsinmatningar - Darksend Create Denominations - Darksend-skapa denominationer + Obfuscate Create Denominations + Obfuscate-skapa denominationer Darksent @@ -2487,19 +2487,19 @@ https://www.transifex.com/projects/p/dash/ Darksent-(skickat) - Darksend Make Collateral Inputs - Darksend-skapa säkerhetsinmatningar + Obfuscate Make Collateral Inputs + Obfuscate-skapa säkerhetsinmatningar - Darksend Create Denominations - Darksend-skapa denominationer + Obfuscate Create Denominations + Obfuscate-skapa denominationer - Darksend Denominate - Darksend-denomination + Obfuscate Denominate + Obfuscate-denomination - Darksend Collateral Payment + Obfuscate Collateral Payment Darskends-säkerhetsbetalning @@ -2656,7 +2656,7 @@ https://www.transifex.com/projects/p/dash/ - dash-core + darknet-core Bind to given address and always listen on it. Use [host]:port notation for IPv6 Sammanbind till fastställd adress och avlyssna alltid den. Använd [host]:port-notation för IPv6 @@ -2666,8 +2666,8 @@ https://www.transifex.com/projects/p/dash/ Kan inte erhålla ett lås på datakatalog %s. Dash Core körs förmodligen redan. - Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. - Darksend använder exakta denominationsmängder för att skicka medel, du kanske måste anonymisera fler mynt. + Obfuscate uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. + Obfuscate använder exakta denominationsmängder för att skicka medel, du kanske måste anonymisera fler mynt. Enter regression test mode, which uses a special chain in which blocks can be solved instantly. @@ -2694,8 +2694,8 @@ https://www.transifex.com/projects/p/dash/ I detta läge kontrollerar -genproclimit hur många block som genereras omedelbart. - InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. - InstantX kräver indatan med åtminstone 6 bekräftelser. Du kanske måste vänta ett par minuter och försöka igen. + SwiftTX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. + SwiftTX kräver indatan med åtminstone 6 bekräftelser. Du kanske måste vänta ett par minuter och försöka igen. Name to construct url for KeePass entry that stores the wallet passphrase @@ -2722,12 +2722,12 @@ https://www.transifex.com/projects/p/dash/ Det går inte att binda till %s till denna dator. Dash Core körs förmodligen redan. - Unable to locate enough Darksend denominated funds for this transaction. - Kunde inte hitta tillräckliga Darksend-denominationsmedel för denna transaktion. + Unable to locate enough Obfuscate denominated funds for this transaction. + Kunde inte hitta tillräckliga Obfuscate-denominationsmedel för denna transaktion. - Unable to locate enough Darksend non-denominated funds for this transaction that are not equal 1000 DASH. - Kunde inte hitta tillräckliga Darksend-icke-denominationsmedel för denna transaktion som inte är likvärdiga 1000 DASH. + Unable to locate enough Obfuscate non-denominated funds for this transaction that are not equal 1000 DNET. + Kunde inte hitta tillräckliga Obfuscate-icke-denominationsmedel för denna transaktion som inte är likvärdiga 1000 DNET. Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction. @@ -2826,8 +2826,8 @@ https://www.transifex.com/projects/p/dash/ Korrumperad blockdatabas upptäcktes - Darksend options: - Darksend-alternativ: + Obfuscate options: + Obfuscate-alternativ: Debugging/Testing options: @@ -2898,8 +2898,8 @@ https://www.transifex.com/projects/p/dash/ Fel: Plånbok låst, kan inte skapa en transaktion! - Error: You already have pending entries in the Darksend pool - Fel: Du har redan väntande inmatningar i Darksend-poolen + Error: You already have pending entries in the Obfuscate pool + Fel: Du har redan väntande inmatningar i Obfuscate-poolen Failed to listen on any port. Use -listen=0 if you want this. @@ -2950,8 +2950,8 @@ https://www.transifex.com/projects/p/dash/ Indata är inte giltig. - InstantX options: - InstantX-alternativ: + SwiftTX options: + SwiftTX-alternativ: Insufficient funds. @@ -3002,8 +3002,8 @@ https://www.transifex.com/projects/p/dash/ Bibehåll som mest <n> icke-anslutningsbara transaktioner i minnet (standardvärde: %u) - Last Darksend was too recent. - Senaste Darksend gjordes för inte alltför länge sedan. + Last Obfuscate was too recent. + Senaste Obfuscate gjordes för inte alltför länge sedan. Loading addresses... @@ -3206,8 +3206,8 @@ https://www.transifex.com/projects/p/dash/ Användarnamn för JSON-RPC-anslutningar - Value more than Darksend pool maximum allows. - Värdera mer än vad Darksends poolmaximum tillåter. + Value more than Obfuscate pool maximum allows. + Värdera mer än vad Obfuscates poolmaximum tillåter. Verifying blocks... diff --git a/src/qt/locale/dash_vi.ts b/src/qt/locale/darknet_vi.ts similarity index 93% rename from src/qt/locale/dash_vi.ts rename to src/qt/locale/darknet_vi.ts index f01324ba33b75..d11a702d423fe 100644 --- a/src/qt/locale/dash_vi.ts +++ b/src/qt/locale/darknet_vi.ts @@ -176,8 +176,8 @@ Xác nhận mã hoá ví - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DASH</b>! - Chú ý: Nếu bạn mã hoá ví và mất mật khẩu, bạn sẽ <b>MẤT TẤT CẢ DASH CỦA BẠN</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DNET</b>! + Chú ý: Nếu bạn mã hoá ví và mất mật khẩu, bạn sẽ <b>MẤT TẤT CẢ DNET CỦA BẠN</b>! Are you sure you wish to encrypt your wallet? @@ -188,8 +188,8 @@ Ví đã được mã hoá. - Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dashs from being stolen by malware infecting your computer. - Dash sẽ được đóng lại bây giờ để hoàn thành tiến trình mã hoá. Hãy nhớ rằng mã hoá ví của bạn không thể hoàn toàn bảo vệ dash khỏi bị trộm bởi những mã độc lây nhiễm vào máy tính của bạn. + Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your darknets from being stolen by malware infecting your computer. + Dash sẽ được đóng lại bây giờ để hoàn thành tiến trình mã hoá. Hãy nhớ rằng mã hoá ví của bạn không thể hoàn toàn bảo vệ darknet khỏi bị trộm bởi những mã độc lây nhiễm vào máy tính của bạn. IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet. @@ -263,8 +263,8 @@ &Nhận - Request payments (generates QR codes and dash: URIs) - Yêu cầu thanh toán (sinh mã QR và dash: URIs) + Request payments (generates QR codes and darknet: URIs) + Yêu cầu thanh toán (sinh mã QR và darknet: URIs) &Transactions @@ -443,8 +443,8 @@ Mở &URI... - Open a dash: URI or payment request - Mở một dash: URI hoặc một yêu cầu thanh toán + Open a darknet: URI or payment request + Mở một darknet: URI hoặc một yêu cầu thanh toán &Command-line options @@ -741,8 +741,8 @@ Kiểu: %3 Sao chép tiền trả lại - Non-anonymized input selected. <b>Darksend will be disabled.</b><br><br>If you still want to use Darksend, please deselect all non-nonymized inputs first and then check Darksend checkbox again. - Đầu vào không ẩn danh được chọn. <b>Darksend sẽ bị tắt.</b><br><br>Nếu bạn vẫn muốn sử dụng Darksend, hãy bỏ chọn tata cả các đầu vào không ẩn danh trước và đánh dấu vào hộp Darksend lần nữa. + Non-anonymized input selected. <b>Obfuscate will be disabled.</b><br><br>If you still want to use Obfuscate, please deselect all non-nonymized inputs first and then check Obfuscate checkbox again. + Đầu vào không ẩn danh được chọn. <b>Obfuscate sẽ bị tắt.</b><br><br>Nếu bạn vẫn muốn sử dụng Obfuscate, hãy bỏ chọn tata cả các đầu vào không ẩn danh trước và đánh dấu vào hộp Obfuscate lần nữa. highest @@ -842,10 +842,10 @@ Kiểu: %3 - DarksendConfig + ObfuscateConfig - Configure Darksend - Cấu hình Darksend + Configure Obfuscate + Cấu hình Obfuscate Basic Privacy @@ -864,48 +864,48 @@ Kiểu: %3 Hãy chọn mức độ riêng tư. - Use 2 separate masternodes to mix funds up to 1000 DASH - Sử dụng 2 masternode khác nhau để trộn số tiền lên đến 1000 DASH + Use 2 separate masternodes to mix funds up to 1000 DNET + Sử dụng 2 masternode khác nhau để trộn số tiền lên đến 1000 DNET - Use 8 separate masternodes to mix funds up to 1000 DASH - Sử dụng 8 masternode khác nhau để trộn số tiền lên đến 1000 DASH + Use 8 separate masternodes to mix funds up to 1000 DNET + Sử dụng 8 masternode khác nhau để trộn số tiền lên đến 1000 DNET Use 16 separate masternodes Sử dụng 16 masternode khác nhau - This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH - Tuỳ chọn này là nhanh nhất và sẽ mất chi phí khoảng ~0.025 DASH để ẩn danh 1000 DASH + This option is the quickest and will cost about ~0.025 DNET to anonymize 1000 DNET + Tuỳ chọn này là nhanh nhất và sẽ mất chi phí khoảng ~0.025 DNET để ẩn danh 1000 DNET - This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH - Tuỳ chọn này là tương đối nhanh và sẽ mất chi phí khoảng ~0.05 DASH để ẩn danh 1000 DASH + This option is moderately fast and will cost about 0.05 DNET to anonymize 1000 DNET + Tuỳ chọn này là tương đối nhanh và sẽ mất chi phí khoảng ~0.05 DNET để ẩn danh 1000 DNET - 0.1 DASH per 1000 DASH you anonymize. - 0.1 DASH cho mỗi 1000 DASH bạn muốn ẩn danh. + 0.1 DNET per 1000 DNET you anonymize. + 0.1 DNET cho mỗi 1000 DNET bạn muốn ẩn danh. This is the slowest and most secure option. Using maximum anonymity will cost Đây là tuỳ chọn chậm nhất và an toàn nhất. Sử dụng mức vô danh cao nhất sẽ tốn kém - Darksend Configuration - Cấu hình Darksend + Obfuscate Configuration + Cấu hình Obfuscate - Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend được thiết lập thành công về mức cơ bản (%1 và 2 vòng). Bạn có thể thay đổi nó bất cứ thời gian nào bằng cách mở màn hình cấu hình Dash. + Obfuscate was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate được thiết lập thành công về mức cơ bản (%1 và 2 vòng). Bạn có thể thay đổi nó bất cứ thời gian nào bằng cách mở màn hình cấu hình Dash. - Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend được thiết lập thành công về mức cao (%1 và 8 vòng). Bạn có thể thay đổi nó bất cứ thời gian nào bằng cách mở màn hình cấu hình Dash. + Obfuscate was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate được thiết lập thành công về mức cao (%1 và 8 vòng). Bạn có thể thay đổi nó bất cứ thời gian nào bằng cách mở màn hình cấu hình Dash. - Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. - Darksend được thiết lập thành công về mức tối đa (%1 và 16 vòng). Bạn có thể thay đổi nó bất cứ thời gian nào bằng cách mở màn hình cấu hình Dash. + Obfuscate was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate được thiết lập thành công về mức tối đa (%1 và 16 vòng). Bạn có thể thay đổi nó bất cứ thời gian nào bằng cách mở màn hình cấu hình Dash. @@ -1146,12 +1146,12 @@ Kiểu: %3 (0 = tự động, <0 = để đó rất nhiều lõi miễn phí) - Darksend rounds to use - Số vòng Darksend sử dụng + Obfuscate rounds to use + Số vòng Obfuscate sử dụng - This amount acts as a threshold to turn off Darksend once it's reached. - Số lượng này hoạt động như là một ngưỡng để tắt Darksend một khi nó đạt đến. + This amount acts as a threshold to turn off Obfuscate once it's reached. + Số lượng này hoạt động như là một ngưỡng để tắt Obfuscate một khi nó đạt đến. Amount of Dash to keep anonymized @@ -1263,9 +1263,9 @@ Kiểu: %3 Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ Ngôn ngữ ị thiếu hoặc việc dịch chưa hoàn tất? Tham gia dịch giúp tại đây: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ User Interface Theme: @@ -1423,16 +1423,16 @@ https://www.transifex.com/projects/p/dash/ Hoàn thành: - Darksend Balance: - Số dư cho Darksend: + Obfuscate Balance: + Số dư cho Obfuscate: Amount and Rounds: Số tiền và số vòng: - 0 DASH / 0 Rounds - 0 DASH / 0 Vòng + 0 DNET / 0 Rounds + 0 DNET / 0 Vòng Submitted Denom: @@ -1443,8 +1443,8 @@ https://www.transifex.com/projects/p/dash/ không áp dụng - Darksend - Darksend + Obfuscate + Obfuscate Recent transactions @@ -1463,16 +1463,16 @@ https://www.transifex.com/projects/p/dash/ (Thông điệp cuối) - Try to manually submit a Darksend request. - Thử gửi yêu cầu Darksend bằng tay. + Try to manually submit a Obfuscate request. + Thử gửi yêu cầu Obfuscate bằng tay. Try Mix Thử Trộn - Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!) - Tái lập lại trạng thái hiện tại của Darksend (có thể gián đoạn Darksend nếu nó đang trong quá trình trộn, điều đó có thể làm bạn bị mất tiền!) + Reset the current status of Obfuscate (can interrupt Obfuscate if it's in the process of Mixing, which can cost you money!) + Tái lập lại trạng thái hiện tại của Obfuscate (có thể gián đoạn Obfuscate nếu nó đang trong quá trình trộn, điều đó có thể làm bạn bị mất tiền!) Reset @@ -1487,12 +1487,12 @@ https://www.transifex.com/projects/p/dash/ Đã tắt - Start Darksend Mixing - Bắt đầu trộn Darksend + Start Obfuscate Mixing + Bắt đầu trộn Obfuscate - Stop Darksend Mixing - Tắt trộn Darksend + Stop Obfuscate Mixing + Tắt trộn Obfuscate No inputs detected @@ -1535,9 +1535,9 @@ https://www.transifex.com/projects/p/dash/ Đã bật - Last Darksend message: + Last Obfuscate message: - Thông điệp Darksend cuối cùng: + Thông điệp Obfuscate cuối cùng: @@ -1545,20 +1545,20 @@ https://www.transifex.com/projects/p/dash/ Không áp dụng - Darksend was successfully reset. - Darksend vừa được tái lập thành công. + Obfuscate was successfully reset. + Obfuscate vừa được tái lập thành công. - If you don't want to see internal Darksend fees/transactions select "Most Common" as Type on the "Transactions" tab. - Nếu bạn không muốn thấy các thông tin bên trong về Darksend phí/giao dịch thì hãy chọn "Thông dụng nhất" làm Kiểu trong trang "Giao dịch". + If you don't want to see internal Obfuscate fees/transactions select "Most Common" as Type on the "Transactions" tab. + Nếu bạn không muốn thấy các thông tin bên trong về Obfuscate phí/giao dịch thì hãy chọn "Thông dụng nhất" làm Kiểu trong trang "Giao dịch". - Darksend requires at least %1 to use. - Darksend cần ít nhất %1 để sử dụng. + Obfuscate requires at least %1 to use. + Obfuscate cần ít nhất %1 để sử dụng. - Wallet is locked and user declined to unlock. Disabling Darksend. - Ví đã được khoá và người dùng từ chối mở khoá. Đang tắt Darksend. + Wallet is locked and user declined to unlock. Disabling Obfuscate. + Ví đã được khoá và người dùng từ chối mở khoá. Đang tắt Obfuscate. @@ -1568,8 +1568,8 @@ https://www.transifex.com/projects/p/dash/ Yêu cầu thanh toán bị lỗi - Cannot start dash: click-to-pay handler - Không thể khởi động dash: trình xử lý click-to-pay + Cannot start darknet: click-to-pay handler + Không thể khởi động darknet: trình xử lý click-to-pay URI handling @@ -2292,8 +2292,8 @@ https://www.transifex.com/projects/p/dash/ Nếu phí giao dịch tuỳ chỉnh được đặt là 1000 duff và giao dịch chỉ có 250 bytes, thì "theo kilobyte" chỉ trả 250 duff phí,<br />trong khi "tổng ít nhất" trả 1000 duff. Với các giao dịch lớn hơn 1 kilobyte thì cả hai đều trả theo kilobyte. - Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process. - Chỉ trả phí tối thiểu cũng được chỉ khi mà có lượng giao dịch ít hơn không gian trong khối.<br />Nhưng cần lưu ý là nó có thể xảy ra hiện tượng giao dịch không bao giờ được xác nhận một khi có nhiều nhu cầu giao dash hơn khả năng mà mạng lưới có thể xử lý được. + Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for darknet transactions than the network can process. + Chỉ trả phí tối thiểu cũng được chỉ khi mà có lượng giao dịch ít hơn không gian trong khối.<br />Nhưng cần lưu ý là nó có thể xảy ra hiện tượng giao dịch không bao giờ được xác nhận một khi có nhiều nhu cầu giao darknet hơn khả năng mà mạng lưới có thể xử lý được. per kilobyte @@ -2364,12 +2364,12 @@ https://www.transifex.com/projects/p/dash/ Thêm &Người nhận - Darksend - Darksend + Obfuscate + Obfuscate - InstantX - InstantX + SwiftTX + SwiftTX Balance: @@ -2416,16 +2416,16 @@ https://www.transifex.com/projects/p/dash/ các khoản tiền ẩn danh - (darksend requires this amount to be rounded up to the nearest %1). - (darksend yêu cầu số tiền này sẽ được làm tròn đến gần %1) + (obfuscate requires this amount to be rounded up to the nearest %1). + (obfuscate yêu cầu số tiền này sẽ được làm tròn đến gần %1) any available funds (not recommended) bất kỳ khoản tiền sẵn nào (gợi ý không nên) - and InstantX - và InstantX + and SwiftTX + và SwiftTX %1 to %2 @@ -2559,8 +2559,8 @@ https://www.transifex.com/projects/p/dash/ Thông điệp: - A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. - Một thông điệp được đính với dash: URI đó sẽ được lưu trữ với các giao dịch cho các bạn tham khảo. Lưu ý: Thông điệp này sẽ không được gửi qua mạng Dash. + A message that was attached to the darknet: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. + Một thông điệp được đính với darknet: URI đó sẽ được lưu trữ với các giao dịch cho các bạn tham khảo. Lưu ý: Thông điệp này sẽ không được gửi qua mạng Dash. This is an unverified payment request. @@ -2778,16 +2778,16 @@ https://www.transifex.com/projects/p/dash/ xung đột - %1/offline (verified via instantx) - %1/ngắt kết nối (đã được kiểm tra qua instantx) + %1/offline (verified via swifttx) + %1/ngắt kết nối (đã được kiểm tra qua swifttx) - %1/confirmed (verified via instantx) - %1/đã được xác nhận (đã được kiểm tra qua instantx) + %1/confirmed (verified via swifttx) + %1/đã được xác nhận (đã được kiểm tra qua swifttx) - %1 confirmations (verified via instantx) - %1 xác nhận (đã được kiểm tra qua instantx) + %1 confirmations (verified via swifttx) + %1 xác nhận (đã được kiểm tra qua swifttx) %1/offline @@ -2802,24 +2802,24 @@ https://www.transifex.com/projects/p/dash/ %1 xác nhận - %1/offline (InstantX verification in progress - %2 of %3 signatures) - %1/mất kết nối (Đang trong tiến trình kiểm tra InstantX - %2 trên %3 các chữ ký) + %1/offline (SwiftTX verification in progress - %2 of %3 signatures) + %1/mất kết nối (Đang trong tiến trình kiểm tra SwiftTX - %2 trên %3 các chữ ký) - %1/confirmed (InstantX verification in progress - %2 of %3 signatures ) - %1/được xác nhận (Đang trong tiến trình kiểm tra InstantX - %2 trên %3 các chữ ký) + %1/confirmed (SwiftTX verification in progress - %2 of %3 signatures ) + %1/được xác nhận (Đang trong tiến trình kiểm tra SwiftTX - %2 trên %3 các chữ ký) - %1 confirmations (InstantX verification in progress - %2 of %3 signatures) - %1 xác nhận (Đang trong tiến trình kiểm tra InstantX - %2 trên %3 các chữ ký) + %1 confirmations (SwiftTX verification in progress - %2 of %3 signatures) + %1 xác nhận (Đang trong tiến trình kiểm tra SwiftTX - %2 trên %3 các chữ ký) - %1/offline (InstantX verification failed) - %1/mất kết nối (Thất bại trong việc kiểm tra InstantX) + %1/offline (SwiftTX verification failed) + %1/mất kết nối (Thất bại trong việc kiểm tra SwiftTX) - %1/confirmed (InstantX verification failed) - %1/đã được xác nhận (Thất bại trong việc kiểm tra InstantX) + %1/confirmed (SwiftTX verification failed) + %1/đã được xác nhận (Thất bại trong việc kiểm tra SwiftTX) Status @@ -3020,8 +3020,8 @@ https://www.transifex.com/projects/p/dash/ Nhận từ - Received via Darksend - Nhận qua Darksend + Received via Obfuscate + Nhận qua Obfuscate Sent to @@ -3036,20 +3036,20 @@ https://www.transifex.com/projects/p/dash/ Được đào - Darksend Denominate - Darksend Denominate + Obfuscate Denominate + Obfuscate Denominate - Darksend Collateral Payment - Thanh toán Darksend Collateral + Obfuscate Collateral Payment + Thanh toán Obfuscate Collateral - Darksend Make Collateral Inputs - Darksend tạo đầu vào Collateral + Obfuscate Make Collateral Inputs + Obfuscate tạo đầu vào Collateral - Darksend Create Denominations - Darksend tạo các mệnh giá + Obfuscate Create Denominations + Obfuscate tạo các mệnh giá Darksent @@ -3135,20 +3135,20 @@ https://www.transifex.com/projects/p/dash/ Darksent - Darksend Make Collateral Inputs - Darksend tạo đầu vào Collateral + Obfuscate Make Collateral Inputs + Obfuscate tạo đầu vào Collateral - Darksend Create Denominations - Darksend tạo các mệnh giá + Obfuscate Create Denominations + Obfuscate tạo các mệnh giá - Darksend Denominate - Darksend Denominate + Obfuscate Denominate + Obfuscate Denominate - Darksend Collateral Payment - Thanh toán Darksend Collateral + Obfuscate Collateral Payment + Thanh toán Obfuscate Collateral To yourself @@ -3276,8 +3276,8 @@ https://www.transifex.com/projects/p/dash/ Gửi tiền - InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH. - InstantX không hỗ trợ để gửi giá trị lớn đến như vậy. Giới hạn giao dịch hiện tại đến %1 DASH. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 DNET. + SwiftTX không hỗ trợ để gửi giá trị lớn đến như vậy. Giới hạn giao dịch hiện tại đến %1 DNET. @@ -3320,7 +3320,7 @@ https://www.transifex.com/projects/p/dash/ - dash-core + darknet-core Bind to given address and always listen on it. Use [host]:port notation for IPv6 Liên kết với địa chỉ nhất định và luôn luôn lắng nghe trên đó. Sử dụng ký hiệu [host]:port cho IPv6 @@ -3330,8 +3330,8 @@ https://www.transifex.com/projects/p/dash/ Không nhận được một khoá trong thư mục %s. Dash Core có thể đã đang chạy. - Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. - Darksend sử dụng số lượng mệnh giá nhất định để gửi tiền, bạn có thể chỉ cần đơn giản ẩn danh vài coin nữa. + Obfuscate uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. + Obfuscate sử dụng số lượng mệnh giá nhất định để gửi tiền, bạn có thể chỉ cần đơn giản ẩn danh vài coin nữa. Enter regression test mode, which uses a special chain in which blocks can be solved instantly. @@ -3358,8 +3358,8 @@ https://www.transifex.com/projects/p/dash/ Chế độ này -genproclimit kiểm soát bao nhiêu khối được sinh tức thời. - InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. - InstantX cần đầu vào với ít nhất 6 xác nhận, bạn có thể cần phải đợi vài phút và thử lại. + SwiftTX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. + SwiftTX cần đầu vào với ít nhất 6 xác nhận, bạn có thể cần phải đợi vài phút và thử lại. Name to construct url for KeePass entry that stores the wallet passphrase @@ -3386,12 +3386,12 @@ https://www.transifex.com/projects/p/dash/ Không thể để ràng buộc vào %s trên máy tính này. Dash Core có thể đã chạy. - Unable to locate enough Darksend denominated funds for this transaction. - Không tìm đủ ngân sách Darksend denominated cho giao dịch này. + Unable to locate enough Obfuscate denominated funds for this transaction. + Không tìm đủ ngân sách Obfuscate denominated cho giao dịch này. - Unable to locate enough Darksend non-denominated funds for this transaction that are not equal 1000 DASH. - Không tìm đủ ngân sách Darksend denominated cho giao dịch mà nó không bằng 1000 DASH + Unable to locate enough Obfuscate non-denominated funds for this transaction that are not equal 1000 DNET. + Không tìm đủ ngân sách Obfuscate denominated cho giao dịch mà nó không bằng 1000 DNET Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction. @@ -3490,8 +3490,8 @@ https://www.transifex.com/projects/p/dash/ Phát hiện ra dữ liệu khối bị hỏng - Darksend options: - Tuỳ chọn Darksend: + Obfuscate options: + Tuỳ chọn Obfuscate: Debugging/Testing options: @@ -3562,8 +3562,8 @@ https://www.transifex.com/projects/p/dash/ Lỗi: Ví đã bị khoá, không thể tạo giao dịch! - Error: You already have pending entries in the Darksend pool - Lỗi: Bạn đã có các thành phần đang chờ trong Darksend pool + Error: You already have pending entries in the Obfuscate pool + Lỗi: Bạn đã có các thành phần đang chờ trong Obfuscate pool Failed to listen on any port. Use -listen=0 if you want this. @@ -3614,32 +3614,32 @@ https://www.transifex.com/projects/p/dash/ Xoá hết tất cả các giao dịch ví và chỉ phục hồi những phần đó của blockchain qua -rescan khi khởi động - Disable all Dash specific functionality (Masternodes, Darksend, InstantX, Budgeting) (0-1, default: %u) - Tắt tất cả các chức năng đặc trưng của Dash (Masternode, Darksend, InstantX, Lập ngân sách) (0-1, ngầm định: %u) + Disable all Dash specific functionality (Masternodes, Obfuscate, SwiftTX, Budgeting) (0-1, default: %u) + Tắt tất cả các chức năng đặc trưng của Dash (Masternode, Obfuscate, SwiftTX, Lập ngân sách) (0-1, ngầm định: %u) Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>. Phân phối dưới giấy phép phần mềm MIT, hãy xem file COPYING đi kèm hoặc <http://www.opensource.org/licenses/mit-license.php>. - Enable instantx, show confirmations for locked transactions (bool, default: %s) - Bật InstantX, hiển thị các xác thực cho các giao dịch bị khoá (bool, ngầm định: %s) + Enable swifttx, show confirmations for locked transactions (bool, default: %s) + Bật SwiftTX, hiển thị các xác thực cho các giao dịch bị khoá (bool, ngầm định: %s) - Enable use of automated darksend for funds stored in this wallet (0-1, default: %u) - Cho phép sử dụng tự động darksend cho những ngân sách được lưu trong ví (0-1, ngầm định: %u) + Enable use of automated obfuscate for funds stored in this wallet (0-1, default: %u) + Cho phép sử dụng tự động obfuscate cho những ngân sách được lưu trong ví (0-1, ngầm định: %u) Error: Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported. Lỗi: Thấy tham số không được hỗ trợ -socks. Thiết lập phiên bản SOCKS là không thể được nữa, chỉ hỗ trợ proxy SOCKS5. - Fees (in DASH/Kb) smaller than this are considered zero fee for relaying (default: %s) - Phí (tính theo DASH/Kb) nhỏ hơn số này được coi là không mất phí cho việc chuyển tiền (ngầm định: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for relaying (default: %s) + Phí (tính theo DNET/Kb) nhỏ hơn số này được coi là không mất phí cho việc chuyển tiền (ngầm định: %s) - Fees (in DASH/Kb) smaller than this are considered zero fee for transaction creation (default: %s) - Phí (theo DASH/Kb) nhỏ hơn số này được coi không mất phí cho việc khởi tạo giao dịch (ngầm định: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Phí (theo DNET/Kb) nhỏ hơn số này được coi không mất phí cho việc khởi tạo giao dịch (ngầm định: %s) Flush database activity from memory pool to disk log every <n> megabytes (default: %u) @@ -3686,8 +3686,8 @@ https://www.transifex.com/projects/p/dash/ Thông tin gỡ rối đầu ra (ngầm định: %u, cung cấp <category> là một tuỳ chọn) - Provide liquidity to Darksend by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) - Cung cấp thanh khoản cho Darksend bằng việc thường xuyên trộn tiền một cách liên tục (0-100, ngầm định: %u, 1=rất thường xuyên, phí cao, 100=rất ít thường xuyên, phí thấp) + Provide liquidity to Obfuscate by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees) + Cung cấp thanh khoản cho Obfuscate bằng việc thường xuyên trộn tiền một cách liên tục (0-100, ngầm định: %u, 1=rất thường xuyên, phí cao, 100=rất ít thường xuyên, phí thấp) Require high priority for relaying free or low-fee transactions (default:%u) @@ -3710,10 +3710,10 @@ https://www.transifex.com/projects/p/dash/ Sản phẩm này có kèm theo phần mềm được phát triển bởi dự án OpenSSL để sử dụng các công cụ OpenSSL <https://www.openssl.org/> và phần mềm mã hoá được viết bởi Eric Young và phần mềm UPnP được viết bởi Thomas Bernard. - To use dashd, or the -server option to dash-qt, you must set an rpcpassword in the configuration file: + To use darknetd, or the -server option to darknet-qt, you must set an rpcpassword in the configuration file: %s It is recommended you use the following random password: -rpcuser=dashrpc +rpcuser=darknetrpc rpcpassword=%s (you do not need to remember this password) The username and password MUST NOT be the same. @@ -3721,10 +3721,10 @@ If the file does not exist, create it with owner-readable-only file permissions. It is also recommended to set alertnotify so you are notified of problems; for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - Để sử dụng dashd, hoặc tuỳ chọn -server với dash-qt, bạn phải đặt một mật khẩu rpcpassword trong tệp cấu hình: + Để sử dụng darknetd, hoặc tuỳ chọn -server với darknet-qt, bạn phải đặt một mật khẩu rpcpassword trong tệp cấu hình: %s Gợi ý rằng bạn nên sử dụng những mật khẩu ngẫu nhiên sau: -rpcuser=dashrpc +rpcuser=darknetrpc rpcpassword=%s (bạn không cần thiết phải nhớ mật khẩu này) Username và mật khẩu KHÔNG ĐƯỢC giống nhau. @@ -3734,8 +3734,8 @@ ví dụ: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - Unable to locate enough funds for this transaction that are not equal 1000 DASH. - Không tìm được đủ ngân sách cho giao dịch mà nó không đủ 1000 DASH. + Unable to locate enough funds for this transaction that are not equal 1000 DNET. + Không tìm được đủ ngân sách cho giao dịch mà nó không đủ 1000 DNET. Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s) @@ -3758,8 +3758,8 @@ ví dụ: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Cái điểm ngang hàng trong danh sách trắng không thể bị cấm DoS và các giao dịch của nó luôn được chuyển tiếp, thậm chí cả khi nó đã có trong mempool, hữu ích ví dụ như cho một cửa ngõ - (9999 could be used only on mainnet) - (9999 chỉ được sử dụng trên mạng chính thức) + (51472 could be used only on mainnet) + (51472 chỉ được sử dụng trên mạng chính thức) (default: %s) @@ -3807,16 +3807,16 @@ ví dụ: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Không thể phân tích giá trị -rpcbind %s như là địa chỉ mạng - Darksend is idle. - Darksend đang nghỉ. + Obfuscate is idle. + Obfuscate đang nghỉ. - Darksend request complete: - Yêu cầu Darksend hoàn thành: + Obfuscate request complete: + Yêu cầu Obfuscate hoàn thành: - Darksend request incomplete: - Yêu cầu Darksend chưa hoàn thành: + Obfuscate request incomplete: + Yêu cầu Obfuscate chưa hoàn thành: Disable safemode, override a real safe mode event (default: %u) @@ -3847,8 +3847,8 @@ ví dụ: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Lỗi: Tìm thấy tham số không được hỗ trợ -tor, thay vào đó hãy sử dụng -onion - Fee (in DASH/kB) to add to transactions you send (default: %s) - Phí (theo DASH/Kb) sẽ thêm vào các giao dịch mà bạn gửi (ngầm định: %s) + Fee (in DNET/kB) to add to transactions you send (default: %s) + Phí (theo DNET/Kb) sẽ thêm vào các giao dịch mà bạn gửi (ngầm định: %s) Finalizing transaction. @@ -3911,8 +3911,8 @@ ví dụ: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Đầu vào không hợp lệ. - InstantX options: - Tuỳ chọn InstantX: + SwiftTX options: + Tuỳ chọn SwiftTX: Insufficient funds. @@ -3947,8 +3947,8 @@ ví dụ: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Số tiền không hợp lệ cho -paytxfee =<số tiền>: '%s' - Last successful Darksend action was too recent. - Phiên giao dịch Darksend thành công cuối cùng quá gần đây. + Last successful Obfuscate action was too recent. + Phiên giao dịch Obfuscate thành công cuối cùng quá gần đây. Limit size of signature cache to <n> entries (default: %u) @@ -4175,8 +4175,8 @@ ví dụ: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Masternodeprivkey không hợp lệ. Hãy xem lại tài liệu. - (must be 9999 for mainnet) - (phải là 9999 cho mạng chính thức) + (must be51472 for mainnet) + (phải là51472 cho mạng chính thức) Can't find random Masternode. @@ -4215,16 +4215,16 @@ ví dụ: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Khoá KeePassHttp cho liên lạc mã hoá AES với KeePass - Keep N DASH anonymized (default: %u) - Giữ N DASH đã được ẩn danh (ngầm định: %u) + Keep N DNET anonymized (default: %u) + Giữ N DNET đã được ẩn danh (ngầm định: %u) Keep at most <n> unconnectable transactions in memory (default: %u) Giữ nhiều nhất <n> các giao dịch không kết nối được trong bộ nhớ (ngầm định: %u) - Last Darksend was too recent. - Darksend cuối cùng quá gần. + Last Obfuscate was too recent. + Obfuscate cuối cùng quá gần. Line: %d @@ -4475,8 +4475,8 @@ ví dụ: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Username cho kết nối JSON-RPC - Value more than Darksend pool maximum allows. - Giá tri trị lớn hơn giá trị tối đa mà bể Darksend cho phép. + Value more than Obfuscate pool maximum allows. + Giá tri trị lớn hơn giá trị tối đa mà bể Obfuscate cho phép. Verifying blocks... diff --git a/src/qt/locale/dash_zh_CN.ts b/src/qt/locale/darknet_zh_CN.ts similarity index 96% rename from src/qt/locale/dash_zh_CN.ts rename to src/qt/locale/darknet_zh_CN.ts index 13efc20b33365..e632a8e0a263e 100644 --- a/src/qt/locale/dash_zh_CN.ts +++ b/src/qt/locale/darknet_zh_CN.ts @@ -176,7 +176,7 @@ 确认加密钱包 - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DASH</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DNET</b>! 警告:如果把钱包加​​密后又忘记密码，你就会从此<b>失去所有的达世币了</b>! @@ -188,7 +188,7 @@ 钱包已加密 - Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dashs from being stolen by malware infecting your computer. + Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your darknets from being stolen by malware infecting your computer. 达世币软体现在要关闭，以完成加密过程。请注意，加密钱包不能完全防止恶意软件入侵你的电脑盗取你的达世币。 @@ -263,7 +263,7 @@ 接收(&R) - Request payments (generates QR codes and dash: URIs) + Request payments (generates QR codes and darknet: URIs) 请求付款(生成二维码和达世币付款协议的URI) @@ -443,7 +443,7 @@ 打开 &URI... - Open a dash: URI or payment request + Open a darknet: URI or payment request 打开达世币：网页或付款请求 @@ -741,7 +741,7 @@ Address: %4 复制零钱 - Non-anonymized input selected. <b>Darksend will be disabled.</b><br><br>If you still want to use Darksend, please deselect all non-nonymized inputs first and then check Darksend checkbox again. + Non-anonymized input selected. <b>Obfuscate will be disabled.</b><br><br>If you still want to use Obfuscate, please deselect all non-nonymized inputs first and then check Obfuscate checkbox again. 已选择非匿名输入. <b>匿名发送将会被禁用.</ b><br> <br>如果你仍然想使用匿名发送功能,请先取消所选的非匿名输入,然后再勾选匿名发送. @@ -842,9 +842,9 @@ Address: %4 - DarksendConfig + ObfuscateConfig - Configure Darksend + Configure Obfuscate 配置匿名发送 @@ -864,11 +864,11 @@ Address: %4 请选择隐私等级。 - Use 2 separate masternodes to mix funds up to 1000 DASH + Use 2 separate masternodes to mix funds up to 1000 DNET 使用2个独立的主节点混合资金最多1000达世币 - Use 8 separate masternodes to mix funds up to 1000 DASH + Use 8 separate masternodes to mix funds up to 1000 DNET 使用8个独立的主节点混合资金最多1000达世币 @@ -876,15 +876,15 @@ Address: %4 使用16个独立主节点 - This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH + This option is the quickest and will cost about ~0.025 DNET to anonymize 1000 DNET 此选项为最快速度，需要支付0.025达世币/1000达世币的匿名处理费用。 - This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH + This option is moderately fast and will cost about 0.05 DNET to anonymize 1000 DNET 此选项为一般速度，需要支付0.05达世币/1000达世币的匿名处理费用。 - 0.1 DASH per 1000 DASH you anonymize. + 0.1 DNET per 1000 DNET you anonymize. 0.1达世币/1000达世币的匿名处理费用。 @@ -892,19 +892,19 @@ Address: %4 此选项提供最慢速度但是却最安全的匿名服务。最多匿名化将花费 - Darksend Configuration + Obfuscate Configuration 匿名发送配置 - Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. 匿名发送已成功设置为一般(%1到2次循环)。可以通过打开达世币配置窗口来随时修改。 - Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. 匿名发送已成功设置为高(%1到8次循环)。可以通过打开达世币配置窗口来随时修改。 - Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. 匿名发送已成功设置为最高(%1到16次循环)。可以通过打开达世币配置窗口来随时修改。 @@ -1147,11 +1147,11 @@ Address: %4 (0 = 自动, <0 = 离开很多免费的核心) - Darksend rounds to use + Obfuscate rounds to use 匿名传送的循环次数 - This amount acts as a threshold to turn off Darksend once it's reached. + This amount acts as a threshold to turn off Obfuscate once it's reached. 此金额为关闭匿名发送的极限. @@ -1264,9 +1264,9 @@ Address: %4 Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ 缺少相关语言或翻译不完整? 请到这里协助翻译: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ User Interface Theme: @@ -1424,7 +1424,7 @@ https://www.transifex.com/projects/p/dash/ 完成度: - Darksend Balance: + Obfuscate Balance: 匿名传送余额: @@ -1432,7 +1432,7 @@ https://www.transifex.com/projects/p/dash/ 数量与循环次数: - 0 DASH / 0 Rounds + 0 DNET / 0 Rounds 0 达世币 / 0 循环数 @@ -1444,7 +1444,7 @@ https://www.transifex.com/projects/p/dash/ n/a - Darksend + Obfuscate 匿名发送 @@ -1457,14 +1457,14 @@ https://www.transifex.com/projects/p/dash/ The denominations you submitted to the Masternode.<br>To mix, other users must submit the exact same denominations. - 您向主节点所提交的用以面额化混合的DASH,<br>当其他用户提交相同的面额化DASH数量时,将开始混合. + 您向主节点所提交的用以面额化混合的DNET,<br>当其他用户提交相同的面额化DNET数量时,将开始混合. (Last Message) (最近一次信息) - Try to manually submit a Darksend request. + Try to manually submit a Obfuscate request. 尝试手动提交一次匿名化请求 @@ -1472,7 +1472,7 @@ https://www.transifex.com/projects/p/dash/ 尝试混合 - Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!) + Reset the current status of Obfuscate (can interrupt Obfuscate if it's in the process of Mixing, which can cost you money!) 重置目前匿名状态(此操作可能会影响您目前正在执行的混合过程，并且产生费用!) @@ -1488,11 +1488,11 @@ https://www.transifex.com/projects/p/dash/ 关闭 - Start Darksend Mixing + Start Obfuscate Mixing 开始匿名化混合 - Stop Darksend Mixing + Stop Obfuscate Mixing 关闭匿名化混合 @@ -1532,7 +1532,7 @@ https://www.transifex.com/projects/p/dash/ 打开 - Last Darksend message: + Last Obfuscate message: 最后一次匿名信息: @@ -1542,15 +1542,15 @@ https://www.transifex.com/projects/p/dash/ 不可用 - Darksend was successfully reset. + Obfuscate was successfully reset. 匿名化被成功重置。 - Darksend requires at least %1 to use. + Obfuscate requires at least %1 to use. 匿名化要求至少 %1 以使用 - Wallet is locked and user declined to unlock. Disabling Darksend. + Wallet is locked and user declined to unlock. Disabling Obfuscate. 钱包已锁定需要用户解锁。 正在关闭匿名化。 @@ -1561,7 +1561,7 @@ https://www.transifex.com/projects/p/dash/ 支付请求出错 - Cannot start dash: click-to-pay handler + Cannot start darknet: click-to-pay handler 无法启动达世币程序：click-to-pay handler @@ -2289,7 +2289,7 @@ https://www.transifex.com/projects/p/dash/ 但如果交易信息大于一千字节,那么两者都要支付千字节费用. - Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process. + Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for darknet transactions than the network can process. 当交易量少于区块可容纳的空间时,只需支付最低手续费.<br />但当交易量的需求增长到超过总体网络可处理的量时,可能会造成一笔一直不被确认的交易. @@ -2361,11 +2361,11 @@ https://www.transifex.com/projects/p/dash/ 添加收款人(&R) - Darksend + Obfuscate 匿名发送 - InstantX + SwiftTX 即时支付 @@ -2413,7 +2413,7 @@ https://www.transifex.com/projects/p/dash/ 匿名化金额 - (darksend requires this amount to be rounded up to the nearest %1). + (obfuscate requires this amount to be rounded up to the nearest %1). (匿名发送需要四舍五入此金额致最接近的值%1). @@ -2421,7 +2421,7 @@ https://www.transifex.com/projects/p/dash/ 全部有效金额(不推荐) - and InstantX + and SwiftTX 和 即时支付 @@ -2552,7 +2552,7 @@ https://www.transifex.com/projects/p/dash/ 消息： - A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. + A message that was attached to the darknet: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. 附加在达世币付款协议URI中的信息,会和交易内容一并存储,可供您参考.提示:此信息不会发送到达世币网络上. @@ -2771,15 +2771,15 @@ https://www.transifex.com/projects/p/dash/ 发现冲突 - %1/offline (verified via instantx) + %1/offline (verified via swifttx) %1/下线(经过即时支付系统认证) - %1/confirmed (verified via instantx) + %1/confirmed (verified via swifttx) %1/已确认(经过即时支付系统认证) - %1 confirmations (verified via instantx) + %1 confirmations (verified via swifttx) %1/确认完成(经过即时支付付系统认证) @@ -2795,23 +2795,23 @@ https://www.transifex.com/projects/p/dash/ %1 已确认 - %1/offline (InstantX verification in progress - %2 of %3 signatures) + %1/offline (SwiftTX verification in progress - %2 of %3 signatures) %1/下线 (即时支付系统正在认证中 - %2 of %3签名数) - %1/confirmed (InstantX verification in progress - %2 of %3 signatures ) + %1/confirmed (SwiftTX verification in progress - %2 of %3 signatures ) %1/已确认 (即时支付系统正在认证中 - %2 of %3签名数) - %1 confirmations (InstantX verification in progress - %2 of %3 signatures) + %1 confirmations (SwiftTX verification in progress - %2 of %3 signatures) %1/确认完成 (即时支付系统正在认证中 - %2 of %3签名数) - %1/offline (InstantX verification failed) + %1/offline (SwiftTX verification failed) %1/下线 (即时支付系统认证失败) - %1/confirmed (InstantX verification failed) + %1/confirmed (SwiftTX verification failed) %1/已确认 (即时支付系统认证失败) @@ -3009,7 +3009,7 @@ https://www.transifex.com/projects/p/dash/ 收款来自 - Received via Darksend + Received via Obfuscate 已通过匿名处理接收 @@ -3025,19 +3025,19 @@ https://www.transifex.com/projects/p/dash/ 挖矿所得 - Darksend Denominate + Obfuscate Denominate 匿名发送面额化 - Darksend Collateral Payment + Obfuscate Collateral Payment 匿名发送附加费用 - Darksend Make Collateral Inputs + Obfuscate Make Collateral Inputs 匿名发送会产生附加费用 - Darksend Create Denominations + Obfuscate Create Denominations 匿名发送会生成面值额度 @@ -3120,19 +3120,19 @@ https://www.transifex.com/projects/p/dash/ 匿名发送 - Darksend Make Collateral Inputs + Obfuscate Make Collateral Inputs 匿名发送会产生附加费用 - Darksend Create Denominations + Obfuscate Create Denominations 匿名发送会生成面值额度 - Darksend Denominate + Obfuscate Denominate 匿名发送面额化 - Darksend Collateral Payment + Obfuscate Collateral Payment 匿名发送附加费用 @@ -3257,7 +3257,7 @@ https://www.transifex.com/projects/p/dash/ 发送达世币 - InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 DNET. 即时支付功能目前还不支持发送如此高的金额.目前限制在%1 达世币. @@ -3301,7 +3301,7 @@ https://www.transifex.com/projects/p/dash/ - dash-core + darknet-core Bind to given address and always listen on it. Use [host]:port notation for IPv6 与提供地址绑定，持续监听。使用[host]:标记IPv6端口 @@ -3311,7 +3311,7 @@ https://www.transifex.com/projects/p/dash/ 不能获得锁定的数据目录 %s. 达世币核心可能已经在运行。 - Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. + Obfuscate uses exact denominated amounts to send funds, you might simply need to anonymize some more coins. 为了匿名发送的正常发送,您可能需要再混淆一些币. @@ -3335,7 +3335,7 @@ https://www.transifex.com/projects/p/dash/ 当最新区块改变时需要执行的命令(命令中的 %s 会被区块哈希值代替) - InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. + SwiftTX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. 即时支付功能需要6步确认，您可以稍后重试。 @@ -3343,12 +3343,12 @@ https://www.transifex.com/projects/p/dash/ 无法绑定%s此计算机. 达世币核心应该已经在运行中了. - Unable to locate enough Darksend denominated funds for this transaction. - 无法找到足够的已匿名化资金来完成交易,不足1000 DASH. + Unable to locate enough Obfuscate denominated funds for this transaction. + 无法找到足够的已匿名化资金来完成交易,不足1000 DNET. - Unable to locate enough Darksend non-denominated funds for this transaction that are not equal 1000 DASH. - 无法找到足够的未匿名化资金来完成交易,不足1000 DASH. + Unable to locate enough Obfuscate non-denominated funds for this transaction that are not equal 1000 DNET. + 无法找到足够的未匿名化资金来完成交易,不足1000 DNET. Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction. @@ -3447,7 +3447,7 @@ https://www.transifex.com/projects/p/dash/ 已找到损坏的数据块 - Darksend options: + Obfuscate options: 匿名发送选项： @@ -3531,23 +3531,23 @@ https://www.transifex.com/projects/p/dash/ 删除钱包里的所有交易信息, 并且在下次启动时, 使用 -rescan 来从区块链中恢复 - Disable all Dash specific functionality (Masternodes, Darksend, InstantX, Budgeting) (0-1, default: %u) + Disable all Dash specific functionality (Masternodes, Obfuscate, SwiftTX, Budgeting) (0-1, default: %u) 禁止所有达世币附加功能(主节点, 匿名发送, 即时发送, 预算) (0-1, default: %u) - Enable instantx, show confirmations for locked transactions (bool, default: %s) + Enable swifttx, show confirmations for locked transactions (bool, default: %s) 激活即时支付,显示锁定交易的确认数(bool, 默认: %s) - Enable use of automated darksend for funds stored in this wallet (0-1, default: %u) + Enable use of automated obfuscate for funds stored in this wallet (0-1, default: %u) 允许存储在这个钱包内的资金自动使用匿名发送(0-1, 默认: %u) - Fees (in DASH/Kb) smaller than this are considered zero fee for relaying (default: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for relaying (default: %s) 如果手续费比这个值低,就视为没有付手续费(当产生交易时)(默认: %s) - Fees (in DASH/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for transaction creation (default: %s) 如果手续费比这个值低,就视为没有付手续费(当产生交易时)(默认: %s) @@ -3591,8 +3591,8 @@ https://www.transifex.com/projects/p/dash/ 此产品包括了由OpenSSL Project所开发的OpenSSL Toolkit 软件<https://www.openssl.org/>, 和由Eric Young 编写的加密软件, 以及由Thomas Bernard 编写的UPnP软件. - Unable to locate enough funds for this transaction that are not equal 1000 DASH. - 无法找到足够的资金完成交易,不足1000 DASH. + Unable to locate enough funds for this transaction that are not equal 1000 DNET. + 无法找到足够的资金完成交易,不足1000 DNET. Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s) @@ -3615,8 +3615,8 @@ https://www.transifex.com/projects/p/dash/ 在白名单中的节点不会因为检测到DoS攻击而被停用. 来自这些节点的交易也一定会被转发, 即使说交易本神就来自记忆池. 适用于网关 - (9999 could be used only on mainnet) - (9999 只能被用于主网) + (51472 could be used only on mainnet) + (51472 只能被用于主网) (default: %s) @@ -3661,15 +3661,15 @@ https://www.transifex.com/projects/p/dash/ 无法解析 -rpcbind 参数 %s 作为网络地址 - Darksend is idle. + Obfuscate is idle. 匿名化处于空闲状态 - Darksend request complete: + Obfuscate request complete: 匿名化请求已完成: - Darksend request incomplete: + Obfuscate request incomplete: 匿名化请求未完成: @@ -3750,7 +3750,7 @@ https://www.transifex.com/projects/p/dash/ 输入是无效的。 - InstantX options: + SwiftTX options: 即时支付 选项： @@ -3786,7 +3786,7 @@ https://www.transifex.com/projects/p/dash/ 设定 -paytxfee=<金额> 的金额无效: '%s' - Last successful Darksend action was too recent. + Last successful Obfuscate action was too recent. 最后一次成功匿名发送刚刚完成. @@ -3959,8 +3959,8 @@ https://www.transifex.com/projects/p/dash/ 无效主节点私钥。请查阅文件材料。 - (must be 9999 for mainnet) - (设置 9999 为主网) + (must be51472 for mainnet) + (设置51472 为主网) Can't find random Masternode. @@ -3987,11 +3987,11 @@ https://www.transifex.com/projects/p/dash/ 检测到无效脚本。 - Keep N DASH anonymized (default: %u) + Keep N DNET anonymized (default: %u) 保持定量达世币匿名化(默认: %u) - Last Darksend was too recent. + Last Obfuscate was too recent. 最后一次匿名发送刚刚完成。 @@ -4215,7 +4215,7 @@ https://www.transifex.com/projects/p/dash/ 链接JSON-RPC的用户名 - Value more than Darksend pool maximum allows. + Value more than Obfuscate pool maximum allows. 数值超过匿名发送池所允许的最大数。 diff --git a/src/qt/locale/dash_zh_TW.ts b/src/qt/locale/darknet_zh_TW.ts similarity index 97% rename from src/qt/locale/dash_zh_TW.ts rename to src/qt/locale/darknet_zh_TW.ts index 747926ff15056..ca48b04a814bd 100644 --- a/src/qt/locale/dash_zh_TW.ts +++ b/src/qt/locale/darknet_zh_TW.ts @@ -176,7 +176,7 @@ 確認錢包加密 - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DASH</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DNET</b>! 警告: 如果把錢包加密後又忘記密碼，你就會從此<b>失去其中所有的達世幣了</b>！ @@ -188,7 +188,7 @@ 錢包已加密 - Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dashs from being stolen by malware infecting your computer. + Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your darknets from being stolen by malware infecting your computer. 達世幣軟體現在要關閉，好完成加密程序。請注意，加密錢包不能完全防止入侵你的電腦的惡意程式偷取達世幣。 @@ -263,7 +263,7 @@ 接收(&R) - Request payments (generates QR codes and dash: URIs) + Request payments (generates QR codes and darknet: URIs) 要求付款(產生 QR Code 和達世幣付款協議的 URI) @@ -443,7 +443,7 @@ 開啓 &URI... - Open a dash: URI or payment request + Open a darknet: URI or payment request 開啓一個達世幣協議的 URI 或付款要求 @@ -737,7 +737,7 @@ Address: %4 複製找零金額 - Non-anonymized input selected. <b>Darksend will be disabled.</b><br><br>If you still want to use Darksend, please deselect all non-nonymized inputs first and then check Darksend checkbox again. + Non-anonymized input selected. <b>Obfuscate will be disabled.</b><br><br>If you still want to use Obfuscate, please deselect all non-nonymized inputs first and then check Obfuscate checkbox again. 選擇了非匿名的輸入。 <b> 匿名發送將會被禁用。</ b><br> <br>如果你仍然想用匿名發送，請先取消選取所有非匿名的輸入，然後再勾選匿名發送的核取方塊 @@ -838,9 +838,9 @@ Address: %4 - DarksendConfig + ObfuscateConfig - Configure Darksend + Configure Obfuscate 配置匿名發送 @@ -860,11 +860,11 @@ Address: %4 請選擇穩私級別。 - Use 2 separate masternodes to mix funds up to 1000 DASH + Use 2 separate masternodes to mix funds up to 1000 DNET 使用2個獨立的主節點來混合最高達1000達世幣的資金 - Use 8 separate masternodes to mix funds up to 1000 DASH + Use 8 separate masternodes to mix funds up to 1000 DNET 使用8個獨立的主節點來混合最高達1000達世幣的資金 @@ -872,15 +872,15 @@ Address: %4 使用16個獨立的主節點 - This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH + This option is the quickest and will cost about ~0.025 DNET to anonymize 1000 DNET 這個是最快的選項，將耗費約~0.025達世幣作為匿名處理1000達世幣的費用 - This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH + This option is moderately fast and will cost about 0.05 DNET to anonymize 1000 DNET 這個是一般的選項，將耗費約0.05達世幣作為匿名處理1000達世幣的費用 - 0.1 DASH per 1000 DASH you anonymize. + 0.1 DNET per 1000 DNET you anonymize. 每1000達世幣耗費0.1達世幣作為匿名處理費用 @@ -888,19 +888,19 @@ Address: %4 這是最慢的和最安全的選頁。耗費最多的匿名處理費 - Darksend Configuration + Obfuscate Configuration 匿名發送配置 - Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen. 匿名發送已成功設置為一般(%1到2次循環)。你可以隨時打開達世幣配置窗口來修改。 - Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen. 匿名發送已成功設置為高(%1到8次循環)。你可以隨時打開達世幣配置窗口來修改。 - Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. + Obfuscate was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen. 匿名發送已成功設置為最高(%1到16次循環)。你可以隨時打開達世幣配置窗口來修改。 @@ -1142,11 +1142,11 @@ Address: %4 (0 表示程式自動決定，小於 0 表示保留處理器核心不用的數目) - Darksend rounds to use + Obfuscate rounds to use 匿名發送的循環次數 - This amount acts as a threshold to turn off Darksend once it's reached. + This amount acts as a threshold to turn off Obfuscate once it's reached. 此金額為關閉匿名發送的門檻。 @@ -1259,9 +1259,9 @@ Address: %4 Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ 缺少相關語言或翻譯不完整？請到這裡協助翻譯 -https://www.transifex.com/projects/p/dash/ +https://www.transifex.com/projects/p/darknet/ User Interface Theme: @@ -1419,7 +1419,7 @@ https://www.transifex.com/projects/p/dash/ 完成度: - Darksend Balance: + Obfuscate Balance: 匿名發送餘額: @@ -1427,7 +1427,7 @@ https://www.transifex.com/projects/p/dash/ 金額和循環次數: - 0 DASH / 0 Rounds + 0 DNET / 0 Rounds 0 達世幣 / 0 循環次數 @@ -1439,7 +1439,7 @@ https://www.transifex.com/projects/p/dash/ 不適用 - Darksend + Obfuscate 匿名發送 @@ -1459,7 +1459,7 @@ https://www.transifex.com/projects/p/dash/ (最近一次信息) - Try to manually submit a Darksend request. + Try to manually submit a Obfuscate request. 嘗試手動提交匿名發送請求。 @@ -1467,7 +1467,7 @@ https://www.transifex.com/projects/p/dash/ 嘗試混合 - Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!) + Reset the current status of Obfuscate (can interrupt Obfuscate if it's in the process of Mixing, which can cost you money!) 重置目前匿名發送狀態(此操作可能會影響您目前正在執行的混合過程，並且產生費用!) @@ -1483,11 +1483,11 @@ https://www.transifex.com/projects/p/dash/ 己禁用 - Start Darksend Mixing + Start Obfuscate Mixing 開始匿名發送混合 - Stop Darksend Mixing + Stop Obfuscate Mixing 停止匿名發送混合 @@ -1527,7 +1527,7 @@ https://www.transifex.com/projects/p/dash/ 己啟用 - Last Darksend message: + Last Obfuscate message: 最近收到的匿名發送訊息: @@ -1537,7 +1537,7 @@ https://www.transifex.com/projects/p/dash/ 不適用 - Darksend was successfully reset. + Obfuscate was successfully reset. 匿名發送成功重置。 @@ -1548,7 +1548,7 @@ https://www.transifex.com/projects/p/dash/ 要求付款時發生錯誤 - Cannot start dash: click-to-pay handler + Cannot start darknet: click-to-pay handler 無法啟動達世幣 : 點擊支付處理程序 @@ -2264,7 +2264,7 @@ https://www.transifex.com/projects/p/dash/ 如果自訂手續費設定為 1000 duffs ，而交易資料大小只有 250 個位元組的話，那麽選擇「每千位元組」就只會付 250 duffs 的手續費，<br />而「總共至少」會支付 1000 duffs。但是如果交易資料大小超過一千個位元組，那麽兩者都是每千位元組的費用。 - Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process. + Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for darknet transactions than the network can process. 當交易量少於區塊可容納的空間時，只付最低手續費不會有什麽問題。<br />但是當交易量的需求成長到超過整體網路可以處理的量時，可能會造成一筆一直不會被確認的交易。 @@ -2336,11 +2336,11 @@ https://www.transifex.com/projects/p/dash/ 增加收款人(&R) - Darksend + Obfuscate 匿名發送 - InstantX + SwiftTX 即時到帳 @@ -2380,7 +2380,7 @@ https://www.transifex.com/projects/p/dash/ 複製找零金額 - and InstantX + and SwiftTX 和 即時到帳 @@ -2507,7 +2507,7 @@ https://www.transifex.com/projects/p/dash/ 訊息: - A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. + A message that was attached to the darknet: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network. 附加在達世幣付款協議 URI 中的訊息，會和交易內容一起存起來，給你自己做參考。注意: 這個訊息不會送到達世幣網路上。 @@ -2726,15 +2726,15 @@ https://www.transifex.com/projects/p/dash/ 發生衝突 - %1/offline (verified via instantx) + %1/offline (verified via swifttx) %1 次/離線 (經即時到帳系統核實) - %1/confirmed (verified via instantx) + %1/confirmed (verified via swifttx) %1 次/確認 (經即時到帳系統核實) - %1 confirmations (verified via instantx) + %1 confirmations (verified via swifttx) 確認 %1 次 (經即時到帳系統核實) @@ -2750,23 +2750,23 @@ https://www.transifex.com/projects/p/dash/ 確認 %1 次 - %1/offline (InstantX verification in progress - %2 of %3 signatures) + %1/offline (SwiftTX verification in progress - %2 of %3 signatures) %1 次/離線 (即時到帳系統正在進行核實- 共 %3 個簽署中的 %2 個 ) - %1/confirmed (InstantX verification in progress - %2 of %3 signatures ) + %1/confirmed (SwiftTX verification in progress - %2 of %3 signatures ) %1 次/已確認 (即時到帳系統正在進行核實- 共 %3 個簽署中的 %2 個 ) - %1 confirmations (InstantX verification in progress - %2 of %3 signatures) + %1 confirmations (SwiftTX verification in progress - %2 of %3 signatures) %1 次確認 (即時到帳系統正在進行核實- 共 %3 個簽署中的 %2 個 ) - %1/offline (InstantX verification failed) + %1/offline (SwiftTX verification failed) %1 次/離線 (即時到帳系統未能核實) - %1/confirmed (InstantX verification failed) + %1/confirmed (SwiftTX verification failed) %1 次/已確認 (即時到帳系統未能核實) @@ -2960,7 +2960,7 @@ https://www.transifex.com/projects/p/dash/ 收款來自 - Received via Darksend + Received via Obfuscate 經由匿名發送收到 @@ -3180,8 +3180,8 @@ https://www.transifex.com/projects/p/dash/ 付款 - InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH. - 即時到帳系統暫時並不支援這麼高的交易金額。目前的金額僅限於%1 DASH。 + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 DNET. + 即時到帳系統暫時並不支援這麼高的交易金額。目前的金額僅限於%1 DNET。 @@ -3220,7 +3220,7 @@ https://www.transifex.com/projects/p/dash/ - dash-core + darknet-core Bind to given address and always listen on it. Use [host]:port notation for IPv6 和指定的位址繫結，並且一直在指定位址聽候連線。IPv6 請用 [主機]:通訊埠 這種格式 @@ -3242,7 +3242,7 @@ https://www.transifex.com/projects/p/dash/ 當最新區塊改變時要執行的指令(指令中的 %s 會被取代成區塊雜湊值) - InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. + SwiftTX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again. 即時到帳系統要求輸入的資金最少要有6個確認，你可能需要等待數分鐘然後再重試。 @@ -3330,7 +3330,7 @@ https://www.transifex.com/projects/p/dash/ 發現區塊資料庫壞掉了 - Darksend options: + Obfuscate options: 匿名發送選項: @@ -3394,7 +3394,7 @@ https://www.transifex.com/projects/p/dash/ 錯誤: 錢包被鎖定，無法創建交易！ - Error: You already have pending entries in the Darksend pool + Error: You already have pending entries in the Obfuscate pool 錯誤: 你已經有待處理項目在匿名發送資金池中 @@ -3438,11 +3438,11 @@ https://www.transifex.com/projects/p/dash/ 錯誤: 找到不再支援的 -socks 參數。現在只支援 SOCKS5 協定的代理伺服器了，因為不再能夠指定 SOCKS 協定版本。 - Fees (in DASH/Kb) smaller than this are considered zero fee for relaying (default: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for relaying (default: %s) 當處理轉發的交易時，如果每千位元組(Kb)的手續費比這個值低，就視為沒付手續費 (預設值: %s) - Fees (in DASH/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Fees (in DNET/Kb) smaller than this are considered zero fee for transaction creation (default: %s) 當建立交易時，如果每千位元組(Kb)的手續費比這個值低，就視為沒付手續費 (預設值: %s) @@ -3538,15 +3538,15 @@ https://www.transifex.com/projects/p/dash/ 沒辦法解析 -rpcbind 參數值 %s 為網路位址 - Darksend is idle. + Obfuscate is idle. 匿名發送處於閒置狀態。 - Darksend request complete: + Obfuscate request complete: 完成匿名發送請求: - Darksend request incomplete: + Obfuscate request incomplete: 未完成匿名發送請求: @@ -3582,7 +3582,7 @@ https://www.transifex.com/projects/p/dash/ 資訊 - InstantX options: + SwiftTX options: 即時到帳選項: diff --git a/src/qt/macnotificationhandler.mm b/src/qt/macnotificationhandler.mm index 0a342d98a609b..e2e66040426f0 100644 --- a/src/qt/macnotificationhandler.mm +++ b/src/qt/macnotificationhandler.mm @@ -13,7 +13,7 @@ @implementation NSBundle(returnCorrectIdentifier) - (NSString *)__bundleIdentifier { if (self == [NSBundle mainBundle]) { - return @"io.dashpay.Dash-Qt"; + return @"io.darknetpay.Dash-Qt"; } else { return [self __bundleIdentifier]; } diff --git a/src/qt/notificator.h b/src/qt/notificator.h index 471675a685c1c..7f1152d940557 100644 --- a/src/qt/notificator.h +++ b/src/qt/notificator.h @@ -6,7 +6,7 @@ #define BITCOIN_QT_NOTIFICATOR_H #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #endif #include diff --git a/src/qt/obfuscateconfig.cpp b/src/qt/obfuscateconfig.cpp new file mode 100644 index 0000000000000..00bf90114a717 --- /dev/null +++ b/src/qt/obfuscateconfig.cpp @@ -0,0 +1,91 @@ +#include "obfuscateconfig.h" +#include "ui_obfuscateconfig.h" + +#include "bitcoinunits.h" +#include "guiconstants.h" +#include "optionsmodel.h" +#include "walletmodel.h" +#include "init.h" + +#include +#include +#include +#include + +ObfuscateConfig::ObfuscateConfig(QWidget *parent) : + QDialog(parent), + ui(new Ui::ObfuscateConfig), + model(0) +{ + ui->setupUi(this); + + connect(ui->buttonBasic, SIGNAL(clicked()), this, SLOT(clickBasic())); + connect(ui->buttonHigh, SIGNAL(clicked()), this, SLOT(clickHigh())); + connect(ui->buttonMax, SIGNAL(clicked()), this, SLOT(clickMax())); +} + +ObfuscateConfig::~ObfuscateConfig() +{ + delete ui; +} + +void ObfuscateConfig::setModel(WalletModel *model) +{ + this->model = model; +} + +void ObfuscateConfig::clickBasic() +{ + configure(true, 1000, 2); + + QString strAmount(BitcoinUnits::formatWithUnit( + model->getOptionsModel()->getDisplayUnit(), 10000 * COIN)); + QMessageBox::information(this, tr("Obfuscate Configuration"), + tr( + "Obfuscate was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening DarkNet's configuration screen." + ).arg(strAmount) + ); + + close(); +} + +void ObfuscateConfig::clickHigh() +{ + configure(true, 1000, 8); + + QString strAmount(BitcoinUnits::formatWithUnit( + model->getOptionsModel()->getDisplayUnit(), 10000 * COIN)); + QMessageBox::information(this, tr("Obfuscate Configuration"), + tr( + "Obfuscate was successfully set to high (%1 and 8 rounds). You can change this at any time by opening DarkNet's configuration screen." + ).arg(strAmount) + ); + + close(); +} + +void ObfuscateConfig::clickMax() +{ + configure(true, 1000, 16); + + QString strAmount(BitcoinUnits::formatWithUnit( + model->getOptionsModel()->getDisplayUnit(), 10000 * COIN)); + QMessageBox::information(this, tr("Obfuscate Configuration"), + tr( + "Obfuscate was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening DarkNet's configuration screen." + ).arg(strAmount) + ); + + close(); +} + +void ObfuscateConfig::configure(bool enabled, int coins, int rounds) { + + QSettings settings; + + settings.setValue("nObfuscateRounds", rounds); + settings.setValue("nAnonymizeDarkcoinAmount", coins); + + nObfuscateRounds = rounds; + nAnonymizeDarkcoinAmount = coins; +} diff --git a/src/qt/darksendconfig.h b/src/qt/obfuscateconfig.h similarity index 75% rename from src/qt/darksendconfig.h rename to src/qt/obfuscateconfig.h index 788602fb9eec3..8a533f1c6f01c 100644 --- a/src/qt/darksendconfig.h +++ b/src/qt/obfuscateconfig.h @@ -4,26 +4,26 @@ #include namespace Ui { - class DarksendConfig; + class ObfuscateConfig; } class WalletModel; /** Multifunctional dialog to ask for passphrases. Used for encryption, unlocking, and changing the passphrase. */ -class DarksendConfig : public QDialog +class ObfuscateConfig : public QDialog { Q_OBJECT public: - DarksendConfig(QWidget *parent = 0); - ~DarksendConfig(); + ObfuscateConfig(QWidget *parent = 0); + ~ObfuscateConfig(); void setModel(WalletModel *model); private: - Ui::DarksendConfig *ui; + Ui::ObfuscateConfig *ui; WalletModel *model; void configure(bool enabled, int coins, int rounds); diff --git a/src/qt/openuridialog.cpp b/src/qt/openuridialog.cpp index 08ac80fb247a7..2232b2d055fa1 100644 --- a/src/qt/openuridialog.cpp +++ b/src/qt/openuridialog.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -17,7 +18,7 @@ OpenURIDialog::OpenURIDialog(QWidget *parent) : { ui->setupUi(this); #if QT_VERSION >= 0x040700 - ui->uriEdit->setPlaceholderText("dash:"); + ui->uriEdit->setPlaceholderText("darknet:"); #endif } @@ -49,5 +50,5 @@ void OpenURIDialog::on_selectFileButton_clicked() if(filename.isEmpty()) return; QUrl fileUri = QUrl::fromLocalFile(filename); - ui->uriEdit->setText("dash:?r=" + QUrl::toPercentEncoding(fileUri.toString())); + ui->uriEdit->setText("darknet:?r=" + QUrl::toPercentEncoding(fileUri.toString())); } diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index d1b30399d2da3..d117f6ba63e33 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #endif #include "optionsdialog.h" @@ -12,7 +12,7 @@ #include "bitcoinunits.h" #include "guiutil.h" #include "optionsmodel.h" -#include "darksend.h" +#include "obfuscate.h" #include "main.h" // for MAX_SCRIPTCHECK_THREADS #include "netbase.h" @@ -82,8 +82,10 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) : } /* Theme selector */ - ui->theme->addItem(QString("DASH-blue"), QVariant("drkblue")); - ui->theme->addItem(QString("DASH-traditional"), QVariant("trad")); + ui->theme->addItem(QString("DNET-dark"), QVariant("drk")); + ui->theme->addItem(QString("DNET-dark-1"), QVariant("drk-1")); + ui->theme->addItem(QString("DNET-blue"), QVariant("drkblue")); + ui->theme->addItem(QString("DNET-traditional"), QVariant("trad")); /* Language selector */ @@ -207,8 +209,8 @@ void OptionsDialog::setMapper() mapper->addMapping(ui->thirdPartyTxUrls, OptionsModel::ThirdPartyTxUrls); - /* Darksend Rounds */ - mapper->addMapping(ui->darksendRounds, OptionsModel::DarksendRounds); + /* Obfuscate Rounds */ + mapper->addMapping(ui->obfuscateRounds, OptionsModel::ObfuscateRounds); mapper->addMapping(ui->anonymizeDarkcoin, OptionsModel::AnonymizeDarkcoinAmount); } diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index e2f15ae74075a..1347b94e62ccb 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -1,10 +1,11 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #endif #include "optionsmodel.h" @@ -60,7 +61,7 @@ void OptionsModel::Init() // Display if (!settings.contains("nDisplayUnit")) - settings.setValue("nDisplayUnit", BitcoinUnits::DASH); + settings.setValue("nDisplayUnit", BitcoinUnits::DNET); nDisplayUnit = settings.value("nDisplayUnit").toInt(); if (!settings.contains("strThirdPartyTxUrls")) @@ -71,13 +72,13 @@ void OptionsModel::Init() settings.setValue("fCoinControlFeatures", false); fCoinControlFeatures = settings.value("fCoinControlFeatures", false).toBool(); - if (!settings.contains("nDarksendRounds")) - settings.setValue("nDarksendRounds", 2); + if (!settings.contains("nObfuscateRounds")) + settings.setValue("nObfuscateRounds", 2); if (!settings.contains("nAnonymizeDarkcoinAmount")) settings.setValue("nAnonymizeDarkcoinAmount", 1000); - nDarksendRounds = settings.value("nDarksendRounds").toLongLong(); + nObfuscateRounds = settings.value("nObfuscateRounds").toLongLong(); nAnonymizeDarkcoinAmount = settings.value("nAnonymizeDarkcoinAmount").toLongLong(); // These are shared with the core or have a command-line parameter @@ -138,10 +139,10 @@ void OptionsModel::Init() if (!SoftSetArg("-lang", settings.value("language").toString().toStdString())) addOverriddenOption("-lang"); - if (settings.contains("nDarksendRounds")) - SoftSetArg("-darksendrounds", settings.value("nDarksendRounds").toString().toStdString()); - if (settings.contains("nAnonymizeDarkcoinAmount")) - SoftSetArg("-anonymizedashamount", settings.value("nAnonymizeDarkcoinAmount").toString().toStdString()); + if (settings.contains("nObfuscateRounds")) + SoftSetArg("-obfuscaterounds", settings.value("nObfuscateRounds").toString().toStdString()); + if (settings.contains("nAnonymizeDarkNetAmount")) + SoftSetArg("-anonymizedarknetamount", settings.value("nAnonymizeDarkNetAmount").toString().toStdString()); language = settings.value("language").toString(); } @@ -152,7 +153,7 @@ void OptionsModel::Reset() // Remove all entries from our QSettings object settings.clear(); - resetSettings = true; // Needed in dash.cpp during shotdown to also remove the window positions + resetSettings = true; // Needed in darknet.cpp during shotdown to also remove the window positions // default setting for OptionsModel::StartAtStartup - disabled if (GUIUtil::GetStartOnSystemStartup()) @@ -219,8 +220,8 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const return settings.value("nDatabaseCache"); case ThreadsScriptVerif: return settings.value("nThreadsScriptVerif"); - case DarksendRounds: - return QVariant(nDarksendRounds); + case ObfuscateRounds: + return QVariant(nObfuscateRounds); case AnonymizeDarkcoinAmount: return QVariant(nAnonymizeDarkcoinAmount); case Listen: @@ -324,10 +325,10 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in setRestartRequired(true); } break; - case DarksendRounds: - nDarksendRounds = value.toInt(); - settings.setValue("nDarksendRounds", nDarksendRounds); - emit darksendRoundsChanged(nDarksendRounds); + case ObfuscateRounds: + nObfuscateRounds = value.toInt(); + settings.setValue("nObfuscateRounds", nObfuscateRounds); + emit obfuscateRoundsChanged(nObfuscateRounds); break; case AnonymizeDarkcoinAmount: nAnonymizeDarkcoinAmount = value.toInt(); diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h index 4bd7d698c2ecb..6167c9c90ce2d 100644 --- a/src/qt/optionsmodel.h +++ b/src/qt/optionsmodel.h @@ -43,7 +43,7 @@ class OptionsModel : public QAbstractListModel ThreadsScriptVerif, // int DatabaseCache, // int SpendZeroConfChange, // bool - DarksendRounds, // int + ObfuscateRounds, // int AnonymizeDarkcoinAmount, //int Listen, // bool OptionIDRowCount, @@ -88,7 +88,7 @@ class OptionsModel : public QAbstractListModel signals: void displayUnitChanged(int unit); - void darksendRoundsChanged(int); + void obfuscateRoundsChanged(int); void anonymizeDarkcoinAmountChanged(int); void coinControlFeaturesChanged(bool); }; diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index e5d19950a6db7..58bbd7a073c9e 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -8,8 +8,8 @@ #include "bitcoinunits.h" #include "clientmodel.h" -#include "darksend.h" -#include "darksendconfig.h" +#include "obfuscate.h" +#include "obfuscateconfig.h" #include "guiconstants.h" #include "guiutil.h" #include "optionsmodel.h" @@ -31,7 +31,7 @@ class TxViewDelegate : public QAbstractItemDelegate { Q_OBJECT public: - TxViewDelegate(): QAbstractItemDelegate(), unit(BitcoinUnits::DASH) + TxViewDelegate(): QAbstractItemDelegate(), unit(BitcoinUnits::DNET) { } @@ -138,22 +138,22 @@ OverviewPage::OverviewPage(QWidget *parent) : // init "out of sync" warning labels ui->labelWalletStatus->setText("(" + tr("out of sync") + ")"); - ui->labelDarksendSyncStatus->setText("(" + tr("out of sync") + ")"); + ui->labelObfuscateSyncStatus->setText("(" + tr("out of sync") + ")"); ui->labelTransactionsStatus->setText("(" + tr("out of sync") + ")"); if(fLiteMode){ - ui->frameDarksend->setVisible(false); + ui->frameObfuscate->setVisible(false); } else { if(fMasterNode){ - ui->toggleDarksend->setText("(" + tr("Disabled") + ")"); - ui->darksendAuto->setText("(" + tr("Disabled") + ")"); - ui->darksendReset->setText("(" + tr("Disabled") + ")"); - ui->frameDarksend->setEnabled(false); + ui->toggleObfuscate->setText("(" + tr("Disabled") + ")"); + ui->obfuscateAuto->setText("(" + tr("Disabled") + ")"); + ui->obfuscateReset->setText("(" + tr("Disabled") + ")"); + ui->frameObfuscate->setEnabled(false); } else { - if(!fEnableDarksend){ - ui->toggleDarksend->setText(tr("Start Darksend Mixing")); + if(!fEnableObfuscate){ + ui->toggleObfuscate->setText(tr("Start Obfuscate Mixing")); } else { - ui->toggleDarksend->setText(tr("Stop Darksend Mixing")); + ui->toggleObfuscate->setText(tr("Stop Obfuscate Mixing")); } timer = new QTimer(this); connect(timer, SIGNAL(timeout()), this, SLOT(darkSendStatus())); @@ -206,7 +206,7 @@ void OverviewPage::setBalance(const CAmount& balance, const CAmount& unconfirmed ui->labelImmatureText->setVisible(showImmature || showWatchOnlyImmature); ui->labelWatchImmature->setVisible(showWatchOnlyImmature); // show watch-only immature balance - updateDarksendProgress(); + updateObfuscateProgress(); static int cachedTxLocks = 0; @@ -272,14 +272,14 @@ void OverviewPage::setWalletModel(WalletModel *model) connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit())); - connect(ui->darksendAuto, SIGNAL(clicked()), this, SLOT(darksendAuto())); - connect(ui->darksendReset, SIGNAL(clicked()), this, SLOT(darksendReset())); - connect(ui->toggleDarksend, SIGNAL(clicked()), this, SLOT(toggleDarksend())); + connect(ui->obfuscateAuto, SIGNAL(clicked()), this, SLOT(obfuscateAuto())); + connect(ui->obfuscateReset, SIGNAL(clicked()), this, SLOT(obfuscateReset())); + connect(ui->toggleObfuscate, SIGNAL(clicked()), this, SLOT(toggleObfuscate())); updateWatchOnlyLabels(model->haveWatchOnly()); connect(model, SIGNAL(notifyWatchonlyChanged(bool)), this, SLOT(updateWatchOnlyLabels(bool))); } - // update the display unit, to not use the default ("DASH") + // update the display unit, to not use the default ("DNET") updateDisplayUnit(); } @@ -308,11 +308,11 @@ void OverviewPage::updateAlerts(const QString &warnings) void OverviewPage::showOutOfSyncWarning(bool fShow) { ui->labelWalletStatus->setVisible(fShow); - ui->labelDarksendSyncStatus->setVisible(fShow); + ui->labelObfuscateSyncStatus->setVisible(fShow); ui->labelTransactionsStatus->setVisible(fShow); } -void OverviewPage::updateDarksendProgress() +void OverviewPage::updateObfuscateProgress() { if(!masternodeSync.IsBlockchainSynced() || ShutdownRequested()) return; @@ -323,12 +323,12 @@ void OverviewPage::updateDarksendProgress() if(currentBalance == 0) { - ui->darksendProgress->setValue(0); - ui->darksendProgress->setToolTip(tr("No inputs detected")); + ui->obfuscateProgress->setValue(0); + ui->obfuscateProgress->setToolTip(tr("No inputs detected")); // when balance is zero just show info from settings strAnonymizeDarkcoinAmount = strAnonymizeDarkcoinAmount.remove(strAnonymizeDarkcoinAmount.indexOf("."), BitcoinUnits::decimals(nDisplayUnit) + 1); - strAmountAndRounds = strAnonymizeDarkcoinAmount + " / " + tr("%n Rounds", "", nDarksendRounds); + strAmountAndRounds = strAnonymizeDarkcoinAmount + " / " + tr("%n Rounds", "", nObfuscateRounds); ui->labelAmountRounds->setToolTip(tr("No inputs detected")); ui->labelAmountRounds->setText(strAmountAndRounds); @@ -363,7 +363,7 @@ void OverviewPage::updateDarksendProgress() ui->labelAmountRounds->setToolTip(tr("Found enough compatible inputs to anonymize %1") .arg(strAnonymizeDarkcoinAmount)); strAnonymizeDarkcoinAmount = strAnonymizeDarkcoinAmount.remove(strAnonymizeDarkcoinAmount.indexOf("."), BitcoinUnits::decimals(nDisplayUnit) + 1); - strAmountAndRounds = strAnonymizeDarkcoinAmount + " / " + tr("%n Rounds", "", nDarksendRounds); + strAmountAndRounds = strAnonymizeDarkcoinAmount + " / " + tr("%n Rounds", "", nObfuscateRounds); } else { QString strMaxToAnonymize = BitcoinUnits::formatHtmlWithUnit(nDisplayUnit, nMaxToAnonymize, false, BitcoinUnits::separatorAlways); ui->labelAmountRounds->setToolTip(tr("Not enough compatible inputs to anonymize %1,
" @@ -373,7 +373,7 @@ void OverviewPage::updateDarksendProgress() strMaxToAnonymize = strMaxToAnonymize.remove(strMaxToAnonymize.indexOf("."), BitcoinUnits::decimals(nDisplayUnit) + 1); strAmountAndRounds = "" + QString(BitcoinUnits::factor(nDisplayUnit) == 1 ? "" : "~") + strMaxToAnonymize + - " / " + tr("%n Rounds", "", nDarksendRounds) + ""; + " / " + tr("%n Rounds", "", nObfuscateRounds) + ""; } ui->labelAmountRounds->setText(strAmountAndRounds); @@ -400,7 +400,7 @@ void OverviewPage::updateDarksendProgress() // apply some weights to them ... float denomWeight = 1; - float anonNormWeight = nDarksendRounds; + float anonNormWeight = nObfuscateRounds; float anonFullWeight = 2; float fullWeight = denomWeight + anonNormWeight + anonFullWeight; // ... and calculate the whole progress @@ -410,16 +410,16 @@ void OverviewPage::updateDarksendProgress() float progress = denomPartCalc + anonNormPartCalc + anonFullPartCalc; if(progress >= 100) progress = 100; - ui->darksendProgress->setValue(progress); + ui->obfuscateProgress->setValue(progress); QString strToolPip = ("" + tr("Overall progress") + ": %1%
" + tr("Denominated") + ": %2%
" + tr("Mixed") + ": %3%
" + tr("Anonymized") + ": %4%
" + - tr("Denominated inputs have %5 of %n rounds on average", "", nDarksendRounds)) + tr("Denominated inputs have %5 of %n rounds on average", "", nObfuscateRounds)) .arg(progress).arg(denomPart).arg(anonNormPart).arg(anonFullPart) .arg(nAverageAnonymizedRounds); - ui->darksendProgress->setToolTip(strToolPip); + ui->obfuscateProgress->setToolTip(strToolPip); } @@ -433,38 +433,38 @@ void OverviewPage::darkSendStatus() if(((nBestHeight - darkSendPool.cachedNumBlocks) / (GetTimeMillis() - nLastDSProgressBlockTime + 1) > 1)) return; nLastDSProgressBlockTime = GetTimeMillis(); - if(!fEnableDarksend) { + if(!fEnableObfuscate) { if(nBestHeight != darkSendPool.cachedNumBlocks) { darkSendPool.cachedNumBlocks = nBestHeight; - updateDarksendProgress(); + updateObfuscateProgress(); - ui->darksendEnabled->setText(tr("Disabled")); - ui->darksendStatus->setText(""); - ui->toggleDarksend->setText(tr("Start Darksend Mixing")); + ui->obfuscateEnabled->setText(tr("Disabled")); + ui->obfuscateStatus->setText(""); + ui->toggleObfuscate->setText(tr("Start Obfuscate Mixing")); } return; } - // check darksend status and unlock if needed + // check obfuscate status and unlock if needed if(nBestHeight != darkSendPool.cachedNumBlocks) { // Balance and number of transactions might have changed darkSendPool.cachedNumBlocks = nBestHeight; - updateDarksendProgress(); + updateObfuscateProgress(); - ui->darksendEnabled->setText(tr("Enabled")); + ui->obfuscateEnabled->setText(tr("Enabled")); } QString strStatus = QString(darkSendPool.GetStatus().c_str()); - QString s = tr("Last Darksend message:\n") + strStatus; + QString s = tr("Last Obfuscate message:\n") + strStatus; - if(s != ui->darksendStatus->text()) - LogPrintf("Last Darksend message: %s\n", strStatus.toStdString()); + if(s != ui->obfuscateStatus->text()) + LogPrintf("Last Obfuscate message: %s\n", strStatus.toStdString()); - ui->darksendStatus->setText(s); + ui->obfuscateStatus->setText(s); if(darkSendPool.sessionDenom == 0){ ui->labelSubmittedDenom->setText(tr("N/A")); @@ -477,35 +477,35 @@ void OverviewPage::darkSendStatus() } -void OverviewPage::darksendAuto(){ +void OverviewPage::obfuscateAuto(){ darkSendPool.DoAutomaticDenominating(); } -void OverviewPage::darksendReset(){ +void OverviewPage::obfuscateReset(){ darkSendPool.Reset(); - QMessageBox::warning(this, tr("Darksend"), - tr("Darksend was successfully reset."), + QMessageBox::warning(this, tr("Obfuscate"), + tr("Obfuscate was successfully reset."), QMessageBox::Ok, QMessageBox::Ok); } -void OverviewPage::toggleDarksend(){ +void OverviewPage::toggleObfuscate(){ QSettings settings; // Popup some information on first mixing QString hasMixed = settings.value("hasMixed").toString(); if(hasMixed.isEmpty()){ - QMessageBox::information(this, tr("Darksend"), - tr("If you don't want to see internal Darksend fees/transactions select \"Most Common\" as Type on the \"Transactions\" tab."), + QMessageBox::information(this, tr("Obfuscate"), + tr("If you don't want to see internal Obfuscate fees/transactions select \"Most Common\" as Type on the \"Transactions\" tab."), QMessageBox::Ok, QMessageBox::Ok); settings.setValue("hasMixed", "hasMixed"); } - if(!fEnableDarksend){ + if(!fEnableObfuscate){ int64_t balance = currentBalance; - float minAmount = 1.49 * COIN; + float minAmount = 14.90 * COIN; if(balance < minAmount){ QString strMinAmount(BitcoinUnits::formatWithUnit(nDisplayUnit, minAmount)); - QMessageBox::warning(this, tr("Darksend"), - tr("Darksend requires at least %1 to use.").arg(strMinAmount), + QMessageBox::warning(this, tr("Obfuscate"), + tr("Obfuscate requires at least %1 to use.").arg(strMinAmount), QMessageBox::Ok, QMessageBox::Ok); return; } @@ -518,29 +518,29 @@ void OverviewPage::toggleDarksend(){ { //unlock was cancelled darkSendPool.cachedNumBlocks = std::numeric_limits::max(); - QMessageBox::warning(this, tr("Darksend"), - tr("Wallet is locked and user declined to unlock. Disabling Darksend."), + QMessageBox::warning(this, tr("Obfuscate"), + tr("Wallet is locked and user declined to unlock. Disabling Obfuscate."), QMessageBox::Ok, QMessageBox::Ok); - if (fDebug) LogPrintf("Wallet is locked and user declined to unlock. Disabling Darksend.\n"); + if (fDebug) LogPrintf("Wallet is locked and user declined to unlock. Disabling Obfuscate.\n"); return; } } } - fEnableDarksend = !fEnableDarksend; + fEnableObfuscate = !fEnableObfuscate; darkSendPool.cachedNumBlocks = std::numeric_limits::max(); - if(!fEnableDarksend){ - ui->toggleDarksend->setText(tr("Start Darksend Mixing")); + if(!fEnableObfuscate){ + ui->toggleObfuscate->setText(tr("Start Obfuscate Mixing")); darkSendPool.UnlockCoins(); } else { - ui->toggleDarksend->setText(tr("Stop Darksend Mixing")); + ui->toggleObfuscate->setText(tr("Stop Obfuscate Mixing")); - /* show darksend configuration if client has defaults set */ + /* show obfuscate configuration if client has defaults set */ if(nAnonymizeDarkcoinAmount == 0){ - DarksendConfig dlg(this); + ObfuscateConfig dlg(this); dlg.setModel(walletModel); dlg.exec(); } diff --git a/src/qt/overviewpage.h b/src/qt/overviewpage.h index d73d144cf1e46..893922017098a 100644 --- a/src/qt/overviewpage.h +++ b/src/qt/overviewpage.h @@ -34,7 +34,7 @@ class OverviewPage : public QWidget void setClientModel(ClientModel *clientModel); void setWalletModel(WalletModel *walletModel); void showOutOfSyncWarning(bool fShow); - void updateDarksendProgress(); + void updateObfuscateProgress(); public slots: void darkSendStatus(); @@ -62,9 +62,9 @@ public slots: TransactionFilterProxy *filter; private slots: - void toggleDarksend(); - void darksendAuto(); - void darksendReset(); + void toggleObfuscate(); + void obfuscateAuto(); + void obfuscateReset(); void updateDisplayUnit(); void handleTransactionClicked(const QModelIndex &index); void updateAlerts(const QString &warnings); diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index e08e628841c11..cb22f5d047a12 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -51,14 +52,14 @@ using namespace boost; using namespace std; const int BITCOIN_IPC_CONNECT_TIMEOUT = 1000; // milliseconds -const QString BITCOIN_IPC_PREFIX("dash:"); +const QString BITCOIN_IPC_PREFIX("darknet:"); // BIP70 payment protocol messages const char* BIP70_MESSAGE_PAYMENTACK = "PaymentACK"; const char* BIP70_MESSAGE_PAYMENTREQUEST = "PaymentRequest"; // BIP71 payment protocol media types -const char* BIP71_MIMETYPE_PAYMENT = "application/dash-payment"; -const char* BIP71_MIMETYPE_PAYMENTACK = "application/dash-paymentack"; -const char* BIP71_MIMETYPE_PAYMENTREQUEST = "application/dash-paymentrequest"; +const char* BIP71_MIMETYPE_PAYMENT = "application/darknet-payment"; +const char* BIP71_MIMETYPE_PAYMENTACK = "application/darknet-paymentack"; +const char* BIP71_MIMETYPE_PAYMENTREQUEST = "application/darknet-paymentrequest"; // BIP70 max payment request size in bytes (DoS protection) const qint64 BIP70_MAX_PAYMENTREQUEST_SIZE = 50000; @@ -79,7 +80,7 @@ void PaymentServer::freeCertStore() // static QString ipcServerName() { - QString name("DashQt"); + QString name("DarkNetQt"); // Append a simple hash of the datadir // Note that GetDataDir(true) returns a different path @@ -199,11 +200,11 @@ void PaymentServer::ipcParseCommandLine(int argc, char* argv[]) if (arg.startsWith("-")) continue; - // If the dash: URI contains a payment request, we are not able to detect the + // If the darknet: URI contains a payment request, we are not able to detect the // network as that would require fetching and parsing the payment request. // That means clicking such an URI which contains a testnet payment request // will start a mainnet instance and throw a "wrong network" error. - if (arg.startsWith(BITCOIN_IPC_PREFIX, Qt::CaseInsensitive)) // dash: URI + if (arg.startsWith(BITCOIN_IPC_PREFIX, Qt::CaseInsensitive)) // darknet: URI { savedPaymentRequests.append(arg); @@ -299,7 +300,7 @@ PaymentServer::PaymentServer(QObject* parent, bool startLocalServer) : GOOGLE_PROTOBUF_VERIFY_VERSION; // Install global event filter to catch QFileOpenEvents - // on Mac: sent when you click dash: links + // on Mac: sent when you click darknet: links // other OSes: helpful when dealing with payment request files (in the future) if (parent) parent->installEventFilter(this); @@ -316,7 +317,7 @@ PaymentServer::PaymentServer(QObject* parent, bool startLocalServer) : if (!uriServer->listen(name)) { // constructor is called early in init, so don't use "emit message()" here QMessageBox::critical(0, tr("Payment request error"), - tr("Cannot start dash: click-to-pay handler")); + tr("Cannot start darknet: click-to-pay handler")); } else { connect(uriServer, SIGNAL(newConnection()), this, SLOT(handleURIConnection())); @@ -331,12 +332,12 @@ PaymentServer::~PaymentServer() } // -// OSX-specific way of handling dash: URIs and +// OSX-specific way of handling darknet: URIs and // PaymentRequest mime types // bool PaymentServer::eventFilter(QObject *object, QEvent *event) { - // clicking on dash: URIs creates FileOpen events on the Mac + // clicking on darknet: URIs creates FileOpen events on the Mac if (event->type() == QEvent::FileOpen) { QFileOpenEvent *fileEvent = static_cast(event); @@ -358,7 +359,7 @@ void PaymentServer::initNetManager() if (netManager != NULL) delete netManager; - // netManager is used to fetch paymentrequests given in dash: URIs + // netManager is used to fetch paymentrequests given in darknet: URIs netManager = new QNetworkAccessManager(this); QNetworkProxy proxy; @@ -398,7 +399,7 @@ void PaymentServer::handleURIOrFile(const QString& s) return; } - if (s.startsWith(BITCOIN_IPC_PREFIX, Qt::CaseInsensitive)) // dash: URI + if (s.startsWith(BITCOIN_IPC_PREFIX, Qt::CaseInsensitive)) // darknet: URI { #if QT_VERSION < 0x050000 QUrl uri(s); @@ -442,7 +443,7 @@ void PaymentServer::handleURIOrFile(const QString& s) } else emit message(tr("URI handling"), - tr("URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters."), + tr("URI cannot be parsed! This can be caused by an invalid DarkNet address or malformed URI parameters."), CClientUIInterface::ICON_WARNING); return; @@ -563,7 +564,7 @@ bool PaymentServer::processPaymentRequest(PaymentRequestPlus& request, SendCoins addresses.append(QString::fromStdString(CBitcoinAddress(dest).ToString())); } else if (!recipient.authenticatedMerchant.isEmpty()) { - // Insecure payments to custom dash addresses are not supported + // Insecure payments to custom darknet addresses are not supported // (there is no good way to tell the user where they are paying in a way // they'd have a chance of understanding). emit message(tr("Payment request rejected"), diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h index f17491db309c7..ef4402b0af559 100644 --- a/src/qt/paymentserver.h +++ b/src/qt/paymentserver.h @@ -6,7 +6,7 @@ #define BITCOIN_QT_PAYMENTSERVER_H // This class handles payment requests from clicking on -// dash: URIs +// darknet: URIs // // This is somewhat tricky, because we have to deal with // the situation where the user clicks on a link during diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp index 987a2fd41b558..4ba3e17248aff 100644 --- a/src/qt/receiverequestdialog.cpp +++ b/src/qt/receiverequestdialog.cpp @@ -22,7 +22,7 @@ #endif #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" /* for USE_QRCODE */ +#include "config/darknet-config.h" /* for USE_QRCODE */ #endif #ifdef USE_QRCODE diff --git a/src/qt/recentrequeststablemodel.h b/src/qt/recentrequeststablemodel.h index c678a2de88d6c..0a61e2a226a44 100644 --- a/src/qt/recentrequeststablemodel.h +++ b/src/qt/recentrequeststablemodel.h @@ -53,7 +53,7 @@ class RecentRequestEntryLessThan Qt::SortOrder order; }; -/** Model for list of recently generated payment requests / dash: URIs. +/** Model for list of recently generated payment requests / darknet: URIs. * Part of wallet model. */ class RecentRequestsTableModel: public QAbstractTableModel diff --git a/src/qt/res/css/drk-1.css b/src/qt/res/css/drk-1.css new file mode 100644 index 0000000000000..a83b1cdbf756e --- /dev/null +++ b/src/qt/res/css/drk-1.css @@ -0,0 +1,1707 @@ +WalletFrame { +border-image: url(':/images/drk-1_walletFrame_bg') 0 0 0 0 stretch stretch; +border-top:0px solid #000; +margin:0; +padding:0; +} + +QStatusBar { +background-color:#ffffff; +} + +.QFrame { +background-color:transparent; +border:0px solid #fff; +} + +QMenuBar { +background-color:#fff; +} + +QMenuBar::item { +background-color:#fff; +} + +QMenuBar::item:selected { +background-color:#f8f6f6; +} + +QMenu { +background-color:#f8f6f6; +} + +QMenu::item { +color:#333; +} + +QMenu::item:selected { +background-color:#f2f0f0; +color:#333; +} + +QToolBar { +background-color:#9e0a0a; +border:0px solid #000; +padding:0; +margin:0; +} + +QToolBar > QToolButton { +background-color:#9e0a0a; +border:0px solid #333; +min-height:2.5em; +padding: 0em 1em; +font-weight:bold; +color:#fff; +} + +QToolBar > QToolButton:checked { +background-color:#fff; +color:#999999; /* TEXT TOTAL AVAILABLE DNET */ +font-weight:bold; +} + +QMessageBox { +background-color:#F8F6F6; +} + +/*******************************************************/ + +QLabel { /* Base Text Size & Color */ +font-size:12px; +color:#333333; /* */ +} + +.QCheckBox { /* Checkbox Labels */ +color:#333333; /* */ +background-color:transparent; +} + +.QCheckBox:hover { +background-color:transparent; +} + +.QValidatedLineEdit, .QLineEdit { /* Text Entry Fields */ +border: 1px solid #9e0a0a; +font-size:11px; +min-height:25px; +outline:0; +padding:3px; +background-color:#fcfcfc; +} + +.QLineEdit:!focus { +font-size:12px; +} + +.QValidatedLineEdit:disabled, .QLineEdit:disabled { +background-color:#f2f2f2; +} + +/*******************************************************/ + +QPushButton { /* Global Button Style */ +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #9e0a0a, stop: .1 #9e0a0a, stop: .95 #9e0a0a, stop: 1 #9e0a0a); */ +background-color:#9e0a0a; +border:1px solid #d2d2d2; +border-radius:3px; +color:#ffffff; +font-size:12px; +font-weight:bold; +padding-left:25px; +padding-right:25px; +padding-top:5px; +padding-bottom:5px; +} + +QPushButton:hover { +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #9e0a0a, stop: .1 #9e0a0a, stop: .95 #9e0a0a, stop: 1 #9e0a0a); +} + +QPushButton:focus { +border:none; +outline:none; +} + +QPushButton:pressed { +border:1px solid #333; +} + +QComboBox { /* Dropdown Menus */ +border:1px solid #9e0a0a; /* */ +padding: 3px 5px 3px 5px; +background:#fcfcfc; +min-height:25px; +color:#818181; /* */ +} + +QComboBox:checked { +background:#f2f2f2; +} + +QComboBox:editable { +background: #9e0a0a; +color:#616161; /* */ +border:0px solid transparent; +} + +QComboBox::drop-down { +width:25px; +border:0px; +} + +QComboBox::down-arrow { +border-image: url(':/images/drk_downArrow') 0 0 0 0 stretch stretch; +} + +QComboBox QListView { +background:#fff; +border:1px solid #333; +padding-right:1px; +padding-left:1px; +} + +QComboBox QAbstractItemView::item { margin:4px; } + +QComboBox::item { +color:#818181; +} + +QComboBox::item:alternate { +background:#fff; +} + +QComboBox::item:selected { +border:0px solid transparent; +background:#f2f2f2; +} + +QComboBox::indicator { +background-color:transparent; +selection-background-color:transparent; +color:transparent; +selection-color:transparent; +} + +QAbstractSpinBox { +border:1px solid #9e0a0a; +padding: 3px 5px 3px 5px; +background:#fcfcfc; +min-height:25px; +color:#818181; +} + +QAbstractSpinBox::up-button { +subcontrol-origin: border; +subcontrol-position: top right; +width:21px; +background:#fcfcfc; +border-left:0px; +border-right:1px solid #9e0a0a; +border-top:1px solid #9e0a0a; +border-bottom:0px; +padding-right:1px; +padding-left:5px; +padding-top:2px; +} + +QAbstractSpinBox::up-arrow { +image:url(':/images/drk_upArrow_small'); +} + +QAbstractSpinBox::down-button { +subcontrol-origin: border; +subcontrol-position: bottom right; +width:21px; +background:#fcfcfc; +border-top:0px; +border-left:0px; +border-right:1px solid #9e0a0a; +border-bottom:1px solid #9e0a0a; +padding-right:1px; +padding-left:5px; +padding-bottom:2px; +} + +QAbstractSpinBox::down-arrow { +image:url(':/images/drk_downArrow_small'); +} + +/*******************************************************/ + +QHeaderView { /* Table Header */ +background-color:transparent; +} + +QHeaderView::section { /* Table Header Sections */ +qproperty-alignment:center; +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #9e0a0a, stop: 1 #9e0a0a); +color:#fff; +min-height:25px; +font-weight:bold; +font-size:11px; +outline:0; +border:0px solid #fff; +border-right:1px solid #fff; +padding-left:5px; +padding-right:5px; +padding-top:2px; +padding-bottom:2px; +} + +QHeaderView::section:last { +border-right: 0px solid #d7d7d7; /* */ +} + +.QScrollArea { +background:transparent; +border:0px; +} + +.QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ +background:transparent; +border:0px solid #fff; +} + +QTableView::item { /* Table Item */ +background-color:#fcfcfc; +font-size:12px; +} + +QTableView::item:selected { /* Table Item Selected */ +background-color:#f0f0f0; +color:#9e0a0a; /* "When you click on a row in the table, the text turns this color" TEXT */ +} + +QScrollBar { /* Scroll Bar */ + +} + +QScrollBar:vertical { /* Vertical Scroll Bar Attributes */ +border:0; +background:#ffffff; +width:18px; +margin: 18px 0px 18px 0px; +} + +QScrollBar:horizontal { /* Horizontal Scroll Bar Attributes */ +border:0; +background:#ffffff; +height:18px; +margin: 0px 18px 0px 18px; +} + + +QScrollBar::handle:vertical { /* Scroll Bar Slider - vertical */ +background:#e0e0e0; +min-height:10px; +} + +QScrollBar::handle:horizontal { /* Scroll Bar Slider - horizontal */ +background:#e0e0e0; +min-width:10px; +} + +QScrollBar::add-page, QScrollBar::sub-page { /* Scroll Bar Background */ +background:#F8F6F6; +} + +QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical, QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { /* Define Arrow Button Dimensions */ +background-color:#F8F6F6; +border: 1px solid #f2f0f0; +width:16px; +height:16px; +} + +QScrollBar::add-line:vertical:pressed, QScrollBar::sub-line:vertical:pressed, QScrollBar::add-line:horizontal:pressed, QScrollBar::sub-line:horizontal:pressed { +background-color:#e0e0e0; +} + +QScrollBar::sub-line:vertical { /* Vertical - top button position */ +subcontrol-position:top; +subcontrol-origin: margin; +} + +QScrollBar::add-line:vertical { /* Vertical - bottom button position */ +subcontrol-position:bottom; +subcontrol-origin: margin; +} + +QScrollBar::sub-line:horizontal { /* Vertical - left button position */ +subcontrol-position:left; +subcontrol-origin: margin; +} + +QScrollBar::add-line:horizontal { /* Vertical - right button position */ +subcontrol-position:right; +subcontrol-origin: margin; +} + +QScrollBar:up-arrow, QScrollBar:down-arrow, QScrollBar:left-arrow, QScrollBar:right-arrow { /* Arrows Icon */ +width:10px; +height:10px; +} + +QScrollBar:up-arrow { +background-image: url(':/images/drk_upArrow_small'); +} + +QScrollBar:down-arrow { +background-image: url(':/images/drk_downArrow_small'); +} + +QScrollBar:left-arrow { +background-image: url(':/images/drk_leftArrow_small'); +} + +QScrollBar:right-arrow { +background-image: url(':/images/drk_rightArrow_small'); +} + + +/*******************************************************/ + +/* DIALOG BOXES */ + +QDialog .QTabWidget { +border-bottom:1px solid #333; +} + +QDialog .QTabWidget::pane { +border: 1px solid #d7d7d7; +} + +QDialog .QTabWidget QTabBar::tab { +background-color:#f2f0f0; +color:#333; /* */ +padding-left:10px; +padding-right:10px; +padding-top:5px; +padding-bottom:5px; +border-top: 1px solid #d7d7d7; +} + +QDialog .QTabWidget QTabBar::tab:first { +border-left: 1px solid #d7d7d7; +} + +QDialog .QTabWidget QTabBar::tab:last { +border-right: 1px solid #d7d7d7; +} + +QDialog .QTabWidget QTabBar::tab:selected, QDialog .QTabWidget QTabBar::tab:hover { +background-color:#ffffff; +color:#333; /* */ +} + +QDialog .QTabWidget .QWidget { +background-color:#fff; +color:#333; /* */ +} + +QDialog .QTabWidget .QWidget QAbstractSpinBox { +min-height:15px; +} + +QDialog .QTabWidget .QWidget QAbstractSpinBox::down-button { +width:15px; +} + +QDialog .QTabWidget .QWidget QAbstractSpinBox::up-button { +width:15px; +} + +QDialog .QTabWidget .QWidget QComboBox { +min-height:15px; +} + +QDialog QWidget { /* Remove Annoying Focus Rectangle */ +outline: 0; +} + +/*******************************************************/ +/* FILE MENU */ + +/* Dialog: Open URI */ +QDialog#OpenURIDialog { +background-color:#F8F6F6; +} + +QDialog#OpenURIDialog QLabel#label { /* URI Label */ +font-weight:bold; +} + +QDialog#OpenURIDialog QPushButton#selectFileButton { /* ... Button */ +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); +border:1px solid #d2d2d2; +color:#616161; /* */ +padding-left:10px; +padding-right:10px; +} + +QDialog#OpenURIDialog QPushButton#selectFileButton:hover { +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); +color:#333; /* */ +} + +QDialog#OpenURIDialog QPushButton#selectFileButton:pressed { +border:1px solid #9e9e9e; +} + +/* Dialog: Sign / Verify Message */ +QDialog#SignVerifyMessageDialog { +background-color:#F8F6F6; +} + +QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_SM { /* Address Book Button */ +background-color:transparent; +padding-left:10px; +padding-right:10px; +} + +QDialog#SignVerifyMessageDialog QPlainTextEdit { /* Message Signing Text */ +border:1px solid #9e0a0a; +background-color:#fff; +} + +QDialog#SignVerifyMessageDialog QPushButton#pasteButton_SM { /* Paste Button */ +/* qproperty-icon: url(":/icons/drk_editpaste"); */ +background-color:transparent; +padding-left:15px; +} + +QDialog#SignVerifyMessageDialog QLineEdit:!focus { /* Font Hack */ +font-size:10px; +} + +QDialog#SignVerifyMessageDialog QPushButton#copySignatureButton_SM { /* Copy Button */ +/* qproperty-icon: url(":/icons/drk_editcopy"); */ +background-color:transparent; +padding-left:10px; +padding-right:10px; +} + +QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM { /* Clear Button */ +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); +border:1px solid #d2d2d2; +color:#616161; /* */ +padding-left:10px; +padding-right:10px; +} + +QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:hover { +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); +color:#333; /* */ +} + +QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:pressed { +border:1px solid #9e9e9e; +} + +QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_VM { /* Verify Message - Address Book Button */ +background-color:transparent; +border:0; +padding-left:10px; +padding-right:10px; +} + +QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM { /* Verify Message - Clear Button */ +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); +border:1px solid #d2d2d2; +color:#616161; /* */ +padding-left:10px; +padding-right:10px; +} + +QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover { +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); +color:#333; /* */ +} + +QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed { +border:1px solid #9e9e9e; +} + +/* Dialog: Send and Receive */ +QWidget#AddressBookPage { +background-color:#F8F6F6; +} + +QWidget#AddressBookPage QPushButton#newAddress { /* New Address Button */ +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); +border:1px solid #d2d2d2; +color:#616161; /* */ +padding-left:10px; +padding-right:10px; +} + +QWidget#AddressBookPage QPushButton#newAddress:hover { +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); +color:#333; +} + +QWidget#AddressBookPage QPushButton#newAddress:pressed { +border:1px solid #9e9e9e; +} + +QWidget#AddressBookPage QPushButton#copyAddress { /* Copy Address Button */ +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); +border:1px solid #d2d2d2; +color:#616161; /* */ +padding-left:10px; +padding-right:10px; +} + +QWidget#AddressBookPage QPushButton#copyAddress:hover { +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); +color:#333; /* */ +} + +QWidget#AddressBookPage QPushButton#copyAddress:pressed { +border:1px solid #9e9e9e; +} + +QWidget#AddressBookPage QPushButton#deleteAddress { /* Delete Address Button */ +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); +border:1px solid #d2d2d2; +color:#616161; /* */ +padding-left:10px; +padding-right:10px; +} + +QWidget#AddressBookPage QPushButton#deleteAddress:hover { +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); +color:#333; /* */ +} + +QWidget#AddressBookPage QPushButton#deleteAddress:pressed { +border:1px solid #9e9e9e; +} + +QWidget#AddressBookPage QTableView { /* Address Listing */ +font-size:12px; +} + +QWidget#AddressBookPage QHeaderView::section { /* Min width for Windows fix */ +min-width:260px; +} + +/* SETTINGS MENU */ + +/* Encrypt Wallet and Change Passphrase Dialog */ +QDialog#AskPassphraseDialog { +background-color:#F8F6F6; /* */ +} + +QDialog#AskPassphraseDialog QLabel#passLabel1, QDialog#AskPassphraseDialog QLabel#passLabel2, QDialog#AskPassphraseDialog QLabel#passLabel3 { +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:170px; +min-height:33px; /* base width of 25px for QLineEdit, plus padding and border */ +} + +/* Options Dialog */ +QDialog#OptionsDialog { +background-color:#F8F6F6; /* */ +} + +QDialog#OptionsDialog QValueComboBox, QDialog#OptionsDialog QSpinBox { +margin-top:5px; +margin-bottom:5px; +} + +QDialog#OptionsDialog QValidatedLineEdit, QDialog#OptionsDialog QValidatedLineEdit:disabled, QDialog#OptionsDialog QLineEdit, QDialog#OptionsDialog QLineEdit:disabled { +qproperty-alignment: 'AlignVCenter | AlignLeft'; +min-height:20px; +margin-top:0px; +margin-bottom:0px; +padding-top:1px; +padding-bottom:1px; +} + +QDialog#OptionsDialog > QLabel { +qproperty-alignment: 'AlignVCenter'; +min-height:20px; +} + +QDialog#OptionsDialog QWidget#tabDisplay QValueComboBox { +margin-top:0px; +margin-bottom:0px; +} + +QDialog#OptionsDialog QLabel#label_3 { /* Translations Missing? Label */ +qproperty-alignment: 'AlignVCenter | AlignCenter'; +color:#818181; /* */ +padding-bottom:8px; +} + +QDialog#OptionsDialog QCheckBox { +qproperty-alignment: 'AlignVCenter'; +min-height:20px; +} + +QDialog#OptionsDialog QCheckBox#displayAddresses { +min-height:33px; + +} + +/* TOOLS MENU */ + +QDialog#RPCConsole { /* RPC Console Dialog Box */ +background-color:#F8F6F6; +} + +QDialog#RPCConsole QWidget#tab_info QLabel#label_11, QDialog#RPCConsole QWidget#tab_info QLabel#label_10 { /* Margin between Network and Block Chain headers */ +qproperty-alignment: 'AlignBottom'; +min-height:25px; +min-width:180px; +} + +QDialog#RPCConsole QWidget#tab_peers QLabel#peerHeading { /* Peers Info Header */ +color:#9e0a0a; /* */ +} + +QDialog#RPCConsole QPushButton#openDebugLogfileButton { +max-width:60px; +} + +QDialog#RPCConsole QTextEdit#messagesWidget { /* Console Messages Window */ +border:0; +} + +QDialog#RPCConsole QLineEdit#lineEdit { /* Console Input */ +margin-right:5px; +} + +QDialog#RPCConsole QPushButton#clearButton { /* Console Clear Button */ +background-color:transparent; +padding-left:10px; +padding-right:10px; +} + +QDialog#RPCConsole .QGroupBox #line { /* Network In Line */ +background-color:#00ff00; +} + +QDialog#RPCConsole .QGroupBox #line_2 { /* Network Out Line */ +background:#ff0000; +} + +/* HELP MENU */ + +/* Command Line Options Dialog */ +QDialog#HelpMessageDialog { +background-color:#F8F6F6; +} + +QDialog#HelpMessageDialog QScrollArea * { +background-color:#ffffff; +} + +QDialog#HelpMessageDialog QScrollBar:vertical, QDialog#HelpMessageDialog QScrollBar:horizontal { +border:0; +} + +/* About Darknet Dialog */ +QDialog#AboutDialog { +background-color:#F8F6F6; +} + +QDialog#AboutDialog QLabel#label, QDialog#AboutDialog QLabel#copyrightLabel, QDialog#AboutDialog QLabel#label_2 { /* About Darknet Contents */ +margin-left:10px; +} + +QDialog#AboutDialog QLabel#label_2 { /* Margin for About Darknet text */ +margin-right:10px; +} + +/* Edit Address Dialog */ +QDialog#EditAddressDialog { +background-color:#F8F6F6; +} + +QDialog#EditAddressDialog QLabel { +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-height:27px; +font-weight:normal; +padding-right:5px; +} + +/* OVERVIEW SCREEN */ + +QWidget .QFrame#frame { /* Wallet Balance */ +min-width:490px; +} + +QWidget .QFrame#frame > .QLabel { +min-width:190px; +font-weight:normal; +min-height:30px; +} + +QWidget .QFrame#frame .QLabel#label_5 { /* Wallet Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +background-color:transparent; +color:#fff; /* */ +margin-right:5px; +padding-right:5px; +} + +QWidget .QFrame#frame .QLabel#labelWalletStatus { /* Wallet Sync Status */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +margin-left:3px; +color:#ffffff; +} + +QWidget .QFrame#frame .QLabel#labelSpendable { /* Spendable Header */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +margin-left:18px; +} + +QWidget .QFrame#frame .QLabel#labelWatchonly { /* Watch-only Header */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +margin-left:16px; +} + +QWidget .QFrame#frame .QLabel#labelBalanceText { /* Available Balance Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +background-color:transparent; /* AVAILABLE BALANCE BOX COLOR */ +color:#ffffff; /* AVAILABLE BALANCE TEXT */ +margin-right:5px; +padding-right:5px; +font-weight:bold; +font-size:14px; +min-height:35px; +} + +QWidget .QFrame#frame .QLabel#labelBalance { /* Available Balance */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +color:#ffffff; /* AVAILABLE BALANCE TEXT */ +margin-left:0px; +} + +QWidget .QFrame#frame .QLabel#labelWatchAvailable { /* Watch-only Balance */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +margin-left:16px; +} + +QWidget .QFrame#frame .QLabel#labelPendingText { /* Pending Balance Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +font-size:12px; +background-color:transparent; /* PENDING BALANCE BOX COLOR */ +font-weight:bold; +color:#ffffff; /* PENDING BALANCE BOX TEXT */ +margin-right:5px; +padding-right:5px; +} + +QWidget .QFrame#frame .QLabel#labelUnconfirmed { /* Pending Balance */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +color:#ffffff; /* PENDING BALANCE TEXT */ +margin-left:0px; +} + +QWidget .QFrame#frame .QLabel#labelWatchPending { /* Watch-only Pending Balance */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +margin-left:16px; +} + +QWidget .QFrame#frame .QLabel#labelImmatureText { /* Immature Balance Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +font-size:12px; +background-color:transparent; /* IMMATURE BOX COLOR */ +font-weight:bold; +color:#ffffff; /* IMMATURE BALANCE BOX TEXT */ +margin-right:5px; +padding-right:5px; +} + +QWidget .QFrame#frame .QLabel#labelImmature { /* Immature Balance */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +color:#ffffff; /* IMMATURE BALANCE TEXT */ +margin-left:0px; +} + +QWidget .QFrame#frame .QLabel#labelWatchImmature { /* Watch-only Immature Balance */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +margin-left:16px; +} + +QWidget .QFrame#frame .QLabel#labelTotalText { /* Total Balance Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +font-size:12px; +background-color:transparent; /* TOTAL BALANCE BOX COLOR */ +font-weight:bold; +color:#ffffff; /* TOTAL BALANCE BOX TEXT */ +margin-right:5px; +padding-right:5px; +} + +QWidget .QFrame#frame .QLabel#labelTotal { /* Total Balance */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +color:#ffffff; /* TOTAL BALANCE TEXT */ +margin-left:0px; +} + +QWidget .QFrame#frame .QLabel#labelWatchTotal { /* Watch-only Total Balance */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +margin-left:16px; +} + +/* DARKSEND WIDGET */ + +QWidget .QFrame#frameObfuscate { /* Obfuscate Widget */ +background-color:transparent; +qproperty-minimumSize: 451px 343px; +} + +QWidget .QFrame#frameObfuscate QWidget { +qproperty-geometry: rect(10 0 431 35); +} + +QWidget .QFrame#frameObfuscate .QLabel#label_2 { /* Obfuscate Header */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +background-color:transparent; /* DARKSEND BOX COLOR */ +font-weight:bold; +color:#ffffff; /* DARKSEND TEXT COLOR */ +margin-right:5px; +padding-right:5px; +font-size:14px; +min-height:35px; +} + +/******************************************************************/ + +QWidget .QFrame#frameObfuscate .QLabel#labelObfuscateSyncStatus { /* Obfuscate Sync Status */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +margin-left:2px; +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget { +qproperty-geometry: rect(10 51 451 175); +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget > .QLabel { +min-width:175px; +font-weight:normal; +min-height:25px; +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#label_6 { /* Obfuscate Status Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +background-color:transparent; /* DARKSEND STATUS BOX COLOR */ +font-weight:bold; +color:#ffffff; /* DARKSEND STATUS BOX TEXT */ +margin-right:5px; +padding-right:5px; +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#obfuscateEnabled { /* Obfuscate Status */ +color:#ffffff; /* DARKSEND STATUS TEXT */ +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#label_7 { /* Obfuscate Completion Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +background-color:transparent; /* DARKSEND COMPLETION BOX COLOR */ +font-weight:bold; +color:#ffffff; /* DARKSEND COMPLETION BOX TEXT */ +margin-right:5px; +padding-right:5px; + +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QProgressBar#obfuscateProgress { /* Obfuscate Completion */ +border: 1px solid #999999; +border-radius: 1px; +margin-right:43px; +text-align: right; +color:#ffffff; /* DARKSEND PROGRESS TEXT */ +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QProgressBar#obfuscateProgress::chunk { +background-color: #9e0a0a; /* DARKSEND PROGRESS BAR */ +width:1px; +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#labelAnonymizedText { /* Obfuscate Balance Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +background-color:transparent; /* DARKSEND BALANCE BOX COLOR */ +font-weight:bold; +color:#ffffff; /* DARKSEND BALANCE BOX TEXT */ +margin-right:5px; +padding-right:5px; +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#labelAnonymized { /* Obfuscate Balance */ +color:#ffffff; /* DARKSEND BALANCE TEXT */ +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#label_8 { /* Obfuscate Amount and Rounds Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +background-color:transparent; /* DARKSEND AMOUNT AND ROUNDS BOX COLOR */ +font-weight:bold; +color:#ffffff; /* DARKSEND AMOUNT AND ROUNDS BOX TEXT */ +margin-right:5px; +padding-right:5px; +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#labelAmountRounds { /* Obfuscate Amount and Rounds */ +color:#ffffff; /* AMOUNTS AND ROUNDS TEXT */ +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#label_9 { /* Obfuscate Submitted Denom Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +background-color:transparent; /* DARKSEND SUBMITTED AND DENOM BOX COLOR */ +font-weight:bold; +color:#ffffff; /* DARKSEND SUBMITTED AND DENOM BOX TEXT */ +margin-right:5px; +padding-right:5px; +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#labelSubmittedDenom { /* Obfuscate Submitted Denom */ +color:#ffffff; /* SUBMITTED AND DENOM TEXT */ +} + +QWidget .QFrame#frameObfuscate .QLabel#obfuscateStatus { /* Obfuscate Status Notifications */ +qproperty-alignment: 'AlignVCenter | AlignCenter'; +qproperty-geometry: rect(70 226 395 34); +font-size:11px; +color:#818181; /* DARKSEND STATUS NOTIFICATION TEXT */ +} + +/* DARKSEND BUTTONS */ + +QWidget .QFrame#frameObfuscate .QPushButton { /* Obfuscate Buttons - General Attributes */ +border:0px solid #ffffff; +} + +QWidget .QFrame#frameObfuscate QPushButton:focus { +border:none; +outline:none; +} + +QWidget .QFrame#frameObfuscate .QPushButton#runAutoDenom { /* No idea why this button is in the .UI file... */ +qproperty-geometry: rect(0 0 0 0); +} + +QWidget .QFrame#frameObfuscate .QPushButton#toggleObfuscate { /* Start Obfuscate Mixing */ +qproperty-geometry: rect(115 268 295 40); +font-size:15px; +background-color:transparent; /* DARKSEND MIXING BOX COLOR */ +font-weight:bold; +color:#ffffff; /* DARKSEND MIXING BOX TEXT */ +padding-left:10px; +padding-right:10px; +padding-top:5px; +padding-bottom:6px; +} + +QWidget .QFrame#frameObfuscate .QPushButton#toggleObfuscate:hover { + +} + +QWidget .QFrame#frameObfuscate .QPushButton#obfuscateAuto { /* Try Mix Button */ +qproperty-geometry: rect(120 314 140 25); +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +min-height:25px; +font-size:9px; +padding:0px; +} + +QWidget .QFrame#frameObfuscate .QPushButton#obfuscateAuto:hover { +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +font-weight:bold; +} + +QWidget .QFrame#frameObfuscate .QPushButton#obfuscateAuto:pressed { +border:1px solid #9e9e9e; +} + +QWidget .QFrame#frameObfuscate .QPushButton#obfuscateReset { /* Reset Button */ +qproperty-geometry: rect(265 314 140 25); +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +min-height:25px; +font-size:9px; +padding:0px; +} + +QWidget .QFrame#frameObfuscate .QPushButton#obfuscateReset:hover { +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +font-weight:bold; +} + +QWidget .QFrame#frameObfuscate .QPushButton#obfuscateReset:pressed { +border:1px solid #9e9e9e; +} + +/* RECENT TRANSACTIONS */ + +QWidget .QFrame#frame_2 { /* Transactions Widget */ +min-width:410px; +margin-right:20px; +margin-left:0; +margin-top:0; +background-image: url(':/images/darknet_logo_horizontal-drk'); +background-repeat:none; +} + +QWidget .QFrame#frame_2 .QLabel#label_4 { /* Recent Transactions Label */ +min-width:180px; +color:#ffffff; /* RECENT TRANSACTIONS HEADER TEXT */ +margin-left:67px; +margin-top:83px; +margin-right:5px; +padding-right:5px; +font-weight:bold; +font-size:15px; +min-height:24px; +} + +QWidget .QFrame#frame_2 .QLabel#labelTransactionsStatus { /* Recent Transactions Sync Status */ +qproperty-alignment: 'AlignBottom | AlignRight'; +min-width:93px; +margin-top:83px; +margin-left:16px; +margin-right:5px; +min-height:16px; +color:#999999; /* SYNC STATUS TEXT */ +} + +QWidget .QFrame#frame_2 QListView { /* Transaction List */ +color:#ffffff; /* DATE TEXT */ +font-weight:normal; +font-size:12px; +max-width:369px; +margin-top:12px; +margin-left:0px; /* CSS Voodoo - set to -66px to hide default transaction icons */ +} + +/* SEND DIALOG */ + +QDialog#SendCoinsDialog QLabel#labelFeeHeadline { +color:#ffffff; /* TEXT "TRANSACTION FEE" */ +} + +QDialog#SendCoinsDialog QLabel#labelFeeMinimized { +color:#ffffff; /* TEXT "0.00010000 DNET/kB" */ +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl { /* Coin Control Section */ + +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl > .QLabel { /* Default Font Color and Size */ +color:#ffffff; /* TEXT */ +font-weight:normal; +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl .QPushButton#pushButtonCoinControl { /* Coin Control Inputs Button */ +padding-left:10px; +padding-right:10px; +border:1px solid #d2d2d2; /* "inputs..." Border */ +background-color:transparent; +color:#ffffff; +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlFeatures { /* Coin Control Header */ +color:#ffffff; /* TEXT */ +font-weight:bold; +font-size:14px; +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl .QWidget#widgetCoinControl { /* Coin Control Inputs */ +color:#ffffff; /* TEXT */ +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl .QWidget#widgetCoinControl > .QLabel { /* Coin Control Inputs Labels */ +padding:2px; +color:#ffffff; /* TEXT */ +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl .QCheckBox#checkBoxCoinControlChange { /* Custom Change Label */ +color:#ffffff; /* TEXT */ +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl .QValidatedLineEdit#lineEditCoinControlChange { /* Custom Change Address */ + +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlChangeLabel { /* Custom Change Address Validation Label */ +color:#ffffff; /* TEXT */ +font-weight:normal; +qproperty-margin:-6; +margin-right:112px; +} + +QDialog#SendCoinsDialog .QScrollArea#scrollArea .QWidget#scrollAreaWidgetContents { /* Send To Widget */ +background:transparent; + +} + +QDialog#SendCoinsDialog .QPushButton#sendButton { /* Send Button */ +border:1px solid #d2d2d2; /* Send Button Border */ +background-color:transparent; +color:#ffffff; +padding-left:10px; +padding-right:10px; + +} + +QDialog#SendCoinsDialog .QPushButton#clearButton { /* Clear Button */ +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +padding-left:10px; +padding-right:10px; +} + +QDialog#SendCoinsDialog .QPushButton#clearButton:hover { +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +} + +QDialog#SendCoinsDialog .QPushButton#clearButton:pressed { +border:1px solid #9e9e9e; +} + +QDialog#SendCoinsDialog .QPushButton#addButton { /* Add Button */ +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +padding-left:10px; +padding-right:10px; +} + +QDialog#SendCoinsDialog .QPushButton#addButton:hover { +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +} + +QDialog#SendCoinsDialog .QPushButton#addButton:pressed { +border:1px solid #9e9e9e; +} + +QDialog#SendCoinsDialog .QCheckBox#checkUseObfuscate { /* Obfuscate Checkbox */ +color:#999999; /* TEXT */ +font-weight:bold; +background: transparent; +/* background: qradialgradient(cx:0.5, cy:0.5, radius: 0.5, fx:0.5, fy:0.5, stop:0 rgba(248, 246, 246, 128), stop: 1 rgba(0, 0, 0, 0)); */ +border-radius:5px; +padding-top:20px; +padding-bottom:18px; +} + +QDialog#SendCoinsDialog .QCheckBox#checkSwiftTX { /* SwiftTX Checkbox */ +color:#999999; /* TEXT */ +font-weight:bold; +background: transparent; +/* background: qradialgradient(cx:0.5, cy:0.5, radius: 0.5, fx:0.5, fy:0.5, stop:0 rgba(248, 246, 246, 128), stop: 1 rgba(0, 0, 0, 0)); */ +border-radius:5px; +padding-top:20px; +padding-bottom:18px; +margin-left:10px; +margin-right:20px; +} + +/* This QLabel uses name = "label" which conflicts with Address Book -> New Address */ +/* To maximize backwards compatibility this formatting has been removed */ + +QDialog#SendCoinsDialog QLabel#label { +/*margin-left:20px; +margin-right:-2px; +padding-right:-2px; +color:#616161; +font-size:14px; +font-weight:bold; +border-radius:5px; +padding-top:20px; +padding-bottom:20px;*/ +min-height:27px; +color:#999999; /* BALANCE TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelBalance { +margin-left:0px; +padding-left:0px; +color:#ffffff; /* BALANCE NUMBER TEXT */ +/* font-weight:bold; +border-radius:5px; +padding-top:20px; +padding-bottom:20px; */ +min-height:27px; +} + +QDialog#SendCoinsDialog QPushButton#buttonChooseFee { +border:1px solid #d2d2d2; /* "Choose..." Border */ +background-color:transparent; +color:#ffffff; +} + +QDialog#SendCoinsDialog QPushButton#buttonMinimizeFee { +border:1px solid #d2d2d2; /* "Minimize..." Border */ +background-color:transparent; +color:#ffffff; +} + +QDialog#SendCoinsDialog QLabel#labelFreeTx { +color:#ffffff; /* "(confirmation may take longer)" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelMinFeeWarning { +color:#ffffff; /* "(read the tooltip)" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelSmartFee_2{ +color:#ffffff; /* "Recommended" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelCustomFee { +color:#ffffff; /* "Custom" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelSmartFee { +color:#ffffff; /* "00010000" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelFeeEstimation { +color:#ffffff; /* "DNET/kB" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelSmartFee2 { +color:#ffffff; /* "Smart fee not initialized yet" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelSmartFee3 { +color:#ffffff; /* "Confirmation time" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelSmartFeeNormal { +color:#ffffff; /* "normal" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelSmartFeeFast { +color:#ffffff; /* "fast" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#radioCustomPerKilobyte { +color:#ffffff; /* "per kilobyte" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#radioCustomAtLeast { +color:#ffffff; /* "total at least" TEXT */ +} + +QDialog#SendCoinsDialog QCheckBox#checkBoxFreeTx { +color:#ffffff; /* "Send as zero fee checkbox" TEXT */ +} + +QDialog#SendCoinsDialog QCheckBox#checkBoxMinimumFee { +color:#ffffff; /* "Send as minimum fee checkbox" TEXT */ +} + +/* SEND COINS ENTRY */ + +QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry Labels */ +background-color:#9e0a0a; /* SEND COINS BUTTON COLOR */ +min-width:102px; +font-weight:bold; +font-size:11px; +color:#ffffff; /* SEND COINS BUTTON TEXT COLOR */ +min-height:25px; +margin-right:5px; +padding-right:5px; +} + +QStackedWidget#SendCoinsEntry .QFrame#SendCoins .QLabel#payToLabel { +background-color:transparent; +color:#ffffff; +} + +QStackedWidget#SendCoinsEntry .QFrame#SendCoins .QLabel#labelLabel { +background-color:transparent; +color:#ffffff; +} + +QStackedWidget#SendCoinsEntry .QFrame#SendCoins .QLabel#amountLabel { +background-color:transparent; +color:#ffffff; +} + +QStackedWidget#SendCoinsEntry .QValidatedLineEdit#payTo { /* Pay To Input Field */ +} + +QStackedWidget#SendCoinsEntry .QToolButton { /* General Settings for Pay To Icons */ +background-color:transparent; +padding-left:5px; +padding-right:5px; +border: 0; +outline: 0; +} + +QStackedWidget#SendCoinsEntry .QToolButton#addressBookButton { /* Address Book Button */ +padding-left:10px; +} + +QStackedWidget#SendCoinsEntry .QToolButton#addressBookButton { +} + +QStackedWidget#SendCoinsEntry .QToolButton#pasteButton { +} + +QStackedWidget#SendCoinsEntry .QToolButton#deleteButton { +} + +QStackedWidget#SendCoinsEntry .QLineEdit#addAsLabel { /* Pay To Input Field */ +} + +/* COIN CONTROL POPUP */ + +QDialog#CoinControlDialog { /* Coin Control Dialog Window */ +background-color:#F8F6F6; +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlQuantityText { /* Coin Control Quantity Label */ +min-height:30px; +color:#333333; /* TEXT */ +padding-left:15px; +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlQuantity { /* Coin Control Quantity */ +min-height:30px; +color:#555888; /* TEXT */ +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlBytesText { /* Coin Control Bytes Label */ +padding-left:15px; +color:#333333; /* TEXT */ +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlBytes { /* Coin Control Bytes */ +color:#555888; /* TEXT */ +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlAmountText { /* Coin Control Amount Label */ +color:#333333; /* TEXT */ +min-height:30px; +padding-left:15px; +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlAmount { /* Coin Control Amount */ +min-height:30px; +color:#555888; /* TEXT */ +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlPriorityText { /* Coin Control Priority Label */ +padding-left:15px; +color:#333333; /* TEXT */ +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlPriority { /* Coin Control Priority */ +color:#555888; /* TEXT */ +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlFeeText { /* Coin Control Fee Label */ +color:#333333; /* TEXT */ +min-height:30px; +padding-left:15px; +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlFee { /* Coin Control Fee */ +min-height:30px; +color:#555888; /* TEXT */ +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlLowOutputText { /* Coin Control Low Output Label */ +color:#333333; /* TEXT */ +padding-left:15px; +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlLowOutput { /* Coin Control Low Output */ +color:#555888; /* TEXT */ +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlAfterFeeText { /* Coin Control After Fee Label */ +color:#333333; /* TEXT */ +min-height:30px; +padding-left:15px; +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlAfterFee { /* Coin Control After Fee */ +color:#555888; /* TEXT */ +min-height:30px; +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlChangeText { /* Coin Control Change Label */ +color:#333333; /* TEXT */ +padding-left:15px; +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlChange { /* Coin Control Change */ +color:#555888; /* TEXT */ +} + +QDialog#CoinControlDialog .QFrame#frame .QPushButton#pushButtonSelectAll { /* (un)select all button */ +padding-left:10px; +padding-right:10px; +min-height:25px; +} + +QDialog#CoinControlDialog .QFrame#frame .QPushButton#pushButtonToggleLock { /* Toggle lock state button */ +padding-left:10px; +padding-right:10px; +min-height:25px; +} + +QDialog#CoinControlDialog .QDialogButtonBox#buttonBox QPushButton { /* Coin Control 'OK' button */ +} + +QDialog#CoinControlDialog .QFrame#frame .QRadioButton#radioTreeMode { /* Coin Control Tree Mode Selector */ +color:#818181; +background-color:transparent; +} + +QDialog#CoinControlDialog .QFrame#frame .QRadioButton#radioListMode { /* Coin Control List Mode Selector */ +color:#818181; +background-color:transparent; +} + +QDialog#CoinControlDialog QHeaderView::section:first { /* Bug Fix: the number "1" displays in this table for some reason... */ +color:transparent; +} + +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget { /* Coin Control Widget Container */ +outline:0; +background-color:#ffffff; +border:0px solid #818181; +} + +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item { + +} + +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:selected { /* Coin Control Item (selected) */ +background-color:#f7f7f7; +color:#333; /* */ +} + +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:checked { /* Coin Control Item (checked) */ +background-color:#f7f7f7; +color:#333; /* */ +} + +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:selected { /* Coin Control Branch Icon */ +background-image: url(':/images/drk_qtreeview_selected'); +background-repeat:no-repeat; +background-position:center; +background-color:#f7f7f7; +color:#ffffff; /* TEXT */ +} + +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:checked { /* Coin Control Branch Icon */ +background-image: url(':/images/drk_qtreeview_selected'); +background-repeat:no-repeat; +background-position:center; +background-color:#f7f7f7; +color:#ffffff; /* TEXT */ +} + +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::seperator { + +} + +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::indicator { /* Coin Control Widget Checkbox */ +color:#999999; /* TEXT */ +} + +/* RECEIVE COINS */ + +QDialog#ReceiveCoinsDialog QPushButton#receiveButton { +border:1px solid #d2d2d2; /* "Request payment" Border */ +background-color:transparent; +color:#ffffff; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_2 { /* Label Label */ +background-color:transparent; /* RECEIVE ADDRESS LABEL BOX COLOR */ +min-width:102px; +color:#ffffff; /* RECEIVE ADDRESS LABEL TEXT COLOR */ +font-weight:bold; +font-size:11px; +padding-right:5px; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label { /* Amount Label */ +background-color:transparent; /* RECEIVE AMOUNT LABEL BOX COLOR */ +min-width:102px; +color:#ffffff; /* RECEIVE AMOUNT LABEL TEXT COLOR */ +font-weight:bold; +font-size:11px; +padding-right:5px; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_3 { /* Message Label */ +background-color:transparent; /* RECEIVE MESSAGE LABEL BOX COLOR */ +min-width:102px; +color:#ffffff; /* RECEIVE MESSAGE LABEL TEXT COLOR */ +font-weight:bold; +font-size:11px; +padding-right:5px; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_5 { /* Message Label */ +color:#ffffff; /* TEXT "USE THIS FORM TO REQUEST PAYMENT" */ +} + +QWidget#ReceiveCoinsDialog .QFrame#frame2 .QCheckBox#reuseAddress { /* Message Label */ +color:#ffffff; /* TEXT "OPTION TO REUSE PREVIOUS ADDRESS" */ +} + + +QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton { /* Clear Button */ +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +padding-left:10px; +padding-right:10px; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:hover { +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +font-weight:bold; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:pressed { +border:1px solid #9e9e9e; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton { /* Show Button */ +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +padding-left:10px; +padding-right:10px; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:hover { +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +font-weight:bold; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:pressed { +border:1px solid #9e9e9e; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton { /* Remove Button */ +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +padding-left:10px; +padding-right:10px; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:hover { +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); +color:#333333; /* TEXT */ +} + +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:pressed { +border:1px solid #9e9e9e; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame .QLabel#label_6 { /* Requested Payments History Label */ +color:#ffffff; /* TEXT */ +font-weight:bold; +font-size:14px; +} + +/* RECEIVE COINS DIALOG */ + +QDialog#ReceiveRequestDialog { +background-color:#F8F6F6; +} + +QDialog#ReceiveRequestDialog QTextEdit { /* Contents of Receive Coin Dialog */ +border:1px solid #d7d7d7; +} + +/* TRANSACTIONS PAGE */ + +TransactionView QLineEdit { /* Address Filter */ +margin-bottom:2px; +margin-right:1px; +min-width:111px; +text-align:center; +} + +TransactionView QComboBox { +margin-bottom:1px; +margin-right:1px; +} + +QLabel#transactionSumLabel { /* Example of setObjectName for widgets without name */ +color:#ffffff; /* TEXT */ +font-weight:bold; +} + +QLabel#transactionSum { /* Example of setObjectName for widgets without name */ +color:#ffffff; /* TEXT */ +} + +/* TRANSACTION DETAIL DIALOG */ + +QDialog#TransactionDescDialog { +background-color:#F8F6F6; +} + +QDialog#TransactionDescDialog QTextEdit { /* Contents of Receive Coin Dialog */ +color:#9e0a0a; /* */ +border:1px solid #d7d7d7; + + diff --git a/src/qt/res/css/drk.css b/src/qt/res/css/drk.css new file mode 100644 index 0000000000000..2d56de84d184e --- /dev/null +++ b/src/qt/res/css/drk.css @@ -0,0 +1,1707 @@ +WalletFrame { +border-image: url(':/images/drk_walletFrame_bg') 0 0 0 0 stretch stretch; +border-top:0px solid #000; +margin:0; +padding:0; +} + +QStatusBar { +background-color:#ffffff; +} + +.QFrame { +background-color:transparent; +border:0px solid #fff; +} + +QMenuBar { +background-color:#fff; +} + +QMenuBar::item { +background-color:#fff; +} + +QMenuBar::item:selected { +background-color:#f8f6f6; +} + +QMenu { +background-color:#f8f6f6; +} + +QMenu::item { +color:#333; +} + +QMenu::item:selected { +background-color:#f2f0f0; +color:#333; +} + +QToolBar { +background-color:#ad1b25; +border:0px solid #000; +padding:0; +margin:0; +} + +QToolBar > QToolButton { +background-color:#ad1b25; +border:0px solid #333; +min-height:2.5em; +padding: 0em 1em; +font-weight:bold; +color:#fff; +} + +QToolBar > QToolButton:checked { +background-color:#fff; +color:#999999; /* TEXT TOTAL AVAILABLE DNET */ +font-weight:bold; +} + +QMessageBox { +background-color:#F8F6F6; +} + +/*******************************************************/ + +QLabel { /* Base Text Size & Color */ +font-size:12px; +color:#333333; /* */ +} + +.QCheckBox { /* Checkbox Labels */ +color:#333333; /* */ +background-color:transparent; +} + +.QCheckBox:hover { +background-color:transparent; +} + +.QValidatedLineEdit, .QLineEdit { /* Text Entry Fields */ +border: 1px solid #ad1b25; +font-size:11px; +min-height:25px; +outline:0; +padding:3px; +background-color:#fcfcfc; +} + +.QLineEdit:!focus { +font-size:12px; +} + +.QValidatedLineEdit:disabled, .QLineEdit:disabled { +background-color:#f2f2f2; +} + +/*******************************************************/ + +QPushButton { /* Global Button Style */ +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #ad1b25, stop: .1 #ad1b25, stop: .95 #ad1b25, stop: 1 #ad1b25); */ +background-color:#ad1b25; +border:1px solid #d2d2d2; +border-radius:3px; +color:#ffffff; +font-size:12px; +font-weight:bold; +padding-left:25px; +padding-right:25px; +padding-top:5px; +padding-bottom:5px; +} + +QPushButton:hover { +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #ad1b25, stop: .1 #ad1b25, stop: .95 #ad1b25, stop: 1 #ad1b25); +} + +QPushButton:focus { +border:none; +outline:none; +} + +QPushButton:pressed { +border:1px solid #333; +} + +QComboBox { /* Dropdown Menus */ +border:1px solid #ad1b25; /* */ +padding: 3px 5px 3px 5px; +background:#fcfcfc; +min-height:25px; +color:#818181; /* */ +} + +QComboBox:checked { +background:#f2f2f2; +} + +QComboBox:editable { +background: #ad1b25; +color:#616161; /* */ +border:0px solid transparent; +} + +QComboBox::drop-down { +width:25px; +border:0px; +} + +QComboBox::down-arrow { +border-image: url(':/images/drk_downArrow') 0 0 0 0 stretch stretch; +} + +QComboBox QListView { +background:#fff; +border:1px solid #333; +padding-right:1px; +padding-left:1px; +} + +QComboBox QAbstractItemView::item { margin:4px; } + +QComboBox::item { +color:#818181; +} + +QComboBox::item:alternate { +background:#fff; +} + +QComboBox::item:selected { +border:0px solid transparent; +background:#f2f2f2; +} + +QComboBox::indicator { +background-color:transparent; +selection-background-color:transparent; +color:transparent; +selection-color:transparent; +} + +QAbstractSpinBox { +border:1px solid #ad1b25; +padding: 3px 5px 3px 5px; +background:#fcfcfc; +min-height:25px; +color:#818181; +} + +QAbstractSpinBox::up-button { +subcontrol-origin: border; +subcontrol-position: top right; +width:21px; +background:#fcfcfc; +border-left:0px; +border-right:1px solid #ad1b25; +border-top:1px solid #ad1b25; +border-bottom:0px; +padding-right:1px; +padding-left:5px; +padding-top:2px; +} + +QAbstractSpinBox::up-arrow { +image:url(':/images/drk_upArrow_small'); +} + +QAbstractSpinBox::down-button { +subcontrol-origin: border; +subcontrol-position: bottom right; +width:21px; +background:#fcfcfc; +border-top:0px; +border-left:0px; +border-right:1px solid #ad1b25; +border-bottom:1px solid #ad1b25; +padding-right:1px; +padding-left:5px; +padding-bottom:2px; +} + +QAbstractSpinBox::down-arrow { +image:url(':/images/drk_downArrow_small'); +} + +/*******************************************************/ + +QHeaderView { /* Table Header */ +background-color:transparent; +} + +QHeaderView::section { /* Table Header Sections */ +qproperty-alignment:center; +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #ad1b25, stop: 1 #ad1b25); +color:#fff; +min-height:25px; +font-weight:bold; +font-size:11px; +outline:0; +border:0px solid #fff; +border-right:1px solid #fff; +padding-left:5px; +padding-right:5px; +padding-top:2px; +padding-bottom:2px; +} + +QHeaderView::section:last { +border-right: 0px solid #d7d7d7; /* */ +} + +.QScrollArea { +background:transparent; +border:0px; +} + +.QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ +background:transparent; +border:0px solid #fff; +} + +QTableView::item { /* Table Item */ +background-color:#fcfcfc; +font-size:12px; +} + +QTableView::item:selected { /* Table Item Selected */ +background-color:#f0f0f0; +color:#ad1b25; /* "When you click on a row in the table, the text turns this color" TEXT */ +} + +QScrollBar { /* Scroll Bar */ + +} + +QScrollBar:vertical { /* Vertical Scroll Bar Attributes */ +border:0; +background:#ffffff; +width:18px; +margin: 18px 0px 18px 0px; +} + +QScrollBar:horizontal { /* Horizontal Scroll Bar Attributes */ +border:0; +background:#ffffff; +height:18px; +margin: 0px 18px 0px 18px; +} + + +QScrollBar::handle:vertical { /* Scroll Bar Slider - vertical */ +background:#e0e0e0; +min-height:10px; +} + +QScrollBar::handle:horizontal { /* Scroll Bar Slider - horizontal */ +background:#e0e0e0; +min-width:10px; +} + +QScrollBar::add-page, QScrollBar::sub-page { /* Scroll Bar Background */ +background:#F8F6F6; +} + +QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical, QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { /* Define Arrow Button Dimensions */ +background-color:#F8F6F6; +border: 1px solid #f2f0f0; +width:16px; +height:16px; +} + +QScrollBar::add-line:vertical:pressed, QScrollBar::sub-line:vertical:pressed, QScrollBar::add-line:horizontal:pressed, QScrollBar::sub-line:horizontal:pressed { +background-color:#e0e0e0; +} + +QScrollBar::sub-line:vertical { /* Vertical - top button position */ +subcontrol-position:top; +subcontrol-origin: margin; +} + +QScrollBar::add-line:vertical { /* Vertical - bottom button position */ +subcontrol-position:bottom; +subcontrol-origin: margin; +} + +QScrollBar::sub-line:horizontal { /* Vertical - left button position */ +subcontrol-position:left; +subcontrol-origin: margin; +} + +QScrollBar::add-line:horizontal { /* Vertical - right button position */ +subcontrol-position:right; +subcontrol-origin: margin; +} + +QScrollBar:up-arrow, QScrollBar:down-arrow, QScrollBar:left-arrow, QScrollBar:right-arrow { /* Arrows Icon */ +width:10px; +height:10px; +} + +QScrollBar:up-arrow { +background-image: url(':/images/drk_upArrow_small'); +} + +QScrollBar:down-arrow { +background-image: url(':/images/drk_downArrow_small'); +} + +QScrollBar:left-arrow { +background-image: url(':/images/drk_leftArrow_small'); +} + +QScrollBar:right-arrow { +background-image: url(':/images/drk_rightArrow_small'); +} + + +/*******************************************************/ + +/* DIALOG BOXES */ + +QDialog .QTabWidget { +border-bottom:1px solid #333; +} + +QDialog .QTabWidget::pane { +border: 1px solid #d7d7d7; +} + +QDialog .QTabWidget QTabBar::tab { +background-color:#f2f0f0; +color:#333; /* */ +padding-left:10px; +padding-right:10px; +padding-top:5px; +padding-bottom:5px; +border-top: 1px solid #d7d7d7; +} + +QDialog .QTabWidget QTabBar::tab:first { +border-left: 1px solid #d7d7d7; +} + +QDialog .QTabWidget QTabBar::tab:last { +border-right: 1px solid #d7d7d7; +} + +QDialog .QTabWidget QTabBar::tab:selected, QDialog .QTabWidget QTabBar::tab:hover { +background-color:#ffffff; +color:#333; /* */ +} + +QDialog .QTabWidget .QWidget { +background-color:#fff; +color:#333; /* */ +} + +QDialog .QTabWidget .QWidget QAbstractSpinBox { +min-height:15px; +} + +QDialog .QTabWidget .QWidget QAbstractSpinBox::down-button { +width:15px; +} + +QDialog .QTabWidget .QWidget QAbstractSpinBox::up-button { +width:15px; +} + +QDialog .QTabWidget .QWidget QComboBox { +min-height:15px; +} + +QDialog QWidget { /* Remove Annoying Focus Rectangle */ +outline: 0; +} + +/*******************************************************/ +/* FILE MENU */ + +/* Dialog: Open URI */ +QDialog#OpenURIDialog { +background-color:#F8F6F6; +} + +QDialog#OpenURIDialog QLabel#label { /* URI Label */ +font-weight:bold; +} + +QDialog#OpenURIDialog QPushButton#selectFileButton { /* ... Button */ +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); +border:1px solid #d2d2d2; +color:#616161; /* */ +padding-left:10px; +padding-right:10px; +} + +QDialog#OpenURIDialog QPushButton#selectFileButton:hover { +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); +color:#333; /* */ +} + +QDialog#OpenURIDialog QPushButton#selectFileButton:pressed { +border:1px solid #9e9e9e; +} + +/* Dialog: Sign / Verify Message */ +QDialog#SignVerifyMessageDialog { +background-color:#F8F6F6; +} + +QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_SM { /* Address Book Button */ +background-color:transparent; +padding-left:10px; +padding-right:10px; +} + +QDialog#SignVerifyMessageDialog QPlainTextEdit { /* Message Signing Text */ +border:1px solid #ad1b25; +background-color:#fff; +} + +QDialog#SignVerifyMessageDialog QPushButton#pasteButton_SM { /* Paste Button */ +/* qproperty-icon: url(":/icons/drk_editpaste"); */ +background-color:transparent; +padding-left:15px; +} + +QDialog#SignVerifyMessageDialog QLineEdit:!focus { /* Font Hack */ +font-size:10px; +} + +QDialog#SignVerifyMessageDialog QPushButton#copySignatureButton_SM { /* Copy Button */ +/* qproperty-icon: url(":/icons/drk_editcopy"); */ +background-color:transparent; +padding-left:10px; +padding-right:10px; +} + +QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM { /* Clear Button */ +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); +border:1px solid #d2d2d2; +color:#616161; /* */ +padding-left:10px; +padding-right:10px; +} + +QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:hover { +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); +color:#333; /* */ +} + +QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:pressed { +border:1px solid #9e9e9e; +} + +QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_VM { /* Verify Message - Address Book Button */ +background-color:transparent; +border:0; +padding-left:10px; +padding-right:10px; +} + +QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM { /* Verify Message - Clear Button */ +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); +border:1px solid #d2d2d2; +color:#616161; /* */ +padding-left:10px; +padding-right:10px; +} + +QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover { +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); +color:#333; /* */ +} + +QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed { +border:1px solid #9e9e9e; +} + +/* Dialog: Send and Receive */ +QWidget#AddressBookPage { +background-color:#F8F6F6; +} + +QWidget#AddressBookPage QPushButton#newAddress { /* New Address Button */ +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); +border:1px solid #d2d2d2; +color:#616161; /* */ +padding-left:10px; +padding-right:10px; +} + +QWidget#AddressBookPage QPushButton#newAddress:hover { +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); +color:#333; +} + +QWidget#AddressBookPage QPushButton#newAddress:pressed { +border:1px solid #9e9e9e; +} + +QWidget#AddressBookPage QPushButton#copyAddress { /* Copy Address Button */ +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); +border:1px solid #d2d2d2; +color:#616161; /* */ +padding-left:10px; +padding-right:10px; +} + +QWidget#AddressBookPage QPushButton#copyAddress:hover { +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); +color:#333; /* */ +} + +QWidget#AddressBookPage QPushButton#copyAddress:pressed { +border:1px solid #9e9e9e; +} + +QWidget#AddressBookPage QPushButton#deleteAddress { /* Delete Address Button */ +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); +border:1px solid #d2d2d2; +color:#616161; /* */ +padding-left:10px; +padding-right:10px; +} + +QWidget#AddressBookPage QPushButton#deleteAddress:hover { +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); +color:#333; /* */ +} + +QWidget#AddressBookPage QPushButton#deleteAddress:pressed { +border:1px solid #9e9e9e; +} + +QWidget#AddressBookPage QTableView { /* Address Listing */ +font-size:12px; +} + +QWidget#AddressBookPage QHeaderView::section { /* Min width for Windows fix */ +min-width:260px; +} + +/* SETTINGS MENU */ + +/* Encrypt Wallet and Change Passphrase Dialog */ +QDialog#AskPassphraseDialog { +background-color:#F8F6F6; /* */ +} + +QDialog#AskPassphraseDialog QLabel#passLabel1, QDialog#AskPassphraseDialog QLabel#passLabel2, QDialog#AskPassphraseDialog QLabel#passLabel3 { +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:170px; +min-height:33px; /* base width of 25px for QLineEdit, plus padding and border */ +} + +/* Options Dialog */ +QDialog#OptionsDialog { +background-color:#F8F6F6; /* */ +} + +QDialog#OptionsDialog QValueComboBox, QDialog#OptionsDialog QSpinBox { +margin-top:5px; +margin-bottom:5px; +} + +QDialog#OptionsDialog QValidatedLineEdit, QDialog#OptionsDialog QValidatedLineEdit:disabled, QDialog#OptionsDialog QLineEdit, QDialog#OptionsDialog QLineEdit:disabled { +qproperty-alignment: 'AlignVCenter | AlignLeft'; +min-height:20px; +margin-top:0px; +margin-bottom:0px; +padding-top:1px; +padding-bottom:1px; +} + +QDialog#OptionsDialog > QLabel { +qproperty-alignment: 'AlignVCenter'; +min-height:20px; +} + +QDialog#OptionsDialog QWidget#tabDisplay QValueComboBox { +margin-top:0px; +margin-bottom:0px; +} + +QDialog#OptionsDialog QLabel#label_3 { /* Translations Missing? Label */ +qproperty-alignment: 'AlignVCenter | AlignCenter'; +color:#818181; /* */ +padding-bottom:8px; +} + +QDialog#OptionsDialog QCheckBox { +qproperty-alignment: 'AlignVCenter'; +min-height:20px; +} + +QDialog#OptionsDialog QCheckBox#displayAddresses { +min-height:33px; + +} + +/* TOOLS MENU */ + +QDialog#RPCConsole { /* RPC Console Dialog Box */ +background-color:#F8F6F6; +} + +QDialog#RPCConsole QWidget#tab_info QLabel#label_11, QDialog#RPCConsole QWidget#tab_info QLabel#label_10 { /* Margin between Network and Block Chain headers */ +qproperty-alignment: 'AlignBottom'; +min-height:25px; +min-width:180px; +} + +QDialog#RPCConsole QWidget#tab_peers QLabel#peerHeading { /* Peers Info Header */ +color:#ad1b25; /* */ +} + +QDialog#RPCConsole QPushButton#openDebugLogfileButton { +max-width:60px; +} + +QDialog#RPCConsole QTextEdit#messagesWidget { /* Console Messages Window */ +border:0; +} + +QDialog#RPCConsole QLineEdit#lineEdit { /* Console Input */ +margin-right:5px; +} + +QDialog#RPCConsole QPushButton#clearButton { /* Console Clear Button */ +background-color:transparent; +padding-left:10px; +padding-right:10px; +} + +QDialog#RPCConsole .QGroupBox #line { /* Network In Line */ +background-color:#00ff00; +} + +QDialog#RPCConsole .QGroupBox #line_2 { /* Network Out Line */ +background:#ff0000; +} + +/* HELP MENU */ + +/* Command Line Options Dialog */ +QDialog#HelpMessageDialog { +background-color:#F8F6F6; +} + +QDialog#HelpMessageDialog QScrollArea * { +background-color:#ffffff; +} + +QDialog#HelpMessageDialog QScrollBar:vertical, QDialog#HelpMessageDialog QScrollBar:horizontal { +border:0; +} + +/* About Darknet Dialog */ +QDialog#AboutDialog { +background-color:#F8F6F6; +} + +QDialog#AboutDialog QLabel#label, QDialog#AboutDialog QLabel#copyrightLabel, QDialog#AboutDialog QLabel#label_2 { /* About Darknet Contents */ +margin-left:10px; +} + +QDialog#AboutDialog QLabel#label_2 { /* Margin for About Darknet text */ +margin-right:10px; +} + +/* Edit Address Dialog */ +QDialog#EditAddressDialog { +background-color:#F8F6F6; +} + +QDialog#EditAddressDialog QLabel { +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-height:27px; +font-weight:normal; +padding-right:5px; +} + +/* OVERVIEW SCREEN */ + +QWidget .QFrame#frame { /* Wallet Balance */ +min-width:490px; +} + +QWidget .QFrame#frame > .QLabel { +min-width:190px; +font-weight:normal; +min-height:30px; +} + +QWidget .QFrame#frame .QLabel#label_5 { /* Wallet Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +background-color:transparent; +color:#fff; /* */ +margin-right:5px; +padding-right:5px; +} + +QWidget .QFrame#frame .QLabel#labelWalletStatus { /* Wallet Sync Status */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +margin-left:3px; +color:#ffffff; +} + +QWidget .QFrame#frame .QLabel#labelSpendable { /* Spendable Header */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +margin-left:18px; +} + +QWidget .QFrame#frame .QLabel#labelWatchonly { /* Watch-only Header */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +margin-left:16px; +} + +QWidget .QFrame#frame .QLabel#labelBalanceText { /* Available Balance Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +background-color:transparent; /* AVAILABLE BALANCE BOX COLOR */ +color:#ffffff; /* AVAILABLE BALANCE TEXT */ +margin-right:5px; +padding-right:5px; +font-weight:bold; +font-size:14px; +min-height:35px; +} + +QWidget .QFrame#frame .QLabel#labelBalance { /* Available Balance */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +color:#ffffff; /* AVAILABLE BALANCE TEXT */ +margin-left:0px; +} + +QWidget .QFrame#frame .QLabel#labelWatchAvailable { /* Watch-only Balance */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +margin-left:16px; +} + +QWidget .QFrame#frame .QLabel#labelPendingText { /* Pending Balance Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +font-size:12px; +background-color:transparent; /* PENDING BALANCE BOX COLOR */ +font-weight:bold; +color:#ffffff; /* PENDING BALANCE BOX TEXT */ +margin-right:5px; +padding-right:5px; +} + +QWidget .QFrame#frame .QLabel#labelUnconfirmed { /* Pending Balance */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +color:#ffffff; /* PENDING BALANCE TEXT */ +margin-left:0px; +} + +QWidget .QFrame#frame .QLabel#labelWatchPending { /* Watch-only Pending Balance */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +margin-left:16px; +} + +QWidget .QFrame#frame .QLabel#labelImmatureText { /* Immature Balance Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +font-size:12px; +background-color:transparent; /* IMMATURE BOX COLOR */ +font-weight:bold; +color:#ffffff; /* IMMATURE BALANCE BOX TEXT */ +margin-right:5px; +padding-right:5px; +} + +QWidget .QFrame#frame .QLabel#labelImmature { /* Immature Balance */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +color:#ffffff; /* IMMATURE BALANCE TEXT */ +margin-left:0px; +} + +QWidget .QFrame#frame .QLabel#labelWatchImmature { /* Watch-only Immature Balance */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +margin-left:16px; +} + +QWidget .QFrame#frame .QLabel#labelTotalText { /* Total Balance Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +font-size:12px; +background-color:transparent; /* TOTAL BALANCE BOX COLOR */ +font-weight:bold; +color:#ffffff; /* TOTAL BALANCE BOX TEXT */ +margin-right:5px; +padding-right:5px; +} + +QWidget .QFrame#frame .QLabel#labelTotal { /* Total Balance */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +color:#ffffff; /* TOTAL BALANCE TEXT */ +margin-left:0px; +} + +QWidget .QFrame#frame .QLabel#labelWatchTotal { /* Watch-only Total Balance */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +font-size:12px; +margin-left:16px; +} + +/* DARKSEND WIDGET */ + +QWidget .QFrame#frameObfuscate { /* Obfuscate Widget */ +background-color:transparent; +qproperty-minimumSize: 451px 343px; +} + +QWidget .QFrame#frameObfuscate QWidget { +qproperty-geometry: rect(10 0 431 35); +} + +QWidget .QFrame#frameObfuscate .QLabel#label_2 { /* Obfuscate Header */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +background-color:transparent; /* DARKSEND BOX COLOR */ +font-weight:bold; +color:#ffffff; /* DARKSEND TEXT COLOR */ +margin-right:5px; +padding-right:5px; +font-size:14px; +min-height:35px; +} + +/******************************************************************/ + +QWidget .QFrame#frameObfuscate .QLabel#labelObfuscateSyncStatus { /* Obfuscate Sync Status */ +qproperty-alignment: 'AlignVCenter | AlignLeft'; +margin-left:2px; +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget { +qproperty-geometry: rect(10 51 451 175); +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget > .QLabel { +min-width:175px; +font-weight:normal; +min-height:25px; +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#label_6 { /* Obfuscate Status Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +background-color:transparent; /* DARKSEND STATUS BOX COLOR */ +font-weight:bold; +color:#ffffff; /* DARKSEND STATUS BOX TEXT */ +margin-right:5px; +padding-right:5px; +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#obfuscateEnabled { /* Obfuscate Status */ +color:#ffffff; /* DARKSEND STATUS TEXT */ +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#label_7 { /* Obfuscate Completion Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +background-color:transparent; /* DARKSEND COMPLETION BOX COLOR */ +font-weight:bold; +color:#ffffff; /* DARKSEND COMPLETION BOX TEXT */ +margin-right:5px; +padding-right:5px; + +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QProgressBar#obfuscateProgress { /* Obfuscate Completion */ +border: 1px solid #999999; +border-radius: 1px; +margin-right:43px; +text-align: right; +color:#ffffff; /* DARKSEND PROGRESS TEXT */ +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QProgressBar#obfuscateProgress::chunk { +background-color: #ad1b25; /* DARKSEND PROGRESS BAR */ +width:1px; +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#labelAnonymizedText { /* Obfuscate Balance Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +background-color:transparent; /* DARKSEND BALANCE BOX COLOR */ +font-weight:bold; +color:#ffffff; /* DARKSEND BALANCE BOX TEXT */ +margin-right:5px; +padding-right:5px; +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#labelAnonymized { /* Obfuscate Balance */ +color:#ffffff; /* DARKSEND BALANCE TEXT */ +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#label_8 { /* Obfuscate Amount and Rounds Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +background-color:transparent; /* DARKSEND AMOUNT AND ROUNDS BOX COLOR */ +font-weight:bold; +color:#ffffff; /* DARKSEND AMOUNT AND ROUNDS BOX TEXT */ +margin-right:5px; +padding-right:5px; +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#labelAmountRounds { /* Obfuscate Amount and Rounds */ +color:#ffffff; /* AMOUNTS AND ROUNDS TEXT */ +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#label_9 { /* Obfuscate Submitted Denom Label */ +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-width:160px; +background-color:transparent; /* DARKSEND SUBMITTED AND DENOM BOX COLOR */ +font-weight:bold; +color:#ffffff; /* DARKSEND SUBMITTED AND DENOM BOX TEXT */ +margin-right:5px; +padding-right:5px; +} + +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#labelSubmittedDenom { /* Obfuscate Submitted Denom */ +color:#ffffff; /* SUBMITTED AND DENOM TEXT */ +} + +QWidget .QFrame#frameObfuscate .QLabel#obfuscateStatus { /* Obfuscate Status Notifications */ +qproperty-alignment: 'AlignVCenter | AlignCenter'; +qproperty-geometry: rect(70 226 395 34); +font-size:11px; +color:#818181; /* DARKSEND STATUS NOTIFICATION TEXT */ +} + +/* DARKSEND BUTTONS */ + +QWidget .QFrame#frameObfuscate .QPushButton { /* Obfuscate Buttons - General Attributes */ +border:0px solid #ffffff; +} + +QWidget .QFrame#frameObfuscate QPushButton:focus { +border:none; +outline:none; +} + +QWidget .QFrame#frameObfuscate .QPushButton#runAutoDenom { /* No idea why this button is in the .UI file... */ +qproperty-geometry: rect(0 0 0 0); +} + +QWidget .QFrame#frameObfuscate .QPushButton#toggleObfuscate { /* Start Obfuscate Mixing */ +qproperty-geometry: rect(115 268 295 40); +font-size:15px; +background-color:transparent; /* DARKSEND MIXING BOX COLOR */ +font-weight:bold; +color:#ffffff; /* DARKSEND MIXING BOX TEXT */ +padding-left:10px; +padding-right:10px; +padding-top:5px; +padding-bottom:6px; +} + +QWidget .QFrame#frameObfuscate .QPushButton#toggleObfuscate:hover { + +} + +QWidget .QFrame#frameObfuscate .QPushButton#obfuscateAuto { /* Try Mix Button */ +qproperty-geometry: rect(120 314 140 25); +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +min-height:25px; +font-size:9px; +padding:0px; +} + +QWidget .QFrame#frameObfuscate .QPushButton#obfuscateAuto:hover { +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +font-weight:bold; +} + +QWidget .QFrame#frameObfuscate .QPushButton#obfuscateAuto:pressed { +border:1px solid #9e9e9e; +} + +QWidget .QFrame#frameObfuscate .QPushButton#obfuscateReset { /* Reset Button */ +qproperty-geometry: rect(265 314 140 25); +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +min-height:25px; +font-size:9px; +padding:0px; +} + +QWidget .QFrame#frameObfuscate .QPushButton#obfuscateReset:hover { +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +font-weight:bold; +} + +QWidget .QFrame#frameObfuscate .QPushButton#obfuscateReset:pressed { +border:1px solid #9e9e9e; +} + +/* RECENT TRANSACTIONS */ + +QWidget .QFrame#frame_2 { /* Transactions Widget */ +min-width:410px; +margin-right:20px; +margin-left:0; +margin-top:0; +background-image: url(':/images/darknet_logo_horizontal-drk'); +background-repeat:none; +} + +QWidget .QFrame#frame_2 .QLabel#label_4 { /* Recent Transactions Label */ +min-width:180px; +color:#ffffff; /* RECENT TRANSACTIONS HEADER TEXT */ +margin-left:67px; +margin-top:83px; +margin-right:5px; +padding-right:5px; +font-weight:bold; +font-size:15px; +min-height:24px; +} + +QWidget .QFrame#frame_2 .QLabel#labelTransactionsStatus { /* Recent Transactions Sync Status */ +qproperty-alignment: 'AlignBottom | AlignRight'; +min-width:93px; +margin-top:83px; +margin-left:16px; +margin-right:5px; +min-height:16px; +color:#999999; /* SYNC STATUS TEXT */ +} + +QWidget .QFrame#frame_2 QListView { /* Transaction List */ +color:#ffffff; /* DATE TEXT */ +font-weight:normal; +font-size:12px; +max-width:369px; +margin-top:12px; +margin-left:0px; /* CSS Voodoo - set to -66px to hide default transaction icons */ +} + +/* SEND DIALOG */ + +QDialog#SendCoinsDialog QLabel#labelFeeHeadline { +color:#ffffff; /* TEXT "TRANSACTION FEE" */ +} + +QDialog#SendCoinsDialog QLabel#labelFeeMinimized { +color:#ffffff; /* TEXT "0.00010000 DNET/kB" */ +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl { /* Coin Control Section */ + +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl > .QLabel { /* Default Font Color and Size */ +color:#ffffff; /* TEXT */ +font-weight:normal; +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl .QPushButton#pushButtonCoinControl { /* Coin Control Inputs Button */ +padding-left:10px; +padding-right:10px; +border:1px solid #d2d2d2; /* "inputs..." Border */ +background-color:transparent; +color:#ffffff; +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlFeatures { /* Coin Control Header */ +color:#ffffff; /* TEXT */ +font-weight:bold; +font-size:14px; +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl .QWidget#widgetCoinControl { /* Coin Control Inputs */ +color:#ffffff; /* TEXT */ +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl .QWidget#widgetCoinControl > .QLabel { /* Coin Control Inputs Labels */ +padding:2px; +color:#ffffff; /* TEXT */ +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl .QCheckBox#checkBoxCoinControlChange { /* Custom Change Label */ +color:#ffffff; /* TEXT */ +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl .QValidatedLineEdit#lineEditCoinControlChange { /* Custom Change Address */ + +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlChangeLabel { /* Custom Change Address Validation Label */ +color:#ffffff; /* TEXT */ +font-weight:normal; +qproperty-margin:-6; +margin-right:112px; +} + +QDialog#SendCoinsDialog .QScrollArea#scrollArea .QWidget#scrollAreaWidgetContents { /* Send To Widget */ +background:transparent; + +} + +QDialog#SendCoinsDialog .QPushButton#sendButton { /* Send Button */ +border:1px solid #d2d2d2; /* Send Button Border */ +background-color:transparent; +color:#ffffff; +padding-left:10px; +padding-right:10px; + +} + +QDialog#SendCoinsDialog .QPushButton#clearButton { /* Clear Button */ +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +padding-left:10px; +padding-right:10px; +} + +QDialog#SendCoinsDialog .QPushButton#clearButton:hover { +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +} + +QDialog#SendCoinsDialog .QPushButton#clearButton:pressed { +border:1px solid #9e9e9e; +} + +QDialog#SendCoinsDialog .QPushButton#addButton { /* Add Button */ +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +padding-left:10px; +padding-right:10px; +} + +QDialog#SendCoinsDialog .QPushButton#addButton:hover { +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +} + +QDialog#SendCoinsDialog .QPushButton#addButton:pressed { +border:1px solid #9e9e9e; +} + +QDialog#SendCoinsDialog .QCheckBox#checkUseObfuscate { /* Obfuscate Checkbox */ +color:#999999; /* TEXT */ +font-weight:bold; +background: transparent; +/* background: qradialgradient(cx:0.5, cy:0.5, radius: 0.5, fx:0.5, fy:0.5, stop:0 rgba(248, 246, 246, 128), stop: 1 rgba(0, 0, 0, 0)); */ +border-radius:5px; +padding-top:20px; +padding-bottom:18px; +} + +QDialog#SendCoinsDialog .QCheckBox#checkSwiftTX { /* SwiftTX Checkbox */ +color:#999999; /* TEXT */ +font-weight:bold; +background: transparent; +/* background: qradialgradient(cx:0.5, cy:0.5, radius: 0.5, fx:0.5, fy:0.5, stop:0 rgba(248, 246, 246, 128), stop: 1 rgba(0, 0, 0, 0)); */ +border-radius:5px; +padding-top:20px; +padding-bottom:18px; +margin-left:10px; +margin-right:20px; +} + +/* This QLabel uses name = "label" which conflicts with Address Book -> New Address */ +/* To maximize backwards compatibility this formatting has been removed */ + +QDialog#SendCoinsDialog QLabel#label { +/*margin-left:20px; +margin-right:-2px; +padding-right:-2px; +color:#616161; +font-size:14px; +font-weight:bold; +border-radius:5px; +padding-top:20px; +padding-bottom:20px;*/ +min-height:27px; +color:#999999; /* BALANCE TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelBalance { +margin-left:0px; +padding-left:0px; +color:#ffffff; /* BALANCE NUMBER TEXT */ +/* font-weight:bold; +border-radius:5px; +padding-top:20px; +padding-bottom:20px; */ +min-height:27px; +} + +QDialog#SendCoinsDialog QPushButton#buttonChooseFee { +border:1px solid #d2d2d2; /* "Choose..." Border */ +background-color:transparent; +color:#ffffff; +} + +QDialog#SendCoinsDialog QPushButton#buttonMinimizeFee { +border:1px solid #d2d2d2; /* "Minimize..." Border */ +background-color:transparent; +color:#ffffff; +} + +QDialog#SendCoinsDialog QLabel#labelFreeTx { +color:#ffffff; /* "(confirmation may take longer)" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelMinFeeWarning { +color:#ffffff; /* "(read the tooltip)" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelSmartFee_2{ +color:#ffffff; /* "Recommended" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelCustomFee { +color:#ffffff; /* "Custom" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelSmartFee { +color:#ffffff; /* "00010000" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelFeeEstimation { +color:#ffffff; /* "DNET/kB" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelSmartFee2 { +color:#ffffff; /* "Smart fee not initialized yet" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelSmartFee3 { +color:#ffffff; /* "Confirmation time" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelSmartFeeNormal { +color:#ffffff; /* "normal" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelSmartFeeFast { +color:#ffffff; /* "fast" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#radioCustomPerKilobyte { +color:#ffffff; /* "per kilobyte" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#radioCustomAtLeast { +color:#ffffff; /* "total at least" TEXT */ +} + +QDialog#SendCoinsDialog QCheckBox#checkBoxFreeTx { +color:#ffffff; /* "Send as zero fee checkbox" TEXT */ +} + +QDialog#SendCoinsDialog QCheckBox#checkBoxMinimumFee { +color:#ffffff; /* "Send as minimum fee checkbox" TEXT */ +} + +/* SEND COINS ENTRY */ + +QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry Labels */ +background-color:#ad1b25; /* SEND COINS BUTTON COLOR */ +min-width:102px; +font-weight:bold; +font-size:11px; +color:#ffffff; /* SEND COINS BUTTON TEXT COLOR */ +min-height:25px; +margin-right:5px; +padding-right:5px; +} + +QStackedWidget#SendCoinsEntry .QFrame#SendCoins .QLabel#payToLabel { +background-color:transparent; +color:#ffffff; +} + +QStackedWidget#SendCoinsEntry .QFrame#SendCoins .QLabel#labelLabel { +background-color:transparent; +color:#ffffff; +} + +QStackedWidget#SendCoinsEntry .QFrame#SendCoins .QLabel#amountLabel { +background-color:transparent; +color:#ffffff; +} + +QStackedWidget#SendCoinsEntry .QValidatedLineEdit#payTo { /* Pay To Input Field */ +} + +QStackedWidget#SendCoinsEntry .QToolButton { /* General Settings for Pay To Icons */ +background-color:transparent; +padding-left:5px; +padding-right:5px; +border: 0; +outline: 0; +} + +QStackedWidget#SendCoinsEntry .QToolButton#addressBookButton { /* Address Book Button */ +padding-left:10px; +} + +QStackedWidget#SendCoinsEntry .QToolButton#addressBookButton { +} + +QStackedWidget#SendCoinsEntry .QToolButton#pasteButton { +} + +QStackedWidget#SendCoinsEntry .QToolButton#deleteButton { +} + +QStackedWidget#SendCoinsEntry .QLineEdit#addAsLabel { /* Pay To Input Field */ +} + +/* COIN CONTROL POPUP */ + +QDialog#CoinControlDialog { /* Coin Control Dialog Window */ +background-color:#F8F6F6; +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlQuantityText { /* Coin Control Quantity Label */ +min-height:30px; +color:#333333; /* TEXT */ +padding-left:15px; +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlQuantity { /* Coin Control Quantity */ +min-height:30px; +color:#555888; /* TEXT */ +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlBytesText { /* Coin Control Bytes Label */ +padding-left:15px; +color:#333333; /* TEXT */ +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlBytes { /* Coin Control Bytes */ +color:#555888; /* TEXT */ +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlAmountText { /* Coin Control Amount Label */ +color:#333333; /* TEXT */ +min-height:30px; +padding-left:15px; +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlAmount { /* Coin Control Amount */ +min-height:30px; +color:#555888; /* TEXT */ +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlPriorityText { /* Coin Control Priority Label */ +padding-left:15px; +color:#333333; /* TEXT */ +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlPriority { /* Coin Control Priority */ +color:#555888; /* TEXT */ +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlFeeText { /* Coin Control Fee Label */ +color:#333333; /* TEXT */ +min-height:30px; +padding-left:15px; +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlFee { /* Coin Control Fee */ +min-height:30px; +color:#555888; /* TEXT */ +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlLowOutputText { /* Coin Control Low Output Label */ +color:#333333; /* TEXT */ +padding-left:15px; +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlLowOutput { /* Coin Control Low Output */ +color:#555888; /* TEXT */ +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlAfterFeeText { /* Coin Control After Fee Label */ +color:#333333; /* TEXT */ +min-height:30px; +padding-left:15px; +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlAfterFee { /* Coin Control After Fee */ +color:#555888; /* TEXT */ +min-height:30px; +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlChangeText { /* Coin Control Change Label */ +color:#333333; /* TEXT */ +padding-left:15px; +} + +QDialog#CoinControlDialog .QLabel#labelCoinControlChange { /* Coin Control Change */ +color:#555888; /* TEXT */ +} + +QDialog#CoinControlDialog .QFrame#frame .QPushButton#pushButtonSelectAll { /* (un)select all button */ +padding-left:10px; +padding-right:10px; +min-height:25px; +} + +QDialog#CoinControlDialog .QFrame#frame .QPushButton#pushButtonToggleLock { /* Toggle lock state button */ +padding-left:10px; +padding-right:10px; +min-height:25px; +} + +QDialog#CoinControlDialog .QDialogButtonBox#buttonBox QPushButton { /* Coin Control 'OK' button */ +} + +QDialog#CoinControlDialog .QFrame#frame .QRadioButton#radioTreeMode { /* Coin Control Tree Mode Selector */ +color:#818181; +background-color:transparent; +} + +QDialog#CoinControlDialog .QFrame#frame .QRadioButton#radioListMode { /* Coin Control List Mode Selector */ +color:#818181; +background-color:transparent; +} + +QDialog#CoinControlDialog QHeaderView::section:first { /* Bug Fix: the number "1" displays in this table for some reason... */ +color:transparent; +} + +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget { /* Coin Control Widget Container */ +outline:0; +background-color:#ffffff; +border:0px solid #818181; +} + +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item { + +} + +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:selected { /* Coin Control Item (selected) */ +background-color:#f7f7f7; +color:#333; /* */ +} + +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:checked { /* Coin Control Item (checked) */ +background-color:#f7f7f7; +color:#333; /* */ +} + +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:selected { /* Coin Control Branch Icon */ +background-image: url(':/images/drk_qtreeview_selected'); +background-repeat:no-repeat; +background-position:center; +background-color:#f7f7f7; +color:#ffffff; /* TEXT */ +} + +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:checked { /* Coin Control Branch Icon */ +background-image: url(':/images/drk_qtreeview_selected'); +background-repeat:no-repeat; +background-position:center; +background-color:#f7f7f7; +color:#ffffff; /* TEXT */ +} + +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::seperator { + +} + +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::indicator { /* Coin Control Widget Checkbox */ +color:#999999; /* TEXT */ +} + +/* RECEIVE COINS */ + +QDialog#ReceiveCoinsDialog QPushButton#receiveButton { +border:1px solid #d2d2d2; /* "Request payment" Border */ +background-color:transparent; +color:#ffffff; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_2 { /* Label Label */ +background-color:transparent; /* RECEIVE ADDRESS LABEL BOX COLOR */ +min-width:102px; +color:#ffffff; /* RECEIVE ADDRESS LABEL TEXT COLOR */ +font-weight:bold; +font-size:11px; +padding-right:5px; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label { /* Amount Label */ +background-color:transparent; /* RECEIVE AMOUNT LABEL BOX COLOR */ +min-width:102px; +color:#ffffff; /* RECEIVE AMOUNT LABEL TEXT COLOR */ +font-weight:bold; +font-size:11px; +padding-right:5px; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_3 { /* Message Label */ +background-color:transparent; /* RECEIVE MESSAGE LABEL BOX COLOR */ +min-width:102px; +color:#ffffff; /* RECEIVE MESSAGE LABEL TEXT COLOR */ +font-weight:bold; +font-size:11px; +padding-right:5px; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_5 { /* Message Label */ +color:#ffffff; /* TEXT "USE THIS FORM TO REQUEST PAYMENT" */ +} + +QWidget#ReceiveCoinsDialog .QFrame#frame2 .QCheckBox#reuseAddress { /* Message Label */ +color:#ffffff; /* TEXT "OPTION TO REUSE PREVIOUS ADDRESS" */ +} + + +QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton { /* Clear Button */ +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +padding-left:10px; +padding-right:10px; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:hover { +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +font-weight:bold; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:pressed { +border:1px solid #9e9e9e; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton { /* Show Button */ +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +padding-left:10px; +padding-right:10px; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:hover { +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +font-weight:bold; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:pressed { +border:1px solid #9e9e9e; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton { /* Remove Button */ +/* background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); */ +background-color:transparent; +border:1px solid #d2d2d2; +color:#ffffff; +padding-left:10px; +padding-right:10px; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:hover { +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); +color:#333333; /* TEXT */ +} + +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:pressed { +border:1px solid #9e9e9e; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame .QLabel#label_6 { /* Requested Payments History Label */ +color:#ffffff; /* TEXT */ +font-weight:bold; +font-size:14px; +} + +/* RECEIVE COINS DIALOG */ + +QDialog#ReceiveRequestDialog { +background-color:#F8F6F6; +} + +QDialog#ReceiveRequestDialog QTextEdit { /* Contents of Receive Coin Dialog */ +border:1px solid #d7d7d7; +} + +/* TRANSACTIONS PAGE */ + +TransactionView QLineEdit { /* Address Filter */ +margin-bottom:2px; +margin-right:1px; +min-width:111px; +text-align:center; +} + +TransactionView QComboBox { +margin-bottom:1px; +margin-right:1px; +} + +QLabel#transactionSumLabel { /* Example of setObjectName for widgets without name */ +color:#ffffff; /* TEXT */ +font-weight:bold; +} + +QLabel#transactionSum { /* Example of setObjectName for widgets without name */ +color:#ffffff; /* TEXT */ +} + +/* TRANSACTION DETAIL DIALOG */ + +QDialog#TransactionDescDialog { +background-color:#F8F6F6; +} + +QDialog#TransactionDescDialog QTextEdit { /* Contents of Receive Coin Dialog */ +color:#ad1b25; /* */ +border:1px solid #d7d7d7; + + diff --git a/src/qt/res/css/drkblue.css b/src/qt/res/css/drkblue.css index 965ef42a395c6..320c988957cd5 100644 --- a/src/qt/res/css/drkblue.css +++ b/src/qt/res/css/drkblue.css @@ -793,7 +793,8 @@ QWidget .QFrame#frame .QLabel#labelPendingText { /* Pending Balance Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; font-size:12px; -background-color:#F8F6F6; +background-color:transparent; /* PENDING BALANCE BOX COLOR */ +font-weight:bold; margin-right:5px; padding-right:5px; } @@ -814,7 +815,7 @@ QWidget .QFrame#frame .QLabel#labelImmatureText { /* Immature Balance Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; font-size:12px; -background-color:#F8F6F6; +background-color:transparent; /* IMMATURE BOX COLOR */ margin-right:5px; padding-right:5px; } @@ -835,7 +836,7 @@ QWidget .QFrame#frame .QLabel#labelTotalText { /* Total Balance Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; font-size:12px; -background-color:#F8F6F6; +background-color:transparent; /* TOTAL BALANCE BOX COLOR */ margin-right:5px; padding-right:5px; } @@ -854,16 +855,16 @@ margin-left:16px; /* DARKSEND WIDGET */ -QWidget .QFrame#frameDarksend { /* Darksend Widget */ +QWidget .QFrame#frameObfuscate { /* Obfuscate Widget */ background-color:transparent; qproperty-minimumSize: 451px 343px; } -QWidget .QFrame#frameDarksend QWidget { +QWidget .QFrame#frameObfuscate QWidget { qproperty-geometry: rect(10 0 431 35); } -QWidget .QFrame#frameDarksend .QLabel#label_2 { /* Darksend Header */ +QWidget .QFrame#frameObfuscate .QLabel#label_2 { /* Obfuscate Header */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; background-color:#56ABD8; @@ -875,43 +876,43 @@ font-size:14px; min-height:35px; } /******************************************************************/ -QWidget .QFrame#frameDarksend .QLabel#labelDarksendSyncStatus { /* Darksend Sync Status */ +QWidget .QFrame#frameObfuscate .QLabel#labelObfuscateSyncStatus { /* Obfuscate Sync Status */ qproperty-alignment: 'AlignVCenter | AlignLeft'; margin-left:2px; } -QWidget .QFrame#frameDarksend #formLayoutWidget { +QWidget .QFrame#frameObfuscate #formLayoutWidget { qproperty-geometry: rect(10 51 451 175); } -QWidget .QFrame#frameDarksend #formLayoutWidget > .QLabel { +QWidget .QFrame#frameObfuscate #formLayoutWidget > .QLabel { min-width:175px; font-weight:normal; min-height:25px; } -QWidget .QFrame#frameDarksend #formLayoutWidget .QLabel#label_6 { /* Darksend Status Label */ +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#label_6 { /* Obfuscate Status Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; -background-color:#F8F6F6; +background-color:transparent; /* DARKSEND STATUS BOX COLOR */ margin-right:5px; padding-right:5px; } -QWidget .QFrame#frameDarksend #formLayoutWidget .QLabel#darksendEnabled { /* Darksend Status */ +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#obfuscateEnabled { /* Obfuscate Status */ } -QWidget .QFrame#frameDarksend #formLayoutWidget .QLabel#label_7 { /* Darksend Completion Label */ +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#label_7 { /* Obfuscate Completion Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; -background-color:#F8F6F6; +background-color:transparent; /* DARKSEND COMPLETION BOX COLOR */ margin-right:5px; padding-right:5px; } -QWidget .QFrame#frameDarksend #formLayoutWidget .QProgressBar#darksendProgress { /* Darksend Completion */ +QWidget .QFrame#frameObfuscate #formLayoutWidget .QProgressBar#obfuscateProgress { /* Obfuscate Completion */ border: 1px solid #818181; border-radius: 1px; margin-right:43px; @@ -919,48 +920,48 @@ text-align: right; color:#818181; } -QWidget .QFrame#frameDarksend #formLayoutWidget .QProgressBar#darksendProgress::chunk { +QWidget .QFrame#frameObfuscate #formLayoutWidget .QProgressBar#obfuscateProgress::chunk { background-color: #3398CC; width:1px; } -QWidget .QFrame#frameDarksend #formLayoutWidget .QLabel#labelAnonymizedText { /* Darksend Balance Label */ +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#labelAnonymizedText { /* Obfuscate Balance Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; -background-color:#F8F6F6; +background-color:transparent; /* DARKSEND BALANCE BOX COLOR */ margin-right:5px; padding-right:5px; } -QWidget .QFrame#frameDarksend #formLayoutWidget .QLabel#labelAnonymized { /* Darksend Balance */ +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#labelAnonymized { /* Obfuscate Balance */ } -QWidget .QFrame#frameDarksend #formLayoutWidget .QLabel#label_8 { /* Darksend Amount and Rounds Label */ +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#label_8 { /* Obfuscate Amount and Rounds Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; -background-color:#F8F6F6; +background-color:transparent; /* DARKSEND AMOUNT AND ROUNDS BOX COLOR */ margin-right:5px; padding-right:5px; } -QWidget .QFrame#frameDarksend #formLayoutWidget .QLabel#labelAmountRounds { /* Darksend Amount and Rounds */ +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#labelAmountRounds { /* Obfuscate Amount and Rounds */ } -QWidget .QFrame#frameDarksend #formLayoutWidget .QLabel#label_9 { /* Darksend Submitted Denom Label */ +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#label_9 { /* Obfuscate Submitted Denom Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; -background-color:#F8F6F6; +background-color:transparent; /* DARKSEND SUBMITTED AND DENOM BOX COLOR */ margin-right:5px; padding-right:5px; } -QWidget .QFrame#frameDarksend #formLayoutWidget .QLabel#labelSubmittedDenom { /* Darksend Submitted Denom */ +QWidget .QFrame#frameObfuscate #formLayoutWidget .QLabel#labelSubmittedDenom { /* Obfuscate Submitted Denom */ } -QWidget .QFrame#frameDarksend .QLabel#darksendStatus { /* Darksend Status Notifications */ +QWidget .QFrame#frameObfuscate .QLabel#obfuscateStatus { /* Obfuscate Status Notifications */ qproperty-alignment: 'AlignVCenter | AlignCenter'; qproperty-geometry: rect(70 226 395 34); font-size:11px; @@ -969,20 +970,20 @@ color:#818181; /* DARKSEND BUTTONS */ -QWidget .QFrame#frameDarksend .QPushButton { /* Darksend Buttons - General Attributes */ +QWidget .QFrame#frameObfuscate .QPushButton { /* Obfuscate Buttons - General Attributes */ border:0px solid #ffffff; } -QWidget .QFrame#frameDarksend QPushButton:focus { +QWidget .QFrame#frameObfuscate QPushButton:focus { border:none; outline:none; } -QWidget .QFrame#frameDarksend .QPushButton#runAutoDenom { /* No idea why this button is in the .UI file... */ +QWidget .QFrame#frameObfuscate .QPushButton#runAutoDenom { /* No idea why this button is in the .UI file... */ qproperty-geometry: rect(0 0 0 0); } -QWidget .QFrame#frameDarksend .QPushButton#toggleDarksend { /* Start Darksend Mixing */ +QWidget .QFrame#frameObfuscate .QPushButton#toggleObfuscate { /* Start Obfuscate Mixing */ qproperty-geometry: rect(115 268 295 40); font-size:15px; font-weight:bold; @@ -993,11 +994,11 @@ padding-top:5px; padding-bottom:6px; } -QWidget .QFrame#frameDarksend .QPushButton#toggleDarksend:hover { +QWidget .QFrame#frameObfuscate .QPushButton#toggleObfuscate:hover { } -QWidget .QFrame#frameDarksend .QPushButton#darksendAuto { /* Try Mix Button */ +QWidget .QFrame#frameObfuscate .QPushButton#obfuscateAuto { /* Try Mix Button */ qproperty-geometry: rect(120 314 140 25); background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); border:1px solid #d2d2d2; @@ -1007,16 +1008,16 @@ font-size:9px; padding:0px; } -QWidget .QFrame#frameDarksend .QPushButton#darksendAuto:hover { +QWidget .QFrame#frameObfuscate .QPushButton#obfuscateAuto:hover { background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); color:#333; } -QWidget .QFrame#frameDarksend .QPushButton#darksendAuto:pressed { +QWidget .QFrame#frameObfuscate .QPushButton#obfuscateAuto:pressed { border:1px solid #9e9e9e; } -QWidget .QFrame#frameDarksend .QPushButton#darksendReset { /* Reset Button */ +QWidget .QFrame#frameObfuscate .QPushButton#obfuscateReset { /* Reset Button */ qproperty-geometry: rect(265 314 140 25); background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); border:1px solid #d2d2d2; @@ -1026,12 +1027,12 @@ font-size:9px; padding:0px; } -QWidget .QFrame#frameDarksend .QPushButton#darksendReset:hover { +QWidget .QFrame#frameObfuscate .QPushButton#obfuscateReset:hover { background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); color:#333; } -QWidget .QFrame#frameDarksend .QPushButton#darksendReset:pressed { +QWidget .QFrame#frameObfuscate .QPushButton#obfuscateReset:pressed { border:1px solid #9e9e9e; } @@ -1042,7 +1043,7 @@ min-width:410px; margin-right:20px; margin-left:0; margin-top:0; -background-image: url(':/images/dash_logo_horizontal'); +background-image: url(':/images/darknet_logo_horizontal-drkblue'); background-repeat:none; } @@ -1159,7 +1160,7 @@ QDialog#SendCoinsDialog .QPushButton#addButton:pressed { border:1px solid #9e9e9e; } -QDialog#SendCoinsDialog .QCheckBox#checkUseDarksend { /* Darksend Checkbox */ +QDialog#SendCoinsDialog .QCheckBox#checkUseObfuscate { /* Obfuscate Checkbox */ color:#616161; font-weight:bold; background: qradialgradient(cx:0.5, cy:0.5, radius: 0.5, fx:0.5, fy:0.5, stop:0 rgba(248, 246, 246, 128), stop: 1 rgba(0, 0, 0, 0)); @@ -1168,7 +1169,7 @@ padding-top:20px; padding-bottom:18px; } -QDialog#SendCoinsDialog .QCheckBox#checkInstantX { /* InstantX Checkbox */ +QDialog#SendCoinsDialog .QCheckBox#checkSwiftTX { /* SwiftTX Checkbox */ color:#616161; font-weight:bold; background: qradialgradient(cx:0.5, cy:0.5, radius: 0.5, fx:0.5, fy:0.5, stop:0 rgba(248, 246, 246, 128), stop: 1 rgba(0, 0, 0, 0)); @@ -1206,6 +1207,14 @@ padding-bottom:20px; */ min-height:27px; } +QDialog#SendCoinsDialog QLabel#labelSmartFee_2{ +color:#333333; /* "Recommended" TEXT */ +} + +QDialog#SendCoinsDialog QLabel#labelCustomFee { +color:#333333; /* "Custom" TEXT */ +} + /* SEND COINS ENTRY */ diff --git a/src/qt/res/dash-qt-res.rc b/src/qt/res/darknet-qt-res.rc old mode 100644 new mode 100755 similarity index 82% rename from src/qt/res/dash-qt-res.rc rename to src/qt/res/darknet-qt-res.rc index 2a8f850260f12..5687919e1fd10 --- a/src/qt/res/dash-qt-res.rc +++ b/src/qt/res/darknet-qt-res.rc @@ -19,14 +19,14 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Dash" - VALUE "FileDescription", "Dash Core (OSS GUI client for Dash)" + VALUE "CompanyName", "DarkNet" + VALUE "FileDescription", "DarkNet Core (OSS GUI client for DarkNet)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "dash-qt" + VALUE "InternalName", "darknet-qt" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." - VALUE "OriginalFilename", "dash-qt.exe" - VALUE "ProductName", "Dash Core" + VALUE "OriginalFilename", "darknet-qt.exe" + VALUE "ProductName", "DarkNet Core" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/qt/res/icons/add.png b/src/qt/res/icons/add.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/address-book.png b/src/qt/res/icons/address-book.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/bitcoin.icns b/src/qt/res/icons/bitcoin.icns index c17b56351de61..417297ed45972 100644 Binary files a/src/qt/res/icons/bitcoin.icns and b/src/qt/res/icons/bitcoin.icns differ diff --git a/src/qt/res/icons/bitcoin.ico b/src/qt/res/icons/bitcoin.ico old mode 100755 new mode 100644 index 9ae1ba55b6d8e..321243f3ee3ff Binary files a/src/qt/res/icons/bitcoin.ico and b/src/qt/res/icons/bitcoin.ico differ diff --git a/src/qt/res/icons/bitcoin.png b/src/qt/res/icons/bitcoin.png index 257ff1419a7b1..bd393768f880b 100644 Binary files a/src/qt/res/icons/bitcoin.png and b/src/qt/res/icons/bitcoin.png differ diff --git a/src/qt/res/icons/bitcoin_testnet.ico b/src/qt/res/icons/bitcoin_testnet.ico old mode 100755 new mode 100644 index b86e2a7039463..6ca0a0120b7ba Binary files a/src/qt/res/icons/bitcoin_testnet.ico and b/src/qt/res/icons/bitcoin_testnet.ico differ diff --git a/src/qt/res/icons/bitcoin_testnet.png b/src/qt/res/icons/bitcoin_testnet.png index 5e044d34083c6..895357d11e5df 100644 Binary files a/src/qt/res/icons/bitcoin_testnet.png and b/src/qt/res/icons/bitcoin_testnet.png differ diff --git a/src/qt/res/icons/browse.png b/src/qt/res/icons/browse.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/clock1.png b/src/qt/res/icons/clock1.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/clock2.png b/src/qt/res/icons/clock2.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/clock3.png b/src/qt/res/icons/clock3.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/clock4.png b/src/qt/res/icons/clock4.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/clock5.png b/src/qt/res/icons/clock5.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/configure.png b/src/qt/res/icons/configure.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/connect0_16.png b/src/qt/res/icons/connect0_16.png old mode 100644 new mode 100755 index b8453165e71d2..fdbf8277cc4e2 Binary files a/src/qt/res/icons/connect0_16.png and b/src/qt/res/icons/connect0_16.png differ diff --git a/src/qt/res/icons/connect1_16.png b/src/qt/res/icons/connect1_16.png old mode 100644 new mode 100755 index c9bc2d80a9457..19804b92dbf31 Binary files a/src/qt/res/icons/connect1_16.png and b/src/qt/res/icons/connect1_16.png differ diff --git a/src/qt/res/icons/connect2_16.png b/src/qt/res/icons/connect2_16.png old mode 100644 new mode 100755 index 0caddf62b6385..8e586d814704e Binary files a/src/qt/res/icons/connect2_16.png and b/src/qt/res/icons/connect2_16.png differ diff --git a/src/qt/res/icons/connect3_16.png b/src/qt/res/icons/connect3_16.png old mode 100644 new mode 100755 index 036aebbd483ed..ffd5ed77e27ca Binary files a/src/qt/res/icons/connect3_16.png and b/src/qt/res/icons/connect3_16.png differ diff --git a/src/qt/res/icons/connect4_16.png b/src/qt/res/icons/connect4_16.png index b96fba68d49b1..41b91b71cb86e 100644 Binary files a/src/qt/res/icons/connect4_16.png and b/src/qt/res/icons/connect4_16.png differ diff --git a/src/qt/res/icons/debugwindow.png b/src/qt/res/icons/debugwindow.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/drk_address-book.png b/src/qt/res/icons/drk_address-book.png new file mode 100755 index 0000000000000..0717b9a93e931 Binary files /dev/null and b/src/qt/res/icons/drk_address-book.png differ diff --git a/src/qt/res/icons/drk_editcopy.png b/src/qt/res/icons/drk_editcopy.png new file mode 100755 index 0000000000000..3f3fa511d9977 Binary files /dev/null and b/src/qt/res/icons/drk_editcopy.png differ diff --git a/src/qt/res/icons/drk_editpaste.png b/src/qt/res/icons/drk_editpaste.png new file mode 100755 index 0000000000000..3cd298c8af315 Binary files /dev/null and b/src/qt/res/icons/drk_editpaste.png differ diff --git a/src/qt/res/icons/drk_history.png b/src/qt/res/icons/drk_history.png new file mode 100644 index 0000000000000..8ada5dc3aa40b Binary files /dev/null and b/src/qt/res/icons/drk_history.png differ diff --git a/src/qt/res/icons/drk_overview.png b/src/qt/res/icons/drk_overview.png new file mode 100644 index 0000000000000..37e825f872765 Binary files /dev/null and b/src/qt/res/icons/drk_overview.png differ diff --git a/src/qt/res/icons/drk_receive.png b/src/qt/res/icons/drk_receive.png new file mode 100644 index 0000000000000..e2ed49f78cd70 Binary files /dev/null and b/src/qt/res/icons/drk_receive.png differ diff --git a/src/qt/res/icons/drk_remove.png b/src/qt/res/icons/drk_remove.png new file mode 100755 index 0000000000000..1f41c41170607 Binary files /dev/null and b/src/qt/res/icons/drk_remove.png differ diff --git a/src/qt/res/icons/drk_send.png b/src/qt/res/icons/drk_send.png new file mode 100644 index 0000000000000..2490887becd87 Binary files /dev/null and b/src/qt/res/icons/drk_send.png differ diff --git a/src/qt/res/icons/drkblue_address-book.png b/src/qt/res/icons/drkblue_address-book.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/drkblue_editcopy.png b/src/qt/res/icons/drkblue_editcopy.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/drkblue_editpaste.png b/src/qt/res/icons/drkblue_editpaste.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/drkblue_remove.png b/src/qt/res/icons/drkblue_remove.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/edit.png b/src/qt/res/icons/edit.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/editcopy.png b/src/qt/res/icons/editcopy.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/editpaste.png b/src/qt/res/icons/editpaste.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/export.png b/src/qt/res/icons/export.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/eye.png b/src/qt/res/icons/eye.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/eye_minus.png b/src/qt/res/icons/eye_minus.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/eye_plus.png b/src/qt/res/icons/eye_plus.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/filesave.png b/src/qt/res/icons/filesave.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/history-old.png b/src/qt/res/icons/history-old.png new file mode 100755 index 0000000000000..07aeca1f96e8f Binary files /dev/null and b/src/qt/res/icons/history-old.png differ diff --git a/src/qt/res/icons/history.png b/src/qt/res/icons/history.png index 07aeca1f96e8f..c72e7fcee9a9e 100644 Binary files a/src/qt/res/icons/history.png and b/src/qt/res/icons/history.png differ diff --git a/src/qt/res/icons/key.png b/src/qt/res/icons/key.png old mode 100644 new mode 100755 index 074d236430a1a..b9abaaa057dec Binary files a/src/qt/res/icons/key.png and b/src/qt/res/icons/key.png differ diff --git a/src/qt/res/icons/lock_closed.png b/src/qt/res/icons/lock_closed.png old mode 100644 new mode 100755 index ab47a3a9ec66b..03acb6942bb39 Binary files a/src/qt/res/icons/lock_closed.png and b/src/qt/res/icons/lock_closed.png differ diff --git a/src/qt/res/icons/lock_open.png b/src/qt/res/icons/lock_open.png old mode 100644 new mode 100755 index 54ca6687f7d45..1ca24208f8dba Binary files a/src/qt/res/icons/lock_open.png and b/src/qt/res/icons/lock_open.png differ diff --git a/src/qt/res/icons/notsynced.png b/src/qt/res/icons/notsynced.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/overview-old.png b/src/qt/res/icons/overview-old.png new file mode 100755 index 0000000000000..78a2575b236ff Binary files /dev/null and b/src/qt/res/icons/overview-old.png differ diff --git a/src/qt/res/icons/overview.png b/src/qt/res/icons/overview.png index 78a2575b236ff..86e673ac9533c 100644 Binary files a/src/qt/res/icons/overview.png and b/src/qt/res/icons/overview.png differ diff --git a/src/qt/res/icons/qrcode.png b/src/qt/res/icons/qrcode.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/quit.png b/src/qt/res/icons/quit.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/receive-old.png b/src/qt/res/icons/receive-old.png new file mode 100755 index 0000000000000..61f1408dd8bfe Binary files /dev/null and b/src/qt/res/icons/receive-old.png differ diff --git a/src/qt/res/icons/receive.png b/src/qt/res/icons/receive.png index 61f1408dd8bfe..af0679d4ce915 100644 Binary files a/src/qt/res/icons/receive.png and b/src/qt/res/icons/receive.png differ diff --git a/src/qt/res/icons/remove.png b/src/qt/res/icons/remove.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/send-old.png b/src/qt/res/icons/send-old.png new file mode 100755 index 0000000000000..11cc3d1bc0e85 Binary files /dev/null and b/src/qt/res/icons/send-old.png differ diff --git a/src/qt/res/icons/send.png b/src/qt/res/icons/send.png index 11cc3d1bc0e85..3007d4466b30f 100644 Binary files a/src/qt/res/icons/send.png and b/src/qt/res/icons/send.png differ diff --git a/src/qt/res/icons/synced.png b/src/qt/res/icons/synced.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/transaction0.png b/src/qt/res/icons/transaction0.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/transaction2.png b/src/qt/res/icons/transaction2.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/transaction_conflicted.png b/src/qt/res/icons/transaction_conflicted.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/tx_inout.png b/src/qt/res/icons/tx_inout.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/tx_input.png b/src/qt/res/icons/tx_input.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/tx_mined.png b/src/qt/res/icons/tx_mined.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/tx_output.png b/src/qt/res/icons/tx_output.png old mode 100644 new mode 100755 diff --git a/src/qt/res/icons/unit_darknet.png b/src/qt/res/icons/unit_darknet.png new file mode 100755 index 0000000000000..948e987414b34 Binary files /dev/null and b/src/qt/res/icons/unit_darknet.png differ diff --git a/src/qt/res/icons/unit_dash.png b/src/qt/res/icons/unit_dash.png deleted file mode 100644 index 1c36829606713..0000000000000 Binary files a/src/qt/res/icons/unit_dash.png and /dev/null differ diff --git a/src/qt/res/icons/unit_duffs.png b/src/qt/res/icons/unit_duffs.png deleted file mode 100644 index 3129e256650d7..0000000000000 Binary files a/src/qt/res/icons/unit_duffs.png and /dev/null differ diff --git a/src/qt/res/icons/unit_mdarknet.png b/src/qt/res/icons/unit_mdarknet.png new file mode 100755 index 0000000000000..737dd8aad805c Binary files /dev/null and b/src/qt/res/icons/unit_mdarknet.png differ diff --git a/src/qt/res/icons/unit_mdash.png b/src/qt/res/icons/unit_mdash.png deleted file mode 100644 index dd75be212982c..0000000000000 Binary files a/src/qt/res/icons/unit_mdash.png and /dev/null differ diff --git a/src/qt/res/icons/unit_tdarknet.png b/src/qt/res/icons/unit_tdarknet.png new file mode 100755 index 0000000000000..207525034ae7f Binary files /dev/null and b/src/qt/res/icons/unit_tdarknet.png differ diff --git a/src/qt/res/icons/unit_tdash.png b/src/qt/res/icons/unit_tdash.png deleted file mode 100644 index 46f83509c7f35..0000000000000 Binary files a/src/qt/res/icons/unit_tdash.png and /dev/null differ diff --git a/src/qt/res/icons/unit_tduffs.png b/src/qt/res/icons/unit_tduffs.png deleted file mode 100644 index daf67b12a8d82..0000000000000 Binary files a/src/qt/res/icons/unit_tduffs.png and /dev/null differ diff --git a/src/qt/res/icons/unit_tmdarknet.png b/src/qt/res/icons/unit_tmdarknet.png new file mode 100755 index 0000000000000..e3989ab067546 Binary files /dev/null and b/src/qt/res/icons/unit_tmdarknet.png differ diff --git a/src/qt/res/icons/unit_tmdash.png b/src/qt/res/icons/unit_tmdash.png deleted file mode 100644 index c4091a5c83b50..0000000000000 Binary files a/src/qt/res/icons/unit_tmdash.png and /dev/null differ diff --git a/src/qt/res/icons/unit_tudarknet.png b/src/qt/res/icons/unit_tudarknet.png new file mode 100755 index 0000000000000..8096eef13e747 Binary files /dev/null and b/src/qt/res/icons/unit_tudarknet.png differ diff --git a/src/qt/res/icons/unit_tudash.png b/src/qt/res/icons/unit_tudash.png deleted file mode 100644 index e74515e0eca92..0000000000000 Binary files a/src/qt/res/icons/unit_tudash.png and /dev/null differ diff --git a/src/qt/res/icons/unit_udarknet.png b/src/qt/res/icons/unit_udarknet.png new file mode 100755 index 0000000000000..fdb3a10420bdc Binary files /dev/null and b/src/qt/res/icons/unit_udarknet.png differ diff --git a/src/qt/res/icons/unit_udash.png b/src/qt/res/icons/unit_udash.png deleted file mode 100644 index b270724eb1b16..0000000000000 Binary files a/src/qt/res/icons/unit_udash.png and /dev/null differ diff --git a/src/qt/res/images/about.png b/src/qt/res/images/about.png index 68e11999b2b07..412982a92e2ef 100755 Binary files a/src/qt/res/images/about.png and b/src/qt/res/images/about.png differ diff --git a/src/qt/res/images/darknet_logo_horizontal-drk.png b/src/qt/res/images/darknet_logo_horizontal-drk.png new file mode 100644 index 0000000000000..b10e22909c191 Binary files /dev/null and b/src/qt/res/images/darknet_logo_horizontal-drk.png differ diff --git a/src/qt/res/images/darknet_logo_horizontal-drkblue.png b/src/qt/res/images/darknet_logo_horizontal-drkblue.png new file mode 100644 index 0000000000000..f725b61233baf Binary files /dev/null and b/src/qt/res/images/darknet_logo_horizontal-drkblue.png differ diff --git a/src/qt/res/images/darknet_logo_horizontal.png b/src/qt/res/images/darknet_logo_horizontal.png new file mode 100644 index 0000000000000..70cf4004980f7 Binary files /dev/null and b/src/qt/res/images/darknet_logo_horizontal.png differ diff --git a/src/qt/res/images/dash_logo_horizontal.png b/src/qt/res/images/dash_logo_horizontal.png deleted file mode 100644 index 961a8ebfe6d57..0000000000000 Binary files a/src/qt/res/images/dash_logo_horizontal.png and /dev/null differ diff --git a/src/qt/res/images/drk-1_walletFrame_bg.png b/src/qt/res/images/drk-1_walletFrame_bg.png new file mode 100644 index 0000000000000..04334d85f7c7c Binary files /dev/null and b/src/qt/res/images/drk-1_walletFrame_bg.png differ diff --git a/src/qt/res/images/drk-2_walletFrame_bg.png b/src/qt/res/images/drk-2_walletFrame_bg.png new file mode 100644 index 0000000000000..221a02c746018 Binary files /dev/null and b/src/qt/res/images/drk-2_walletFrame_bg.png differ diff --git a/src/qt/res/images/drk-3_walletFrame_bg.png b/src/qt/res/images/drk-3_walletFrame_bg.png new file mode 100644 index 0000000000000..64a5b8053dbc6 Binary files /dev/null and b/src/qt/res/images/drk-3_walletFrame_bg.png differ diff --git a/src/qt/res/images/drk-4_walletFrame_bg.png b/src/qt/res/images/drk-4_walletFrame_bg.png new file mode 100644 index 0000000000000..9c5cea5d7046f Binary files /dev/null and b/src/qt/res/images/drk-4_walletFrame_bg.png differ diff --git a/src/qt/res/images/drk-5_walletFrame_bg.png b/src/qt/res/images/drk-5_walletFrame_bg.png new file mode 100644 index 0000000000000..b207808479b9c Binary files /dev/null and b/src/qt/res/images/drk-5_walletFrame_bg.png differ diff --git a/src/qt/res/images/drk_downArrow.png b/src/qt/res/images/drk_downArrow.png new file mode 100755 index 0000000000000..8429204cf0795 Binary files /dev/null and b/src/qt/res/images/drk_downArrow.png differ diff --git a/src/qt/res/images/drk_downArrow_small.png b/src/qt/res/images/drk_downArrow_small.png new file mode 100755 index 0000000000000..59f225d4d3fc6 Binary files /dev/null and b/src/qt/res/images/drk_downArrow_small.png differ diff --git a/src/qt/res/images/drk_leftArrow_small.png b/src/qt/res/images/drk_leftArrow_small.png new file mode 100755 index 0000000000000..4e1fafd028c8a Binary files /dev/null and b/src/qt/res/images/drk_leftArrow_small.png differ diff --git a/src/qt/res/images/drk_qtreeview_selected.png b/src/qt/res/images/drk_qtreeview_selected.png new file mode 100755 index 0000000000000..27c31336fd2b7 Binary files /dev/null and b/src/qt/res/images/drk_qtreeview_selected.png differ diff --git a/src/qt/res/images/drk_rightArrow_small.png b/src/qt/res/images/drk_rightArrow_small.png new file mode 100755 index 0000000000000..5d3ea7cfae994 Binary files /dev/null and b/src/qt/res/images/drk_rightArrow_small.png differ diff --git a/src/qt/res/images/drk_upArrow_small.png b/src/qt/res/images/drk_upArrow_small.png new file mode 100755 index 0000000000000..a30b3295115a7 Binary files /dev/null and b/src/qt/res/images/drk_upArrow_small.png differ diff --git a/src/qt/res/images/drk_walletFrame.png b/src/qt/res/images/drk_walletFrame.png new file mode 100755 index 0000000000000..6f3a6b06ea92f Binary files /dev/null and b/src/qt/res/images/drk_walletFrame.png differ diff --git a/src/qt/res/images/drk_walletFrame_bg.png b/src/qt/res/images/drk_walletFrame_bg.png new file mode 100755 index 0000000000000..d98e38a112081 Binary files /dev/null and b/src/qt/res/images/drk_walletFrame_bg.png differ diff --git a/src/qt/res/images/drkblue_downArrow.png b/src/qt/res/images/drkblue_downArrow.png old mode 100644 new mode 100755 diff --git a/src/qt/res/images/drkblue_downArrow_small.png b/src/qt/res/images/drkblue_downArrow_small.png old mode 100644 new mode 100755 diff --git a/src/qt/res/images/drkblue_leftArrow_small.png b/src/qt/res/images/drkblue_leftArrow_small.png old mode 100644 new mode 100755 diff --git a/src/qt/res/images/drkblue_qtreeview_selected.png b/src/qt/res/images/drkblue_qtreeview_selected.png old mode 100644 new mode 100755 diff --git a/src/qt/res/images/drkblue_rightArrow_small.png b/src/qt/res/images/drkblue_rightArrow_small.png old mode 100644 new mode 100755 diff --git a/src/qt/res/images/drkblue_upArrow_small.png b/src/qt/res/images/drkblue_upArrow_small.png old mode 100644 new mode 100755 diff --git a/src/qt/res/images/drkblue_walletFrame.png b/src/qt/res/images/drkblue_walletFrame.png old mode 100644 new mode 100755 index 3d30cbbe05f2a..dd0c44997be6e Binary files a/src/qt/res/images/drkblue_walletFrame.png and b/src/qt/res/images/drkblue_walletFrame.png differ diff --git a/src/qt/res/images/drkblue_walletFrame_bg.png b/src/qt/res/images/drkblue_walletFrame_bg.png old mode 100644 new mode 100755 index 436a0005591c9..1e004f097a8da Binary files a/src/qt/res/images/drkblue_walletFrame_bg.png and b/src/qt/res/images/drkblue_walletFrame_bg.png differ diff --git a/src/qt/res/images/splash.png b/src/qt/res/images/splash.png old mode 100644 new mode 100755 index c81fd7794ada1..a84fff9656fb1 Binary files a/src/qt/res/images/splash.png and b/src/qt/res/images/splash.png differ diff --git a/src/qt/res/images/splash_testnet.png b/src/qt/res/images/splash_testnet.png old mode 100644 new mode 100755 index 963e7df3a689c..8683949553206 Binary files a/src/qt/res/images/splash_testnet.png and b/src/qt/res/images/splash_testnet.png differ diff --git a/src/qt/res/movies/spinner-000.png b/src/qt/res/movies/spinner-000.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-001.png b/src/qt/res/movies/spinner-001.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-002.png b/src/qt/res/movies/spinner-002.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-003.png b/src/qt/res/movies/spinner-003.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-004.png b/src/qt/res/movies/spinner-004.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-005.png b/src/qt/res/movies/spinner-005.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-006.png b/src/qt/res/movies/spinner-006.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-007.png b/src/qt/res/movies/spinner-007.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-008.png b/src/qt/res/movies/spinner-008.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-009.png b/src/qt/res/movies/spinner-009.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-010.png b/src/qt/res/movies/spinner-010.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-011.png b/src/qt/res/movies/spinner-011.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-012.png b/src/qt/res/movies/spinner-012.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-013.png b/src/qt/res/movies/spinner-013.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-014.png b/src/qt/res/movies/spinner-014.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-015.png b/src/qt/res/movies/spinner-015.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-016.png b/src/qt/res/movies/spinner-016.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-017.png b/src/qt/res/movies/spinner-017.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-018.png b/src/qt/res/movies/spinner-018.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-019.png b/src/qt/res/movies/spinner-019.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-020.png b/src/qt/res/movies/spinner-020.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-021.png b/src/qt/res/movies/spinner-021.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-022.png b/src/qt/res/movies/spinner-022.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-023.png b/src/qt/res/movies/spinner-023.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-024.png b/src/qt/res/movies/spinner-024.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-025.png b/src/qt/res/movies/spinner-025.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-026.png b/src/qt/res/movies/spinner-026.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-027.png b/src/qt/res/movies/spinner-027.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-028.png b/src/qt/res/movies/spinner-028.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-029.png b/src/qt/res/movies/spinner-029.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-030.png b/src/qt/res/movies/spinner-030.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-031.png b/src/qt/res/movies/spinner-031.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-032.png b/src/qt/res/movies/spinner-032.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-033.png b/src/qt/res/movies/spinner-033.png old mode 100644 new mode 100755 diff --git a/src/qt/res/movies/spinner-034.png b/src/qt/res/movies/spinner-034.png old mode 100644 new mode 100755 diff --git a/src/qt/res/src/bitcoin.svg b/src/qt/res/src/bitcoin.svg old mode 100644 new mode 100755 diff --git a/src/qt/res/src/clock1.svg b/src/qt/res/src/clock1.svg old mode 100644 new mode 100755 diff --git a/src/qt/res/src/clock2.svg b/src/qt/res/src/clock2.svg old mode 100644 new mode 100755 diff --git a/src/qt/res/src/clock3.svg b/src/qt/res/src/clock3.svg old mode 100644 new mode 100755 diff --git a/src/qt/res/src/clock4.svg b/src/qt/res/src/clock4.svg old mode 100644 new mode 100755 diff --git a/src/qt/res/src/clock5.svg b/src/qt/res/src/clock5.svg old mode 100644 new mode 100755 diff --git a/src/qt/res/src/clock_green.svg b/src/qt/res/src/clock_green.svg old mode 100644 new mode 100755 diff --git a/src/qt/res/src/inout.svg b/src/qt/res/src/inout.svg old mode 100644 new mode 100755 diff --git a/src/qt/res/src/questionmark.svg b/src/qt/res/src/questionmark.svg old mode 100644 new mode 100755 diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index b3be32cc65048..825df5e9009f8 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -438,7 +439,7 @@ void RPCConsole::clear() "b { color: #006060; } " ); - message(CMD_REPLY, (tr("Welcome to the Dash RPC console.") + "
" + + message(CMD_REPLY, (tr("Welcome to the DarkNet RPC console.") + "
" + tr("Use up and down arrows to navigate history, and Ctrl-L to clear screen.") + "
" + tr("Type help for an overview of available commands.")), true); } diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h index 07281c35a33bf..72e72ff29e5c2 100644 --- a/src/qt/rpcconsole.h +++ b/src/qt/rpcconsole.h @@ -90,7 +90,7 @@ public slots: void showPeers(); /** Switch to wallet-repair tab and show */ void showRepair(); - /** Open external (default) editor with dash.conf */ + /** Open external (default) editor with darknet.conf */ void showConfEditor(); /** Handle selection of peer in peers list */ void peerSelected(const QItemSelection &selected, const QItemSelection &deselected); diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 9f3fc57ebc93b..e6255af8dca51 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -53,31 +54,31 @@ SendCoinsDialog::SendCoinsDialog(QWidget *parent) : connect(ui->checkBoxCoinControlChange, SIGNAL(stateChanged(int)), this, SLOT(coinControlChangeChecked(int))); connect(ui->lineEditCoinControlChange, SIGNAL(textEdited(const QString &)), this, SLOT(coinControlChangeEdited(const QString &))); - // Dash specific + // DarkNet specific QSettings settings; - if (!settings.contains("bUseDarkSend")) - settings.setValue("bUseDarkSend", false); - if (!settings.contains("bUseInstantX")) - settings.setValue("bUseInstantX", false); + if (!settings.contains("bUseObfuscate")) + settings.setValue("bUseObfuscate", false); + if (!settings.contains("bUseSwiftTX")) + settings.setValue("bUseSwiftTX", false); - bool useDarkSend = settings.value("bUseDarkSend").toBool(); - bool useInstantX = settings.value("bUseInstantX").toBool(); + bool useObfuscate = settings.value("bUseObfuscate").toBool(); + bool useSwiftTX = settings.value("bUseSwiftTX").toBool(); if(fLiteMode) { - ui->checkUseDarksend->setChecked(false); - ui->checkUseDarksend->setVisible(false); - ui->checkInstantX->setVisible(false); - CoinControlDialog::coinControl->useDarkSend = false; - CoinControlDialog::coinControl->useInstantX = false; + ui->checkUseObfuscate->setChecked(false); + ui->checkUseObfuscate->setVisible(false); + ui->checkSwiftTX->setVisible(false); + CoinControlDialog::coinControl->useObfuscate = false; + CoinControlDialog::coinControl->useSwiftTX = false; } else{ - ui->checkUseDarksend->setChecked(useDarkSend); - ui->checkInstantX->setChecked(useInstantX); - CoinControlDialog::coinControl->useDarkSend = useDarkSend; - CoinControlDialog::coinControl->useInstantX = useInstantX; + ui->checkUseObfuscate->setChecked(useObfuscate); + ui->checkSwiftTX->setChecked(useSwiftTX); + CoinControlDialog::coinControl->useObfuscate = useObfuscate; + CoinControlDialog::coinControl->useSwiftTX = useSwiftTX; } - connect(ui->checkUseDarksend, SIGNAL(stateChanged ( int )), this, SLOT(updateDisplayUnit())); - connect(ui->checkInstantX, SIGNAL(stateChanged ( int )), this, SLOT(updateInstantX())); + connect(ui->checkUseObfuscate, SIGNAL(stateChanged ( int )), this, SLOT(updateDisplayUnit())); + connect(ui->checkSwiftTX, SIGNAL(stateChanged ( int )), this, SLOT(updateSwiftTX())); // Coin Control: clipboard actions QAction *clipboardQuantityAction = new QAction(tr("Copy quantity"), this); @@ -246,26 +247,26 @@ void SendCoinsDialog::on_sendButton_clicked() QString strFee = ""; recipients[0].inputType = ONLY_DENOMINATED; - if(ui->checkUseDarksend->isChecked()) { + if(ui->checkUseObfuscate->isChecked()) { recipients[0].inputType = ONLY_DENOMINATED; strFunds = tr("using") + " " + tr("anonymous funds") + ""; QString strNearestAmount( BitcoinUnits::formatWithUnit( - model->getOptionsModel()->getDisplayUnit(), 0.1 * COIN)); + model->getOptionsModel()->getDisplayUnit(), 1 * COIN)); strFee = QString(tr( - "(darksend requires this amount to be rounded up to the nearest %1)." + "(obfuscate requires this amount to be rounded up to the nearest %1)." ).arg(strNearestAmount)); } else { recipients[0].inputType = ALL_COINS; strFunds = tr("using") + " " + tr("any available funds (not recommended)") + ""; } - if(ui->checkInstantX->isChecked()) { - recipients[0].useInstantX = true; + if(ui->checkSwiftTX->isChecked()) { + recipients[0].useSwiftTX = true; strFunds += " "; - strFunds += tr("and InstantX"); + strFunds += tr("and SwiftTX"); } else { - recipients[0].useInstantX = false; + recipients[0].useSwiftTX = false; } @@ -567,8 +568,8 @@ void SendCoinsDialog::setBalance(const CAmount& balance, const CAmount& unconfir { uint64_t bal = 0; QSettings settings; - settings.setValue("bUseDarkSend", ui->checkUseDarksend->isChecked()); - if(ui->checkUseDarksend->isChecked()) { + settings.setValue("bUseObfuscate", ui->checkUseObfuscate->isChecked()); + if(ui->checkUseObfuscate->isChecked()) { bal = anonymizedBalance; } else { bal = balance; @@ -585,18 +586,18 @@ void SendCoinsDialog::updateDisplayUnit() setBalance(model->getBalance(), model->getUnconfirmedBalance(), model->getImmatureBalance(), model->getAnonymizedBalance(), model->getWatchBalance(), model->getWatchUnconfirmedBalance(), model->getWatchImmatureBalance()); - CoinControlDialog::coinControl->useDarkSend = ui->checkUseDarksend->isChecked(); + CoinControlDialog::coinControl->useObfuscate = ui->checkUseObfuscate->isChecked(); coinControlUpdateLabels(); ui->customFee->setDisplayUnit(model->getOptionsModel()->getDisplayUnit()); updateMinFeeLabel(); updateSmartFeeLabel(); } -void SendCoinsDialog::updateInstantX() +void SendCoinsDialog::updateSwiftTX() { QSettings settings; - settings.setValue("bUseInstantX", ui->checkInstantX->isChecked()); - CoinControlDialog::coinControl->useInstantX = ui->checkInstantX->isChecked(); + settings.setValue("bUseSwiftTX", ui->checkSwiftTX->isChecked()); + CoinControlDialog::coinControl->useSwiftTX = ui->checkSwiftTX->isChecked(); coinControlUpdateLabels(); } @@ -855,7 +856,7 @@ void SendCoinsDialog::coinControlChangeEdited(const QString& text) } else if (!addr.IsValid()) // Invalid address { - ui->labelCoinControlChangeLabel->setText(tr("Warning: Invalid Dash address")); + ui->labelCoinControlChangeLabel->setText(tr("Warning: Invalid DarkNet address")); } else // Valid address { @@ -898,7 +899,7 @@ void SendCoinsDialog::coinControlUpdateLabels() CoinControlDialog::payAmounts.append(entry->getValue().amount); } - ui->checkUseDarksend->setChecked(CoinControlDialog::coinControl->useDarkSend); + ui->checkUseObfuscate->setChecked(CoinControlDialog::coinControl->useObfuscate); if (CoinControlDialog::coinControl->HasSelected()) { diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h index 8b87b25485684..565c7e9c7758f 100644 --- a/src/qt/sendcoinsdialog.h +++ b/src/qt/sendcoinsdialog.h @@ -75,7 +75,7 @@ private slots: void on_buttonMinimizeFee_clicked(); void removeEntry(SendCoinsEntry* entry); void updateDisplayUnit(); - void updateInstantX(); + void updateSwiftTX(); void coinControlFeatureChanged(bool); void coinControlButtonClicked(); void coinControlChangeChecked(int); diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index 0a58998bd8308..3822ce3a0f62e 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -31,9 +32,9 @@ SendCoinsEntry::SendCoinsEntry(QWidget *parent) : ui->addAsLabel->setPlaceholderText(tr("Enter a label for this address to add it to your address book")); #endif - // normal dash address field + // normal darknet address field GUIUtil::setupAddressWidget(ui->payTo, this); - // just a label for displaying dash address(es) + // just a label for displaying darknet address(es) ui->payTo_is->setFont(GUIUtil::bitcoinAddressFont()); // Connect signals diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index 3312bd134167e..796f1871a80c6 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2014-2015 The Dash developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -33,10 +34,11 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle *networkStyle) float fontFactor = 1.0; // define text to place - QString titleText = tr("Dash Core"); + QString titleText = tr("DarkNet Core"); QString versionText = QString(tr("Version %1")).arg(QString::fromStdString(FormatFullVersion())); QString copyrightTextBtc = QChar(0xA9)+QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin Core developers")); QString copyrightTextDash = QChar(0xA9)+QString(" 2014-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Dash Core developers")); + QString copyrightTextDarkNet = QChar(0xA9)+QString(" 2016 ") + QString(tr("The DarkNet Core developers")); QString titleAddText = networkStyle->getTitleAddText(); QString font = QApplication::font().toString(); @@ -68,6 +70,7 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle *networkStyle) pixPaint.setFont(QFont(font, 10*fontFactor)); pixPaint.drawText(paddingLeft,paddingTop+titleCopyrightVSpace,copyrightTextBtc); pixPaint.drawText(paddingLeft,paddingTop+titleCopyrightVSpace+12,copyrightTextDash); + pixPaint.drawText(paddingLeft,paddingTop+titleCopyrightVSpace+24,copyrightTextDarkNet); // draw additional text if special network if(!titleAddText.isEmpty()) { diff --git a/src/qt/test/Makefile b/src/qt/test/Makefile index 09cd874b11577..965ecf6e61faf 100644 --- a/src/qt/test/Makefile +++ b/src/qt/test/Makefile @@ -1,6 +1,6 @@ all: - $(MAKE) -C ../../ test_dash_qt + $(MAKE) -C ../../ test_darknet_qt clean: - $(MAKE) -C ../../ test_dash_qt_clean + $(MAKE) -C ../../ test_darknet_qt_clean check: - $(MAKE) -C ../../ test_dash_qt_check + $(MAKE) -C ../../ test_darknet_qt_check diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index 36e926456c927..cc5255676931d 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -1,10 +1,11 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #endif #include "util.h" diff --git a/src/qt/test/uritests.cpp b/src/qt/test/uritests.cpp index c8598e46482bb..2017090e6999d 100644 --- a/src/qt/test/uritests.cpp +++ b/src/qt/test/uritests.cpp @@ -13,54 +13,54 @@ void URITests::uriTests() { SendCoinsRecipient rv; QUrl uri; - uri.setUrl(QString("dash:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?req-dontexist=")); + uri.setUrl(QString("darknet:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?req-dontexist=")); QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv)); - uri.setUrl(QString("dash:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?dontexist=")); + uri.setUrl(QString("darknet:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?dontexist=")); QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); QVERIFY(rv.address == QString("XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg")); QVERIFY(rv.label == QString()); QVERIFY(rv.amount == 0); - uri.setUrl(QString("dash:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?label=Some Example Address")); + uri.setUrl(QString("darknet:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?label=Some Example Address")); QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); QVERIFY(rv.address == QString("XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg")); QVERIFY(rv.label == QString("Some Example Address")); QVERIFY(rv.amount == 0); - uri.setUrl(QString("dash:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?amount=0.001")); + uri.setUrl(QString("darknet:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?amount=0.001")); QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); QVERIFY(rv.address == QString("XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg")); QVERIFY(rv.label == QString()); QVERIFY(rv.amount == 100000); - uri.setUrl(QString("dash:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?amount=1.001")); + uri.setUrl(QString("darknet:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?amount=1.001")); QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); QVERIFY(rv.address == QString("XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg")); QVERIFY(rv.label == QString()); QVERIFY(rv.amount == 100100000); - uri.setUrl(QString("dash:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?amount=100&label=Some Example")); + uri.setUrl(QString("darknet:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?amount=100&label=Some Example")); QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); QVERIFY(rv.address == QString("XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg")); QVERIFY(rv.amount == 10000000000LL); QVERIFY(rv.label == QString("Some Example")); - uri.setUrl(QString("dash:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?message=Some Example Address")); + uri.setUrl(QString("darknet:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?message=Some Example Address")); QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); QVERIFY(rv.address == QString("XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg")); QVERIFY(rv.label == QString()); - QVERIFY(GUIUtil::parseBitcoinURI("dash://XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?message=Some Example Address", &rv)); + QVERIFY(GUIUtil::parseBitcoinURI("darknet://XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?message=Some Example Address", &rv)); QVERIFY(rv.address == QString("XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg")); QVERIFY(rv.label == QString()); - uri.setUrl(QString("dash:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?req-message=Some Example Address")); + uri.setUrl(QString("darknet:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?req-message=Some Example Address")); QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); - uri.setUrl(QString("dash:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?amount=1,000&label=Some Example")); + uri.setUrl(QString("darknet:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?amount=1,000&label=Some Example")); QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv)); - uri.setUrl(QString("dash:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?amount=1,000.0&label=Some Example")); + uri.setUrl(QString("darknet:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?amount=1,000.0&label=Some Example")); QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv)); } diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 5fb1573edcf0d..fe316b7466476 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2014-2015 The Dash developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -45,30 +46,30 @@ QString TransactionDesc::FormatTxStatus(const CWalletTx& wtx) if (nDepth < 0) return tr("conflicted"); else if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0) - return tr("%1/offline (verified via instantx)").arg(nDepth); + return tr("%1/offline (verified via swifttx)").arg(nDepth); else if (nDepth < 6) - return tr("%1/confirmed (verified via instantx)").arg(nDepth); + return tr("%1/confirmed (verified via swifttx)").arg(nDepth); else - return tr("%1 confirmations (verified via instantx)").arg(nDepth); + return tr("%1 confirmations (verified via swifttx)").arg(nDepth); } else { if(!wtx.IsTransactionLockTimedOut()){ int nDepth = wtx.GetDepthInMainChain(); if (nDepth < 0) return tr("conflicted"); else if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0) - return tr("%1/offline (InstantX verification in progress - %2 of %3 signatures)").arg(nDepth).arg(signatures).arg(INSTANTX_SIGNATURES_TOTAL); + return tr("%1/offline (SwiftTX verification in progress - %2 of %3 signatures)").arg(nDepth).arg(signatures).arg(INSTANTX_SIGNATURES_TOTAL); else if (nDepth < 6) - return tr("%1/confirmed (InstantX verification in progress - %2 of %3 signatures )").arg(nDepth).arg(signatures).arg(INSTANTX_SIGNATURES_TOTAL); + return tr("%1/confirmed (SwiftTX verification in progress - %2 of %3 signatures )").arg(nDepth).arg(signatures).arg(INSTANTX_SIGNATURES_TOTAL); else - return tr("%1 confirmations (InstantX verification in progress - %2 of %3 signatures)").arg(nDepth).arg(signatures).arg(INSTANTX_SIGNATURES_TOTAL); + return tr("%1 confirmations (SwiftTX verification in progress - %2 of %3 signatures)").arg(nDepth).arg(signatures).arg(INSTANTX_SIGNATURES_TOTAL); } else { int nDepth = wtx.GetDepthInMainChain(); if (nDepth < 0) return tr("conflicted"); else if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0) - return tr("%1/offline (InstantX verification failed)").arg(nDepth); + return tr("%1/offline (SwiftTX verification failed)").arg(nDepth); else if (nDepth < 6) - return tr("%1/confirmed (InstantX verification failed)").arg(nDepth); + return tr("%1/confirmed (SwiftTX verification failed)").arg(nDepth); else return tr("%1 confirmations").arg(nDepth); } @@ -282,7 +283,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco strHTML += "" + tr("Transaction ID") + ": " + TransactionRecord::formatSubTxId(wtx.GetHash(), rec->idx) + "
"; - // Message from normal dash:URI (dash:XyZ...?message=example) + // Message from normal darknet:URI (darknet:XyZ...?message=example) foreach (const PAIRTYPE(string, string)& r, wtx.vOrderForm) if (r.first == "Message") strHTML += "
" + tr("Message") + ":
" + GUIUtil::HtmlEscape(r.second, true) + "
"; diff --git a/src/qt/transactionfilterproxy.h b/src/qt/transactionfilterproxy.h index 69c273eaf6e4b..d9370c8a451b4 100644 --- a/src/qt/transactionfilterproxy.h +++ b/src/qt/transactionfilterproxy.h @@ -24,7 +24,7 @@ class TransactionFilterProxy : public QSortFilterProxyModel static const QDateTime MAX_DATE; /** Type filter bit field (all types) */ static const quint32 ALL_TYPES = 0xFFFFFFFF; - /** Type filter bit field (all types but Darksend-SPAM) */ + /** Type filter bit field (all types but Obfuscate-SPAM) */ static const quint32 COMMON_TYPES = 4223; static quint32 TYPE(int type) { return 1< @@ -58,7 +59,7 @@ QList TransactionRecord::decomposeTransaction(const CWallet * sub.involvesWatchAddress = mine == ISMINE_WATCH_ONLY; if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*wallet, address)) { - // Received by Dash Address + // Received by DarkNet Address sub.type = TransactionRecord::RecvWithAddress; sub.address = CBitcoinAddress(address).ToString(); } @@ -109,7 +110,7 @@ QList TransactionRecord::decomposeTransaction(const CWallet * } if(fAllFromMeDenom && fAllToMeDenom && nFromMe * nToMe) { - parts.append(TransactionRecord(hash, nTime, TransactionRecord::DarksendDenominate, "", -nDebit, nCredit)); + parts.append(TransactionRecord(hash, nTime, TransactionRecord::ObfuscateDenominate, "", -nDebit, nCredit)); parts.last().involvesWatchAddress = false; // maybe pass to TransactionRecord as constructor argument } else if (fAllFromMe && fAllToMe) @@ -129,7 +130,7 @@ QList TransactionRecord::decomposeTransaction(const CWallet * CTxDestination address; if (ExtractDestination(wtx.vout[0].scriptPubKey, address)) { - // Sent to Dash Address + // Sent to DarkNet Address sub.address = CBitcoinAddress(address).ToString(); } else @@ -145,9 +146,9 @@ QList TransactionRecord::decomposeTransaction(const CWallet * const CTxOut& txout = wtx.vout[nOut]; sub.idx = parts.size(); - if(wallet->IsCollateralAmount(txout.nValue)) sub.type = TransactionRecord::DarksendMakeCollaterals; - if(wallet->IsDenominatedAmount(txout.nValue)) sub.type = TransactionRecord::DarksendCreateDenominations; - if(nDebit - wtx.GetValueOut() == DARKSEND_COLLATERAL) sub.type = TransactionRecord::DarksendCollateralPayment; + if(wallet->IsCollateralAmount(txout.nValue)) sub.type = TransactionRecord::ObfuscateMakeCollaterals; + if(wallet->IsDenominatedAmount(txout.nValue)) sub.type = TransactionRecord::ObfuscateCreateDenominations; + if(nDebit - wtx.GetValueOut() == DARKSEND_COLLATERAL) sub.type = TransactionRecord::ObfuscateCollateralPayment; } } @@ -182,7 +183,7 @@ QList TransactionRecord::decomposeTransaction(const CWallet * CTxDestination address; if (ExtractDestination(txout.scriptPubKey, address)) { - // Sent to Dash Address + // Sent to DarkNet Address sub.type = TransactionRecord::SendToAddress; sub.address = CBitcoinAddress(address).ToString(); } diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h index ffd0aee0277cc..165591e3ee4af 100644 --- a/src/qt/transactionrecord.h +++ b/src/qt/transactionrecord.h @@ -80,11 +80,11 @@ class TransactionRecord RecvWithAddress, RecvFromOther, SendToSelf, - RecvWithDarksend, - DarksendDenominate, - DarksendCollateralPayment, - DarksendMakeCollaterals, - DarksendCreateDenominations, + RecvWithObfuscate, + ObfuscateDenominate, + ObfuscateCollateralPayment, + ObfuscateMakeCollaterals, + ObfuscateCreateDenominations, Darksent }; diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index bd5257015bfea..10e445ede6291 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -353,8 +353,8 @@ QString TransactionTableModel::formatTxType(const TransactionRecord *wtx) const return tr("Received with"); case TransactionRecord::RecvFromOther: return tr("Received from"); - case TransactionRecord::RecvWithDarksend: - return tr("Received via Darksend"); + case TransactionRecord::RecvWithObfuscate: + return tr("Received via Obfuscate"); case TransactionRecord::SendToAddress: case TransactionRecord::SendToOther: return tr("Sent to"); @@ -363,14 +363,14 @@ QString TransactionTableModel::formatTxType(const TransactionRecord *wtx) const case TransactionRecord::Generated: return tr("Mined"); - case TransactionRecord::DarksendDenominate: - return tr("Darksend Denominate"); - case TransactionRecord::DarksendCollateralPayment: - return tr("Darksend Collateral Payment"); - case TransactionRecord::DarksendMakeCollaterals: - return tr("Darksend Make Collateral Inputs"); - case TransactionRecord::DarksendCreateDenominations: - return tr("Darksend Create Denominations"); + case TransactionRecord::ObfuscateDenominate: + return tr("Obfuscate Denominate"); + case TransactionRecord::ObfuscateCollateralPayment: + return tr("Obfuscate Collateral Payment"); + case TransactionRecord::ObfuscateMakeCollaterals: + return tr("Obfuscate Make Collateral Inputs"); + case TransactionRecord::ObfuscateCreateDenominations: + return tr("Obfuscate Create Denominations"); case TransactionRecord::Darksent: return tr("Darksent"); @@ -385,7 +385,7 @@ QVariant TransactionTableModel::txAddressDecoration(const TransactionRecord *wtx { case TransactionRecord::Generated: return QIcon(":/icons/tx_mined"); - case TransactionRecord::RecvWithDarksend: + case TransactionRecord::RecvWithObfuscate: case TransactionRecord::RecvWithAddress: case TransactionRecord::RecvFromOther: return QIcon(":/icons/tx_input"); @@ -410,7 +410,7 @@ QString TransactionTableModel::formatTxToAddress(const TransactionRecord *wtx, b case TransactionRecord::RecvFromOther: return QString::fromStdString(wtx->address) + watchAddress; case TransactionRecord::RecvWithAddress: - case TransactionRecord::RecvWithDarksend: + case TransactionRecord::RecvWithObfuscate: case TransactionRecord::SendToAddress: case TransactionRecord::Generated: case TransactionRecord::Darksent: diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp index 2787453017acb..359bc19b38bc0 100644 --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -90,10 +90,10 @@ TransactionView::TransactionView(QWidget *parent) : typeWidget->addItem(tr("Sent to"), TransactionFilterProxy::TYPE(TransactionRecord::SendToAddress) | TransactionFilterProxy::TYPE(TransactionRecord::SendToOther)); typeWidget->addItem(tr("Darksent"), TransactionFilterProxy::TYPE(TransactionRecord::Darksent)); - typeWidget->addItem(tr("Darksend Make Collateral Inputs"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendMakeCollaterals)); - typeWidget->addItem(tr("Darksend Create Denominations"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendCreateDenominations)); - typeWidget->addItem(tr("Darksend Denominate"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendDenominate)); - typeWidget->addItem(tr("Darksend Collateral Payment"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendCollateralPayment)); + typeWidget->addItem(tr("Obfuscate Make Collateral Inputs"), TransactionFilterProxy::TYPE(TransactionRecord::ObfuscateMakeCollaterals)); + typeWidget->addItem(tr("Obfuscate Create Denominations"), TransactionFilterProxy::TYPE(TransactionRecord::ObfuscateCreateDenominations)); + typeWidget->addItem(tr("Obfuscate Denominate"), TransactionFilterProxy::TYPE(TransactionRecord::ObfuscateDenominate)); + typeWidget->addItem(tr("Obfuscate Collateral Payment"), TransactionFilterProxy::TYPE(TransactionRecord::ObfuscateCollateralPayment)); typeWidget->addItem(tr("To yourself"), TransactionFilterProxy::TYPE(TransactionRecord::SendToSelf)); typeWidget->addItem(tr("Mined"), TransactionFilterProxy::TYPE(TransactionRecord::Generated)); typeWidget->addItem(tr("Other"), TransactionFilterProxy::TYPE(TransactionRecord::Other)); @@ -280,16 +280,9 @@ void TransactionView::chooseDate(int idx) TransactionFilterProxy::MAX_DATE); break; case LastMonth: - if (current.month() == 1){ - transactionProxyModel->setDateRange( - QDateTime(QDate(current.year()-1, 12, 1)), - QDateTime(QDate(current.year(), current.month(), 1))); - } - else { - transactionProxyModel->setDateRange( + transactionProxyModel->setDateRange( QDateTime(QDate(current.year(), current.month()-1, 1)), QDateTime(QDate(current.year(), current.month(), 1))); - } break; case ThisYear: transactionProxyModel->setDateRange( diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index c0bfc47c41b19..aa266b2dc0c3d 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -29,7 +30,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) : ui->setupUi(this); GUIUtil::restoreWindowGeometry("nHelpMessageDialogWindow", this->size(), this); - QString version = tr("Dash Core") + " " + tr("version") + " " + QString::fromStdString(FormatFullVersion()); + QString version = tr("DarkNet Core") + " " + tr("version") + " " + QString::fromStdString(FormatFullVersion()); /* On x86 add a bit specifier to the version so that users can distinguish between * 32 and 64 bit builds. On other architectures, 32/64 bit may be more ambigious. */ @@ -41,7 +42,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) : if (about) { - setWindowTitle(tr("About Dash Core")); + setWindowTitle(tr("About DarkNet Core")); /// HTML-format the license message from the core QString licenseInfo = QString::fromStdString(LicenseInfo()); @@ -62,7 +63,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) : } else { setWindowTitle(tr("Command-line options")); QString header = tr("Usage:") + "\n" + - " dash-qt [" + tr("command-line options") + "] " + "\n"; + " darknet-qt [" + tr("command-line options") + "] " + "\n"; QString coreOptions = QString::fromStdString(HelpMessage(HMM_BITCOIN_QT)); @@ -114,7 +115,7 @@ ShutdownWindow::ShutdownWindow(QWidget *parent, Qt::WindowFlags f): { QVBoxLayout *layout = new QVBoxLayout(); layout->addWidget(new QLabel( - tr("Dash Core is shutting down...") + "

" + + tr("DarkNet Core is shutting down...") + "

" + tr("Do not shut down the computer until this window disappears."))); setLayout(layout); } diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 71179e791f157..c151d20eba96c 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -129,13 +130,13 @@ void WalletModel::pollBalanceChanged() if(!lockWallet) return; - if(fForceCheckBalanceChanged || chainActive.Height() != cachedNumBlocks || nDarksendRounds != cachedDarksendRounds || cachedTxLocks != nCompleteTXLocks) + if(fForceCheckBalanceChanged || chainActive.Height() != cachedNumBlocks || nObfuscateRounds != cachedObfuscateRounds || cachedTxLocks != nCompleteTXLocks) { fForceCheckBalanceChanged = false; // Balance and number of transactions might have changed cachedNumBlocks = chainActive.Height(); - cachedDarksendRounds = nDarksendRounds; + cachedObfuscateRounds = nObfuscateRounds; checkBalanceChanged(); if(transactionTableModel){ @@ -247,7 +248,7 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact total += subtotal; } else - { // User-entered dash address / amount: + { // User-entered darknet address / amount: if(!validateAddress(rcp.address)) { return InvalidAddress; @@ -288,17 +289,17 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact CReserveKey *keyChange = transaction.getPossibleKeyChange(); - if(recipients[0].useInstantX && total > GetSporkValue(SPORK_5_MAX_VALUE)*COIN){ - emit message(tr("Send Coins"), tr("InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.").arg(GetSporkValue(SPORK_5_MAX_VALUE)), + if(recipients[0].useSwiftTX && total > GetSporkValue(SPORK_5_MAX_VALUE)*COIN){ + emit message(tr("Send Coins"), tr("SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 DNET.").arg(GetSporkValue(SPORK_5_MAX_VALUE)), CClientUIInterface::MSG_ERROR); return TransactionCreationFailed; } - bool fCreated = wallet->CreateTransaction(vecSend, *newTx, *keyChange, nFeeRequired, strFailReason, coinControl, recipients[0].inputType, recipients[0].useInstantX); + bool fCreated = wallet->CreateTransaction(vecSend, *newTx, *keyChange, nFeeRequired, strFailReason, coinControl, recipients[0].inputType, recipients[0].useSwiftTX); transaction.setTransactionFee(nFeeRequired); - if(recipients[0].useInstantX && newTx->GetValueOut() > GetSporkValue(SPORK_5_MAX_VALUE)*COIN){ - emit message(tr("Send Coins"), tr("InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.").arg(GetSporkValue(SPORK_5_MAX_VALUE)), + if(recipients[0].useSwiftTX && newTx->GetValueOut() > GetSporkValue(SPORK_5_MAX_VALUE)*COIN){ + emit message(tr("Send Coins"), tr("SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 DNET.").arg(GetSporkValue(SPORK_5_MAX_VALUE)), CClientUIInterface::MSG_ERROR); return TransactionCreationFailed; } @@ -346,7 +347,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran rcp.paymentRequest.SerializeToString(&value); newTx->vOrderForm.push_back(make_pair(key, value)); } - else if (!rcp.message.isEmpty()) // Message from normal dash:URI (dash:XyZ...?message=example) + else if (!rcp.message.isEmpty()) // Message from normal darknet:URI (darknet:XyZ...?message=example) { newTx->vOrderForm.push_back(make_pair("Message", rcp.message.toStdString())); } @@ -356,7 +357,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran transaction.getRecipients(); - if(!wallet->CommitTransaction(*newTx, *keyChange, (recipients[0].useInstantX) ? "ix" : "tx")) + if(!wallet->CommitTransaction(*newTx, *keyChange, (recipients[0].useSwiftTX) ? "ix" : "tx")) return TransactionCommitFailed; CTransaction* t = (CTransaction*)newTx; diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index ea13ebefa23fe..fca36026c7b17 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -9,7 +9,7 @@ #include "walletmodeltransaction.h" #include "allocators.h" /* for SecureString */ -#include "instantx.h" +#include "swifttx.h" #include "wallet.h" #include @@ -50,7 +50,7 @@ class SendCoinsRecipient QString address; QString label; AvailableCoinsType inputType; - bool useInstantX; + bool useSwiftTX; CAmount amount; // If from a payment request, this is used for storing the memo QString message; @@ -228,7 +228,7 @@ class WalletModel : public QObject EncryptionStatus cachedEncryptionStatus; int cachedNumBlocks; int cachedTxLocks; - int cachedDarksendRounds; + int cachedObfuscateRounds; QTimer *pollTimer; diff --git a/src/qt/walletview.h b/src/qt/walletview.h index 71fd26ba9c7af..691875396bc03 100644 --- a/src/qt/walletview.h +++ b/src/qt/walletview.h @@ -109,7 +109,7 @@ public slots: /** Show progress dialog e.g. for rescan */ void showProgress(const QString &title, int nProgress); - /** Update selected DASH amount from transactionview */ + /** Update selected DNET amount from transactionview */ void trxAmount(QString amount); signals: diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 8ff4ffc80e379..8493b42a4ae6b 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -173,7 +174,7 @@ Value getrawmempool(const Array& params, bool fHelp) "{ (json object)\n" " \"transactionid\" : { (json object)\n" " \"size\" : n, (numeric) transaction size in bytes\n" - " \"fee\" : n, (numeric) transaction fee in dashs\n" + " \"fee\" : n, (numeric) transaction fee in darknet\n" " \"time\" : n, (numeric) local time transaction entered pool in seconds since 1 Jan 1970 GMT\n" " \"height\" : n, (numeric) block height when transaction entered pool\n" " \"startingpriority\" : n, (numeric) priority when transaction entered pool\n" @@ -430,8 +431,8 @@ Value gettxout(const Array& params, bool fHelp) " \"hex\" : \"hex\", (string) \n" " \"reqSigs\" : n, (numeric) Number of required signatures\n" " \"type\" : \"pubkeyhash\", (string) The type, eg pubkeyhash\n" - " \"addresses\" : [ (array of string) array of dash addresses\n" - " \"dashaddress\" (string) dash address\n" + " \"addresses\" : [ (array of string) array of darknet addresses\n" + " \"darknetaddress\" (string) darknet address\n" " ,...\n" " ]\n" " },\n" diff --git a/src/rpcclient.cpp b/src/rpcclient.cpp index 4844f6567373d..1f6b7fdbaf3d9 100644 --- a/src/rpcclient.cpp +++ b/src/rpcclient.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpcdump.cpp b/src/rpcdump.cpp index 1171965f1bc8a..cba56dd90e9a1 100644 --- a/src/rpcdump.cpp +++ b/src/rpcdump.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -74,10 +75,10 @@ Value importprivkey(const Array& params, bool fHelp) { if (fHelp || params.size() < 1 || params.size() > 3) throw runtime_error( - "importprivkey \"dashprivkey\" ( \"label\" rescan )\n" + "importprivkey \"darknetprivkey\" ( \"label\" rescan )\n" "\nAdds a private key (as returned by dumpprivkey) to your wallet.\n" "\nArguments:\n" - "1. \"dashprivkey\" (string, required) The private key (see dumpprivkey)\n" + "1. \"darknetprivkey\" (string, required) The private key (see dumpprivkey)\n" "2. \"label\" (string, optional, default=\"\") An optional label\n" "3. rescan (boolean, optional, default=true) Rescan the wallet for transactions\n" "\nNote: This call can take minutes to complete if rescan is true.\n" @@ -168,7 +169,7 @@ Value importaddress(const Array& params, bool fHelp) std::vector data(ParseHex(params[0].get_str())); script = CScript(data.begin(), data.end()); } else { - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Dash address or script"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid DarkNet address or script"); } string strLabel = ""; @@ -310,11 +311,11 @@ Value dumpprivkey(const Array& params, bool fHelp) { if (fHelp || params.size() != 1) throw runtime_error( - "dumpprivkey \"dashaddress\"\n" - "\nReveals the private key corresponding to 'dashaddress'.\n" + "dumpprivkey \"darknetaddress\"\n" + "\nReveals the private key corresponding to 'darknetaddress'.\n" "Then the importprivkey can be used with this output\n" "\nArguments:\n" - "1. \"dashaddress\" (string, required) The dash address for the private key\n" + "1. \"darknetaddress\" (string, required) The darknet address for the private key\n" "\nResult:\n" "\"key\" (string) The private key\n" "\nExamples:\n" @@ -328,7 +329,7 @@ Value dumpprivkey(const Array& params, bool fHelp) string strAddress = params[0].get_str(); CBitcoinAddress address; if (!address.SetString(strAddress)) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Dash address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid DarkNet address"); CKeyID keyID; if (!address.GetKeyID(keyID)) throw JSONRPCError(RPC_TYPE_ERROR, "Address does not refer to a key"); @@ -373,7 +374,7 @@ Value dumpwallet(const Array& params, bool fHelp) std::sort(vKeyBirth.begin(), vKeyBirth.end()); // produce output - file << strprintf("# Wallet dump created by Dash %s (%s)\n", CLIENT_BUILD, CLIENT_DATE); + file << strprintf("# Wallet dump created by DarkNet %s (%s)\n", CLIENT_BUILD, CLIENT_DATE); file << strprintf("# * Created on %s\n", EncodeDumpTime(GetTime())); file << strprintf("# * Best block at time of backup was %i (%s),\n", chainActive.Height(), chainActive.Tip()->GetBlockHash().ToString()); file << strprintf("# mined on %s\n", EncodeDumpTime(chainActive.Tip()->GetBlockTime())); diff --git a/src/rpcmasternode-budget.cpp b/src/rpcmasternode-budget.cpp index 3245349f847c2..eb39c2ed8cb8c 100644 --- a/src/rpcmasternode-budget.cpp +++ b/src/rpcmasternode-budget.cpp @@ -60,7 +60,7 @@ Value mnbudget(const Array& params, bool fHelp) mnEntries = masternodeConfig.getEntries(); if (params.size() != 7) - throw runtime_error("Correct usage is 'mnbudget prepare proposal-name url payment_count block_start dash_address monthly_payment_dash'"); + throw runtime_error("Correct usage is 'mnbudget prepare proposal-name url payment_count block_start darknet_address monthly_payment_darknet'"); std::string strProposalName = params[1].get_str(); if(strProposalName.size() > 20) @@ -137,7 +137,7 @@ Value mnbudget(const Array& params, bool fHelp) mnEntries = masternodeConfig.getEntries(); if (params.size() != 8) - throw runtime_error("Correct usage is 'mnbudget submit proposal-name url payment_count block_start dash_address monthly_payment_dash fee_tx'"); + throw runtime_error("Correct usage is 'mnbudget submit proposal-name url payment_count block_start darknet_address monthly_payment_darknet fee_tx'"); // Check these inputs the same way we check the vote commands: // ********************************************************** diff --git a/src/rpcmasternode.cpp b/src/rpcmasternode.cpp index d59abb77416d0..4b6f5541e5eb1 100644 --- a/src/rpcmasternode.cpp +++ b/src/rpcmasternode.cpp @@ -51,12 +51,12 @@ void SendMoney(const CTxDestination &address, CAmount nValue, CWalletTx& wtxNew, throw JSONRPCError(RPC_WALLET_ERROR, "Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."); } -Value darksend(const Array& params, bool fHelp) +Value obfuscate(const Array& params, bool fHelp) { if (fHelp || params.size() == 0) throw runtime_error( - "darksend \n" - "dashaddress, reset, or auto (AutoDenominate)" + "obfuscate \n" + "darknetaddress, reset, or auto (AutoDenominate)" " is a real and will be rounded to the next 0.1" + HelpRequiringPassphrase()); @@ -65,20 +65,20 @@ Value darksend(const Array& params, bool fHelp) if(params[0].get_str() == "auto"){ if(fMasterNode) - return "DarkSend is not supported from masternodes"; + return "Obfuscate is not supported from masternodes"; return "DoAutomaticDenominating " + (darkSendPool.DoAutomaticDenominating() ? "successful" : ("failed: " + darkSendPool.GetStatus())); } if(params[0].get_str() == "reset"){ darkSendPool.Reset(); - return "successfully reset darksend"; + return "successfully reset obfuscate"; } if (params.size() != 2) throw runtime_error( - "darksend \n" - "dashaddress, denominate, or auto (AutoDenominate)" + "obfuscate \n" + "darknetaddress, denominate, or auto (AutoDenominate)" " is a real and will be rounded to the next 0.1" + HelpRequiringPassphrase()); @@ -140,7 +140,7 @@ Value masternode(const Array& params, bool fHelp) " genkey - Generate new masternodeprivkey\n" " enforce - Enforce masternode payments\n" " outputs - Print masternode compatible outputs\n" - " start - Start masternode configured in dash.conf\n" + " start - Start masternode configured in darknet.conf\n" " start-alias - Start single masternode by assigned alias configured in masternode.conf\n" " start- - Start masternodes configured in masternode.conf (: 'all', 'missing', 'disabled')\n" " status - Print masternode status information\n" diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 4f42e7e534abd..12b3b90d6386c 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -101,7 +102,7 @@ Value getgenerate(const Array& params, bool fHelp) throw runtime_error( "getgenerate\n" "\nReturn if the server is set to generate coins or not. The default is false.\n" - "It is set with the command line argument -gen (or dash.conf setting gen)\n" + "It is set with the command line argument -gen (or darknet.conf setting gen)\n" "It can also be set with the setgenerate call.\n" "\nResult\n" "true|false (boolean) If the server is set to generate coins or not\n" @@ -440,10 +441,10 @@ Value getblocktemplate(const Array& params, bool fHelp) throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid mode"); if (vNodes.empty()) - throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Dash is not connected!"); + throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "DarkNet is not connected!"); if (IsInitialBlockDownload()) - throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Dash is downloading blocks..."); + throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "DarkNet is downloading blocks..."); static unsigned int nTransactionsUpdatedLast; diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index 5aa41de1f33e7..eab3fd4d711ba 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -55,8 +56,8 @@ Value getinfo(const Array& params, bool fHelp) " \"version\": xxxxx, (numeric) the server version\n" " \"protocolversion\": xxxxx, (numeric) the protocol version\n" " \"walletversion\": xxxxx, (numeric) the wallet version\n" - " \"balance\": xxxxxxx, (numeric) the total dash balance of the wallet\n" - " \"darksend_balance\": xxxxxx, (numeric) the anonymized dash balance of the wallet\n" + " \"balance\": xxxxxxx, (numeric) the total darknet balance of the wallet\n" + " \"obfuscate_balance\": xxxxxx, (numeric) the anonymized darknet balance of the wallet\n" " \"blocks\": xxxxxx, (numeric) the current number of blocks processed in the server\n" " \"timeoffset\": xxxxx, (numeric) the time offset\n" " \"connections\": xxxxx, (numeric) the number of connections\n" @@ -66,8 +67,8 @@ Value getinfo(const Array& params, bool fHelp) " \"keypoololdest\": xxxxxx, (numeric) the timestamp (seconds since GMT epoch) of the oldest pre-generated key in the key pool\n" " \"keypoolsize\": xxxx, (numeric) how many new keys are pre-generated\n" " \"unlocked_until\": ttt, (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n" - " \"paytxfee\": x.xxxx, (numeric) the transaction fee set in dash/kb\n" - " \"relayfee\": x.xxxx, (numeric) minimum relay fee for non-free transactions in dash/kb\n" + " \"paytxfee\": x.xxxx, (numeric) the transaction fee set in darknet/kb\n" + " \"relayfee\": x.xxxx, (numeric) minimum relay fee for non-free transactions in darknet/kb\n" " \"errors\": \"...\" (string) any error messages\n" "}\n" "\nExamples:\n" @@ -86,7 +87,7 @@ Value getinfo(const Array& params, bool fHelp) obj.push_back(Pair("walletversion", pwalletMain->GetVersion())); obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance()))); if(!fLiteMode) - obj.push_back(Pair("darksend_balance", ValueFromAmount(pwalletMain->GetAnonymizedBalance()))); + obj.push_back(Pair("obfuscate_balance", ValueFromAmount(pwalletMain->GetAnonymizedBalance()))); } #endif obj.push_back(Pair("blocks", (int)chainActive.Height())); @@ -247,14 +248,14 @@ Value validateaddress(const Array& params, bool fHelp) { if (fHelp || params.size() != 1) throw runtime_error( - "validateaddress \"dashaddress\"\n" - "\nReturn information about the given dash address.\n" + "validateaddress \"darknetaddress\"\n" + "\nReturn information about the given darknet address.\n" "\nArguments:\n" - "1. \"dashaddress\" (string, required) The dash address to validate\n" + "1. \"darknetaddress\" (string, required) The darknet address to validate\n" "\nResult:\n" "{\n" " \"isvalid\" : true|false, (boolean) If the address is valid or not. If not, this is the only property returned.\n" - " \"address\" : \"dashaddress\", (string) The dash address validated\n" + " \"address\" : \"darknetaddress\", (string) The darknet address validated\n" " \"ismine\" : true|false, (boolean) If the address is yours or not\n" " \"isscript\" : true|false, (boolean) If the key is a script\n" " \"pubkey\" : \"publickeyhex\", (string) The hex value of the raw public key\n" @@ -314,7 +315,7 @@ CScript _createmultisig_redeemScript(const Array& params) { const std::string& ks = keys[i].get_str(); #ifdef ENABLE_WALLET - // Case 1: Dash address and we have full public key: + // Case 1: DarkNet address and we have full public key: CBitcoinAddress address(ks); if (pwalletMain && address.IsValid()) { @@ -365,9 +366,9 @@ Value createmultisig(const Array& params, bool fHelp) "\nArguments:\n" "1. nrequired (numeric, required) The number of required signatures out of the n keys or addresses.\n" - "2. \"keys\" (string, required) A json array of keys which are dash addresses or hex-encoded public keys\n" + "2. \"keys\" (string, required) A json array of keys which are darknet addresses or hex-encoded public keys\n" " [\n" - " \"key\" (string) dash address or hex-encoded public key\n" + " \"key\" (string) darknet address or hex-encoded public key\n" " ,...\n" " ]\n" @@ -402,10 +403,10 @@ Value verifymessage(const Array& params, bool fHelp) { if (fHelp || params.size() != 3) throw runtime_error( - "verifymessage \"dashaddress\" \"signature\" \"message\"\n" + "verifymessage \"darknetaddress\" \"signature\" \"message\"\n" "\nVerify a signed message\n" "\nArguments:\n" - "1. \"dashaddress\" (string, required) The dash address to use for the signature.\n" + "1. \"darknetaddress\" (string, required) The darknet address to use for the signature.\n" "2. \"signature\" (string, required) The signature provided by the signer in base 64 encoding (see signmessage).\n" "3. \"message\" (string, required) The message that was signed.\n" "\nResult:\n" diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index a8f51fa6122dd..bdb22d440e23e 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -175,8 +176,8 @@ Value addnode(const Array& params, bool fHelp) "1. \"node\" (string, required) The node (see getpeerinfo for nodes)\n" "2. \"command\" (string, required) 'add' to add a node to the list, 'remove' to remove a node from the list, 'onetry' to try a connection to the node once\n" "\nExamples:\n" - + HelpExampleCli("addnode", "\"192.168.0.6:9999\" \"onetry\"") - + HelpExampleRpc("addnode", "\"192.168.0.6:9999\", \"onetry\"") + + HelpExampleCli("addnode", "\"192.168.0.6:51472\" \"onetry\"") + + HelpExampleRpc("addnode", "\"192.168.0.6:51472\", \"onetry\"") ); string strNode = params[0].get_str(); @@ -229,7 +230,7 @@ Value getaddednodeinfo(const Array& params, bool fHelp) " \"connected\" : true|false, (boolean) If connected\n" " \"addresses\" : [\n" " {\n" - " \"address\" : \"192.168.0.201:9999\", (string) The dash server host and port\n" + " \"address\" : \"192.168.0.201:51472\", (string) The darknet server host and port\n" " \"connected\" : \"outbound\" (string) connection, inbound or outbound\n" " }\n" " ,...\n" @@ -395,7 +396,7 @@ Value getnetworkinfo(const Array& params, bool fHelp) " }\n" " ,...\n" " ],\n" - " \"relayfee\": x.xxxxxxxx, (numeric) minimum relay fee for non-free transactions in dash/kb\n" + " \"relayfee\": x.xxxxxxxx, (numeric) minimum relay fee for non-free transactions in daknet/kb\n" " \"localaddresses\": [ (array) list of local addresses\n" " {\n" " \"address\": \"xxxx\", (string) network address\n" diff --git a/src/rpcprotocol.cpp b/src/rpcprotocol.cpp index b5f8f5ce75877..041cc14d7ba6c 100644 --- a/src/rpcprotocol.cpp +++ b/src/rpcprotocol.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -45,7 +46,7 @@ string HTTPPost(const string& strMsg, const map& mapRequestHeader { ostringstream s; s << "POST / HTTP/1.1\r\n" - << "User-Agent: dash-json-rpc/" << FormatFullVersion() << "\r\n" + << "User-Agent: darknet-json-rpc/" << FormatFullVersion() << "\r\n" << "Host: 127.0.0.1\r\n" << "Content-Type: application/json\r\n" << "Content-Length: " << strMsg.size() << "\r\n" @@ -80,7 +81,7 @@ string HTTPError(int nStatus, bool keepalive, bool headersOnly) if (nStatus == HTTP_UNAUTHORIZED) return strprintf("HTTP/1.0 401 Authorization Required\r\n" "Date: %s\r\n" - "Server: dash-json-rpc/%s\r\n" + "Server: darknet-json-rpc/%s\r\n" "WWW-Authenticate: Basic realm=\"jsonrpc\"\r\n" "Content-Type: text/html\r\n" "Content-Length: 296\r\n" @@ -107,7 +108,7 @@ string HTTPReplyHeader(int nStatus, bool keepalive, size_t contentLength, const "Connection: %s\r\n" "Content-Length: %u\r\n" "Content-Type: %s\r\n" - "Server: dash-json-rpc/%s\r\n" + "Server: darknet-json-rpc/%s\r\n" "\r\n", nStatus, httpStatusDescription(nStatus), @@ -249,7 +250,7 @@ int ReadHTTPMessage(std::basic_istream& stream, map 1) throw runtime_error( "stop\n" - "\nStop Dash server."); + "\nStop DarkNet server."); // Shutdown will take long enough that the response should get back StartShutdown(); - return "Dash server stopping"; + return "DarkNet server stopping"; } @@ -309,15 +310,15 @@ static const CRPCCommand vRPCCommands[] = { "hidden", "setmocktime", &setmocktime, true, false, false }, /* Dash features */ - { "dash", "masternode", &masternode, true, true, false }, - { "dash", "masternodelist", &masternodelist, true, true, false }, - { "dash", "mnbudget", &mnbudget, true, true, false }, - { "dash", "mnbudgetvoteraw", &mnbudgetvoteraw, true, true, false }, - { "dash", "mnfinalbudget", &mnfinalbudget, true, true, false }, - { "dash", "mnsync", &mnsync, true, true, false }, - { "dash", "spork", &spork, true, true, false }, + { "darknet", "masternode", &masternode, true, true, false }, + { "darknet", "masternodelist", &masternodelist, true, true, false }, + { "darknet", "mnbudget", &mnbudget, true, true, false }, + { "darknet", "mnbudgetvoteraw", &mnbudgetvoteraw, true, true, false }, + { "darknet", "mnfinalbudget", &mnfinalbudget, true, true, false }, + { "darknet", "mnsync", &mnsync, true, true, false }, + { "darknet", "spork", &spork, true, true, false }, #ifdef ENABLE_WALLET - { "dash", "darksend", &darksend, false, false, true }, /* not threadSafe because of SendMoney */ + { "darknet", "obfuscate", &obfuscate, false, false, true }, /* not threadSafe because of SendMoney */ /* Wallet */ { "wallet", "addmultisigaddress", &addmultisigaddress, true, false, true }, @@ -586,16 +587,16 @@ void StartRPCThreads() unsigned char rand_pwd[32]; GetRandBytes(rand_pwd, 32); uiInterface.ThreadSafeMessageBox(strprintf( - _("To use dashd, or the -server option to dash-qt, you must set an rpcpassword in the configuration file:\n" + _("To use darknetd, or the -server option to darknet-qt, you must set an rpcpassword in the configuration file:\n" "%s\n" "It is recommended you use the following random password:\n" - "rpcuser=dashrpc\n" + "rpcuser=darknetrpc\n" "rpcpassword=%s\n" "(you do not need to remember this password)\n" "The username and password MUST NOT be the same.\n" "If the file does not exist, create it with owner-readable-only file permissions.\n" "It is also recommended to set alertnotify so you are notified of problems;\n" - "for example: alertnotify=echo %%s | mail -s \"Dash Alert\" admin@foo.com\n"), + "for example: alertnotify=echo %%s | mail -s \"DarkNet Alert\" admin@foo.com\n"), GetConfigFile().string(), EncodeBase58(&rand_pwd[0],&rand_pwd[0]+32)), "", CClientUIInterface::MSG_ERROR | CClientUIInterface::SECURE); @@ -1046,12 +1047,12 @@ json_spirit::Value CRPCTable::execute(const std::string &strMethod, const json_s } std::string HelpExampleCli(string methodname, string args){ - return "> dash-cli " + methodname + " " + args + "\n"; + return "> darknet-cli " + methodname + " " + args + "\n"; } std::string HelpExampleRpc(string methodname, string args){ return "> curl --user myusername --data-binary '{\"jsonrpc\": \"1.0\", \"id\":\"curltest\", " - "\"method\": \"" + methodname + "\", \"params\": [" + args + "] }' -H 'content-type: text/plain;' http://127.0.0.1:9998/\n"; + "\"method\": \"" + methodname + "\", \"params\": [" + args + "] }' -H 'content-type: text/plain;' http://127.0.0.1:51473/\n"; } const CRPCTable tableRPC; diff --git a/src/rpcserver.h b/src/rpcserver.h index ff8d556173f6d..670ae4e4b6dea 100644 --- a/src/rpcserver.h +++ b/src/rpcserver.h @@ -93,7 +93,7 @@ class CRPCCommand }; /** - * Dash RPC command dispatcher. + * DarkNet RPC command dispatcher. */ class CRPCTable { @@ -227,7 +227,7 @@ extern json_spirit::Value verifychain(const json_spirit::Array& params, bool fHe extern json_spirit::Value getchaintips(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value invalidateblock(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value reconsiderblock(const json_spirit::Array& params, bool fHelp); -extern json_spirit::Value darksend(const json_spirit::Array& params, bool fHelp); +extern json_spirit::Value obfuscate(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value spork(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value masternode(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value masternodelist(const json_spirit::Array& params, bool fHelp); diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index c60c819a35c51..26b42091a7bb7 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -84,13 +85,13 @@ Value getnewaddress(const Array& params, bool fHelp) if (fHelp || params.size() > 1) throw runtime_error( "getnewaddress ( \"account\" )\n" - "\nReturns a new Dash address for receiving payments.\n" + "\nReturns a new DarkNet address for receiving payments.\n" "If 'account' is specified (recommended), it is added to the address book \n" "so payments received with the address will be credited to 'account'.\n" "\nArguments:\n" "1. \"account\" (string, optional) The account name for the address to be linked to. if not provided, the default account \"\" is used. It can also be set to the empty string \"\" to represent the default account. The account does not need to exist, it will be created if there is no account by the given name.\n" "\nResult:\n" - "\"dashaddress\" (string) The new dash address\n" + "\"darknetaddress\" (string) The new darknet address\n" "\nExamples:\n" + HelpExampleCli("getnewaddress", "") + HelpExampleCli("getnewaddress", "\"\"") @@ -160,11 +161,11 @@ Value getaccountaddress(const Array& params, bool fHelp) if (fHelp || params.size() != 1) throw runtime_error( "getaccountaddress \"account\"\n" - "\nReturns the current Dash address for receiving payments to this account.\n" + "\nReturns the current DarkNet address for receiving payments to this account.\n" "\nArguments:\n" "1. \"account\" (string, required) The account name for the address. It can also be set to the empty string \"\" to represent the default account. The account does not need to exist, it will be created and a new address created if there is no account by the given name.\n" "\nResult:\n" - "\"dashaddress\" (string) The account dash address\n" + "\"darknetaddress\" (string) The account darknet address\n" "\nExamples:\n" + HelpExampleCli("getaccountaddress", "") + HelpExampleCli("getaccountaddress", "\"\"") @@ -188,7 +189,7 @@ Value getrawchangeaddress(const Array& params, bool fHelp) if (fHelp || params.size() > 1) throw runtime_error( "getrawchangeaddress\n" - "\nReturns a new Dash address, for receiving change.\n" + "\nReturns a new DarkNet address, for receiving change.\n" "This is for use with raw transactions, NOT normal use.\n" "\nResult:\n" "\"address\" (string) The address\n" @@ -217,10 +218,10 @@ Value setaccount(const Array& params, bool fHelp) { if (fHelp || params.size() < 1 || params.size() > 2) throw runtime_error( - "setaccount \"dashaddress\" \"account\"\n" + "setaccount \"darknetaddress\" \"account\"\n" "\nSets the account associated with the given address.\n" "\nArguments:\n" - "1. \"dashaddress\" (string, required) The dash address to be associated with an account.\n" + "1. \"darknetaddress\" (string, required) The darknet address to be associated with an account.\n" "2. \"account\" (string, required) The account to assign the address to.\n" "\nExamples:\n" + HelpExampleCli("setaccount", "\"XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg\" \"tabby\"") @@ -229,7 +230,7 @@ Value setaccount(const Array& params, bool fHelp) CBitcoinAddress address(params[0].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Dash address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid DarkNet address"); string strAccount; @@ -259,10 +260,10 @@ Value getaccount(const Array& params, bool fHelp) { if (fHelp || params.size() != 1) throw runtime_error( - "getaccount \"dashaddress\"\n" + "getaccount \"darknetaddress\"\n" "\nReturns the account associated with the given address.\n" "\nArguments:\n" - "1. \"dashaddress\" (string, required) The dash address for account lookup.\n" + "1. \"darknetaddress\" (string, required) The darknet address for account lookup.\n" "\nResult:\n" "\"accountname\" (string) the account address\n" "\nExamples:\n" @@ -272,7 +273,7 @@ Value getaccount(const Array& params, bool fHelp) CBitcoinAddress address(params[0].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Dash address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid DarkNet address"); string strAccount; map::iterator mi = pwalletMain->mapAddressBook.find(address.Get()); @@ -292,7 +293,7 @@ Value getaddressesbyaccount(const Array& params, bool fHelp) "1. \"account\" (string, required) The account name.\n" "\nResult:\n" "[ (json array of string)\n" - " \"dashaddress\" (string) a dash address associated with the given account\n" + " \"darknetaddress\" (string) a darknet address associated with the given account\n" " ,...\n" "]\n" "\nExamples:\n" @@ -331,7 +332,7 @@ void SendMoney(const CTxDestination &address, CAmount nValue, CWalletTx& wtxNew, throw JSONRPCError(RPC_WALLET_ERROR, strError); } - // Parse Dash address + // Parse DarkNet address CScript scriptPubKey = GetScriptForDestination(address); // Create and send the transaction @@ -352,11 +353,11 @@ Value sendtoaddress(const Array& params, bool fHelp) { if (fHelp || params.size() < 2 || params.size() > 4) throw runtime_error( - "sendtoaddress \"dashaddress\" amount ( \"comment\" \"comment-to\" )\n" + "sendtoaddress \"darknetaddress\" amount ( \"comment\" \"comment-to\" )\n" "\nSend an amount to a given address. The amount is a real and is rounded to the nearest 0.00000001\n" + HelpRequiringPassphrase() + "\nArguments:\n" - "1. \"dashaddress\" (string, required) The dash address to send to.\n" + "1. \"darknetaddress\" (string, required) The darknet address to send to.\n" "2. \"amount\" (numeric, required) The amount in btc to send. eg 0.1\n" "3. \"comment\" (string, optional) A comment used to store what the transaction is for. \n" " This is not part of the transaction, just kept in your wallet.\n" @@ -373,7 +374,7 @@ Value sendtoaddress(const Array& params, bool fHelp) CBitcoinAddress address(params[0].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Dash address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid DarkNet address"); // Amount CAmount nAmount = AmountFromValue(params[1]); @@ -396,11 +397,11 @@ Value sendtoaddressix(const Array& params, bool fHelp) { if (fHelp || params.size() < 2 || params.size() > 4) throw runtime_error( - "sendtoaddressix \"dashaddress\" amount ( \"comment\" \"comment-to\" )\n" + "sendtoaddressix \"darknetaddress\" amount ( \"comment\" \"comment-to\" )\n" "\nSend an amount to a given address. The amount is a real and is rounded to the nearest 0.00000001\n" + HelpRequiringPassphrase() + "\nArguments:\n" - "1. \"dashaddress\" (string, required) The dash address to send to.\n" + "1. \"darknetaddress\" (string, required) The darknet address to send to.\n" "2. \"amount\" (numeric, required) The amount in btc to send. eg 0.1\n" "3. \"comment\" (string, optional) A comment used to store what the transaction is for. \n" " This is not part of the transaction, just kept in your wallet.\n" @@ -417,7 +418,7 @@ Value sendtoaddressix(const Array& params, bool fHelp) CBitcoinAddress address(params[0].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Dash address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid DarkNet address"); // Amount CAmount nAmount = AmountFromValue(params[1]); @@ -447,7 +448,7 @@ Value listaddressgroupings(const Array& params, bool fHelp) "[\n" " [\n" " [\n" - " \"dashaddress\", (string) The dash address\n" + " \"darknetaddress\", (string) The darknet address\n" " amount, (numeric) The amount in btc\n" " \"account\" (string, optional) The account\n" " ]\n" @@ -486,11 +487,11 @@ Value signmessage(const Array& params, bool fHelp) { if (fHelp || params.size() != 2) throw runtime_error( - "signmessage \"dashaddress\" \"message\"\n" + "signmessage \"dakrnetaddress\" \"message\"\n" "\nSign a message with the private key of an address" + HelpRequiringPassphrase() + "\n" "\nArguments:\n" - "1. \"dashaddress\" (string, required) The dash address to use for the private key.\n" + "1. \"darknetaddress\" (string, required) The darknet address to use for the private key.\n" "2. \"message\" (string, required) The message to create a signature of.\n" "\nResult:\n" "\"signature\" (string) The signature of the message encoded in base 64\n" @@ -537,10 +538,10 @@ Value getreceivedbyaddress(const Array& params, bool fHelp) { if (fHelp || params.size() < 1 || params.size() > 2) throw runtime_error( - "getreceivedbyaddress \"dashaddress\" ( minconf )\n" - "\nReturns the total amount received by the given dashaddress in transactions with at least minconf confirmations.\n" + "getreceivedbyaddress \"darknetaddress\" ( minconf )\n" + "\nReturns the total amount received by the given darknetaddress in transactions with at least minconf confirmations.\n" "\nArguments:\n" - "1. \"dashaddress\" (string, required) The dash address for transactions.\n" + "1. \"darknetaddress\" (string, required) The darknet address for transactions.\n" "2. minconf (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n" "\nResult:\n" "amount (numeric) The total amount in btc received at this address.\n" @@ -555,10 +556,10 @@ Value getreceivedbyaddress(const Array& params, bool fHelp) + HelpExampleRpc("getreceivedbyaddress", "\"XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg\", 6") ); - // Dash address + // darknet address CBitcoinAddress address = CBitcoinAddress(params[0].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Dash address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid DarkNet address"); CScript scriptPubKey = GetScriptForDestination(address.Get()); if (!IsMine(*pwalletMain,scriptPubKey)) return (double)0.0; @@ -823,13 +824,13 @@ Value sendfrom(const Array& params, bool fHelp) { if (fHelp || params.size() < 3 || params.size() > 6) throw runtime_error( - "sendfrom \"fromaccount\" \"todashaddress\" amount ( minconf \"comment\" \"comment-to\" )\n" - "\nSent an amount from an account to a dash address.\n" + "sendfrom \"fromaccount\" \"todarknetaddress\" amount ( minconf \"comment\" \"comment-to\" )\n" + "\nSent an amount from an account to a darknet address.\n" "The amount is a real and is rounded to the nearest 0.00000001." + HelpRequiringPassphrase() + "\n" "\nArguments:\n" "1. \"fromaccount\" (string, required) The name of the account to send funds from. May be the default account using \"\".\n" - "2. \"todashaddress\" (string, required) The dash address to send funds to.\n" + "2. \"todarknetaddress\" (string, required) The darknet address to send funds to.\n" "3. amount (numeric, required) The amount in btc. (transaction fee is added on top).\n" "4. minconf (numeric, optional, default=1) Only use funds with at least this many confirmations.\n" "5. \"comment\" (string, optional) A comment used to store what the transaction is for. \n" @@ -851,7 +852,7 @@ Value sendfrom(const Array& params, bool fHelp) string strAccount = AccountFromValue(params[0]); CBitcoinAddress address(params[1].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Dash address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid DarkNet address"); CAmount nAmount = AmountFromValue(params[2]); int nMinDepth = 1; if (params.size() > 3) @@ -888,7 +889,7 @@ Value sendmany(const Array& params, bool fHelp) "1. \"fromaccount\" (string, required) The account to send the funds from, can be \"\" for the default account\n" "2. \"amounts\" (string, required) A json object with addresses and amounts\n" " {\n" - " \"address\":amount (numeric) The dash address is the key, the numeric amount in btc is the value\n" + " \"address\":amount (numeric) The darknet address is the key, the numeric amount in btc is the value\n" " ,...\n" " }\n" "3. minconf (numeric, optional, default=1) Only use the balance confirmed at least this many times.\n" @@ -924,7 +925,7 @@ Value sendmany(const Array& params, bool fHelp) { CBitcoinAddress address(s.name_); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Dash address: ")+s.name_); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid DarkNet address: ")+s.name_); if (setAddress.count(address)) throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+s.name_); @@ -966,20 +967,20 @@ Value addmultisigaddress(const Array& params, bool fHelp) { string msg = "addmultisigaddress nrequired [\"key\",...] ( \"account\" )\n" "\nAdd a nrequired-to-sign multisignature address to the wallet.\n" - "Each key is a Dash address or hex-encoded public key.\n" + "Each key is a DarkNet address or hex-encoded public key.\n" "If 'account' is specified, assign address to that account.\n" "\nArguments:\n" "1. nrequired (numeric, required) The number of required signatures out of the n keys or addresses.\n" - "2. \"keysobject\" (string, required) A json array of dash addresses or hex-encoded public keys\n" + "2. \"keysobject\" (string, required) A json array of darknet addresses or hex-encoded public keys\n" " [\n" - " \"address\" (string) dash address or hex-encoded public key\n" + " \"address\" (string) darknet address or hex-encoded public key\n" " ...,\n" " ]\n" "3. \"account\" (string, optional) An account to assign the addresses to.\n" "\nResult:\n" - "\"dashaddress\" (string) A dash address associated with the keys.\n" + "\"darknetaddress\" (string) A darknet address associated with the keys.\n" "\nExamples:\n" "\nAdd a multisig address from 2 addresses\n" @@ -1323,7 +1324,7 @@ Value listtransactions(const Array& params, bool fHelp) " {\n" " \"account\":\"accountname\", (string) The account name associated with the transaction. \n" " It will be \"\" for the default account.\n" - " \"address\":\"dashaddress\", (string) The dash address of the transaction. Not present for \n" + " \"address\":\"darknetaddress\", (string) The darknet address of the transaction. Not present for \n" " move transactions (category = move).\n" " \"category\":\"send|receive|move\", (string) The transaction category. 'move' is a local (off blockchain)\n" " transaction between accounts, and not associated with an address,\n" @@ -1509,7 +1510,7 @@ Value listsinceblock(const Array& params, bool fHelp) "{\n" " \"transactions\": [\n" " \"account\":\"accountname\", (string) The account name associated with the transaction. Will be \"\" for the default account.\n" - " \"address\":\"dashaddress\", (string) The dash address of the transaction. Not present for move transactions (category = move).\n" + " \"address\":\"darknetaddress\", (string) The darknet address of the transaction. Not present for move transactions (category = move).\n" " \"category\":\"send|receive\", (string) The transaction category. 'send' has negative amounts, 'receive' has positive amounts.\n" " \"amount\": x.xxx, (numeric) The amount in btc. This is negative for the 'send' category, and for the 'move' category for moves \n" " outbound. It is positive for the 'receive' category, and for the 'move' category for inbound funds.\n" @@ -1605,7 +1606,7 @@ Value gettransaction(const Array& params, bool fHelp) " \"details\" : [\n" " {\n" " \"account\" : \"accountname\", (string) The account name involved in the transaction, can be \"\" for the default account.\n" - " \"address\" : \"dashaddress\", (string) The dash address involved in the transaction\n" + " \"address\" : \"darknetaddress\", (string) The darknet address involved in the transaction\n" " \"category\" : \"send|receive\", (string) The category, either 'send' or 'receive'\n" " \"amount\" : x.xxx (numeric) The amount in btc\n" " \"vout\" : n, (numeric) the vout value\n" @@ -1722,7 +1723,7 @@ Value walletpassphrase(const Array& params, bool fHelp) throw runtime_error( "walletpassphrase \"passphrase\" timeout ( anonymizeonly )\n" "\nStores the wallet decryption key in memory for 'timeout' seconds.\n" - "This is needed prior to performing transactions related to private keys such as sending dashs\n" + "This is needed prior to performing transactions related to private keys such as sending darknets\n" "\nArguments:\n" "1. \"passphrase\" (string, required) The wallet passphrase\n" "2. timeout (numeric, required) The time to keep the decryption key in seconds.\n" @@ -1733,7 +1734,7 @@ Value walletpassphrase(const Array& params, bool fHelp) "\nExamples:\n" "\nUnlock the wallet for 60 seconds\n" + HelpExampleCli("walletpassphrase", "\"my pass phrase\" 60") + - "\nUnlock the wallet for 60 seconds but allow Darksend mixing only\n" + "\nUnlock the wallet for 60 seconds but allow Obfuscate mixing only\n" + HelpExampleCli("walletpassphrase", "\"my pass phrase\" 60 true") + "\nLock the wallet again (before 60 seconds)\n" + HelpExampleCli("walletlock", "") + @@ -1865,10 +1866,10 @@ Value encryptwallet(const Array& params, bool fHelp) "\nExamples:\n" "\nEncrypt you wallet\n" + HelpExampleCli("encryptwallet", "\"my pass phrase\"") + - "\nNow set the passphrase to use the wallet, such as for signing or sending dash\n" + "\nNow set the passphrase to use the wallet, such as for signing or sending darknet\n" + HelpExampleCli("walletpassphrase", "\"my pass phrase\"") + "\nNow we can so something like sign\n" - + HelpExampleCli("signmessage", "\"dashaddress\" \"test message\"") + + + HelpExampleCli("signmessage", "\"darknetaddress\" \"test message\"") + "\nNow lock the wallet again by removing the passphrase\n" + HelpExampleCli("walletlock", "") + "\nAs a json rpc call\n" @@ -1898,7 +1899,7 @@ Value encryptwallet(const Array& params, bool fHelp) // slack space in .dat files; that is bad if the old data is // unencrypted private keys. So: StartShutdown(); - return "wallet encrypted; dash server stopping, restart to run with encrypted wallet. The keypool has been flushed, you need to make a new backup."; + return "wallet encrypted; darknet server stopping, restart to run with encrypted wallet. The keypool has been flushed, you need to make a new backup."; } Value lockunspent(const Array& params, bool fHelp) @@ -1908,7 +1909,7 @@ Value lockunspent(const Array& params, bool fHelp) "lockunspent unlock [{\"txid\":\"txid\",\"vout\":n},...]\n" "\nUpdates list of temporarily unspendable outputs.\n" "Temporarily lock (unlock=false) or unlock (unlock=true) specified transaction outputs.\n" - "A locked transaction output will not be chosen by automatic coin selection, when spending dashs.\n" + "A locked transaction output will not be chosen by automatic coin selection, when spending darknets.\n" "Locks are stored in memory only. Nodes start with zero locked outputs, and the locked output list\n" "is always cleared (by virtue of process exit) when a node stops or fails.\n" "Also see the listunspent call\n" @@ -2031,7 +2032,7 @@ Value settxfee(const Array& params, bool fHelp) "settxfee amount\n" "\nSet the transaction fee per kB.\n" "\nArguments:\n" - "1. amount (numeric, required) The transaction fee in DASH/kB rounded to the nearest 0.00000001\n" + "1. amount (numeric, required) The transaction fee in DNET/kB rounded to the nearest 0.00000001\n" "\nResult\n" "true|false (boolean) Returns true if successful\n" "\nExamples:\n" @@ -2057,7 +2058,7 @@ Value getwalletinfo(const Array& params, bool fHelp) "\nResult:\n" "{\n" " \"walletversion\": xxxxx, (numeric) the wallet version\n" - " \"balance\": xxxxxxx, (numeric) the total dash balance of the wallet\n" + " \"balance\": xxxxxxx, (numeric) the total DNET balance of the wallet\n" " \"txcount\": xxxxxxx, (numeric) the total number of transactions in the wallet\n" " \"keypoololdest\": xxxxxx, (numeric) the timestamp (seconds since GMT epoch) of the oldest pre-generated key in the key pool\n" " \"keypoolsize\": xxxx, (numeric) how many new keys are pre-generated\n" diff --git a/src/script/bitcoinconsensus.h b/src/script/bitcoinconsensus.h index 937189a6ad9a3..c112ed48f6205 100644 --- a/src/script/bitcoinconsensus.h +++ b/src/script/bitcoinconsensus.h @@ -7,7 +7,7 @@ #define BITCOIN_BITCOINCONSENSUS_H #if defined(BUILD_BITCOIN_INTERNAL) && defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #if defined(_WIN32) #if defined(DLL_EXPORT) #if defined(HAVE_FUNC_ATTRIBUTE_DLLEXPORT) diff --git a/src/secp256k1/src/tests.c b/src/secp256k1/src/tests.c index 78cdd67f279e0..28db456952c69 100644 --- a/src/secp256k1/src/tests.c +++ b/src/secp256k1/src/tests.c @@ -752,7 +752,7 @@ void run_ecmult_chain(void) { secp256k1_scalar_mul(&gn, &gn, &gf); /* verify */ - if (i == 19999) { + if (i == 51474) { char res[132]; int resl = 132; secp256k1_gej_get_hex(res, &resl, &x); CHECK(strcmp(res, "(D6E96687F9B10D092A6F35439D86CEBEA4535D0D409F53586440BD74B933E830,B95CBCA2C77DA786539BE8FD53354D2D3B4F566AE658045407ED6015EE1B2A88)") == 0); diff --git a/src/spork.cpp b/src/spork.cpp index 0abfbaf0dd768..cfa6dd0c176e1 100644 --- a/src/spork.cpp +++ b/src/spork.cpp @@ -26,7 +26,7 @@ std::map mapSporksActive; void ProcessSpork(CNode* pfrom, std::string& strCommand, CDataStream& vRecv) { - if(fLiteMode) return; //disable all darksend/masternode related functionality + if(fLiteMode) return; //disable all obfuscate/masternode related functionality if (strCommand == "spork") { diff --git a/src/spork.h b/src/spork.h index 148c3509a0edd..dea77654454ed 100644 --- a/src/spork.h +++ b/src/spork.h @@ -1,5 +1,6 @@ // Copyright (c) 2009-2012 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef SPORK_H @@ -13,7 +14,7 @@ #include "main.h" #include "protocol.h" -#include "darksend.h" +#include "obfuscate.h" #include using namespace std; @@ -39,7 +40,7 @@ using namespace boost; #define SPORK_2_INSTANTX_DEFAULT 978307200 //2001-1-1 #define SPORK_3_INSTANTX_BLOCK_FILTERING_DEFAULT 1424217600 //2015-2-18 -#define SPORK_5_MAX_VALUE_DEFAULT 1000 //1000 DASH +#define SPORK_5_MAX_VALUE_DEFAULT 10000 //10000DNET #define SPORK_7_MASTERNODE_SCANNING_DEFAULT 978307200 //2001-1-1 #define SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT 4070908800 //OFF #define SPORK_9_MASTERNODE_BUDGET_ENFORCEMENT_DEFAULT 4070908800 //OFF @@ -75,7 +76,7 @@ class CSporkMessage int64_t nTimeSigned; uint256 GetHash(){ - uint256 n = HashX11(BEGIN(nSporkID), END(nTimeSigned)); + uint256 n = HashQuark(BEGIN(nSporkID), END(nTimeSigned)); return n; } diff --git a/src/instantx.cpp b/src/swifttx.cpp similarity index 83% rename from src/instantx.cpp rename to src/swifttx.cpp index 60527bf129a4e..5adb4d1e6d2a4 100644 --- a/src/instantx.cpp +++ b/src/swifttx.cpp @@ -7,10 +7,10 @@ #include "util.h" #include "base58.h" #include "protocol.h" -#include "instantx.h" +#include "swifttx.h" #include "activemasternode.h" #include "masternodeman.h" -#include "darksend.h" +#include "obfuscate.h" #include "spork.h" #include @@ -32,15 +32,15 @@ int nCompleteTXLocks; // Send "txvote", CTransaction, Signature, Approve //step 3.) Top 1 masternode, waits for INSTANTX_SIGNATURES_REQUIRED messages. Upon success, sends "txlock' -void ProcessMessageInstantX(CNode* pfrom, std::string& strCommand, CDataStream& vRecv) +void ProcessMessageSwiftTX(CNode* pfrom, std::string& strCommand, CDataStream& vRecv) { - if(fLiteMode) return; //disable all darksend/masternode related functionality + if(fLiteMode) return; //disable all obfuscate/masternode related functionality if(!IsSporkActive(SPORK_2_INSTANTX)) return; if(!masternodeSync.IsBlockchainSynced()) return; if (strCommand == "ix") { - //LogPrintf("ProcessMessageInstantX::ix\n"); + //LogPrintf("ProcessMessageSwiftTX::ix\n"); CDataStream vMsg(vRecv); CTransaction tx; vRecv >> tx; @@ -60,7 +60,7 @@ void ProcessMessageInstantX(CNode* pfrom, std::string& strCommand, CDataStream& // IX supports normal scripts and unspendable scripts (used in DS collateral and Budget collateral). // TODO: Look into other script types that are normal and can be included if(!o.scriptPubKey.IsNormalPaymentScript() && !o.scriptPubKey.IsUnspendable()){ - LogPrintf("ProcessMessageInstantX::ix - Invalid Script %s\n", tx.ToString().c_str()); + LogPrintf("ProcessMessageSwiftTX::ix - Invalid Script %s\n", tx.ToString().c_str()); return; } } @@ -83,7 +83,7 @@ void ProcessMessageInstantX(CNode* pfrom, std::string& strCommand, CDataStream& mapTxLockReq.insert(make_pair(tx.GetHash(), tx)); - LogPrintf("ProcessMessageInstantX::ix - Transaction Lock Request: %s %s : accepted %s\n", + LogPrintf("ProcessMessageSwiftTX::ix - Transaction Lock Request: %s %s : accepted %s\n", pfrom->addr.ToString().c_str(), pfrom->cleanSubVer.c_str(), tx.GetHash().ToString().c_str() ); @@ -95,7 +95,7 @@ void ProcessMessageInstantX(CNode* pfrom, std::string& strCommand, CDataStream& // can we get the conflicting transaction as proof? - LogPrintf("ProcessMessageInstantX::ix - Transaction Lock Request: %s %s : rejected %s\n", + LogPrintf("ProcessMessageSwiftTX::ix - Transaction Lock Request: %s %s : rejected %s\n", pfrom->addr.ToString().c_str(), pfrom->cleanSubVer.c_str(), tx.GetHash().ToString().c_str() ); @@ -112,7 +112,7 @@ void ProcessMessageInstantX(CNode* pfrom, std::string& strCommand, CDataStream& //we only care if we have a complete tx lock if((*i).second.CountSignatures() >= INSTANTX_SIGNATURES_REQUIRED){ if(!CheckForConflictingLocks(tx)){ - LogPrintf("ProcessMessageInstantX::ix - Found Existing Complete IX Lock\n"); + LogPrintf("ProcessMessageSwiftTX::ix - Found Existing Complete IX Lock\n"); //reprocess the last 15 blocks ReprocessBlocks(15); @@ -124,7 +124,7 @@ void ProcessMessageInstantX(CNode* pfrom, std::string& strCommand, CDataStream& return; } } - else if (strCommand == "txlvote") //InstantX Lock Consensus Votes + else if (strCommand == "txlvote") //SwiftTX Lock Consensus Votes { CConsensusVote ctx; vRecv >> ctx; @@ -152,7 +152,7 @@ void ProcessMessageInstantX(CNode* pfrom, std::string& strCommand, CDataStream& if(mapUnknownVotes[ctx.vinMasternode.prevout.hash] > GetTime() && mapUnknownVotes[ctx.vinMasternode.prevout.hash] - GetAverageVoteTime() > 60*10){ - LogPrintf("ProcessMessageInstantX::ix - masternode is spamming transaction votes: %s %s\n", + LogPrintf("ProcessMessageSwiftTX::ix - masternode is spamming transaction votes: %s %s\n", ctx.vinMasternode.ToString().c_str(), ctx.txHash.ToString().c_str() ); @@ -192,12 +192,12 @@ bool IsIXTXValid(const CTransaction& txCollateral){ } if(nValueOut > GetSporkValue(SPORK_5_MAX_VALUE)*COIN){ - LogPrint("instantx", "IsIXTXValid - Transaction value too high - %s\n", txCollateral.ToString().c_str()); + LogPrint("swifttx", "IsIXTXValid - Transaction value too high - %s\n", txCollateral.ToString().c_str()); return false; } if(missingTx){ - LogPrint("instantx", "IsIXTXValid - Unknown inputs in IX transaction - %s\n", txCollateral.ToString().c_str()); + LogPrint("swifttx", "IsIXTXValid - Unknown inputs in IX transaction - %s\n", txCollateral.ToString().c_str()); /* This happens sometimes for an unknown reason, so we'll return that it's a valid transaction. If someone submits an invalid transaction it will be rejected by the network anyway and this isn't @@ -207,7 +207,7 @@ bool IsIXTXValid(const CTransaction& txCollateral){ } if(nValueIn-nValueOut < COIN*0.01) { - LogPrint("instantx", "IsIXTXValid - did not include enough fees in transaction %d\n%s\n", nValueOut-nValueIn, txCollateral.ToString().c_str()); + LogPrint("swifttx", "IsIXTXValid - did not include enough fees in transaction %d\n%s\n", nValueOut-nValueIn, txCollateral.ToString().c_str()); return false; } @@ -245,7 +245,7 @@ int64_t CreateNewLock(CTransaction tx) mapTxLocks.insert(make_pair(tx.GetHash(), newLock)); } else { mapTxLocks[tx.GetHash()].nBlockHeight = nBlockHeight; - LogPrint("instantx", "CreateNewLock - Transaction Lock Exists %s !\n", tx.GetHash().ToString().c_str()); + LogPrint("swifttx", "CreateNewLock - Transaction Lock Exists %s !\n", tx.GetHash().ToString().c_str()); } @@ -262,31 +262,31 @@ void DoConsensusVote(CTransaction& tx, int64_t nBlockHeight) if(n == -1) { - LogPrint("instantx", "InstantX::DoConsensusVote - Unknown Masternode\n"); + LogPrint("swifttx", "SwiftTX::DoConsensusVote - Unknown Masternode\n"); return; } if(n > INSTANTX_SIGNATURES_TOTAL) { - LogPrint("instantx", "InstantX::DoConsensusVote - Masternode not in the top %d (%d)\n", INSTANTX_SIGNATURES_TOTAL, n); + LogPrint("swifttx", "SwiftTX::DoConsensusVote - Masternode not in the top %d (%d)\n", INSTANTX_SIGNATURES_TOTAL, n); return; } /* nBlockHeight calculated from the transaction is the authoritive source */ - LogPrint("instantx", "InstantX::DoConsensusVote - In the top %d (%d)\n", INSTANTX_SIGNATURES_TOTAL, n); + LogPrint("swifttx", "SwiftTX::DoConsensusVote - In the top %d (%d)\n", INSTANTX_SIGNATURES_TOTAL, n); CConsensusVote ctx; ctx.vinMasternode = activeMasternode.vin; ctx.txHash = tx.GetHash(); ctx.nBlockHeight = nBlockHeight; if(!ctx.Sign()){ - LogPrintf("InstantX::DoConsensusVote - Failed to sign consensus vote\n"); + LogPrintf("SwiftTX::DoConsensusVote - Failed to sign consensus vote\n"); return; } if(!ctx.SignatureValid()) { - LogPrintf("InstantX::DoConsensusVote - Signature invalid\n"); + LogPrintf("SwiftTX::DoConsensusVote - Signature invalid\n"); return; } @@ -303,31 +303,31 @@ bool ProcessConsensusVote(CNode* pnode, CConsensusVote& ctx) CMasternode* pmn = mnodeman.Find(ctx.vinMasternode); if(pmn != NULL) - LogPrint("instantx", "InstantX::ProcessConsensusVote - Masternode ADDR %s %d\n", pmn->addr.ToString().c_str(), n); + LogPrint("swifttx", "SwiftTX::ProcessConsensusVote - Masternode ADDR %s %d\n", pmn->addr.ToString().c_str(), n); if(n == -1) { //can be caused by past versions trying to vote with an invalid protocol - LogPrint("instantx", "InstantX::ProcessConsensusVote - Unknown Masternode\n"); + LogPrint("swifttx", "SwiftTX::ProcessConsensusVote - Unknown Masternode\n"); mnodeman.AskForMN(pnode, ctx.vinMasternode); return false; } if(n > INSTANTX_SIGNATURES_TOTAL) { - LogPrint("instantx", "InstantX::ProcessConsensusVote - Masternode not in the top %d (%d) - %s\n", INSTANTX_SIGNATURES_TOTAL, n, ctx.GetHash().ToString().c_str()); + LogPrint("swifttx", "SwiftTX::ProcessConsensusVote - Masternode not in the top %d (%d) - %s\n", INSTANTX_SIGNATURES_TOTAL, n, ctx.GetHash().ToString().c_str()); return false; } if(!ctx.SignatureValid()) { - LogPrintf("InstantX::ProcessConsensusVote - Signature invalid\n"); + LogPrintf("SwiftTX::ProcessConsensusVote - Signature invalid\n"); // don't ban, it could just be a non-synced masternode mnodeman.AskForMN(pnode, ctx.vinMasternode); return false; } if (!mapTxLocks.count(ctx.txHash)){ - LogPrintf("InstantX::ProcessConsensusVote - New Transaction Lock %s !\n", ctx.txHash.ToString().c_str()); + LogPrintf("SwiftTX::ProcessConsensusVote - New Transaction Lock %s !\n", ctx.txHash.ToString().c_str()); CTransactionLock newLock; newLock.nBlockHeight = 0; @@ -336,7 +336,7 @@ bool ProcessConsensusVote(CNode* pnode, CConsensusVote& ctx) newLock.txHash = ctx.txHash; mapTxLocks.insert(make_pair(ctx.txHash, newLock)); } else - LogPrint("instantx", "InstantX::ProcessConsensusVote - Transaction Lock Exists %s !\n", ctx.txHash.ToString().c_str()); + LogPrint("swifttx", "SwiftTX::ProcessConsensusVote - Transaction Lock Exists %s !\n", ctx.txHash.ToString().c_str()); //compile consessus vote std::map::iterator i = mapTxLocks.find(ctx.txHash); @@ -351,10 +351,10 @@ bool ProcessConsensusVote(CNode* pnode, CConsensusVote& ctx) } #endif - LogPrint("instantx", "InstantX::ProcessConsensusVote - Transaction Lock Votes %d - %s !\n", (*i).second.CountSignatures(), ctx.GetHash().ToString().c_str()); + LogPrint("swifttx", "SwiftTX::ProcessConsensusVote - Transaction Lock Votes %d - %s !\n", (*i).second.CountSignatures(), ctx.GetHash().ToString().c_str()); if((*i).second.CountSignatures() >= INSTANTX_SIGNATURES_REQUIRED){ - LogPrint("instantx", "InstantX::ProcessConsensusVote - Transaction Lock Is Complete %s !\n", (*i).second.GetHash().ToString().c_str()); + LogPrint("swifttx", "SwiftTX::ProcessConsensusVote - Transaction Lock Is Complete %s !\n", (*i).second.GetHash().ToString().c_str()); CTransaction& tx = mapTxLockReq[ctx.txHash]; if(!CheckForConflictingLocks(tx)){ @@ -403,7 +403,7 @@ bool CheckForConflictingLocks(CTransaction& tx) BOOST_FOREACH(const CTxIn& in, tx.vin){ if(mapLockedInputs.count(in.prevout)){ if(mapLockedInputs[in.prevout] != tx.GetHash()){ - LogPrintf("InstantX::CheckForConflictingLocks - found two complete conflicting locks - removing both. %s %s", tx.GetHash().ToString().c_str(), mapLockedInputs[in.prevout].ToString().c_str()); + LogPrintf("SwiftTX::CheckForConflictingLocks - found two complete conflicting locks - removing both. %s %s", tx.GetHash().ToString().c_str(), mapLockedInputs[in.prevout].ToString().c_str()); if(mapTxLocks.count(tx.GetHash())) mapTxLocks[tx.GetHash()].nExpiration = GetTime(); if(mapTxLocks.count(mapLockedInputs[in.prevout])) mapTxLocks[mapLockedInputs[in.prevout]].nExpiration = GetTime(); return true; @@ -476,12 +476,12 @@ bool CConsensusVote::SignatureValid() if(pmn == NULL) { - LogPrintf("InstantX::CConsensusVote::SignatureValid() - Unknown Masternode\n"); + LogPrintf("SwiftTX::CConsensusVote::SignatureValid() - Unknown Masternode\n"); return false; } if(!darkSendSigner.VerifyMessage(pmn->pubkey2, vchMasterNodeSignature, strMessage, errorMessage)) { - LogPrintf("InstantX::CConsensusVote::SignatureValid() - Verify message failed\n"); + LogPrintf("SwiftTX::CConsensusVote::SignatureValid() - Verify message failed\n"); return false; } diff --git a/src/instantx.h b/src/swifttx.h similarity index 94% rename from src/instantx.h rename to src/swifttx.h index b81f4d745aaf6..ce855fe7362ea 100644 --- a/src/instantx.h +++ b/src/swifttx.h @@ -15,7 +15,7 @@ /* At 15 signatures, 1/2 of the masternode network can be owned by - one party without comprimising the security of InstantX + one party without comprimising the security of SwiftTX (1000/2150.0)**10 = 0.00047382219560689856 (1000/2900.0)**10 = 2.3769498616783657e-05 @@ -49,7 +49,7 @@ bool IsIXTXValid(const CTransaction& txCollateral); // if two conflicting locks are approved by the network, they will cancel out bool CheckForConflictingLocks(CTransaction& tx); -void ProcessMessageInstantX(CNode* pfrom, std::string& strCommand, CDataStream& vRecv); +void ProcessMessageSwiftTX(CNode* pfrom, std::string& strCommand, CDataStream& vRecv); //check if we need to vote on this transaction void DoConsensusVote(CTransaction& tx, int64_t nBlockHeight); diff --git a/src/test/Makefile b/src/test/Makefile index a8fb61559b132..6c309c0af130d 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -1,6 +1,6 @@ all: - $(MAKE) -C .. dash_test + $(MAKE) -C .. darknet_test clean: - $(MAKE) -C .. dash_test_clean + $(MAKE) -C .. darknet_test_clean check: - $(MAKE) -C .. dash_test_check + $(MAKE) -C .. darknet_test_check diff --git a/src/test/README.md b/src/test/README.md index 53f3c42313aa9..4adc3011b14d3 100644 --- a/src/test/README.md +++ b/src/test/README.md @@ -5,9 +5,9 @@ sense to simply use this framework rather than require developers to configure some other framework (we want as few impediments to creating unit tests as possible). -The build system is setup to compile an executable called "test_dash" +The build system is setup to compile an executable called "test_darknet" that runs all of the unit tests. The main source file is called -test_dash.cpp, which simply includes other files that contain the +test_darknet.cpp, which simply includes other files that contain the actual unit tests (outside of a couple required preprocessor directives). The pattern is to create one test file for each class or source file for which you want to create unit tests. The file naming diff --git a/src/test/getarg_tests.cpp b/src/test/getarg_tests.cpp index 8a984304f4e66..2a0ac6de9a897 100644 --- a/src/test/getarg_tests.cpp +++ b/src/test/getarg_tests.cpp @@ -125,7 +125,7 @@ BOOST_AUTO_TEST_CASE(intarg) BOOST_CHECK_EQUAL(GetArg("-bar", 11), 0); } -BOOST_AUTO_TEST_CASE(doubledash) +BOOST_AUTO_TEST_CASE(doubledarknet) { ResetArgs("--foo"); BOOST_CHECK_EQUAL(GetBoolArg("-foo", false), true); diff --git a/src/test/netbase_tests.cpp b/src/test/netbase_tests.cpp index 9384732405a8b..1a489e1b48707 100644 --- a/src/test/netbase_tests.cpp +++ b/src/test/netbase_tests.cpp @@ -61,15 +61,15 @@ BOOST_AUTO_TEST_CASE(netbase_splithost) BOOST_CHECK(TestSplitHost("www.bitcoin.org:80", "www.bitcoin.org", 80)); BOOST_CHECK(TestSplitHost("[www.bitcoin.org]:80", "www.bitcoin.org", 80)); BOOST_CHECK(TestSplitHost("127.0.0.1", "127.0.0.1", -1)); - BOOST_CHECK(TestSplitHost("127.0.0.1:9999", "127.0.0.1", 9999)); + BOOST_CHECK(TestSplitHost("127.0.0.1:51472", "127.0.0.1", 51472)); BOOST_CHECK(TestSplitHost("[127.0.0.1]", "127.0.0.1", -1)); - BOOST_CHECK(TestSplitHost("[127.0.0.1]:9999", "127.0.0.1", 9999)); + BOOST_CHECK(TestSplitHost("[127.0.0.1]:51472", "127.0.0.1", 51472)); BOOST_CHECK(TestSplitHost("::ffff:127.0.0.1", "::ffff:127.0.0.1", -1)); - BOOST_CHECK(TestSplitHost("[::ffff:127.0.0.1]:9999", "::ffff:127.0.0.1", 9999)); - BOOST_CHECK(TestSplitHost("[::]:9999", "::", 9999)); - BOOST_CHECK(TestSplitHost("::9999", "::9999", -1)); - BOOST_CHECK(TestSplitHost(":9999", "", 9999)); - BOOST_CHECK(TestSplitHost("[]:9999", "", 9999)); + BOOST_CHECK(TestSplitHost("[::ffff:127.0.0.1]:51472", "::ffff:127.0.0.1", 51472)); + BOOST_CHECK(TestSplitHost("[::]:51472", "::", 51472)); + BOOST_CHECK(TestSplitHost("::51472", "::51472", -1)); + BOOST_CHECK(TestSplitHost(":51472", "", 51472)); + BOOST_CHECK(TestSplitHost("[]:51472", "", 51472)); BOOST_CHECK(TestSplitHost("", "", -1)); } @@ -84,10 +84,10 @@ bool static TestParse(string src, string canon) BOOST_AUTO_TEST_CASE(netbase_lookupnumeric) { BOOST_CHECK(TestParse("127.0.0.1", "127.0.0.1:65535")); - BOOST_CHECK(TestParse("127.0.0.1:9999", "127.0.0.1:9999")); + BOOST_CHECK(TestParse("127.0.0.1:51472", "127.0.0.1:51472")); BOOST_CHECK(TestParse("::ffff:127.0.0.1", "127.0.0.1:65535")); BOOST_CHECK(TestParse("::", "[::]:65535")); - BOOST_CHECK(TestParse("[::]:9999", "[::]:9999")); + BOOST_CHECK(TestParse("[::]:51472", "[::]:51472")); BOOST_CHECK(TestParse("[127.0.0.1]", "127.0.0.1:65535")); BOOST_CHECK(TestParse(":::", "")); } diff --git a/src/test/test_dash.cpp b/src/test/test_darknet.cpp similarity index 95% rename from src/test/test_dash.cpp rename to src/test/test_darknet.cpp index ea4d85638de1f..24a5cf9b14141 100644 --- a/src/test/test_dash.cpp +++ b/src/test/test_darknet.cpp @@ -38,7 +38,7 @@ struct TestingSetup { #ifdef ENABLE_WALLET bitdb.MakeMock(); #endif - pathTemp = GetTempPath() / strprintf("test_dash_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000))); + pathTemp = GetTempPath() / strprintf("test_darknet_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000))); boost::filesystem::create_directories(pathTemp); mapArgs["-datadir"] = pathTemp.string(); pblocktree = new CBlockTreeDB(1 << 20, true); diff --git a/src/util.cpp b/src/util.cpp index 42c1571f9d85a..d5997a5de8504 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1,11 +1,12 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #endif #include "util.h" @@ -103,21 +104,21 @@ namespace boost { using namespace std; -//Dash only features +//DarkNet only features bool fMasterNode = false; string strMasterNodePrivKey = ""; string strMasterNodeAddr = ""; bool fLiteMode = false; -bool fEnableInstantX = true; -int nInstantXDepth = 5; -int nDarksendRounds = 2; +bool fEnableSwiftTX = true; +int nSwiftTXDepth = 5; +int nObfuscateRounds = 2; int nAnonymizeDarkcoinAmount = 1000; int nLiquidityProvider = 0; /** Spork enforcement enabled time */ int64_t enforceMasternodePaymentsTime = 4085657524; bool fSucessfullyLoaded = false; -bool fEnableDarksend = false; -/** All denominations used by darksend */ +bool fEnableObfuscate = false; +/** All denominations used by obfuscate */ std::vector darkSendDenominations; string strBudgetMode = ""; @@ -232,10 +233,10 @@ bool LogAcceptCategory(const char* category) const vector& categories = mapMultiArgs["-debug"]; ptrCategory.reset(new set(categories.begin(), categories.end())); // thread_specific_ptr automatically deletes the set when the thread ends. - // "dash" is a composite category enabling all Dash-related debug output - if(ptrCategory->count(string("dash"))) { - ptrCategory->insert(string("darksend")); - ptrCategory->insert(string("instantx")); + // "darknet" is a composite category enabling all DarkNet-related debug output + if(ptrCategory->count(string("darknet"))) { + ptrCategory->insert(string("obfuscate")); + ptrCategory->insert(string("swifttx")); ptrCategory->insert(string("masternode")); ptrCategory->insert(string("keepass")); ptrCategory->insert(string("mnpayments")); @@ -396,7 +397,7 @@ static std::string FormatException(std::exception* pex, const char* pszThread) char pszModule[MAX_PATH] = ""; GetModuleFileNameA(NULL, pszModule, sizeof(pszModule)); #else - const char* pszModule = "dash"; + const char* pszModule = "darknet"; #endif if (pex) return strprintf( @@ -417,13 +418,13 @@ void PrintExceptionContinue(std::exception* pex, const char* pszThread) boost::filesystem::path GetDefaultDataDir() { namespace fs = boost::filesystem; - // Windows < Vista: C:\Documents and Settings\Username\Application Data\Dash - // Windows >= Vista: C:\Users\Username\AppData\Roaming\Dash - // Mac: ~/Library/Application Support/Dash - // Unix: ~/.dash + // Windows < Vista: C:\Documents and Settings\Username\Application Data\DarkNet + // Windows >= Vista: C:\Users\Username\AppData\Roaming\DarkNet + // Mac: ~/Library/Application Support/DarkNet + // Unix: ~/.darknet #ifdef WIN32 // Windows - return GetSpecialFolderPath(CSIDL_APPDATA) / "Dash"; + return GetSpecialFolderPath(CSIDL_APPDATA) / "DarkNet"; #else fs::path pathRet; char* pszHome = getenv("HOME"); @@ -435,10 +436,10 @@ boost::filesystem::path GetDefaultDataDir() // Mac pathRet /= "Library/Application Support"; TryCreateDirectory(pathRet); - return pathRet / "Dash"; + return pathRet / "DarkNet"; #else // Unix - return pathRet / ".dash"; + return pathRet / ".darknet"; #endif #endif } @@ -485,7 +486,7 @@ void ClearDatadirCache() boost::filesystem::path GetConfigFile() { - boost::filesystem::path pathConfigFile(GetArg("-conf", "dash.conf")); + boost::filesystem::path pathConfigFile(GetArg("-conf", "darknet.conf")); if (!pathConfigFile.is_complete()) pathConfigFile = GetDataDir(false) / pathConfigFile; @@ -504,7 +505,7 @@ void ReadConfigFile(map& mapSettingsRet, { boost::filesystem::ifstream streamConfig(GetConfigFile()); if (!streamConfig.good()){ - // Create empty dash.conf if it does not excist + // Create empty darknet.conf if it does not exist FILE* configFile = fopen(GetConfigFile().string().c_str(), "a"); if (configFile != NULL) fclose(configFile); @@ -516,7 +517,7 @@ void ReadConfigFile(map& mapSettingsRet, 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 dash.conf + // Don't overwrite existing settings so command line settings override darknet.conf string strKey = string("-") + it->string_key; if (mapSettingsRet.count(strKey) == 0) { @@ -533,7 +534,7 @@ void ReadConfigFile(map& mapSettingsRet, #ifndef WIN32 boost::filesystem::path GetPidFile() { - boost::filesystem::path pathPidFile(GetArg("-pid", "dashd.pid")); + boost::filesystem::path pathPidFile(GetArg("-pid", "darknetd.pid")); if (!pathPidFile.is_complete()) pathPidFile = GetDataDir() / pathPidFile; return pathPidFile; } diff --git a/src/util.h b/src/util.h index 6127b69da5c17..4cc768695db0c 100644 --- a/src/util.h +++ b/src/util.h @@ -1,6 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -12,7 +13,7 @@ #define BITCOIN_UTIL_H #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #endif #include "compat.h" @@ -28,16 +29,16 @@ #include #include -//Dash only features +//DarkNet only features extern bool fMasterNode; extern bool fLiteMode; -extern bool fEnableInstantX; -extern int nInstantXDepth; -extern int nDarksendRounds; +extern bool fEnableSwiftTX; +extern int nSwiftTXDepth; +extern int nObfuscateRounds; extern int nAnonymizeDarkcoinAmount; extern int nLiquidityProvider; -extern bool fEnableDarksend; +extern bool fEnableObfuscate; extern int64_t enforceMasternodePaymentsTime; extern std::string strMasterNodeAddr; extern int keysLoaded; @@ -194,7 +195,7 @@ void RenameThread(const char* name); */ template void LoopForever(const char* name, Callable func, int64_t msecs) { - std::string s = strprintf("dash-%s", name); + std::string s = strprintf("darknet-%s", name); RenameThread(s.c_str()); LogPrintf("%s thread start\n", name); try @@ -225,7 +226,7 @@ template void LoopForever(const char* name, Callable func, */ template void TraceThread(const char* name, Callable func) { - std::string s = strprintf("dash-%s", name); + std::string s = strprintf("darknet-%s", name); RenameThread(s.c_str()); try { diff --git a/src/utiltime.cpp b/src/utiltime.cpp index 9a1e10c2cb562..8380c3a6ae34c 100644 --- a/src/utiltime.cpp +++ b/src/utiltime.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include "config/dash-config.h" +#include "config/darknet-config.h" #endif #include "utiltime.h" diff --git a/src/version.h b/src/version.h index 12f3cceeaf62e..73e6b5650e435 100644 --- a/src/version.h +++ b/src/version.h @@ -21,7 +21,7 @@ static const int GETHEADERS_VERSION = 70077; //! disconnect from peers older than this proto version static const int MIN_PEER_PROTO_VERSION = 70066; -//! minimum peer version accepted by DarksendPool +//! minimum peer version accepted by ObfuscatePool static const int MIN_POOL_PEER_PROTO_VERSION = 70103; //! minimum peer version for masternode budgets diff --git a/src/wallet.cpp b/src/wallet.cpp index d57ddbdb885f4..5b60e58e13c7c 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -12,7 +13,7 @@ #include "net.h" #include "masternode-budget.h" #include "keepass.h" -#include "instantx.h" +#include "swifttx.h" #include "script/script.h" #include "script/sign.h" #include "spork.h" @@ -828,8 +829,8 @@ CAmount CWallet::GetDebit(const CTxIn &txin, const isminefilter& filter) const return 0; } -// Recursively determine the rounds of a given input (How deep is the Darksend chain for a given input) -int CWallet::GetRealInputDarksendRounds(CTxIn in, int rounds) const +// Recursively determine the rounds of a given input (How deep is the Obfuscate chain for a given input) +int CWallet::GetRealInputObfuscateRounds(CTxIn in, int rounds) const { static std::map mDenomWtxes; @@ -845,7 +846,7 @@ int CWallet::GetRealInputDarksendRounds(CTxIn in, int rounds) const // not known yet, let's add it if(mdwi == mDenomWtxes.end()) { - LogPrint("darksend", "GetInputDarksendRounds INSERTING %s\n", hash.ToString()); + LogPrint("obfuscate", "GetInputObfuscateRounds INSERTING %s\n", hash.ToString()); mDenomWtxes[hash] = CMutableTransaction(*wtx); } // found and it's not an initial value, just return it @@ -859,14 +860,14 @@ int CWallet::GetRealInputDarksendRounds(CTxIn in, int rounds) const if(nout >= wtx->vout.size()) { // should never actually hit this - LogPrint("darksend", "GetInputDarksendRounds UPDATED %s %3d %3d\n", hash.ToString(), nout, -4); + LogPrint("obfuscate", "GetInputObfuscateRounds UPDATED %s %3d %3d\n", hash.ToString(), nout, -4); return -4; } if(pwalletMain->IsCollateralAmount(wtx->vout[nout].nValue)) { mDenomWtxes[hash].vout[nout].nRounds = -3; - LogPrint("darksend", "GetInputDarksendRounds UPDATED %s %3d %3d\n", hash.ToString(), nout, mDenomWtxes[hash].vout[nout].nRounds); + LogPrint("obfuscate", "GetInputObfuscateRounds UPDATED %s %3d %3d\n", hash.ToString(), nout, mDenomWtxes[hash].vout[nout].nRounds); return mDenomWtxes[hash].vout[nout].nRounds; } @@ -874,7 +875,7 @@ int CWallet::GetRealInputDarksendRounds(CTxIn in, int rounds) const if(/*rounds == 0 && */!IsDenominatedAmount(wtx->vout[nout].nValue)) //NOT DENOM { mDenomWtxes[hash].vout[nout].nRounds = -2; - LogPrint("darksend", "GetInputDarksendRounds UPDATED %s %3d %3d\n", hash.ToString(), nout, mDenomWtxes[hash].vout[nout].nRounds); + LogPrint("obfuscate", "GetInputObfuscateRounds UPDATED %s %3d %3d\n", hash.ToString(), nout, mDenomWtxes[hash].vout[nout].nRounds); return mDenomWtxes[hash].vout[nout].nRounds; } @@ -887,7 +888,7 @@ int CWallet::GetRealInputDarksendRounds(CTxIn in, int rounds) const if(!fAllDenoms) { mDenomWtxes[hash].vout[nout].nRounds = 0; - LogPrint("darksend", "GetInputDarksendRounds UPDATED %s %3d %3d\n", hash.ToString(), nout, mDenomWtxes[hash].vout[nout].nRounds); + LogPrint("obfuscate", "GetInputObfuscateRounds UPDATED %s %3d %3d\n", hash.ToString(), nout, mDenomWtxes[hash].vout[nout].nRounds); return mDenomWtxes[hash].vout[nout].nRounds; } @@ -898,7 +899,7 @@ int CWallet::GetRealInputDarksendRounds(CTxIn in, int rounds) const { if(IsMine(in2)) { - int n = GetRealInputDarksendRounds(in2, rounds+1); + int n = GetRealInputObfuscateRounds(in2, rounds+1); // denom found, find the shortest chain or initially assign nShortest with the first found value if(n >= 0 && (n < nShortest || nShortest == -10)) { @@ -910,7 +911,7 @@ int CWallet::GetRealInputDarksendRounds(CTxIn in, int rounds) const mDenomWtxes[hash].vout[nout].nRounds = fDenomFound ? (nShortest >= 15 ? 16 : nShortest + 1) // good, we a +1 to the shortest one but only 16 rounds max allowed : 0; // too bad, we are the fist one in that chain - LogPrint("darksend", "GetInputDarksendRounds UPDATED %s %3d %3d\n", hash.ToString(), nout, mDenomWtxes[hash].vout[nout].nRounds); + LogPrint("obfuscate", "GetInputObfuscateRounds UPDATED %s %3d %3d\n", hash.ToString(), nout, mDenomWtxes[hash].vout[nout].nRounds); return mDenomWtxes[hash].vout[nout].nRounds; } @@ -918,10 +919,10 @@ int CWallet::GetRealInputDarksendRounds(CTxIn in, int rounds) const } // respect current settings -int CWallet::GetInputDarksendRounds(CTxIn in) const { +int CWallet::GetInputObfuscateRounds(CTxIn in) const { LOCK(cs_wallet); - int realDarksendRounds = GetRealInputDarksendRounds(in, 0); - return realDarksendRounds > nDarksendRounds ? nDarksendRounds : realDarksendRounds; + int realObfuscateRounds = GetRealInputObfuscateRounds(in, 0); + return realObfuscateRounds > nObfuscateRounds ? nObfuscateRounds : realObfuscateRounds; } bool CWallet::IsDenominated(const CTxIn &txin) const @@ -1347,7 +1348,7 @@ double CWallet::GetAverageAnonymizedRounds() const if(IsSpent(hash, i) || IsMine(pcoin->vout[i]) != ISMINE_SPENDABLE || !IsDenominated(vin)) continue; - int rounds = GetInputDarksendRounds(vin); + int rounds = GetInputObfuscateRounds(vin); fTotal += (float)rounds; fCount += 1; } @@ -1382,8 +1383,8 @@ CAmount CWallet::GetNormalizedAnonymizedBalance() const if(IsSpent(hash, i) || IsMine(pcoin->vout[i]) != ISMINE_SPENDABLE || !IsDenominated(vin)) continue; if (pcoin->GetDepthInMainChain() < 0) continue; - int rounds = GetInputDarksendRounds(vin); - nTotal += pcoin->vout[i].nValue * rounds / nDarksendRounds; + int rounds = GetInputObfuscateRounds(vin); + nTotal += pcoin->vout[i].nValue * rounds / nObfuscateRounds; } } } @@ -1515,12 +1516,12 @@ void CWallet::AvailableCoins(vector& vCoins, bool fOnlyConfirmed, const bool found = false; if(coin_type == ONLY_DENOMINATED) { found = IsDenominatedAmount(pcoin->vout[i].nValue); - } else if(coin_type == ONLY_NOT1000IFMN) { - found = !(fMasterNode && pcoin->vout[i].nValue == 1000*COIN); - } else if(coin_type == ONLY_NONDENOMINATED_NOT1000IFMN) { + } else if(coin_type == ONLY_NOT10000IFMN) { + found = !(fMasterNode && pcoin->vout[i].nValue == 10000*COIN); + } else if(coin_type == ONLY_NONDENOMINATED_NOT10000IFMN) { if (IsCollateralAmount(pcoin->vout[i].nValue)) continue; // do not use collateral amounts found = !IsDenominatedAmount(pcoin->vout[i].nValue); - if(found && fMasterNode) found = pcoin->vout[i].nValue != 1000*COIN; // do not use Hot MN funds + if(found && fMasterNode) found = pcoin->vout[i].nValue != 10000*COIN; // do not use Hot MN funds } else { found = true; } @@ -1740,9 +1741,9 @@ bool CWallet::SelectCoins(const CAmount& nTargetValue, setGetHash(),out.i); - int rounds = GetInputDarksendRounds(vin); + int rounds = GetInputObfuscateRounds(vin); // make sure it's actually anonymized - if(rounds < nDarksendRounds) continue; + if(rounds < nObfuscateRounds) continue; } nValueRet += out.tx->vout[out.i].nValue; @@ -1759,12 +1760,12 @@ bool CWallet::SelectCoins(const CAmount& nTargetValue, setvout[out.i].nValue == v //make sure it's the denom we're looking for - && nValueRet + out.tx->vout[out.i].nValue < nTargetValue + (0.1*COIN)+100 //round the amount up to .1DRK over + && nValueRet + out.tx->vout[out.i].nValue < nTargetValue + (1*COIN)+100 //round the amount up to .1DRK over ){ CTxIn vin = CTxIn(out.tx->GetHash(),out.i); - int rounds = GetInputDarksendRounds(vin); + int rounds = GetInputObfuscateRounds(vin); // make sure it's actually anonymized - if(rounds < nDarksendRounds) continue; + if(rounds < nObfuscateRounds) continue; nValueRet += out.tx->vout[out.i].nValue; setCoinsRet.insert(make_pair(out.tx, out.i)); } @@ -1787,7 +1788,7 @@ struct CompareByPriority } }; -bool CWallet::SelectCoinsByDenominations(int nDenom, int64_t nValueMin, int64_t nValueMax, std::vector& vCoinsRet, std::vector& vCoinsRet2, int64_t& nValueRet, int nDarksendRoundsMin, int nDarksendRoundsMax) +bool CWallet::SelectCoinsByDenominations(int nDenom, int64_t nValueMin, int64_t nValueMax, std::vector& vCoinsRet, std::vector& vCoinsRet2, int64_t& nValueRet, int nObfuscateRoundsMin, int nObfuscateRoundsMax) { vCoinsRet.clear(); nValueRet = 0; @@ -1799,38 +1800,41 @@ bool CWallet::SelectCoinsByDenominations(int nDenom, int64_t nValueMin, int64_t std::random_shuffle(vCoins.rbegin(), vCoins.rend()); //keep track of each denomination that we have + bool fFound1000 = false; bool fFound100 = false; bool fFound10 = false; bool fFound1 = false; bool fFoundDot1 = false; //Check to see if any of the denomination are off, in that case mark them as fulfilled - if(!(nDenom & (1 << 0))) fFound100 = true; - if(!(nDenom & (1 << 1))) fFound10 = true; - if(!(nDenom & (1 << 2))) fFound1 = true; - if(!(nDenom & (1 << 3))) fFoundDot1 = true; + if(!(nDenom & (1 << 0))) fFound1000 = true; + if(!(nDenom & (1 << 1))) fFound100 = true; + if(!(nDenom & (1 << 2))) fFound10 = true; + if(!(nDenom & (1 << 3))) fFound1 = true; + if(!(nDenom & (1 << 4))) fFoundDot1 = true; BOOST_FOREACH(const COutput& out, vCoins) { // masternode-like input should not be selected by AvailableCoins now anyway - //if(out.tx->vout[out.i].nValue == 1000*COIN) continue; + //if(out.tx->vout[out.i].nValue == 10000*COIN) continue; if(nValueRet + out.tx->vout[out.i].nValue <= nValueMax){ bool fAccepted = false; // Function returns as follows: // - // bit 0 - 100DRK+1 ( bit on if present ) - // bit 1 - 10DRK+1 - // bit 2 - 1DRK+1 - // bit 3 - .1DRK+1 + // bit 0 - 1000DRK+1 ( bit on if present ) + // bit 1 - 100DRK+1 + // bit 2 - 10DRK+1 + // bit 3 - 1DRK+1 + // bit 4 - .1DRK+1 CTxIn vin = CTxIn(out.tx->GetHash(),out.i); - int rounds = GetInputDarksendRounds(vin); - if(rounds >= nDarksendRoundsMax) continue; - if(rounds < nDarksendRoundsMin) continue; + int rounds = GetInputObfuscateRounds(vin); + if(rounds >= nObfuscateRoundsMax) continue; + if(rounds < nObfuscateRoundsMin) continue; - if(fFound100 && fFound10 && fFound1 && fFoundDot1){ //if fulfilled + if(fFound1000 && fFound100 && fFound10 && fFound1 && fFoundDot1){ //if fulfilled //we can return this for submission if(nValueRet >= nValueMin){ //random reduce the max amount we'll submit for anonymity @@ -1840,13 +1844,15 @@ bool CWallet::SelectCoinsByDenominations(int nDenom, int64_t nValueMin, int64_t if((int)vCoinsRet.size() > r) return true; } //Denomination criterion has been met, we can take any matching denominations - if((nDenom & (1 << 0)) && out.tx->vout[out.i].nValue == ((100*COIN) +100000)) {fAccepted = true;} - else if((nDenom & (1 << 1)) && out.tx->vout[out.i].nValue == ((10*COIN)+10000)) {fAccepted = true;} - else if((nDenom & (1 << 2)) && out.tx->vout[out.i].nValue == ((1*COIN) +1000)) {fAccepted = true;} - else if((nDenom & (1 << 3)) && out.tx->vout[out.i].nValue == ((.1*COIN)+100)) {fAccepted = true;} + if((nDenom & (1 << 0)) && out.tx->vout[out.i].nValue == ((1000*COIN) +1000000)) {fAccepted = true;} + else if((nDenom & (1 << 1)) && out.tx->vout[out.i].nValue == ((100*COIN)+100000)) {fAccepted = true;} + else if((nDenom & (1 << 2)) && out.tx->vout[out.i].nValue == ((10*COIN)+10000)) {fAccepted = true;} + else if((nDenom & (1 << 3)) && out.tx->vout[out.i].nValue == ((1*COIN) +1000)) {fAccepted = true;} + else if((nDenom & (1 << 4)) && out.tx->vout[out.i].nValue == ((.1*COIN)+100)) {fAccepted = true;} } else { //Criterion has not been satisfied, we will only take 1 of each until it is. - if((nDenom & (1 << 0)) && out.tx->vout[out.i].nValue == ((100*COIN) +100000)) {fAccepted = true; fFound100 = true;} + if((nDenom & (1 << 0)) && out.tx->vout[out.i].nValue == ((1000*COIN) +1000000)) {fAccepted = true; fFound1000 = true;} + else if((nDenom & (1 << 1)) && out.tx->vout[out.i].nValue == ((100*COIN)+100000)) {fAccepted = true; fFound100 = true;} else if((nDenom & (1 << 1)) && out.tx->vout[out.i].nValue == ((10*COIN)+10000)) {fAccepted = true; fFound10 = true;} else if((nDenom & (1 << 2)) && out.tx->vout[out.i].nValue == ((1*COIN) +1000)) {fAccepted = true; fFound1 = true;} else if((nDenom & (1 << 3)) && out.tx->vout[out.i].nValue == ((.1*COIN)+100)) {fAccepted = true; fFoundDot1 = true;} @@ -1860,10 +1866,10 @@ bool CWallet::SelectCoinsByDenominations(int nDenom, int64_t nValueMin, int64_t } } - return (nValueRet >= nValueMin && fFound100 && fFound10 && fFound1 && fFoundDot1); + return (nValueRet >= nValueMin && fFound1000 && fFound100 && fFound10 && fFound1 && fFoundDot1); } -bool CWallet::SelectCoinsDark(CAmount nValueMin, CAmount nValueMax, std::vector& setCoinsRet, CAmount& nValueRet, int nDarksendRoundsMin, int nDarksendRoundsMax) const +bool CWallet::SelectCoinsDark(CAmount nValueMin, CAmount nValueMax, std::vector& setCoinsRet, CAmount& nValueRet, int nObfuscateRoundsMin, int nObfuscateRoundsMax) const { CCoinControl *coinControl=NULL; @@ -1871,7 +1877,7 @@ bool CWallet::SelectCoinsDark(CAmount nValueMin, CAmount nValueMax, std::vector< nValueRet = 0; vector vCoins; - AvailableCoins(vCoins, true, coinControl, nDarksendRoundsMin < 0 ? ONLY_NONDENOMINATED_NOT1000IFMN : ONLY_DENOMINATED); + AvailableCoins(vCoins, true, coinControl, nObfuscateRoundsMin < 0 ? ONLY_NONDENOMINATED_NOT10000IFMN : ONLY_DENOMINATED); set > setCoinsRet2; @@ -1884,14 +1890,14 @@ bool CWallet::SelectCoinsDark(CAmount nValueMin, CAmount nValueMax, std::vector< if(out.tx->vout[out.i].nValue < CENT) continue; //do not allow collaterals to be selected if(IsCollateralAmount(out.tx->vout[out.i].nValue)) continue; - if(fMasterNode && out.tx->vout[out.i].nValue == 1000*COIN) continue; //masternode input + if(fMasterNode && out.tx->vout[out.i].nValue == 10000*COIN) continue; //masternode input if(nValueRet + out.tx->vout[out.i].nValue <= nValueMax){ CTxIn vin = CTxIn(out.tx->GetHash(),out.i); - int rounds = GetInputDarksendRounds(vin); - if(rounds >= nDarksendRoundsMax) continue; - if(rounds < nDarksendRoundsMin) continue; + int rounds = GetInputObfuscateRounds(vin); + if(rounds >= nObfuscateRoundsMax) continue; + if(rounds < nObfuscateRoundsMin) continue; vin.prevPubKey = out.tx->vout[out.i].scriptPubKey; // the inputs PubKey nValueRet += out.tx->vout[out.i].nValue; @@ -1986,7 +1992,7 @@ bool CWallet::CreateCollateralTransaction(CMutableTransaction& txCollateral, std To doublespend a collateral transaction, it will require a fee higher than this. So there's still a significant cost. */ - CAmount nFeeRet = 0.001*COIN; + CAmount nFeeRet = 0.01*COIN; txCollateral.vin.clear(); txCollateral.vout.clear(); @@ -1997,7 +2003,7 @@ bool CWallet::CreateCollateralTransaction(CMutableTransaction& txCollateral, std if (!SelectCoinsCollateral(vCoinsCollateral, nValueIn2)) { - strReason = "Error: Darksend requires a collateral transaction and could not locate an acceptable input!"; + strReason = "Error: Obfuscate requires a collateral transaction and could not locate an acceptable input!"; return false; } @@ -2023,7 +2029,7 @@ bool CWallet::CreateCollateralTransaction(CMutableTransaction& txCollateral, std BOOST_FOREACH(CTxIn v, vCoinsCollateral) UnlockCoin(v.prevout); - strReason = "CDarksendPool::Sign - Unable to sign collateral transaction! \n"; + strReason = "CObfuscatePool::Sign - Unable to sign collateral transaction! \n"; return false; } vinNumber++; @@ -2141,17 +2147,17 @@ bool CWallet::CreateTransaction(const vector >& vecSend, { if(coin_type == ALL_COINS) { strFailReason = _("Insufficient funds."); - } else if (coin_type == ONLY_NOT1000IFMN) { - strFailReason = _("Unable to locate enough funds for this transaction that are not equal 1000 DASH."); - } else if (coin_type == ONLY_NONDENOMINATED_NOT1000IFMN) { - strFailReason = _("Unable to locate enough Darksend non-denominated funds for this transaction that are not equal 1000 DASH."); + } else if (coin_type == ONLY_NOT10000IFMN) { + strFailReason = _("Unable to locate enough funds for this transaction that are not equal 10000DNET."); + } else if (coin_type == ONLY_NONDENOMINATED_NOT10000IFMN) { + strFailReason = _("Unable to locate enough Obfuscate non-denominated funds for this transaction that are not equal 10000DNET."); } else { - strFailReason = _("Unable to locate enough Darksend denominated funds for this transaction."); - strFailReason += " " + _("Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins."); + strFailReason = _("Unable to locate enough Obfuscate denominated funds for this transaction."); + strFailReason += " " + _("Obfuscate uses exact denominated amounts to send funds, you might simply need to anonymize some more coins."); } if(useIX){ - strFailReason += " " + _("InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again."); + strFailReason += " " + _("SwiftTX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again."); } return false; @@ -2184,7 +2190,7 @@ bool CWallet::CreateTransaction(const vector >& vecSend, { // Fill a vout to ourself // TODO: pass in scriptChange instead of reservekey so - // change transaction isn't always pay-to-dash-address + // change transaction isn't always pay-to-darknet-address CScript scriptChange; // coin control: send change to custom address @@ -2391,14 +2397,14 @@ int64_t CWallet::GetTotalValue(std::vector vCoins) { return nTotalValue; } -string CWallet::PrepareDarksendDenominate(int minRounds, int maxRounds) +string CWallet::PrepareObfuscateDenominate(int minRounds, int maxRounds) { if (IsLocked()) return _("Error: Wallet locked, unable to create transaction!"); if(darkSendPool.GetState() != POOL_STATUS_ERROR && darkSendPool.GetState() != POOL_STATUS_SUCCESS) if(darkSendPool.GetEntriesCount() > 0) - return _("Error: You already have pending entries in the Darksend pool"); + return _("Error: You already have pending entries in the Obfuscate pool"); // ** find the coins we'll use std::vector vCoins; @@ -2413,11 +2419,11 @@ string CWallet::PrepareDarksendDenominate(int minRounds, int maxRounds) if minRounds >= 0 it means only denominated inputs are going in and coming out */ if(minRounds >= 0){ - if (!SelectCoinsByDenominations(darkSendPool.sessionDenom, 0.1*COIN, DARKSEND_POOL_MAX, vCoins, vCoins2, nValueIn, minRounds, maxRounds)) + if (!SelectCoinsByDenominations(darkSendPool.sessionDenom, 1*COIN, DARKSEND_POOL_MAX, vCoins, vCoins2, nValueIn, minRounds, maxRounds)) return _("Error: Can't select current denominated inputs"); } - LogPrintf("PrepareDarksendDenominate - preparing darksend denominate . Got: %d \n", nValueIn); + LogPrintf("PrepareObfuscateDenominate - preparing obfuscate denominate . Got: %d \n", nValueIn); { LOCK(cs_wallet); @@ -2443,10 +2449,11 @@ string CWallet::PrepareDarksendDenominate(int minRounds, int maxRounds) BOOST_FOREACH(int64_t v, darkSendDenominations){ // only use the ones that are approved bool fAccepted = false; - if((darkSendPool.sessionDenom & (1 << 0)) && v == ((100*COIN) +100000)) {fAccepted = true;} - else if((darkSendPool.sessionDenom & (1 << 1)) && v == ((10*COIN) +10000)) {fAccepted = true;} - else if((darkSendPool.sessionDenom & (1 << 2)) && v == ((1*COIN) +1000)) {fAccepted = true;} - else if((darkSendPool.sessionDenom & (1 << 3)) && v == ((.1*COIN) +100)) {fAccepted = true;} + if((darkSendPool.sessionDenom & (1 << 0)) && v == ((100*COIN) +1000000)) {fAccepted = true;} + else if((darkSendPool.sessionDenom & (1 << 1)) && v == ((10*COIN) +100000)) {fAccepted = true;} + else if((darkSendPool.sessionDenom & (1 << 2)) && v == ((10*COIN) +10000)) {fAccepted = true;} + else if((darkSendPool.sessionDenom & (1 << 3)) && v == ((1*COIN) +1000)) {fAccepted = true;} + else if((darkSendPool.sessionDenom & (1 << 4)) && v == ((.1*COIN) +100)) {fAccepted = true;} if(!fAccepted) continue; // try to add it @@ -2509,7 +2516,7 @@ string CWallet::PrepareDarksendDenominate(int minRounds, int maxRounds) std::random_shuffle (vOut.begin(), vOut.end()); // We also do not care about full amount as long as we have right denominations, just pass what we found - darkSendPool.SendDarksendDenominate(vCoinsResult, vOut, nValueIn - nValueLeft); + darkSendPool.SendObfuscateDenominate(vCoinsResult, vOut, nValueIn - nValueLeft); return ""; } @@ -3228,7 +3235,7 @@ int CMerkleTx::GetDepthInMainChain(const CBlockIndex* &pindexRet, bool enableIX) if (nResult < 6){ int signatures = GetTransactionLockSignatures(); if(signatures >= INSTANTX_SIGNATURES_REQUIRED){ - return nInstantXDepth+nResult; + return nSwiftTXDepth+nResult; } } } @@ -3254,7 +3261,7 @@ int CMerkleTx::GetTransactionLockSignatures() const { if(fLargeWorkForkFound || fLargeWorkInvalidChainFound) return -2; if(!IsSporkActive(SPORK_2_INSTANTX)) return -3; - if(!fEnableInstantX) return -1; + if(!fEnableSwiftTX) return -1; //compile consessus vote std::map::iterator i = mapTxLocks.find(GetHash()); @@ -3267,7 +3274,7 @@ int CMerkleTx::GetTransactionLockSignatures() const bool CMerkleTx::IsTransactionLockTimedOut() const { - if(!fEnableInstantX) return 0; + if(!fEnableSwiftTX) return 0; //compile consessus vote std::map::iterator i = mapTxLocks.find(GetHash()); diff --git a/src/wallet.h b/src/wallet.h index 069b50520e98c..4914459ee6e2d 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -1,6 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2015-2016 The DarkNet developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -41,9 +42,9 @@ extern bool fPayAtLeastCustomFee; //! -paytxfee default static const CAmount DEFAULT_TRANSACTION_FEE = 0; //! -paytxfee will warn if called with a higher fee than this amount (in satoshis) per KB -static const CAmount nHighTransactionFeeWarning = 0.01 * COIN; +static const CAmount nHighTransactionFeeWarning = 0.1 * COIN; //! -maxtxfee default -static const CAmount DEFAULT_TRANSACTION_MAXFEE = 0.1 * COIN; +static const CAmount DEFAULT_TRANSACTION_MAXFEE = 1 * COIN; //! -maxtxfee will warn if called with a higher fee than this amount (in satoshis) static const CAmount nHighTransactionMaxFeeWarning = 100 * nHighTransactionFeeWarning; //! Largest (in bytes) free transaction we're willing to create @@ -71,8 +72,8 @@ enum AvailableCoinsType { ALL_COINS = 1, ONLY_DENOMINATED = 2, - ONLY_NOT1000IFMN = 3, - ONLY_NONDENOMINATED_NOT1000IFMN = 4 + ONLY_NOT10000IFMN = 3, + ONLY_NONDENOMINATED_NOT10000IFMN = 4 // ONLY_NONDENOMINATED and not 10000DNET at the same time }; @@ -148,8 +149,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface public: // bool SelectCoins(int64_t nTargetValue, std::set >& setCoinsRet, int64_t& nValueRet, const CCoinControl *coinControl = NULL, AvailableCoinsType coin_type=ALL_COINS, bool useIX = true) const; - bool SelectCoinsDark(int64_t nValueMin, int64_t nValueMax, std::vector& setCoinsRet, int64_t& nValueRet, int nDarksendRoundsMin, int nDarksendRoundsMax) const; - bool SelectCoinsByDenominations(int nDenom, int64_t nValueMin, int64_t nValueMax, std::vector& vCoinsRet, std::vector& vCoinsRet2, int64_t& nValueRet, int nDarksendRoundsMin, int nDarksendRoundsMax); + bool SelectCoinsDark(int64_t nValueMin, int64_t nValueMax, std::vector& setCoinsRet, int64_t& nValueRet, int nObfuscateRoundsMin, int nObfuscateRoundsMax) const; + bool SelectCoinsByDenominations(int nDenom, int64_t nValueMin, int64_t nValueMax, std::vector& vCoinsRet, std::vector& vCoinsRet2, int64_t& nValueRet, int nObfuscateRoundsMin, int nObfuscateRoundsMax); bool SelectCoinsDarkDenominated(int64_t nTargetValue, std::vector& setCoinsRet, int64_t& nValueRet) const; bool HasCollateralInputs(bool fOnlyConfirmed = true) const; bool IsCollateralAmount(int64_t nInputAmount) const; @@ -321,8 +322,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface bool CreateTransaction(CScript scriptPubKey, const CAmount& nValue, CWalletTx& wtxNew, CReserveKey& reservekey, CAmount& nFeeRet, std::string& strFailReason, const CCoinControl *coinControl = NULL, AvailableCoinsType coin_type=ALL_COINS, bool useIX=false, CAmount nFeePay=0); bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, std::string strCommand="tx"); - std::string PrepareDarksendDenominate(int minRounds, int maxRounds); - int GenerateDarksendOutputs(int nTotalValue, std::vector& vout); + std::string PrepareObfuscateDenominate(int minRounds, int maxRounds); + int GenerateObfuscateOutputs(int nTotalValue, std::vector& vout); bool CreateCollateralTransaction(CMutableTransaction& txCollateral, std::string& strReason); bool ConvertList(std::vector vCoins, std::vector& vecAmounts); @@ -346,10 +347,10 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface bool GetBudgetSystemCollateralTX(CTransaction& tx, uint256 hash, bool useIX); bool GetBudgetSystemCollateralTX(CWalletTx& tx, uint256 hash, bool useIX); - // get the Darksend chain depth for a given input - int GetRealInputDarksendRounds(CTxIn in, int rounds) const; + // get the Obfuscate chain depth for a given input + int GetRealInputObfuscateRounds(CTxIn in, int rounds) const; // respect current settings - int GetInputDarksendRounds(CTxIn in) const; + int GetInputObfuscateRounds(CTxIn in) const; bool IsDenominated(const CTxIn &txin) const; bool IsDenominated(const CTransaction& tx) const; @@ -900,10 +901,10 @@ class CWalletTx : public CMerkleTx const CTxIn vin = CTxIn(hashTx, i); if(pwallet->IsSpent(hashTx, i) || pwallet->IsLockedCoin(hashTx, i)) continue; - if(fMasterNode && vout[i].nValue == 1000*COIN) continue; // do not count MN-like outputs + if(fMasterNode && vout[i].nValue == 10000*COIN) continue; // do not count MN-like outputs - const int rounds = pwallet->GetInputDarksendRounds(vin); - if(rounds >=-2 && rounds < nDarksendRounds) { + const int rounds = pwallet->GetInputObfuscateRounds(vin); + if(rounds >=-2 && rounds < nObfuscateRounds) { nCredit += pwallet->GetCredit(txout, ISMINE_SPENDABLE); if (!MoneyRange(nCredit)) throw std::runtime_error("CWalletTx::GetAnonamizableCredit() : value out of range"); @@ -936,8 +937,8 @@ class CWalletTx : public CMerkleTx if(pwallet->IsSpent(hashTx, i) || !pwallet->IsDenominated(vin)) continue; - const int rounds = pwallet->GetInputDarksendRounds(vin); - if(rounds >= nDarksendRounds){ + const int rounds = pwallet->GetInputObfuscateRounds(vin); + if(rounds >= nObfuscateRounds){ nCredit += pwallet->GetCredit(txout, ISMINE_SPENDABLE); if (!MoneyRange(nCredit)) throw std::runtime_error("CWalletTx::GetAnonymizedCredit() : value out of range"); @@ -1110,12 +1111,12 @@ class COutput tx = txIn; i = iIn; nDepth = nDepthIn; fSpendable = fSpendableIn; } - //Used with Darksend. Will return largest nondenom, then denominations, then very small inputs + //Used with Obfuscate. Will return largest nondenom, then denominations, then very small inputs int Priority() const { BOOST_FOREACH(int64_t d, darkSendDenominations) - if(tx->vout[i].nValue == d) return 10000; - if(tx->vout[i].nValue < 1*COIN) return 20000; + if(tx->vout[i].nValue == d) return 100000; + if(tx->vout[i].nValue < 10*COIN) return 200000; //nondenom return largest first return -(tx->vout[i].nValue/COIN); diff --git a/src/walletdb.cpp b/src/walletdb.cpp index 8c9b31df400b7..f2247e53e747d 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -1,6 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers +// Copyright (c) 2014-2015 The DarkNet developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -791,7 +792,7 @@ DBErrors CWalletDB::ZapWalletTx(CWallet* pwallet, vector& vWtx) void ThreadFlushWalletDB(const string& strFile) { // Make this thread recognisable as the wallet flushing thread - RenameThread("dash-wallet"); + RenameThread("darknet-wallet"); static bool fOneThread; if (fOneThread)