diff --git a/basilisk/jumblr.c b/basilisk/jumblr.c index 6e2563552..730c976c0 100755 --- a/basilisk/jumblr.c +++ b/basilisk/jumblr.c @@ -587,7 +587,7 @@ void jumblr_utxotxidpendingadd(struct supernet_info *myinfo,char *dest,struct ig pend.txid = txid; pend.vout = vout; pend.ind = ind; - if ( shouldsplit == 0 && ind < 3 ) + if ( myinfo->IAMLP == 0 && shouldsplit == 0 && ind < 3 ) { if ( price > SMALLVAL ) { @@ -706,6 +706,8 @@ void jumblr_CMCname(char *CMCname,char *symbol) void jumblr_DEXcheck(struct supernet_info *myinfo,struct iguana_info *coin) { struct iguana_info *kmdcoin; + if ( myinfo->IAMNOTARY != 0 ) + return; if ( (kmdcoin= iguana_coinfind("KMD")) == 0 || iguana_coinfind("BTC") == 0 ) return; //printf("jumblr_DEXcheck\n"); @@ -747,6 +749,8 @@ void jumblr_iteration(struct supernet_info *myinfo,struct iguana_info *coin,int3 { //static uint32_t lasttime; char BTCaddr[64],KMDaddr[64],*zaddr,*retstr; bits256 privkey; uint64_t amount=0,total=0; double fee; struct jumblr_item *ptr,*tmp; uint8_t r; + if ( myinfo->IAMNOTARY != 0 ) + return; fee = JUMBLR_INCR * JUMBLR_FEE; OS_randombytes(&r,sizeof(r)); //r = 0; diff --git a/iguana/dpow/dpow_network.c b/iguana/dpow/dpow_network.c index 94b80c90d..6d2211c03 100755 --- a/iguana/dpow/dpow_network.c +++ b/iguana/dpow/dpow_network.c @@ -1154,7 +1154,7 @@ char *_dex_listunspentarg(struct supernet_info *myinfo,char *symbol,char *addres dexreq.func = arg; if ( (retstr= _dex_sendrequeststr(myinfo,&dexreq,address,0,1,"")) != 0 ) { - printf("%s UNSPENTS.(%s)\n",symbol,retstr); + //printf("_dex_listunspentarg: %s UNSPENTS.(%s)\n",symbol,retstr); } return(_dex_arrayreturn(retstr)); } diff --git a/iguana/iguana_notary.c b/iguana/iguana_notary.c index 1b75c02ba..842828271 100755 --- a/iguana/iguana_notary.c +++ b/iguana/iguana_notary.c @@ -665,8 +665,8 @@ TWO_STRINGS(dex,listunspent,symbol,address) return(retstr); } } - else if ( coin != 0 && coin->FULLNODE < 0 ) - return(jprint(dpow_listunspent(myinfo,coin,address),1)); + //else if ( coin != 0 && coin->FULLNODE < 0 ) + // return(jprint(dpow_listunspent(myinfo,coin,address),1)); return(_dex_listunspent(myinfo,symbol,address)); } diff --git a/iguana/main.c b/iguana/main.c index 71aad6eea..d9932835e 100755 --- a/iguana/main.c +++ b/iguana/main.c @@ -755,10 +755,10 @@ void jumblr_loop(void *ptr) { if ( (coin= iguana_coinfind("KMD")) != 0 ) { - // if BTC has arrived in destination address, invoke DEX -> BTC - jumblr_DEXcheck(myinfo,coin); if ( myinfo->jumblr_passphrase[0] != 0 && coin->FULLNODE < 0 ) { + // if BTC has arrived in destination address, invoke DEX -> BTC + jumblr_DEXcheck(myinfo,coin); t = (uint32_t)time(NULL); if ( (t % (120 * mult)) < 60 ) {