FIX: Remove fIncludeWitness

emercoin · Feb 13, 2024 · c248e9a · c248e9a
1 parent a3fac5a
commit c248e9a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/src/gen-stun-list.c b/src/gen-stun-list.c
@@ -1022,4 +1022,7 @@
 {"stunx.externet.hu",	3478},
 {"stunx.novuscom.net",	3478},
 {"stuny.externet.hu",	3478},
-{"stuny.megafone.hu",	3478}
+{"stuny.megafone.hu",	3478},
+{"stun.cloudflare.com",	3478},
+{"stun.flashdance.cx",	3478}
+
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -85,8 +85,6 @@ void BlockAssembler::resetBlock()
     // Reserve space for coinbase tx
     nBlockWeight = 4000;
     nBlockSigOpsCost = 400;
-    fIncludeWitness = false;
-
     // These counters do not include coinbase tx
     nBlockTx = 0;
     nFees = 0;
@@ -513,10 +511,6 @@ void BlockAssembler::addTxs()
             continue;
         }
 
-        // cannot accept witness transactions into a non-witness block
-        if (!fIncludeWitness && iter->GetTx().HasWitness())
-            continue;
-
         // If tx is dependent on other mempool txs which haven't yet been included
         // then put it in the waitSet
         if (isStillDependent(iter)) {
@@ -596,7 +590,6 @@ void PoSMiner(std::shared_ptr<CWallet> pwallet)
 
     unsigned int nExtraNonce = 0;
 
-    OutputType output_type = pwallet->m_default_change_type != OutputType::CHANGE_AUTO ? pwallet->m_default_change_type : pwallet->m_default_address_type;
     CScript no_dest_script; // Dummy script for COINBASE TX in minted block
     // Compute timeout for pos as sqrt(numUTXO)
     unsigned int pos_timio;

diff --git a/src/miner.h b/src/miner.h
@@ -145,7 +145,6 @@ class BlockAssembler
     CBlock* pblock;
 
     // Configuration parameters for the block size
-    bool fIncludeWitness;
     unsigned int nBlockMaxWeight;
     CFeeRate blockMinFeeRate;