DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

set import max priotity, and also 0.001 flat fee.

Browse Source
This commit is contained in:
blackjok3r
2019-01-08 23:07:34 +08:00
parent 0b24307e2b
commit 0dee67a800
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/miner.cpp
View File

@@ -285,9 +285,10 @@ CBlockTemplate* CreateNewBlock(const CScript& _scriptPubKeyIn, int32_t gpucount,
bool fNotarisation = false; bool fNotarisation = false;
if (tx.IsCoinImport()) if (tx.IsCoinImport())
{ {
CAmount nValueIn = GetCoinImportValue(tx); CAmount nValueIn = GetCoinImportValue(tx); // burn amount
nTotalIn += nValueIn; //tx.vout[1].nValue import amount
dPriority += (double)nValueIn * 1000; // flat multiplier //nTotalIn += nValueIn;
dPriority += 1e16; //(double)nValueIn * 1000; // flat multiplier
} else { } else {
int numNotaryVins = 0; bool fToCryptoAddress = false; int numNotaryVins = 0; bool fToCryptoAddress = false;
if ( komodo_is_notarytx(tx) == 1 ) if ( komodo_is_notarytx(tx) == 1 )

2
src/rpc/crosschain.cpp
View File

@@ -205,7 +205,7 @@ UniValue migrate_converttoexport(const UniValue& params, bool fHelp)
ptr = rawproof.data(); ptr = rawproof.data();
for (i=0; i<rawproof.size(); i++) for (i=0; i<rawproof.size(); i++)
ptr[i] = ASSETCHAINS_SYMBOL[i]; ptr[i] = ASSETCHAINS_SYMBOL[i];
CTxOut burnOut = MakeBurnOutput(burnAmount, ccid, targetSymbol, tx.vout,rawproof); CTxOut burnOut = MakeBurnOutput(burnAmount-0.0001, ccid, targetSymbol, tx.vout,rawproof);
UniValue ret(UniValue::VOBJ); UniValue ret(UniValue::VOBJ);
ret.push_back(Pair("payouts", HexStr(E_MARSHAL(ss << tx.vout)))); ret.push_back(Pair("payouts", HexStr(E_MARSHAL(ss << tx.vout))));
tx.vout.clear(); tx.vout.clear();