Delete many things we do not want or need
This commit is contained in:
@@ -25,7 +25,6 @@
|
||||
|
||||
#include "amount.h"
|
||||
#include "chainparams.h"
|
||||
#include "importcoin.h"
|
||||
#include "consensus/consensus.h"
|
||||
#include "consensus/upgrades.h"
|
||||
#include "consensus/validation.h"
|
||||
@@ -308,12 +307,13 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32
|
||||
bool fMissingInputs = false;
|
||||
bool fNotarization = false;
|
||||
std::vector<int8_t> TMP_NotarizationNotaries;
|
||||
if (tx.IsCoinImport())
|
||||
//if (tx.IsCoinImport())
|
||||
//{
|
||||
// CAmount nValueIn = GetCoinImportValue(tx); // burn amount
|
||||
// nTotalIn += nValueIn;
|
||||
// dPriority += (double)nValueIn * 1000; // flat multiplier... max = 1e16.
|
||||
//} else
|
||||
{
|
||||
CAmount nValueIn = GetCoinImportValue(tx); // burn amount
|
||||
nTotalIn += nValueIn;
|
||||
dPriority += (double)nValueIn * 1000; // flat multiplier... max = 1e16.
|
||||
} else {
|
||||
TMP_NotarizationNotaries.clear();
|
||||
bool fToCryptoAddress = false;
|
||||
if ( numSN != 0 && notarypubkeys[0][0] != 0 && hush_is_notarytx(tx) == 1 )
|
||||
@@ -321,6 +321,7 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32
|
||||
|
||||
BOOST_FOREACH(const CTxIn& txin, tx.vin)
|
||||
{
|
||||
/*
|
||||
if (tx.IsPegsImport() && txin.prevout.n==10e8)
|
||||
{
|
||||
CAmount nValueIn = GetCoinImportValue(tx); // burn amount
|
||||
@@ -328,6 +329,7 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32
|
||||
dPriority += (double)nValueIn * 1000; // flat multiplier... max = 1e16.
|
||||
continue;
|
||||
}
|
||||
*/
|
||||
// Read prev transaction
|
||||
if (!view.HaveCoins(txin.prevout.hash))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user