* Created unit test for #325
* remove needless find()
* issue - 154: Don't allow to vote when vesting balance is 0
* Increase block creation timeout to 2500ms
* increase delay for node connection
* remove cache from cli get_account
* add cli tests framework
* Adjust newly merged code to new API
* Merged changes from Bitshares PR 1036
* GRPH-76 - Short-cut long sequences of missed blocks
Fixes database::update_global_dynamic_data to speed up counting missed blocks.
(This also fixes a minor issue with counting - the previous algorithm would skip missed blocks for the witness who signed the first block after the gap.)
* Improved resilience of block database against corruption
* Moved reindex logic into database / chain_database, make use of additional blocks in block_database
Fixed tests wrt db.open
* Enable undo + fork database for final blocks in a replay
Dont remove blocks from block db when popping blocks, handle edge case in replay wrt fork_db, adapted unit tests
* Log starting block number of replay
* Prevent unsigned integer underflow
* Fixed lock detection
* Dont leave _data_dir empty if db is locked
* Writing the object_database is now almost atomic
* Improved consistency check for block_log
* Cut back block_log index file if inconsistent
* Fixed undo_database
* Added test case for broken merge on empty undo_db
* exclude second undo_db.enable() call in some cases
* Add missing change
* change bitshares to core in message
* Merge pull request #938 from bitshares/fix-block-storing
Store correct block ID when switching forks
* Fixed integer overflow issue
* Fix for for history ID mismatch ( Bitshares PR #875 )
* Update the FC submodule with the changes for GRPH-4
* Merged Bitshares PR #1462 and compilation fixes
* Support/gitlab (#123)
* Updated gitlab process
* Fix undefined references in cli test
* Updated GitLab CI
* Fix #436 object_database created outside of witness data directory
* supplement more comments on database::_opened variable
* prevent segfault when destructing application obj
* Fixed test failures and compilation issue
* minor performance improvement
* Added comment
* Fix compilation in debug mode
* Fixed duplicate ops returned from get_account_history
* Fixed account_history_pagination test
* Removed unrelated comment
* Update to fixed version of fc
* Skip auth check when pushing self-generated blocks
* Extract public keys before pushing a transaction
* Dereference chain_database shared_ptr
* Updated transaction::signees to mutable
and
* updated get_signature_keys() to return a const reference,
* get_signature_keys() will update signees on first call,
* modified test cases and wallet.cpp accordingly,
* no longer construct a new signed_transaction object before pushing
* Added get_asset_count API
* No longer extract public keys before pushing a trx
and removed unused new added constructor and _get_signature_keys() function from signed_transaction struct
* changes to withdraw_vesting feature(for both cdd and GPOS)
* Comments update
* update to GPOS hardfork ref
* Remove leftover comment from merge
* fix for get_vesting_balance API call
* braces update
* Allow sufficient space for new undo_session
* Throw for deep nesting
* node.cpp: Check the attacker/buggy client before updating items ids
The peer is an attacker or buggy, which means the item_hashes_received is
not correct.
Move the check before updating items ids to save some time in this case.
* Create .gitlab-ci.yml
* Added cli_test to CI
* fixing build errors (#150)
* fixing build errors
vest type correction
* fixing build errors
vest type correction
* fixes
new Dockerfile
* vesting_balance_type correction
vesting_balance_type changed to normal
* gcc5 support to Dockerfile
gcc5 support to Dockerfile
* use random port numbers in app_test (#154)
* Changes to compiple with GCC 7(Ubuntu 18.04)
* proposal fail_reason bug fixed (#157)
* Added Sonarcloud code_quality to CI (#159)
* Added sonarcloud analysis (#158)
* changes to have separate methods and single withdrawl fee for multiple vest objects
* 163-fix, Return only non-zero vesting balances
* Support/gitlab develop (#168)
* Added code_quality to CI
* Update .gitlab-ci.yml
* Point to PBSA/peerplays-fc commit f13d063 (#167)
* [GRPH-3] Additional cli tests (#155)
* Additional cli tests
* Compatible with latest fc changes
* Fixed Spacing issues
* [GRPH-106] Added voting tests (#136)
* Added more voting tests
* Added additional option
* Adjust p2p log level (#180)
* merge gpos to develop (#186)
* issue - 154: Don't allow to vote when vesting balance is 0
* changes to withdraw_vesting feature(for both cdd and GPOS)
* Comments update
* update to GPOS hardfork ref
* fix for get_vesting_balance API call
* braces update
* Create .gitlab-ci.yml
* fixing build errors (#150)
* fixing build errors
vest type correction
* fixing build errors
vest type correction
* fixes
new Dockerfile
* vesting_balance_type correction
vesting_balance_type changed to normal
* gcc5 support to Dockerfile
gcc5 support to Dockerfile
* Changes to compiple with GCC 7(Ubuntu 18.04)
* changes to have separate methods and single withdrawl fee for multiple vest objects
* 163-fix, Return only non-zero vesting balances
* Revert "Revert "GPOS protocol""
This reverts commit 67616417b7.
* add new line needed to gpos hardfork file
* comment temporally cli_vote_for_2_witnesses until refactor or delete
* fix gpos tests
* fix gitlab-ci conflict
* Fixed few error messages
* error message corrections at other places
* Updated FC repository to peerplays-network/peerplays-fc (#189)
Point to fc commit hash 6096e94 [latest-fc branch]
* Project name update in Doxyfile (#146)
* changes to allow user to vote in each sub-period
* Fixed GPOS vesting factor issue when proxy is set
* Added unit test for proxy voting
* Review changes
* changes to update last voting time
* resolve merge conflict
* unit test changes and also separated GPOS test suite
* delete unused variables
* removed witness check
* eliminate time gap between two consecutive vesting periods
* deleted GPOS specific test suite and updated gpos tests
* updated GPOS hf
* Fixed dividend distribution issue and added test case
* fix flag
* clean newlines gpos_tests
* adapt gpos_tests to changed flag
* Fix to roll in GPOS rules, carry votes from 6th sub-period
* check was already modified
* comments updated
* updated comments to the benefit of reviewer
* Added token symbol name in error messages
* Added token symbol name in error messages (#204)
* case 1: Fixed last voting time issue
* get_account bug fixed
* Fixed flag issue
* Fixed spelling issue
* remove non needed gcc5 changes to dockerfile
* GRPH134- High CPU Issue, websocket changes (#213)
* update submodule branch to refer to the latest commit on latest-fc branch (#214)
* Improve account maintenance performance (#130)
* Improve account maintenance performance
* merge fixes
* Fixed merge issue
* Fixed indentations and extra ';'
* Update CI for syncing gitmodules (#216)
* Added logging for the old update_expired_feeds bug
The old bug is https://github.com/cryptonomex/graphene/issues/615 .
Due to the bug, `update_median_feeds()` and `check_call_orders()`
will be called when a feed is not actually expired, normally this
should not affect consensus since calling them should not change
any data in the state.
However, the logging indicates that `check_call_orders()` did
change some data under certain circumstances, specifically, when
multiple limit order matching issue (#453) occurred at same block.
* https://github.com/bitshares/bitshares-core/issues/453
* Minor performance improvement for price::is_null()
* Use static refs in db_getter for immutable objects
* Minor performance improvement for db_maint
* Minor code updates for asset_evaluator.cpp
* changed an `assert()` to `FC_ASSERT()`
* replaced one `db.get(asset_id_type())` with `db.get_core_asset()`
* capture only required variables for lambda
* Improve update_expired_feeds performance #1093
* Change static refs to member pointers of db class
* Added getter for witness schedule object
* Added getter for core dynamic data object
* Use getters
* Removed unused variable
* Add comments for update_expired_feeds in db_block
* Minor refactory asset_create_evaluator::do_apply()
* Added FC_ASSERT for dynamic data id of core asset
* Added header inclusions in db_management.cpp
* fix global objects usage during replay
* Logging config parsing issue
* added new files
* compilation fix
* Simplified code in database::pay_workers()
* issue with withdrawl
* Added unit test for empty account history
* set extensions default values
* Update GPOS hardfork date and don't allow GPOS features before hardfork time
* refer to latest commit of latest-fc branch (#224)
* account name or id support in all database api
* asset id or name support in all asset APIs
* Fixed compilation issues
* Fixed alignment issues
* Externalized some API templates
* Externalize serialization of blocks, tx, ops
* Externalized db objects
* Externalized genesis serialization
* Externalized serialization in protocol library
* Undo superfluous change
* remove default value for extension parameter
* fix compilation issues
* GRPH-46-Quit_command_cliwallet
* removed multiple function definition
* Fixed chainparameter update proposal issue
* Move GPOS withdraw logic to have single transaction(also single fee) and update API
* Added log for authorization failure of proposal operations
* Votes consideration on GPOS activation
* bump fc version
* fix gpos tests
* Bump fc version
* Updated gpos/voting_tests
* Fixed withdraw vesting bug
* Added unit test
* Update hardfork date for TESTNET, sync fc module and update logs
* avoid wlog as it filling up space
* Beatrice hot fix(sync issue fix)
* gpos tests fix
* Set hardfork date to Jan5th on TESTNET
Co-authored-by: Peter Conrad <github.com@quisquis.de>
Co-authored-by: John M. Jones <jmjatlanta@gmail.com>
Co-authored-by: obucinac <obucinac@users.noreply.github.com>
Co-authored-by: Bobinson K B <bobinson@gmail.com>
Co-authored-by: Alfredo Garcia <oxarbitrage@gmail.com>
Co-authored-by: Miha Čančula <miha@noughmad.eu>
Co-authored-by: Abit <abitmore@users.noreply.github.com>
Co-authored-by: Roshan Syed <r.syed@pbsa.info>
Co-authored-by: Sandip Patel <sandip@knackroot.com>
Co-authored-by: RichardWeiYang <richard.weiyang@gmail.com>
Co-authored-by: gladcow <jahr@yandex.ru>
Co-authored-by: satyakoneru <satyakoneru.iiith@gmail.com>
256 lines
9.6 KiB
C++
256 lines
9.6 KiB
C++
/*
|
|
* Copyright (c) 2015 Cryptonomex, Inc., and contributors.
|
|
*
|
|
* The MIT License
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include <graphene/chain/vesting_balance_object.hpp>
|
|
|
|
#include <fc/io/raw.hpp>
|
|
|
|
namespace graphene { namespace chain {
|
|
|
|
inline bool sum_below_max_shares(const asset& a, const asset& b)
|
|
{
|
|
assert(GRAPHENE_MAX_SHARE_SUPPLY + GRAPHENE_MAX_SHARE_SUPPLY > GRAPHENE_MAX_SHARE_SUPPLY);
|
|
return (a.amount <= GRAPHENE_MAX_SHARE_SUPPLY)
|
|
&& ( b.amount <= GRAPHENE_MAX_SHARE_SUPPLY)
|
|
&& ((a.amount + b.amount) <= GRAPHENE_MAX_SHARE_SUPPLY);
|
|
}
|
|
|
|
asset linear_vesting_policy::get_allowed_withdraw( const vesting_policy_context& ctx )const
|
|
{
|
|
share_type allowed_withdraw = 0;
|
|
|
|
if( ctx.now > begin_timestamp )
|
|
{
|
|
const auto elapsed_seconds = (ctx.now - begin_timestamp).to_seconds();
|
|
assert( elapsed_seconds > 0 );
|
|
|
|
if( elapsed_seconds >= vesting_cliff_seconds )
|
|
{
|
|
// BLOCKBACK-154 fix, Begin balance for linear vesting applies only to initial account balance from genesis
|
|
// So, for any GPOS vesting, the begin balance would be 0 and should be able to withdraw balance amount based on lockin period
|
|
if(begin_balance == 0)
|
|
{
|
|
allowed_withdraw = ctx.balance.amount;
|
|
return asset( allowed_withdraw, ctx.balance.asset_id );
|
|
}
|
|
else
|
|
{
|
|
share_type total_vested = 0;
|
|
if( elapsed_seconds < vesting_duration_seconds )
|
|
{
|
|
total_vested = (fc::uint128_t( begin_balance.value ) * elapsed_seconds / vesting_duration_seconds).to_uint64();
|
|
}
|
|
else
|
|
{
|
|
total_vested = begin_balance;
|
|
}
|
|
assert( total_vested >= 0 );
|
|
|
|
const share_type withdrawn_already = begin_balance - ctx.balance.amount;
|
|
assert( withdrawn_already >= 0 );
|
|
|
|
allowed_withdraw = total_vested - withdrawn_already;
|
|
assert( allowed_withdraw >= 0 );
|
|
}
|
|
}
|
|
}
|
|
|
|
return asset( allowed_withdraw, ctx.balance.asset_id );
|
|
}
|
|
|
|
void linear_vesting_policy::on_deposit(const vesting_policy_context& ctx)
|
|
{
|
|
}
|
|
|
|
bool linear_vesting_policy::is_deposit_allowed(const vesting_policy_context& ctx)const
|
|
{
|
|
return (ctx.amount.asset_id == ctx.balance.asset_id)
|
|
&& sum_below_max_shares(ctx.amount, ctx.balance);
|
|
}
|
|
|
|
void linear_vesting_policy::on_withdraw(const vesting_policy_context& ctx)
|
|
{
|
|
}
|
|
|
|
bool linear_vesting_policy::is_withdraw_allowed(const vesting_policy_context& ctx)const
|
|
{
|
|
return (ctx.amount.asset_id == ctx.balance.asset_id)
|
|
&& (ctx.amount <= get_allowed_withdraw(ctx));
|
|
}
|
|
|
|
fc::uint128_t cdd_vesting_policy::compute_coin_seconds_earned(const vesting_policy_context& ctx)const
|
|
{
|
|
assert(ctx.now >= coin_seconds_earned_last_update);
|
|
int64_t delta_seconds = (ctx.now - coin_seconds_earned_last_update).to_seconds();
|
|
assert(delta_seconds >= 0);
|
|
|
|
fc::uint128_t delta_coin_seconds = ctx.balance.amount.value;
|
|
delta_coin_seconds *= delta_seconds;
|
|
|
|
fc::uint128_t coin_seconds_earned_cap = ctx.balance.amount.value;
|
|
coin_seconds_earned_cap *= std::max(vesting_seconds, 1u);
|
|
|
|
return std::min(coin_seconds_earned + delta_coin_seconds, coin_seconds_earned_cap);
|
|
}
|
|
|
|
void cdd_vesting_policy::update_coin_seconds_earned(const vesting_policy_context& ctx)
|
|
{
|
|
coin_seconds_earned = compute_coin_seconds_earned(ctx);
|
|
coin_seconds_earned_last_update = ctx.now;
|
|
}
|
|
|
|
asset cdd_vesting_policy::get_allowed_withdraw(const vesting_policy_context& ctx)const
|
|
{
|
|
if(ctx.now <= start_claim)
|
|
return asset(0, ctx.balance.asset_id);
|
|
fc::uint128_t cs_earned = compute_coin_seconds_earned(ctx);
|
|
fc::uint128_t withdraw_available = cs_earned / std::max(vesting_seconds, 1u);
|
|
assert(withdraw_available <= ctx.balance.amount.value);
|
|
return asset(withdraw_available.to_uint64(), ctx.balance.asset_id);
|
|
}
|
|
|
|
void cdd_vesting_policy::on_deposit(const vesting_policy_context& ctx)
|
|
{
|
|
update_coin_seconds_earned(ctx);
|
|
}
|
|
|
|
void cdd_vesting_policy::on_deposit_vested(const vesting_policy_context& ctx)
|
|
{
|
|
on_deposit(ctx);
|
|
coin_seconds_earned += ctx.amount.amount.value * std::max(vesting_seconds, 1u);
|
|
}
|
|
|
|
void cdd_vesting_policy::on_withdraw(const vesting_policy_context& ctx)
|
|
{
|
|
update_coin_seconds_earned(ctx);
|
|
fc::uint128_t coin_seconds_needed = ctx.amount.amount.value;
|
|
coin_seconds_needed *= std::max(vesting_seconds, 1u);
|
|
// is_withdraw_allowed should forbid any withdrawal that
|
|
// would trigger this assert
|
|
assert(coin_seconds_needed <= coin_seconds_earned);
|
|
|
|
coin_seconds_earned -= coin_seconds_needed;
|
|
}
|
|
|
|
bool cdd_vesting_policy::is_deposit_allowed(const vesting_policy_context& ctx)const
|
|
{
|
|
return (ctx.amount.asset_id == ctx.balance.asset_id)
|
|
&& sum_below_max_shares(ctx.amount, ctx.balance);
|
|
}
|
|
|
|
bool cdd_vesting_policy::is_deposit_vested_allowed(const vesting_policy_context& ctx) const
|
|
{
|
|
return is_deposit_allowed(ctx);
|
|
}
|
|
|
|
bool cdd_vesting_policy::is_withdraw_allowed(const vesting_policy_context& ctx)const
|
|
{
|
|
return (ctx.amount <= get_allowed_withdraw(ctx));
|
|
}
|
|
|
|
#define VESTING_VISITOR(NAME, MAYBE_CONST) \
|
|
struct NAME ## _visitor \
|
|
{ \
|
|
typedef decltype( \
|
|
std::declval<linear_vesting_policy>().NAME( \
|
|
std::declval<vesting_policy_context>()) \
|
|
) result_type; \
|
|
\
|
|
NAME ## _visitor( \
|
|
const asset& balance, \
|
|
const time_point_sec& now, \
|
|
const asset& amount \
|
|
) \
|
|
: ctx(balance, now, amount) {} \
|
|
\
|
|
template< typename Policy > \
|
|
result_type \
|
|
operator()(MAYBE_CONST Policy& policy) MAYBE_CONST \
|
|
{ \
|
|
return policy.NAME(ctx); \
|
|
} \
|
|
\
|
|
vesting_policy_context ctx; \
|
|
}
|
|
|
|
VESTING_VISITOR(on_deposit,);
|
|
VESTING_VISITOR(on_deposit_vested,);
|
|
VESTING_VISITOR(on_withdraw,);
|
|
VESTING_VISITOR(is_deposit_allowed, const);
|
|
VESTING_VISITOR(is_deposit_vested_allowed, const);
|
|
VESTING_VISITOR(is_withdraw_allowed, const);
|
|
VESTING_VISITOR(get_allowed_withdraw, const);
|
|
|
|
bool vesting_balance_object::is_deposit_allowed(const time_point_sec& now, const asset& amount)const
|
|
{
|
|
return policy.visit(is_deposit_allowed_visitor(balance, now, amount));
|
|
}
|
|
|
|
bool vesting_balance_object::is_withdraw_allowed(const time_point_sec& now, const asset& amount)const
|
|
{
|
|
bool result = policy.visit(is_withdraw_allowed_visitor(balance, now, amount));
|
|
// if some policy allows you to withdraw more than your balance,
|
|
// there's a programming bug in the policy algorithm
|
|
assert((amount <= balance) || (!result));
|
|
return result;
|
|
}
|
|
|
|
void vesting_balance_object::deposit(const time_point_sec& now, const asset& amount)
|
|
{
|
|
on_deposit_visitor vtor(balance, now, amount);
|
|
policy.visit(vtor);
|
|
balance += amount;
|
|
}
|
|
|
|
void vesting_balance_object::deposit_vested(const time_point_sec& now, const asset& amount)
|
|
{
|
|
on_deposit_vested_visitor vtor(balance, now, amount);
|
|
policy.visit(vtor);
|
|
balance += amount;
|
|
}
|
|
|
|
bool vesting_balance_object::is_deposit_vested_allowed(const time_point_sec& now, const asset& amount) const
|
|
{
|
|
return policy.visit(is_deposit_vested_allowed_visitor(balance, now, amount));
|
|
}
|
|
|
|
void vesting_balance_object::withdraw(const time_point_sec& now, const asset& amount)
|
|
{
|
|
assert(amount <= balance);
|
|
on_withdraw_visitor vtor(balance, now, amount);
|
|
policy.visit(vtor);
|
|
balance -= amount;
|
|
}
|
|
|
|
asset vesting_balance_object::get_allowed_withdraw(const time_point_sec& now)const
|
|
{
|
|
asset amount = asset();
|
|
return policy.visit(get_allowed_withdraw_visitor(balance, now, amount));
|
|
}
|
|
|
|
} } // graphene::chain
|
|
|
|
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::linear_vesting_policy )
|
|
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::cdd_vesting_policy )
|
|
GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::vesting_balance_object )
|