diff --git a/src/cc/crypto777/OS_portable.h b/src/cc/crypto777/OS_portable.h index e6ec3e435..3e00131da 100644 --- a/src/cc/crypto777/OS_portable.h +++ b/src/cc/crypto777/OS_portable.h @@ -82,10 +82,6 @@ #define hrewind(hp) hseek(hp,0,SEEK_SET) #define SCRIPT_OPRETURN 0x6a -#define GENESIS_ACCT "1739068987193023818" // NXT-MRCC-2YLS-8M54-3CMAJ -#define GENESIS_PUBKEYSTR "1259ec21d31a30898d7cd1609f80d9668b4778e3d97e941044b39f0c44d2e51b" -#define GENESIS_PRIVKEYSTR "88a71671a6edd987ad9e9097428fc3f169decba3ac8f10da7b24e0ca16803b70" -#define GENESIS_SECRET "It was a bright cold day in April, and the clocks were striking thirteen." #define SATOSHIDEN ((uint64_t)100000000L) #define dstr(x) ((double)(x) / SATOSHIDEN) @@ -116,15 +112,6 @@ typedef struct queue char name[64],initflag; } queue_t; -struct rpcrequest_info -{ - struct rpcrequest_info *next,*prev; - pthread_t T; - int32_t sock; - uint32_t ipbits; - uint16_t port,pad; -}; - struct OS_mappedptr { char fname[512]; @@ -147,7 +134,6 @@ struct OS_memspace struct tai { uint64_t x; double millis; }; 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(void); uint32_t tai2utc(struct tai t); @@ -164,8 +150,6 @@ char *utc_str(char *str,uint32_t utc); double tai_diff(struct tai reftai,struct tai cmptai); uint32_t OS_conv_utime(char *utime); -//int32_t msync(void *addr,size_t len,int32_t flags); - #ifdef __PNACL int32_t OS_nonportable_syncmap(struct OS_mappedptr *mp,long len); void *OS_nonportable_tmpalloc(char *dirname,char *name,struct OS_memspace *mem,long origsize); @@ -191,13 +175,9 @@ void OS_remove_directory(char *dirname); int32_t OS_portable_renamefile(char *fname,char *newfname); int32_t OS_portable_removefile(char *fname); void *OS_portable_mapfile(char *fname,long *filesizep,int32_t enablewrite); -//int32_t OS_portable_syncmap(struct OS_mappedptr *mp,long len); -//void *OS_portable_tmpalloc(char *dirname,char *name,struct OS_memspace *mem,long origsize); -int32_t is_DST(int32_t datenum); int32_t extract_datenum(int32_t *yearp,int32_t *monthp,int32_t *dayp,int32_t datenum); int32_t expand_datenum(char *date,int32_t datenum); -int32_t calc_datenum(int32_t year,int32_t month,int32_t day); int32_t ecb_decrdate(int32_t *yearp,int32_t *monthp,int32_t *dayp,char *date,int32_t datenum); int32_t conv_date(int32_t *secondsp,char *buf); uint32_t OS_conv_datenum(int32_t datenum,int32_t hour,int32_t minute,int32_t second); @@ -231,13 +211,9 @@ int32_t OS_releasemap(void *ptr,unsigned long filesize); double OS_milliseconds(void); void OS_randombytes(uint8_t *x,long xlen); -//int32_t OS_syncmap(struct OS_mappedptr *mp,long len); -//void *OS_tmpalloc(char *dirname,char *name,struct OS_memspace *mem,long origsize); - long myallocated(uint8_t type,long change); void *mycalloc(uint8_t type,int32_t n,long itemsize); void myfree(void *_ptr,long allocsize); -//void free_queueitem(void *itemdata); void *myrealloc(uint8_t type,void *oldptr,long oldsize,long newsize); void *myaligned_alloc(uint64_t allocsize); int32_t myaligned_free(void *ptr,long size); @@ -288,10 +264,8 @@ int init_base32(char *tokenstr,uint8_t *token,int32_t len); char *OS_mvstr(void); long _stripwhite(char *buf,int accept); -int32_t is_DST(int32_t datenum); int32_t extract_datenum(int32_t *yearp,int32_t *monthp,int32_t *dayp,int32_t datenum); int32_t expand_datenum(char *date,int32_t datenum); -int32_t calc_datenum(int32_t year,int32_t month,int32_t day); int32_t ecb_decrdate(int32_t *yearp,int32_t *monthp,int32_t *dayp,char *date,int32_t datenum); int32_t conv_date(int32_t *secondsp,char *buf); uint32_t OS_conv_datenum(int32_t datenum,int32_t hour,int32_t minute,int32_t second); @@ -303,58 +277,14 @@ uint64_t RS_decode(char *rs); int32_t RS_encode(char *rsaddr,uint64_t id); char *cmc_ticker(char *base); -void calc_sha1(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_md2(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_md4(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_md4str(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_md2str(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_md5str(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_sha224(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_sha384(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_sha512(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_sha224(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_rmd160(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_rmd128(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_rmd256(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_rmd320(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_tiger(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_whirlpool(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); - -char *hmac_sha1_str(char *dest,char *key,int32_t key_size,char *message); -char *hmac_md2_str(char *dest,char *key,int32_t key_size,char *message); -char *hmac_md4_str(char *dest,char *key,int32_t key_size,char *message); -char *hmac_md5_str(char *dest,char *key,int32_t key_size,char *message); -char *hmac_sha224_str(char *dest,char *key,int32_t key_size,char *message); -char *hmac_sha256_str(char *dest,char *key,int32_t key_size,char *message); -char *hmac_sha384_str(char *dest,char *key,int32_t key_size,char *message); -char *hmac_sha512_str(char *dest,char *key,int32_t key_size,char *message); -char *hmac_rmd128_str(char *dest,char *key,int32_t key_size,char *message); -char *hmac_rmd160_str(char *dest,char *key,int32_t key_size,char *message); -char *hmac_rmd256_str(char *dest,char *key,int32_t key_size,char *message); -char *hmac_rmd320_str(char *dest,char *key,int32_t key_size,char *message); -char *hmac_tiger_str(char *dest,char *key,int32_t key_size,char *message); -char *hmac_whirlpool_str(char *dest,char *key,int32_t key_size,char *message); int nn_base64_encode(const uint8_t *in,size_t in_len,char *out,size_t out_len); int nn_base64_decode(const char *in,size_t in_len,uint8_t *out,size_t out_len); void calc_rmd160_sha256(uint8_t rmd160[20],uint8_t *data,int32_t datalen); void sha256_sha256(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); void rmd160ofsha256(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_md5str(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_crc32str(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_NXTaddr(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_curve25519_str(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_base64_encodestr(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_base64_decodestr(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_hexstr(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); -void calc_unhexstr(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len); int32_t safecopy(char *dest,char *src,long len); double dxblend(double *destp,double val,double decay); -uint64_t calc_ipbits(char *ip_port); -void expand_ipbits(char *ipaddr,uint64_t ipbits); -void escape_code(char *escaped,char *str); -void SaM_PrepareIndices(void); - // dragon_serdes.c #ifndef IGUANA_LOG2PACKETSIZE #define IGUANA_LOG2PACKETSIZE 22 @@ -399,10 +329,5 @@ void bits256_rmd160_sha256(uint8_t rmd160[20],bits256 data); double get_theoretical(double *avebidp,double *aveaskp,double *highbidp,double *lowaskp,double *CMC_averagep,double changes[3],char *name,char *base,char *rel,double *USD_averagep); char *bitcoind_RPCnew(void *curl_handle,char **retstrp,char *debugstr,char *url,char *userpass,char *command,char *params,int32_t timeout); -extern char *Iguana_validcommands[]; -extern bits256 GENESIS_PUBKEY,GENESIS_PRIVKEY; -extern char NXTAPIURL[]; -extern int32_t smallprimes[168],Debuglevel; - #endif diff --git a/src/chainparams.h b/src/chainparams.h index 5104e3b7e..962f8ece9 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -118,11 +118,7 @@ public: void SetKValue(uint64_t k) { nEquihashK = k; } void SetMiningRequiresPeers(bool flag) { fMiningRequiresPeers = flag; } - //void setnonce(uint32_t nonce) { memcpy(&genesis.nNonce,&nonce,sizeof(nonce)); } - //void settimestamp(uint32_t timestamp) { genesis.nTime = timestamp; } - //void setgenesis(CBlock &block) { genesis = block; } - //void recalc_genesis(uint32_t nonce) { genesis = CreateGenesisBlock(ASSETCHAINS_TIMESTAMP, nonce, GENESIS_NBITS, 1, COIN); }; - CMessageHeader::MessageStartChars pchMessageStart; // jl777 moved + CMessageHeader::MessageStartChars pchMessageStart; Consensus::Params consensus; protected: