Commit graph

142 commits

Author SHA1 Message Date
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
fe7c8d6ad1
Implemented item 1 2018-10-10 14:24:42 +02:00
Andrew Moore
da799f84b0 Updating licensing 2018-10-09 11:33:31 -03:00
Peter Conrad
b0afddaa6b Move new chain parameters into extensions 2018-09-05 16:43:35 +02: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
Eric Frias
931c925610 Register event status update operation 2018-02-13 11:34:04 -05: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
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
2acd4dd187 added event_update_operation 2017-07-20 12:19:18 +02: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
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
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
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
Roman Olearski
9b08b502be implementing betting_market_resolve_group_operation (3) #1 2017-07-06 12:56:32 +02:00
Eric Frias
627dba3a46 Merge commit '0ad83697f08a11431eece565f0386a849bed25c9' into betting 2017-06-20 18:36:19 -04: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
SynaptiCAD User
c42a56d332 implement bet_cancel_operation 2017-03-22 12:06:08 -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
ccd570874f Updated data structures to take bets with explicit odds 2017-03-21 12:27:13 -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
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
7c30da6b6d Simple two-player tournaments are working if you don't do anything fancy 2016-10-14 19:43:38 -04:00
Eric Frias
5186ef4076 More reworking of initial tournament bracket setup 2016-09-16 18:53:12 -04:00
Eric Frias
c2f3beb5d6 Initial data structures for creating/joining tournaments 2016-09-01 14:28:46 -04:00
Eric Frias
908929210b Prevent creation of accounts with the same name as dividend distribution accounts 2016-08-30 14:18:21 -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
3865dd1573 Merge remote-tracking branch 'graphene/develop' into bitshares 2016-03-25 20:15:32 -04:00
abitmore
23b8843d2f check_authority(): fix #631 early end of recursion 2016-03-20 01:21:13 +01:00
Eric Frias
14295772f0 Merge branch 'bitshares-2-bitshares'
# Conflicts:
#	libraries/fc
2016-02-26 11:29:25 -05:00
theoreticalbts
52c0b31bcf Merge remote-tracking branch 'graphene/develop' into bitshares at commit e3478d2338 2016-02-23 12:10:40 -05:00
Daniel Larimer
0159297fa8 fix linking errors on OS X 2016-02-23 10:52:44 -05:00
Daniel Larimer
2a5c6a3b40 fix linking errors on OS X 2016-02-19 15:12:53 -05:00
Eric Frias
d3c6cbf4de Compile fixes for win32 and out-of-source builds 2016-02-17 09:17:00 -05: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
theoreticalbts
50c06e7e64 Merge branch graphene/develop into bitshares at commit '1b8ce8a'
Conflicts:
	libraries/chain/include/graphene/chain/hardfork.hpp
2016-02-16 11:02:11 -05:00
theoreticalbts
e46af9f372 Merge branch '538-fork-buyback' into develop
Includes dependencies '555-fork-defer-s4n-cull', '559-test-fix-zero-block-wait' and '566-cleanup-wl-flag-check'
2016-02-11 13:03:19 -05:00
Daniel Larimer
146c0c4d8e Clean up some non-determisitic behavior, maybe fix #485
1. Replace ordered_non_unique indexes with composite keys / ordered_unique, using object_id as tiebreaker.
2. Make some casts more explicit.

This commit was rebased by theoreticalbts due to conflicts with the patches for #466 #562 including bugfixes

- Fix flipped comparison operator
- Implement operator> and operator!= for object_id_type
2016-02-11 13:02:11 -05:00