From 6ac31b4e99a84b7523e1a9f143b7a62fba1ca6b1 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 5 May 2016 19:06:09 -0500 Subject: [PATCH] test --- crypto777/OS_portable.h | 2 +- crypto777/m_js | 2 +- iguana/exchanges/bitcoin.h | 2 +- iguana/iguana777.h | 2 +- iguana/iguana_init.c | 2 +- iguana/iguana_secp.c | 2 +- iguana/m_js | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/crypto777/OS_portable.h b/crypto777/OS_portable.h index 1f2a9434f..3424cd742 100755 --- a/crypto777/OS_portable.h +++ b/crypto777/OS_portable.h @@ -149,7 +149,7 @@ struct taidate { int32_t year,month,day; }; struct taitime { struct taidate date; int32_t hour,minute,second; uint32_t offset; double millis; }; int32_t leapsecs_sub(struct tai *); -struct tai tai_now(); +struct tai tai_now(void); uint32_t tai2utc(struct tai t); struct taidate taidate_frommjd(int32_t day,int32_t *pwday,int32_t *pyday); struct taitime tai2time(struct tai t,int32_t *pwday,int32_t *pyday); diff --git a/crypto777/m_js b/crypto777/m_js index 28e08dbb7..ad6f55cfd 100755 --- a/crypto777/m_js +++ b/crypto777/m_js @@ -1,4 +1,4 @@ git pull rm *.o -emcc -c -O2 *.c jpeg/*.c jpeg/unix/*.c +emcc -c -s USE_PTHREADS=1 -O2 *.c jpeg/*.c jpeg/unix/*.c rm -f ../agents/libcrypto777.a; emar rcu ../agents/libcrypto777.a *.o diff --git a/iguana/exchanges/bitcoin.h b/iguana/exchanges/bitcoin.h index e2d97eda7..42e1b6902 100755 --- a/iguana/exchanges/bitcoin.h +++ b/iguana/exchanges/bitcoin.h @@ -76,7 +76,7 @@ char *iguana_scriptget(struct iguana_info *coin,char *scriptstr,char *asmstr,int int32_t bitcoin_base58decode(uint8_t *data,char *coinaddr); char *bitcoin_base58encode(char *coinaddr,uint8_t *data_,int32_t datalen); -int32_t bitcoin_sign(void *ctx,char *symbol,uint8_t *sig,bits256 txhash2,bits256 privkey,int32_t recoverable); +int32_t bitcoin_sign(void *ctx,char *symbol,uint8_t *sig,bits256 txhash2,bits256 privkey,int32_t recoverflag); int32_t oldbitcoin_verify(uint8_t *sig,int32_t siglen,uint8_t *data,int32_t datalen,uint8_t *pubkey,int32_t len); diff --git a/iguana/iguana777.h b/iguana/iguana777.h index cfa0c2410..4c34df2b0 100755 --- a/iguana/iguana777.h +++ b/iguana/iguana777.h @@ -923,7 +923,7 @@ int32_t iguana_process_msgrequestQ(struct iguana_info *coin); uint32_t iguana_fastfindinit(struct iguana_info *coin); int32_t iguana_unspentindfind(struct iguana_info *coin,char *coinaddr,uint8_t *spendscript,int32_t *scriptlenp,uint64_t *valuep,int32_t *heightp,bits256 txid,int32_t vout,int32_t lasthdrsi); int32_t iguana_addressvalidate(struct iguana_info *coin,uint8_t *addrtypep,uint8_t rmd160[20],char *address); -int32_t bitcoin_sign(void *ctx,char *symbol,uint8_t *sig,bits256 txhash2,bits256 privkey,int32_t recoverable); +int32_t bitcoin_sign(void *ctx,char *symbol,uint8_t *sig,bits256 txhash2,bits256 privkey,int32_t recoverflag); bits256 iguana_str2priv(struct supernet_info *myinfo,struct iguana_info *coin,char *str); int32_t iguana_spentflag(struct iguana_info *coin,int64_t *RTspendp,int32_t *spentheightp,struct iguana_ramchain *ramchain,int16_t spent_hdrsi,uint32_t spent_unspentind,int32_t height,int32_t minconf,int32_t maxconf,uint64_t amount); int32_t iguana_voutscript(struct iguana_info *coin,struct iguana_bundle *bp,uint8_t *scriptspace,char *asmstr,struct iguana_unspent *u,struct iguana_pkhash *p,int32_t txi); diff --git a/iguana/iguana_init.c b/iguana/iguana_init.c index 3c1728716..a5b177909 100755 --- a/iguana/iguana_init.c +++ b/iguana/iguana_init.c @@ -67,7 +67,7 @@ void iguana_initcoin(struct iguana_info *coin,cJSON *argjson) usleep(1); coin->startutc++; printf("start.%u\n",coin->startutc); - coin->startmillis = OS_milliseconds(), coin->starttime = tai_now(coin->startmillis); + coin->startmillis = OS_milliseconds(), coin->starttime = tai_now(); coin->avetime = 1 * 100; //coin->R.maxrecvbundles = IGUANA_INITIALBUNDLES; for (i=0; i