Browse Source

Merge pull request #817 from jl777/jl777

Test
pass-iguana-arg
jl777 7 years ago
committed by GitHub
parent
commit
b4564792d7
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      iguana/dpow/dpow_fsm.c
  2. 3
      iguana/dpow/dpow_network.c

2
iguana/dpow/dpow_fsm.c

@ -305,6 +305,8 @@ void dpow_statemachinestart(void *ptr)
bp->srccoin = src; bp->srccoin = src;
bp->destcoin = dest; bp->destcoin = dest;
bp->myind = -1; bp->myind = -1;
for (i=0; i<sizeof(bp->notaries)/sizeof(*bp->notaries); i++)
bp->notaries[i].bestk = -1;
bp->opret_symbol = dp->symbol; bp->opret_symbol = dp->symbol;
if ( jsonstr != 0 && (ratified= cJSON_Parse(jsonstr)) != 0 ) if ( jsonstr != 0 && (ratified= cJSON_Parse(jsonstr)) != 0 )
{ {

3
iguana/dpow/dpow_network.c

@ -1838,8 +1838,9 @@ void dpow_notarize_update(struct supernet_info *myinfo,struct dpow_info *dp,stru
{ {
//fprintf(stderr,"{%d %x} ",senderind,paxwdcrc); //fprintf(stderr,"{%d %x} ",senderind,paxwdcrc);
} }
if ( (bp->notaries[senderind].bestk= bestk) >= 0 ) if ( bestk >= 0 || bp->notaries[senderind].bestk < 0 )
{ {
bp->notaries[senderind].bestk = bestk;
if ( (bp->notaries[senderind].src.siglens[bestk]= siglens[0]) != 0 ) if ( (bp->notaries[senderind].src.siglens[bestk]= siglens[0]) != 0 )
{ {
memcpy(bp->notaries[senderind].src.sigs[bestk],sigs[0],siglens[0]); memcpy(bp->notaries[senderind].src.sigs[bestk],sigs[0],siglens[0]);

Loading…
Cancel
Save