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

722 commits

Author SHA1 Message Date
Eric Frias
0ebcf00ae0 Fix tournament end_time not set bug #20 2016-11-02 10:57:39 -04: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
Roman Olearski
a17f2e48ed correcting "then" -> "than" 2016-10-28 20:27:24 +02:00
Roman Olearski
8b0cdacb11 Create new blockchain parameters for peerplays that can be voted on by committee members part 1 2016-10-28 19:35:49 +02: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
50a9f913ce Move game object to its own file 2016-10-04 10:41:26 -04:00
Eric Frias
b4f9eb05fb Update fc submodule 2016-10-03 15:52:26 -04:00
Eric Frias
e57a5e84db Add missing source files 2016-10-03 13:45:24 -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
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
da43a8712d Moved most of the logic for joining tournament into tournament_object 2016-09-08 18:34:43 -04:00
Eric Frias
122dbfc698 More work on tournament registration, tournaments are now canceled and 
buy-in is refunded
 2016-09-03 17:51:27 -04:00
Eric Frias
4e856996be More validation of tournament_join op 2016-09-02 19:25:02 -04:00
Eric Frias
234a76fdd1 More validation and processing of the tournament_create and tournament_join operations 2016-09-02 15:04:17 -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
908929210b Prevent creation of accounts with the same name as dividend distribution accounts 2016-08-30 14:18:21 -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
bc212b7d59 Fixes to paying out non-core assets using their fee pools 2016-08-25 10:41:01 -04:00
Eric Frias
b584ee15dd Separate out unit tests for dividend-assets into their own test suite 2016-06-30 12:05:16 -04:00
Eric Frias
06b2134085 Keep pending dividend balance and distributed dividend balance objects around (with zero 
balance) after payouts, they will probably be needed again.
 2016-06-27 17:31:14 -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
7574aea75a Merge branches '477-history-account-history-indexing', '592-get_ticker', '599-fork-ext-unpack', '607-fork-disable-negative-worker-votes', '613-fork-deprecate-annual' and '615-fork-feed-expiration' into develop 2016-03-16 01:08:27 -04:00
theoreticalbts
b7b4d4fc5d Deprecate annual memberships #613 2016-03-16 01:08:18 -04:00
theoreticalbts
c4fc67602a Implement hardfork for serialization fix #599 2016-03-15 15:34:57 -04:00
theoreticalbts
2a745f5882 db_update.cpp: Include hardfork.hpp, fix non-unity build broken by #615 fix 2016-03-15 15:21:34 -04:00
theoreticalbts
14f7b520bd Disable negative voting on workers #607 2016-03-15 15:18:11 -04:00
theoreticalbts
da9ee0c499 db_block.cpp: Include smart_ref_impl 2016-03-15 13:36:29 -04:00
theoreticalbts
77ac461a8a Implement debug_node target #606 2016-03-15 13:36:29 -04:00
Michael Vandeberg
c89d60ba92 First implementation of get_account_history api changes. 2016-03-15 12:25:01 -04:00
Daniel Larimer
7f4b40f57d Improve index on account operation history 
- operations are now indexed by account and sequence for effecient
traversal and query
 2016-03-15 12:24:58 -04:00
abitmore
f1cd2c2454 Add hard fork logic for #615 feed expiration check issue, fix #540 2016-03-10 09:17:05 +08:00
abitmore
3c6f4ce223 Fix price feed expiration check, fix #540 2016-03-09 14:37:33 +01:00
theoreticalbts
241a7b0c3a account_evaluator.cpp: Refactor verify_account_votes() into own method #611 2016-03-07 13:49:23 -05:00
theoreticalbts
4138ec29cc account_evaluator.cpp: Remove redundant vote check #611 2016-03-07 13:40:47 -05:00
theoreticalbts
a83af9208e ext.hpp: Fix extension unpacking #599 2016-02-26 14:38:34 -05: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
theoreticalbts
e3478d2338 Default initialize output in extension<T>'s from_variant and stream extraction #594 2016-02-23 12:00:40 -05:00
Daniel Larimer
0159297fa8 fix linking errors on OS X 2016-02-23 10:52:44 -05:00
theoreticalbts
76de1f8f0b Merge branch '593-bugfix-ext-json-serializer' into develop at commit 53699a9d27 2016-02-23 10:51:11 -05:00
Eric Frias
567a40170e Fix gcc/clang builds broken by d3c6cbf4de (breaking circular dependency) 2016-02-22 19:34:16 -05:00
theoreticalbts
53699a9d27 ext.hpp: Accept null and empty array for extensions #593 2016-02-22 12:00:51 -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
f62e7311c2 Fix compile, add hardfork definition for #385 2016-02-16 12:08:36 -05:00
theoreticalbts
fac1284f77 Prepare for release 
- Bump FC
- Bump GRAPHENE_CURRENT_DB_VERSION to force re-index
- Set hardfork date
- Set GRAPHENE_FBA_STEALTH_DESIGNATED_ASSET
 2016-02-16 11:57:45 -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
a1d0339ccf Merge remote-tracking branch 'graphene/549-fork-cancel-order' into bitshares 2016-02-16 11:29:32 -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
ce8a6ec518 Merge branch graphene/develop into bitshares at commit '399e0ed9f970908ea7c2c5c43a64a28303c143b8' 2016-02-16 11:05:33 -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
1153d77dba Update documentation of updating active key to match implementation #556 2016-02-15 22:48:47 -05:00
theoreticalbts
4a6de2fba7 Merge branches '492-bugfix-close-logic', '550-cleanup-remove-evaluation-observer' and '581-cleanup-object-operators' into develop 2016-02-15 16:01:27 -05:00
Daniel Larimer
c63b624caf fix build errors and warnings 
This commit was rebased by theoreticalbts and assigned issue #581
Conflict with 146c0c4d8e was resolved, minor improvements.
 2016-02-15 16:01:13 -05:00
theoreticalbts
fe0920ddc8 Merge branches '538-fork-buyback', '562-util-check-reflection' and '575-bugfix-settle-reflect' into develop 
Fix reflection bugs and enhance check_reflect.py
 2016-02-15 15:37:50 -05:00
theoreticalbts
92685af364 Merge branch '563-fork-stealth-fee-routing' into develop 
Includes dependency '572-fork-reenable-asset-perms'
 2016-02-15 15:37:22 -05:00
theoreticalbts
36a8c3d6f1 Unit test for STEALTH fee routing #563 2016-02-15 15:33:21 -05:00
theoreticalbts
5dd56bd824 Implement FBA fee routing for STEALTH #563 2016-02-15 15:33:21 -05:00
Daniel Larimer
89fbb11bb6 Fix #492 - database corruption when closing 
The database was attempting to pop blocks for which there was no undo
history. These changes make it impossible to pop blocks if there isn't
a fork db history.
 2016-02-15 15:18:44 -05:00
abitmore
3fa79740df Reflect ID of force_settlement_object, fix #575 2016-02-15 15:13:25 -05:00
theoreticalbts
1f910e765d Merge branch '572-fork-reenable-asset-perms' into 563-fork-stealth-fee-routing 2016-02-14 20:45:46 -05:00
theoreticalbts
4e9e3ae054 Allow asset to update permission flags when no supply exists #572 2016-02-14 20:39:33 -05:00
theoreticalbts
b1f8c8f291 buyback_object.hpp: Don't FC_REFLECT buyback_object, FC_REFLECT_DERIVED it instead #538 #575 2016-02-14 17:26:35 -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
theoreticalbts
c33fe35e4e Implement buyback accounts #538 2016-02-11 04:59:28 -05:00
theoreticalbts
bd22592d19 Merge branches '555-fork-defer-s4n-cull', '559-test-fix-zero-block-wait' and '566-cleanup-wl-flag-check' into 538-fork-buyback 2016-02-11 04:56:47 -05:00
theoreticalbts
e4f7483ec3 transfer_evaluator.cpp: Remove unused variable and redundant check #566 
This check was the pre-419 check of whether the fee asset is authorized,
which was (due to a typo) buggily checking the sent asset rather
then the fee asset.
 2016-02-11 04:02:35 -05:00
theoreticalbts
6f7f2605c1 Remove now-redundant white_list bit check from evaluators #566 2016-02-11 04:02:33 -05:00
theoreticalbts
bb47f4c71c Remove now-redundant white_list bit check from _is_authorized_asset() #566 2016-02-11 04:02:31 -05:00
theoreticalbts
130b54116c Inline fast path of is_authorized_asset() #566 2016-02-11 04:02:29 -05:00
theoreticalbts
68a0ffa1aa Make is_authorized_asset a free-floating method #566 
The following sed commands were used to port existing call sites to the new interface:

    sed -i -e 's/\([a-zA-Z0-9_]\+\)->is_authorized_asset[(] \([a-zA-Z0-9_*]\+\), d [)]/is_authorized_asset( d, *\1, \2 )/' libraries/chain/*.cpp
    sed -i -e 's/\([a-zA-Z0-9_]\+\)[.]is_authorized_asset[(] \([a-zA-Z0-9_*]\+\), d [)]/is_authorized_asset( d, \1, \2 )/' libraries/chain/*.cpp
    sed -i -e 's/\([a-zA-Z0-9_]\+\)[(]db[)][.]is_authorized_asset[(]\([a-zA-Z0-9_*]\+\)[(]db[)], db[)]/is_authorized_asset( db, \1(db), \2(db) )/' tests/tests/uia_tests.cpp
    sed -i -e 's/\([a-zA-Z0-9_]\+\)[.]is_authorized_asset[(]\([a-zA-Z0-9_*]\+\), db[)]/is_authorized_asset( db, \1, \2 )/' tests/tests/uia_tests.cpp

No new functionality is added by this commit, it is simply re-organizing the existing code in a different place.
 2016-02-11 01:57:22 -05:00
theoreticalbts
d0f119b215 Merge branch '489-bugfix-reflect-whitelist' into develop 
Conflicts:
	libraries/chain/include/graphene/chain/account_object.hpp
 2016-02-09 10:58:59 -05: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
theoreticalbts
39d0946b50 Remove evaluation_observer #550 2016-02-09 04:44:11 -05:00
theoreticalbts
e8aeacc293 operations.cpp: Remove unused ancient implementation of operation_get_required_authorities #537 2016-02-09 04:36:41 -05:00
theoreticalbts
3a968332e8 Remove active_witnesses from global_property_object #562 2016-02-09 04:09:26 -05:00
theoreticalbts
19cf1b135b Fix withdraw_permission_object.hpp reflection #562 2016-02-09 04:01:06 -05:00
abitmore
a5620c3064 Expose whitelisted_accounts, fix #489 2016-02-08 16:14:25 -05:00
theoreticalbts
ad339d2729 Defer something-for-nothing culling for taker orders until the order is unmatched #555 2016-02-08 10:05:43 -05:00
theoreticalbts
b67d223d17 Merge branch '549-fork-cancel-order' into 452-fork-stealth-fba 2016-02-05 12:17:46 -05:00
Daniel Larimer
062ae3fc67 validate fixes 2016-02-02 16:39:05 -05:00
theoreticalbts
59503acde9 Cap auto-cancel fees at deferred_fee #549 2016-02-02 14:17:57 -05:00
Daniel Larimer
3646754fe5 HARDFORK - auto canceled orders still pay fee 2016-02-02 11:04:35 -05:00
Daniel Larimer
45e717c181 HARDFORK: fix for hung cancel order 2016-02-02 11:04:22 -05:00
Daniel Larimer
c1c37df31a HARDFORK - auto canceled orders still pay fee 2016-01-28 20:11:46 -05:00
Daniel Larimer
405f81eaf8 HARDFORK: fix for hung cancel order 2016-01-28 20:02:37 -05:00
Daniel Larimer
d9db27d416 extra debug info 2016-01-28 19:46:40 -05:00