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

test

Browse Source
This commit is contained in:
jl777
2016-10-25 10:33:49 -03:00
parent 9632af31d2
commit cf9538e02b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/komodo.h
View File

@@ -288,7 +288,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
} }
} }
} }
if ( notaryid >= 0 && notaryid < 64 && voutmask != 0 ) if ( i != 0 && notaryid >= 0 && notaryid < 64 && voutmask != 0 )
{ {
komodo_stateupdate(height,0,0,notaryid,txhash,voutmask,numvouts,0,0); komodo_stateupdate(height,0,0,notaryid,txhash,voutmask,numvouts,0,0);
//komodo_nutxoadd(height,notaryid,txhash,voutmask,numvouts); //komodo_nutxoadd(height,notaryid,txhash,voutmask,numvouts);

10
src/script/standard.cpp
View File

@@ -184,14 +184,20 @@ bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType)
{ {
vector<valtype> vSolutions; vector<valtype> vSolutions;
if (!Solver(scriptPubKey, whichType, vSolutions)) if (!Solver(scriptPubKey, whichType, vSolutions))
{
int32_t i; uint8_t *ptr = (uint8_t *)scriptPubKey.data();
for (i=0; i<scriptPubKey.size(); i++)
fprintf(stderr,"%02x",ptr[i]);
fprintf(stderr," non-standard scriptPubKey\n");
return false; return false;
}
if (whichType == TX_MULTISIG) if (whichType == TX_MULTISIG)
{ {
unsigned char m = vSolutions.front()[0]; unsigned char m = vSolutions.front()[0];
unsigned char n = vSolutions.back()[0]; unsigned char n = vSolutions.back()[0];
// Support up to x-of-3 multisig txns as standard // Support up to x-of-9 multisig txns as standard
if (n < 1 || n > 3) if (n < 1 || n > 9)
return false; return false;
if (m < 1 || m > n) if (m < 1 || m > n)
return false; return false;