Merge remote-tracking branch 'origin/master' into elements-22-fix-ci

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/

doc/elements-confidential-transactions.md

@@ -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

src/rpc/blockchain.cpp

@@ -1684,7 +1684,7 @@ static void AssetTest(const UniValue& test)
     size_t idx = test["index"].get_int64();
     unsigned int test_flags = ParseScriptFlags(test["flags"].get_str());
     bool fin = test.exists("final") && test["final"].get_bool();
-    // ELEMENTS FIXME: update feature_taproot.py --dumptests to actually output these
+    // ELEMENTS: feature_taproot.py --dumptests outputs this field
     uint256 hash_genesis_block = test.exists("hash_genesis_block") ? uint256S(test["hash_genesis_block"].get_str()) : uint256{};
 
     if (test.exists("success")) {
@@ -1725,6 +1725,8 @@ BOOST_AUTO_TEST_CASE(script_assets_test)
 {
     // See src/test/fuzz/script_assets_test_minimizer.cpp for information on how to generate
     // the script_assets_test.json file used by this test.
+    // ELEMENTS: qa-assets repo can be cloned here https://github.com/ElementsProject/qa-assets
+    // then set DIR_UNIT_TEST_DATA env var to /path/to/qa-assets/unit_test_data when running this test
 
     const char* dir = std::getenv("DIR_UNIT_TEST_DATA");
     BOOST_WARN_MESSAGE(dir != nullptr, "Variable DIR_UNIT_TEST_DATA unset, skipping script_assets_test");
@@ -1744,12 +1746,11 @@ BOOST_AUTO_TEST_CASE(script_assets_test)
     BOOST_CHECK(tests.isArray());
     BOOST_CHECK(tests.size() > 0);
 
-/*
-    ELEMENTS: temporarily disabled until we implement the new Taproot sighash and upload new qa-assets
+    g_con_elementsmode = true;
     for (size_t i = 0; i < tests.size(); i++) {
         AssetTest(tests[i]);
     }
-*/
+    g_con_elementsmode = false;
     file.close();
 }
 

src/test/script_tests.cpp

@@ -1172,7 +1172,7 @@ PackageMempoolAcceptResult MemPoolAccept::AcceptMultipleTransactions(const std::
     }
 
     for (Workspace& ws : workspaces) {
-        PrecomputedTransactionData txdata;
+        PrecomputedTransactionData txdata(args.m_chainparams.HashGenesisBlock());
         if (!PolicyScriptChecks(args, ws, txdata)) {
             // Exit early to avoid doing pointless work. Update the failed tx result; the rest are unfinished.
             package_state.Invalid(PackageValidationResult::PCKG_TX, "transaction failed");

src/validation.cpp

@@ -29,6 +29,8 @@
 initial_extension = [initial_online+initial_online]
 new_extension = [initial_offline+initial_online]
 
+initial_cpe_root = "3700bdb2975ff8e0dadaaba2b33857b0ca2610c950a92b1db725025e3647a8e1"
+
 ERR_MP_INVALID_PEGOUT = "invalid-pegout-proof"
 ERR_MP_INVALID_PEGIN = "pegin-no-witness"
 
@@ -48,16 +50,19 @@ def validate_no_vote_op_true(node, block, first_dynafed_active_block):
     assert_equal(dynamic_parameters["current"]["signblockscript"], WSH_OP_TRUE)
     if block_height % 10 == 0 or first_dynafed_active_block:
         assert_equal(dynamic_parameters["current"]["type"], "full")
+        assert_equal(dynamic_parameters["current"]["root"], initial_cpe_root)
         assert_equal(dynamic_parameters["current"]["fedpegscript"], "51")
         assert_equal(dynamic_parameters["current"]["extension_space"], initial_extension)
     else:
         assert_equal(dynamic_parameters["current"]["type"], "compact")
+        assert_equal(dynamic_parameters["current"]["root"], initial_cpe_root)
         assert not "fedpegscript" in dynamic_parameters["proposed"]
         assert not "extension_space" in dynamic_parameters["proposed"]
     assert_equal(dynamic_parameters["current"]["max_block_witness"], 74)
     # nothing was proposed, null fields make impossible to be valid blockheader
     # due to script rules requiring bool true on stack
     assert_equal(dynamic_parameters["proposed"]["type"], "null")
+    assert not "root" in dynamic_parameters["proposed"]
     assert not "signblockscript" in dynamic_parameters["proposed"]
     assert not "max_block_witness" in dynamic_parameters["proposed"]
     assert not "fedpegscript" in dynamic_parameters["proposed"]
@@ -134,6 +139,9 @@ def test_dynafed_activation(self):
         self.sync_blocks(timeout=240)
         assert_equal(self.nodes[0].getblockchaininfo()["softforks"]["dynafed"]["bip9"]["status"], "active")
 
+        # Check the root hash
+        assert_equal(self.nodes[0].getblockchaininfo()["current_params_root"], initial_cpe_root)
+
         # Existing blocks should have null dynafed fields
         for block in blocks:
             assert "dynamic_parameters" not in self.nodes[0].getblock(block)

test/functional/feature_dynafed.py

@@ -21,6 +21,7 @@
     CTxOut,
     CTxOutValue,
     CTxOutWitness,
+    ser_uint256,
     uint256_from_str,
 )
 from test_framework.script import (
@@ -1179,12 +1180,15 @@ def dump_json_test(tx, input_utxos, idx, success, failure):
     # Determine flags to dump
     flags = LEGACY_FLAGS if spender.comment.startswith("legacy/") or spender.comment.startswith("inactive/") else TAPROOT_FLAGS
 
+    hash_genesis_block = bytearray(ser_uint256(g_genesis_hash))
+    hash_genesis_block.reverse()
     fields = [
         ("tx", tx.serialize().hex()),
         ("prevouts", [x.output.serialize().hex() for x in input_utxos]),
         ("index", idx),
         ("flags", flags),
-        ("comment", spender.comment)
+        ("comment", spender.comment),
+        ("hash_genesis_block", hash_genesis_block.hex())
     ]
 
     # The "final" field indicates that a spend should be always valid, even with more validation flags enabled