2 Commits

Author	SHA1	Message	Date
dustinface	ae506bae66	refactor: PrivateSend -> CoinJoin + Move the tab (#4038) ... * 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>	2021-03-17 18:36:11 -04:00
Pieter Wuille	12309092de	Merge #13021: MOVEONLY: Move logging code from util.{h,cpp} to new files. ... b77b6e2345 MOVEONLY: Move logging code from util.{h,cpp} to new files. (Jim Posen) Pull request description: Split out first commit from #12954 to reduce amount of rebasing necessary. This introduces a cyclic dependency between `logging` and `util` that should be cleaned up in a future PR. Tree-SHA512: 695e512f9c2f7b4ca65e367fc924358e3cb2dc531bcbb7a6f62710b2a87280b35aba7793aa272e457fcd65448abe3feb1deb3b8064ed208917ca356b0f410813 Signed-off-by: pasta <pasta@dashboost.org> # Conflicts: # src/Makefile.am # src/util.cpp # src/util.h	2020-07-18 03:08:13 -05:00