Commit graph

200 commits

Author SHA1 Message Date
Serki
c6c26a7d9f Merge branch 'develop' into feature/SONs-base 2020-09-22 18:23:36 +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
obucina
54390346c1
[SON-271] Merge recent develop branch changes(both GPOS and graphene updates) into SONs branch (#322) 2020-03-27 18:46:30 +01:00
obucina
19a34e9102
Revert "Merge develop branch changes(GPOS+graphene updates) into SONs branch" 2020-03-21 09:47:46 +01:00
pbattu123
78c17c0ef0 updated unit test cases to reflect GPOS vesting and update account id's according to sons-account 2020-03-18 17:19:28 -03:00
pbattu123
da4954c686 resolved compilation issues and other conflicts 2020-03-05 16:20:24 -04:00
pbattu123
11718af9b8 Merge develop into SONS 2020-03-03 16:42:51 -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
obucinac
a688bb93ed
son_wallet_object operations and multisig wallet recreation by RPC (#263)
* Extend GPO.active_sons to contain votes and all public keys

* Introduce son_wallet_object
* son_wallet_object operations
* Create son_wallet_object on new set of SONs, to initiate primary wallet recreation
* son_wallet_object API and cli wallet commands
* Send RPC command to bitcoin node to recreate multisig wallet
* Updating wallet info through operation instead through database.modify() for persistance
* Update libraries/chain/include/graphene/chain/protocol/son_wallet.hpp
* Update libraries/chain/include/graphene/chain/protocol/son_wallet.hpp
* Fix #include <graphene/chain/son_wallet_transfer_object.hpp>
* Refactor primary wallet recreation
* PW recreation refactoring, prevent duplicated recreations, update wallet address through proposal
* Quickfix for checking payer in evaluator
* Fix failing son_wallet_tests
- Check for son_btc_account is temporarely disabled
* Remove redundant file
Co-authored-by: gladcow <jahr@yandex.ru>
2020-02-04 19:31:45 +01:00
Alfredo Garcia
62247c543d Merge pull request #1725 from oxarbitrage/issue1682
elasticsearch history api #1682
2020-01-01 14:51:25 +03:00
Abit
c9583f4486 Merge pull request #1201 from oxarbitrage/elasticsearch_tests2
Elasticsearch refactor
2019-12-31 00:03:25 +03:00
Sandip Patel
0bcfaa385b Improve account maintenance performance (#130)
* Improve account maintenance performance

* merge fixes

* Fixed merge issue

* Fixed indentations and extra ';'
2019-11-07 11:25:02 +05:30
satyakoneru
ee7aae56da SON118-Add Budget for SON (#165)
* SON118-Add Budget for SON

* SON118 - Compilation errors fix

* SON118 - Proper commenting around pay_sons function

* SON118 - Comment correction, SON statistics object implementation type correction

* SON118 - Add missing index init and reflect enums

* SON118 - Correcting the indentation

* SON118 SON144 - Add unit test, code fixes and resolve failures for existing tests

* SON118 SON144 - Removing extra spaces added
2019-10-17 20:16:48 +05:30
gladcow
777019241e fix affiliate tests 2019-10-11 11:33:26 +03:00
Sandip Patel
40534446da [GRPH-106] Added voting tests (#136)
* Added more voting tests

* Added additional option
2019-10-10 21:29:01 +05:30
abitmore
106824c62a No longer extract public keys before pushing a trx
and removed unused new added constructor and _get_signature_keys() function from signed_transaction struct
2019-09-20 16:27:26 +03:00
abitmore
2dfb67e16e Updated transaction::signees to mutable
and
* updated get_signature_keys() to return a const reference,
* get_signature_keys() will update signees on first call,
* modified test cases and wallet.cpp accordingly,
* no longer construct a new signed_transaction object before pushing
2019-09-20 14:10:24 +03:00
abitmore
56a6f8b732 Extract public keys before pushing a transaction 2019-09-20 13:44:15 +03:00
Alfredo Garcia
d911b3db69
Merge branch 'develop' into GRPH-75 2019-09-17 15:53:18 -03:00
Ronak Patel
3510704398 Fix for for history ID mismatch ( Bitshares PR #875 ) 2019-09-09 15:33:47 +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
Srdjan Obucina
2ceb77f796 Fix building error for develop branch + test fix from PR 65 2019-08-30 12:06:41 +02:00
Prabhjot
c278352713 removed sweeps_parameter_extensions 2019-08-02 09:47:32 -04:00
Prabhjot Singh
aa3128fe89 Merged beatrice into 5050 2019-07-30 11:43:31 -04:00
pbattu123
8678b677bb missing files from dev branch 2019-07-01 22:20:00 -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
100a415825 comment out fee_pool core check 2018-12-15 20:35:47 -03:00
Alfredo
33a4759f31 make GRAPHENE_TESTING_GENESIS_TIMESTAMP divisible by 3 2018-12-15 16:20:14 -03:00
Fabian Schuh
7d6432e4bf
Merge remote-tracking branch 'origin/sport_n_events_api_extension_release' into beatrice 2018-10-11 14:08:23 +02:00
Peter Conrad
b40e823875
Added unit test for affiliate_stats plugin and API 2018-10-10 14:26:38 +02:00
Peter Conrad
abf909803c
Refactored betting market macros into common header 2018-10-10 14:26:21 +02:00
Peter Conrad
d8828dc3a9
Refactored betting market macros into common header 2018-10-10 14:26:20 +02:00
Peter Conrad
55fb6c4ce2
Test affiliate payout in RPS tournament 2018-10-10 14:25:57 +02:00
Peter Conrad
d25604e467
Refactored tournament_helper into common files 2018-10-10 14:25:57 +02:00
Apr Team
688110ce8d Implemented event_group delete operation. 2018-05-17 09:45:04 +02:00
Apr Team
71fec0ac83 Implemented sport delete operation added test. 2018-05-17 09:45:04 +02:00
Eric Frias
5b771c3a28 Create a version of the basic dividend distribution test that uses
the core asset as the dividend holder asset.
2018-05-09 16:44:06 -04:00
Eric Frias
3b3a0905ff Change the behavior of the betting markets from being controlled by
a collection of flags (is_live, is_closed) to a single status field.
The status changes in an event can trickle down to the market groups,
and the status changes in market groups can bubble up to events.
2018-02-07 10:16:30 -05:00
kstdl
090a3a4dad merge get_account_lotteries branch. fix create_witness test 2018-01-09 11:45:19 +03:00
kstdl
6b3de963a2 fix and comment some tests 2017-12-13 18:29:39 +03:00
kstdl
f00c56d789 fix some tests. add gitlab-ci.yml 2017-12-12 18:15:55 +03:00
kstdl
8f379a3c53 fix reindex on peerplays network 2017-12-12 15:37:58 +03:00
kstdl
930ddb06c1 lottery end implemented 2017-12-06 10:40:52 +03:00
kstdl
2acbf3d929 ticket_purchase_operation implemented. added lottery_options to asset 2017-11-13 10:14:07 +03:00
kstdl
d7c80b4b6a fix rng and get_winner_numbers implemented 2017-11-03 17:52:41 +03:00
Eric Frias
b505c375af Finish delayed (live) betting.
Remove the ability to change the event of a betting market group after creation.
2017-08-15 18:44:09 -04:00
Roman Olearski
a2b83c668f added delay_bets to betting_market_group_object, live_betting_delay_time to chain parametrs . 2017-08-10 21:36:04 +02:00
Eric Frias
26c2eb4c7a Make the bet_place helper in the test fixture return the bet id 2017-08-09 13:53:37 -04:00
Roman Olearski
2c8b9ce17a Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-08-09 17:59:25 +02:00
Roman Olearski
ec77685264 added is_live_market to event_update operation 2017-08-09 17:58:01 +02:00