Merge pull request #235 from BlockMechanic/segwit

More/Less
Crowndev · Nov 29, 2022 · a06d67d · a06d67d
2 parents ed47362 + 484d855
commit a06d67d
Show file tree

Hide file tree

Showing 12 changed files with 276 additions and 81 deletions.
diff --git a/src/qt/assetmanagerpage.cpp b/src/qt/assetmanagerpage.cpp
@@ -41,10 +41,16 @@ void AssetManagerPage::setWalletModel(WalletModel *_walletModel, ClientModel *_c
 
     contractFilter = new ContractFilterProxy(this);
     contractFilter->setSourceModel(walletModel->getContractTableModel());
-    contractFilter->setSortRole(ContractTableModel::NameRole);
    	contractFilter->setOnlyMine(false);
+    contractFilter->setSortRole(ContractTableModel::NameRole);
     contractFilter->sort(ContractTableModel::Name, Qt::AscendingOrder);
 
+	mycontractFilter = new ContractFilterProxy(this);
+	mycontractFilter->setSourceModel(walletModel->getContractTableModel());
+	mycontractFilter->setOnlyMine(true);
+    mycontractFilter->setSortRole(ContractTableModel::NameRole);
+    mycontractFilter->sort(ContractTableModel::Name, Qt::AscendingOrder);
+
     assetFilter = new AssetFilterProxy(this);
     assetFilter->setSourceModel(walletModel->getAssetTableModel());
     assetFilter->setDynamicSortFilter(true);
@@ -114,7 +120,7 @@ void AssetManagerPage::on_CreateNewAsset_clicked()
     NewAssetPage dialog(this);
     dialog.setWindowModality(Qt::ApplicationModal);
     dialog.setWindowTitle("Create a New Asset");
-    dialog.setWalletModel(walletModel);
+    dialog.setWalletModel(walletModel, mycontractFilter);
     if(dialog.exec())
         update();
 }

diff --git a/src/qt/assetmanagerpage.h b/src/qt/assetmanagerpage.h
@@ -38,6 +38,7 @@ class AssetManagerPage : public QWidget
     AssetFilterProxy *assetFilter = nullptr;
     ContractFilterProxy *contractFilter = nullptr;
     CoinControlFilterProxy *coincontrolfilter = nullptr;
+    ContractFilterProxy *mycontractFilter = nullptr;
 
     void updateAssetList();
     void updateContractList();

diff --git a/src/qt/assettablemodel.cpp b/src/qt/assettablemodel.cpp
@@ -8,6 +8,9 @@
 #include <interfaces/node.h>
 #include <qt/clientmodel.h>
 
+#include <masternode/masternode-sync.h>
+#include <systemnode/systemnode-sync.h>
+
 #include <key_io.h>
 #include <qt/guiconstants.h>
 #include <qt/guiutil.h>
@@ -256,6 +259,11 @@ void AssetTableModel::update()
 {
     if (walletModel->getClientModel()->node().isInitialBlockDownload())
         return;
+
+    if (!masternodeSync.IsSynced() || !systemnodeSync.IsSynced()) {
+        return;
+    }
+
     Q_EMIT layoutAboutToBeChanged();
     beginResetModel();
     endResetModel();

diff --git a/src/qt/contracttablemodel.cpp b/src/qt/contracttablemodel.cpp
@@ -8,6 +8,9 @@
 #include <interfaces/node.h>
 #include <qt/clientmodel.h>
 
+#include <masternode/masternode-sync.h>
+#include <systemnode/systemnode-sync.h>
+
 #include <key_io.h>
 #include <outputtype.h>
 #include <qt/guiconstants.h>
@@ -223,10 +226,15 @@ void ContractTableModel::update()
 {
     if (walletModel->getClientModel()->node().isInitialBlockDownload())
         return;
-    Q_EMIT layoutAboutToBeChanged();
-    beginResetModel();
-    endResetModel();
+
+    if (!masternodeSync.IsSynced() || !systemnodeSync.IsSynced()) {
+        return;
+    }
+
+//    Q_EMIT layoutAboutToBeChanged();
+//    beginResetModel();
+//    endResetModel();
     priv->refreshWallet();
     Q_EMIT dataChanged(index(0, 0, QModelIndex()), index(priv->size(), columns.length()-1, QModelIndex()));
-    Q_EMIT layoutChanged();
+//    Q_EMIT layoutChanged();
 }
diff --git a/src/qt/forms/assetmanagerpage.ui b/src/qt/forms/assetmanagerpage.ui
@@ -17,7 +17,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -163,6 +163,9 @@
            </item>
            <item>
             <widget class="QPushButton" name="CreateNewContract">
+             <property name="toolTip">
+              <string extracomment="Create a new Contract"/>
+             </property>
              <property name="text">
               <string>New Contract</string>
              </property>

diff --git a/src/qt/forms/newassetpage.ui b/src/qt/forms/newassetpage.ui
@@ -21,10 +21,23 @@
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout">
          <item>
-          <widget class="QComboBox" name="contractcomboBox"/>
+          <widget class="QComboBox" name="contractcomboBox">
+           <property name="toolTip">
+            <string/>
+           </property>
+           <property name="currentText">
+            <string/>
+           </property>
+           <property name="placeholderText">
+            <string>Select Contract</string>
+           </property>
+          </widget>
          </item>
          <item>
           <widget class="QComboBox" name="typecomboBox">
+           <property name="toolTip">
+            <string/>
+           </property>
            <property name="layoutDirection">
             <enum>Qt::LeftToRight</enum>
            </property>
@@ -60,6 +73,9 @@
          </item>
          <item>
           <widget class="QDateTimeEdit" name="expiry">
+           <property name="toolTip">
+            <string/>
+           </property>
            <property name="alignment">
             <set>Qt::AlignCenter</set>
            </property>
@@ -74,6 +90,9 @@
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <item>
           <widget class="QLineEdit" name="inputAmount">
+           <property name="toolTip">
+            <string/>
+           </property>
            <property name="alignment">
             <set>Qt::AlignCenter</set>
            </property>
@@ -84,6 +103,9 @@
          </item>
          <item>
           <widget class="QLineEdit" name="outputAmount">
+           <property name="toolTip">
+            <string/>
+           </property>
            <property name="alignment">
             <set>Qt::AlignCenter</set>
            </property>
@@ -98,34 +120,49 @@
         <layout class="QHBoxLayout" name="horizontalLayout_4">
          <item>
           <widget class="QCheckBox" name="convertcheckBox">
+           <property name="toolTip">
+            <string/>
+           </property>
            <property name="text">
             <string>Convertable</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QCheckBox" name="transfercheckBox">
+           <property name="toolTip">
+            <string/>
+           </property>
            <property name="text">
             <string>Transferable</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QCheckBox" name="restrictedcheckBox">
+           <property name="toolTip">
+            <string/>
+           </property>
            <property name="text">
             <string>Restricted</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QCheckBox" name="limitedcheckBox">
+           <property name="toolTip">
+            <string/>
+           </property>
            <property name="text">
             <string>Limited</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QCheckBox" name="divisiblecheckBox">
+           <property name="toolTip">
+            <string/>
+           </property>
            <property name="text">
             <string>Divisible</string>
            </property>
@@ -165,6 +202,9 @@
        </item>
        <item>
         <widget class="QPushButton" name="Create">
+         <property name="toolTip">
+          <string extracomment="Create the Asset"/>
+         </property>
          <property name="text">
           <string>Create</string>
          </property>

diff --git a/src/qt/forms/newcontractpage.ui b/src/qt/forms/newcontractpage.ui
@@ -38,6 +38,9 @@
         <layout class="QHBoxLayout" name="horizontalLayout">
          <item>
           <widget class="QLineEdit" name="contractName">
+           <property name="toolTip">
+            <string extracomment="Name of contract"/>
+           </property>
            <property name="text">
             <string/>
            </property>
@@ -51,6 +54,9 @@
          </item>
          <item>
           <widget class="QLineEdit" name="contractSymbol">
+           <property name="toolTip">
+            <string extracomment="Symbol for contract"/>
+           </property>
            <property name="alignment">
             <set>Qt::AlignCenter</set>
            </property>
@@ -65,6 +71,9 @@
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
           <widget class="QLineEdit" name="websiteURL">
+           <property name="toolTip">
+            <string extracomment="website"/>
+           </property>
            <property name="alignment">
             <set>Qt::AlignCenter</set>
            </property>
@@ -75,6 +84,9 @@
          </item>
          <item>
           <widget class="QLineEdit" name="contractURL">
+           <property name="toolTip">
+            <string extracomment="contract URL"/>
+           </property>
            <property name="alignment">
             <set>Qt::AlignCenter</set>
            </property>
@@ -91,13 +103,19 @@
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
         <widget class="QTextEdit" name="contractScript">
+         <property name="toolTip">
+          <string extracomment="Script code for contract"/>
+         </property>
          <property name="placeholderText">
           <string>Enter Contract Script</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QTextEdit" name="contractDescription">
+         <property name="toolTip">
+          <string extracomment="Contract Description"/>
+         </property>
          <property name="placeholderText">
           <string>Enter Contract Description</string>
          </property>