tiamak/salvium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small fix to prevent wallets from abandoning scanning when encountering protocol_tx not intended for them - duh!

Browse Source
This commit is contained in:
ncoggins
2024-05-20 09:28:44 +01:00
parent d24ed9e0cc
commit 199e47e076
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/version.cpp.in
+1 -1
View File
@@ -1,5 +1,5 @@
#define DEF_SALVIUM_VERSION_TAG "7f6b8da" #define DEF_SALVIUM_VERSION_TAG "7f6b8da"
#define DEF_SALVIUM_VERSION "0.0.5" #define DEF_SALVIUM_VERSION "0.0.7"
#define DEF_MONERO_VERSION_TAG "@VERSIONTAG@" #define DEF_MONERO_VERSION_TAG "@VERSIONTAG@"
#define DEF_MONERO_VERSION "0.18.2.2" #define DEF_MONERO_VERSION "0.18.2.2"
#define DEF_MONERO_RELEASE_NAME "Zero" #define DEF_MONERO_RELEASE_NAME "Zero"
src/wallet/wallet2.cpp
+6 -2
View File
@@ -2236,6 +2236,10 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
// Find the TX public key for P_change // Find the TX public key for P_change
//auto search = m_protocol_txs.find(pk_change); //auto search = m_protocol_txs.find(pk_change);
auto search = m_protocol_txs.find(output_public_key); auto search = m_protocol_txs.find(output_public_key);
if (search == m_protocol_txs.end()) {
LOG_PRINT_L3("failed to locate protocol_tx entry for this vout - skipping");
continue;
}
THROW_WALLET_EXCEPTION_IF(search == m_protocol_txs.end(), error::wallet_internal_error, "failed to locate protocol_tx entry to permit source usage"); THROW_WALLET_EXCEPTION_IF(search == m_protocol_txs.end(), error::wallet_internal_error, "failed to locate protocol_tx entry to permit source usage");
size_t idx = search->second; size_t idx = search->second;
THROW_WALLET_EXCEPTION_IF(idx >= get_num_transfer_details(), error::wallet_internal_error, "cannot locate protocol_txs index in m_transfers"); THROW_WALLET_EXCEPTION_IF(idx >= get_num_transfer_details(), error::wallet_internal_error, "cannot locate protocol_txs index in m_transfers");
@@ -2727,10 +2731,10 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
payment.m_fee = fee; payment.m_fee = fee;
// SRCG - figure out what this needs to be (pretty sure we should never get here with CONVERT!) // SRCG - figure out what this needs to be (pretty sure we should never get here with CONVERT!)
payment.m_amount = source_asset == dest_asset ? i.second[dest_asset] : tx.amount_burnt; payment.m_amount = source_asset == dest_asset ? i.second[dest_asset] : tx.amount_burnt;
payment.m_asset_type = dest_asset; payment.m_asset_type = (tx.type == cryptonote::transaction_type::PROTOCOL) ? "SAL" : dest_asset;
payment.m_amounts = tx_amounts_individual_outs[i.first]; payment.m_amounts = tx_amounts_individual_outs[i.first];
payment.m_block_height = height; payment.m_block_height = height;
payment.m_unlock_time = tx.unlock_time; payment.m_unlock_time = tx.unlock_time; // SRCG: this is incorrect - work out which vout entry it is and query that
payment.m_timestamp = ts; payment.m_timestamp = ts;
payment.m_coinbase = miner_tx; payment.m_coinbase = miner_tx;
payment.m_subaddr_index = i.first; payment.m_subaddr_index = i.first;