Skip to content

fix: charge collateral when a CoinJoin session aborts #7568

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.

Sign up for GitHub

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

Open
PastaPastaPasta wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

fix: charge collateral when a CoinJoin session aborts #7568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5d22ec3
fix: make CoinJoin nSessionDenom atomic
PastaPastaPasta Aug 3, 2026
bd20793
fix: decide CoinJoin server state transitions under cs_coinjoin
PastaPastaPasta Aug 3, 2026
ef0e058
fix: guard the CoinJoin session collaterals with cs_coinjoin
PastaPastaPasta Aug 3, 2026
1b9075d
fix: revalidate the CoinJoin session before committing an entry
PastaPastaPasta Aug 3, 2026
3c939ae
fix: serialize CoinJoin timeout transitions
PastaPastaPasta Aug 9, 2026
9a8c558
fix(coinjoin): validate entries against session snapshot
PastaPastaPasta Aug 10, 2026
de81211
fix(coinjoin): deduplicate signing offenders
PastaPastaPasta Aug 10, 2026
f6f0527
fix: charge one collateral when a CoinJoin session aborts
PastaPastaPasta Aug 10, 2026
d41a6ef
fix(coinjoin): commit a fully signed session instead of timing it out
PastaPastaPasta Aug 12, 2026
9777136
fix(coinjoin): charge the saboteur, not the peers a relayed abort orp…
PastaPastaPasta Aug 12, 2026
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
18 changes: 10 additions & 8 deletions src/coinjoin/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ bool CCoinJoinClientSession::SignFinalTransaction(CNode& peer, Chainstate& activ
// Make sure all inputs/outputs are valid
PoolMessage nMessageID{MSG_NOERR};
if (!IsValidInOuts(active_chainstate, m_isman, mempool, finalMutableTransaction.vin, finalMutableTransaction.vout,
nMessageID, nullptr)) {
nSessionDenom.load(), nMessageID, nullptr)) {
WalletCJLogPrint(m_wallet, "CCoinJoinClientSession::%s -- ERROR! IsValidInOuts() failed: %s\n", __func__, CoinJoin::GetMessageByID(nMessageID).translated);
UnlockCoins();
keyHolderStorage.ReturnAll();
Expand Down Expand Up @@ -1229,8 +1229,9 @@ bool CCoinJoinClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymized,
SetState(POOL_STATE_QUEUE);
nTimeLastSuccessfulStep = GetTime();
WalletCJLogPrint(m_wallet, /* Continued */
"CCoinJoinClientSession::JoinExistingQueue -- pending connection, masternode=%s, nSessionDenom=%d (%s)\n",
dmn->proTxHash.ToString(), nSessionDenom, CoinJoin::DenominationToString(nSessionDenom));
"CCoinJoinClientSession::JoinExistingQueue -- pending connection, masternode=%s, "
"nSessionDenom=%d (%s)\n",
dmn->proTxHash.ToString(), nSessionDenom.load(), CoinJoin::DenominationToString(nSessionDenom));
strAutoDenomResult = _("Trying to connect…");
return true;
}
Expand Down Expand Up @@ -1310,9 +1311,11 @@ bool CCoinJoinClientSession::StartNewQueue(CAmount nBalanceNeedsAnonymized, CCon
pendingDsaRequest = CPendingDsaRequest(dmn->proTxHash, CCoinJoinAccept(nSessionDenom, txMyCollateral));
SetState(POOL_STATE_QUEUE);
nTimeLastSuccessfulStep = GetTime();
WalletCJLogPrint( /* Continued */
m_wallet, "CCoinJoinClientSession::StartNewQueue -- pending connection, masternode=%s, nSessionDenom=%d (%s)\n",
dmn->proTxHash.ToString(), nSessionDenom, CoinJoin::DenominationToString(nSessionDenom));
WalletCJLogPrint(/* Continued */
m_wallet,
"CCoinJoinClientSession::StartNewQueue -- pending connection, masternode=%s, nSessionDenom=%d "
"(%s)\n",
dmn->proTxHash.ToString(), nSessionDenom.load(), CoinJoin::DenominationToString(nSessionDenom));
strAutoDenomResult = _("Trying to connect…");
return true;
}
Expand Down Expand Up @@ -1424,7 +1427,7 @@ bool CCoinJoinClientSession::SubmitDenominate(CConnman& connman)
return a.second > b.second || (a.second == b.second && a.first < b.first);
});

WalletCJLogPrint(m_wallet, "vecInputsByRounds for denom %d\n", nSessionDenom);
WalletCJLogPrint(m_wallet, "vecInputsByRounds for denom %d\n", nSessionDenom.load());
for (const auto& pair : vecInputsByRounds) {
WalletCJLogPrint(m_wallet, "vecInputsByRounds: rounds: %d, inputs: %d\n", pair.first, pair.second);
}
Expand Down Expand Up @@ -2001,4 +2004,3 @@ UniValue CCoinJoinClientManager::getJsonInfo() const
obj.pushKV("sessions", arrSessions);
return obj;
}

9 changes: 5 additions & 4 deletions src/coinjoin/coinjoin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ std::string CCoinJoinBaseSession::GetStateString() const

bool CCoinJoinBaseSession::IsValidInOuts(Chainstate& active_chainstate, const llmq::CInstantSendManager& isman,
const CTxMemPool& mempool, const std::vector<CTxIn>& vin,
const std::vector<CTxOut>& vout, PoolMessage& nMessageIDRet,
bool* fConsumeCollateralRet) const
const std::vector<CTxOut>& vout, int session_denom,
PoolMessage& nMessageIDRet, bool* fConsumeCollateralRet) const
{
std::set<CScript> setScripPubKeys;
nMessageIDRet = MSG_NOERR;
Expand All @@ -221,9 +221,10 @@ bool CCoinJoinBaseSession::IsValidInOuts(Chainstate& active_chainstate, const ll
}

auto checkTxOut = [&](const CTxOut& txout) {
if (int nDenom = CoinJoin::AmountToDenomination(txout.nValue); nDenom != nSessionDenom) {
if (int nDenom = CoinJoin::AmountToDenomination(txout.nValue); nDenom != session_denom) {
LogPrint(BCLog::COINJOIN, "CCoinJoinBaseSession::IsValidInOuts -- ERROR: incompatible denom %d (%s) != nSessionDenom %d (%s)\n",
nDenom, CoinJoin::DenominationToString(nDenom), nSessionDenom, CoinJoin::DenominationToString(nSessionDenom));
nDenom, CoinJoin::DenominationToString(nDenom), session_denom,
CoinJoin::DenominationToString(session_denom));
nMessageIDRet = ERR_DENOM;
if (fConsumeCollateralRet) *fConsumeCollateralRet = true;
return false;
Expand Down
10 changes: 8 additions & 2 deletions src/coinjoin/coinjoin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,10 +339,16 @@ class CCoinJoinBaseSession

bool IsValidInOuts(Chainstate& active_chainstate, const llmq::CInstantSendManager& isman,
const CTxMemPool& mempool, const std::vector<CTxIn>& vin, const std::vector<CTxOut>& vout,
PoolMessage& nMessageIDRet, bool* fConsumeCollateralRet) const;
int session_denom, PoolMessage& nMessageIDRet, bool* fConsumeCollateralRet) const;

public:
int nSessionDenom{0}; // Users must submit a denom matching this
// Users must submit a denom matching this. Atomic like its sibling session fields: it is
// written by the message-handling thread when a session opens and by either thread in
// SetNull(), and read unlocked by both plus RPC threads via GetJsonInfo().
// Note when logging: tinyformat reads the atomic through its implicit int conversion. LogPrint()
// passes arguments by const reference, while WalletCJLogPrint() forwards to CWallet::WalletLogPrintf()
// by value and therefore needs an explicit .load().
std::atomic<int> nSessionDenom{0};

CCoinJoinBaseSession() = default;
virtual ~CCoinJoinBaseSession() = default;
Expand Down
Loading