Browse Source

Merge pull request #179 from jl777/dev

Dev
win-cross
jl777 8 years ago
committed by GitHub
parent
commit
18e89bc748
  1. 2
      iguana/dpow/dpow_prices.c
  2. 2
      iguana/iguana777.h
  3. 3
      iguana/iguana_notary.c

2
iguana/dpow/dpow_prices.c

@ -1890,7 +1890,7 @@ int32_t PAX_idle(struct supernet_info *myinfo)//struct PAX_data *argdp,int32_t i
splineval = PAX_splineval(&dp->splines[i],timestamp,0); splineval = PAX_splineval(&dp->splines[i],timestamp,0);
pvals[6+i] = PAX_val32(splineval); pvals[6+i] = PAX_val32(splineval);
if ( dispflag != 0 ) if ( dispflag != 0 )
printf("%d ",pvals[6+i]); printf("%u ",pvals[6+i]);
} }
if ( pvals[6+CNY] != 0 && pvals[6+USD] != 0 ) if ( pvals[6+CNY] != 0 && pvals[6+USD] != 0 )
dp->CNYUSD = ((double)pvals[6 + CNY] / pvals[6 + USD]) * MINDENOMS[USD] / MINDENOMS[CNY]; dp->CNYUSD = ((double)pvals[6 + CNY] / pvals[6 + USD]) * MINDENOMS[USD] / MINDENOMS[CNY];

2
iguana/iguana777.h

@ -122,7 +122,7 @@ struct supernet_info
uint8_t *pingbuf; uint8_t *pingbuf;
struct basilisk_request DEXaccept; struct basilisk_request DEXaccept;
FILE *dexfp; FILE *dexfp;
struct dpow_info DPOWS[64]; int32_t numdpows,dpowsock,dexsock,pubsock,repsock,subsock,reqsock; struct dpow_info DPOWS[128]; int32_t numdpows,dpowsock,dexsock,pubsock,repsock,subsock,reqsock;
struct delayedPoW_info dPoW; struct delayedPoW_info dPoW;
struct basilisk_spend *spends; int32_t numspends; struct basilisk_spend *spends; int32_t numspends;
char bindaddr[64]; char bindaddr[64];

3
iguana/iguana_notary.c

@ -81,6 +81,7 @@ void dpow_srcupdate(struct supernet_info *myinfo,struct dpow_info *dp,int32_t he
return; return;
if ( bits256_nonz(checkpoint.blockhash.hash) != 0 && (checkpoint.blockhash.height % freq) == 0 ) if ( bits256_nonz(checkpoint.blockhash.hash) != 0 && (checkpoint.blockhash.height % freq) == 0 )
{ {
dpow_heightfind(myinfo,dp,checkpoint.blockhash.height + 1000);
ptrs = calloc(1,sizeof(void *)*5 + sizeof(struct dpow_checkpoint)); ptrs = calloc(1,sizeof(void *)*5 + sizeof(struct dpow_checkpoint));
ptrs[0] = (void *)myinfo; ptrs[0] = (void *)myinfo;
ptrs[1] = (void *)dp; ptrs[1] = (void *)dp;
@ -322,7 +323,7 @@ TWO_STRINGS(iguana,dpow,symbol,pubkey)
} }
if ( dp->blocks == 0 ) if ( dp->blocks == 0 )
{ {
dp->maxblocks = 100000; dp->maxblocks = 1000000;
dp->blocks = calloc(dp->maxblocks,sizeof(*dp->blocks)); dp->blocks = calloc(dp->maxblocks,sizeof(*dp->blocks));
} }
portable_mutex_init(&dp->paxmutex); portable_mutex_init(&dp->paxmutex);

Loading…
Cancel
Save