refactor: PrivateSend -> CoinJoin + Move the tab #4038

xdustinface · 2021-03-10T16:43:28Z

As decided by DCG this PR renames PrivateSend to CoinJoin in the entire codebase and moves its tab to the right next to Transactions.

src/qt/bitcoingui.cpp

Co-authored-by: thephez <thephez@users.noreply.github.com>

UdjinM6

LGTM, utACK

xdustinface · 2021-03-11T13:35:41Z

Pushed some more commits to rename the entire codebase.

UdjinM6

Pls see UdjinM6@bac67e9 and 2 suggestions below

src/Makefile.test.include

src/qt/dashstrings.cpp

xdustinface · 2021-03-11T15:32:55Z

Pls see UdjinM6@bac67e9 and 2 suggestions below

Picked and addressed the suggestions!

UdjinM6 · 2021-03-11T16:16:45Z

Found a couple more: 4dc95e2 and a9515e3

xdustinface · 2021-03-11T16:34:08Z

Found a couple more: 4dc95e2 and a9515e3

Good catch 👍 There is also ps_salt but it might confuse users if they suddenly have other fully mixed amounts so if we rename it maybe like:
reads: cj_salt first, then tries ps_salt
writes: cj_salt

thoughts?

UdjinM6 · 2021-03-11T16:53:20Z

There is also ps_salt but it might confuse users if they suddenly have other fully mixed amounts so if we rename it

Hmmm, good point... and nCoinJoinRounds can cause similar confusion too for users who had nPrivateSendRounds higher than default 🤔

xdustinface · 2021-03-11T17:17:45Z

and nCoinJoinRounds can cause similar confusion too for users who had nPrivateSendRounds higher than default 🤔

Also a good point 😄 See the last three commits, note that c92bf89 also drops legacy checks for nAnonymizeDashAmount.

UdjinM6 · 2021-03-11T17:19:14Z

Pls see c3110f1 as an alternative to b3df6df. And c92bf89 is not that critical really (doesn't affect the balance), no need for that imo.

xdustinface · 2021-03-11T17:48:06Z

Pls see c3110f1 as an alternative to b3df6df.

Jup thats better! But it has this e013f9c issue, no?

And c92bf89 is not that critical really (doesn't affect the balance), no need for that imo.

Dropped but still added 74bcb8b because this could lead to unexpected denominating because default is 1k DASH if i didn't get something wrong here? 🤔

UdjinM6 · 2021-03-11T17:50:41Z

Pls see c3110f1 as an alternative to b3df6df.

Jup thats better! But it has this e013f9c issue, no?

Right, my bad 🙈 👍

And c92bf89 is not that critical really (doesn't affect the balance), no need for that imo.

Dropped but still added 74bcb8b because this could lead to unexpected denominating because default is 1k DASH if i didn't get something wrong here? 🤔

You mean in case it was set to a lower number? True, didn't think about. Ok, let's have this one too 👍

UdjinM6 · 2021-03-11T19:38:33Z

Pls see 30ec408.

Also, the more I play with it (going back to develop, saving some settings, going back) the more it feels awkward that we have some options/settings covered and some not :/ Let's maybe migrate all of them (e9b44f6) since we have the P-word in our code again anyway now? Probably not a big issue since it's only 2 specific places and for a good reason. Thoughts?

xdustinface · 2021-03-11T19:49:39Z

Pls see 30ec408.

Good catch! :)

Also, the more I play with it (going back to develop, saving some settings, going back) the more it feels awkward that we have some options/settings covered and some not :/ Let's maybe migrate all of them (e9b44f6) since we have the P-word in our code again anyway now? Probably not a big issue since it's only 2 specific places and for a good reason. Thoughts?

Well yeah, actually it just makes sense to migrate them all. IMO having the P-Word (lol for that) in there for migration shouldn't be any issue at all.. i mean, a class also has a P-Section and its still just to "remove the P-Word from older wallet databases/setting files" 😄

UdjinM6

LGTM now 👍

Slightly tested ACK

UdjinM6

utACK

thephez

utACK

PastaPastaPasta

utACK

* qt|wallet|privatesend: Rename PrivateSend to CoinJoin in GUI strings * qt: Move CoinJoin next to Transactions * qt: Adjust status tip of privateSendCoinsMenuAction Co-authored-by: thephez <thephez@users.noreply.github.com> * rename: privateSend -> coinJoin * rename: privatesend -> coinjoin * rename: PrivateSend -> CoinJoin * rename: use_ps -> use_cj * rename: PRIVATESEND -> COINJOIN * rename: privatesend -> coinjoin for files and folders * refactor: Re-order coinjoin files in cmake/make files * refactor: Re-order coinjoin includes where it makes sense * test: Update lint-circular-dependencies.sh * Few cleanups * test: test/coinjoin_tests.cpp -> wallet/test/coinjoin_test.cpp * s/AdvancedPSUI/AdvancedCJUI/g * s/privateSentAmountChanged/coinJoinAmountChanged/g * wallet: Rename "ps_salt" backwards compatible * Minimal PrivateSend -> CoinJoin migration for settings and cmd-line * wallet: Fix privatesendrounds -> coinjoinrounds migration * qt: Migrate nPrivateSendAmount -> nCoinJoinAmount * `-coinjoindenoms` never existed * Migrate all PS options/settings * rpc: Formatting only * qt: Make Send/CoinJoin tabs a bit more distinguishable Co-authored-by: thephez <thephez@users.noreply.github.com> Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>

xdustinface added 2 commits March 10, 2021 17:31

qt|wallet|privatesend: Rename PrivateSend to CoinJoin in GUI strings

0b4fecd

qt: Move CoinJoin next to Transactions

d7265d1

xdustinface added this to the 17 milestone Mar 10, 2021

thephez reviewed Mar 10, 2021

View reviewed changes

src/qt/bitcoingui.cpp Outdated Show resolved Hide resolved

qt: Adjust status tip of privateSendCoinsMenuAction

b2e9318

Co-authored-by: thephez <thephez@users.noreply.github.com>

UdjinM6 previously approved these changes Mar 10, 2021

View reviewed changes

UdjinM6 requested a review from PastaPastaPasta March 10, 2021 23:47

xdustinface added 2 commits March 11, 2021 13:36

rename: privateSend -> coinJoin

ee9bd98

rename: privatesend -> coinjoin

379850b

xdustinface changed the title ~~qt|wallet|privatesend: PrivateSend -> CoinJoin in GUI + Move the tab~~ refactor: PrivateSend -> CoinJoin + Move the tab Mar 11, 2021

xdustinface dismissed UdjinM6’s stale review via 275442f March 11, 2021 13:34

xdustinface requested a review from UdjinM6 March 11, 2021 13:35

xdustinface force-pushed the pr-coinjoin branch from 23513b5 to 5d6fdfb Compare March 11, 2021 14:48

UdjinM6 reviewed Mar 11, 2021

View reviewed changes

src/Makefile.test.include Outdated Show resolved Hide resolved

src/qt/dashstrings.cpp Outdated Show resolved Hide resolved

xdustinface and others added 9 commits March 11, 2021 16:24

rename: PrivateSend -> CoinJoin

d7dbdaa

rename: use_ps -> use_cj

f876b9a

rename: PRIVATESEND -> COINJOIN

b40e15d

rename: privatesend -> coinjoin for files and folders

82d2f07

refactor: Re-order coinjoin files in cmake/make files

b9c5252

refactor: Re-order coinjoin includes where it makes sense

33daf46

test: Update lint-circular-dependencies.sh

b6a82a0

Few cleanups

023b73b

test: test/coinjoin_tests.cpp -> wallet/test/coinjoin_test.cpp

9c1a3bd

xdustinface force-pushed the pr-coinjoin branch from 5dfc2a1 to 9c1a3bd Compare March 11, 2021 15:31

UdjinM6 added 2 commits March 11, 2021 17:18

s/AdvancedPSUI/AdvancedCJUI/g

193ac1b

s/privateSentAmountChanged/coinJoinAmountChanged/g

7eb9e0d

wallet: Rename "ps_salt" backwards compatible

5533556

Minimal PrivateSend -> CoinJoin migration for settings and cmd-line

41e0a7c

xdustinface force-pushed the pr-coinjoin branch from c92bf89 to 41e0a7c Compare March 11, 2021 17:28

xdustinface added 2 commits March 11, 2021 18:45

wallet: Fix privatesendrounds -> coinjoinrounds migration

e013f9c

qt: Migrate nPrivateSendAmount -> nCoinJoinAmount

74bcb8b

UdjinM6 added 2 commits March 11, 2021 20:45

-coinjoindenoms never existed

578ec52

Migrate all PS options/settings

5fb1774

UdjinM6 previously approved these changes Mar 11, 2021

View reviewed changes

xdustinface added the RPC Some notable changes to RPC params/behaviour/descriptions label Mar 12, 2021

xdustinface added 2 commits March 16, 2021 19:49

rpc: Formatting only

68b5e63

qt: Make Send/CoinJoin tabs a bit more distinguishable

5b5de66

xdustinface dismissed UdjinM6’s stale review via 5b5de66 March 16, 2021 19:11

xdustinface requested a review from UdjinM6 March 16, 2021 19:11

UdjinM6 approved these changes Mar 17, 2021

View reviewed changes

thephez approved these changes Mar 17, 2021

View reviewed changes

PastaPastaPasta approved these changes Mar 17, 2021

View reviewed changes

PastaPastaPasta merged commit ae506ba into dashpay:develop Mar 17, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: PrivateSend -> CoinJoin + Move the tab #4038

refactor: PrivateSend -> CoinJoin + Move the tab #4038

xdustinface commented Mar 10, 2021 •

edited

Loading

UdjinM6 left a comment

xdustinface commented Mar 11, 2021

UdjinM6 left a comment

xdustinface commented Mar 11, 2021

UdjinM6 commented Mar 11, 2021

xdustinface commented Mar 11, 2021

UdjinM6 commented Mar 11, 2021

xdustinface commented Mar 11, 2021

UdjinM6 commented Mar 11, 2021 •

edited

Loading

xdustinface commented Mar 11, 2021

UdjinM6 commented Mar 11, 2021 •

edited

Loading

UdjinM6 commented Mar 11, 2021 •

edited

Loading

xdustinface commented Mar 11, 2021 •

edited

Loading

UdjinM6 left a comment

UdjinM6 left a comment

thephez left a comment

PastaPastaPasta left a comment

refactor: PrivateSend -> CoinJoin + Move the tab #4038

refactor: PrivateSend -> CoinJoin + Move the tab #4038

Conversation

xdustinface commented Mar 10, 2021 • edited Loading

UdjinM6 left a comment

Choose a reason for hiding this comment

xdustinface commented Mar 11, 2021

UdjinM6 left a comment

Choose a reason for hiding this comment

xdustinface commented Mar 11, 2021

UdjinM6 commented Mar 11, 2021

xdustinface commented Mar 11, 2021

UdjinM6 commented Mar 11, 2021

xdustinface commented Mar 11, 2021

UdjinM6 commented Mar 11, 2021 • edited Loading

xdustinface commented Mar 11, 2021

UdjinM6 commented Mar 11, 2021 • edited Loading

UdjinM6 commented Mar 11, 2021 • edited Loading

xdustinface commented Mar 11, 2021 • edited Loading

UdjinM6 left a comment

Choose a reason for hiding this comment

UdjinM6 left a comment

Choose a reason for hiding this comment

thephez left a comment

Choose a reason for hiding this comment

PastaPastaPasta left a comment

Choose a reason for hiding this comment

xdustinface commented Mar 10, 2021 •

edited

Loading

UdjinM6 commented Mar 11, 2021 •

edited

Loading

UdjinM6 commented Mar 11, 2021 •

edited

Loading

UdjinM6 commented Mar 11, 2021 •

edited

Loading

xdustinface commented Mar 11, 2021 •

edited

Loading