various fixes for show_transfers, locked_transfer command, blocking of invalid TXs

fixed support for XMRIG mining RandomX; updated genesis_tx for testnet to support RandomX; bumped version
fixed output type checking for all HF versions; bumped TESTNET version; bumped version
2024-07-02 21:00:29 +01:00 · 2024-06-28 13:32:01 +01:00 · 2024-06-24 17:02:19 +01:00 · 2024-06-24 10:10:54 +01:00 · 2024-06-24 10:10:13 +01:00 · 2024-06-23 14:43:38 +01:00
46 changed files with 629 additions and 405 deletions
@@ -1179,21 +1179,38 @@ uint64_t BlockchainLMDB::add_transaction_data(const crypto::hash& blk_hash, cons
      throw0(DB_ERROR(lmdb_error("Failed to add prunable tx prunable hash to db transaction: ", result).c_str()));
  }

+  if (tx.type == cryptonote::transaction_type::MINER) {
+
+    // Update the circulating supply tally because of potentially burnt block_reward proportion
+    MDB_val_copy<uint64_t> source_idx(cryptonote::asset_id_from_type("SAL"));
+    boost::multiprecision::int128_t source_tally = 0;
+    result = read_circulating_supply_data(m_cur_circ_supply_tally, source_idx, source_tally);
+    if (result && (m_height>0 || result != MDB_NOTFOUND))
+      throw0(DB_ERROR(lmdb_error("Failed to get circulating supply tally when adding db transaction: ", result).c_str()));
+    boost::multiprecision::int128_t final_source_tally = source_tally;
+    for (const auto& out: tx.vout) {
+
+      // Sanity check - prevent overflow
+      if (final_source_tally > final_source_tally + out.amount)
+        throw0(DB_ERROR("numeric overflow detected when adding miner_tx for db transaction")); 
+
+      // Fetch the amount for this output
+      final_source_tally += out.amount;
+    }
+    write_circulating_supply_data(m_cur_circ_supply_tally, source_idx, final_source_tally);
+    LOG_PRINT_L1("tx ID " << tx_id << "\n\tTally before burn = " << source_tally.str() << "\n\tTally after burn = " << final_source_tally.str());
+  }
+  
  if (tx.type == cryptonote::transaction_type::BURN || tx.type == cryptonote::transaction_type::CONVERT || tx.type == cryptonote::transaction_type::STAKE) {

    // Get the current tally value for the source currency type
    MDB_val_copy<uint64_t> source_idx(cryptonote::asset_id_from_type(tx.source_asset_type));
    boost::multiprecision::int128_t source_tally = 0;
    result = read_circulating_supply_data(m_cur_circ_supply_tally, source_idx, source_tally);
-    boost::multiprecision::int128_t final_source_tally = source_tally - tx.amount_burnt;
+    boost::multiprecision::int128_t final_source_tally = source_tally - tx.amount_burnt - tx.rct_signatures.txnFee;
    boost::multiprecision::int128_t coinbase = get_block_already_generated_coins(m_height-1);
-    if (source_tally == 0 && result == MDB_NOTFOUND) {
-      if (tx.source_asset_type == "SAL") {
-        final_source_tally += coinbase;
-      } else {
-        throw0(DB_ERROR("burn underflow - asset balance is zero for non-SAL asset"));
-      }
-    }
+    if (result)
+      throw0(DB_ERROR(lmdb_error("Failed to get circulating supply tally when adding db transaction: ", result).c_str()));
    write_circulating_supply_data(m_cur_circ_supply_tally, source_idx, final_source_tally);
    LOG_PRINT_L1("tx ID " << tx_id << "\n\tTally before burn = " << source_tally.str() << "\n\tTally after burn = " << final_source_tally.str());
  }
@@ -1219,6 +1236,8 @@ uint64_t BlockchainLMDB::add_transaction_data(const crypto::hash& blk_hash, cons
      MDB_val_copy<uint64_t> source_idx(asset.first);
      boost::multiprecision::int128_t source_tally = 0;
      result = read_circulating_supply_data(m_cur_circ_supply_tally, source_idx, source_tally);
+      if (result)
+        throw0(DB_ERROR(lmdb_error("Failed to get circulating supply tally when adding db transaction: ", result).c_str()));
      boost::multiprecision::int128_t final_source_tally = source_tally + asset.second;
      boost::multiprecision::int128_t coinbase = get_block_already_generated_coins(m_height-1);
      if (source_tally == 0 && result == MDB_NOTFOUND) {
@@ -1340,7 +1359,29 @@ void BlockchainLMDB::remove_transaction_data(const crypto::hash& tx_hash, const
        throw1(DB_ERROR(lmdb_error("Failed to add removal of prunable hash tx to db transaction: ", result).c_str()));
  }

-  if (tx.type == cryptonote::transaction_type::CONVERT || tx.type == cryptonote::transaction_type::BURN) {
+  if (tx.type == cryptonote::transaction_type::MINER) {
+
+    // Update the circulating supply tally because of potentially burnt block_reward proportion
+    MDB_val_copy<uint64_t> source_idx(cryptonote::asset_id_from_type("SAL"));
+    boost::multiprecision::int128_t source_tally = 0;
+    result = read_circulating_supply_data(m_cur_circ_supply_tally, source_idx, source_tally);
+    if (result && (m_height>0 || result != MDB_NOTFOUND))
+      throw0(DB_ERROR(lmdb_error("remove_transaction_data() - Failed to get circulating supply tally when removing db transaction: ", result).c_str()));
+    boost::multiprecision::int128_t final_source_tally = source_tally;
+    for (const auto& out: tx.vout) {
+
+      // Sanity check - prevent underflow
+      if (final_source_tally < final_source_tally - out.amount)
+        throw0(DB_ERROR("remove_transaction_data() - numeric underflow detected when removing miner_tx for db transaction")); 
+
+      // Fetch the amount for this output
+      final_source_tally -= out.amount;
+    }
+    write_circulating_supply_data(m_cur_circ_supply_tally, source_idx, final_source_tally);
+    LOG_PRINT_L1("tx ID " << tip->data.tx_id << "\n\tTally before burn = " << source_tally.str() << "\n\tTally after burn = " << final_source_tally.str());
+  }
+  
+  if (tx.type == cryptonote::transaction_type::BURN || tx.type == cryptonote::transaction_type::CONVERT || tx.type == cryptonote::transaction_type::STAKE) {

    // Get the current tally value for the source currency type
    MDB_val_copy<uint64_t> source_idx(cryptonote::asset_id_from_type(tx.source_asset_type));
@@ -1348,8 +1389,10 @@ void BlockchainLMDB::remove_transaction_data(const crypto::hash& tx_hash, const
    result = read_circulating_supply_data(m_cur_circ_supply_tally, source_idx, source_tally);
    if (result == MDB_NOTFOUND)
      throw0(DB_ERROR("remove_transaction_data() - minted asset not found"));
-    boost::multiprecision::int128_t final_source_tally = source_tally + tx.amount_burnt;
-    boost::multiprecision::int128_t coinbase = get_block_already_generated_coins(m_height-1);
+    // Sanity check - prevent overflow
+    if (source_tally > source_tally + tx.amount_burnt + tx.rct_signatures.txnFee)
+      throw0(DB_ERROR("remove_transaction_data() - numeric overflow detected when processing C/B/S for db transaction")); 
+    boost::multiprecision::int128_t final_source_tally = source_tally + tx.amount_burnt + tx.rct_signatures.txnFee;
    write_circulating_supply_data(m_cur_circ_supply_tally, source_idx, final_source_tally);
    LOG_PRINT_L1("tx ID " << tip->data.tx_id << "\n\tTally before remint =" << source_tally.str() << "\n\tTally after remint =" << final_source_tally.str());
  }
@@ -1399,17 +1442,28 @@ void BlockchainLMDB::remove_transaction_data(const crypto::hash& tx_hash, const
      throw1(DB_ERROR(lmdb_error("Failed to add removal of tx outputs to db transaction: ", result).c_str()));
  }

+  // SRCG: The following code is designed to clean up the STAKE transactions, but it is very poorly written
+  // Since transactions are ALWAYS supposed to be created in order, it stands that they should ALWAYS be
+  // removed in REVERSE ORDER. Yet the following loop starts from the beginning - this is the worst possible
+  // implementation in performance terms, since it will ALWAYS take the longest possible time to remove the
+  // correct TX.
+
+  // RECODE TO START FROM THE END OF THE DATABASE TABLE, AND THROW AN EXCEPTION IF YOU DO NOT MATCH FIRST TIME!
+  
  // Is there yield_tx data to remove?
  if (tx.type == cryptonote::transaction_type::STAKE) {
    // Remove any yield_tx data for this transaction
    MDB_val_set(val_height, m_height);
    MDB_val v;
+    MDB_cursor_op op = MDB_SET;
    while (1) {
-      result = mdb_cursor_get(m_cur_yield_txs, &val_height, &v, MDB_SET);
-      if (result == MDB_NOTFOUND)
-        break;
-      else if (result)
+      result = mdb_cursor_get(m_cur_yield_txs, &val_height, &v, op);
+      if (result == MDB_NOTFOUND) {
+        throw1(DB_ERROR("Failed to locate yield tx for removal from db transaction"));
+      } else if (result) {
        throw1(DB_ERROR(lmdb_error("Failed to locate yield_tx data for removal: ", result).c_str()));
+      }
+      op = MDB_NEXT_DUP;
      const yield_tx_info yti = *(const yield_tx_info*)v.mv_data;
      if (yti.tx_hash == tx_hash) {
        result = mdb_cursor_del(m_cur_yield_txs, 0);
@@ -3416,10 +3470,9 @@ std::map<std::string,uint64_t> BlockchainLMDB::get_circulating_supply() const
  LOG_PRINT_L3("BlockchainLMDB::" << __func__ << " - mined supply for SAL = " << m_coinbase);

  // SRCG: For V1, we can simply return this number, because there is no other source of coins
-  circulating_supply["SAL"] = m_coinbase;
-  return circulating_supply;
+  //circulating_supply["SAL"] = m_coinbase;
+  //return circulating_supply;
  
-  /*
  check_open();
  
  TXN_PREFIX_RDONLY();
@@ -3460,8 +3513,8 @@ std::map<std::string,uint64_t> BlockchainLMDB::get_circulating_supply() const
  if (circulating_supply.empty()) {
    circulating_supply["SAL"] = m_coinbase;
  }
+  circulating_supply["BURN"] = m_coinbase - circulating_supply["SAL"];
  return circulating_supply;
-  */
 }

 uint64_t BlockchainLMDB::num_outputs() const
@@ -133,59 +133,59 @@ monero_private_headers(blockchain_stats
 	  ${blockchain_stats_private_headers})


-#monero_add_executable(blockchain_import
-#  ${blockchain_import_sources}
-#  ${blockchain_import_private_headers})
+monero_add_executable(blockchain_import
+  ${blockchain_import_sources}
+  ${blockchain_import_private_headers})

-#target_link_libraries(blockchain_import
-#  PRIVATE
-#    crypto
-#    cncrypto
-#    cryptonote_core
-#    blockchain_db
-#    oracle
-#    version
-#    epee
-#    ${Boost_FILESYSTEM_LIBRARY}
-#    ${Boost_SYSTEM_LIBRARY}
-#    ${Boost_THREAD_LIBRARY}
-#    ${CMAKE_THREAD_LIBS_INIT}
-#    ${EXTRA_LIBRARIES}
-#    ${Blocks})
+target_link_libraries(blockchain_import
+  PRIVATE
+    crypto
+    cncrypto
+    cryptonote_core
+    blockchain_db
+    oracle
+    version
+    epee
+    ${Boost_FILESYSTEM_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY}
+    ${Boost_THREAD_LIBRARY}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${EXTRA_LIBRARIES}
+    ${Blocks})

-#if(ARCH_WIDTH)
-#  target_compile_definitions(blockchain_import
-#    PUBLIC -DARCH_WIDTH=${ARCH_WIDTH})
-#endif()
+if(ARCH_WIDTH)
+  target_compile_definitions(blockchain_import
+    PUBLIC -DARCH_WIDTH=${ARCH_WIDTH})
+endif()

-#set_property(TARGET blockchain_import
-#	PROPERTY
-#	OUTPUT_NAME "salvium-blockchain-import")
-#install(TARGETS blockchain_import DESTINATION bin)
+set_property(TARGET blockchain_import
+	PROPERTY
+	OUTPUT_NAME "salvium-blockchain-import")
+install(TARGETS blockchain_import DESTINATION bin)

-#monero_add_executable(blockchain_export
-#  ${blockchain_export_sources}
-#  ${blockchain_export_private_headers})
+monero_add_executable(blockchain_export
+  ${blockchain_export_sources}
+  ${blockchain_export_private_headers})

-#target_link_libraries(blockchain_export
-#  PRIVATE
-#    crypto
-#    cncrypto
-#    cryptonote_core
-#    blockchain_db
-#    oracle
-#    version
-#    epee
-#    ${Boost_FILESYSTEM_LIBRARY}
-#    ${Boost_SYSTEM_LIBRARY}
-#    ${Boost_THREAD_LIBRARY}
-#    ${CMAKE_THREAD_LIBS_INIT}
-#    ${EXTRA_LIBRARIES})
+target_link_libraries(blockchain_export
+  PRIVATE
+    crypto
+    cncrypto
+    cryptonote_core
+    blockchain_db
+    oracle
+    version
+    epee
+    ${Boost_FILESYSTEM_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY}
+    ${Boost_THREAD_LIBRARY}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${EXTRA_LIBRARIES})

-#set_property(TARGET blockchain_export
-#	PROPERTY
-#	OUTPUT_NAME "salvium-blockchain-export")
-#install(TARGETS blockchain_export DESTINATION bin)
+set_property(TARGET blockchain_export
+	PROPERTY
+	OUTPUT_NAME "salvium-blockchain-export")
+install(TARGETS blockchain_export DESTINATION bin)

 monero_add_executable(blockchain_blackball
  ${blockchain_blackball_sources}
@@ -213,95 +213,95 @@ set_property(TARGET blockchain_blackball
 install(TARGETS blockchain_blackball DESTINATION bin)


-#monero_add_executable(blockchain_usage
-#  ${blockchain_usage_sources}
-#  ${blockchain_usage_private_headers})
+monero_add_executable(blockchain_usage
+  ${blockchain_usage_sources}
+  ${blockchain_usage_private_headers})

-#target_link_libraries(blockchain_usage
-#  PRIVATE
-#    crypto
-#    cncrypto
-#    cryptonote_core
-#    blockchain_db
-#    oracle
-#    version
-#    epee
-#    ${Boost_FILESYSTEM_LIBRARY}
-#    ${Boost_SYSTEM_LIBRARY}
-#    ${Boost_THREAD_LIBRARY}
-#    ${CMAKE_THREAD_LIBS_INIT}
-#    ${EXTRA_LIBRARIES})
+target_link_libraries(blockchain_usage
+  PRIVATE
+    crypto
+    cncrypto
+    cryptonote_core
+    blockchain_db
+    oracle
+    version
+    epee
+    ${Boost_FILESYSTEM_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY}
+    ${Boost_THREAD_LIBRARY}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${EXTRA_LIBRARIES})

-#set_property(TARGET blockchain_usage
-#	PROPERTY
-#	OUTPUT_NAME "salvium-blockchain-usage")
-#nstall(TARGETS blockchain_usage DESTINATION bin)
+set_property(TARGET blockchain_usage
+	PROPERTY
+	OUTPUT_NAME "salvium-blockchain-usage")
+install(TARGETS blockchain_usage DESTINATION bin)

-#monero_add_executable(blockchain_ancestry
-#  ${blockchain_ancestry_sources}
-#  ${blockchain_ancestry_private_headers})
+monero_add_executable(blockchain_ancestry
+  ${blockchain_ancestry_sources}
+  ${blockchain_ancestry_private_headers})

-#target_link_libraries(blockchain_ancestry
-#  PRIVATE
-#    cryptonote_core
-#    blockchain_db
-#    oracle
-#    version
-#    epee
-#    ${Boost_FILESYSTEM_LIBRARY}
-#    ${Boost_SYSTEM_LIBRARY}
-#    ${Boost_THREAD_LIBRARY}
-#    ${CMAKE_THREAD_LIBS_INIT}
-#    ${EXTRA_LIBRARIES})
+target_link_libraries(blockchain_ancestry
+  PRIVATE
+    cryptonote_core
+    blockchain_db
+    oracle
+    version
+    epee
+    ${Boost_FILESYSTEM_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY}
+    ${Boost_THREAD_LIBRARY}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${EXTRA_LIBRARIES})

-#set_property(TARGET blockchain_ancestry
-#	PROPERTY
-#	OUTPUT_NAME "salvium-blockchain-ancestry")
-#install(TARGETS blockchain_ancestry DESTINATION bin)
+set_property(TARGET blockchain_ancestry
+	PROPERTY
+	OUTPUT_NAME "salvium-blockchain-ancestry")
+install(TARGETS blockchain_ancestry DESTINATION bin)

-# monero_add_executable(blockchain_depth
-#  ${blockchain_depth_sources}
-#  ${blockchain_depth_private_headers})
+monero_add_executable(blockchain_depth
+  ${blockchain_depth_sources}
+  ${blockchain_depth_private_headers})

-#target_link_libraries(blockchain_depth
-#  PRIVATE
-#    cryptonote_core
-#    blockchain_db
-#    oracle
-#    version
-#    epee
-#    ${Boost_FILESYSTEM_LIBRARY}
-#    ${Boost_SYSTEM_LIBRARY}
-#    ${Boost_THREAD_LIBRARY}
-#    ${CMAKE_THREAD_LIBS_INIT}
-#    ${EXTRA_LIBRARIES})
+target_link_libraries(blockchain_depth
+  PRIVATE
+    cryptonote_core
+    blockchain_db
+    oracle
+    version
+    epee
+    ${Boost_FILESYSTEM_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY}
+    ${Boost_THREAD_LIBRARY}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${EXTRA_LIBRARIES})

-#set_property(TARGET blockchain_depth
-#	PROPERTY
-#	OUTPUT_NAME "salvium-blockchain-depth")
-#install(TARGETS blockchain_depth DESTINATION bin)
+set_property(TARGET blockchain_depth
+	PROPERTY
+	OUTPUT_NAME "salvium-blockchain-depth")
+install(TARGETS blockchain_depth DESTINATION bin)

-#monero_add_executable(blockchain_stats
-#  ${blockchain_stats_sources}
-#  ${blockchain_stats_private_headers})
+monero_add_executable(blockchain_stats
+  ${blockchain_stats_sources}
+  ${blockchain_stats_private_headers})

-#target_link_libraries(blockchain_stats
-#  PRIVATE
-#    cryptonote_core
-#    blockchain_db
-#    oracle
-#    version
-#    epee
-#    ${Boost_FILESYSTEM_LIBRARY}
-#    ${Boost_SYSTEM_LIBRARY}
-#    ${Boost_THREAD_LIBRARY}
-#    ${CMAKE_THREAD_LIBS_INIT}
-#    ${EXTRA_LIBRARIES})
+target_link_libraries(blockchain_stats
+  PRIVATE
+    cryptonote_core
+    blockchain_db
+    oracle
+    version
+    epee
+    ${Boost_FILESYSTEM_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY}
+    ${Boost_THREAD_LIBRARY}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${EXTRA_LIBRARIES})

-#set_property(TARGET blockchain_stats
-#	PROPERTY
-#	OUTPUT_NAME "salvium-blockchain-stats")
-#install(TARGETS blockchain_stats DESTINATION bin)
+set_property(TARGET blockchain_stats
+	PROPERTY
+	OUTPUT_NAME "salvium-blockchain-stats")
+install(TARGETS blockchain_stats DESTINATION bin)

 monero_add_executable(blockchain_prune_known_spent_data
  ${blockchain_prune_known_spent_data_sources}
@@ -959,7 +959,7 @@ static void open_db(const std::string &filename, MDB_env **env, MDB_txn **txn, M
  dbr = mdb_env_set_maxdbs(*env, 1);
  CHECK_AND_ASSERT_THROW_MES(!dbr, "Failed to set max env dbs: " + std::string(mdb_strerror(dbr)));
  const std::string actual_filename = filename;
-  MINFO("Opening monero blockchain at " << actual_filename);
+  MINFO("Opening Salvium blockchain at " << actual_filename);
  dbr = mdb_env_open(*env, actual_filename.c_str(), flags, 0664);
  CHECK_AND_ASSERT_THROW_MES(!dbr, "Failed to open rings database file '"
      + actual_filename + "': " + std::string(mdb_strerror(dbr)));
@@ -174,7 +174,7 @@ int main(int argc, char* argv[])

  if (command_line::get_arg(vm, command_line::arg_help))
  {
-    std::cout << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")" << ENDL << ENDL;
+    std::cout << "Salvium '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")" << ENDL << ENDL;
    std::cout << desc_options << std::endl;
    return 1;
  }
@@ -240,7 +240,7 @@ int main(int argc, char* argv[])
 /*
 * The default output can be plotted with GnuPlot using these commands:
 set key autotitle columnhead
-set title "Monero Blockchain Growth"
+set title "Salvium Blockchain Growth"
 set timefmt "%Y-%m-%d"
 set xdata time
 set xrange ["2014-04-17":*]
@@ -102,7 +102,7 @@ namespace tools

  std::string get_update_url(const std::string &software, const std::string &subdir, const std::string &buildtag, const std::string &version, bool user)
  {
-    const char *base = user ? "https://downloads.salvium.network/" : "https://updates.salvium.network/";
+    const char *base = user ? "https://downloads.salvium.io/" : "https://updates.salvium.io/";
 #ifdef _WIN32
    static const char *extension = strncmp(buildtag.c_str(), "source", 6) ? (strncmp(buildtag.c_str(), "install-", 8) ? ".zip" : ".exe") : ".tar.bz2";
 #elif defined(__APPLE__)
@@ -71,7 +71,7 @@ target_link_libraries(cncrypto
    epee
    randomx
    ${Boost_SYSTEM_LIBRARY}
-    ${SODIUM_LIBRARY}
+    ${sodium_LIBRARIES}
  PRIVATE
    ${EXTRA_LIBRARIES})

@@ -91,7 +91,7 @@ namespace cryptonote
    BEGIN_SERIALIZE_OBJECT()
      FIELD(key)
      FIELD(asset_type)
-      FIELD(unlock_time)
+      VARINT_FIELD(unlock_time)
    END_SERIALIZE()
  };

@@ -82,7 +82,7 @@ namespace cryptonote {
  //-----------------------------------------------------------------------------------------------
  bool get_block_reward(size_t median_weight, size_t current_block_weight, uint64_t already_generated_coins, uint64_t &reward, uint8_t version) {
    static_assert(DIFFICULTY_TARGET_V2%60==0&&DIFFICULTY_TARGET_V1%60==0,"difficulty targets must be a multiple of 60");
-    const int target = version < 2 ? DIFFICULTY_TARGET_V1 : DIFFICULTY_TARGET_V2;
+    const int target = DIFFICULTY_TARGET_V2;
    const int target_minutes = target / 60;
    const int emission_speed_factor = EMISSION_SPEED_FACTOR_PER_MINUTE - (target_minutes-1);

@@ -316,6 +316,53 @@ namespace cryptonote {
  bool operator ==(const cryptonote::block& a, const cryptonote::block& b) {
    return cryptonote::get_block_hash(a) == cryptonote::get_block_hash(b);
  }
+  //--------------------------------------------------------------------------------
+  int compare_hash32_reversed_nbits(const crypto::hash& ha, const crypto::hash& hb, unsigned int nbits)
+  {
+    static_assert(sizeof(uint64_t) * 4 == sizeof(crypto::hash), "hash is wrong size");
+
+    // We have to copy these buffers b/c of the strict aliasing rule
+    uint64_t va[4];
+    memcpy(va, &ha, sizeof(crypto::hash));
+    uint64_t vb[4];
+    memcpy(vb, &hb, sizeof(crypto::hash));
+
+    for (int n = 3; n >= 0 && nbits; --n)
+    {
+      const unsigned int msb_nbits = std::min<unsigned int>(64, nbits);
+      const uint64_t lsb_nbits_dropped = static_cast<uint64_t>(64 - msb_nbits);
+      const uint64_t van = SWAP64LE(va[n]) >> lsb_nbits_dropped;
+      const uint64_t vbn = SWAP64LE(vb[n]) >> lsb_nbits_dropped;
+      nbits -= msb_nbits;
+
+      if (van < vbn) return -1; else if (van > vbn) return 1;
+    }
+
+    return 0;
+  }
+
+  crypto::hash make_hash32_loose_template(unsigned int nbits, const crypto::hash& h)
+  {
+    static_assert(sizeof(uint64_t) * 4 == sizeof(crypto::hash), "hash is wrong size");
+
+    // We have to copy this buffer b/c of the strict aliasing rule
+    uint64_t vh[4];
+    memcpy(vh, &h, sizeof(crypto::hash));
+
+    for (int n = 3; n >= 0; --n)
+    {
+      const unsigned int msb_nbits = std::min<unsigned int>(64, nbits);
+      const uint64_t mask = msb_nbits ? (~((std::uint64_t(1) << (64 - msb_nbits)) - 1)) : 0;
+      nbits -= msb_nbits;
+
+      vh[n] &= SWAP64LE(mask);
+    }
+
+    crypto::hash res;
+    memcpy(&res, vh, sizeof(crypto::hash));
+    return res;
+  }
+  //--------------------------------------------------------------------------------
 }

 //--------------------------------------------------------------------------------
@@ -39,15 +39,6 @@ namespace cryptonote {
  /************************************************************************/
  /*                                                                      */
  /************************************************************************/
-  template<class t_array>
-  struct array_hasher: std::unary_function<t_array&, std::size_t>
-  {
-    std::size_t operator()(const t_array& val) const
-    {
-      return boost::hash_range(&val.data[0], &val.data[sizeof(val.data)]);
-    }
-  };
-

 #pragma pack(push, 1)
  struct public_address_outer_blob
@@ -121,6 +112,41 @@ namespace cryptonote {

  bool operator ==(const cryptonote::transaction& a, const cryptonote::transaction& b);
  bool operator ==(const cryptonote::block& a, const cryptonote::block& b);
+
+  /************************************************************************/
+  /* K-anonymity helper functions                                         */
+  /************************************************************************/
+
+  /**
+   * @brief Compares two hashes up to `nbits` bits in reverse byte order ("LMDB key order")
+   *
+   * The comparison essentially goes from the 31th, 30th, 29th, ..., 0th byte and compares the MSBs
+   * to the LSBs in each byte, up to `nbits` bits. If we use up `nbits` bits before finding a
+   * difference in the bits between the two hashes, we return 0. If we encounter a zero bit in `ha`
+   * where `hb` has a one in that bit place, then we reutrn -1. If the converse scenario happens,
+   * we return a 1. When `nbits` == 256 (there are 256 bits in `crypto::hash`), calling this is
+   * functionally identical to `BlockchainLMDB::compare_hash32`.
+   *
+   * @param ha left hash
+   * @param hb right hash
+   * @param nbits the number of bits to consider, a higher value means a finer comparison
+   * @return int 0 if ha == hb, -1 if ha < hb, 1 if ha > hb
+   */
+  int compare_hash32_reversed_nbits(const crypto::hash& ha, const crypto::hash& hb, unsigned int nbits);
+
+  /**
+   * @brief Make a template which matches `h` in LMDB order up to `nbits` bits, safe for k-anonymous fetching
+   *
+   * To be more technical, this function creates a hash which satifies the following property:
+   *     For all `H_prime` s.t. `0 == compare_hash32_reversed_nbits(real_hash, H_prime, nbits)`,
+   *     `1 > compare_hash32_reversed_nbits(real_hash, H_prime, 256)`.
+   * In other words, we return the "least" hash nbit-equal to `real_hash`.
+   *
+   * @param nbits The number of "MSB" bits to include in the template
+   * @param real_hash The original hash which contains more information than we want to disclose
+   * @return crypto::hash hash template that contains `nbits` bits matching real_hash and no more
+   */
+  crypto::hash make_hash32_loose_template(unsigned int nbits, const crypto::hash& real_hash);
 }

 bool parse_hash256(const std::string &str_hash, crypto::hash& hash);
@@ -1256,6 +1256,11 @@ namespace cryptonote
          << o.target.type().name() << " and " << tx.vout[0].target.type().name() << ", "
          << "expected matching variant types in transaction id=" << get_transaction_hash(tx));
      }
+
+      // Verify the asset type
+      std::string asset_type;
+      CHECK_AND_ASSERT_MES(cryptonote::get_output_asset_type(o, asset_type), false, "failed to get asset type");
+      CHECK_AND_ASSERT_MES(asset_type == "SAL", false, "wrong output asset type:" << asset_type);
    }
    return true;
  }
@@ -1790,6 +1795,7 @@ namespace cryptonote
    CHECK_AND_ASSERT_MES(r, false, "Failed to parse block from blob");
    b.invalidate_hashes();
    b.miner_tx.invalidate_hashes();
+    b.protocol_tx.invalidate_hashes();
    if (block_hash)
    {
      calculate_block_hash(b, *block_hash, &b_blob);
@@ -577,7 +577,7 @@ namespace cryptonote
      b.nonce = nonce;
      crypto::hash h;

-      if ((b.major_version >= RX_BLOCK_VERSION) && !rx_set)
+      if (!rx_set)
      {
        crypto::rx_set_miner_thread(th_local_index, tools::get_max_concurrency());
        rx_set = true;
@@ -52,7 +52,7 @@

 // MONEY_SUPPLY - total number coins to be generated
 #define MONEY_SUPPLY                                    ((uint64_t)(18440000000000000ull)) // 184.4M coins * pow(10, 8)
-#define EMISSION_SPEED_FACTOR_PER_MINUTE                (20)
+#define EMISSION_SPEED_FACTOR_PER_MINUTE                (21)
 #define FINAL_SUBSIDY_PER_MINUTE                        ((uint64_t)30000000) // 3 * pow(10, 7)

 #define BURN_LOCK_PERIOD                                0
@@ -208,15 +208,15 @@
 #define HF_VERSION_REJECT_SIGS_IN_COINBASE      1
 #define HF_VERSION_BULLETPROOF_PLUS             1
 #define HF_VERSION_ENABLE_RETURN                1
+#define HF_VERSION_VIEW_TAGS                    1

 #define HF_VERSION_LONG_TERM_BLOCK_WEIGHT       2
-#define HF_VERSION_VIEW_TAGS                    2
 #define HF_VERSION_2021_SCALING                 2
 #define HF_VERSION_ENABLE_CONVERT               2
 #define HF_VERSION_ENABLE_ORACLE                2
 #define HF_VERSION_SLIPPAGE_YIELD               2

-#define TESTNET_VERSION                         7
+#define TESTNET_VERSION                         11
 #define STAGENET_VERSION                        1

 #define PER_KB_FEE_QUANTIZATION_DECIMALS        8
@@ -298,7 +298,7 @@ namespace config
  // Multisig
  const uint32_t MULTISIG_MAX_SIGNERS{16};

-  std::array<std::string, 3> const ORACLE_URLS = {{"oracle.salvium.network:8443", "oracle.salvium.network:8443", "oracle.salvium.network:8443"}};
+  std::array<std::string, 3> const ORACLE_URLS = {{"oracle.salvium.io:8443", "oracle.salvium.io:8443", "oracle.salvium.io:8443"}};
  
  std::string const ORACLE_PUBLIC_KEY = "-----BEGIN PUBLIC KEY-----\n"
    "MIIDRDCCAjYGByqGSM44BAEwggIpAoIBAQCZP7IJ5PcNvGbWiEqAioKF9wViVxEN\n"
@@ -337,12 +337,12 @@ namespace config
    boost::uuids::uuid const NETWORK_ID = { {
        0x12 ,0x30, 0xF1, 0x71 , 0x61, 0x04 , 0x41, 0x61, 0x17, 0x31, 0x82, 0x53, 0x41, 0x4C, 0x00, TESTNET_VERSION
      } };
-    std::string const GENESIS_TX = "020001ff000180c0d0c7bbbff6030279e90d3da9f9568396c5795833e6aed334d10b6bc08219de189e3ac6fade73c50353414c3c00000000000000210118c0fd33040975cb28c52cca0005a909661afeec61944e42b8646e069fd04209010000";
+    std::string const GENESIS_TX = "020001ff000180c0d0c7bbbff60302838f76f69b70bb0d0f1961a12f6082a033d22285c07d4f12ec93c28197ae2a600353414c3c2101009e8b0abce686c417a1b1344eb7337176bdca90cc928b0facec8a9516190645010000";
    uint32_t const GENESIS_NONCE = 10001;

    const uint64_t STAKE_LOCK_PERIOD = 20;
  
-    std::array<std::string, 3> const ORACLE_URLS = {{"oracle.salvium.network:8443", "oracle.salvium.network:8443", "oracle.salvium.network:8443"}};
+    std::array<std::string, 3> const ORACLE_URLS = {{"oracle.salvium.io:8443", "oracle.salvium.io:8443", "oracle.salvium.io:8443"}};

    std::string const ORACLE_PUBLIC_KEY = "-----BEGIN PUBLIC KEY-----\n"
      "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE5YBxWx1AZCA9jTUk8Pr2uZ9jpfRt\n"
@@ -368,7 +368,7 @@ namespace config

    const uint64_t STAKE_LOCK_PERIOD = 20;
  
-    std::array<std::string, 3> const ORACLE_URLS = {{"oracle.salvium.network:8443", "oracle.salvium.network:8443", "oracle.salvium.network:8443"}};
+    std::array<std::string, 3> const ORACLE_URLS = {{"oracle.salvium.io:8443", "oracle.salvium.io:8443", "oracle.salvium.io:8443"}};

    std::string const ORACLE_PUBLIC_KEY = "-----BEGIN PUBLIC KEY-----\n"
      "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE5YBxWx1AZCA9jTUk8Pr2uZ9jpfRt\n"
@@ -1044,7 +1044,7 @@ size_t Blockchain::recalculate_difficulties(boost::optional<uint64_t> start_heig
  std::vector<difficulty_type> new_cumulative_difficulties;
  for (uint64_t height = start_height; height <= top_height; ++height)
  {
-    size_t target = get_ideal_hard_fork_version(height) < 2 ? DIFFICULTY_TARGET_V1 : DIFFICULTY_TARGET_V2;
+    size_t target = DIFFICULTY_TARGET_V2;
    difficulty_type recalculated_diff = next_difficulty(timestamps, difficulties, target);

    boost::multiprecision::uint256_t recalculated_cum_diff_256 = boost::multiprecision::uint256_t(recalculated_diff) + last_cum_diff;
@@ -1351,7 +1351,7 @@ difficulty_type Blockchain::get_next_difficulty_for_alternative_chain(const std:
  }

  // FIXME: This will fail if fork activation heights are subject to voting
-  size_t target = get_ideal_hard_fork_version(bei.height) < 2 ? DIFFICULTY_TARGET_V1 : DIFFICULTY_TARGET_V2;
+  size_t target = DIFFICULTY_TARGET_V2;

  // calculate the difficulty target for the block and return it
  return next_difficulty(timestamps, cumulative_difficulties, target);
@@ -3555,7 +3555,7 @@ bool Blockchain::check_tx_outputs(const transaction& tx, tx_verification_context
    }
  }

-  // from v15, require view tags on outputs
+  // from v15, require view tags and asset types on outputs
  if (!check_output_types(tx, hf_version))
  {
    tvc.m_invalid_output = true;
@@ -4336,7 +4336,7 @@ bool Blockchain::calculate_yield_payouts(const uint64_t start_height, std::vecto
  LOG_PRINT_L3("Blockchain::" << __func__);

  // Clear the yield payout amounts
-  yield_container.empty();
+  yield_container.clear();

  // Get the YIELD TX information for matured staked coins
  std::vector<cryptonote::yield_tx_info> yield_entries;
@@ -5978,7 +5978,7 @@ bool Blockchain::get_hard_fork_voting_info(uint8_t version, uint32_t &window, ui

 uint64_t Blockchain::get_difficulty_target() const
 {
-  return get_current_hard_fork_version() < 2 ? DIFFICULTY_TARGET_V1 : DIFFICULTY_TARGET_V2;
+  return DIFFICULTY_TARGET_V2;
 }

 std::map<uint64_t, std::tuple<uint64_t, uint64_t, uint64_t>> Blockchain:: get_output_histogram(const std::vector<uint64_t> &amounts, bool unlocked, uint64_t recent_cutoff, uint64_t min_count) const
@@ -170,7 +170,7 @@ namespace cryptonote
  };
  static const command_line::arg_descriptor<std::string> arg_check_updates = {
    "check-updates"
-  , "Check for new versions of monero: [disabled|notify|download|update]"
+  , "Check for new versions of Salvium: [disabled|notify|download|update]"
  , "disabled"
  };
  static const command_line::arg_descriptor<bool> arg_fluffy_blocks  = {
@@ -209,7 +209,7 @@ namespace cryptonote
  static const command_line::arg_descriptor<std::string> arg_block_rate_notify = {
    "block-rate-notify"
  , "Run a program when the block rate undergoes large fluctuations. This might "
-    "be a sign of large amounts of hash rate going on and off the Monero network, "
+    "be a sign of large amounts of hash rate going on and off the Salvium network, "
    "and thus be of potential interest in predicting attacks. %t will be replaced "
    "by the number of minutes for the observation window, %b by the number of "
    "blocks observed within that window, and %e by the number of blocks that was "
@@ -504,7 +504,7 @@ namespace cryptonote
      if (boost::filesystem::exists(old_files / "blockchain.bin"))
      {
        MWARNING("Found old-style blockchain.bin in " << old_files.string());
-        MWARNING("Monero now uses a new format. You can either remove blockchain.bin to start syncing");
+        MWARNING("Salvium now uses a new format. You can either remove blockchain.bin to start syncing");
        MWARNING("the blockchain anew, or use salvium-blockchain-export and salvium-blockchain-import to");
        MWARNING("convert your existing blockchain.bin to the new format. See README.md for instructions.");
        return false;
@@ -1294,6 +1294,7 @@ namespace cryptonote
      std::vector<transaction> txs;
      std::vector<crypto::hash> missed_txs;
      uint64_t coinbase_amount = get_outs_money_amount(b.miner_tx);
+      coinbase_amount += b.miner_tx.amount_burnt;
      this->get_transactions(b.tx_hashes, txs, missed_txs, true);
      uint64_t tx_fee_amount = 0;
      for(const auto& tx: txs)
@@ -1829,7 +1830,7 @@ namespace cryptonote
    {
      std::string main_message;
      if (m_offline)
-        main_message = "The daemon is running offline and will not attempt to sync to the Monero network.";
+        main_message = "The daemon is running offline and will not attempt to sync to the Salvium network.";
      else
        main_message = "The daemon will start synchronizing with the network. This may take a long time to complete.";
      MGINFO_YELLOW(ENDL << "**********************************************************************" << ENDL
@@ -1877,7 +1878,7 @@ namespace cryptonote
  //-----------------------------------------------------------------------------------------------
  bool core::check_updates()
  {
-    static const char software[] = "monero";
+    static const char software[] = "salvium";
 #ifdef BUILD_TAG
    static const char buildtag[] = BOOST_PP_STRINGIZE(BUILD_TAG);
    static const char subdir[] = "cli"; // because it can never be simple
@@ -2072,7 +2073,7 @@ namespace cryptonote
      MDEBUG("blocks in the last " << seconds[n] / 60 << " minutes: " << b << " (probability " << p << ")");
      if (p < threshold)
      {
-        MWARNING("There were " << b << (b == max_blocks_checked ? " or more" : "") << " blocks in the last " << seconds[n] / 60 << " minutes, there might be large hash rate changes, or we might be partitioned, cut off from the Monero network or under attack, or your computer's time is off. Or it could be just sheer bad luck.");
+        MWARNING("There were " << b << (b == max_blocks_checked ? " or more" : "") << " blocks in the last " << seconds[n] / 60 << " minutes, there might be large hash rate changes, or we might be partitioned, cut off from the Salvium network or under attack, or your computer's time is off. Or it could be just sheer bad luck.");

        std::shared_ptr<tools::Notify> block_rate_notify = m_block_rate_notify;
        if (block_rate_notify)
@@ -1236,29 +1236,16 @@ namespace cryptonote

  bool get_block_longhash(const Blockchain *pbc, const blobdata& bd, crypto::hash& res, const uint64_t height, const int major_version, const crypto::hash *seed_hash, const int miners)
  {
-    // block 202612 bug workaround
-    if (height == 202612)
+    crypto::hash hash;
+    if (pbc != NULL)
    {
-      static const std::string longhash_202612 = "84f64766475d51837ac9efbef1926486e58563c95a19fef4aec3254f03000000";
-      epee::string_tools::hex_to_pod(longhash_202612, res);
-      return true;
-    }
-    if (major_version >= RX_BLOCK_VERSION)
+      const uint64_t seed_height = rx_seedheight(height);
+      hash = seed_hash ? *seed_hash : pbc->get_pending_block_id_by_height(seed_height);
+    } else
    {
-      crypto::hash hash;
-      if (pbc != NULL)
-      {
-        const uint64_t seed_height = rx_seedheight(height);
-        hash = seed_hash ? *seed_hash : pbc->get_pending_block_id_by_height(seed_height);
-      } else
-      {
-        memset(&hash, 0, sizeof(hash));  // only happens when generating genesis block
-      }
-      rx_slow_hash(hash.data, bd.data(), bd.size(), res.data);
-    } else {
-      const int pow_variant = major_version >= 7 ? major_version - 6 : 0;
-      crypto::cn_slow_hash(bd.data(), bd.size(), res, pow_variant, height);
+      memset(&hash, 0, sizeof(hash));  // only happens when generating genesis block
    }
+    rx_slow_hash(hash.data, bd.data(), bd.size(), res.data);
    return true;
  }

@@ -260,6 +260,13 @@ namespace cryptonote
      return false;
    }

+    // Check the TX type
+    if (tx.type <= cryptonote::transaction_type::UNSET || tx.type > cryptonote::transaction_type::MAX) {
+      LOG_PRINT_L1("Transaction with id= "<< id << " has invalid type " << (uint8_t)tx.type);
+      tvc.m_verifivation_failed = true;
+      return false;
+    }
+    
    // assume failure during verification steps until success is certain
    tvc.m_verifivation_failed = true;

@@ -52,6 +52,7 @@ namespace cryptonote
    CONVERT = 4,
    BURN = 5,
    STAKE = 6,
-    RETURN = 7
+    RETURN = 7,
+    MAX = 7
  };
 }
@@ -35,7 +35,7 @@

 namespace daemon_args
 {
-  std::string const WINDOWS_SERVICE_NAME = "Monero Daemon";
+  std::string const WINDOWS_SERVICE_NAME = "Salvium Daemon";

  const command_line::arg_descriptor<std::string, false, true, 2> arg_config_file = {
    "config-file"
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022, The Monero Project
+# Copyright (c) 2016-2023, The Monero Project
 #
 # All rights reserved.
 #
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022, The Monero Project
+// Copyright (c) 2017-2023, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022, The Monero Project
+// Copyright (c) 2017-2023, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022, The Monero Project
+// Copyright (c) 2017-2023, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022, The Monero Project
+// Copyright (c) 2017-2023, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022, The Monero Project
+// Copyright (c) 2017-2023, The Monero Project

 // 
 // All rights reserved.
@@ -57,28 +57,28 @@ extern "C"
 //   1     1     52.8     70.4      70.2

 // Pippenger:
-// 	1	2	3	4	5	6	7	8	9	bestN
-// 2	555	598	621	804	1038	1733	2486	5020	8304	1
-// 4	783	747	800	1006	1428	2132	3285	5185	9806	2
-// 8	1174	1071	1095	1286	1640	2398	3869	6378	12080	2
-// 16	2279	1874	1745	1739	2144	2831	4209	6964	12007	4
-// 32	3910	3706	2588	2477	2782	3467	4856	7489	12618	4
-// 64	7184	5429	4710	4368	4010	4672	6027	8559	13684	5
-// 128	14097	10574	8452	7297	6841	6718	8615	10580	15641	6
-// 256	27715	20800	16000	13550	11875	11400	11505	14090	18460	6
-// 512	55100	41250	31740	26570	22030	19830	20760	21380	25215	6
-// 1024	111520	79000	61080	49720	43080	38320	37600	35040	36750	8
-// 2048	219480	162680	122120	102080	83760	70360	66600	63920	66160	8
-// 4096	453320	323080	247240	210200	180040	150240	132440	114920	110560	9
+//      1       2       3       4       5       6       7       8       9       bestN
+// 2    555     598     621     804     1038    1733    2486    5020    8304    1
+// 4    783     747     800     1006    1428    2132    3285    5185    9806    2
+// 8    1174    1071    1095    1286    1640    2398    3869    6378    12080   2
+// 16   2279    1874    1745    1739    2144    2831    4209    6964    12007   4
+// 32   3910    3706    2588    2477    2782    3467    4856    7489    12618   4
+// 64   7184    5429    4710    4368    4010    4672    6027    8559    13684   5
+// 128  14097   10574   8452    7297    6841    6718    8615    10580   15641   6
+// 256  27715   20800   16000   13550   11875   11400   11505   14090   18460   6
+// 512  55100   41250   31740   26570   22030   19830   20760   21380   25215   6
+// 1024 111520  79000   61080   49720   43080   38320   37600   35040   36750   8
+// 2048 219480  162680  122120  102080  83760   70360   66600   63920   66160   8
+// 4096 453320  323080  247240  210200  180040  150240  132440  114920  110560  9

-// 			2	4	8	16	32	64	128	256	512	1024	2048	4096
-// Bos Coster		858	994	1316	1949	3183	5512	9865	17830	33485	63160	124280	246320
-// Straus		226	341	548	980	1870	3538	7039	14490	29020	57200	118640	233640
-// Straus/cached	226	315	485	785	1514	2858	5753	11065	22970	45120	98880	194840
-// Pippenger		555	747	1071	1739	2477	4010	6718	11400	19830	35040	63920	110560
+//                2   4   8     16    32    64    128   256   512   1024  2048    4096
+// Bos Coster     858 994 1316  1949  3183  5512  9865  17830 33485 63160 124280  246320
+// Straus         226 341 548   980   1870  3538  7039  14490 29020 57200 118640  233640
+// Straus/cached  226 315 485   785   1514  2858  5753  11065 22970 45120 98880   194840
+// Pippenger      555 747 1071  1739  2477  4010  6718  11400 19830 35040 63920   110560

-// Best/cached		Straus	Straus	Straus	Straus	Straus	Straus	Straus	Straus	Pip	Pip	Pip	Pip
-// Best/uncached	Straus	Straus	Straus	Straus	Straus	Straus	Pip	Pip	Pip	Pip	Pip	Pip
+// Best/cached    Straus  Straus  Straus  Straus  Straus  Straus  Straus  Straus  Pip Pip Pip Pip
+// Best/uncached  Straus  Straus  Straus  Straus  Straus  Straus  Pip     Pip     Pip Pip Pip Pip

 // New timings:
 //   Pippenger:
@@ -443,7 +443,7 @@ size_t straus_get_cache_size(const std::shared_ptr<straus_cached_data> &cache)
  return sz;
 }

-rct::key straus(const std::vector<MultiexpData> &data, const std::shared_ptr<straus_cached_data> &cache, size_t STEP)
+ge_p3 straus_p3(const std::vector<MultiexpData> &data, const std::shared_ptr<straus_cached_data> &cache, size_t STEP)
 {
  CHECK_AND_ASSERT_THROW_MES(cache == NULL || cache->size >= data.size(), "Cache is too small");
  MULTIEXP_PERF(PERF_TIMER_UNIT(straus, 1000000));
@@ -554,7 +554,13 @@ skipfirst:
    ge_p1p1_to_p3(&res_p3, &p1);
  }

+  return res_p3;
+}
+
+rct::key straus(const std::vector<MultiexpData> &data, const std::shared_ptr<straus_cached_data> &cache, size_t STEP)
+{
  rct::key res;
+  const ge_p3 res_p3 = straus_p3(data, cache, STEP);
  ge_p3_tobytes(res.bytes, &res_p3);
  return res;
 }
@@ -571,14 +577,6 @@ size_t get_pippenger_c(size_t N)
  return 9;
 }

-struct pippenger_cached_data
-{
-  size_t size;
-  ge_cached *cached;
-  pippenger_cached_data(): size(0), cached(NULL) {}
-  ~pippenger_cached_data() { aligned_free(cached); }
-};
-
 std::shared_ptr<pippenger_cached_data> pippenger_init_cache(const std::vector<MultiexpData> &data, size_t start_offset, size_t N)
 {
  MULTIEXP_PERF(PERF_TIMER_START_UNIT(pippenger_init_cache, 1000000));
@@ -586,13 +584,11 @@ std::shared_ptr<pippenger_cached_data> pippenger_init_cache(const std::vector<Mu
  if (N == 0)
    N = data.size() - start_offset;
  CHECK_AND_ASSERT_THROW_MES(N <= data.size() - start_offset, "Bad cache base data");
-  std::shared_ptr<pippenger_cached_data> cache(new pippenger_cached_data());
+  std::shared_ptr<pippenger_cached_data> cache = std::make_shared<pippenger_cached_data>();

-  cache->size = N;
-  cache->cached = (ge_cached*)aligned_realloc(cache->cached, N * sizeof(ge_cached), 4096);
-  CHECK_AND_ASSERT_THROW_MES(cache->cached, "Out of memory");
+  cache->resize(N);
  for (size_t i = 0; i < N; ++i)
-    ge_p3_to_cached(&cache->cached[i], &data[i+start_offset].point);
+    ge_p3_to_cached(&(*cache)[i], &data[i+start_offset].point);

  MULTIEXP_PERF(PERF_TIMER_STOP(pippenger_init_cache));
  return cache;
@@ -600,14 +596,14 @@ std::shared_ptr<pippenger_cached_data> pippenger_init_cache(const std::vector<Mu

 size_t pippenger_get_cache_size(const std::shared_ptr<pippenger_cached_data> &cache)
 {
-  return cache->size * sizeof(*cache->cached);
+  return cache->size() * sizeof(ge_cached);
 }

-rct::key pippenger(const std::vector<MultiexpData> &data, const std::shared_ptr<pippenger_cached_data> &cache, size_t cache_size, size_t c)
+ge_p3 pippenger_p3(const std::vector<MultiexpData> &data, const std::shared_ptr<pippenger_cached_data> &cache, size_t cache_size, size_t c)
 {
  if (cache != NULL && cache_size == 0)
-    cache_size = cache->size;
-  CHECK_AND_ASSERT_THROW_MES(cache == NULL || cache_size <= cache->size, "Cache is too small");
+    cache_size = cache->size();
+  CHECK_AND_ASSERT_THROW_MES(cache == NULL || cache_size <= cache->size(), "Cache is too small");
  if (c == 0)
    c = get_pippenger_c(data.size());
  CHECK_AND_ASSERT_THROW_MES(c <= 9, "c is too large");
@@ -661,9 +657,9 @@ rct::key pippenger(const std::vector<MultiexpData> &data, const std::shared_ptr<
      if (buckets_init[bucket])
      {
        if (i < cache_size)
-          add(buckets[bucket], local_cache->cached[i]);
+          add(buckets[bucket], (*local_cache)[i]);
        else
-          add(buckets[bucket], local_cache_2->cached[i - cache_size]);
+          add(buckets[bucket], (*local_cache_2)[i - cache_size]);
      }
      else
      {
@@ -700,8 +696,14 @@ rct::key pippenger(const std::vector<MultiexpData> &data, const std::shared_ptr<
    }
  }

+  return result;
+}
+
+rct::key pippenger(const std::vector<MultiexpData> &data, const std::shared_ptr<pippenger_cached_data> &cache, const size_t cache_size, const size_t c)
+{
  rct::key res;
-  ge_p3_tobytes(res.bytes, &result);
+  const ge_p3 result_p3 = pippenger_p3(data, cache, cache_size, c);
+  ge_p3_tobytes(res.bytes, &result_p3);
  return res;
 }

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022, The Monero Project
+// Copyright (c) 2017-2023, The Monero Project

 // 
 // All rights reserved.
@@ -35,10 +35,16 @@
 #define MULTIEXP_H

 #include <vector>
+extern "C"
+{
+#include "crypto/crypto-ops.h"
+}
 #include "crypto/crypto.h"
 #include "rctTypes.h"
 #include "misc_log_ex.h"

+#include <boost/align/aligned_allocator.hpp>
+
 namespace rct
 {

@@ -55,17 +61,19 @@ struct MultiexpData {
 };

 struct straus_cached_data;
-struct pippenger_cached_data;
+using pippenger_cached_data = std::vector<ge_cached, boost::alignment::aligned_allocator<ge_cached, 4096>>;

 rct::key bos_coster_heap_conv(std::vector<MultiexpData> data);
 rct::key bos_coster_heap_conv_robust(std::vector<MultiexpData> data);
 std::shared_ptr<straus_cached_data> straus_init_cache(const std::vector<MultiexpData> &data, size_t N =0);
 size_t straus_get_cache_size(const std::shared_ptr<straus_cached_data> &cache);
+ge_p3 straus_p3(const std::vector<MultiexpData> &data, const std::shared_ptr<straus_cached_data> &cache = NULL, size_t STEP = 0);
 rct::key straus(const std::vector<MultiexpData> &data, const std::shared_ptr<straus_cached_data> &cache = NULL, size_t STEP = 0);
 std::shared_ptr<pippenger_cached_data> pippenger_init_cache(const std::vector<MultiexpData> &data, size_t start_offset = 0, size_t N =0);
 size_t pippenger_get_cache_size(const std::shared_ptr<pippenger_cached_data> &cache);
 size_t get_pippenger_c(size_t N);
-rct::key pippenger(const std::vector<MultiexpData> &data, const std::shared_ptr<pippenger_cached_data> &cache = NULL, size_t cache_size = 0, size_t c = 0);
+ge_p3 pippenger_p3(const std::vector<MultiexpData> &data, const std::shared_ptr<pippenger_cached_data> &cache = NULL, size_t cache_size = 0, size_t c = 0);
+rct::key pippenger(const std::vector<MultiexpData> &data, const std::shared_ptr<pippenger_cached_data> &cache = NULL, const size_t cache_size = 0, const size_t c = 0);

 }

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2022, The Monero Project
+// Copyright (c) 2014-2023, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2022, The Monero Project
+// Copyright (c) 2014-2023, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -1,4 +1,4 @@
-// Copyright (c) 2016, Monero Research Labs
+// Copyright (c) 2016-2023, Monero Research Labs
 //
 // Author: Shen Noether <shen.noether@gmx.com>
 //
@@ -671,7 +671,7 @@ namespace rct {

    //Elliptic Curve Diffie Helman: encodes and decodes the amount b and mask a
    // where C= aG + bH
-    static key ecdhHash(const key &k)
+    key genAmountEncodingFactor(const key &k)
    {
        char data[38];
        rct::key hash;
@@ -700,7 +700,7 @@ namespace rct {
        if (v2)
        {
          unmasked.mask = zero();
-          xor8(unmasked.amount, ecdhHash(sharedSec));
+          xor8(unmasked.amount, genAmountEncodingFactor(sharedSec));
        }
        else
        {
@@ -715,7 +715,7 @@ namespace rct {
        if (v2)
        {
          masked.mask = genCommitmentMask(sharedSec);
-          xor8(masked.amount, ecdhHash(sharedSec));
+          xor8(masked.amount, genAmountEncodingFactor(sharedSec));
        }
        else
        {
@@ -1,5 +1,5 @@
 //#define DBG
-// Copyright (c) 2016, Monero Research Labs
+// Copyright (c) 2016-2023, Monero Research Labs
 //
 // Author: Shen Noether <shen.noether@gmx.com>
 //
@@ -184,6 +184,7 @@ namespace rct {

    //Elliptic Curve Diffie Helman: encodes and decodes the amount b and mask a
    // where C= aG + bH
+    key genAmountEncodingFactor(const key &k);
    key genCommitmentMask(const key &sk);
    void ecdhEncode(ecdhTuple & unmasked, const key & sharedSec, bool v2);
    void ecdhDecode(ecdhTuple & masked, const key & sharedSec, bool v2);
@@ -2982,13 +2982,13 @@ namespace cryptonote
    return true;
  }
  //------------------------------------------------------------------------------------------------------------------------------
-  bool core_rpc_server::on_get_circulating_supply(const COMMAND_RPC_GET_CIRCULATING_SUPPLY::request& req, COMMAND_RPC_GET_CIRCULATING_SUPPLY::response& res, epee::json_rpc::error& error_resp, const connection_context *ctx)
+  bool core_rpc_server::on_get_supply_info(const COMMAND_RPC_GET_SUPPLY_INFO::request& req, COMMAND_RPC_GET_SUPPLY_INFO::response& res, epee::json_rpc::error& error_resp, const connection_context *ctx)
  {
-    PERF_TIMER(on_get_circulating_supply);
+    PERF_TIMER(on_get_supply_info);
    std::map<std::string, uint64_t> amounts = m_core.get_blockchain_storage().get_db().get_circulating_supply();
    for (const auto &i: amounts)
    {
-      COMMAND_RPC_GET_CIRCULATING_SUPPLY::supply_entry se(i.first, std::to_string(i.second));
+      COMMAND_RPC_GET_SUPPLY_INFO::supply_entry se(i.first, std::to_string(i.second));
      res.supply_tally.push_back(se);
    }
    res.height = m_core.get_current_blockchain_height();
@@ -3006,20 +3006,44 @@ namespace cryptonote
      return true;
    }
    // Iterate over the cache, supplying the data in a more accessible format
+    res.total_burnt = res.total_staked = res.total_yield = res.yield_per_stake = 0;
    res.yield_data.clear();
    for (const auto& entry: ybi_cache) {
-      // Skip this entry if out-of=range
+
+      // Check for last entry
+      if (entry.first == height - 1) {
+        res.total_staked = entry.second.locked_coins_tally;
+        if (entry.second.locked_coins_tally > 0) {
+          boost::multiprecision::uint128_t yield_per_stake = entry.second.slippage_total_this_block;
+          yield_per_stake *= COIN;
+          yield_per_stake /= entry.second.locked_coins_tally;
+          res.yield_per_stake = yield_per_stake.convert_to<uint64_t>();
+        }
+      }
+      
+      // Skip this entry if out-of-range
      if (req.from_height > 0 and entry.first < req.from_height) continue;
      if (req.to_height > 0 and entry.first > req.to_height) continue;

-      // Clone the data into the response
-      COMMAND_RPC_GET_YIELD_INFO::yield_data_t yd;
-      yd.block_height = entry.second.block_height;
-      yd.slippage_total_this_block = entry.second.slippage_total_this_block;
-      yd.locked_coins_this_block = entry.second.locked_coins_this_block;
-      yd.locked_coins_tally = entry.second.locked_coins_tally;
-      yd.network_health_percentage = entry.second.network_health_percentage;
-      res.yield_data.push_back(yd);
+      // Do we need to include raw data?
+      if (req.include_raw_data) {
+        
+        // Clone the data into the response
+        COMMAND_RPC_GET_YIELD_INFO::yield_data_t yd;
+        yd.block_height = entry.second.block_height;
+        yd.slippage_total_this_block = entry.second.slippage_total_this_block;
+        yd.locked_coins_this_block = entry.second.locked_coins_this_block;
+        yd.locked_coins_tally = entry.second.locked_coins_tally;
+        yd.network_health_percentage = entry.second.network_health_percentage;
+        res.yield_data.push_back(yd);
+      }
+      
+      // Perform the aggregation
+      if (entry.second.locked_coins_tally == 0) {
+        res.total_burnt += entry.second.slippage_total_this_block;
+      } else {
+        res.total_yield += entry.second.slippage_total_this_block;
+      }
    }
    res.status = CORE_RPC_STATUS_OK;
    return true;
@@ -174,7 +174,7 @@ namespace cryptonote
        MAP_JON_RPC_WE("get_output_histogram",   on_get_output_histogram,       COMMAND_RPC_GET_OUTPUT_HISTOGRAM)
        MAP_JON_RPC_WE("get_version",            on_get_version,                COMMAND_RPC_GET_VERSION)
        MAP_JON_RPC_WE_IF("get_coinbase_tx_sum", on_get_coinbase_tx_sum,        COMMAND_RPC_GET_COINBASE_TX_SUM, !m_restricted)
-        MAP_JON_RPC_WE("get_circulating_supply", on_get_circulating_supply,     COMMAND_RPC_GET_CIRCULATING_SUPPLY)
+        MAP_JON_RPC_WE("get_supply_info",        on_get_supply_info,            COMMAND_RPC_GET_SUPPLY_INFO)
        MAP_JON_RPC_WE("get_yield_info",         on_get_yield_info,             COMMAND_RPC_GET_YIELD_INFO)
        MAP_JON_RPC_WE("get_fee_estimate",       on_get_base_fee_estimate,      COMMAND_RPC_GET_BASE_FEE_ESTIMATE)
        MAP_JON_RPC_WE_IF("get_alternate_chains",on_get_alternate_chains,       COMMAND_RPC_GET_ALTERNATE_CHAINS, !m_restricted)
@@ -253,7 +253,7 @@ namespace cryptonote
    bool on_get_output_histogram(const COMMAND_RPC_GET_OUTPUT_HISTOGRAM::request& req, COMMAND_RPC_GET_OUTPUT_HISTOGRAM::response& res, epee::json_rpc::error& error_resp, const connection_context *ctx = NULL);
    bool on_get_version(const COMMAND_RPC_GET_VERSION::request& req, COMMAND_RPC_GET_VERSION::response& res, epee::json_rpc::error& error_resp, const connection_context *ctx = NULL);
    bool on_get_coinbase_tx_sum(const COMMAND_RPC_GET_COINBASE_TX_SUM::request& req, COMMAND_RPC_GET_COINBASE_TX_SUM::response& res, epee::json_rpc::error& error_resp, const connection_context *ctx = NULL);
-    bool on_get_circulating_supply(const COMMAND_RPC_GET_CIRCULATING_SUPPLY::request& req, COMMAND_RPC_GET_CIRCULATING_SUPPLY::response& res, epee::json_rpc::error& error_resp, const connection_context *ctx = NULL);
+    bool on_get_supply_info(const COMMAND_RPC_GET_SUPPLY_INFO::request& req, COMMAND_RPC_GET_SUPPLY_INFO::response& res, epee::json_rpc::error& error_resp, const connection_context *ctx = NULL);
    bool on_get_yield_info(const COMMAND_RPC_GET_YIELD_INFO::request& req, COMMAND_RPC_GET_YIELD_INFO::response& res, epee::json_rpc::error& error_resp, const connection_context *ctx = NULL);
    bool on_get_base_fee_estimate(const COMMAND_RPC_GET_BASE_FEE_ESTIMATE::request& req, COMMAND_RPC_GET_BASE_FEE_ESTIMATE::response& res, epee::json_rpc::error& error_resp, const connection_context *ctx = NULL);
    bool on_get_alternate_chains(const COMMAND_RPC_GET_ALTERNATE_CHAINS::request& req, COMMAND_RPC_GET_ALTERNATE_CHAINS::response& res, epee::json_rpc::error& error_resp, const connection_context *ctx = NULL);
@@ -1294,10 +1294,12 @@ namespace cryptonote
    
    struct request_t
    {
+      bool include_raw_data;
      uint64_t from_height;
      uint64_t to_height;

      BEGIN_KV_SERIALIZE_MAP()
+        KV_SERIALIZE_OPT(include_raw_data, false)
        KV_SERIALIZE_OPT(from_height, (uint64_t)0)
        KV_SERIALIZE_OPT(to_height, (uint64_t)0)
      END_KV_SERIALIZE_MAP()
@@ -1308,9 +1310,17 @@ namespace cryptonote
    struct response_t
    {
      std::string status;
+      uint64_t total_burnt;
+      uint64_t total_staked;
+      uint64_t total_yield;
+      uint64_t yield_per_stake;
      std::vector<COMMAND_RPC_GET_YIELD_INFO::yield_data_t> yield_data;
      BEGIN_KV_SERIALIZE_MAP()
        KV_SERIALIZE(status)
+        KV_SERIALIZE(total_burnt)
+        KV_SERIALIZE(total_staked)
+        KV_SERIALIZE(total_yield)
+        KV_SERIALIZE(yield_per_stake)
        KV_SERIALIZE(yield_data)
      END_KV_SERIALIZE_MAP()
    };
@@ -1440,7 +1450,7 @@ namespace cryptonote
    typedef epee::misc_utils::struct_init<response_t> response;
  };

-  struct COMMAND_RPC_GET_CIRCULATING_SUPPLY
+  struct COMMAND_RPC_GET_SUPPLY_INFO
  {
    struct request_t
    {
@@ -234,16 +234,8 @@ namespace cryptonote

    block = is_current ? info.block : info.previous_block;
    *(uint32_t*)(hashing_blob.data() + 39) = SWAP32LE(nonce);
-    if (block.major_version >= RX_BLOCK_VERSION)
-    {
-      const crypto::hash &seed_hash = is_current ? info.seed_hash : info.previous_seed_hash;
-      crypto::rx_slow_hash(seed_hash.data, hashing_blob.data(), hashing_blob.size(), hash.data);
-    }
-    else
-    {
-      const int cn_variant = hashing_blob[0] >= 7 ? hashing_blob[0] - 6 : 0;
-      crypto::cn_slow_hash(hashing_blob.data(), hashing_blob.size(), hash, cn_variant, cryptonote::get_block_height(block));
-    }
+    const crypto::hash &seed_hash = is_current ? info.seed_hash : info.previous_seed_hash;
+    crypto::rx_slow_hash(seed_hash.data, hashing_blob.data(), hashing_blob.size(), hash.data);
    if (!check_hash(hash, m_diff))
    {
      MWARNING("Payment too low");
@@ -45,7 +45,7 @@ namespace rpc
 bool is_version_string_valid(const std::string& str)
 {
    return std::regex_match(str, std::regex(
-        "^\\d{1,2}(\\.\\d{1,2}){3}(-(release|[0-9a-f]{9}))?$",
+        "^\\d{1,2}(\\.\\d{1,2}){2}(-(release|[0-9a-f]{9}))?.+$",
        std::regex_constants::nosubs
    ));
 }
@@ -239,7 +239,7 @@ namespace
  const char* USAGE_CHECK_SPEND_PROOF("check_spend_proof <txid> <signature_file> [<message>]");
  const char* USAGE_GET_RESERVE_PROOF("get_reserve_proof (all|<amount>) [<message>]");
  const char* USAGE_CHECK_RESERVE_PROOF("check_reserve_proof <address> <signature_file> [<message>]");
-  const char* USAGE_SHOW_TRANSFERS("show_transfers [in|out|all|pending|failed|pool|coinbase] [index=<N1>[,<N2>,...]] [<min_height> [<max_height>]]");
+  const char* USAGE_SHOW_TRANSFERS("show_transfers [in|out|all|pending|failed|pool|coinbase|burnt|staked|yield] [index=<N1>[,<N2>,...]] [<min_height> [<max_height>]]");
  const char* USAGE_UNSPENT_OUTPUTS("unspent_outputs [index=<N1>[,<N2>,...]] [<min_amount> [<max_amount>]]");
  const char* USAGE_RESCAN_BC("rescan_bc [hard|soft|keep_ki] [start_height=0]");
  const char* USAGE_SET_TX_NOTE("set_tx_note <txid> [free text note]");
@@ -2349,7 +2349,7 @@ bool simple_wallet::welcome(const std::vector<std::string> &args)
  message_writer() << tr("Flaws in Salvium may be discovered in the future, and attacks may be developed to peek under some");
  message_writer() << tr("of the layers of privacy Salvium provides. Be safe and practice defense in depth.");
  message_writer() << "";
-  message_writer() << tr("Welcome to Salvium and compliant financial privacy. For more information see https://salvium.network");
+  message_writer() << tr("Welcome to Salvium and compliant financial privacy. For more information see https://salvium.io");
  return true;
 }

@@ -3222,7 +3222,7 @@ bool simple_wallet::help(const std::vector<std::string> &args/* = std::vector<st
    message_writer() << tr("\"price_info\" - Display current pricing information for supported assets.");
    message_writer() << tr("\"supply_info\" - Display circulating supply information.");
    message_writer() << tr("\"yield_info\" - Display current stats on Salvium staking / yield.");
-    message_writer() << tr("\"show_transfers [in|out|pending|failed|pool|coinbase|burnt|yield]\" - Show transactions.");
+    message_writer() << tr("\"show_transfers [in|out|pending|failed|pool|coinbase|burnt|staked|yield]\" - Show transactions.");
    message_writer() << tr("\"sweep_all <address>\" - Send whole balance to another wallet.");
    message_writer() << tr("\"seed\" - Show secret 25 words that can be used to recover this wallet.");
    message_writer() << tr("\"refresh\" - Synchronize wallet with the Salvium network.");
@@ -3427,7 +3427,7 @@ simple_wallet::simple_wallet()
  m_cmd_binder.set_handler("donate",
                           boost::bind(&simple_wallet::on_command, this, &simple_wallet::donate, _1),
                           tr(USAGE_DONATE),
-                           tr("Donate <amount> to the development team (donate.salvium.network)."));
+                           tr("Donate <amount> to the development team (donate.salvium.io)."));
  m_cmd_binder.set_handler("sign_transfer",
                           boost::bind(&simple_wallet::on_command, this, &simple_wallet::sign_transfer, _1),
                           tr(USAGE_SIGN_TRANSFER),
@@ -3606,15 +3606,16 @@ simple_wallet::simple_wallet()
                           // Seemingly broken formatting to compensate for the backslash before the quotes.
                           tr("Show the incoming/outgoing transfers within an optional height range.\n\n"
                              "Output format:\n"
-                              "In or Coinbase:    Block Number, \"block\"|\"in\",              Time, Amount,  Transaction Hash, Payment ID, Subaddress Index,                     \"-\", Note\n"
-                              "Out:               Block Number, \"out\",                     Time, Amount*, Transaction Hash, Payment ID, Fee, Destinations, Input addresses**, \"-\", Note\n"
-                              "Pool:                            \"pool\", \"in\",              Time, Amount,  Transaction Hash, Payment Id, Subaddress Index,                     \"-\", Note, Double Spend Note\n"
-                              "Pending or Failed:               \"failed\"|\"pending\", \"out\", Time, Amount*, Transaction Hash, Payment ID, Fee, Input addresses**,               \"-\", Note\n\n"
+                              "In or Coinbase:    Block Number, \"block\"|\"in\",              Time, Amount, Asset Type, Transaction Hash, Payment ID, Subaddress Index,                     \"-\", Note\n"
+                              "Out:               Block Number, \"out\",                     Time, Amount*, Asset Type, Transaction Hash, Payment ID, Fee, Destinations, Input addresses**, \"-\", Note\n"
+                              "Pool:                            \"pool\", \"in\",              Time, Amount, Asset Type, Transaction Hash, Payment Id, Subaddress Index,                     \"-\", Note, Double Spend Note\n"
+                              "Pending or Failed:               \"failed\"|\"pending\", \"out\", Time, Amount*, Transaction Hash, Payment ID, Fee, Input addresses**,               \"-\", Note\n"
+                              "Staked or Burnt:   Block Number, \"out\",                     Time, Amount*, Asset Type, Transaction Hash, Payment ID, Fee, Input addresses**,               \"-\", Note\n\n"
                              "* Excluding change and fee.\n"
                              "** Set of address indices used as inputs in this transfer."));
  m_cmd_binder.set_handler("export_transfers",
                           boost::bind(&simple_wallet::on_command, this, &simple_wallet::export_transfers, _1),
-                           tr("export_transfers [in|out|all|pending|failed|pool|coinbase|burnt|yield] [index=<N1>[,<N2>,...]] [<min_height> [<max_height>]] [output=<filepath>] [option=<with_keys>]"),
+                           tr("export_transfers [in|out|all|pending|failed|pool|coinbase|burnt|staked|yield] [index=<N1>[,<N2>,...]] [<min_height> [<max_height>]] [output=<filepath>] [option=<with_keys>]"),
                           tr("Export to CSV the incoming/outgoing transfers within an optional height range."));
  m_cmd_binder.set_handler("unspent_outputs",
                           boost::bind(&simple_wallet::on_command, this, &simple_wallet::unspent_outputs, _1),
@@ -6962,7 +6963,7 @@ bool simple_wallet::transfer_main(
          fail_msg_writer() << tr("failed to get blockchain height: ") << err;
          return false;
        }
-        unlock_block = bc_height + locked_blocks;
+        unlock_block = locked_blocks;
        ptx_vector = m_wallet->create_transactions_2(dsts, source_asset, dest_asset, cryptonote::transaction_type::TRANSFER, fake_outs_count, unlock_block /* unlock_time */, priority, extra, m_current_subaddress_account, subaddr_indices, subtract_fee_from_outputs);
      break;
      default:
@@ -7092,7 +7093,7 @@ bool simple_wallet::transfer_main(
        if (transfer_type == TransferLocked)
        {
          float days = locked_blocks / 720.0f;
-          prompt << boost::format(tr(".\nThis transaction (including %s change) will unlock on block %llu, in approximately %s days (assuming 2 minutes per block)")) % cryptonote::print_money(change) % ((unsigned long long)unlock_block) % days;
+          prompt << boost::format(tr(".\nThis transaction (including %s change) will unlock in %llu blocks, approximately %s days (assuming 2 minutes per block)")) % cryptonote::print_money(change) % ((unsigned long long)unlock_block) % days;
        }
        if (!process_ring_members(ptx_vector, prompt, m_wallet->print_ring_members()))
          return false;
@@ -7272,7 +7273,7 @@ bool simple_wallet::locked_transfer(const std::vector<std::string> &args_)
    local_args.pop_back();  
  }
  
-  transfer_main(Transfer, source_asset, source_asset, local_args, false);
+  transfer_main(TransferLocked, source_asset, source_asset, local_args, false);
  return true;
 }
 //----------------------------------------------------------------------------------------------------
@@ -8370,7 +8371,7 @@ bool simple_wallet::supply_info(const std::vector<std::string> &args) {
    //supply_128 /= COIN;
    uint64_t supply = supply_128.convert_to<uint64_t>();

-    message_writer(console_color_default, false) << boost::format(tr("\t%s\t:\t%d")) % supply_asset.first % print_money(supply);
+    message_writer(console_color_default, false) << boost::format(tr("\t%6s : %21.8d")) % supply_asset.first % print_money(supply);

    /*
    // get price
@@ -8411,22 +8412,40 @@ bool simple_wallet::yield_info(const std::vector<std::string> &args) {
    return false;

  // Scan the entries we have received to gather the state (total yield over period captured)
+  uint64_t total_burnt = 0;
  uint64_t total_yield = 0;
+  uint64_t yield_per_stake = 0;
  for (size_t idx=1; idx<ybi_data.size(); ++idx) {
-    total_yield += ybi_data[idx].slippage_total_this_block;
+    if (ybi_data[idx].locked_coins_tally == 0) {
+      total_burnt += ybi_data[idx].slippage_total_this_block;
+    } else {
+      total_yield += ybi_data[idx].slippage_total_this_block;
+    }
  }

+  // Calculate the yield_per_staked_SAL value
+  if (ybi_data.back().locked_coins_tally > 0) {
+    boost::multiprecision::uint128_t yield_per_stake_128 = ybi_data.back().slippage_total_this_block;
+    yield_per_stake_128 *= COIN;
+    yield_per_stake_128 /= ybi_data.back().locked_coins_tally;
+    yield_per_stake = yield_per_stake_128.convert_to<uint64_t>();
+  }
+  
  // Output the necessary information about yield stats
-  message_writer(console_color_default, false) << boost::format(tr("YIELD INFO:\n\tTotal SAL supply: %d\n\tTotal coins locked: %d\n\tYield accrued over last %s: %d"))
-    % print_money(total_supply_128.convert_to<uint64_t>())
+  message_writer(console_color_default, false) << boost::format(tr("YIELD INFO:\n\tSupply coins burnt over last %s: %d\n\tTotal coins locked: %d\n\tYield accrued over last %s: %d\n\tYield per SAL staked: %d"))
+    % get_human_readable_timespan((ybi_data.size()-1) * DIFFICULTY_TARGET_V2)
+    % print_money(total_burnt)
    % print_money(ybi_data.back().locked_coins_tally)
    % get_human_readable_timespan((ybi_data.size()-1) * DIFFICULTY_TARGET_V2)
-    % print_money(total_yield);
+    % print_money(total_yield)
+    % print_money(yield_per_stake);

  // Now summarise our own YIELD TXs that are yet to amture
  tools::wallet2::transfer_container transfers;
  m_wallet->get_transfers(transfers);
-
+  if (transfers.empty())
+    return true;
+  
  std::map<size_t, size_t> payouts;
  message_writer(console_color_default, false) << boost::format(tr("\nSTAKED FUNDS:"));
  for (size_t idx = transfers.size()-1; idx>0; --idx) {
@@ -8508,7 +8527,7 @@ bool simple_wallet::donate(const std::vector<std::string> &args_)
  if (!payment_id_str.empty())
    local_args.push_back(payment_id_str);
  if (m_wallet->nettype() == cryptonote::MAINNET)
-    message_writer() << (boost::format(tr("Donating %s %s to The Salvium Team (donate.salvium.network or %s).")) % amount_str % cryptonote::get_unit(cryptonote::get_default_decimal_point()) % SALVIUM_DONATION_ADDR).str();
+    message_writer() << (boost::format(tr("Donating %s %s to The Salvium Team (donate.salvium.io or %s).")) % amount_str % cryptonote::get_unit(cryptonote::get_default_decimal_point()) % SALVIUM_DONATION_ADDR).str();
  else
    message_writer() << (boost::format(tr("Donating %s %s to %s.")) % amount_str % cryptonote::get_unit(cryptonote::get_default_decimal_point()) % address_str).str();
  transfer(local_args);
@@ -9444,19 +9463,9 @@ bool simple_wallet::get_transfers(std::vector<std::string>& local_args, std::vec
      if (!unlocked)
      {
        locked_msg = "locked";
-        if (pd.m_unlock_time < CRYPTONOTE_MAX_BLOCK_NUMBER)
-        {
-          uint64_t bh = std::max(pd.m_unlock_time, pd.m_block_height + CRYPTONOTE_DEFAULT_TX_SPENDABLE_AGE);
-          if (bh >= last_block_height)
-            locked_msg = std::to_string(bh - last_block_height) + " blks";
-        }
-        else
-        {
-          const uint64_t adjusted_time = m_wallet->get_daemon_adjusted_time();
-          uint64_t threshold = adjusted_time + (m_wallet->use_fork_rules(2, 0) ? CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_SECONDS_V2 : CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_SECONDS_V1);
-          if (threshold < pd.m_unlock_time)
-            locked_msg = get_human_readable_timespan(std::chrono::seconds(pd.m_unlock_time - threshold));
-        }
+        uint64_t bh = pd.m_block_height + std::max(pd.m_unlock_time, (uint64_t)CRYPTONOTE_DEFAULT_TX_SPENDABLE_AGE);
+        if (bh >= last_block_height)
+          locked_msg = std::to_string(bh - last_block_height) + " blks";
      }
      transfers.push_back({
        type,
@@ -9465,7 +9474,7 @@ bool simple_wallet::get_transfers(std::vector<std::string>& local_args, std::vec
        type,
        true,
        pd.m_amount,
-	pd.m_asset_type,
+        pd.m_asset_type,
        pd.m_tx_hash,
        payment_id,
        (pd.m_tx_type == cryptonote::transaction_type::STAKE) ? pd.m_fee : 0,
@@ -9618,7 +9627,7 @@ bool simple_wallet::show_transfers(const std::vector<std::string> &args_)
  std::vector<std::string> local_args = args_;

  if(local_args.size() > 4) {
-    fail_msg_writer() << tr("usage: show_transfers [in|out|all|pending|failed|pool|coinbase] [index=<N1>[,<N2>,...]] [<min_height> [<max_height>]]");
+    fail_msg_writer() << tr("usage: show_transfers [in|out|all|pending|failed|pool|coinbase|burnt|staked|yield] [index=<N1>[,<N2>,...]] [<min_height> [<max_height>]]");
    return true;
  }

@@ -9677,7 +9686,7 @@ bool simple_wallet::export_transfers(const std::vector<std::string>& args_)
  std::vector<std::string> local_args = args_;

  if(local_args.size() > 6) {
-    fail_msg_writer() << tr("usage: export_transfers [in|out|all|pending|failed|pool|coinbase] [index=<N1>[,<N2>,...]] [<min_height> [<max_height>]] [output=<path>] [option=<with_keys>]");
+    fail_msg_writer() << tr("usage: export_transfers [in|out|all|pending|failed|pool|coinbase|burnt|staked|yield] [index=<N1>[,<N2>,...]] [<min_height> [<max_height>]] [output=<path>] [option=<with_keys>]");
    return true;
  }

@@ -1,6 +1,6 @@
-#define DEF_SALVIUM_VERSION_TAG "7f6b8da"
-#define DEF_SALVIUM_VERSION "0.2.8"
-#define DEF_MONERO_VERSION_TAG "@VERSIONTAG@"
+#define DEF_SALVIUM_VERSION_TAG "@VERSIONTAG@"
+#define DEF_SALVIUM_VERSION "0.3.6"
+#define DEF_MONERO_VERSION_TAG "release"
 #define DEF_MONERO_VERSION "0.18.3.3"
 #define DEF_MONERO_RELEASE_NAME "Zero"
 #define DEF_MONERO_VERSION_FULL DEF_SALVIUM_VERSION "-" DEF_SALVIUM_VERSION_TAG ", based on Monero " DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG
@@ -487,7 +487,7 @@ bool message_store::get_signer_index_by_monero_address(const cryptonote::account
      return true;
    }
  }
-  MWARNING("No authorized signer with Monero address " << account_address_to_string(monero_address));
+  MWARNING("No authorized signer with Salvium address " << account_address_to_string(monero_address));
  return false;
 }

@@ -2169,8 +2169,8 @@ void wallet2::scan_output(const cryptonote::transaction &tx, bool miner_tx, cons
    if (!m_encrypt_keys_after_refresh)
    {
      boost::optional<epee::wipeable_string> pwd = m_callback->on_get_password(pool ? "output found in pool" : "output received");
-      THROW_WALLET_EXCEPTION_IF(!pwd, error::password_needed, tr("Password is needed to compute key image for incoming monero"));
-      THROW_WALLET_EXCEPTION_IF(!verify_password(*pwd), error::password_needed, tr("Invalid password: password is needed to compute key image for incoming monero"));
+      THROW_WALLET_EXCEPTION_IF(!pwd, error::password_needed, tr("Password is needed to compute key image for incoming SALs"));
+      THROW_WALLET_EXCEPTION_IF(!verify_password(*pwd), error::password_needed, tr("Invalid password: password is needed to compute key image for incoming SALs"));
      m_encrypt_keys_after_refresh.reset(new wallet_keys_unlocker(*this, m_ask_password == AskPasswordToDecrypt && !m_unattended && !m_watch_only, *pwd));
    }
  }
@@ -2223,14 +2223,17 @@ void wallet2::scan_output(const cryptonote::transaction &tx, bool miner_tx, cons
  {
    tx_scan_info.money_transfered = tools::decodeRct(tx.rct_signatures, tx_scan_info.received->derivation, i, tx_scan_info.mask, m_account.get_device());
  }
-  /*
+  // SRCG: The following "if" block was commented out until v0.3.5 - wonder why???
  if (tx_scan_info.money_transfered == 0)
  {
    MERROR("Invalid output amount, skipping");
    tx_scan_info.error = true;
    return;
  }
-  */
+
+  // Populate the unlock_time
+  THROW_WALLET_EXCEPTION_IF(!cryptonote::get_output_unlock_time(tx.vout[i], tx_scan_info.unlock_time), error::wallet_internal_error, "failed to get output unlock_time");
+  
  outs.push_back(i);
  THROW_WALLET_EXCEPTION_IF(tx_money_got_in_outs[tx_scan_info.received->index][tx_scan_info.asset_type] >= std::numeric_limits<uint64_t>::max() - tx_scan_info.money_transfered,
      error::wallet_internal_error, "Overflow in received amounts");
@@ -2323,10 +2326,10 @@ bool wallet2::get_pricing_record(oracle::pricing_record& pr, const uint64_t heig
 bool wallet2::get_circulating_supply(std::vector<std::pair<std::string, std::string>> &amounts)
 {
  // Issue an RPC call to get the block header (and thus the pricing record) at the specified height
-  cryptonote::COMMAND_RPC_GET_CIRCULATING_SUPPLY::request req = AUTO_VAL_INIT(req);
-  cryptonote::COMMAND_RPC_GET_CIRCULATING_SUPPLY::response res = AUTO_VAL_INIT(res);
+  cryptonote::COMMAND_RPC_GET_SUPPLY_INFO::request req = AUTO_VAL_INIT(req);
+  cryptonote::COMMAND_RPC_GET_SUPPLY_INFO::response res = AUTO_VAL_INIT(res);
  m_daemon_rpc_mutex.lock();
-  bool r = invoke_http_json_rpc("/json_rpc", "get_circulating_supply", req, res, rpc_timeout);
+  bool r = invoke_http_json_rpc("/json_rpc", "get_supply_info", req, res, rpc_timeout);
  m_daemon_rpc_mutex.unlock();
  if (r && res.status == CORE_RPC_STATUS_OK)
  {
@@ -2338,7 +2341,7 @@ bool wallet2::get_circulating_supply(std::vector<std::pair<std::string, std::str
  }
  else
  {
-    MERROR("Failed to retrieve circulating supply from daemon");
+    MERROR("Failed to retrieve supply info from daemon");
    return false;
  }
 }
@@ -2349,6 +2352,7 @@ bool wallet2::get_yield_info(std::vector<cryptonote::yield_block_info>& ybi_data
  cryptonote::COMMAND_RPC_GET_YIELD_INFO::request req = AUTO_VAL_INIT(req);
  cryptonote::COMMAND_RPC_GET_YIELD_INFO::response res = AUTO_VAL_INIT(res);
  m_daemon_rpc_mutex.lock();
+  req.include_raw_data = true;
  bool r = invoke_http_json_rpc("/json_rpc", "get_yield_info", req, res, rpc_timeout);
  m_daemon_rpc_mutex.unlock();
  if (r && res.status == CORE_RPC_STATUS_OK)
@@ -2381,8 +2385,10 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
  if (!miner_tx && !pool)
    process_unconfirmed(txid, tx, height);

-  std::string source_asset = tx.source_asset_type;
-  std::string dest_asset = tx.destination_asset_type;
+  std::string source_asset =
+    (tx.type == cryptonote::transaction_type::MINER) ? "SAL" :
+    (tx.type == cryptonote::transaction_type::PROTOCOL) ? "SAL" :
+    tx.source_asset_type;
  
  // per receiving subaddress index
  std::unordered_map<cryptonote::subaddress_index, std::map<std::string, uint64_t>> tx_money_got_in_outs;
@@ -2406,7 +2412,7 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
  size_t pk_index = 0;
  std::vector<tx_scan_info_t> tx_scan_info(tx.vout.size());
  std::deque<bool> output_found(tx.vout.size(), false);
-  uint64_t total_received_1 = 0;
+  std::map<std::string, uint64_t> total_received_1;
  uint64_t td_origin_idx = ((uint64_t)-1);
  while (!tx.vout.empty())
  {
@@ -2542,12 +2548,6 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
        bool ok = m_account.get_device().derive_subaddress_public_key(output_public_key, derivation, i, pk_change);
        THROW_WALLET_EXCEPTION_IF(!ok, error::wallet_internal_error, "Failed to derive subaddress public key for TRANSFER TX");

-        // Find the TX public key for P_change
-        //auto search = m_salvium_txs.find(pk_change);
-        //if (search != m_salvium_txs.end()) {
-          // Store the origin index for the TX - this is needed when we want to SPEND the returned funds
-          
-	
        check_acc_out_precomp_once(tx.vout[i], derivation, additional_derivations, i, is_out_data_ptr, tx_scan_info[i], output_found[i]);
        THROW_WALLET_EXCEPTION_IF(tx_scan_info[i].error, error::acc_outs_lookup_error, tx, tx_pub_key, m_account.get_keys());
        if (tx_scan_info[i].received)
@@ -2563,6 +2563,19 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote

            // Copy the origin TD
            td_origin_idx = tx_scan_info[i].origin_idx;
+
+            if (tx.type == cryptonote::transaction_type::PROTOCOL) {
+              
+              THROW_WALLET_EXCEPTION_IF(td_origin_idx >= get_num_transfer_details(), error::wallet_internal_error, "cannot locate protocol TX origin in m_transfers");
+              const transfer_details& td_origin = get_transfer_details(td_origin_idx);
+              THROW_WALLET_EXCEPTION_IF(td_origin.m_tx.type != cryptonote::transaction_type::STAKE, error::wallet_internal_error, "incorrect TX type for protocol_tx origin in m_transfers");
+              
+              // Get the output key for the change entry
+              crypto::public_key pk_locked_coins = crypto::null_pkey;
+              THROW_WALLET_EXCEPTION_IF(!get_output_public_key(td_origin.m_tx.vout[td_origin.m_internal_output_index], pk_locked_coins), error::wallet_internal_error, "Failed to get output public key for locked coins");
+              // At this point, we need to clear the "locked coins" count, because otherwise we will be counting yield stakes twice in our balance
+              THROW_WALLET_EXCEPTION_IF(!m_locked_coins.erase(pk_locked_coins), error::wallet_internal_error, "Failed to remove protocol_tx entry from m_locked_coins");
+            }
          }
        }
      }
@@ -2671,7 +2684,11 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
            if (!ignore_callbacks && 0 != m_callback)
              m_callback->on_money_received(height, txid, tx, td.m_amount, td.asset_type, 0, td.m_subaddr_index, spends_one_of_ours(tx), td.m_tx.unlock_time, td.m_td_origin_idx);
          }
-          total_received_1 += amount;
+          std::string asset_type = m_transfers.back().asset_type;
+          if (total_received_1.count(asset_type))
+            total_received_1[asset_type] += amount;
+          else 
+            total_received_1[asset_type] = amount;
          notify = true;

          if (tx.type == cryptonote::transaction_type::CONVERT || tx.type == cryptonote::transaction_type::STAKE) {
@@ -2690,7 +2707,7 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
            if (tx.type == cryptonote::transaction_type::STAKE) {
              // Additionally, with YIELD TXs, we need to update our "balance staked" subtotal, because otherwise our balance is out by the staked coins until they mature!
              // SRCG: must remember to deduct the number of staked coins when they mature!!
-              LOG_ERROR("***** STAKED COINS : " << tx.amount_burnt << " *****");
+              LOG_PRINT_L1("***** STAKED COINS : " << tx.amount_burnt << " *****");
              m_locked_coins.insert({P_change, {0, tx.amount_burnt}});
            }
            
@@ -2782,7 +2799,11 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
            if (!ignore_callbacks && 0 != m_callback)
              m_callback->on_money_received(height, txid, tx, td.m_amount, td.asset_type, burnt, td.m_subaddr_index, spends_one_of_ours(tx), td.m_tx.unlock_time, td.m_td_origin_idx);
          }
-          total_received_1 += extra_amount;
+          std::string asset_type = m_transfers.back().asset_type;
+          if (total_received_1.count(asset_type))
+            total_received_1[asset_type] += extra_amount;
+          else 
+            total_received_1[asset_type] = extra_amount;
          notify = true;
        }
      }
@@ -2967,51 +2988,84 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
      }
    }

-    uint64_t total_received_2 = sub_change;
+    std::map<std::string, uint64_t> total_received_2;
    for (auto& i : tx_money_got_in_outs)
-      total_received_2 += i.second[source_asset];
+      for (auto& asset: i.second)
+        total_received_2[asset.first] += asset.second;

    // only for regular transfers
-    if (source_asset == dest_asset && !miner_tx) {
-      if (total_received_1 != total_received_2)
-      {
-        const el::Level level = el::Level::Warning;
-        MCLOG_RED(level, "global", "**********************************************************************");
-        MCLOG_RED(level, "global", "Consistency failure in amounts received");
-        MCLOG_RED(level, "global", "Check transaction " << txid);
-        MCLOG_RED(level, "global", "**********************************************************************");
-        exit(1);
-        return;
+    if (!miner_tx) {
+      for (auto& asset: total_received_1) {
+        if (asset.second != total_received_2[asset.first]) {
+          //if (source_asset == dest_asset && !miner_tx) {
+          //if (total_received_1 != total_received_2)
+          //{
+          const el::Level level = el::Level::Warning;
+          MCLOG_RED(level, "global", "**********************************************************************");
+          MCLOG_RED(level, "global", "Consistency failure in amounts received");
+          MCLOG_RED(level, "global", "Check transaction " << txid);
+          MCLOG_RED(level, "global", "**********************************************************************");
+          exit(1);
+          return;
+        }
      }
    }

    bool all_same = true;
-    for (auto& i : tx_money_got_in_outs)
-    {
-      payment_details payment;
-      payment.m_tx_hash      = txid;
-      payment.m_fee          = fee;
+    std::vector<payment_details> temp_payments;
+    for (auto& tsi : tx_scan_info) {
+      if (!tsi.received) continue;
+      cryptonote::subaddress_index si = tsi.received->index;
+      bool updated_payment = false;
+      for (auto& payment : temp_payments) {
+        if (payment.m_subaddr_index == si && payment.m_unlock_time == tsi.unlock_time) {
+          // Add to existing payment
+          payment.m_amount += tsi.amount;
+          payment.m_amounts.push_back(tsi.amount);
+          updated_payment = true;
+        }
+        if (updated_payment) break;
+      }
+      if (updated_payment) continue;
+      
+      // Create a new payment
+      temp_payments.push_back(payment_details{});
+      payment_details& payment = temp_payments.back();
+      payment.m_tx_hash       = txid;
+      payment.m_fee           = fee;
      // SRCG - figure out what this needs to be (pretty sure we should never get here with CONVERT!)
-      payment.m_amount       = source_asset == dest_asset ? i.second[dest_asset] : tx.amount_burnt;
-      payment.m_asset_type   = (tx.type == cryptonote::transaction_type::PROTOCOL) ? "SAL" : dest_asset;
-      payment.m_amounts      = tx_amounts_individual_outs[i.first];
-      payment.m_block_height = height;
-      payment.m_unlock_time  = tx.unlock_time; // SRCG: this is incorrect - work out which vout entry it is and query that
-      payment.m_timestamp    = ts;
-      payment.m_coinbase     = miner_tx;
-      payment.m_subaddr_index = i.first;
-      if (tx.type == cryptonote::transaction_type::PROTOCOL) {
+      payment.m_amount        = tsi.amount;
+      payment.m_asset_type    = tsi.asset_type;
+      payment.m_amounts.push_back(tsi.amount);
+      payment.m_block_height  = height;
+      payment.m_unlock_time   = tsi.unlock_time;
+      payment.m_timestamp     = ts;
+      payment.m_coinbase      = miner_tx;
+      payment.m_subaddr_index = si;
+      if (tx.type == cryptonote::transaction_type::MINER) {
+
+        payment.m_unlock_time = CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW; // All protocol_tx payments are coinbase
+        payment.m_tx_type     = cryptonote::transaction_type::MINER;
+          
+      } else if (tx.type == cryptonote::transaction_type::PROTOCOL) {
+
+        payment.m_unlock_time = CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW; // All protocol_tx payments are coinbase
        if (td_origin_idx != ((uint64_t)-1)) {
          // Get the origin TD information
-          payment.m_amount   = payment.m_amounts.empty() ? 0 : payment.m_amounts[0];
-          payment.m_tx_type  = m_transfers[td_origin_idx].m_tx.type;
-          payment.m_fee      = m_transfers[td_origin_idx].m_tx.amount_burnt;
+          payment.m_amount    = payment.m_amounts.empty() ? 0 : payment.m_amounts[0];
+          payment.m_tx_type   = m_transfers[td_origin_idx].m_tx.type;
+          payment.m_fee       = m_transfers[td_origin_idx].m_tx.amount_burnt;
        } else {
          assert(false);
        }
+          
      } else {
-        payment.m_tx_type      = tx.type;
+        payment.m_tx_type     = tx.type;
      }
+    }
+
+    // Now iterate over the temp_payment entries
+    for (auto& payment : temp_payments) {
      if (pool) {
        if (emplace_or_replace(m_unconfirmed_payments, payment_id, pool_payment_details{payment, double_spend_seen}))
          all_same = false;
@@ -3022,7 +3076,6 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
        m_payments.emplace(payment_id, payment);
      LOG_PRINT_L2("Payment found in " << (pool ? "pool" : "block") << ": " << payment_id << " / " << payment.m_tx_hash << " / " << payment.m_amount);
    }
-
    // if it's a pool tx and we already had it, don't notify again
    if (pool && all_same)
      notify = false;
@@ -6863,14 +6916,16 @@ std::map<uint32_t, std::pair<uint64_t, std::pair<uint64_t, uint64_t>>> wallet2::
      }
      else
      {
-        uint64_t unlock_height = td.m_block_height + std::max<uint64_t>(CRYPTONOTE_DEFAULT_TX_SPENDABLE_AGE, CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_BLOCKS);
-        if (td.m_tx.unlock_time < CRYPTONOTE_MAX_BLOCK_NUMBER && td.m_tx.unlock_time > unlock_height)
-          unlock_height = td.m_tx.unlock_time;
-        if (td.m_tx.type == cryptonote::transaction_type::MINER)
+        uint64_t unlock_height = 0;
+        if (td.m_tx.type == cryptonote::transaction_type::MINER || td.m_tx.type == cryptonote::transaction_type::PROTOCOL)
          unlock_height = td.m_block_height + CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW;
-        uint64_t unlock_time = td.m_tx.unlock_time >= CRYPTONOTE_MAX_BLOCK_NUMBER ? td.m_tx.unlock_time : 0;
-        blocks_to_unlock = unlock_height > blockchain_height ? unlock_height - blockchain_height : 0;
-        time_to_unlock = unlock_time > now ? unlock_time - now : 0;
+        else {
+          uint64_t unlock_blocks = 0;
+          THROW_WALLET_EXCEPTION_IF(!cryptonote::get_output_unlock_time(td.m_tx.vout[td.m_internal_output_index], unlock_blocks), error::wallet_internal_error, "failed to get unlock_time");
+          unlock_height = td.m_block_height + ((unlock_blocks > CRYPTONOTE_DEFAULT_TX_SPENDABLE_AGE) ? unlock_blocks : CRYPTONOTE_DEFAULT_TX_SPENDABLE_AGE);
+        }
+        blocks_to_unlock = (unlock_height > blockchain_height) ? unlock_height - blockchain_height : 0;
+        time_to_unlock = 0;
        amount = 0;
      }
      auto found = amount_per_subaddr.find(td.m_subaddr_index.minor);
@@ -14900,7 +14955,7 @@ mms::multisig_wallet_state wallet2::get_multisig_wallet_state() const
  state.num_transfer_details = m_transfers.size();
  if (state.multisig)
  {
-    THROW_WALLET_EXCEPTION_IF(!m_original_keys_available, error::wallet_internal_error, "MMS use not possible because own original Monero address not available");
+    THROW_WALLET_EXCEPTION_IF(!m_original_keys_available, error::wallet_internal_error, "MMS use not possible because own original Salvium address not available");
    state.address = m_original_address;
    state.view_secret_key = m_original_view_secret_key;
  }
@@ -320,12 +320,13 @@ private:
      rct::key mask;
      uint64_t amount;
      std::string asset_type;
+      uint64_t unlock_time;
      uint64_t money_transfered;
      uint64_t origin_idx;
      bool error;
      boost::optional<cryptonote::subaddress_receive_info> received;

-      tx_scan_info_t(): amount(0), asset_type(""), money_transfered(0), origin_idx((uint64_t)-1), error(true) {}
+      tx_scan_info_t(): amount(0), asset_type(""), unlock_time(0), money_transfered(0), origin_idx((uint64_t)-1), error(true) {}
    };

    struct transfer_details
@@ -149,8 +149,7 @@ namespace wallet_args
      if (command_line::get_arg(vm, command_line::arg_help))
      {
        Print(print) << "Salvium '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")" << ENDL;
-        Print(print) << wallet_args::tr("This is the command line monero wallet. It needs to connect to a monero\n"
-												  "daemon to work correctly.") << ENDL;
+        Print(print) << wallet_args::tr("This is the command line Salvium wallet. It needs to connect to a Salvium daemon to work correctly.") << ENDL;
        Print(print) << wallet_args::tr("Usage:") << ENDL << "  " << usage;
        Print(print) << desc_all;
        should_terminate = true;
@@ -153,15 +153,7 @@ bool wallet2::search_for_rpc_payment(uint64_t credits_target, uint32_t n_threads
      tpool.submit(&waiter, [&, i] {
        *(uint32_t*)(hashing_blob.data() + 39) = SWAP32LE(local_nonce-i);
        const uint8_t major_version = hashing_blob[0];
-        if (major_version >= RX_BLOCK_VERSION)
-        {
-          crypto::rx_slow_hash(seed_hash.data, hashing_blob.data(), hashing_blob.size(), hash[i].data);
-        }
-        else
-        {
-          int cn_variant = hashing_blob[0] >= 7 ? hashing_blob[0] - 6 : 0;
-          crypto::cn_slow_hash(hashing_blob.data(), hashing_blob.size(), hash[i], cn_variant, height);
-        }
+        crypto::rx_slow_hash(seed_hash.data, hashing_blob.data(), hashing_blob.size(), hash[i].data);
      });
    }
    waiter.wait();
@@ -320,7 +320,7 @@ namespace tools
    {
      MINFO("The daemon is not set up to background mine.");
      MINFO("With background mining enabled, the daemon will mine when idle and not on battery.");
-      MINFO("Enabling this supports the network you are using, and makes you eligible for receiving new monero");
+      MINFO("Enabling this supports the network you are using, and makes you eligible for receiving new SALs");
      MINFO("Set setup-background-mining to 1 in salvium-wallet-cli to change.");
      return;
    }
@@ -358,6 +358,7 @@ namespace tools
    entry.timestamp = pd.m_timestamp;
    entry.amount = pd.m_amount;
    entry.amounts = pd.m_amounts;
+    entry.asset_type = pd.m_asset_type;
    entry.unlock_time = pd.m_unlock_time;
    entry.locked = !m_wallet->is_transfer_unlocked(pd.m_unlock_time, pd.m_block_height);
    entry.fee = pd.m_fee;
@@ -473,7 +474,7 @@ namespace tools
        balance_info.balance = req.all_accounts ? m_wallet->balance_all(req.strict, asset) : m_wallet->balance(req.account_index, asset, req.strict);
        if (!balance_info.balance)
          continue;
-        balance_info.unlocked_balance = req.all_accounts ? m_wallet->unlocked_balance_all(req.strict, asset, &balance_info.blocks_to_unlock, &balance_info.time_to_unlock) : m_wallet->unlocked_balance(req.account_index, "XHV", req.strict, &balance_info.blocks_to_unlock, &balance_info.time_to_unlock);
+        balance_info.unlocked_balance = req.all_accounts ? m_wallet->unlocked_balance_all(req.strict, asset, &balance_info.blocks_to_unlock, &balance_info.time_to_unlock) : m_wallet->unlocked_balance(req.account_index, asset, req.strict, &balance_info.blocks_to_unlock, &balance_info.time_to_unlock);
        balance_info.multisig_import_needed = m_wallet->multisig() && m_wallet->has_multisig_partial_key_images();
        std::map<uint32_t, std::map<uint32_t, uint64_t>> balance_per_subaddress_per_account;
        std::map<uint32_t, std::map<uint32_t, std::pair<uint64_t, std::pair<uint64_t, uint64_t>>>> unlocked_balance_per_subaddress_per_account;
@@ -914,7 +915,7 @@ namespace tools
          }
          if (addresses.empty())
          {
-            er.message = std::string("No Monero address found at ") + url;
+            er.message = std::string("No Salvium address found at ") + url;
            return {};
          }
          return addresses[0];
@@ -2223,7 +2224,7 @@ namespace tools
        }
        if (addresses.empty())
        {
-          er.message = std::string("No Monero address found at ") + url;
+          er.message = std::string("No Salvium address found at ") + url;
          return {};
        }
        return addresses[0];
@@ -3041,7 +3042,7 @@ namespace tools
        }
        if (addresses.empty())
        {
-          er.message = std::string("No Monero address found at ") + url;
+          er.message = std::string("No Salvium address found at ") + url;
          return {};
        }
        return addresses[0];
@@ -3095,7 +3096,7 @@ namespace tools
          }
          if (addresses.empty())
          {
-            er.message = std::string("No Monero address found at ") + url;
+            er.message = std::string("No Salvium address found at ") + url;
            return {};
          }
          return addresses[0];
@@ -4403,7 +4404,7 @@ namespace tools
            }
            if (addresses.empty())
            {
-              er.message = std::string("No Monero address found at ") + url;
+              er.message = std::string("No Salvium address found at ") + url;
              return {};
            }
            address = addresses[0];
@@ -4780,7 +4781,7 @@ int main(int argc, char** argv) {
  std::tie(vm, should_terminate) = wallet_args::main(
    argc, argv,
    "salvium-wallet-rpc [--wallet-file=<file>|--generate-from-json=<file>|--wallet-dir=<directory>] [--rpc-bind-port=<port>]",
-    tools::wallet_rpc_server::tr("This is the RPC monero wallet. It needs to connect to a monero\ndaemon to work correctly."),
+    tools::wallet_rpc_server::tr("This is the RPC Salvium wallet. It needs to connect to a Salvium daemon to work correctly."),
    desc_params,
    po::positional_options_description(),
    [](const std::string &s, bool emphasis){ tools::scoped_message_writer(emphasis ? epee::console_color_white : epee::console_color_default, true) << s; },
@@ -1439,6 +1439,7 @@ namespace wallet_rpc
    uint64_t amount;
    amounts_container amounts;
    uint64_t fee;
+    std::string asset_type;
    std::string note;
    std::list<transfer_destination> destinations;
    std::string type;
@@ -1460,6 +1461,7 @@ namespace wallet_rpc
      KV_SERIALIZE(amounts);
      KV_SERIALIZE(fee);
      KV_SERIALIZE(note);
+      KV_SERIALIZE(asset_type);
      KV_SERIALIZE(destinations);
      KV_SERIALIZE(type);
      KV_SERIALIZE(unlock_time)
Author	SHA1	Message	Date
Some Random Crypto Guy	847db19867	various fixes for show_transfers, locked_transfer command, blocking of invalid TXs	2024-07-02 21:00:29 +01:00
Some Random Crypto Guy	0663a5ead7	fixed support for XMRIG mining RandomX; updated genesis_tx for testnet to support RandomX; bumped version	2024-06-28 13:32:01 +01:00
Some Random Crypto Guy	7ad904a9ae	fixed output type checking for all HF versions; bumped TESTNET version; bumped version	2024-06-24 17:02:19 +01:00
Some Random Crypto Guy	12cf6be402	Merge branch 'main' into develop	2024-06-24 10:10:54 +01:00
Some Random Crypto Guy	292845d721	changed some errant monero strings to salvium	2024-06-24 10:10:13 +01:00
Some Random Crypto Guy	9bc0ccc14d	bumped version	2024-06-23 14:43:38 +01:00
Some Random Crypto Guy	c20ab30963	fixed error when popping blocks containing multiple STAKE TXs; fixed 'version' command in daemon; bumped version number	2024-06-23 08:56:59 +01:00
Some Random Crypto Guy	3e012bc1fb	fixed segfault in clean wallet when calling yield_info	2024-06-22 20:34:40 +01:00
Some Random Crypto Guy	f07d3942e1	fixed stake returned wallet balance; updated yield_info and supply_info commands	2024-06-22 19:40:19 +01:00
Neil Coggins	b93cf3a2d0	bumped chain version; updated premine wallet for testnet	2024-06-21 14:16:20 +01:00
Some Random Crypto Guy	9ce266cea2	changes to some URLs to .io domain	2024-06-21 12:58:14 +01:00
Some Random Crypto Guy	193a22d55c	fixed circulating supply calculation; more rebranding; bumped version number to v0.3.0	2024-06-20 12:02:43 +01:00
Some Random Crypto Guy	2f08b2fe2e	Fixed bug in handling of yield payouts	2024-06-18 23:48:45 +01:00
Some Random Crypto Guy	6404d34e33	added K-anonymity helper functions	2024-06-18 23:47:00 +01:00
Some Random Crypto Guy	f41c20ee7c	updated ringct function libraries; fixed build issue with blockchain_utilities	2024-06-18 23:16:45 +01:00
Some Random Crypto Guy	7bb90f57d4	updated external modules	2024-06-18 21:31:00 +01:00