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

168 commits

Author SHA1 Message Date
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
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
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
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
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
bd70c0dc67 Restore sanity-check assert 2017-06-06 10:22:46 -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
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
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
Roman Olearski
71b53bbf26 changed to PPY core and BTS prefix 2017-05-24 19:34:39 +02:00
Roman Olearski
8d73141d8b preparing genesis.json db_init.cpp for PPY 2017-05-23 18:21:51 +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
94ba6266c6 Implementing missing functionality (5) 
Peerplays Blockchain pre-launch settings & modifications I II III
 2017-04-08 15:50:13 +02:00
Roman Olearski
2fd34ef6ab commiting last changes 2017-04-01 13:59:52 +02:00
Eric Frias
784b11059f Start implementing bettimg_market_resolve op 2017-03-23 19:35:10 -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
a267741fd1 added global_betting_statistics implementation object. Object is created, but nothing talks to it yet. 2017-03-23 00:36:18 -04:00
Eric Frias
06c56484de Add blockchain parameters to limit the allowed bet odds, start data structure to 
track an account's market position
 2017-03-21 18:10:02 -04:00
Eric Frias
db6b312784 Stub out the bet object and the operation for placing it (currently breaks 
json_serializer builds, until I port over some code into fc)
 2017-03-16 19:37:26 -04:00
Eric Frias
2470af6eb9 Initial work on creating blockchain objects for sports betting 2017-03-15 17:04:27 -04:00
Roman Olearski
787019617f Summary commiting changes made since the last commit 
modified:   libraries/app/impacted.cpp
	modified:   libraries/chain/db_init.cpp
	modified:   libraries/chain/db_maint.cpp
	modified:   libraries/chain/game_object.cpp
	modified:   libraries/chain/include/graphene/chain/protocol/operations.hpp
	modified:   libraries/chain/include/graphene/chain/protocol/tournament.hpp
	modified:   libraries/chain/protocol/tournament.cpp
	modified:   libraries/chain/tournament_object.cpp
	modified:   libraries/wallet/wallet.cpp
	modified:   programs/witness_node/main.cpp
	modified:   tests/CMakeLists.txt
	modified:   tests/common/database_fixture.cpp
	new file:   tests/tournament/tournament_tests.cpp
 2016-11-28 12:36:18 +01:00
Roman Olearski
32b53434f9 Implementing propose_dividend_asset_update 2016-11-08 11:34:04 +01:00
Roman Olearski
58f1fdc46d Setting the core asset as test dividend asset inn genesis 2016-11-07 22:27:58 +01:00
Roman Olearski
0d8e3a31d5 Removing redundant line 2016-11-07 11:05:04 +01:00
Roman Olearski
26f47189f0 Creating default dividend asset 2016-11-07 10:18:18 +01:00
Roman Olearski
7f36b261bf Merge remote-tracking branch 'origin/dividends' into rock-paper-scissors 
Adding new chain parameters
Distribute prize money when a tournament ends
 2016-11-02 15:30:18 +01:00
Eric Frias
30874697cc Rework the API calls for tournaments, add an index for getting tournaments 
registered by a given account
 2016-10-21 12:14:37 -04:00
Eric Frias
7c30da6b6d Simple two-player tournaments are working if you don't do anything fancy 2016-10-14 19:43:38 -04:00
Eric Frias
50a9f913ce Move game object to its own file 2016-10-04 10:41:26 -04:00
Eric Frias
baab40070d Many changes, including a start to supporting peerplays games in the cli wallet 2016-10-03 12:14:48 -04:00
Eric Frias
eb8929f6fa Separate match object out from tournament and give it a fsm, 
start changing genesis json
 2016-09-20 14:36:06 -04:00
Eric Frias
5186ef4076 More reworking of initial tournament bracket setup 2016-09-16 18:53:12 -04:00
Eric Frias
dd0ad9e759 more fixes to get tournament_create/join working in cli wallet 2016-09-12 18:28:45 -04:00
Eric Frias
9b101cefcf Restore secret hashes from witnesses -- this is a selective restore of the parts of commits 59a3ca32b7 and c2e5432a30 that generated the secret hashes (it omits the changes to the witness scheduling algorithm) 2016-09-10 15:28:09 -04:00
Eric Frias
c2f3beb5d6 Initial data structures for creating/joining tournaments 2016-09-01 14:28:46 -04:00
Eric Frias
be6ad130d9 Code cleanups -- renaming variables, adding comments, fix one bug with override transfers 
and dividend assets
 2016-08-26 11:29:37 -04:00
Eric Frias
abc7853c99 Initial work on dividend-paying assets. Basic functionality works in simple 
cases.
 2016-06-26 15:41:07 -04:00
theoreticalbts
4f9bf7cc21 Merge remote-tracking branch 'graphene/develop' into bitshares at commit 1153d77dba 
Conflicts:
	libraries/chain/include/graphene/chain/config.hpp
 2016-02-16 11:32:14 -05:00
theoreticalbts
d6863a587c Merge branch graphene/develop into bitshares at commit '447018b319668deddf4d55baac168c1afc0a5e21' 
Conflicts:
	libraries/chain/include/graphene/chain/hardfork.hpp
	libraries/fc
 2016-02-16 11:16:36 -05:00
theoreticalbts
42140fccaa Merge branch graphene/develop into bitshares at commit 'f1b19b15' 2016-02-16 11:04:31 -05:00