fixes WIP

Author: UkoeHB

src/wallet/tx_builder_multisig.cpp

@@ -105,9 +105,9 @@ static void prepare_legacy_multisig_input_signing_attempt(
     std::unordered_set<rct::key> &all_used_L_inout,
     std::vector<rct::key> &used_L_out,
     std::vector<crypto::secret_key> &local_alpha_out,
-    rct::keyV alpha_G_out,
-    rct::keyV alpha_H_out,
-    rct::keyV alpha_U_out,
+    rct::keyV &alpha_G_out,
+    rct::keyV &alpha_H_out,
+    rct::keyV &alpha_U_out,
     crypto::key_image &key_image_out,
     rct::key &kU_out,
     // Subaddress extension + sender extension

src/wallet/wallet2.cpp

@@ -8396,11 +8396,6 @@ std::string wallet2::save_multisig_tx(multisig_tx_set txs)
       memwipe(&e.multisig_kLRki.k, sizeof(e.multisig_kLRki.k));
   }
 
-  for (auto &ptx: txs.m_ptx)
-  {
-    ptx.construction_data = std::get<wallet::PreCarrotTransactionProposal>(ptx.construction_data);
-  }
-
   // save as binary
   std::ostringstream oss;
   binary_archive<true> ar(oss);
@@ -8607,7 +8602,7 @@ bool wallet2::sign_multisig_tx(multisig_tx_set &exported_txs, std::vector<crypto
     multisig::signing::tx_builder_ringct_t multisig_tx_builder;
 
     // Add local partial signatures
-    if (use_fork_rules(HF_VERSION_CARROT))
+    if (use_fork_rules_offline(HF_VERSION_CARROT))
     {
       const carrot::CarrotTransactionProposalV1 *proposal = std::get_if<carrot::CarrotTransactionProposalV1>(
         &ptx.construction_data
@@ -8703,7 +8698,7 @@ bool wallet2::sign_multisig_tx(multisig_tx_set &exported_txs, std::vector<crypto
         {
           THROW_WALLET_EXCEPTION_IF(found, error::wallet_internal_error, "More than one transaction is final");
 
-          if (use_fork_rules(HF_VERSION_CARROT))
+          if (use_fork_rules_offline(HF_VERSION_CARROT))
           {
             THROW_WALLET_EXCEPTION_IF(!try_finalize_multisig_tx(
               this->get_tree_cache_ref(),

tests/unit_tests/wallet_tx_builder_multisig.cpp

@@ -211,7 +211,6 @@ TEST(wallet_tx_builder_multisig, wallet2_scan_propose_sign_prove_member_and_scan
     {
         w.decrypt_keys("");
         w.import_multisig(multisig_exports, false);
-        // bc.refresh_wallet(w);
         w.encrypt_keys("");
     }