theoreticalbts
e6f8ef1679
Merge commit '5fa123b6d7b64638fd1e93c9530479ed04d56950' into bitshares
...
This commit merges the Graphene database version bump commit into BitShares (and overrides it with the BitShares version's bump).
Conflicts:
libraries/chain/include/graphene/chain/config.hpp
2015-12-09 18:19:43 -05:00
theoreticalbts
f699240e0a
config.hpp: Bump db version
2015-12-07 17:53:03 -05:00
theoreticalbts
5fa123b6d7
config.hpp: Bump db version
2015-12-07 17:52:49 -05:00
theoreticalbts
020dc2e789
Merge branch 'graphene/develop' into prerel-2015-12-07
2015-12-07 17:45:45 -05:00
theoreticalbts
2b9876fd98
hardfork.hpp: Set hardfork timestamps
2015-12-07 15:36:52 -05:00
theoreticalbts
7107735e3f
Bump fc to enable WEBSOCKETPP_STRICT_MASKING #365
2015-12-07 15:17:23 -05:00
theoreticalbts
725ffd021e
Merge branch '455-fork-annual-self-referrer' into develop
2015-12-07 15:15:41 -05:00
theoreticalbts
0735a8722e
Merge branch '453-fork-referral-percent' into develop
2015-12-07 15:15:26 -05:00
theoreticalbts
d853aecd3f
Merge branch '445-fork-order-create-fee-refund' into develop
2015-12-07 15:14:03 -05:00
theoreticalbts
ac267393fc
Merge branch '436-fork-feed-protect' into develop
2015-12-07 15:12:17 -05:00
theoreticalbts
67aa3a4eb1
Merge branches '424-wallet-cancel-order', '437-test-fix-future-genesis', '439-util-js-op-wrapper' and '449-wallet-percent-mult' into develop
2015-12-07 15:11:58 -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
b80587e5b5
Prevent margin call from being triggered unless feed < call #436
2015-12-07 14:59:07 -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
emfrias
ec876f3def
update blocktrades seed node DNS address
2015-12-04 15:24:46 -05:00
theoreticalbts
32f12b9215
Refund order creation fee when order is cancelled #445
2015-12-03 15:48:52 -05:00
Daniel Larimer
0b4675354a
Merge pull request #462 from wackou/api-339
...
Api calls for #339 : needed api calls (mostly network) for supporting bts_tools
2015-11-25 09:57:38 -05:00
Nicolas Wack
86029542ae
Add "about" api call to wallet. Fix #339
2015-11-25 15:26:26 +01:00
Scott Howard
699144c173
add cancel_order to wallet api
2015-11-23 09:47:45 -05:00
James Calfee
228d9b5a93
JavaScript serilizer generator updates #439
2015-11-23 09:42:03 -05:00
Nicolas Wack
c3dd6c3e48
Add network api calls: get_advanced_node_parameters, set_advanced_node_parameters, get_potential_peers
2015-11-21 23:04:43 +01:00
Nicolas Wack
de7b427472
Network api returns fc::variant_object instead of fc::variant
2015-11-21 23:00:03 +01:00
theoreticalbts
498ebf486f
account_evaluator.cpp: Set annual referrer to self when upgrading to annual member #455
2015-11-20 10:51:59 -05:00
theoreticalbts
084e38753b
Hardfork to retroactively correct referral percentages #453
2015-11-19 16:35:33 -05:00
theoreticalbts
47585a6b9a
Fix cli_wallet referrer percentage type #449
2015-11-19 14:11:40 -05:00
Valentine Zavgorodnev
51eca8086f
Merge pull request #3 from nathanhourt/bitshares
...
Dockerfile fix: export 8090, not 8091
2015-11-11 16:04:10 -05:00
James Calfee
ed3ccca357
JavaScript serilizer generator updates #439
2015-11-09 17:26:51 -06:00
theoreticalbts
979d52c4c9
Merge branch '434-api-fillin-proposed-op-fees' into develop
2015-11-05 16:04:44 -05:00
theoreticalbts
b03ac00b6c
database_api.cpp: Recursively evaluate proposal fees #434
2015-11-05 16:02:39 -05:00
theoreticalbts
a96fd62d03
fee_schedule.cpp: Use relaxation to set fee #435
2015-11-05 15:59:32 -05:00
Scott Howard
70d364251a
add cancel_order to wallet api #424
2015-11-02 17:53:57 -05:00
theoreticalbts
09855166a2
Merge branch 'fork-367' into develop
2015-11-02 10:49:56 -05:00
theoreticalbts
2f83c4e427
Merge remote-tracking branch 'graphene/fork-367' into bitshares
2015-11-02 10:23:35 -05:00
theoreticalbts
75d1bb39a3
Re-bump fc after inadvertently reverted by #367
2015-11-02 10:22:46 -05:00
theoreticalbts
2d6dfd04e4
config.hpp: Bump db version to force replay
2015-11-02 10:11:42 -05:00
theoreticalbts
e1ba96b524
[BTS2] asset_evaluator.cpp: Don't check asset names registered before implementation of hardfork #385
2015-11-02 10:09:24 -05:00
theoreticalbts
545fbfe63c
Merge branch 'newmaster' into newbitshares
...
Conflicts:
libraries/chain/asset_evaluator.cpp
libraries/chain/include/graphene/chain/hardfork.hpp
libraries/chain/market_evaluator.cpp
2015-11-02 10:06:13 -05:00
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
theoreticalbts
d588ac987c
operation_tests2.cpp: Implement zero_second_vbo test for issue #390
2015-10-31 17:11:10 -04:00
theoreticalbts
55fef1b161
db_update.cpp: Don't clear expired feeds for non-market-issued assets #410
2015-10-31 16:14:25 -04:00
theoreticalbts
f72ed2f532
uia_tests.cpp: Implement asset_name_test #409
2015-10-31 15:46:54 -04:00
theoreticalbts
a126520fa3
HARDFORK Allow creation of sub-assets #409
2015-10-31 15:46:53 -04:00
theoreticalbts
28eddf1b6f
block_tests.cpp: Fix generate_empty_blocks not working correctly when last_irreversible_block_num skipped over 200
...
Revealed by #427 , related to #407
2015-10-31 15:46:18 -04:00
theoreticalbts
7c9d4584b8
operation_tests2.cpp: Don't use real time for balance_object_test starting_time, breakage revealed by #427
2015-10-31 15:46:18 -04:00
theoreticalbts
ef1c721690
fee_tests.cpp: Implement asset_claim_fees_test #413
2015-10-31 14:40:50 -04:00
