Split PS into Manager and Session and allow running multiple mixing sessions in parallel (on client side) #2203

UdjinM6 · 2018-08-05T18:34:34Z

This should considerably speed things up (when there are enough participants ofc). Should also mitigate mixing speed degradation which could happen if we introduce additional mixing denoms (i.e. fix #2198) and keep the rest of it as is.

PastaPastaPasta · 2018-08-09T03:43:50Z

src/privatesend-client.cpp

@@ -40,13 +44,18 @@ void CPrivateSendClient::ProcessMessage(CNode* pfrom, const std::string& strComm
        CDarksendQueue dsq;
        vRecv >> dsq;

+        {


Why are these brackets here? If there's a reason for them to be there shouldn't it's contents be indented?

That's for cs_vecqueue lock. Same logic for changes as in #2200 basically but since the block here is pretty small and there are a lot of changes anyway I guess I should probably add some whitespaces here. Will fix.

PastaPastaPasta · 2018-08-09T03:49:38Z

src/privatesend-client.cpp

    UnlockCoins();
    keyHolderStorage.ReturnAll();
    SetNull();
 }

-void CPrivateSendClient::SetNull()
+void CPrivateSendClientManager::ResetPool()


Shouldn't we keep CPrivateSendClientSession methods together and CPrivateSendClientManager methods together and not intermingle?

The idea for the split is to change the behaviour, so imo it's best to keep the logic that was split close to the original one in code to make it easier to review. I would create a separate move-only PR after this one is merged (there are quite a few other dash-specific modules which could also be refactored this way btw).

PastaPastaPasta · 2018-08-09T03:56:19Z

src/privatesend-client.cpp

+    for (auto& session : vecSessions) {
+        strSessionDenoms += (session.nSessionDenom ? CPrivateSend::GetDenominationsToString(session.nSessionDenom) : "N/A") + "; ";
+    }
+    return strSessionDenoms.empty() ? "N/A" : strSessionDenoms;


Is `"N/A" consistent to use? I don't recall seeing that elsewhere and it seems a little weird.
Also, in current there is no difference in return between having 1 session which has no denoms and having no sessions, which I would think sound be a problem

Not sure I understand what you mean tbh. Any suggestions how to modify this?

I'm not sure if "N/A" is a good message to use. It seems very non-descriptive but since I don't really know what the overall use case is I can't say if it should be changed or if it's fine and dandy

This basically reproduces current GUI behaviour https://github.com/dashpay/dash/pull/2203/files/78d913321f724b736842a6560abee679a25142d9#diff-59a80b7def583e0548abaca42dca0236L576 but for multiple sessions.

PastaPastaPasta · 2018-08-09T03:59:41Z

src/privatesend-client.cpp

 }

+void CPrivateSendClientManager::CheckTimeout()


add comment to remain consistent?

PastaPastaPasta · 2018-08-09T04:06:40Z

src/privatesend-client.cpp

+    CheckQueue();
+
+    for (auto& session : vecSessions) {
+        if (!session.CheckTimeout()) {


Why does false mean timedout and true means not timedout? I get that the normal thing is true means success false means failed, but this just isn't intuitive imo and confuses a reader

Makes sense, will rewrite CPrivateSendClientSession::CheckTimeout() a bit.

PastaPastaPasta · 2018-08-09T04:17:14Z

src/privatesend-client.h

 static const int MAX_PRIVATESEND_ROUNDS             = 16;
 static const int MAX_PRIVATESEND_AMOUNT             = MAX_MONEY / COIN;
 static const int MAX_PRIVATESEND_LIQUIDITY          = 100;
+static const int DEFAULT_PRIVATESEND_SESSIONS       = 4;


Is there any reasoning for this and MAX_PRIVATESEND_SESSIONS or do you just love 4 and 10 😉 ?

Don't want to keep too many connections open to avoid high bandwidth usage while still having some positive effect of using multiple sessions even with default settings. 4 and 10 seems like reasonable numbers for normal and extreme usage respectively IMO :)

Alright, we probably want to put some documentation out about how much bandwidth it'll use, etc on different values and if that might affect privacy in any way. Although that might be more @strophy 's domain?

Well, by default node keeps MAX_OUTBOUND_CONNECTIONS (8) regular connections open, so each new connections adds some initial sync bandwidth (should be negligible) and relay everything one which depends on current network activity. Anyway, good that you asked - I realized that we should also bump MAX_OUTBOUND_MASTERNODE_CONNECTIONS to make sure mixing sessions fit into the limit, see 213a080 🙂 👍

PastaPastaPasta · 2018-08-09T04:23:36Z

src/rpc/masternode.cpp

-    if (privateSendClient.GetMixingMasternodeInfo(mnInfo)) {
-        obj.push_back(Pair("outpoint",      mnInfo.outpoint.ToStringShort()));
-        obj.push_back(Pair("addr",          mnInfo.addr.ToString()));
+    // TODO:


remove todo

It's for state and entries - not sure if I want them to be removed or implemented in pprivateSendBaseManager, so I just added TODO here as a reminder.

+10 for parallel mixing

PastaPastaPasta · 2018-08-09T15:18:44Z

utACK

Antti-Kaikkonen · 2018-08-14T01:01:29Z

I'm a little bit concerned that by making the mixing speed faster you might end up mixing with fewer people thus reducing your privacy. Any thoughts?

UdjinM6 · 2018-08-14T10:34:10Z

@Antti-Kaikkonen yes, that's a good point but it also could be that you will mix with more people because 1) when mixing is faster more people could be willing to mix and 2) you could mix with those you would miss if you were using one session only. So I guess it's hard to say what the final outcome will be but imo it's a balanced one.

thephez · 2018-08-14T12:59:45Z

@Antti-Kaikkonen Also, while the default number of sessions is 4, you can override that and set it to anywhere between 1 and 10 so "legacy mode" is still available if you set it to 1.

gladcow

utACK

…eSendClientManager::GetMixingMasternodesInfo(). This should solve potential deadlock cs_vecqueue vs cs_vNodes.

UdjinM6 · 2018-08-25T18:08:20Z

No potential deadlocks or conflicting transactions (finally) for a couple of days of non-stop mixing and a bunch of restarts here. Pls (re-)review/test :)

gladcow

ACK, slightly tested

nmarley

utACK, nothing stands out to me, but I'm not too familiar w/PS code currently

codablock

utACK

…essions in parallel (client side) (dashpay#2203) * Split PS into Manager and Session * Adjust log messages accordingly * add -privatesendsessions cmd-line option * address review comments * bump MAX_OUTBOUND_MASTERNODE_CONNECTIONS to 30 +10 for parallel mixing * protect vecSessions * constructors * Rewrite CMasternodeMan::ProcessMasternodeConnections() to use CPrivateSendClientManager::GetMixingMasternodesInfo(). This should solve potential deadlock cs_vecqueue vs cs_vNodes. * Drop no longer used IsMixingMasternode() * lock cs_wallet when mixing uses balance related functions

UdjinM6 added 3 commits August 5, 2018 21:02

Split PS into Manager and Session

c5ecc72

Adjust log messages accordingly

160a359

add -privatesendsessions cmd-line option

78d9133

UdjinM6 added this to the 12.4 milestone Aug 5, 2018

PastaPastaPasta reviewed Aug 9, 2018

View reviewed changes

UdjinM6 added 2 commits August 9, 2018 12:21

address review comments

a877e95

bump MAX_OUTBOUND_MASTERNODE_CONNECTIONS to 30

213a080

+10 for parallel mixing

gladcow previously approved these changes Aug 17, 2018

View reviewed changes

UdjinM6 dismissed gladcow’s stale review via f1b3bb7 August 22, 2018 14:54

UdjinM6 changed the title ~~Split PS into Manager and Session and allow running multiple mixing sessions in parallel (on client side)~~ [WIP] Split PS into Manager and Session and allow running multiple mixing sessions in parallel (on client side) Aug 22, 2018

UdjinM6 added 2 commits August 23, 2018 02:01

protect vecSessions

b25e5cf

constructors

180f2a7

UdjinM6 force-pushed the splitps branch 3 times, most recently from 4d0f297 to 4f50895 Compare August 22, 2018 23:44

UdjinM6 added 3 commits August 24, 2018 20:43

Rewrite CMasternodeMan::ProcessMasternodeConnections() to use CPrivat…

613b405

…eSendClientManager::GetMixingMasternodesInfo(). This should solve potential deadlock cs_vecqueue vs cs_vNodes.

Drop no longer used IsMixingMasternode()

c8b5740

lock cs_wallet when mixing uses balance related functions

5b86a37

UdjinM6 force-pushed the splitps branch from 6bb00f0 to 5b86a37 Compare August 24, 2018 17:43

UdjinM6 changed the title ~~[WIP] Split PS into Manager and Session and allow running multiple mixing sessions in parallel (on client side)~~ Split PS into Manager and Session and allow running multiple mixing sessions in parallel (on client side) Aug 25, 2018

gladcow approved these changes Aug 31, 2018

View reviewed changes

nmarley approved these changes Sep 3, 2018

View reviewed changes

codablock approved these changes Sep 4, 2018

View reviewed changes

UdjinM6 merged commit b164bcc into dashpay:develop Sep 4, 2018

UdjinM6 deleted the splitps branch November 26, 2020 13:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Split PS into Manager and Session and allow running multiple mixing sessions in parallel (on client side) #2203

Split PS into Manager and Session and allow running multiple mixing sessions in parallel (on client side) #2203

UdjinM6 commented Aug 5, 2018 •

edited

Loading

PastaPastaPasta Aug 9, 2018

UdjinM6 Aug 9, 2018

PastaPastaPasta Aug 9, 2018

UdjinM6 Aug 9, 2018

PastaPastaPasta Aug 9, 2018

UdjinM6 Aug 9, 2018

PastaPastaPasta Aug 9, 2018

UdjinM6 Aug 9, 2018

PastaPastaPasta Aug 9, 2018

PastaPastaPasta Aug 9, 2018

UdjinM6 Aug 9, 2018

PastaPastaPasta Aug 9, 2018

UdjinM6 Aug 9, 2018

PastaPastaPasta Aug 9, 2018

UdjinM6 Aug 9, 2018

PastaPastaPasta Aug 9, 2018

UdjinM6 Aug 9, 2018

PastaPastaPasta commented Aug 9, 2018

Antti-Kaikkonen commented Aug 14, 2018

UdjinM6 commented Aug 14, 2018 •

edited

Loading

thephez commented Aug 14, 2018

gladcow left a comment

UdjinM6 commented Aug 25, 2018

gladcow left a comment

nmarley left a comment

codablock left a comment

Split PS into Manager and Session and allow running multiple mixing sessions in parallel (on client side) #2203

Split PS into Manager and Session and allow running multiple mixing sessions in parallel (on client side) #2203

Conversation

UdjinM6 commented Aug 5, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PastaPastaPasta commented Aug 9, 2018

Antti-Kaikkonen commented Aug 14, 2018

UdjinM6 commented Aug 14, 2018 • edited Loading

thephez commented Aug 14, 2018

gladcow left a comment

Choose a reason for hiding this comment

UdjinM6 commented Aug 25, 2018

gladcow left a comment

Choose a reason for hiding this comment

nmarley left a comment

Choose a reason for hiding this comment

codablock left a comment

Choose a reason for hiding this comment

UdjinM6 commented Aug 5, 2018 •

edited

Loading

UdjinM6 commented Aug 14, 2018 •

edited

Loading