MERGE-FIX: Fix functional tests

Author: stevenroose

src/init.cpp

@@ -888,11 +888,6 @@ void InitParameterInteraction()
     for (const auto& arg : gArgs.GetUnsuitableSectionOnlyArgs()) {
         InitWarning(strprintf(_("Config setting for %s only applied on %s network when in [%s] section."), arg, network, network));
     }
-
-    // Warn if unrecognized section name are present in the config file.
-    for (const auto& section : gArgs.GetUnrecognizedSections()) {
-        InitWarning(strprintf(_("Section [%s] is not recognized."), section));
-    }
 }
 
 static std::string ResolveErrMsg(const char * const optname, const std::string& strBind)

src/rpc/blockchain.cpp

@@ -2371,6 +2371,7 @@ UniValue scantxoutset(const JSONRPCRequest& request)
                 unspent.pushKV("txid", outpoint.hash.GetHex());
                 unspent.pushKV("vout", (int32_t)outpoint.n);
                 unspent.pushKV("scriptPubKey", HexStr(txo.scriptPubKey.begin(), txo.scriptPubKey.end()));
+                unspent.pushKV("desc", descriptors[txo.scriptPubKey]);
                 if (txo.nValue.IsExplicit()) {
                     unspent.pushKV("amount", ValueFromAmount(txo.nValue.GetAmount()));
                 } else {

test/functional/data/invalid_txs.py

@@ -47,7 +47,7 @@ class BadTxTemplate:
 
     def __init__(self, *, spend_tx=None, spend_block=None):
         self.spend_tx = spend_block.vtx[0] if spend_block else spend_tx
-        self.spend_avail = sum(o.nValue for o in self.spend_tx.vout)
+        self.spend_avail = sum(o.nValue.getAmount() for o in self.spend_tx.vout)
         self.valid_txin = CTxIn(COutPoint(self.spend_tx.sha256, 0), b"", 0xffffffff)
 
     @abc.abstractmethod
@@ -78,17 +78,19 @@ def get_tx(self):
         return tx
 
 
-class SizeTooSmall(BadTxTemplate):
-    reject_reason = "tx-size-small"
-    expect_disconnect = False
-    valid_in_block = True
-
-    def get_tx(self):
-        tx = CTransaction()
-        tx.vin.append(self.valid_txin)
-        tx.vout.append(CTxOut(0, sc.CScript([sc.OP_TRUE])))
-        tx.calc_sha256()
-        return tx
+# ELEMENTS: disabled because we don't want to increase the minimal tx size and 
+# the value and asset size crosses the minimum value
+#class SizeTooSmall(BadTxTemplate):
+#    reject_reason = "tx-size-small"
+#    expect_disconnect = False
+#    valid_in_block = True
+#
+#    def get_tx(self):
+#        tx = CTransaction()
+#        tx.vin.append(self.valid_txin)
+#        tx.vout.append(CTxOut(0, sc.CScript([sc.OP_TRUE])))
+#        tx.calc_sha256()
+#        return tx
 
 
 class BadInputOutpointIndex(BadTxTemplate):
@@ -135,7 +137,8 @@ def get_tx(self):
 
 
 class SpendTooMuch(BadTxTemplate):
-    reject_reason = 'bad-txns-in-belowout'
+    reject_reason = 'bad-txns-in-ne-out'
+    block_reject_reason = 'block-validation-failed'
     expect_disconnect = True
 
     def get_tx(self):
@@ -159,7 +162,7 @@ class InvalidOPIFConstruction(BadTxTemplate):
     def get_tx(self):
         return create_tx_with_script(
             self.spend_tx, 0, script_sig=b'\x64' * 35,
-            amount=(self.spend_avail // 2))
+            amount=self.spend_avail)
 
 
 class TooManySigops(BadTxTemplate):
@@ -172,7 +175,7 @@ def get_tx(self):
         return create_tx_with_script(
             self.spend_tx, 0,
             script_pub_key=lotsa_checksigs,
-            amount=1)
+            amount=self.spend_avail)
 
 
 def iter_all_templates():

test/functional/feature_block_subsidy.py

@@ -37,7 +37,7 @@ def run_test(self):
         # Block will have 10 satoshi output, node 1 will ban
         addr = self.nodes[0].getnewaddress()
         sub_block = self.nodes[0].generatetoaddress(1, addr)
-        raw_coinbase = self.nodes[0].getrawtransaction(self.nodes[0].getblock(sub_block[0])["tx"][0])
+        raw_coinbase = self.nodes[0].getrawtransaction(self.nodes[0].getblock(sub_block[0])["tx"][0], False, sub_block[0])
         decoded_coinbase = self.nodes[0].decoderawtransaction(raw_coinbase)
 
         found_ten = False
@@ -53,13 +53,13 @@ def run_test(self):
 
         # Block will have 0 satoshis outputs only at height 1
         no_sub_block = self.nodes[1].generatetoaddress(1, addr)
-        raw_coinbase = self.nodes[1].getrawtransaction(self.nodes[1].getblock(no_sub_block[0])["tx"][0])
+        raw_coinbase = self.nodes[1].getrawtransaction(self.nodes[1].getblock(no_sub_block[0])["tx"][0], False, no_sub_block[0])
         decoded_coinbase = self.nodes[1].decoderawtransaction(raw_coinbase)
         for vout in decoded_coinbase["vout"]:
             if vout["value"] != 0:
                 raise Exception("Invalid output amount in coinbase")
 
-        tmpl = self.nodes[0].getblocktemplate()
+        tmpl = self.nodes[0].getblocktemplate({"rules": ["segwit"]})
 
         # Template with invalid amount(50*COIN) will be invalid in both
         coinbase_tx = create_coinbase(height=int(tmpl["height"]))

test/functional/feature_blocksdir.py

@@ -18,7 +18,7 @@ def set_test_params(self):
 
     def run_test(self):
         self.stop_node(0)
-        assert os.path.isdir(os.path.join(self.nodes[0].datadir, "regtest", "blocks"))
+        assert os.path.isdir(os.path.join(self.nodes[0].datadir, "elementsregtest", "blocks"))
         assert not os.path.isdir(os.path.join(self.nodes[0].datadir, "blocks"))
         shutil.rmtree(self.nodes[0].datadir)
         initialize_datadir(self.options.tmpdir, 0, self.chain)

test/functional/feature_confidential_transactions.py

@@ -567,7 +567,7 @@ def run_test(self):
         stx = self.nodes[0].signrawtransactionwithwallet(stx2['hex'])
         txid = self.nodes[2].sendrawtransaction(stx['hex'])
         self.nodes[2].generate(1)
-        assert self.nodes[2].getrawtransaction(txid, 1)['confirmations'] == 1
+        assert self.nodes[2].gettransaction(txid)['confirmations'] == 1
         self.sync_all()
 
         # Check that the sent asset has reached its destination

test/functional/feature_config_args.py

@@ -41,10 +41,11 @@ def test_config_file_parser(self):
             conf.write('server=1\nrpcuser=someuser\n[main]\nrpcpassword=some#pass')
         self.nodes[0].assert_start_raises_init_error(expected_msg='Error reading configuration file: parse error on line 4, using # in rpcpassword can be ambiguous and should be avoided')
 
-        with open(inc_conf_file_path, 'w', encoding='utf-8') as conf:
-            conf.write('testnot.datadir=1\n[testnet]\n')
-        self.restart_node(0)
-        self.nodes[0].stop_node(expected_stderr='Warning: Section [testnet] is not recognized.' + os.linesep + 'Warning: Section [testnot] is not recognized.')
+        # ELEMENTS: allows custom chains
+        #with open(inc_conf_file_path, 'w', encoding='utf-8') as conf:
+        #    conf.write('testnot.datadir=1\n[testnet]\n')
+        #self.restart_node(0)
+        #self.nodes[0].stop_node(expected_stderr='Warning: Section [testnet] is not recognized.' + os.linesep + 'Warning: Section [testnot] is not recognized.')
 
         with open(inc_conf_file_path, 'w', encoding='utf-8') as conf:
             conf.write('')  # clear

test/functional/feature_connect_coinbase.py

@@ -57,7 +57,7 @@ def run_test(self):
 
         # Issuance transaction is an OP_TRUE, so will be available to second node
         assert_raises_rpc_error(-5, "No such mempool transaction. Use -txindex to enable blockchain transaction queries. Use gettransaction for wallet transactions.", self.nodes[0].getrawtransaction, issuance_tx)
-        self.nodes[1].getrawtransaction(issuance_tx)
+        self.nodes[1].getrawtransaction(issuance_tx, False, self.nodes[0].getblockhash(0))
 
 if __name__ == '__main__':
     ConnectGenesisTest().main()

test/functional/feature_fedpeg.py

@@ -54,7 +54,7 @@ def setup_network(self, split=False):
 
         self.nodes = []
         # Setup parent nodes
-        parent_chain = "parent" if not self.options.parent_bitcoin else "regtest"
+        parent_chain = "elementsregtest" if not self.options.parent_bitcoin else "regtest"
         parent_binary = [self.options.parent_binpath] if self.options.parent_binpath != "" else None
         for n in range(2):
             extra_args = [
@@ -76,9 +76,8 @@ def setup_network(self, split=False):
                 extra_args.extend([
                     "-validatepegin=0",
                     "-initialfreecoins=0",
-                    "-anyonecanspendaremine",
+                    "-anyonecanspendaremine=1",
                     "-signblockscript=51", # OP_TRUE
-                    '-con_blocksubsidy=5000000000',
                 ])
 
             self.add_nodes(1, [extra_args], chain=[parent_chain], binary=parent_binary, chain_in_args=[not self.options.parent_bitcoin])
@@ -101,17 +100,16 @@ def setup_network(self, split=False):
                 "-printtoconsole=0",
                 "-port="+str(p2p_port(2+n)),
                 "-rpcport="+str(rpc_port(2+n)),
-                '-parentgenesisblockhash=%s' % self.parentgenesisblockhash,
                 '-validatepegin=1',
                 '-fedpegscript=%s' % self.fedpeg_script,
-                '-anyonecanspendaremine=0',
                 '-minrelaytxfee=0',
                 '-blockmintxfee=0',
                 '-initialfreecoins=0',
                 '-peginconfirmationdepth=10',
                 '-mainchainrpchost=127.0.0.1',
                 '-mainchainrpcport=%s' % rpc_port(n),
                 '-recheckpeginblockinterval=15', # Long enough to allow failure and repair before timeout
+                '-parentgenesisblockhash=%s' % self.parentgenesisblockhash,
                 '-parentpubkeyprefix=111',
                 '-parentscriptprefix=196',
                 '-parent_bech32_hrp=bcrt',
@@ -142,7 +140,7 @@ def setup_network(self, split=False):
                 datadir = get_datadir_path(self.options.tmpdir, n)
                 extra_args.append('-mainchainrpccookiefile='+datadir+"/" + parent_chain + "/.cookie")
 
-            self.add_nodes(1, [extra_args], chain=["sidechain"])
+            self.add_nodes(1, [extra_args], chain=["elementsregtest"])
             self.start_node(2+n)
             print("Node {} started".format(2+n))
 

test/functional/feature_mandatory_coinbase.py

@@ -23,7 +23,7 @@ def b2x(b):
 def assert_template(node, block, expect, rehash=True):
     if rehash:
         block.hashMerkleRoot = block.calc_merkle_root()
-    rsp = node.getblocktemplate({'data': b2x(block.serialize()), 'mode': 'proposal'})
+    rsp = node.getblocktemplate({'data': b2x(block.serialize()), 'mode': 'proposal', 'rules': 'segwit'})
     assert_equal(rsp, expect)
 
 class MandatoryCoinbaseTest(BitcoinTestFramework):
@@ -51,7 +51,7 @@ def run_test(self):
 
         # Have non-mandatory node make a template
         self.sync_all()
-        tmpl = node1.getblocktemplate()
+        tmpl = node1.getblocktemplate({'rules': ['segwit']})
 
         # We make a block with OP_TRUE coinbase output that will fail on node0
         coinbase_tx = create_coinbase(height=int(tmpl["height"]))
@@ -86,7 +86,7 @@ def run_test(self):
         #
         # Also test that coinbases can't have fees.
         self.sync_all()
-        tmpl = node1.getblocktemplate()
+        tmpl = node1.getblocktemplate({'rules': ['segwit']})
         coinbase_tx = create_coinbase(height=int(tmpl["height"]))
         # sequence numbers must not be max for nLockTime to have effect
         coinbase_tx.vin[0].nSequence = 2 ** 32 - 2