Merge branch 'master' into elem-23.3.3-final

Author: psgreco

src/chainparamsbase.cpp

@@ -22,7 +22,7 @@ const std::string CBaseChainParams::DEFAULT = CBaseChainParams::LIQUID1;
 
 void SetupChainParamsBaseOptions(ArgsManager& argsman)
 {
-    argsman.AddArg("-chain=<chain>", "Use the chain <chain> (default: liquidv1). Reserved values: main, test, signet, regtest, liquidv1, liquidv1test", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
+    argsman.AddArg("-chain=<chain>", "Use the chain <chain> (default: liquidv1). Reserved values: main, test, signet, regtest, liquidv1, liquidv1test, liquidtestnet", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     argsman.AddArg("-regtest", "Enter regression test mode, which uses a special chain in which blocks can be solved instantly. "
                  "This is intended for regression testing tools and app development. Equivalent to -chain=regtest.", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS);
     argsman.AddArg("-testactivationheight=name@height.", "Set the activation height of 'name' (segwit, bip34, dersig, cltv, csv). (regtest-only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);

src/qt/bitcoinamountfield.cpp

@@ -124,11 +124,11 @@ class AmountSpinBox: public QAbstractSpinBox
         val.second = val.second + steps * currentSingleStep;
         val.second = qMax(val.second, CAmount(0));
         val.second = qBound(m_min_amount, val.second, m_max_amount);
-        // FIXME: Add this back in when assets can have > MAX_MONEY
-        // if (val.first == Params().GetConsensus().pegged_asset)
-        {
-            val.second = qMin(val.second, BitcoinUnits::maxMoney());
-        }
+        // ELEMENTS: issued assets can have values > MAX_MONEY
+        if (val.first == Params().GetConsensus().pegged_asset)
+            {
+                val.second = qMin(val.second, BitcoinUnits::maxMoney());
+            }
         setValue(val);
     }
 
@@ -228,8 +228,8 @@ class AmountSpinBox: public QAbstractSpinBox
         bool valid = GUIUtil::parseAssetAmount(current_asset, text, currentUnit, &val);
         if(valid)
         {
-            // FIXME: Add this back in when assets can have > MAX_MONEY
-            if (val < 0 || (val > BitcoinUnits::maxMoney() /*&& current_asset == Params().GetConsensus().pegged_asset*/)) {
+            // ELEMENTS: issued assets can have values > MAX_MONEY
+            if (val < 0 || (val > BitcoinUnits::maxMoney() && current_asset == Params().GetConsensus().pegged_asset)) {
                 valid = false;
             }
         }

src/rpc/blockchain.cpp

@@ -1672,7 +1672,7 @@ RPCHelpMan getblockchaininfo()
                 RPCResult{
                     RPCResult::Type::OBJ, "", "",
                     {
-                        {RPCResult::Type::STR, "chain", "current network name (main, test, signet, regtest)"},
+                        {RPCResult::Type::STR, "chain", "current network name (main, test, signet, regtest, liquidv1, liquidv1test, liquidtestnet)"},
                         {RPCResult::Type::NUM, "blocks", "the height of the most-work fully-validated chain. The genesis block has height 0"},
                         {RPCResult::Type::NUM, "headers", "the current number of headers we have validated"},
                         {RPCResult::Type::STR, "bestblockhash", "the hash of the currently best block"},

src/rpc/mining.cpp

@@ -444,7 +444,7 @@ static RPCHelpMan getmininginfo()
                         {RPCResult::Type::NUM, "difficulty", "The current difficulty"},
                         {RPCResult::Type::NUM, "networkhashps", "The network hashes per second"},
                         {RPCResult::Type::NUM, "pooledtx", "The size of the mempool"},
-                        {RPCResult::Type::STR, "chain", "current network name (main, test, signet, regtest)"},
+                        {RPCResult::Type::STR, "chain", "current network name (main, test, signet, regtest, liquidv1, liquidv1test, liquidtestnet)"},
                         {RPCResult::Type::STR, "warnings", "any network and blockchain warnings"},
                     }},
                 RPCExamples{