diff --git a/contrib/valgrind.supp b/contrib/valgrind.supp index e044976b9..331ef11ef 100644 --- a/contrib/valgrind.supp +++ b/contrib/valgrind.supp @@ -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 diff --git a/doc/descriptors.md b/doc/descriptors.md index 990c0cb74..92bed6c23 100644 --- a/doc/descriptors.md +++ b/doc/descriptors.md @@ -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. diff --git a/doc/developer-notes.md b/doc/developer-notes.md index 5f2d962d8..f7eaa746a 100644 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -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 ``` @@ -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** @@ -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 ``` @@ -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 diff --git a/doc/tor.md b/doc/tor.md index cb50dbb8e..27195a4c4 100644 --- a/doc/tor.md +++ b/doc/tor.md @@ -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. diff --git a/doc/translation_process.md b/doc/translation_process.md index 0a6524bcc..d140c27ea 100644 --- a/doc/translation_process.md +++ b/doc/translation_process.md @@ -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: @@ -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) diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index a201ae7e1..7d2ede850 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -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" diff --git a/src/chainparams.cpp b/src/chainparams.cpp index eb1520f2a..3ce352a7b 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -885,7 +885,7 @@ void CRegTestParams::UpdateBudgetParametersFromArgs(const ArgsManager &args) { std::vector vParams; boost::split(vParams, strParams, boost::is_any_of(":")); if (vParams.size() != 3) { - throw std::runtime_error("Budget parameters malformed, expecting ::"); + throw std::runtime_error("Budget parameters malformed, expecting ::"); } int nSmartnodePaymentsStartBlock, nBudgetPaymentsStartBlock, nSuperblockStartBlock; if (!ParseInt32(vParams[0], &nSmartnodePaymentsStartBlock)) { diff --git a/src/coinjoin/coinjoin-client.h b/src/coinjoin/coinjoin-client.h index 9bd0528dc..0d483a21d 100644 --- a/src/coinjoin/coinjoin-client.h +++ b/src/coinjoin/coinjoin-client.h @@ -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 @@ -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 vecSmartnodesUsed; mutable Mutex cs_deqsessions; diff --git a/src/interfaces/node.h b/src/interfaces/node.h index 84e5b4eb8..99af492af 100644 --- a/src/interfaces/node.h +++ b/src/interfaces/node.h @@ -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: @@ -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. @@ -355,7 +355,7 @@ namespace interfaces { virtual std::unique_ptr handleNotifyHeaderTip(NotifyHeaderTipFn fn) = 0; - //! Register handler for masternode list update messages. + //! Register handler for smartnode list update messages. using NotifySmartnodeListChangedFn = std::function; virtual std::unique_ptr handleNotifySmartnodeListChanged(NotifySmartnodeListChangedFn fn) = 0; diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp index ae266b709..0c37405a7 100644 --- a/src/llmq/quorums.cpp +++ b/src/llmq/quorums.cpp @@ -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; } diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index 665942c16..d706083ab 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -778,7 +778,7 @@ Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/raptoreum/ +https://explore.transifex.com/feathered-inc/ true diff --git a/src/qt/locale/raptoreum_en.ts b/src/qt/locale/raptoreum_en.ts index 1fe7ea93a..321132b83 100644 --- a/src/qt/locale/raptoreum_en.ts +++ b/src/qt/locale/raptoreum_en.ts @@ -701,12 +701,12 @@ - + Details for asset: %1 - + Mint details: @@ -1631,7 +1631,7 @@ CreateAssetConfirmationDialog - + Yes Yes @@ -1926,7 +1926,7 @@ - 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. + 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. @@ -1956,7 +1956,7 @@ - + C&reate Asset @@ -2031,7 +2031,7 @@ %1 (%2 blocks) - + Asset details: @@ -2107,7 +2107,7 @@ - + Pay only the required fee of %1 Pay only the required fee of %1 @@ -2704,7 +2704,13 @@ Use separate SOCKS&5 proxy to reach peers via Tor hidden services: - + + Language missing or translation incomplete? Help contributing translations here: +https://explore.transifex.com/feathered-inc/ + + + + Options set in this dialog are overriden by the command_line or in the configuration file: @@ -2854,14 +2860,7 @@ The user interface language can be set here. This setting will take effect after restarting %1. - - Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/raptoreum/ - Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/raptoreum/ - - - + &Unit to show amounts in: &Unit to show amounts in: @@ -6643,7 +6642,7 @@ https://www.transifex.com/projects/p/raptoreum/ UpdateAssetConfirmationDialog - + Yes Yes @@ -6822,7 +6821,7 @@ https://www.transifex.com/projects/p/raptoreum/ - 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. + 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. @@ -6852,7 +6851,7 @@ https://www.transifex.com/projects/p/raptoreum/ - + U&pdate Asset @@ -6892,7 +6891,7 @@ https://www.transifex.com/projects/p/raptoreum/ %1 (%2 blocks) - + Updating asset: %1<br> @@ -7245,11 +7244,6 @@ https://www.transifex.com/projects/p/raptoreum/ Warning: The Network does not appear to fully agree! Some miners addear to experiencing issues. - - - Warning: Unknown block versions being mined! It's possible unknown rules are in effect - - Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade. @@ -8198,7 +8192,7 @@ https://www.transifex.com/projects/p/raptoreum/ - Warning: unknown new rules activated (versionbit %i) + Warning: unknown new rules activated: Expected: 0x%08x, Actual: 0x%08x diff --git a/src/qt/locale/raptoreum_en.xlf b/src/qt/locale/raptoreum_en.xlf index 1472ed63d..f0c3e0475 100644 --- a/src/qt/locale/raptoreum_en.xlf +++ b/src/qt/locale/raptoreum_en.xlf @@ -723,41 +723,41 @@ Details for asset: %1 - 260 + 265 Mint details: - 405 + 378 Name: %1 <br> - 407 + 380 Amount: %1 Amount: %1 {1?} - 408 + 381 are added as transaction fee.<hr /> - 417 + 390 Confirm Asset Mint - 419 + 392 Yes Yes - 462 - 465 + 435 + 438 @@ -1794,8 +1794,8 @@ Yes Yes - 885 - 888 + 877 + 880 @@ -1857,86 +1857,86 @@ Asset details: - 363 + 361 Name: %1 <br> - 365 + 363 Isunique: %1 <br> - 366 + 364 Updatable: %1 <br> - 367 + 365 Decimalpoint: %1 <br> - 368 + 366 ReferenceHash: %1 <br> - 369 + 367 MaxMintCount: %1 <br> - 370 + 368 Owner: %1 <hr /> - 371 + 369 Distribution:<hr /> - 372 + 370 Type: %1 <br> - 373 + 371 Target: %1 <br> - 374 + 372 IssueFrequency: %1 <br> - 375 + 373 Amount: %1 Amount: %1 {1?} - 376 + 374 are added as transaction fee.<hr /> - 385 + 383 Confirm Asset Creation - 387 + 385 Pay only the required fee of %1 Pay only the required fee of %1 - 599 + 594 - 634 + 629 Estimated to begin confirmation within %n block(s). Estimated to begin confirmation within %n block. @@ -1949,27 +1949,27 @@ Warning: Invalid Raptoreum address Warning: Invalid Raptoreum address - 726 + 721 Warning: Unknown change address Warning: Unknown change address - 730 + 725 Confirm custom change address Confirm custom change address - 733 + 728 The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure? The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure? - 734 + 729 (no label) (no label) - 756 + 751 @@ -2260,7 +2260,7 @@ 1185 - 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. + 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. 1212 1225 @@ -2920,162 +2920,161 @@ 639 + Language missing or translation incomplete? Help contributing translations here: +https://explore.transifex.com/feathered-inc/ + + 780 + + Options set in this dialog are overriden by the command_line or in the configuration file: 911 - + Hide the icon from the system tray. Hide the icon from the system tray. 122 - + &Hide tray icon &Hide tray icon 125 - + Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu. Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu. 142 - + Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.<br/>%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |. Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.<br/>%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |. 844 857 - + &Third party transaction URLs &Third party transaction URLs 847 - + Whether to show coin control features or not. Whether to show coin control features or not. 251 - + Automatically start %1 after logging in to the system. Automatically start %1 after logging in to the system. 112 - + &Start %1 on system login &Start %1 on system login 115 - + Enable coin &control features Enable coin &control features 254 - + &Spend unconfirmed change &Spend unconfirmed change 274 - + This setting determines the amount of individual smartnodes that an input will be mixed through.<br/>More rounds of mixing gives a higher degree of privacy, but also costs more in fees. This setting determines the amount of individual smartnodes that an input will be mixed through.<br/>More rounds of mixing gives a higher degree of privacy, but also costs more in fees. 365 - + &Network &Network 67 - + Map port using &UPnP Map port using &UPnP 452 - + Proxy &IP: Proxy &IP: 491 648 - + IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1) IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1) 516 673 - + &Port: &Port: 523 680 - + Port of the proxy (e.g. 9050) Port of the proxy (e.g. 9050) 548 705 - + Used for reaching peers via: Used for reaching peers via: 572 - + IPv4 IPv4 588 - + IPv6 IPv6 601 - + Tor Tor 614 - + Connect to the Raptoreum network through a separate SOCKS5 proxy for Tor hidden services. Connect to the Raptoreum network through a separate SOCKS5 proxy for Tor hidden services. 636 - + Show only a tray icon after minimizing the window. Show only a tray icon after minimizing the window. 132 - + &Minimize to the tray instead of the taskbar &Minimize to the tray instead of the taskbar 135 - + M&inimize on close M&inimize on close 145 - + &Display &Display 77 - + User Interface &language: User Interface &language: 746 - + The user interface language can be set here. This setting will take effect after restarting %1. The user interface language can be set here. This setting will take effect after restarting %1. 759 - - Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/raptoreum/ - Language missing or translation incomplete? Help contributing translations here: -https://www.transifex.com/projects/p/raptoreum/ - 780 - &Unit to show amounts in: &Unit to show amounts in: @@ -6847,8 +6846,8 @@ https://www.transifex.com/projects/p/raptoreum/ Yes Yes - 714 - 717 + 681 + 684 @@ -6875,70 +6874,70 @@ https://www.transifex.com/projects/p/raptoreum/ Updating asset: %1<br> - 412 + 379 transfer ownership from: %1 <br> - 415 + 382 To: %1 <hr /> - 416 + 383 Updatable: %1 <br> - 419 + 386 ReferenceHash: %1 <br> - 422 + 389 Target: %1 <br> - 425 + 392 Distribution Type: %1 <br> - 428 + 395 Amount: %1 <br> - 431 + 398 MaxMintCount: %1 <br> - 434 + 401 IssueFrequency: %1 <br> - 437 + 404 are added as transaction fee.<hr /> - 448 + 415 Confirm Asset Update - 450 + 417 Pay only the required fee of %1 Pay only the required fee of %1 - 580 + 547 - 615 + 582 Estimated to begin confirmation within %n block(s). Estimated to begin confirmation within %n block. @@ -7121,7 +7120,7 @@ https://www.transifex.com/projects/p/raptoreum/ 652 - 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. + 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. 679 692 @@ -7440,1020 +7439,1015 @@ https://www.transifex.com/projects/p/raptoreum/ 117 - Warning: Unknown block versions being mined! It's possible unknown rules are in effect + Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade. 120 - Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade. + You need to rebuild the database using -reindex to change -timestampindex 123 - You need to rebuild the database using -reindex to change -timestampindex + You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain - 126 + 125 - You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain + %d of last 100 blocks have unexpected version 128 - %d of last 100 blocks have unexpected version + %s can't be lower than %s - 131 + 129 - %s can't be lower than %s + %s failed - 132 + 130 - %s failed + %s is idle. - 133 + 131 - %s is idle. + %s is not a valid backup folder! - 134 + 132 - %s is not a valid backup folder! + %s is set very high! - 135 + 133 - %s is set very high! + %s request incomplete: %s - 136 + 134 - %s request incomplete: %s + -devnet can only be specified once - 137 + 135 - -devnet can only be specified once + -maxmempool must be at least %d MB - 138 + 136 - -maxmempool must be at least %d MB + -port must be specified when -devnet and -listen are specified - 139 + 137 - -port must be specified when -devnet and -listen are specified + -rpcport must be specified when -devnet and -server are specified - 140 + 138 - -rpcport must be specified when -devnet and -server are specified + Already have that input. - 141 + 139 - Already have that input. + Asset Transfer amounts must be greater than 0 - 142 + 140 - Asset Transfer amounts must be greater than 0 + Asset owner key not in wallet - 143 + 141 - Asset owner key not in wallet + Automatic backups disabled - 144 + 142 - Automatic backups disabled + Can't find random Smartnode. - 145 + 143 - Can't find random Smartnode. + Can't mix while sync in progress. - 146 + 144 - Can't mix while sync in progress. + Can't mix: no compatible inputs found! - 147 + 145 - Can't mix: no compatible inputs found! + Cannot downgrade wallet - 148 + 146 - Cannot downgrade wallet + Cannot resolve -%s address: '%s' - 149 + 147 - Cannot resolve -%s address: '%s' + Cannot write to data directory '%s'; check permissions. - 150 + 148 - Cannot write to data directory '%s'; check permissions. + Change index out of range - 151 + 149 - Change index out of range + Collateral not valid. - 152 + 150 - Collateral not valid. + Config settings for %s only applied on %s network when in [%s] section. - 153 + 151 - Config settings for %s only applied on %s network when in [%s] section. + Copyright (C) - 154 + 152 - Copyright (C) + Corrupted block database detected - 155 + 153 - Corrupted block database detected + Could not find asmap file %s - 156 + 154 - Could not find asmap file %s + Could not parse asmap file %s - 157 + 155 - Could not parse asmap file %s - - 158 - - Do you want to rebuild the block database now? - 159 + 156 - + Done loading - 160 + 157 - + ERROR! Failed to create automatic backup ERROR! Failed to create automatic backup - 161 + 158 - + Entries are full. - 162 + 159 - + Entry exceeds maximum size. - 163 + 160 - + Error initializing block database - 164 + 161 - + Error initializing wallet database environment %s! - 165 + 162 - + Error loading %s - 166 + 163 - + Error loading %s: Private keys can only be disabled during creation - 167 + 164 - + Error loading %s: Wallet corrupted - 168 + 165 - + Error loading %s: Wallet requires newer version of %s - 169 + 166 - + Error loading %s: You can't disable HD on an already existing HD wallet - 170 + 167 - + Error loading block database - 171 + 168 - + Error loading wallet %s. Duplicate -wallet filename specified. - 172 + 169 - + Error opening block database - 173 + 170 - + Error reading from database, shutting down. - 174 + 171 - + Error upgrading chainstate database - 175 + 172 - + Error upgrading evo database - 176 + 173 - + Error Error - 177 + 174 - + Error: A fatal internal error occurred, see debug.log for details - 178 + 175 - + Error: Disk space is low for %s - 179 + 176 - + Error: Disk space is low! - 180 + 177 - + Error: failed to add socket to epollfd (epoll_ctl returned error %s) - 181 + 178 - + Error: failed to add socket to kqueuefd (kevent returned error %s) - 182 + 179 - + Exceeded max tries. - 183 + 180 - + Failed to clear fulfilled requests cache at - 184 + 181 - + Failed to clear governance cache at - 185 + 182 - + Failed to clear smartnode cache at - 186 + 183 - + Failed to commit EvoDB - 187 + 184 - + Failed to create backup %s! - 188 + 185 - + Failed to create backup, error: %s - 189 + 186 - + Failed to delete backup, error: %s - 190 + 187 - + Failed to find mixing queue to join - 191 + 188 - + Failed to get root metadata - 192 + 189 - + Failed to listen on any port. Use -listen=0 if you want this. - 193 + 190 - + Failed to load Assets Database - 194 + 191 - + Failed to load POW cache from - 195 + 192 - + Failed to load fulfilled requests cache from - 196 + 193 - + Failed to load governance cache from - 197 + 194 - + Failed to load smartnode cache from - 198 + 195 - + Failed to load sporks cache from - 199 + 196 - + Failed to rescan the wallet during initialization - 200 + 197 - + Failed to sign special tx - 201 + 198 - + Failed to start a new mixing queue - 202 + 199 - + Found enough users, signing ( waiting %s ) - 203 + 200 - + Found enough users, signing ... - 204 + 201 - + Importing... - 205 + 202 - + Incompatible mode. - 206 + 203 - + Incompatible version. - 207 + 204 - + Incorrect -rescan mode, falling back to default value - 208 + 205 - + Incorrect or no genesis block found. Wrong datadir for network? - 209 + 206 - + Information Information - 210 + 207 - + Initialization sanity check failed. %s is shutting down. - 211 + 208 - + Input is not valid. - 212 + 209 - + Inputs vs outputs size mismatch. - 213 + 210 - + Insufficient Unique asset funds - 214 + 211 - + Insufficient asset funds - 215 + 212 - + Insufficient funds. - 216 + 213 - + Invalid -onion address or hostname: '%s' - 217 + 214 - + Invalid -proxy address or hostname: '%s' - 218 + 215 - + Invalid amount for -%s=<amount>: '%s' - 219 + 216 - + Invalid amount for -discardfee=<amount>: '%s' - 220 + 217 - + Invalid amount for -fallbackfee=<amount>: '%s' - 221 + 218 - + Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s) - 222 + 219 - + Invalid minimum number of spork signers specified with -minsporkkeys - 223 + 220 - + Invalid netmask specified in -whitelist: '%s' - 224 + 221 - + Invalid script detected. - 225 + 222 - + Invalid smartnodeblsprivkey. Please see documentation. - 226 + 223 - + Invalid spork address specified with -sporkaddr - 227 + 224 - + Keypool ran out, please call keypoolrefill first - 228 + 225 - + Last queue was created too recently. - 229 + 226 - + Last successful action was too recent. - 230 + 227 - + Loading P2P addresses... - 231 + 228 - + Loading POW cache... - 232 + 229 - + Loading banlist... - 233 + 230 - + Loading block index... - 234 + 231 - + Loading fulfilled requests cache... - 235 + 232 - + Loading governance cache... - 236 + 233 - + Loading smartnode cache... - 237 + 234 - + Loading sporks cache... - 238 + 235 - + Loading wallet... (%3.2f %%) - 239 + 236 - + Loading wallet... - 240 + 237 - + Lock is already in place. - 241 + 238 - + Missing input transaction information. - 242 + 239 - + Mixing in progress... - 243 + 240 - + Need to specify a port with -whitebind: '%s' - 244 + 241 - + No Smartnodes detected. - 245 + 242 - + No compatible Smartnode found. - 246 + 243 - + No errors detected. - 247 + 244 - + No matching denominations found for mixing. - 248 + 245 - + Not compatible with existing transactions. - 249 + 246 - + Not enough file descriptors available. - 250 + 247 - + Not enough funds to mix. - 251 + 248 - + Not in the Smartnode list. - 252 + 249 - + Prune cannot be configured with a negative value. - 253 + 250 - + Prune mode is incompatible with -disablegovernance=false. - 254 + 251 - + Prune mode is incompatible with -txindex. - 255 + 252 - + Pruning blockstore... - 256 + 253 - + Reducing -maxconnections from %d to %d, because of system limitations. - 257 + 254 - + Replaying blocks... - 258 + 255 - + Rescanning... - 259 + 256 - + Root asset key not in wallet - 260 + 257 - + Section [%s] is not recognized. - 261 + 258 - + Session not complete! - 262 + 259 - + Session timed out. - 263 + 260 - + Signing transaction failed - 264 + 261 - + Smartnode queue is full. - 265 + 262 - + Smartnode: - 266 + 263 - + Specified -walletdir "%s" does not exist - 267 + 264 - + Specified -walletdir "%s" is a relative path - 268 + 265 - + Specified -walletdir "%s" is not a directory - 269 + 266 - + Specified blocks directory "%s" does not exist. - 270 + 267 - + Starting network threads... - 271 + 268 - + Submitted to smartnode, waiting in queue %s - 272 + 269 - + Synchronization finished - 273 + 270 - + Synchronizing blockchain... - 274 + 271 - + Synchronizing governance objects... - 275 + 272 - + The source code is available from %s. - 276 + 273 - + The specified config file %s does not exist - 277 + 274 - + The transaction amount is too small to pay the fee - 278 + 275 - + The wallet will avoid paying less than the minimum relay fee. - 279 + 276 - + This is expected because you are running a pruned node. - 280 + 277 - + This is experimental software. - 281 + 278 - + This is the minimum transaction fee you pay on every transaction. - 282 + 279 - + This is the transaction fee you will pay if you send a transaction. - 283 + 280 - + Transaction amount too small - 284 + 281 - + Transaction amounts must not be negative - 285 + 282 - + Transaction created successfully. - 286 + 283 - + Transaction fees are too high. - 287 + 284 - + Transaction has too long of a mempool chain - 288 + 285 - + Transaction must have at least one recipient - 289 + 286 - + Transaction not valid. - 290 + 287 - + Transaction too large for fee policy - 291 + 288 - + Transaction too large - 292 + 289 - + Trying to connect... - 293 + 290 - + Unable to bind to %s on this computer (bind returned error %s) - 294 + 291 - + Unable to bind to %s on this computer. %s is probably already running. - 295 + 292 - + Unable to create PID file '%s': %s - 296 + 293 - + Unable to generate initial keys - 297 + 294 - + Unable to locate enough mixed funds for this transaction. - 298 + 295 - + Unable to locate enough non-denominated funds for this transaction. - 299 + 296 - + Unable to sign spork message, wrong key? - 300 + 297 - + Unable to start HTTP server. See debug log for details. - 301 + 298 - + Unknown network specified in -onlynet: '%s' - 302 + 299 - + Unknown response. - 303 + 300 - + Unknown state: id = %u - 304 + 301 - + Unsupported logging category %s=%s. - 305 + 302 - + Upgrading UTXO database - 306 + 303 - + Upgrading txindex database - 307 + 304 - + User Agent comment (%s) contains unsafe characters. - 308 + 305 - + Verifying blocks... - 309 + 306 - + Verifying wallet(s)... - 310 + 307 - + Very low number of keys left: %d - 311 + 308 - + Wallet is locked. - 312 + 309 - + Wallet needed to be rewritten: restart %s to complete - 313 + 310 - + Warning Warning - 314 + 311 - + Warning: can't use %s and %s together, will prefer %s - 315 + 312 - + Warning: incorrect parameter %s, path must exist! Using default path. - 316 + 313 - - Warning: unknown new rules activated (versionbit %i) + + Warning: unknown new rules activated: Expected: 0x%08x, Actual: 0x%08x - 317 + 314 - + Wasn't able to create wallet backup folder %s! - 318 + 315 - + Will retry... - 319 + 316 - + You are starting with governance validation disabled. - 320 + 317 - + You can not disable governance validation on a smartnode. - 321 + 318 - + You can not start a smartnode with wallet enabled. - 322 + 319 - + You need to rebuild the database using -reindex to change -addressindex - 323 + 320 - + You need to rebuild the database using -reindex to change -assetindex - 324 + 321 - + You need to rebuild the database using -reindex to change -futureindex - 325 + 322 - + You need to rebuild the database using -reindex to change -spentindex - 326 + 323 - + Your entries added successfully. - 327 + 324 - + no mixing available. - 328 + 325 - + see debug.log for details. see debug.log for details. - 329 + 326 diff --git a/src/qt/raptoreumstrings.cpp b/src/qt/raptoreumstrings.cpp index 49e36e613..a1d30aa13 100644 --- a/src/qt/raptoreumstrings.cpp +++ b/src/qt/raptoreumstrings.cpp @@ -118,9 +118,6 @@ QT_TRANSLATE_NOOP("raptoreum-core", "" "Warning: The Network does not appear to fully agree! Some miners addear to " "experiencing issues."), QT_TRANSLATE_NOOP("raptoreum-core", "" -"Warning: Unknown block versions being mined! It's possible unknown rules are " -"in effect"), -QT_TRANSLATE_NOOP("raptoreum-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("raptoreum-core", "" @@ -314,7 +311,7 @@ QT_TRANSLATE_NOOP("raptoreum-core", "Wallet needed to be rewritten: restart %s t QT_TRANSLATE_NOOP("raptoreum-core", "Warning"), QT_TRANSLATE_NOOP("raptoreum-core", "Warning: can't use %s and %s together, will prefer %s"), QT_TRANSLATE_NOOP("raptoreum-core", "Warning: incorrect parameter %s, path must exist! Using default path."), -QT_TRANSLATE_NOOP("raptoreum-core", "Warning: unknown new rules activated (versionbit %i)"), +QT_TRANSLATE_NOOP("raptoreum-core", "Warning: unknown new rules activated: Expected: 0x%08x, Actual: 0x%08x"), QT_TRANSLATE_NOOP("raptoreum-core", "Wasn't able to create wallet backup folder %s!"), QT_TRANSLATE_NOOP("raptoreum-core", "Will retry..."), QT_TRANSLATE_NOOP("raptoreum-core", "You are starting with governance validation disabled."), diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index d0f1936f2..1a2dd54b5 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -5,7 +5,7 @@ file COPYING or http://www.opensource.org/licenses/mit-license.php. --------------------------------------------------------------------- -This file contains color changes for the dash theme "Dark". +This file contains color changes for the raptoreum theme "Dark". NOTE: This file gets appended to the general.css while its getting loaded in GUIUtil::loadStyleSheet(). Thus changes made in diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index ac28250d2..15de87010 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -1004,11 +1004,11 @@ AboutDialog QDialog#AboutDialog QLabel#label, QDialog#AboutDialog QLabel#copyrightLabel, -QDialog#AboutDialog QLabel#label_2 { /* About Dash Contents */ +QDialog#AboutDialog QLabel#label_2 { /* About Raptoreum Contents */ margin-left: 10px; } -QDialog#AboutDialog QLabel#label_2 { /* Margin for About Dash text */ +QDialog#AboutDialog QLabel#label_2 { /* Margin for About Raptoreum text */ margin-right: 10px; } diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index d566723db..efb9de5cc 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -5,7 +5,7 @@ file COPYING or http://www.opensource.org/licenses/mit-license.php. --------------------------------------------------------------------- -This file contains color changes for the dash theme "Light". +This file contains color changes for the raptoreum theme "Light". NOTE: This file gets appended to the general.css while its getting loaded in GUIUtil::loadStyleSheet(). Thus changes made in diff --git a/src/qt/res/css/traditional.css b/src/qt/res/css/traditional.css index 3e1b59578..9220e35c3 100644 --- a/src/qt/res/css/traditional.css +++ b/src/qt/res/css/traditional.css @@ -5,7 +5,7 @@ file COPYING or http://www.opensource.org/licenses/mit-license.php. --------------------------------------------------------------------- -This file contains all changes for the dash theme "Traditional". +This file contains all changes for the raptoreum theme "Traditional". NOTE: This file gets not appended to the general.css. The Traditional theme is a standalone theme which just fixes some bugs in the OS default diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp index 5217b2e82..69288c2b9 100644 --- a/src/rpc/governance.cpp +++ b/src/rpc/governance.cpp @@ -420,7 +420,7 @@ static UniValue gobject_submit(const JSONRPCRequest &request) { void gobject_vote_conf_help(const JSONRPCRequest &request) { RPCHelpMan{"gobject vote-conf", - "Vote on a governance object by masternode configured in dash.conf\n", + "Vote on a governance object by smartnode configured in raptoreum.conf\n", { {"governance-hash", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "hash of the governance object"}, diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 228ab54be..ac285a1d6 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -519,8 +519,8 @@ static UniValue getblocktemplate(const JSONRPCRequest &request) { {RPCResult::Type::STR, "bits", "compressed target of next block"}, {RPCResult::Type::STR, "previousbits", "compressed target of current highest block"}, {RPCResult::Type::NUM, "height", "The height of the next block"}, - {RPCResult::Type::ARR, "masternode", - "required masternode payments that must be included in the next block", + {RPCResult::Type::ARR, "smartnode", + "required smartnode payments that must be included in the next block", { {RPCResult::Type::OBJ, "", "", { diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index b52efafd4..5836b765d 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -367,7 +367,7 @@ UniValue getaddednodeinfo(const JSONRPCRequest &request) { {RPCResult::Type::OBJ, "", "", { {RPCResult::Type::STR, "address", - "The dash server IP and port we're connected to"}, + "The Raptoreum server IP and port we're connected to"}, {RPCResult::Type::STR, "connected", "connection, inbound or outbound"}, }}, diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp index 83595927f..b326ae479 100644 --- a/src/rpc/rpcevo.cpp +++ b/src/rpc/rpcevo.cpp @@ -157,12 +157,12 @@ static RPCArg GetRpcArg(const std::string &strParamName) { {"operatorPubKey_register", {"operatorPubKey_register", RPCArg::Type::STR, RPCArg::Optional::NO, "The operator BLS public key. The BLS private key does not have to be known.\n" - "It has to match the BLS private key which is later used when operating the masternode."} + "It has to match the BLS private key which is later used when operating the smartnode."} }, {"operatorPubKey_update", {"operatorPubKey_update", RPCArg::Type::STR, RPCArg::Optional::NO, "The operator BLS public key. The BLS private key does not have to be known.\n" - "It has to match the BLS private key which is later used when operating the masternode.\n" + "It has to match the BLS private key which is later used when operating the smartnode.\n" "If set to an empty string, the currently active operator BLS public key is reused."} }, {"operatorReward", @@ -178,11 +178,11 @@ static RPCArg GetRpcArg(const std::string &strParamName) { }, {"payoutAddress_register", {"payoutAddress_register", RPCArg::Type::STR, RPCArg::Optional::NO, - "The raptoreum address to use for masternode reward payments."} + "The raptoreum address to use for smartnode reward payments."} }, {"payoutAddress_update", {"payoutAddress_update", RPCArg::Type::STR, RPCArg::Optional::NO, - "The raptoreum address to use for masternode reward payments.\n" + "The raptoreum address to use for smartnode reward payments.\n" "If set to an empty string, the currently active payout address is reused."} }, {"proTxHash", @@ -191,7 +191,7 @@ static RPCArg GetRpcArg(const std::string &strParamName) { }, {"reason", {"reason", RPCArg::Type::NUM, /* default */ "", - "The reason for masternode service revocation."} + "The reason for smartnode service revocation."} }, {"submit", {"submit", RPCArg::Type::BOOL, /* default */ "true", @@ -524,7 +524,7 @@ void protx_register_help(const JSONRPCRequest& request) + HELP_REQUIRING_PASSPHRASE, { GetRpcArg("collateralHash"), - GetRpcArg("collateralAddress"), + GetRpcArg("collateralIndex"), GetRpcArg("ipAndPort"), GetRpcArg("ownerAddress"), GetRpcArg("operatorPubKey_register"), @@ -554,7 +554,7 @@ void protx_register_prepare_help(const JSONRPCRequest& request) "The prepared transaction will also contain inputs and outputs to cover fees.\n", { GetRpcArg("collateralHash"), - GetRpcArg("collateralAddress"), + GetRpcArg("collateralIndex"), GetRpcArg("ipAndPort"), GetRpcArg("ownerAddress"), GetRpcArg("operatorPubKey_register"), @@ -1084,7 +1084,7 @@ void protx_quick_setup_help(const JSONRPCRequest& request) + HELP_REQUIRING_PASSPHRASE, { GetRpcArg("collateralHash"), - GetRpcArg("collateralAddress"), + GetRpcArg("collateralIndex"), GetRpcArg("ipAndPort"), GetRpcArg("feeSourceAddress"), }, diff --git a/src/smartnode/smartnode-meta.h b/src/smartnode/smartnode-meta.h index c854a3b77..c8de9de3e 100644 --- a/src/smartnode/smartnode-meta.h +++ b/src/smartnode/smartnode-meta.h @@ -175,4 +175,4 @@ class CSmartnodeMetaMan { extern CSmartnodeMetaMan mmetaman; -#endif // BITCOIN_SMARTNODE_MASTERNODE_META_H +#endif // BITCOIN_SMARTNODE_SMARTNODE_META_H diff --git a/src/validation.cpp b/src/validation.cpp index b47f2d0bd..1c09fa5bc 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -774,7 +774,7 @@ static bool AcceptToMemoryPoolWorker(const CChainParams &chainparams, CTxMemPool // check special TXs after all the other checks. If we'd do this before the other checks, we might end up // DoS scoring a node for non-critical errors, e.g. duplicate keys because a TX is received that was already // mined - // NOTE: we use UTXO here and do NOT allow mempool txes as masternode collaterals + // NOTE: we use UTXO here and do NOT allow mempool txes as smartnode collaterals if (!CheckSpecialTx(tx, ::ChainActive().Tip(), state, ::ChainstateActive().CoinsTip(), &assetsCache, true)) return false; if (pool.existsProviderTxConflict(tx)) { diff --git a/src/version.h b/src/version.h index 4df7a2458..505f284c5 100644 --- a/src/version.h +++ b/src/version.h @@ -21,14 +21,14 @@ static const int OLD_MIN_PEER_PROTO_VERSION = 70213; static const int MIN_PEER_PROTO_VERSION = 70219; -//! minimum proto version of masternode to accept in DKGs +//! minimum proto version of smartnode to accept in DKGs static const int OLD_MIN_SMARTNODE_PROTO_VERSION = 70218; static const int MIN_SMARTNODE_PROTO_VERSION = 70219; //! minimum proto version for governance sync and messages static const int MIN_GOVERNANCE_PEER_PROTO_VERSION = 70213; -//! minimum proto version to broadcast governance messages from banned masternodes +//! minimum proto version to broadcast governance messages from banned smartnodes static const int GOVERNANCE_POSE_BANNED_VOTES_VERSION = 70215; //! nTime field added to CAddress, starting with this version; diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index 5dc406dc3..4e1cd3de1 100644 --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -144,11 +144,11 @@ void WalletInit::AddWalletOptions() const { strprintf("Enable multiple CoinJoin mixing sessions per block, experimental (0-1, default: %u)", DEFAULT_COINJOIN_MULTISESSION), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET_COINJOIN); gArgs.AddArg("-coinjoinrounds=", - strprintf("Use N separate masternodes for each denominated input to mix funds (%u-%u, default: %u)", + strprintf("Use N separate smartnodes for each denominated input to mix funds (%u-%u, default: %u)", MIN_COINJOIN_ROUNDS, MAX_COINJOIN_ROUNDS, DEFAULT_COINJOIN_ROUNDS), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET_COINJOIN); gArgs.AddArg("-coinjoinsessions=", - strprintf("Use N separate masternodes in parallel to mix funds (%u-%u, default: %u)", + strprintf("Use N separate smartnodes in parallel to mix funds (%u-%u, default: %u)", MIN_COINJOIN_SESSIONS, MAX_COINJOIN_SESSIONS, DEFAULT_COINJOIN_SESSIONS), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET_COINJOIN); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 33fd3b643..8ac64e280 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -3157,7 +3157,7 @@ static UniValue listunspent(const JSONRPCRequest &request) { "Minimum sum value of all UTXOs in " + CURRENCY_UNIT + ""}, {"coinType", RPCArg::Type::NUM, /* default */ "0", "Filter coinTypes as follows:\n" " 0=ALL_COINS, 1=ONLY_FULLY_MIXED, 2=ONLY_READY_TO_MIX, 3=ONLY_NONDENOMINATED,\n" - " 4=ONLY_MASTERNODE_COLLATERAL, 5=ONLY_COINJOIN_COLLATERAL"}, + " 4=ONLY_SMARTNODE_COLLATERAL, 5=ONLY_COINJOIN_COLLATERAL"}, }, "query_options"}, },