Skip to content

Provide SPV peers as mixing message source #2626

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

Merged
jrick merged 1 commit into from
Apr 9, 2026
Merged

Provide SPV peers as mixing message source #2626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions chain/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,7 @@ func (s *Syncer) mixMessage(ctx context.Context, params json.RawMessage) error {
msg.WriteHash(s.blake256Hasher)
s.blake256HasherMu.Unlock()

err = s.wallet.AcceptMixMessage(msg)
err = s.wallet.AcceptMixMessageBySource(msg, mixpool.ZeroSource)
var e *mixpool.MissingOwnPRError
if errors.As(err, &e) {
ke, ok := msg.(*wire.MsgMixKeyExchange)
Expand All @@ -957,7 +957,7 @@ func (s *Syncer) mixMessage(ctx context.Context, params json.RawMessage) error {
pr.WriteHash(s.blake256Hasher)
s.blake256HasherMu.Unlock()

err = s.wallet.AcceptMixMessage(pr)
err = s.wallet.AcceptMixMessageBySource(pr, mixpool.ZeroSource)
}
return err
}
Expand Down
2 changes: 1 addition & 1 deletion spv/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1223,7 +1223,7 @@ func (s *Syncer) handleMixInvs(ctx context.Context, rp *p2p.RemotePeer, hashes [
}
}

err := s.wallet.AcceptMixMessage(msg)
err := s.wallet.AcceptMixMessageBySource(msg, rp)
var missingPRErr *mixpool.MissingOwnPRError
if errors.As(err, &missingPRErr) {
ke := msg.(*wire.MsgMixKeyExchange)
Expand Down
13 changes: 13 additions & 0 deletions wallet/mixing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,6 +553,8 @@ func PossibleCoinJoin(tx *wire.MsgTx) (isMix bool, mixDenom int64, mixCount uint

// AcceptMixMessage adds a mixing message received from the network backend to
// the wallet's mixpool.
//
// Deprecated: Use [AcceptMixMessageBySource].
func (w *Wallet) AcceptMixMessage(msg mixing.Message) error {
_, err := w.mixpool.AcceptMessage(msg, mixpool.ZeroSource)
if err != nil {
Expand All @@ -562,6 +564,17 @@ func (w *Wallet) AcceptMixMessage(msg mixing.Message) error {
return nil
}

// AcceptMixMessageBySource adds a mixing message received from the network
// backend to the wallet's mixpool.
func (w *Wallet) AcceptMixMessageBySource(msg mixing.Message, source mixpool.Source) error {
_, err := w.mixpool.AcceptMessage(msg, source)
if err != nil {
return err
}

return nil
}

func (w *Wallet) expireMixMessages(height uint32) {
mixc := w.mixClient.Load()
if mixc == nil {
Expand Down
Loading