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

Merge branch 'merge/master-to-beatrice-20201203' into beatrice

Browse source
This commit is contained in:
serkixenos 2020-12-05 03:57:27 +01:00
commit 99a7d8453c
16 changed files with 213918 additions and 8196 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

221980
genesis.json
View file

File diff suppressed because it is too large Load diff

11
libraries/app/application.cpp
View file

@ -160,10 +160,13 @@ namespace detail {
{
// t.me/peerplays #seednodes
vector<string> seeds = {
"ppy-beatrice-seed.blckchnd.com:6666",
"159.69.223.206:7777",
"51.38.237.243:9666",
"pbsa-beatrice.blockchainprojectsbv.com:9195"
"173.249.23.108:9777",
"node.peerblock.trade:9777",
"peerplays.blockoperations.com:9777",
"pms.blockveritas.co:7777",
"seed.ppy.alex-pu.info:8888",
"seed.ppy.blckchnd.com:6116",
"seed01.eifos.org:7777"
};
for( const string& endpoint_string : seeds )

2
libraries/chain/hardfork.d/1000.hf
View file

@ -1,3 +1,3 @@
#ifndef HARDFORK_1000_TIME
#define HARDFORK_1000_TIME (fc::time_point_sec( 1540000000 ))
#define HARDFORK_1000_TIME (fc::time_point_sec( 1550491200 ))
#endif

2
libraries/chain/hardfork.d/1001.hf
View file

@ -1,4 +1,4 @@
// added delete sport and delete event group operations
#ifndef HARDFORK_1001_TIME
#define HARDFORK_1001_TIME (fc::time_point_sec( 1540000000 ))
#define HARDFORK_1001_TIME (fc::time_point_sec( 1550491200 ))
#endif

4
libraries/chain/hardfork.d/5050-1.hf
View file

@ -1,4 +1,4 @@
// 5050_1 HARDFORK Wednesday, 15 April 2020 20:00:00 GMT
// 5050_1 HARDFORK Thursday, 22 April 2020 20:00:00 GMT
#ifndef HARDFORK_5050_1_TIME
#define HARDFORK_5050_1_TIME (fc::time_point_sec( 1586980800 ))
#define HARDFORK_5050_1_TIME (fc::time_point_sec( 1587585600 ))
#endif

2
libraries/chain/hardfork.d/999.hf
View file

@ -1,4 +1,4 @@
// Placeholder HF for affiliate reward system
#ifndef HARDFORK_999_TIME
#define HARDFORK_999_TIME (fc::time_point_sec( 1540000000 ))
#define HARDFORK_999_TIME (fc::time_point_sec( 1550491200 ))
#endif

2
libraries/chain/hardfork.d/CORE-429.hf
View file

@ -1,4 +1,4 @@
// bitshares-core #429 rounding issue when creating assets
#ifndef HARDFORK_CORE_429_TIME
#define HARDFORK_CORE_429_TIME (fc::time_point_sec( 1566784800 ))
#define HARDFORK_CORE_429_TIME (fc::time_point_sec( 1568340000 ))
#endif

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

@ -1,4 +1,4 @@
// GPOS HARDFORK Monday, 6 January 2020 01:00:00 GMT
// GPOS HARDFORK Monday, 17 February 2020 22:00:00 GMT
#ifndef HARDFORK_GPOS_TIME
#define HARDFORK_GPOS_TIME (fc::time_point_sec( 1578272400 ))
#define HARDFORK_GPOS_TIME (fc::time_point_sec( 1581976800 ))
#endif

2
libraries/chain/hardfork.d/SWEEPS.hf
View file

@ -1,3 +1,3 @@
#ifndef HARDFORK_SWEEPS_TIME
#define HARDFORK_SWEEPS_TIME (fc::time_point_sec( 1566784800 ))
#define HARDFORK_SWEEPS_TIME (fc::time_point_sec( 1568340000 ))
#endif

6
libraries/chain/include/graphene/chain/config.hpp
View file

@ -23,8 +23,8 @@
*/
#pragma once
#define GRAPHENE_SYMBOL "TEST"
#define GRAPHENE_ADDRESS_PREFIX "TEST"
#define GRAPHENE_SYMBOL "PPY"
#define GRAPHENE_ADDRESS_PREFIX "PPY"
#define GRAPHENE_MIN_ACCOUNT_NAME_LENGTH 1
#define GRAPHENE_MAX_ACCOUNT_NAME_LENGTH 63
@ -153,7 +153,7 @@
#define GRAPHENE_RECENTLY_MISSED_COUNT_INCREMENT 4
#define GRAPHENE_RECENTLY_MISSED_COUNT_DECREMENT 3
#define GRAPHENE_CURRENT_DB_VERSION "PPY2.3"
#define GRAPHENE_CURRENT_DB_VERSION "PPY2.4"
#define GRAPHENE_IRREVERSIBLE_THRESHOLD (70 * GRAPHENE_1_PERCENT)

1
tests/betting/betting_tests.cpp
View file

@ -1880,7 +1880,6 @@ BOOST_AUTO_TEST_CASE(event_group_delete_test_not_existed_event_group)
event_group_id_type nhl_id = nhl.id;
delete_event_group(nhl_id);
BOOST_CHECK_THROW(delete_event_group(nhl_id), fc::exception);
} FC_LOG_AND_RETHROW()
}