This commit is contained in:
@@ -256,7 +256,6 @@ int32_t NSPV_rwtxproof(int32_t rwflag,uint8_t *serialized,struct NSPV_txproof *p
|
|||||||
len += iguana_rwnum(rwflag,&serialized[len],sizeof(ptr->pad),&ptr->pad);
|
len += iguana_rwnum(rwflag,&serialized[len],sizeof(ptr->pad),&ptr->pad);
|
||||||
len += iguana_rwuint8vec(rwflag,&serialized[len],&ptr->txlen,&ptr->tx);
|
len += iguana_rwuint8vec(rwflag,&serialized[len],&ptr->txlen,&ptr->tx);
|
||||||
len += iguana_rwuint8vec(rwflag,&serialized[len],&ptr->txprooflen,&ptr->txproof);
|
len += iguana_rwuint8vec(rwflag,&serialized[len],&ptr->txprooflen,&ptr->txproof);
|
||||||
fprintf(stderr,"rwtxproof len.%d\n",len);
|
|
||||||
return(len);
|
return(len);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -408,10 +407,14 @@ uint256 NSPV_hdrhash(struct NSPV_equihdr *hdr)
|
|||||||
int32_t NSPV_txextract(CTransaction &tx,uint8_t *data,int32_t datalen)
|
int32_t NSPV_txextract(CTransaction &tx,uint8_t *data,int32_t datalen)
|
||||||
{
|
{
|
||||||
std::vector<uint8_t> rawdata;
|
std::vector<uint8_t> rawdata;
|
||||||
|
fprintf(stderr,"extract %d bytes\n",datalen);
|
||||||
rawdata.resize(datalen);
|
rawdata.resize(datalen);
|
||||||
memcpy(&rawdata[0],data,datalen);
|
memcpy(&rawdata[0],data,datalen);
|
||||||
if ( DecodeHexTx(tx,HexStr(rawdata)) != 0 )
|
if ( DecodeHexTx(tx,HexStr(rawdata)) != 0 )
|
||||||
|
{
|
||||||
|
fprintf(stderr,"extracted %s\n",tx.GetHex().c_str());
|
||||||
return(0);
|
return(0);
|
||||||
|
}
|
||||||
else return(-1);
|
else return(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -450,7 +450,6 @@ void komodo_nSPVreq(CNode *pfrom,std::vector<uint8_t> request) // received a req
|
|||||||
{
|
{
|
||||||
response.resize(1 + slen);
|
response.resize(1 + slen);
|
||||||
response[0] = NSPV_TXPROOFRESP;
|
response[0] = NSPV_TXPROOFRESP;
|
||||||
fprintf(stderr,"slen.%d\n",slen);
|
|
||||||
if ( NSPV_rwtxproof(1,&response[1],&P) == slen )
|
if ( NSPV_rwtxproof(1,&response[1],&P) == slen )
|
||||||
{
|
{
|
||||||
pfrom->PushMessage("nSPV",response);
|
pfrom->PushMessage("nSPV",response);
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ int32_t NSPV_gettransaction(int32_t vout,uint256 txid,int32_t height,CTransactio
|
|||||||
NSPV_txproof(vout,txid,height);
|
NSPV_txproof(vout,txid,height);
|
||||||
if ( NSPV_txproofresult.txid != txid )
|
if ( NSPV_txproofresult.txid != txid )
|
||||||
return(-1);
|
return(-1);
|
||||||
if ( NSPV_txextract(tx,NSPV_txproofresult.tx,NSPV_txproofresult.txlen) < 0 || NSPV_txproofresult.txlen <= 0 )
|
else if ( NSPV_txextract(tx,NSPV_txproofresult.tx,NSPV_txproofresult.txlen) < 0 || NSPV_txproofresult.txlen <= 0 )
|
||||||
retval = -20;
|
retval = -20;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user