From c451705b32b86f1b0c17d44a253b457384f6e4df Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 13 Mar 2016 22:44:06 -0300 Subject: [PATCH] test --- iguana/iguana_scripts.c | 29 ++++++++++++++--------------- iguana/main.c | 2 +- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/iguana/iguana_scripts.c b/iguana/iguana_scripts.c index d41c52e9b..6b4fca94b 100755 --- a/iguana/iguana_scripts.c +++ b/iguana/iguana_scripts.c @@ -516,24 +516,23 @@ int32_t iguana_scriptgen(struct iguana_info *coin,int32_t *Mp,int32_t *nump,char { scriptlen = bitcoin_MofNspendscript(rmd160,script,0,vp); if ( asmstr != 0 ) - sprintf(asmstr,"%d ",m); - for (i=0; isigners[i].pubkey)) > 0 ) + sprintf(asmstr,"%d ",m); + for (i=0; isigners[i].pubkey,plen); - if ( asmstr != 0 ) - strcat(asmstr," "); + if ( (plen= bitcoin_pubkeylen(vp->signers[i].pubkey)) > 0 ) + { + init_hexbytes_noT(asmstr + strlen(asmstr),(uint8_t *)vp->signers[i].pubkey,plen); + if ( asmstr != 0 ) + strcat(asmstr," "); + } + else if ( asmstr != 0 ) + strcat(asmstr,"NOPUBKEY "); + sprintf(asmstr + strlen(asmstr),"%d // M.%d of N.%d [",n,m,n); + for (i=0; isigners[i].coinaddr,isigners[i].coinaddr,ispendlen > 0 ) diff --git a/iguana/main.c b/iguana/main.c index 95db43f79..7b46097ec 100755 --- a/iguana/main.c +++ b/iguana/main.c @@ -1131,7 +1131,7 @@ void iguana_main(void *arg) sleep(1); char *str; //iguana_launchcoin(MYINFO.rpcsymbol,cJSON_Parse("{}")); - if ( 1 && (str= SuperNET_JSON(&MYINFO,cJSON_Parse("{\"userhome\":\"/Users/jimbolaptop/Library/Application Support\",\"agent\":\"iguana\",\"method\":\"addcoin\",\"services\":128,\"maxpeers\":1024,\"newcoin\":\"BTCD\",\"active\":1,\"numhelpers\":1,\"poll\":1}"),0)) != 0 ) + if ( 1 && (str= SuperNET_JSON(&MYINFO,cJSON_Parse("{\"userhome\":\"/Users/jimbolaptop/Library/Application Support\",\"agent\":\"iguana\",\"method\":\"addcoin\",\"services\":128,\"maxpeers\":1024,\"newcoin\":\"BTC\",\"active\":1,\"numhelpers\":1,\"poll\":1}"),0)) != 0 ) { free(str); if ( 0 && (str= SuperNET_JSON(&MYINFO,cJSON_Parse("{\"userhome\":\"/Users/jimbolaptop/Library/Application Support\",\"agent\":\"iguana\",\"method\":\"addcoin\",\"services\":1024,\"maxpeers\":256,\"newcoin\":\"BTCD\",\"active\":1}"),0)) != 0 )