From 793c8d47fcce4bd5154ec6f78f62ce978c303e14 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 21 May 2016 21:31:55 -0500 Subject: [PATCH] test --- iguana/SuperNET.c | 2 +- iguana/iguana_instantdex.c | 9 +++++++-- iguana/iguana_sign.c | 4 ++-- iguana/swaps/iguana_BTCswap.c | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/iguana/SuperNET.c b/iguana/SuperNET.c index 0cb87e723..a1e1ba317 100755 --- a/iguana/SuperNET.c +++ b/iguana/SuperNET.c @@ -599,7 +599,7 @@ char *SuperNET_DHTsend(struct supernet_info *myinfo,uint64_t destipbits,bits256 { if ( strcmp("0.0.0.0",addr->ipaddr) != 0 && strcmp("127.0.0.1",addr->ipaddr) != 0 ) { - char str[65]; printf("BROADCAST[%d] crc.%x %s SEND.(%d) to %s\n",j,calc_crc32(0,jsonstr,(int32_t)strlen(jsonstr)),bits256_str(str,categoryhash),(int32_t)strlen(jsonstr),addr->ipaddr); + //char str[65]; printf("BROADCAST[%d] crc.%x %s SEND.(%d) to %s\n",j,calc_crc32(0,jsonstr,(int32_t)strlen(jsonstr)),bits256_str(str,categoryhash),(int32_t)strlen(jsonstr),addr->ipaddr); iguana_send_supernet(addr,jsonstr,maxdelay==0?0:(rand()%maxdelay)); } } diff --git a/iguana/iguana_instantdex.c b/iguana/iguana_instantdex.c index 7d1686975..bd58f4396 100755 --- a/iguana/iguana_instantdex.c +++ b/iguana/iguana_instantdex.c @@ -1308,7 +1308,7 @@ char *instantdex_parse(struct supernet_info *myinfo,struct instantdex_msghdr *ms A.offer.minperc = 100; if ( (swap= instantdex_statemachinefind(myinfo,exchange,A.orderid)) != 0 ) { - printf("found existing state machine %llx\n",(long long)A.orderid); + //printf("found existing state machine %llx\n",(long long)A.orderid); newjson = instantdex_parseargjson(myinfo,exchange,swap,argjson,0); if ( serdatalen == sizeof(swap->otherdeck) && swap->choosei < 0 && (retstr= instantdex_choosei(swap,newjson,argjson,serdata,serdatalen)) != 0 ) { @@ -1384,6 +1384,11 @@ char *InstantDEX_hexmsg(struct supernet_info *myinfo,struct category_info *cat,v else if ( (signerbits= acct777_validate(&msg->sig,acct777_msgprivkey(serdata,datalen),msg->sig.pubkey)) != 0 )//|| 1 ) { flag++; + if ( signerbits == myinfo->myaddr.nxt64bits ) + { + printf("filter out self-messages\n"); + return(0); + } //printf("InstantDEX_hexmsg <<<<<<<<<<<<< sigsize.%d VALIDATED [%ld] len.%d t%u allocsize.%d (%s) [%d]\n",(int32_t)sizeof(msg->sig),(long)serdata-(long)msg,datalen,msg->sig.timestamp,msg->sig.allocsize,(char *)msg->serialized,serdata[datalen-1]); newlen = (int32_t)(msg->sig.allocsize - ((long)msg->serialized - (long)msg)); serdata = msg->serialized; @@ -1400,7 +1405,7 @@ char *InstantDEX_hexmsg(struct supernet_info *myinfo,struct category_info *cat,v newlen -= olen; //newlen -= ((long)msg->serialized - (long)msg); serdata = &serdata[olen]; - printf("received orderhash.%llx olen.%d slen.%d newlen.%d\n",(long long)orderhash.txid,olen,slen,newlen); + //printf("received orderhash.%llx olen.%d slen.%d newlen.%d\n",(long long)orderhash.txid,olen,slen,newlen); } else olen = 0; if ( newlen <= 0 ) serdata = 0, newlen = 0; diff --git a/iguana/iguana_sign.c b/iguana/iguana_sign.c index 36927514b..7825a88ff 100755 --- a/iguana/iguana_sign.c +++ b/iguana/iguana_sign.c @@ -650,7 +650,7 @@ int32_t bitcoin_verifyvins(struct iguana_info *coin,bits256 *signedtxidp,char ** for (i=0; isigners[j].pubkey[i]);*/ // s2 = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141 - s1; - char str[65]; printf(" SIGNEDTX.[%02x] siglen.%d sigtxid.%s\n",sig[siglen-1],siglen,bits256_str(str,sigtxid)); + //char str[65]; printf(" SIGNEDTX.[%02x] siglen.%d sigtxid.%s\n",sig[siglen-1],siglen,bits256_str(str,sigtxid)); } if ( sig == 0 || siglen == 0 ) { @@ -743,7 +743,7 @@ void iguana_ensure_privkey(struct supernet_info *myinfo,struct iguana_info *coin uint8_t pubkey33[33]; struct iguana_waccount *wacct; struct iguana_waddress *waddr,addr; char coinaddr[128]; bitcoin_pubkey33(myinfo->ctx,pubkey33,privkey); bitcoin_address(coinaddr,coin->chain->pubtype,pubkey33,33); - printf("privkey for (%s)\n",coinaddr); + //printf("privkey for (%s)\n",coinaddr); if ( myinfo->expiration != 0 && ((waddr= iguana_waddresssearch(myinfo,coin,&wacct,coinaddr)) == 0 || bits256_nonz(waddr->privkey) == 0) ) { if ( waddr == 0 ) diff --git a/iguana/swaps/iguana_BTCswap.c b/iguana/swaps/iguana_BTCswap.c index 741f7c175..782d9c2b9 100755 --- a/iguana/swaps/iguana_BTCswap.c +++ b/iguana/swaps/iguana_BTCswap.c @@ -187,7 +187,7 @@ struct bitcoin_statetx *instantdex_feetx(struct supernet_info *myinfo,struct ins r = swap->mine.orderid ^ swap->other.orderid; n = instantdex_outputinsurance(paymentscript,swap->insurance,r,r * (strcmp("BTC",coin->symbol) == 0)); init_hexbytes_noT(scriptstr,paymentscript,n); - printf("feetx %.8f (%s)\n",dstr(swap->insurance),scriptstr); + printf("instantdex_feetx %.8f (%s)\n",dstr(swap->insurance),scriptstr); ptr = instantdex_signtx(myinfo,coin,0,scriptstr,swap->insurance,coin->txfee,swap->mine.minconfirms,A->offer.myside); return(ptr); }