Browse Source

Test

etomic
jl777 8 years ago
parent
commit
2ad48da342
  1. 6
      basilisk/basilisk_bitcoin.c
  2. 4
      iguana/iguana_payments.c

6
basilisk/basilisk_bitcoin.c

@ -759,11 +759,11 @@ char *basilisk_bitcoinrawtx(struct supernet_info *myinfo,struct iguana_info *coi
amount = jdouble(valsobj,"value") * SATOSHIDEN; amount = jdouble(valsobj,"value") * SATOSHIDEN;
if ( (txfee= j64bits(valsobj,"txfee")) == 0 ) if ( (txfee= j64bits(valsobj,"txfee")) == 0 )
{ {
if ( strcmp(coin->symbol,"BTC") != 0 ) //if ( strcmp(coin->symbol,"BTC") != 0 )
{ {
txfee = coin->chain->txfee; txfee = coin->chain->txfee;
if ( txfee == 0 ) if ( txfee < 50000 )
txfee = 10000; txfee = 50000;
} }
} }
spendscriptstr = jstr(valsobj,"spendscript"); spendscriptstr = jstr(valsobj,"spendscript");

4
iguana/iguana_payments.c

@ -426,7 +426,7 @@ char *iguana_calcrawtx(struct supernet_info *myinfo,struct iguana_info *coin,cJS
coinaddr = jstri(addresses,i); coinaddr = jstri(addresses,i);
if ( (array= basilisk_unspents(myinfo,coin,coinaddr)) != 0 ) if ( (array= basilisk_unspents(myinfo,coin,coinaddr)) != 0 )
{ {
//printf("unspents.(%s) %s\n",coinaddr,jprint(array,0)); printf("unspents.(%s) %s\n",coinaddr,jprint(array,0));
if ( (m= cJSON_GetArraySize(array)) > 0 ) if ( (m= cJSON_GetArraySize(array)) > 0 )
{ {
for (j=0; j<m; j++) for (j=0; j<m; j++)
@ -459,7 +459,7 @@ char *iguana_calcrawtx(struct supernet_info *myinfo,struct iguana_info *coin,cJS
free(unspents); free(unspents);
return(0); return(0);
}*/ }*/
printf("avail %.8f satoshis %.8f, txfee %.8f burnamount %.8f vin0.scriptlen %d\n",dstr(avail),dstr(satoshis),dstr(txfee),dstr(burnamount),unspents[0].spendlen); printf("avail %.8f satoshis %.8f, txfee %.8f burnamount %.8f vin0.scriptlen %d num.%d\n",dstr(avail),dstr(satoshis),dstr(txfee),dstr(burnamount),unspents[0].spendlen,num);
if ( txobj != 0 && avail >= satoshis+txfee ) if ( txobj != 0 && avail >= satoshis+txfee )
{ {
if ( (vins= iguana_RTinputsjson(myinfo,coin,&total,satoshis + txfee,unspents,num,maxmode)) != 0 ) if ( (vins= iguana_RTinputsjson(myinfo,coin,&total,satoshis + txfee,unspents,num,maxmode)) != 0 )

Loading…
Cancel
Save