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

Syntax

Browse Source
This commit is contained in:
jl777
2017-03-14 22:02:23 +02:00
parent 68f495d1b5
commit d1775ced1e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/komodo_gateway.h
View File

@@ -495,7 +495,7 @@ int32_t komodo_gateway_deposits(CMutableTransaction *txNew,char *base,int32_t to
continue; continue;
{ {
#ifdef KOMODO_ASSETCHAINS_WAITNOTARIZE #ifdef KOMODO_ASSETCHAINS_WAITNOTARIZE
if ( height > 236000 ) if ( pax->height > 236000 )
{ {
if ( kmdsp != 0 && kmdsp->NOTARIZED_HEIGHT >= pax->height ) if ( kmdsp != 0 && kmdsp->NOTARIZED_HEIGHT >= pax->height )
pax->validated = pax->komodoshis; pax->validated = pax->komodoshis;

4
src/main.cpp
View File

@@ -875,7 +875,11 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state,
{ {
static uint32_t counter; static uint32_t counter;
if ( counter++ < 100 ) if ( counter++ < 100 )
<<<<<<< Updated upstream
printf("MEMPOOL: banned tx.%d being used at ht.%d vini.%d\n",k,(int32_t)chainActive.Tip()->nHeight,j); printf("MEMPOOL: banned tx.%d being used at ht.%d vini.%d\n",k,(int32_t)chainActive.Tip()->nHeight,j);
=======
fprintf(stderr,"MEMPOOL: banned tx.%d being used at ht.%d vini.%d\n",k,(int32_t)chainActive.Tip()->nHeight,j);
>>>>>>> Stashed changes
return(false); return(false);
} }
} }