From 31b15ca6b5898973b195c951b793b5aa874a9a60 Mon Sep 17 00:00:00 2001 From: blondfrogs Date: Tue, 6 Nov 2018 13:27:02 -0700 Subject: [PATCH 1/4] Fix min relay fee --- src/wallet/wallet.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index dae010f69b..43d748ebe5 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3465,9 +3465,12 @@ bool CWallet::CreateTransactionAll(const std::vector& vecSend, CWall } /** RVN END */ + // Add the new asset inputs into the tempSet so the dummysigntx will add the correct amount of sigsß + std::set 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; } From 3dcc7660267f5e396ee2cda1ac6f2b6abaef583b Mon Sep 17 00:00:00 2001 From: blondfrogs Date: Tue, 6 Nov 2018 13:40:47 -0700 Subject: [PATCH 2/4] Update version from 2.1.2 -> 2.1.3 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ea66ada238..bd10d8859c 100644 --- 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) From 8f749ae51b9e5a41ad00f49dc72438f25449fc8c Mon Sep 17 00:00:00 2001 From: blondfrogs Date: Tue, 6 Nov 2018 14:00:04 -0700 Subject: [PATCH 3/4] Make units default to 0 on create asset in the GUI --- src/qt/createassetdialog.cpp | 4 ++-- src/qt/forms/createassetdialog.ui | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qt/createassetdialog.cpp b/src/qt/createassetdialog.cpp index 4e6c36f29d..c3824bf9bf 100644 --- a/src/qt/createassetdialog.cpp +++ b/src/qt/createassetdialog.cpp @@ -193,7 +193,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); @@ -1003,5 +1003,5 @@ void CreateAssetDialog::clearSelected() ui->unitBox->setDisabled(false); ui->quantitySpinBox->setDisabled(false); ui->reissuableBox->setChecked(true); - ui->unitBox->setValue(8); + ui->unitBox->setValue(0); } \ No newline at end of file diff --git a/src/qt/forms/createassetdialog.ui b/src/qt/forms/createassetdialog.ui index f18bd267a0..4626955fd0 100644 --- a/src/qt/forms/createassetdialog.ui +++ b/src/qt/forms/createassetdialog.ui @@ -745,7 +745,7 @@ - e.g. 1.00000000 + e.g. 1 @@ -1375,15 +1375,15 @@ - RavenAmountField + QValidatedLineEdit QLineEdit -
ravenamountfield.h
- 1 +
qvalidatedlineedit.h
 - QValidatedLineEdit + RavenAmountField QLineEdit -
qvalidatedlineedit.h
+
ravenamountfield.h
+ 1 From 6ce320701e5d13e098c33f8072a529af7dd877e5 Mon Sep 17 00:00:00 2001 From: blondfrogs Date: Wed, 7 Nov 2018 15:15:32 -0700 Subject: [PATCH 4/4] Hide destination address for asset creation, unless coincontrol is active --- src/qt/createassetdialog.cpp | 7 ++++++- src/qt/reissueassetdialog.cpp | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/qt/createassetdialog.cpp b/src/qt/createassetdialog.cpp index c3824bf9bf..a57bd875dd 100644 --- 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 @@ -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(); diff --git a/src/qt/reissueassetdialog.cpp b/src/qt/reissueassetdialog.cpp index 95f2f2d1c6..02478da84a 100644 --- 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();