From 8f3aa743bd8fbe0989bb69f54b2903b61ea6c3f3 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 17 Mar 2017 18:14:40 +0200 Subject: [PATCH] Touch --- src/komodo.h | 1 + src/komodo_gateway.h | 1 + src/komodo_interest.h | 1 + src/main.cpp | 1 - src/miner.cpp | 1 + 5 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/komodo.h b/src/komodo.h index bdb692d09..33e4ea544 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -446,6 +446,7 @@ int32_t komodo_voutupdate(int32_t *isratificationp,int32_t notaryid,uint8_t *scr printf("ISRATIFICATION (%s)\n",(char *)&scriptbuf[len+32*2+4]); } } + if ( *isratificationp == 0 && (signedmask != 0 || (scriptbuf[len] != 'X' && scriptbuf[len] != 'A' && scriptbuf[len] != 'I')) ) komodo_stateupdate(height,0,0,0,txhash,0,0,0,0,0,0,value,&scriptbuf[len],opretlen,j); } diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index bd7538d9b..af3633a95 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -688,6 +688,7 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above } return(0); } + //fprintf(stderr,"ht.%d n.%d nValue %.8f (%d %d %d)\n",height,n,dstr(block.vtx[0].vout[1].nValue),KOMODO_PAX,komodo_isrealtime(&ht),KOMODO_PASSPORT_INITDONE); if ( komodo_isrealtime(&ht) == 0 || KOMODO_PASSPORT_INITDONE == 0 ) //KOMODO_PAX == 0 || return(0); diff --git a/src/komodo_interest.h b/src/komodo_interest.h index 2aa745070..fa19319ef 100644 --- a/src/komodo_interest.h +++ b/src/komodo_interest.h @@ -99,6 +99,7 @@ uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uin if ( exception == 0 || nValue == 4000000000000LL ) printf(">>>>>>>>>>>> exception.%d txheight.%d %.8f locktime %u vs tiptime %u <<<<<<<<<\n",exception,txheight,(double)nValue/COIN,nLockTime,tiptime); } + //if ( nValue == 4000000000000LL ) // printf(">>>>>>>>>>>> exception.%d txheight.%d %.8f locktime %u vs tiptime %u <<<<<<<<<\n",exception,txheight,(double)nValue/COIN,nLockTime,tiptime); if ( exception == 0 ) diff --git a/src/main.cpp b/src/main.cpp index 455e6f78e..1a92bcd91 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3258,7 +3258,6 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta else if ( komodo_checkpoint(¬arized_height,nHeight,hash) < 0 ) return state.DoS(100, error("%s: forked chain %d older than last notarized (height %d) vs %d", __func__,nHeight, notarized_height)); } - // Reject block.nVersion < 4 blocks if (block.nVersion < 4) return state.Invalid(error("%s : rejected nVersion<4 block", __func__), diff --git a/src/miner.cpp b/src/miner.cpp index 27e892fe1..33fe68327 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -406,6 +406,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) if ( txNew.vout.size() > 1 ) fprintf(stderr,"%s txNew numvouts.%d\n",ASSETCHAINS_SYMBOL,(int32_t)txNew.vout.size()); } + pblock->vtx[0] = txNew; pblocktemplate->vTxFees[0] = -nFees; // Randomise nonce