Changes done in 'origin/develop' specific to v1.27.0 release

Author: vogel76

libraries/chain/database.cpp

@@ -56,20 +56,20 @@
 
 long next_hf_time()
 {
-  // current "next hardfork" is HF26
+  // current "next hardfork" is HF27
   long hfTime =
 
 #ifdef IS_TEST_NET
-    1643716800; // Tuesday, 1 February 2022 12:00:00
+    1665532800; // Wednesday, October 12, 2022 0:00:00 GMT
 #else
-    1665489600; // Tuesday, 11 October 2022 12:00:00 GMT
+    1666612800; // Monday, 24 October 2022 12:00:00 GMT
 #endif /// IS_TEST_NET
 
-  const char* value = getenv("HIVE_HF26_TIME");
-  if(value != nullptr)
+  const char* value = getenv("HIVE_HF27_TIME");
+  if (value)
   {
     hfTime = atol(value);
-    ilog("HIVE_HF26_TIME has been specified through environment variable as ${v}, long value: ${l}", ("v", value)("l", hfTime));
+    ilog("HIVE_HF27_TIME has been specified through environment variable as ${value}, long value: ${hfTime}", (value)(hfTime));
   }
 
   return hfTime;
@@ -245,7 +245,7 @@ void database::load_state_initial_data(const open_args& args)
     FC_ASSERT(hardforks.last_hardfork <= HIVE_NUM_HARDFORKS, "Chain knows of more hardforks than configuration", ("hardforks.last_hardfork", hardforks.last_hardfork)("HIVE_NUM_HARDFORKS", HIVE_NUM_HARDFORKS));
     FC_ASSERT(_hardfork_versions.versions[hardforks.last_hardfork] <= HIVE_BLOCKCHAIN_VERSION, "Blockchain version is older than last applied hardfork");
     FC_ASSERT(HIVE_BLOCKCHAIN_HARDFORK_VERSION >= HIVE_BLOCKCHAIN_VERSION);
-    FC_ASSERT(HIVE_BLOCKCHAIN_HARDFORK_VERSION == _hardfork_versions.versions[HIVE_NUM_HARDFORKS]);
+    FC_ASSERT(HIVE_BLOCKCHAIN_HARDFORK_VERSION == _hardfork_versions.versions[HIVE_NUM_HARDFORKS], "Blockchain version mismatch", (HIVE_BLOCKCHAIN_HARDFORK_VERSION)(_hardfork_versions.versions[HIVE_NUM_HARDFORKS]));
   });
 
 #ifdef USE_ALTERNATE_CHAIN_ID
@@ -1891,7 +1891,8 @@ void database::adjust_witness_votes( const account_object& a, const share_type&
 
 void database::adjust_witness_vote( const witness_object& witness, share_type delta )
 {
-  const witness_schedule_object& wso = get_witness_schedule_object();
+  const witness_schedule_object& wso = has_hardfork(HIVE_HARDFORK_1_27_FIX_TIMESHARE_WITNESS_SCHEDULING) ?
+                                       get_witness_schedule_object_for_irreversibility() : get_witness_schedule_object();
   modify( witness, [&]( witness_object& w )
   {
     auto delta_pos = w.votes.value * (wso.current_virtual_time - w.virtual_last_update);
@@ -6422,10 +6423,13 @@ void database::init_hardforks()
   FC_ASSERT( HIVE_HARDFORK_1_26 == 26, "Invalid hardfork configuration" );
   _hardfork_versions.times[ HIVE_HARDFORK_1_26 ] = fc::time_point_sec( HIVE_HARDFORK_1_26_TIME );
   _hardfork_versions.versions[ HIVE_HARDFORK_1_26 ] = HIVE_HARDFORK_1_26_VERSION;
-#if defined(IS_TEST_NET) && defined(HIVE_ENABLE_SMT)
   FC_ASSERT( HIVE_HARDFORK_1_27 == 27, "Invalid hardfork configuration" );
   _hardfork_versions.times[ HIVE_HARDFORK_1_27 ] = fc::time_point_sec( HIVE_HARDFORK_1_27_TIME );
   _hardfork_versions.versions[ HIVE_HARDFORK_1_27 ] = HIVE_HARDFORK_1_27_VERSION;
+#if defined(IS_TEST_NET) && defined(HIVE_ENABLE_SMT)
+  FC_ASSERT( HIVE_HARDFORK_1_28 == 28, "Invalid hardfork configuration" );
+  _hardfork_versions.times[ HIVE_HARDFORK_1_28 ] = fc::time_point_sec( HIVE_HARDFORK_1_28_TIME );
+  _hardfork_versions.versions[ HIVE_HARDFORK_1_28 ] = HIVE_HARDFORK_1_28_VERSION;
 #endif
 }
 

libraries/chain/witness_schedule.cpp

@@ -14,11 +14,10 @@ using hive::chain::util::rd_system_params;
 using hive::chain::util::rd_user_params;
 using hive::chain::util::rd_validate_user_params;
 
-// this is only called on application of hf4, and the future witness schedule doesn't take
-// effect until a much later hard fork, so we only need to operate on the current witness schedule here.
 void reset_virtual_schedule_time( database& db )
 { try {
-  const witness_schedule_object& wso = db.get_witness_schedule_object();
+  const witness_schedule_object& wso = db.has_hardfork(HIVE_HARDFORK_1_27_FIX_TIMESHARE_WITNESS_SCHEDULING) ?
+                                       db.get_witness_schedule_object_for_irreversibility() : db.get_witness_schedule_object();
   db.modify( wso, [&](witness_schedule_object& o )
   {
     o.current_virtual_time = fc::uint128(); // reset it 0

libraries/protocol/hardfork.d/0-preamble.hf

@@ -13,7 +13,7 @@
 #include <set>
 
 #if defined(IS_TEST_NET) && defined(HIVE_ENABLE_SMT)
-#define HIVE_NUM_HARDFORKS 27
+#define HIVE_NUM_HARDFORKS 28
 #else
-#define HIVE_NUM_HARDFORKS 26
+#define HIVE_NUM_HARDFORKS 27
 #endif

libraries/protocol/hardfork.d/1_26.hf

@@ -1,9 +1,7 @@
 #ifndef HIVE_HARDFORK_1_26
 #define HIVE_HARDFORK_1_26 26
 
-long next_hf_time();
-
-#define HIVE_HARDFORK_1_26_TIME next_hf_time()
+# define HIVE_HARDFORK_1_26_TIME 1665489600 // Tuesday, 11 October 2022 12:00:00 GMT
 
 #define HIVE_HARDFORK_1_26_VERSION hive::protocol::hardfork_version( 1, 26 )
 

libraries/protocol/hardfork.d/1_27.hf

@@ -1,9 +1,12 @@
 #ifndef HIVE_HARDFORK_1_27
 #define HIVE_HARDFORK_1_27 27
-#define HIVE_SMT_HARDFORK HIVE_HARDFORK_1_27
 
-#define HIVE_HARDFORK_1_27_TIME 1654084800 // Wednesday, 1 June 2022 12:00:00
+long next_hf_time();
+#define HIVE_HARDFORK_1_27_TIME next_hf_time()
 
 #define HIVE_HARDFORK_1_27_VERSION hive::protocol::hardfork_version( 1, 27 )
 
+// fix scheduling of timeshare witnesses to restore pre-hf26 behavior 
+#define HIVE_HARDFORK_1_27_FIX_TIMESHARE_WITNESS_SCHEDULING (HIVE_HARDFORK_1_27)
+
 #endif

libraries/protocol/hardfork.d/1_28.hf

@@ -0,0 +1,9 @@
+#ifndef HIVE_HARDFORK_1_28
+#define HIVE_HARDFORK_1_28 28
+#define HIVE_SMT_HARDFORK HIVE_HARDFORK_1_28
+
+#define HIVE_HARDFORK_1_28_TIME 1654084800 // Wednesday, 1 June 2022 12:00:00
+
+#define HIVE_HARDFORK_1_28_VERSION hive::protocol::hardfork_version( 1, 28 )
+
+#endif

libraries/protocol/include/hive/protocol/config.hpp

@@ -35,9 +35,9 @@ using namespace hive::protocol::testnet_blockchain_configuration;
 #ifdef IS_TEST_NET
 
 #ifdef HIVE_ENABLE_SMT
-  #define HIVE_BLOCKCHAIN_VERSION             ( version(1, 27, 0) )
+  #define HIVE_BLOCKCHAIN_VERSION             ( version(1, 28, 0) )
 #else
-  #define HIVE_BLOCKCHAIN_VERSION             ( version(1, 26, 0) )
+  #define HIVE_BLOCKCHAIN_VERSION             ( version(1, 27, 0) )
 #endif
 
 #define OLD_CHAIN_ID                          (fc::sha256::hash("testnet"))
@@ -89,7 +89,7 @@ using namespace hive::protocol::testnet_blockchain_configuration;
 ///                               LIVE HIVE NETWORK (MainNet)                                   ///
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#define HIVE_BLOCKCHAIN_VERSION               ( version(1, 26, 0) )
+#define HIVE_BLOCKCHAIN_VERSION               ( version(1, 27, 0) )
 
 #ifndef HIVE_INIT_PUBLIC_KEY_STR
 # define HIVE_INIT_PUBLIC_KEY_STR              "STM8GC13uCZbP44HzMLV6zPZGwVQ8Nt4Kji8PapsPiNq1BK153XTX"

libraries/protocol/include/hive/protocol/hardfork_block.hpp

@@ -25,4 +25,5 @@
 #define HIVE_HARDFORK_0_23_BLOCK 41818752
 #define HIVE_HARDFORK_1_24_BLOCK 47797680
 #define HIVE_HARDFORK_1_25_BLOCK 55235767
-#define HIVE_HARDFORK_1_26_BLOCK 100000000
+#define HIVE_HARDFORK_1_26_BLOCK 68676505
+#define HIVE_HARDFORK_1_27_BLOCK 100000000

tests/api_tests/message_format_tests/cli_wallet_tests/output_formatter_tests/__init__.py

@@ -0,0 +1,3 @@
+import pytest
+
+pytest.register_assert_rewrite("tests.api_tests.message_format_tests.cli_wallet_tests.output_formatter_tests.local_tools")

tests/api_tests/message_format_tests/cli_wallet_tests/output_formatter_tests/block_log/generate_block_log.py

@@ -2,8 +2,6 @@
 
 import test_tools as tt
 
-from local_tools import create_account_and_fund_it
-
 
 def prepare_block_log_with_transactions():
     node = tt.InitNode()
@@ -22,7 +20,7 @@ def prepare_block_log_with_transactions():
 
 
 def prepare_transactions(wallet) -> None:
-    create_account_and_fund_it(wallet, 'alice', tests=tt.Asset.Test(100), vests=tt.Asset.Test(100))
+    wallet.create_account('alice', hives=tt.Asset.Test(100), vests=tt.Asset.Test(100))
 
     wallet.api.post_comment('alice', 'test-permlink', '', 'someone0', 'test-title', 'this is a body', '{}')