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

rename btc_asset to pbtc_asset

Browse source
This commit is contained in:
gladcow 2020-03-29 16:26:34 +03:00
parent 4011068430
commit 64095e4861
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/chain/db_maint.cpp
View file

@ -1860,15 +1860,14 @@ void perform_son_tasks(database& db)
});
}
// create PBTC asset here because son_account is the issuer of the PBTC
if (gpo.parameters.btc_asset() == asset_id_type())
if (gpo.parameters.pbtc_asset() == asset_id_type())
{
// Create PBTC asset
const asset_dynamic_data_object& dyn_asset =
db.create<asset_dynamic_data_object>([](asset_dynamic_data_object& a) {
a.current_supply = GRAPHENE_MAX_SHARE_SUPPLY;
});
const asset_object& btc_asset =
const asset_object& pbtc_asset =
db.create<asset_object>( [&gpo, &dyn_asset]( asset_object& a ) {
a.symbol = "PBTC";
a.options.max_supply = GRAPHENE_MAX_SHARE_SUPPLY;
@ -1882,10 +1881,10 @@ void perform_son_tasks(database& db)
a.options.core_exchange_rate.quote.asset_id = asset_id_type(0);
a.dynamic_asset_data_id = dyn_asset.id;
});
db.modify( gpo, [&btc_asset]( global_property_object& gpo ) {
gpo.parameters.extensions.value.btc_asset = btc_asset.get_id();
db.modify( gpo, [&pbtc_asset]( global_property_object& gpo ) {
gpo.parameters.extensions.value.pbtc_asset = pbtc_asset.get_id();
if( gpo.pending_parameters )
gpo.pending_parameters->extensions.value.btc_asset = btc_asset.get_id();
gpo.pending_parameters->extensions.value.pbtc_asset = pbtc_asset.get_id();
});
}
}

8
libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp
View file

@ -59,7 +59,7 @@ namespace graphene { namespace chain {
optional < uint32_t > son_heartbeat_frequency;
optional < uint32_t > son_down_time;
optional < account_id_type > son_account;
optional < asset_id_type > btc_asset;
optional < asset_id_type > pbtc_asset;
};
struct chain_parameters
@ -179,8 +179,8 @@ namespace graphene { namespace chain {
inline account_id_type son_account() const {
return extensions.value.son_account.valid() ? *extensions.value.son_account : GRAPHENE_NULL_ACCOUNT;
}
inline asset_id_type btc_asset() const {
return extensions.value.btc_asset.valid() ? *extensions.value.btc_asset : asset_id_type();
inline asset_id_type pbtc_asset() const {
return extensions.value.pbtc_asset.valid() ? *extensions.value.pbtc_asset : asset_id_type();
}
};
@ -208,7 +208,7 @@ FC_REFLECT( graphene::chain::parameter_extension,
(son_heartbeat_frequency)
(son_down_time)
(son_account)
(btc_asset)
(pbtc_asset)
)
FC_REFLECT( graphene::chain::chain_parameters,