carrot_impl compilation

src/multisig/multisig.cpp

@@ -101,7 +101,7 @@ namespace multisig
     // - later, we add in the components held by other participants
     cryptonote::keypair in_ephemeral;
 
-    if (!cryptonote::generate_key_image_helper(keys, subaddresses, out_key, tx_public_key, additional_tx_public_keys, real_output_index, in_ephemeral, ki, keys.get_device(), use_origin_data, origin_tx_data, sid))
+    if (!cryptonote::generate_key_image_helper(keys, subaddresses, out_key, tx_public_key, additional_tx_public_keys, real_output_index, in_ephemeral, ki, keys.get_device()))
       return false;
     std::unordered_set<crypto::key_image> used;
 

src/multisig/multisig_tx_builder_ringct.cpp

@@ -186,10 +186,7 @@ static bool compute_keys_for_sources(
       src.real_output_in_tx_index,
       tmp_keys,
       tmp_key_image,
-      hwdev,
-      use_origin_data,
-      src.origin_tx_data,
-      sid
+      hwdev
     )) {
       return false;
     }