Skip to content
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.

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

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

Merged
merged 24 commits into from
Mar 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
0b4fecd
qt|wallet|privatesend: Rename PrivateSend to CoinJoin in GUI strings
xdustinface Mar 10, 2021
d7265d1
qt: Move CoinJoin next to Transactions
xdustinface Mar 10, 2021
b2e9318
qt: Adjust status tip of privateSendCoinsMenuAction
xdustinface Mar 10, 2021
ee9bd98
rename: privateSend -> coinJoin
xdustinface Mar 11, 2021
379850b
rename: privatesend -> coinjoin
xdustinface Mar 11, 2021
d7dbdaa
rename: PrivateSend -> CoinJoin
xdustinface Mar 11, 2021
f876b9a
rename: use_ps -> use_cj
xdustinface Mar 11, 2021
b40e15d
rename: PRIVATESEND -> COINJOIN
xdustinface Mar 11, 2021
82d2f07
rename: privatesend -> coinjoin for files and folders
xdustinface Mar 11, 2021
b9c5252
refactor: Re-order coinjoin files in cmake/make files
xdustinface Mar 11, 2021
33daf46
refactor: Re-order coinjoin includes where it makes sense
xdustinface Mar 11, 2021
b6a82a0
test: Update lint-circular-dependencies.sh
xdustinface Mar 11, 2021
023b73b
Few cleanups
UdjinM6 Mar 11, 2021
9c1a3bd
test: test/coinjoin_tests.cpp -> wallet/test/coinjoin_test.cpp
xdustinface Mar 11, 2021
193ac1b
s/AdvancedPSUI/AdvancedCJUI/g
UdjinM6 Mar 11, 2021
7eb9e0d
s/privateSentAmountChanged/coinJoinAmountChanged/g
UdjinM6 Mar 11, 2021
5533556
wallet: Rename "ps_salt" backwards compatible
xdustinface Mar 11, 2021
41e0a7c
Minimal PrivateSend -> CoinJoin migration for settings and cmd-line
UdjinM6 Mar 11, 2021
e013f9c
wallet: Fix privatesendrounds -> coinjoinrounds migration
xdustinface Mar 11, 2021
74bcb8b
qt: Migrate nPrivateSendAmount -> nCoinJoinAmount
xdustinface Mar 11, 2021
578ec52
`-coinjoindenoms` never existed
UdjinM6 Mar 11, 2021
5fb1774
Migrate all PS options/settings
UdjinM6 Mar 11, 2021
68b5e63
rpc: Formatting only
xdustinface Mar 16, 2021
5b5de66
qt: Make Send/CoinJoin tabs a bit more distinguishable
xdustinface Mar 16, 2021
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
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions contrib/auto_gdb/debug.gdb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions contrib/auto_gdb/simple_class_obj.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
18 changes: 9 additions & 9 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.test.include
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Loading