Commit graph

884 commits

Author SHA1 Message Date
Roman Olearski
fb22da620d minor cosmetic changes ... 2017-07-14 13:31:04 +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
790bfe3704 WIP Force all betting markets in a group to use the same asset_id for betting 2017-07-09 18:41:26 -04: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
Roman Olearski
c18094abd8 implementing rake fee in resolve_betting_market_group #1
improving net profit calculation
2017-07-08 18:30:23 +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
Roman Olearski
32433ef29f Cherry-picked all divident commits from rps to betting resolving conflicts 2017-07-06 23:04:50 +02:00
Roman Olearski
3a8b8a3b5b Cherry-picked commit b9508c6.
little correction for solution ...issues/#10 avoid generating dividend_payout virtual operations for zero-size payouts
2017-07-06 20:19:51 +02:00
Roman Olearski
59c64efb5a solution ...issues/#10 avoid generating dividend_payout virtual operations for zero-size payouts 2017-07-06 20:15:50 +02:00
Roman Olearski
9bbf73a96a Cherry-picked commit 81c9e98.
solution  ...issues/#7 Allow vesting core tokens to vote and receive dividends
2017-07-06 20:14:54 +02:00
Roman Olearski
64d59602a8 solution proposal for ...issues/#7 Allow vesting core tokens to vote and receive dividends 2017-07-06 20:05:24 +02:00
Eric Frias
bfcc23ac9d Cherry-picked commit 749ffb8.
Don't make the core asset a bitasset
2017-07-06 20:04:05 +02:00
Roman Olearski
85102da504 Cherry-picked commit 32b5343.
Implementing propose_dividend_asset_update
2017-07-06 19:58:10 +02:00
Roman Olearski
1386617465 Removing redundant line 2017-07-06 19:55:24 +02:00
Roman Olearski
dac9d8b61b Cherry-picked commit 26f4718.
Creating default dividend asset
2017-07-06 19:53:14 +02:00
Eric Frias
da5ef56a35 Cherry-picked commit 9089292.
Prevent creation of accounts with the same name as dividend distribution accounts
2017-07-06 19:44:35 +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
67d0898394 Fixes to paying out non-core assets using their fee pools 2017-07-06 19:39:04 +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
60f7dd798f Keep pending dividend balance and distributed dividend balance objects around (with zero
balance) after payouts, they will probably be needed again.
2017-07-06 19:19:54 +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
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
Eric Frias
627dba3a46 Merge commit '0ad83697f08a11431eece565f0386a849bed25c9' into betting 2017-06-20 18:36:19 -04:00
Eric Frias
bd525ef55d Merge commit 'c777a88649d50edf6c5e4a8c3b13dda88a66e9d0' into betting 2017-06-20 18:15:43 -04:00
Eric Frias
7195e22216 Merge commit '36164263f4cceda85ec92568d48016a48f7ad9c9' into betting 2017-06-20 17:28:41 -04:00
Eric Frias
bd70c0dc67 Restore sanity-check assert 2017-06-06 10:22:46 -04:00
Eric Frias
50f224137b Add peerplays-testnet account in genesis file.
change default core asset and prefix to PPY.
update test genesis to match new prefix.
2017-06-06 09:01:27 -04:00
Eric Frias
e53e9f8623 Update max core supply in genesis, properly track total supply for vesting balances in bts accounts 2017-06-05 19:52:51 -04:00
Abit
feabafd45f Merge pull request #297 from abitmore/292-acc-his-prune
Account history: option to prune old data (#292)
2017-06-06 00:42:54 +02:00
Roman Olearski
9c1e522070 Merge branch 'rock-paper-scissors' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into rock-paper-scissors 2017-06-05 19:21:58 +02:00
Roman Olearski
a8f51e2a98 updated genesis/genesis.json for peerplays 2017-06-05 19:20:54 +02:00
Eric Frias
38b2767567 Support specifying cliff_seconds in initial_vesting_balances 2017-06-05 12:31:14 -04:00
Eric Frias
ea7e8e6f31 Support genesis vesting balances tied to account objects 2017-06-04 18:26:50 -04:00
abitmore
06b18c4011 Fix Windows build. 2017-06-03 01:21:17 +00:00
abitmore
504aa5dccd Account history: option to prune old data (#292) 2017-06-02 16:16:34 +00:00
Eric Frias
cc77db0410 comment out excessive debug logging 2017-06-01 17:05:35 -04:00
Eric Frias
3cc82f0022 Change unique index to non-unique on vesting_balance_objects 2017-06-01 15:27:38 -04:00
SynaptiCAD User
e3b4c28f9b [DLN] revert some test code related to worker-pay that was inadvertently committed in a larger commit 2017-06-01 11:38:27 -04:00
Eric Frias
7f44b793c1 Fix a bug where initial_bts_accounts' balances weren't correctly accounted in total_supply 2017-05-31 18:06:11 -04:00
SynaptiCAD User
50f474a8bf [DLN] added code to test participation rate using ./tests/chain_test --run_test=operation_tests/witness_create, currently passes when test is set to use shuffle (which I've set as default) but fails for RNG 2017-05-30 18:49:15 -04:00
SynaptiCAD User
80e1be9ee0 [DLN] fixed missed_count for participation_rate calculateion on RNG, also hopefully fix missed block count for individual witnesses 2017-05-30 14:50:49 -04:00
Ryan R. Fox
0fc6079828 Update db_block.cpp
Ensure the transaction signature is validated.
2017-05-27 16:42:21 -04:00
Roman Olearski
e6b58adbd1 fixed update witness operation - added new_initial_secret 2017-05-27 20:11:46 +02:00
Roman Olearski
74bcc3ed4f Merge branch 'rock-paper-scissors' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into rock-paper-scissors
Conflicts:
	libraries/chain/include/graphene/chain/config.hpp
2017-05-24 19:37:08 +02:00
Roman Olearski
71b53bbf26 changed to PPY core and BTS prefix 2017-05-24 19:34:39 +02:00
Eric Frias
90553db95b Update key core asset and key prefix to PPY.
Add BitShares sharedrop balances, PEERPLAYS token balances, and reserved
accounts for exchanges to genesis file.
2017-05-24 13:19:02 -04:00
Roman Olearski
8d73141d8b preparing genesis.json db_init.cpp for PPY 2017-05-23 18:21:51 +02:00
Vikram Rajkumar
f13698370b Clean up replay logic; resolve #175 2017-05-21 18:40:54 -05:00
Abit
db9669a264 _apply_block: don't skip trx signature validation 2017-05-10 20:20:18 +02:00
Roman Olearski
2259224078 added missing reflection for chain parameter 'witness_schedule_algorithm' 2017-04-21 14:58:00 +02:00
Roman Olearski
27b5c978db completing scheduled (restored) witnesses, setting as default 2017-04-21 14:24:40 +02:00
Roman Olearski
a8244963e7 shuffled witnesses repaired 2017-04-19 21:47:54 +02:00
Roman Olearski
90ec694446 integrating scheduled (old) and shuffled (current) witnesses 2017-04-19 20:31:00 +02:00
Roman Olearski
83c5be13f6 completing creating tournament test cases for assertions 2017-04-14 13:49:55 +02:00
Roman Olearski
509867655f implementing tournament test cases for assertions 2017-04-12 17:26:51 +02:00
Roman Olearski
8be10bc6cf Merge branch 'rock-paper-scissors' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into rock-paper-scissors 2017-04-11 12:43:49 +02:00
Roman Olearski
db2b397afd Merge branch 'rock-paper-scissors' of http://syncad.storm.pl:56780/blocktrades/graphene into rock-paper-scissors 2017-04-11 11:38:08 +02:00
Roman Olearski
73d7dbf092 creating committee settable parameters for a bunch of constants in tournament_evaluator 2017-04-11 10:23:28 +02:00
Eric Frias
f7113d3d05 [DLN] change parameters to tournament_leave_operation to specify the account canceling the registration instead of the payer. The canceling acount must be either the payer or the player. Don't allow a player to leave a tournament once registration has been closed. Require player to be authorized for the asset being paid as tournament prize winnings during tournament_join_operation. Tests still need to be made for these changes. 2017-04-10 23:29:02 -04:00
Eric Frias
2b6be2a65e Verify all account ids on whitelist are valid accounts 2017-04-10 15:50:36 -04:00
Roman Olearski
a74e66dd24 little fix in libraries/chain/tournament_evaluator.cpp, corrected comparison asset with integer 2017-04-10 20:07:08 +02:00
Roman Olearski
c60e88d054 Merge branch 'rock-paper-scissors' of http://syncad.storm.pl:56780/blocktrades/graphene into rock-paper-scissors 2017-04-10 19:07:56 +02:00
Dan Notestein
3b36205555 Limit games to 3 gestures because GUI wallet only supports 3 gesture games currently. Note that cli-wallet also supports 5 gesture games in theory, and the code can be expanded to support any odd number of gestures by giving the gestures names. 2017-04-10 11:55:31 -04:00
Dan Notestein
1aad7e4b74 Document limits on number_of_players in a tournament. 2017-04-10 14:42:34 +00:00
Dan Notestein
d5358c6eb0 Prevent creation of tournament with negative buy-in 2017-04-10 13:54:40 +00:00
Abit
2c05590cd4 Fix clear_expired_transactions memory leak #256 2017-04-09 00:20:13 +02:00
Roman Olearski
c16454890c Implementing missing functionality (6)
Peerplays Blockchain pre-launch settings & modifications I II III
2017-04-08 20:16:05 +02:00
Roman Olearski
94ba6266c6 Implementing missing functionality (5)
Peerplays Blockchain pre-launch settings & modifications I II III
2017-04-08 15:50:13 +02:00
Roman Olearski
33e2f4fd14 Implementing missing functionality
Peerplays Blockchain pre-launch settings & modifications I II III

Merge branch 'rock-paper-scissors' of http://syncad.storm.pl:56780/blocktrades/graphene into rock-paper-scissors-ro
2017-04-07 17:28:53 +02:00
Roman Olearski
66208a2d9e I. DEX
Task: The Peerplays DEX should only allow UIA and sidechain assets to be paired (traded) with the core token (PPY).
2017-04-06 09:46:17 +02:00
Eric Frias
672fad6d40 Start of a plugin to track deleted events (and other deleted objects) needed by the
bookie ui
2017-04-04 17:02:19 -04:00
Roman Olearski
2fd34ef6ab commiting last changes 2017-04-01 13:59:52 +02:00
Eric Frias
6045b8b096 Add a simple test fixture to verify a bet plays out correctly in all three
outcomes.
Fix refunding fees on market cancelation
2017-03-31 17:56:00 -04:00
Eric Frias
39093df26c Create a bunch of utility functions to make writing betting market tests easier 2017-03-31 11:10:37 -04:00
Eric Frias
69192a889d Generate a virtual op when a market is resolved 2017-03-24 11:51:35 -04:00
SynaptiCAD User
e609764df3 cancel all the betting markets of a canceled event 2017-03-24 11:04:35 -04:00
Eric Frias
e74a505622 Fix missing const qualifier, payouts for betting market wins 2017-03-24 10:40:53 -04:00
SynaptiCAD User
c8a9c86ca6 cancel all unmatched bets on betting market when it is resolved 2017-03-24 00:09:43 -04:00
Eric Frias
784b11059f Start implementing bettimg_market_resolve op 2017-03-23 19:35:10 -04:00
Eric Frias
fd38d385ca Fix an error using the wrong scaling constant for bet odds 2017-03-23 18:16:18 -04:00
Eric Frias
9f6edc649d Sort bets by odds for use in an order book 2017-03-23 16:24:47 -04:00
SynaptiCAD User
239d8ee885 update global_betting_statistics when new events created, change scores representation to simple vector of strings, working on evaluator for event_update_status_operation 2017-03-23 00:36:18 -04:00
SynaptiCAD User
c0776eb1dc add get_global_betting_statistics api call 2017-03-23 00:36:18 -04:00
SynaptiCAD User
a267741fd1 added global_betting_statistics implementation object. Object is created, but nothing talks to it yet. 2017-03-23 00:36:18 -04:00
elmato
3eb160bed1 Move notification related functions from db_block.cpp to db_notify.cpp 2017-03-22 22:03:45 +00:00
elmato
0ecdc90d4d Add the array of ids (that are being removed) to the removed_objects signal 2017-03-22 20:14:53 +00:00
elmato
6d3fbeef55 Include information of impacted accounts relative to the objects created/changed/removed. Only extract the impacted accounts information if there are handlers defined in order prevent useless cpu usage on nodes not exposing the rpc api 2017-03-22 20:14:53 +00:00
elmato
29c636fcef add get_market() function to call_order_object 2017-03-22 20:14:53 +00:00