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

515 commits

Author SHA1 Message Date
Peter Conrad
bee7f31f07 Added unit test for #429 2018-03-23 15:20:17 +01: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
kstdl
090a3a4dad merge get_account_lotteries branch. fix create_witness test 2018-01-09 11:45:19 +03:00
kstdl
6b3de963a2 fix and comment some tests 2017-12-13 18:29:39 +03:00
kstdl
f00c56d789 fix some tests. add gitlab-ci.yml 2017-12-12 18:15:55 +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
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
Eric Frias
eedd775405 Add get_matched_bets_for_bettor() to bookie plugin 2017-09-02 19:05:07 -04:00
Roman Olearski
f31f9739c4 commenting one unneccessary line in betting_tests.cpp 2017-08-16 11:45:54 +02: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
26c2eb4c7a Make the bet_place helper in the test fixture return the bet id 2017-08-09 13:53:37 -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
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
9ab4d7049a added betting wimbledon test, improving database::resolve_betting_market_group . 2017-07-26 22:23:49 +02:00
Roman Olearski
85125df15a updating betting tests 2017-07-25 10:14:09 +02:00
Roman Olearski
b6682fa69a added betting_market_group_update_operation betting_market_update_operation 2017-07-24 20:59:47 +02:00
Roman Olearski
b9badec2f1 added testing exceptions in betting 2017-07-24 11:43:18 +02:00
Eric Frias
a3710e01af Patch up chained betting market creation tests (broken since introduction of rules) 2017-07-21 11:08:20 -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
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
c7c03c4aab added cancel_all_bets operation 2017-07-18 12:02:16 +02:00
Roman Olearski
6aa9057d12 improving try_create_sport test 2017-07-17 22:17:43 +02:00
Roman Olearski
054423dce0 added new betting test - try_create_sport_and_try_again 2017-07-17 18:59:01 +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
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
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
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
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
21661eb12c Disable incomplete bookie_plugin 2017-07-03 12:12:34 -04:00
Roman Olearski
b158950404 moved betting tests to seprarate executable 2 2017-07-03 13:51:02 +02:00
Roman Olearski
61d5f43774 removed betting tests to seprarate executable 
found generate_block(s) after ACTORS macro
 2017-07-03 13:30:37 +02: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
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
8549cef70c Merge commit '92cfb96c618e1c051dd7a7224e5392d56c496c06' into betting 2017-06-20 16:39: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
Viktor
a4937a2cce [DLN] experimenting with RNG vs shuffle algorithm in tests 2017-06-02 11:56:59 +03:00
SynaptiCAD User
29402ddff3 [DLN] experimenting with RNG vs shuffle algorithm in tests 2017-06-01 11:38:27 -04: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
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
kstdl
342e6db610 inital 2017-05-25 12:13:59 +03:00
Roman Olearski
90ec694446 integrating scheduled (old) and shuffled (current) witnesses 2017-04-19 20:31:00 +02:00
Roman Olearski
94d681181c adding tournament test case for joinig with buy-in with different asset 2017-04-14 17:44:36 +02:00
Roman Olearski
83c5be13f6 completing creating tournament test cases for assertions 2017-04-14 13:49:55 +02:00
Roman Olearski
7463cc28c6 implementing creating tournament test cases for assertions 2017-04-13 21:00:14 +02:00
Roman Olearski
c351abc09a completing tournament test cases for assertions - joining, leaving 2017-04-13 16:36:39 +02:00
Roman Olearski
509867655f implementing tournament test cases for assertions 2017-04-12 17:26:51 +02:00
Roman Olearski
647ac1fa1e Merge branch 'rock-paper-scissors' of http://syncad.storm.pl:56780/blocktrades/graphene into rock-paper-scissors 2017-04-11 17:06:31 +02:00
Roman Olearski
35ee4e1c92 minor change in tournaments test 2017-04-11 17:03:02 +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
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
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
f935282181 commiting last changes 2 2017-04-01 14:04:38 +02: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
e74a505622 Fix missing const qualifier, payouts for betting market wins 2017-03-24 10:40:53 -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
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
Vikram Rajkumar
8ae1f6b3a5 Remove NTP time 2017-03-16 12:53:52 -05:00
Eric Frias
2470af6eb9 Initial work on creating blockchain objects for sports betting 2017-03-15 17:04:27 -04:00
Taconator
eb4db2963e - CLI: Derive possible owner keys from a brain key 
- Test: Derive possible owner keys from a brain key

- CLI enhanced to permit checking of whether a public key is currently linked to a registered account

- Database API enhanced to permit checking of whether a public key is currently linked to a registered account

- Test: Check whether a public key is currently registered/associated with an account
 2017-02-16 16:22:35 -05:00
Eric Frias
1018221812 quiet signed/unsigned warning 2017-01-03 16:44:56 -05:00
Roman Olearski
d9413b8780 enhancing tournaments test 2016-12-05 11:27:19 +01:00
Roman Olearski
21268b92ab correcting conslusion -> conclusion 2016-12-02 22:08:33 +01:00
Roman Olearski
8048d1c35e quality assessment of get_random_bits randomness 2016-12-02 21:43:12 +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
f2c0157bb7 avoiding generating tournament payout operation if zero payout 
updating tournaments tests
 2016-11-25 18:01:32 +01:00
Roman Olearski
2320be1f55 tournaments tests - correcting max min calculations 2016-11-22 20:30:19 +01:00
Roman Olearski
ac9c301092 tournaments tests - randomizing number of wins 2016-11-21 20:38:49 +01:00
Roman Olearski
16e7104c8e adding two assets tournaments test 2016-11-20 18:39:48 +01:00
Roman Olearski
740b07404a implementing tournament tests 2016-11-18 19:51:38 +01:00
Eric Frias
0a6e25507e Fix compile warning 2016-11-16 15:10:10 -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
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
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
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
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
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
aeabad7364 database_fixture.cpp: Check asset supplies later in verify_asset_supplies() #639 2016-03-25 13:42:05 -04:00
theoreticalbts
194186b63a Implement vbo_withdraw_different test #625 2016-03-25 13:42:05 -04:00
theoreticalbts
4dbfe53f1f Merge remote-tracking branch 'graphene/develop' into bitshares 2016-03-16 01:09:52 -04:00
theoreticalbts
e0c4c5e914 Wait for HARDFORK_599_TIME when needed in tests #599 2016-03-16 00:15:49 -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
theoreticalbts
92cfb96c61 Test serialization of extensions #599 2016-02-26 14:38:28 -05:00
Eric Frias
d3c6cbf4de Compile fixes for win32 and out-of-source builds 2016-02-17 09:17:00 -05:00
theoreticalbts
32f07de4e2 Fix unit test failure due to skip_flags changes caused by #492 fix 2016-02-15 21:02:20 -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
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
1a51d87329 Implement test for buyback accounts #538 2016-02-11 04:59:35 -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
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
078e63a79f Merge many bugfix branches into develop 
Merged:

492-bugfix-open-fail #492
523-bugfix-multiple-blind-xfer #523
537-cleanup-remove-operation_get_required_authorities #537
540-cleanup-settle-volume-spam #540
542-bugfix-cancel-fee #542
557-bugfix-pts-address #557
559-test-fix-zero-block-wait #559
561-bugfix-serializer-build-broken #561
562-bugfix-unreflected-fields #562
 2016-02-09 10:57:21 -05:00
theoreticalbts
3a968332e8 Remove active_witnesses from global_property_object #562 2016-02-09 04:09:26 -05:00
theoreticalbts
10fca25acc database_fixture.cpp: Fix integer overflow bug waiting for zero blocks #559 2016-02-08 10:04:34 -05:00
theoreticalbts
a1e8fc0741 Implement top_n special authority #516 2016-01-27 10:30:32 -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
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
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
Fabian Schuh
5111084730 [License] Modify cpp and hpp headers to MIT #496 2016-01-07 11:44:52 -05:00
theoreticalbts
d853aecd3f Merge branch '445-fork-order-create-fee-refund' into develop 2015-12-07 15:14:03 -05:00
theoreticalbts
59d0ddf0f1 operation_tests.cpp: Use BOOST_CHECK instead of BOOST_REQUIRE in margin_call_limit_test 2015-12-07 15:00:52 -05:00
theoreticalbts
15c455dc63 Make margin_call_limit_test pass after hardfork #436 2015-12-07 15:00:46 -05:00
theoreticalbts
6feadd77a5 Fix GRAPHENE_TESTING_GENESIS_TIMESTAMP behavior of asset_claim_fees_test #413 #437 2015-12-07 14:38:05 -05:00
theoreticalbts
5b99cd4faa Allow zero_second_vbo test to run at any timestamp #437 2015-12-07 14:36:21 -05:00
theoreticalbts
32f12b9215 Refund order creation fee when order is cancelled #445 2015-12-03 15:48:52 -05:00
theoreticalbts
e845def98c Add hardfork logic to transfer_whitelist_uia test #419 2015-11-01 11:35:07 -05:00
theoreticalbts
65003ba06c Merge branch 'fork-413' into develop 
Conflicts:
	libraries/chain/include/graphene/chain/hardfork.hpp
 2015-10-31 17:13:15 -04:00
theoreticalbts
3dc58e435f Merge branches 'fork-409' and 'fork-419' into develop 2015-10-31 17:12:16 -04:00
theoreticalbts
4fa7443922 Merge branches 'history-324', 'bugfix-390', 'wallet-398', 'opt-410', 'script-411', 'bugfix-412', 'bugfix-414', 'bugfix-423' and 'feature-427' into develop 2015-10-31 17:11:41 -04:00