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

136 commits

Author SHA1 Message Date
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
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
5dd56bd824 Implement FBA fee routing for STEALTH #563 2016-02-15 15:33:21 -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
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
3a968332e8 Remove active_witnesses from global_property_object #562 2016-02-09 04:09:26 -05:00
theoreticalbts
a1e8fc0741 Implement top_n special authority #516 2016-01-27 10:30:32 -05:00
theoreticalbts
d6878852f0 confidential_object.hpp: Move confidential objects into own header #466 2016-01-08 13:06:14 -05:00
theoreticalbts
e9eb050c1e worker_object.hpp: Move worker objects into own header #466 2016-01-08 11:42:35 -05:00
theoreticalbts
2da6840405 Optionally disable database unity build #509 2016-01-08 11:29:39 -05:00
Fabian Schuh
5111084730 [License] Modify cpp and hpp headers to MIT #496 2016-01-07 11:44:52 -05:00
theoreticalbts
545fbfe63c Merge branch 'newmaster' into newbitshares 
Conflicts:
	libraries/chain/asset_evaluator.cpp
	libraries/chain/include/graphene/chain/hardfork.hpp
	libraries/chain/market_evaluator.cpp
 2015-11-02 10:06:13 -05:00
Daniel Larimer
5d6091e581 HARDFORK - adding operation to claim asset fees #413 2015-10-30 18:07:19 -04:00
Daniel Larimer
6b469528a1 remove all hardfork checks leftover from testnet 2015-10-20 12:36:47 -04:00
Daniel Larimer
aa9ca16cb3 HARDFORK - Change initial permissions for assets created in genesis 2015-10-15 11:08:01 -04:00
Daniel Larimer
15e4464300 Merge branch 'master' into bitshares 2015-10-14 14:50:38 -04:00
theoreticalbts
fc95e83732 Merge remote-tracking branch 'graphene/master' into master 2015-10-14 14:41:59 -04:00
Daniel Larimer
098f2cbe2d remove all hardfork checks leftover from testnet 2015-10-13 09:29:48 -04:00
Eric Frias
03306860d2 win32 compile fix (#warning) 2015-10-13 09:13:16 -04:00
theoreticalbts
6646957ce2 db_init.cpp: Make genesis BitAssets require 7 price feeds 2015-10-12 19:23:44 -04:00
theoreticalbts
9d19358a0c db_init.cpp: Make genesis BitAssets require 7 price feeds 2015-10-12 17:01:16 -04:00
theoreticalbts
d0609e8e74 Update copyright notice for BitShares 2015-10-12 13:48:40 -04:00
theoreticalbts
60f0812de2 Update copyright notice 2015-10-12 13:32:47 -04:00
theoreticalbts
f0f96d5a8f Allow witness-fed and committee-fed BitAsset feeds to be specified in flags. 
This is only technically a hardfork, in order to actually desync the chain
the witness account / committee account would need to pass a proposal to do
something in their capacity as the owner of an asset_object.  It should be
fairly safe to say that this will not occur on testnet until witnesses have
upgraded.
 2015-10-09 13:23:55 -04:00
theoreticalbts
97423812a1 db_init.cpp: Check for imbalanced assets 2015-10-08 16:16:51 -04:00
Daniel Larimer
26288549e6 Fix blackswan on force settle, Fix #346 and #347 
- fix detection and handling of black swan events
- fix total core in orders calculation from genesis
 2015-09-30 18:30:44 -04:00
theoreticalbts
9d3bcbb569 Provide objects to trace budget computations 2015-09-28 15:46:37 -04:00
theoreticalbts
f7980f5252 scheduler: Refactor 26007bb655 to use witness_schedule_object 
The functionality is equivalent, but it now uses a separate witness_schedule_object,
and the code now lives in db_witness_schedule.cpp.
 2015-09-18 14:26:54 -04:00
Daniel Larimer
26007bb655 update shuffling algorithm 2015-09-18 13:42:12 -04:00
Daniel Larimer
b3052dfcc1 fix warnings 2015-09-11 08:53:50 -04:00
theoreticalbts
77ac6eb689 db_init.cpp: Don't allocate unnecessary asset_dynamic_data_object 2015-09-10 15:41:43 -04:00