Skip to content

Commit

Permalink
Released v3.92.15.
Browse files Browse the repository at this point in the history
Added the option to choose between ECDSA, SORA-QAI v1, SORA-QAI v2, and Eth Style when generating a new address.
  • Loading branch information
FromHDDtoSSD committed Aug 10, 2024
1 parent 9358ab5 commit 7555965
Show file tree
Hide file tree
Showing 10 changed files with 135 additions and 29 deletions.
4 changes: 2 additions & 2 deletions SorachanCoinQ-qt.pro
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TEMPLATE = app
VERSION = 3.89.15
VERSION = 3.92.15

INCLUDEPATH += src src/json src/qt
QT += core gui network
Expand All @@ -21,7 +21,7 @@ ONLYTESTNET=0
# 0: with debug console, DEBUG mode
# 1: no debug console, Release mode
#
RELEASE=0
RELEASE=1

#
# GUI_MODE
Expand Down
2 changes: 2 additions & 0 deletions autoclean.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ rm -f missing
rm -f stamp-h1
rm -f compile
rm -f configure
rm -f src/soracoind
rm -f src/soracoin-cli

if [ -f ${srcdir}/src/Makefile.am.sqlite ]; then
if [ -f ${srcdir}/src/Makefile.am ]; then
Expand Down
64 changes: 48 additions & 16 deletions src/qt/editaddressdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,14 @@ EditAddressDialog::EditAddressDialog(Mode mode, QWidget *parent) :
ui->label_2->setVisible(false);
ui->addressEdit->setEnabled(false);
ui->addressEdit->setVisible(false);
ui->qaicheckbutton->setEnabled(true);
ui->qaicheckbutton->setVisible(true);
ui->ethcheckbutton->setEnabled(true);
ui->ethcheckbutton->setVisible(true);
ui->radioButtonECDSA->setEnabled(true);
ui->radioButtonECDSA->setVisible(true);
ui->radioButtonQaiv1->setEnabled(true);
ui->radioButtonQaiv1->setVisible(true);
ui->radioButtonQaiV2->setEnabled(true);
ui->radioButtonQaiV2->setVisible(true);
ui->radioButtonEthStyle->setEnabled(true);
ui->radioButtonEthStyle->setVisible(true);
break;
case NewSendingAddress:
setWindowTitle(tr("New sending address"));
Expand All @@ -52,10 +56,14 @@ EditAddressDialog::EditAddressDialog(Mode mode, QWidget *parent) :
ui->label_2->setVisible(true);
ui->addressEdit->setEnabled(true);
ui->addressEdit->setVisible(true);
ui->qaicheckbutton->setEnabled(false);
ui->qaicheckbutton->setVisible(false);
ui->ethcheckbutton->setEnabled(false);
ui->ethcheckbutton->setVisible(false);
ui->radioButtonECDSA->setEnabled(false);
ui->radioButtonECDSA->setVisible(false);
ui->radioButtonQaiv1->setEnabled(false);
ui->radioButtonQaiv1->setVisible(false);
ui->radioButtonQaiV2->setEnabled(false);
ui->radioButtonQaiV2->setVisible(false);
ui->radioButtonEthStyle->setEnabled(false);
ui->radioButtonEthStyle->setVisible(false);
break;
case EditReceivingAddress:
setWindowTitle(tr("Edit receiving address"));
Expand All @@ -67,10 +75,14 @@ EditAddressDialog::EditAddressDialog(Mode mode, QWidget *parent) :
ui->label_2->setVisible(false);
ui->addressEdit->setEnabled(false);
ui->addressEdit->setVisible(false);
ui->qaicheckbutton->setEnabled(false);
ui->qaicheckbutton->setVisible(false);
ui->ethcheckbutton->setEnabled(false);
ui->ethcheckbutton->setVisible(false);
ui->radioButtonECDSA->setEnabled(false);
ui->radioButtonECDSA->setVisible(false);
ui->radioButtonQaiv1->setEnabled(false);
ui->radioButtonQaiv1->setVisible(false);
ui->radioButtonQaiV2->setEnabled(false);
ui->radioButtonQaiV2->setVisible(false);
ui->radioButtonEthStyle->setEnabled(false);
ui->radioButtonEthStyle->setVisible(false);
break;
case EditSendingAddress:
setWindowTitle(tr("Edit sending address"));
Expand All @@ -82,10 +94,14 @@ EditAddressDialog::EditAddressDialog(Mode mode, QWidget *parent) :
ui->label_2->setVisible(true);
ui->addressEdit->setEnabled(true);
ui->addressEdit->setVisible(true);
ui->qaicheckbutton->setEnabled(false);
ui->qaicheckbutton->setVisible(false);
ui->ethcheckbutton->setEnabled(false);
ui->ethcheckbutton->setVisible(false);
ui->radioButtonECDSA->setEnabled(false);
ui->radioButtonECDSA->setVisible(false);
ui->radioButtonQaiv1->setEnabled(false);
ui->radioButtonQaiv1->setVisible(false);
ui->radioButtonQaiV2->setEnabled(false);
ui->radioButtonQaiV2->setVisible(false);
ui->radioButtonEthStyle->setEnabled(false);
ui->radioButtonEthStyle->setVisible(false);
break;
}

Expand Down Expand Up @@ -125,25 +141,41 @@ bool EditAddressDialog::saveCurrentRow()
return false;
}

/*
if(ui->ethcheckbutton->isChecked() && ui->qaicheckbutton->isChecked()) {
QMessageBox::warning(this, windowTitle(),
tr("It cannot choose both. Please make only one selection."),
QMessageBox::Ok, QMessageBox::Ok);
return false;
}
*/

switch(mode)
{
case NewReceivingAddress:
case NewSendingAddress:
try {
/*
if(ui->ethcheckbutton->isChecked()) {
model->addQai_eth(ui->labelEdit->text());
return true;
} else if(ui->qaicheckbutton->isChecked()) {
model->addQai_v2(ui->labelEdit->text());
return true;
}
*/

if(ui->radioButtonQaiv1->isChecked()) {
model->addQai_v1(ui->labelEdit->text());
return true;
} else if (ui->radioButtonQaiV2->isChecked()) {
model->addQai_v2(ui->labelEdit->text());
return true;
} else if (ui->radioButtonEthStyle->isChecked()) {
model->addQai_eth(ui->labelEdit->text());
return true;
}

} catch (const json_spirit::Object &s) {
QMessageBox::warning(this, windowTitle(),
tr(s.at(1).value_.get_str().c_str()),
Expand Down
29 changes: 23 additions & 6 deletions src/qt/forms/editaddressdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>457</width>
<height>126</height>
<height>195</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -57,17 +57,34 @@ color: rgb(0, 170, 255);</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QRadioButton" name="radioButtonECDSA">
<property name="text">
<string>ECDSA P2PKH (S ...)</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="ethcheckbutton">
<widget class="QRadioButton" name="radioButtonQaiv1">
<property name="text">
<string>Eth Style Address (0x ...)</string>
<string>Quanrum and AI reisitance (sora1 ...)</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="qaicheckbutton">
<item row="5" column="1">
<widget class="QRadioButton" name="radioButtonQaiV2">
<property name="text">
<string>Quantum ans AI resistance / Schnorr agg - sig 5000 keys (sora1 ,,,)</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QRadioButton" name="radioButtonEthStyle">
<property name="text">
<string>Quantum and AI resistance Address (bech32 sora ...)</string>
<string>Eth Style Address (0x ...)</string>
</property>
</widget>
</item>
Expand Down
17 changes: 16 additions & 1 deletion src/qt/locale/bitcoin_cn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Copyright © 2011-2012 The PPCoin Developers
Copyright © 2014 The Peerunity Developers
Copyright © 2014 The EmerCoin Developers
Copyright © 2012-2016 The NovaCoin developers
Copyright © 2017-2019 The SorachanCoin Developers</translation>
Copyright © 2017-2024 The SorachanCoin Developers</translation>
</message>
<message>
<location filename="../forms/aboutdialog.ui" line="114"/>
Expand Down Expand Up @@ -1219,6 +1219,21 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
<source>New receiving address</source>
<translation>新的接收地址</translation>
</message>
<message>
<location filename="../editaddressdialog.cpp" line="+20"/>
<source>Eth Style Address (0x ...)</source>
<translation>以太坊格式地址 (0x ...)</translation>
</message>
<message>
<location filename="../editaddressdialog.cpp" line="+20"/>
<source>Quanrum and AI reisitance (sora1 ...)</source>
<translation>量子AI抗性支持格式地址 (sora1 ...)</translation>
</message>
<message>
<location filename="../editaddressdialog.cpp" line="+20"/>
<source>Quantum ans AI resistance / Schnorr agg - sig 5000 keys (sora1 ,,,)</source>
<translation>量子AI抗性 + Schnorr集约签名 - 支持5000键集约格式地址 (sora1 ...)</translation>
</message>
<message>
<location filename="../editaddressdialog.cpp" line="25"/>
<source>New sending address</source>
Expand Down
17 changes: 16 additions & 1 deletion src/qt/locale/bitcoin_hk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Copyright © 2011-2012 The PPCoin Developers
Copyright © 2014 The Peerunity Developers
Copyright © 2014 The EmerCoin Developers
Copyright © 2012-2016 The NovaCoin developers
Copyright © 2017-2019 The SorachanCoin Developers</translation>
Copyright © 2017-2024 The SorachanCoin Developers</translation>
</message>
<message>
<location filename="../forms/aboutdialog.ui" line="114"/>
Expand Down Expand Up @@ -1209,6 +1209,21 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
<source>&amp;Address</source>
<translation>&amp;地址</translation>
</message>
<message>
<location filename="../editaddressdialog.cpp" line="+20"/>
<source>Eth Style Address (0x ...)</source>
<translation>以太坊格式地址 (0x ...)</translation>
</message>
<message>
<location filename="../editaddressdialog.cpp" line="+20"/>
<source>Quanrum and AI reisitance (sora1 ...)</source>
<translation>量子AI抗性支援格式地址 (sora1 ...)</translation>
</message>
<message>
<location filename="../editaddressdialog.cpp" line="+20"/>
<source>Quantum ans AI resistance / Schnorr agg - sig 5000 keys (sora1 ,,,)</source>
<translation>量子AI抗性 + Schnorr集約簽名 - 支援5000鍵集約格式地址 (sora1 ...)</translation>
</message>
<message>
<location filename="../forms/editaddressdialog.ui" line="52"/>
<source>The address associated with this address book entry. This can only be modified for sending addresses.</source>
Expand Down
17 changes: 16 additions & 1 deletion src/qt/locale/bitcoin_id.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Copyright © 2011-2012 The PPCoin Developers
Copyright © 2014 The Peerunity Developers
Copyright © 2014 The EmerCoin Developers
Copyright © 2012-2016 The NovaCoin developers
Copyright © 2017-2018 The SorachanCoin Developers</source>
Copyright © 2017-2024 The SorachanCoin Developers</source>
<translation>Hak Cipta © 2009-2016 Pengembang Bitcoin Hak Cipta © 2011-2012 Pengembang PPCoin Hak Cipta © 2014 Pengembang Peerunity Hak Cipta © 2014 Pengembang EmerCoin Hak Cipta © 2012-2016 Pengembang NovaCoin Hak Cipta © 2017-2019 Pengembang SorachanCoin</translation>
</message>
<message>
Expand Down Expand Up @@ -1173,6 +1173,21 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
<source>&amp;Address</source>
<translation>&amp;Alamat</translation>
</message>
<message>
<location filename="../editaddressdialog.cpp" line="+20"/>
<source>Eth Style Address (0x ...)</source>
<translation>Alamat format Ethereum (0x ...)</translation>
</message>
<message>
<location filename="../editaddressdialog.cpp" line="+20"/>
<source>Quanrum and AI reisitance (sora1 ...)</source>
<translation>Alamat format dukungan ketahanan AI Kuantum (sora1 ...)</translation>
</message>
<message>
<location filename="../editaddressdialog.cpp" line="+20"/>
<source>Quantum ans AI resistance / Schnorr agg - sig 5000 keys (sora1 ,,,)</source>
<translation>Alamat format dukungan ketahanan AI Kuantum + Schnorr - dukungan agregasi 5000 kunci (sora1 ...)</translation>
</message>
<message>
<location filename="../forms/editaddressdialog.ui" line="52"/>
<source>The address associated with this address book entry. This can only be modified for sending addresses.</source>
Expand Down
10 changes: 10 additions & 0 deletions src/qt/locale/bitcoin_ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1057,6 +1057,16 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
<source>Eth Style Address (0x ...)</source>
<translation>イーサリアム形式のアドレス (0x ...)</translation>
</message>
<message>
<location filename="../editaddressdialog.cpp" line="+20"/>
<source>Quanrum and AI reisitance (sora1 ...)</source>
<translation>量子AI耐性サポート形式のアドレス (sora1 ...)</translation>
</message>
<message>
<location filename="../editaddressdialog.cpp" line="+20"/>
<source>Quantum ans AI resistance / Schnorr agg - sig 5000 keys (sora1 ,,,)</source>
<translation>量子AI耐性 + Schnorr集約署名 - 5000鍵集約サポート形式のアドレス (sora1 ...)</translation>
</message>
<message>
<location line="+4"/>
<source>New sending address</source>
Expand Down
2 changes: 1 addition & 1 deletion src/version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
#define GIT_ARCHIVE 1
#ifdef GIT_ARCHIVE
# define GIT_COMMIT_ID "----"
# define GIT_COMMIT_DATE "Jul-2024"
# define GIT_COMMIT_DATE "Aug-2024"
#endif

#define BUILD_DESC_FROM_COMMIT(maj,min,rev,build,commit) \
Expand Down
2 changes: 1 addition & 1 deletion src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class format_version : private no_instance

// display version
#define DISPLAY_VERSION_MAJOR 3
#define DISPLAY_VERSION_MINOR 89
#define DISPLAY_VERSION_MINOR 92
#define DISPLAY_VERSION_REVISION 15

#endif

0 comments on commit 7555965

Please sign in to comment.