obscuren
7336dfad02
Merge branch 'develop' into poc8
2015-02-13 17:23:48 +01:00
obscuren
00fca40939
Merge branch 'miner' into develop
2015-02-13 17:23:18 +01:00
obscuren
8a0f23915e
Fixed a few issues in the miner and updated hash rate title
...
* Sometimes old nonces were set by "old" agents
* Added the hash rate to the miner
2015-02-13 17:23:09 +01:00
obscuren
8305d409d2
Merge branch 'develop' into miner
2015-02-13 17:00:15 +01:00
obscuren
5c251b6928
Merge branch 'fjl-poc8-net-integration' into develop
2015-02-13 16:08:30 +01:00
obscuren
bde3ff16ad
merge
2015-02-13 16:02:37 +01:00
Gustav Simonsson
39434e383b
Unexport randEntropy type and use exported Reader instead
2015-02-13 15:38:26 +01:00
obscuren
76fa75b394
wip
2015-02-13 15:35:54 +01:00
Felix Lange
32a9c0ca80
p2p: bump devp2p protcol version to 3
...
For compatibility with cpp-ethereum
2015-02-13 15:08:40 +01:00
Felix Lange
fd3e1061e0
p2p: handle disconnect before protocol handshake
2015-02-13 15:06:47 +01:00
Felix Lange
cf754b9483
p2p/discover: fix race in ListenUDP
...
udp.Table was assigned after the readLoop started, so
packets could arrive and be processed before the Table was there.
2015-02-13 15:06:47 +01:00
Felix Lange
5cc1256fd6
p2p: ensure we don't dial ourself
...
addPeer doesn't allow self connects, but we can avoid opening
connections in the first place.
2015-02-13 15:06:47 +01:00
Felix Lange
7101f44998
p2p: add I/O timeout for encrytion handshake
2015-02-13 15:06:47 +01:00
Felix Lange
22ee366ed6
p2p: fix goroutine leak for invalid peers
...
The deflect logic called Disconnect on the peer, but the peer never ran
and wouldn't process the disconnect request.
2015-02-13 15:06:46 +01:00
obscuren
75d164037f
Merge branch 'logjson' into develop
2015-02-13 15:06:32 +01:00
obscuren
a5ea21cd85
merge
2015-02-13 15:05:56 +01:00
Felix Lange
5110f80bba
p2p: improve read deadlines
...
There are now two deadlines, frameReadTimeout and payloadReadTimeout.
The frame timeout is longer and allows for connections that are idle.
The message timeout is still short and ensures that we don't get stuck
in the middle of a message.
2015-02-13 14:44:00 +01:00
Christoph Jentzsch
4ee0f90b46
Merge pull request #59 from winsvega/develop
...
new solidity tests, manual altered transaction tests
2015-02-13 12:47:02 +01:00
winsvega
ddc830be5c
new tests
...
solidity test
wrong transaction rlp (manual)
2015-02-13 14:20:47 +03:00
Felix Lange
170eb3ac68
p2p/discover: map listening port using configured mechanism
2015-02-13 11:39:32 +01:00
Felix Lange
82f0bd9009
p2p/discover: code review fixes
2015-02-13 11:39:31 +01:00
Felix Lange
d0a2e655c9
cmd/ethereum, cmd/mist, eth, p2p: use package p2p/nat
...
This deletes the old NAT implementation.
2015-02-13 11:39:31 +01:00
Felix Lange
1543833ca0
p2p/nat: new package for port mapping stuff
...
I have verified that UPnP and NAT-PMP work against an older version of
the MiniUPnP daemon running on pfSense. This code is kind of hard to
test automatically.
2015-02-13 11:39:31 +01:00
CJentzsch
4e3377333f
Merge remote-tracking branch 'origin/develop' into develop
2015-02-13 09:10:27 +01:00
CJentzsch
a681d1ec02
performance test
2015-02-13 09:09:11 +01:00
obscuren
38faf2c51a
removed messages
2015-02-12 17:06:15 +01:00
obscuren
31fdc645ed
cmd + t switches to new dapp window
2015-02-12 15:03:53 +01:00
wanderer
1000b02b18
bump
2015-02-12 00:56:22 -05:00
Gustav Simonsson
5136fc9ab7
Fix ECIES params nil bug
...
* Change ECIES params init function to static var as it does not have
state; fixes TestMarshalencryption.
2015-02-12 02:35:35 +01:00
Jeffrey Wilcke
04c1a81509
Merge pull request #2 from Gustav-Simonsson/correct_ecies_shared_key_generation
...
Correct ECIES shared key length check
2015-02-12 00:10:00 +01:00
obscuren
b64ad7a2a6
Merge branch 'develop' into miner
2015-02-11 23:46:54 +01:00
obscuren
3f6baa45a7
Documented methods & removed old manifest
2015-02-11 23:46:45 +01:00
Gustav Simonsson
52a46e61f9
Correct ECIES shared key length check
...
* Ensure the ECIES shared key is padded with zero bytes if it's
smaller than the requested key length.
* Split the ECIES shared key error into two;
one for when the generated key is too big for the params
and one for when it's nil (point of infinity returned by the
curve scalar multiplication).
2015-02-11 20:28:42 +01:00
obscuren
558c67d392
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
2015-02-11 20:22:19 +01:00
Jeffrey Wilcke
d73dff4d5b
Merge pull request #303 from fjl/rlp-flat
...
rlp: add Flat
2015-02-11 20:22:04 +01:00
Felix Lange
b94f85de22
rlp: add Flat
2015-02-11 19:28:56 +01:00
obscuren
1fc3524e40
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
2015-02-11 19:22:38 +01:00
Jeffrey Wilcke
ebc506dae8
Merge pull request #302 from alexvandesande/UI
...
Catalog Page Behaviour
2015-02-11 19:22:23 +01:00
Alexandre Van de Sande
6221b282d4
Catalog Page Behaviour
2015-02-11 19:16:35 +01:00
Taylor Gerring
db24fb792c
Move standard fields to LogEvent
2015-02-11 18:49:00 +01:00
Taylor Gerring
d311b1b9b7
Merge pull request #301 from ethereum/travis
...
Updates to Travis config
2015-02-11 14:25:44 +01:00
Taylor Gerring
3c40eb9e5a
Temporarily skip broken TestVerifyPoW
2015-02-11 13:47:03 +01:00
obscuren
df49c609a0
updated coin
2015-02-11 13:26:44 +01:00
Taylor Gerring
3d6fd601c5
Move event names within each object
2015-02-11 12:45:41 +01:00
Taylor Gerring
ef6c7bd726
Merge pull request #300 from tgerring/jsonrpc
...
Allow RPC ID to be string or null
2015-02-11 11:59:51 +01:00
Taylor Gerring
d613bf69bf
#295 Allow RPC ID to be string
2015-02-11 11:56:29 +01:00
Taylor Gerring
cfddb7f3cd
Merge branch 'develop' into jsonrpc
...
Conflicts:
rpc/ws/server.go
2015-02-11 11:40:12 +01:00
Taylor Gerring
c6af5f0a27
No longer switch branches for go-qml dep
2015-02-11 11:30:36 +01:00
Taylor Gerring
e433525f51
Merge branch 'sveneh-origin_develop' into develop
2015-02-11 11:28:39 +01:00
Taylor Gerring
ab66a3d0d3
Merge branch 'origin_develop' of https://github.com/sveneh/go-ethereum into sveneh-origin_develop
2015-02-11 11:03:40 +01:00
