Commit graph

155 commits

Author SHA1 Message Date
Eric Frias
7a2eb92563 Automatically update wallet's cached copy of account objects
whenever we are notified of a change on the blockchain
2017-06-01 16:58:56 -04:00
Roman Olearski
50f07d47f5 Merge branch 'rock-paper-scissors' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into rock-paper-scissors 2017-05-27 20:13:17 +02:00
Roman Olearski
e6b58adbd1 fixed update witness operation - added new_initial_secret 2017-05-27 20:11:46 +02:00
Eric Frias
0c6ba8e1d5 Change ordering of fields for password generation 2017-05-26 10:43:51 -04:00
Eric Frias
4b17eb6657 Add get_private_key_from_password from steem commit 27ee20fdc0a11b721c760685b8a6956c592287cb 2017-05-25 12:21:48 -04: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
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
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
kstdl
895fbec5bc get_tournaments and get_tournaments_by_state method added 2017-02-20 18:09:37 +03: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
a66af8b072 enhancing tournament_payout operation according issues 8 9 2016-11-23 11:33:24 +01:00
Roman Olearski
cf6f3a15fd generating tournament payout operation 2016-11-21 18:11:31 +01:00
Roman Olearski
32b53434f9 Implementing propose_dividend_asset_update 2016-11-08 11:34:04 +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
f078fed4fd Properly sequence matches when there are more than two players in the tournament 2016-10-23 13:12:06 -04: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
72d48cf3d2 Remove redundant type_of_game field 2016-10-19 18:19:13 -04:00
Eric Frias
c4ad900026 Fix build error in member_enumerator when an operation includes an enum.
Implement the commit/reveal timeouts in RPS games, and generate automatic
("insurance") moves.  Make the CLI wallet watch for new games in
tournaments you're registered for.
2016-10-18 17:36:59 -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
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
55255010df Add get_upcoming_tournaments wallet call, clean up logging 2016-09-14 11:52:22 -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
bf59b503bc Start on tournament_create evaluator 2016-09-02 10:53:08 -04:00
Eric Frias
c2f3beb5d6 Initial data structures for creating/joining tournaments 2016-09-01 14:28:46 -04:00
Eric Frias
bc212b7d59 Fixes to paying out non-core assets using their fee pools 2016-08-25 10:41:01 -04:00
Eric Frias
6c35e8d2a3 Compile fix 2016-06-30 16:00:29 -04:00
Eric Frias
7857ac48a4 Correctly generating virtual transactions for payouts 2016-06-27 16:24:13 -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
006d548633 Merge branch '606-debug-node' into develop
Conflicts:
	libraries/app/CMakeLists.txt
2016-03-16 01:09:21 -04:00
theoreticalbts
ee3f81fa31 Fix build broken by previous patch #592 2016-03-15 15:58:02 -04:00
theoreticalbts
a7c88be7c7 debug_api: Add API call to stream JSON objects to file 2016-03-15 13:36:29 -04:00
theoreticalbts
77ac461a8a Implement debug_node target #606 2016-03-15 13:36:29 -04:00
Eric Frias
14295772f0 Merge branch 'bitshares-2-bitshares'
# Conflicts:
#	libraries/fc
2016-02-26 11:29:25 -05:00
Michael Vandeberg
4b346579a8 Fixed to follow QUOTE:BASE semantics. Cleanup and added in wallet calls that were missed in last merge. #592 2016-02-25 16:46:31 -05:00
theoreticalbts
e34b83c872 Merge remote-tracking branch 'graphene/develop' into bitshares at commit 2f941c718f 2016-02-16 12:19:59 -05:00
Daniel Larimer
2f941c718f Fix #586 - decoding memo for sender in CLI wallet 2016-02-16 12:07:24 -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
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
3c6cd2c8a7 Merge branch '564-transfer_from_blind-save-conf' into develop 2016-02-12 00:11:59 -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
James Calfee
a0cc5b775d Saves change address (without changing wallet_api::receive_blind_transfer API) #564 2016-02-09 13:43:56 -06:00
James Calfee
fa439e9732 Saves change address in the wallet when transfering from blind to an account (close #564) 2016-02-09 12:37:54 -06:00
theoreticalbts
078e63a79f Merge many bugfix branches into develop
Merged:

492-bugfix-open-fail #492
523-bugfix-multiple-blind-xfer #523
537-cleanup-remove-operation_get_required_authorities #537
540-cleanup-settle-volume-spam #540
542-bugfix-cancel-fee #542
557-bugfix-pts-address #557
559-test-fix-zero-block-wait #559
561-bugfix-serializer-build-broken #561
562-bugfix-unreflected-fields #562
2016-02-09 10:57:21 -05:00
Daniel Larimer
ababf24e69 Fix #523 relevant to #452 2016-02-09 10:01:50 -05:00
Peter Conrad
8d2fa3863e Fix for #557: check BTC/PTS addresses on balance import including compressed/uncompressed versions 2016-02-08 16:23:14 -05:00