From 89ede5f3b7992ec03f636c94d16d7ed110548b33 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 14 Mar 2017 21:53:44 +0200 Subject: [PATCH] Legacy combat --- src/komodo_gateway.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 4de2cbca0..6f216b24d 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -495,10 +495,19 @@ int32_t komodo_gateway_deposits(CMutableTransaction *txNew,char *base,int32_t to continue; { #ifdef KOMODO_ASSETCHAINS_WAITNOTARIZE - if ( kmdsp != 0 && kmdsp->NOTARIZED_HEIGHT >= pax->height )//|| kmdsp->CURRENT_HEIGHT > pax->height+30) ) // assumes same chain as notarize - pax->validated = pax->komodoshis; //kmdsp->NOTARIZED_HEIGHT; - else if ( kmdsp->CURRENT_HEIGHT > pax->height+30 ) - pax->validated = pax->ready = 0; + if ( height > 236000 ) + { + if ( kmdsp != 0 && kmdsp->NOTARIZED_HEIGHT >= pax->height ) + pax->validated = pax->komodoshis; + else if ( kmdsp->CURRENT_HEIGHT > pax->height+30 ) + pax->validated = pax->ready = 0; + } + else + { + if ( kmdsp != 0 && (kmdsp->NOTARIZED_HEIGHT >= pax->height || kmdsp->CURRENT_HEIGHT > pax->height+30) ) // assumes same chain as notarize + pax->validated = pax->komodoshis; + else pax->validated = pax->ready = 0; + } #else pax->validated = pax->komodoshis; #endif