Skip to content

Commit ac96da9

Browse files
hayzamjshayzamjs
committed
changelog, version bump, scala oa url
1 parent 05b5b50 commit ac96da9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+127
-131
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
The much awaited V8 iteration of Scala. This release has the following changes:
1+
A point release for V8, this release has the following changes:
22

3-
* Diardi V2: Allowing elected members of the community to participate in consensus and help protect the network
4-
* Separate [proof-of-work](https://github.com/scala-network/felidae) for Diardi miners
5-
* Better emission curve with eroding block rewards
6-
* Upstream merge to XMR version v0.18.2.2 "Fluorine Fermi"
7-
* New CLSAG transaction format
8-
* View tags for faster wallet scans
9-
* A lot of bug fixes and more
3+
* Fixes for wallet fee and open alias issues
4+
* Added checkpoints for testnet
5+
* Some other minor bug fixes

‎src/common/dns_utils.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,8 @@ namespace dns_utils {
396396
//-----------------------------------------------------------------------
397397
// TODO: parse the string in a less stupid way, probably with regex
398398
std::string address_from_txt_record(const std::string &s) {
399-
// make sure the txt record has "oa1:xmr" and find it
400-
auto pos = s.find("oa1:xmr");
399+
// make sure the txt record has "oa1:xla" and find it
400+
auto pos = s.find("oa1:xla");
401401
if (pos == std::string::npos)
402402
return {};
403403
// search from there to find "recipient_address="
@@ -409,12 +409,12 @@ std::string address_from_txt_record(const std::string &s) {
409409
auto pos2 = s.find(";", pos);
410410
if (pos2 != std::string::npos) {
411411
// length of address == 95, we can at least validate that much here
412-
if (pos2 - pos == 95) {
413-
return s.substr(pos, 95);
412+
if (pos2 - pos == 97) {
413+
return s.substr(pos, 97);
414414
} else if (pos2 - pos ==
415-
106) // length of address == 106 --> integrated address
415+
109) // length of address == 106 --> integrated address
416416
{
417-
return s.substr(pos, 106);
417+
return s.substr(pos, 109);
418418
}
419419
}
420420
return {};
@@ -481,7 +481,7 @@ std::string get_account_address_as_str_from_url(
481481
// attempt to get address from dns query
482482
auto addresses = addresses_from_url(url, dnssec_valid);
483483
if (addresses.empty()) {
484-
LOG_ERROR("wrong address: " << url);
484+
LOG_ERROR("wrong address for UD: " << url);
485485
return {};
486486
}
487487
return dns_confirm(url, addresses, dnssec_valid);

‎src/common/dns_utils.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class DNSResolver {
133133
* @brief Gets a DNS address from OpenAlias format
134134
*
135135
* If the address looks good, but contains one @ symbol, replace that with a .
136-
* e.g. donate@getscala.org becomes donate.getscala.org
136+
* e.g. donate@scalaproject.io becomes donate.scalaproject.io
137137
*
138138
* @param oa_addr OpenAlias address
139139
*

‎src/simplewallet/simplewallet.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3079,8 +3079,7 @@ simple_wallet::simple_wallet()
30793079
m_cmd_binder.set_handler(
30803080
"donate",
30813081
boost::bind(&simple_wallet::on_command, this, &simple_wallet::donate, _1),
3082-
tr(USAGE_DONATE),
3083-
tr("Donate <amount> to the development team (donate.getscala.org)."));
3082+
tr(USAGE_DONATE), tr("Donate <amount> to the Scala team."));
30843083
m_cmd_binder.set_handler(
30853084
"sign_transfer",
30863085
boost::bind(&simple_wallet::on_command, this,
@@ -7750,7 +7749,7 @@ bool simple_wallet::donate(const std::vector<std::string> &args_) {
77507749
local_args.push_back(payment_id_str);
77517750
if (m_wallet->nettype() == cryptonote::MAINNET)
77527751
message_writer() << (boost::format(tr("Donating %s %s to The scala Project "
7753-
"(donate.getscala.org or %s).")) %
7752+
"(donate.scalaproject.io or %s).")) %
77547753
amount_str %
77557754
cryptonote::get_unit(
77567755
cryptonote::get_default_decimal_point()) %

‎src/simplewallet/simplewallet.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,11 @@
5959

6060
#undef scala_DEFAULT_LOG_CATEGORY
6161
#define scala_DEFAULT_LOG_CATEGORY "wallet.simplewallet"
62-
// Hardcode scala's donation address (see #1447)
62+
// Hardcode scala's donation address
6363
constexpr const char scala_DONATION_ADDR[] =
64-
"888tNkZrPN6JsEgekjMnABU4TBzc2Dt29EPAvkRxbANsAnjyPbb3iQ1YBRk1UXcdRsiKc9dhwM"
65-
"VgN5S9cQUiyoogDavup3H";
64+
"SvkzckfVpUSWuSG4VS4WCL9KMTh39krgk6SLwVGLkZufh83ET8JjZ3yidaoURyHgLFDhFZEPPY"
65+
"12cHqYyS"
66+
"VoV2x62XvMtJii5";
6667

6768
/*!
6869
* \namespace cryptonote

‎src/version.cpp.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#define DEF_scala_VERSION_TAG "@VERSIONTAG@"
2-
#define DEF_scala_VERSION "8.0.0"
2+
#define DEF_scala_VERSION "8.0.1"
33
#define DEF_scala_RELEASE_NAME "Menger"
44
#define DEF_scala_VERSION_FULL DEF_scala_VERSION "-" DEF_scala_VERSION_TAG
55
#define DEF_scala_VERSION_IS_RELEASE @VERSION_IS_RELEASE@

‎tests/unit_tests/address_from_url.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838

3939
TEST(AddressFromTXT, Success)
4040
{
41-
std::string addr = "46BeWrHpwXmHDpDEUmZBWZfoQpdc6HaERCNmx1pEYL2rAcuwufPN9rXHHtyUA4QVy66qeFQkn6sfK8aHYjA3jk3o1Bv16em";
41+
std::string addr = "SvkzckfVpUSWuSG4VS4WCL9KMTh39krgk6SLwVGLkZufh83ET8JjZ3yidaoURyHgLFDhFZEPPY12cHqYySVoV2x62XvMtJii5";
4242

43-
std::string txtr = "oa1:xmr";
43+
std::string txtr = "oa1:xla";
4444
txtr += " recipient_address=";
4545
txtr += addr;
4646
txtr += ";";
@@ -59,7 +59,7 @@ TEST(AddressFromTXT, Success)
5959

6060
EXPECT_STREQ(addr.c_str(), res.c_str());
6161

62-
std::string txtr3 = "foobar oa1:xmr tx_description=\"Donation for scala Development Fund\"; ";
62+
std::string txtr3 = "foobar oa1:xla tx_description=\"Donation for scala Development Fund\"; ";
6363
txtr3 += "recipient_address=";
6464
txtr3 += addr;
6565
txtr3 += "; foobar";
@@ -71,7 +71,7 @@ TEST(AddressFromTXT, Success)
7171

7272
TEST(AddressFromTXT, Failure)
7373
{
74-
std::string txtr = "oa1:xmr recipient_address=not a real address";
74+
std::string txtr = "oa1:xla recipient_address=not a real address";
7575

7676
std::string res = tools::dns_utils::address_from_txt_record(txtr);
7777

@@ -89,7 +89,7 @@ TEST(AddressFromURL, Success)
8989

9090
bool dnssec_result = false;
9191

92-
std::vector<std::string> addresses = tools::dns_utils::addresses_from_url("donate.getscala.org", dnssec_result);
92+
std::vector<std::string> addresses = tools::dns_utils::addresses_from_url("donate.scalaproject.io", dnssec_result);
9393

9494
EXPECT_EQ(1, addresses.size());
9595
if (addresses.size() == 1)

‎tests/unit_tests/dns_resolver.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,22 +141,22 @@ TEST(DNSResolver, GetTXTRecord)
141141
{
142142
bool avail, valid;
143143

144-
std::vector<std::string> records = tools::DNSResolver::instance().get_txt_record("donate.getscala.org", avail, valid);
144+
std::vector<std::string> records = tools::DNSResolver::instance().get_txt_record("donate.scalaproject.io", avail, valid);
145145

146146
EXPECT_NE(0, records.size());
147147

148148
for (auto& rec : records)
149149
{
150-
std::cout << "TXT record for donate.getscala.org: " << rec << std::endl;
150+
std::cout << "TXT record for donate.scalaproject.io: " << rec << std::endl;
151151
}
152152

153153
// replace first @ with .
154154
std::string addr = tools::DNSResolver::instance().get_dns_format_from_oa_address("donate@getscala.org");
155-
EXPECT_STREQ("donate.getscala.org", addr.c_str());
155+
EXPECT_STREQ("donate.scalaproject.io", addr.c_str());
156156

157157
// no change
158-
addr = tools::DNSResolver::instance().get_dns_format_from_oa_address("donate.getscala.org");
159-
EXPECT_STREQ("donate.getscala.org", addr.c_str());
158+
addr = tools::DNSResolver::instance().get_dns_format_from_oa_address("donate.scalaproject.io");
159+
EXPECT_STREQ("donate.scalaproject.io", addr.c_str());
160160
}
161161

162162
TEST(DNSResolver, Localhost)

‎translations/monero.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1634,7 +1634,7 @@ Amount, Spent(&quot;T&quot;|&quot;F&quot;), &quot;frozen&quot;|&quot;locked&quot
16341634
</message>
16351635
<message>
16361636
<location filename="../src/simplewallet/simplewallet.cpp" line="3134"/>
1637-
<source>Donate &lt;amount&gt; to the development team (donate.getscala.org).</source>
1637+
<source>Donate &lt;amount&gt; to the development team (donate.scalaproject.io).</source>
16381638
<translation type="unfinished"></translation>
16391639
</message>
16401640
<message>
@@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate
45064506
</message>
45074507
<message>
45084508
<location filename="../src/simplewallet/simplewallet.cpp" line="7388"/>
4509-
<source>Donating %s %s to The scala Project (donate.getscala.org or %s).</source>
4509+
<source>Donating %s %s to The scala Project (donate.scalaproject.io or %s).</source>
45104510
<translation type="unfinished"></translation>
45114511
</message>
45124512
<message>

‎translations/scala_ar.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1634,7 +1634,7 @@ Amount, Spent(&quot;T&quot;|&quot;F&quot;), &quot;frozen&quot;|&quot;locked&quot
16341634
</message>
16351635
<message>
16361636
<location filename="../src/simplewallet/simplewallet.cpp" line="3134"/>
1637-
<source>Donate &lt;amount&gt; to the development team (donate.getscala.org).</source>
1637+
<source>Donate &lt;amount&gt; to the development team (donate.scalaproject.io).</source>
16381638
<translation type="unfinished"></translation>
16391639
</message>
16401640
<message>
@@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate
45064506
</message>
45074507
<message>
45084508
<location filename="../src/simplewallet/simplewallet.cpp" line="7388"/>
4509-
<source>Donating %s %s to The scala Project (donate.getscala.org or %s).</source>
4509+
<source>Donating %s %s to The scala Project (donate.scalaproject.io or %s).</source>
45104510
<translation type="unfinished"></translation>
45114511
</message>
45124512
<message>

0 commit comments

Comments
 (0)