Merge pull request #1561 from delta1/2026-06-fixes

23.x minor fixes

Author: psgreco

src/block_proof.cpp

@@ -26,10 +26,8 @@ static bool CheckProofGeneric(const CBlockHeader& block, const uint32_t max_bloc
 
     // Check signature limits for blocks
     if (scriptSig.size() > max_block_signature_size) {
-        assert(!is_dyna);
         return false;
     } else if (witness.GetSerializedSize() > max_block_signature_size) {
-        assert(is_dyna);
         return false;
     }
 

src/pegins.cpp

@@ -552,7 +552,7 @@ bool DecomposePeginWitness(const CScriptWitness& witness, CAmount& value, CAsset
 {
     const auto& stack = witness.stack;
 
-    if (stack.size() < 5) return false;
+    if (stack.size() != 6) return false;
 
     CDataStream stream(stack[0], SER_NETWORK, PROTOCOL_VERSION);
     stream >> value;

src/validation.cpp

@@ -673,7 +673,7 @@ class MemPoolAccept
             // calculate the burned subsidy value from the tx
             CAmount subsidy = 0;
             for (const CTxOut& txout : tx.vout) {
-                if (txout.scriptPubKey.IsUnspendable() && txout.nAsset.GetAsset() == Params().GetConsensus().pegged_asset && !txout.IsFee()) {
+                if (txout.scriptPubKey.IsUnspendable() && !txout.IsFee() && txout.nAsset.IsExplicit() && txout.nValue.IsExplicit() && txout.nAsset.GetAsset() == Params().GetConsensus().pegged_asset) {
                     subsidy += txout.nValue.GetAmount();
                 }
             }

src/wallet/rpc/elements.cpp

@@ -1376,6 +1376,9 @@ RPCHelpMan blindrawtransaction()
         // Vacuous, just return the transaction
         return EncodeHexTx(CTransaction(tx));
     } else if (n_blinded_ins > 0 && num_pubkeys == 0) {
+        if (tx.vout.empty()) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Unable to blind transaction: transaction has no outputs to balance blinded inputs against.");
+        }
         // Blinded inputs need to balanced with something to be valid, make a dummy.
         CTxOut newTxOut(tx.vout.back().nAsset.GetAsset(), 0, CScript() << OP_RETURN);
         tx.vout.push_back(newTxOut);