From 8b49e403d3046832df8e5aeaada1852c3c0cd286 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 28 Sep 2016 15:19:50 -0300
Subject: [PATCH] test

---
 basilisk/basilisk_bitcoin.c |  2 +-
 basilisk/basilisk_swap.c    |  8 +++++---
 iguana/iguana_sign.c        | 12 ++++++------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/basilisk/basilisk_bitcoin.c b/basilisk/basilisk_bitcoin.c
index 0153fbb12..ec9634a51 100755
--- a/basilisk/basilisk_bitcoin.c
+++ b/basilisk/basilisk_bitcoin.c
@@ -594,7 +594,7 @@ char *basilisk_bitcoinrawtx(struct supernet_info *myinfo,struct iguana_info *coi
                 } else oplen = datachain_opreturnscript(coin,buf,opreturn,oplen);
             }
             rawtx = iguana_calcrawtx(myinfo,coin,&vins,txobj,amount,changeaddr,txfee,addresses,minconf,oplen!=0?buf:0,oplen+offset,burnamount,remoteaddr,V);
-            printf("generated.(%s) vins.(%s)\n",rawtx!=0?rawtx:"",vins!=0?jprint(vins,0):"");
+            //printf("generated.(%s) vins.(%s)\n",rawtx!=0?rawtx:"",vins!=0?jprint(vins,0):"");
         }
         if ( rawtx != 0 )
         {
diff --git a/basilisk/basilisk_swap.c b/basilisk/basilisk_swap.c
index ecf893bec..a353828f6 100755
--- a/basilisk/basilisk_swap.c
+++ b/basilisk/basilisk_swap.c
@@ -171,7 +171,7 @@ int32_t basilisk_bobscript(uint8_t *rmd160,uint8_t *redeemscript,int32_t *redeem
         *secretstartp = n + 2;
     if ( 1 )
     {
-        if ( 1 && bits256_nonz(privkey) != 0 )
+        if ( 0 && bits256_nonz(privkey) != 0 )
         {
             uint8_t bufA[20],bufB[20];
             revcalc_rmd160_sha256(bufA,privkey);
@@ -181,13 +181,13 @@ int32_t basilisk_bobscript(uint8_t *rmd160,uint8_t *redeemscript,int32_t *redeem
             else if ( memcmp(bufB,secret160,sizeof(bufB)) == 0 )
                 printf("MATCHES BUFB\n");
             else printf("secret160 matches neither\n");
-            memcpy(secret160,bufB,20);
             for (i=0; i<20; i++)
                 printf("%02x",bufA[i]);
             printf(" <- revcalc\n");
             for (i=0; i<20; i++)
                 printf("%02x",bufB[i]);
             printf(" <- calc\n");
+            memcpy(secret160,bufB,20);
         }
         n = bitcoin_secret160verify(redeemscript,n,secret160);
     }
@@ -362,7 +362,9 @@ int32_t basilisk_rawtx_sign(struct supernet_info *myinfo,int32_t height,struct b
             decode_hex(dest->txbytes,dest->datalen,signedtx);
             if ( signedtx != rawtxbytes )
                 free(signedtx);
-            retval = 0;
+            if ( dest->completed != 0 )
+                retval = 0;
+            else printf("couldnt sign transaction %s\n",rawtx->name);
         } else printf("error signing\n");
         free(rawtxbytes);
     } else printf("error making rawtx\n");
diff --git a/iguana/iguana_sign.c b/iguana/iguana_sign.c
index ec2a12297..182b6d1c6 100755
--- a/iguana/iguana_sign.c
+++ b/iguana/iguana_sign.c
@@ -526,7 +526,7 @@ bits256 bitcoin_sigtxid(struct iguana_info *coin,int32_t height,uint8_t *seriali
         revsigtxid = bits256_doublesha256(0,serialized,len);
         for (i=0; i<sizeof(revsigtxid); i++)
             sigtxid.bytes[31-i] = revsigtxid.bytes[i];
-        char str[65]; printf("SIGTXID.(%s) numvouts.%d\n",bits256_str(str,sigtxid),dest.tx_out);
+        //char str[65]; printf("SIGTXID.(%s) numvouts.%d\n",bits256_str(str,sigtxid),dest.tx_out);
     }
     free(dest.vins);
     free(dest.vouts);
@@ -976,8 +976,8 @@ int32_t bitcoin_verifyvins(struct iguana_info *coin,int32_t height,bits256 *sign
                         bitcoin_pubkey33(coin->ctx,vp->signers[j].pubkey,vp->signers[j].privkey);
                     sig[siglen++] = sighash;
                     vp->signers[j].siglen = siglen;
-                    char str[65]; printf("SIGTXID.(%s) ",bits256_str(str,sigtxid));
-                    /*int32_t i; for (i=0; i<siglen; i++)
+                    /*char str[65]; printf("SIGTXID.(%s) ",bits256_str(str,sigtxid));
+                    int32_t i; for (i=0; i<siglen; i++)
                         printf("%02x",sig[i]);
                     printf(" sig, ");
                     for (i=0; i<plen; i++)
@@ -999,13 +999,13 @@ int32_t bitcoin_verifyvins(struct iguana_info *coin,int32_t height,bits256 *sign
                 {
                     flag++;
                     numsigs++;
-                    int32_t z;
+                    /*int32_t z;
                     for (z=0; z<siglen-1; z++)
                         printf("%02x",sig[z]);
-                    printf(" <- sig[%d]n\n",j);
+                    printf(" <- sig[%d]\n",j);
                     for (z=0; z<33; z++)
                         printf("%02x",vp->signers[j].pubkey[z]);
-                    printf(" <- pub, SIG.%d.%d VERIFIED numsigs.%d vs M.%d\n",vini,j,numsigs,vp->M);
+                    printf(" <- pub, SIG.%d.%d VERIFIED numsigs.%d vs M.%d\n",vini,j,numsigs,vp->M);*/
                 }
             }
             if ( numsigs >= vp->M )