From 5ba0ce9d70b55725bc826b8a77c45438e0e50cc0 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 12 Dec 2016 23:25:24 +0200 Subject: [PATCH 1/2] test --- src/miner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/miner.cpp b/src/miner.cpp index 455e327ba..9c2949763 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -125,7 +125,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) if ( ASSETCHAINS_SYMBOL[0] != 0 && chainActive.Tip()->nHeight >= ASSETCHAINS_MINHEIGHT ) { isrealtime = komodo_isrealtime(&kmdheight); - while ( KOMODO_ON_DEMAND == 0 ) + while ( KOMODO_ON_DEMAND == 0 && deposits == 0 && (int32_t)mempool.GetTotalTxSize() == 0 ) { deposits = komodo_paxtotal(); if ( KOMODO_INITDONE == 0 || (komodo_baseid(ASSETCHAINS_SYMBOL) >= 0 && (isrealtime= komodo_isrealtime(&kmdheight)) == 0) ) From 3da07d2e1debcdebee9f57c0663183aa5b6b5d53 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 12 Dec 2016 23:31:30 +0200 Subject: [PATCH 2/2] test --- src/miner.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/miner.cpp b/src/miner.cpp index 9c2949763..94e89325a 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -125,6 +125,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) if ( ASSETCHAINS_SYMBOL[0] != 0 && chainActive.Tip()->nHeight >= ASSETCHAINS_MINHEIGHT ) { isrealtime = komodo_isrealtime(&kmdheight); + deposits = komodo_paxtotal(); while ( KOMODO_ON_DEMAND == 0 && deposits == 0 && (int32_t)mempool.GetTotalTxSize() == 0 ) { deposits = komodo_paxtotal();