fixed AUDIT payout scanning for split AUDIT TXs; bumped RC version

This commit is contained in:
Some Random Crypto Guy
2025-08-14 12:07:53 +01:00
parent a159bed3ba
commit bfe8c4606d
3 changed files with 13 additions and 8 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
#define DEF_SALVIUM_VERSION_TAG "@VERSIONTAG@"
#define DEF_SALVIUM_VERSION "0.9.9-rc5"
#define DEF_SALVIUM_VERSION "0.9.9-rc6"
#define DEF_MONERO_VERSION_TAG "release"
#define DEF_MONERO_VERSION "0.18.3.4"
#define DEF_MONERO_RELEASE_NAME "One"
+10 -7
View File
@@ -132,6 +132,9 @@ static bool try_load_pre_carrot_enote(const bool is_coinbase,
enote_out.amount_commitment = rct::Z;
}
// Check for protocol_tx outputs
enote_out.is_protocol_tx_output = (tx.type == cryptonote::transaction_type::PROTOCOL);
return true;
}
//-------------------------------------------------------------------------------------------------------------------
@@ -168,8 +171,8 @@ static std::optional<enote_view_incoming_scan_info_t> view_incoming_scan_pre_car
crypto::ec_scalar amount_key;
if (!hwdev.derivation_to_scalar(receive_info->derivation,
enote.local_output_index,
amount_key))
enote.is_protocol_tx_output ? 0 : enote.local_output_index,
amount_key))
return std::nullopt;
// a
@@ -208,16 +211,16 @@ static std::optional<enote_view_incoming_scan_info_t> view_incoming_scan_pre_car
// derive k^g_o
crypto::secret_key sender_extension_g;
if (!hwdev.derivation_to_scalar(receive_info->derivation,
enote.local_output_index,
sender_extension_g))
enote.is_protocol_tx_output ? 0 : enote.local_output_index,
sender_extension_g))
return std::nullopt;
// K^j_s'
crypto::public_key address_spend_pubkey;
if (!hwdev.derive_subaddress_public_key(enote.onetime_address,
receive_info->derivation,
enote.local_output_index,
address_spend_pubkey))
receive_info->derivation,
enote.is_protocol_tx_output ? 0 : enote.local_output_index,
address_spend_pubkey))
return std::nullopt;
//pid
+2
View File
@@ -100,6 +100,8 @@ struct PreCarrotEnote
bool short_amount;
rct::key amount_commitment;
rct::ecdhTuple amount;
bool is_protocol_tx_output;
};
using MoneroEnoteVariant = std::variant<PreCarrotEnote,