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

111 commits

Author SHA1 Message Date
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
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
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
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
e8aeacc293 operations.cpp: Remove unused ancient implementation of operation_get_required_authorities #537 2016-02-09 04:36:41 -05:00
Daniel Larimer
062ae3fc67 validate fixes 2016-02-02 16:39:05 -05:00
theoreticalbts
a1e8fc0741 Implement top_n special authority #516 2016-01-27 10:30:32 -05:00
Michael Vandeberg
fd09669be3 Merge branch '500-crypto-api' into develop 
Closes cryptonomex/graphene#500
 2016-01-07 17:24:13 -05:00
Michael Vandeberg
8df58439b1 Opens up cryptographic methods in their own API with serialized wrappers for public and private keys. 
Tests for serialization of the wrappers added in serialization_tests.
 2016-01-07 17:17:27 -05:00
theoreticalbts
f1b19b1562 Merge branch '496-cleanup-license-header' into develop 2016-01-07 13:38:52 -05:00
Fabian Schuh
5111084730 [License] Modify cpp and hpp headers to MIT #496 2016-01-07 11:44:52 -05:00
theoreticalbts
1b8ce8a537 Merge branch '498-cleanup-move-options-validate' into develop 2016-01-07 11:42:41 -05:00
theoreticalbts
c56cbfe2a7 account.cpp: Move account_options::validate() implementation from account_object.cpp #498 2016-01-07 11:42:16 -05:00
theoreticalbts
84fab61589 Merge branch '480-fork-mia-core-exchange' into develop 2016-01-07 11:30:04 -05:00
theoreticalbts
4d5515702c Merge branch 'graphene/480-fork-mia-core-exchange' into bitshares 2015-12-15 14:42:02 -05:00
theoreticalbts
f42bbcd087 Fix non-BTS MIA core_exchange_rate check #480 2015-12-15 14:20:00 -05:00
theoreticalbts
020dc2e789 Merge branch 'graphene/develop' into prerel-2015-12-07 2015-12-07 17:45:45 -05:00
Eric Frias
ed1121d3f6 Hack to allow address parsing code to handle both MUSE prefix and BTS 
prefix
 2015-11-09 16:38:19 -05:00
theoreticalbts
a96fd62d03 fee_schedule.cpp: Use relaxation to set fee #435 2015-11-05 15:59:32 -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
ddd58e946a Fix #385 - HARDFORK to expand valid names 2015-10-21 09:29:13 -04:00
theoreticalbts
8488731e37 Merge branch 'master' into bitshares 2015-10-20 13:27:57 -04:00
theoreticalbts
0e41933003 asset_evaluator.cpp: Implement TODO, move feed validation checks from evaluate() to validate() 2015-10-20 12:36:47 -04:00
theoreticalbts
704f943181 address.cpp: Don't special-case BTS prefix 2015-10-20 12:36:47 -04:00
Daniel Larimer
15e4464300 Merge branch 'master' into bitshares 2015-10-14 14:50:38 -04:00
Daniel Larimer
39fb95b66c remove/fix address prefix checking 2015-10-14 14:33:48 -04:00
Daniel Larimer
b325805878 fix recursion 2015-10-12 18:58:41 -04:00
Daniel Larimer
63bd27e7d2 adding initial seed nodes 2015-10-12 15:15:46 -04:00
Daniel Larimer
52d88c57c9 prevent assets with BIT prefix 2015-10-12 14:17:18 -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
Eric Frias
9c650bddb0 Make conversions from boost's uint128_t to builtin int64_t explicit, without these 
the compiler prefers to convert through operator bool yielding either 1 or 0.
 2015-10-10 17:13:56 -04:00