From cb040aa153d7c105f56ba513ab4c4a846820e155 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 4 Nov 2016 16:10:13 -0300 Subject: [PATCH] test --- src/komodo_gateway.h | 20 +++++++++----------- src/miner.cpp | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 77b3d3637..5e79a0b59 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -170,17 +170,15 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above { for (i=1; ifiatoshis != block.vtx[0].vout[i].nValue ) - break; - komodo_paxmark(&space,txids[i-1],vouts[i-1],height); - } - if ( i != n-1 ) - { - hash = block.GetHash(); - for (j=0; j<32; j++) - printf("%02x",((uint8_t *)&hash)[j]); - printf(" ht.%d blockhash couldnt find vout.[%d]\n",height,i); - //return(-1); + if ( (pax= komodo_paxfind(&space,txids[i-1],vouts[i-1])) != 0 && pax->fiatoshis == block.vtx[0].vout[i].nValue ) + komodo_paxmark(&space,txids[i-1],vouts[i-1],height); + else + { + hash = block.GetHash(); + for (j=0; j<32; j++) + printf("%02x",((uint8_t *)&hash)[j]); + printf(" ht.%d blockhash couldnt find vout.[%d]\n",height,i); + } } } //printf("opretlen.%d num.%d\n",opretlen,num); diff --git a/src/miner.cpp b/src/miner.cpp index 3563c83fe..4db4cb02a 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -606,7 +606,7 @@ void static BitcoinMiner(CWallet *pwallet) solutionTargetChecks.increment(); if ( UintToArith256(pblock->GetHash()) > hashTarget ) return false; - if ( Mining_start != 0 && time(NULL) < Mining_start+30 ) + if ( ASSETCHAINS_SYMBOL[0] == 0 && Mining_start != 0 && time(NULL) < Mining_start+30 ) { printf("Round robin diff sleep %d\n",(int32_t)(Mining_start+30-time(NULL))); sleep(Mining_start+30-time(NULL));