Commit graph

617 commits

Author SHA1 Message Date
sierra19XX
6514f8fadd
NFT Marketplace HRP Beatrice Merge (#371)
* private-key option update

* ppy marketplace 1 - add evaluators and objects

* NFT object and basic operations

* ci: update .gitlab-ci.yml

* ci: update .gitlab-ci.yml

* NFT evaluators and basic tests, no evaluator checks

* Evaluator checks in place

* ppy marketplace 2 - batch sale, offer_object escrow

* Database API

* Wallet API

* NFT metadata implemented

* Fix NFT tests

* Database API for NFT metadata and enumerables

* ppy marketplace 4 - Add tests NFT+Marketplace

* ppy marketplace 5 - Add revenue split

* ppy marketplace 6 - Remove unnecessary files

* ppy marketplace 7 - Add db, wallet changes and some NFT fixes

* ppy marketplace 8 - Add pagination for list APIs

* ci: update .gitlab-ci.yml

* New DB API, list all NFTs, list NFTs by owner

* Marketplace + NFT + RBAC (#368)

* rbac1 - evaluators and op validators added
* rbac2 - op_type hf checks
* rbac3 - tx auth verify changes
* Update .gitlab-ci.yml
* rbac4 - basic op tests
* rbac5 - clear expired and deleted permission linked auths
* rbac6 - more tests
* rbac7 - more tests
* rbac8 - more tests
* rbac9 - wallet and db api changes
* rbac10 - db api changes for required signature fetch
* rbac11 - add db_api tests
* rbac12 - add missing code for key auths

Co-authored-by: Roshan Syed <roshan.syed.rs@gmail.com>
Co-authored-by: sierra19XX <15652887+sierra19XX@users.noreply.github.com>

* Fix nft_get_token_uri returning empty string

* Fix nft_mint_evaluator to save token_uri

* Fix cli_wallet to properly pass metadata id for nft_create

* ppy marketplace 9 - FC_REFLECT offer create op

* Add stricter checks to NFTs

* GPOS2 HF - Handle rolling period on missing blocks (#369)

* Mainnet chain halt 5050 Issue (#370)

* Unlisting offers, add result in offer history object

* Reverting genesis.json wrong commit

* Add non-transferable non-sellable properties to NFTs

* Review comments - change variable names, use scoped enums

* nft_metadata_update changes

* NFT HF checks and op fee addition changes

* NFT make revenue_split integer from double

* revenue_split condition check allow zero or above

* Peerplays Marketplace + NFT (#367)

* ppy marketplace 1 - add evaluators and objects

* NFT object and basic operations

* ci: update .gitlab-ci.yml

* ci: update .gitlab-ci.yml

* NFT evaluators and basic tests, no evaluator checks

* Evaluator checks in place

* ppy marketplace 2 - batch sale, offer_object escrow

* Database API

* Wallet API

* NFT metadata implemented

* Fix NFT tests

* Database API for NFT metadata and enumerables

* ppy marketplace 4 - Add tests NFT+Marketplace

* ppy marketplace 5 - Add revenue split

* ppy marketplace 6 - Remove unnecessary files

* ppy marketplace 7 - Add db, wallet changes and some NFT fixes

* ppy marketplace 8 - Add pagination for list APIs

* New DB API, list all NFTs, list NFTs by owner

* Marketplace + NFT + RBAC (#368)

* rbac1 - evaluators and op validators added
* rbac2 - op_type hf checks
* rbac3 - tx auth verify changes
* Update .gitlab-ci.yml
* rbac4 - basic op tests
* rbac5 - clear expired and deleted permission linked auths
* rbac6 - more tests
* rbac7 - more tests
* rbac8 - more tests
* rbac9 - wallet and db api changes
* rbac10 - db api changes for required signature fetch
* rbac11 - add db_api tests
* rbac12 - add missing code for key auths

Co-authored-by: Roshan Syed <roshan.syed.rs@gmail.com>
Co-authored-by: sierra19XX <15652887+sierra19XX@users.noreply.github.com>

* Fix nft_get_token_uri returning empty string

* Fix nft_mint_evaluator to save token_uri

* Fix cli_wallet to properly pass metadata id for nft_create

* ppy marketplace 9 - FC_REFLECT offer create op

* Add stricter checks to NFTs

* Unlisting offers, add result in offer history object

* Reverting genesis.json wrong commit

* Add non-transferable non-sellable properties to NFTs

* Review comments - change variable names, use scoped enums

* nft_metadata_update changes

* NFT HF checks and op fee addition changes

* NFT make revenue_split integer from double

* revenue_split condition check allow zero or above

Co-authored-by: Srdjan Obucina <obucinac@gmail.com>
Co-authored-by: Roshan Syed <roshan.syed.rs@gmail.com>
Co-authored-by: obucina <11353193+obucina@users.noreply.github.com>

* Beatrice NFT HF

Co-authored-by: pbattu123 <43043205+pbattu123@users.noreply.github.com>
Co-authored-by: pbattu123 <p.battu@pbsa.info>
Co-authored-by: Srdjan Obucina <obucinac@gmail.com>
Co-authored-by: Roshan Syed <roshan.syed.rs@gmail.com>
Co-authored-by: obucina <11353193+obucina@users.noreply.github.com>
2020-08-11 01:42:59 +10:00
pbattu123
cb7429e818 code improvement with edge case handling 2020-04-07 01:31:17 -03:00
pbattu123
29f41ec7da nh5050:winner ticket id changes 2020-04-06 12:30:55 -03:00
pbattu123
cd8d7253cb updated tests to keep in-line with plugin changes 2020-03-06 15:15:51 -04:00
pbattu123
b68e6ce854
Fix unit test failures (#289)
* fixed unit test failures from the recent merges

* fixed unit test failures from the recent merges
2020-02-20 23:38:38 +05:30
pbattu123
046ee5b75c
Merge pull request #257 from peerplays-network/feature/GRPH-205
Backport ElasticSearch plugins from BitShares
2020-02-13 08:46:45 -04:00
gladcow
bfa878f9b2 change ES index prefixes to Peerplays-specific 2020-01-01 14:51:25 +03:00
Alfredo Garcia
62247c543d Merge pull request #1725 from oxarbitrage/issue1682
elasticsearch history api #1682
2020-01-01 14:51:25 +03:00
Abit
c9583f4486 Merge pull request #1201 from oxarbitrage/elasticsearch_tests2
Elasticsearch refactor
2019-12-31 00:03:25 +03:00
Abit
e91e61e6cb Merge pull request #873 from pmconrad/585_fix_history_ids
Fix history ids
2019-12-30 23:20:31 +03:00
pbattu123
b6fc207160 gpos tests fix 2019-12-20 22:16:09 -04:00
pbattu123
054f06adc7 Beatrice hot fix(sync issue fix) 2019-12-20 21:55:45 -04:00
Sandip Patel
e7af03a987 Added unit test 2019-12-13 13:11:03 +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
c98c7bcb94 Updated gpos/voting_tests 2019-12-07 23:41:22 -04:00
pbattu123
383b8d0b02 fix gpos tests 2019-12-07 17:06:48 -04:00
pbattu123
067fcd13f7 Votes consideration on GPOS activation 2019-12-06 11:26:49 -04:00
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
7aeaa14bae account name or id support in all database api 2019-11-26 13:50:06 +05:30
Sandip Patel
ae47eb9390 Added unit test for empty account history 2019-11-22 11:49:33 +05:30
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
satyakoneru
3e6b9196ce GRPH134- High CPU Issue, websocket changes (#213) 2019-11-06 20:15:15 +05:30
Alfredo Garcia
f831f9527f Merge branch 'qa_gpos_18.04' into develop_gpos 2019-11-05 14:34:04 -03:00
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
5f1436b8be Fix to roll in GPOS rules, carry votes from 6th sub-period 2019-10-27 12:54:54 -03:00
Alfredo Garcia
7c1966247b adapt gpos_tests to changed flag 2019-10-27 09:10:53 -03:00
Alfredo Garcia
84f30926bc clean newlines gpos_tests 2019-10-27 08:54:37 -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
pbattu123
22e5dfa502 deleted GPOS specific test suite and updated gpos tests 2019-10-24 15:31:49 -03:00
pbattu123
78787c2a14 eliminate time gap between two consecutive vesting periods 2019-10-24 14:39:01 -03:00
pbattu123
f7d7f043ce delete unused variables 2019-10-23 23:18:44 -03:00
pbattu123
cf3b54ece4 unit test changes and also separated GPOS test suite 2019-10-23 23:13:23 -03:00
Sandip Patel
8bbab4c113 Review changes 2019-10-23 18:25:33 +05:30
Sandip Patel
ccdea033f3 Added unit test for proxy voting 2019-10-23 17:41:16 +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
Sandip Patel
ec33f0cc07 [GRPH-3] Additional cli tests (#155)
* Additional cli tests

* Compatible with latest fc changes

* Fixed Spacing issues
2019-10-10 21:24:12 +05:30
gladcow
caa3d2468c use random port numbers in app_test (#154) 2019-09-27 10:58:49 -04:00
Bobinson K B
7fae375e0f
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
2019-09-26 11:41:28 -04: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
Miha Čančula
97f9875918
Merge branch 'develop' into GRPH-50-network_broadcast_api-fix-v2 2019-09-21 17:17:19 +02: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
Bobinson K B
fba10888cc
Merge pull request #131 from peerplays-network/feature/GRPH-93-v2
index type addition for performance improvement, version 2
2019-09-20 06:36:30 -04:00
Miha Čančula
94157497bb
Merge branch 'develop' into feature/GRPH-93-v2 2019-09-18 18:19:17 +02:00