carrot+fcmp: test stateless hot/cold sign

Author: jeffro256

src/wallet/hot_cold.cpp

@@ -336,6 +336,37 @@ static std::vector<RerandomizationScalars> expand_rerandomization_scalars(const
 }
 //-------------------------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------------------------
+static std::function<carrot::InputProposalV1(const crypto::public_key&)> extend_supplemental_input_proposals_fetcher(
+    const std::function<carrot::InputProposalV1(const crypto::public_key&)> &supplemental_input_proposals,
+    const UnsignedCarrotTransactionSetV1 &unsigned_txs,
+    const carrot::cryptonote_hierarchy_address_device &addr_dev)
+{
+    // fake key image device
+    struct dummy_key_image_device: public carrot::key_image_device
+    {
+        crypto::key_image derive_key_image(const carrot::OutputOpeningHintVariant&) const final
+        { return {}; }
+    };
+
+    // collect new in-set transfers by one-time address (w/o correct key images)
+    std::unordered_map<crypto::public_key, carrot::InputProposalV1> inset_input_proposals;
+    for (const exported_transfer_details_variant &etd : unsigned_txs.new_transfers)
+    {
+        const wallet2_basic::transfer_details td = import_cold_output(etd, addr_dev, dummy_key_image_device());
+        inset_input_proposals.emplace(td.get_public_key(), make_sal_opening_hint_from_transfer_details(td));
+    }
+
+    // try to find in-set first, then use backup supplemental callback
+    return [&, inset_input_proposals](const crypto::public_key &ota) -> carrot::InputProposalV1
+    {
+        const auto inset_it = inset_input_proposals.find(ota);
+        if (inset_it != inset_input_proposals.cend())
+            return inset_it->second;
+        return supplemental_input_proposals(ota);
+    };
+}
+//-------------------------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------------------------
 static crypto::hash ki2hash(const crypto::key_image &ki)
 {
     return carrot::raw_byte_convert<crypto::hash>(ki);
@@ -898,28 +929,8 @@ void expand_carrot_transaction_proposals(const UnsignedCarrotTransactionSetV1 &u
     tx_proposals_out.clear();
     tx_proposals_out.reserve(unsigned_txs.tx_proposals.size());
 
-    // fake key image device
-    struct dummy_key_image_device: public carrot::key_image_device
-    {
-        crypto::key_image derive_key_image(const carrot::OutputOpeningHintVariant&) const final
-        { return {}; }
-    };
-
-    // collect new in-set transfers by one-time address (w/o correct key images)
-    std::unordered_map<crypto::public_key, carrot::InputProposalV1> inset_input_proposals;
-    for (const exported_transfer_details_variant &etd : unsigned_txs.new_transfers)
-    {
-        const wallet2_basic::transfer_details td = import_cold_output(etd, addr_dev, dummy_key_image_device());
-        inset_input_proposals.emplace(td.get_public_key(), make_sal_opening_hint_from_transfer_details(td));
-    }
-
-    const auto supplemental_and_inset_input_proposals = [&](const crypto::public_key &ota) -> carrot::InputProposalV1
-    {
-        const auto inset_it = inset_input_proposals.find(ota);
-        if (inset_it != inset_input_proposals.cend())
-            return inset_it->second;
-        return supplemental_input_proposals(ota);
-    };
+    const auto supplemental_and_inset_input_proposals = extend_supplemental_input_proposals_fetcher(
+        supplemental_input_proposals, unsigned_txs, addr_dev);
 
     for (const HotColdCarrotTransactionProposalV1 &cold_tx_proposal : unsigned_txs.tx_proposals)
     {
@@ -1304,6 +1315,10 @@ void sign_carrot_tx_set_v1(const UnsignedCarrotTransactionSetV1 &unsigned_txs,
     const carrot::generate_image_key_ram_borrowed_device generate_image_dev(k_spend);
     const carrot::key_image_device_composed key_image_dev(generate_image_dev, hybrid_addr_dev, nullptr, &addr_dev);
 
+    // fetcher of input proposals / opening hints which tries provided in-set first
+    const auto supplemental_and_inset_input_proposals = extend_supplemental_input_proposals_fetcher(
+        supplemental_opening_hints, unsigned_txs, addr_dev);
+
     // for each hot/cold tx proposal...
     for (const HotColdCarrotTransactionProposalV1 &tx_proposal : unsigned_txs.tx_proposals)
     {
@@ -1312,7 +1327,7 @@ void sign_carrot_tx_set_v1(const UnsignedCarrotTransactionSetV1 &unsigned_txs,
         std::vector<crypto::key_image> input_key_images;
         std::vector<FcmpRerandomizedOutputCompressed> rerandomized_outputs;
         expand_carrot_transaction_proposal_and_rerandomized_outputs(tx_proposal,
-            supplemental_opening_hints,
+            supplemental_and_inset_input_proposals,
             addr_dev,
             key_image_dev,
             expanded_tx_proposal,

tests/unit_tests/tx_construction_helpers.cpp

@@ -358,6 +358,7 @@ cryptonote::transaction construct_pre_carrot_tx_with_fake_inputs(
     std::vector<stripped_down_tx_source_entry_t> &&stripped_sources,
     std::vector<cryptonote::tx_destination_entry> &destinations,
     const boost::optional<cryptonote::account_public_address> &change_addr,
+    const crypto::hash &payment_id,
     const rct::xmr_amount fee,
     const uint8_t hf_version,
     const bool sweep_unmixable_override)
@@ -369,7 +370,7 @@ cryptonote::transaction construct_pre_carrot_tx_with_fake_inputs(
         std::forward<std::vector<stripped_down_tx_source_entry_t>>(stripped_sources),
         destinations,
         change_addr,
-        crypto::null_hash,
+        payment_id,
         fee,
         hf_version,
         dummy_main_tx_privkey,
@@ -379,6 +380,7 @@ cryptonote::transaction construct_pre_carrot_tx_with_fake_inputs(
 //----------------------------------------------------------------------------------------------------------------------
 cryptonote::transaction construct_pre_carrot_tx_with_fake_inputs(
     std::vector<cryptonote::tx_destination_entry> &destinations,
+    const crypto::hash &payment_id,
     const rct::xmr_amount fee,
     const uint8_t hf_version,
     const bool sweep_unmixable_override)
@@ -394,6 +396,20 @@ cryptonote::transaction construct_pre_carrot_tx_with_fake_inputs(
         /*stripped_sources=*/{},
         destinations,
         /*change_addr*/boost::none,
+        payment_id,
+        fee,
+        hf_version,
+        sweep_unmixable_override);
+}
+//----------------------------------------------------------------------------------------------------------------------
+cryptonote::transaction construct_pre_carrot_tx_with_fake_inputs(
+    std::vector<cryptonote::tx_destination_entry> &destinations,
+    const rct::xmr_amount fee,
+    const uint8_t hf_version,
+    const bool sweep_unmixable_override)
+{
+    return construct_pre_carrot_tx_with_fake_inputs(destinations,
+        crypto::null_hash,
         fee,
         hf_version,
         sweep_unmixable_override);

tests/unit_tests/tx_construction_helpers.h

@@ -97,6 +97,15 @@ cryptonote::transaction construct_pre_carrot_tx_with_fake_inputs(
     std::vector<stripped_down_tx_source_entry_t> &&stripped_sources,
     std::vector<cryptonote::tx_destination_entry> &destinations,
     const boost::optional<cryptonote::account_public_address> &change_addr,
+    const crypto::hash &payment_id,
+    const rct::xmr_amount fee,
+    const uint8_t hf_version,
+    const bool sweep_unmixable_override = false);
+//----------------------------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------------------------------------
+cryptonote::transaction construct_pre_carrot_tx_with_fake_inputs(
+    std::vector<cryptonote::tx_destination_entry> &destinations,
+    const crypto::hash &payment_id,
     const rct::xmr_amount fee,
     const uint8_t hf_version,
     const bool sweep_unmixable_override = false);