Commit graph

112 commits

Author SHA1 Message Date
pbattu123
481fac17d5
Merge branch 'master' into beatrice 2019-08-22 09:15:27 -03:00
Prabhjot
7044e5c782 added missing comma in operations.hpp, small changes to config.hpp 2019-07-31 10:19:35 -04:00
Prabhjot Singh
aa3128fe89 Merged beatrice into 5050 2019-07-30 11:43:31 -04:00
pbattu123
ea41e06471 update db_version for replay and removed duplicate include files 2019-04-15 09:47:04 -03:00
Fabian Schuh
7078b224af Increase default (starting) rake 2019-01-23 16:27:57 +01:00
Fabian Schuh
e9970767f5
Ensure we use the correct genesis block, config and seed nodes 2019-01-22 10:21:39 +01:00
Alfredo
0b1e53234f add last_vote_time to account statistics 2018-12-17 18:50:05 -03:00
Fabian Schuh
ea3bb1a377
Proper variables for beatrice testnet 2018-10-12 12:20:30 +02:00
Peter Conrad
fe7c8d6ad1
Implemented item 1 2018-10-10 14:24:42 +02:00
Peter Conrad
0a2af8afb2 Merge remote-tracking branch 'origin/baxter' 2018-09-04 14:52:48 +02:00
Fabian Schuh
101325990b Hardfork baxter 2018-04-05 11:53:45 +02:00
kstdl
930ddb06c1 lottery end implemented 2017-12-06 10:40:52 +03:00
Eric Frias
629e6c7be7 Change default live betting delay to 5 seconds (down from 10) 2017-08-29 11:33:40 -04:00
Roman Olearski
a2b83c668f added delay_bets to betting_market_group_object, live_betting_delay_time to chain parametrs . 2017-08-10 21:36:04 +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
Roman Olearski
c18094abd8 implementing rake fee in resolve_betting_market_group #1
improving net profit calculation
2017-07-08 18:30:23 +02:00
Roman Olearski
dac9d8b61b Cherry-picked commit 26f4718.
Creating default dividend asset
2017-07-06 19:53:14 +02:00
Eric Frias
bd525ef55d Merge commit 'c777a88649d50edf6c5e4a8c3b13dda88a66e9d0' into betting 2017-06-20 18:15:43 -04:00
Viktor
d245b70d70 Change core symbol and address prefix 2017-06-06 16:27:12 +03:00
Eric Frias
50f224137b Add peerplays-testnet account in genesis file.
change default core asset and prefix to PPY.
update test genesis to match new prefix.
2017-06-06 09:01:27 -04:00
Viktor
b7e11ae9d6 Update max core supply in genesis, properly track total supply for vesting balances in bts accounts and other changes 2017-06-06 11:17:04 +03:00
Roman Olearski
a8f51e2a98 updated genesis/genesis.json for peerplays 2017-06-05 19:20:54 +02:00
kstdl
342e6db610 inital 2017-05-25 12:13:59 +03:00
Roman Olearski
74bcc3ed4f Merge branch 'rock-paper-scissors' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into rock-paper-scissors
Conflicts:
	libraries/chain/include/graphene/chain/config.hpp
2017-05-24 19:37:08 +02:00
Roman Olearski
71b53bbf26 changed to PPY core and BTS prefix 2017-05-24 19:34:39 +02:00
Eric Frias
90553db95b Update key core asset and key prefix to PPY.
Add BitShares sharedrop balances, PEERPLAYS token balances, and reserved
accounts for exchanges to genesis file.
2017-05-24 13:19:02 -04:00
Roman Olearski
90ec694446 integrating scheduled (old) and shuffled (current) witnesses 2017-04-19 20:31:00 +02:00
Roman Olearski
db2b397afd Merge branch 'rock-paper-scissors' of http://syncad.storm.pl:56780/blocktrades/graphene into rock-paper-scissors 2017-04-11 11:38:08 +02:00
Roman Olearski
73d7dbf092 creating committee settable parameters for a bunch of constants in tournament_evaluator 2017-04-11 10:23:28 +02: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
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
Eric Frias
4cdcbe32da Validate the fee paid when placing a bet. Add virtual op for canceling bet 2017-03-22 15:04:11 -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
kstdl
895fbec5bc get_tournaments and get_tournaments_by_state method added 2017-02-20 18:09:37 +03: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
baab40070d Many changes, including a start to supporting peerplays games in the cli wallet 2016-10-03 12:14:48 -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
theoreticalbts
755f9ecf38 Prepare for release
- Bump GRAPHENE_CURRENT_DB_VERSION to force re-index
- Set hardfork date
2016-03-16 01:10:14 -04: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
42140fccaa Merge branch graphene/develop into bitshares at commit 'f1b19b15' 2016-02-16 11:04:31 -05:00
theoreticalbts
36a8c3d6f1 Unit test for STEALTH fee routing #563 2016-02-15 15:33:21 -05:00
theoreticalbts
c33fe35e4e Implement buyback accounts #538 2016-02-11 04:59:28 -05:00
theoreticalbts
a1e8fc0741 Implement top_n special authority #516 2016-01-27 10:30:32 -05:00
Fabian Schuh
5111084730 [License] Modify cpp and hpp headers to MIT #496 2016-01-07 11:44:52 -05:00
theoreticalbts
dcc0b556ba config.hpp: Bump DB version 2015-12-16 17:55:01 -05:00
theoreticalbts
802ca9e613 config.hpp: Bump DB version 2015-12-16 11:52:03 -05:00
theoreticalbts
0f67fb655b config.hpp: Bump DB version 2015-12-15 14:43:38 -05:00