obscuren
e67d32b467
Merge commit '85fa3790ac9f67232f0e31e7f861c66ef0e0047e' into develop
2015-03-18 22:13:08 +01:00
Taylor Gerring
da427e8843
Merge branch 'rpcutil' into rpcfrontier
2015-03-18 15:57:06 -04:00
Taylor Gerring
0685810ec6
Tests
2015-03-18 15:48:40 -04:00
Taylor Gerring
e02eedb43e
BlockNumber as int fix
2015-03-18 15:48:34 -04:00
Taylor Gerring
7cbcd81ddc
Remove UnmarshalRawMessages
2015-03-18 15:42:57 -04:00
obscuren
5f35e6778f
Merge branch 'rpcfrontier' into conversion
2015-03-18 18:42:30 +01:00
obscuren
af9da83ce2
Merge branch 'develop' into rpcfrontier
2015-03-18 18:42:21 +01:00
obscuren
f0bb136099
Merge branch 'develop' into conversion
2015-03-18 18:42:01 +01:00
obscuren
c12046d6bf
Merge branch 'ethersphere-frontier/cli-private-network' into develop
2015-03-18 18:39:56 +01:00
obscuren
79f90bf7c1
added frontier to version
2015-03-18 18:39:24 +01:00
obscuren
bc5ae94384
Merge branch 'frontier/cli-private-network' of https://github.com/ethersphere/go-ethereum into ethersphere-frontier/cli-private-network
2015-03-18 18:37:20 +01:00
obscuren
f9a6038f5b
merge
2015-03-18 18:23:37 +01:00
Taylor Gerring
baca0c2251
Merge pull request #523 from fjl/docker-fast
...
Dockerfile: use fast™ build steps
2015-03-18 12:09:20 -04:00
Felix Lange
3e52c9439a
Merge pull request #522 from fjl/makedag
...
cmd/ethereum: add makedag command for testing
2015-03-18 16:40:50 +01:00
Taylor Gerring
60c43d1952
Remove i2hex
2015-03-18 11:10:08 -04:00
Taylor Gerring
7c9bc8517d
Remove RpcServer
2015-03-18 11:08:49 -04:00
obscuren
4d0ae8b0cb
Merge branch 'conversion' of github.com-obscure:ethereum/go-ethereum into conversion
2015-03-18 14:16:07 +01:00
obscuren
48dd601de0
prep template for fixed size hashes
2015-03-18 14:15:58 +01:00
Felix Lange
064279c0ec
cmd/ethereum, cmd/utils: partial fix for chain import
2015-03-18 14:04:44 +01:00
Taylor Gerring
e30c323391
merge develop
2015-03-18 08:46:55 -04:00
Felix Lange
d15f90645d
Merge remote-tracking branch 'ethereum/conversion' into conversion
2015-03-18 13:39:01 +01:00
Felix Lange
a59dd393e7
core: fix tests
2015-03-18 13:38:47 +01:00
Felix Lange
b5b83db450
core: use package rlp to encode blocks
...
This also changes the chain export format so there is no
enclosing list around the blocks, which enables streaming export.
2015-03-18 13:36:48 +01:00
Felix Lange
c298148a7f
core/types: use package rlp instead of common.Decode
2015-03-18 13:24:34 +01:00
Felix Lange
b94a6a0193
rlp: add DecodeBytes
...
Über-convenience.
2015-03-18 13:17:39 +01:00
obscuren
0a1eeca41e
conversions. -compilable-
2015-03-18 13:00:01 +01:00
obscuren
942980609f
conversions
2015-03-18 11:44:25 +01:00
obscuren
cd52ef315c
Added Hex methods
2015-03-18 11:44:17 +01:00
zelig
ca8d184173
fix eth tests
2015-03-18 16:31:49 +07:00
zelig
b6aa88c099
private network support
...
- protocolversion, networkid global int flags to cli and mist
- fix bug with protocolversion check using wrong db
- log protocolversion & networkid in backend
2015-03-18 14:44:58 +07:00
Taylor Gerring
67c9d9c2fa
Remove JsonWrapper
2015-03-17 20:14:19 -04:00
Felix Lange
cb009a5c4d
rlp: don't panic for nil *big.Int
...
All other pointer types can handle nil just fine.
2015-03-17 23:49:49 +01:00
Taylor Gerring
c6f84325b1
Support JSON RPC batch requests
2015-03-17 17:46:22 -04:00
Taylor Gerring
8fd243ee23
Add JSON RPC batch support
...
http://www.jsonrpc.org/specification#batch
2015-03-17 17:38:05 -04:00
zelig
7dbbe1bedc
eth/backend: remove spurious and incorrent PeerInfo()
2015-03-18 04:01:47 +07:00
zelig
1872418316
eth: remove disused peer_util.go
2015-03-18 03:59:21 +07:00
obscuren
142e81258c
Merge branch 'develop' into conversion
2015-03-17 21:40:05 +01:00
Jeffrey Wilcke
3ea99f989f
Merge pull request #498 from maran/feature/drytoHex
...
DRY up the use of toHex in the project and move it to common
2015-03-17 21:31:42 +01:00
obscuren
048d4ec5be
Merge branch 'rpcfrontier' into develop
2015-03-17 21:30:29 +01:00
obscuren
917050dc30
Merge branch 'develop' into rpcfrontier
2015-03-17 21:27:34 +01:00
obscuren
53104b09fa
bump
2015-03-17 21:23:05 +01:00
Felix Lange
786a58d8b0
Merge pull request #485 from ethersphere/frontier/nodeadmin.js
...
Frontier console node admin interface
2015-03-17 21:15:23 +01:00
obscuren
86661de077
Fixed tests and bloom
2015-03-17 18:00:03 +01:00
obscuren
c21293cd91
bloom
2015-03-17 16:05:17 +01:00
Felix Lange
1513413412
Dockerfile: use fast™ build steps
2015-03-17 14:49:37 +01:00
Felix Lange
b422835a59
cmd/ethereum: add makedag command for testing
2015-03-17 14:12:34 +01:00
Taylor Gerring
fe819f3b9f
Comment out whisper remove identity stubs
2015-03-17 09:11:01 -04:00
obscuren
0fa7859b94
Fixed VM & Tests w/ conversion
2015-03-17 13:24:25 +01:00
obscuren
ff55c6f5ba
Merge branch 'develop' into conversion
...
Conflicts:
common/types.go
2015-03-17 13:09:22 +01:00
obscuren
b0ebccb31e
fixed to
2015-03-17 12:56:29 +01:00