Browse Source

test

release/v0.1
jl777 9 years ago
parent
commit
06627d6abd
  1. 6
      iguana/SuperNET.c
  2. 2
      iguana/iguana_payments.c
  3. 2
      includes/iguana_apideclares.h

6
iguana/SuperNET.c

@ -764,7 +764,7 @@ char *SuperNET_p2p(struct iguana_info *coin,struct iguana_peer *addr,int32_t *de
// printf("%02x ",data[i]);
//printf("DECRYPT %d\n",datalen);
iguana_setkeys(myinfo,addr,&privkey,&pubkey,&senderpub,&nextprivkey,&nextpubkey,&nextdestpub);
senderpub = iguana_actualpubkey(&offset,data,datalen,senderpub);
iguana_actualpubkey(&offset,data,datalen,senderpub);
if ( (msgbits= SuperNET_deciphercalc(&ptr,&msglen,privkey,senderpub,data+offset,datalen-offset,space,sizeof(space))) == 0 )
{
if ( (msgbits= SuperNET_deciphercalc(&ptr,&msglen,GENESIS_PRIVKEY,GENESIS_PUBKEY,data+offset,datalen-offset,space,sizeof(space))) == 0 )
@ -798,7 +798,7 @@ char *SuperNET_p2p(struct iguana_info *coin,struct iguana_peer *addr,int32_t *de
//printf("validpub.%d: %x vs %x shared.%llx\n",addr->validpub,checkc,othercheckc,(long long)addr->sharedseed.txid);
}
maxdelay = juint(json,"maxdelay");
//if ( 1 && jstr(json,"method") != 0 && strcmp(jstr(json,"method"),"getpeers") != 0 )
if ( 1 && jstr(json,"method") != 0 && strcmp(jstr(json,"method"),"getpeers") != 0 )
printf("GOT >>>>>>>> SUPERNET P2P.(%s) from.%s %s valid.%d:%d\n",jprint(json,0),coin->symbol,addr->ipaddr,addr->validpub,addr->othervalid);
if ( (myipaddr= jstr(json,"yourip")) != 0 )
SuperNET_checkipaddr(SuperNET_MYINFO(0),coin,addr,myipaddr,ipaddr);
@ -815,7 +815,7 @@ char *SuperNET_p2p(struct iguana_info *coin,struct iguana_peer *addr,int32_t *de
return(0);
}
retstr = SuperNET_JSON(myinfo,json,ipaddr,addr->A.port);
//printf("p2pret.(%s)\n",retstr);
printf("p2pret.(%s)\n",retstr);
*delaymillisp = SuperNET_delaymillis(myinfo,maxdelay);
senderpub = jbits256(json,"mypub");
addr->othervalid = (int32_t)jdouble(json,"ov");

2
iguana/iguana_payments.c

@ -552,6 +552,7 @@ char *iguana_createrawtx(struct supernet_info *myinfo,struct iguana_info *coin,c
STRING_ARRAY_OBJ_STRING(iguana,rawtx,changeaddr,addresses,vals,spendscriptstr)
{
cJSON *vins=0,*retjson; char *rawtx=0,*symbol=0; int64_t txfee,satoshis; uint32_t locktime,minconf;
printf("RAWTX changeaddr.%s\n",changeaddr==0?"":changeaddr);
retjson = cJSON_CreateObject();
if ( spendscriptstr != 0 && spendscriptstr[0] != 0 && (symbol= jstr(vals,"coin")) != 0 && (coin= iguana_coinfind(symbol)) != 0 )
{
@ -578,6 +579,7 @@ STRING_ARRAY_OBJ_STRING(iguana,rawtx,changeaddr,addresses,vals,spendscriptstr)
INT_ARRAY_STRING(iguana,rawtx_result,rawtxtag,vins,rawtx)
{
struct rawtx_queue *ptr = calloc(1,sizeof(*ptr) + strlen(rawtx) + 1);
printf("rawtx_result\n");
strcpy(ptr->rawtx,rawtx);
ptr->vins = jduplicate(vins);
ptr->rawtxtag = rawtxtag;

2
includes/iguana_apideclares.h

@ -84,7 +84,7 @@ ZERO_ARGS(bitcoinrpc,getrawchangeaddress);
SS_D_I_S(bitcoinrpc,move,fromaccount,toaccount,amount,minconf,comment);
STRING_ARRAY_OBJ_STRING(iguana,rawtx,changeaddr,addresses,vals,spendscriptstr);
INT_ARRAY_STRING(iguana,rawtx_result,tag,vins,rawtx);
INT_ARRAY_STRING(iguana,rawtx_result,rawtxtag,vins,rawtx);
STRING_ARG(iguana,initfastfind,activecoin);
STRING_ARG(iguana,peers,activecoin);

Loading…
Cancel
Save