Browse Source

Ensure correct prior confirmed notarization

pull/455/head
miketout 2 years ago
parent
commit
e0b2a4508b
  1. 2
      src/main.cpp
  2. 5
      src/pbaas/notarization.cpp

2
src/main.cpp

@ -2124,7 +2124,7 @@ bool AcceptToMemoryPoolInt(CTxMemPool& pool, CValidationState &state, const CTra
ContextualCheckInputs(tx, state, view, nextBlockHeight, true, MANDATORY_SCRIPT_VERIFY_FLAGS, true, txdata, Params().GetConsensus(), consensusBranchId);
if ( flag != 0 )
KOMODO_CONNECTING = -1;
return error("AcceptToMemoryPool: BUG! PLEASE REPORT THIS! ConnectInputs failed against MANDATORY but not STANDARD flags %s", hash.ToString());
return error("AcceptToMemoryPool: ConnectInputs failed against MANDATORY but not STANDARD flags %s", hash.ToString());
}
// if this is a valid stake transaction, don't put it in the mempool

5
src/pbaas/notarization.cpp

@ -4047,7 +4047,10 @@ bool CPBaaSNotarization::ConfirmOrRejectNotarizations(CWallet *pWallet,
if (tP.evalCode == EVAL_FINALIZE_NOTARIZATION &&
tP.vData.size() &&
(tPOF = CObjectFinalization(tP.vData[0])).IsValid() &&
tPOF.output == of.output &&
((tPOF.output.hash.IsNull() &&
oneInput.txIn.prevout.hash == cnd.vtx[oneConfirmedIdx].first.hash &&
tPOF.output.n == cnd.vtx[oneConfirmedIdx].first.n) ||
tPOF.output == cnd.vtx[oneConfirmedIdx].first) &&
tPOF.IsConfirmed())
{
isConfirmed = true;

Loading…
Cancel
Save