Commit Graph

274 Commits

Author SHA1 Message Date
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
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 8393dab470 menubar back to mist main.qml 2015-03-15 22:29:10 +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 d9966d6158 merge 2015-03-14 23:37:21 +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
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
Taylor Gerring f7c3c7eda4 Update ethereum.js
Added to git modules
2015-03-12 10:03:35 -05:00
Felix Lange 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
obscuren 7e0ccc9de5 Merge branch 'develop' into rpcfrontier
Conflicts:
	rpc/api.go
	rpc/args.go
2015-03-11 01:08:42 +01:00
obscuren ce595b9266 fallback 2015-03-10 20:28:20 +01:00
obscuren f22684439a Updated RPC
* Added a generic RawMessage deserialiser
* Updated ethereum.js
* Updated coin test app
2015-03-10 20:14:38 +01:00
Felix Lange 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
Felix Lange 0bb7377ebe cmd/ethereum: show more helpful message if no accounts exist 2015-03-10 15:44:05 +01:00
obscuren bbe8b18660 Added unmarshalState 2015-03-10 13:40:49 +01:00
obscuren 56524d13b5 removed debugger 2015-03-10 12:06:16 +01:00
Felix Lange 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
Felix Lange 697f6748b8 cmd/mist: use cli library and package accounts 2015-03-09 23:08:47 +01:00
obscuren 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
obscuren 69920c735a Bump v 2015-03-08 00:59:26 +01:00
obscuren e26ebc3110 Updated ethereum.js 2015-03-08 00:54:18 +01:00
obscuren cd856cb213 Separated block db from state db. Partial fix for #416 2015-03-06 18:26:16 +01:00
Gustav Simonsson 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
Felix Lange e64f727529 Merge pull request #433 from fjl/newcli
Improved CLI
2015-03-06 14:02:16 +01:00
Felix Lange 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
obscuren 377c8a13de Merge branch 'develop' into poc-9 2015-03-05 17:37:18 +01:00
obscuren 44b83c6ea6 Removed unused variables 2015-03-05 17:37:00 +01:00
obscuren c47866d251 Miner fixes and updates (including miner) 2015-03-05 09:14:58 +01:00
Alexandre Van de Sande 178798ef87 network back to local files 2015-03-04 16:31:48 -03:00
Alexandre Van de Sande 671e38fb65 Fixed Average Return calculation 2015-03-04 15:13:57 -03:00
Alexandre Van de Sande e1bae3771e updated network app to latest build 2015-03-04 12:59:17 -03:00
Alexandre Van de Sande 5f25c117eb Merge branch 'develop' into ui 2015-03-04 10:04:07 -03:00
Alexandre Van de Sande cf880f78d5 network dashboard is now a local file 2015-03-04 10:02:11 -03:00
obscuren 827ea43478 removed all old filters 2015-03-03 20:38:28 +01:00
Jeffrey Wilcke 253eb778d1 Merge pull request #411 from ethersphere/readme
[WIP] Update Readme
2015-03-03 20:17:51 +01:00
Alexandre Van de Sande 8c2940a98b updating to new network health page 2015-03-03 15:00:34 -03:00
Alexandre Van de Sande 21c373b55d Network Health Panel with mining 2015-03-02 18:39:07 -03:00
zelig deb2e50296 minor cleanup 2015-03-03 01:45:50 +07:00
Taylor Gerring 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
Taylor Gerring cfe0370280 Remove Websockets RPC transport 2015-03-01 16:19:06 +01:00
Taylor Gerring f6e821fd33 Add flag to set RPC port 2015-02-28 01:00:42 +01:00
obscuren 3ab05ddd25 Bump 2015-02-26 20:26:37 +01:00
obscuren a1c830cd3c Defautl block 2015-02-26 12:06:10 +01:00
Taylor Gerring 739b7cc2ac Cleanup imports 2015-02-26 02:36:06 +01:00
Taylor Gerring d5aed82b11 DRY DefaultAssetPath() 2015-02-26 02:32:27 +01:00
Taylor Gerring 8eeab7ea3f Update osext import path 2015-02-26 02:24:20 +01:00