Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ea919eb6ea | |||
| 42aee311cd | |||
| d51ca28d7b |
+1
-1
@@ -1,5 +1,5 @@
|
||||
#define DEF_SALVIUM_VERSION_TAG "@VERSIONTAG@"
|
||||
#define DEF_SALVIUM_VERSION "0.5.1"
|
||||
#define DEF_SALVIUM_VERSION "0.5.2"
|
||||
#define DEF_MONERO_VERSION_TAG "release"
|
||||
#define DEF_MONERO_VERSION "0.18.3.3"
|
||||
#define DEF_MONERO_RELEASE_NAME "Zero"
|
||||
|
||||
+15
-14
@@ -2415,23 +2415,24 @@ bool wallet2::get_yield_summary_info(uint64_t &total_burnt,
|
||||
// Iterate over the transfers in our wallet
|
||||
std::map<size_t, size_t> map_payouts;
|
||||
std::map<std::string, std::pair<size_t, std::pair<uint64_t, uint64_t>>> payouts_active;
|
||||
for (size_t idx = m_transfers.size()-1; idx>0; --idx) {
|
||||
const tools::wallet2::transfer_details& td = m_transfers[idx];
|
||||
//if (td.m_block_height < ybi_data[0].block_height) break;
|
||||
if (td.m_tx.type == cryptonote::transaction_type::STAKE) {
|
||||
if (map_payouts.count(idx)) {
|
||||
payouts.push_back(std::make_tuple(td.m_block_height, epee::string_tools::pod_to_hex(td.m_txid), td.m_tx.amount_burnt, m_transfers[map_payouts[idx]].m_amount - td.m_tx.amount_burnt));
|
||||
} else {
|
||||
//payouts.push_back(std::make_tuple(td.m_block_height, epee::string_tools::pod_to_hex(td.m_txid), td.m_tx.amount_burnt, 0));
|
||||
payouts_active[epee::string_tools::pod_to_hex(td.m_txid)] = std::make_pair(td.m_block_height, std::make_pair(td.m_tx.amount_burnt, 0));
|
||||
if (m_transfers.size() > 0) {
|
||||
for (size_t idx = m_transfers.size()-1; idx>0; --idx) {
|
||||
const tools::wallet2::transfer_details& td = m_transfers[idx];
|
||||
//if (td.m_block_height < ybi_data[0].block_height) break;
|
||||
if (td.m_tx.type == cryptonote::transaction_type::STAKE) {
|
||||
if (map_payouts.count(idx)) {
|
||||
payouts.push_back(std::make_tuple(td.m_block_height, epee::string_tools::pod_to_hex(td.m_txid), td.m_tx.amount_burnt, m_transfers[map_payouts[idx]].m_amount - td.m_tx.amount_burnt));
|
||||
} else {
|
||||
//payouts.push_back(std::make_tuple(td.m_block_height, epee::string_tools::pod_to_hex(td.m_txid), td.m_tx.amount_burnt, 0));
|
||||
payouts_active[epee::string_tools::pod_to_hex(td.m_txid)] = std::make_pair(td.m_block_height, std::make_pair(td.m_tx.amount_burnt, 0));
|
||||
}
|
||||
} else if (td.m_tx.type == cryptonote::transaction_type::PROTOCOL) {
|
||||
// Store list of reverse-lookup indices to tell YIELD TXs how much they earned
|
||||
if (m_transfers[td.m_td_origin_idx].m_tx.type == cryptonote::transaction_type::STAKE)
|
||||
map_payouts[td.m_td_origin_idx] = idx;
|
||||
}
|
||||
} else if (td.m_tx.type == cryptonote::transaction_type::PROTOCOL) {
|
||||
// Store list of reverse-lookup indices to tell YIELD TXs how much they earned
|
||||
if (m_transfers[td.m_td_origin_idx].m_tx.type == cryptonote::transaction_type::STAKE)
|
||||
map_payouts[td.m_td_origin_idx] = idx;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Scan the entries we have received to gather the state (total yield over period captured)
|
||||
total_burnt = 0;
|
||||
|
||||
+3
-3
@@ -2,9 +2,9 @@ de
|
||||
es
|
||||
fr
|
||||
it
|
||||
jp
|
||||
ja
|
||||
nl
|
||||
pt
|
||||
pt-pt
|
||||
ru
|
||||
sv
|
||||
zh
|
||||
zh-cn
|
||||
|
||||
@@ -6641,29 +6641,29 @@ WARNING: Do not reuse your Salvium keys on another fork, UNLESS this fork has ke
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/wallet/wallet2.cpp" line="3751"/>
|
||||
<location filename="../src/wallet/wallet2.cpp" line="3752"/>
|
||||
<source>reorg exceeds maximum allowed depth, use 'set max-reorg-depth N' to allow it, reorg depth: </source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/wallet/wallet2.cpp" line="5639"/>
|
||||
<location filename="../src/wallet/wallet2.cpp" line="6220"/>
|
||||
<location filename="../src/wallet/wallet2.cpp" line="6709"/>
|
||||
<location filename="../src/wallet/wallet2.cpp" line="5640"/>
|
||||
<location filename="../src/wallet/wallet2.cpp" line="6221"/>
|
||||
<location filename="../src/wallet/wallet2.cpp" line="6710"/>
|
||||
<source>Primary account</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/wallet/wallet2.cpp" line="9078"/>
|
||||
<location filename="../src/wallet/wallet2.cpp" line="9079"/>
|
||||
<source>Transaction sanity check failed</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/wallet/wallet2.cpp" line="12641"/>
|
||||
<location filename="../src/wallet/wallet2.cpp" line="12642"/>
|
||||
<source>No funds received in this tx.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/wallet/wallet2.cpp" line="13553"/>
|
||||
<location filename="../src/wallet/wallet2.cpp" line="13554"/>
|
||||
<source>failed to read file </source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
||||
+1341
-1342
File diff suppressed because it is too large
Load Diff
+721
-723
File diff suppressed because it is too large
Load Diff
+825
-827
File diff suppressed because it is too large
Load Diff
+702
-703
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+721
-723
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+730
-731
File diff suppressed because it is too large
Load Diff
+717
-719
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -11,7 +11,7 @@ use XML::LibXML;
|
||||
use open qw( :std :encoding(UTF-8) );
|
||||
|
||||
#Name of the XML File
|
||||
my $xmlfile = "salvium-en.ts";
|
||||
my $xmlfile = "salvium.ts";
|
||||
my $lang = $ARGV[0];
|
||||
if (length($lang) != 2) {
|
||||
die "input language code '$lang' is invalid";
|
||||
@@ -26,7 +26,7 @@ foreach my $context ($dom->findnodes('/TS/context')) {
|
||||
my $source = $message->findvalue('./source');
|
||||
$source =~ s/\n/\\n/g;
|
||||
print CSV $context->findvalue('./name') . "===";
|
||||
print CSV encode_entities($source) . "======";
|
||||
print CSV encode_entities($source,'<>&"') . "======";
|
||||
my @locations = ();
|
||||
foreach my $location ($message->findnodes('./location')) {
|
||||
my $temp = $location->getAttribute('filename') . ":" . $location->getAttribute('line');
|
||||
|
||||
Reference in New Issue
Block a user