Skip to content

Release 2.1.3 #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blondfrogs merged 4 commits into from
Nov 12, 2018
Merged

Release 2.1.3 #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31b15ca
Fix min relay fee
Nov 6, 2018
3dcc766
Update version from 2.1.2 -> 2.1.3
Nov 6, 2018
8f749ae
Make units default to 0 on create asset in the GUI
Nov 6, 2018
6ce3207
Hide destination address for asset creation, unless coincontrol is ac…
Nov 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
11 changes: 8 additions & 3 deletions src/qt/createassetdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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);
}
12 changes: 6 additions & 6 deletions src/qt/forms/createassetdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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/>
Expand Down
7 changes: 6 additions & 1 deletion src/qt/reissueassetdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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();
Expand Down
5 changes: 4 additions & 1 deletion src/wallet/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down