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

496 commits

Author SHA1 Message Date
blockc p
ae3edc6e27 Ws updates 2020-08-29 16:27:01 +00:00
sierra19XX
ecd14b8329
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: satyakoneru <15652887+satyakoneru@users.noreply.github.com>
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: Satyanarayana Koneru <skoneru@SK-GT.local>
Co-authored-by: obucina <11353193+obucina@users.noreply.github.com>
Co-authored-by: satyakoneru <15652887+satyakoneru@users.noreply.github.com>
 2020-08-10 23:18:47 +10:00
pbattu123
32d9175061 enable mandatory plugins to have smooth transition for next release 2020-02-27 14:27:49 -04:00
gladcow
e55075ec6d fix CLI tests 2020-01-17 18:51:44 +03:00
Alfredo Garcia
62247c543d Merge pull request #1725 from oxarbitrage/issue1682 
elasticsearch history api #1682
 2020-01-01 14:51:25 +03:00
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
Alfredo
f3d961bb70 allow plugin to have descriptions 2019-12-30 19:55:13 +03:00
Peter Conrad
e1244eb7ab Implemented "plugins" config variable 2019-12-30 18:55:08 +03: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
Peter Conrad
854119233a Externalized serialization in protocol library 2019-11-29 14:10:40 +03:00
Peter Conrad
4df7298a0d Externalized some API templates 2019-11-29 14:10:40 +03:00
Sandip Patel
ad5707ed95 Fixed alignment issues 2019-11-28 10:36:26 +05:30
Sandip Patel
41445a8764 Fixed compilation issues 2019-11-26 18:18:42 +05:30
Sandip Patel
a5d8a15728 asset id or name support in all asset APIs 2019-11-26 16:51:20 +05:30
Sandip Patel
7aeaa14bae account name or id support in all database api 2019-11-26 13:50:06 +05:30
pbattu123
fd2679a888
Merge pull request #223 from peerplays-network/BLOCKBACK-181 
BLOCKBACK-181 Update GPOS hardfork date and don't allow GPOS features before hardfork time
 2019-11-24 12:21:44 -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
ac5d55be0f added new files 2019-11-14 17:05:01 +05:30
Sandip Patel
7a1f1a7293 Logging config parsing issue 2019-11-14 17:02:54 +05:30
Alfredo Garcia
25ab039a58
Merge branch 'develop' into develop_gpos 2019-11-07 08:08:53 -03:00
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
48d0d88ff0 changes to update last voting time 2019-10-23 18:33:17 -03:00
pbattu123
0d1c41557d changes to allow user to vote in each sub-period 2019-10-22 10:39:45 -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
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
c73d0a338a 163-fix, Return only non-zero vesting balances 2019-10-03 22:22:21 -03:00
Bobinson K B
1cb494e686
Merge pull request #140 from peerplays-network/feature/GRPH-111 
Added get_asset_count API
 2019-09-23 09:55:27 -04:00
Miha Čančula
4586cc5df5
Remove leftover comment from merge 2019-09-21 17:37:43 +02:00
Miha Čančula
97f9875918
Merge branch 'develop' into GRPH-50-network_broadcast_api-fix-v2 2019-09-21 17:17:19 +02:00
Sandip Patel
aa31de5d44 Added get_asset_count API 2019-09-20 17:51:43 +05:30
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
d911b3db69
Merge branch 'develop' into GRPH-75 2019-09-17 15:53:18 -03:00
Ronak Patel
646dc2e548 Merged Bitshares PR #1462 and compilation fixes 2019-09-10 18:56:27 +05:30
Ronak Patel
3510704398 Fix for for history ID mismatch ( Bitshares PR #875 ) 2019-09-09 15:33:47 +05:30
Bobinson K B
b11edaa6a5
Merge pull request #69 from peerplays-network/WASM-49 
get_account_history fix
 2019-09-07 00:54:39 +05:30
Bobinson K B
f9a3d087ea
Merge pull request #60 from peerplays-network/GRPH-48-Object-Database-18.04 
Grph 48 object database 18.04
 2019-09-07 00:53:04 +05:30
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
satyakoneru
f6423d0b10 GRPH-4-CliWallet_crash_ctrlD 2019-08-28 13:53:41 +00:00
Miha Čančula
cb99aaa0cf
Adapt to variant API with max_depth argument 2019-08-28 15:42:21 +02:00
abitmore
94f9c5f3eb
Increase max depth for trx confirmation callback 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
abitmore
22e7c44984
Add nullptr check in api.cpp for easier testing 2019-08-28 15:41:15 +02:00
gladcow
5d38466f7d Backport fix for get_account_history from https://github.com/bitshares/bitshares-core/pull/628 and add additional account history test case 2019-08-28 15:49:33 +03:00
Peter Conrad
14b0d08d5a Fixed error when account_history_object with id 0 doesnt exist 2019-08-28 15:49:33 +03:00
Sandip Patel
0d0a6b7c74 Fixed error while loading object database 2019-08-28 12:11:43 +05:30
pbattu123
947b02bd57
Merge branch 'beatrice' into beatrice-5050-merge 2019-08-20 15:15:01 -03:00
Prabhjot
37b813d4fa fix double definition of functions in database_api 2019-08-12 11:05:20 -04:00