Jeffrey Wilcke
3133372a6a
Merge pull request #536 from zsfelfoldi/develop
...
using robertkrimen/otto, godeps updated
2015-03-22 21:45:56 +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
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
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
obscuren
a7ad9c309b
Merge branch 'develop' into conversion
2015-03-21 14:52:42 +01:00
Felix Lange
b95ff54632
cmd/blocktest: delete package
...
Blocktests are now integrated in cmd/ethereum.
2015-03-20 22:46:41 +01:00
zsfelfoldi
8324b683b4
using robertkrimen/otto, godeps updated
2015-03-20 13:22:01 +01:00
obscuren
4f5b362bda
%#x => %x
2015-03-20 12:52:03 +01:00
obscuren
91f9f355b2
test
2015-03-20 12:17:57 +01:00
obscuren
df5901fdc5
Removed more casts
2015-03-19 22:45:03 +01:00
obscuren
b5a71d955c
merge
2015-03-19 16:59:13 +01:00
obscuren
93ba3df4ff
Removed frontier from version :-(
2015-03-19 15:36:38 +01:00
obscuren
ad7e491214
improved test output
2015-03-19 15:04:29 +01:00
obscuren
d4e5747d04
Merge branch 'develop' into conversion
2015-03-19 14:31:41 +01:00
obscuren
d7ab716eea
Fixed mkdnode & added some tests
2015-03-19 10:57:02 +01:00
obscuren
f0bb136099
Merge branch 'develop' into conversion
2015-03-18 18:42:01 +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
Felix Lange
064279c0ec
cmd/ethereum, cmd/utils: partial fix for chain import
2015-03-18 14:04:44 +01:00
Felix Lange
d15f90645d
Merge remote-tracking branch 'ethereum/conversion' into conversion
2015-03-18 13:39:01 +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
obscuren
0a1eeca41e
conversions. -compilable-
2015-03-18 13:00:01 +01: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
obscuren
53104b09fa
bump
2015-03-17 21:23:05 +01:00
Felix Lange
b422835a59
cmd/ethereum: add makedag command for testing
2015-03-17 14:12:34 +01:00
zelig
17cd7a5817
remove long-running mining test, ethutil -> common
2015-03-16 22:56:05 +07:00
zelig
b3e133dd15
Merge branch 'frontier/js' into frontier/nodeadmin.js
2015-03-16 22:50:29 +07:00
zelig
73af0302be
we do not use the name Frontier Console
2015-03-16 22:49:39 +07:00
zelig
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
obscuren
22893b7ac9
removed compile
2015-03-16 16:31:16 +01:00
obscuren
b523441361
Moved ethutil => common
2015-03-16 11:27:38 +01:00
zelig
ece5c2aade
Merge branch 'frontier/js' into frontier/nodeadmin.js
2015-03-15 22:29:50 +07:00
zelig
8393dab470
menubar back to mist main.qml
2015-03-15 22:29:10 +07:00
zelig
132e87a707
node admin interface for Frontier Console, see spec https://github.com/ethereum/go-ethereum/wiki/Frontier-Console
2015-03-15 13:43:48 +07:00
zelig
7279a485c2
CLI:
...
- js subcommand for vm
- console for Frontier console interactive REPL
- jspath in cli
- integrate jeth apiBindings
2015-03-15 13:31:40 +07:00
zelig
31ffca6d8a
remove jsre from mist
2015-03-15 13:18:58 +07:00
zelig
da44097800
jsre:
...
- require became loadScript(), no require is supplied
- bignumber_js.go: heredoc v2.0.3 minified fixed for otto Regexp incompatibility https://github.com/robertkrimen/otto#regular-expression-incompatibility
- bignumber.min.js also updated in mist/assets/ext
- ethereum_js.go: latest master minified
- assetPath in constructor
- Eval/Exec/Handle/ToVal nice API
- jsre tests
2015-03-15 13:13:39 +07:00
obscuren
2a5fbced7f
removed seed hash
2015-03-14 23:39:45 +01:00
obscuren
d9966d6158
merge
2015-03-14 23:37:21 +01:00
Maran
9754e7aca7
Support for addresses with or without 0x. Fixes #472
2015-03-14 11:40:13 +01:00
Felix Lange
67f8f83a1b
cmd/ethereum: add blocktest command
2015-03-13 18:41:09 +01:00
Felix Lange
58d9d98daf
cmd/utils: GetEthereum -> MakeEthConfig
...
This allows changing the config before starting Ethereum
with it.
2015-03-13 18:41:09 +01:00
obscuren
80592f244d
more obvious failure for ethtest
2015-03-12 23:26:58 +01:00
obscuren
fa917387e4
Merge branch 'rpcfrontier' into develop
2015-03-12 22:31:13 +01:00
obscuren
347cb272be
fixed ethtest
2015-03-12 19:41:56 +01:00
obscuren
fb71c9f6ee
Return 1 on fail
2015-03-12 18:22:56 +01:00
Taylor Gerring
7235e84c75
#469
2015-03-12 11:09:25 -05:00
Taylor Gerring
d11fabd2ef
Update path to web3 library
2015-03-12 10:08:01 -05:00
