Merge pull request #126 from BlockMechanic/segwit

Segwit
Crowndev · Oct 18, 2022 · 5a8cfa5 · 5a8cfa5
2 parents 8c48654 + a80bb8c
commit 5a8cfa5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp
@@ -267,8 +267,8 @@ bool Consensus::CheckTxInputs(const CTransaction& tx, TxValidationState& state,
                         return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-txns-inflation-issuer-mismatch", strprintf("(%s) vs (%s) only", contract.sIssuingaddress, EncodeDestination(address1)));
 
                 }
-                else
-                    return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-txns-ouput-asset-not-inflatable");
+                //else
+                    //return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-txns-ouput-asset-not-inflatable");
 
             }
 

diff --git a/src/miner.cpp b/src/miner.cpp
@@ -200,7 +200,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
         if (!fStakeFound)
             return NULL;
     }
-    LogPrintf("%s: 111111111  %s\n",__func__, txCoinStake.ToString());
+    //LogPrintf("%s: 111111111  %s\n",__func__, txCoinStake.ToString());
 
     // Masternode and general budget payments
     if (IsSporkActive(SPORK_4_ENABLE_MASTERNODE_PAYMENTS) || Params().NetworkIDString() == CBaseChainParams::TESTNET) {
@@ -232,7 +232,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
 
         if(Params().NetworkIDString() == CBaseChainParams::TESTNET){
             //Reduce PoS reward by the node rewards
-                LogPrintf("%s: 3333333333333  \n",__func__);
+                //LogPrintf("%s: 3333333333333  \n",__func__);
 
             if (!budget.IsBudgetPaymentBlock(nHeight)){
 				if(txCoinStake.nVersion >= TX_ELE_VERSION)
@@ -242,7 +242,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
 			}
 		}
         else if (!(IsSporkActive(SPORK_13_ENABLE_SUPERBLOCKS) && budget.IsBudgetPaymentBlock(nHeight))){
-                LogPrintf("%s: 4444444  \n",__func__);
+                //LogPrintf("%s: 4444444  \n",__func__);
 
             //Reduce PoS reward by the node rewards
             if(txCoinStake.nVersion >= TX_ELE_VERSION)
@@ -270,7 +270,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
         }
     }
 
-    LogPrintf("%s: 222222222  %s\n",__func__, txCoinStake.ToString());
+    //LogPrintf("%s: 222222222  %s\n",__func__, txCoinStake.ToString());
 
     if ((Params().NetworkIDString() == CBaseChainParams::TESTNET && !budget.IsBudgetPaymentBlock(nHeight)) || (!(IsSporkActive(SPORK_13_ENABLE_SUPERBLOCKS) && budget.IsBudgetPaymentBlock(nHeight))) )   {
-Original file line number
+Diff line change
@@ Expand Up @@
                             return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-txns-inflation-issuer-mismatch", strprintf("(%s) vs (%s) only", contract.sIssuingaddress, EncodeDestination(address1)));
                     }
-                    else
-                        return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-txns-ouput-asset-not-inflatable");
+                    //else
+                        //return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-txns-ouput-asset-not-inflatable");
                 }
@@ Expand Down @@