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

make new fields optional

Browse source
This commit is contained in:
gladcow 2019-12-20 00:46:43 +03:00
parent 26886cc7d5
commit 58e4b741c4
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libraries/chain/include/graphene/chain/protocol/vesting.hpp
View file

@ -80,12 +80,12 @@ namespace graphene { namespace chain {
{
struct fee_parameters_type { uint64_t fee = GRAPHENE_BLOCKCHAIN_PRECISION; };
asset fee;
account_id_type creator; ///< Who provides funds initially
account_id_type owner; ///< Who is able to withdraw the balance
asset amount;
vesting_policy_initializer policy;
vesting_balance_type balance_type;
asset fee;
account_id_type creator; ///< Who provides funds initially
account_id_type owner; ///< Who is able to withdraw the balance
asset amount;
vesting_policy_initializer policy;
optional<vesting_balance_type> balance_type;
account_id_type fee_payer()const { return creator; }
void validate()const
@ -108,11 +108,11 @@ namespace graphene { namespace chain {
{
struct fee_parameters_type { uint64_t fee = 20*GRAPHENE_BLOCKCHAIN_PRECISION; };
asset fee;
vesting_balance_id_type vesting_balance;
account_id_type owner; ///< Must be vesting_balance.owner
asset amount;
vesting_balance_type balance_type;
asset fee;
vesting_balance_id_type vesting_balance;
account_id_type owner; ///< Must be vesting_balance.owner
asset amount;
optional<vesting_balance_type> balance_type;
account_id_type fee_payer()const { return owner; }
void validate()const

3
libraries/chain/vesting_balance_evaluator.cpp
View file

@ -108,7 +108,8 @@ object_id_type vesting_balance_create_evaluator::do_apply( const vesting_balance
else {
op.policy.visit(init_policy_visitor(obj.policy, op.amount.amount, now));
}
obj.balance_type = op.balance_type;
if(op.balance_type)
obj.balance_type = *op.balance_type;
} );