3133372a6a
Merge pull request #536 from zsfelfoldi/develop
...
using robertkrimen/otto, godeps updated
2015-03-22 21:45:56 +01:00
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
d186bf0dfe
Fix Mist types build errors
2015-03-22 14:25:33 +01:00
e349fb9350
bump
2015-03-22 12:20:27 +01:00
13781b922a
converted to proper types
2015-03-22 12:12:29 +01:00
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
a7ad9c309b
Merge branch 'develop' into conversion
2015-03-21 14:52:42 +01:00
b95ff54632
cmd/blocktest: delete package
...
Blocktests are now integrated in cmd/ethereum.
2015-03-20 22:46:41 +01:00
8324b683b4
using robertkrimen/otto, godeps updated
2015-03-20 13:22:01 +01:00
4f5b362bda
%#x => %x
2015-03-20 12:52:03 +01:00
91f9f355b2
test
2015-03-20 12:17:57 +01:00
df5901fdc5
Removed more casts
2015-03-19 22:45:03 +01:00
b5a71d955c
merge
2015-03-19 16:59:13 +01:00
93ba3df4ff
Removed frontier from version :-(
2015-03-19 15:36:38 +01:00
ad7e491214
improved test output
2015-03-19 15:04:29 +01:00
d4e5747d04
Merge branch 'develop' into conversion
2015-03-19 14:31:41 +01:00
d7ab716eea
Fixed mkdnode & added some tests
2015-03-19 10:57:02 +01:00
f0bb136099
Merge branch 'develop' into conversion
2015-03-18 18:42:01 +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
f9a6038f5b
merge
2015-03-18 18:23:37 +01:00
064279c0ec
cmd/ethereum, cmd/utils: partial fix for chain import
2015-03-18 14:04:44 +01:00
d15f90645d
Merge remote-tracking branch 'ethereum/conversion' into conversion
2015-03-18 13:39:01 +01:00
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
0a1eeca41e
conversions. -compilable-
2015-03-18 13:00:01 +01: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
53104b09fa
bump
2015-03-17 21:23:05 +01:00
b422835a59
cmd/ethereum: add makedag command for testing
2015-03-17 14:12:34 +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
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
b523441361
Moved ethutil => common
2015-03-16 11:27:38 +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
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
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
31ffca6d8a
remove jsre from mist
2015-03-15 13:18:58 +07:00
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
2a5fbced7f
removed seed hash
2015-03-14 23:39:45 +01:00
d9966d6158
merge
2015-03-14 23:37:21 +01:00
9754e7aca7
Support for addresses with or without 0x. Fixes #472
2015-03-14 11:40:13 +01:00
67f8f83a1b
cmd/ethereum: add blocktest command
2015-03-13 18:41:09 +01:00
58d9d98daf
cmd/utils: GetEthereum -> MakeEthConfig
...
This allows changing the config before starting Ethereum
with it.
2015-03-13 18:41:09 +01:00
80592f244d
more obvious failure for ethtest
2015-03-12 23:26:58 +01:00
fa917387e4
Merge branch 'rpcfrontier' into develop
2015-03-12 22:31:13 +01:00
347cb272be
fixed ethtest
2015-03-12 19:41:56 +01:00
fb71c9f6ee
Return 1 on fail
2015-03-12 18:22:56 +01:00
7235e84c75
#469
2015-03-12 11:09:25 -05:00
d11fabd2ef
Update path to web3 library
2015-03-12 10:08:01 -05:00
f7c3c7eda4
Update ethereum.js
...
Added to git modules
2015-03-12 10:03:35 -05:00
2a0e5888fd
Merge pull request #460 from tgerring/ethutil
...
Move MakeName to ethutil
2015-03-12 14:45:31 +01:00
31a95151c9
updated rnd vm test => state test
2015-03-12 01:12:28 +01:00
d5aaf413e0
cmd/ethereum: remove extra check for 'no accounts' error
...
This error can no longer be returned from eth.New.
2015-03-11 23:43:27 +01:00
d7b5a87b3b
miner: provide coinbase when starting the miner
...
This avoids having to query the coinbase when creating the miner, which
in turn eliminates the dreaded startup error when no accounts are set
up. Later, this will also allow us to simply restart the miner when the
user picks a different coinbase.
This causes a lot of changes in other packages. These are included in
this commit because they're impossible to separate.
2015-03-11 23:43:27 +01:00
485e37e889
Move MakeName to ethutil
2015-03-11 14:29:07 -05:00
629f4b1d3c
merge
2015-03-11 17:46:58 +01:00
6b63759ded
Reverted global
2015-03-11 16:33:04 +01:00
99bc44cf52
cmd/ethereum: add a flag to switch to unencrytped keystore
...
This is mostly for automated tests. The tests can use the following
commands to start the node:
ethereum --unencrypted-keys account new
...
ethereum --unencrypted-keys
2015-03-11 13:58:01 +01:00
7e0ccc9de5
Merge branch 'develop' into rpcfrontier
...
Conflicts:
rpc/api.go
rpc/args.go
2015-03-11 01:08:42 +01:00
ce595b9266
fallback
2015-03-10 20:28:20 +01:00
f22684439a
Updated RPC
...
* Added a generic RawMessage deserialiser
* Updated ethereum.js
* Updated coin test app
2015-03-10 20:14:38 +01:00
269cfbb8ac
Merge branch origin/develop into accounts-integration
...
Conflicts:
cmd/blocktest/main.go
cmd/mist/debugger.go
cmd/utils/cmd.go
2015-03-10 17:14:31 +01:00
972e2c1e31
cmd/utils: improve CLI help templates
...
Help for a specific command now shows available subcommands.
2015-03-10 16:44:48 +01:00
221fae4112
cmd/ethereum: show some help before prompting for encryption passphrase
2015-03-10 16:44:22 +01:00
0bb7377ebe
cmd/ethereum: show more helpful message if no accounts exist
2015-03-10 15:44:05 +01:00
c3f94a4341
cmd/utils: remove extra space in fatal error message
2015-03-10 15:42:25 +01:00
0395c174ca
cmd/ethereum: fix line editing setup and history
2015-03-10 14:31:54 +01:00
bbe8b18660
Added unmarshalState
2015-03-10 13:40:49 +01:00
0542df941f
Merge pull request #449 from Gustav-Simonsson/add_blockchain_tests2
...
Add empty total difficulty to test blocks and clean up stopping the node
2015-03-10 12:07:34 +01:00
56524d13b5
removed debugger
2015-03-10 12:06:16 +01:00
c9b6d268b4
Merge pull request #438 from ethersphere/poc9/cli
...
Poc9/cli (exportchain)
2015-03-10 11:24:47 +01:00
80985f97da
cmd/evm, core, ethdb, state, tests/helper: remove ReadConfig calls
2015-03-10 02:39:53 +01:00
ae38871a54
cmd/ethereum: remove "prompter" in identifiers
2015-03-10 02:33:59 +01:00
9f0e3bd286
cmd/ethereum: unlock accounts on JS REPL
2015-03-10 02:00:57 +01:00
d1e04f7388
cmd/ethereum: allow multiple js files
2015-03-10 00:24:11 +01:00
487f68ec48
accounts: add {Timed,}Unlock, remove SignLocked
2015-03-10 00:19:01 +01:00
9bf513e993
Merge ethereum/poc-9 into accounts-integration
...
Conflicts:
cmd/utils/cmd.go
cmd/utils/flags.go
core/manager.go
eth/backend.go
rpc/http/server.go
xeth/xeth.go
2015-03-09 23:25:46 +01:00
cd51860bf0
cmd/utils: delete InitConfig, KeyTasks
2015-03-09 23:08:47 +01:00
697f6748b8
cmd/mist: use cli library and package accounts
2015-03-09 23:08:47 +01:00
a11f1d6a7e
rpc: add dataDir parameter and JSON-RPC handler
2015-03-09 23:08:46 +01:00
73d1ebe244
cmd/utils: add NewApp
2015-03-09 23:08:46 +01:00
2dacb51fb0
cmd/blocktest: simplify to fix build
...
block tests only need the chain, not all of ethereum.
2015-03-09 23:07:24 +01:00
27c42ea934
Add empty total difficulty to test blocks and clean up stopping the node
2015-03-09 18:03:35 +01:00
20741a96ac
Updated xeth instances to take extra param for ui.Interface
...
Please be aware that if any of the instances on xeth.frontend are called
the program will crash due to the default, temporarily, frontend
interface.
2015-03-09 13:50:05 +01:00
41a89e18f6
version output
...
- make version output more verbose
- include NetworkId
- go version and os not displayed like env vars (confusing)
2015-03-08 22:50:27 +07:00
51eed7964e
add export blockchain subcommand, remove BlockDo
2015-03-08 22:44:48 +07:00
fb53a9362e
accounts: AccountManager -> Manager
2015-03-08 01:58:35 +01:00
69920c735a
Bump v
2015-03-08 00:59:26 +01:00
e26ebc3110
Updated ethereum.js
2015-03-08 00:54:18 +01:00
a2810c06d7
cmd/ethereum: add account commands
2015-03-07 12:39:52 +01:00
cd856cb213
Separated block db from state db. Partial fix for #416
2015-03-06 18:26:16 +01:00
ed84b58af5
Debug option for VM & command line flag
2015-03-06 16:58:52 +01:00
bc45e5c6de
Integrate eth_accounts and eth_transact to use new account manager
...
* Add from to eth_transact / xeth.Transact and add static pass in lieu
of integrating with native Mist window for user passphrase entry
* Make eth_accounts return AccountManager.Accounts()
* Add a Generate Key menu item in Mist
2015-03-06 13:10:42 +00:00
e64f727529
Merge pull request #433 from fjl/newcli
...
Improved CLI
2015-03-06 14:02:16 +01:00
de86403f33
cmd/ethereum: fix JS REPL exit and add support for dumb terminals
...
It is now possible to exit the REPL using Ctrl-C, Ctrl-D or by typing "exit".
2015-03-06 13:08:11 +01:00
38f6d60e6e
cmd/ethereum: new JS repl with cross-platform line editing
2015-03-06 03:57:13 +01:00
bae7e93a9c
cmd/ethereum: improve command line interface
...
The ethereum command line interface is now structured using subcommands.
These separate the different tasks it can perform.
Almost all flag names are backwards compatible.
The key tasks have not been ported to subcommands since they will be
replaced by the new accounts infrastructure very soon.
2015-03-06 03:57:13 +01:00
bdba044a80
ethutil: remove Config variable
...
Various functions throughout the codebase used it to grab settings. This
has to stop because I want to use them without reading the config file.
These functions can now be used without reading the config first:
* ethdb.NewLDBDatabase
* ethrepl.NewJSRepl
* vm.New
2015-03-06 02:46:56 +01:00
3b30765378
Merge pull request #426 from Gustav-Simonsson/add_blockchain_tests
...
Add initial implementation of block tests
2015-03-05 17:43:56 +01:00
377c8a13de
Merge branch 'develop' into poc-9
2015-03-05 17:37:18 +01:00
44b83c6ea6
Removed unused variables
2015-03-05 17:37:00 +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
871dfd399b
Add initial implementation of block tests
...
* Add blocktest cmd and support for block tests files in
tests/BlockTests , the launched node does not connect to
network, resets state with a genesis block from the test file
and starts the RPC API
2015-03-04 20:27:09 +01: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
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
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
08fd0715f9
updated genesis
2015-03-03 21:09:29 +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
253eb778d1
Merge pull request #411 from ethersphere/readme
...
[WIP] Update Readme
2015-03-03 20:17:51 +01:00
8e995b97cc
Fixes and debug added
2015-03-03 20:13:11 +01: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
313fe3861b
fixed pow stuff
2015-03-03 17:55:23 +01:00
21c373b55d
Network Health Panel with mining
2015-03-02 18:39:07 -03:00
deb2e50296
minor cleanup
2015-03-03 01:45:50 +07:00
4cb0bfe939
Merge branch 'develop' of github.com:ethereum/go-ethereum into removews
...
Conflicts:
cmd/ethereum/flags.go
cmd/mist/flags.go
2015-03-02 07:06:08 -06:00
cfe0370280
Remove Websockets RPC transport
2015-03-01 16:19:06 +01:00
fdf939a6f9
Fixed miner threads for ethereum CLI
2015-02-28 23:01:41 +01:00
cdb77f0ecd
Merge pull request #402 from tgerring/rpcupdates
...
Set RPC listening address via param
2015-02-28 21:07:46 +01:00
ae45a39dc1
Secure trie
2015-02-28 20:52:29 +01:00
7ab13e0f17
Unused variable
2015-02-28 20:24:20 +01:00
6ea7aae29c
Removed some methods from the JS REPL
2015-02-28 19:15:57 +01:00
f6e821fd33
Add flag to set RPC port
2015-02-28 01:00:42 +01:00
3ab05ddd25
Bump
2015-02-26 20:26:37 +01:00
a1c830cd3c
Defautl block
2015-02-26 12:06:10 +01:00
739b7cc2ac
Cleanup imports
2015-02-26 02:36:06 +01:00
d5aed82b11
DRY DefaultAssetPath()
2015-02-26 02:32:27 +01:00
8eeab7ea3f
Update osext import path
2015-02-26 02:24:20 +01:00
91a8c08f03
Merge pull request #368 from maran/feature/changeDataDir
...
Implement OS sensitive dataDirs
2015-02-24 17:30:44 +01:00
b2a225a52e
Properly uninstall filters. Mining issue fixed #closes #365
...
* Added an additional tx state which is used to get the current nonce
* Refresh transient state each time a new canonical block is found
* Properly uninstall filters. Fixes a possible crash in RPC
2015-02-23 15:43:41 +01:00
dea6584018
Merge branch 'develop' into ui
2015-02-23 09:05:15 -03:00
bb3338df63
changes to sidebar sizes
2015-02-23 08:52:50 -03:00
40adb7feb6
Implement OS sensitive dataDirs
2015-02-23 11:28:20 +01:00
321dce1f47
Bump
2015-02-22 13:26:10 +01:00
483d96a89d
Added eth_logs & fixed issue with manual log filtering
...
* Implemented `eth_logs`
* Fixed issue with `filter.Find()` where logs were appended to an
incorrect, non-returned slice resulting in no logs found
2015-02-22 13:12:01 +01:00
92337baa5a
reverted back to proper version number
2015-02-21 00:42:57 +01:00
cc43ab9a81
Minor updates for release
2015-02-20 18:05:46 +01:00
ea9a549bbd
Removed exported fields from state object and added proper set/getters
2015-02-20 14:19:34 +01:00
0006585391
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
2015-02-19 22:46:15 +01:00
639ac5c3da
Merge pull request #352 from fjl/no-enc-handshake
...
p2p: disable encryption handshake, enable log events
2015-02-19 22:46:07 +01:00
765740b829
Merge pull request #345 from maran/feature/minerthreads
...
Implement command line argument to set the amount miner threads
2015-02-19 22:37:13 +01:00
07c34751da
Merge pull request #335 from alexvandesande/ui
...
Cut, Copy, Undo and Redo working in webview
2015-02-19 22:36:35 +01:00
fa4cbad315
Optimisations and fixed a couple of DDOS issues in the miner
2015-02-19 22:33:22 +01:00
1ec6190e86
cmd/mist: show peer names in peers window
2015-02-19 16:54:53 +01:00
4322632c59
Merge pull request #339 from tgerring/jsonlog
...
JSON log updates
2015-02-19 12:25:45 +01:00
0057bb4ef6
WIP QT Clipboard
2015-02-19 11:51:38 +01:00
5aff8bfb59
Implement command line argument to set the amount of agents created by the miner
...
Defaults to the amount of cores available on the CPU
2015-02-19 10:38:36 +01:00
05b1ec008b
Disabled ability to disable whisper. Closes #334
2015-02-18 11:42:01 +01:00
07bdba687f
Re-add LogFormat to Config
2015-02-18 10:52:36 +01:00
acd93c2971
Removed console logs from mist.js
...
also fixed an issue where it would force reloads unnecessarily
2015-02-18 10:25:40 +01:00
60318c96d0
removed old wallet
2015-02-17 23:22:42 +01:00
c1474e1877
Removed mined transactions from pending view. Closes #321
2015-02-17 23:10:37 +01:00
7fc9b5b3f9
Changed to ChainEvent and fixed a nil pointer in transact
2015-02-17 22:20:47 +01:00
0e2f6691bf
Cut, Copy, Undo and Redo working in webview
2015-02-17 17:37:26 +01:00
13c00afc68
Implement register and watchTx
2015-02-17 16:54:52 +01:00
5238b9439e
Merge branch 'alexvandesande-ui' into develop
2015-02-17 16:18:40 +01:00
9a2be227a6
commented peer count out
2015-02-17 16:18:29 +01:00
fe94622ea3
Merge branch 'ui' of https://github.com/alexvandesande/go-ethereum into develop
2015-02-17 16:13:06 +01:00
567428fb34
Filter and mutex locks added
2015-02-17 16:12:55 +01:00
abb9b7f46f
Merge branch 'develop' into ui
2015-02-17 12:29:10 +01:00
8135752a32
"centralised" mining to backend. Closes #323
2015-02-17 12:24:58 +01:00
fbd5e4d5af
Updated icons
2015-02-17 11:52:22 +01:00
0de1d1dd58
removed status bar code
2015-02-17 11:23:28 +01:00
a22711a7b5
badge support
2015-02-17 11:22:52 +01:00
c4b8c11529
side icons
2015-02-17 00:52:40 +01:00
666ef48239
SideIcons work. Copy paste still doesn't.
2015-02-16 20:55:14 +01:00
3068e2688d
merge conflicts
2015-02-16 14:43:30 +01:00
1878630b59
Solved Issue #318 and added states to back button
2015-02-16 14:34:47 +01:00
164de5e22b
Changed default denominators
2015-02-16 13:20:16 +01:00
05f2808849
Add http when not present on browser
2015-02-16 11:17:31 +01:00
2c3a014f03
Resolved some bugs in the miner
...
* TODO nonce error sometimes persists
* Fixed mining on wrong blocks
* Fixed state error & receipt fail
2015-02-15 16:16:27 +01:00
12fc590b34
removed some old menu items
2015-02-15 01:58:15 +01:00
c29b01ce75
Reset URL bar
2015-02-14 17:18:28 +01:00
befb4bc1c1
Fixed a few errors in the browser special meta tags objects
2015-02-14 17:13:21 +01:00
65159d65c8
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
2015-02-14 00:27:46 +01:00
84f7c966f7
Moved ECIES to repo & added secondary title for webview
...
* ECIES moved from obscuren to ethereum
* Added html META[name=badge] to reflect menuItem.secondaryTitle
2015-02-14 00:25:47 +01:00
8464e43eaf
cmd/mist: fix peer window
2015-02-14 00:12:37 +01:00
384305f4aa
Fixed QML errors
2015-02-13 18:33:08 +01:00
7aef0fed29
changed url bar behaviour. Failed attempt at icon
2015-02-13 18:32:15 +01:00
6a7b0ef904
Updated coin.js abi
2015-02-13 18:17:17 +01:00
ce239333d5
Update balance label when mining
2015-02-13 18:15:23 +01:00
0f3c25b265
Propagate blocks
2015-02-13 18:03:16 +01:00
790de35e7f
Fixed issue in peer window
...
* Fixed issues where new peer window could cause a crash when entering
an empty string
2015-02-13 17:57:46 +01:00
218f437b0c
Updated window
2015-02-13 17:30:37 +01:00
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
8305d409d2
Merge branch 'develop' into miner
2015-02-13 17:00:15 +01:00
bde3ff16ad
merge
2015-02-13 16:02:37 +01:00
76fa75b394
wip
2015-02-13 15:35:54 +01:00
a5ea21cd85
merge
2015-02-13 15:05:56 +01:00
170eb3ac68
p2p/discover: map listening port using configured mechanism
2015-02-13 11:39:32 +01:00
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
Jeffrey Wilcke
obscuren
Taylor Gerring
zelig
Felix Lange
zsfelfoldi
Maran
Gustav Simonsson
Alexandre Van de Sande