hush
/
dragon
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Delete basilisk junk we do not want nor need

master
Duke Leto 4 years ago
parent
298cfc63fb
commit
b7a10a2a36
8 changed files with 39 additions and 108 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      dragon/dpow.h
  2. 2
      dragon/dragon_peers.c
  3. 4
      dragon/m_notary_testnet
  4. 6
      dragon/notary.sh
  5. 35
      includes/dragon_apideclares.h
  6. 23
      includes/dragon_funcs.h
  7. 40
      includes/dragon_structs.h
  8. 3
      includes/dragon_types.h

34
dragon/dpow.h
View File

@ -92,9 +92,41 @@ struct dpow_sigentry
uint8_t senderind,lastk,siglen,sig[DPOW_MAXSIGLEN],senderpub[33];
};
struct notary_p2pitem
{
struct queueitem DL;
struct dragon_info *coin; struct dragon_peer *addr;
uint32_t ipbits,datalen; char type[4];
uint8_t data[];
};
struct notary_request
{
uint32_t requestid,timestamp,quoteid,quotetime; // 0 to 15
uint64_t srcamount,minamount; // 16 to 31
bits256 srchash; // 32 to 63
bits256 desthash;
char src[8],dest[8];
//char volatile_start,message[43];
uint64_t destamount;
int32_t optionhours,profitmargin;//,DEXselector,extraspace;
} PACKEDSTRUCT;
struct notary_relaystatus
{
uint8_t pingdelay;
};
struct notary_relay
{
bits256 pubkey; int32_t relayid,oldrelayid; uint32_t ipbits,lastping; uint8_t pubkey33[33];
struct notary_request *requests; int32_t maxrequests,numrequests;
struct notary_relaystatus direct,reported[BASILISK_MAXRELAYS];
};
struct komodo_notaries
{
struct basilisk_relay RELAYS[DPOW_MAXRELAYS];
struct notary_relay RELAYS[DPOW_MAXRELAYS];
int32_t NUMRELAYS,RELAYID;
};

2
dragon/dragon_peers.c
View File

@ -596,8 +596,6 @@ int32_t dragon_send(struct dragon_info *coin,struct dragon_peer *addr,uint8_t *s
}
}
addr->totalsent += len;
if ( (0) && addr->basilisk != 0 )
printf("verack.%d (%s) sent.%d bytes to %s\n",addr->msgcounts.verack,cmdstr,len,addr->ipaddr);
return(len);
}

4
dragon/m_notary_testnet
View File

@ -5,8 +5,8 @@ rm -f ../agents/dragon *.o
git pull
cd secp256k1; ./m_unix; cd ..
cd ../crypto555; ./m_LP; cd ../dragon
clang -g -Wno-deprecated -c -O2 -DISNOTARYNODE=1 -DLIQUIDITY_PROVIDER=1 *.c ../basilisk/basilisk.c ../gecko/gecko.c ../datachain/datachain.c
clang -g -Wno-deprecated -c -DISNOTARYNODE=1 -DLIQUIDITY_PROVIDER=1 main.c dragon.c dragon_bundles.c ../basilisk/basilisk.c
clang -g -Wno-deprecated -c -O2 -DISNOTARYNODE=1 -DLIQUIDITY_PROVIDER=1 *.c ../datachain/datachain.c
clang -g -Wno-deprecated -c -DISNOTARYNODE=1 -DLIQUIDITY_PROVIDER=1 main.c dragon.c dragon_bundles.c
clang -g -o ../agents/dragon *.o ../agents/libcrypto555.a -lnanomsg -lcurl -lssl -lcrypto -lpthread -lz -lm -lsodium
wget -qO testnet https://raw.githubusercontent.com/JustLies777/vote2018/master/testnet/testnet.json
../agents/dragon testnet & #> dragon.log 2> error.log &

6
dragon/notary.sh
View File

@ -17,10 +17,8 @@ case "$1" in
rm -f ../agents/dragon *.o
cd secp256k1; ./m_unix; cd ..
cd ../crypto555; ./m_LP; cd ../dragon
#gcc -g -fno-aggressive-loop-optimizations -Wno-deprecated -c -O2 -DISNOTARYNODE=1 -DLIQUIDITY_PROVIDER=1 *.c ../basilisk/basilisk.c ../gecko/gecko.c ../datachain/datachain.c
clang -g -Wno-deprecated -c -O2 -DISNOTARYNODE=1 *.c ../basilisk/basilisk.c ../gecko/gecko.c ../datachain/datachain.c
#gcc -g -fno-aggressive-loop-optimizations -Wno-deprecated -c -DISNOTARYNODE=1 -DLIQUIDITY_PROVIDER=1 main.c dragon.c dragon_bundles.c ../basilisk/basilisk.c
clang -g -Wno-deprecated -c -DISNOTARYNODE=1 main.c dragon.c dragon_bundles.c ../basilisk/basilisk.c
clang -g -Wno-deprecated -c -O2 -DISNOTARYNODE=1 *.c ../datachain/datachain.c
clang -g -Wno-deprecated -c -DISNOTARYNODE=1 main.c dragon.c dragon_bundles.c
clang -g -o ../agents/dragon *.o ../agents/libcrypto555.a -lnanomsg -lcurl -lssl -lcrypto -lpthread -lz -lm -lsodium
echo ">>> Done building dragon <<<"
;;

35
includes/dragon_apideclares.h
View File

@ -61,41 +61,6 @@ STRING_ARG(dex,explorer,symbol);
STRING_ARG(dex,getmessage,argstr);
STRING_ARG(dex,psock,argstr);
HASH_ARRAY_STRING(basilisk,genesis_opreturn,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,history,hash,vals,hexstr);
INT_ARG(basilisk,paxfiats,mask);
HASH_ARRAY_STRING(basilisk,balances,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,value,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,rawtx,hash,vals,hexstr);
TWO_STRINGS(basilisk,refresh,symbol,address);
ZERO_ARGS(basilisk,cancelrefresh);
STRING_ARRAY_OBJ_STRING(basilisk,utxorawtx,symbol,utxos,vals,ignore);
HASH_ARRAY_STRING(basilisk,utxocombine,ignore,vals,symbol);
HASH_ARRAY_STRING(basilisk,getmessage,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,sendmessage,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,geckoheaders,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,geckoblock,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,geckotx,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,geckoget,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,addrelay,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,dispatch,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,publish,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,subscribe,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,forward,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,mailbox,hash,vals,hexstr);
/*HASH_ARRAY_STRING(basilisk,VPNcreate,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,VPNjoin,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,VPNmessage,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,VPNbroadcast,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,VPNreceive,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,VPNlogout,hash,vals,hexstr);
HASH_ARRAY_STRING(basilisk,vote,hash,vals,hexstr);*/
ZERO_ARGS(bitcoinrpc,getinfo);
ZERO_ARGS(bitcoinrpc,getblockcount);
ZERO_ARGS(bitcoinrpc,getdifficulty);

23
includes/dragon_funcs.h
View File

@ -249,8 +249,6 @@ void dragon_peerkill(struct dragon_info *coin);
int32_t blockhash_sha256(uint8_t *blockhashp,uint8_t *serialized,int32_t len);
void dragon_nameset(char name[64],char *symbol,cJSON *json);
cJSON *dragon_getinfo(struct supernet_info *myinfo,struct dragon_info *coin);
void *basilisk_getinfo(struct basilisk_item *Lptr,struct supernet_info *myinfo,struct dragon_info *coin,char *remoteaddr,uint32_t basilisktag,int32_t timeoutmillis,cJSON *valsobj);
void basilisk_unspents_process(struct supernet_info *myinfo,struct dragon_info *coin,char *retstr);
char *busdata_sync(uint32_t *noncep,char *jsonstr,char *broadcastmode,char *destNXTaddr);
void peggy();
int32_t opreturns_init(uint32_t blocknum,uint32_t blocktimestamp,char *path);
@ -447,17 +445,13 @@ struct dragon_waddress *dragon_waddresssearch(struct supernet_info *myinfo,struc
cJSON *dragon_RTlistunspent(struct supernet_info *myinfo,struct dragon_info *coin,cJSON *argarray,int32_t minconf,int32_t maxconf,char *remoteaddr,int32_t includespends);
uint64_t dragon_interest(struct supernet_info *myinfo,struct dragon_info *coin,bits256 txid,int32_t vout,uint64_t value);
void calc_shares(struct supernet_info *myinfo,uint8_t *shares,uint8_t *secret,int32_t size,int32_t width,int32_t M,int32_t N,uint8_t *sharenrs,uint8_t *space,int32_t spacesize);
//struct basilisk_spend *basilisk_addspend(struct supernet_info *myinfo,char *symbol,bits256 txid,uint16_t vout,int32_t addflag);
//void dragon_wallet_Cclear(struct supernet_info *myinfo,char *symbol);
int64_t _RTgettxout(struct dragon_info *coin,struct dragon_RTtxid **ptrp,int32_t *heightp,int32_t *scriptlenp,uint8_t *script,uint8_t *rmd160,char *coinaddr,bits256 txid,int32_t vout,int32_t mempool);
int32_t _dragon_RTunspentfind(struct supernet_info *myinfo,struct dragon_info *coin,bits256 *txidp,int32_t *voutp,uint8_t *spendscript,struct dragon_outpoint outpt,int64_t value);
int32_t basilisk_unspentfind(struct supernet_info *myinfo,struct dragon_info *coin,bits256 *txidp,int32_t *voutp,uint8_t *spendscript,struct dragon_outpoint outpt,int64_t value);
int64_t dragon_addressreceived(struct supernet_info *myinfo,struct dragon_info *coin,cJSON *json,char *remoteaddr,cJSON *txids,cJSON *vouts,cJSON *unspents,cJSON *spends,char *coinaddr,int32_t minconf,int32_t firstheight);
cJSON *dragon_walletjson(struct supernet_info *myinfo);
int32_t dragon_payloadupdate(struct supernet_info *myinfo,struct dragon_info *coin,char *retstr,struct dragon_waddress *waddr,char *account);
int32_t bitcoin_MofNspendscript(uint8_t p2sh_rmd160[20],uint8_t *script,int32_t n,const struct vin_info *vp);
cJSON *basilisk_balance_valsobj(struct supernet_info *myinfo,struct dragon_info *coin);
void basilisk_unspents_update(struct supernet_info *myinfo,struct dragon_info *coin);
struct dragon_txid *dragon_blocktx(struct dragon_info *coin,struct dragon_txid *tx,struct dragon_block *block,int32_t i);
cJSON *dragon_p2shjson(struct supernet_info *myinfo,struct dragon_info *coin,cJSON *retjson,struct dragon_waddress *waddr);
char *setaccount(struct supernet_info *myinfo,struct dragon_info *coin,struct dragon_waddress **waddrp,char *account,char *coinaddr,char *redeemScript);
@ -470,7 +464,6 @@ int32_t dragon_volatileupdate(struct dragon_info *coin,int32_t incremental,struc
void dragon_utxoaddrs_purge(struct dragon_info *coin);
int32_t dragon_utxoupdate(struct dragon_info *coin,int16_t spent_hdrsi,uint32_t spent_unspentind,uint32_t spent_pkind,uint64_t spent_value,uint32_t spendind,uint32_t fromheight,uint8_t *rmd160);
int32_t dragon_RTunspentslists(struct supernet_info *myinfo,struct dragon_info *coin,uint64_t *totalp,struct dragon_outpoint *unspents,int32_t max,uint64_t required,int32_t minconf,cJSON *addresses,char *remoteaddr);
double basilisk_request_listprocess(struct supernet_info *myinfo,struct basilisk_request *issueR,struct basilisk_request *list,int32_t n);
void dragon_unspents_mark(struct supernet_info *myinfo,struct dragon_info *coin,cJSON *vins);
int32_t dragon_immediate(struct dragon_info *coin,int32_t immedmillis);
int32_t dragon_fastfindreset(struct dragon_info *coin);
@ -504,18 +497,12 @@ char *dragon_signunspents(struct supernet_info *myinfo,struct dragon_info *coin,
bits256 dragon_sendrawtransaction(struct supernet_info *myinfo,struct dragon_info *coin,char *signedtx);
int32_t dragon_inv2packet(uint8_t *serialized,int32_t maxsize,int32_t type,bits256 *hashes,int32_t n);
int32_t instantdex_inv2data(struct supernet_info *myinfo,struct dragon_info *coin,struct dragon_peer *addr,struct exchange_info *exchange);
uint32_t basilisk_crcrecv(struct supernet_info *myinfo,int32_t width,uint8_t *verifybuf,int32_t maxlen,int32_t *datalenp,bits256 srchash,bits256 desthash,uint32_t channel,uint32_t msgbits);
struct dragon_bundlereq *instantdex_recvquotes(struct dragon_info *coin,struct dragon_bundlereq *req,bits256 *encodedhash,int32_t n);
uint32_t basilisk_crcsend(struct supernet_info *myinfo,int32_t width,uint8_t *verifybuf,int32_t maxlen,bits256 srchash,bits256 desthash,uint32_t channel,uint32_t msgbits,uint8_t *data,int32_t datalen,uint32_t crcs[2]);
struct exchange_info *exchange_create(char *exchangestr,cJSON *argjson);
int32_t dragon_inv2poll(struct supernet_info *myinfo,struct dragon_info *coin);
struct dragon_bundlereq *dragon_bundlereq(struct dragon_info *coin,struct dragon_peer *addr,int32_t type,uint8_t *data,int32_t datalen);
void instantdex_FSMinit();
//void dpow_handler(struct supernet_info *myinfo,struct basilisk_message *msg);
int32_t datachain_opreturnscript(struct dragon_info *coin,uint8_t *script,char *datastr,int32_t datalen);
int32_t basilisk_messagekeyread(uint8_t *key,uint32_t *channelp,uint32_t *msgidp,bits256 *srchashp,bits256 *desthashp);
cJSON *basilisk_channelget(struct supernet_info *myinfo,bits256 srchash,bits256 desthash,uint32_t channel,uint32_t msgid,int32_t width);
int32_t basilisk_channelsend(struct supernet_info *myinfo,bits256 srchash,bits256 desthash,uint32_t channel,uint32_t msgid,uint8_t *data,int32_t datalen,uint32_t duration);
cJSON *dpow_listunspent(struct supernet_info *myinfo,struct dragon_info *coin,char *coinaddr);
void dragon_dPoWupdate(struct supernet_info *myinfo,struct dpow_info *dp);
char *dragon_utxoduplicates(struct supernet_info *myinfo,struct dragon_info *coin,uint8_t *pubkey33,uint64_t satoshis,int32_t duplicates,int32_t *completedp,bits256 *signedtxidp,int32_t sendflag,cJSON *addresses);
@ -527,7 +514,6 @@ void datachain_update_spend(struct supernet_info *myinfo,int32_t ordered,struct
cJSON *bitcoin_data2json(struct dragon_info *coin,int32_t height,bits256 *txidp,struct dragon_msgtx *msgtx,uint8_t *extraspace,int32_t extralen,uint8_t *serialized,int32_t len,cJSON *vins,int32_t suppress_pubkeys);
int32_t dragon_unspentind2txid(struct supernet_info *myinfo,struct dragon_info *coin,int32_t *spentheightp,bits256 *txidp,int32_t *voutp,struct dragon_outpoint outpt);
int32_t dragon_RTunspent_check(struct supernet_info *myinfo,struct dragon_info *coin,struct dragon_outpoint outpt);
char *basilisk_bitcoinrawtx(struct supernet_info *myinfo,struct dragon_info *coin,char *remoteaddr,uint32_t basilisktag,int32_t timeoutmillis,cJSON *valsobj,struct vin_info *V);
int32_t dragon_markedunspents_find(struct dragon_info *coin,int32_t *firstslotp,bits256 txid,int32_t vout);
void jumblr_opidsupdate(struct supernet_info *myinfo,struct dragon_info *coin);
@ -539,11 +525,9 @@ void instantdex_eventfree(struct bitcoin_eventitem *ptr);
struct dragon_monitorinfo *dragon_txidmonitor(struct dragon_info *coin,bits256 txid);
struct dragon_monitorinfo *dragon_txidreport(struct dragon_info *coin,bits256 txid,struct dragon_peer *addr);
double dragon_txidstatus(struct supernet_info *myinfo,struct dragon_info *coin,bits256 txid);
void basilisk_functions(struct dragon_info *coin,int32_t protocol);
char *bitcoind_passthru(char *coinstr,char *serverport,char *userpass,char *method,char *params);
char *bitcoin_calcrawtx(struct supernet_info *myinfo,struct dragon_info *coin,cJSON **vinsp,int64_t satoshis,char *paymentscriptstr,char *changeaddr,int64_t txfee,cJSON *addresses,int32_t minconf,uint32_t locktime);
char *bitcoin_blockhashstr(char *coinstr,char *serverport,char *userpass,int32_t height);
bits256 basilisk_blockhash(struct dragon_info *coin,bits256 prevhash2);
void calc_scrypthash(uint32_t *hash,void *data);
int32_t dragon_rwvarstr(int32_t rwflag,uint8_t *serialized,int32_t maxlen,char *endianedp);
bits256 bitcoin_sharedsecret(void *ctx,bits256 privkey,uint8_t *pubkey,int32_t plen);
@ -552,11 +536,9 @@ int32_t dragon_blockROsize(uint8_t zcash);
void *dragon_blockzcopyRO(uint8_t zcash,struct dragon_blockRO *dest,int32_t desti,struct dragon_blockRO *src,int32_t srci);
void dragon_blockzcopy(uint8_t zcash,struct dragon_block *dest,struct dragon_block *src);
int32_t dragon_blocksizecheck(char *debugstr,uint8_t zcash,struct dragon_block *block);
void basilisk_miner(struct supernet_info *myinfo,struct dragon_info *btcd,struct dragon_info *virt,int32_t maxmillis,char *mineraddr);
int32_t bitcoin_secret160verify(uint8_t *script,int32_t n,uint8_t secret160[20]);
int32_t bitcoin_secret256spend(uint8_t *script,int32_t n,bits256 secret);
int32_t bitcoin_pubkeyspend(uint8_t *script,int32_t n,uint8_t pubkey[66]);
int32_t basilisk_blocksubmit(struct supernet_info *myinfo,struct dragon_info *btcd,struct dragon_info *virt,struct dragon_peer *addr,char *blockstr,bits256 hash2,int32_t height);
struct supernet_info *SuperNET_MYINFO(char *passphrase);
bits256 calc_categoryhashes(bits256 *subhashp,char *category,char *subcategory);
struct gecko_chain *category_find(bits256 categoryhash,bits256 subhash);
@ -581,7 +563,6 @@ bits256 dragon_parsetxobj(struct supernet_info *myinfo,struct dragon_info *coin,
int32_t dragon_ROallocsize(struct dragon_info *virt);
uint64_t dragon_utxoaddr_gen(struct supernet_info *myinfo,struct dragon_info *coin,int32_t maxheight);
long dragon_bundlesload(struct supernet_info *myinfo,struct dragon_info *coin);
void basilisk_wait(struct supernet_info *myinfo,struct dragon_info *coin);
int32_t bitcoin_pubkey_combine(void *ctx,uint8_t *combined_pub,uint8_t *skipkey,bits256 *evenkeys,int32_t n,bits256 *oddkeys,int32_t m);
bits256 bitcoin_pub256(void *ctx,bits256 *privkeyp,uint8_t odd_even);
bits256 bitcoin_schnorr_noncepair(void *ctx,uint8_t *pubnonce,bits256 txhash2,bits256 privkey);
@ -592,8 +573,6 @@ struct gecko_memtx *gecko_unspentfind(struct gecko_memtx ***ptrpp,struct dragon_
int64_t *gecko_valueptr(struct gecko_memtx *memtx,int32_t vout);
struct dragon_peer *dragon_peerfindipaddr(struct dragon_info *coin,char *ipaddr,int32_t needalive);
struct dragon_peer *dragon_peerfindipbits(struct dragon_info *coin,uint32_t ipbits,int32_t needalive);
//int32_t basilisk_relays_send(struct supernet_info *myinfo,struct dragon_peer *addr);
int32_t basilisk_hashes_send(struct supernet_info *myinfo,struct dragon_info *virt,struct dragon_peer *addr,char *CMD,bits256 *txids,int32_t num);
int32_t dragon_opreturn(struct supernet_info *myinfo,int32_t ordered,struct dragon_info *coin,uint32_t timestamp,struct dragon_bundle *bp,int64_t crypto555_payment,int32_t height,uint64_t hdrsi_unspentind,int64_t payment,uint32_t fileid,uint64_t scriptpos,uint32_t scriptlen);
/*
* because the address passed in a non-portable way we defined uint64_t as parameter to
@ -605,10 +584,8 @@ int32_t dragon_scriptdata(struct dragon_info *coin, uint8_t *scriptspace, uint64
#else
int32_t dragon_scriptdata(struct dragon_info *coin,uint8_t *scriptspace,long fileptr[2],char *fname,uint64_t scriptpos,int32_t scriptlen);
#endif
void basilisk_ensurerelay(struct supernet_info *myinfo,struct dragon_info *notaries,uint32_t ipbits);
void dpow_nanomsginit(struct supernet_info *myinfo,char *ipaddr);
int32_t dragon_datachain_scan(struct supernet_info *myinfo,struct dragon_info *coin,uint8_t rmd160[20]);
int32_t basilisk_requests_poll(struct supernet_info *myinfo);
void dpow_psockloop(void *_ptr);
int32_t smartaddress_add(struct supernet_info *myinfo,bits256 privkey,char *typestr,char *symbol,double maxbid,double minask);
int32_t smartaddress(struct supernet_info *myinfo,char *typestr,double *bidaskp,bits256 *privkeyp,char *symbol,char *coinaddr);

40
includes/dragon_structs.h
View File

@ -376,7 +376,7 @@ struct dragon_peer
char ipaddr[64],lastcommand[16],coinname[64],symbol[64];
uint64_t pingnonce,totalsent,totalrecv,ipbits; double pingtime,sendmillis,pingsum,getdatamillis;
uint32_t lastcontact,sendtime,ready,startsend,startrecv,pending,lastgotaddr,lastblockrecv,pendtime,lastflush,lastpoll,myipbits,persistent_peer,protover,numrecverrs;
int32_t supernet,basilisk,dead,addrind,usock,lastheight,relayflag,numpackets,numpings,ipv6,height,rank,pendhdrs,pendblocks,recvhdrs,lastlefti,validpub,othervalid,dirty[2],laggard,headerserror,lastsent,isrelay;
int32_t supernet,dead,addrind,usock,lastheight,relayflag,numpackets,numpings,ipv6,height,rank,pendhdrs,pendblocks,recvhdrs,lastlefti,validpub,othervalid,dirty[2],laggard,headerserror,lastsent,isrelay;
double recvblocks,recvtotal;
int64_t allocated,freed;
bits256 RThashes[DRAGON_MAXBUNDLESIZE]; int32_t numRThashes;
@ -434,9 +434,7 @@ struct dragon_bundlereq
struct dragon_bitmap { int32_t width,height,amplitude; char name[52]; uint8_t data[DRAGON_WIDTH*DRAGON_HEIGHT*3]; };
struct basilisk_spend { bits256 txid,spentfrom; uint64_t relaymask,value; uint32_t timestamp; int32_t vini,vout,height,unspentheight,ismine; char destaddr[64],symbol[16]; };
struct basilisk_unspent { bits256 txid; uint64_t value,relaymask; uint32_t unspentind,timestamp; int32_t RTheight,height,spentheight; int16_t status,hdrsi,vout,spendlen; char symbol[16]; uint8_t script[256]; };
struct dragon_waddress { UT_hash_handle hh; uint64_t balance; uint16_t scriptlen; uint8_t rmd160[20],pubkey[33],wiftype,addrtype; bits256 privkey; char symbol[16],coinaddr[36],wifstr[54]; uint8_t redeemScript[]; };
struct dragon_waccount { UT_hash_handle hh; struct dragon_waddress *waddr,*current; char account[]; };
@ -495,8 +493,6 @@ struct dragon_info
UT_hash_handle hh;
char CMCname[64],name[64],symbol[64],protocol,statusstr[512],scriptsfname[2][512];
struct dragon_peers *peers; struct dragon_peer internaladdr;
//basilisk_func basilisk_rawtx,basilisk_balances,basilisk_value;
//basilisk_metricfunc basilisk_rawtxmetric,basilisk_balancesmetric,basilisk_valuemetric;
#if defined(_M_X64)
/*
* because we have no choice but to pass the value as parameters
@ -531,7 +527,7 @@ struct dragon_info
int32_t numremain,numpendings,zcount,recvcount,bcount,pcount,lastbundle,numsaved,pendbalances,numverified,blockdepth,matchedfiles;
uint32_t recvtime,hdrstime,backstoptime,lastbundletime,numreqsent,numbundlesQ,lastbundleitime,lastdisp,RTgenesis,firstRTgenesis,RTstarti,idletime,stucktime,stuckmonitor,maxstuck,lastreqtime,RThdrstime,nextchecked,lastcheckpoint,sigserrs,sigsvalidated,coinid;
double bandwidth,maxbandwidth,backstopmillis; bits256 backstophash2; int64_t spaceused;
int32_t disableUTXO,initialheight,mapflags,minconfirms,numrecv,bindsock,isRT,backstop,blocksrecv,merging,firstRTheight,maxRTheight,polltimeout,numreqtxids,allhashes,balanceflush,basilisk_busy,almostRT,busy_processing; bits256 reqtxids[64];
int32_t disableUTXO,initialheight,mapflags,minconfirms,numrecv,bindsock,isRT,backstop,blocksrecv,merging,firstRTheight,maxRTheight,polltimeout,numreqtxids,allhashes,balanceflush,almostRT,busy_processing; bits256 reqtxids[64];
void *launched,*started,*rpcloop;
uint64_t bloomsearches,bloomhits,bloomfalse,collisions,txfee_perkb,txfee;
uint8_t *blockspace; int32_t blockspacesize; struct OS_memspace blockMEM,RTHASHMEM;
@ -599,37 +595,5 @@ struct _gfshare_ctx
uint8_t sharenrs[255],buffer[];
};
struct basilisk_p2pitem
{
struct queueitem DL;
struct dragon_info *coin; struct dragon_peer *addr;
uint32_t ipbits,datalen; char type[4];
uint8_t data[];
};
struct basilisk_request
{
uint32_t requestid,timestamp,quoteid,quotetime; // 0 to 15
uint64_t srcamount,minamount; // 16 to 31
bits256 srchash; // 32 to 63
bits256 desthash;
char src[8],dest[8];
//char volatile_start,message[43];
uint64_t destamount;
int32_t optionhours,profitmargin;//,DEXselector,extraspace;
} PACKEDSTRUCT;
struct basilisk_relaystatus
{
uint8_t pingdelay;
};
struct basilisk_relay
{
bits256 pubkey; int32_t relayid,oldrelayid; uint32_t ipbits,lastping; uint8_t pubkey33[33];
struct basilisk_request *requests; int32_t maxrequests,numrequests;
struct basilisk_relaystatus direct,reported[BASILISK_MAXRELAYS];
};
#endif

3
includes/dragon_types.h
View File

@ -20,9 +20,6 @@
typedef void (*dragon_func)(void *);
typedef int32_t (*blockhashfunc)(uint8_t *blockhashp,uint8_t *serialized,int32_t len);
//typedef void *(*basilisk_func)(struct basilisk_item *Lptr,struct supernet_info *myinfo,struct dragon_info *coin,char *remoteaddr,uint32_t basilisktag,int32_t timeoutmillis,cJSON *vals);
//typedef double (*basilisk_metricfunc)(struct supernet_info *myinfo,struct basilisk_item *ptr,char *result);
//typedef struct _gfshare_ctx gfshare_ctx;
#endif

Write Preview
Loading…
Cancel
Save