Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes various #367

Merged
merged 2 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions contrib/valgrind.supp
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# in-tree.
#
# Example use:
# $ valgrind --suppressions=contrib/valgrind.supp src/test/test_dash
# $ valgrind --suppressions=contrib/valgrind.supp src/test/test_raptoreum
# $ valgrind --suppressions=contrib/valgrind.supp --leak-check=full \
# --show-leak-kinds=all src/test/test_dash --log_level=test_suite
# --show-leak-kinds=all src/test/test_raporeum --log_level=test_suite
{
Suppress libstdc++ warning - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65434
Memcheck:Leak
Expand Down
2 changes: 1 addition & 1 deletion doc/descriptors.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ be detected in descriptors up to 501 characters, and up to 3 errors in longer
ones. For larger numbers of errors, or other types of errors, there is a
roughly 1 in a trillion chance of not detecting the errors.

All RPCs in Dash Core will include the checksum in their output. Only
All RPCs in Raptoreum Core will include the checksum in their output. Only
certain RPCs require checksums on input, including `deriveaddress` and
`importmulti`. The checksum for a descriptor without one can be computed
using the `getdescriptorinfo` RPC.
14 changes: 7 additions & 7 deletions doc/developer-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,9 @@ 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_dash
$ valgrind --suppressions=contrib/valgrind.supp src/test/test_raptoreum
$ valgrind --suppressions=contrib/valgrind.supp --leak-check=full \
--show-leak-kinds=all src/test/test_dash --log_level=test_suite
--show-leak-kinds=all src/test/test_raptoreu --log_level=test_suite
$ valgrind -v --leak-check=full src/raptoreumd -printtoconsole
```

Expand All @@ -260,7 +260,7 @@ To enable LCOV report generation during test runs:
make
make cov

# A coverage report will now be accessible at `./test_dash.coverage/index.html`.
# A coverage report will now be accessible at `./test_raptoreum.coverage/index.html`.
```

**Sanitizers**
Expand All @@ -287,14 +287,14 @@ Some examples:

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/dashpay/dash/blob/master/contrib/valgrind.supp))
([`valgrind.supp`](https://github.com/Raptor3um/raptoreum/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_dash
$ valgrind --suppressions=contrib/valgrind.supp src/test/test_raptoreum
$ valgrind --suppressions=contrib/valgrind.supp --leak-check=full \
--show-leak-kinds=all src/test/test_dash --log_level=test_suite
--show-leak-kinds=all src/test/test_raptoreum --log_level=test_suite
$ valgrind -v --leak-check=full src/raptoreumd -printtoconsole
```

Expand All @@ -311,7 +311,7 @@ To enable LCOV report generation during test runs:
make
make cov

# A coverage report will now be accessible at `./test_dash.coverage/index.html`.
# A coverage report will now be accessible at `./test_raptoreum.coverage/index.html`.
```

Locking/mutex usage notes
Expand Down
6 changes: 3 additions & 3 deletions doc/tor.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ configured. For cookie authentication the user running raptoreumd must have writ
to the `CookieAuthFile` specified in Tor configuration. In some cases this is
preconfigured and the creation of a hidden service is automatic. If permission problems
are seen with `-debug=tor` they can be resolved by adding both the user running Tor and
the user running dashd to the same group and setting permissions appropriately. On
Debian-based systems the user running dashd can be added to the debian-tor group,
which has the appropriate permissions. Before starting dashd you will need to re-login
the user running raptoreumd to the same group and setting permissions appropriately. On
Debian-based systems the user running raptoreumd can be added to the debian-tor group,
which has the appropriate permissions. Before starting raptoreumd you will need to re-login
to allow debian-tor group to be applied. Otherwise you will see the following notice: "tor:
Authentication cookie /run/tor/control.authcookie could not be opened (check permissions)"
on debug.log.
Expand Down
4 changes: 2 additions & 2 deletions doc/translation_process.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Transifex is setup to monitor the GitHub repo for updates, and when code contain

Multiple language support is critical in assisting Raptoreum’s global adoption, and growth. One of Raptoreum’s greatest strengths is cross-border money transfers, any help making that easier is greatly appreciated.

See the [Transifex Raptoreum project](https://www.transifex.com/projects/p/raptoreum/) to assist in translations. You should also join the translation mailing list for announcements - see details below.
See the [Transifex Raptoreum project](https://explore.transifex.com/feathered-inc/) to assist in translations. You should also join the translation mailing list for announcements - see details below.

### Writing code with translations
We use automated scripts to help extract translations in both Qt, and non-Qt source files. It is rarely necessary to manually edit the files in `src/qt/locale/`. The translation source files must adhere to the following format:
Expand Down Expand Up @@ -44,7 +44,7 @@ git commit
### Creating a Transifex account
Visit the [Transifex Signup](https://www.transifex.com/signup/) page to create an account. Take note of your username and password, as they will be required to configure the command-line tool.

You can find the Raptoreum translation project at [https://www.transifex.com/projects/p/raptoreum/](https://www.transifex.com/projects/p/raptoreum/).
You can find the Raptoreum translation project at [https://explore.transifex.com/feathered-inc/](https://explore.transifex.com/feathered-inc/).

### Installing the Transifex client command-line tool
The client it used to fetch updated translations. If you are having problems, or need more details, see [http://docs.transifex.com/developer/client/setup](http://docs.transifex.com/developer/client/setup)
Expand Down
12 changes: 6 additions & 6 deletions docker/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ export LC_ALL=C
set -e

# Get Tor service IP if running
if [[ "$1" == "dashd" ]]; then
# Because dashd only accept torcontrol= host as an ip only, we resolve it here and add to config
if [[ "$1" == "raptoreumd" ]]; then
# Because raptoreumd only accept torcontrol= host as an ip only, we resolve it here and add to config
if [[ "$TOR_CONTROL_HOST" ]] && [[ "$TOR_CONTROL_PORT" ]] && [[ "$TOR_PROXY_PORT" ]]; then
TOR_IP=$(getent hosts $TOR_CONTROL_HOST | cut -d ' ' -f 1)
echo "proxy=$TOR_IP:$TOR_PROXY_PORT" >> "$HOME/.dashcore/dash.conf"
echo "Added "proxy=$TOR_IP:$TOR_PROXY_PORT" to $HOME/.dashcore/dash.conf"
echo "torcontrol=$TOR_IP:$TOR_CONTROL_PORT" >> "$HOME/.dashcore/dash.conf"
echo "Added "torcontrol=$TOR_IP:$TOR_CONTROL_PORT" to $HOME/.dashcore/dash.conf"
echo "proxy=$TOR_IP:$TOR_PROXY_PORT" >> "$HOME/.raptoreumcore/raptoreum.conf"
echo "Added "proxy=$TOR_IP:$TOR_PROXY_PORT" to $HOME/.raptoreumcore/raptoreum.conf"
echo "torcontrol=$TOR_IP:$TOR_CONTROL_PORT" >> "$HOME/.raptoreumcore/raptoreum.conf"
echo "Added "torcontrol=$TOR_IP:$TOR_CONTROL_PORT" to $HOME/.raptoreumcore/raptoreum.conf"
echo -e "\n"
else
echo "Tor control credentials not provided"
Expand Down
2 changes: 1 addition & 1 deletion src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@ void CRegTestParams::UpdateBudgetParametersFromArgs(const ArgsManager &args) {
std::vector <std::string> vParams;
boost::split(vParams, strParams, boost::is_any_of(":"));
if (vParams.size() != 3) {
throw std::runtime_error("Budget parameters malformed, expecting <masternode>:<budget>:<superblock>");
throw std::runtime_error("Budget parameters malformed, expecting <smartnode>:<budget>:<superblock>");
}
int nSmartnodePaymentsStartBlock, nBudgetPaymentsStartBlock, nSuperblockStartBlock;
if (!ParseInt32(vParams[0], &nSmartnodePaymentsStartBlock)) {
Expand Down
4 changes: 2 additions & 2 deletions src/coinjoin/coinjoin-client.h
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class CCoinJoinClientSession : public CCoinJoinBaseSession {

LOCKS_EXCLUDED(cs_coinjoin);

/// Process Masternode updates about the progress of mixing
/// Process smartnode updates about the progress of mixing
void ProcessPoolStateUpdate(CCoinJoinStatusUpdate psssup);

// Set the 'state' value, with some logging and capturing when the state changed
Expand Down Expand Up @@ -181,7 +181,7 @@ class CCoinJoinClientQueueManager : public CCoinJoinBaseManager {
*/
class CCoinJoinClientManager {
private:
// Keep track of the used Masternodes
// Keep track of the used Smartnodes
std::vector <COutPoint> vecSmartnodesUsed;

mutable Mutex cs_deqsessions;
Expand Down
8 changes: 4 additions & 4 deletions src/interfaces/node.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ namespace interfaces {
virtual size_t getInstantSentLockCount() = 0;
};

//! Interface for the src/masternode part of a raptoreum node (raptoreumd process).
//! Interface for the src/smartnode part of a raptoreum node (raptoreumd process).
namespace Smartnode {
class Sync {
public:
Expand Down Expand Up @@ -289,10 +289,10 @@ namespace interfaces {
//! Return interface for accessing llmq related handler.
virtual LLMQ &llmq() = 0;

//! Return interface for accessing masternode related handler.
//! Return interface for accessing smartnode related handler.
virtual Smartnode::Sync &smartnodeSync() = 0;

//! Return interface for accessing masternode related handler.
//! Return interface for accessing smartnode related handler.
virtual CoinJoin::Options &coinJoinOptions() = 0;

//! Register handler for init messages.
Expand Down Expand Up @@ -355,7 +355,7 @@ namespace interfaces {

virtual std::unique_ptr <Handler> handleNotifyHeaderTip(NotifyHeaderTipFn fn) = 0;

//! Register handler for masternode list update messages.
//! Register handler for smartnode list update messages.
using NotifySmartnodeListChangedFn = std::function<void(const CDeterministicMNList &newList)>;

virtual std::unique_ptr <Handler> handleNotifySmartnodeListChanged(NotifySmartnodeListChangedFn fn) = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/llmq/quorums.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ namespace llmq {
auto verifiedProRegTxHash = pFrom->GetVerifiedProRegTxHash();
if ((!fSmartnodeMode && !CLLMQUtils::IsWatchQuorumsEnabled()) || pFrom == nullptr ||
(verifiedProRegTxHash.IsNull() && !pFrom->qwatch)) {
errorHandler("Not a verified masternode or a qwatch connection");
errorHandler("Not a verified smartnode or a qwatch connection");
return;
}

Expand Down
2 changes: 1 addition & 1 deletion src/qt/forms/optionsdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@
</property>
<property name="text">
<string>Language missing or translation incomplete? Help contributing translations here:
https://www.transifex.com/projects/p/raptoreum/</string>
https://explore.transifex.com/feathered-inc/</string>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down
46 changes: 20 additions & 26 deletions src/qt/locale/raptoreum_en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -701,12 +701,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+191"/>
<location line="+196"/>
<source>Details for asset: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+145"/>
<location line="+113"/>
<source>Mint details:</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -1631,7 +1631,7 @@
<context>
<name>CreateAssetConfirmationDialog</name>
<message>
<location filename="../createassetsdialog.cpp" line="+885"/>
<location filename="../createassetsdialog.cpp" line="+877"/>
<location line="+3"/>
<source>Yes</source>
<translation type="unfinished">Yes</translation>
Expand Down Expand Up @@ -1926,7 +1926,7 @@
<message>
<location line="+27"/>
<location line="+13"/>
<source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for raptoreum transactions than the network can process.</source>
<source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for Raptoreum transactions than the network can process.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down Expand Up @@ -1956,7 +1956,7 @@
</message>
<message>
<location line="+106"/>
<location filename="../createassetsdialog.cpp" line="-736"/>
<location filename="../createassetsdialog.cpp" line="-728"/>
<source>C&amp;reate Asset</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -2031,7 +2031,7 @@
<translation type="unfinished">%1 (%2 blocks)</translation>
</message>
<message>
<location line="+156"/>
<location line="+154"/>
<source>Asset details:</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -2107,7 +2107,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+212"/>
<location line="+209"/>
<source>Pay only the required fee of %1</source>
<translation type="unfinished">Pay only the required fee of %1</translation>
</message>
Expand Down Expand Up @@ -2704,7 +2704,13 @@
<translation>Use separate SOCKS&amp;5 proxy to reach peers via Tor hidden services:</translation>
</message>
<message>
<location line="+272"/>
<location line="+141"/>
<source>Language missing or translation incomplete? Help contributing translations here:
https://explore.transifex.com/feathered-inc/</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+131"/>
<source>Options set in this dialog are overriden by the command_line or in the configuration file:</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -2854,14 +2860,7 @@
<translation>The user interface language can be set here. This setting will take effect after restarting %1.</translation>
</message>
<message>
<location line="+21"/>
<source>Language missing or translation incomplete? Help contributing translations here:
https://www.transifex.com/projects/p/raptoreum/</source>
<translation>Language missing or translation incomplete? Help contributing translations here:
https://www.transifex.com/projects/p/raptoreum/</translation>
</message>
<message>
<location line="+26"/>
<location line="+47"/>
<source>&amp;Unit to show amounts in:</source>
<translation>&amp;Unit to show amounts in:</translation>
</message>
Expand Down Expand Up @@ -6643,7 +6642,7 @@ https://www.transifex.com/projects/p/raptoreum/</translation>
<context>
<name>UpdateAssetConfirmationDialog</name>
<message>
<location filename="../updateassetsdialog.cpp" line="+714"/>
<location filename="../updateassetsdialog.cpp" line="+681"/>
<location line="+3"/>
<source>Yes</source>
<translation type="unfinished">Yes</translation>
Expand Down Expand Up @@ -6822,7 +6821,7 @@ https://www.transifex.com/projects/p/raptoreum/</translation>
<message>
<location line="+27"/>
<location line="+13"/>
<source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for raptoreum transactions than the network can process.</source>
<source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for Raptoreum transactions than the network can process.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down Expand Up @@ -6852,7 +6851,7 @@ https://www.transifex.com/projects/p/raptoreum/</translation>
</message>
<message>
<location line="+106"/>
<location filename="../updateassetsdialog.cpp" line="-614"/>
<location filename="../updateassetsdialog.cpp" line="-581"/>
<source>U&amp;pdate Asset</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -6892,7 +6891,7 @@ https://www.transifex.com/projects/p/raptoreum/</translation>
<translation type="unfinished">%1 (%2 blocks)</translation>
</message>
<message>
<location line="+257"/>
<location line="+224"/>
<source>Updating asset: %1&lt;br&gt;</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -7245,11 +7244,6 @@ https://www.transifex.com/projects/p/raptoreum/</translation>
<source>Warning: The Network does not appear to fully agree! Some miners addear to experiencing issues.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>Warning: Unknown block versions being mined! It&apos;s possible unknown rules are in effect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
Expand Down Expand Up @@ -8198,7 +8192,7 @@ https://www.transifex.com/projects/p/raptoreum/</translation>
</message>
<message>
<location line="+1"/>
<source>Warning: unknown new rules activated (versionbit %i)</source>
<source>Warning: unknown new rules activated: Expected: 0x%08x, Actual: 0x%08x</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
Loading
Loading