Skip to content

Commit

Permalink
several text replacements
Browse files Browse the repository at this point in the history
  • Loading branch information
Pedro Simões committed Mar 3, 2021
1 parent 1253c6c commit 3150a8c
Show file tree
Hide file tree
Showing 43 changed files with 99 additions and 157 deletions.
1 change: 0 additions & 1 deletion COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contrib/debian/examples/pivx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions contrib/devtools/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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

Expand Down
1 change: 0 additions & 1 deletion contrib/devtools/copyright_header.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions contrib/gitian-build.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
18 changes: 9 additions & 9 deletions contrib/rpm/pivx.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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,-)
Expand All @@ -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*



Expand Down
6 changes: 3 additions & 3 deletions contrib/spendfrom/spendfrom.py
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion doc/Doxyfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions doc/dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) |
Expand Down
34 changes: 17 additions & 17 deletions doc/developer-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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`:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
--------------
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
```
Expand Down Expand Up @@ -801,7 +801,7 @@ Git and GitHub tips

[remote "upstream-pull"]
fetch = +refs/pull/*:refs/remotes/upstream-pull/*
url = [email protected]:sappcoin-com/SAPP.git
url = [email protected]: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`,
Expand Down Expand Up @@ -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
Expand All @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions doc/man/dashdiamond-cli.1
Original file line number Diff line number Diff line change
@@ -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] <command> [params]
Expand Down Expand Up @@ -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.

Expand Down
14 changes: 7 additions & 7 deletions doc/man/dashdiamond-qt.1
Original file line number Diff line number Diff line change
@@ -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]
Expand Down Expand Up @@ -47,7 +47,7 @@ Specify data directory
\fB\-paramsdir=\fR<dir>
.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<file>
.IP
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -447,7 +447,7 @@ Use the test network
.HP
\fB\-litemode=\fR<n>
.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:
Expand Down Expand Up @@ -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.

Expand Down
Loading

0 comments on commit 3150a8c

Please sign in to comment.