From 7ca711bac3a368e4d9775415ae1248fbb9c1cf15 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 7 Nov 2016 18:05:15 -0300 Subject: [PATCH] test --- src/komodo_gateway.h | 4 ++-- src/miner.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 3339252e8..2c2335e9a 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -167,10 +167,10 @@ void komodo_gateway_deposits(CMutableTransaction *txNew,int32_t shortflag,char * else opcode = 'X'; HASH_ITER(hh,PAX,pax,tmp) { - if ( ASSETCHAINS_SYMBOL[0] != 0 ) - printf("pax.%p marked.%d %.8f -> %.8f\n",pax,pax->marked,dstr(pax->komodoshis),dstr(pax->fiatoshis)); if ( pax->marked != 0 ) continue; + if ( ASSETCHAINS_SYMBOL[0] != 0 ) + printf("pax.%p marked.%d %.8f -> %.8f\n",pax,pax->marked,dstr(pax->komodoshis),dstr(pax->fiatoshis)); txNew->vout.resize(numvouts+1); txNew->vout[numvouts].nValue = pax->fiatoshis; txNew->vout[numvouts].scriptPubKey.resize(25); diff --git a/src/miner.cpp b/src/miner.cpp index 6514f4f50..e56cd5240 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -524,7 +524,7 @@ void static BitcoinMiner(CWallet *pwallet) komodo_chosennotary(¬aryid,chainActive.Tip()->nHeight,NOTARY_PUBKEY33); std::string solver; - if ( notaryid >= 0 ) + if ( notaryid >= 0 || ASSETCHAINS[0] != 0 ) solver = "tromp"; else solver = "default"; assert(solver == "tromp" || solver == "default");