Small touchups + fix test compile errors

Author: j-berman

src/blockchain_db/blockchain_db_utils.cpp

@@ -64,12 +64,6 @@ static uint64_t set_tx_outs_by_last_locked_block(const cryptonote::transaction &
 
     for (std::size_t i = 0; i < tx.vout.size(); ++i)
     {
-        const auto &out = tx.vout[i];
-
-        static_assert(CURRENT_TRANSACTION_VERSION == 2, "This section of code was written with 2 tx versions in mind. "
-            "Revisit this section and update for the new tx version.");
-        CHECK_AND_ASSERT_THROW_MES(tx.version == 1 || tx.version == 2, "encountered unexpected tx version");
-
         TIME_MEASURE_NS_START(getting_commitment);
 
         rct::ctkey ctKey = rct::getCtKey(tx, i);

tests/unit_tests/fake_pruned_blockchain.cpp

@@ -34,6 +34,7 @@
 //local headers
 #include "common/container_helpers.h"
 #include "ringct/rctOps.h"
+#include "ringct/rctSigs.h"
 #include "tx_construction_helpers.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
@@ -303,18 +304,14 @@ void fake_pruned_blockchain::add_block(cryptonote::block &&blk,
                 parsed_block_with_unlocked_miner_tx.block.miner_tx;
             for (size_t local_output_index = 0; local_output_index < unlocked_miner_tx.vout.size(); ++local_output_index)
             {
-                const cryptonote::tx_out &o = unlocked_miner_tx.vout.at(local_output_index);
-                crypto::public_key output_pubkey;
-                CHECK_AND_ASSERT_THROW_MES(cryptonote::get_output_public_key(o, output_pubkey),
-                    "cannot get output pubkey");
-                const rct::key amount_commitment = rct::zeroCommitVartime(o.amount);
-                const fcmp_pp::curve_trees::OutputPair output_pair{output_pubkey, amount_commitment};
+                const rct::ctkey ctkey = rct::getCtKey(unlocked_miner_tx, local_output_index);
+                const fcmp_pp::curve_trees::OutputPair output_pair{rct::rct2pk(ctkey.dest), ctkey.mask};
                 if (!is_valid_output_pair_for_tree(output_pair))
                     continue;
                 const uint64_t global_output_index =
                     parsed_block_with_unlocked_miner_tx.o_indices.indices.at(0).indices.at(local_output_index);
                 new_spendable_outputs.push_back(fcmp_pp::curve_trees::OutputContext{
-                    global_output_index, output_pair
+                    global_output_index, false/*torsion_checked*/, output_pair
                 });
             }
         }
@@ -326,19 +323,14 @@ void fake_pruned_blockchain::add_block(cryptonote::block &&blk,
             const cryptonote::transaction &unlocked_tx = parsed_block_with_unlocked_txs.txes.at(tx_index);
             for (size_t local_output_index = 0; local_output_index < unlocked_tx.vout.size(); ++local_output_index)
             {
-                const cryptonote::tx_out &o = unlocked_tx.vout.at(local_output_index);
-                crypto::public_key output_pubkey;
-                CHECK_AND_ASSERT_THROW_MES(cryptonote::get_output_public_key(o, output_pubkey),
-                    "cannot get output pubkey");
-                const rct::key amount_commitment = o.amount
-                    ? rct::zeroCommitVartime(o.amount) : unlocked_tx.rct_signatures.outPk.at(local_output_index).mask;
-                const fcmp_pp::curve_trees::OutputPair output_pair{output_pubkey, amount_commitment};
+                const rct::ctkey ctkey = rct::getCtKey(unlocked_tx, local_output_index);
+                const fcmp_pp::curve_trees::OutputPair output_pair{rct::rct2pk(ctkey.dest), ctkey.mask};
                 if (!is_valid_output_pair_for_tree(output_pair))
                     continue;
                 const uint64_t global_output_index =
                     parsed_block_with_unlocked_txs.o_indices.indices.at(tx_index + 1).indices.at(local_output_index);
                 new_spendable_outputs.push_back(fcmp_pp::curve_trees::OutputContext{
-                    global_output_index, output_pair
+                    global_output_index, false/*torsion_checked*/, output_pair
                 });
             }
         }