Commit graph

1931 commits

Author SHA1 Message Date
sierra19XX
8d26d9c42d Beatrice NFT HF 2020-08-10 13:21:36 +00:00
sierra19XX
3aab6cb61d Merge remote-tracking branch 'origin/feature/marketplace' into HEAD 2020-08-10 01:47:08 +00:00
sierra19XX
a360a0df77 revenue_split condition check allow zero or above 2020-08-09 05:43:07 +00:00
sierra19XX
10cdecd489 Merge origin/develop 2020-08-07 15:29:02 +00:00
sierra19XX
1e1f109e7e NFT make revenue_split integer from double 2020-08-07 15:24:35 +00:00
sierra19XX
5783648cfb NFT HF checks and op fee addition changes 2020-08-06 19:13:58 +00:00
sierra19XX
92eb5c441f nft_metadata_update changes 2020-08-06 14:18:48 +00:00
sierra19XX
218d826e65 Review comments - change variable names, use scoped enums 2020-08-04 14:12:15 +00:00
sierra19XX
b2e2d7e966 Add non-transferable non-sellable properties to NFTs 2020-08-03 13:15:45 +00:00
sierra19XX
7d80c042bf Unlisting offers, add result in offer history object 2020-07-31 12:26:45 +00:00
sierra19XX
c36d4c9687
Mainnet chain halt 5050 Issue (#370) 2020-07-30 21:28:27 +10:00
sierra19XX
a5aa7c200d
GPOS2 HF - Handle rolling period on missing blocks (#369) 2020-07-30 21:28:08 +10:00
sierra19XX
82e9d92089 Add stricter checks to NFTs 2020-07-29 05:50:49 +00:00
sierra19XX
10ecad7566 ppy marketplace 9 - FC_REFLECT offer create op 2020-07-24 08:46:12 +00:00
Srdjan Obucina
212c366b46 Fix cli_wallet to properly pass metadata id for nft_create 2020-07-23 13:38:39 +02:00
Srdjan Obucina
a62ffd73ea Fix nft_mint_evaluator to save token_uri 2020-07-23 13:22:54 +02:00
Srdjan Obucina
957b331d4e Fix nft_get_token_uri returning empty string 2020-07-22 17:33:29 +02:00
obucina
196c2539d9
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>
2020-07-21 11:32:53 +02:00
Srdjan Obucina
f1e9a79d0b Merge branch 'feature/nft' into feature/marketplace 2020-07-16 14:15:15 +02:00
Srdjan Obucina
76ed35af2e New DB API, list all NFTs, list NFTs by owner 2020-07-16 14:09:44 +02:00
sierra19XX
d1f64ca919 ppy marketplace 8 - Add pagination for list APIs 2020-07-08 14:39:17 +00:00
sierra19XX
e8ec6ae0e5 ppy marketplace 7 - Add db, wallet changes and some NFT fixes 2020-07-08 11:25:52 +00:00
Satyanarayana Koneru
4cbb01d4e6 ppy marketplace 6 - Remove unnecessary files 2020-07-08 18:18:05 +10:00
sierra19XX
c0da3a2e84 ppy marketplace 5 - Add revenue split 2020-07-07 18:40:58 +00:00
sierra19XX
db9a35fa17 ppy marketplace 4 - Add tests NFT+Marketplace 2020-07-06 16:51:18 +00:00
sierra19XX
99a24a6e39 ppy marketplace 3 - Merge NFT Branch with market place 2020-07-04 17:22:13 +00:00
Srdjan Obucina
3a8d8b9e98 Database API for NFT metadata and enumerables 2020-07-02 00:23:09 +02:00
Srdjan Obucina
e2c375e2a2 Fix NFT tests 2020-07-01 12:13:53 +02:00
Srdjan Obucina
51cb17e2d8 NFT metadata implemented 2020-07-01 01:08:31 +02:00
Srdjan Obucina
0d79d5d0ee Wallet API 2020-06-23 03:14:33 +02:00
Srdjan Obucina
d0c72f7cf7 Database API 2020-06-22 21:36:42 +02:00
sierra19XX
5093b94128 ppy marketplace 2 - batch sale, offer_object escrow 2020-06-19 15:02:03 +00:00
Srdjan Obucina
775eac55a9 Evaluator checks in place 2020-06-19 02:44:02 +02:00
Srdjan Obucina
31ed9b4ddb NFT evaluators and basic tests, no evaluator checks 2020-06-18 04:52:58 +02:00
Srdjan Obucina
de9ede0d5c NFT object and basic operations 2020-06-15 22:39:04 +02:00
sierra19XX
3032185b5c ppy marketplace 1 - add evaluators and objects 2020-06-15 12:13:44 +00:00
pbattu123
a4c922cee9 private-key option update 2020-04-20 09:15:54 -03:00
pbattu123
02a89dd770 update HF to 15th April 2020-04-10 12:01:28 -03:00
pbattu123
fb90c83b29 Merge commit 'refs/pull/340/head' of https://github.com/peerplays-network/peerplays into feature/beatrice_winner_id 2020-04-10 11:28:25 -03:00
pbattu123
03ebcc6f3b update variable type to uint64 2020-04-10 09:39:09 -03:00
pbattu123
f701f03401 update HF date 16th April 2020 2020-04-10 08:53:25 -03:00
pbattu123
e3cf4ab9e2 changes to fetch operations based on lottery asset 2020-04-09 22:05:18 -03:00
pbattu123
dd88b8f1ff update HF check 2020-04-08 09:05:39 -03:00
pbattu123
cb7429e818 code improvement with edge case handling 2020-04-07 01:31:17 -03:00
pbattu123
e445e1a11c update HF-check 2020-04-06 14:47:38 -03:00
pbattu123
9ffce8f33c update HF check 2020-04-06 14:45:50 -03:00
pbattu123
29f41ec7da nh5050:winner ticket id changes 2020-04-06 12:30:55 -03:00
pbattu123
2f034420e0 sync latest fc commit on beatrice 2020-03-09 14:40:31 -03: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
ac109234d2
Merge pull request #299 from peerplays-network/plugins_enable_fix1
Enable mandatory plugins to have smooth transition for next release
2020-03-06 16:04:04 -04:00