hot-cold rebase fixes

Author: jeffro256

src/carrot_impl/tx_builder_outputs.cpp

@@ -230,24 +230,6 @@ void make_signable_tx_hash_from_proposal_v1(const CarrotTransactionProposalV1 &t
         signable_tx_hash_out);
 }
 //-------------------------------------------------------------------------------------------------------------------
-void make_signable_tx_hash_from_proposal_v1(const CarrotTransactionProposalV1 &tx_proposal,
-    const view_balance_secret_device *s_view_balance_dev,
-    const view_incoming_key_device *k_view_dev,
-    const key_image_device &key_image_dev,
-    crypto::hash &signable_tx_hash_out)
-{
-    // derive input key images
-    std::vector<crypto::key_image> sorted_input_key_images;
-    get_sorted_input_key_images_from_proposal_v1(tx_proposal, key_image_dev, sorted_input_key_images);
-    CARROT_CHECK_AND_THROW(!sorted_input_key_images.empty(), too_few_inputs, "No inputs in proposal");
-
-    make_signable_tx_hash_from_proposal_v1(tx_proposal,
-        s_view_balance_dev,
-        k_view_dev,
-        sorted_input_key_images,
-        signable_tx_hash_out);
-}
-//-------------------------------------------------------------------------------------------------------------------
 void make_pruned_transaction_from_proposal_v1(const CarrotTransactionProposalV1 &tx_proposal,
     const view_balance_secret_device *s_view_balance_dev,
     const view_incoming_key_device *k_view_dev,