Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

instantsend: Implement Spork 2 Mempool Signing signalling #4024

Merged
merged 12 commits into from
Mar 8, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
IsInstantSendSigningEnabled -> IsInstantSendMempoolSigningEnabled
Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com>
  • Loading branch information
PastaPastaPasta and xdustinface authored Mar 6, 2021
commit c81a2154ce4e180f8507047e2f8fd25648378e82
4 changes: 2 additions & 2 deletions src/llmq/quorums_instantsend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ bool CInstantSendManager::ProcessTx(const CTransaction& tx, bool fRetroactive, c
// However, if we are processing a tx because it was included in a block we should
// sign even if mempool IS signing is disabled. This allows a ChainLock to happen on this
// block after we retroactively locked all transactions.
if (!IsInstantSendSigningEnabled() && !fRetroactive) return true;
if (!IsInstantSendMempoolSigningEnabled() && !fRetroactive) return true;

if (!TrySignInputLocks(tx, fRetroactive, llmqType)) return false;

Expand Down Expand Up @@ -1527,7 +1527,7 @@ bool IsInstantSendEnabled()
return !fReindex && !fImporting && sporkManager.IsSporkActive(SPORK_2_INSTANTSEND_ENABLED);
}

bool IsInstantSendSigningEnabled()
bool IsInstantSendMempoolSigningEnabled()
{
return !fReindex && !fImporting && sporkManager.GetSporkValue(SPORK_2_INSTANTSEND_ENABLED) == 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/llmq/quorums_instantsend.h
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ bool IsInstantSendEnabled();
* transactions in mempool, but should sign txes included in a block. This
* allows ChainLocks to continue even while this spork is disabled.
*/
bool IsInstantSendSigningEnabled();
bool IsInstantSendMempoolSigningEnabled();
bool RejectConflictingBlocks();

} // namespace llmq
Expand Down