Add payment sidechain, bug fixes, refactoring, gui

* Added payment sidechain keypair
* Fixed several GUI bugs related to multi-sidechain support
* Fixed several wallet bugs related to multi-sidechain support
* Fixed several validation bugs related to multi-sidechain support

Author: CryptAxe

src/Makefile.qt.include

@@ -293,6 +293,7 @@ RES_ICONS = \
   qt/res/icons/remove.png \
   qt/res/icons/send.png \
   qt/res/icons/sidechain_one.png \
+  qt/res/icons/sidechain_payments.png \
   qt/res/icons/synced.png \
   qt/res/icons/transaction0.png \
   qt/res/icons/transaction2.png \

src/init.cpp

@@ -1786,8 +1786,11 @@ bool AppInitMain()
 
             // Watch sidechain deposit addresses
             for (const Sidechain& sidechain : ValidSidechains) {
-                std::vector<unsigned char> data(ParseHex(std::string(sidechain.sidechainHex)));
+                std::vector<unsigned char> data;
+                data = std::vector<unsigned char>(ParseHex(sidechain.sidechainHex));
+
                 CScript script(data.begin(), data.end());
+
                 if (!pwallet->HaveWatchOnly(script)) {
                     pwallet->AddWatchOnly(script, 0 /* nCreateTime */);
                 }

src/primitives/transaction.cpp

@@ -161,28 +161,27 @@ bool CCriticalData::IsBMMRequest(uint8_t& nSidechain, uint16_t& nPrevBlockRef) c
     if (bytes[0] != 0x00 || bytes[1] != 0xbf || bytes[2] != 0x00)
         return false;
 
-    // Convert bytes to script for easy parsing
-    CScript script(bytes.begin(), bytes.end());
-
-    // Get nSidechain
-    CScript::const_iterator psidechain = script.begin() + 3;
-    opcodetype opcode;
-    std::vector<unsigned char> vchSidechain;
-    if (!script.GetOp(psidechain, opcode, vchSidechain))
-        return false;
-
-    // Is nSidechain valid?
-    nSidechain = CScriptNum(vchSidechain, true).getint();
-    if (!IsSidechainNumberValid(nSidechain))
-        return false;
-
-    // Get prevBlockRef
-    CScript::const_iterator pprevblock = psidechain + vchSidechain.size() + 1;
-    std::vector<unsigned char> vchPrevBlockRef;
-    if (!script.GetOp(pprevblock, opcode, vchPrevBlockRef))
-        return false;
-
-    nPrevBlockRef = CScriptNum(vchPrevBlockRef, true).getint();
+    if (bytes.size() == 4) {
+        nSidechain = 0;
+        if (!IsSidechainNumberValid(nSidechain))
+            return false;
+
+        std::vector<unsigned char> vch;
+        vch.push_back(bytes[3]);
+        nPrevBlockRef = CScriptNum(vch, false).getint();
+
+    } else {
+        std::vector<unsigned char> vch;
+        vch.push_back(bytes[3]);
+
+        nSidechain = CScriptNum(vch, false).getint();
+        if (!IsSidechainNumberValid(nSidechain))
+            return false;
+
+        std::vector<unsigned char> vchPrev;
+        vchPrev.push_back(bytes[4]);
+        nPrevBlockRef = CScriptNum(vchPrev, false).getint();
+    }
 
     return true;
 }

src/qt/drivenet.qrc

@@ -30,6 +30,7 @@
         <file alias="overview">res/icons/overview.png</file>
         <file alias="export">res/icons/export.png</file>
         <file alias="sidechain_one">res/icons/sidechain_one.png</file>
+        <file alias="sidechain_payments">res/icons/sidechain_payments.png</file>
         <file alias="synced">res/icons/synced.png</file>
         <file alias="remove">res/icons/remove.png</file>
         <file alias="tx_mined">res/icons/tx_mined.png</file>

src/qt/forms/sidechainpage.ui

@@ -54,13 +54,8 @@
       <item>
        <widget class="QComboBox" name="comboBoxSidechains">
         <property name="currentText">
-         <string>Sidechain One</string>
+         <string/>
         </property>
-        <item>
-         <property name="text">
-          <string>Sidechain One</string>
-         </property>
-        </item>
        </widget>
       </item>
       <item>
@@ -180,13 +175,13 @@
              <item>
               <widget class="QPushButton" name="pushButtonDeposit">
                <property name="sizePolicy">
-                <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
                <property name="text">
-                <string>Deposit</string>
+                <string/>
                </property>
                <property name="icon">
                 <iconset resource="../drivenet.qrc">

src/qt/res/icons/sidechain_payments.png

@@ -21,7 +21,6 @@
 #include <miner.h>
 #include <net.h>
 #include <primitives/block.h>
-#include <sidechain.h>
 #include <txdb.h>
 #include <validation.h>
 #include <wallet/coincontrol.h>
@@ -48,20 +47,24 @@ SidechainPage::SidechainPage(QWidget *parent) :
     for (const Sidechain& s : ValidSidechains) {
         QListWidgetItem *item = new QListWidgetItem(ui->listWidgetSidechains);
 
-        // TODO keep list of sidechain icons and display correct icon based on nSidechain
         // Set icon
-        QIcon icon(":/icons/sidechain_one");
+        QIcon icon(SidechainIcons[s.nSidechain]);
         item->setIcon(icon);
 
         // Set text
         item->setText(QString::fromStdString(s.GetSidechainName()));
         QFont font = item->font();
-        font.setPointSize(22);
+        font.setPointSize(16);
         item->setFont(font);
 
         ui->listWidgetSidechains->addItem(item);
     }
 
+    // Setup sidechain selection combo box
+    for (const Sidechain& s : ValidSidechains) {
+        ui->comboBoxSidechains->addItem(QString::fromStdString(s.GetSidechainName()));
+    }
+
     // Initialize models
     escrowModel = new SidechainEscrowTableModel(this);
     withdrawalModel = new SidechainWithdrawalTableModel(this);
@@ -207,7 +210,7 @@ void SidechainPage::on_pushButtonDeposit_clicked()
     // Successful deposit message box
     messageBox.setWindowTitle("Deposit transaction created!");
     QString result = "Deposited to " + QString::fromStdString(GetSidechainName(nSidechain));
-    result += " Sidechain.\n";
+    result += "\n";
     result += "txid: " + QString::fromStdString(tx->GetHash().ToString());
     result += "\n";
     result += "Amount deposited: ";
@@ -228,6 +231,24 @@ void SidechainPage::on_pushButtonClear_clicked()
     ui->payTo->clear();
 }
 
+void SidechainPage::on_comboBoxSidechains_currentIndexChanged(const int i)
+{
+    if (!IsSidechainNumberValid(i))
+        return;
+
+    ui->listWidgetSidechains->setCurrentRow(i);
+
+    // Update deposit button text
+    QString strSidechain = QString::fromStdString(GetSidechainName(i));
+    QString str = "Deposit to: " + strSidechain;
+    ui->pushButtonDeposit->setText(str);
+}
+
+void SidechainPage::on_listWidgetSidechains_doubleClicked(const QModelIndex& i)
+{
+    ui->comboBoxSidechains->setCurrentIndex(i.row());
+}
+
 bool SidechainPage::validateDepositAmount()
 {
     if (!ui->payAmount->validate()) {

src/qt/sidechainpage.cpp

@@ -5,9 +5,11 @@
 #ifndef SIDECHAINPAGE_H
 #define SIDECHAINPAGE_H
 
+#include <QString>
 #include <QWidget>
 
 #include <amount.h>
+#include <sidechain.h>
 #include <uint256.h>
 
 #include <string>
@@ -22,6 +24,13 @@ namespace Ui {
 class SidechainPage;
 }
 
+// Sidechain icons
+static const std::array<QString, VALID_SIDECHAINS_COUNT> SidechainIcons =
+{{
+    {":/icons/sidechain_one"},
+    {":/icons/sidechain_payments"},
+}};
+
 class SidechainPage : public QWidget
 {
     Q_OBJECT
@@ -43,6 +52,10 @@ public Q_SLOTS:
 
     void on_pushButtonClear_clicked();
 
+    void on_comboBoxSidechains_currentIndexChanged(const int index);
+
+    void on_listWidgetSidechains_doubleClicked(const QModelIndex& index);
+
 private:
     Ui::SidechainPage *ui;
 
@@ -54,6 +67,7 @@ public Q_SLOTS:
     void SetupTables();
 
     bool validateDepositAmount();
+
 };
 
 #endif // SIDECHAINPAGE_H

src/qt/sidechainpage.h

@@ -727,8 +727,8 @@ UniValue createbmmcriticaldatatx(const JSONRPCRequest& request)
     bytes[1] = 0xbf;
     bytes[2] = 0x00;
 
-    bytes << CScriptNum::serialize(nSidechain);
-    bytes << CScriptNum::serialize(nDAG);
+    bytes << CScriptNum(nSidechain);
+    bytes << CScriptNum(nDAG);
 
     CCriticalData criticalData;
     criticalData.bytes = std::vector<unsigned char>(bytes.begin(), bytes.end());
@@ -800,7 +800,7 @@ UniValue listsidechainctip(const JSONRPCRequest& request)
 #endif
 
     // Is nSidechain valid?
-    uint8_t nSidechain = std::stoi(request.params[0].getValStr());
+    uint8_t nSidechain = (unsigned int)request.params[0].get_int();
     if (!IsSidechainNumberValid(nSidechain))
         throw std::runtime_error("Invalid sidechain number");
 

src/rpc/misc.cpp

@@ -23,6 +23,8 @@ std::string Sidechain::GetSidechainName() const
     switch (nSidechain) {
     case SIDECHAIN_ONE:
         return "Sidechain One";
+    case SIDECHAIN_PAYMENT:
+        return "Payment Sidechain";
     default:
         break;
     }
@@ -166,14 +168,10 @@ bool SCDBIndex::GetMember(uint256 hashWT, SidechainWTPrimeState& wt) const
 
 bool IsSidechainNumberValid(uint8_t nSidechain)
 {
-    if (!(nSidechain < ValidSidechains.size()))
-        return false;
-
-    // Check that number corresponds to a valid sidechain
-    switch (nSidechain) {
-    case SIDECHAIN_ONE:
-        return true;
-    default:
-        return false;
+    for (const Sidechain& s : ValidSidechains) {
+        if (s.nSidechain == nSidechain)
+            return true;
     }
+
+    return false;
 }