lukechilds
/
SuperNET
mirror of https://github.com/lukechilds/SuperNET.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

test

release/v0.1
jl777 9 years ago
parent
8fdb38f987
commit
640056ab83
4 changed files with 109 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      iguana/iguana777.c
  2. 10
      iguana/iguana777.h
  3. 125
      iguana/iguana_unspents.c
  4. 3
      iguana/main.c

4
iguana/iguana777.c
View File

@ -352,7 +352,7 @@ int32_t iguana_helpertask(FILE *fp,struct OS_memspace *mem,struct OS_memspace *m
return(0); return(0);
} }
void iguana_balancecalc(struct iguana_info *coin,struct iguana_bundle *bp) void iguana_balancecalc(struct iguana_info *coin,struct iguana_bundle *bp,int32_t incremental)
{ {
uint32_t starttime; uint32_t starttime;
if ( bp->balancefinish > 1 ) if ( bp->balancefinish > 1 )
@ -362,7 +362,7 @@ void iguana_balancecalc(struct iguana_info *coin,struct iguana_bundle *bp)
return; return;
} }
starttime = (uint32_t)time(NULL); starttime = (uint32_t)time(NULL);
if ( iguana_balancegen(coin,bp) < 0 ) if ( iguana_balancegen(coin,bp,incremental) < 0 )
{ {
printf("GENERATE BALANCES ERROR ht.%d\n",bp->bundleheight); printf("GENERATE BALANCES ERROR ht.%d\n",bp->bundleheight);
exit(-1); exit(-1);

10
iguana/iguana777.h
View File

@ -338,7 +338,9 @@ struct iguana_pkhash { uint8_t rmd160[20]; uint32_t pkind; } __attribute__((pack
// dynamic // dynamic
struct iguana_account { int64_t total; uint32_t lastind; } __attribute__((packed)); struct iguana_account { int64_t total; uint32_t lastind; } __attribute__((packed));
struct iguana_utxo { uint32_t prevspendind,height:31,spentflag:1; } __attribute__((packed)); struct iguana_utxo { uint32_t prevunspentind,height:31,spentflag:1; } __attribute__((packed));
struct iguana_hhaccount { UT_hash_handle hh; uint8_t buf[6]; struct iguana_account a; } __attribute__((packed));
struct iguana_hhutxo { UT_hash_handle hh; uint8_t buf[6]; struct iguana_utxo u; } __attribute__((packed));
// GLOBAL one zero to non-zero write (unless reorg) // GLOBAL one zero to non-zero write (unless reorg)
struct iguana_spendvector { uint32_t ind,height; uint16_t hdrsi; } __attribute__((packed)); // unspentind struct iguana_spendvector { uint32_t ind,height; uint16_t hdrsi; } __attribute__((packed)); // unspentind
@ -478,6 +480,7 @@ struct iguana_info
uint8_t blockspace[IGUANA_MAXPACKETSIZE + 8192]; struct OS_memspace blockMEM; uint8_t blockspace[IGUANA_MAXPACKETSIZE + 8192]; struct OS_memspace blockMEM;
struct iguana_blocks blocks; bits256 APIblockhash,APItxid; char *APIblockstr; struct iguana_blocks blocks; bits256 APIblockhash,APItxid; char *APIblockstr;
struct iguana_waccount *wallet; struct iguana_waccount *wallet;
struct iguana_hhutxo *utxotable; struct iguana_hhaccount *accountstable;
}; };
struct vin_signer { bits256 privkey; char coinaddr[64]; uint8_t siglen,sig[80],rmd160[20],pubkey[66]; }; struct vin_signer { bits256 privkey; char coinaddr[64]; uint8_t siglen,sig[80],rmd160[20],pubkey[66]; };
@ -783,7 +786,7 @@ int32_t iguana_vinscriptparse(struct iguana_info *coin,struct vin_info *vp,uint3
void iguana_parsebuf(struct iguana_info *coin,struct iguana_peer *addr,struct iguana_msghdr *H,uint8_t *buf,int32_t len); void iguana_parsebuf(struct iguana_info *coin,struct iguana_peer *addr,struct iguana_msghdr *H,uint8_t *buf,int32_t len);
int32_t _iguana_calcrmd160(struct iguana_info *coin,struct vin_info *vp); int32_t _iguana_calcrmd160(struct iguana_info *coin,struct vin_info *vp);
int32_t iguana_utxogen(struct iguana_info *coin,struct iguana_bundle *bp); int32_t iguana_utxogen(struct iguana_info *coin,struct iguana_bundle *bp);
int32_t iguana_balancegen(struct iguana_info *coin,struct iguana_bundle *bp); int32_t iguana_balancegen(struct iguana_info *coin,struct iguana_bundle *bp,int32_t incremental);
int32_t iguana_bundlevalidate(struct iguana_info *coin,struct iguana_bundle *bp); int32_t iguana_bundlevalidate(struct iguana_info *coin,struct iguana_bundle *bp);
void iguana_validateQ(struct iguana_info *coin,struct iguana_bundle *bp); void iguana_validateQ(struct iguana_info *coin,struct iguana_bundle *bp);
struct iguana_bloominds iguana_calcbloom(bits256 hash2); struct iguana_bloominds iguana_calcbloom(bits256 hash2);
@ -793,10 +796,11 @@ int32_t iguana_Xspendmap(struct iguana_info *coin,struct iguana_ramchain *ramcha
void iguana_balancesQ(struct iguana_info *coin,struct iguana_bundle *bp); void iguana_balancesQ(struct iguana_info *coin,struct iguana_bundle *bp);
int32_t iguana_balanceflush(struct iguana_info *coin,int32_t refhdrsi,int32_t purgedist); int32_t iguana_balanceflush(struct iguana_info *coin,int32_t refhdrsi,int32_t purgedist);
int32_t iguana_bundleissue(struct iguana_info *coin,struct iguana_bundle *bp,int32_t starti,int32_t max); int32_t iguana_bundleissue(struct iguana_info *coin,struct iguana_bundle *bp,int32_t starti,int32_t max);
void iguana_balancecalc(struct iguana_info *coin,struct iguana_bundle *bp); void iguana_balancecalc(struct iguana_info *coin,struct iguana_bundle *bp,int32_t incremental);
int32_t iguana_sendblockreqPT(struct iguana_info *coin,struct iguana_peer *addr,struct iguana_bundle *bp,int32_t bundlei,bits256 hash2,int32_t iamthreadsafe); int32_t iguana_sendblockreqPT(struct iguana_info *coin,struct iguana_peer *addr,struct iguana_bundle *bp,int32_t bundlei,bits256 hash2,int32_t iamthreadsafe);
int32_t iguana_blockreq(struct iguana_info *coin,int32_t height,int32_t priority); int32_t iguana_blockreq(struct iguana_info *coin,int32_t height,int32_t priority);
int64_t iguana_bundlecalcs(struct iguana_info *coin,struct iguana_bundle *bp); int64_t iguana_bundlecalcs(struct iguana_info *coin,struct iguana_bundle *bp);
void iguana_ramchain_prefetch(struct iguana_info *coin,struct iguana_ramchain *ramchain);
extern int32_t HDRnet,netBLOCKS; extern int32_t HDRnet,netBLOCKS;

125
iguana/iguana_unspents.c
View File

@ -16,6 +16,32 @@
#include "iguana777.h" #include "iguana777.h"
#include "exchanges/bitcoin.h" #include "exchanges/bitcoin.h"
int32_t iguana_utxoupdate(struct iguana_info *coin,uint16_t spent_hdris,uint32_t spent_unspentind,uint32_t spent_pkind,uint64_t spent_value,int32_t hdrsi,uint32_t spendind,uint32_t height)
{
struct iguana_hhutxo *hhutxo; struct iguana_hhaccount *hhacct;
uint8_t buf[sizeof(spent_hdris) + sizeof(uint32_t)];
memcpy(&buf[sizeof(uint32_t)],(void *)&spent_hdris,sizeof(spent_hdris));
memcpy(buf,(void *)&spent_unspentind,sizeof(spent_unspentind));
HASH_FIND(hh,coin->utxotable,buf,sizeof(buf),hhutxo);
if ( hhutxo != 0 && hhutxo->u.spentflag != 0 )
return(-1);
hhutxo = calloc(1,sizeof(*hhutxo));
HASH_ADD(hh,coin->utxotable,buf,sizeof(buf),hhutxo);
memcpy(buf,(void *)&spent_pkind,sizeof(spent_pkind));
HASH_FIND(hh,coin->accountstable,buf,sizeof(buf),hhacct);
if ( hhacct == 0 )
{
hhacct = calloc(1,sizeof(*hhacct));
HASH_ADD(hh,coin->accountstable,buf,sizeof(buf),hhacct);
}
hhutxo->u.spentflag = 1;
hhutxo->u.height = height;
hhutxo->u.prevunspentind = hhacct->a.lastind;
hhacct->a.lastind = spent_unspentind;
hhacct->a.total += spent_value;
return(0);
}
struct iguana_pkhash *iguana_pkhashfind(struct iguana_info *coin,struct iguana_ramchain **ramchainp,int64_t *balancep,uint32_t *lastunspentindp,struct iguana_pkhash *p,uint8_t rmd160[20],int32_t firsti,int32_t endi) struct iguana_pkhash *iguana_pkhashfind(struct iguana_info *coin,struct iguana_ramchain **ramchainp,int64_t *balancep,uint32_t *lastunspentindp,struct iguana_pkhash *p,uint8_t rmd160[20],int32_t firsti,int32_t endi)
{ {
uint8_t *PKbits; struct iguana_pkhash *P; uint32_t pkind,i; struct iguana_bundle *bp; struct iguana_ramchain *ramchain; struct iguana_account *ACCTS; uint8_t *PKbits; struct iguana_pkhash *P; uint32_t pkind,i; struct iguana_bundle *bp; struct iguana_ramchain *ramchain; struct iguana_account *ACCTS;
@ -196,6 +222,26 @@ int32_t iguana_pkhasharray(struct iguana_info *coin,cJSON *array,int32_t minconf
return(n); return(n);
} }
void iguana_ramchain_prefetch(struct iguana_info *coin,struct iguana_ramchain *ramchain)
{
struct iguana_pkhash *P,p; struct iguana_unspent *U,u; struct iguana_txid *T,txid; uint32_t i,numpkinds,numtxids,numunspents;
if ( ramchain->H.data != 0 )
{
U = (void *)(long)((long)ramchain->H.data + ramchain->H.data->Uoffset);
T = (void *)(long)((long)ramchain->H.data + ramchain->H.data->Toffset);
P = (void *)(long)((long)ramchain->H.data + ramchain->H.data->Poffset);
numpkinds = ramchain->H.data->numpkinds;
numunspents = ramchain->H.data->numunspents;
numtxids = ramchain->H.data->numtxids;
for (i=1; i<numtxids; i++)
memcpy(&txid,&T[i],sizeof(txid));
for (i=1; i<numunspents; i++)
memcpy(&u,&U[i],sizeof(u));
for (i=1; i<numpkinds; i++)
memcpy(&p,&P[i],sizeof(p));
}
}
void iguana_unspents(struct supernet_info *myinfo,struct iguana_info *coin,cJSON *array,int32_t minconf,int32_t maxconf,uint8_t *rmdarray,int32_t numrmds) void iguana_unspents(struct supernet_info *myinfo,struct iguana_info *coin,cJSON *array,int32_t minconf,int32_t maxconf,uint8_t *rmdarray,int32_t numrmds)
{ {
int64_t total,sum=0; struct iguana_pkhash *P; uint8_t *addrtypes,*pubkeys; int32_t i,flag = 0; char coinaddr[64]; int64_t total,sum=0; struct iguana_pkhash *P; uint8_t *addrtypes,*pubkeys; int32_t i,flag = 0; char coinaddr[64];
@ -342,13 +388,15 @@ int32_t iguana_utxogen(struct iguana_info *coin,struct iguana_bundle *bp)
return(-errs); return(-errs);
} }
int32_t iguana_balancegen(struct iguana_info *coin,struct iguana_bundle *bp) int32_t iguana_balancegen(struct iguana_info *coin,struct iguana_bundle *bp,int32_t incremental)
{ {
int32_t spendind,n,errs=0,emit=0; uint32_t unspentind,pkind,txidind; struct iguana_account *A2; uint32_t unspentind,pkind,txidind; struct iguana_account *A2;
struct iguana_unspent *u,*spentU; struct iguana_spend *S,*s; struct iguana_ramchain *ramchain; struct iguana_unspent *u,*spentU; struct iguana_spend *S,*s; struct iguana_ramchain *ramchain;
struct iguana_bundle *spentbp; struct iguana_txid *T,*nextT; int32_t hdrsi; struct iguana_bundle *spentbp; struct iguana_txid *T,*nextT; uint32_t numtxid,now,h,refheight;
uint32_t numtxid,now,h,refheight; struct iguana_utxo *utxo,*Uextras; int32_t flag,hdrsi,spendind,n,errs=0,emit=0; struct iguana_utxo *utxo,*Uextras;
ramchain = &bp->ramchain; ramchain = &bp->ramchain;
Uextras = 0;
A2 = 0;
//printf("BALANCEGEN.%d\n",bp->bundleheight); //printf("BALANCEGEN.%d\n",bp->bundleheight);
if ( ramchain->H.data == 0 || (n= ramchain->H.data->numspends) < 1 ) if ( ramchain->H.data == 0 || (n= ramchain->H.data->numspends) < 1 )
return(0); return(0);
@ -420,39 +468,64 @@ int32_t iguana_balancegen(struct iguana_info *coin,struct iguana_bundle *bp)
now = (uint32_t)time(NULL); now = (uint32_t)time(NULL);
if ( spentbp != 0 && unspentind > 0 && unspentind < spentbp->ramchain.H.data->numunspents ) if ( spentbp != 0 && unspentind > 0 && unspentind < spentbp->ramchain.H.data->numunspents )
{ {
if ( spentbp->ramchain.Uextras == 0 ) if ( spentbp->dirty == 0 )
iguana_ramchain_prefetch(coin,&spentbp->ramchain);
if ( incremental == 0 )
{ {
spentbp->ramchain.Uextras = calloc(sizeof(*spentbp->ramchain.Uextras),spentbp->ramchain.H.data->numunspents + 16); if ( spentbp->ramchain.Uextras == 0 )
} {
if ( spentbp->ramchain.A == 0 ) spentbp->ramchain.Uextras = calloc(sizeof(*spentbp->ramchain.Uextras),spentbp->ramchain.H.data->numunspents + 16);
{ }
spentbp->ramchain.A = calloc(sizeof(*spentbp->ramchain.A),spentbp->ramchain.H.data->numpkinds + 16); if ( spentbp->ramchain.A == 0 )
} {
if ( (Uextras= spentbp->ramchain.Uextras) == 0 || (A2= spentbp->ramchain.A) == 0 ) spentbp->ramchain.A = calloc(sizeof(*spentbp->ramchain.A),spentbp->ramchain.H.data->numpkinds + 16);
{ }
printf("null ptrs.[%d] %p %p\n",spentbp->hdrsi,spentbp->ramchain.Uextras,spentbp->ramchain.A);
errs++;
} }
else Uextras = spentbp->ramchain.Uextras;
A2 = spentbp->ramchain.A;
if ( incremental != 0 || (A2 != 0 && Uextras != 0) )
{ {
spentU = (void *)(long)((long)spentbp->ramchain.H.data + spentbp->ramchain.H.data->Uoffset); spentU = (void *)(long)((long)spentbp->ramchain.H.data + spentbp->ramchain.H.data->Uoffset);
u = &spentU[unspentind]; u = &spentU[unspentind];
if ( (pkind= u->pkind) != 0 && pkind < spentbp->ramchain.H.data->numpkinds ) if ( (pkind= u->pkind) != 0 && pkind < spentbp->ramchain.H.data->numpkinds )
{ {
utxo = &Uextras[unspentind]; spentbp->dirty = now;
if ( utxo->spentflag == 0 ) flag = -1;
if ( incremental == 0 )
{ {
utxo->prevspendind = A2[pkind].lastind; if ( Uextras == 0 || A2 == 0 )
utxo->spentflag = 1; {
utxo->height = h; printf("null ptrs.[%d] %p %p\n",spentbp->hdrsi,spentbp->ramchain.Uextras,spentbp->ramchain.A);
A2[pkind].total += u->value; errs++;
A2[pkind].lastind = spendind; }
spentbp->dirty = now; else
{
utxo = &Uextras[unspentind];
if ( utxo->spentflag == 0 )
{
utxo->prevunspentind = A2[pkind].lastind;
utxo->spentflag = 1;
utxo->height = h;
A2[pkind].total += u->value;
A2[pkind].lastind = unspentind;//spendind;
flag = 0;
}
}
} }
else else
{
if ( bp != spentbp )
{
utxo = &Uextras[unspentind];
if ( utxo->spentflag == 0 )
flag = iguana_utxoupdate(coin,spentbp->hdrsi,unspentind,pkind,u->value,bp->hdrsi,spendind,h);
}
else flag = iguana_utxoupdate(coin,spentbp->hdrsi,unspentind,pkind,u->value,bp->hdrsi,spendind,h);
}
if ( flag != 0 )
{ {
errs++; errs++;
printf("iguana_balancegen: pkind.%d double spend of hdrsi.%d unspentind.%d prev.%u spentflag.%d height.%d\n",pkind,spentbp->hdrsi,unspentind,utxo->prevspendind,utxo->spentflag,utxo->height); printf("iguana_balancegen: pkind.%d double spend of hdrsi.%d unspentind.%d prev.%u spentflag.%d height.%d\n",pkind,spentbp->hdrsi,unspentind,utxo->prevunspentind,utxo->spentflag,utxo->height);
getchar(); getchar();
} }
} }
@ -480,8 +553,6 @@ int32_t iguana_balancegen(struct iguana_info *coin,struct iguana_bundle *bp)
errs++; errs++;
} }
printf(">>>>>>>> balances.%d done errs.%d spendind.%d\n",bp->hdrsi,errs,n); printf(">>>>>>>> balances.%d done errs.%d spendind.%d\n",bp->hdrsi,errs,n);
//if ( errs == 0 )
// bp->validated = (uint32_t)time(NULL);
return(-errs); return(-errs);
} }

3
iguana/main.c
View File

@ -323,6 +323,7 @@ void sigalarm_func() { printf("\nSIGALRM\n"); signal(SIGALRM,sigalarm_func); }
void sigcontinue_func() { printf("\nSIGCONT\n"); signal(SIGCONT,sigcontinue_func); } void sigcontinue_func() { printf("\nSIGCONT\n"); signal(SIGCONT,sigcontinue_func); }
#endif #endif
// mksquashfs DB/BTC BTC.squash -b 1048576
// mksquashfs DB/BTC BTC.lzo -comp lzo -b 1048576 // mksquashfs DB/BTC BTC.lzo -comp lzo -b 1048576
// mksquashfs DB/BTC BTC.xz -b 1048576 -comp xz -Xdict-size 512K // mksquashfs DB/BTC BTC.xz -b 1048576 -comp xz -Xdict-size 512K
int32_t iguana_balanceflush(struct iguana_info *coin,int32_t refhdrsi,int32_t purgedist) int32_t iguana_balanceflush(struct iguana_info *coin,int32_t refhdrsi,int32_t purgedist)
@ -450,7 +451,7 @@ void mainloop(struct supernet_info *myinfo)
//printf("hdrsi.%d start balances.%d\n",bp->hdrsi,bp->bundleheight); //printf("hdrsi.%d start balances.%d\n",bp->hdrsi,bp->bundleheight);
bp->ramchain.A = 0; bp->ramchain.A = 0;
bp->ramchain.Uextras = 0; bp->ramchain.Uextras = 0;
iguana_balancecalc(ptr->coin,bp); iguana_balancecalc(ptr->coin,bp,bp == coin->current);
bp->queued = 0; bp->queued = 0;
if ( bp->hdrsi > coin->longestchain/coin->chain->bundlesize-3 ) if ( bp->hdrsi > coin->longestchain/coin->chain->bundlesize-3 )
{ {

Write Preview
Loading…
Cancel
Save