Browse Source

test

pull/4/head
jl777 8 years ago
parent
commit
cf9538e02b
  1. 2
      src/komodo.h
  2. 10
      src/script/standard.cpp

2
src/komodo.h

@ -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_nutxoadd(height,notaryid,txhash,voutmask,numvouts);

10
src/script/standard.cpp

@ -184,14 +184,20 @@ bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType)
{
vector<valtype> 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;
}
if (whichType == TX_MULTISIG)
{
unsigned char m = vSolutions.front()[0];
unsigned char n = vSolutions.back()[0];
// Support up to x-of-3 multisig txns as standard
if (n < 1 || n > 3)
// Support up to x-of-9 multisig txns as standard
if (n < 1 || n > 9)
return false;
if (m < 1 || m > n)
return false;

Loading…
Cancel
Save