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

Test

Browse Source
This commit is contained in:
jl777
2017-04-27 09:27:22 +03:00
parent ab49ccacba
commit e0440cc39c
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/komodo.h
View File

@@ -497,7 +497,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
fprintf(stderr,"unexpected null komodostateptr.[%s]\n",ASSETCHAINS_SYMBOL); fprintf(stderr,"unexpected null komodostateptr.[%s]\n",ASSETCHAINS_SYMBOL);
return; return;
} }
fprintf(stderr,"%s connect.%d\n",ASSETCHAINS_SYMBOL,pindex->nHeight); //fprintf(stderr,"%s connect.%d\n",ASSETCHAINS_SYMBOL,pindex->nHeight);
numnotaries = komodo_notaries(pubkeys,pindex->nHeight); numnotaries = komodo_notaries(pubkeys,pindex->nHeight);
calc_rmd160_sha256(rmd160,pubkeys[0],33); calc_rmd160_sha256(rmd160,pubkeys[0],33);
if ( pindex->nHeight > hwmheight ) if ( pindex->nHeight > hwmheight )

2
src/komodo_bitcoind.h
View File

@@ -553,7 +553,7 @@ uint32_t komodo_txtime(uint256 hash)
void komodo_disconnect(CBlockIndex *pindex,CBlock& block) void komodo_disconnect(CBlockIndex *pindex,CBlock& block)
{ {
char symbol[16],dest[16]; struct komodo_state *sp; char symbol[16],dest[16]; struct komodo_state *sp;
fprintf(stderr,"disconnect ht.%d\n",pindex->nHeight); //fprintf(stderr,"disconnect ht.%d\n",pindex->nHeight);
komodo_init(pindex->nHeight); komodo_init(pindex->nHeight);
if ( (sp= komodo_stateptr(symbol,dest)) != 0 ) if ( (sp= komodo_stateptr(symbol,dest)) != 0 )
{ {

6
src/main.cpp
View File

@@ -2231,7 +2231,7 @@ static int64_t nTimeTotal = 0;
bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pindex, CCoinsViewCache& view, bool fJustCheck) bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pindex, CCoinsViewCache& view, bool fJustCheck)
{ {
const CChainParams& chainparams = Params(); const CChainParams& chainparams = Params();
fprintf(stderr,"connectblock ht.%d\n",(int32_t)pindex->nHeight); //fprintf(stderr,"connectblock ht.%d\n",(int32_t)pindex->nHeight);
AssertLockHeld(cs_main); AssertLockHeld(cs_main);
/*<<<<<<< HEA /*<<<<<<< HEA
// Check it again in case a previous version let a bad block in // Check it again in case a previous version let a bad block in
@@ -2660,7 +2660,7 @@ bool static DisconnectTip(CValidationState &state) {
SyncWithWallets(tx, NULL); SyncWithWallets(tx, NULL);
} }
// Update cached incremental witnesses // Update cached incremental witnesses
fprintf(stderr,"chaintip false\n"); //fprintf(stderr,"chaintip false\n");
GetMainSignals().ChainTip(pindexDelete, &block, newTree, false); GetMainSignals().ChainTip(pindexDelete, &block, newTree, false);
return true; return true;
} }
@@ -2731,7 +2731,7 @@ bool static ConnectTip(CValidationState &state, CBlockIndex *pindexNew, CBlock *
SyncWithWallets(tx, pblock); SyncWithWallets(tx, pblock);
} }
// Update cached incremental witnesses // Update cached incremental witnesses
fprintf(stderr,"chaintip true\n"); //fprintf(stderr,"chaintip true\n");
GetMainSignals().ChainTip(pindexNew, pblock, oldTree, true); GetMainSignals().ChainTip(pindexNew, pblock, oldTree, true);
int64_t nTime6 = GetTimeMicros(); nTimePostConnect += nTime6 - nTime5; nTimeTotal += nTime6 - nTime1; int64_t nTime6 = GetTimeMicros(); nTimePostConnect += nTime6 - nTime5; nTimeTotal += nTime6 - nTime1;

4
src/wallet/wallet.cpp
View File

@@ -643,7 +643,7 @@ void CWallet::IncrementNoteWitnesses(const CBlockIndex* pindex,
const CBlock* pblockIn, const CBlock* pblockIn,
ZCIncrementalMerkleTree& tree) ZCIncrementalMerkleTree& tree)
{ {
fprintf(stderr,"A increment witness cache -> %d\n",(int32_t)nWitnessCacheSize); //fprintf(stderr,"A increment witness cache -> %d\n",(int32_t)nWitnessCacheSize);
{ {
LOCK(cs_wallet); LOCK(cs_wallet);
for (std::pair<const uint256, CWalletTx>& wtxItem : mapWallet) { for (std::pair<const uint256, CWalletTx>& wtxItem : mapWallet) {
@@ -786,7 +786,7 @@ void CWallet::DecrementNoteWitnesses(const CBlockIndex* pindex)
} }
} }
} }
fprintf(stderr,"decrement witness cache -> %d\n",(int32_t)nWitnessCacheSize); //fprintf(stderr,"decrement witness cache -> %d\n",(int32_t)nWitnessCacheSize);
if ( nWitnessCacheSize > 1 ) if ( nWitnessCacheSize > 1 )
nWitnessCacheSize -= 1; nWitnessCacheSize -= 1;
else else