From f0f50cf9ce09ddae8e129253ab502f5018bf5347 Mon Sep 17 00:00:00 2001
From: chromatic <chromatic@wgz.org>
Date: Thu, 9 Jun 2022 20:47:03 -0700
Subject: [PATCH] Improve Qt payment server IPC

Add a unique suffix to the IPC server name before hashing, to avoid
things like network collisions or attempts to reuse old sockets on
restart.

Remove now-superfluous code that removed the old socket after a crash.
---
 src/qt/paymentserver.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index 84ea24b6f..12335c547 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -11,6 +11,7 @@
 #include "base58.h"
 #include "chainparams.h"
 #include "policy/policy.h"
+#include "random.h"
 #include "ui_interface.h"
 #include "util.h"
 #include "wallet/wallet.h"
@@ -55,6 +56,7 @@ const char* BIP70_MESSAGE_PAYMENTREQUEST = "PaymentRequest";
 const char* BIP71_MIMETYPE_PAYMENT = "application/bitcoin-payment";
 const char* BIP71_MIMETYPE_PAYMENTACK = "application/bitcoin-paymentack";
 const char* BIP71_MIMETYPE_PAYMENTREQUEST = "application/bitcoin-paymentrequest";
+const int IPC_SOCKET_HASH = GetRandInt(INT_MAX);
 
 struct X509StoreDeleter {
       void operator()(X509_STORE* b) {
@@ -84,7 +86,7 @@ static QString ipcServerName()
     // Note that GetDataDir(true) returns a different path
     // for -testnet versus main net
     QString ddir(GUIUtil::boostPathToQString(GetDataDir(true)));
-    name.append(QString::number(qHash(ddir)));
+    name.append(QString::number(qHash(ddir, IPC_SOCKET_HASH)));
 
     return name;
 }
@@ -314,9 +316,6 @@ PaymentServer::PaymentServer(QObject* parent, bool startLocalServer) :
 
     QString name = ipcServerName();
 
-    // Clean up old socket leftover from a crash:
-    QLocalServer::removeServer(name);
-
     if (startLocalServer)
     {
         uriServer = new QLocalServer(this);