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

fixed RCT types to support ECDHINFO for Salvium One; fixed input and output limits for TXs

Browse Source
This commit is contained in:
Some Random Crypto Guy
2025-07-23 10:21:13 +01:00
parent b87bfe002a
commit 9c11200666
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/carrot_impl/tx_proposal_utils.cpp
+1 -1
View File
@@ -90,7 +90,7 @@ static void append_additional_payment_proposal_if_necessary(
//------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------
std::uint64_t get_carrot_default_tx_extra_size(const std::size_t n_outputs) std::uint64_t get_carrot_default_tx_extra_size(const std::size_t n_outputs)
{ {
CHECK_AND_ASSERT_THROW_MES(n_outputs <= FCMP_PLUS_PLUS_MAX_OUTPUTS, CHECK_AND_ASSERT_THROW_MES(n_outputs <= CARROT_MAX_TX_OUTPUTS,
"get_carrot_default_tx_extra_size: n_outputs too high: " << n_outputs); "get_carrot_default_tx_extra_size: n_outputs too high: " << n_outputs);
CHECK_AND_ASSERT_THROW_MES(n_outputs >= CARROT_MIN_TX_OUTPUTS, CHECK_AND_ASSERT_THROW_MES(n_outputs >= CARROT_MIN_TX_OUTPUTS,
"get_carrot_default_tx_extra_size: n_outputs too low: " << n_outputs); "get_carrot_default_tx_extra_size: n_outputs too low: " << n_outputs);
src/ringct/rctTypes.h
+3 -2
View File
@@ -446,7 +446,7 @@ namespace rct {
return false; return false;
for (size_t i = 0; i < outputs; ++i) for (size_t i = 0; i < outputs; ++i)
{ {
if (type == RCTTypeBulletproofPlus || type == RCTTypeFullProofs || type == RCTTypeSalviumZero) if (type == RCTTypeBulletproofPlus || type == RCTTypeFullProofs || type == RCTTypeSalviumZero || type == RCTTypeSalviumOne)
{ {
// Since RCTTypeBulletproof2 enote types, we don't serialize the blinding factor, and only serialize the // Since RCTTypeBulletproof2 enote types, we don't serialize the blinding factor, and only serialize the
// first 8 bytes of ecdhInfo[i].amount // first 8 bytes of ecdhInfo[i].amount
@@ -504,7 +504,7 @@ namespace rct {
FIELD(outPk) FIELD(outPk)
VARINT_FIELD(txnFee) VARINT_FIELD(txnFee)
FIELD(p_r) FIELD(p_r)
if (type == RCTTypeSalviumZero) if (type == RCTTypeSalviumZero || type == RCTTypeSalviumOne)
{ {
FIELD(salvium_data) FIELD(salvium_data)
} }
@@ -673,6 +673,7 @@ namespace rct {
FIELD(bulletproofs_plus) FIELD(bulletproofs_plus)
FIELD(MGs) FIELD(MGs)
FIELD(CLSAGs) FIELD(CLSAGs)
FIELD(TCLSAGs)
FIELD(pseudoOuts) FIELD(pseudoOuts)
END_SERIALIZE() END_SERIALIZE()
}; };
src/wallet/tx_builder.cpp
+4 -4
View File
@@ -590,7 +590,7 @@ std::vector<carrot::CarrotTransactionProposalV1> make_carrot_transaction_proposa
const size_t n_inputs = input_key_images.size(); const size_t n_inputs = input_key_images.size();
CARROT_CHECK_AND_THROW(n_inputs, carrot::too_few_inputs, "no key images provided"); CARROT_CHECK_AND_THROW(n_inputs, carrot::too_few_inputs, "no key images provided");
CARROT_CHECK_AND_THROW(n_dests_per_tx, carrot::too_few_outputs, "sweep must have at least one destination"); CARROT_CHECK_AND_THROW(n_dests_per_tx, carrot::too_few_outputs, "sweep must have at least one destination");
CARROT_CHECK_AND_THROW(n_dests_per_tx <= FCMP_PLUS_PLUS_MAX_OUTPUTS, CARROT_CHECK_AND_THROW(n_dests_per_tx <= CARROT_MAX_TX_OUTPUTS,
carrot::too_many_outputs, "too many sweep destinations per transaction"); carrot::too_many_outputs, "too many sweep destinations per transaction");
// Check that the key image is usable and isn't spent, collect amounts, and get subaddress account index // Check that the key image is usable and isn't spent, collect amounts, and get subaddress account index
@@ -636,11 +636,11 @@ std::vector<carrot::CarrotTransactionProposalV1> make_carrot_transaction_proposa
|| (!is_selfsend_dest && normal_payment_proposals.size() == i+1), || (!is_selfsend_dest && normal_payment_proposals.size() == i+1),
__func__ << ": BUG in build_payment_proposals: incorrect count for payment proposal lists"); __func__ << ": BUG in build_payment_proposals: incorrect count for payment proposal lists");
} }
CARROT_CHECK_AND_THROW(normal_payment_proposals.size() < FCMP_PLUS_PLUS_MAX_OUTPUTS, CARROT_CHECK_AND_THROW(normal_payment_proposals.size() < CARROT_MAX_TX_OUTPUTS,
carrot::too_many_outputs, "too many *outgoing* sweep destinations per tx, we also need 1 self-send output"); carrot::too_many_outputs, "too many *outgoing* sweep destinations per tx, we also need 1 self-send output");
// make `n_txs` tx proposals with `n_output` payment proposals each // make `n_txs` tx proposals with `n_output` payment proposals each
const size_t n_txs = div_ceil<size_t>(n_inputs, FCMP_PLUS_PLUS_MAX_INPUTS); const size_t n_txs = div_ceil<size_t>(n_inputs, CARROT_MAX_TX_INPUTS);
std::vector<carrot::CarrotTransactionProposalV1> tx_proposals(n_txs); std::vector<carrot::CarrotTransactionProposalV1> tx_proposals(n_txs);
size_t ki_idx = 0; size_t ki_idx = 0;
for (carrot::CarrotTransactionProposalV1 &tx_proposal : tx_proposals) for (carrot::CarrotTransactionProposalV1 &tx_proposal : tx_proposals)
@@ -650,7 +650,7 @@ std::vector<carrot::CarrotTransactionProposalV1> make_carrot_transaction_proposa
selfsend_payment_proposals.back().proposal.enote_type = carrot::CarrotEnoteType::CHANGE; selfsend_payment_proposals.back().proposal.enote_type = carrot::CarrotEnoteType::CHANGE;
// collect inputs for this tx // collect inputs for this tx
const size_t ki_idx_end = std::min<size_t>(n_inputs, ki_idx + FCMP_PLUS_PLUS_MAX_INPUTS); const size_t ki_idx_end = std::min<size_t>(n_inputs, ki_idx + CARROT_MAX_TX_INPUTS);
std::vector<carrot::CarrotSelectedInput> selected_inputs; std::vector<carrot::CarrotSelectedInput> selected_inputs;
selected_inputs.reserve(n_inputs - ki_idx_end); selected_inputs.reserve(n_inputs - ki_idx_end);
for (; ki_idx < ki_idx_end; ++ki_idx) for (; ki_idx < ki_idx_end; ++ki_idx)