Commit graph

207 commits

Author SHA1 Message Date
theoreticalbts
d6863a587c Merge branch graphene/develop into bitshares at commit '447018b319668deddf4d55baac168c1afc0a5e21'
Conflicts:
	libraries/chain/include/graphene/chain/hardfork.hpp
	libraries/fc
2016-02-16 11:16:36 -05:00
theoreticalbts
ce8a6ec518 Merge branch graphene/develop into bitshares at commit '399e0ed9f970908ea7c2c5c43a64a28303c143b8' 2016-02-16 11:05:33 -05:00
theoreticalbts
42140fccaa Merge branch graphene/develop into bitshares at commit 'f1b19b15' 2016-02-16 11:04:31 -05:00
theoreticalbts
aa6d13b057 Remove by_account index from account_object #529 2016-01-21 10:39:13 -05:00
theoreticalbts
b5480db341 api.cpp: Add break to every case in get_relevant_accounts #513 2016-01-08 14:35:07 -05:00
theoreticalbts
d6878852f0 confidential_object.hpp: Move confidential objects into own header #466 2016-01-08 13:06:14 -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
3c7a4525d7 Merge branch '503-api-new-market-api' into develop 2016-01-07 14:23:24 -05:00
Michael Vandeberg
f7bfcea355 Implement new market API #503 2016-01-07 14:12:03 -05:00
theoreticalbts
f1b19b1562 Merge branch '496-cleanup-license-header' into develop 2016-01-07 13:38:52 -05:00
Michael Vandeberg
acfbad2cd4 Adds a cryptography API. 2016-01-07 12:57:29 -05:00
Fabian Schuh
5111084730 [License] Modify cpp and hpp headers to MIT #496 2016-01-07 11:44:52 -05:00
theoreticalbts
3680b67271 Merge branch '481-history-failed-proposal-ops' into develop 2016-01-07 11:30:50 -05:00
Daniel Larimer
16b59e0b42 adding seed node 2016-01-03 22:10:56 -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
020dc2e789 Merge branch 'graphene/develop' into prerel-2015-12-07 2015-12-07 17:45:45 -05:00
emfrias
ec876f3def update blocktrades seed node DNS address 2015-12-04 15:24: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
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
b03ac00b6c database_api.cpp: Recursively evaluate proposal fees #434 2015-11-05 16:02:39 -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
Daniel Larimer
5d6091e581 HARDFORK - adding operation to claim asset fees #413 2015-10-30 18:07:19 -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
867e87196b update fill order history 2015-10-26 09:44:49 -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
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
3bc8832dde Merge branch 'master' into bitshares 2015-10-21 08:54:53 -04:00
Daniel Larimer
af589b2287 cleanly handle db upgrade 2015-10-19 16:48:14 -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
29cc90ba99 Fix build 2015-10-13 13:32:58 -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
Nicolas Wack
7cb4140b97 Added network get_info api call 2015-10-12 19:24:04 -04:00
Nicolas Wack
0892491096 Added network get_info api call 2015-10-12 17:02:47 -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
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