Commit graph

1389 commits

Author SHA1 Message Date
Alfredo
d602e71601 move gpos global parameters to extensions 2019-01-22 22:40:15 -03:00
Fabian Schuh
af561e7463
TBD, hardfork dates 2019-01-22 15:16:52 +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
b914a7dc0b add globals to genesis, update hardfork date, fix test case 2019-01-15 14:25:43 -03:00
Alfredo
83ea345042 hf protection for creating gpos balances in proposals 2019-01-03 14:38:31 -03:00
Alfredo
d468b146e8 implement gpos to voting calculations 2018-12-31 19:18:00 -03:00
Alfredo
6b533828db implement rolling_period_start function 2018-12-31 18:20:48 -03:00
Alfredo
602b8530da implement functions for gpos 2018-12-31 18:17:52 -03:00
Alfredo
6d01286140 prepare to pay dividends only to vested gpos balances after hf 2018-12-31 17:48:26 -03:00
Alfredo
3de55137d5 bump the database 2018-12-31 12:04:04 -03:00
Alfredo
46467a7bbe only allow gpos balance creation after HF 2018-12-31 12:01:31 -03:00
Alfredo
57a54f5714 add fixed policy to gpos vesting balances 2018-12-31 11:59:51 -03:00
Alfredo
604fbed498 add type field to vesting balances 2018-12-30 18:01:57 -03:00
Alfredo
62d2c1c63b add global gpos parameters 2018-12-29 21:19:42 -03:00
Alfredo
88f18d16a7 add gpos hardfork date 2018-12-29 14:43:41 -03:00
Fabian Schuh
3e58dc5a11 cleanup of code 2018-12-20 09:58:57 +01:00
dimfred
4875c7a0f9 Fix Duplication operation check 2018-12-20 09:58:57 +01:00
Fabian Schuh
381946bab7
Merge pull request #1 from oxarbitrage/dividends_testcases
Dividends testcases fixes
2018-12-18 15:53:08 +01:00
Alfredo
0b1e53234f add last_vote_time to account statistics 2018-12-17 18:50:05 -03:00
Alfredo
8a0dc48321 fix identation in asset_create_evaluator::do_evaluate 2018-12-15 16:21:53 -03:00
Fabian Schuh
9ad4b3a594 Move hardfork dates closer to now() 2018-10-24 10:40:37 +02:00
Fabian Schuh
ea3bb1a377
Proper variables for beatrice testnet 2018-10-12 12:20:30 +02:00
Fabian Schuh
cc7953672c
Merge remote-tracking branch 'origin/fix_asset_create_fee' into testnet-beatrice 2018-10-11 14:22:33 +02:00
Fabian Schuh
7d6432e4bf
Merge remote-tracking branch 'origin/sport_n_events_api_extension_release' into beatrice 2018-10-11 14:08:23 +02:00
Fabian Schuh
d0c6c49e44
Merge remote-tracking branch 'origin/broadcast-api-operations-duplication-check' into beatrice 2018-10-11 13:54:31 +02:00
Fabian Schuh
fc21e79206
Fix rebase 2018-10-11 13:36:49 +02:00
Peter Conrad
9e624bd2c8
Payout operation fix 2018-10-10 14:26:38 +02:00
Peter Conrad
2428383466
Fixed bookie payout 2018-10-10 14:26:21 +02:00
Peter Conrad
517c86c60f
Refactored handling of asset_id 2018-10-10 14:25:57 +02:00
Peter Conrad
12a8bdc590
Fixes 2018-10-10 14:25:56 +02:00
Peter Conrad
fdd7c193a6
Implemented affiliate payouts 2018-10-10 14:25:56 +02:00
Peter Conrad
1ab596952e
Rake calculation fix as outlined by Dan Notestein 2018-10-10 14:25:39 +02:00
Peter Conrad
03bc592114
Prevent some virtual ops from being included in proposals 2018-10-10 14:25:09 +02:00
Peter Conrad
8c0fcf9db8
Ported security fix from https://github.com/bitshares/bitshares-core/pull/591/ 2018-10-10 14:24:42 +02:00
Peter Conrad
fe7c8d6ad1
Implemented item 1 2018-10-10 14:24:42 +02:00
Andrew Moore
10fa56a018 Fixing license on db_notify.cpp 2018-10-09 14:38:51 -03:00
Andrew Moore
da799f84b0 Updating licensing 2018-10-09 11:33:31 -03:00
Peter Conrad
db072af33d Added hf protection for new operations wrapped in proposals 2018-09-10 21:03:28 +02:00
Peter Conrad
fa9acafcd0 Moved hf date into far future 2018-09-10 20:25:27 +02:00
Peter Conrad
153fcacbb3 Revert dividend payout timing modification 2018-09-10 18:53:12 +02:00
Peter Conrad
eb5100545f Switch object id types 2018-09-10 15:20:37 +02:00
Peter Conrad
b0afddaa6b Move new chain parameters into extensions 2018-09-05 16:43:35 +02:00
Peter Conrad
0a2af8afb2 Merge remote-tracking branch 'origin/baxter' 2018-09-04 14:52:48 +02:00
Michael Neynens
bed81e358d Updated vote tallying, skipping non-existing accounts 2018-08-08 09:44:19 +02:00
Michael Neynens
1c1026516a Updated vote tallying, skipping non-existing accounts 2018-08-07 18:04:17 -07:00
Apr Team
b28783c3ec Refactoring after review. Removed code duplication. 2018-07-12 17:53:15 +03:00
Apr Team
63f4c7f2c5 Added pending list check. 2018-07-12 17:18:55 +03:00
Apr Team
8094431613 Refactoring after review. 2018-07-06 15:29:15 +03:00
Apr Team
e6f56af1b6 Fixed small issue in test + removed explicit check for duplicates in pending transactions.
They are covered by proposal storage check.
2018-07-05 16:16:16 +03:00
Apr Team
a94dd371c1 Reverted commented code. 2018-07-05 14:41:00 +03:00
Apr Team
140ecd7532 Added more tests. Fixed offsets in the db file. Pathced the network_broadcast_api. 2018-07-05 13:58:36 +03:00
Apr Team
1c74bba60d Moved check for duplicates to the database. Removed code duplication from unit-tests 2018-07-05 12:58:59 +03:00
Michael Neynens
d9345f0ea5 Merge branch 'pr11' 2018-07-04 16:14:18 -07:00
Apr Team
4a9ca67b60 Added check for operation existing in pending proposals. 2018-07-04 19:31:32 +03:00
Eric Frias
ef369658ea Restore the original bet matching for back taker bets 2018-05-30 18:22:10 -07:00
Michael Neynens
861c287109 Merge branch 'betting-merge' into baxter-hardfork 2018-05-23 08:39:28 -07:00
Apr Team
b782005d04 Refactoring after Fabian review. 2018-05-21 18:27:18 +03:00
Apr Team
99efbc7ea2 Added tests for checking various market states canceling and added ignoring of canceling the settled state and canceled state. 2018-05-21 18:20:54 +03:00
Apr Team
256eeb3eac Added hardfork logic. 2018-05-21 18:15:00 +03:00
Apr Team
9cc3558417 Added hardfork logic based on HARDFORK_1000 macro. 2018-05-20 14:41:35 +03:00
Apr Team
3295953127 Fixes after Fabian review. Added tests for non proposal delete operations.
Added logic for checking of sport and event existence before its updating.
2018-05-18 18:26:47 +03:00
Apr Team
afaaa950a2 Fixes after Fabian review. 2018-05-18 14:32:31 +03:00
Apr Team
0b974a6ddb Added canceling of bets for market. 2018-05-17 09:45:04 +02:00
Apr Team
88adfb6661 Cleanups before review. 2018-05-17 09:45:04 +02:00
Apr Team
c829228aca Fixed deleteting of sport with related event_groups. 2018-05-17 09:45:04 +02:00
Apr Team
0b1e165bf3 Refactored canceling of the sub events of the event_group. Moved that logic to the event_group_object. Updated tests to control canceling of markets and market_groups. 2018-05-17 09:45:04 +02:00
Apr Team
c4612cbed1 Added canceling of the sub events for the removed event_group. 2018-05-17 09:45:04 +02:00
Apr Team
688110ce8d Implemented event_group delete operation. 2018-05-17 09:45:04 +02:00
Apr Team
80efb85d72 Added event_group delete operation and evaluator. Fixed compilation issues. 2018-05-17 09:45:04 +02:00
Apr Team
71fec0ac83 Implemented sport delete operation added test. 2018-05-17 09:45:04 +02:00
Apr Team
4f501f6aaf Added sport_delete operation, evaluator and API. Fixed various compilation issues.
Added tests file.
2018-05-17 09:45:04 +02:00
Eric Frias
7a97e9381c restore accidentally-deleted line 2018-05-11 11:04:00 -04:00
Eric Frias
123fc3915f Switch dividend payout virtual op from using a flat_set to vector
to allow payouts in multiple assets in the same operation
2018-05-10 12:14:27 -04:00
Eric Frias
ed9cdd96ec Wrap exceptions thrown during dividend payouts to add extra info
for debugging
2018-05-09 19:27:49 -04:00
Eric Frias
a4dd00ab8e Change how we redirect log messages in the betting code to the
"betting" logger so that it doesn't interfere with logging in
other database implementation files
2018-05-09 15:41:48 -04:00
Eric Frias
06a297d811 Pay the rake fee to the dividend account of the core asset, not
the dividend account of the buy-in asset
2018-05-09 10:27:39 -04:00
Eric Frias
922bdec8d6 Fix a bug in serializing betting market objects to json which
would show graded betting markets as canceled, and vice versa,
even though the internal represntation was in the right state.
2018-05-03 14:49:24 -04:00
Eric Frias
70e47a74dd Change bet matching algorithm to limit the amount matched by the
taker's odds, instead of buying as much as the taker's bet_amount
allowed at the maker's odds
2018-05-02 19:19:01 -04:00
Eric Frias
2c50036ee1 Prevent placing bets when the betting market group is closed, graded,
re-grading, or settledt
2018-05-02 09:42:56 -04:00
Eric Frias
440fdb566b Fix bug causing a cancel of one event in an event group to cancel
other events
2018-04-29 18:59:15 -04:00
Eric Frias
6b86ccc2f3 When tallying witness/committee member votes, always assign at least
one vote to each witness/committee member for purposes of calculating
their weight in the witness-account or committee-account authority.
This will likely have no effect in a well established blockchain, but
it does occur when a new blockchain is launched for testing without
enough votes to fill all the witness/committee slots.
2018-04-24 19:13:30 -04:00
Eric Frias
0404e6c0b6 When placing a bet, delay the check to see if you are able to fund
the bet until after any guaranteed winnings have been returned
2018-04-17 18:54:42 -04:00
Eric Frias
5343c073bd Delay deletion of completed/canceled events to avoid an error producing
blocks when a betting market group with no betting markets is canceled.
2018-04-17 13:17:38 -04:00
Fabian Schuh
101325990b Hardfork baxter 2018-04-05 11:53:45 +02:00
Peter Conrad
e75f18ba57 Removed hardfork code for CORE_429 2018-03-23 15:20:18 +01:00
Peter Conrad
4b0579b475 Fixed #429 2018-03-23 15:20:18 +01:00
abitmore
8d8b84cc37 Proof of concept fix for asset creation fee issue 2018-03-23 15:20:18 +01:00
SynaptiCAD User
cfd77773c7 [DLN] reorder operations to match testnet, add asserts to reject operations before new testnet hardfork '1000' (actual hardfork time still needs to be set in 1000.hf) 2018-03-19 18:51:19 -04:00
Eric Frias
931c925610 Register event status update operation 2018-02-13 11:34:04 -05:00
Eric Frias
3b3a0905ff Change the behavior of the betting markets from being controlled by
a collection of flags (is_live, is_closed) to a single status field.
The status changes in an event can trickle down to the market groups,
and the status changes in market groups can bubble up to events.
2018-02-07 10:16:30 -05:00
Fabian Schuh
4c5e0a07f7 Show proposer on proposals 2018-01-29 14:19:38 +01:00
kstdl
8cb335a515 fixed indices sorting and lottery end checking by date 2018-01-10 12:06:34 +03:00
kstdl
c32269ee8e fix test genesis and end_date verification 2018-01-09 12:35:30 +03:00
kstdl
090a3a4dad merge get_account_lotteries branch. fix create_witness test 2018-01-09 11:45:19 +03:00
kstdl
202153acdc added get_account_lotteries method to db_api and cli, lottery end_date and ticket_price verification 2018-01-03 15:34:15 +03:00
kstdl
186a0e61ea added owner to lottery_asset_options. commented async call in on_applied_block callback 2017-12-27 17:21:56 +03:00
kstdl
8f379a3c53 fix reindex on peerplays network 2017-12-12 15:37:58 +03:00
kstdl
fdd77ef5af minor logic changes. added db_api and cli_wallet methods 2017-12-11 17:42:55 +03:00
kstdl
930ddb06c1 lottery end implemented 2017-12-06 10:40:52 +03:00
kstdl
2acbf3d929 ticket_purchase_operation implemented. added lottery_options to asset 2017-11-13 10:14:07 +03:00
kstdl
3dd1860b64 coipied code for bitshares fixing 429 and 433 isuues 2017-11-04 11:40:28 +03:00
kstdl
d7c80b4b6a fix rng and get_winner_numbers implemented 2017-11-03 17:52:41 +03:00
Eric Frias
69b00293d9 Only do slow replays when the bookie plugin is loaded 2017-09-07 15:55:44 -04:00
Eric Frias
ed0917ee03 Leave undo_db enabled during replay so bookie plugin gets the correct history 2017-09-07 12:00:44 -04:00
Eric Frias
d333dd3812 Track match/cancel/adjust operations related to a bet in the bookie plugin.
Create a paginated version of get_matched_bets_for_bettor()
2017-09-06 16:52:58 -04:00
Roman Olearski
2cd816ec6d fixing bet_cancel_operation, added mising fee to reflection 2017-09-01 16:25:13 +02:00
Roman Olearski
ec08259b7d added cancel_bet to the wallet 2017-09-01 13:29:45 +02:00
Eric Frias
f3290a8827 Add get_unmatched_bets_for_bettor() to get unmatched bets across all betting markets 2017-08-31 11:02:16 -04:00
Eric Frias
38f1cbdcd6 Add list_events_in_group() and get_unmatched_bets_for_bettor() API calls 2017-08-30 19:21:27 -04:00
Eric Frias
b83dea821e Fix a case where neither the taker nor maker bet was able to fully match. When this
happens, cancel the remainder of the taker bet.
2017-08-30 17:18:58 -04:00
Eric Frias
6a9b2a0d04 Fix a crash in which we tried to log a proposal object that may have been deleted.
Also, fix a place where logged the letter e instead of the exception it represented
2017-08-30 17:15:50 -04:00
Eric Frias
629e6c7be7 Change default live betting delay to 5 seconds (down from 10) 2017-08-29 11:33:40 -04:00
Eric Frias
b505c375af Finish delayed (live) betting.
Remove the ability to change the event of a betting market group after creation.
2017-08-15 18:44:09 -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
Eric Frias
d13783a3c4 Fix bug that prevented placing bets that were too small to stay on the books,
Add a get_objects() call to the bookie API to provide access to objects that
have been removed from the blockchain, and a few tests to verify that they
work.
2017-08-09 17:17:51 -04:00
Eric Frias
8fd01c8af7 Swap the 'bet_adjusted_operation' into the position previously occupied by
betting_market_group_freeze_operation to avoid renumbering subsequent operations.
2017-08-09 12:42:51 -04:00
Roman Olearski
2c8b9ce17a Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-08-09 17:59:25 +02:00
Roman Olearski
ec77685264 added is_live_market to event_update operation 2017-08-09 17:58:01 +02:00
Eric Frias
a8d5fded26 Remove the code for charging beting fees up-front now that rake fees are taken from your net winnings.
Change the bet matching algorithm to only match at exactly the maker's odds, no rounding.
Implement binned order books in the betting market plugin.  Keep betting market groups,
betting markets, and bet objects around forever in the plugin (not yet exposed to the api).
2017-08-09 11:15:12 -04:00
Roman Olearski
f417dc0391 removed betting_market_group_freeze operation
added freeze to betting_market_group_update operation
2017-08-09 11:08:50 +02:00
Roman Olearski
69e8348522 setting initial event_state 2017-08-07 17:27:23 +02:00
Eric Frias
93088a204d Change the rounding used when matching bets to never round, bets are always matched at
exactly the maker's odds.
2017-08-01 15:42:52 -04:00
Roman Olearski
6ca6413d88 bookie_plugin: added localized_event_strings .... 2017-08-01 12:26:45 +02:00
Roman Olearski
b96459045b added get_total_matched_bet_amount_for_betting_market_group to bookie_plugin 2017-07-28 18:23:57 +02:00
Roman Olearski
3ac447b8a7 Add missing 'description' field to betting_market_update operation 2017-07-27 09:50:37 +02:00
Roman Olearski
6e33db129d Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-07-26 22:25:05 +02:00
Roman Olearski
9ab4d7049a added betting wimbledon test, improving database::resolve_betting_market_group . 2017-07-26 22:23:49 +02:00
Eric Frias
0b1d55586e Add missing 'description' field to betting_market_create operation 2017-07-26 13:52:55 -04:00
Roman Olearski
b6682fa69a added betting_market_group_update_operation betting_market_update_operation 2017-07-24 20:59:47 +02:00
Roman Olearski
ea3818cf4f extended event_update_operation 2017-07-21 13:42:15 +02:00
Roman Olearski
cd40ef0715 extended event_group_update_operation 2017-07-20 21:01:10 +02:00
Roman Olearski
78100f9fb5 added betting_market_rules_update_operation 2017-07-20 14:28:12 +02:00
Roman Olearski
2acd4dd187 added event_update_operation 2017-07-20 12:19:18 +02:00
Roman Olearski
7b8fad0bfa added event_group_update_operation 2017-07-19 18:10:55 +02:00
Roman Olearski
a24f671c02 added sport_update_operation 2017-07-19 13:05:28 +02:00
Roman Olearski
67c134a138 changed cancel_all_bets to cancel_unmatched_bets 2017-07-19 10:29:51 +02:00
Roman Olearski
04985c2624 improving cancel_all_bets operation 2017-07-18 19:17:13 +02:00
Roman Olearski
86b909da44 Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-07-18 12:04:28 +02:00
Roman Olearski
c7c03c4aab added cancel_all_bets operation 2017-07-18 12:02:16 +02:00
Eric Frias
24c0089869 Fix link error in release builds 2017-07-17 18:59:35 -04:00
Daniel Larimer
1c97c13eed Replace flat_index with generic_index for bitasset_object
- this enabled me to produce blocks and fixed corruption
2017-07-17 23:24:09 +02:00
Roman Olearski
fb22da620d minor cosmetic changes ... 2017-07-14 13:31: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
bb46f84666 Fixing double declared enumerated types with FC_REFLECT_TYPENAME FC_REFLECT_ENUM
Adapting fc
2017-07-12 12:28:59 +02:00
Eric Frias
790bfe3704 WIP Force all betting markets in a group to use the same asset_id for betting 2017-07-09 18:41:26 -04:00
Eric Frias
4e2c6c303a Add an operation to freeze/unfreeze a betting market group 2017-07-09 13:52:01 -04:00
Roman Olearski
5de1437d24 Merge branch 'betting-ro4' into betting-merge 2017-07-08 20:41:45 +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
Eric Frias
a8a64e530b Add an informational betting_market_rules object, linked to betting market groups 2017-07-06 18:07:39 -04:00
Roman Olearski
32433ef29f Cherry-picked all divident commits from rps to betting resolving conflicts 2017-07-06 23:04:50 +02:00
Roman Olearski
3a8b8a3b5b Cherry-picked commit b9508c6.
little correction for solution ...issues/#10 avoid generating dividend_payout virtual operations for zero-size payouts
2017-07-06 20:19:51 +02:00
Roman Olearski
59c64efb5a solution ...issues/#10 avoid generating dividend_payout virtual operations for zero-size payouts 2017-07-06 20:15:50 +02:00
Roman Olearski
9bbf73a96a Cherry-picked commit 81c9e98.
solution  ...issues/#7 Allow vesting core tokens to vote and receive dividends
2017-07-06 20:14:54 +02:00
Roman Olearski
64d59602a8 solution proposal for ...issues/#7 Allow vesting core tokens to vote and receive dividends 2017-07-06 20:05:24 +02:00
Eric Frias
bfcc23ac9d Cherry-picked commit 749ffb8.
Don't make the core asset a bitasset
2017-07-06 20:04:05 +02:00
Roman Olearski
85102da504 Cherry-picked commit 32b5343.
Implementing propose_dividend_asset_update
2017-07-06 19:58:10 +02:00
Roman Olearski
1386617465 Removing redundant line 2017-07-06 19:55:24 +02:00
Roman Olearski
dac9d8b61b Cherry-picked commit 26f4718.
Creating default dividend asset
2017-07-06 19:53:14 +02:00
Eric Frias
da5ef56a35 Cherry-picked commit 9089292.
Prevent creation of accounts with the same name as dividend distribution accounts
2017-07-06 19:44:35 +02:00
Eric Frias
90722fc0a4 Cherry-picke commit be6ad13.
Code cleanups -- renaming variables, adding comments, fix one bug with override transfers and dividend assets
2017-07-06 19:41:13 +02:00
Eric Frias
67d0898394 Fixes to paying out non-core assets using their fee pools 2017-07-06 19:39:04 +02:00
Eric Frias
5b437d7363 Cherry-picked commit b584ee1.
Separate out unit tests for dividend-assets into their own test suite
2017-07-06 19:22:33 +02:00
Eric Frias
60f7dd798f Keep pending dividend balance and distributed dividend balance objects around (with zero
balance) after payouts, they will probably be needed again.
2017-07-06 19:19:54 +02:00
Eric Frias
b8e1165290 Cherry-picked commit 7857ac4.
Correctly generating virtual transactions for payouts
2017-07-06 19:18:48 +02:00
Eric Frias
b9304caffa Cherry-picked commit abc7853.
Initial work on dividend-paying assets.  Basic functionality works in simple cases.
2017-07-06 19:14:02 +02:00
Eric Frias
cd2940c8a8 Remove competitor and market options objects from the blockchain 2017-07-06 11:57:45 -04:00
Roman Olearski
9b08b502be implementing betting_market_resolve_group_operation (3) #1 2017-07-06 12:56:32 +02:00
Eric Frias
9c9af76e12 Merge commit 'd8e7c0afee573d82647018a9efd530a03274a2aa' into betting 2017-06-21 16:58:50 -04:00
Eric Frias
3238ea735f Merge commit '568ceb189eca96e77e38c4059b83a504008d7e91' into betting 2017-06-21 16:43:00 -04:00
Eric Frias
636f28eac6 Merge commit 'aa6f3e9051787bfc1b4284f1684544cca9bfc9c9' into betting 2017-06-21 16:08:58 -04:00
Eric Frias
51fb13f8ba Merge commit '9466d2096a370e15aff70842b48feeca4a941e5c' into betting 2017-06-21 14:54:05 -04:00
Eric Frias
b200fb893b Merge commit '0ecdc90d4df2ebd80a6d4cfa4388f4b8a608c9c1' into betting 2017-06-21 09:35:32 -04:00
Eric Frias
fe82e85d8d Merge commit '9bbbefd3913ccfe01b8e8ef2007ca3eb74ab9d81' into betting 2017-06-21 09:33:53 -04:00
Eric Frias
c20978bae6 Merge commit '1e80d8a01e6181711bba3d6462e64286d79935b1' into betting 2017-06-20 19:34:52 -04:00
Eric Frias
5a99abc3de Merge commit '0053613b38e81719c198f36c748e181cc44635b2' into betting 2017-06-20 18:57:23 -04:00
Eric Frias
627dba3a46 Merge commit '0ad83697f08a11431eece565f0386a849bed25c9' into betting 2017-06-20 18:36:19 -04:00
Eric Frias
bd525ef55d Merge commit 'c777a88649d50edf6c5e4a8c3b13dda88a66e9d0' into betting 2017-06-20 18:15:43 -04:00
Eric Frias
7195e22216 Merge commit '36164263f4cceda85ec92568d48016a48f7ad9c9' into betting 2017-06-20 17:28:41 -04:00
Eric Frias
bd70c0dc67 Restore sanity-check assert 2017-06-06 10:22:46 -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
Eric Frias
e53e9f8623 Update max core supply in genesis, properly track total supply for vesting balances in bts accounts 2017-06-05 19:52:51 -04:00
Abit
feabafd45f Merge pull request #297 from abitmore/292-acc-his-prune
Account history: option to prune old data (#292)
2017-06-06 00:42:54 +02:00
Roman Olearski
9c1e522070 Merge branch 'rock-paper-scissors' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into rock-paper-scissors 2017-06-05 19:21:58 +02:00
Roman Olearski
a8f51e2a98 updated genesis/genesis.json for peerplays 2017-06-05 19:20:54 +02:00
Eric Frias
38b2767567 Support specifying cliff_seconds in initial_vesting_balances 2017-06-05 12:31:14 -04:00
Eric Frias
ea7e8e6f31 Support genesis vesting balances tied to account objects 2017-06-04 18:26:50 -04:00
BhuzOr
8ceaeb0aa2 Fix clear_expired_transactions memory leak
Backport from Steem/BitShares: https://github.com/bitshares/bitshares-core/issues/256
2017-06-04 23:29:55 +02:00
abitmore
06b18c4011 Fix Windows build. 2017-06-03 01:21:17 +00:00
abitmore
504aa5dccd Account history: option to prune old data (#292) 2017-06-02 16:16:34 +00:00
Viktor
744b9c08d2 comment out excessive debug logging 2017-06-02 12:01:43 +03:00
Viktor
8ae95e1d5c Change unique index to non-unique on vesting_balance_objects 2017-06-02 11:58:58 +03:00
Viktor
a06096d0dd [DLN] revert some test code related to worker-pay that was inadvertently committed in a larger commit 2017-06-02 11:58:23 +03:00
Eric Frias
cc77db0410 comment out excessive debug logging 2017-06-01 17:05:35 -04:00
Eric Frias
3cc82f0022 Change unique index to non-unique on vesting_balance_objects 2017-06-01 15:27:38 -04:00
SynaptiCAD User
e3b4c28f9b [DLN] revert some test code related to worker-pay that was inadvertently committed in a larger commit 2017-06-01 11:38:27 -04:00
Viktor
77fb78b841 Fix a bug where initial_bts_accounts' balances weren't correctly accounted in total_supply 2017-06-01 09:52:18 +03:00
Viktor
f90c8a4101 [DLN] added code to test participation rate using ./tests/chain_test --run_test=operation_tests/witness_create, currently passes when test is set to use shuffle (which I've set as default) but fails for RNG 2017-06-01 09:50:55 +03:00
Viktor
074817f29a [DLN] fixed missed_count for participation_rate calculateion on RNG, also hopefully fix missed block count for individual witnesses 2017-06-01 09:46:16 +03:00
Eric Frias
7f44b793c1 Fix a bug where initial_bts_accounts' balances weren't correctly accounted in total_supply 2017-05-31 18:06:11 -04:00
SynaptiCAD User
50f474a8bf [DLN] added code to test participation rate using ./tests/chain_test --run_test=operation_tests/witness_create, currently passes when test is set to use shuffle (which I've set as default) but fails for RNG 2017-05-30 18:49:15 -04:00
SynaptiCAD User
80e1be9ee0 [DLN] fixed missed_count for participation_rate calculateion on RNG, also hopefully fix missed block count for individual witnesses 2017-05-30 14:50:49 -04:00
PBSA Github Manager
e180475f5f Ensure the transaction signature is validated. 2017-05-28 02:00:18 -03:00
PBSA Github Manager
017d37ed6b fixed update witness operation - added new_initial_secret 2017-05-28 01:53:53 -03:00
PBSA Github Manager
42cd0a6fb1 fixed update witness operation - added new_initial_secret 2017-05-28 01:52:14 -03:00
PBSA Github Manager
4cc9f11fec fixed update witness operation - added new_initial_secret 2017-05-28 01:50:33 -03:00
Ryan R. Fox
0fc6079828 Update db_block.cpp
Ensure the transaction signature is validated.
2017-05-27 16:42:21 -04:00
Roman Olearski
e6b58adbd1 fixed update witness operation - added new_initial_secret 2017-05-27 20:11:46 +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
8d73141d8b preparing genesis.json db_init.cpp for PPY 2017-05-23 18:21:51 +02:00
Vikram Rajkumar
f13698370b Clean up replay logic; resolve #175 2017-05-21 18:40:54 -05:00
Abit
db9669a264 _apply_block: don't skip trx signature validation 2017-05-10 20:20:18 +02:00
Roman Olearski
2259224078 added missing reflection for chain parameter 'witness_schedule_algorithm' 2017-04-21 14:58:00 +02:00
Roman Olearski
27b5c978db completing scheduled (restored) witnesses, setting as default 2017-04-21 14:24:40 +02:00
Roman Olearski
a8244963e7 shuffled witnesses repaired 2017-04-19 21:47:54 +02:00
Roman Olearski
90ec694446 integrating scheduled (old) and shuffled (current) witnesses 2017-04-19 20:31:00 +02:00
Roman Olearski
83c5be13f6 completing creating tournament test cases for assertions 2017-04-14 13:49:55 +02:00
Roman Olearski
509867655f implementing tournament test cases for assertions 2017-04-12 17:26:51 +02:00
Roman Olearski
8be10bc6cf Merge branch 'rock-paper-scissors' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into rock-paper-scissors 2017-04-11 12:43:49 +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
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
Eric Frias
2b6be2a65e Verify all account ids on whitelist are valid accounts 2017-04-10 15:50:36 -04:00
Roman Olearski
a74e66dd24 little fix in libraries/chain/tournament_evaluator.cpp, corrected comparison asset with integer 2017-04-10 20:07:08 +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
Dan Notestein
3b36205555 Limit games to 3 gestures because GUI wallet only supports 3 gesture games currently. Note that cli-wallet also supports 5 gesture games in theory, and the code can be expanded to support any odd number of gestures by giving the gestures names. 2017-04-10 11:55:31 -04:00
Dan Notestein
1aad7e4b74 Document limits on number_of_players in a tournament. 2017-04-10 14:42:34 +00:00
Dan Notestein
d5358c6eb0 Prevent creation of tournament with negative buy-in 2017-04-10 13:54:40 +00:00
Abit
2c05590cd4 Fix clear_expired_transactions memory leak #256 2017-04-09 00:20:13 +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
Roman Olearski
66208a2d9e I. DEX
Task: The Peerplays DEX should only allow UIA and sidechain assets to be paired (traded) with the core token (PPY).
2017-04-06 09:46:17 +02:00
Eric Frias
672fad6d40 Start of a plugin to track deleted events (and other deleted objects) needed by the
bookie ui
2017-04-04 17:02:19 -04:00
Roman Olearski
2fd34ef6ab commiting last changes 2017-04-01 13:59:52 +02:00
Eric Frias
6045b8b096 Add a simple test fixture to verify a bet plays out correctly in all three
outcomes.
Fix refunding fees on market cancelation
2017-03-31 17:56:00 -04:00
Eric Frias
39093df26c Create a bunch of utility functions to make writing betting market tests easier 2017-03-31 11:10:37 -04:00
Eric Frias
69192a889d Generate a virtual op when a market is resolved 2017-03-24 11:51:35 -04:00
SynaptiCAD User
e609764df3 cancel all the betting markets of a canceled event 2017-03-24 11:04:35 -04:00
Eric Frias
e74a505622 Fix missing const qualifier, payouts for betting market wins 2017-03-24 10:40:53 -04:00
SynaptiCAD User
c8a9c86ca6 cancel all unmatched bets on betting market when it is resolved 2017-03-24 00:09:43 -04:00
Eric Frias
784b11059f Start implementing bettimg_market_resolve op 2017-03-23 19:35:10 -04:00
Eric Frias
fd38d385ca Fix an error using the wrong scaling constant for bet odds 2017-03-23 18:16:18 -04:00
Eric Frias
9f6edc649d Sort bets by odds for use in an order book 2017-03-23 16:24:47 -04:00
SynaptiCAD User
239d8ee885 update global_betting_statistics when new events created, change scores representation to simple vector of strings, working on evaluator for event_update_status_operation 2017-03-23 00:36:18 -04:00
SynaptiCAD User
c0776eb1dc add get_global_betting_statistics api call 2017-03-23 00:36:18 -04:00
SynaptiCAD User
a267741fd1 added global_betting_statistics implementation object. Object is created, but nothing talks to it yet. 2017-03-23 00:36:18 -04:00
elmato
3eb160bed1 Move notification related functions from db_block.cpp to db_notify.cpp 2017-03-22 22:03:45 +00:00
elmato
0ecdc90d4d Add the array of ids (that are being removed) to the removed_objects signal 2017-03-22 20:14:53 +00:00
elmato
6d3fbeef55 Include information of impacted accounts relative to the objects created/changed/removed. Only extract the impacted accounts information if there are handlers defined in order prevent useless cpu usage on nodes not exposing the rpc api 2017-03-22 20:14:53 +00:00
elmato
29c636fcef add get_market() function to call_order_object 2017-03-22 20:14:53 +00:00
elmato
b2b895ac94 allow to apply_block when exception in database signal handler 2017-03-22 20:14:53 +00:00
elmato
02b2672a39 split notifications (notify_changed_objects) in three signals: new_objects, changed_objects, removed_objects 2017-03-22 20:14:53 +00:00
elmato
823beb7fe5 remove call to notify_changed_objects in _push_transaction 2017-03-22 20:14:53 +00:00
Eric Frias
3feea69a4c Stub out bet fill virtual op 2017-03-22 16:02:57 -04: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
SynaptiCAD User
58d5affe40 fix merge conflict 2017-03-22 12:48:02 -04:00
SynaptiCAD User
c42a56d332 implement bet_cancel_operation 2017-03-22 12:06:08 -04:00
Eric Frias
46ef911f8e Add more checks when placing bets 2017-03-21 19:47:57 -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
SynaptiCAD User
f99bf1c6e6 [DLN] implement list_betting_markets(betting_market_group) 2017-03-19 22:44:16 -04:00
SynaptiCAD User
2d4f18280f [DLN] implement list_betting_market_groups(event_id) 2017-03-19 22:12:31 -04:00
SynaptiCAD User
20a64be400 [DLN] implement list_event_groups(sport_id) 2017-03-19 20:40:17 -04:00
Eric Frias
db6b312784 Stub out the bet object and the operation for placing it (currently breaks
json_serializer builds, until I port over some code into fc)
2017-03-16 19:37:26 -04:00
Eric Frias
5aedb65e5c Implement the apparently-unused feature allowing later operations in a transaction to
reference objects created by earlier operations.  Change all betting operations
to allow use of this feature, and test it in operation_tests2
2017-03-16 18:38:35 -04:00
Eric Frias
2470af6eb9 Initial work on creating blockchain objects for sports betting 2017-03-15 17:04:27 -04:00
oxarbitrage
24d1ce8b1f log unexpected exception in close function for github issue 81 2017-03-13 17:03:15 -07:00
kstdl
895fbec5bc get_tournaments and get_tournaments_by_state method added 2017-02-20 18:09:37 +03:00
alfredo
9ea386aa10 added list of assets created by account output to get_full_accounts api function 2017-02-02 18:20:21 -03:00
Vikram Rajkumar
ef356a15a6 Update submodules 2017-01-17 16:42:33 -06:00
Roman Olearski
ac73f34045 little correction for #12 Add tournament rules to prevent a game from lasting too long due to ties 2016-12-02 12:01:37 +01:00
Roman Olearski
e16b9d0610 fxing #11 Fix operation of "insurance" parameter
implementing	#12 Add tournament rules to prevent a game from lasting too long due to ties
2016-11-29 17:38:37 +01: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
b9508c6da8 little correction for solution ...issues/#10 avoid generating dividend_payout virtual operations for zero-size payouts 2016-11-28 09:06:29 +01:00
Roman Olearski
eadbae0808 solution ...issues/#10 avoid generating dividend_payout virtual operations for zero-size payouts 2016-11-26 16:03:33 +01:00
Roman Olearski
81c9e98d7b solution ...issues/#7 Allow vesting core tokens to vote and receive dividends 2016-11-25 19:40:25 +01:00
Roman Olearski
f2c0157bb7 avoiding generating tournament payout operation if zero payout
updating tournaments tests
2016-11-25 18:01:32 +01:00
Roman Olearski
278c9b1683 solution proposal for ...issues/#7 Allow vesting core tokens to vote and receive dividends 2016-11-25 11:23:06 +01:00
Roman Olearski
85d7a30f87 improving tournament prize distributing for assets other then core asset 2016-11-24 17:17:59 +01:00
Roman Olearski
bf8e46bf8d Merge branch 'rock-paper-scissors' of http://syncad.storm.pl:56780/blocktrades/graphene into rock-paper-scissors 2016-11-23 11:35:58 +01:00
Roman Olearski
a66af8b072 enhancing tournament_payout operation according issues 8 9 2016-11-23 11:33:24 +01:00
Eric Frias
85914fb3b4 Remove code that was resetting the game timer each time a player made a move 2016-11-22 18:30:34 -05:00
Eric Frias
a00b6cc8a1 Disalbe excessive logging, fix a bug that was preventing a game from ending
even after all reveal moves  moves were made
2016-11-22 17:47:33 -05:00
Roman Olearski
cf6f3a15fd generating tournament payout operation 2016-11-21 18:11:31 +01:00
Vikram Rajkumar
4eaef390a3 Decrease printing frequency during replay 2016-11-17 16:39:31 -06:00
Roman Olearski
b1a8a3e503 cleaning unnecessary dumps and comments 2016-11-17 19:04:14 +01:00
Roman Olearski
1530f04882 added operation tournament_payout_operation 2016-11-17 18:04:32 +01:00
Vikram Rajkumar
2254fc62d6 Remove "applied epsilon logic" log message 2016-11-16 16:24:12 -06:00
Eric Frias
935dac7ae6 Fix crash in logging when one player fails to reveal their move 2016-11-16 15:57:35 -05:00
Roman Olearski
39b6bfd85e fixing problem : tournament never ends if "bye" matches present
adding tournaments' prize_pool to total  balances
2016-11-16 15:10:10 -05:00
Eric Frias
749ffb8688 Don't make the core asset a bitasset 2016-11-15 10:23:58 -05:00
Roman Olearski
5c3c8d9a8a fixing problem : tournament never ends if "bye" matches present
adding tournaments' prize_pool to total  balances
2016-11-14 20:18:44 +01:00
Roman Olearski
b72eae0941 Merge branch 'rock-paper-scissors-ro' into rock-paper-scissors 2016-11-08 16:26:43 +01:00
Roman Olearski
6abffc0963 Merge branch 'rock-paper-scissors' of http://syncad.storm.pl:56780/blocktrades/graphene into rock-paper-scissors 2016-11-08 15:57:57 +01:00
Roman Olearski
32b53434f9 Implementing propose_dividend_asset_update 2016-11-08 11:34:04 +01:00
Nathan Hourt
af6eb06a3e Add missing includes 2016-11-07 18:17:51 -06:00
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
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
3865dd1573 Merge remote-tracking branch 'graphene/develop' into bitshares 2016-03-25 20:15:32 -04:00
theoreticalbts
8835f4f6b2 Bump HARDFORK_599_TIME 2016-03-25 20:15:17 -04:00
theoreticalbts
55ec0607f8 Rebased "ext.hpp: Fix extension unpacking #599" to fix revert #637 2016-03-25 20:15:17 -04:00
theoreticalbts
f049fce4e9 Ignore ctx.amount in get_allowed_withdraw() #625 2016-03-25 19:24:14 -04:00
theoreticalbts
395a68d61f Merge remote-tracking branch 'abitmore/patch-3' into develop #631 2016-03-25 19:13:14 -04:00
abitmore
23b8843d2f check_authority(): fix #631 early end of recursion 2016-03-20 01:21:13 +01:00
Nathan Hourt
0525d16477 Fix install of chain/protocol headers 2016-03-17 19:14:55 -05:00
Nathan Hourt
b2835bc02d Add headers to install targets 2016-03-17 17:16:13 -05:00
theoreticalbts
e955b06c42 Fix accidental reversion of #615 fix by b175cc7feb 2016-03-16 15:50:13 -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
4dbfe53f1f Merge remote-tracking branch 'graphene/develop' into bitshares 2016-03-16 01:09:52 -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
Eric Frias
b175cc7feb Revert "Merge branch 'graphene_master' into bitshares"
This reverts commit 2d0a7a2a4d, reversing
changes made to 6684fb75ac.
2016-03-11 14:19:31 -05:00
Eric Frias
2d0a7a2a4d Merge branch 'graphene_master' into bitshares 2016-03-11 11:40:48 -05: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
theoreticalbts
10a4dce501 db_update.cpp: Don't update bitasset_data_object force_settled_volume every block unless needed #540 2016-01-28 18:16:19 -05:00
theoreticalbts
a1e8fc0741 Implement top_n special authority #516 2016-01-27 10:30:32 -05:00
theoreticalbts
ef68375fab Fix indentation #533 2016-01-25 11:33:05 -05:00
theoreticalbts
a1ee326b55 Improve vote counting implementation #533 2016-01-25 11:33:04 -05:00
theoreticalbts
447018b319 Tell cmake hardfork.hpp is generated, build hardfork.hpp in binary directory #511 2016-01-22 11:37:28 -05:00
theoreticalbts
d8cd48d6ad Implement by_asset_balance index #529 2016-01-21 11:13:42 -05:00
theoreticalbts
aa6d13b057 Remove by_account index from account_object #529 2016-01-21 10:39:13 -05:00
theoreticalbts
600a06f57e db_balance.cpp: Rename by_balance -> by_account_asset #529 2016-01-21 10:23:07 -05:00
theoreticalbts
3edaf15652 Generate hardfork.hpp from hardfork.d directory #511 2016-01-11 10:09:03 -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
07fb90a7ec market_object.hpp: Move market objects into own header #466 2016-01-08 11:36:32 -05:00
theoreticalbts
2da6840405 Optionally disable database unity build #509 2016-01-08 11:29:39 -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
a548217e5c db_update.cpp: Log a lot of information if clear_expired_orders() is iterating too much, maybe useful to diagnose #485 2016-01-07 16:23:50 -05:00
theoreticalbts
c1612a434e db_block.cpp: Disable skip_validate #505 2016-01-07 16:04:52 -05:00
theoreticalbts
399e0ed9f9 db_update.cpp: Take mia as reference, not copy, in clear_expired_orders(), maybe fix #485 2016-01-07 16:04:16 -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
0ccc6722eb Merge branch '483-history-fix-op-numbers' into develop 2016-01-07 11:31:02 -05:00
theoreticalbts
3680b67271 Merge branch '481-history-failed-proposal-ops' into develop 2016-01-07 11:30:50 -05:00
theoreticalbts
84fab61589 Merge branch '480-fork-mia-core-exchange' into develop 2016-01-07 11:30:04 -05:00
Daniel Larimer
dd5b7708b4 potential fix for hung chain 2016-01-07 11:27:50 -05:00
Daniel Larimer
7c1c7e8504 removing log 2016-01-03 22:50:07 -05:00
Daniel Larimer
16b59e0b42 adding seed node 2016-01-03 22:10:56 -05:00
Daniel Larimer
dca5c95ab5 potential fix for hung chain 2016-01-03 20:40:21 -05:00
theoreticalbts
dcc0b556ba config.hpp: Bump DB version 2015-12-16 17:55:01 -05:00
theoreticalbts
e4787e431a Merge branch 'graphene/483-history-fix-op-numbers' into release-2015-12-16b 2015-12-16 17:15:00 -05:00
theoreticalbts
d60c8a255e Fix optional dereferences 2015-12-16 17:14:41 -05:00
theoreticalbts
802ca9e613 config.hpp: Bump DB version 2015-12-16 11:52:03 -05:00