Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Merge branch 'develop' into issue/son-for-hive-rpc-connection

Browse source
This commit is contained in:
serkixenos 2021-11-18 13:34:36 -04:00
commit aa7d75b8c7
3 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
libraries/chain/db_getter.cpp
View file

@ -315,27 +315,6 @@ bool database::is_son_active( son_id_type son_id )
return (it_son != active_son_ids.end()); 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<std::string> 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<uint64_t> database::get_random_numbers(uint64_t minimum, uint64_t maximum, uint64_t selections, bool duplicates) vector<uint64_t> database::get_random_numbers(uint64_t minimum, uint64_t maximum, uint64_t selections, bool duplicates)
{ {
FC_ASSERT( selections <= 100000 ); FC_ASSERT( selections <= 100000 );
@ -368,4 +347,25 @@ vector<uint64_t> database::get_random_numbers(uint64_t minimum, uint64_t maximum
return v; return v;
} }
bool database::is_asset_creation_allowed(const string &symbol)
{
time_point_sec now = head_block_time();
std::unordered_set<std::string> 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;
}
} } } }

4
libraries/chain/hardfork.d/SON2.hf
View file

@ -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 #ifndef HARDFORK_SON2_TIME
#define HARDFORK_SON2_TIME (fc::time_point_sec( 1623369600 )) #define HARDFORK_SON2_TIME (fc::time_point_sec( 1627689600 ))
#endif #endif

2
programs/witness_node/genesis.json
View file

@ -392,7 +392,7 @@
"son_deregister_time": 43200, "son_deregister_time": 43200,
"son_heartbeat_frequency": 180, "son_heartbeat_frequency": 180,
"son_down_time": 360, "son_down_time": 360,
"maximum_son_count": 7 "maximum_son_count": 15
} }
}, },
"initial_bts_accounts": [], "initial_bts_accounts": [],