This adds the most important updates to Graphene from BitShares. Most notably, https://github.com/bitshares/bitshares-core/issues/1506 Second most notably, it updates Peerplays' FC to be in sync with BitShares FC. This is a squash commit of several subcommits. The subcommit messages are reproduced below: Replace fc::uint128 with boost::multiprecision::uint128_t replace smart_ref with shared_ptr Fixes/Remove Unused Remove NTP time Remove old macro This macro is now in FC, so no need to define it here anymore Replaced fc::array with std::array Separate exception declaration and implementation Adapted to fc promise changes Fixes Add back in some of Peter's fixes that got lost in the cherry pick _hash endianness fixes Remove all uses of fc/smart_ref It's gone, can't use it anymore Replace improper static_variant operator overloads with comparators Fixes Remove boost::signals from build system; it's header-only so it's not listed in cmake anymore. Also remove some unused hashing code Impl. pack/unpack functions for extension class Ref #1506: Isolate chain/protocol to its own library Ref #1506: Add object_downcast_t Allows the more concise expression `object_downcast_t<xyz>` instead of the old `typename object_downcast<xyz>::type` Ref #1506: Move ID types from db to protocol The ID types, object_id and object_id_type, were defined in the db library, and the protocol library depends on db to get these types. Technically, the ID types are defined by the protocol and used by the database, and not vice versa. Therefore these types should be in the protocol library, and db should depend on protocol to get them. This commit makes it so. Ref #1506: Isolate chain/protocol to its own library Remove commented-out index code Wrap overlength line Remove unused key types Probably fix Docker build Fix build after rebase Ref #1506/#1737: Some requested changes Ref #1506/#1737: Macro-fy ID type definitions Define macros to fully de-boilerplate ID type definitions. Externalities: - Rename transaction_object -> transaction_history_object - Rename impl_asset_dynamic_data_type -> impl_asset_dynamic_data_object_type - Rename impl_asset_bitasset_data_type -> impl_asset_bitasset_data_object_type The first is to avoid a naming collision on transaction_id_type, and the other two are to maintain consistency with the naming of the other types. Ref #1506/#1737: Fix clean_name() Ref #1506/#1737: Oops Fix .gitignore Externalized serialization in protocol library Fix compile sets Delete a couple of ghost files that were in the tree but not part of the project (I accidentally added them to CMakeLists while merging, but they're broken and not part of the Peerplays code), and add several files that got dropped from the build during merge. General fixes Fix warnings, build issues, unused code, etc. Fix #1772 by decprecating cli_wallet -H More fixes Fix errors and warnings and generally coax it to build Fix test I'm pretty sure this didn't break from what I did... But I can't build the original code, so I can't tell. Anyways, this one now passes... Others still fail... Small fix Fix crash in auth checks Final fixes Last round of fixes following the rebase to Beatrice Rename project in CMakeLists.txt The CMakeLists.txt declared this project as BitShares and not Peerplays, which makes it confusing in IDEs. Rename it to be clear which project is open. Resolve #374 Replace all object refs in macros with IDs, and fix affected tests to look up objects by ID rather than using invalidated refs. A full audit of all tests should be performed to eliminate any further usage of invalidated object references. Resolve #373: Add object notifiers Various fixes Fixes to various issues, primarily reflections, that cropped up during merge conflict resolution Fix startup bug in Bookie plugin Bookie plugin was preventing the node from starting up because it registered its secondary indexes to create objects in its own primary indexes to track objects being created in other primary indexes, and did so during its `initialize()` step, which is to say, before the database was loaded from disk at startup. This caused the secondary indexes to create tracker objects when the observed indexes were loading objects from disk. This then caused a failure when these tracker indexes were later loaded from disk, and the first object IDs collided. This is fixed by refraining from defining secondary indexes until the `startup()` stage rather than the `initialize()` stage. Primary indexes are registered in `initialize()`, secondary indexes are registered in `startup()`. This also involved adding a new method, "add_secondary_index()", to `object_database`, as before there was no way to do this because you couldn't get a non-const index from a non-const database. I have no idea how this was working before I got here... Fix egenesis install Fixes after updates Rebase on updated develop branch and fix conflicts
150 lines
5.2 KiB
C++
150 lines
5.2 KiB
C++
#pragma once
|
|
#include <graphene/db/object.hpp>
|
|
#include <graphene/db/generic_index.hpp>
|
|
|
|
#include <graphene/protocol/types.hpp>
|
|
#include <graphene/protocol/sidechain_defs.hpp>
|
|
|
|
namespace graphene { namespace chain {
|
|
using namespace graphene::db;
|
|
|
|
enum class son_status
|
|
{
|
|
inactive,
|
|
active,
|
|
request_maintenance,
|
|
in_maintenance,
|
|
deregistered
|
|
};
|
|
/**
|
|
* @class son_statistics_object
|
|
* @ingroup object
|
|
* @ingroup implementation
|
|
*
|
|
* This object contains regularly updated statistical data about an SON. It is provided for the purpose of
|
|
* separating the SON transaction data that changes frequently from the SON object data that is mostly static.
|
|
*/
|
|
class son_statistics_object : public graphene::db::abstract_object<son_statistics_object>
|
|
{
|
|
public:
|
|
static const uint8_t space_id = implementation_ids;
|
|
static const uint8_t type_id = impl_son_statistics_object_type;
|
|
|
|
son_id_type owner;
|
|
// Lifetime total transactions signed
|
|
uint64_t total_txs_signed = 0;
|
|
// Transactions signed since the last son payouts
|
|
uint64_t txs_signed = 0;
|
|
// Total Voted Active time i.e. duration selected as part of voted active SONs
|
|
uint64_t total_voted_time = 0;
|
|
// Total Downtime barring the current down time in seconds, used for stats to present to user
|
|
uint64_t total_downtime = 0;
|
|
// Current Interval Downtime since last maintenance
|
|
uint64_t current_interval_downtime = 0;
|
|
// Down timestamp, if son status is in_maintenance use this
|
|
fc::time_point_sec last_down_timestamp;
|
|
// Last Active heartbeat timestamp
|
|
fc::time_point_sec last_active_timestamp;
|
|
// Deregistered Timestamp
|
|
fc::time_point_sec deregistered_timestamp;
|
|
// Total sidechain transactions reported by SON network while SON was active
|
|
uint64_t total_sidechain_txs_reported = 0;
|
|
// Sidechain transactions reported by this SON
|
|
uint64_t sidechain_txs_reported = 0;
|
|
};
|
|
|
|
/**
|
|
* @class son_object
|
|
* @brief tracks information about a SON account.
|
|
* @ingroup object
|
|
*/
|
|
class son_object : public abstract_object<son_object>
|
|
{
|
|
public:
|
|
static const uint8_t space_id = protocol_ids;
|
|
static const uint8_t type_id = son_object_type;
|
|
|
|
account_id_type son_account;
|
|
vote_id_type vote_id;
|
|
uint64_t total_votes = 0;
|
|
string url;
|
|
vesting_balance_id_type deposit;
|
|
public_key_type signing_key;
|
|
vesting_balance_id_type pay_vb;
|
|
son_statistics_id_type statistics;
|
|
son_status status = son_status::inactive;
|
|
flat_map<sidechain_type, string> sidechain_public_keys;
|
|
|
|
void pay_son_fee(share_type pay, database& db);
|
|
bool has_valid_config()const;
|
|
};
|
|
|
|
struct by_account;
|
|
struct by_vote_id;
|
|
using son_multi_index_type = multi_index_container<
|
|
son_object,
|
|
indexed_by<
|
|
ordered_unique< tag<by_id>,
|
|
member<object, object_id_type, &object::id>
|
|
>,
|
|
ordered_unique< tag<by_account>,
|
|
member<son_object, account_id_type, &son_object::son_account>
|
|
>,
|
|
ordered_unique< tag<by_vote_id>,
|
|
member<son_object, vote_id_type, &son_object::vote_id>
|
|
>
|
|
>
|
|
>;
|
|
using son_index = generic_index<son_object, son_multi_index_type>;
|
|
|
|
struct by_owner;
|
|
using son_stats_multi_index_type = multi_index_container<
|
|
son_statistics_object,
|
|
indexed_by<
|
|
ordered_unique< tag<by_id>,
|
|
member<object, object_id_type, &object::id>
|
|
>,
|
|
ordered_unique< tag<by_owner>,
|
|
member<son_statistics_object, son_id_type, &son_statistics_object::owner>
|
|
>
|
|
>
|
|
>;
|
|
using son_stats_index = generic_index<son_statistics_object, son_stats_multi_index_type>;
|
|
|
|
} } // graphene::chain
|
|
|
|
MAP_OBJECT_ID_TO_TYPE(graphene::chain::son_object)
|
|
MAP_OBJECT_ID_TO_TYPE(graphene::chain::son_statistics_object)
|
|
|
|
FC_REFLECT_ENUM(graphene::chain::son_status, (inactive)(active)(request_maintenance)(in_maintenance)(deregistered) )
|
|
|
|
FC_REFLECT_DERIVED( graphene::chain::son_object, (graphene::db::object),
|
|
(son_account)
|
|
(vote_id)
|
|
(total_votes)
|
|
(url)
|
|
(deposit)
|
|
(signing_key)
|
|
(pay_vb)
|
|
(statistics)
|
|
(status)
|
|
(sidechain_public_keys)
|
|
)
|
|
|
|
FC_REFLECT_DERIVED( graphene::chain::son_statistics_object,
|
|
(graphene::db::object),
|
|
(owner)
|
|
(total_txs_signed)
|
|
(txs_signed)
|
|
(total_voted_time)
|
|
(total_downtime)
|
|
(current_interval_downtime)
|
|
(last_down_timestamp)
|
|
(last_active_timestamp)
|
|
(deregistered_timestamp)
|
|
(total_sidechain_txs_reported)
|
|
(sidechain_txs_reported)
|
|
)
|
|
|
|
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::son_object )
|
|
GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::son_statistics_object )
|