Merge branch 'master' into elements-22.1.2-rc1-prep

Author: psgreco

ci/test/04_install.sh

@@ -86,7 +86,7 @@ DOCKER_EXEC df -h
 
 if [ "$RUN_FUZZ_TESTS" = "true" ] || [ "$RUN_UNIT_TESTS" = "true" ] || [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]; then
   if [ ! -d ${DIR_QA_ASSETS} ]; then
-    DOCKER_EXEC git clone --depth=1 https://github.com/bitcoin-core/qa-assets ${DIR_QA_ASSETS}
+    DOCKER_EXEC git clone --depth=1 https://github.com/ElementsProject/qa-assets ${DIR_QA_ASSETS}
   fi
 
   export DIR_FUZZ_IN=${DIR_QA_ASSETS}/fuzz_seed_corpus/

configure.ac

@@ -673,6 +673,7 @@ case $host in
        AC_MSG_ERROR("windres not found")
      fi
 
+     CPPFLAGS="$CPPFLAGS -DSECP256K1_STATIC"
      CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -D_WIN32_WINNT=0x0601 -D_WIN32_IE=0x0501 -DWIN32_LEAN_AND_MEAN"
 
      dnl libtool insists upon adding -nostdlib and a list of objects/libs to link against.

doc/elements-confidential-transactions.md

@@ -217,11 +217,11 @@ class CBlockIndex
         m_signblock_witness = std::nullopt;
     }
 
-    bool trimmed() const {
+    inline bool trimmed() const {
         return m_trimmed;
     }
 
-    void assert_untrimmed() const {
+    inline void assert_untrimmed() const {
         assert(!m_trimmed);
     }
 
@@ -230,7 +230,7 @@ class CBlockIndex
         return proof.value();
     }
 
-    const bool dynafed_block() const {
+    bool is_dynafed_block() const {
         if (m_trimmed) {
             return m_trimmed_dynafed_block;
         }
@@ -417,12 +417,12 @@ class CDiskBlockIndex : public CBlockIndex
             nVersion = ~CBlockHeader::DYNAFED_HF_MASK & nVersion;
             return is_dyna;
         } else {
-            return !dynafed_params().IsNull();
+            return is_dynafed_block();
         }
     }
     bool RemoveDynaFedMaskOnSerialize(bool for_read) const {
         assert(!for_read);
-        return !dynafed_params().IsNull();
+        return is_dynafed_block();
     }
 
     SERIALIZE_METHODS(CDiskBlockIndex, obj)
@@ -445,12 +445,12 @@ class CDiskBlockIndex : public CBlockIndex
             READWRITE(obj.nVersion);
         } else {
             int32_t nVersion = obj.nVersion;
-            if (!obj.dynafed_params().IsNull()) {
+            if (obj.is_dynafed_block()) {
                 nVersion |= CBlockHeader::DYNAFED_HF_MASK;
             }
             READWRITE(nVersion);
         }
-        bool is_dyna = obj.RemoveDynaFedMaskOnSerialize(ser_action.ForRead());;
+        bool is_dyna = obj.RemoveDynaFedMaskOnSerialize(ser_action.ForRead());
 
         READWRITE(obj.hashPrev);
         READWRITE(obj.hashMerkleRoot);

src/chain.h

@@ -986,7 +986,7 @@ bool AppInitParameterInteraction(const ArgsManager& args)
         epoch_length = 20160;
     }
 
-    if (args.IsArgSet("-trim_headers")) {
+    if (args.GetBoolArg("-trim_headers", false)) {
         LogPrintf("Configured for header-trimming mode. This will reduce memory usage substantially, but we will be unable to serve as a full P2P peer, and certain header fields may be missing from JSON RPC output.\n");
         fTrimHeaders = true;
         // This calculation is driven by GetValidFedpegScripts in pegins.cpp, which walks the chain

src/init.cpp

@@ -2023,7 +2023,7 @@ void PeerManagerImpl::ProcessHeadersMessage(CNode& pfrom, const Peer& peer,
             if ((nodestate->pindexBestKnownBlock == nullptr) ||
                 (nodestate->pindexBestKnownBlock->nHeight < m_chainman.ActiveHeight())) {
                 // Our notion of what blocks a peer has available is based on its pindexBestKnownBlock,
-                // which is based on headers recieved from it. If we don't have one, or it's too old,
+                // which is based on headers received from it. If we don't have one, or it's too old,
                 // then we can never get blocks from this peer until we accept headers from it first.
                 LogPrint(BCLog::NET, "NOT discarding headers from peer=%d, to update its block availability. (current best header %d, active chain height %d)\n", pfrom.GetId(), pindexBestHeader->nHeight, m_chainman.ActiveHeight());
             } else {

src/net_processing.cpp

@@ -7,6 +7,7 @@
 #include <QStringList>
 
 #include <cassert>
+#include <util/system.h>
 
 static constexpr auto MAX_DIGITS_BTC = 16;
 
@@ -42,6 +43,19 @@ bool BitcoinUnits::valid(int unit)
 
 QString BitcoinUnits::longName(int unit)
 {
+    const std::string default_asset_name = gArgs.GetArg("-defaultpeggedassetname", "");
+    if (default_asset_name != "") {
+        std::string rv;
+        switch(unit)
+        {
+        case BTC: rv=default_asset_name;break;
+        case mBTC: rv=std::string("m-")+default_asset_name;break;
+        case uBTC: rv=std::string("μ-")+default_asset_name;break;
+        case SAT: rv=std::string("sat-")+default_asset_name;break;
+        default: rv="???";break;
+        }
+        return QString::fromUtf8(rv.c_str());
+    }
     switch(unit)
     {
     case BTC: return QString("L-BTC");
@@ -54,6 +68,9 @@ QString BitcoinUnits::longName(int unit)
 
 QString BitcoinUnits::shortName(int unit)
 {
+    if (gArgs.GetArg("-defaultpeggedassetname", "") != "") {
+        return longName(unit);
+    }
     switch(unit)
     {
     case uBTC: return QString::fromUtf8("L-bits");

src/qt/bitcoinunits.cpp

@@ -154,17 +154,17 @@ UniValue paramEntryToJSON(const DynaFedParamEntry& entry)
     }
 
     // fields all params have
-    result.pushKV("root", HexStr(entry.CalculateRoot()));
+    result.pushKV("root", entry.CalculateRoot().GetHex());
     result.pushKV("signblockscript", HexStr(entry.m_signblockscript));
     result.pushKV("max_block_witness", (uint64_t)entry.m_signblock_witness_limit);
 
     // add the extra root which is stored for compact and calculated for full
     if (entry.m_serialize_type == 1) {
         // compact
-        result.pushKV("extra_root", HexStr(entry.m_elided_root));
+        result.pushKV("extra_root", entry.m_elided_root.GetHex());
     } else if (entry.m_serialize_type == 2) {
         // full
-        result.pushKV("extra_root", HexStr(entry.CalculateExtraRoot()));
+        result.pushKV("extra_root", entry.CalculateExtraRoot().GetHex());
     }
 
     // some extra fields only present on full params
@@ -248,7 +248,7 @@ UniValue blockheaderToJSON(const CBlockIndex* tip, const CBlockIndex* blockindex
         result.pushKV("difficulty", GetDifficulty(blockindex));
         result.pushKV("chainwork", blockindex->nChainWork.GetHex());
     } else {
-        if (!blockindex->dynafed_block()) {
+        if (!blockindex->is_dynafed_block()) {
             if (blockindex->trimmed()) {
                 result.pushKV("signblock_witness_asm", "<trimmed>");
                 result.pushKV("signblock_witness_hex", "<trimmed>");