Commit graph

275 commits

Author SHA1 Message Date
Fabian Schuh
6885f215a4 Merge pull request #7 from btscube/bitshares
Update bitcube's seed node address
2016-03-08 08:54:10 +01:00
Michael Vandeberg
4b346579a8 Fixed to follow QUOTE:BASE semantics. Cleanup and added in wallet calls that were missed in last merge. #592 2016-02-25 16:46:31 -05:00
theoreticalbts
4096d34f88 Merge remote-tracking branch 'graphene/develop' into bitshares at commit 8dd7dbc5b8 2016-02-23 13:40:26 -05:00
Michael Vandeberg
a675023b9f #592 Fixes ticker except for percent change of market 2016-02-22 14:02:20 -05:00
theoreticalbts
4f9bf7cc21 Merge remote-tracking branch 'graphene/develop' into bitshares at commit 1153d77dba
Conflicts:
	libraries/chain/include/graphene/chain/config.hpp
2016-02-16 11:32:14 -05:00
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
Fabian Schuh
b574e815a3 Remove unnecessariy warning 2016-02-16 10:01:13 +01: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
5dd56bd824 Implement FBA fee routing for STEALTH #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
c33fe35e4e Implement buyback accounts #538 2016-02-11 04:59:28 -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
a1e8fc0741 Implement top_n special authority #516 2016-01-27 10:30:32 -05:00
theoreticalbts
aa6d13b057 Remove by_account index from account_object #529 2016-01-21 10:39:13 -05:00
abitmore
d6db289717 Add alt's seed node 2016-01-13 10:30:33 +01:00
abitmore
65f7c1ca62 Remove the extra comma from seed node list 2016-01-12 23:04:27 +01:00
abitmore
16b34f66be Add harvey's seed node 2016-01-12 22:48:21 +01: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
root
33728e3e6a Update bitcube's seed node address 2016-01-05 16:18:17 +08:00
theoreticalbts
3af94b7878 application.cpp: Handle exception in open() by re-indexing #492 2016-01-04 10:38:59 -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
Daniel Larimer
f7c91be622 fix market history 2015-10-09 16:31:40 -04:00
Daniel Larimer
efd5e96192 clean up shutdown 2015-10-09 15:05:14 -04:00
theoreticalbts
17aac27bec application.cpp: Implement --force-validate command line option 2015-10-08 15:26:13 -04:00
Daniel Larimer
8e96d9c89c clean up print statements, minimize undo/fork history 2015-10-07 10:15:32 -04:00
Daniel Larimer
650af1778d Merge branch 'master' of github.com:cryptonomex/graphene 2015-09-29 10:49:14 -04:00
Daniel Larimer
edcd46dd14 fix reindex with failed proposed transaction 2015-09-29 10:49:12 -04:00
theoreticalbts
9d3bcbb569 Provide objects to trace budget computations 2015-09-28 15:46:37 -04:00
theoreticalbts
2cf80cd04a Remove vestigial meta objects #246 2015-09-28 12:15:17 -04:00
Daniel Larimer
738abf03af adding API call to get potential address sigs: Fix #337 2015-09-23 18:22:38 -04:00
Eric Frias
5bfbe0df86 When a we're in normal (in-sync) mode and we get a block that doesn't link to the chain, restart sync with that peer to try to get the missing block 2015-09-21 16:15:51 -04:00
theoreticalbts
44f5bac305 api: Fix get_config API call #333 2015-09-21 11:01:10 -04:00
theoreticalbts
f7980f5252 scheduler: Refactor 26007bb655 to use witness_schedule_object
The functionality is equivalent, but it now uses a separate witness_schedule_object,
and the code now lives in db_witness_schedule.cpp.
2015-09-18 14:26:54 -04:00
Daniel Larimer
26007bb655 update shuffling algorithm 2015-09-18 13:42:12 -04:00
Daniel Larimer
465280fbcb Improved Logging, track blocks missed by witnesses 2015-09-18 09:13:17 -04:00
theoreticalbts
f0502ee2f1 Implement virtual op for settlement cancel #250 2015-09-17 15:46:15 -04:00
theoreticalbts
e008cbb70b database_api.cpp: Include smart_ref_impl, fix #321 2015-09-17 13:45:12 -04:00
Eric Frias
1177cfe0ed Reverse direction of fork history used in block syncing 2015-09-15 09:19:39 -04:00
Daniel Larimer
f506c2b089 better debugging messages around crashes 2015-09-15 08:38:27 -04:00
Daniel Larimer
640d69aa05 Merge branch 'master' of github.com:cryptonomex/graphene 2015-09-14 18:07:09 -04:00
Daniel Larimer
225acfff25 fetch workers by vote_id 2015-09-14 18:07:07 -04:00
Eric Frias
f0f12076fa Win32 compile fixes 2015-09-14 16:05:32 -04:00
Eric Frias
30ae8e4f34 Remove debugging code 2015-09-11 19:27:31 -04:00
Daniel Larimer
1202c0258d Merge branch 'p2p_sync_fixes' 2015-09-11 17:57:11 -04:00
Daniel Larimer
127ac7f3de add api to query worker state 2015-09-11 17:47:27 -04:00
Daniel Larimer
cf7a67ec76 Merge branch 'master' of github.com:cryptonomex/graphene 2015-09-11 17:35:07 -04:00
Eric Frias
76a36a67ac Fix race condition that happens when we're pushing sync blocks faster than get_synopsis calls are getting through to the main thread 2015-09-11 17:33:20 -04:00
Eric Frias
e9e3b0d679 Fix an instance where we were reporting that the peer was on an unreachable blockchain when they really weren't 2015-09-11 16:15:05 -04:00
Eric Frias
0046cc0698 Fix error messages generated when peer is syncing with empty blockchain 2015-09-11 15:26:55 -04:00
theoreticalbts
a083f7b955 api: Split database_api off into own file, reorder methods by topic 2015-09-11 12:37:36 -04:00
Eric Frias
8e9bd890a8 Fix bugs, improve logging in p2p sync 2015-09-10 19:33:11 -04:00
Eric Frias
928b6934e0 Merge branch 'master' into p2p_sync_fixes
Conflicts:
	libraries/chain/include/graphene/chain/database.hpp
2015-09-10 17:34:20 -04:00
Daniel Larimer
70746b82ad Merge branch 'master' of github.com:cryptonomex/graphene 2015-09-10 16:23:02 -04:00