Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions
3303 commits 435 branches 47 tags 121 MiB
Commit graph

1379 commits

Author SHA1 Message Date
Alfredo Garcia
aef57f1720
Merge pull request #200 from peerplays-network/feature/BLOCKBACK-166 
[BLOCKBACK-166] GPOS - dividend distribution for UIAs
 2019-10-26 08:08:27 -03:00
pbattu123
8269c94601
Merge branch 'qa_gpos_18.04' into BLOCKBACK-155 2019-10-25 10:21:55 -03:00
Sandip Patel
a8423f167d Fixed dividend distribution issue and added test case 2019-10-25 16:41:34 +05:30
Alfredo Garcia
e63452cb3c
Merge pull request #199 from peerplays-network/BLOCKBACK_164 
BLOCKBACK-164 Eliminate time gap between two consecutive vesting periods
 2019-10-25 08:01:56 -03:00
Alfredo Garcia
ed49ab8eea
Merge pull request #190 from peerplays-network/feature/BLOCKBACK-162 
[BLOCKBACK-162] Error message correction
 2019-10-25 07:04:01 -03:00
pbattu123
bdd1863cf2 updated GPOS hf 2019-10-24 23:53:47 -03:00
pbattu123
78787c2a14 eliminate time gap between two consecutive vesting periods 2019-10-24 14:39:01 -03:00
pbattu123
d6da2963dc resolve merge conflict 2019-10-23 22:15:26 -03:00
pbattu123
3be3fd36bb Merge branch 'BLOCKBACK-155' of https://github.com/peerplays-network/peerplays into BLOCKBACK-155 2019-10-23 18:36:39 -03:00
pbattu123
48d0d88ff0 changes to update last voting time 2019-10-23 18:33:17 -03:00
pbattu123
d4460870bd
Merge branch 'qa_gpos_18.04' into BLOCKBACK-155 2019-10-23 17:57:13 -03:00
satyakoneru
666ced390e SON126 - Witness Proposals to deregister SONs (#192) 
* SON126 - Witness Proposals to deregister SONs

* SON126 - Approval by witness, removal of son_proposal_object, commenting

* SON126 - Witness proposal tests and related fixes

* SON126 - Proper commenting
 2019-10-23 22:16:04 +05:30
Sandip Patel
73829bd97f Fixed GPOS vesting factor issue when proxy is set 2019-10-23 11:56:38 +05:30
pbattu123
0d1c41557d changes to allow user to vote in each sub-period 2019-10-22 10:39:45 -03:00
Alfredo Garcia
e0242bcf86 fix build error (#191) 
* fix build error

* adapt son_pay_test to dormant vesting policy
 2019-10-22 03:29:31 +05:30
obucinac
610490ef81
Active SONs, list up to 15, order by votes, add test (#185) 
* Add test for selecting 15 SONs with highest votes
* Display up to 15 active SONs, SON ordering by total_votes
 2019-10-21 15:44:09 +02:00
Sandip Patel
0800e2bc67 error message corrections at other places 2019-10-19 16:38:12 +05:30
Sandip Patel
c025f639d7 Fixed few error messages 2019-10-19 10:58:56 +05:30
Alfredo Garcia
f84155a166
Merge branch 'feature/SONs-base' into son_vesting 2019-10-18 15:21:08 -03:00
Alfredo Garcia
d29e433488 force son create vesting balance to have dormant policy 2019-10-18 00:27:13 -03:00
Alfredo Garcia
76120a5b76 abstraction of dormant vesting policy 2019-10-18 00:01:40 -03:00
Alfredo Garcia
8c188bd53f 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
 2019-10-17 22:09:44 +05:30
satyakoneru
ee7aae56da SON118-Add Budget for SON (#165) 
* SON118-Add Budget for SON

* SON118 - Compilation errors fix

* SON118 - Proper commenting around pay_sons function

* SON118 - Comment correction, SON statistics object implementation type correction

* SON118 - Add missing index init and reflect enums

* SON118 - Correcting the indentation

* SON118 SON144 - Add unit test, code fixes and resolve failures for existing tests

* SON118 SON144 - Removing extra spaces added
 2019-10-17 20:16:48 +05:30
Alfredo Garcia
032c4c7a99 add precision to son vesting amount 2019-10-16 14:59:49 -03:00
Alfredo Garcia
be8dc42d66 add dormant vesting policy for son 2019-10-15 21:55:48 -03:00
Alfredo Garcia
c94412cb7a add vesting balance type support 2019-10-15 20:28:04 -03:00
Alfredo Garcia
c02a33a004 add son vesting config options 2019-10-15 17:35:26 -03:00
Sandip Patel
40534446da [GRPH-106] Added voting tests (#136) 
* Added more voting tests

* Added additional option
 2019-10-10 21:29:01 +05:30
obucinac
e3548de34e
SON object, operations, cli_wallet commands and RPC (#160) 
- create_son, update_son, delete_son, list_sons
- get_sons, get_son_by_account, lookup_son_accounts, get_son_count
- vote_for_son, update_son_votes
- claim_registered_son
- get_son in cli_wallet
- Updating global_property_object
- Decrease SON hardfork time for test purposes
- CLI Wallet tests imported from develop branch
 2019-10-09 22:24:36 +02:00
Srdjan Obucina
944c2c1a4c Merge branch 'develop' into feature/SONs-base 2019-10-08 17:59:28 +02:00
Srdjan Obucina
9768d302be Revert "[SON-107] Merge develop branch to SONs-base (#166)" 
This reverts commit 499e318199.
 2019-10-08 15:44:13 +02:00
gladcow
499e318199 [SON-107] Merge develop branch to SONs-base (#166) 
* fix rng and get_winner_numbers implemented

* coipied code for bitshares fixing 429 and 433 isuues

* ticket_purchase_operation implemented. added lottery_options to asset

* lottery end implemented

* minor logic changes. added db_api and cli_wallet methods

* fix reindex on peerplays network

* fix some tests. add gitlab-ci.yml

* add pull to gitlab-ci

* fix

* fix and comment some tests

* added owner to lottery_asset_options. commented async call in on_applied_block callback

* added get_account_lotteries method to db_api and cli, lottery end_date and ticket_price verification

* merge get_account_lotteries branch. fix create_witness test

* fix test genesis and end_date verification

* fixed indices sorting and lottery end checking by date

* update db_version for replay and removed duplicate include files

* Added ntp and upgraded boost version

* Revert "GPOS protocol"

* need to remove backup files

* virtual-op-fix for deterministic virtual_op number

* Merged beatrice into 5050

* Updated gitmodules, changes to allow voting on lottery fee

* Removed submodule libraries/fc

* Added libraries/fc

* added missing , in types.hpp

* Added sweeps parameters to parameter_extension

* added missing comma in operations.hpp, small changes to config.hpp

* fixed returntype in chain_parameters.hpp

* removed sweeps_parameter_extensions

* Changed fc library

* fixed asset_object

* Changed peerplays-fc submodule

* Changed fc submodule to ubuntu 18.04 upgrade

* Removed submodule libraries/fc

* Added fc library back

* fix casting in overloaded function

* Removed blind_sign and unblind_signature functions

* Added new lottery_asset_create_operation

* Changed sweeps hardfork time

* Removed redundant if from asset_evaluator and fixed db_notify

* fixed duplicate code in fee_tests

* removed redundant tgenesis file

* Enable building on Ubuntu 18.04 using GCC 7 compiler

* fix: is_benefactor_reward had the default value of true when not set

* Docker file for Ubuntu 18.04

Base image updated to Unbuntu 18.04
Prerequisite list updated
Basic configuration updated

* Quick fix: Added missing package pkg-config

* Docker file updates

* 5050 fee update and compilation error fix

* Dockerfile, set system locale

Prevents locale::facet::_S_create_c_locale name error

* Update README.md

Fix typo

* Update README.md

* Changed hardfork time for SWEEPS and Core-429

* revert master changes that were brought in previous commit

* Fixed error when account_history_object with id 0 doesnt exist

* Fixed error while loading object database

* test for zero id object in account history

* Reorder operations in Dockerfile, to make image creation faster

- Reorder prevents unnecessary building of Boost libraries

* Fix for irrelevant signature included issue

* fix copyrigth messages order

* remove double empty lines

* Backport fix for `get_account_history` from https://github.com/bitshares/bitshares-core/pull/628 and add additional account history test case

* NTP client back

* GRPH-53-Log_format_error

* Merge pull request #1036 from jmjatlanta/issue_730

Add fail_reason to proposal_object

* Unit test case fixes and prepared SONs base

* Use offsetof instead of custom macro

* Hide some compiler warnings

* Make all the tests compile

* Add nullptr check in api.cpp for easier testing

* Add test case for broadcast_trx_with_callback API

* Unit test case fixes and prepared SONs base

* Merge pull request #714 from pmconrad/json_fix

JSON fix

* Increase max depth for trx confirmation callback

* Adapt to variant API with `max_depth` argument

* Update fc submodule

* Created unit test for #325

* remove needless find()

* GRPH-4-CliWallet_crash_ctrlD

* fix copyright message

* Make all the tests compile

* increase delay for node connection

* Increase block creation timeout to 2500ms

* remove cache from cli get_account

* add cli tests framework

* Adjust newly merged code to new API

* Improved resilience of block database against corruption

* 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.)

* 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

* Merge pull request #938 from bitshares/fix-block-storing

Store correct block ID when switching forks

* exclude second undo_db.enable() call in some cases

* Add missing change

* change bitshares to core in message

* Fixed integer overflow issue

* Fix for for history ID mismatch ( Bitshares PR #875 )

* Update the FC submodule with the changes for GRPH-4

* Fix #436 object_database created outside of witness data directory

* supplement more comments on database::_opened variable

* prevent segfault when destructing application obj

* Fixed duplicate ops returned from get_account_history

* minor performance improvement

* Added comment

* Merged Bitshares PR #1462 and compilation fixes

* Support/gitlab (#123)

* Updated gitlab process

* Fix undefined references in cli test

* Fixed test failures and compilation issue

* Fixed account_history_pagination test

* Fix compilation in debug mode

* Removed unrelated comment

* 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

* Allow sufficient space for new undo_session

* Throw for deep nesting

* No longer extract public keys before pushing a trx

and removed unused new added constructor and _get_signature_keys() function from signed_transaction struct

* Added cli_test to CI

* use random port numbers in app_test (#154)

* proposal fail_reason bug fixed (#157)

* Added Sonarcloud code_quality to CI (#159)

* Added sonarcloud analysis (#158)

* fix for lottery end

* fix declarations

* fix declarations

* fix boost integer

* fix compilation

* fix chain tests

* fix app_test

* try to fix cli test

* fix incorrect max_depth param

* working cli test

* correct fc version
 2019-10-08 06:55:03 +05:30
pbattu123
d65f20a89f changes to have separate methods and single withdrawl fee for multiple vest objects 2019-10-03 16:38:40 -03:00
Sandip Patel
e995744716 proposal fail_reason bug fixed (#157) 2019-09-30 18:21:05 -04:00
pbattu123
f1eb625df8 Changes to compiple with GCC 7(Ubuntu 18.04) 2019-09-30 00:27:21 -03:00
Bobinson K B
e377478c34
Merge pull request #139 from peerplays-network/feature/GRPH-94 
Improve block generation performance
 2019-09-24 13:51:46 -04:00
Peter Conrad
819e1d25b2 Throw for deep nesting 2019-09-23 15:38:01 +03:00
Peter Conrad
8544896e6c Allow sufficient space for new undo_session 2019-09-23 15:38:01 +03:00
pbattu123
a7df686ebe braces update 2019-09-21 13:08:33 -03:00
pbattu123
4a72f943e8 fix for get_vesting_balance API call 2019-09-21 13:04:43 -03:00
Miha Čančula
97f9875918
Merge branch 'develop' into GRPH-50-network_broadcast_api-fix-v2 2019-09-21 17:17:19 +02:00
pbattu123
8e1c038558 update to GPOS hardfork ref 2019-09-20 16:58:06 -03:00
pbattu123
2a3d8a4c66 changes to withdraw_vesting feature(for both cdd and GPOS) 2019-09-20 11:32:07 -03:00
abitmore
106824c62a No longer extract public keys before pushing a trx 
and removed unused new added constructor and _get_signature_keys() function from signed_transaction struct
 2019-09-20 16:27:26 +03:00
abitmore
2dfb67e16e 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
 2019-09-20 14:10:24 +03:00
abitmore
56a6f8b732 Extract public keys before pushing a transaction 2019-09-20 13:44:15 +03:00
abitmore
12105ab6e5 Skip auth check when pushing self-generated blocks 2019-09-20 13:37:23 +03:00
Miha Čančula
94157497bb
Merge branch 'develop' into feature/GRPH-93-v2 2019-09-18 18:19:17 +02:00
Miha Čančula
499a5fc33e
Merge branch 'develop' into GRPH-50-network_broadcast_api-fix-v2 2019-09-18 16:36:42 +02:00
satyakoneru
b853a82275 SON11 - Add chain extension parameter to set SON count 2019-09-18 02:50:59 +00:00
Alfredo Garcia
bada09d7d0
Merge branch 'develop' into GRPH-75 2019-09-17 21:10:20 -03:00
Alfredo Garcia
88d90c327b
Merge branch 'develop' into feature/GRPH-79 2019-09-17 20:19:37 -03:00
Alfredo Garcia
589005515b
Merge branch 'develop' into GRPH-73-fix-block-id-forks 2019-09-17 19:32:20 -03:00
Alfredo Garcia
4914e74770
Merge branch 'develop' into feature/GRPH-79 2019-09-17 17:38:37 -03:00
Alfredo Garcia
d911b3db69
Merge branch 'develop' into GRPH-75 2019-09-17 15:53:18 -03:00
Alfredo Garcia
1f4de92d62
Merge branch 'develop' into feature/GRPH-88 2019-09-17 15:01:36 -03:00
Miha Čančula
6850be492d
Fix compilation in debug mode 2019-09-17 18:42:03 +02:00
Miha Čančula
2dc79e8674
Merge branch 'develop' into feature/GRPH-93 2019-09-17 15:26:33 +02:00
Sandip Patel
5ce9f8c8de Added comment 2019-09-17 13:28:22 +05:30
Sandip Patel
cde18342da minor performance improvement 2019-09-17 13:28:22 +05:30
Miha Čančula
4b5076b2e9
Merge branch 'develop' into GRPH-73-fix-block-id-forks 2019-09-16 18:51:53 +02:00
Miha Čančula
67362be337
Merge branch 'develop' into feature/GRPH-93 2019-09-16 10:15:40 +02:00
Alfredo Garcia
755383c121
Merge branch 'develop' into feature/GRPH-88 2019-09-12 16:07:36 -03:00
Ronak Patel
9fc07f191f Fixed test failures and compilation issue 2019-09-12 19:13:36 +05:30
John Jones
b3c64c83b2 prevent segfault when destructing application obj 2019-09-12 14:59:18 +03:00
cifer
f1ffd52e1e supplement more comments on database::_opened variable 2019-09-12 14:59:18 +03:00
cifer
0bcf6d4d65 Fix #436 object_database created outside of witness data directory 2019-09-12 14:59:18 +03:00
S
8f317e93d6 Fix building on Ubuntu 18.04 with GCC 7 2019-09-11 15:37:44 +02:00
Ronak Patel
646dc2e548 Merged Bitshares PR #1462 and compilation fixes 2019-09-10 18:56:27 +05:30
Bobinson K B
64c05f9b3f
Merge pull request #70 from peerplays-network/GRPH-59-Proposal-failure-handling 
Proposal failure handling
 2019-09-07 00:52:02 +05:30
pbattu123
e82a3dbcc0 Hardfork date updated to Sep12-10pm EST 2019-09-06 08:59:56 -03:00
pbattu123
7ce73aeb4e update 2019-09-04 13:09:11 -03:00
pbattu123
d28f9b0dbc missing things 2019-09-04 12:15:58 -03:00
pbattu123
f998c4611a bring back all review fixes that were deleted with 50/50 merge 2019-09-04 11:29:16 -03:00
Ronak Patel
22eb42e3eb Fixed integer overflow issue 2019-09-04 15:14:18 +05:30
Abit
f732048a6e
Merge pull request #938 from bitshares/fix-block-storing 
Store correct block ID when switching forks
 2019-09-04 10:54:53 +02:00
pbattu123
bec5918586 update hardfork date for 18.04 upgrade + 50/50 dApp 2019-09-03 11:07:00 -03:00
Srdjan Obucina
a081a8ecba Add missing change 2019-09-03 12:46:47 +02:00
gladcow
7b259ba2d3 exclude second undo_db.enable() call in some cases 2019-09-03 08:07:46 +03:00
Peter Conrad
ab382189fe Cut back block_log index file if inconsistent 2019-09-02 17:19:21 +03:00
Peter Conrad
0d108fb8ef Improved consistency check for block_log 2019-09-02 17:19:21 +03:00
Peter Conrad
b45a6ca147 Prevent unsigned integer underflow 2019-09-02 17:19:21 +03:00
Peter Conrad
3bee3f29a2 Log starting block number of replay 2019-09-02 17:19:21 +03:00
Peter Conrad
a0052d4bd3 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
 2019-09-02 17:19:21 +03:00
Peter Conrad
17417037c6 Moved reindex logic into database / chain_database, make use of additional blocks in block_database 
Fixed tests wrt db.open
 2019-09-02 17:19:21 +03:00
Peter Conrad
42680456b6 Improved resilience of block database against corruption 2019-09-02 17:19:21 +03:00
Srdjan Obucina
77dd8a9359 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.)
 2019-09-02 15:03:00 +02:00
Ronak Patel
b751508404 Merged changes from Bitshares PR 1036 2019-09-02 18:23:19 +05:30
Miha Čančula
83c28c2c06
Use offsetof instead of custom macro 2019-08-28 15:42:50 +02:00
Miha Čančula
cb99aaa0cf
Adapt to variant API with max_depth argument 2019-08-28 15:42:21 +02:00
Abit
a49f8bf47c
Merge pull request #714 from pmconrad/json_fix 
JSON fix
 2019-08-28 15:42:21 +02:00
John M. Jones
b4bf247c21
Merge pull request #1036 from jmjatlanta/issue_730 
Add fail_reason to proposal_object
 2019-08-28 14:56:24 +02:00
Miha Čančula
15290b8996
Use offsetof instead of custom macro 2019-08-28 14:55:15 +02:00
pbattu123
2486eddb5d revert master changes that were brought in previous commit 2019-08-22 09:54:52 -03:00
pbattu123
481fac17d5
Merge branch 'master' into beatrice 2019-08-22 09:15:27 -03:00
Prabhjot
30c336ecfb Changed hardfork time for SWEEPS and Core-429 2019-08-22 09:08:12 -03:00
PBSA
896ac97962 5050 fee update and compilation error fix 2019-08-21 13:13:46 +00:00
pbattu123
f9e46a31df
Merge branch 'beatrice' into qa_gpos_18.04_gcc7_fix 2019-08-20 15:42:03 -03:00
pbattu123
947b02bd57
Merge branch 'beatrice' into beatrice-5050-merge 2019-08-20 15:15:01 -03:00
pbattu123
c2a7aa7a33
Merge pull request #39 from PBSA/virtual_op_fix 
virtual-op-fix for deterministic virtual_op number
 2019-08-20 14:54:18 -03:00
Prabhjot
2c14af0699 fix: is_benefactor_reward had the default value of true when not set 2019-08-19 11:47:04 -03:00
Srdjan Obucina
4d426e1f5a Enable building on Ubuntu 18.04 using GCC 7 compiler 2019-08-14 14:05:30 +02:00
Prabhjot Singh
8caeb0ec18 merge 5050 into beatrice 2019-08-12 08:38:53 -04:00
Prabhjot
80dc2003b9 Removed redundant if from asset_evaluator and fixed db_notify 2019-08-09 13:18:09 -04:00
Prabhjot
afe6cba258 Changed sweeps hardfork time 2019-08-09 13:04:02 -04:00
Prabhjot
a0ae945f8d Added new lottery_asset_create_operation 2019-08-09 13:01:57 -04:00
Prabhjot
6072dd16bb fix casting in overloaded function 2019-08-08 07:46:55 -04:00
pbsa
485bb0e7b3 included sstring in 2 files, added missing ops to db_notify.cpp 2019-08-06 15:19:51 -03:00
Prabhjot
115bfb0370 fixed asset_object 2019-08-06 07:54:06 -04:00
Prabhjot
c278352713 removed sweeps_parameter_extensions 2019-08-02 09:47:32 -04:00
Prabhjot
7944a6db34 fixed returntype in chain_parameters.hpp 2019-07-31 10:22:51 -04:00
Prabhjot
7044e5c782 added missing comma in operations.hpp, small changes to config.hpp 2019-07-31 10:19:35 -04:00
Prabhjot
3db62bbe46 Added sweeps parameters to parameter_extension 2019-07-31 09:36:22 -04:00
Prabhjot
4829c3dd93 added missing , in types.hpp 2019-07-30 15:28:03 -04:00
Prabhjot
7b98f7de16 Updated gitmodules, changes to allow voting on lottery fee 2019-07-30 15:01:44 -04:00
Prabhjot Singh
aa3128fe89 Merged beatrice into 5050 2019-07-30 11:43:31 -04:00
pbattu123
d365e555f4 virtual-op-fix for deterministic virtual_op number 2019-06-19 11:16:43 -03:00
Alfredo
891137cf57 merge PR 2 2019-05-30 00:04:53 -03:00
pbattu123
67616417b7
Revert "GPOS protocol" 2019-05-29 18:31:01 -03:00
pbattu123
2c86caacc5
Merge pull request #8 from oxarbitrage/gpos2 
GPOS protocol
 2019-05-29 18:09:48 -03:00
pbattu
0f06a9af2a Required changes to upgrade blockchain to ubuntu18.04 2019-05-20 22:32:17 -03:00
pbattu123
ea41e06471 update db_version for replay and removed duplicate include files 2019-04-15 09:47:04 -03:00
Roshan Syed
b787f3f21b Revert "Merge branch 'master' into beatrice" 
This reverts commit cc8766d319, reversing
changes made to fd71c4b682.
 2019-04-12 12:53:09 -03:00
pbattu123
cc8766d319
Merge branch 'master' into beatrice 2019-04-12 10:12:58 -03:00
Eric Frias
1052f49f5d Make indexes on blockchain objects related to betting markets into 
unique indexes to ensure the order betting market groups are resolved
is consistent between different nodes.  This bumps the database version
which will trigger a replay on the first run after this upgrade.
 2019-03-29 16:20:45 -04:00
Alfredo
a58eb6fae8 add get_gpos_info database api call 2019-03-05 17:48:47 -03:00
Fabian Schuh
5e352238c4
Dupcheck fix 2019-02-07 16:20:43 +01:00
Fabian Schuh
9946eab684
Make ordered_unique out of ordered_non_unique indices 2019-02-07 15:42:01 +01:00
Fabian Schuh
6f3ddc0719
Merge branch 'hardfork' into feature/duplicate-operation-check-hardfork 2019-02-07 15:34:16 +01:00
Fabian Schuh
80600494d7
Ensure proposals for fee updates with new operations cannot happen before HF 2019-02-07 13:29:06 +01:00
Fabian Schuh
7598d54fa7
Fixes after review 2019-02-07 12:18:15 +01:00
Fabian Schuh
867ac8045c
Remove unecessary loop since _pending_tx are in API's scope's database already 2019-02-07 11:18:44 +01:00
Fabian Schuh
d5beeae570
Set hardfork dates to February 18th 12:00PM GMT 2019-02-04 16:14:31 +01:00
dimfred
ee8429938c moved check_trx_for_duplicate_operation and digest_accumulator to database api 2019-02-01 18:36:30 +01:00
Alfredo
0e3d87eaad refactor calculate_vesting_factor to consider if voted in last periods for coefficient calculation, fix the tests accordingly, change hardfork date 2019-01-31 20:32:19 -03:00
Fabian Schuh
6400957860
Merge remote-tracking branch 'network/develop' into hardfork 2019-01-28 09:47:30 +01:00
Fabian Schuh
74f295ba40
Merge branch 'beatrice' into develop 2019-01-28 09:45:57 +01:00
Alfredo
ec64df7889 refactor calculate_vesting_factor 2019-01-26 11:51:15 -03:00
Alfredo
30c95f6010 remove not needed period calculation 2019-01-24 17:52:24 -03:00
Fabian Schuh
7078b224af Increase default (starting) rake 2019-01-23 16:27:57 +01:00
Alfredo
d602e71601 move gpos global parameters to extensions 2019-01-22 22:40:15 -03:00
Fabian Schuh
af561e7463
TBD, hardfork dates 2019-01-22 15:16:52 +01:00
Fabian Schuh
e9970767f5
Ensure we use the correct genesis block, config and seed nodes 2019-01-22 10:21:39 +01:00
Alfredo
b914a7dc0b add globals to genesis, update hardfork date, fix test case 2019-01-15 14:25:43 -03:00
Alfredo
83ea345042 hf protection for creating gpos balances in proposals 2019-01-03 14:38:31 -03:00
Alfredo
d468b146e8 implement gpos to voting calculations 2018-12-31 19:18:00 -03:00
Alfredo
6b533828db implement rolling_period_start function 2018-12-31 18:20:48 -03:00
Alfredo
602b8530da implement functions for gpos 2018-12-31 18:17:52 -03:00
Alfredo
6d01286140 prepare to pay dividends only to vested gpos balances after hf 2018-12-31 17:48:26 -03:00
Alfredo
3de55137d5 bump the database 2018-12-31 12:04:04 -03:00
Alfredo
46467a7bbe only allow gpos balance creation after HF 2018-12-31 12:01:31 -03:00
Alfredo
57a54f5714 add fixed policy to gpos vesting balances 2018-12-31 11:59:51 -03:00
Alfredo
604fbed498 add type field to vesting balances 2018-12-30 18:01:57 -03:00
Alfredo
62d2c1c63b add global gpos parameters 2018-12-29 21:19:42 -03:00
Alfredo
88f18d16a7 add gpos hardfork date 2018-12-29 14:43:41 -03:00
Fabian Schuh
3e58dc5a11 cleanup of code 2018-12-20 09:58:57 +01:00
dimfred
4875c7a0f9 Fix Duplication operation check 2018-12-20 09:58:57 +01:00
Fabian Schuh
381946bab7
Merge pull request #1 from oxarbitrage/dividends_testcases 
Dividends testcases fixes
 2018-12-18 15:53:08 +01:00
Alfredo
0b1e53234f add last_vote_time to account statistics 2018-12-17 18:50:05 -03:00
Alfredo
8a0dc48321 fix identation in asset_create_evaluator::do_evaluate 2018-12-15 16:21:53 -03:00
Fabian Schuh
9ad4b3a594 Move hardfork dates closer to now() 2018-10-24 10:40:37 +02:00
Fabian Schuh
ea3bb1a377
Proper variables for beatrice testnet 2018-10-12 12:20:30 +02:00
Fabian Schuh
cc7953672c
Merge remote-tracking branch 'origin/fix_asset_create_fee' into testnet-beatrice 2018-10-11 14:22:33 +02:00
Fabian Schuh
7d6432e4bf
Merge remote-tracking branch 'origin/sport_n_events_api_extension_release' into beatrice 2018-10-11 14:08:23 +02:00
Fabian Schuh
d0c6c49e44
Merge remote-tracking branch 'origin/broadcast-api-operations-duplication-check' into beatrice 2018-10-11 13:54:31 +02:00
Fabian Schuh
fc21e79206
Fix rebase 2018-10-11 13:36:49 +02:00
Peter Conrad
9e624bd2c8
Payout operation fix 2018-10-10 14:26:38 +02:00
Peter Conrad
2428383466
Fixed bookie payout 2018-10-10 14:26:21 +02:00
Peter Conrad
517c86c60f
Refactored handling of asset_id 2018-10-10 14:25:57 +02:00
Peter Conrad
12a8bdc590
Fixes 2018-10-10 14:25:56 +02:00
Peter Conrad
fdd7c193a6
Implemented affiliate payouts 2018-10-10 14:25:56 +02:00
Peter Conrad
1ab596952e
Rake calculation fix as outlined by Dan Notestein 2018-10-10 14:25:39 +02:00
Peter Conrad
03bc592114
Prevent some virtual ops from being included in proposals 2018-10-10 14:25:09 +02:00
Peter Conrad
8c0fcf9db8
Ported security fix from https://github.com/bitshares/bitshares-core/pull/591/ 2018-10-10 14:24:42 +02:00
Peter Conrad
fe7c8d6ad1
Implemented item 1 2018-10-10 14:24:42 +02:00
Andrew Moore
10fa56a018 Fixing license on db_notify.cpp 2018-10-09 14:38:51 -03:00
Andrew Moore
da799f84b0 Updating licensing 2018-10-09 11:33:31 -03:00
Peter Conrad
db072af33d Added hf protection for new operations wrapped in proposals 2018-09-10 21:03:28 +02:00
Peter Conrad
fa9acafcd0 Moved hf date into far future 2018-09-10 20:25:27 +02:00
Peter Conrad
153fcacbb3 Revert dividend payout timing modification 2018-09-10 18:53:12 +02:00
Peter Conrad
eb5100545f Switch object id types 2018-09-10 15:20:37 +02:00
Peter Conrad
b0afddaa6b Move new chain parameters into extensions 2018-09-05 16:43:35 +02:00
Peter Conrad
0a2af8afb2 Merge remote-tracking branch 'origin/baxter' 2018-09-04 14:52:48 +02:00
Michael Neynens
bed81e358d Updated vote tallying, skipping non-existing accounts 2018-08-08 09:44:19 +02:00
Michael Neynens
1c1026516a Updated vote tallying, skipping non-existing accounts 2018-08-07 18:04:17 -07:00
Apr Team
b28783c3ec Refactoring after review. Removed code duplication. 2018-07-12 17:53:15 +03:00
Apr Team
63f4c7f2c5 Added pending list check. 2018-07-12 17:18:55 +03:00
Apr Team
8094431613 Refactoring after review. 2018-07-06 15:29:15 +03:00
Apr Team
e6f56af1b6 Fixed small issue in test + removed explicit check for duplicates in pending transactions. 
They are covered by proposal storage check.
 2018-07-05 16:16:16 +03:00
Apr Team
a94dd371c1 Reverted commented code. 2018-07-05 14:41:00 +03:00
Apr Team
140ecd7532 Added more tests. Fixed offsets in the db file. Pathced the network_broadcast_api. 2018-07-05 13:58:36 +03:00
Apr Team
1c74bba60d Moved check for duplicates to the database. Removed code duplication from unit-tests 2018-07-05 12:58:59 +03:00
Michael Neynens
d9345f0ea5 Merge branch 'pr11' 2018-07-04 16:14:18 -07:00
Apr Team
4a9ca67b60 Added check for operation existing in pending proposals. 2018-07-04 19:31:32 +03:00
Eric Frias
ef369658ea Restore the original bet matching for back taker bets 2018-05-30 18:22:10 -07:00
Michael Neynens
861c287109 Merge branch 'betting-merge' into baxter-hardfork 2018-05-23 08:39:28 -07:00
Apr Team
b782005d04 Refactoring after Fabian review. 2018-05-21 18:27:18 +03:00
Apr Team
99efbc7ea2 Added tests for checking various market states canceling and added ignoring of canceling the settled state and canceled state. 2018-05-21 18:20:54 +03:00
Apr Team
256eeb3eac Added hardfork logic. 2018-05-21 18:15:00 +03:00
Apr Team
9cc3558417 Added hardfork logic based on HARDFORK_1000 macro. 2018-05-20 14:41:35 +03:00
Apr Team
3295953127 Fixes after Fabian review. Added tests for non proposal delete operations. 
Added logic for checking of sport and event existence before its updating.
 2018-05-18 18:26:47 +03:00
Apr Team
afaaa950a2 Fixes after Fabian review. 2018-05-18 14:32:31 +03:00
Apr Team
0b974a6ddb Added canceling of bets for market. 2018-05-17 09:45:04 +02:00
Apr Team
88adfb6661 Cleanups before review. 2018-05-17 09:45:04 +02:00
Apr Team
c829228aca Fixed deleteting of sport with related event_groups. 2018-05-17 09:45:04 +02:00
Apr Team
0b1e165bf3 Refactored canceling of the sub events of the event_group. Moved that logic to the event_group_object. Updated tests to control canceling of markets and market_groups. 2018-05-17 09:45:04 +02:00
Apr Team
c4612cbed1 Added canceling of the sub events for the removed event_group. 2018-05-17 09:45:04 +02:00
Apr Team
688110ce8d Implemented event_group delete operation. 2018-05-17 09:45:04 +02:00
Apr Team
80efb85d72 Added event_group delete operation and evaluator. Fixed compilation issues. 2018-05-17 09:45:04 +02:00
Apr Team
71fec0ac83 Implemented sport delete operation added test. 2018-05-17 09:45:04 +02:00
Apr Team
4f501f6aaf Added sport_delete operation, evaluator and API. Fixed various compilation issues. 
Added tests file.
 2018-05-17 09:45:04 +02:00
Eric Frias
7a97e9381c restore accidentally-deleted line 2018-05-11 11:04:00 -04:00
Eric Frias
123fc3915f Switch dividend payout virtual op from using a flat_set to vector 
to allow payouts in multiple assets in the same operation
 2018-05-10 12:14:27 -04:00
Eric Frias
ed9cdd96ec Wrap exceptions thrown during dividend payouts to add extra info 
for debugging
 2018-05-09 19:27:49 -04:00
Eric Frias
a4dd00ab8e Change how we redirect log messages in the betting code to the 
"betting" logger so that it doesn't interfere with logging in
other database implementation files
 2018-05-09 15:41:48 -04:00
Eric Frias
06a297d811 Pay the rake fee to the dividend account of the core asset, not 
the dividend account of the buy-in asset
 2018-05-09 10:27:39 -04:00
Eric Frias
922bdec8d6 Fix a bug in serializing betting market objects to json which 
would show graded betting markets as canceled, and vice versa,
even though the internal represntation was in the right state.
 2018-05-03 14:49:24 -04:00
Eric Frias
70e47a74dd Change bet matching algorithm to limit the amount matched by the 
taker's odds, instead of buying as much as the taker's bet_amount
allowed at the maker's odds
 2018-05-02 19:19:01 -04:00
Eric Frias
2c50036ee1 Prevent placing bets when the betting market group is closed, graded, 
re-grading, or settledt
 2018-05-02 09:42:56 -04:00
Eric Frias
440fdb566b Fix bug causing a cancel of one event in an event group to cancel 
other events
 2018-04-29 18:59:15 -04:00
Eric Frias
6b86ccc2f3 When tallying witness/committee member votes, always assign at least 
one vote to each witness/committee member for purposes of calculating
their weight in the witness-account or committee-account authority.
This will likely have no effect in a well established blockchain, but
it does occur when a new blockchain is launched for testing without
enough votes to fill all the witness/committee slots.
 2018-04-24 19:13:30 -04:00
Eric Frias
0404e6c0b6 When placing a bet, delay the check to see if you are able to fund 
the bet until after any guaranteed winnings have been returned
 2018-04-17 18:54:42 -04:00
Eric Frias
5343c073bd Delay deletion of completed/canceled events to avoid an error producing 
blocks when a betting market group with no betting markets is canceled.
 2018-04-17 13:17:38 -04:00
Fabian Schuh
101325990b Hardfork baxter 2018-04-05 11:53:45 +02:00
Peter Conrad
e75f18ba57 Removed hardfork code for CORE_429 2018-03-23 15:20:18 +01:00
Peter Conrad
4b0579b475 Fixed #429 2018-03-23 15:20:18 +01:00
abitmore
8d8b84cc37 Proof of concept fix for asset creation fee issue 2018-03-23 15:20:18 +01:00
SynaptiCAD User
cfd77773c7 [DLN] reorder operations to match testnet, add asserts to reject operations before new testnet hardfork '1000' (actual hardfork time still needs to be set in 1000.hf) 2018-03-19 18:51:19 -04:00
Eric Frias
931c925610 Register event status update operation 2018-02-13 11:34:04 -05:00
Eric Frias
3b3a0905ff Change the behavior of the betting markets from being controlled by 
a collection of flags (is_live, is_closed) to a single status field.
The status changes in an event can trickle down to the market groups,
and the status changes in market groups can bubble up to events.
 2018-02-07 10:16:30 -05:00
Fabian Schuh
4c5e0a07f7 Show proposer on proposals 2018-01-29 14:19:38 +01:00
kstdl
8cb335a515 fixed indices sorting and lottery end checking by date 2018-01-10 12:06:34 +03:00
kstdl
c32269ee8e fix test genesis and end_date verification 2018-01-09 12:35:30 +03:00
kstdl
090a3a4dad merge get_account_lotteries branch. fix create_witness test 2018-01-09 11:45:19 +03:00
kstdl
202153acdc added get_account_lotteries method to db_api and cli, lottery end_date and ticket_price verification 2018-01-03 15:34:15 +03:00
kstdl
186a0e61ea added owner to lottery_asset_options. commented async call in on_applied_block callback 2017-12-27 17:21:56 +03:00
kstdl
8f379a3c53 fix reindex on peerplays network 2017-12-12 15:37:58 +03:00
kstdl
fdd77ef5af minor logic changes. added db_api and cli_wallet methods 2017-12-11 17:42:55 +03:00
kstdl
930ddb06c1 lottery end implemented 2017-12-06 10:40:52 +03:00
kstdl
2acbf3d929 ticket_purchase_operation implemented. added lottery_options to asset 2017-11-13 10:14:07 +03:00
kstdl
3dd1860b64 coipied code for bitshares fixing 429 and 433 isuues 2017-11-04 11:40:28 +03:00
kstdl
d7c80b4b6a fix rng and get_winner_numbers implemented 2017-11-03 17:52:41 +03:00
Eric Frias
69b00293d9 Only do slow replays when the bookie plugin is loaded 2017-09-07 15:55:44 -04:00
Eric Frias
ed0917ee03 Leave undo_db enabled during replay so bookie plugin gets the correct history 2017-09-07 12:00:44 -04:00
Eric Frias
d333dd3812 Track match/cancel/adjust operations related to a bet in the bookie plugin. 
Create a paginated version of get_matched_bets_for_bettor()
 2017-09-06 16:52:58 -04:00
Roman Olearski
2cd816ec6d fixing bet_cancel_operation, added mising fee to reflection 2017-09-01 16:25:13 +02:00
Roman Olearski
ec08259b7d added cancel_bet to the wallet 2017-09-01 13:29:45 +02:00
Eric Frias
f3290a8827 Add get_unmatched_bets_for_bettor() to get unmatched bets across all betting markets 2017-08-31 11:02:16 -04:00
Eric Frias
38f1cbdcd6 Add list_events_in_group() and get_unmatched_bets_for_bettor() API calls 2017-08-30 19:21:27 -04:00
Eric Frias
b83dea821e Fix a case where neither the taker nor maker bet was able to fully match. When this 
happens, cancel the remainder of the taker bet.
 2017-08-30 17:18:58 -04:00
Eric Frias
6a9b2a0d04 Fix a crash in which we tried to log a proposal object that may have been deleted. 
Also, fix a place where logged the letter e instead of the exception it represented
 2017-08-30 17:15:50 -04:00
Eric Frias
629e6c7be7 Change default live betting delay to 5 seconds (down from 10) 2017-08-29 11:33:40 -04:00
Eric Frias
b505c375af Finish delayed (live) betting. 
Remove the ability to change the event of a betting market group after creation.
 2017-08-15 18:44:09 -04:00
Roman Olearski
a2b83c668f added delay_bets to betting_market_group_object, live_betting_delay_time to chain parametrs . 2017-08-10 21:36:04 +02:00
Eric Frias
d13783a3c4 Fix bug that prevented placing bets that were too small to stay on the books, 
Add a get_objects() call to the bookie API to provide access to objects that
have been removed from the blockchain, and a few tests to verify that they
work.
 2017-08-09 17:17:51 -04:00
Eric Frias
8fd01c8af7 Swap the 'bet_adjusted_operation' into the position previously occupied by 
betting_market_group_freeze_operation to avoid renumbering subsequent operations.
 2017-08-09 12:42:51 -04:00
Roman Olearski
2c8b9ce17a Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-08-09 17:59:25 +02:00
Roman Olearski
ec77685264 added is_live_market to event_update operation 2017-08-09 17:58:01 +02:00
Eric Frias
a8d5fded26 Remove the code for charging beting fees up-front now that rake fees are taken from your net winnings. 
Change the bet matching algorithm to only match at exactly the maker's odds, no rounding.
Implement binned order books in the betting market plugin.  Keep betting market groups,
betting markets, and bet objects around forever in the plugin (not yet exposed to the api).
 2017-08-09 11:15:12 -04:00
Roman Olearski
f417dc0391 removed betting_market_group_freeze operation 
added freeze to betting_market_group_update operation
 2017-08-09 11:08:50 +02:00
Roman Olearski
69e8348522 setting initial event_state 2017-08-07 17:27:23 +02:00
Eric Frias
93088a204d Change the rounding used when matching bets to never round, bets are always matched at 
exactly the maker's odds.
 2017-08-01 15:42:52 -04:00
Roman Olearski
6ca6413d88 bookie_plugin: added localized_event_strings .... 2017-08-01 12:26:45 +02:00
Roman Olearski
b96459045b added get_total_matched_bet_amount_for_betting_market_group to bookie_plugin 2017-07-28 18:23:57 +02:00
Roman Olearski
3ac447b8a7 Add missing 'description' field to betting_market_update operation 2017-07-27 09:50:37 +02:00
Roman Olearski
6e33db129d Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-07-26 22:25:05 +02:00
Roman Olearski
9ab4d7049a added betting wimbledon test, improving database::resolve_betting_market_group . 2017-07-26 22:23:49 +02:00
Eric Frias
0b1d55586e Add missing 'description' field to betting_market_create operation 2017-07-26 13:52:55 -04:00
Roman Olearski
b6682fa69a added betting_market_group_update_operation betting_market_update_operation 2017-07-24 20:59:47 +02:00
Roman Olearski
ea3818cf4f extended event_update_operation 2017-07-21 13:42:15 +02:00
Roman Olearski
cd40ef0715 extended event_group_update_operation 2017-07-20 21:01:10 +02:00
Roman Olearski
78100f9fb5 added betting_market_rules_update_operation 2017-07-20 14:28:12 +02:00
Roman Olearski
2acd4dd187 added event_update_operation 2017-07-20 12:19:18 +02:00
Roman Olearski
7b8fad0bfa added event_group_update_operation 2017-07-19 18:10:55 +02:00
Roman Olearski
a24f671c02 added sport_update_operation 2017-07-19 13:05:28 +02:00
Roman Olearski
67c134a138 changed cancel_all_bets to cancel_unmatched_bets 2017-07-19 10:29:51 +02:00
Roman Olearski
04985c2624 improving cancel_all_bets operation 2017-07-18 19:17:13 +02:00
Roman Olearski
86b909da44 Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-07-18 12:04:28 +02:00
Roman Olearski
c7c03c4aab added cancel_all_bets operation 2017-07-18 12:02:16 +02:00
Eric Frias
24c0089869 Fix link error in release builds 2017-07-17 18:59:35 -04:00
Daniel Larimer
1c97c13eed Replace flat_index with generic_index for bitasset_object 
- this enabled me to produce blocks and fixed corruption
 2017-07-17 23:24:09 +02:00
Roman Olearski
fb22da620d minor cosmetic changes ... 2017-07-14 13:31:04 +02:00
Roman Olearski
d3482f3a08 Merge branch 'rock-paper-scissors' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-07-13 16:07:30 +02:00
Roman Olearski
bb46f84666 Fixing double declared enumerated types with FC_REFLECT_TYPENAME FC_REFLECT_ENUM 
Adapting fc
 2017-07-12 12:28:59 +02:00
Eric Frias
790bfe3704 WIP Force all betting markets in a group to use the same asset_id for betting 2017-07-09 18:41:26 -04:00
Eric Frias
4e2c6c303a Add an operation to freeze/unfreeze a betting market group 2017-07-09 13:52:01 -04:00
Roman Olearski
5de1437d24 Merge branch 'betting-ro4' into betting-merge 2017-07-08 20:41:45 +02:00
Roman Olearski
c18094abd8 implementing rake fee in resolve_betting_market_group #1 
improving net profit calculation
 2017-07-08 18:30:23 +02:00
Eric Frias
a8a64e530b Add an informational betting_market_rules object, linked to betting market groups 2017-07-06 18:07:39 -04:00
Roman Olearski
32433ef29f Cherry-picked all divident commits from rps to betting resolving conflicts 2017-07-06 23:04:50 +02:00
Roman Olearski
3a8b8a3b5b Cherry-picked commit b9508c6. 
little correction for solution ...issues/#10 avoid generating dividend_payout virtual operations for zero-size payouts
 2017-07-06 20:19:51 +02:00
Roman Olearski
59c64efb5a solution ...issues/#10 avoid generating dividend_payout virtual operations for zero-size payouts 2017-07-06 20:15:50 +02:00
Roman Olearski
9bbf73a96a Cherry-picked commit 81c9e98. 
solution  ...issues/#7 Allow vesting core tokens to vote and receive dividends
 2017-07-06 20:14:54 +02:00
Roman Olearski
64d59602a8 solution proposal for ...issues/#7 Allow vesting core tokens to vote and receive dividends 2017-07-06 20:05:24 +02:00
Eric Frias
bfcc23ac9d Cherry-picked commit 749ffb8. 
Don't make the core asset a bitasset
 2017-07-06 20:04:05 +02:00
Roman Olearski
85102da504 Cherry-picked commit 32b5343. 
Implementing propose_dividend_asset_update
 2017-07-06 19:58:10 +02:00
Roman Olearski
1386617465 Removing redundant line 2017-07-06 19:55:24 +02:00
Roman Olearski
dac9d8b61b Cherry-picked commit 26f4718. 
Creating default dividend asset
 2017-07-06 19:53:14 +02:00
Eric Frias
da5ef56a35 Cherry-picked commit 9089292. 
Prevent creation of accounts with the same name as dividend distribution accounts
 2017-07-06 19:44:35 +02:00
Eric Frias
90722fc0a4 Cherry-picke commit be6ad13. 
Code cleanups -- renaming variables, adding comments, fix one bug with override transfers and dividend assets
 2017-07-06 19:41:13 +02:00