Skip to content

Commit

Permalink
Remove support for InstantSend locked gobject collaterals (#3019)
Browse files Browse the repository at this point in the history
  • Loading branch information
codablock authored and UdjinM6 committed Jul 8, 2019
1 parent 53efd1f commit 85fcf32
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions src/governance/governance-object.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,13 @@
#include "governance-validators.h"
#include "governance-vote.h"
#include "governance.h"
#include "instantsend.h"
#include "masternode/masternode-meta.h"
#include "masternode/masternode-sync.h"
#include "messagesigner.h"
#include "spork.h"
#include "util.h"
#include "validation.h"

#include "llmq/quorums_instantsend.h"

#include <string>
#include <univalue.h>

Expand Down Expand Up @@ -589,8 +586,7 @@ bool CGovernanceObject::IsCollateralValid(std::string& strError, bool& fMissingC
}
}

if ((nConfirmationsIn < GOVERNANCE_FEE_CONFIRMATIONS) &&
(!instantsend.IsLockedInstantSendTransaction(nCollateralHash) || llmq::quorumInstantSendManager->IsLocked(nCollateralHash))) {
if ((nConfirmationsIn < GOVERNANCE_FEE_CONFIRMATIONS)) {
strError = strprintf("Collateral requires at least %d confirmations to be relayed throughout the network (it has only %d)", GOVERNANCE_FEE_CONFIRMATIONS, nConfirmationsIn);
if (nConfirmationsIn >= GOVERNANCE_MIN_RELAY_FEE_CONFIRMATIONS) {
fMissingConfirmations = true;
Expand Down

0 comments on commit 85fcf32

Please sign in to comment.