Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions
1944 commits 435 branches 47 tags 121 MiB
Commit graph

1440 commits

Author SHA1 Message Date
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
3ac447b8a7 Add missing 'description' field to betting_market_update operation 2017-07-27 09:50:37 +02:00
Roman Olearski
6e33db129d Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-07-26 22:25:05 +02:00
Roman Olearski
9ab4d7049a added betting wimbledon test, improving database::resolve_betting_market_group . 2017-07-26 22:23:49 +02:00
Eric Frias
0b1d55586e Add missing 'description' field to betting_market_create operation 2017-07-26 13:52:55 -04:00
Roman Olearski
1d450f6ff9 Added wallet operations for updating betting_market_group/betting_market 2017-07-25 11:22:35 +02:00
Roman Olearski
510f2f919f Add a wallet operation for updating betting market rules 2017-07-25 09:20:45 +02:00
Roman Olearski
f1a0c3de66 Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-07-24 21:00:34 +02:00
Roman Olearski
b6682fa69a added betting_market_group_update_operation betting_market_update_operation 2017-07-24 20:59:47 +02:00
Eric Frias
5459beebb6 Add a wallet operation for creating betting market rules 2017-07-24 10:43:15 -04:00
Roman Olearski
ea3818cf4f extended event_update_operation 2017-07-21 13:42:15 +02:00
Roman Olearski
cd40ef0715 extended event_group_update_operation 2017-07-20 21:01:10 +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
Eric Frias
034acf7399 Replace idiosyncratic use of captures in ilog() statements with the usual mechanism 2017-07-19 14:40:43 -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
04985c2624 improving cancel_all_bets operation 2017-07-18 19:17:13 +02:00
Roman Olearski
86b909da44 Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-07-18 12:04:28 +02:00
Roman Olearski
c7c03c4aab added cancel_all_bets operation 2017-07-18 12:02:16 +02:00
Eric Frias
24c0089869 Fix link error in release builds 2017-07-17 18:59:35 -04:00
Roman Olearski
8397ce0c7a Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge2 2017-07-17 23:33:48 +02:00
Daniel Larimer
1c97c13eed Replace flat_index with generic_index for bitasset_object 
- this enabled me to produce blocks and fixed corruption
 2017-07-17 23:24:09 +02:00
Dan Notestein
231eebd021 re-enable time library 2017-07-17 20:36:07 +00:00
Roman Olearski
be9138e227 Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-07-17 22:18:38 +02:00
Roman Olearski
6fe57fbb74 added missing libraries/time 2017-07-17 22:16:23 +02:00
Dan Notestein
087d29b1d6 Disable building of missing time library 2017-07-17 19:56:37 +00:00
Roman Olearski
fb22da620d minor cosmetic changes ... 2017-07-14 13:31:04 +02:00
Roman Olearski
9196d79cb3 updated fc 2017-07-13 16:20:28 +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
f67dd3ea58 Compile fix 2017-07-06 19:24:14 +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
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
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
50fef80189 Merge commit 'ee3f81fa31e39a8ae4ebcfe5b3d78f2dbc103e1b' into betting 2017-06-20 17:44:12 -04:00
Eric Frias
7195e22216 Merge commit '36164263f4cceda85ec92568d48016a48f7ad9c9' into betting 2017-06-20 17:28:41 -04:00
Eric Frias
8549cef70c Merge commit '92cfb96c618e1c051dd7a7224e5392d56c496c06' into betting 2017-06-20 16:39:27 -04:00
Vikram Rajkumar
d8e7c0afee Merge pull request #311 from elmato/push-transaction-sync 
Implement network_broadcast_api::broadcast_transaction_synchronous
 2017-06-14 18:52:14 -05:00
Vikram Rajkumar
38ac7cb457 Cleanup #312 2017-06-14 18:06:39 -05:00
root
b307557182 add simple pagination to get_asset_holders 2017-06-14 17:47:18 +00:00
Matias Romeo
ea8f8964eb Implement network_broadcast_api::broadcast_transaction_synchronous (ported from steem) 2017-06-12 18:22:34 -03:00
oxarbitrage
fab2794699 remove GRAPHENE_TEST_NETWORK_VERSION 
https://github.com/bitshares/bitshares-core/issues/307
 2017-06-11 11:47:11 -03:00
oxarbitrage
1939c7bff6 remove extra space 2017-06-10 17:39:48 -03:00
oxarbitrage
2b1f1b7f74 add commented GRAPHENE_TEST_NETWORK to config 
for issue https://github.com/bitshares/bitshares-core/issues/307
 2017-06-10 17:38:46 -03:00
Abit
919787d281 Merge pull request #306 from oxarbitrage/patch-12 
get_full_accounts change, allow 100 subscribed accounts instead of 99. issue #295
 2017-06-10 17:38:48 +02:00
Roman Olearski
eb4c8f75d1 Merge branch 'rock-paper-scissors-ro' into rock-paper-scissors 
Conflicts:
	programs/witness_node/main.cpp
 2017-06-09 12:17:26 +02:00
oxarbitrage
773a2d0caf get_full_accounts change 
allow 100 subscribed accounts instead of 99.
 2017-06-08 18:43:36 -03:00
root
9200cc83c3 fix get_order_book 2017-06-08 12:27:51 +00: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
Vikram Rajkumar
848eb65ab1 Update submodules 2017-06-04 18:28:04 -05:00
Vikram Rajkumar
a4d2fd6427 Merge pull request #299 from abitmore/fix-win-build 
Fix Windows build.
 2017-06-04 18:17:42 -05:00
Abit
df787c9062 Fix latency check error 2017-06-05 00:32:44 +02:00
Eric Frias
ea7e8e6f31 Support genesis vesting balances tied to account objects 2017-06-04 18:26:50 -04:00
Abit
1ce4d36532 Check block latency after logging. 2017-06-04 01:47:02 +02:00
Vikram Rajkumar
f9f60770f9 Revert "Merge branch 'goho' of git://github.com/oxarbitrage/bitshares-core into oxarbitrage-goho" 
This reverts commit 628652f3eb, reversing
changes made to 568ceb189e.
 2017-06-03 16:05:17 -05:00
Vikram Rajkumar
a263279b76 Revert "Fix warnings; #296" 
This reverts commit 40c7a7ffa3.
 2017-06-03 16:03:52 -05:00
abitmore
06b18c4011 Fix Windows build. 2017-06-03 01:21:17 +00:00
Vikram Rajkumar
40c7a7ffa3 Fix warnings; #296 2017-06-02 19:38:30 -05:00
Vikram Rajkumar
628652f3eb Merge branch 'goho' of git://github.com/oxarbitrage/bitshares-core into oxarbitrage-goho 2017-06-02 19:31:33 -05:00