use the version to determine the fork instead of the block height

Author: gutongjiang

src/cryptonote_basic/cryptonote_basic_impl.cpp

@@ -81,15 +81,13 @@ namespace cryptonote {
     return CRYPTONOTE_MAX_TX_SIZE;
   }
   //-----------------------------------------------------------------------------------------------
-  //bool get_block_reward(size_t median_weight, size_t current_block_weight, uint64_t already_generated_coins, uint64_t &reward, uint8_t version) {
-  bool get_block_reward(size_t median_weight, size_t current_block_weight, uint64_t already_generated_coins, uint64_t &reward, uint8_t version, bool fork) {
+  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_minutes = target / 60;
     const int emission_speed_factor = EMISSION_SPEED_FACTOR_PER_MINUTE - (target_minutes-1);
 
-    // uint64_t base_reward = version < 0xa7 ? (MONEY_SUPPLY - already_generated_coins) >> emission_speed_factor : MONERO_BLOCK_REWARD;
-    uint64_t base_reward = fork ? MONERO_BLOCK_REWARD : (MONEY_SUPPLY - already_generated_coins) >> emission_speed_factor;
+    uint64_t base_reward = version < 0xa7 ? (MONEY_SUPPLY - already_generated_coins) >> emission_speed_factor : MONERO_BLOCK_REWARD;
     if (base_reward < FINAL_SUBSIDY_PER_MINUTE*target_minutes)
     {
       base_reward = FINAL_SUBSIDY_PER_MINUTE*target_minutes;

src/cryptonote_basic/cryptonote_basic_impl.h

@@ -88,8 +88,7 @@ namespace cryptonote {
   /************************************************************************/
   size_t get_min_block_weight(uint8_t version);
   size_t get_max_tx_size();
-  //bool get_block_reward(size_t median_weight, size_t current_block_weight, uint64_t already_generated_coins, uint64_t &reward, uint8_t version);
-  bool get_block_reward(size_t median_weight, size_t current_block_weight, uint64_t already_generated_coins, uint64_t &reward, uint8_t version, bool fork);
+  bool get_block_reward(size_t median_weight, size_t current_block_weight, uint64_t already_generated_coins, uint64_t &reward, uint8_t version);
   uint8_t get_account_address_checksum(const public_address_outer_blob& bl);
   uint8_t get_account_integrated_address_checksum(const public_integrated_address_outer_blob& bl);
 

src/cryptonote_core/blockchain.cpp

@@ -108,8 +108,8 @@ static const struct {
   // version 6 starts from block 1400000, which is on or around the 16th of September, 2017. Fork time finalised on 2017-08-18.
   { 6, 1400000, 0, 1503046577 },
 
-  // version 0xa7 starts from block 1881040 , timestamp after block 1876000 + 1week
-//  { 0xa7, 1881040, 0, 1561887557 + 7 * 24 * 60 * 60 },
+  // version 0xa7 starts from block 1906800
+  { 0xa7, 1996800, 0, 1565587533 },
 };
 static const uint64_t mainnet_hard_fork_version_1_till = 1009826;
 
@@ -1284,8 +1284,7 @@ bool Blockchain::validate_miner_transaction(const block& b, size_t cumulative_bl
 
   std::vector<uint64_t> last_blocks_weights;
   get_last_n_blocks_weights(last_blocks_weights, CRYPTONOTE_REWARD_BLOCKS_WINDOW);
-  bool fork = height >= TEST_NEW_BLOCK_REWARD_HEIGHT;
-  if (!get_block_reward(epee::misc_utils::median(last_blocks_weights), cumulative_block_weight, already_generated_coins, base_reward, version, fork))
+  if (!get_block_reward(epee::misc_utils::median(last_blocks_weights), cumulative_block_weight, already_generated_coins, base_reward, version))
   {
     MERROR_VER("block weight " << cumulative_block_weight << " is bigger than allowed for this blockchain");
     return false;
@@ -1319,6 +1318,7 @@ bool Blockchain::validate_miner_transaction(const block& b, size_t cumulative_bl
   if (m_fundctl.funding_enabled(height))
   {
 //    bool ret = fundctl.check_block_funding(miner_reward_amount, funding_amount, base_reward + fee);
+    bool fork = height >= DIFFICULTY_ADJUST_HEIGHT;
     bool ret = m_fundctl.check_block_funding(miner_reward_amount, funding_amount, base_reward + fee, fork);
     MINFO("miner_reward_amount=" << miner_reward_amount << ", funding_amount=" << funding_amount << ", money_in_use=" << (base_reward + fee));
     CHECK_AND_ASSERT_MES(ret, false, "check reward failed");
@@ -1519,8 +1519,7 @@ bool Blockchain::create_block_template(block& b, const crypto::hash *from_block,
 
   size_t txs_weight;
   uint64_t fee;
-  bool fork = height >= TEST_NEW_BLOCK_REWARD_HEIGHT;
-  if (!m_tx_pool.fill_block_template(b, median_weight, already_generated_coins, txs_weight, fee, expected_reward, b.major_version, fork))
+  if (!m_tx_pool.fill_block_template(b, median_weight, already_generated_coins, txs_weight, fee, expected_reward, b.major_version))
   {
     return false;
   }
@@ -3331,8 +3330,7 @@ bool Blockchain::check_fee(size_t tx_weight, uint64_t fee) const
     median = m_current_block_cumul_weight_limit / 2;
     const uint64_t blockchain_height = m_db->height();
     already_generated_coins = blockchain_height ? m_db->get_block_already_generated_coins(blockchain_height - 1) : 0;
-    bool fork = blockchain_height >= TEST_NEW_BLOCK_REWARD_HEIGHT;
-    if (!get_block_reward(median, 1, already_generated_coins, base_reward, version, fork))
+    if (!get_block_reward(median, 1, already_generated_coins, base_reward, version))
       return false;
   }
 
@@ -3398,8 +3396,7 @@ uint64_t Blockchain::get_dynamic_base_fee_estimate(uint64_t grace_blocks) const
 
   uint64_t already_generated_coins = db_height ? m_db->get_block_already_generated_coins(db_height - 1) : 0;
   uint64_t base_reward;
-  bool fork = db_height >= TEST_NEW_BLOCK_REWARD_HEIGHT;
-  if (!get_block_reward(median, 1, already_generated_coins, base_reward, version, fork))
+  if (!get_block_reward(median, 1, already_generated_coins, base_reward, version))
   {
     MERROR("Failed to determine block reward, using placeholder " << print_money(BLOCK_REWARD_OVERESTIMATE) << " as a high bound");
     base_reward = BLOCK_REWARD_OVERESTIMATE;

src/cryptonote_core/blockfunding.h

@@ -38,9 +38,6 @@
 #include "cryptonote_basic/verification_context.h"
 #include "crypto/hash.h"
 
-// just for test
-#define TEST_NEW_BLOCK_REWARD_HEIGHT 1995000
-
 namespace cryptonote{
     class BlockFunding
     {

src/cryptonote_core/cryptonote_tx_utils.cpp

@@ -97,8 +97,7 @@ namespace cryptonote
     CHECK_AND_ASSERT_MES(fundctl.init(nettype), false, "init fundctl failed");
 
     uint64_t block_reward;
-    bool fork = height >= TEST_NEW_BLOCK_REWARD_HEIGHT;
-    if(!get_block_reward(median_weight, current_block_weight, already_generated_coins, block_reward, hard_fork_version, fork))
+    if(!get_block_reward(median_weight, current_block_weight, already_generated_coins, block_reward, hard_fork_version))
     {
       LOG_PRINT_L0("Block is too big");
       return false;

src/cryptonote_core/tx_pool.cpp

@@ -1166,7 +1166,7 @@ namespace cryptonote
   }
   //---------------------------------------------------------------------------------
   //TODO: investigate whether boolean return is appropriate
-  bool tx_memory_pool::fill_block_template(block &bl, size_t median_weight, uint64_t already_generated_coins, size_t &total_weight, uint64_t &fee, uint64_t &expected_reward, uint8_t version, bool fork)
+  bool tx_memory_pool::fill_block_template(block &bl, size_t median_weight, uint64_t already_generated_coins, size_t &total_weight, uint64_t &fee, uint64_t &expected_reward, uint8_t version)
   {
     CRITICAL_REGION_LOCAL(m_transactions_lock);
     CRITICAL_REGION_LOCAL1(m_blockchain);
@@ -1176,7 +1176,7 @@ namespace cryptonote
     fee = 0;
 
     //baseline empty block
-    get_block_reward(median_weight, total_weight, already_generated_coins, best_coinbase, version, fork);
+    get_block_reward(median_weight, total_weight, already_generated_coins, best_coinbase, version);
 
 
     size_t max_total_weight_pre_v5 = (130 * median_weight) / 100 - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;
@@ -1212,7 +1212,7 @@ namespace cryptonote
         // If we're getting lower coinbase tx,
         // stop including more tx
         uint64_t block_reward;
-        if(!get_block_reward(median_weight, total_weight + meta.weight, already_generated_coins, block_reward, version, fork))
+        if(!get_block_reward(median_weight, total_weight + meta.weight, already_generated_coins, block_reward, version))
         {
           LOG_PRINT_L2("  would exceed maximum block weight");
           continue;

src/cryptonote_core/tx_pool.h

@@ -229,7 +229,7 @@ namespace cryptonote
      *
      * @return true
      */
-    bool fill_block_template(block &bl, size_t median_weight, uint64_t already_generated_coins, size_t &total_weight, uint64_t &fee, uint64_t &expected_reward, uint8_t version, bool fork);
+    bool fill_block_template(block &bl, size_t median_weight, uint64_t already_generated_coins, size_t &total_weight, uint64_t &fee, uint64_t &expected_reward, uint8_t version);
 
     /**
      * @brief get a list of all transactions in the pool