Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion config.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ type config struct {
mixedAccount string
mixedBranch uint32
TicketSplitAccount string `long:"ticketsplitaccount" description:"Account to derive fresh addresses from for mixed ticket splits; uses mixedaccount if unset"`
ChangeAccount string `long:"changeaccount" description:"Account used to derive unmixed CoinJoin outputs in CoinShuffle++ protocol"`
ChangeAccount string `long:"changeaccount" description:"Account to send change when ticket autobuying or mixing; required when mixing"`
MixChange bool `long:"mixchange" description:"Use CoinShuffle++ to mix change account outputs into mix account"`
MixSplitLimit int `long:"mixsplitlimit" description:"Maximum concurrent mixes for any change amount"`

Expand Down
7 changes: 6 additions & 1 deletion dcrwallet.go
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ func run(ctx context.Context) error {
purchaseAccount uint32 // enableticketbuyer
votingAccount uint32 // enableticketbuyer
mixedAccount uint32 // (enableticketbuyer && mixing) || mixchange
changeAccount uint32 // (enableticketbuyer && mixing) || mixchange
changeAccount uint32 // enableticketbuyer || mixchange
ticketSplitAccount uint32 // enableticketbuyer && mixing
)
if cfg.EnableTicketBuyer {
Expand All @@ -317,6 +317,11 @@ func run(ctx context.Context) error {
} else {
votingAccount = purchaseAccount
}
if cfg.ChangeAccount != "" {
changeAccount = lookup("changeaccount", cfg.ChangeAccount)
} else {
changeAccount = purchaseAccount
}
}
if (cfg.EnableTicketBuyer && cfg.MixingEnabled) || cfg.MixChange {
mixedAccount = lookup("mixedaccount", cfg.mixedAccount)
Expand Down
Loading