Commit graph

518 commits

Author SHA1 Message Date
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
94157497bb
Merge branch 'develop' into feature/GRPH-93-v2 2019-09-18 18:19:17 +02:00
Miha Čančula
499a5fc33e
Merge branch 'develop' into GRPH-50-network_broadcast_api-fix-v2 2019-09-18 16:36:42 +02:00
Alfredo Garcia
d911b3db69
Merge branch 'develop' into GRPH-75 2019-09-17 15:53:18 -03:00
obucinac
f8da5415e3
Part two of SON-83 - plugins option in command line and config file (#126)
- Empty SON plugin is INACTIVE by default
- To enable it, add peerplays_sidechain to plugins section in
  config file, or use --plugins command line option
- Plugin can work with or without witness
2019-09-13 17:34:34 +02:00
Ronak Patel
646dc2e548 Merged Bitshares PR #1462 and compilation fixes 2019-09-10 18:56:27 +05:30
Ronak Patel
3510704398 Fix for for history ID mismatch ( Bitshares PR #875 ) 2019-09-09 15:33:47 +05:30
Bobinson K B
b11edaa6a5
Merge pull request #69 from peerplays-network/WASM-49
get_account_history fix
2019-09-07 00:54:39 +05:30
Bobinson K B
f9a3d087ea
Merge pull request #60 from peerplays-network/GRPH-48-Object-Database-18.04
Grph 48 object database 18.04
2019-09-07 00:53:04 +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
satyakoneru
f6423d0b10 GRPH-4-CliWallet_crash_ctrlD 2019-08-28 13:53:41 +00:00
Miha Čančula
cb99aaa0cf
Adapt to variant API with max_depth argument 2019-08-28 15:42:21 +02:00
abitmore
94f9c5f3eb
Increase max depth for trx confirmation callback 2019-08-28 15:42:21 +02:00
Abit
a49f8bf47c
Merge pull request #714 from pmconrad/json_fix
JSON fix
2019-08-28 15:42:21 +02:00
abitmore
22e7c44984
Add nullptr check in api.cpp for easier testing 2019-08-28 15:41:15 +02:00
gladcow
5d38466f7d Backport fix for get_account_history from https://github.com/bitshares/bitshares-core/pull/628 and add additional account history test case 2019-08-28 15:49:33 +03:00
Peter Conrad
14b0d08d5a Fixed error when account_history_object with id 0 doesnt exist 2019-08-28 15:49:33 +03:00
Sandip Patel
0d0a6b7c74 Fixed error while loading object database 2019-08-28 12:11:43 +05:30
pbattu123
947b02bd57
Merge branch 'beatrice' into beatrice-5050-merge 2019-08-20 15:15:01 -03:00
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
a0ae945f8d Added new lottery_asset_create_operation 2019-08-09 13:01:57 -04: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
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
Fabian Schuh
e9970767f5
Ensure we use the correct genesis block, config and seed nodes 2019-01-22 10:21:39 +01:00
Fabian Schuh
fe138fabbf
Add more seed nodes 2018-12-11 11:20:16 +01:00
Fabian Schuh
462f737227 Chain launched by blckchnd 2018-10-29 10:21:55 +01:00
Fabian Schuh
ea3bb1a377
Proper variables for beatrice testnet 2018-10-12 12:20:30 +02:00
Fabian Schuh
d8f3f6b399
Merge remote-tracking branch 'origin/list_pending_proposals_api' into testnet-beatrice 2018-10-11 14:20:53 +02: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
Fabian Schuh
d0c6c49e44
Merge remote-tracking branch 'origin/broadcast-api-operations-duplication-check' into beatrice 2018-10-11 13:54:31 +02:00
Peter Conrad
ade7cf2d87
Created plugin stub for affiliate statistics 2018-10-10 14:26:38 +02:00
Peter Conrad
fdd7c193a6
Implemented affiliate payouts 2018-10-10 14:25:56 +02:00
Peter Conrad
0a2af8afb2 Merge remote-tracking branch 'origin/baxter' 2018-09-04 14:52:48 +02:00
Michael Neynens
d5d7900cb4 Updated seed nodes and added update section in README 2018-07-09 08:51:56 -07:00
Apr Team
140ecd7532 Added more tests. Fixed offsets in the db file. Pathced the network_broadcast_api. 2018-07-05 13:58:36 +03:00
Michael Neynens
7c853e42aa Merge branch 'pr10' 2018-07-04 16:14:13 -07:00
Apr Team
80efb85d72 Added event_group delete operation and evaluator. Fixed compilation issues. 2018-05-17 09:45:04 +02:00
Apr Team
4f501f6aaf Added sport_delete operation, evaluator and API. Fixed various compilation issues.
Added tests file.
2018-05-17 09:45:04 +02:00
Fabian Schuh
2be2826f3c [pending] use map instead of vector 2018-04-11 15:43:10 +02:00
Fabian Schuh
cbe88eb511 [pending] remove expired transactions from list 2018-04-11 15:43:04 +02:00
Fabian Schuh
101325990b Hardfork baxter 2018-04-05 11:53:45 +02:00
Blockchain Projects BV
16e0b5353a Added Pending-transactions 2018-04-03 10:13:38 +02:00
Eric Frias
931c925610 Register event status update operation 2018-02-13 11:34:04 -05: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
186a0e61ea added owner to lottery_asset_options. commented async call in on_applied_block callback 2017-12-27 17:21:56 +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
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
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
a8d5fded26 Remove the code for charging beting fees up-front now that rake fees are taken from your net winnings.
Change the bet matching algorithm to only match at exactly the maker's odds, no rounding.
Implement binned order books in the betting market plugin.  Keep betting market groups,
betting markets, and bet objects around forever in the plugin (not yet exposed to the api).
2017-08-09 11:15:12 -04:00
Roman Olearski
f417dc0391 removed betting_market_group_freeze operation
added freeze to betting_market_group_update operation
2017-08-09 11:08:50 +02:00
Eric Frias
85b26c6905 Remove unnecessary explicit instantiation 2017-08-01 15:42:52 -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
b6682fa69a added betting_market_group_update_operation betting_market_update_operation 2017-07-24 20:59:47 +02:00
Roman Olearski
78100f9fb5 added betting_market_rules_update_operation 2017-07-20 14:28:12 +02:00
Roman Olearski
c13ba46b2b Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-07-20 12:20:11 +02:00
Roman Olearski
2acd4dd187 added event_update_operation 2017-07-20 12:19:18 +02:00
Eric Frias
6c7f4cc2b9 Point seed nodes at testnet 2017-07-19 14:56:36 -04:00
Roman Olearski
7b8fad0bfa added event_group_update_operation 2017-07-19 18:10:55 +02:00
Roman Olearski
a24f671c02 added sport_update_operation 2017-07-19 13:05:28 +02:00
Roman Olearski
67c134a138 changed cancel_all_bets to cancel_unmatched_bets 2017-07-19 10:29:51 +02:00
Roman Olearski
c7c03c4aab added cancel_all_bets operation 2017-07-18 12:02:16 +02: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
Roman Olearski
bb46f84666 Fixing double declared enumerated types with FC_REFLECT_TYPENAME FC_REFLECT_ENUM
Adapting fc
2017-07-12 12:28:59 +02:00
Eric Frias
4e2c6c303a Add an operation to freeze/unfreeze a betting market group 2017-07-09 13:52:01 -04:00
Roman Olearski
5de1437d24 Merge branch 'betting-ro4' into betting-merge 2017-07-08 20:41:45 +02:00
Eric Frias
a8a64e530b Add an informational betting_market_rules object, linked to betting market groups 2017-07-06 18:07:39 -04: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
b8e1165290 Cherry-picked commit 7857ac4.
Correctly generating virtual transactions for payouts
2017-07-06 19:18:48 +02:00
Eric Frias
b9304caffa Cherry-picked commit abc7853.
Initial work on dividend-paying assets.  Basic functionality works in simple cases.
2017-07-06 19:14:02 +02:00
Eric Frias
cd2940c8a8 Remove competitor and market options objects from the blockchain 2017-07-06 11:57:45 -04:00
Roman Olearski
9b08b502be implementing betting_market_resolve_group_operation (3) #1 2017-07-06 12:56:32 +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
Eric Frias
fe82e85d8d Merge commit '9bbbefd3913ccfe01b8e8ef2007ca3eb74ab9d81' into betting 2017-06-21 09:33:53 -04:00
Eric Frias
c20978bae6 Merge commit '1e80d8a01e6181711bba3d6462e64286d79935b1' into betting 2017-06-20 19:34:52 -04:00
Eric Frias
5a99abc3de Merge commit '0053613b38e81719c198f36c748e181cc44635b2' into betting 2017-06-20 18:57:23 -04:00