From 3150a8c4d3b058e0714ceac9a4181dd9ff35423a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Sim=C3=B5es?= Date: Wed, 3 Mar 2021 09:45:55 +0000 Subject: [PATCH] several text replacements --- COPYING | 1 - contrib/debian/examples/pivx.conf | 2 +- contrib/devtools/README.md | 4 +-- contrib/devtools/copyright_header.py | 1 - contrib/gitian-build.py | 4 +-- contrib/gitian-descriptors/gitian-linux.yml | 2 +- contrib/gitian-descriptors/gitian-osx.yml | 2 +- contrib/gitian-descriptors/gitian-win.yml | 2 +- contrib/rpm/pivx.spec | 18 +++++----- contrib/spendfrom/spendfrom.py | 6 ++-- doc/Doxyfile.in | 2 +- doc/dependencies.md | 10 +++--- doc/developer-notes.md | 34 +++++++++---------- doc/man/dashdiamond-cli.1 | 8 ++--- doc/man/dashdiamond-qt.1 | 14 ++++---- doc/man/dashdiamond-tx.1 | 8 ++--- doc/man/dashdiamondd.1 | 20 +++++------ doc/man/pivx-cli.1 | 10 +++--- doc/man/pivx-qt.1 | 14 ++++---- doc/man/pivx-tx.1 | 8 ++--- share/qt/Info.plist.in | 2 +- src/chain.cpp | 2 +- src/init.cpp | 2 -- src/init.h | 1 - src/pivxd-res.rc | 2 +- src/qt/locale/pivx_de.ts | 4 --- src/qt/locale/pivx_en.ts | 5 --- src/qt/locale/pivx_en_US.ts | 4 --- src/qt/locale/pivx_es.ts | 4 --- src/qt/locale/pivx_es_ES.ts | 4 --- src/qt/locale/pivx_fr_FR.ts | 4 --- src/qt/locale/pivx_hr_HR.ts | 4 --- src/qt/locale/pivx_it.ts | 4 --- src/qt/locale/pivx_ko_KR.ts | 4 --- src/qt/locale/pivx_nl.ts | 4 --- src/qt/locale/pivx_pl.ts | 4 --- src/qt/locale/pivx_ru.ts | 4 --- src/qt/locale/pivx_tr.ts | 4 --- src/qt/locale/pivx_zh_CN.ts | 4 +-- test/functional/mining_pos_reorg.py | 10 +++--- test/functional/rpc_budget.py | 2 +- .../test_framework/test_framework.py | 4 +-- test/functional/test_framework/util.py | 4 +-- 43 files changed, 99 insertions(+), 157 deletions(-) diff --git a/COPYING b/COPYING index 166131a729..e5cc73523a 100644 --- a/COPYING +++ b/COPYING @@ -4,7 +4,6 @@ Copyright (c) 2011-2013 The PPCoin developers Copyright (c) 2013-2014 The NovaCoin Developers Copyright (c) 2014-2018 The BlackCoin Developers Copyright (c) 2015-2020 PIVX Developers -Copyright (c) 2020 Sapphire Developers Copyright (c) 2021 The DECENOMY Developers Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/contrib/debian/examples/pivx.conf b/contrib/debian/examples/pivx.conf index 1eec321a43..351be4b70e 100644 --- a/contrib/debian/examples/pivx.conf +++ b/contrib/debian/examples/pivx.conf @@ -91,7 +91,7 @@ # both prior transactions and several dozen future transactions. #keypool=100 -# Pay an optional transaction fee every time you send SAPPs. Transactions with fees +# Pay an optional transaction fee every time you send DASHDs. 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/devtools/README.md b/contrib/devtools/README.md index 11a18c4260..e803e5ed72 100644 --- a/contrib/devtools/README.md +++ b/contrib/devtools/README.md @@ -105,7 +105,7 @@ For example: ./github-merge.py 3077 (in any git repository) will help you merge pull request #3077 for the -sappcoin-com/SAPP repository. +Dash-Diamond/DASHD repository. What it does: * Fetch master and the pull request. @@ -125,7 +125,7 @@ Setup --------- Configuring the github-merge tool for the Dash Diamond repository is done in the following way: - git config githubmerge.repository sappcoin-com/SAPP + git config githubmerge.repository Dash-Diamond/DASHD git config githubmerge.testcmd "make -j4 check" (adapt to whatever you want to use for testing) git config --global user.signingkey mykeyid diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py index e2061fe3f4..ef98a06962 100755 --- a/contrib/devtools/copyright_header.py +++ b/contrib/devtools/copyright_header.py @@ -121,7 +121,6 @@ def compile_copyright_regex(copyright_style, year_style, name): "The Dash Developers\n", "The Dash Core developers\n", "The PIVX developers\n", - "The Sapphire Coin Core developers\n", "The The DECENOMY Coin Core developers\n", "The PPCoin developers\n", "The NovaCoin Developers", diff --git a/contrib/gitian-build.py b/contrib/gitian-build.py index e0e4d49bb1..e21d9dc05c 100755 --- a/contrib/gitian-build.py +++ b/contrib/gitian-build.py @@ -110,7 +110,7 @@ def setup_repos(): if not os.path.isdir('gitian-builder'): subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git']) if not os.path.isdir('pivx'): - subprocess.check_call(['git', 'clone', 'https://github.com/sappcoin-com/SAPP.git']) + subprocess.check_call(['git', 'clone', 'https://github.com/Dash-Diamond/DASHD.git']) os.chdir('gitian-builder') make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64'] if args.docker: @@ -258,7 +258,7 @@ def main(): parser = argparse.ArgumentParser(description='Script for running full Gitian builds.') parser.add_argument('-c', '--commit', action='store_true', dest='commit', help='Indicate that the version argument is for a commit or branch') parser.add_argument('-p', '--pull', action='store_true', dest='pull', help='Indicate that the version argument is the number of a github repository pull request') - parser.add_argument('-u', '--url', dest='url', default='https://github.com/sappcoin-com/SAPP', help='Specify the URL of the repository. Default is %(default)s') + parser.add_argument('-u', '--url', dest='url', default='https://github.com/Dash-Diamond/DASHD', help='Specify the URL of the repository. Default is %(default)s') parser.add_argument('-v', '--verify', action='store_true', dest='verify', help='Verify the Gitian build') parser.add_argument('-b', '--build', action='store_true', dest='build', help='Do a Gitian build') parser.add_argument('-s', '--sign', action='store_true', dest='sign', help='Make signed binaries for Windows and MacOS') diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 907fe2d9ff..b3f27ab3cc 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -33,7 +33,7 @@ packages: - "ca-certificates" - "python3" remotes: -- "url": "https://github.com/sappcoin-com/SAPP" +- "url": "https://github.com/Dash-Diamond/DASHD" "dir": "pivx" files: [] script: | diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index 5ea4aa472d..8bb22cbe35 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -29,7 +29,7 @@ packages: - "python3-setuptools" - "fonts-tuffy" remotes: -- "url": "https://github.com/sappcoin-com/SAPP" +- "url": "https://github.com/Dash-Diamond/DASHD" "dir": "pivx" files: - "MacOSX10.11.sdk.tar.gz" diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index c6ea50e483..d717ad6c77 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -24,7 +24,7 @@ packages: - "python3" - "rename" remotes: -- "url": "https://github.com/sappcoin-com/SAPP" +- "url": "https://github.com/Dash-Diamond/DASHD" "dir": "pivx" files: [] script: | diff --git a/contrib/rpm/pivx.spec b/contrib/rpm/pivx.spec index 51bdb36066..e08c8c787c 100644 --- a/contrib/rpm/pivx.spec +++ b/contrib/rpm/pivx.spec @@ -27,9 +27,9 @@ Source1: http://download.oracle.com/berkeley-db/db-%{bdbv}.NC.tar.gz Source10: https://raw.githubusercontent.com/pivx-project/pivx/v%{version}/contrib/debian/examples/pivx.conf #man pages -Source20: https://raw.githubusercontent.com/sappcoin-com/sapp/v%{version}/doc/man/sapphired.1 -Source21: https://raw.githubusercontent.com/sappcoin-com/sapp/v%{version}/doc/man/sapphire-cli.1 -Source22: https://raw.githubusercontent.com/sappcoin-com/sapp/v%{version}/doc/man/sapphire-qt.1 +Source20: https://raw.githubusercontent.com/Dash-Diamond/DASHD/v%{version}/doc/man/dashdiamondd.1 +Source21: https://raw.githubusercontent.com/Dash-Diamond/DASHD/v%{version}/doc/man/dashdiamond-cli.1 +Source22: https://raw.githubusercontent.com/Dash-Diamond/DASHD/v%{version}/doc/man/dashdiamond-qt.1 #selinux Source30: https://raw.githubusercontent.com/pivx-project/pivx/v%{version}/contrib/rpm/pivx.te @@ -300,10 +300,10 @@ touch -a -m -t 201511100546 %{buildroot}%{_datadir}/kde4/services/pivx-core.prot %endif # man pages -install -D -p %{SOURCE20} %{buildroot}%{_mandir}/man1/sapphired.1 -install -p %{SOURCE21} %{buildroot}%{_mandir}/man1/sapphire-cli.1 +install -D -p %{SOURCE20} %{buildroot}%{_mandir}/man1/dashdiamondd.1 +install -p %{SOURCE21} %{buildroot}%{_mandir}/man1/dashdiamond-cli.1 %if %{_buildqt} -install -p %{SOURCE22} %{buildroot}%{_mandir}/man1/sapphire-qt.1 +install -p %{SOURCE22} %{buildroot}%{_mandir}/man1/dashdiamond-qt.1 %endif # nuke these, we do extensive testing of binaries in %%check before packaging @@ -384,7 +384,7 @@ rm -rf %{buildroot} %attr(0644,root,root) %{_datadir}/pixmaps/*.svg %attr(0644,root,root) %{_datadir}/pixmaps/*.png %attr(0644,root,root) %{_datadir}/pixmaps/*.xpm -%attr(0644,root,root) %{_mandir}/man1/sapphire-qt.1* +%attr(0644,root,root) %{_mandir}/man1/dashdiamond-qt.1* %endif %files libs @@ -414,7 +414,7 @@ rm -rf %{buildroot} %dir %attr(0750,pivx,pivx) %{_localstatedir}/lib/pivx %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/sysconfig/pivx %attr(0644,root,root) %{_datadir}/selinux/*/*.pp -%attr(0644,root,root) %{_mandir}/man1/sapphired.1* +%attr(0644,root,root) %{_mandir}/man1/dashdiamondd.1* %files utils %defattr(-,root,root,-) @@ -423,7 +423,7 @@ rm -rf %{buildroot} %attr(0755,root,root) %{_bindir}/pivx-cli %attr(0755,root,root) %{_bindir}/pivx-tx %attr(0755,root,root) %{_bindir}/bench_pivx -%attr(0644,root,root) %{_mandir}/man1/sapphire-cli.1* +%attr(0644,root,root) %{_mandir}/man1/dashdiamond-cli.1* diff --git a/contrib/spendfrom/spendfrom.py b/contrib/spendfrom/spendfrom.py index cba67441ad..97d3b6fe86 100755 --- a/contrib/spendfrom/spendfrom.py +++ b/contrib/spendfrom/spendfrom.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Use the raw transactions API to spend SAPPs received on particular addresses, +# Use the raw transactions API to spend DASHDs received on particular addresses, # and send any change back to that same address. # # Example usage: @@ -221,9 +221,9 @@ def main(): parser = optparse.OptionParser(usage="%prog [options]") parser.add_option("--from", dest="fromaddresses", default=None, - help="addresses to get SAPPs from") + help="addresses to get DASHDs from") parser.add_option("--to", dest="to", default=None, - help="address to get send SAPPs to") + help="address to get send DASHDs to") parser.add_option("--amount", dest="amount", default=None, help="amount to send") parser.add_option("--fee", dest="fee", default="0.0", diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 6b005e98ec..c3b256277e 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = "SAPP Core" +PROJECT_NAME = "Dash Diamond Core" # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version diff --git a/doc/dependencies.md b/doc/dependencies.md index 66ad22b408..f24fb2af49 100644 --- a/doc/dependencies.md +++ b/doc/dependencies.md @@ -15,19 +15,19 @@ These are the dependencies currently used by Sappkire Core. You can find instruc | GCC | | [4.8+](https://gcc.gnu.org/) (C++11 support) | | | | | HarfBuzz-NG | | | | | | | libevent | [2.1.8-stable](https://github.com/libevent/libevent/releases) | 2.0.22 | No | | | -| libjpeg | | | | | [Yes](https://github.com/sappcoin-com/sapp/blob/master/depends/packages/qt.mk#L65) | -| libpng | | | | | [Yes](https://github.com/sappcoin-com/sapp/blob/master/depends/packages/qt.mk#L64) | +| libjpeg | | | | | [Yes](https://github.com/Dash-Diamond/DASHD/blob/master/depends/packages/qt.mk#L65) | +| libpng | | | | | [Yes](https://github.com/Dash-Diamond/DASHD/blob/master/depends/packages/qt.mk#L64) | | librsvg | | | | | | | MiniUPnPc | [2.0.20180203](http://miniupnp.free.fr/files) | | No | | | | OpenSSL | [1.0.1k](https://www.openssl.org/source) | | Yes | | | | GMP | [6.1.2](https://gmplib.org/) | | No | | | -| PCRE | | | | | [Yes](https://github.com/sappcoin-com/sapp/blob/master/depends/packages/qt.mk#L66) | +| PCRE | | | | | [Yes](https://github.com/Dash-Diamond/DASHD/blob/master/depends/packages/qt.mk#L66) | | protobuf | [2.6.1](https://github.com/google/protobuf/releases) | | No | | | | Python (tests) | | [3.5](https://www.python.org/downloads) | | | | | qrencode | [3.4.4](https://fukuchi.org/works/qrencode) | | No | | | | Qt | [5.9.7](https://download.qt.io/official_releases/qt/) | [5.5.1](https://github.com/bitcoin/bitcoin/issues/13478) | No | | | -| XCB | | | | | [Yes](https://github.com/sappcoin-com/sapp/blob/master/depends/packages/qt.mk#L87) (Linux only) | -| xkbcommon | | | | | [Yes](https://github.com/sappcoin-com/sapp/blob/master/depends/packages/qt.mk#L86) (Linux only) | +| XCB | | | | | [Yes](https://github.com/Dash-Diamond/DASHD/blob/master/depends/packages/qt.mk#L87) (Linux only) | +| xkbcommon | | | | | [Yes](https://github.com/Dash-Diamond/DASHD/blob/master/depends/packages/qt.mk#L86) (Linux only) | | ZeroMQ | [4.3.1](https://github.com/zeromq/libzmq/releases) | 4.0.0 | No | | | | zlib | [1.2.11](https://zlib.net/) | | | | No | | Sodium | [1.0.15](https://github.com/jedisct1/libsodium) | diff --git a/doc/developer-notes.md b/doc/developer-notes.md index c7127fe7e2..19010947db 100644 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -22,7 +22,7 @@ Developer Notes - [Threads](#threads) - [Ignoring IDE/editor files](#ignoring-ideeditor-files) - [Development guidelines](#development-guidelines) - - [General Sapphire Core](#general-sapphire-core) + - [General Decenomy Core](#general-dashdiamond-core) - [Wallet](#wallet) - [General C++](#general-c) - [C++ data structures](#c-data-structures) @@ -125,7 +125,7 @@ Refer to [/test/functional/README.md#style-guidelines](/test/functional/README.m Coding Style (Doxygen-compatible comments) ------------------------------------------ -Sapphire Core uses [Doxygen](http://www.doxygen.nl/) to generate its official documentation. +Dash Diamond Core uses [Doxygen](http://www.doxygen.nl/) to generate its official documentation. Use Doxygen-compatible comment blocks for functions, methods, and fields. @@ -224,7 +224,7 @@ that run in `-regtest` mode. ### DEBUG_LOCKORDER -Sapphire Core is a multi-threaded application, and deadlocks or other +Dash Diamond Core is a multi-threaded application, and deadlocks or other multi-threading bugs can be very difficult to track down. The `--enable-debug` configure option adds `-DDEBUG_LOCKORDER` to the compiler flags. This inserts run-time checks to keep track of which locks are held, and adds warnings to the @@ -234,15 +234,15 @@ debug.log file if inconsistencies are detected. Valgrind is a programming tool for memory debugging, memory leak detection, and profiling. The repo contains a Valgrind suppressions file -([`valgrind.supp`](https://github.com/sappcoin-com/SAPP/blob/master/contrib/valgrind.supp)) +([`valgrind.supp`](https://github.com/Dash-Diamond/DASHD/blob/master/contrib/valgrind.supp)) which includes known Valgrind warnings in our dependencies that cannot be fixed in-tree. Example use: ```shell -$ valgrind --suppressions=contrib/valgrind.supp src/test/test_sapphire +$ valgrind --suppressions=contrib/valgrind.supp src/test/test_dashdiamond $ valgrind --suppressions=contrib/valgrind.supp --leak-check=full \ - --show-leak-kinds=all src/test/test_sapphire --log_level=test_suite -$ valgrind -v --leak-check=full src/sapphired -printtoconsole + --show-leak-kinds=all src/test/test_dashdiamond --log_level=test_suite +$ valgrind -v --leak-check=full src/dashdiamondd -printtoconsole ``` ### Compiling for test coverage @@ -315,7 +315,7 @@ Ignoring IDE/editor files In closed-source environments in which everyone uses the same IDE it is common to add temporary files it produces to the project-wide `.gitignore` file. -However, in open source software such as Sapphire Core, where everyone uses +However, in open source software such as Decenomy Core, where everyone uses their own editors/IDE/tools, it is less common. Only you know what files your editor produces and this may change from version to version. The canonical way to do this is thus to create your local gitignore. Add this to `~/.gitconfig`: @@ -345,9 +345,9 @@ Development guidelines ============================ A few non-style-related recommendations for developers, as well as points to -pay attention to for reviewers of Sapphire Core code. +pay attention to for reviewers of Decenomy Core code. -General Sapphire Core +General Dash Diamond Core ---------------------- - New features should be exposed on RPC first, then can be made available in the GUI @@ -508,7 +508,7 @@ Strings and formatting - For `strprintf`, `LogPrint`, `LogPrintf` formatting characters don't need size specifiers - - *Rationale*: Sapphire Core uses tinyformat, which is type safe. Leave them out to avoid confusion + - *Rationale*: Dash Diamond Core uses tinyformat, which is type safe. Leave them out to avoid confusion Variable names -------------- @@ -659,7 +659,7 @@ directly upstream without being PRed directly against the project. They will be subtree merge. Others are external projects without a tight relationship with our project. Changes to these should also -be sent upstream but bugfixes may also be prudent to PR against Sapphire Core so that they can be integrated +be sent upstream but bugfixes may also be prudent to PR against Dash Diamond Core so that they can be integrated quickly. Cosmetic changes should be purely taken upstream. There is a tool in `test/lint/git-subtree-check.sh` to check a subtree directory for consistency with @@ -693,7 +693,7 @@ you must be aware of. In most configurations we use the default LevelDB value for `max_open_files`, which is 1000 at the time of this writing. If LevelDB actually uses this many -file descriptors it will cause problems with Sapphire's `select()` loop, because +file descriptors it will cause problems with DashDiamond's `select()` loop, because it may cause new sockets to be created where the fd value is >= 1024. For this reason, on 64-bit Unix systems we rely on an internal LevelDB optimization that uses `mmap()` + `close()` to open table files without actually retaining @@ -704,7 +704,7 @@ In addition to reviewing the upstream changes in `env_posix.cc`, you can use `ls check this. For example, on Linux this command will show open `.ldb` file counts: ```bash -$ lsof -p $(pidof Sapphired) |\ +$ lsof -p $(pidof dashdiamondd) |\ awk 'BEGIN { fd=0; mem=0; } /ldb$/ { if ($4 == "mem") mem++; else fd++ } END { printf "mem = %s, fd = %s\n", mem, fd}' mem = 119, fd = 0 ``` @@ -801,7 +801,7 @@ Git and GitHub tips [remote "upstream-pull"] fetch = +refs/pull/*:refs/remotes/upstream-pull/* - url = git@github.com:sappcoin-com/SAPP.git + url = git@github.com:Dash-Diamond/DASHD.git This will add an `upstream-pull` remote to your git repository, which can be fetched using `git fetch --all` or `git fetch upstream-pull`. Afterwards, you can use `upstream-pull/NUMBER/head` in arguments to `git show`, @@ -862,7 +862,7 @@ A few guidelines for introducing and reviewing new RPC interfaces: - Try not to overload methods on argument type. E.g. don't make `getblock(true)` and `getblock("hash")` do different things. - - *Rationale*: This is impossible to use with `sapphire-cli`, and can be surprising to users. + - *Rationale*: This is impossible to use with `dashdiamond-cli`, and can be surprising to users. - *Exception*: Some RPC calls can take both an `int` and `bool`, most notably when a bool was switched to a multi-value, or due to other historical reasons. **Always** have false map to 0 and @@ -881,7 +881,7 @@ A few guidelines for introducing and reviewing new RPC interfaces: - Add every non-string RPC argument `(method, idx, name)` to the table `vRPCConvertParams` in `rpc/client.cpp`. - - *Rationale*: `sapphire-cli` and the GUI debug console use this table to determine how to + - *Rationale*: `dashdiamond-cli` and the GUI debug console use this table to determine how to convert a plaintext command line to JSON. If the types don't match, the method can be unusable from there. diff --git a/doc/man/dashdiamond-cli.1 b/doc/man/dashdiamond-cli.1 index e8c74ec8d2..e56f596af7 100644 --- a/doc/man/dashdiamond-cli.1 +++ b/doc/man/dashdiamond-cli.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH DASHDIAMOND-CLI "1" "December 2020" "dashdiamond-cli v1.4.0.0" "User Commands" +.TH DASHDIAMOND-CLI "1" "December 2020" "dashdiamond-cli v2.0.0.0" "User Commands" .SH NAME -dashdiamond-cli \- manual page for dashdiamond-cli v1.4.0.0 +dashdiamond-cli \- manual page for dashdiamond-cli v2.0.0.0 .SH DESCRIPTION -Dash Diamond Core RPC client version v1.4.0.0\-dirty +Dash Diamond Core RPC client version v2.0.0.0\-dirty .SS "Usage:" .TP dashdiamond\-cli [options] [params] @@ -68,7 +68,7 @@ Copyright (C) 2014-2020 The Dash Core Developers Copyright (C) 2015-2020 The PIVX Core Developers -Copyright (C) 2020-2021 Sapphire Core Developers +Copyright (C) 2021 DECENOMY Core Developers This is experimental software. diff --git a/doc/man/dashdiamond-qt.1 b/doc/man/dashdiamond-qt.1 index cd5fb69d3a..e95cdca742 100644 --- a/doc/man/dashdiamond-qt.1 +++ b/doc/man/dashdiamond-qt.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH SAPP-QT "1" "September 2020" "dashdiamond-qt v1.4.0.0" "User Commands" +.TH DASHD-QT "1" "September 2020" "dashdiamond-qt v2.0.0.0" "User Commands" .SH NAME -dashdiamond-qt \- manual page for dashdiamond-qt v1.4.0.0 +dashdiamond-qt \- manual page for dashdiamond-qt v2.0.0.0 .SH DESCRIPTION -SAPP Core version v1.4.0.0 (64\-bit) +Dash Diamond Core version v2.0.0.0 (64\-bit) Usage: .IP dashdiamond\-qt [command\-line options] @@ -47,7 +47,7 @@ Specify data directory \fB\-paramsdir=\fR .IP Specify zk params directory (default: -\fI\,/Users/fuzzbawls/Library/Application\/\fP Support/SAPPParams) +\fI\,/Users/fuzzbawls/Library/Application\/\fP Support/DASHDParams) .HP \fB\-debuglogfile=\fR .IP @@ -98,7 +98,7 @@ Rebuild block chain index from current blk000??.dat files on startup .HP \fB\-reindexmoneysupply\fR .IP -Reindex the PIV and zSAPP money supply statistics on startup +Reindex the DASHD and zDASHD money supply statistics on startup .HP \fB\-resync\fR .IP @@ -447,7 +447,7 @@ Use the test network .HP \fB\-litemode=\fR .IP -Disable all SAPP specific functionality (Masternodes, Zerocoin, SwiftX, +Disable all DASHD specific functionality (Masternodes, Zerocoin, SwiftX, Budgeting) (0\-1, default: 0) .PP Masternode options: @@ -614,7 +614,7 @@ Copyright (C) 2014-2020 The Dash Core Developers Copyright (C) 2015-2020 The PIVX Core Developers -Copyright (C) 2015-2020 The Sapphire Core Developers +Copyright (C) 2021 The DECENOMY Core Developers This is experimental software. diff --git a/doc/man/dashdiamond-tx.1 b/doc/man/dashdiamond-tx.1 index 59bb00c232..14ab52ca21 100644 --- a/doc/man/dashdiamond-tx.1 +++ b/doc/man/dashdiamond-tx.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH DASHDIAMOND-TX "1" "December 2020" "dashdiamond-tx v1.4.0.0" "User Commands" +.TH DASHDIAMOND-TX "1" "December 2020" "dashdiamond-tx v2.0.0.0" "User Commands" .SH NAME -dashdiamond-tx \- manual page for dashdiamond-tx v1.4.0.0 +dashdiamond-tx \- manual page for dashdiamond-tx v2.0.0.0 .SH DESCRIPTION -Dash Diamond Core dashdiamond\-tx utility version v1.4.0.0\-dirty +Dash Diamond Core dashdiamond\-tx utility version v2.0.0.0\-dirty .SS "Usage:" .TP dashdiamond\-tx [options] [commands] @@ -90,7 +90,7 @@ Copyright (C) 2014-2020 The Dash Core Developers Copyright (C) 2015-2020 The PIVX Core Developers -Copyright (C) 2020-2021 Sapphire Core Developers +Copyright (C) 2021 DECENOMY Core Developers This is experimental software. diff --git a/doc/man/dashdiamondd.1 b/doc/man/dashdiamondd.1 index 4e70a10a00..28d8e8bf64 100644 --- a/doc/man/dashdiamondd.1 +++ b/doc/man/dashdiamondd.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH DASHDIAMONDD "1" "December 2020" "dashdiamondd v1.4.0.0" "User Commands" +.TH DASHDIAMONDD "1" "December 2020" "dashdiamondd v2.0.0.0" "User Commands" .SH NAME -dashdiamondd \- manual page for dashdiamondd v1.4.0.0 +dashdiamondd \- manual page for dashdiamondd v2.0.0.0 .SH DESCRIPTION -Pivx Core Daemon version v1.4.0.0\-dirty +Pivx Core Daemon version v2.0.0.0\-dirty .SS "Usage:" .TP pivxd [options] @@ -102,7 +102,7 @@ Rebuild block chain index from current blk000??.dat files on startup .HP \fB\-reindexmoneysupply\fR .IP -Reindex the SAPP and zSAPP money supply statistics on startup +Reindex the DASHD and zDASHD money supply statistics on startup .HP \fB\-resync\fR .IP @@ -288,12 +288,12 @@ low may abort large transactions (default: 1.00) .HP \fB\-mintxfee=\fR .IP -Fees (in SAPP/Kb) smaller than this are considered zero fee for +Fees (in DASHD/Kb) smaller than this are considered zero fee for transaction creation (default: 0.0001) .HP \fB\-paytxfee=\fR .IP -Fee (in SAPP/kB) to add to transactions you send (default: 0.00) +Fee (in DASHD/kB) to add to transactions you send (default: 0.00) .HP \fB\-rescan\fR .IP @@ -353,7 +353,7 @@ cores, default: 1) .HP \fB\-minstakesplit=\fR .IP -Minimum positive amount (in SAPP) allowed by GUI and RPC for the stake +Minimum positive amount (in DASHD) allowed by GUI and RPC for the stake split threshold (default: 100.00) .HP \fB\-staking=\fR @@ -430,7 +430,7 @@ Maximum tip age in seconds to consider node in initial block download .HP \fB\-minrelaytxfee=\fR .IP -Fees (in SAPP/Kb) smaller than this are considered zero fee for +Fees (in DASHD/Kb) smaller than this are considered zero fee for relaying, mining and transaction creation (default: 0.0001) .HP \fB\-printtoconsole\fR @@ -447,7 +447,7 @@ Use the test network .HP \fB\-litemode=\fR .IP -Disable all SAPP specific functionality (Masternodes, Zerocoin, SwiftX, +Disable all DASHD specific functionality (Masternodes, Zerocoin, SwiftX, Budgeting) (0\-1, default: 0) .PP Masternode options: @@ -588,7 +588,7 @@ Copyright (C) 2014-2020 The Dash Core Developers Copyright (C) 2015-2020 The PIVX Core Developers -Copyright (C) 2020-2021 Sapphire Core Developers +Copyright (C) 2021 DECENOMY Core Developers This is experimental software. diff --git a/doc/man/pivx-cli.1 b/doc/man/pivx-cli.1 index d48f954c27..5bf9026e22 100644 --- a/doc/man/pivx-cli.1 +++ b/doc/man/pivx-cli.1 @@ -1,13 +1,13 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH SAPP-CLI "1" "December 2020" "dashdiamond-cli v1.4.0.0" "User Commands" +.TH DASHD-CLI "1" "December 2020" "dashdiamond-cli v2.0.0.0" "User Commands" .SH NAME -dashdiamond-cli \- manual page for dashdiamond-cli v1.4.0.0 +dashdiamond-cli \- manual page for dashdiamond-cli v2.0.0.0 .SH DESCRIPTION -SAPP Core RPC client version v1.4.0.0 +Dash Diamond Core RPC client version v2.0.0.0 .SS "Usage:" .TP pivx\-cli [options] [params] -Send command to SAPP Core +Send command to Dash Diamond Core .TP pivx\-cli [options] help List commands @@ -68,7 +68,7 @@ Copyright (C) 2014-2020 The Dash Core Developers Copyright (C) 2015-2020 The PIVX Core Developers -Copyright (C) 2020 The Sapphire Core Developers +Copyright (C) 2020 The DECENOMY Core Developers This is experimental software. diff --git a/doc/man/pivx-qt.1 b/doc/man/pivx-qt.1 index db9ee8c0d1..19f2d9dbef 100644 --- a/doc/man/pivx-qt.1 +++ b/doc/man/pivx-qt.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH SAPP-QT "1" "September 2020" "pivx-qt v1.4.0.0" "User Commands" +.TH DashDiamond-QT "1" "February 2021" "dashdiamond-qt v2.0.0.0" "User Commands" .SH NAME -pivx-qt \- manual page for pivx-qt v1.4.0.0 +pivx-qt \- manual page for pivx-qt v2.0.0.0 .SH DESCRIPTION -SAPP Core version v1.4.0.0 (64\-bit) +Dash Diamond Core version v2.0.0.0 (64\-bit) Usage: .IP pivx\-qt [command\-line options] @@ -47,7 +47,7 @@ Specify data directory \fB\-paramsdir=\fR .IP Specify zk params directory (default: -\fI\,/Users/fuzzbawls/Library/Application\/\fP Support/SAPPParams) +\fI\,/Users/fuzzbawls/Library/Application\/\fP Support/DASHDParams) .HP \fB\-debuglogfile=\fR .IP @@ -98,7 +98,7 @@ Rebuild block chain index from current blk000??.dat files on startup .HP \fB\-reindexmoneysupply\fR .IP -Reindex the PIV and zSAPP money supply statistics on startup +Reindex the PIV and zDASHD money supply statistics on startup .HP \fB\-resync\fR .IP @@ -447,7 +447,7 @@ Use the test network .HP \fB\-litemode=\fR .IP -Disable all SAPP specific functionality (Masternodes, Zerocoin, SwiftX, +Disable all DASHD specific functionality (Masternodes, Zerocoin, SwiftX, Budgeting) (0\-1, default: 0) .PP Masternode options: @@ -614,7 +614,7 @@ Copyright (C) 2014-2020 The Dash Core Developers Copyright (C) 2015-2020 The PIVX Core Developers -Copyright (C) 2015-2020 The Sapphire Core Developers +Copyright (C) 2021 The DECENOMY Core Developers This is experimental software. diff --git a/doc/man/pivx-tx.1 b/doc/man/pivx-tx.1 index 01b42eef25..2386e5b354 100644 --- a/doc/man/pivx-tx.1 +++ b/doc/man/pivx-tx.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH SAPP-TX "1" "September 2020" "pivx-tx v1.4.0.0" "User Commands" +.TH DASHD-TX "1" "September 2020" "pivx-tx v2.0.0.0" "User Commands" .SH NAME -pivx-tx \- manual page for pivx-tx v1.4.0.0 +pivx-tx \- manual page for pivx-tx v2.0.0.0 .SH DESCRIPTION -Pivx Core pivx\-tx utility version v1.4.0.0 +Pivx Core pivx\-tx utility version v2.0.0.0 .SS "Usage:" .TP pivx\-tx [options] [commands] @@ -90,7 +90,7 @@ Copyright (C) 2014-2020 The Dash Core Developers Copyright (C) 2015-2020 The PIVX Core Developers -Copyright (C) 2020 The Sapphire Core Developers +Copyright (C) 2020 The DECENOMY Core Developers This is experimental software. diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in index cdc19d73f9..c1487becfc 100644 --- a/share/qt/Info.plist.in +++ b/share/qt/Info.plist.in @@ -17,7 +17,7 @@ APPL CFBundleGetInfoString - @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@.@CLIENT_VERSION_BUILD@, Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers, 2014-@COPYRIGHT_YEAR@ The Dash Core developers, 2015-@COPYRIGHT_YEAR@ The PIVX Core developers, 2020-@COPYRIGHT_YEAR@ Sapphire Core developers + @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@.@CLIENT_VERSION_BUILD@, Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers, 2014-@COPYRIGHT_YEAR@ The Dash Core developers, 2015-@COPYRIGHT_YEAR@ The PIVX Core developers, 2020-@COPYRIGHT_YEAR@ DECENOMY Core developers CFBundleShortVersionString @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@ diff --git a/src/chain.cpp b/src/chain.cpp index 42e41bdb6d..fba1b46472 100644 --- a/src/chain.cpp +++ b/src/chain.cpp @@ -133,7 +133,7 @@ int64_t CBlockIndex::MinPastBlockTime() const // on the transition from Time Protocol v1 to v2 // pindexPrev->nTime might be in the future (up to the allowed drift) - // so we allow the nBlockTimeProtocolV2 (SAPP v4.0) to be at most (180-14) seconds earlier than previous block + // so we allow the nBlockTimeProtocolV2 (DASHD v4.0) to be at most (180-14) seconds earlier than previous block if (nHeight + 1 == consensus.vUpgrades[Consensus::UPGRADE_V4_0].nActivationHeight) return GetBlockTime() - consensus.FutureBlockTimeDrift(nHeight) + consensus.FutureBlockTimeDrift(nHeight + 1); diff --git a/src/init.cpp b/src/init.cpp index ae14eae8ee..89329227a3 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -575,8 +575,6 @@ std::string LicenseInfo() "\n" + FormatParagraph(strprintf(_("Copyright (C) 2015-%i The PIVX Core Developers"), COPYRIGHT_YEAR)) + "\n" + "\n" + - FormatParagraph(strprintf(_("Copyright (C) 2020-%i Sapphire Core Developers"), COPYRIGHT_YEAR)) + "\n" + - "\n" + FormatParagraph(strprintf(_("Copyright (C) 2021-%i The DECENOMY Core Developers"), COPYRIGHT_YEAR)) + "\n" + "\n" + FormatParagraph(_("This is experimental software.")) + "\n" + diff --git a/src/init.h b/src/init.h index b33fafe049..c6d4f73c3f 100644 --- a/src/init.h +++ b/src/init.h @@ -12,7 +12,6 @@ class CScheduler; class CWallet; -class CzSAPPWallet; namespace boost { diff --git a/src/pivxd-res.rc b/src/pivxd-res.rc index 20acd2e172..c7649d5476 100644 --- a/src/pivxd-res.rc +++ b/src/pivxd-res.rc @@ -17,7 +17,7 @@ BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN VALUE "CompanyName", "dashdiamond" - VALUE "FileDescription", "dashdiamondd (OSS daemon/client for Sapphire)" + VALUE "FileDescription", "dashdiamondd (OSS daemon/client for Dash Diamond)" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "dashdiamondd" VALUE "LegalCopyright", COPYRIGHT_STR diff --git a/src/qt/locale/pivx_de.ts b/src/qt/locale/pivx_de.ts index 309d5c3a40..e7a6ee0c3e 100644 --- a/src/qt/locale/pivx_de.ts +++ b/src/qt/locale/pivx_de.ts @@ -5655,10 +5655,6 @@ Dash Diamond Core Wallet Copyright (C) 2015-%i The PIVX Core Developers Copyright (C) 2015-%i The PIVX Core Developers - - Copyright (C) 2020-%i Sapphire Core Developers - Copyright (C) 2020-%i Sapphire Core Developers - Copyright (C) 2021-%i The DECENOMY Core Developers Copyright (C) 2021-%i The DECENOMY Core Developers diff --git a/src/qt/locale/pivx_en.ts b/src/qt/locale/pivx_en.ts index f9cac5a0a6..e443c6da05 100644 --- a/src/qt/locale/pivx_en.ts +++ b/src/qt/locale/pivx_en.ts @@ -7102,11 +7102,6 @@ Please run 'sapling-fetch-params' or './util/fetch-params.sh&apos Copyright (C) 2015-%i The PIVX Core Developers - - - Copyright (C) 2020-%i Sapphire Core Developers - - Copyright (C) 2021-%i The DECENOMY Core Developers Copyright (C) 2021-%i The DECENOMY Core Developers diff --git a/src/qt/locale/pivx_en_US.ts b/src/qt/locale/pivx_en_US.ts index 0e0f60a97b..7162cda47c 100644 --- a/src/qt/locale/pivx_en_US.ts +++ b/src/qt/locale/pivx_en_US.ts @@ -5775,10 +5775,6 @@ Please run 'sapling-fetch-params' or './util/fetch-params.sh' and then restart.< Copyright (C) 2015-%i The PIVX Core Developers Copyright (C) 2015-%i The PIVX Core Developers - - Copyright (C) 2020-%i Sapphire Core Developers - Copyright (C) 2020-%i Sapphire Core Developers - Copyright (C) 2021-%i The DECENOMY Core Developers Copyright (C) 2021-%i The DECENOMY Core Developers diff --git a/src/qt/locale/pivx_es.ts b/src/qt/locale/pivx_es.ts index bfe4a867e9..b477b57f93 100644 --- a/src/qt/locale/pivx_es.ts +++ b/src/qt/locale/pivx_es.ts @@ -5716,10 +5716,6 @@ Ejecute 'sapling-fetch-params' o './util/fetch-params.sh' y luego reinicie.Copyright (C) 2015-%i The PIVX Core Developers Copyright (C) 2015-%i The PIVX Core Developers - - Copyright (C) 2020-%i Sapphire Core Developers - Copyright (C) 2020-%i Sapphire Core Developers - Copyright (C) 2021-%i The DECENOMY Core Developers Copyright (C) 2021-%i The DECENOMY Core Developers diff --git a/src/qt/locale/pivx_es_ES.ts b/src/qt/locale/pivx_es_ES.ts index 69a30d2456..798e1cdc43 100644 --- a/src/qt/locale/pivx_es_ES.ts +++ b/src/qt/locale/pivx_es_ES.ts @@ -5337,10 +5337,6 @@ una nueva copia de seguridad. Copyright (C) 2015-%i The PIVX Core Developers Copyright (C) 2015-%i The PIVX Core Developers - - Copyright (C) 2020-%i Sapphire Core Developers - Copyright (C) 2020-%i Sapphire Core Developers - Copyright (C) 2021-%i The DECENOMY Core Developers Copyright (C) 2021-%i The DECENOMY Core Developers diff --git a/src/qt/locale/pivx_fr_FR.ts b/src/qt/locale/pivx_fr_FR.ts index 10eaefc316..9e1aacaa1f 100644 --- a/src/qt/locale/pivx_fr_FR.ts +++ b/src/qt/locale/pivx_fr_FR.ts @@ -5714,10 +5714,6 @@ Portefeuille Dash Diamond Core Copyright (C) 2015-%i The PIVX Core Developers Copyright (C) 2015-%i Les développeurs de PIVX Core - - Copyright (C) 2020-%i Sapphire Core Developers - Copyright (C) 2020-%i Les développeurs de Sapphire Core - Copyright (C) 2021-%i The DECENOMY Core Developers Copyright (C) 2021-%i The DECENOMY Core Developers diff --git a/src/qt/locale/pivx_hr_HR.ts b/src/qt/locale/pivx_hr_HR.ts index 44094ce30a..a50945a6c9 100644 --- a/src/qt/locale/pivx_hr_HR.ts +++ b/src/qt/locale/pivx_hr_HR.ts @@ -5527,10 +5527,6 @@ se nova sigurnosna kopija. Copyright (C) 2015-%i The PIVX Core Developers Autorska prava (C) 2015-%i The PIVX Core Developers - - Copyright (C) 2020-%i Sapphire Core Developers - Autorska prava (C) 2020-%i Sapphire Core Developers - Copyright (C) 2021-%i The DECENOMY Core Developers Autorska prava (C) 2021-%i The DECENOMY Core Developers diff --git a/src/qt/locale/pivx_it.ts b/src/qt/locale/pivx_it.ts index 072cc79d5b..e25fd13b28 100644 --- a/src/qt/locale/pivx_it.ts +++ b/src/qt/locale/pivx_it.ts @@ -5727,10 +5727,6 @@ Portafoglio Dash Diamond Core. Copyright (C) 2015-%i The PIVX Core Developers Copyright (C) 2015-%i Gli sviluppatori di PIVX Core - - Copyright (C) 2020-%i Sapphire Core Developers - Copyright (C) 2020-%i Gli sviluppatori di Sapphire Core - Copyright (C) 2021-%i The DECENOMY Core Developers Copyright (C) 2020-%i Gli sviluppatori di DECENOMY Core diff --git a/src/qt/locale/pivx_ko_KR.ts b/src/qt/locale/pivx_ko_KR.ts index 13701bb462..badb5533fb 100644 --- a/src/qt/locale/pivx_ko_KR.ts +++ b/src/qt/locale/pivx_ko_KR.ts @@ -4810,10 +4810,6 @@ NOTE: 업그레이드 이후에는 Copyright (C) 2015-%i The PIVX Core Developers Copyright (C) 2015-%i The PIVX Core 개발자 - - Copyright (C) 2020-%i Sapphire Core Developers - Copyright (C) 2020-%i Sapphire Core 개발자 - Copyright (C) 2021-%i The DECENOMY Core Developers Copyright (C) 2021-%i The DECENOMY Core 개발자 diff --git a/src/qt/locale/pivx_nl.ts b/src/qt/locale/pivx_nl.ts index e7aa5caec8..81d8c5df6c 100644 --- a/src/qt/locale/pivx_nl.ts +++ b/src/qt/locale/pivx_nl.ts @@ -5726,10 +5726,6 @@ Selecteer minder invoeren met muntcontrole. Copyright (C) 2015-%i The PIVX Core Developers Copyright (C) 2015-%i The PIVX Kernontwikkelaars - - Copyright (C) 2020-%i Sapphire Core Developers - Copyright (C) 2020-%i Sapphire Kernontwikkelaars - Copyright (C) 2021-%i The DECENOMY Core Developers Copyright (C) 2021-%i The DECENOMY Kernontwikkelaars diff --git a/src/qt/locale/pivx_pl.ts b/src/qt/locale/pivx_pl.ts index 48030d482b..de1b4e5037 100644 --- a/src/qt/locale/pivx_pl.ts +++ b/src/qt/locale/pivx_pl.ts @@ -5073,10 +5073,6 @@ Portfel Dash Diamond Core Copyright (C) 2015-%i The PIVX Core Developers Copyright (C) 2015-%i The PIVX Core Developers - - Copyright (C) 2020-%i Sapphire Core Developers - Copyright (C) 2020-%i Sapphire Core Developers - Copyright (C) 2021-%i The DECENOMY Core Developers Copyright (C) 2021-%i The DECENOMY Core Developers diff --git a/src/qt/locale/pivx_ru.ts b/src/qt/locale/pivx_ru.ts index 1ab12a474f..4e4de09d5b 100644 --- a/src/qt/locale/pivx_ru.ts +++ b/src/qt/locale/pivx_ru.ts @@ -5675,10 +5675,6 @@ Select fewer inputs with coin control. Copyright (C) 2015-%i The PIVX Core Developers Copyright (C) 2015-%i Разработчики PIVX Core - - Copyright (C) 2020-%i Sapphire Core Developers - Copyright (C) 2020-%i Разработчики Sapphire Core - Copyright (C) 2021-%i The DECENOMY Core Developers Copyright (C) 2021-%i Разработчики DECENOMY Core diff --git a/src/qt/locale/pivx_tr.ts b/src/qt/locale/pivx_tr.ts index 4d4c479a5f..1fc20b8588 100644 --- a/src/qt/locale/pivx_tr.ts +++ b/src/qt/locale/pivx_tr.ts @@ -4700,10 +4700,6 @@ Hoşgeldiniz Copyright (C) 2015-%i The PIVX Core Developers Copyright (C) 2015-%i The PIVX Core Developers - - Copyright (C) 2020-%i Sapphire Core Developers - Copyright (C) 2020-%i Sapphire Core Developers - Copyright (C) 2021-%i The DECENOMY Core Developers Copyright (C) 2021-%i The DECENOMY Core Developers diff --git a/src/qt/locale/pivx_zh_CN.ts b/src/qt/locale/pivx_zh_CN.ts index 29c7c2f2f4..8a9bff343e 100644 --- a/src/qt/locale/pivx_zh_CN.ts +++ b/src/qt/locale/pivx_zh_CN.ts @@ -5205,8 +5205,8 @@ backup will be created. 版权所有(C) 2014-%i的达世核心开发者 - Copyright (C) 2015-%i The Sapphire Core Developers - 版权所有(C) 2015-%i Sapphire核心开发者 + Copyright (C) 2015-%i The PIVX Core Developers + 版权所有(C) 2015-%i PIVX核心开发者 Copyright (C) 2021-%i The DECENOMY Core Developers diff --git a/test/functional/mining_pos_reorg.py b/test/functional/mining_pos_reorg.py index c6fbbef105..4b4aea9889 100755 --- a/test/functional/mining_pos_reorg.py +++ b/test/functional/mining_pos_reorg.py @@ -53,7 +53,7 @@ def get_tot_balance(self, nodeid): def check_money_supply(self, expected_piv, expected_zpiv): g_info = [self.nodes[i].getinfo() for i in range(self.num_nodes)] - # verify that nodes have the expected PIV and zSAPP supply + # verify that nodes have the expected PIV and zDASHD supply for node in g_info: assert_equal(node['moneysupply'], DecimalAmt(expected_piv)) for denom in node['zPIVsupply']: @@ -68,9 +68,9 @@ def findUtxoInList(txid, vout, utxo_list): return True, x return False, None - # Check PIV and zSAPP supply at the beginning + # Check PIV and zDASHD supply at the beginning # ------------------------------------------ - # zSAPP supply: 2 coins for each denomination + # zDASHD supply: 2 coins for each denomination expected_zpiv_supply = { "1": 2, "5": 10, @@ -230,8 +230,8 @@ def findUtxoInList(txid, vout, utxo_list): res, utxo = findUtxoInList(stakeinput["txid"], stakeinput["vout"], self.nodes[0].listunspent()) assert (not res or not utxo["spendable"]) - # Verify that PIV and zSAPP supplies were properly updated after the spends and reorgs - self.log.info("Check SAPP and zSAPP supply...") + # Verify that PIV and zDASHD supplies were properly updated after the spends and reorgs + self.log.info("Check DASHD and zDASHD supply...") expected_money_supply += 250.0 * (self.nodes[1].getblockcount() - 330) spent_coin_0 = mints[0]["denomination"] spent_coin_1 = mints[1]["denomination"] diff --git a/test/functional/rpc_budget.py b/test/functional/rpc_budget.py index ebf95ec2c3..aa6a1260f0 100755 --- a/test/functional/rpc_budget.py +++ b/test/functional/rpc_budget.py @@ -47,7 +47,7 @@ def run_test(self): name, scheme + url, numcycles, nextsuperblock, "DBREvBPNQguwuC4YMoCG5FoH1sA2YntvZm", cycleamount) self.log.info("Test with too low amount") - assert_raises_rpc_error(-8, "Invalid amount - Payment of 9.00 is less than minimum 10 SAPP allowed", self.nodes[0].preparebudget, + assert_raises_rpc_error(-8, "Invalid amount - Payment of 9.00 is less than minimum 10 DASHD allowed", self.nodes[0].preparebudget, name, scheme + url, numcycles, nextsuperblock, address, 9) self.log.info("Test with too high amount") diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index 25683854f3..d780fb51be 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -801,7 +801,7 @@ def make_txes(self, node_id, spendingPrevOuts, to_pubKey): block_txes = [] for uniqueness in spendingPrevOuts: if is_zerocoin(uniqueness): - # spend zSAPP + # spend zDASHD _, serialHash, _ = spendingPrevOuts[uniqueness] raw_spend = rpc_conn.createrawzerocoinspend(serialHash, "", False) else: @@ -908,7 +908,7 @@ def stake_block(self, node_id, # Don't add tx doublespending the coinstake input, unless fDoubleSpend=True for tx in vtx: if not fDoubleSpend: - # assume txes don't double spend zSAPP inputs when fDoubleSpend is false. It needs to + # assume txes don't double spend zDASHD inputs when fDoubleSpend is false. It needs to # be checked outside until a convenient tx.spends(zerocoin) is added to the framework. if not isZPoS and tx.spends(prevout): continue diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py index 511328c61e..14efc84504 100644 --- a/test/functional/test_framework/util.py +++ b/test/functional/test_framework/util.py @@ -28,10 +28,10 @@ def assert_fee_amount(fee, tx_size, fee_per_kB): """Assert the fee was in range""" target_fee = round(tx_size * fee_per_kB / 1000, 8) if fee < target_fee: - raise AssertionError("Fee of %s SAPP too low! (Should be %s SAPP)" % (str(fee), str(target_fee))) + raise AssertionError("Fee of %s DASHD too low! (Should be %s DASHD)" % (str(fee), str(target_fee))) # allow the wallet's estimation to be at most 2 bytes off if fee > (tx_size + 20) * fee_per_kB / 1000: - raise AssertionError("Fee of %s SAPP too high! (Should be %s SAPP)" % (str(fee), str(target_fee))) + raise AssertionError("Fee of %s DASHD too high! (Should be %s DASHD)" % (str(fee), str(target_fee))) def assert_equal(thing1, thing2, *args): if thing1 != thing2 or any(thing1 != arg for arg in args):