Browse Source

Test

etomic
jl777 7 years ago
parent
commit
21ef9c284e
  1. 18
      iguana/exchanges/LP_bitcoin.c
  2. 6
      iguana/exchanges/LP_transaction.c

18
iguana/exchanges/LP_bitcoin.c

@ -3345,11 +3345,11 @@ int32_t iguana_rwmsgtx(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,uint8_t is
sigser = calloc(1,maxsize*2);
//printf("json.%p array.%p sigser.%p\n",json,vinarray,sigser);
}
printf("version.%d\n",msg->version);
//printf("version.%d\n",msg->version);
if ( isPoS != 0 )
{
len += iguana_rwnum(rwflag,&serialized[len],sizeof(msg->timestamp),&msg->timestamp);
char str[65]; printf("version.%d timestamp.%08x %u %s\n",msg->version,msg->timestamp,msg->timestamp,utc_str(str,msg->timestamp));
//char str[65]; printf("version.%d timestamp.%08x %u %s\n",msg->version,msg->timestamp,msg->timestamp,utc_str(str,msg->timestamp));
if ( json != 0 )
jaddnum(json,"timestamp",msg->timestamp);
}
@ -3370,7 +3370,7 @@ char str[65]; printf("version.%d timestamp.%08x %u %s\n",msg->version,msg->times
}
for (i=0; i<msg->tx_in; i++)
{
printf("vin.%d starts offset.%d\n",i,len);
//printf("vin.%d starts offset.%d\n",i,len);
if ( vins != 0 && jitem(vins,i) != 0 )
iguana_vinobjset(&msg->vins[i],jitem(vins,i),spendscript,sizeof(spendscript));
if ( (n= iguana_vinparse(rwflag,&serialized[len],&msg->vins[i])) < 0 )
@ -3378,7 +3378,7 @@ printf("vin.%d starts offset.%d\n",i,len);
//printf("serialized vin.[%02x %02x %02x]\n",serialized[len],serialized[len+1],serialized[len+2]);
if ( msg->vins[i].spendscript == spendscript )
msg->vins[i].spendscript = 0;
printf("vin.%d n.%d len.%d\n",i,n,len);
//printf("vin.%d n.%d len.%d\n",i,n,len);
len += n;
if ( len > maxsize )
{
@ -3386,9 +3386,9 @@ printf("vin.%d n.%d len.%d\n",i,n,len);
return(-1);
}
}
for (i=-3; i<7; i++)
printf("%02x",serialized[len+i]);
printf(" prev 3 bytes before tx_out rw.%d\n",rwflag);
//for (i=-3; i<7; i++)
// printf("%02x",serialized[len+i]);
//printf(" prev 3 bytes before tx_out rw.%d\n",rwflag);
len += iguana_rwvarint32(rwflag,&serialized[len],&msg->tx_out);
if ( rwflag == 0 )
{
@ -3408,7 +3408,7 @@ printf("vin.%d n.%d len.%d\n",i,n,len);
}
for (i=0; i<msg->tx_out; i++)
{
printf("rwflag.%d vout.%d starts %d\n",rwflag,i,len);
//printf("rwflag.%d vout.%d starts %d\n",rwflag,i,len);
if ( (n= iguana_voutparse(rwflag,&serialized[len],&msg->vouts[i])) < 0 )
return(-1);
len += n;
@ -3421,7 +3421,7 @@ printf("rwflag.%d vout.%d starts %d\n",rwflag,i,len);
jaddi(voutarray,iguana_voutjson(taddr,pubtype,p2shtype,&msg->vouts[i],i,*txidp));
}
len += iguana_rwnum(rwflag,&serialized[len],sizeof(msg->lock_time),&msg->lock_time);
printf("lock_time.%08x len.%d\n",msg->lock_time,len);
//printf("lock_time.%08x len.%d\n",msg->lock_time,len);
/*if ( strcmp(coin->symbol,"VPN") == 0 )
{
uint16_t ddosflag = 0;

6
iguana/exchanges/LP_transaction.c

@ -901,7 +901,6 @@ char *LP_createrawtransaction(int32_t *numvinsp,struct iguana_info *coin,struct
adjust = change / numvouts;
change = 0;
}
printf("numvins.%d vins.(%s) privkeys.(%s)\n",numvins,jprint(vins,0),jprint(privkeys,0));
for (i=0; i<numvouts; i++)
{
item = jitem(outputs,i);
@ -924,7 +923,6 @@ char *LP_createrawtransaction(int32_t *numvinsp,struct iguana_info *coin,struct
}
if ( change != 0 )
txobj = bitcoin_txoutput(txobj,script,scriptlen,change);
printf("call json2hex.(%s)\n",jprint(txobj,0));
if ( (rawtxbytes= bitcoin_json2hex(coin->isPoS,&txid,txobj,V)) != 0 )
{
} else printf("error making rawtx suppress.%d\n",suppress_pubkeys);
@ -963,7 +961,6 @@ char *LP_withdraw(struct iguana_info *coin,cJSON *argjson)
completed = 0;
memset(&msgtx,0,sizeof(msgtx));
memset(signedtxid.bytes,0,sizeof(signedtxid));
printf("%p %p vins.(%s) privkeys.(%s)\n",vins,privkeys,jprint(vins,0),jprint(privkeys,0));
if ( (completed= iguana_signrawtransaction(ctx,coin->symbol,coin->wiftaddr,coin->taddr,coin->pubtype,coin->p2shtype,coin->isPoS,coin->longestchain,&msgtx,&signedtx,&signedtxid,V,numvins,rawtx,vins,privkeys)) < 0 )
printf("couldnt sign withdraw %s\n",bits256_str(str,signedtxid));
else if ( completed == 0 )
@ -981,11 +978,14 @@ char *LP_withdraw(struct iguana_info *coin,cJSON *argjson)
printf("txfee %.8f -> newtxfee %.8f\n",dstr(txfee),dstr(newtxfee));
} else break;
} else break;
free_json(vins), vins = 0;
free_json(privkeys), privkeys = 0;
if ( rawtx != 0 )
free(rawtx), rawtx = 0;
}
free(V);
if ( vins != 0 )
free_json(vins);
if ( privkeys != 0 )
free_json(privkeys);
retjson = cJSON_CreateObject();

Loading…
Cancel
Save