changelog, version bump, scala oa url

scala-network · Sep 3, 2023 · ac96da9 · ac96da9
1 parent 05b5b50
commit ac96da9
Show file tree

Hide file tree

Showing 54 changed files with 127 additions and 131 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,5 @@
-The much awaited V8 iteration of Scala. This release has the following changes:
+A point release for V8, this release has the following changes:
 
-* Diardi V2: Allowing elected members of the community to participate in consensus and help protect the network
-    * Separate [proof-of-work](https://github.com/scala-network/felidae) for Diardi miners
-* Better emission curve with eroding block rewards
-* Upstream merge to XMR version v0.18.2.2 "Fluorine Fermi"
-    * New CLSAG transaction format
-    * View tags for faster wallet scans
-    * A lot of bug fixes and more
+* Fixes for wallet fee and open alias issues
+* Added checkpoints for testnet
+* Some other minor bug fixes
diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp
@@ -396,8 +396,8 @@ namespace dns_utils {
 //-----------------------------------------------------------------------
 // TODO: parse the string in a less stupid way, probably with regex
 std::string address_from_txt_record(const std::string &s) {
-  // make sure the txt record has "oa1:xmr" and find it
-  auto pos = s.find("oa1:xmr");
+  // make sure the txt record has "oa1:xla" and find it
+  auto pos = s.find("oa1:xla");
   if (pos == std::string::npos)
     return {};
   // search from there to find "recipient_address="
@@ -409,12 +409,12 @@ std::string address_from_txt_record(const std::string &s) {
   auto pos2 = s.find(";", pos);
   if (pos2 != std::string::npos) {
     // length of address == 95, we can at least validate that much here
-    if (pos2 - pos == 95) {
-      return s.substr(pos, 95);
+    if (pos2 - pos == 97) {
+      return s.substr(pos, 97);
     } else if (pos2 - pos ==
-               106) // length of address == 106 --> integrated address
+               109) // length of address == 106 --> integrated address
     {
-      return s.substr(pos, 106);
+      return s.substr(pos, 109);
     }
   }
   return {};
@@ -481,7 +481,7 @@ std::string get_account_address_as_str_from_url(
     // attempt to get address from dns query
     auto addresses = addresses_from_url(url, dnssec_valid);
     if (addresses.empty()) {
-      LOG_ERROR("wrong address: " << url);
+      LOG_ERROR("wrong address for UD: " << url);
       return {};
     }
     return dns_confirm(url, addresses, dnssec_valid);

diff --git a/src/common/dns_utils.h b/src/common/dns_utils.h
@@ -133,7 +133,7 @@ class DNSResolver {
    * @brief Gets a DNS address from OpenAlias format
    *
    * If the address looks good, but contains one @ symbol, replace that with a .
-   * e.g. donate@getscala.org becomes donate.getscala.org
+   * e.g. donate@scalaproject.io becomes donate.scalaproject.io
    *
    * @param oa_addr  OpenAlias address
    *

diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
@@ -3079,8 +3079,7 @@ simple_wallet::simple_wallet()
   m_cmd_binder.set_handler(
       "donate",
       boost::bind(&simple_wallet::on_command, this, &simple_wallet::donate, _1),
-      tr(USAGE_DONATE),
-      tr("Donate <amount> to the development team (donate.getscala.org)."));
+      tr(USAGE_DONATE), tr("Donate <amount> to the Scala team."));
   m_cmd_binder.set_handler(
       "sign_transfer",
       boost::bind(&simple_wallet::on_command, this,
@@ -7750,7 +7749,7 @@ bool simple_wallet::donate(const std::vector<std::string> &args_) {
     local_args.push_back(payment_id_str);
   if (m_wallet->nettype() == cryptonote::MAINNET)
     message_writer() << (boost::format(tr("Donating %s %s to The scala Project "
-                                          "(donate.getscala.org or %s).")) %
+                                          "(donate.scalaproject.io or %s).")) %
                          amount_str %
                          cryptonote::get_unit(
                              cryptonote::get_default_decimal_point()) %

diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h
@@ -59,10 +59,11 @@
 
 #undef scala_DEFAULT_LOG_CATEGORY
 #define scala_DEFAULT_LOG_CATEGORY "wallet.simplewallet"
-// Hardcode scala's donation address (see #1447)
+// Hardcode scala's donation address
 constexpr const char scala_DONATION_ADDR[] =
-    "888tNkZrPN6JsEgekjMnABU4TBzc2Dt29EPAvkRxbANsAnjyPbb3iQ1YBRk1UXcdRsiKc9dhwM"
-    "VgN5S9cQUiyoogDavup3H";
+    "SvkzckfVpUSWuSG4VS4WCL9KMTh39krgk6SLwVGLkZufh83ET8JjZ3yidaoURyHgLFDhFZEPPY"
+    "12cHqYyS"
+    "VoV2x62XvMtJii5";
 
 /*!
  * \namespace cryptonote

diff --git a/src/version.cpp.in b/src/version.cpp.in
@@ -1,5 +1,5 @@
 #define DEF_scala_VERSION_TAG "@VERSIONTAG@"
-#define DEF_scala_VERSION "8.0.0"
+#define DEF_scala_VERSION "8.0.1"
 #define DEF_scala_RELEASE_NAME "Menger"
 #define DEF_scala_VERSION_FULL DEF_scala_VERSION "-" DEF_scala_VERSION_TAG
 #define DEF_scala_VERSION_IS_RELEASE @VERSION_IS_RELEASE@

diff --git a/tests/unit_tests/address_from_url.cpp b/tests/unit_tests/address_from_url.cpp
@@ -38,9 +38,9 @@
 
 TEST(AddressFromTXT, Success)
 {
-  std::string addr = "46BeWrHpwXmHDpDEUmZBWZfoQpdc6HaERCNmx1pEYL2rAcuwufPN9rXHHtyUA4QVy66qeFQkn6sfK8aHYjA3jk3o1Bv16em";
+  std::string addr = "SvkzckfVpUSWuSG4VS4WCL9KMTh39krgk6SLwVGLkZufh83ET8JjZ3yidaoURyHgLFDhFZEPPY12cHqYySVoV2x62XvMtJii5";
 
-  std::string txtr = "oa1:xmr";
+  std::string txtr = "oa1:xla";
   txtr += " recipient_address=";
   txtr += addr;
   txtr += ";";
@@ -59,7 +59,7 @@ TEST(AddressFromTXT, Success)
 
   EXPECT_STREQ(addr.c_str(), res.c_str());
 
-  std::string txtr3 = "foobar oa1:xmr tx_description=\"Donation for scala Development Fund\"; ";
+  std::string txtr3 = "foobar oa1:xla tx_description=\"Donation for scala Development Fund\"; ";
   txtr3 += "recipient_address=";
   txtr3 += addr;
   txtr3 += "; foobar";
@@ -71,7 +71,7 @@ TEST(AddressFromTXT, Success)
 
 TEST(AddressFromTXT, Failure)
 {
-  std::string txtr = "oa1:xmr recipient_address=not a real address";
+  std::string txtr = "oa1:xla recipient_address=not a real address";
 
   std::string res = tools::dns_utils::address_from_txt_record(txtr);
 
@@ -89,7 +89,7 @@ TEST(AddressFromURL, Success)
 
   bool dnssec_result = false;
 
-  std::vector<std::string> addresses = tools::dns_utils::addresses_from_url("donate.getscala.org", dnssec_result);
+  std::vector<std::string> addresses = tools::dns_utils::addresses_from_url("donate.scalaproject.io", dnssec_result);
 
   EXPECT_EQ(1, addresses.size());
   if (addresses.size() == 1)

diff --git a/tests/unit_tests/dns_resolver.cpp b/tests/unit_tests/dns_resolver.cpp
@@ -141,22 +141,22 @@ TEST(DNSResolver, GetTXTRecord)
 {
   bool avail, valid;
 
-  std::vector<std::string> records = tools::DNSResolver::instance().get_txt_record("donate.getscala.org", avail, valid);
+  std::vector<std::string> records = tools::DNSResolver::instance().get_txt_record("donate.scalaproject.io", avail, valid);
 
   EXPECT_NE(0, records.size());
 
   for (auto& rec : records)
   {
-    std::cout << "TXT record for donate.getscala.org: " << rec << std::endl;
+    std::cout << "TXT record for donate.scalaproject.io: " << rec << std::endl;
   }
 
   // replace first @ with .
   std::string addr = tools::DNSResolver::instance().get_dns_format_from_oa_address("donate@getscala.org");
-  EXPECT_STREQ("donate.getscala.org", addr.c_str());
+  EXPECT_STREQ("donate.scalaproject.io", addr.c_str());
 
   // no change
-  addr = tools::DNSResolver::instance().get_dns_format_from_oa_address("donate.getscala.org");
-  EXPECT_STREQ("donate.getscala.org", addr.c_str());
+  addr = tools::DNSResolver::instance().get_dns_format_from_oa_address("donate.scalaproject.io");
+  EXPECT_STREQ("donate.scalaproject.io", addr.c_str());
 }
 
 TEST(DNSResolver, Localhost)

diff --git a/translations/monero.ts b/translations/monero.ts
@@ -1634,7 +1634,7 @@ Amount, Spent(&quot;T&quot;|&quot;F&quot;), &quot;frozen&quot;|&quot;locked&quot
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="3134"/>
-        <source>Donate &lt;amount&gt; to the development team (donate.getscala.org).</source>
+        <source>Donate &lt;amount&gt; to the development team (donate.scalaproject.io).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="7388"/>
-        <source>Donating %s %s to The scala Project (donate.getscala.org or %s).</source>
+        <source>Donating %s %s to The scala Project (donate.scalaproject.io or %s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/translations/scala_ar.ts b/translations/scala_ar.ts
@@ -1634,7 +1634,7 @@ Amount, Spent(&quot;T&quot;|&quot;F&quot;), &quot;frozen&quot;|&quot;locked&quot
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="3134"/>
-        <source>Donate &lt;amount&gt; to the development team (donate.getscala.org).</source>
+        <source>Donate &lt;amount&gt; to the development team (donate.scalaproject.io).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="7388"/>
-        <source>Donating %s %s to The scala Project (donate.getscala.org or %s).</source>
+        <source>Donating %s %s to The scala Project (donate.scalaproject.io or %s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/translations/scala_bg.ts b/translations/scala_bg.ts
@@ -1634,7 +1634,7 @@ Amount, Spent(&quot;T&quot;|&quot;F&quot;), &quot;frozen&quot;|&quot;locked&quot
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="3134"/>
-        <source>Donate &lt;amount&gt; to the development team (donate.getscala.org).</source>
+        <source>Donate &lt;amount&gt; to the development team (donate.scalaproject.io).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="7388"/>
-        <source>Donating %s %s to The scala Project (donate.getscala.org or %s).</source>
+        <source>Donating %s %s to The scala Project (donate.scalaproject.io or %s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/translations/scala_bn.ts b/translations/scala_bn.ts
@@ -1634,7 +1634,7 @@ Amount, Spent(&quot;T&quot;|&quot;F&quot;), &quot;frozen&quot;|&quot;locked&quot
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="3134"/>
-        <source>Donate &lt;amount&gt; to the development team (donate.getscala.org).</source>
+        <source>Donate &lt;amount&gt; to the development team (donate.scalaproject.io).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="7388"/>
-        <source>Donating %s %s to The scala Project (donate.getscala.org or %s).</source>
+        <source>Donating %s %s to The scala Project (donate.scalaproject.io or %s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/translations/scala_cat.ts b/translations/scala_cat.ts
@@ -1634,7 +1634,7 @@ Amount, Spent(&quot;T&quot;|&quot;F&quot;), &quot;frozen&quot;|&quot;locked&quot
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="3134"/>
-        <source>Donate &lt;amount&gt; to the development team (donate.getscala.org).</source>
+        <source>Donate &lt;amount&gt; to the development team (donate.scalaproject.io).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="7388"/>
-        <source>Donating %s %s to The scala Project (donate.getscala.org or %s).</source>
+        <source>Donating %s %s to The scala Project (donate.scalaproject.io or %s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/translations/scala_cs.ts b/translations/scala_cs.ts
@@ -1634,7 +1634,7 @@ Amount, Spent(&quot;T&quot;|&quot;F&quot;), &quot;frozen&quot;|&quot;locked&quot
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="3134"/>
-        <source>Donate &lt;amount&gt; to the development team (donate.getscala.org).</source>
+        <source>Donate &lt;amount&gt; to the development team (donate.scalaproject.io).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="7388"/>
-        <source>Donating %s %s to The scala Project (donate.getscala.org or %s).</source>
+        <source>Donating %s %s to The scala Project (donate.scalaproject.io or %s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/translations/scala_da.ts b/translations/scala_da.ts
@@ -1634,7 +1634,7 @@ Amount, Spent(&quot;T&quot;|&quot;F&quot;), &quot;frozen&quot;|&quot;locked&quot
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="3134"/>
-        <source>Donate &lt;amount&gt; to the development team (donate.getscala.org).</source>
+        <source>Donate &lt;amount&gt; to the development team (donate.scalaproject.io).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="7388"/>
-        <source>Donating %s %s to The scala Project (donate.getscala.org or %s).</source>
+        <source>Donating %s %s to The scala Project (donate.scalaproject.io or %s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/translations/scala_de.ts b/translations/scala_de.ts
@@ -1634,8 +1634,8 @@ Amount, Spent(&quot;T&quot;|&quot;F&quot;), &quot;frozen&quot;|&quot;locked&quot
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="3134"/>
-        <source>Donate &lt;amount&gt; to the development team (donate.getscala.org).</source>
-        <translation>Spende &lt;Betrag&gt; ans Entwicklerteam (donate.getscala.org).</translation>
+        <source>Donate &lt;amount&gt; to the development team (donate.scalaproject.io).</source>
+        <translation>Spende &lt;Betrag&gt; ans Entwicklerteam (donate.scalaproject.io).</translation>
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="3138"/>
@@ -4525,7 +4525,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="7388"/>
-        <source>Donating %s %s to The scala Project (donate.getscala.org or %s).</source>
+        <source>Donating %s %s to The scala Project (donate.scalaproject.io or %s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/translations/scala_el.ts b/translations/scala_el.ts
@@ -1628,7 +1628,7 @@ Amount, Spent(&quot;T&quot;|&quot;F&quot;), &quot;frozen&quot;|&quot;locked&quot
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="3134"/>
-        <source>Donate &lt;amount&gt; to the development team (donate.getscala.org).</source>
+        <source>Donate &lt;amount&gt; to the development team (donate.scalaproject.io).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4521,7 +4521,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="7388"/>
-        <source>Donating %s %s to The scala Project (donate.getscala.org or %s).</source>
+        <source>Donating %s %s to The scala Project (donate.scalaproject.io or %s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/translations/scala_eo.ts b/translations/scala_eo.ts
@@ -1634,7 +1634,7 @@ Amount, Spent(&quot;T&quot;|&quot;F&quot;), &quot;frozen&quot;|&quot;locked&quot
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="3134"/>
-        <source>Donate &lt;amount&gt; to the development team (donate.getscala.org).</source>
+        <source>Donate &lt;amount&gt; to the development team (donate.scalaproject.io).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="7388"/>
-        <source>Donating %s %s to The scala Project (donate.getscala.org or %s).</source>
+        <source>Donating %s %s to The scala Project (donate.scalaproject.io or %s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/translations/scala_es.ts b/translations/scala_es.ts
@@ -1634,7 +1634,7 @@ Amount, Spent(&quot;T&quot;|&quot;F&quot;), &quot;frozen&quot;|&quot;locked&quot
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="3134"/>
-        <source>Donate &lt;amount&gt; to the development team (donate.getscala.org).</source>
+        <source>Donate &lt;amount&gt; to the development team (donate.scalaproject.io).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="7388"/>
-        <source>Donating %s %s to The scala Project (donate.getscala.org or %s).</source>
+        <source>Donating %s %s to The scala Project (donate.scalaproject.io or %s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/translations/scala_fa.ts b/translations/scala_fa.ts
@@ -1634,7 +1634,7 @@ Amount, Spent(&quot;T&quot;|&quot;F&quot;), &quot;frozen&quot;|&quot;locked&quot
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="3134"/>
-        <source>Donate &lt;amount&gt; to the development team (donate.getscala.org).</source>
+        <source>Donate &lt;amount&gt; to the development team (donate.scalaproject.io).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate
     </message>
     <message>
         <location filename="../src/simplewallet/simplewallet.cpp" line="7388"/>
-        <source>Donating %s %s to The scala Project (donate.getscala.org or %s).</source>
+        <source>Donating %s %s to The scala Project (donate.scalaproject.io or %s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>