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

1670 commits

Author SHA1 Message Date
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
Michael Neynens
7c853e42aa Merge branch 'pr10' 2018-07-04 16:14:13 -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
2212bdea3a Fixed small issue. Added registering of the new API calls in the FC_API macro. 2018-05-17 09:45:04 +02: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
8ef5335a70 Change the bookie plugin's binned order books to more closely match the 
behavior of the bet matching algorithm where the taker's bet is now
the limiting factor
 2018-05-03 18:54:04 -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
2be2826f3c [pending] use map instead of vector 2018-04-11 15:43:10 +02:00
Fabian Schuh
cbe88eb511 [pending] remove expired transactions from list 2018-04-11 15:43:04 +02:00
Fabian Schuh
101325990b Hardfork baxter 2018-04-05 11:53:45 +02:00
Blockchain Projects BV
16e0b5353a Added Pending-transactions 2018-04-03 10:13:38 +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
Bartek Wrona
d8e545bb53 Issue #92 Valgrind error fixes. 
Eliminated debug checks.
 2017-09-07 10:04:00 -04:00
Bartek Wrona
b5c8cd0ad3 Fixes for most of valgrind errors related to unintialized values 
Including one additional debug code (related to read_loop MT access).
 2017-09-07 10:04:00 -04:00
theoreticalbts
a9de7c1da3 node.cpp: Fix possible race condition in process_backlog_of_sync_blocks() #1434 2017-09-07 10:04:00 -04:00
Eric Frias
f66eeeb73b Fix bug where peers could get stuck in sync mode. 
There was a case where we had requested a block through the sync
mechanism and also received it through the normal inventory mechanism
where we would leave the peer in a sync state, but never ask them
for more sync blocks.

This commit fixes the bug that put us into that stuck state, and also
adds code to disconnect peers if we ever manage to get into that stalled
state.
 2017-09-07 10:04:00 -04:00
Roman Olearski
c054a92d5e added get_all_unmatched_bets_for_bettor to the wallet 2017-09-07 13:50:08 +02: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
Eric Frias
c8ee15df04 Fix get_matched_bets_for_bettor() that wasn't exposed to the JSON API correctly, 
fix bookie api which wasn't returning deleted betting markets.
 2017-09-05 11:08:55 -04:00
Roman Olearski
d63a89febf get_matched_bets_for_bettor: added to the wallet, fixed missing reflection 2017-09-04 08:44:29 +02:00
Eric Frias
eedd775405 Add get_matched_bets_for_bettor() to bookie plugin 2017-09-02 19:05:07 -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
Roman Olearski
05a06a6f6d addedd (list_events_in_group) (get_unmatched_bets_for_bettor) to the wallet 2017-08-31 12:51:53 +02: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
bbef24b485 Update fc submodule 2017-08-24 17:46:35 -04:00
Eric Frias
05607ada37 Fix incorrect doc string in wallet help 2017-08-24 17:36:30 -04:00
Eric Frias
ad11c45415 Pretty-print bet place, fill, refund, cancellation 2017-08-16 18:56:23 -04:00
Eric Frias
596ab26eb5 Fix the place_bet wallet command to use a more friendly format for specifying 
the bet amount and multiplier
 2017-08-16 15:17:31 -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
Eric Frias
85e819185f Allow bookie API to return deleted betting_market, betting_market_group, and event objects 2017-08-10 15:49:53 -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
e9f1788eae added get_binned_order_book to wallet 2017-08-08 12:12:55 +02:00
Roman Olearski
28ada40217 added missing reflections for betting update methods . 2017-08-08 11:20:55 +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
Eric Frias
85b26c6905 Remove unnecessary explicit instantiation 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
Eric Frias
c4470131ac Enable building bookie plugin, add API for bookie plugin, and implement a 
function for getting binned order books (as yet untested)
 2017-07-27 19:36:31 -04: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
1d450f6ff9 Added wallet operations for updating betting_market_group/betting_market 2017-07-25 11:22:35 +02:00
Roman Olearski
510f2f919f Add a wallet operation for updating betting market rules 2017-07-25 09:20:45 +02:00
Roman Olearski
f1a0c3de66 Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-07-24 21:00:34 +02:00
Roman Olearski
b6682fa69a added betting_market_group_update_operation betting_market_update_operation 2017-07-24 20:59:47 +02:00
Eric Frias
5459beebb6 Add a wallet operation for creating betting market rules 2017-07-24 10:43:15 -04: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
c13ba46b2b Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-07-20 12:20:11 +02:00
Roman Olearski
2acd4dd187 added event_update_operation 2017-07-20 12:19:18 +02:00
Eric Frias
6c7f4cc2b9 Point seed nodes at testnet 2017-07-19 14:56:36 -04:00
Eric Frias
034acf7399 Replace idiosyncratic use of captures in ilog() statements with the usual mechanism 2017-07-19 14:40:43 -04: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
Roman Olearski
8397ce0c7a Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge2 2017-07-17 23:33:48 +02: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
Dan Notestein
231eebd021 re-enable time library 2017-07-17 20:36:07 +00:00
Roman Olearski
be9138e227 Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge 2017-07-17 22:18:38 +02:00
Roman Olearski
6fe57fbb74 added missing libraries/time 2017-07-17 22:16:23 +02:00
Dan Notestein
087d29b1d6 Disable building of missing time library 2017-07-17 19:56:37 +00:00
Roman Olearski
fb22da620d minor cosmetic changes ... 2017-07-14 13:31:04 +02:00
Roman Olearski
9196d79cb3 updated fc 2017-07-13 16:20:28 +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
f67dd3ea58 Compile fix 2017-07-06 19:24:14 +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
c64d83910c Merge commit '030577f6719a483314c6de7b7e42214399704adb' into betting 2017-06-21 14:15:57 -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
50fef80189 Merge commit 'ee3f81fa31e39a8ae4ebcfe5b3d78f2dbc103e1b' into betting 2017-06-20 17:44:12 -04:00
Eric Frias
7195e22216 Merge commit '36164263f4cceda85ec92568d48016a48f7ad9c9' into betting 2017-06-20 17:28:41 -04:00
Eric Frias
8549cef70c Merge commit '92cfb96c618e1c051dd7a7224e5392d56c496c06' into betting 2017-06-20 16:39:27 -04:00
Vikram Rajkumar
d8e7c0afee Merge pull request #311 from elmato/push-transaction-sync 
Implement network_broadcast_api::broadcast_transaction_synchronous
 2017-06-14 18:52:14 -05:00
Vikram Rajkumar
38ac7cb457 Cleanup #312 2017-06-14 18:06:39 -05:00
root
b307557182 add simple pagination to get_asset_holders 2017-06-14 17:47:18 +00:00
Matias Romeo
ea8f8964eb Implement network_broadcast_api::broadcast_transaction_synchronous (ported from steem) 2017-06-12 18:22:34 -03:00
oxarbitrage
fab2794699 remove GRAPHENE_TEST_NETWORK_VERSION 
https://github.com/bitshares/bitshares-core/issues/307
 2017-06-11 11:47:11 -03:00
oxarbitrage
1939c7bff6 remove extra space 2017-06-10 17:39:48 -03:00
oxarbitrage
2b1f1b7f74 add commented GRAPHENE_TEST_NETWORK to config 
for issue https://github.com/bitshares/bitshares-core/issues/307
 2017-06-10 17:38:46 -03:00
Abit
919787d281 Merge pull request #306 from oxarbitrage/patch-12 
get_full_accounts change, allow 100 subscribed accounts instead of 99. issue #295
 2017-06-10 17:38:48 +02:00
Roman Olearski
eb4c8f75d1 Merge branch 'rock-paper-scissors-ro' into rock-paper-scissors 
Conflicts:
	programs/witness_node/main.cpp
 2017-06-09 12:17:26 +02:00
BhuzOr
fc18c4812c Fix for block_num != 0 
Backport from Steem/BitShares
Some info here: https://github.com/bitshares/bitshares-core/issues/273
 2017-06-09 00:21:35 -03:00
BhuzOr
661a5ea5b0 Catch DNS exceptions when adding seed nodes 2017-06-09 00:20:17 -03:00
PBSA Github Manager
b4d43437a6 Updated seednodes from witnesses 2017-06-08 23:40:44 -03:00
oxarbitrage
773a2d0caf get_full_accounts change 
allow 100 subscribed accounts instead of 99.
 2017-06-08 18:43:36 -03:00
root
9200cc83c3 fix get_order_book 2017-06-08 12:27:51 +00:00
Viktor
32758955df Change default seed node 2017-06-06 18:18:27 +03: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
Vikram Rajkumar
848eb65ab1 Update submodules 2017-06-04 18:28:04 -05:00
Vikram Rajkumar
a4d2fd6427 Merge pull request #299 from abitmore/fix-win-build 
Fix Windows build.
 2017-06-04 18:17:42 -05:00
Abit
df787c9062 Fix latency check error 2017-06-05 00:32:44 +02: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
BhuzOr
83f9e46668 Validate block timestamps 
Reject blocks with timestamp too far in the future
Backport from BitShares: https://github.com/bitshares/bitshares-core/pull/17
 2017-06-04 15:16:49 +02:00
Abit
1ce4d36532 Check block latency after logging. 2017-06-04 01:47:02 +02:00
Vikram Rajkumar
f9f60770f9 Revert "Merge branch 'goho' of git://github.com/oxarbitrage/bitshares-core into oxarbitrage-goho" 
This reverts commit 628652f3eb, reversing
changes made to 568ceb189e.
 2017-06-03 16:05:17 -05:00