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

Test

beta
jl777 8 years ago
parent
69db057143
commit
edde7e3dae
3 changed files with 22 additions and 19 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. 2
      iguana/exchanges/LP_nativeDEX.c
  2. 4
      iguana/exchanges/LP_utxo.c
  3. 35
      iguana/exchanges/LP_utxos.c

2
iguana/exchanges/LP_nativeDEX.c
View File

@ -62,7 +62,7 @@ struct LP_privkey { bits256 privkey; uint8_t rmd160[20]; };
struct LP_globals struct LP_globals
{ {
struct LP_utxoinfo *LP_utxoinfos,*LP_utxoinfos2; struct LP_utxoinfo *LP_utxoinfos[2],*LP_utxoinfos2[2];
bits256 LP_mypub25519,LP_mypriv25519; bits256 LP_mypub25519,LP_mypriv25519;
uint8_t LP_myrmd160[20],LP_pubsecp[33]; uint8_t LP_myrmd160[20],LP_pubsecp[33];
uint32_t LP_sessionid,counter; uint32_t LP_sessionid,counter;

4
iguana/exchanges/LP_utxo.c
View File

@ -393,7 +393,7 @@ struct LP_utxoinfo *_LP_utxofind(int32_t iambob,bits256 txid,int32_t vout)
return(0); return(0);
}*/ }*/
LP_utxosetkey(key,txid,vout); LP_utxosetkey(key,txid,vout);
HASH_FIND(hh,G.LP_utxoinfos,key,sizeof(key),utxo); HASH_FIND(hh,G.LP_utxoinfos[iambob],key,sizeof(key),utxo);
return(utxo); return(utxo);
} }
@ -406,7 +406,7 @@ struct LP_utxoinfo *_LP_utxo2find(int32_t iambob,bits256 txid2,int32_t vout2)
return(0); return(0);
}*/ }*/
LP_utxosetkey(key2,txid2,vout2); LP_utxosetkey(key2,txid2,vout2);
HASH_FIND(hh2,G.LP_utxoinfos2,key2,sizeof(key2),utxo); HASH_FIND(hh2,G.LP_utxoinfos2[iambob],key2,sizeof(key2),utxo);
return(utxo); return(utxo);
} }

35
iguana/exchanges/LP_utxos.c
View File

@ -212,13 +212,13 @@ cJSON *LP_utxojson(struct LP_utxoinfo *utxo)
struct LP_utxoinfo *LP_utxo_bestfit(char *symbol,uint64_t destsatoshis) struct LP_utxoinfo *LP_utxo_bestfit(char *symbol,uint64_t destsatoshis)
{ {
uint64_t srcvalue,srcvalue2; struct LP_utxoinfo *utxo,*tmp,*bestutxo = 0; uint64_t srcvalue,srcvalue2; struct LP_utxoinfo *utxo,*tmp,*bestutxo = 0; int32_t iambob = 0;
if ( symbol == 0 || destsatoshis == 0 ) if ( symbol == 0 || destsatoshis == 0 )
{ {
printf("LP_utxo_bestfit error symbol.%p %.8f\n",symbol,dstr(destsatoshis)); printf("LP_utxo_bestfit error symbol.%p %.8f\n",symbol,dstr(destsatoshis));
return(0); return(0);
} }
HASH_ITER(hh,G.LP_utxoinfos,utxo,tmp) HASH_ITER(hh,G.LP_utxoinfos[iambob],utxo,tmp)
{ {
//char str[65]; printf("s%u %d [%.8f vs %.8f] check %s.%s avail.%d ismine.%d >= %d\n",utxo->T.spentflag,LP_iseligible(&srcvalue,&srcvalue2,utxo->iambob,symbol,utxo->payment.txid,utxo->payment.vout,utxo->S.satoshis,utxo->fee.txid,utxo->fee.vout),dstr(destsatoshis),dstr(utxo->S.satoshis),utxo->coin,bits256_str(str,utxo->payment.txid),LP_isavailable(utxo) > 0,LP_ismine(utxo) > 0,utxo->S.satoshis >= destsatoshis); //char str[65]; printf("s%u %d [%.8f vs %.8f] check %s.%s avail.%d ismine.%d >= %d\n",utxo->T.spentflag,LP_iseligible(&srcvalue,&srcvalue2,utxo->iambob,symbol,utxo->payment.txid,utxo->payment.vout,utxo->S.satoshis,utxo->fee.txid,utxo->fee.vout),dstr(destsatoshis),dstr(utxo->S.satoshis),utxo->coin,bits256_str(str,utxo->payment.txid),LP_isavailable(utxo) > 0,LP_ismine(utxo) > 0,utxo->S.satoshis >= destsatoshis);
if ( strcmp(symbol,utxo->coin) != 0 ) if ( strcmp(symbol,utxo->coin) != 0 )
@ -411,9 +411,9 @@ struct LP_utxoinfo *LP_utxoadd(int32_t iambob,char *symbol,bits256 txid,int32_t
} }
printf(" %s %.8f %.8f %p addutxo.%d (%s %s) session.%u iambob.%d <<<<<<<<<<<<<<<\n",symbol,dstr(value),dstr(value2),utxo,LP_ismine(utxo) > 0,bits256_str(str,utxo->payment.txid),bits256_str(str2,iambob != 0 ? utxo->deposit.txid : utxo->fee.txid),utxo->T.sessionid,iambob); printf(" %s %.8f %.8f %p addutxo.%d (%s %s) session.%u iambob.%d <<<<<<<<<<<<<<<\n",symbol,dstr(value),dstr(value2),utxo,LP_ismine(utxo) > 0,bits256_str(str,utxo->payment.txid),bits256_str(str2,iambob != 0 ? utxo->deposit.txid : utxo->fee.txid),utxo->T.sessionid,iambob);
portable_mutex_lock(&LP_utxomutex); portable_mutex_lock(&LP_utxomutex);
HASH_ADD_KEYPTR(hh,G.LP_utxoinfos,utxo->key,sizeof(utxo->key),utxo); HASH_ADD_KEYPTR(hh,G.LP_utxoinfos[iambob],utxo->key,sizeof(utxo->key),utxo);
if ( _LP_utxo2find(iambob,txid2,vout2) == 0 ) if ( _LP_utxo2find(iambob,txid2,vout2) == 0 )
HASH_ADD_KEYPTR(hh2,G.LP_utxoinfos2,utxo->key2,sizeof(utxo->key2),utxo); HASH_ADD_KEYPTR(hh2,G.LP_utxoinfos2[iambob],utxo->key2,sizeof(utxo->key2),utxo);
portable_mutex_unlock(&LP_utxomutex); portable_mutex_unlock(&LP_utxomutex);
if ( iambob != 0 ) if ( iambob != 0 )
{ {
@ -436,7 +436,7 @@ cJSON *LP_inventory(char *symbol)
else myipaddr = "127.0.0.1"; else myipaddr = "127.0.0.1";
if ( (coin= LP_coinfind(symbol)) != 0 ) if ( (coin= LP_coinfind(symbol)) != 0 )
LP_listunspent_both(symbol,coin->smartaddr); LP_listunspent_both(symbol,coin->smartaddr);
HASH_ITER(hh,G.LP_utxoinfos,utxo,tmp) HASH_ITER(hh,G.LP_utxoinfos[iambob],utxo,tmp)
{ {
char str[65]; char str[65];
//printf("iambob.%d iterate %s\n",iambob,bits256_str(str,LP_mypub25519)); //printf("iambob.%d iterate %s\n",iambob,bits256_str(str,LP_mypub25519));
@ -767,7 +767,7 @@ void LP_privkey_updates(void *ctx,int32_t pubsock,char *passphrase)
int32_t LP_passphrase_init(char *passphrase,char *gui) int32_t LP_passphrase_init(char *passphrase,char *gui)
{ {
static void *ctx; struct LP_utxoinfo *utxo,*tmp; static void *ctx; int32_t iambob; struct LP_utxoinfo *utxo,*tmp;
if ( ctx == 0 ) if ( ctx == 0 )
ctx = bitcoin_ctx(); ctx = bitcoin_ctx();
if ( G.LP_pendingswaps != 0 ) if ( G.LP_pendingswaps != 0 )
@ -780,20 +780,23 @@ int32_t LP_passphrase_init(char *passphrase,char *gui)
printf("waiting for G.waiting\n"); printf("waiting for G.waiting\n");
sleep(5); sleep(5);
} }
if ( G.LP_utxoinfos != 0 ) for (iambob=0; iambob<2; iambob++)
{ {
HASH_ITER(hh,G.LP_utxoinfos,utxo,tmp) if ( G.LP_utxoinfos[iambob] != 0 )
{ {
HASH_DELETE(hh,G.LP_utxoinfos,utxo); HASH_ITER(hh,G.LP_utxoinfos[iambob],utxo,tmp)
free(utxo); {
HASH_DELETE(hh,G.LP_utxoinfos[iambob],utxo);
free(utxo);
}
} }
} if ( G.LP_utxoinfos2[iambob] != 0 )
if ( G.LP_utxoinfos2 != 0 )
{
HASH_ITER(hh,G.LP_utxoinfos2,utxo,tmp)
{ {
HASH_DELETE(hh,G.LP_utxoinfos2,utxo); HASH_ITER(hh,G.LP_utxoinfos2[iambob],utxo,tmp)
free(utxo); {
HASH_DELETE(hh,G.LP_utxoinfos2[iambob],utxo);
free(utxo);
}
} }
} }
memset(&G,0,sizeof(G)); memset(&G,0,sizeof(G));

Write Preview
Loading…
Cancel
Save