Merge branch 'feature/bitcoin-v26.2-merge' of https://github.com/DigiByte-Core/digibyte into feature/bitcoin-v26.2-merge

Author: JaredTate

src/net_processing.cpp

@@ -121,7 +121,7 @@ static const int MAX_BLOCKTXN_DEPTH = 10;
  *  Larger windows tolerate larger download speed differences between peer, but increase the potential
  *  degree of disordering of blocks on disk (which make reindexing and pruning harder). We'll probably
  *  want to make this a per-peer adaptive value at some point. */
-static const unsigned int BLOCK_DOWNLOAD_WINDOW = 4096;
+static const unsigned int BLOCK_DOWNLOAD_WINDOW = 1024;
 /** Block download timeout base, expressed in multiples of the block interval (i.e. 10 min) */
 static constexpr double BLOCK_DOWNLOAD_TIMEOUT_BASE = 1;
 /** Additional block download timeout per parallel downloading peer (i.e. 5 min) */

src/wallet/wallet.cpp

@@ -2007,12 +2007,19 @@ bool CWallet::SubmitTxMemoryPoolAndRelay(CWalletTx& wtx, std::string& err_string
     bool ret = chain().broadcastTransaction(wtx.tx, m_default_max_tx_fee, relay, err_string);
     if (ret) {
         wtx.m_state = TxStateInMempool{};
-        // Refresh status to ensure we have the correct state (mempool vs stempool)
-        RefreshMempoolStatus(wtx, chain());
+        // When Dandelion is disabled, transactions go directly to mempool but may take
+        // time to propagate through internal structures. Don't overwrite the state we
+        // just set unless we're certain the transaction is not in mempool.
         if (gArgs.GetBoolArg("-dandelion", true)) {
+            // Only refresh status for Dandelion mode where stempool/mempool transitions occur
+            RefreshMempoolStatus(wtx, chain());
             WalletLogPrintf("SubmitTxMemoryPoolAndRelay: Transaction %s submitted for Dandelion routing, state=%s\n", 
                            wtx.GetHash().ToString(), 
                            wtx.state<TxStateInMempool>() ? "InMempool" : "NotInMempool");
+        } else {
+            // In non-Dandelion mode, trust that broadcastTransaction success means InMempool
+            WalletLogPrintf("SubmitTxMemoryPoolAndRelay: Transaction %s added to mempool (Dandelion disabled)\n", 
+                           wtx.GetHash().ToString());
         }
     }
     return ret;

test/functional/data/rpc_getblockstats.json

@@ -103,9 +103,7 @@
     "02000020c5e1e001bb8e5c325ab00865497d52498b9da09848756da3ed25adb1c7a96536b838a07f0ac41f31c2352d06c38b8a7ca4536fa5e1f33106e8d06a83ab3ae5df2b4ae75affff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016400ffffffff02004071618c0600001976a9149e0fba4896c9771390bf1c931e368cf3494a24da88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
     "02000020b4b409e3d6fe79da7111d446cd58b69bb56e724ce253429c703e8140fd2dabee4e06b53a7aa2641a676cbc04f74e212510b73630ec25c58454b113424dfc5c712b4ae75affff7f200700000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016500ffffffff02004071618c0600001976a9149e0fba4896c9771390bf1c931e368cf3494a24da88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
     "020000203b918e752e01d9ed65cc510ec2d0d5f36e1236e41f8a58ceb008d85ae6bbd69e683c218bc1e81ca72f75ce3701a5e3cf387bcbd0e3f867576e8b29dee2b489d52b4ae75affff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016600ffffffff02004071618c0600001976a9149e0fba4896c9771390bf1c931e368cf3494a24da88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "02000020b1ef3969535bb84a6c6efae11e0c8e6851760e4e56fad6bf348e1ea8c5a3206333b34ac80b72b925072f55b2d6b8e6be8c16a3bf86a953e988218bce326a7b962b4ae75affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016700ffffffff02004071618c0600001976a9149e0fba4896c9771390bf1c931e368cf3494a24da88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "02000020343865ce4529f124cae102f0f3350b1867d28b74714314f7a46f480a62f4dbce9a332f0cb80b556e596172da1ff78aed3a96f092e3062c813ff75b1a4c2a5f2d2c4ae75affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016800ffffffff02004071618c0600001976a9149e0fba4896c9771390bf1c931e368cf3494a24da88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "02000020ca2ac2024fcaba89286504ba22abf2afdb630bb08a02ea281421ec7768b4ea5b40097bdf48f92ab915f0e7497053e77e38f97d8895ec8f5d0a887653c4270bb92c4ae75affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016900ffffffff02004071618c0600001976a9149e0fba4896c9771390bf1c931e368cf3494a24da88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000"
+    "02000020b1ef3969535bb84a6c6efae11e0c8e6851760e4e56fad6bf348e1ea8c5a3206333b34ac80b72b925072f55b2d6b8e6be8c16a3bf86a953e988218bce326a7b962b4ae75affff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03016700ffffffff02004071618c0600001976a9149e0fba4896c9771390bf1c931e368cf3494a24da88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000"
   ],
   "mocktime": 1525107225,
   "stats": [

test/functional/feature_coinstatsindex.py

@@ -137,8 +137,8 @@ def _test_coin_stats_index(self):
             assert_equal(res5['block_info'], {
                 'unspendable': Decimal('0E-8'),
                 'prevout_spent': Decimal('72000.00000000'),
-                'new_outputs_ex_coinbase': Decimal('71999.96880000'),  # DigiByte: Adjusted for 100x fees
-                'coinbase': Decimal('72000.03120000'),  # DigiByte: Adjusted for 100x fees
+                'new_outputs_ex_coinbase': Decimal('71999.99688000'),  # DigiByte: Corrected fees
+                'coinbase': Decimal('72000.00312000'),  # DigiByte: Corrected fees
                 'unspendables': {
                     'genesis_block': Decimal('0E-8'),
                     'bip30': Decimal('0E-8'),

test/functional/feature_segwit.py

@@ -128,13 +128,13 @@ def setup_network(self):
         self.sync_all()
 
     def success_mine(self, node, txid, sign, redeem_script=""):
-        send_to_witness(1, node, getutxo(txid), self.pubkey[0], False, Decimal("71998"), sign, redeem_script)
+        send_to_witness(1, node, getutxo(txid), self.pubkey[0], False, Decimal("71999.998"), sign, redeem_script)
         block = self.generate(node, 1)
         assert_equal(len(node.getblock(block[0])["tx"]), 2)
         self.sync_blocks()
 
     def fail_accept(self, node, error_msg, txid, sign, redeem_script=""):
-        assert_raises_rpc_error(-26, error_msg, send_to_witness, use_p2wsh=1, node=node, utxo=getutxo(txid), pubkey=self.pubkey[0], encode_p2sh=False, amount=Decimal("71998"), sign=sign, insert_redeem_script=redeem_script)
+        assert_raises_rpc_error(-26, error_msg, send_to_witness, use_p2wsh=1, node=node, utxo=getutxo(txid), pubkey=self.pubkey[0], encode_p2sh=False, amount=Decimal("71999.998"), sign=sign, insert_redeem_script=redeem_script)
 
     def run_test(self):
         self.generate(self.nodes[0], 161)  # block 161
@@ -197,15 +197,15 @@ def run_test(self):
         for _ in range(5):
             for n in range(3):
                 for v in range(2):
-                    wit_ids[n][v].append(send_to_witness(v, self.nodes[0], find_spendable_utxo(self.nodes[0], 72000), self.pubkey[n], False, Decimal("71999")))
-                    p2sh_ids[n][v].append(send_to_witness(v, self.nodes[0], find_spendable_utxo(self.nodes[0], 72000), self.pubkey[n], True, Decimal("71999")))
+                    wit_ids[n][v].append(send_to_witness(v, self.nodes[0], find_spendable_utxo(self.nodes[0], 72000), self.pubkey[n], False, Decimal("71999.999")))
+                    p2sh_ids[n][v].append(send_to_witness(v, self.nodes[0], find_spendable_utxo(self.nodes[0], 72000), self.pubkey[n], True, Decimal("71999.999")))
 
         self.generate(self.nodes[0], 1)  # block 163
 
         # Make sure all nodes recognize the transactions as theirs
-        assert_equal(self.nodes[0].getbalance(), balance_presetup - 60 * 72000 + 20 * Decimal("71999") + 72000)
-        assert_equal(self.nodes[1].getbalance(), 20 * Decimal("71999"))
-        assert_equal(self.nodes[2].getbalance(), 20 * Decimal("71999"))
+        assert_equal(self.nodes[0].getbalance(), balance_presetup - 60 * 72000 + 20 * Decimal("71999.999") + 72000)
+        assert_equal(self.nodes[1].getbalance(), 20 * Decimal("71999.999"))
+        assert_equal(self.nodes[2].getbalance(), 20 * Decimal("71999.999"))
 
         self.log.info("Verify unsigned p2sh witness txs without a redeem script are invalid")
         self.fail_accept(self.nodes[2], "mandatory-script-verify-flag-failed (Operation not valid with the current stack size)", p2sh_ids[NODE_2][P2WPKH][1], sign=False)
@@ -215,10 +215,10 @@ def run_test(self):
 
         self.log.info("Verify witness txs are mined as soon as segwit activates")
 
-        send_to_witness(1, self.nodes[2], getutxo(wit_ids[NODE_2][P2WPKH][0]), self.pubkey[0], encode_p2sh=False, amount=Decimal("71998"), sign=True)
-        send_to_witness(1, self.nodes[2], getutxo(wit_ids[NODE_2][P2WSH][0]), self.pubkey[0], encode_p2sh=False, amount=Decimal("71998"), sign=True)
-        send_to_witness(1, self.nodes[2], getutxo(p2sh_ids[NODE_2][P2WPKH][0]), self.pubkey[0], encode_p2sh=False, amount=Decimal("71998"), sign=True)
-        send_to_witness(1, self.nodes[2], getutxo(p2sh_ids[NODE_2][P2WSH][0]), self.pubkey[0], encode_p2sh=False, amount=Decimal("71998"), sign=True)
+        send_to_witness(1, self.nodes[2], getutxo(wit_ids[NODE_2][P2WPKH][0]), self.pubkey[0], encode_p2sh=False, amount=Decimal("71999.998"), sign=True)
+        send_to_witness(1, self.nodes[2], getutxo(wit_ids[NODE_2][P2WSH][0]), self.pubkey[0], encode_p2sh=False, amount=Decimal("71999.998"), sign=True)
+        send_to_witness(1, self.nodes[2], getutxo(p2sh_ids[NODE_2][P2WPKH][0]), self.pubkey[0], encode_p2sh=False, amount=Decimal("71999.998"), sign=True)
+        send_to_witness(1, self.nodes[2], getutxo(p2sh_ids[NODE_2][P2WSH][0]), self.pubkey[0], encode_p2sh=False, amount=Decimal("71999.998"), sign=True)
 
         assert_equal(len(self.nodes[2].getrawmempool()), 4)
         blockhash = self.generate(self.nodes[2], 1)[0]  # block 165 (first block with new rules)
@@ -287,7 +287,7 @@ def run_test(self):
         #                      tx2 (segwit input, paying to a non-segwit output) ->
         #                      tx3 (non-segwit input, paying to a non-segwit output).
         # tx1 is allowed to appear in the block, but no others.
-        txid1 = send_to_witness(1, self.nodes[0], find_spendable_utxo(self.nodes[0], 72000), self.pubkey[0], False, Decimal("71996"))
+        txid1 = send_to_witness(1, self.nodes[0], find_spendable_utxo(self.nodes[0], 72000), self.pubkey[0], False, Decimal("71999.996"))
         hex_tx = self.nodes[0].gettransaction(txid)['hex']
         tx = tx_from_hex(hex_tx)
         assert tx.wit.is_null()  # This should not be a segwit input

test/functional/feature_taproot.py

@@ -1385,8 +1385,8 @@ def test_spenders(self, node, spenders, input_counts):
                 amount = int(random.randrange(int(avg*0.85 + 0.5), int(avg*1.15 + 0.5)) + 0.5)
                 balance -= amount
                 fund_tx.vout.append(CTxOut(amount, spenders[done + i].script))
-            # Add change
-            fund_tx.vout.append(CTxOut(balance - 10000, random.choice(host_spks)))
+            # Add change (DigiByte uses higher fees than Bitcoin)
+            fund_tx.vout.append(CTxOut(balance - 1000000, random.choice(host_spks)))
             # Ask the wallet to sign
             fund_tx = tx_from_hex(node.signrawtransactionwithwallet(fund_tx.serialize().hex())["hex"])
             # Construct UTXOData entries

test/functional/feature_utxo_set_hash.py

@@ -69,8 +69,8 @@ def test_muhash_implementation(self):
         assert_equal(finalized[::-1].hex(), node_muhash)
 
         self.log.info("Test deterministic UTXO set hash results")
-        assert_equal(node.gettxoutsetinfo()['hash_serialized_3'], "a345b92b5a02673693808bfd2c43deed8cefa7cea9cb1877c8582861329b46cc")  # DigiByte hash
-        assert_equal(node.gettxoutsetinfo("muhash")['muhash'], "c2c9e5df0d95bc8bcefb9615383548e07a525d08627f3a5704ced0b639af5537")  # DigiByte muhash
+        assert_equal(node.gettxoutsetinfo()['hash_serialized_3'], "f2394386f671a23886fec1b819caa4d6c5cf9fde0a34f54e282e19ded9dc94fc")  # DigiByte v8.26 hash
+        assert_equal(node.gettxoutsetinfo("muhash")['muhash'], "b9678ef04621339679a49e5e2ddd916ee0651b038b0d50ce2830e77cdce13412")  # DigiByte v8.26 muhash
 
     def run_test(self):
         self.test_muhash_implementation()

test/functional/rpc_getblockstats.py

@@ -169,18 +169,18 @@ def run_test(self):
 
         self.log.info('Test block height 0')
         genesis_stats = self.nodes[0].getblockstats(0)
-        assert_equal(genesis_stats["blockhash"], "0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206")
+        assert_equal(genesis_stats["blockhash"], "4598a0f2b823aaf9e77ee6d5e46f1edb824191dcd48b08437b7cec17e6ae6e26")
         assert_equal(genesis_stats["utxo_increase"], 1)
-        assert_equal(genesis_stats["utxo_size_inc"], 117)
+        assert_equal(genesis_stats["utxo_size_inc"], 52)
         assert_equal(genesis_stats["utxo_increase_actual"], 0)
         assert_equal(genesis_stats["utxo_size_inc_actual"], 0)
 
         self.log.info('Test tip including OP_RETURN')
         tip_stats = self.nodes[0].getblockstats(tip)
-        assert_equal(tip_stats["utxo_increase"], 6)
-        assert_equal(tip_stats["utxo_size_inc"], 441)
-        assert_equal(tip_stats["utxo_increase_actual"], 4)
-        assert_equal(tip_stats["utxo_size_inc_actual"], 300)
+        assert_equal(tip_stats["utxo_increase"], 2)
+        assert_equal(tip_stats["utxo_size_inc"], 163)
+        assert_equal(tip_stats["utxo_increase_actual"], 1)
+        assert_equal(tip_stats["utxo_size_inc_actual"], 75)
 
 if __name__ == '__main__':
     GetblockstatsTest().main()

test/functional/wallet_spend_unconfirmed.py

@@ -20,7 +20,7 @@ def set_test_params(self):
         getcontext().prec=9
         self.setup_clean_chain = True
         self.num_nodes = 1
-        self.extra_args = [["-dandelion=0"]]
+        self.extra_args = [["-dandelion=0", "-maxtxfee=10"]]  # Allow up to 10 DGB in fees
 
     def setup_and_fund_wallet(self, walletname):
         self.nodes[0].createwallet(walletname)
@@ -393,7 +393,7 @@ def test_sibling_tx_bumps_parent(self):
         self.log.info("Start test where a high-fee sibling tx bumps the parent")
         wallet = self.setup_and_fund_wallet("generous-sibling")
 
-        parent_txid = wallet.sendtoaddress(address=wallet.getnewaddress(), amount=1, fee_rate=11000)
+        parent_txid = wallet.sendtoaddress(address=wallet.getnewaddress(), amount=1, fee_rate=10500)
         parent_tx = wallet.gettransaction(txid=parent_txid, verbose=True)
         self.assert_undershoots_target(parent_tx)
 
@@ -427,7 +427,7 @@ def test_confirmed_and_unconfirmed_parent(self):
         wallet = self.setup_and_fund_wallet("confirmed_and_unconfirmed_wallet")
         confirmed_parent_txid = wallet.sendtoaddress(address=wallet.getnewaddress(), amount=1, fee_rate=self.target_fee_rate)
         self.generate(self.nodes[0], 1) # Wallet has two confirmed UTXOs of ~1DGB each
-        unconfirmed_parent_txid = wallet.sendtoaddress(address=wallet.getnewaddress(), amount=0.5, fee_rate=0.5*self.target_fee_rate)
+        unconfirmed_parent_txid = wallet.sendtoaddress(address=wallet.getnewaddress(), amount=0.5, fee_rate=10500)  # Just above minimum
 
         # wallet has one confirmed UTXO of 1DGB and two unconfirmed UTXOs of ~0.5DGB each
         ancestor_aware_txid = wallet.sendtoaddress(address=self.def_wallet.getnewaddress(), amount=1.4, fee_rate=self.target_fee_rate)
@@ -469,7 +469,7 @@ def test_external_input_unconfirmed_low(self):
 
     def run_test(self):
         self.log.info("Starting UnconfirmedInputTest!")
-        self.target_fee_rate = 30000  # DigiByte fee rate: Above minimum 10000 sat/kB (Bitcoin uses 30)
+        self.target_fee_rate = 15000  # DigiByte fee rate: Above minimum 10000 sat/kB but lower to avoid fee limit
         self.def_wallet  = self.nodes[0].get_wallet_rpc(self.default_wallet_name)
         self.generate(self.nodes[0], 110)