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

Enable notary sig count

Browse Source
This commit is contained in:
jl777
2019-07-08 03:33:46 -11:00
parent de0ebde5c3
commit 8441b72f00
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/komodo_nSPV.h
View File

@@ -417,15 +417,22 @@ int32_t NSPV_txextract(CTransaction &tx,uint8_t *data,int32_t datalen)
else return(-1); else return(-1);
} }
int32_t NSPV_pubkeysextract(uint8_t pubkeys[64][33],CTransaction tx,uint8_t elected[64][33]) int32_t NSPV_notariescount(CTransaction tx,uint8_t elected[64][33])
{ {
uint256 hashBlock; CTransaction vintx; int32_t i,numsigs = 13; uint8_t scriptPubkey[64]; int32_t i,j,scriptlen,numsigs = 0;
/*LOCK(cs_main);
for (i=0; i<tx.vin.size(); i++) for (i=0; i<tx.vin.size(); i++)
{ {
if ( !GetTransaction(txid,vintx,hashBlock, false)) if ( (scriptlen= gettxout_scriptPubKey(scriptPubKey,sizeof(scriptPubKey),tx.vin[i].prevout.hash,tx.vin[i].prevout.n)) == 35 )
return(-1); {
}*/ for (j=0; j<64; j++)
if ( memcmp(&scriptPubKey[1],elected[j],33) == 0 )
{
numsigs++;
break;
}
}
}
fprintf(stderr,"numsigs.%d\n",numsigs);
return(numsigs); return(numsigs);
} }
@@ -444,7 +451,7 @@ uint256 NSPV_opretextract(int32_t *heightp,uint256 *blockhashp,char *symbol,std:
int32_t NSPV_notarizationextract(int32_t *ntzheightp,uint256 *blockhashp,uint256 *desttxidp,CTransaction tx) int32_t NSPV_notarizationextract(int32_t *ntzheightp,uint256 *blockhashp,uint256 *desttxidp,CTransaction tx)
{ {
int32_t numsigs; uint8_t elected[64][33],sigkeys[64][33]; char *symbol; std::vector<uint8_t> opret; int32_t numsigs; uint8_t elected[64][33]; char *symbol; std::vector<uint8_t> opret;
if ( tx.vout.size() >= 2 ) if ( tx.vout.size() >= 2 )
{ {
symbol = (ASSETCHAINS_SYMBOL[0] == 0) ? (char *)"KMD" : ASSETCHAINS_SYMBOL; symbol = (ASSETCHAINS_SYMBOL[0] == 0) ? (char *)"KMD" : ASSETCHAINS_SYMBOL;
@@ -453,7 +460,7 @@ int32_t NSPV_notarizationextract(int32_t *ntzheightp,uint256 *blockhashp,uint256
{ {
*desttxidp = NSPV_opretextract(ntzheightp,blockhashp,symbol,opret,tx.GetHash()); *desttxidp = NSPV_opretextract(ntzheightp,blockhashp,symbol,opret,tx.GetHash());
komodo_notaries(elected,*ntzheightp,0); komodo_notaries(elected,*ntzheightp,0);
if ( (numsigs= NSPV_pubkeysextract(sigkeys,tx,elected)) < 12 ) if ( (numsigs= NSPV_notariescount(tx,elected)) < 12 )
return(-3); return(-3);
return(0); return(0);
} else return(-2); } else return(-2);