From fd99b453f7930401aa523a23a7dda3cbb807b61a Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 17 Nov 2016 10:25:39 -0300 Subject: [PATCH] test --- iguana/dpow/dpow_fsm.c | 3 ++- iguana/dpow/dpow_tx.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/iguana/dpow/dpow_fsm.c b/iguana/dpow/dpow_fsm.c index 4e98b04b3..b85f9e26d 100755 --- a/iguana/dpow/dpow_fsm.c +++ b/iguana/dpow/dpow_fsm.c @@ -209,7 +209,8 @@ void dpow_statemachinestart(void *ptr) destprevvout0 = jint(item,"destprevvout0"); srcprevtxid0 = jbits256(item,"srcprevtxid0"); srcprevvout0 = jint(item,"srcprevvout0"); - bp->require0 = 1; + if ( bits256_nonz(destprevtxid0) != 0 && bits256_nonz(srcprevtxid0) != 0 ) + bp->require0 = 1; } } else diff --git a/iguana/dpow/dpow_tx.c b/iguana/dpow/dpow_tx.c index 0c6459faa..cfcde5733 100755 --- a/iguana/dpow/dpow_tx.c +++ b/iguana/dpow/dpow_tx.c @@ -92,7 +92,7 @@ uint64_t dpow_ratifybest(uint64_t refmask,struct dpow_block *bp,int8_t *lastkp) { *lastkp = k; bestmask = mask | bp->require0; - printf("m.%d == minsigs.%d (%d %llx)\n",m,bp->minsigs,k,(long long)bestmask); + //printf("m.%d == minsigs.%d (%d %llx)\n",m,bp->minsigs,k,(long long)bestmask); } } } @@ -348,6 +348,7 @@ cJSON *dpow_vins(struct iguana_info *coin,struct dpow_block *bp,int8_t bestk,uin calc_rmd160_sha256(&script[3],ep->pubkey,33); // 8ee61a3161993f4f7b7081259bf5f3322d65d3f8 script[23] = 0x88; script[24] = 0xac; + init_hexbytes_noT(scriptstr,script,25); /*int32_t z; for (z=0; z<25; z++) printf("%02x",script[z]); @@ -358,8 +359,8 @@ cJSON *dpow_vins(struct iguana_info *coin,struct dpow_block *bp,int8_t bestk,uin script[0] = 33; memcpy(script+1,ep->pubkey,33); script[34] = CHECKSIG; + init_hexbytes_noT(scriptstr,script,35); } - init_hexbytes_noT(scriptstr,script,35); jaddstr(item,"scriptPubKey",scriptstr); jaddi(vins,item); //printf("height.%d mod.%d VINI.%d <- i.%d j.%d\n",height,height % numnotaries,m,i,j);