DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Retry loop

Browse Source
This commit is contained in:
jl777
2019-07-08 00:27:03 -11:00
parent a2b6e876af
commit e80685bc2d
2 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/komodo_nSPV_superlite.h
View File

@@ -97,24 +97,41 @@ void komodo_nSPVresp(CNode *pfrom,std::vector<uint8_t> response) // received a r
CNode *NSPV_req(CNode *pnode,uint8_t *msg,int32_t len,uint64_t mask,int32_t ind) CNode *NSPV_req(CNode *pnode,uint8_t *msg,int32_t len,uint64_t mask,int32_t ind)
{ {
int32_t flag = 0; uint32_t timestamp = (uint32_t)time(NULL); int32_t iter,num; CNode *firstpnode = 0; uint32_t timestamp = (uint32_t)time(NULL);
if ( pnode == 0 ) while ( pnode == 0 )
{ {
LOCK(cs_vNodes); LOCK(cs_vNodes);
BOOST_FOREACH(CNode *ptr,vNodes) num = 0;
for (iter=0; iter<2; iter++)
{ {
if ( ptr->prevtimes[ind] > timestamp ) BOOST_FOREACH(CNode *ptr,vNodes)
ptr->prevtimes[ind] = 0;
if ( ptr->hSocket == INVALID_SOCKET )
continue;
if ( (ptr->nServices & mask) == mask && timestamp > ptr->prevtimes[ind] )
{ {
flag = 1; if ( ptr->prevtimes[ind] > timestamp )
pnode = ptr; ptr->prevtimes[ind] = 0;
if ( ptr->hSocket == INVALID_SOCKET )
continue;
if ( (ptr->nServices & mask) == mask && timestamp > ptr->prevtimes[ind] )
{
if ( firstpnode == 0 )
firstpnode = ptr;
if ( iter != 0 )
{
if ( num == 1 || (rand() % num) == 0 )
{
pnode = ptr;
break;
}
} else num++;
} //else fprintf(stderr,"nServices %llx vs mask %llx, t%u vs %u, ind.%d\n",(long long)ptr->nServices,(long long)mask,timestamp,ptr->prevtimes[ind],ind);
}
if ( iter == 0 && num == 0 )
break; break;
} //else fprintf(stderr,"nServices %llx vs mask %llx, t%u vs %u, ind.%d\n",(long long)ptr->nServices,(long long)mask,timestamp,ptr->prevtimes[ind],ind); if ( pnode == 0 )
pnode = firstpnode;
} }
} else flag = 1; if ( pnode != 0 && time(NULL) > timestamp+2 )
break;
}
if ( pnode != 0 ) if ( pnode != 0 )
{ {
std::vector<uint8_t> request; std::vector<uint8_t> request;

2
src/wallet/rpcdump.cpp
View File

@@ -1071,7 +1071,7 @@ UniValue nspv_spend(const UniValue& params, bool fHelp)
if ( NSPV_address.size() == 0 ) if ( NSPV_address.size() == 0 )
throw runtime_error("to nspv_send you need an active nspv_login\n"); throw runtime_error("to nspv_send you need an active nspv_login\n");
satoshis = atof(params[1].get_str().c_str())*COIN + 0.0000000049; satoshis = atof(params[1].get_str().c_str())*COIN + 0.0000000049;
fprintf(stderr,"satoshis.%lld from %.8f\n",(long long)satoshis,atof(params[1].get_str().c_str())); //fprintf(stderr,"satoshis.%lld from %.8f\n",(long long)satoshis,atof(params[1].get_str().c_str()));
if ( satoshis < 1000 ) if ( satoshis < 1000 )
throw runtime_error("amount too small\n"); throw runtime_error("amount too small\n");
return(NSPV_spend((char *)NSPV_address.c_str(),(char *)params[0].get_str().c_str(),satoshis)); return(NSPV_spend((char *)NSPV_address.c_str(),(char *)params[0].get_str().c_str(),satoshis));