Merge pull request #944 from jl777/dev

Dev

iguana/dPoW.h

@@ -109,7 +109,7 @@ struct dpow_recvdata { uint64_t recvmask,bestmask; int8_t bestk; };
 
 struct dpow_block
 {
-    bits256 hashmsg,desttxid,srctxid,beacon,commit,MoM;
+    bits256 hashmsg,desttxid,srctxid,beacon,commit,MoM,mysrcutxo,mydestutxo;
     struct iguana_info *srccoin,*destcoin; char *opret_symbol;
     uint64_t destsigsmasks[DPOW_MAXRELAYS],srcsigsmasks[DPOW_MAXRELAYS];
     uint64_t recvmask,bestmask,ratifybestmask,ratifyrecvmask,pendingbestmask,pendingratifybestmask,ratifysigmasks[2];

iguana/dpow/dpow_fsm.c

@@ -488,6 +488,11 @@ void dpow_statemachinestart(void *ptr)
             bp->notaries[myind].ratifydestutxo = ep->dest.prev_hash;
             bp->notaries[myind].ratifydestvout = ep->dest.prev_vout;
         }
+        else
+        {
+            bp->mysrcutxo = ep->src.prev_hash;
+            bp->mydestutxo = ep->dest.prev_hash;
+        }
     }
     /*if ( strcmp(dp->symbol,"CHIPS") == 0 && myind == 0 )
     {

iguana/dpow/dpow_network.c

@@ -1868,6 +1868,8 @@ void dpow_notarize_update(struct supernet_info *myinfo,struct dpow_info *dp,stru
     if ( bp->myind < 0 )
         return;
     if ( bp->isratify == 0 && bp->state != 0xffffffff && senderind >= 0 && senderind < bp->numnotaries && bits256_nonz(srcutxo) != 0 && bits256_nonz(destutxo) != 0 )
+    {
+        if ( bp->myind != senderind )
         {
             if ( bits256_nonz(srcutxo) != 0 )
             {
@@ -1880,6 +1882,12 @@ void dpow_notarize_update(struct supernet_info *myinfo,struct dpow_info *dp,stru
                 bp->notaries[senderind].dest.prev_hash = destutxo;
                 bp->notaries[senderind].dest.prev_vout = destvout;
             }
+        }
+        else
+        {
+            bp->notaries[bp->myind].src.prev_hash = bp->mysrcutxo;
+            bp->notaries[bp->myind].dest.prev_hash = bp->mydestutxo;
+        }
         if ( bestmask != 0 )
             bp->notaries[senderind].bestmask = bestmask;
         if ( recvmask != 0 )

iguana/exchanges/LP_swap.c

@@ -945,6 +945,7 @@ void LP_bobloop(void *_swap)
     LP_swap_endcritical = (uint32_t)time(NULL);
     if ( err < 0 )
         LP_failedmsg(swap->I.req.requestid,swap->I.req.quoteid,err,swap->uuidstr);
+    if ( swap->I.aliceconfirms > 0 )
         sleep(13);
     LP_pendswap_add(swap->I.expiration,swap->I.req.requestid,swap->I.req.quoteid);
     //swap->I.finished = LP_swapwait(swap->I.expiration,swap->I.req.requestid,swap->I.req.quoteid,LP_atomic_locktime(swap->I.bobstr,swap->I.alicestr)*3,swap->I.aliceconfirms == 0 ? 3 : 30);
@@ -1041,6 +1042,7 @@ void LP_aliceloop(void *_swap)
     LP_swap_endcritical = (uint32_t)time(NULL);
     if ( err < 0 )
         LP_failedmsg(swap->I.req.requestid,swap->I.req.quoteid,err,swap->uuidstr);
+    if ( swap->I.bobconfirms > 0 )
         sleep(13);
     LP_pendswap_add(swap->I.expiration,swap->I.req.requestid,swap->I.req.quoteid);
     //swap->I.finished = LP_swapwait(swap->I.expiration,swap->I.req.requestid,swap->I.req.quoteid,LP_atomic_locktime(swap->I.bobstr,swap->I.alicestr)*3,swap->I.aliceconfirms == 0 ? 3 : 30);