From cf9538e02bfb3053066292ab4c5c36e292f86bc2 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 25 Oct 2016 10:33:49 -0300 Subject: [PATCH] test --- src/komodo.h | 2 +- src/script/standard.cpp | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index f0b32e24e..f7dc35ea1 100644 --- a/src/komodo.h +++ b/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); diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 50c855485..e4f9fc1c1 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -184,14 +184,20 @@ bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType) { vector vSolutions; if (!Solver(scriptPubKey, whichType, vSolutions)) + { + int32_t i; uint8_t *ptr = (uint8_t *)scriptPubKey.data(); + for (i=0; i 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;