Browse Source

test

release/v0.1
jl777 9 years ago
parent
commit
1528641f55
  1. 8
      iguana/iguana_payments.c
  2. 3
      iguana/iguana_sign.c

8
iguana/iguana_payments.c

@ -317,7 +317,7 @@ bits256 iguana_sendrawtransaction(struct supernet_info *myinfo,struct iguana_inf
char *iguana_calcrawtx(struct supernet_info *myinfo,struct iguana_info *coin,cJSON **vinsp,cJSON *txobj,int64_t satoshis,char *changeaddr,int64_t txfee,cJSON *addresses,int32_t minconf) char *iguana_calcrawtx(struct supernet_info *myinfo,struct iguana_info *coin,cJSON **vinsp,cJSON *txobj,int64_t satoshis,char *changeaddr,int64_t txfee,cJSON *addresses,int32_t minconf)
{ {
uint8_t addrtype,rmd160[20],spendscript[IGUANA_MAXSCRIPTSIZE]; int32_t max,num,spendlen; char *rawtx=0; bits256 txid; cJSON *vins=0; int64_t avail,total,change,*unspents = 0; uint8_t addrtype,rmd160[20],spendscript[IGUANA_MAXSCRIPTSIZE]; int32_t max,num,spendlen; char *rawtx=0; bits256 txid; cJSON *vins=0; int64_t avail,total,change,*unspents = 0; struct vin_info *V=0;
*vinsp = 0; *vinsp = 0;
max = 10000; max = 10000;
unspents = calloc(max,sizeof(*unspents)); unspents = calloc(max,sizeof(*unspents));
@ -358,7 +358,11 @@ char *iguana_calcrawtx(struct supernet_info *myinfo,struct iguana_info *coin,cJS
spendlen = bitcoin_standardspend(spendscript,0,rmd160); spendlen = bitcoin_standardspend(spendscript,0,rmd160);
bitcoin_txoutput(coin,txobj,spendscript,spendlen,change); bitcoin_txoutput(coin,txobj,spendscript,spendlen,change);
} }
rawtx = bitcoin_json2hex(myinfo,coin,&txid,txobj,0); if ( vins != 0 )
V = calloc(cJSON_GetArraySize(vins),sizeof(*V));
rawtx = bitcoin_json2hex(myinfo,coin,&txid,txobj,V);
if ( V != 0 )
free(V);
} }
} }
free(unspents); free(unspents);

3
iguana/iguana_sign.c

@ -341,6 +341,7 @@ int32_t iguana_rwmsgtx(struct iguana_info *coin,int32_t rwflag,cJSON *json,uint8
array = cJSON_CreateArray(); array = cJSON_CreateArray();
if ( rwflag == 0 ) if ( rwflag == 0 )
sigser = calloc(1,maxsize); sigser = calloc(1,maxsize);
printf("json.%p array.%p sigser.%p\n",json,array,sigser);
} }
//printf("version.%d\n",msg->version); //printf("version.%d\n",msg->version);
if ( coin->chain->hastimestamp != 0 ) if ( coin->chain->hastimestamp != 0 )
@ -469,7 +470,7 @@ int32_t iguana_rwmsgtx(struct iguana_info *coin,int32_t rwflag,cJSON *json,uint8
return(len); return(len);
} }
bits256 iguana_parsetxobj(struct supernet_info *myinfo,struct iguana_info *coin,int32_t *txstartp,uint8_t *serialized,int32_t maxsize,struct iguana_msgtx *msg,cJSON *txobj,struct vin_info *V) // json -> serialized + (msg,V) bits256 iguana_parsetxobj(struct supernet_info *myinfo,struct iguana_info *coin,int32_t *txstartp,uint8_t *serialized,int32_t maxsize,struct iguana_msgtx *msg,cJSON *txobj,struct vin_info *V)
{ {
int32_t i,numvins,numvouts,len = 0; cJSON *array=0; bits256 txid; char vpnstr[64]; int32_t i,numvins,numvouts,len = 0; cJSON *array=0; bits256 txid; char vpnstr[64];
memset(&txid,0,sizeof(txid)); memset(&txid,0,sizeof(txid));

Loading…
Cancel
Save