Merge pull request #436 from RavenProject/release_2.1.3

Release 2.1.3
RavenProject · Nov 12, 2018 · e97c00b · e97c00b
2 parents bf3e949 + 6ce3207
commit e97c00b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 12 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
 define(_CLIENT_VERSION_MINOR, 1)
-define(_CLIENT_VERSION_REVISION, 2)
+define(_CLIENT_VERSION_REVISION, 3)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)

diff --git a/src/qt/createassetdialog.cpp b/src/qt/createassetdialog.cpp
@@ -137,7 +137,10 @@ void CreateAssetDialog::setModel(WalletModel *_model)
         // Coin Control
         connect(_model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(coinControlUpdateLabels()));
         connect(_model->getOptionsModel(), SIGNAL(coinControlFeaturesChanged(bool)), this, SLOT(coinControlFeatureChanged(bool)));
-        ui->frameCoinControl->setVisible(_model->getOptionsModel()->getCoinControlFeatures());
+        bool fCoinControlEnabled = _model->getOptionsModel()->getCoinControlFeatures();
+        ui->frameCoinControl->setVisible(fCoinControlEnabled);
+        ui->addressText->setVisible(fCoinControlEnabled);
+        ui->addressLabel->setVisible(fCoinControlEnabled);
         coinControlUpdateLabels();
 
         // Custom Fee Control
@@ -193,7 +196,7 @@ CreateAssetDialog::~CreateAssetDialog()
 /** Helper Methods */
 void CreateAssetDialog::setUpValues()
 {
-    ui->unitBox->setValue(8);
+    ui->unitBox->setValue(0);
     ui->reissuableBox->setCheckState(Qt::CheckState::Checked);
     ui->ipfsText->hide();
     ui->availabilityButton->setDisabled(true);
@@ -811,6 +814,8 @@ void CreateAssetDialog::coinControlClipboardChange()
 void CreateAssetDialog::coinControlFeatureChanged(bool checked)
 {
     ui->frameCoinControl->setVisible(checked);
+    ui->addressText->setVisible(checked);
+    ui->addressLabel->setVisible(checked);
 
     if (!checked && model) // coin control features disabled
         CoinControlDialog::coinControl->SetNull();
@@ -1003,5 +1008,5 @@ void CreateAssetDialog::clearSelected()
     ui->unitBox->setDisabled(false);
     ui->quantitySpinBox->setDisabled(false);
     ui->reissuableBox->setChecked(true);
-    ui->unitBox->setValue(8);
+    ui->unitBox->setValue(0);
 }
diff --git a/src/qt/forms/createassetdialog.ui b/src/qt/forms/createassetdialog.ui
@@ -745,7 +745,7 @@
           <item>
            <widget class="QLabel" name="unitExampleLabel">
             <property name="text">
-             <string>e.g. 1.00000000</string>
+             <string>e.g. 1</string>
             </property>
            </widget>
           </item>
@@ -1375,15 +1375,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>RavenAmountField</class>
+   <class>QValidatedLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>ravenamountfield.h</header>
-   <container>1</container>
+   <header>qvalidatedlineedit.h</header>
   </customwidget>
   <customwidget>
-   <class>QValidatedLineEdit</class>
+   <class>RavenAmountField</class>
    <extends>QLineEdit</extends>
-   <header>qvalidatedlineedit.h</header>
+   <header>ravenamountfield.h</header>
+   <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>

diff --git a/src/qt/reissueassetdialog.cpp b/src/qt/reissueassetdialog.cpp
@@ -141,7 +141,10 @@ void ReissueAssetDialog::setModel(WalletModel *_model)
         // Coin Control
         connect(_model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(coinControlUpdateLabels()));
         connect(_model->getOptionsModel(), SIGNAL(coinControlFeaturesChanged(bool)), this, SLOT(coinControlFeatureChanged(bool)));
-        ui->frameCoinControl->setVisible(_model->getOptionsModel()->getCoinControlFeatures());
+        bool fCoinControlEnabled = _model->getOptionsModel()->getCoinControlFeatures();
+        ui->frameCoinControl->setVisible(fCoinControlEnabled);
+        ui->addressText->setVisible(fCoinControlEnabled);
+        ui->addressLabel->setVisible(fCoinControlEnabled);
         coinControlUpdateLabels();
 
         // Custom Fee Control
@@ -798,6 +801,8 @@ void ReissueAssetDialog::coinControlClipboardChange()
 void ReissueAssetDialog::coinControlFeatureChanged(bool checked)
 {
     ui->frameCoinControl->setVisible(checked);
+    ui->addressText->setVisible(checked);
+    ui->addressLabel->setVisible(checked);
 
     if (!checked && model) // coin control features disabled
         CoinControlDialog::coinControl->SetNull();

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3465,9 +3465,12 @@ bool CWallet::CreateTransactionAll(const std::vector<CRecipient>& vecSend, CWall
                 }
                 /** RVN END */
 
+                // Add the new asset inputs into the tempSet so the dummysigntx will add the correct amount of sigsß
+                std::set<CInputCoin> tempSet = setCoins;
+                tempSet.insert(setAssets.begin(), setAssets.end());
 
                 // Fill in dummy signatures for fee calculation.
-                if (!DummySignTx(txNew, setCoins)) {
+                if (!DummySignTx(txNew, tempSet)) {
                     strFailReason = _("Signing transaction for fee calculation failed");
                     return false;
                 }