diff --git a/libraries/chain/db_getter.cpp b/libraries/chain/db_getter.cpp index cb0cdc17..78740c9b 100644 --- a/libraries/chain/db_getter.cpp +++ b/libraries/chain/db_getter.cpp @@ -315,27 +315,6 @@ bool database::is_son_active( son_id_type son_id ) return (it_son != active_son_ids.end()); } -bool database::is_asset_creation_allowed(const string &symbol) -{ - time_point_sec now = head_block_time(); - std::unordered_set post_son_hf_symbols = {"ETH", "USDT", "BNB", "ADA", "DOGE", "XRP", "USDC", "DOT", "UNI", "BUSD", "BCH", "LTC", "SOL", "LINK", "MATIC", "THETA", - "WBTC", "XLM", "ICP", "DAI", "VET", "ETC", "TRX", "FIL", "XMR", "EGR", "EOS", "SHIB", "AAVE", "CRO", "ALGO", "AMP", "BTCB", - "BSV", "KLAY", "CAKE", "FTT", "LEO", "XTZ", "TFUEL", "MIOTA", "LUNA", "NEO", "ATOM", "MKR", "FEI", "WBNB", "UST", "AVAX", - "STEEM", "HIVE", "HBD", "SBD", "BTS"}; - if (symbol == "BTC") - { - if (now < HARDFORK_SON_TIME) - return false; - } - - if (post_son_hf_symbols.find(symbol) != post_son_hf_symbols.end()) - { - if (now >= HARDFORK_SON_TIME) - return false; - } - return true; -} - vector database::get_random_numbers(uint64_t minimum, uint64_t maximum, uint64_t selections, bool duplicates) { FC_ASSERT( selections <= 100000 ); @@ -368,4 +347,25 @@ vector database::get_random_numbers(uint64_t minimum, uint64_t maximum return v; } +bool database::is_asset_creation_allowed(const string &symbol) +{ + time_point_sec now = head_block_time(); + std::unordered_set post_son_hf_symbols = {"ETH", "USDT", "BNB", "ADA", "DOGE", "XRP", "USDC", "DOT", "UNI", "BUSD", "BCH", "LTC", "SOL", "LINK", "MATIC", "THETA", + "WBTC", "XLM", "ICP", "DAI", "VET", "ETC", "TRX", "FIL", "XMR", "EGR", "EOS", "SHIB", "AAVE", "CRO", "ALGO", "AMP", "BTCB", + "BSV", "KLAY", "CAKE", "FTT", "LEO", "XTZ", "TFUEL", "MIOTA", "LUNA", "NEO", "ATOM", "MKR", "FEI", "WBNB", "UST", "AVAX", + "STEEM", "HIVE", "HBD", "SBD", "BTS"}; + if (symbol == "BTC") + { + if (now < HARDFORK_SON_TIME) + return false; + } + + if (post_son_hf_symbols.find(symbol) != post_son_hf_symbols.end()) + { + if (now >= HARDFORK_SON_TIME) + return false; + } + return true; +} + } } diff --git a/libraries/chain/hardfork.d/SON2.hf b/libraries/chain/hardfork.d/SON2.hf index c283f409..bc8fde45 100644 --- a/libraries/chain/hardfork.d/SON2.hf +++ b/libraries/chain/hardfork.d/SON2.hf @@ -1,4 +1,4 @@ -// SON2 HARDFORK Friday, June 11, 2021 00:00:00 GMT +// SON2 HARDFORK Saturday, July 31, 2021 00:00:00 GMT #ifndef HARDFORK_SON2_TIME -#define HARDFORK_SON2_TIME (fc::time_point_sec( 1623369600 )) +#define HARDFORK_SON2_TIME (fc::time_point_sec( 1627689600 )) #endif diff --git a/programs/witness_node/genesis.json b/programs/witness_node/genesis.json index d38f3e4e..1e0610f4 100644 --- a/programs/witness_node/genesis.json +++ b/programs/witness_node/genesis.json @@ -392,7 +392,7 @@ "son_deregister_time": 43200, "son_heartbeat_frequency": 180, "son_down_time": 360, - "maximum_son_count": 7 + "maximum_son_count": 15 } }, "initial_bts_accounts": [],