Commit graph

15 commits

Author SHA1 Message Date
Eric Frias
8927e800af Merge branch 'github_master'
Conflicts:
	CMakeLists.txt
	libraries/fc
	libraries/wallet/include/graphene/wallet/wallet.hpp
2015-07-14 17:33:03 -04:00
Vikram Rajkumar
6043586d15 Rename bad references to delegate -> witness; #147 2015-07-13 16:08:17 -04:00
Vikram Rajkumar
12d8f3732e Minor 2015-07-13 16:08:16 -04:00
theoreticalbts
e201e59b3d Define GRAPHENE_MIN_BLOCK_INTERVAL and use it to fix minimum_time_of_last_offered_block logic #154 2015-07-13 12:33:52 -04:00
Daniel Larimer
04b8820b3b Merge branch 'master' into fee_refactor 2015-07-09 16:34:56 -04:00
theoreticalbts
ae7b904e4a Clean up some unused files 2015-07-09 11:59:06 -04:00
Daniel Larimer
fdcf821c41 Progress on #144 - refactoring fee schedule 2015-07-08 18:45:53 -04:00
Eric Frias
609f5a746e Quiet harmless compiler warnings 2015-07-01 11:16:25 -04:00
Eric Frias
49acfb3bd6 Fix up application_impl's has_item() which was throwing to indicate a
missing item instead of returning false.  #55
2015-06-25 10:36:28 -04:00
Eric Frias
37cadb2be8 Create directory for storing p2p config if it doesn't already exist 2015-06-24 18:21:20 -04:00
Eric Frias
11b357494b Remove leveldb code from peer database, replace with writing to json
file.  Still need to add code to periodically write the file out to
disk.
2015-06-24 18:21:20 -04:00
Eric Frias
1b9ca9ffe8 Add wallet command for whitelisting accounts.
Re-enable shutdown in node code which was causing some (not all) of the
errors in two_node_network test #55, and likely occasional crashes at
shutdown for the witness node
2015-06-20 18:36:02 -04:00
Daniel Larimer
ca89d5057c remove dependency on level db, bugs left to fix 2015-06-16 15:56:13 -04:00
Eric Frias
d1e2449290 Fix up submodules, add compile fixes 2015-06-10 18:54:12 -04:00
Nathan Hourt
0a945b0257 Initial commit 2015-06-08 12:36:37 -04:00