modify construct_tx_for_mock_ledger_v1 so it outputs the JamtisPaymen…

…tProposals (monero-project#24) * modify construct_tx_for_mock_ledger_v1 so it outputs the JamtisPaymentProposals --------- Co-authored-by: DangerousFreedom <monero-inflation-checker@protonmail.com>
jeffro256 · Feb 8, 2024 · ff07abe · ff07abe
1 parent ad18f65
commit ff07abe
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 1 deletion.
diff --git a/src/seraphis_mocks/mock_send_receive.cpp b/src/seraphis_mocks/mock_send_receive.cpp
@@ -228,7 +228,9 @@ void construct_tx_for_mock_ledger_v1(const legacy_mock_keys &local_user_legacy_k
     const std::size_t ref_set_decomp_m,
     const SpBinnedReferenceSetConfigV1 &bin_config,
     const MockLedgerContext &ledger_context,
-    SpTxSquashedV1 &tx_out)
+    SpTxSquashedV1 &tx_out,
+    std::vector<jamtis::JamtisPaymentProposalSelfSendV1> &selfsend_payments_out,
+    std::vector<jamtis::JamtisPaymentProposalV1> &normal_payments_out)
 {
     /// build transaction
 
@@ -250,6 +252,8 @@ void construct_tx_for_mock_ledger_v1(const legacy_mock_keys &local_user_legacy_k
             tools::add_element(normal_payment_proposals));
     }
 
+    normal_payments_out = normal_payment_proposals;
+
     // 3. prepare inputs and finalize outputs
     std::vector<LegacyContextualEnoteRecordV1> legacy_contextual_inputs;
     std::vector<SpContextualEnoteRecordV1> sp_contextual_inputs;
@@ -271,6 +275,8 @@ void construct_tx_for_mock_ledger_v1(const legacy_mock_keys &local_user_legacy_k
             discretized_transaction_fee),
         "construct tx for mock ledger (v1): preparing inputs and outputs failed.");
 
+    selfsend_payments_out = selfsend_payment_proposals;
+
     // 4. tx proposal
     SpTxProposalV1 tx_proposal;
     make_v1_tx_proposal_v1(legacy_contextual_inputs,
@@ -325,6 +331,40 @@ void construct_tx_for_mock_ledger_v1(const legacy_mock_keys &local_user_legacy_k
         tx_out);
 }
 //-------------------------------------------------------------------------------------------------------------------
+void construct_tx_for_mock_ledger_v1(const legacy_mock_keys &local_user_legacy_keys,
+    const jamtis::mocks::jamtis_mock_keys &local_user_sp_keys,
+    const InputSelectorV1 &local_user_input_selector,
+    const FeeCalculator &tx_fee_calculator,
+    const rct::xmr_amount fee_per_tx_weight,
+    const std::size_t max_inputs,
+    const std::vector<std::tuple<rct::xmr_amount, jamtis::JamtisDestinationV1, TxExtra>> &outlays,
+    const std::size_t legacy_ring_size,
+    const std::size_t ref_set_decomp_n,
+    const std::size_t ref_set_decomp_m,
+    const SpBinnedReferenceSetConfigV1 &bin_config,
+    const MockLedgerContext &ledger_context,
+    SpTxSquashedV1 &tx_out)
+{
+    std::vector<jamtis::JamtisPaymentProposalSelfSendV1> selfsend_payments;
+    std::vector<jamtis::JamtisPaymentProposalV1> normal_payments;
+
+    construct_tx_for_mock_ledger_v1(local_user_legacy_keys,
+        local_user_sp_keys,
+        local_user_input_selector,
+        tx_fee_calculator,
+        fee_per_tx_weight,
+        max_inputs,
+        outlays,
+        legacy_ring_size,
+        ref_set_decomp_n,
+        ref_set_decomp_m,
+        bin_config,
+        ledger_context,
+        tx_out,
+        selfsend_payments,
+        normal_payments);
+}
+//-------------------------------------------------------------------------------------------------------------------
 void transfer_funds_single_mock_v1_unconfirmed_sp_only(const jamtis::mocks::jamtis_mock_keys &local_user_sp_keys,
     const InputSelectorV1 &local_user_input_selector,
     const FeeCalculator &tx_fee_calculator,

diff --git a/src/seraphis_mocks/mock_send_receive.h b/src/seraphis_mocks/mock_send_receive.h
@@ -84,6 +84,21 @@ void send_sp_coinbase_amounts_to_users(const std::vector<std::vector<rct::xmr_am
     const std::vector<jamtis::JamtisDestinationV1> &user_addresses,
     MockLedgerContext &ledger_context_inout);
 /// create a seraphis transaction
+void construct_tx_for_mock_ledger_v1(const legacy_mock_keys &local_user_legacy_keys,
+    const jamtis::mocks::jamtis_mock_keys &local_user_sp_keys,
+    const InputSelectorV1 &local_user_input_selector,
+    const FeeCalculator &tx_fee_calculator,
+    const rct::xmr_amount fee_per_tx_weight,
+    const std::size_t max_inputs,
+    const std::vector<std::tuple<rct::xmr_amount, jamtis::JamtisDestinationV1, TxExtra>> &outlays,
+    const std::size_t legacy_ring_size,
+    const std::size_t ref_set_decomp_n,
+    const std::size_t ref_set_decomp_m,
+    const SpBinnedReferenceSetConfigV1 &bin_config,
+    const MockLedgerContext &ledger_context,
+    SpTxSquashedV1 &tx_out,
+    std::vector<jamtis::JamtisPaymentProposalSelfSendV1> &selfsend_payments_out,
+    std::vector<jamtis::JamtisPaymentProposalV1> &normal_payments_out);
 void construct_tx_for_mock_ledger_v1(const legacy_mock_keys &local_user_legacy_keys,
     const jamtis::mocks::jamtis_mock_keys &local_user_sp_keys,
     const InputSelectorV1 &local_user_input_selector,