Commit graph

776 commits

Author SHA1 Message Date
Fabian Schuh
a2ce86bf4f Merge remote-tracking branch 'remotes/origin/467-wallet-propose-account' 2015-12-10 13:01:53 +01:00
theoreticalbts
c2943ee3bb undo_database.cpp: Handle unimplemented upd+del case 2015-12-09 18:16:50 -05:00
theoreticalbts
44db4760a1 undo_database.cpp: Refactor undo_database::merge() code
This commit does not change semantics at all, it just changes the layout of the code and adds comments.
2015-12-09 18:16:50 -05:00
theoreticalbts
5fa123b6d7 config.hpp: Bump db version 2015-12-07 17:52:49 -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
b80587e5b5 Prevent margin call from being triggered unless feed < call #436 2015-12-07 14:59:07 -05:00
theoreticalbts
32f12b9215 Refund order creation fee when order is cancelled #445 2015-12-03 15:48:52 -05:00
theoreticalbts
7a5c5c476d wallet.cpp: Implement propose_builder_transaction2 #467 2015-12-02 16:17:46 -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
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
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
75d1bb39a3 Re-bump fc after inadvertently reverted by #367 2015-11-02 10:22:46 -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
55fef1b161 db_update.cpp: Don't clear expired feeds for non-market-issued assets #410 2015-10-31 16:14:25 -04:00
theoreticalbts
a126520fa3 HARDFORK Allow creation of sub-assets #409 2015-10-31 15:46:53 -04:00
theoreticalbts
dfe228fc85 global_property_object.hpp: Reflect last_budget_time #414 2015-10-31 14:37:56 -04:00
theoreticalbts
966b3edf0c Add hardfork logic #413 2015-10-30 18:07:19 -04:00
Daniel Larimer
5d6091e581 HARDFORK - adding operation to claim asset fees #413 2015-10-30 18:07:19 -04:00
theoreticalbts
032eeda416 generic_index.hpp: Change sparse_index to use ordered_unique 2015-10-30 16:02:36 -04:00
theoreticalbts
4f2b8bd6f6 HARDFORK Move fee blacklist check to evaluator #419 2015-10-30 14:35:50 -04:00
theoreticalbts
d821d4a993 Get rid of enforce_white_list() #416 2015-10-30 14:35:50 -04:00
theoreticalbts
db045f453c Implement hardfork logic for #415 2015-10-30 13:12:37 -04:00
Daniel Larimer
20c8ca8fa1 Fix #398 - reserve_asset was calling fund_fee_pool in wallet 2015-10-30 11:18:52 -04:00
Daniel Larimer
d1f9216f85 HARDFORK enable whitelisting of everyone, but blacklisting of some 2015-10-30 11:17:31 -04:00
theoreticalbts
57015b43fa Add missing FC_REFLECT_TYPENAME #414 2015-10-30 10:47:35 -04:00
Daniel Larimer
0f25cd2a0d Fix Issue #324 - getKeyRefs now returns for memo and active keys 2015-10-30 10:43:53 -04:00
theoreticalbts
fda84dfe8b witness: Submit wakeup time for fc::schedule() on local system clock, not NTP 2015-10-30 10:21:27 -04:00
theoreticalbts
5e91e095c0 vesting_balance_object.cpp: Handle vesting_seconds == 0 case #390 2015-10-30 10:09:50 -04:00
theoreticalbts
a1b00b2749 db_management.cpp: Only pop to last irreversible block, fix #407 2015-10-30 10:04:42 -04:00
Daniel Larimer
2adbe53714 Merge branch 'master' of https://github.com/cryptonomex/graphene 2015-10-26 09:45:13 -04:00
Daniel Larimer
867e87196b update fill order history 2015-10-26 09:44:49 -04:00
Daniel Larimer
7378fb80bc adding API call for market fill history 2015-10-23 18:13:33 -04:00