Commit graph

2664 commits

Author SHA1 Message Date
pravin-battu
1191949b02 replace readline library with editline 2020-10-13 13:54:41 -03:00
pravin-battu
847a87472d Merge branch 'develop' of gitlab.com:PBSA/peerplays into develop 2020-09-23 09:17:45 -03:00
sierra19XX
213a188c46
NFT Permissions (#380)
* Account Roles Permission 1 - Working code with tests

* Account Roles Permission 2 - Add marketplace offer/bid tests

* Account Roles Permission 3 - Add Op check

* Account Roles Permission 4 - Add chain params and limits
2020-09-23 00:26:24 +05:30
pravin-battu
ef51f079f2 Merge branch 'develop' of gitlab.com:PBSA/peerplays into develop 2020-09-18 16:07:29 -03:00
sierra19XX
c46e899cf4
Fix for custom operation authority checking (BTS Issue #210) (#382)
* Resolve #210: [HF] Check authorities on custom_operation

The required_auths field on custom_operation was being ignored during authority checking. This commit causes it to be checked correctly, and adds a unit test verifying as much.

* Ref #381: Fixes

Build and logic fixes for Pull Request #381

* Ref #381: Fix bad merge

During merge conflict resolution, I accidentally broke custom
authorities. This fixes it.

* compilation fix

Co-authored-by: Nathan Hourt <nathan@followmyvote.com>
2020-09-08 18:05:29 +05:30
pravin-battu
149ec3d011 Merge branch 'develop' of gitlab.com:PBSA/peerplays into develop 2020-09-07 22:31:06 -03:00
Bobinson K B
adb22299d9 Merge branch 'ws-updates' into 'develop'
Ws updates

See merge request PBSA/peerplays!1
2020-08-29 16:27:01 +00:00
blockc p
ae3edc6e27 Ws updates 2020-08-29 16:27:01 +00:00
pravin-battu
9f9e44c876 Merge commit 'refs/merge-requests/1/head' of gitlab.com:PBSA/peerplays into develop 2020-08-26 12:46:04 -03:00
pravin-battu
211708d884 Bump fc version for ws-updates 2020-08-12 10:07:35 -03: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
pravin-battu
50bfb4e2f0 updates main.cpp 2020-08-06 13:58:14 -03:00
pravin-battu
3b3ad70c2f websocket related changes 2020-08-06 09:51:47 -03: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
Roshan Syed
490a332db1 ci: update .gitlab-ci.yml 2020-07-09 13:33:14 +00:00
pbattu123
d8ca4d4625
Merge pull request #353 from peerplays-network/issue_a_gitlab
Unable set private-key option through cli comand
2020-04-20 14:33:58 -03:00
pbattu123
a4c922cee9 private-key option update 2020-04-20 09:15:54 -03:00
pbattu123
b857603f10
Merge pull request #340 from peerplays-network/feature/nh5050_winner_id
Feature/nh5050 winner_ticket_id changes
2020-04-10 11:10:51 -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
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
pbattu123
cd8d7253cb updated tests to keep in-line with plugin changes 2020-03-06 15:15:51 -04:00
pbattu123
32d9175061 enable mandatory plugins to have smooth transition for next release 2020-02-27 14:27:49 -04:00
pbattu123
24e7610bce
Merge pull request #296 from peerplays-network/es_update1
ES update1
2020-02-26 13:57:17 -04:00
pbattu123
b7951e916b
fix verify witness signature method (#295) 2020-02-26 22:25:36 +05:30
pbattu123
7f0bc332be update to es plugin 2020-02-26 12:41:22 -04:00
pbattu123
371c4c521d
Merge pull request #293 from peerplays-network/sync_fc_dev
Sync fc with latest updates
2020-02-24 13:52:07 -04:00
pbattu123
71e73146eb sync fc branch(build optimization changes) 2020-02-24 11:13:19 -04:00
pbattu123
926d4ae381
enable snapshot plugin (#288) 2020-02-24 10:24:01 -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
5188a686d9
Merge pull request #229 from peerplays-network/feature/GRPH-155
[GRPH-155] fixed cli_wallet log issue
2020-02-13 12:59:39 -04:00
pbattu123
d5df44935a
Merge pull request #230 from peerplays-network/feature/GRPH-163
[GRPH-163] Port plugin sanitization code
2020-02-13 10:43:59 -04:00
pbattu123
c93c3d3b18
Merge pull request #226 from peerplays-network/feature/GRPH-160
[GRPH-160] check witness signature before adding block to fork db
2020-02-13 09:00:22 -04:00
pbattu123
524b3088df
Merge pull request #228 from peerplays-network/feature/GRPH-162
Replace verify_no_send_in_progress with no_parallel_execution_guard
2020-02-13 08:59:20 -04:00
pbattu123
0e4434a0dc
Merge branch 'develop' into feature/GRPH-155 2020-02-13 08:57:28 -04:00
pbattu123
0579058792
Merge branch 'develop' into feature/GRPH-163 2020-02-13 08:53:44 -04:00
pbattu123
bf25029e4a
Merge pull request #242 from peerplays-network/feature/GRPH-169
[GRPH-169] Avoid directly overwriting wallet file on exit
2020-02-13 08:47:25 -04:00
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
pbattu123
11919cdbd9
brought updates from mainnet branch (#285) 2020-02-12 23:38:23 +05:30
gladcow
e55075ec6d fix CLI tests 2020-01-17 18:51:44 +03:00
pbattu123
62b8bde1e0
Merge pull request #258 from peerplays-network/sync-develop
sync develop with beatrice
2020-01-16 15:33:29 -04:00
gladcow
0a90442966 fix the data writing to ES during sync issues 2020-01-13 15:35:18 +03:00
pbattu123
63750ecf57 sync develop with beatrice 2020-01-02 11:33:05 -04:00