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

Change mempool print

Browse Source
This commit is contained in:
jl777
2018-08-19 08:42:57 -11:00
parent 050f89ac30
commit e4e12ec083
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cc/CCutils.cpp
View File

@@ -255,10 +255,16 @@ CPubKey GetUnspendable(struct CCcontract_info *cp,uint8_t *unspendablepriv)
bool ProcessCC(struct CCcontract_info *cp,Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn) bool ProcessCC(struct CCcontract_info *cp,Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
{ {
CTransaction createTx; uint256 assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; int64_t amount; std::vector<uint8_t> origpubkey; CTransaction createTx; uint256 assetid,assetid2,hashBlock; uint8_t funcid; int32_t height,i,n,from_mempool = 0; int64_t amount; std::vector<uint8_t> origpubkey;
fprintf(stderr,"KOMODO_CONNECTING.%d\n",KOMODO_CONNECTING);
if ( KOMODO_CONNECTING < 0 ) // always comes back with > 0 for final confirmation if ( KOMODO_CONNECTING < 0 ) // always comes back with > 0 for final confirmation
return(true); return(true);
height = KOMODO_CONNECTING;
if ( (KOMODO_CONNECTING & (1<<30)) != 0 )
{
from_mempool = 1;
height &= ((1<<30) - 1);
}
fprintf(stderr,"KOMODO_CONNECTING.%d mempool.%d\n",height,from_mempool);
// there is a chance CC tx is valid in mempool, but invalid when in block, so we cant filter duplicate requests. if any of the vins are spent, for example // there is a chance CC tx is valid in mempool, but invalid when in block, so we cant filter duplicate requests. if any of the vins are spent, for example
//txid = ctx.GetHash(); //txid = ctx.GetHash();
//if ( txid == cp->prevtxid ) //if ( txid == cp->prevtxid )

2
src/main.cpp
View File

@@ -1529,7 +1529,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
if ( KOMODO_CONNECTING <= 0 && chainActive.LastTip() != 0 ) if ( KOMODO_CONNECTING <= 0 && chainActive.LastTip() != 0 )
{ {
flag = 1; flag = 1;
KOMODO_CONNECTING = 100000000 + (int32_t)chainActive.LastTip()->nHeight + 1; KOMODO_CONNECTING = (1<<30) + (int32_t)chainActive.LastTip()->nHeight + 1;
} }
if (!ContextualCheckInputs(tx, state, view, true, MANDATORY_SCRIPT_VERIFY_FLAGS, true, txdata, Params().GetConsensus(), consensusBranchId)) if (!ContextualCheckInputs(tx, state, view, true, MANDATORY_SCRIPT_VERIFY_FLAGS, true, txdata, Params().GetConsensus(), consensusBranchId))
{ {