Merge branch 'UCR-develop' of https://github.com/decenomy/DSW

.github/ISSUE_TEMPLATE.md

@@ -1,7 +1,7 @@
 <!--- Remove this description and sections that do not apply -->
 
-This issue tracker is only for technical issues related to Ultra Clear Core.
-General Ultra Clear questions and/or support requests and are best directed to the [Ultra Clear Discord](https://discord.gg/VyEGKeZBrV).
+This issue tracker is only for technical issues related to UltraClear Core.
+General UltraClear questions and/or support requests and are best directed to the [UltraClear Discord](https://discord.gg/VyEGKeZBrV).
 
 ### Describe the issue
 
@@ -20,7 +20,7 @@ Tell us what happens instead
 ### Screenshots.
 If the issue is related to the GUI, screenshots can be added to this issue via drag & drop.
 
-### What version of Ultra Clear Core are you using?
+### What version of UltraClear Core are you using?
 List the version number/commit ID, and if it is an official binary, self compiled or a distribution package.
 
 ### Machine specs:

CONTRIBUTING.md

@@ -1,7 +1,7 @@
-Contributing to Ultra Clear Core
+Contributing to UltraClear Core
 ============================
 
-The Ultra Clear Core project operates an open contributor model where anyone is
+The UltraClear Core project operates an open contributor model where anyone is
 welcome to contribute towards development in the form of peer review, testing
 and patches. This document explains the practical process and guidelines for
 contributing.
@@ -64,7 +64,7 @@ the pull request affects. Valid areas as:
   - *Net* or *P2P* for changes to the peer-to-peer network code
   - *RPC/REST* for changes to the RPC or REST APIs
   - *Scripts and tools* for changes to the scripts and tools
-  - *Tests* for changes to the Ultra Clear Coreunit tests or QA tests
+  - *Tests* for changes to the UltraClear Coreunit tests or QA tests
   - *Trivial* should **only** be used for PRs that do not change generated
     executable code. Notably, refactors (change of function arguments and code
     reorganization) and changes in behavior should **not** be marked as trivial.
@@ -203,10 +203,10 @@ workload on reviewing.
 "Decision Making" Process
 -------------------------
 
-The following applies to code changes to the Ultra Clear Core project, and is not to be
-confused with overall Ultra Clear Network Protocol consensus changes.
+The following applies to code changes to the UltraClear Core project, and is not to be
+confused with overall UltraClear Network Protocol consensus changes.
 
-Whether a pull request is merged into Ultra Clear Core rests with the project merge
+Whether a pull request is merged into UltraClear Core rests with the project merge
 maintainers and ultimately the project lead.
 
 Maintainers will take into consideration if a patch is in line with the general
@@ -220,7 +220,7 @@ In general, all pull requests must:
   - Be well peer reviewed;
   - follow code style guidelines;
 
-Patches that change Ultra Clear consensus rules are considerably more involved than
+Patches that change UltraClear consensus rules are considerably more involved than
 normal because they affect the entire ecosystem and so must be preceded by
 extensive discussions and clear detailing. While each case will be different,
 one should be prepared to expend more time and effort than for other kinds of
@@ -263,7 +263,7 @@ higher in terms of discussion and peer review requirements, keeping in mind that
 mistakes could be very costly to the wider community. This includes refactoring
 of consensus critical code.
 
-Where a patchset proposes to change the Ultra Clear consensus, it must have been
+Where a patchset proposes to change the UltraClear consensus, it must have been
 discussed extensively on the forums and Discord, be accompanied by a widely
 discussed Proposal and have a generally widely perceived technical consensus of being
 a worthwhile change based on the judgement of the maintainers.
@@ -303,7 +303,7 @@ about:
 Release Policy
 --------------
 
-The project leader is the release manager for each Ultra Clear Core release.
+The project leader is the release manager for each UltraClear Core release.
 
 Copyright
 ---------

INSTALL

@@ -1,4 +1,4 @@
-Building Ultra Clear
+Building UltraClear
 
 Use the autogen script to prepare the build environment.
 
@@ -10,4 +10,4 @@ Always verify the signatures and checksums.
 
 See doc/build-*.md for instructions on building ultracleard,
 the intended-for-services, no-graphical-interface, reference
-implementation of Ultra Clear.
+implementation of UltraClear.

README.md

@@ -1,4 +1,4 @@
-Ultra Clear integration/staging repository
+UltraClear integration/staging repository
 =====================================
 
 • PoW Algorithm: X13

contrib/debian/control

@@ -36,7 +36,7 @@ Package: ultracleard
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: peer-to-peer network based digital currency - daemon
- Ultra Clear is a free, open source peer-to-peer electronic cash system that
+ UltraClear is a free, open source peer-to-peer electronic cash system that
  is completely decentralized, without the need for a central server or
  trusted parties.  Users hold the crypto keys to their own money and
  transact directly with each other, with the help of a P2P network to
@@ -52,7 +52,7 @@ Package: ultraclear-qt
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: peer-to-peer network based digital currency - Qt GUI
- Ultra Clear is a free, open source peer-to-peer electronic cash system that
+ UltraClear is a free, open source peer-to-peer electronic cash system that
  is completely decentralized, without the need for a central server or
  trusted parties.  Users hold the crypto keys to their own money and
  transact directly with each other, with the help of a P2P network to
@@ -61,4 +61,4 @@ Description: peer-to-peer network based digital currency - Qt GUI
  Full transaction history is stored locally at each client.  This
  requires 18.5+ GB of space, slowly growing.
  .
- This package provides ultraclear-Qt, a GUI for Ultra Clear based on Qt.
+ This package provides ultraclear-Qt, a GUI for UltraClear based on Qt.

contrib/debian/examples/pivx.conf

@@ -98,7 +98,7 @@
 
 # User interface options
 
-# Start Ultra Clear minimized
+# Start UltraClear minimized
 #min=1
 
 # Minimize to the system tray

contrib/debian/pivx-qt.desktop

@@ -1,9 +1,9 @@
 [Desktop Entry]
 Version=1.0
-Name=Ultra Clear
-Comment= Ultra Clear P2P Cryptocurrency
-Comment[fr]= Ultra Clear, monnaie virtuelle cryptographique pair à pair
-Comment[tr]= Ultra Clear, eşten eşe kriptografik sanal para birimi
+Name=UltraClear
+Comment= UltraClear P2P Cryptocurrency
+Comment[fr]= UltraClear, monnaie virtuelle cryptographique pair à pair
+Comment[tr]= UltraClear, eşten eşe kriptografik sanal para birimi
 Exec=ultraclear-qt %u
 Terminal=false
 Type=Application

contrib/debian/ucr-qt.desktop

@@ -1,9 +1,9 @@
 [Desktop Entry]
 Version=1.0
-Name=Ultra Clear 
-Comment=Ultra Clear P2P Cryptocurrency
-Comment[fr]=Ultra Clear, monnaie virtuelle cryptographique pair à pair
-Comment[tr]=Ultra Clear, eşten eşe kriptografik sanal para birimi
+Name=UltraClear 
+Comment=UltraClear P2P Cryptocurrency
+Comment[fr]=UltraClear, monnaie virtuelle cryptographique pair à pair
+Comment[tr]=UltraClear, eşten eşe kriptografik sanal para birimi
 Exec=ultraclear-qt %u
 Terminal=false
 Type=Application

doc/README.md

@@ -1,13 +1,13 @@
-Ultra Clear Core
+UltraClear Core
 =============
 
 Setup
 ---------------------
-[Ultra Clear Core](https://ucrcoin.net/) is the original Ultra Clear client and it builds the backbone of the network. However, it downloads and stores the entire history of Ultra Clear transactions; depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once.
+[UltraClear Core](https://ucrcoin.net/) is the original UltraClear client and it builds the backbone of the network. However, it downloads and stores the entire history of UltraClear transactions; depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once.
 
 Running
 ---------------------
-The following are some helpful notes on how to run Ultra Clear Core on your native platform.
+The following are some helpful notes on how to run UltraClear Core on your native platform.
 
 ### Unix
 
@@ -26,13 +26,13 @@ Drag ultraclear-Qt to your applications folder, and then run ultraclear-Qt.
 
 ### Need Help?
 
-* See the documentation at the [Ultra Clear Wiki](https://ucrcoin.net/)
+* See the documentation at the [UltraClear Wiki](https://ucrcoin.net/)
 for help and more information.
 * Join our Discord server [Discord Server](https://discord.gg/VyEGKeZBrV)
 
 Building
 ---------------------
-The following are developer notes on how to build Ultra Clear Core on your native platform. They are not complete guides, but include notes on the necessary libraries, compile flags, etc.
+The following are developer notes on how to build UltraClear Core on your native platform. They are not complete guides, but include notes on the necessary libraries, compile flags, etc.
 
 - [Dependencies](dependencies.md)
 - [macOS Build Notes](build-osx.md)
@@ -42,7 +42,7 @@ The following are developer notes on how to build Ultra Clear Core on your nativ
 
 Development
 ---------------------
-The Ultra Clear repo's [root README](/README.md) contains relevant information on the development process and automated testing.
+The UltraClear repo's [root README](/README.md) contains relevant information on the development process and automated testing.
 
 - [Developer Notes](developer-notes.md)
 - [Multiwallet Qt Development](multiwallet-qt.md)
@@ -55,8 +55,8 @@ The Ultra Clear repo's [root README](/README.md) contains relevant information o
 - [Dnsseed Policy](dnsseed-policy.md)
 
 ### Resources
-* Discuss on the [Ultra Clear Homepage](https://ucrcoin.net/).
-* Join the [Ultra Clear Discord](https://discord.gg/VyEGKeZBrV).
+* Discuss on the [UltraClear Homepage](https://ucrcoin.net/).
+* Join the [UltraClear Discord](https://discord.gg/VyEGKeZBrV).
 
 ### Miscellaneous
 - [Assets Attribution](assets-attribution.md)

doc/README_windows.txt

@@ -1,9 +1,9 @@
-Ultra Clear Core
+UltraClear Core
 =====================
 
 Intro
 -----
-Ultra Clear is a free open source peer-to-peer electronic cash system that is
+UltraClear is a free open source peer-to-peer electronic cash system that is
 completely decentralized, without the need for a central server or trusted
 parties.  Users hold the crypto keys to their own money and transact directly
 with each other, with the help of a P2P network to check for double-spending.
@@ -13,7 +13,7 @@ Setup
 -----
 Unpack the files into a directory and run ultraclear-qt.exe.
 
-Ultra Clear Core is the original Ultra Clear client and it builds the backbone of the network.
-However, it downloads and stores the entire history of Ultra Clear transactions;
+UltraClear Core is the original UltraClear client and it builds the backbone of the network.
+However, it downloads and stores the entire history of UltraClear transactions;
 depending on the speed of your computer and network connection, the synchronization
 process can take anywhere from a few hours to a day or more.

doc/dependencies.md

@@ -1,7 +1,7 @@
 Dependencies
 ============
 
-These are the dependencies currently used by Ultra Clear Core. You can find instructions for installing them in the `build-*.md` file for your platform.
+These are the dependencies currently used by UltraClear Core. You can find instructions for installing them in the `build-*.md` file for your platform.
 
 | Dependency | Version used | Minimum required | CVEs | Shared | [Bundled Qt library](https://doc.qt.io/qt-5/configure-options.html#third-party-libraries) |
 | --- | --- | --- | --- | --- | --- |

doc/dnsseed-policy.md

@@ -1,12 +1,12 @@
 Expectations for DNS Seed operators
 ====================================
 
-Ultra Clear Core attempts to minimize the level of trust in DNS seeds,
+UltraClear Core attempts to minimize the level of trust in DNS seeds,
 but DNS seeds still pose a small amount of risk for the network.
 As such, DNS seeds must be run by entities which have some minimum
-level of trust within the Ultra Clear community.
+level of trust within the UltraClear community.
 
-Other implementations of Ultra Clear software may also use the same
+Other implementations of UltraClear software may also use the same
 seeds and may be more exposed. In light of this exposure, this
 document establishes some basic expectations for operating dnsseeds.
 
@@ -16,7 +16,7 @@ and not sell or transfer control of the DNS seed. Any hosting services
 contracted by the operator are equally expected to uphold these expectations.
 
 1. The DNS seed results must consist exclusively of fairly selected and
-functioning Ultra Clear nodes from the public network to the best of the
+functioning UltraClear nodes from the public network to the best of the
 operators understanding and capability.
 
 2. For the avoidance of doubt, the results may be randomized but must not
@@ -26,7 +26,7 @@ urgent technical necessity and disclosed.
 3. The results may not be served with a DNS TTL of less than one minute.
 
 4. Any logging of DNS queries should be only that which is necessary
-for the operation of the service or urgent health of the Ultra Clear
+for the operation of the service or urgent health of the UltraClear
 network and must not be retained longer than necessary nor disclosed
 to any third party.
 
@@ -42,9 +42,9 @@ details of their operating practices.
 related to the DNS seed operation.
 
 If these expectations cannot be satisfied the operator should
-discontinue providing services and contact the active Ultra Clear
+discontinue providing services and contact the active UltraClear
 Core development team as well as posting on the
-[Ultra Clear Discord](https://discord.gg/VyEGKeZBrV).
+[UltraClear Discord](https://discord.gg/VyEGKeZBrV).
 
 Behavior outside of these expectations may be reasonable in some
 situations but should be discussed in public in advance.

src/chainparams.cpp

@@ -389,7 +389,7 @@ class CTestNetParams : public CMainParams
         assert(genesis.hashMerkleRoot == uint256S("0x57614ebefbc1a26b6cee7cd4bc94d060baaadf1ad2551a81153a588fd75b471c"));
 
         consensus.fPowAllowMinDifficultyBlocks = true;
-        consensus.powLimit   = ~UINT256_ZERO >> 20;   // Ultra Clear starting difficulty is 1 / 2^12
+        consensus.powLimit   = ~UINT256_ZERO >> 20;   // UltraClear starting difficulty is 1 / 2^12
         consensus.posLimitV1 = ~UINT256_ZERO >> 24;
         consensus.posLimitV2 = ~UINT256_ZERO >> 20;
         consensus.nBudgetCycleBlocks = 144;         // approx 10 cycles per day
@@ -481,11 +481,11 @@ class CTestNetParams : public CMainParams
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1, 139); // Testnet ultraclear addresses start with 'x' or 'y'
         base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1, 19);  // Testnet ultraclear_ script addresses start with '8' or '9'
         base58Prefixes[SECRET_KEY] = std::vector<unsigned char>(1, 239);     // Testnet private keys start with '9' or 'c' (Bitcoin defaults)
-        // Testnet Ultra Clear BIP32 pubkeys start with 'DRKV'
+        // Testnet UltraClear BIP32 pubkeys start with 'DRKV'
         base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x3a)(0x80)(0x61)(0xa0).convert_to_container<std::vector<unsigned char> >();
-        // Testnet Ultra Clear BIP32 prvkeys start with 'DRKP'
+        // Testnet UltraClear BIP32 prvkeys start with 'DRKP'
         base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x3a)(0x80)(0x58)(0x37).convert_to_container<std::vector<unsigned char> >();
-        // Testnet Ultra Clear BIP44 coin type is '1' (All coin's testnet default)
+        // Testnet UltraClear BIP44 coin type is '1' (All coin's testnet default)
         base58Prefixes[EXT_COIN_TYPE] = boost::assign::list_of(0x80)(0x00)(0x00)(0x01).convert_to_container<std::vector<unsigned char> >();
 
         vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_test, pnSeed6_test + ARRAYLEN(pnSeed6_test));
@@ -515,7 +515,7 @@ class CRegTestParams : public CTestNetParams
         //assert(genesis.hashMerkleRoot == uint256S("0x1b2ef6e2f28be914103a277377ae7729dcd125dfeb8bf97bd5964ba72b6dc39b"));
 
         consensus.fPowAllowMinDifficultyBlocks = true;
-        consensus.powLimit   = ~UINT256_ZERO >> 20;   // Ultra Clear starting difficulty is 1 / 2^12
+        consensus.powLimit   = ~UINT256_ZERO >> 20;   // UltraClear starting difficulty is 1 / 2^12
         consensus.posLimitV1 = ~UINT256_ZERO >> 24;
         consensus.posLimitV2 = ~UINT256_ZERO >> 20;
         consensus.nBudgetCycleBlocks = 144;         // approx 10 cycles per day

src/chainparams.h

@@ -31,7 +31,7 @@ struct SeedSpec6 {
 
 /**
  * CChainParams defines various tweakable parameters of a given instance of the
- * Ultra Clear system. There are three: the main network on which people trade goods
+ * UltraClear system. There are three: the main network on which people trade goods
  * and services, the public test network which gets reset from time to time and
  * a regression test mode which is intended for private networks only. It has
  * minimal difficulty to ensure that blocks can be found instantly.

src/chainparamsbase.h

@@ -15,7 +15,7 @@
 
 /**
  * CBaseChainParams defines the base parameters (shared between ultraclear-cli and ultracleard)
- * of a given instance of the Ultra Clear system.
+ * of a given instance of the UltraClear system.
  */
 class CBaseChainParams
 {

src/clientversion.cpp

@@ -14,7 +14,7 @@
  * for both ultracleard and ultraclear-qt, to make it harder for attackers to
  * target servers or GUI users specifically.
  */
-const std::string CLIENT_NAME("Ultra Clear");
+const std::string CLIENT_NAME("Ultra Clear Core");
 
 /**
  * Client version number

src/consensus/upgrades.cpp

@@ -16,7 +16,7 @@
 const struct NUInfo NetworkUpgradeInfo[Consensus::MAX_NETWORK_UPGRADES] = {
         {
                 /*.strName =*/ "Base",
-                /*.strInfo =*/ "Ultra Clear network",
+                /*.strInfo =*/ "UltraClear network",
         },
         {
                 /*.strName =*/ "PoS",