Released v3.84.14.

Implemented a button to send the transaction fee (10 SORA) to the ECDSA side for SORA-QAI encryption.
FromHDDtoSSD · Jul 25, 2024 · 07caf55 · 07caf55
1 parent dcac5b8
commit 07caf55
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 27 deletions.
diff --git a/SorachanCoinQ-qt.pro b/SorachanCoinQ-qt.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-VERSION = 3.83.14
+VERSION = 3.84.14
 
 INCLUDEPATH += src src/json src/qt
 QT += core gui network

diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
@@ -179,23 +179,33 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Require a confirmations for change (default:
 QT_TRANSLATE_NOOP("bitcoin-core", "Enforce transaction scripts to use canonical PUSH operators (default: 1)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Set the number of script verification threads (1-16, 0=auto, default: 0)"),
 QT_TRANSLATE_NOOP("bitcoin-core", "When creating transactions, ignore inputs with value less than this (default: %s)"),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Blockchain can't acquire the exact balance until the sync is complete.\n"
-"Therefore, please wait for a while until the synchronization is completed."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Is it okay to record the ciphered message on the blockchain?"),
-QT_TRANSLATE_NOOP("bitcoin-core", "The recipient's public cipher address is empty."),
-QT_TRANSLATE_NOOP("bitcoin-core",
-"The process of recording to the blockchain has started. "
-"Please keep your wallet open and wait for a while until the process is completed. "
-"SORA will notify you once the recording to the blockchain is finished."),
-QT_TRANSLATE_NOOP("bitcoin-core", "An error occurred during the initiation of the recording process."),
-QT_TRANSLATE_NOOP("bitcoin-core",
-"If the number of processes is large, "
-"the Schnorr aggregated signature process will take a considerable amount of time. "
-"Please wait patiently until the process is completed. "
-"SORA will notify you once it is finished."),
-QT_TRANSLATE_NOOP("bitcoin-core", "A fee of %.2f will be charged. Do you wish to proceed?"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Is it okay to send a small amount of SORA from QAI to ECDSA to cover the fee?"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Completed successfully."),
-QT_TRANSLATE_NOOP("bitcoin-core", "The process has failed."),
+//QT_TRANSLATE_NOOP("bitcoin-core", ""
+//"Blockchain can't acquire the exact balance until the sync is complete.\n"
+//"Therefore, please wait for a while until the synchronization is completed."),
+//QT_TRANSLATE_NOOP("bitcoin-core", "Is it okay to record the ciphered message on the blockchain?"),
+//QT_TRANSLATE_NOOP("bitcoin-core", "The recipient's public cipher address is empty."),
+//QT_TRANSLATE_NOOP("bitcoin-core",
+//"The process of recording to the blockchain has started. "
+//"Please keep your wallet open and wait for a while until the process is completed. "
+//"SORA will notify you once the recording to the blockchain is finished."),
+//QT_TRANSLATE_NOOP("bitcoin-core", "An error occurred during the initiation of the recording process."),
+//QT_TRANSLATE_NOOP("bitcoin-core",
+//"If the number of processes is large, "
+//"the Schnorr aggregated signature process will take a considerable amount of time. "
+//"Please wait patiently until the process is completed. "
+//"SORA will notify you once it is finished."),
+QT_TRANSLATE_NOOP("bitcoin-core", "A fee of %.2f SORA will be charged. Do you wish to proceed?"),
+//QT_TRANSLATE_NOOP("bitcoin-core", "Is it okay to send a small amount of SORA from QAI to ECDSA to cover the fee?"),
+//QT_TRANSLATE_NOOP("bitcoin-core", "Completed successfully."),
+//QT_TRANSLATE_NOOP("bitcoin-core", "The process has failed."),
+QT_TRANSLATE_NOOP("bitcoin-core", "Failed to read from CDataStream."),
+QT_TRANSLATE_NOOP("bitcoin-core", "The HD Wallet disable."),
+QT_TRANSLATE_NOOP("bitcoin-core", "The Wallet is locked."),
+QT_TRANSLATE_NOOP("bitcoin-core", "SORA L1 network fee is insufficient. Please charge the fee to the ECDSA total side."),
+QT_TRANSLATE_NOOP("bitcoin-core", "Failed to create transaction."),
+QT_TRANSLATE_NOOP("bitcoin-core", "Failed to commit transaction."),
+QT_TRANSLATE_NOOP("bitcoin-core", "Failed to wait for transaction."),
+QT_TRANSLATE_NOOP("bitcoin-core", "Failed to get the transaction."),
+QT_TRANSLATE_NOOP("bitcoin-core", "Detected an anomaly in the public key."),
+QT_TRANSLATE_NOOP("bitcoin-core", "Successfully verified the ciphered message transaction."),
 };
diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts
@@ -1900,6 +1900,16 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
         <source>Send Coins</source>
         <translation>コインを送ります</translation>
     </message>
+    <message>
+        <location line="+77"/>
+        <source>QaiToEcdsa</source>
+        <translation>ECDSAに少量送る</translation>
+    </message>
+    <message>
+        <location line="+77"/>
+        <source>All balances send to Quantum and AI resistance amount</source>
+        <translation>全ての残高を量子AI耐性 + Schnorr集約署名(5000鍵)に送ります</translation>
+    </message>
     <message>
         <location line="+76"/>
         <source>Coin Control Features</source>
@@ -2029,6 +2039,21 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
         <source>S&amp;end</source>
         <translation>送る (&amp;e)</translation>
     </message>
+    <message>
+        <location line="+3"/>
+        <source>Is it okay to send a small amount of SORA from QAI to ECDSA to cover the fee?</source>
+        <translation>ECDSA側に手数料用途としての少量のSORAを移動します。よろしいでしょうか？</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Completed successfully.</source>
+        <translation>正常に完了いたしました。</translation>
+    </message>
+     <message>
+        <location line="+3"/>
+        <source>The process has failed.</source>
+        <translation>処理に失敗いたしました。</translation>
+    </message>
     <message>
         <location filename="../sendcoinsdialog.cpp" line="-173"/>
         <source>Enter a SorachanCoin address (e.g. SUEgQX5BMKamE3eZYJD7wGfV1T3EuytBak)</source>
@@ -3600,6 +3625,61 @@ rpcpassword=%s
         <source>Error</source>
         <translation>エラー</translation>
     </message>
+    <message>
+        <location line="+3"/>
+        <source>A fee of %.2f SORA will be charged. Do you wish to proceed?</source>
+        <translation>ネットワーク手数料として %.2f SORA かかります。処理を進めてもよろしいでしょうか？</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Failed to read from CDataStream.</source>
+        <translation>CDataStreamからの読み出しに失敗しました。</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The HD Wallet disable.</source>
+        <translation>HDウォレットが無効です。</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The Wallet is locked.</source>
+        <translation>ウォレットがロックされています。</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>SORA L1 network fee is insufficient. Please charge the fee to the ECDSA total side.</source>
+        <translation>ネットワーク手数料が不足しています。ECDSA側に手数料分の残高を置いてください。</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Failed to create transaction.</source>
+        <translation>トランザクションの生成に失敗しました。</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Failed to commit transaction.</source>
+        <translation>トランザクションのコミットに失敗いたしました。</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Failed to wait for transaction.</source>
+        <translation>トランザクションの待機に失敗いたしました。</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Failed to get the transaction.</source>
+        <translation>トランザクションの取得に失敗いたしました。</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Detected an anomaly in the public key.</source>
+        <translation>公開鍵の導き出しに失敗いたしました。</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Successfully verified the ciphered message transaction.</source>
+        <translation>暗号メッセージのトランザクションに成功しました。</translation>
+    </message>
     <message>
         <location line="+6"/>
         <source>You must set rpcpassword=&lt;password&gt; in the configuration file:

diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
@@ -134,18 +134,18 @@ SendCoinsDialog::~SendCoinsDialog()
 }
 
 void SendCoinsDialog::on_qaitoecdsa_clicked() {
-    if(QMB(QMB::M_QUESTION).setText(_("Is it okay to send a small amount of SORA from QAI to ECDSA to cover the fee?"), _("")).ask()) {
+    if(QMB(QMB::M_QUESTION).setText(tr("Is it okay to send a small amount of SORA from QAI to ECDSA to cover the fee?").toStdString(), tr("").toStdString()).ask()) {
         AddressTableModel *address_model = model->getAddressTableModel();
         bool mintflag;
         if(!address_model->addQai_v3(mintflag)) {
-            QMB(QMB::M_ERROR).setText(_("Failed to the wallet unlocking."), _("")).exec();
+            QMB(QMB::M_ERROR).setText(tr("Failed to the wallet unlocking.").toStdString(), tr("").toStdString()).exec();
             return;
         }
 
         if(ai_ecdsa::qai_to_ecdsa_move_tx())
-            QMB(QMB::M_INFO).setText(_("Completed successfully."), _("")).exec();
+            QMB(QMB::M_INFO).setText(tr("Completed successfully.").toStdString(), tr("").toStdString()).exec();
         else
-            QMB(QMB::M_ERROR).setText(_("The process has failed."), _("")).exec();
+            QMB(QMB::M_ERROR).setText(tr("The process has failed.").toStdString(), tr("").toStdString()).exec();
 
         address_model->addQai_v3_wallet_tolock(mintflag);
     }

diff --git a/src/sorara/aitx.cpp b/src/sorara/aitx.cpp
@@ -420,7 +420,7 @@ void wait_for_confirm_transaction(std::shared_ptr<CDataStream> stream) {
         } while(true);
     }
 
-    fMessage ? QMB(QMB::M_INFO).setText(_("Successfully verified the encrypted message transaction.")).exec(): 0;
+    fMessage ? QMB(QMB::M_INFO).setText(_("Successfully verified the ciphered message transaction.")).exec(): 0;
     call_raise();
     if(fWalletlock) walletLock(fMintonly);
 }
@@ -857,7 +857,7 @@ bool qai_to_ecdsa_move_tx() {
     if(!entry::pwalletMain->CreateTransaction(scriptPubKey, nAmount, wtx, reservekey, nFeeRequired, &coinControl)) {
         return false;
     }
-    std::string message = tinyformat::format(_("A fee of %.2f will be charged. Do you wish to proceed?"), (double)nFeeRequired / util::COIN);
+    std::string message = tinyformat::format(_("A fee of %.2f SORA will be charged. Do you wish to proceed?"), (double)nFeeRequired / util::COIN);
     if(QMB(QMB::M_QUESTION).setText(message, _("")).ask()) {
         if(!entry::pwalletMain->CommitTransaction(wtx, reservekey)) {
             return false;

diff --git a/src/version.h b/src/version.h
@@ -84,7 +84,7 @@ class format_version : private no_instance
 
 // display version
 #define DISPLAY_VERSION_MAJOR        3
-#define DISPLAY_VERSION_MINOR        83
+#define DISPLAY_VERSION_MINOR        84
 #define DISPLAY_VERSION_REVISION     14
 
 #endif