Commit Graph

4438 Commits

Author SHA1 Message Date
Jeffrey Wilcke 3133372a6a Merge pull request #536 from zsfelfoldi/develop
using robertkrimen/otto, godeps updated
2015-03-22 21:45:56 +01:00
obscuren 59eab49cb8 Merge branch 'ethersphere-jsonlog' into develop 2015-03-22 21:43:58 +01:00
obscuren 8b1b9fc99d Merge branch 'jsonlog' of https://github.com/ethersphere/go-ethereum into ethersphere-jsonlog
Conflicts:
	eth/backend.go
2015-03-22 21:43:36 +01:00
obscuren 8ed4f226d1 check for nil ptrs 2015-03-22 15:44:00 +01:00
obscuren 82956df523 Get work / submit work partially implemented.
* WIP missing arguments for submitting new work
* GetWork **done**
2015-03-22 15:38:01 +01:00
Taylor Gerring d186bf0dfe Fix Mist types build errors 2015-03-22 14:25:33 +01:00
Taylor Gerring bf73f02fe0 Remove common.go 2015-03-22 13:48:07 +01:00
Taylor Gerring 360c66c65d Move Big* vars to big.go 2015-03-22 13:46:38 +01:00
Taylor Gerring 2477d10aa0 Move MakeName to path 2015-03-22 13:46:21 +01:00
Taylor Gerring c0741edc34 Move OS-specific funcs to path.go 2015-03-22 13:44:17 +01:00
Taylor Gerring 82a41a198e Move CurrencyToString to size 2015-03-22 13:35:13 +01:00
Taylor Gerring 08b21acff1 Move ToHex/FromHex into bytes 2015-03-22 13:32:52 +01:00
Jeffrey Wilcke 9682a3ef3e Merge pull request #526 from ethersphere/frontier/blockpool
Frontier/blockpool
2015-03-22 13:11:16 +01:00
obscuren e349fb9350 bump 2015-03-22 12:20:27 +01:00
obscuren 13781b922a converted to proper types 2015-03-22 12:12:29 +01:00
zelig 0edb33566f fix blockpool test logger 2015-03-22 02:18:07 +00:00
zelig 78cff9e3a4 independent flag for json structured logging
- logjson flag remove logformat flag
- passed to eth Config
- logsystem not a field of Ethereum
- LogSystem does not need to expose GetLogLevel/SetLogLevel
- message struct just implements more generic LogMsg interface
- LogMsg is a fmt.Stringer with Level()
- jsonMsg ([]byte) implements LogMsg
- remove "raw" systems
- move level logic inside StdLogSystem
- logsystems only print their kind of msg: jsonLogSystem prints jsonMsg, StdLogSystem prints stdMsg
2015-03-22 02:16:54 +00:00
zelig 95038fc62d Idle too long error incorrectly triggered even when peer sending new blocks
- fix status chain map uses common.Hash as key
- add badPeers increment to IncorrectTD errors (forgotten)
- signal head info update to head section process even if parent hash is not in pool (inserted), so that idle timer can be set to nil
- suicideC -> peer.headInfoTimer
- quit -> peer.bestIdleTimer
- and they are properly set from within getBlockHashes and handleSection
2015-03-22 02:02:24 +00:00
obscuren 7f85608f30 Merge branch 'conversion' into develop 2015-03-21 18:18:19 +01:00
Jeffrey Wilcke 09766d1729 Merge pull request #535 from maran/fixReadmeLink
Fix link to build instructions in the readme
2015-03-21 18:16:55 +01:00
obscuren fcacfabe19 Added new ethereum.js 2015-03-21 15:09:03 +01:00
obscuren 83728e4b64 Merge branch 'develop' into conversion
Conflicts:
	rpc/responses.go
2015-03-21 14:54:25 +01:00
obscuren 004f5008ff Merge branch 'rpcfrontier' into develop 2015-03-21 14:53:12 +01:00
obscuren a7ad9c309b Merge branch 'develop' into conversion 2015-03-21 14:52:42 +01:00
obscuren 38c7c589e4 Merge branch 'rpcfrontier' into develop 2015-03-21 14:52:31 +01:00
obscuren ce862ee758 Removed some comments 2015-03-21 14:51:45 +01:00
obscuren 4300f2a0fa Fixed state tests 2015-03-21 14:47:50 +01:00
obscuren c28116cb3b Fixed incorrect recipient derived 2015-03-21 14:46:50 +01:00
obscuren 06697775d1 Merge branch 'conversion' of github.com-obscure:ethereum/go-ethereum into conversion 2015-03-21 14:36:20 +01:00
Taylor Gerring 9edb9a21bc Add json LogSystem #538 2015-03-21 07:26:44 +01:00
Taylor Gerring 670021da15 Rename topic to topics #544 2015-03-21 07:08:33 +01:00
Felix Lange 069c87b960 whisper: use common.Hash 2015-03-21 00:57:18 +01:00
Felix Lange 7c4ff3abb4 eth: enable whisper again 2015-03-21 00:50:20 +01:00
Felix Lange 483d43a15a whisper: use package rlp 2015-03-21 00:49:58 +01:00
Felix Lange a829a56587 rlp: add Stream.Raw 2015-03-21 00:49:31 +01:00
Felix Lange 81800ca39e Merge remote-tracking branch 'ethereum/conversion' into conversion 2015-03-20 22:47:27 +01:00
Felix Lange b95ff54632 cmd/blocktest: delete package
Blocktests are now integrated in cmd/ethereum.
2015-03-20 22:46:41 +01:00
Felix Lange b41185a68f rlp: fix nil pointer decoding
The generic pointer decoder did not advance the input position
for empty values. This can lead to strange issues and even
infinite loops.
2015-03-20 22:33:40 +01:00
obscuren abce6804a0 Right pad bytes to prevent future programmers making bugs 2015-03-20 20:37:56 +01:00
obscuren f4e9638867 Merge branch 'ethersphere-frontier/blockpool' into conversion 2015-03-20 18:01:05 +01:00
obscuren ecd10d2cf7 iterator returned wrong value 2015-03-20 18:00:54 +01:00
obscuren 1821d1af48 Merge branch 'frontier/blockpool' of https://github.com/ethersphere/go-ethereum into ethersphere-frontier/blockpool 2015-03-20 17:42:25 +01:00
obscuren 54dac59285 wip 2015-03-20 17:42:09 +01:00
obscuren a59bb053f4 merge 2015-03-20 16:02:01 +01:00
obscuren deee9cb170 Added caching for block chain. Currently set to 10k 2015-03-20 15:54:42 +01:00
Taylor Gerring 28e1971272 Merge branch 'rpcxeth' into rpcfrontier
Conflicts:
	rpc/api.go
2015-03-20 15:25:43 +01:00
Taylor Gerring 0cde7a4d46 Add xethAtStateNum convenience method 2015-03-20 14:56:55 +01:00
Taylor Gerring efcc93e7da Move Account register to xeth 2015-03-20 14:12:07 +01:00
Felix Lange 28ddc16a9b Merge remote-tracking branch 'ethereum/conversion' into conversion 2015-03-20 14:01:35 +01:00
Felix Lange c161d73d42 common: drop accessors for Value.Val
I don't see why we would need two different accessors for a public field.
2015-03-20 14:00:26 +01:00