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

carrot_impl: rename make_pruned_transaction_from_proposal_v1

Browse Source
This commit is contained in:
jeffro256
2025-04-26 15:36:17 -05:00
committed by akildemir
parent 0bfa68beda
commit 70bde9353b
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/carrot_impl/carrot_tx_builder_utils.cpp
View File

@@ -514,7 +514,7 @@ void make_signable_tx_hash_from_proposal_v1(const CarrotTransactionProposalV1 &t
// HW devices will need to implement this function to sign tx proposals, and most of these devices don't have a lot of memory // HW devices will need to implement this function to sign tx proposals, and most of these devices don't have a lot of memory
cryptonote::transaction pruned_tx; cryptonote::transaction pruned_tx;
make_pruned_transaction_from_carrot_proposal_v1(tx_proposal, make_pruned_transaction_from_proposal_v1(tx_proposal,
s_view_balance_dev, s_view_balance_dev,
k_view_dev, k_view_dev,
pruned_tx); pruned_tx);
@@ -528,7 +528,7 @@ void make_signable_tx_hash_from_proposal_v1(const CarrotTransactionProposalV1 &t
signable_tx_hash_out = rct::rct2hash(signable_tx_hash_k); signable_tx_hash_out = rct::rct2hash(signable_tx_hash_k);
} }
//------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------
void make_pruned_transaction_from_carrot_proposal_v1(const CarrotTransactionProposalV1 &tx_proposal, void make_pruned_transaction_from_proposal_v1(const CarrotTransactionProposalV1 &tx_proposal,
const view_balance_secret_device *s_view_balance_dev, const view_balance_secret_device *s_view_balance_dev,
const view_incoming_key_device *k_view_dev, const view_incoming_key_device *k_view_dev,
cryptonote::transaction &pruned_tx_out) cryptonote::transaction &pruned_tx_out)
@@ -560,7 +560,7 @@ void make_pruned_transaction_from_carrot_proposal_v1(const CarrotTransactionProp
std::vector<std::uint8_t> sorted_extra; std::vector<std::uint8_t> sorted_extra;
pruned_tx_out.extra.insert(pruned_tx_out.extra.end(), tx_proposal.extra.cbegin(), tx_proposal.extra.cend()); pruned_tx_out.extra.insert(pruned_tx_out.extra.end(), tx_proposal.extra.cbegin(), tx_proposal.extra.cend());
CHECK_AND_ASSERT_THROW_MES(cryptonote::sort_tx_extra(pruned_tx_out.extra, sorted_extra), CHECK_AND_ASSERT_THROW_MES(cryptonote::sort_tx_extra(pruned_tx_out.extra, sorted_extra),
"make_pruned_transaction_from_carrot_proposal_v1: failed to sort "); "make_pruned_transaction_from_proposal_v1: failed to sort tx extra");
pruned_tx_out.extra = std::move(sorted_extra); pruned_tx_out.extra = std::move(sorted_extra);
} }
} }

2
src/carrot_impl/carrot_tx_builder_utils.h
View File

@@ -119,7 +119,7 @@ void make_signable_tx_hash_from_proposal_v1(const CarrotTransactionProposalV1 &t
const view_incoming_key_device *k_view_dev, const view_incoming_key_device *k_view_dev,
crypto::hash &signable_tx_hash_out); crypto::hash &signable_tx_hash_out);
void make_pruned_transaction_from_carrot_proposal_v1(const CarrotTransactionProposalV1 &tx_proposal, void make_pruned_transaction_from_proposal_v1(const CarrotTransactionProposalV1 &tx_proposal,
const view_balance_secret_device *s_view_balance_dev, const view_balance_secret_device *s_view_balance_dev,
const view_incoming_key_device *k_view_dev, const view_incoming_key_device *k_view_dev,
cryptonote::transaction &pruned_tx_out); cryptonote::transaction &pruned_tx_out);

2
tests/unit_tests/carrot_impl.cpp
View File

@@ -165,7 +165,7 @@ static void subtest_multi_account_transfer_over_transaction(const unittest_trans
// make unsigned transaction // make unsigned transaction
cryptonote::transaction tx; cryptonote::transaction tx;
make_pruned_transaction_from_carrot_proposal_v1(tx_proposal, make_pruned_transaction_from_proposal_v1(tx_proposal,
&ss_keys.s_view_balance_dev, &ss_keys.s_view_balance_dev,
&ss_keys.k_view_incoming_dev, &ss_keys.k_view_incoming_dev,
tx); tx);

2
tests/unit_tests/tx_construction_helpers.cpp
View File

@@ -432,7 +432,7 @@ cryptonote::transaction construct_carrot_pruned_transaction_fake_inputs(
tx_proposal); tx_proposal);
cryptonote::transaction tx; cryptonote::transaction tx;
carrot::make_pruned_transaction_from_carrot_proposal_v1(tx_proposal, carrot::make_pruned_transaction_from_proposal_v1(tx_proposal,
/*s_view_balance_dev=*/nullptr, /*s_view_balance_dev=*/nullptr,
&k_view_dev, &k_view_dev,
tx); tx);