Skip to content

Provide mixclient jitter as param. #2641

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

Draft
jholdstock wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Provide mixclient jitter as param. #2641

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
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ require (
google.golang.org/protobuf v1.36.10
)

replace github.com/decred/dcrd/mixing => ../dcrd/mixing

require (
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
github.com/companyzero/sntrup4591761 v0.0.0-20220309191932-9e0f3af2f07a // indirect
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ github.com/decred/dcrd/gcs/v4 v4.1.1 h1:3ELoII8uwIxXFGq6ETB29AjW7Lmr3McQOYsSD3dv
github.com/decred/dcrd/gcs/v4 v4.1.1/go.mod h1:5q1EnYp1CzJw057/XfRB6UGkos24fpu2r2ZLuwE7YdE=
github.com/decred/dcrd/hdkeychain/v3 v3.1.3 h1:Kn2wfj5cOR6pQO/WrYOMT1KK12IgWFEeQwnk1o81WsU=
github.com/decred/dcrd/hdkeychain/v3 v3.1.3/go.mod h1:mDAuGaH6InRD+hKVeVJsjLD/ih1mD3aCKURNHS8Tq2s=
github.com/decred/dcrd/mixing v0.7.3 h1:zrMPKvR3GP2stDiqT9tiv0e8GGnFpgl1EClNRew7FFk=
github.com/decred/dcrd/mixing v0.7.3/go.mod h1:riSgG1GpWXl8LVuBvo8WXuFgcBj01ZGpTAxT/4PrtU0=
github.com/decred/dcrd/rpc/jsonrpc/types/v4 v4.4.0 h1:BBVaYemabsFsaqNVlCmacoZlSsLDqwHYIs8ty6fg59Q=
github.com/decred/dcrd/rpc/jsonrpc/types/v4 v4.4.0/go.mod h1:w4C6hZ7ywpc8/YNkiPAknCaqKofF68cRhUiTglEIc7s=
github.com/decred/dcrd/rpcclient/v8 v8.1.0 h1:FLZ1j4ub7+O9oCIcKf+frYCrZW++G3FSzk2/f4U80hI=
Expand Down
12 changes: 10 additions & 2 deletions wallet/mixing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2019-2025 The Decred developers
// Copyright (c) 2019-2026 The Decred developers
// Use of this source code is governed by an ISC
// license that can be found in the LICENSE file.

Expand All @@ -7,6 +7,7 @@
import (
"context"
"sync/atomic"
"time"

"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v5/wallet/txrules"
Expand All @@ -15,12 +16,13 @@
"decred.org/dcrwallet/v5/wallet/walletdb"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/crypto/rand"
"github.com/decred/dcrd/dcrec"
"github.com/decred/dcrd/dcrec/secp256k1/v4"
"github.com/decred/dcrd/dcrutil/v4"
"github.com/decred/dcrd/mixing"
"github.com/decred/dcrd/mixing/mixclient"
"github.com/decred/dcrd/mixing/mixpool"

Check failure on line 25 in wallet/mixing.go

View workflow job for this annotation

GitHub Actions / Go CI (1.24) 

github.com/decred/dcrd/mixing@v0.7.3: replacement directory ../dcrd/mixing does not exist

Check failure on line 25 in wallet/mixing.go

View workflow job for this annotation

GitHub Actions / Go CI (1.25) 

github.com/decred/dcrd/mixing@v0.7.3: replacement directory ../dcrd/mixing does not exist
"github.com/decred/dcrd/txscript/v4"
"github.com/decred/dcrd/txscript/v4/sign"
"github.com/decred/dcrd/txscript/v4/stdaddr"
Expand Down Expand Up @@ -588,5 +590,11 @@
if mixc == nil {
return errors.E(errors.Invalid, "mixing client is not running")
}
return mixc.Dicemix(ctx, cj)

timeoutDuration := 30 * time.Second
maxJitter := timeoutDuration / 10
msgJitter := 300 * time.Millisecond
peerJitter := rand.Duration(maxJitter - msgJitter)

return mixc.Dicemix(ctx, cj, peerJitter)
}
3 changes: 2 additions & 1 deletion wallet/wallet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5536,7 +5536,8 @@ func (w *Wallet) MixingEnabled() bool {
}

func newMixClient(w *Wallet) *mixclient.Client {
c := mixclient.NewClient((*mixingWallet)(w))
msgJitter := 300 * time.Millisecond
c := mixclient.NewClient((*mixingWallet)(w), msgJitter)
c.SetLogger(loggers.MixcLog)
return c
}
Expand Down
Loading