From ebdaac975ae3e102581ac32271507779c1fed220 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 13 Nov 2016 14:46:27 -0300 Subject: [PATCH] test --- iguana/dpow/dpow_network.c | 19 +++++++++---------- iguana/dpow/dpow_tx.c | 1 + 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/iguana/dpow/dpow_network.c b/iguana/dpow/dpow_network.c index 822a9e3ba..0eb7f44ba 100755 --- a/iguana/dpow/dpow_network.c +++ b/iguana/dpow/dpow_network.c @@ -192,15 +192,17 @@ void dpow_ratify_update(struct supernet_info *myinfo,struct dpow_info *dp,struct bp->notaries[senderind].ratifydestvout = destvout; bp->notaries[senderind].ratifybestmask = bestmask; bp->notaries[senderind].ratifyrecvmask = recvmask; - bp->notaries[senderind].ratifybestk = bestk; - for (i=0; i<2; i++) + if ( (bp->notaries[senderind].ratifybestk= bestk) >= 0 ) { - if ( (bp->notaries[senderind].ratifysiglens[i]= siglens[i]) != 0 ) + for (i=0; i<2; i++) { - memcpy(bp->notaries[senderind].ratifysigs[i],sigs[i],siglens[i]); - if ( bestk == bp->pendingbestk && bestmask == bp->pendingbestmask ) - bp->ratifysigmasks[i] |= (1LL << senderind); - else bp->ratifysigmasks[i] &= ~(1LL << senderind); + if ( (bp->notaries[senderind].ratifysiglens[i]= siglens[i]) != 0 ) + { + memcpy(bp->notaries[senderind].ratifysigs[i],sigs[i],siglens[i]); + if ( bestk == bp->pendingbestk && bestmask == bp->pendingbestmask ) + bp->ratifysigmasks[i] |= (1LL << senderind); + else bp->ratifysigmasks[i] &= ~(1LL << senderind); + } } } bp->ratifyrecvmask |= (1LL << senderind) | (1LL << bp->myind); @@ -210,9 +212,6 @@ void dpow_ratify_update(struct supernet_info *myinfo,struct dpow_info *dp,struct bp->notaries[bp->myind].ratifyrecvmask = bp->ratifyrecvmask; if ( bp->ratifybestk >= 0 ) { - bp->notaries[bp->myind].ratifybestmask = bp->ratifybestmask; - bp->notaries[bp->myind].ratifyrecvmask = bp->ratifyrecvmask; - bp->notaries[bp->myind].ratifybestk = bp->ratifybestk; for (i=0; inumnotaries; i++) { if ( bp->ratifybestk >= 0 && bp->notaries[i].ratifybestk == bp->ratifybestk && bp->notaries[i].ratifybestmask == bp->ratifybestmask ) diff --git a/iguana/dpow/dpow_tx.c b/iguana/dpow/dpow_tx.c index d5744359b..19c6cb91b 100755 --- a/iguana/dpow/dpow_tx.c +++ b/iguana/dpow/dpow_tx.c @@ -443,6 +443,7 @@ int32_t dpow_signedtxgen(struct supernet_info *myinfo,struct dpow_info *dp,struc { bp->ratifysiglens[src_or_dest] = (int32_t)strlen(sigstr) >> 1; decode_hex(bp->ratifysigs[src_or_dest],bp->ratifysiglens[src_or_dest],sigstr); + bp->ratifysigmasks[src_or_dest] |= (1LL << bp->myind); } } }