refactor: PrivateSend -> CoinJoin + Move the tab (dashpay#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>
PastaPastaPasta · Mar 17, 2021 · ae506ba · ae506ba
1 parent 4feb38b
commit ae506ba
Show file tree

Hide file tree

Showing 82 changed files with 1,681 additions and 1,602 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,6 +45,8 @@ file(GLOB SOURCE_FILES
         src/bench/*.h
         src/bls/*.cpp
         src/bls/*.h
+        src/coinjoin/*.cpp
+        src/coinjoin/*.h
         src/compat/*.cpp
         src/compat/*.h
         src/consensus/*.cpp
@@ -65,8 +67,6 @@ file(GLOB SOURCE_FILES
         src/policy/*.h
         src/primitives/*.cpp
         src/primitives/*.h
-        src/privatesend/*.cpp
-        src/privatesend/*.h
         src/qt/*.cpp
         src/qt/*.h
         src/qt/test/*.cpp

diff --git a/contrib/auto_gdb/debug.gdb b/contrib/auto_gdb/debug.gdb
@@ -2,8 +2,8 @@ set pagination off
 source used_size.py
 source log_size.py
 source test_used_size.gdb
-#logsize privateSendClient "memlog.txt"
-#logsize privateSendServer "memlog.txt"
+#logsize coinJoinClient "memlog.txt"
+#logsize coinJoinServer "memlog.txt"
 #logsize mnodeman "memlog.txt"
 logsize mnpayments "memlog.txt"
 #logsize instantsend "memlog.txt"

diff --git a/contrib/auto_gdb/simple_class_obj.py b/contrib/auto_gdb/simple_class_obj.py
@@ -10,9 +10,9 @@
 simple_types = ["CMasternode", "CMasternodeVerification",
                 "CMasternodeBroadcast", "CMasternodePing",
                 "CMasternodeMan", "CDarksendQueue", "CDarkSendEntry",
-                "CTransaction", "CMutableTransaction", "CPrivateSendBaseSession",
-                "CPrivateSendBaseManager", "CPrivateSendClientSession",
-                "CPrivateSendClientManager", "CPrivateSendServer", "CMasternodePayments",
+                "CTransaction", "CMutableTransaction", "CCoinJoinBaseSession",
+                "CCoinJoinBaseManager", "CCoinJoinClientSession",
+                "CCoinJoinClientManager", "CCoinJoinServer", "CMasternodePayments",
                 "CMasternodePaymentVote", "CMasternodeBlockPayees",
                 "CMasternodePayee", "CInstantSend", "CTxLockRequest",
                 "CTxLockVote", "CTxLockCandidate", "COutPoint",

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -134,6 +134,10 @@ BITCOIN_CORE_H = \
   checkpoints.h \
   checkqueue.h \
   clientversion.h \
+  coinjoin/coinjoin.h \
+  coinjoin/coinjoin-client.h \
+  coinjoin/coinjoin-server.h \
+  coinjoin/coinjoin-util.h \
   coins.h \
   compat.h \
   compat/byteswap.h \
@@ -154,10 +158,6 @@ BITCOIN_CORE_H = \
   evo/providertx.h \
   evo/simplifiedmns.h \
   evo/specialtx.h \
-  privatesend/privatesend.h \
-  privatesend/privatesend-client.h \
-  privatesend/privatesend-server.h \
-  privatesend/privatesend-util.h \
   dsnotificationinterface.h \
   governance/governance.h \
   governance/governance-classes.h \
@@ -299,6 +299,8 @@ libdash_server_a_SOURCES = \
   blockfilter.cpp \
   chain.cpp \
   checkpoints.cpp \
+  coinjoin/coinjoin.cpp \
+  coinjoin/coinjoin-server.cpp \
   consensus/tx_verify.cpp \
   dsnotificationinterface.cpp \
   evo/cbtx.cpp \
@@ -347,8 +349,6 @@ libdash_server_a_SOURCES = \
   policy/fees.cpp \
   policy/policy.cpp \
   pow.cpp \
-  privatesend/privatesend.cpp \
-  privatesend/privatesend-server.cpp \
   rest.cpp \
   rpc/blockchain.cpp \
   rpc/masternode.cpp \
@@ -360,7 +360,7 @@ libdash_server_a_SOURCES = \
   rpc/rpcevo.cpp \
   rpc/rpcquorums.cpp \
   rpc/server.cpp \
-  rpc/privatesend.cpp \
+  rpc/coinjoin.cpp \
   rpc/util.cpp \
   script/sigcache.cpp \
   spork.cpp \
@@ -391,10 +391,10 @@ endif
 libdash_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 libdash_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libdash_wallet_a_SOURCES = \
+  coinjoin/coinjoin-client.cpp \
+  coinjoin/coinjoin-util.cpp \
   interfaces/wallet.cpp \
   keepass.cpp \
-  privatesend/privatesend-client.cpp \
-  privatesend/privatesend-util.cpp \
   wallet/crypter.cpp \
   wallet/db.cpp \
   wallet/fees.cpp \

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
@@ -110,7 +110,7 @@ BITCOIN_TESTS =\
 
 if ENABLE_WALLET
 BITCOIN_TESTS += \
-  test/privatesend_tests.cpp \
+  wallet/test/coinjoin_tests.cpp \
   wallet/test/wallet_test_fixture.cpp \
   wallet/test/wallet_test_fixture.h \
   wallet/test/accounting_tests.cpp \