This commit is contained in:
jl777
2016-11-07 17:41:05 -03:00
parent ceb6be4606
commit c169f64b23

View File

@@ -28,16 +28,16 @@ struct pax_transaction
uint64_t komodo_paxtotal() uint64_t komodo_paxtotal()
{ {
struct pax_transaction *pax,*tmp; int32_t n = 0; uint64_t total = 0; struct pax_transaction *pax,*tmp; int32_t n = 0; uint64_t total = 0;
pthread_mutex_lock(&komodo_mutex); /*pthread_mutex_lock(&komodo_mutex);
tmp = 0; tmp = 0;
if ( PAX != 0 ) if ( PAX != 0 )
{ {
pax = (struct pax_transaction *)PAX->hh.next; pax = (struct pax_transaction *)PAX->hh.next;
while ( pax != 0 && pax != tmp && n++ < 1000000 ) while ( pax != 0 && pax != tmp && n++ < 1000000 )
{ {
printf("PAX.[%p %p] pax.%p marked.%d fiat %.8f KMD %.8f\n",PAX->hh.next,PAX->hh.prev,pax,pax->marked,dstr(pax->fiatoshis),dstr(pax->komodoshis));
if ( pax->marked == 0 ) if ( pax->marked == 0 )
{ {
//printf("PAX.[%p %p] pax.%p marked.%d fiat %.8f KMD %.8f\n",PAX->hh.next,PAX->hh.prev,pax,pax->marked,dstr(pax->fiatoshis),dstr(pax->komodoshis));
if ( komodo_is_issuer() != 0 ) if ( komodo_is_issuer() != 0 )
total += pax->fiatoshis; total += pax->fiatoshis;
else total += pax->komodoshis; else total += pax->komodoshis;
@@ -48,7 +48,16 @@ uint64_t komodo_paxtotal()
} }
pthread_mutex_unlock(&komodo_mutex); pthread_mutex_unlock(&komodo_mutex);
if ( n >= 1000000 ) if ( n >= 1000000 )
printf("komodo_paxtotal n.%d iterations?\n",n); printf("komodo_paxtotal n.%d iterations?\n",n);*/
HASH_ITER(hh,PAX,pax,tmp)
{
if ( pax->marked == 0 )
{
if ( komodo_is_issuer() != 0 )
total += pax->fiatoshis;
else total += pax->komodoshis;
}
}
return(total); return(total);
} }
@@ -153,14 +162,16 @@ void komodo_gateway_deposits(CMutableTransaction *txNew,int32_t shortflag,char *
{ {
struct pax_transaction *pax,*tmp; uint8_t *script,opcode,opret[10000],data[10000]; int32_t i,len=0,opretlen=0,numvouts=1; struct pax_transaction *pax,*tmp; uint8_t *script,opcode,opret[10000],data[10000]; int32_t i,len=0,opretlen=0,numvouts=1;
PENDING_KOMODO_TX = 0; PENDING_KOMODO_TX = 0;
if ( PAX == 0 )
return;
if ( strcmp(symbol,"KMD") == 0 ) if ( strcmp(symbol,"KMD") == 0 )
opcode = 'I'; opcode = 'I';
else opcode = 'X'; else opcode = 'X';
HASH_ITER(hh,PAX,pax,tmp)
{
//if ( PAX == 0 )
// return;
tmp = 0; tmp = 0;
pax = (struct pax_transaction *)PAX->hh.next; //pax = (struct pax_transaction *)PAX->hh.next;
while ( pax != 0 && pax != tmp ) //while ( pax != 0 && pax != tmp )
{ {
printf("pax.%p marked.%d %.8f -> %.8f\n",pax,pax->marked,dstr(pax->komodoshis),dstr(pax->fiatoshis)); printf("pax.%p marked.%d %.8f -> %.8f\n",pax,pax->marked,dstr(pax->komodoshis),dstr(pax->fiatoshis));
if ( pax->marked != 0 ) if ( pax->marked != 0 )
@@ -188,8 +199,9 @@ void komodo_gateway_deposits(CMutableTransaction *txNew,int32_t shortflag,char *
printf(" vout.%u DEPOSIT %.8f <- paxdeposit.%s pending %.8f\n",pax->vout,(double)txNew->vout[numvouts].nValue/COIN,symbol,dstr(PENDING_KOMODO_TX)); printf(" vout.%u DEPOSIT %.8f <- paxdeposit.%s pending %.8f\n",pax->vout,(double)txNew->vout[numvouts].nValue/COIN,symbol,dstr(PENDING_KOMODO_TX));
if ( numvouts++ >= 64 ) if ( numvouts++ >= 64 )
break; break;
tmp = pax; //tmp = pax;
pax = (struct pax_transaction *)pax->hh.next; //pax = (struct pax_transaction *)pax->hh.next;
}
} }
if ( numvouts > 1 ) if ( numvouts > 1 )
{ {