Commit graph

1223 commits

Author SHA1 Message Date
pbattu123
11919cdbd9
brought updates from mainnet branch (#285) 2020-02-12 23:38:23 +05:30
pbattu123
c0b57fce33
resync/replay issues addressed (#283)
* resync/replay issues addressed

* minor changes done to withdraw GPOS vesting balance by WITNESS account
2020-02-10 19:21:50 +05:30
pbattu123
0b280882af
Merge beatrice(GPOS changes) with master (#270)
* 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>
2020-02-07 21:23:08 +05:30
Alfredo Garcia
de4faee7f0 Merge pull request #1073 from xiangxn/merge-impacted
merge impacted into db_notify
2019-12-31 00:22:51 +03:00
oxarbitrage
00f14c4729 Merge pull request #444 from oxarbitrage/elasticsearch
Elasticsearch plugin
2019-12-30 21:09:24 +03:00
pbattu123
d52f9fbb59 Set hardfork date to Jan5th on TESTNET 2019-12-24 10:46:27 -04:00
pbattu123
054f06adc7 Beatrice hot fix(sync issue fix) 2019-12-20 21:55:45 -04:00
pbattu123
26886cc7d5 avoid wlog as it filling up space 2019-12-17 12:13:46 -04:00
pbattu123
a4d399d6cc Update hardfork date for TESTNET, sync fc module and update logs 2019-12-17 09:18:34 -04:00
Sandip Patel
b57220a180 Fixed withdraw vesting bug 2019-12-12 14:14:31 +05:30
pbattu123
f1fef49373
Merge pull request #237 from peerplays-network/BLOCKBACK-183
BLOCKBACK-183 GPOS: Votes consideration on GPOS activation
2019-12-08 21:42:26 -04:00
pbattu123
91c65b9845
Merge pull request #234 from peerplays-network/BLOCKBACK-186
BLOCKBACK-186 fix: GPOS
2019-12-07 13:51:58 -04:00
pbattu123
067fcd13f7 Votes consideration on GPOS activation 2019-12-06 11:26:49 -04:00
Sandip Patel
d5662ada04 Added log for authorization failure of proposal operations 2019-12-06 11:07:38 +05:30
pbattu123
38bb9226ec Move GPOS withdraw logic to have single transaction(also single fee) and update API 2019-12-05 13:46:13 -04:00
Sandip Patel
2dfaa866ca Fixed chainparameter update proposal issue 2019-12-05 18:53:38 +05:30
Alfredo Garcia
3a2def7311
Merge pull request #137 from peerplays-network/feature/GRPH-92
[GRPH 92] Build optimization
2019-12-03 20:43:50 -03:00
Sandip Patel
5606fc5fc2 Port plugin sanitization code 2019-12-03 15:17:45 +05:30
gladcow
40c2fd8783 fix compilation issues 2019-12-02 17:41:13 +03:00
pbattu123
0b2c9dde22 remove default value for extension parameter 2019-11-29 10:15:13 -04:00
Peter Conrad
854119233a Externalized serialization in protocol library 2019-11-29 14:10:40 +03:00
Peter Conrad
2358149e46 Externalized genesis serialization 2019-11-29 14:10:40 +03:00
Peter Conrad
b3d6058485 Externalized db objects 2019-11-29 14:10:40 +03:00
Peter Conrad
71d8bfd843 Externalize serialization of blocks, tx, ops 2019-11-29 14:10:40 +03:00
Sandip Patel
614e51cca0 check witness signature before adding block to fork db 2019-11-29 16:08:23 +05:30
pbattu123
9b7776e301
Merge pull request #220 from peerplays-network/BLOCKBACK-177
issue with withdrawl
2019-11-25 10:51:06 -04:00
pbattu123
0ecf2e8d0e
Merge pull request #222 from peerplays-network/feature/BLOCKBACK-182
[BLOCKBACK-182] set extensions default values
2019-11-25 10:49:25 -04:00
pbattu123
e6d3dd0662 Update GPOS hardfork date and don't allow GPOS features before hardfork time 2019-11-23 20:46:17 -04:00
Sandip Patel
c17d73f11b set extensions default values 2019-11-22 18:46:55 +05:30
pbattu123
9c1e7af9c7 issue with withdrawl 2019-11-21 10:40:39 -04:00
Alfredo Garcia
e7e08169c8
Merge pull request #116 from peerplays-network/GRPH-81
[GRPH-81] Different performance optimization
2019-11-20 13:36:41 -03:00
abitmore
d3b2c4ce95 Simplified code in database::pay_workers() 2019-11-20 14:23:20 +03:00
gladcow
d99ef0c1f9 fix global objects usage during replay 2019-11-08 15:42:09 +03:00
abitmore
4f54b13074 Added header inclusions in db_management.cpp 2019-11-08 15:42:09 +03:00
abitmore
6a7d670762 Added FC_ASSERT for dynamic data id of core asset 2019-11-08 15:42:09 +03:00
abitmore
02f6019896 Minor refactory asset_create_evaluator::do_apply() 2019-11-08 15:42:09 +03:00
abitmore
2f6de1f056 Add comments for update_expired_feeds in db_block 2019-11-08 15:42:09 +03:00
abitmore
66f6f26934 Removed unused variable 2019-11-08 15:42:09 +03:00
abitmore
83736ba656 Use getters 2019-11-08 15:42:09 +03:00
abitmore
1939cd127b Added getter for core dynamic data object 2019-11-08 15:42:09 +03:00
abitmore
dcc6902720 Added getter for witness schedule object 2019-11-08 15:42:09 +03:00
abitmore
04102d549c Change static refs to member pointers of db class 2019-11-08 15:39:16 +03:00
abitmore
36e318a503 Improve update_expired_feeds performance #1093 2019-11-08 15:39:16 +03:00
abitmore
e27b074f62 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
2019-11-08 15:37:46 +03:00
abitmore
ac7ac9f1f2 Minor performance improvement for db_maint 2019-11-08 15:37:46 +03:00
abitmore
cabbd7d070 Use static refs in db_getter for immutable objects 2019-11-08 15:37:46 +03:00
abitmore
01a81554ff Minor performance improvement for price::is_null() 2019-11-08 15:37:46 +03:00
abitmore
8a9d3e7775 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
2019-11-08 15:37:46 +03:00
Alfredo Garcia
25ab039a58
Merge branch 'develop' into develop_gpos 2019-11-07 08:08:53 -03:00
Sandip Patel
0bcfaa385b Improve account maintenance performance (#130)
* Improve account maintenance performance

* merge fixes

* Fixed merge issue

* Fixed indentations and extra ';'
2019-11-07 11:25:02 +05:30
Alfredo Garcia
f831f9527f Merge branch 'qa_gpos_18.04' into develop_gpos 2019-11-05 14:34:04 -03:00
Alfredo Garcia
20a9f9b84d
Merge pull request #211 from peerplays-network/feature/BLOCKBACK-162
[BLOCKBACK-162] Fixed spelling issue in error message
2019-11-05 09:00:11 -03:00
Sandip Patel
61fa3918ef Fixed spelling issue 2019-11-05 15:02:38 +05:30
pbattu123
ab780862d3
Merge pull request #205 from peerplays-network/BLOCKBACK-155
[Blockback 155] GPOS - Multiple issues with vote_for_witness
2019-10-31 13:57:31 -03:00
Sandip Patel
fd8659caaf Fixed flag issue 2019-10-31 19:01:50 +05:30
Sandip Patel
5d36258f0c case 1: Fixed last voting time issue 2019-10-31 15:02:05 +05:30
pbattu123
3a817e17ea
Merge pull request #202 from peerplays-network/BLOCKBACK-174
BLOCKBACK- 174 Roll in GPOS votes from 6th sub-period
2019-10-28 14:49:51 -03:00
pbattu123
3f8ac21b1e updated comments to the benefit of reviewer 2019-10-28 12:14:53 -03:00
pbattu123
9f0b23122f comments updated 2019-10-28 10:46:10 -03:00
pbattu123
5f1436b8be Fix to roll in GPOS rules, carry votes from 6th sub-period 2019-10-27 12:54:54 -03:00
Alfredo Garcia
a80d25f9df fix flag 2019-10-27 08:54:18 -03:00
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
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
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
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
Sandip Patel
40534446da [GRPH-106] Added voting tests (#136)
* Added more voting tests

* Added additional option
2019-10-10 21:29:01 +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
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