Commit Graph

3818 Commits

Author SHA1 Message Date
377c8a13de Merge branch 'develop' into poc-9 2015-03-05 17:37:18 +01:00
201b09f99a Merge branch 'alexvandesande-ui' into develop 2015-03-05 17:37:09 +01:00
44b83c6ea6 Removed unused variables 2015-03-05 17:37:00 +01:00
12ca70537f Merge branch 'fjl-p2p-handshake-2' into poc-9 2015-03-05 17:26:41 +01:00
ba0c41436c Merge branch 'p2p-handshake-2' of https://github.com/fjl/go-ethereum into fjl-p2p-handshake-2 2015-03-05 17:21:32 +01:00
fabaf4f1f0 wip math 2015-03-05 17:21:16 +01:00
c47866d251 Miner fixes and updates (including miner) 2015-03-05 09:14:58 +01:00
178798ef87 network back to local files 2015-03-04 16:31:48 -03:00
671e38fb65 Fixed Average Return calculation 2015-03-04 15:13:57 -03:00
e1bae3771e updated network app to latest build 2015-03-04 12:59:17 -03:00
215c763d53 eth, p2p: delete p2p.Blacklist
It is unused and untested right now. We can
bring it back later if required.
2015-03-04 16:54:36 +01:00
429828cd92 p2p: reject messages that cannot be written as simple RLPx frames
Until chunked frames are implemented we cannot send messages
with a size overflowing uint24.
2015-03-04 16:42:01 +01:00
22659a7fea p2p: restore read/write timeouts
They got lost in the transition to rlpxFrameRW.
2015-03-04 16:42:00 +01:00
5f25c117eb Merge branch 'develop' into ui 2015-03-04 10:04:07 -03:00
cf880f78d5 network dashboard is now a local file 2015-03-04 10:02:11 -03:00
6e7e5d5fd5 eth, whisper: fix msg.Payload reads 2015-03-04 13:25:01 +01:00
7964f30dcb p2p: msg.Payload contains list data
With RLPx frames, the message code is contained in the
frame and is no longer part of the encoded data.

EncodeMsg, Msg.Decode have been updated to match.
Code that decodes RLP directly from Msg.Payload will need
to change.
2015-03-04 12:27:24 +01:00
21649100b1 p2p: verify protocol handshake node ID 2015-03-04 12:27:24 +01:00
7d39fd6678 p2p: make encryption handshake code easier to follow
This mostly changes how information is passed around.
Instead of using many function parameters and return values,
put the entire state in a struct and pass that.

This also adds back derivation of ecdhe-shared-secret. I deleted
it by accident in a previous refactoring.
2015-03-04 12:27:24 +01:00
2c505efd1e p2p/discover: add NodeID.Pubkey 2015-03-04 12:27:24 +01:00
d344054e5a p2p: make RLPx frame MAC 16 bytes as defined in the spec 2015-03-04 12:27:24 +01:00
d084aed5e9 p2p: delete frameRW 2015-03-04 12:27:24 +01:00
736e632215 p2p: use RLPx frames for messaging 2015-03-04 12:27:23 +01:00
51e01cceca p2p: encrypted and authenticated RLPx frame I/O 2015-03-04 12:27:23 +01:00
936dd0f3bc p2p: add basic RLPx frame I/O 2015-03-04 12:27:23 +01:00
15f491e500 Clean up REPL 2015-03-04 12:18:26 +01:00
5817dab89e Merge branch 'develop' into poc-9 2015-03-04 10:51:44 +01:00
a56243075a removed double flag. Closes #421 2015-03-04 10:51:17 +01:00
84a4f761f3 uncle validation 2015-03-04 10:49:56 +01:00
d4d505c868 Fixed genesis 2015-03-03 21:48:05 +01:00
08fd0715f9 updated genesis 2015-03-03 21:09:29 +01:00
26de12d9bf Changed nonce to a uint64 2015-03-03 21:04:31 +01:00
2b3c55f20d Merge pull request #413 from chfast/pr/jit_build_fixes
JIT build fixes
2015-03-03 20:39:51 +01:00
e9f1e868e2 Merge branch 'develop' into poc-9 2015-03-03 20:38:46 +01:00
827ea43478 removed all old filters 2015-03-03 20:38:28 +01:00
bb152612e0 Merge branch 'develop' into poc-9
Conflicts:
	cmd/utils/cmd.go
2015-03-03 20:34:48 +01:00
cfe3af099c Merge branch 'ethersphere-jsonlogs' into poc-9 2015-03-03 20:31:12 +01:00
f0b2ea64fc Merge branch 'jsonlogs' of https://github.com/ethersphere/go-ethereum into ethersphere-jsonlogs
Conflicts:
	eth/block_pool.go
	eth/block_pool_test.go
	eth/protocol_test.go
	miner/worker.go
2015-03-03 20:30:05 +01:00
2707891966 Merge branch 'ethersphere-blockpool2' into poc-9 2015-03-03 20:27:15 +01:00
d8a68dc0f1 Merge branch 'blockpool2' of https://github.com/ethersphere/go-ethereum into ethersphere-blockpool2 2015-03-03 20:26:59 +01:00
253eb778d1 Merge pull request #411 from ethersphere/readme
[WIP] Update Readme
2015-03-03 20:17:51 +01:00
988391fc37 Merge pull request #409 from tgerring/jsonlogs
Updated JSON log events
2015-03-03 20:16:55 +01:00
b1603f166e Merge pull request #408 from tgerring/removews
Remove Websockets RPC transport
2015-03-03 20:16:16 +01:00
8e995b97cc Fixes and debug added 2015-03-03 20:13:11 +01:00
2c616bd279 partial fix to idle best peer issue
- best peer cannot be idle for more than idleBestPeerTimeout
- introduce ErrIdleTooLong fatal error
- modify default values
2015-03-04 02:06:15 +07:00
8c2940a98b updating to new network health page 2015-03-03 15:00:34 -03:00
40ff3cac39 merge 2015-03-03 17:56:36 +01:00
53b5a45856 Merge branch 'xcthulhu-publictests' into poc-9 2015-03-03 17:55:29 +01:00
313fe3861b fixed pow stuff 2015-03-03 17:55:23 +01:00
22b132e28f Merge branch 'publictests' of https://github.com/xcthulhu/go-ethereum into xcthulhu-publictests 2015-03-03 17:20:34 +01:00