Commit Graph

4128 Commits

Author SHA1 Message Date
af9da83ce2 Merge branch 'develop' into rpcfrontier 2015-03-18 18:42:21 +01:00
c12046d6bf Merge branch 'ethersphere-frontier/cli-private-network' into develop 2015-03-18 18:39:56 +01:00
79f90bf7c1 added frontier to version 2015-03-18 18:39:24 +01:00
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
baca0c2251 Merge pull request #523 from fjl/docker-fast
Dockerfile: use fast™ build steps
2015-03-18 12:09:20 -04:00
3e52c9439a Merge pull request #522 from fjl/makedag
cmd/ethereum: add makedag command for testing
2015-03-18 16:40:50 +01:00
e30c323391 merge develop 2015-03-18 08:46:55 -04:00
ca8d184173 fix eth tests 2015-03-18 16:31:49 +07:00
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
67c9d9c2fa Remove JsonWrapper 2015-03-17 20:14:19 -04:00
c6f84325b1 Support JSON RPC batch requests 2015-03-17 17:46:22 -04:00
8fd243ee23 Add JSON RPC batch support
http://www.jsonrpc.org/specification#batch
2015-03-17 17:38:05 -04:00
7dbbe1bedc eth/backend: remove spurious and incorrent PeerInfo() 2015-03-18 04:01:47 +07:00
1872418316 eth: remove disused peer_util.go 2015-03-18 03:59:21 +07:00
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
048d4ec5be Merge branch 'rpcfrontier' into develop 2015-03-17 21:30:29 +01:00
917050dc30 Merge branch 'develop' into rpcfrontier 2015-03-17 21:27:34 +01:00
53104b09fa bump 2015-03-17 21:23:05 +01:00
786a58d8b0 Merge pull request #485 from ethersphere/frontier/nodeadmin.js
Frontier console node admin interface
2015-03-17 21:15:23 +01:00
1513413412 Dockerfile: use fast™ build steps 2015-03-17 14:49:37 +01:00
b422835a59 cmd/ethereum: add makedag command for testing 2015-03-17 14:12:34 +01:00
fe819f3b9f Comment out whisper remove identity stubs 2015-03-17 09:11:01 -04:00
9663493ba0 Merge commit 'dffaa678f966f87dcd011671a16b554b29a37549' into develop 2015-03-17 12:02:50 +01:00
dffaa678f9 Squashed 'tests/files/' changes from 0749546..641ebaa
641ebaa Merge branch 'develop' of https://github.com/ethereum/tests into develop
8e44fd4 possibility to launch more than one machine
5498fd5 2 more python fails
99268f3 update random test simulation files
170485e Merge remote-tracking branch 'origin/develop' into develop
4fcdf8f new python fails
e67b68a Merge branch 'develop' of https://github.com/ethereum/tests into develop
3f45f18 BlockRLPTests block fields prefixed with 0000
9fa9bbd Merge pull request #78 from wanderer/develop
222c2b4 update block tests
9d844dd python fails
05233a4 update blockchaintests
7dc0aa2 update JS_API_Test blockchain
6daf1cc added JS_API_test blockchain
e878f7e consitant address format
0e246ce python fail
57ea9a0 random failures
95934e0 add test for callcode to 0
13b8cd2 new python failures
9e60453 remove empty tests
ca6dfa9 uncle older than 6 generation test
cf7e950 some random failures
282090e update gas limits + uncle generation test
bb4c1f4 cppjit failure
cda9d4c more random failures
31ac17a add calldataload big offset test
f6b8e28 remove seedhash and update blockchain tests
ad69f9d add addmod test in order toc check that nothing get downcasted inbetween
38b7db2 a failing test
b9149b5 Merge remote-tracking branch 'origin/develop' into develop
5bea708 more failing tests
478a07d fix missing comma
6d82797 Merge remote-tracking branch 'origin/develop' into develop
2f380e2 random fails
3cd0ce7 Merge pull request #75 from romanman/develop
afa0a43 Update crypto.json
1b9b7b8 Introduce ECIES crypto test

git-subtree-dir: tests/files
git-subtree-split: 641ebaa3cf257c08838c707bebb481d61e708f95
2015-03-17 12:02:49 +01:00
176115e22e More empty param tests 2015-03-16 16:49:51 -04:00
0339a13862 RPC empty args tests 2015-03-16 16:21:51 -04:00
719effa7ec Return error when filter params are not strings 2015-03-16 15:30:31 -04:00
03ac0f18ae Initial support to remove Whisper identities per #491 2015-03-16 14:46:46 -04:00
e5e265d024 Merge branch 'develop' into rpcfrontier 2015-03-16 13:02:41 -04:00
7330c97b5b DRY up the use of toHex in the project and move it to common 2015-03-16 16:56:11 +01:00
17cd7a5817 remove long-running mining test, ethutil -> common 2015-03-16 22:56:05 +07:00
b3e133dd15 Merge branch 'frontier/js' into frontier/nodeadmin.js 2015-03-16 22:50:29 +07:00
73af0302be we do not use the name Frontier Console 2015-03-16 22:49:39 +07:00
b4060da9eb ethutil -> common 2015-03-16 22:48:54 +07:00
5e7702fd05 Merge remote-tracking branch 'upstream/develop' into frontier/js
Conflicts:
	cmd/ethereum/js.go
	javascript/types.go
2015-03-16 22:46:29 +07:00
22893b7ac9 removed compile 2015-03-16 16:31:16 +01:00
5757f547a6 Allow latest/pending in filter options 2015-03-16 10:38:57 -04:00
3cf51d5479 tmp 2015-03-16 12:03:52 +01:00
b523441361 Moved ethutil => common 2015-03-16 11:27:38 +01:00
8139d444f8 Merge remote-tracking branch 'upstream/develop' into frontier/nodeadmin.js 2015-03-16 15:19:09 +07:00
0b8f66ed9e updated godep ethash 2015-03-15 21:47:59 +01:00
22fa59f131 moved to detail 2015-03-15 21:47:35 +01:00
ece5c2aade Merge branch 'frontier/js' into frontier/nodeadmin.js 2015-03-15 22:29:50 +07:00
8393dab470 menubar back to mist main.qml 2015-03-15 22:29:10 +07:00
d2e75cc957 cleaning up unused code 2015-03-15 15:25:09 +01:00
ff86d7d52a Merge branch 'frontier/js' into frontier/nodeadmin.js 2015-03-15 18:43:03 +07:00
7bc40aa963 jsre: remove assetpath using GOPATH from test 2015-03-15 18:42:17 +07:00
c87cc59bdf Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Conflicts:
	README.md
2015-03-15 12:20:58 +01:00
8f84ddbbec Linux build links 2015-03-15 12:20:07 +01:00
0f26a62334 Linux build links 2015-03-15 12:19:26 +01:00