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

179 commits

Author SHA1 Message Date
Nathan Hourt
14f627c014
Ref #1506: Isolate chain/protocol to its own library 2020-08-23 14:37:00 -05:00
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
08318d06a2
Merge Elasticplugin, snapshot plugin and graphene updates to beatrice (#304) 
* check witness signature before adding block to fork db

* Replace verify_no_send_in_progress with no_parallel_execution_guard

* fixed cli_wallet log issue

* Port plugin sanitization code

* avoid directly overwriting wallet file

* Implemented "plugins" config variable

* allow plugin to have descriptions

* Merge pull request #444 from oxarbitrage/elasticsearch

Elasticsearch plugin

* Merge pull request #500 from oxarbitrage/elasticsearch-extras

es_objects plugin

* Merge pull request #873 from pmconrad/585_fix_history_ids

Fix history ids

* Merge pull request #1201 from oxarbitrage/elasticsearch_tests2

Elasticsearch refactor

* Merge pull request #1271 from oxarbitrage/es_objects

refine es_objects plugin

* Merge pull request #1429 from oxarbitrage/es_objects_templates

Add an adaptor to es_objects and template function to reduce code

* Merge pull request #1458 from oxarbitrage/issue1455

add option elasticsearch-start-es-after-block to es plugin

* Merge pull request #1541 from oxarbitrage/es_objects_start_after_block

add es-objects-start-es-after-block option

* explicitly cleanup external library facilities

* Merge pull request #1717 from oxarbitrage/issue1652

add genesis data to es_objects

* Merge pull request #1073 from xiangxn/merge-impacted

merge impacted into db_notify

* Merge pull request #1725 from oxarbitrage/issue1682

elasticsearch history api #1682

* change ES index prefixes to Peerplays-specific

* sync develop with beatrice

* fix the data writing to ES during sync issues

* fix CLI tests

* brought updates from mainnet branch (#285)

* Fix unit test failures (#289)

* fixed unit test failures from the recent merges

* fixed unit test failures from the recent merges

* enable snapshot plugin (#288)

* sync fc branch(build optimization changes)

* update to es plugin

* fix verify witness signature method (#295)

* enable mandatory plugins to have smooth transition for next release

* updated tests to keep in-line with plugin changes

Co-authored-by: Sandip Patel <sandip@knackroot.com>
Co-authored-by: Peter Conrad <conrad@quisquis.de>
Co-authored-by: Alfredo <oxarbitrage@gmail.com>
Co-authored-by: Abit <abitmore@users.noreply.github.com>
Co-authored-by: crypto-ape <43807588+crypto-ape@users.noreply.github.com>
Co-authored-by: gladcow <s.gladkov@pbsa.info>
 2020-03-09 18:28:13 +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
Peter Conrad
4df7298a0d Externalized some API templates 2019-11-29 14:10:40 +03:00
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
Sandip Patel
ac5d55be0f added new files 2019-11-14 17:05:01 +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
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
Sandip Patel
aa31de5d44 Added get_asset_count API 2019-09-20 17:51:43 +05:30
Abit
a49f8bf47c
Merge pull request #714 from pmconrad/json_fix 
JSON fix
 2019-08-28 15:42:21 +02:00
pbattu123
947b02bd57
Merge branch 'beatrice' into beatrice-5050-merge 2019-08-20 15:15:01 -03:00
Prabhjot
0386ffebce Removed blind_sign and unblind_signature functions 2019-08-08 08:20:58 -04:00
Prabhjot Singh
aa3128fe89 Merged beatrice into 5050 2019-07-30 11:43:31 -04: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
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
Fabian Schuh
6f3ddc0719
Merge branch 'hardfork' into feature/duplicate-operation-check-hardfork 2019-02-07 15:34:16 +01:00
Fabian Schuh
7598d54fa7
Fixes after review 2019-02-07 12:18:15 +01:00
dimfred
ee8429938c moved check_trx_for_duplicate_operation and digest_accumulator to database api 2019-02-01 18:36:30 +01:00
Fabian Schuh
d8f3f6b399
Merge remote-tracking branch 'origin/list_pending_proposals_api' into testnet-beatrice 2018-10-11 14:20:53 +02:00
Peter Conrad
ade7cf2d87
Created plugin stub for affiliate statistics 2018-10-10 14:26:38 +02:00
Fabian Schuh
2be2826f3c [pending] use map instead of vector 2018-04-11 15:43:10 +02:00
Blockchain Projects BV
16e0b5353a Added Pending-transactions 2018-04-03 10:13:38 +02: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
Eric Frias
c4470131ac Enable building bookie plugin, add API for bookie plugin, and implement a 
function for getting binned order books (as yet untested)
 2017-07-27 19:36:31 -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
c20978bae6 Merge commit '1e80d8a01e6181711bba3d6462e64286d79935b1' into betting 2017-06-20 19:34:52 -04:00
Eric Frias
bd525ef55d Merge commit 'c777a88649d50edf6c5e4a8c3b13dda88a66e9d0' into betting 2017-06-20 18:15:43 -04:00
Eric Frias
50fef80189 Merge commit 'ee3f81fa31e39a8ae4ebcfe5b3d78f2dbc103e1b' into betting 2017-06-20 17:44:12 -04:00
Vikram Rajkumar
d8e7c0afee Merge pull request #311 from elmato/push-transaction-sync 
Implement network_broadcast_api::broadcast_transaction_synchronous
 2017-06-14 18:52:14 -05:00
root
b307557182 add simple pagination to get_asset_holders 2017-06-14 17:47:18 +00:00
Matias Romeo
ea8f8964eb Implement network_broadcast_api::broadcast_transaction_synchronous (ported from steem) 2017-06-12 18:22:34 -03:00
Vikram Rajkumar
f9f60770f9 Revert "Merge branch 'goho' of git://github.com/oxarbitrage/bitshares-core into oxarbitrage-goho" 
This reverts commit 628652f3eb, reversing
changes made to 568ceb189e.
 2017-06-03 16:05:17 -05:00
Vikram Rajkumar
a263279b76 Revert "Fix warnings; #296" 
This reverts commit 40c7a7ffa3.
 2017-06-03 16:03:52 -05:00