diff --git a/basilisk/basilisk_swap.c b/basilisk/basilisk_swap.c index 4d582da56..1a7f93836 100755 --- a/basilisk/basilisk_swap.c +++ b/basilisk/basilisk_swap.c @@ -581,16 +581,15 @@ int32_t basilisk_rawtx_return(struct supernet_info *myinfo,int32_t height,struct int32_t basilisk_rawtx_gen(char *str,struct supernet_info *myinfo,int32_t iambob,int32_t lockinputs,struct basilisk_rawtx *rawtx,uint32_t locktime,uint8_t *script,int32_t scriptlen,int64_t txfee,int32_t minconf) { struct iguana_waddress *waddr; struct iguana_waccount *wacct; char coinaddr[64],wifstr[64],*retstr,scriptstr[1024]; uint32_t basilisktag; int32_t flag,i,n,retval = -1; cJSON *valsobj,*retarray=0,*privkeyarray,*addresses; - if ( (waddr= iguana_getaccountaddress(myinfo,rawtx->coin,0,0,rawtx->coin->changeaddr,"change")) == 0 ) + //if ( (waddr= iguana_getaccountaddress(myinfo,rawtx->coin,0,0,rawtx->coin->changeaddr,"change")) == 0 ) + if ( rawtx->coin->changeaddr[0] == 0 ) { - printf("no change addr error\n"); - return(-1); + bitcoin_address(rawtx->coin->changeaddr,rawtx->coin->chain->pubtype,myinfo->persistent_pubkey33,33); + printf("set change address.(%s)\n",rawtx->coin->changeaddr); } init_hexbytes_noT(scriptstr,script,scriptlen); privkeyarray = cJSON_CreateArray(); addresses = cJSON_CreateArray(); - if ( rawtx->coin->changeaddr[0] == 0 ) - bitcoin_address(rawtx->coin->changeaddr,rawtx->coin->chain->pubtype,waddr->rmd160,20); bitcoin_address(coinaddr,rawtx->coin->chain->pubtype,myinfo->persistent_pubkey33,33); //printf("%s persistent.(%s) (%s) change.(%s) scriptstr.(%s)\n",coin->symbol,myinfo->myaddr.BTC,coinaddr,coin->changeaddr,scriptstr); if ( (waddr= iguana_waddresssearch(myinfo,&wacct,coinaddr)) != 0 ) diff --git a/iguana/iguana777.c b/iguana/iguana777.c index 7612d9473..206196dea 100755 --- a/iguana/iguana777.c +++ b/iguana/iguana777.c @@ -830,8 +830,8 @@ struct iguana_info *iguana_setcoin(char *symbol,void *launched,int32_t maxpeers, } if ( coin->startPEND > maxval*mult ) coin->startPEND = maxval*mult; - else if ( coin->startPEND < 2 ) - coin->startPEND = 2; + else if ( coin->startPEND < 1 ) + coin->startPEND = 1; coin->MAXBUNDLES = coin->startPEND; if ( (coin->endPEND= juint(json,"endpend")) == 0 ) { @@ -841,8 +841,8 @@ struct iguana_info *iguana_setcoin(char *symbol,void *launched,int32_t maxpeers, } if ( coin->endPEND > maxval*mult ) coin->endPEND = maxval*mult; - else if ( coin->endPEND < 2 ) - coin->endPEND = 2; + else if ( coin->endPEND < 1 ) + coin->endPEND = 1; #ifdef __PNACL__ coin->startPEND = coin->endPEND = 1; #endif diff --git a/iguana/iguana_spendvectors.c b/iguana/iguana_spendvectors.c index 901b6b44a..1eeeaab5f 100755 --- a/iguana/iguana_spendvectors.c +++ b/iguana/iguana_spendvectors.c @@ -1108,8 +1108,9 @@ int32_t iguana_bundlevalidate(struct iguana_info *coin,struct iguana_bundle *bp, free(blockspace); bp->validated = (uint32_t)time(NULL); printf("VALIDATED.[%d] ht.%d duration.%d errs.%d total.%lld %u | total errs.%d validated.%d %llx\n",bp->hdrsi,bp->bundleheight,bp->validated - now,errs,(long long)total,bp->validated,totalerrs,totalvalidated,(long long)validatehash.txid); - if ( bp == coin->current ) - coin->RTdatabad = -1; + iguana_volatilesmap(coin,&bp->ramchain); + //if ( bp == coin->current ) + // coin->RTdatabad = -1; } if ( errs == 0 && fp == 0 ) {