disabled exchange

Author: corvaxx

src/main.cpp

@@ -3465,47 +3465,51 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
 
     else if (strCommand == "xbridge")
     {
-        std::vector<unsigned char> raw;
-        vRecv >> raw;
-
-        uint256 hash = Hash(raw.begin(), raw.end());
-        if (!pfrom->setKnown.count(hash))
+        static bool isEnabled = XBridgeApp::isEnabled();
+        if (isEnabled)
         {
-            pfrom->setKnown.insert(hash);
+            std::vector<unsigned char> raw;
+            vRecv >> raw;
 
-            // Relay
+            uint256 hash = Hash(raw.begin(), raw.end());
+            if (!pfrom->setKnown.count(hash))
             {
-                LOCK(cs_vNodes);
-                for  (CNode * pnode : vNodes)
+                pfrom->setKnown.insert(hash);
+
+                // Relay
                 {
-                    if (pnode->setKnown.insert(hash).second)
+                    LOCK(cs_vNodes);
+                    for  (CNode * pnode : vNodes)
                     {
-                        pnode->PushMessage("xbridge", raw);
+                        if (pnode->setKnown.insert(hash).second)
+                        {
+                            pnode->PushMessage("xbridge", raw);
+                        }
                     }
                 }
-            }
 
-            if (raw.size() > 20 + sizeof(time_t))
-            {
-                static std::vector<unsigned char> zero(20, 0);
-                std::vector<unsigned char> addr(raw.begin(), raw.begin()+20);
-                // remove addr from raw
-                raw.erase(raw.begin(), raw.begin()+20);
-                // remove timestamp from raw
-                raw.erase(raw.begin(), raw.begin()+sizeof(uint64_t));
+                if (raw.size() > 20 + sizeof(time_t))
+                {
+                    static std::vector<unsigned char> zero(20, 0);
+                    std::vector<unsigned char> addr(raw.begin(), raw.begin()+20);
+                    // remove addr from raw
+                    raw.erase(raw.begin(), raw.begin()+20);
+                    // remove timestamp from raw
+                    raw.erase(raw.begin(), raw.begin()+sizeof(uint64_t));
 
-                XBridgeApp & app = XBridgeApp::instance();
+                    XBridgeApp & app = XBridgeApp::instance();
 
-                if (addr != zero)
-                {
-                    app.onMessageReceived(addr, raw);
-                }
-                else
-                {
-                    app.onBroadcastReceived(raw);
+                    if (addr != zero)
+                    {
+                        app.onMessageReceived(addr, raw);
+                    }
+                    else
+                    {
+                        app.onBroadcastReceived(raw);
+                    }
                 }
             }
-        }
+        } // if (isEnabled)
     }
 
     // messages

src/qt/bitcoingui.cpp

@@ -33,6 +33,7 @@
 #include "messagedialog/messagedialog.h"
 #include "xbridgeui/xbridgetransactionsview.h"
 #include "xbridge/xbridgeexchange.h"
+#include "xbridge/xbridgeapp.h"
 #include "util/verify.h"
 
 #ifdef Q_OS_MAC
@@ -159,7 +160,10 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
     centralWidget->addWidget(receiveCoinsPage);
     centralWidget->addWidget(sendCoinsPage);
     centralWidget->addWidget(messagesPage);
-    centralWidget->addWidget(xbridgePage);
+    if (XBridgeApp::isEnabled())
+    {
+        centralWidget->addWidget(xbridgePage);
+    }
     setCentralWidget(centralWidget);
 
 
@@ -303,14 +307,19 @@ void BitcoinGUI::createActions()
     messagesAction->setToolTip(tr("Show chat"));
     // messagesAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_6));
     messagesAction->setCheckable(true);
+#if 0
     tabGroup->addAction(messagesAction);
+#endif
 
     // TODO icons
     xbridgeAction = new QAction(QIcon(":/icons/block"), tr("&XBridge"), this);
     xbridgeAction->setToolTip(tr("Show xbridge dialog"));
     // xbridgeAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_6));
     xbridgeAction->setCheckable(true);
-    tabGroup->addAction(xbridgeAction);
+    if (XBridgeApp::isEnabled())
+    {
+        tabGroup->addAction(xbridgeAction);
+    }
 
 	connect(blockAction, SIGNAL(triggered()), this, SLOT(gotoBlockBrowser()));
     VERIFY(connect(overviewAction,     SIGNAL(triggered()), this, SLOT(showNormalIfMinimized())));
@@ -444,10 +453,14 @@ void BitcoinGUI::createToolBars()
     spacer->setObjectName("spacer");
 	toolbar->addAction(unlockWalletAction);
 	toolbar->addAction(lockWalletAction);
+#if 0
     toolbar->addAction(messagesAction);
-    toolbar->addAction(xbridgeAction);
-
+#endif
 
+    if (XBridgeApp::isEnabled())
+    {
+        toolbar->addAction(xbridgeAction);
+    }
 }
 
 //*****************************************************************************

src/xbridge/xbridgeapp.cpp

@@ -100,6 +100,14 @@ std::string XBridgeApp::version()
     return o.str();
 }
 
+//*****************************************************************************
+//*****************************************************************************
+// static
+bool XBridgeApp::isEnabled()
+{
+    return false;
+}
+
 //*****************************************************************************
 //*****************************************************************************
 bool XBridgeApp::start()

src/xbridge/xbridgeapp.h

@@ -46,6 +46,8 @@ class XBridgeApp
 
     static std::string version();
 
+    static bool isEnabled();
+
     bool init(int argc, char *argv[]);
     bool start();