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

125 commits

Author SHA1 Message Date
Srdjan Obucina
b284d10f21 Merge branch 'develop' into feature/rng 2020-08-11 01:22:45 +02: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
Srdjan Obucina
01758b1c47 Fix problem with returning more random numbers than requested 2020-05-28 12:35:33 +02:00
Srdjan Obucina
29d6d7b1f9 Random number wallet api with number storing 2020-05-25 03:12:52 +02:00
Srdjan Obucina
56676b5a58 Implemented parametrized random number retrieval 2020-05-18 15:49:45 +02:00
obucina
be4869a64d
API endpoint for reading random numbers from the witness (#113) 2020-05-17 23:09:15 +02: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
e6d3dd0662 Update GPOS hardfork date and don't allow GPOS features before hardfork time 2019-11-23 20:46:17 -04:00
Alfredo Garcia
f831f9527f Merge branch 'qa_gpos_18.04' into develop_gpos 2019-11-05 14:34:04 -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
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
499a5fc33e
Merge branch 'develop' into GRPH-50-network_broadcast_api-fix-v2 2019-09-18 16:36:42 +02:00
Ronak Patel
646dc2e548 Merged Bitshares PR #1462 and compilation fixes 2019-09-10 18:56:27 +05:30
Abit
a49f8bf47c
Merge pull request #714 from pmconrad/json_fix 
JSON fix
 2019-08-28 15:42:21 +02:00
Sandip Patel
0d0a6b7c74 Fixed error while loading object database 2019-08-28 12:11:43 +05:30
Prabhjot
37b813d4fa fix double definition of functions in database_api 2019-08-12 11:05:20 -04:00
Prabhjot Singh
8caeb0ec18 merge 5050 into beatrice 2019-08-12 08:38:53 -04:00
Prabhjot Singh
aa3128fe89 Merged beatrice into 5050 2019-07-30 11:43:31 -04: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
Alfredo
a58eb6fae8 add get_gpos_info database api call 2019-03-05 17:48:47 -03:00
dimfred
87bf4be89b digest_accumulator picks out bm_create and bmg_create and reworked duplicate check 2019-02-06 14:25:37 +01:00
dimfred
c86237cd86 changed api.cpp accordingly 2019-02-01 18:36:30 +01:00
dimfred
2922366e27 changed check_transaction to check only for proposals associated with GRAPHENE_WITNESS_ACC 2019-02-01 18:36:30 +01:00
dimfred
ee8429938c moved check_trx_for_duplicate_operation and digest_accumulator to database api 2019-02-01 18:36:30 +01:00
kstdl
8cb335a515 fixed indices sorting and lottery end checking by date 2018-01-10 12:06:34 +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
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
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
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
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
Eric Frias
5b437d7363 Cherry-picked commit b584ee1. 
Separate out unit tests for dividend-assets into their own test suite
 2017-07-06 19:22:33 +02:00
Eric Frias
9c9af76e12 Merge commit 'd8e7c0afee573d82647018a9efd530a03274a2aa' into betting 2017-06-21 16:58:50 -04:00
Eric Frias
3238ea735f Merge commit '568ceb189eca96e77e38c4059b83a504008d7e91' into betting 2017-06-21 16:43:00 -04:00
Eric Frias
636f28eac6 Merge commit 'aa6f3e9051787bfc1b4284f1684544cca9bfc9c9' into betting 2017-06-21 16:08:58 -04:00
Eric Frias
51fb13f8ba Merge commit '9466d2096a370e15aff70842b48feeca4a941e5c' into betting 2017-06-21 14:54:05 -04:00
Eric Frias
c64d83910c Merge commit '030577f6719a483314c6de7b7e42214399704adb' into betting 2017-06-21 14:15:57 -04:00
Eric Frias
b200fb893b Merge commit '0ecdc90d4df2ebd80a6d4cfa4388f4b8a608c9c1' into betting 2017-06-21 09:35:32 -04:00