938 commits

Author	SHA1	Message	Date
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
theoreticalbts	3af94b7878	application.cpp: Handle exception in open() by re-indexing #492	2016-01-04 10:38:59 -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
theoreticalbts	eaba77b2d6	Merge branch 'graphene/483-history-fix-op-numbers' into release-2015-12-16	2015-12-16 11:46:38 -05:00
theoreticalbts	7cae3501f8	Fix operation history numbering #483	2015-12-16 11:43:45 -05:00
theoreticalbts	0f67fb655b	config.hpp: Bump DB version	2015-12-15 14:43:38 -05:00
theoreticalbts	e2c7a946cb	Merge branch 'graphene-local/481-history-failed-proposal-ops' into bitshares	2015-12-15 14:42:33 -05:00
theoreticalbts	4d5515702c	Merge branch 'graphene/480-fork-mia-core-exchange' into bitshares	2015-12-15 14:42:02 -05:00
theoreticalbts	f42bbcd087	Fix non-BTS MIA core_exchange_rate check #480	2015-12-15 14:20:00 -05:00
theoreticalbts	7e0e58f441	Discard from _applied_ops when proposal fails #481	2015-12-15 14:14:57 -05:00
Fabian Schuh	a2ce86bf4f	Merge remote-tracking branch 'remotes/origin/467-wallet-propose-account'	2015-12-10 13:01:53 +01:00
theoreticalbts	844df7a7d4	Merge branch 'graphene/undo-patch' into bitshares	2015-12-09 18:21:57 -05: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	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	b80587e5b5	Prevent margin call from being triggered unless feed < call #436	2015-12-07 14:59:07 -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
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	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	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	0c3a7c4bc4	Fix Issue #324 - getKeyRefs now returns for memo and active keys	2015-10-27 13:54:15 -04:00
Daniel Larimer	3273d1f7b6	fetching up to 200 items	2015-10-26 09:52:40 -04:00
Daniel Larimer	a4d4ab0108	Merge branch 'master' into bitshares	2015-10-26 09:45:35 -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	05f05c18ba	Merge branch 'bitshares' of https://github.com/bitshares/bitshares-2 into bitshares	2015-10-23 18:14:40 -04:00
Daniel Larimer	6336a2bc1a	fix conflicts	2015-10-23 18:14:35 -04:00
Daniel Larimer	7378fb80bc	adding API call for market fill history	2015-10-23 18:13:33 -04:00
theoreticalbts	7aa33928f8	Merge branch 'master' into bitshares	2015-10-23 17:39:25 -04:00
theoreticalbts	4fa0f182ec	cli_wallet: Print operation results	2015-10-23 15:00:31 -04:00
theoreticalbts	0d55541682	object_id.hpp: Implement std::string() conversion for object_id_type	2015-10-23 15:00:31 -04:00
theoreticalbts	57969d5018	cli_wallet: Show txid's for transactions in blocks	2015-10-23 15:00:31 -04:00
Daniel Larimer	0ef59f6165	fix build	2015-10-23 13:34:08 -04:00
Daniel Larimer	32d6b22b7b	Merge branch 'master' into bitshares ... Added a hardfork that is scheduled to happen years in the future after this change has been reviewed and approved.	2015-10-23 13:30:42 -04:00
Daniel Larimer	6e554260e5	Issue #393 - HARDFORK to give cash back upon canceling an order	2015-10-23 13:26:18 -04:00
Daniel Larimer	a1640abf81	Merge branch 'master' into bitshares	2015-10-22 10:51:00 -04:00
Daniel Larimer	44b2198f97	normalize blinded_balance reflection	2015-10-22 10:50:51 -04:00
Daniel Larimer	eb105f1065	Merge branch 'master' into bitshares	2015-10-22 10:28:19 -04:00
Daniel Larimer	9b0abe2790	adding api to get recent transactions by id	2015-10-22 10:27:49 -04:00
Daniel Larimer	9afe3420d8	Merge branch 'master' into bitshares	2015-10-22 10:08:16 -04:00
Daniel Larimer	1ff46f0b29	adding api to get trx id from trx	2015-10-22 10:08:07 -04:00
Daniel Larimer	63c286a769	adding transfer2 API that also returns the transaction id	2015-10-22 10:05:34 -04:00
Daniel Larimer	6418f819fd	Merge branch 'master' of https://github.com/cryptonomex/graphene	2015-10-22 09:59:03 -04:00
Daniel Larimer	ddd58e946a	Fix #385 - HARDFORK to expand valid names	2015-10-21 09:29:13 -04:00
Daniel Larimer	3bc8832dde	Merge branch 'master' into bitshares	2015-10-21 08:54:53 -04:00
Daniel Larimer	4e443bded5	Merge branch 'bitshares' of https://github.com/bitshares/bitshares-2 into bitshares	2015-10-20 13:41:16 -04:00
Daniel Larimer	1c9d5c602c	update signature of transfer_to_blind	2015-10-20 13:41:14 -04:00
theoreticalbts	8488731e37	Merge branch 'master' into bitshares	2015-10-20 13:27:57 -04:00
theoreticalbts	4c09d6b8ed	cli_wallet: Implement worker creation and voting	2015-10-20 13:26:25 -04:00
theoreticalbts	5cd73f5683	account_object.cpp: Get rid of no-ops	2015-10-20 12:36:47 -04:00
theoreticalbts	0e41933003	asset_evaluator.cpp: Implement TODO, move feed validation checks from evaluate() to validate()	2015-10-20 12:36:47 -04:00
theoreticalbts	704f943181	address.cpp: Don't special-case BTS prefix	2015-10-20 12:36:47 -04:00
Daniel Larimer	6b469528a1	remove all hardfork checks leftover from testnet	2015-10-20 12:36:47 -04:00
Daniel Larimer	29aec3c28c	remove print spam	2015-10-19 16:48:30 -04:00
Daniel Larimer	af589b2287	cleanly handle db upgrade	2015-10-19 16:48:14 -04:00
Daniel Larimer	fc48ecbfc1	HARDFORK - Enforce asset domains	2015-10-19 16:46:26 -04:00
Daniel Larimer	487046e375	Merge branch 'master' of https://github.com/cryptonomex/graphene	2015-10-19 16:46:05 -04:00
theoreticalbts	66c18c6932	Merge master into bitshares	2015-10-15 13:59:37 -04:00
theoreticalbts	9870b5db0a	reflect_util.hpp: Fix reflection, make propose_fee_change work as intended	2015-10-15 13:52:50 -04:00
Daniel Larimer	546755484a	Fix bug where updated DB version causes crash on restart	2015-10-15 13:52:29 -04:00
Daniel Larimer	6b1b794ff4	prevent excessive saving of wallet backups	2015-10-15 13:52:28 -04:00
Daniel Larimer	ab0d789d72	Fix bug where updated DB version causes crash on restart	2015-10-15 12:07:44 -04:00
Daniel Larimer	c528ea1ff3	update DB VERSION to force replay	2015-10-15 11:40:48 -04:00
Daniel Larimer	aa9ca16cb3	HARDFORK - Change initial permissions for assets created in genesis	2015-10-15 11:08:01 -04:00
Daniel Larimer	e85949584b	Merge branch 'master' into bitshares	2015-10-15 10:27:04 -04:00
Daniel Larimer	e5010aaa5a	improve error messages	2015-10-15 10:26:53 -04:00
Daniel Larimer	d083c5c9de	Merge branch 'master' into bitshares ... Accepted changes from master	2015-10-14 16:22:53 -04:00
Daniel Larimer	f85dec1c23	increasing the maximum undo history	2015-10-14 16:20:29 -04:00
Daniel Larimer	ae4790bcb8	Merge branch 'master' of https://github.com/bitshares/bitshares-2	2015-10-14 16:19:21 -04:00
Daniel Larimer	15e4464300	Merge branch 'master' into bitshares	2015-10-14 14:50:38 -04:00
theoreticalbts	fc95e83732	Merge remote-tracking branch 'graphene/master' into master	2015-10-14 14:41:59 -04:00
Daniel Larimer	39fb95b66c	remove/fix address prefix checking	2015-10-14 14:33:48 -04:00
Daniel Larimer	6a117572fd	prevent excessive saving of wallet backups	2015-10-13 18:19:07 -04:00
Daniel Larimer	29cc90ba99	Fix build	2015-10-13 13:32:58 -04:00
Eric Frias	21caba4cfa	remove stray semicolon that confuses doxygen	2015-10-13 10:44:18 -04:00
Daniel Larimer	5dbe57c3ff	Fix build	2015-10-13 10:34:48 -04:00
theoreticalbts	e410df78c0	Initialize hash when using egenesis	2015-10-13 10:31:49 -04:00
theoreticalbts	3706c88a0b	Initialize hash when using egenesis	2015-10-13 10:30:51 -04:00
Daniel Larimer	098f2cbe2d	remove all hardfork checks leftover from testnet	2015-10-13 09:29:48 -04:00
Eric Frias	03306860d2	win32 compile fix (#warning)	2015-10-13 09:13:16 -04:00
Nicolas Wack	7cb4140b97	Added network get_info api call	2015-10-12 19:24:04 -04:00
theoreticalbts	6646957ce2	db_init.cpp: Make genesis BitAssets require 7 price feeds	2015-10-12 19:23:44 -04:00
Daniel Larimer	b325805878	fix recursion	2015-10-12 18:58:41 -04:00
Nicolas Wack	0892491096	Added network get_info api call	2015-10-12 17:02:47 -04:00
theoreticalbts	9d19358a0c	db_init.cpp: Make genesis BitAssets require 7 price feeds	2015-10-12 17:01:16 -04:00
Daniel Larimer	283de52f38	don't connect to all seeds	2015-10-12 15:16:29 -04:00
Daniel Larimer	63bd27e7d2	adding initial seed nodes	2015-10-12 15:15:46 -04:00
Daniel Larimer	52d88c57c9	prevent assets with BIT prefix	2015-10-12 14:17:18 -04:00
Daniel Larimer	91c8e709fe	change CORE to BTS	2015-10-12 14:04:56 -04:00
theoreticalbts	d0609e8e74	Update copyright notice for BitShares	2015-10-12 13:48:40 -04:00
theoreticalbts	60f0812de2	Update copyright notice	2015-10-12 13:32:47 -04:00
theoreticalbts	9ccbc55ba6	Implement chain_id #374	2015-10-12 13:32:47 -04:00
Daniel Larimer	a61c23fa6a	reduce trx spam messages	2015-10-12 12:06:26 -04:00
theoreticalbts	b6be698c34	fc: Fix #367	2015-10-12 10:10:23 -04:00
Eric Frias	9c650bddb0	Make conversions from boost's uint128_t to builtin int64_t explicit, without these ... the compiler prefers to convert through operator bool yielding either 1 or 0.	2015-10-10 17:13:56 -04:00
theoreticalbts	837e4f254e	wallet.cpp: More detailed logging of exception when broadcasting	2015-10-09 17:22:56 -04:00
Daniel Larimer	55dd3cc26a	update fc	2015-10-09 17:09:30 -04:00