aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
Commit message (Collapse)AuthorAgeFilesLines
* geth: fixed failing cli testsobscuren2015-04-151-2/+2
|
* geth: added print block to adminobscuren2015-04-141-1/+32
|
* Merge pull request #700 from bas-vk/issue_650Jeffrey Wilcke2015-04-133-26/+154
|\ | | | | Added blockchain DB versioning support, closes #650
| * Added blockchain DB versioning support, closes #650Bas van Kervel2015-04-133-26/+154
| |
* | Updated glogobscuren2015-04-111-11/+15
| |
* | Bumpobscuren2015-04-111-1/+1
| |
* | Added pprofobscuren2015-04-101-0/+8
| |
* | cmd/mist: fix another nil recipient address panic.Péter Szilágyi2015-04-101-7/+5
|/
* Merge pull request #682 from bas-vk/issue_567Jeffrey Wilcke2015-04-101-4/+3
|\ | | | | bugfix as a result of PR 671
| * bugfix as a result of PR 671Bas van Kervel2015-04-101-4/+3
| |
* | Added some quotes ....obscuren2015-04-101-1/+1
| |
* | Added proper contract for registrarobscuren2015-04-092-3/+3
| |
* | bumpobscuren2015-04-091-1/+1
| |
* | added contractsobscuren2015-04-091-0/+6
| |
* | Added default registrarobscuren2015-04-091-0/+1
| |
* | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-04-094-4/+164
|\ \
| * \ Merge pull request #678 from bas-vk/feature_635Jeffrey Wilcke2015-04-091-2/+1
| |\ \ | | | | | | | | Support for import/export hex encoded keys
| | * | Support for import/export hex encoded keys, closes #635Bas van Kervel2015-04-091-2/+1
| | | |
| * | | Merge pull request #671 from bas-vk/issue_567Jeffrey Wilcke2015-04-093-2/+163
| |\ \ \ | | | |/ | | |/| Add path expansion support for command line arguments, closes 567
| | * | reformat code with goimportsBas van Kervel2015-04-093-94/+94
| | | |
| | * | Add path expansion support for command line arguments, closes 567Bas van Kervel2015-04-083-3/+164
| | |/
* | / Updated xeth loggerobscuren2015-04-091-1/+1
|/ /
* | Default log to stderrobscuren2015-04-091-1/+2
| |
* | Fixed tests to reflect log changesobscuren2015-04-092-9/+9
| |
* | ignore invalid txs right after being added if they prove incorrectobscuren2015-04-091-2/+5
|/
* updated loggingobscuren2015-04-072-8/+6
|
* Updated loggingobscuren2015-04-072-4/+11
|
* Block header changed & console miner controlobscuren2015-04-061-3/+24
| | | | | | * miner control moved to `admin.miner` * miner option to set extra data * block extra now bytes
* v bumpobscuren2015-04-051-1/+1
|
* reflect ethash changesobscuren2015-04-051-1/+1
|
* removed hash rate from info log. Added hashrate js funcobscuren2015-04-051-0/+5
|
* set backtrace during runtimeobscuren2015-04-051-0/+12
|
* bumped version numberobscuren2015-04-041-1/+1
|
* added verbosity to js adminobscuren2015-04-041-0/+13
|
* basic glogobscuren2015-04-041-4/+0
|
* Merge branch 'develop' into glogobscuren2015-04-041-1/+1
|\
| * version bumpobscuren2015-04-031-1/+1
| |
* | glog wipobscuren2015-04-032-0/+21
|/
* fixed stack levelobscuren2015-04-031-3/+0
|
* updated coinobscuren2015-04-031-10/+4
|
* updated ethereum.jsobscuren2015-04-021-0/+0
|
* info => debugobscuren2015-04-021-1/+1
|
* Merge pull request #589 from tgerring/corssettingJeffrey Wilcke2015-04-014-16/+31
|\ | | | | Configurable CORS domain
| * Abstract http into rpc packageTaylor Gerring2015-03-302-15/+18
| | | | | | | | New RpcConfig object to pass growing config
| * Add flag to control CORS header #394Taylor Gerring2015-03-303-1/+13
| | | | | | | | | | * Disabled on CLI * http://localhost on Mist
* | ethereum.js updateobscuren2015-04-011-0/+0
| |
* | fixed testsobscuren2015-04-011-2/+2
| |
* | Blocktest fixed, Execution fixedobscuren2015-04-011-1/+1
|/ | | | | | * Added new CreateAccount method which properly overwrites previous accounts (excluding balance) * Fixed block tests (100% success)
* Etherbase => etherbaseobscuren2015-03-271-1/+1
|
* Merge pull request #580 from ethersphere/frontier/cli-keyJeffrey Wilcke2015-03-272-5/+11
|\ | | | | settable etherbase
| * settable etherbasezelig2015-03-272-5/+11
| | | | | | | | | | | | | | | | - etherbase flag for block reward destination - coinbase => etherbase - CLI- eth Config -> eth, xeth -> RPC / Miner - use primary instead of coinbase as the unlock magic wildcard - accounts: firstAddr/Coinbase -> Primary
* | Use ExtraDB for storage. Fixes #577Taylor Gerring2015-03-273-7/+4
|/
* renamed ethereum => gethobscuren2015-03-275-5/+5
|
* max paranoia mode to UNsupport unencrypted keys entirelyzelig2015-03-272-92/+71
| | | | | | | - remove account export functionality from CLI - remove accountExport method, - remove unencrypted-keys flag from everywhere - improve documentation
* output error message if unlock address is invalid (fixes the wierd "read ↵zelig2015-03-271-1/+5
| | | | /path: is a directory") msg
* unlocking coinbase without knowing addresszelig2015-03-271-2/+7
| | | | | - accounts: remove Manager.getKey - cli: for -unlock coinbase, use account manager Coinbase()
* common: remove WriteFile and ReadAllFile (use ioutil instead)zelig2015-03-274-10/+13
|
* Applying: fix adming js test regression (maybe otto update?)zelig2015-03-271-1/+1
|
* cli test: fix test newJSRE interactive argumentzelig2015-03-271-1/+1
|
* cli: implement ethereum presale wallet import via clizelig2015-03-271-27/+47
|
* cli: help formattingzelig2015-03-272-14/+19
|
* cli: fix liner not closing (spuriously opened) in noninteractive jsrezelig2015-03-272-4/+4
|
* unlocking coinbasezelig2015-03-271-1/+4
| | | | | - extract accounts.getKey method - if given empty address it retrieves coinbase (first account) - cli -unlock coinbase will unlock coinbase
* import/export accountszelig2015-03-272-30/+152
| | | | | | | | | | | - cli: add passwordfile flag - cli: change unlock flag only takes account - cli: with unlock you are prompted for password or use passfile with password flag - cli: unlockAccount used in normal client start (run) and accountExport - cli: getPassword used in accountCreate and accountImport - accounts: Manager.Import, Manager.Export - crypto: SaveECDSA (to complement LoadECDSA) to save to file - crypto: NewKeyFromECDSA added (used in accountImport and New = generated constructor)
* bumpobscuren2015-03-271-1/+1
|
* updated web3.jsobscuren2015-03-261-0/+0
|
* Updated example for new ethereum.jsobscuren2015-03-261-4/+4
|
* Godep issue?obscuren2015-03-261-1/+1
|
* updated ethereum.jsobscuren2015-03-251-0/+0
|
* Removed full pathobscuren2015-03-251-1/+1
|
* bumpobscuren2015-03-251-2/+2
|
* fixed testobscuren2015-03-251-3/+13
|
* Better error reporting in the console. Updated ethereum.jsobscuren2015-03-252-11/+15
|
* fixed testsobscuren2015-03-241-4/+4
|
* Merge pull request #552 from ethersphere/jsonlogTaylor Gerring2015-03-241-5/+4
|\ | | | | Jsonlog
| * fix ethtest loggingzelig2015-03-241-5/+4
| |
* | Add Close() method to EthereumApiTaylor Gerring2015-03-241-0/+1
|/ | | | To close the handler for LDB
* moved state and vm to coreobscuren2015-03-236-8/+8
|
* Fix new types for blocktests and comment out non-working log level setterGustav Simonsson2015-03-231-1/+1
|
* gofmtGustav Simonsson2015-03-231-1/+1
|
* Add validation of post state accounts to block testsGustav Simonsson2015-03-231-2/+9
|
* In blocktest cmd, disable network and add RPC flagGustav Simonsson2015-03-232-5/+12
|
* Merge pull request #548 from tgerring/typescleanupJeffrey Wilcke2015-03-234-10/+10
|\ | | | | Fix Mist types build errors
| * Fix Mist types build errorsTaylor Gerring2015-03-224-10/+10
| |
* | Merge pull request #536 from zsfelfoldi/developJeffrey Wilcke2015-03-233-3/+10
|\ \ | | | | | | using robertkrimen/otto, godeps updated
| * | using robertkrimen/otto, godeps updatedzsfelfoldi2015-03-203-4/+11
| | |
* | | Merge branch 'jsonlog' of https://github.com/ethersphere/go-ethereum into ↵obscuren2015-03-232-6/+6
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | ethersphere-jsonlog Conflicts: eth/backend.go
| * | independent flag for json structured loggingzelig2015-03-222-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | bumpobscuren2015-03-221-1/+1
| | |
* | | converted to proper typesobscuren2015-03-221-29/+29
|/ /
* | Merge branch 'develop' into conversionobscuren2015-03-211-2/+2
|\ \
| * | %#x => %xobscuren2015-03-201-1/+1
| |/
| * testobscuren2015-03-201-1/+1
| |
* | cmd/blocktest: delete packageFelix Lange2015-03-211-213/+0
| | | | | | | | Blocktests are now integrated in cmd/ethereum.
* | Removed more castsobscuren2015-03-201-2/+1
| |
* | mergeobscuren2015-03-191-1/+1
|\|
| * Removed frontier from version :-(obscuren2015-03-191-1/+1
| |
* | improved test outputobscuren2015-03-191-24/+45
| |
* | Merge branch 'develop' into conversionobscuren2015-03-191-7/+12
|\|
| * Fixed mkdnode & added some testsobscuren2015-03-191-7/+12
| |
* | Merge branch 'develop' into conversionobscuren2015-03-193-35/+48
|\|
| * added frontier to versionobscuren2015-03-191-1/+1
| |
| * Merge branch 'frontier/cli-private-network' of ↵obscuren2015-03-193-34/+47
| |\ | | | | | | | | | https://github.com/ethersphere/go-ethereum into ethersphere-frontier/cli-private-network
| | * private network supportzelig2015-03-183-34/+47
| | | | | | | | | | | | | | | | | | - protocolversion, networkid global int flags to cli and mist - fix bug with protocolversion check using wrong db - log protocolversion & networkid in backend
* | | mergeobscuren2015-03-191-0/+21
|\| |
| * | cmd/ethereum: add makedag command for testingFelix Lange2015-03-171-0/+21
| |/
* | cmd/ethereum, cmd/utils: partial fix for chain importFelix Lange2015-03-182-8/+4
| |
* | Merge remote-tracking branch 'ethereum/conversion' into conversionFelix Lange2015-03-1810-240/+675
|\ \
| * | conversions. -compilable-obscuren2015-03-182-3/+3
| |/
| * bumpobscuren2015-03-181-1/+1
| |
| * remove long-running mining test, ethutil -> commonzelig2015-03-162-46/+8
| |
| * Merge branch 'frontier/js' into frontier/nodeadmin.jszelig2015-03-1613-94/+76
| |\
| | * we do not use the name Frontier Consolezelig2015-03-161-4/+4
| | |
| | * Merge remote-tracking branch 'upstream/develop' into frontier/jszelig2015-03-1613-91/+73
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: cmd/ethereum/js.go javascript/types.go
| * | | Merge branch 'frontier/js' into frontier/nodeadmin.jszelig2015-03-151-0/+89
| |\| |
| | * | menubar back to mist main.qmlzelig2015-03-151-0/+89
| | | |
| * | | node admin interface for Frontier Console, see spec ↵zelig2015-03-153-0/+550
| |/ / | | | | | | | | | https://github.com/ethereum/go-ethereum/wiki/Frontier-Console
| * | CLI:zelig2015-03-153-130/+92
| | | | | | | | | | | | | | | | | | | | | - js subcommand for vm - console for Frontier console interactive REPL - jspath in cli - integrate jeth apiBindings
| * | remove jsre from mistzelig2015-03-154-193/+63
| | |
| * | jsre:zelig2015-03-151-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | core: use package rlp to encode blocksFelix Lange2015-03-181-15/+22
| |/ |/| | | | | | | This also changes the chain export format so there is no enclosing list around the blocks, which enables streaming export.
* | removed compileobscuren2015-03-162-22/+4
| |
* | Moved ethutil => commonobscuren2015-03-1614-79/+79
|/
* removed seed hashobscuren2015-03-151-1/+1
|
* mergeobscuren2015-03-154-12/+83
|\
| * cmd/ethereum: add blocktest commandFelix Lange2015-03-142-0/+67
| |
| * cmd/utils: GetEthereum -> MakeEthConfigFelix Lange2015-03-143-12/+16
| | | | | | | | | | This allows changing the config before starting Ethereum with it.
* | Support for addresses with or without 0x. Fixes #472Maran2015-03-141-1/+1
| |
* | more obvious failure for ethtestobscuren2015-03-131-5/+5
| |
* | Merge branch 'rpcfrontier' into developobscuren2015-03-131-1/+2
|\ \
| * | #469Taylor Gerring2015-03-131-1/+2
| | |
* | | fixed ethtestobscuren2015-03-131-1/+3
| | |
* | | Return 1 on failobscuren2015-03-131-0/+5
|/ /
* | Update path to web3 libraryTaylor Gerring2015-03-121-1/+1
| |
* | Update ethereum.jsTaylor Gerring2015-03-1244-6328/+0
| | | | | | | | Added to git modules
* | Merge pull request #460 from tgerring/ethutilFelix Lange2015-03-121-2/+1
|\ \ | |/ |/| Move MakeName to ethutil
| * Move MakeName to ethutilTaylor Gerring2015-03-121-2/+1
| |
* | updated rnd vm test => state testobscuren2015-03-121-28/+88
| |
* | cmd/ethereum: remove extra check for 'no accounts' errorFelix Lange2015-03-121-9/+2
| | | | | | | | This error can no longer be returned from eth.New.
* | miner: provide coinbase when starting the minerFelix Lange2015-03-125-47/+38
|/ | | | | | | | | | 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.
* mergeobscuren2015-03-122-16/+29
|\
| * cmd/ethereum: add a flag to switch to unencrytped keystoreFelix Lange2015-03-112-14/+28
| | | | | | | | | | | | | | | | | | 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
* | Reverted globalobscuren2015-03-112-8/+3
| |
* | Merge branch 'develop' into rpcfrontierobscuren2015-03-1114-710/+430
|\| | | | | | | | | | | Conflicts: rpc/api.go rpc/args.go
| * Merge branch origin/develop into accounts-integrationFelix Lange2015-03-117-472/+62
| |\ | | | | | | | | | | | | | | | | | | Conflicts: cmd/blocktest/main.go cmd/mist/debugger.go cmd/utils/cmd.go
| * | cmd/utils: improve CLI help templatesFelix Lange2015-03-101-0/+27
| | | | | | | | | | | | Help for a specific command now shows available subcommands.
| * | cmd/ethereum: show some help before prompting for encryption passphraseFelix Lange2015-03-101-0/+3
| | |
| * | cmd/ethereum: show more helpful message if no accounts existFelix Lange2015-03-103-9/+23
| | |
| * | cmd/utils: remove extra space in fatal error messageFelix Lange2015-03-101-1/+1
| | |
| * | cmd/ethereum: fix line editing setup and historyFelix Lange2015-03-101-6/+11
| | |
| * | cmd/evm, core, ethdb, state, tests/helper: remove ReadConfig callsFelix Lange2015-03-101-2/+0
| | |
| * | cmd/ethereum: remove "prompter" in identifiersFelix Lange2015-03-101-9/+10
| | |
| * | cmd/ethereum: unlock accounts on JS REPLFelix Lange2015-03-102-104/+111
| | |
| * | cmd/ethereum: allow multiple js filesFelix Lange2015-03-101-5/+5
| | |
| * | accounts: add {Timed,}Unlock, remove SignLockedFelix Lange2015-03-101-2/+1
| | |
| * | Merge ethereum/poc-9 into accounts-integrationFelix Lange2015-03-1012-338/+703
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmd/utils/cmd.go cmd/utils/flags.go core/manager.go eth/backend.go rpc/http/server.go xeth/xeth.go
| * | | cmd/utils: delete InitConfig, KeyTasksFelix Lange2015-03-101-40/+0
| | | |
| * | | cmd/mist: use cli library and package accountsFelix Lange2015-03-106-304/+58
| | | |
| * | | rpc: add dataDir parameter and JSON-RPC handlerFelix Lange2015-03-103-15/+19
| | | |
| * | | cmd/utils: add NewAppFelix Lange2015-03-102-5/+12
| | | |
| * | | cmd/blocktest: simplify to fix buildFelix Lange2015-03-102-189/+34
| | | | | | | | | | | | | | | | block tests only need the chain, not all of ethereum.
| * | | accounts: AccountManager -> ManagerFelix Lange2015-03-081-2/+2
| | | |
| * | | cmd/ethereum: add account commandsFelix Lange2015-03-072-34/+93
| | | |
| * | | Integrate eth_accounts and eth_transact to use new account managerGustav Simonsson2015-03-064-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | fallbackobscuren2015-03-111-1/+1
| | | |
* | | | Updated RPCobscuren2015-03-112-24/+61
| | | | | | | | | | | | | | | | | | | | | | | | * Added a generic RawMessage deserialiser * Updated ethereum.js * Updated coin test app
* | | | Added unmarshalStateobscuren2015-03-102-1004/+1473
| |_|/ |/| |
* | | Merge pull request #449 from Gustav-Simonsson/add_blockchain_tests2Jeffrey Wilcke2015-03-102-3/+20
|\ \ \ | | | | | | | | Add empty total difficulty to test blocks and clean up stopping the node
| * | | Add empty total difficulty to test blocks and clean up stopping the nodeGustav Simonsson2015-03-102-3/+20
| | |/ | |/|
* | | removed debuggerobscuren2015-03-104-435/+1
| | |
* | | Merge pull request #438 from ethersphere/poc9/cliJeffrey Wilcke2015-03-102-35/+49
|\ \ \ | |/ / |/| | Poc9/cli (exportchain)
| * | version outputzelig2015-03-081-5/+7
| | | | | | | | | | | | | | | | | | - make version output more verbose - include NetworkId - go version and os not displayed like env vars (confusing)
| * | add export blockchain subcommand, remove BlockDozelig2015-03-082-30/+42
| | |
* | | Updated xeth instances to take extra param for ui.Interfaceobscuren2015-03-095-140/+5
|/ / | | | | | | | | | | 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.
* | Bump vobscuren2015-03-083-3/+3
| |
* | Updated ethereum.jsobscuren2015-03-081-180/+663
| |
* | Separated block db from state db. Partial fix for #416obscuren2015-03-075-9/+14
| |
* | Debug option for VM & command line flagobscuren2015-03-062-4/+12
|/
* Merge pull request #433 from fjl/newcliFelix Lange2015-03-0613-846/+624
|\ | | | | Improved CLI
| * cmd/ethereum: fix JS REPL exit and add support for dumb terminalsFelix Lange2015-03-062-31/+60
| | | | | | | | It is now possible to exit the REPL using Ctrl-C, Ctrl-D or by typing "exit".
| * cmd/ethereum: new JS repl with cross-platform line editingFelix Lange2015-03-067-538/+209
| |
| * cmd/ethereum: improve command line interfaceFelix Lange2015-03-065-272/+350
| | | | | | | | | | | | | | | | | | | | 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.
| * ethutil: remove Config variableFelix Lange2015-03-063-4/+4
| | | | | | | | | | | | | | | | | | | | | | 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
* | Merge pull request #426 from Gustav-Simonsson/add_blockchain_testsJeffrey Wilcke2015-03-062-0/+361
|\ \ | | | | | | Add initial implementation of block tests
| * | Add initial implementation of block testsGustav Simonsson2015-03-052-0/+361
| | | | | | | | | | | | | | | | | | | | | * 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
* | | Merge branch 'develop' into poc-9obscuren2015-03-0627-36/+544
|\ \ \ | |_|/ |/| |
| * | Removed unused variablesobscuren2015-03-061-2/+1
| | |
| * | network back to local filesAlexandre Van de Sande2015-03-051-5/+0
| | |
| * | Fixed Average Return calculationAlexandre Van de Sande2015-03-052-3/+3
| | |
| * | updated network app to latest buildAlexandre Van de Sande2015-03-043-4/+5
| | |
| * | Merge branch 'develop' into uiAlexandre Van de Sande2015-03-0411-484/+586
| |\ \
| * | | network dashboard is now a local fileAlexandre Van de Sande2015-03-0423-1/+346
| | | |
| * | | updating to new network health pageAlexandre Van de Sande2015-03-042-4/+5
| | | |
| * | | Network Health Panel with miningAlexandre Van de Sande2015-03-035-27/+178
| | | |
| * | | Merge branch 'develop' into uiAlexandre Van de Sande2015-02-2314-93/+88
| |\ \ \
| * | | | changes to sidebar sizesAlexandre Van de Sande2015-02-231-17/+32
| | | | |
* | | | | Miner fixes and updates (including miner)obscuren2015-03-052-3/+2
| |_|_|/ |/| | |
* | | | Clean up REPLobscuren2015-03-044-37/+127
| | | |
* | | | Merge branch 'develop' into poc-9obscuren2015-03-041-1/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | removed double flag. Closes #421obscuren2015-03-041-1/+0
| | | |
* | | | updated genesisobscuren2015-03-041-1/+0
| | | |
* | | | Merge branch 'develop' into poc-9obscuren2015-03-041-5/+0
|\| | |
| * | | removed all old filtersobscuren2015-03-041-5/+0
| | | |
* | | | Merge branch 'develop' into poc-9obscuren2015-03-045-34/+7
|\| | | | | | | | | | | | | | | | | | | Conflicts: cmd/utils/cmd.go
| * | | Merge pull request #411 from ethersphere/readmeJeffrey Wilcke2015-03-042-6/+7
| |\ \ \ | | | | | | | | | | [WIP] Update Readme
| | * | | minor cleanupzelig2015-03-032-6/+7
| | | | |
| * | | | Merge branch 'develop' of github.com:ethereum/go-ethereum into removewsTaylor Gerring2015-03-026-79/+95
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmd/ethereum/flags.go cmd/mist/flags.go
| * | | | Remove Websockets RPC transportTaylor Gerring2015-03-015-27/+0
| | | | |
* | | | | Fixes and debug addedobscuren2015-03-041-4/+0
| | | | |
* | | | | mergeobscuren2015-03-045-77/+89
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fixed miner threads for ethereum CLIobscuren2015-03-012-18/+22
| | | | |
| * | | | Merge pull request #402 from tgerring/rpcupdatesJeffrey Wilcke2015-03-015-63/+67
| |\ \ \ \ | | | | | | | | | | | | Set RPC listening address via param
| | * | | | Add flag to set RPC portTaylor Gerring2015-02-285-63/+67
| | |/ / /
* | | | | fixed pow stuffobscuren2015-03-042-40/+1
| | | | |
* | | | | Secure trieobscuren2015-03-011-1/+0
|/ / / /
* | | | Unused variableobscuren2015-03-011-1/+0
| | | |
* | | | Removed some methods from the JS REPLobscuren2015-03-013-0/+10
|/ / /
* | | Bumpobscuren2015-02-273-3/+3
| | |
* | | Defautl blockobscuren2015-02-262-284/+457
| | |
* | | Cleanup importsTaylor Gerring2015-02-262-5/+0
| | |
* | | DRY DefaultAssetPath()Taylor Gerring2015-02-262-54/+1
| | |
* | | Update osext import pathTaylor Gerring2015-02-262-2/+2
| | |
* | | Merge pull request #368 from maran/feature/changeDataDirJeffrey Wilcke2015-02-252-15/+6
|\ \ \ | | | | | | | | Implement OS sensitive dataDirs
| * | | Implement OS sensitive dataDirsMaran2015-02-232-15/+6
| | |/ | |/|
* / | Properly uninstall filters. Mining issue fixed #closes #365obscuren2015-02-231-6/+18
|/ / | | | | | | | | | | * 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
* | Bumpobscuren2015-02-223-3/+3
| |
* | Added eth_logs & fixed issue with manual log filteringobscuren2015-02-222-13/+12
| | | | | | | | | | | | * Implemented `eth_logs` * Fixed issue with `filter.Find()` where logs were appended to an incorrect, non-returned slice resulting in no logs found
* | reverted back to proper version numberobscuren2015-02-213-3/+3
| |
* | Minor updates for releaseobscuren2015-02-213-3/+3
| |
* | Removed exported fields from state object and added proper set/gettersobscuren2015-02-202-4/+4
| |
* | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-209-39/+49
|\ \
| * \ Merge pull request #352 from fjl/no-enc-handshakeJeffrey Wilcke2015-02-202-2/+4
| |\ \ | | | | | | | | p2p: disable encryption handshake, enable log events
| | * | cmd/mist: show peer names in peers windowFelix Lange2015-02-192-2/+4
| | | |
| * | | Merge pull request #345 from maran/feature/minerthreadsJeffrey Wilcke2015-02-203-14/+18
| |\ \ \ | | | | | | | | | | Implement command line argument to set the amount miner threads
| | * | | Implement command line argument to set the amount of agents created by the minerMaran2015-02-193-14/+18
| | | | | | | | | | | | | | | | | | | | Defaults to the amount of cores available on the CPU
| * | | | Merge pull request #335 from alexvandesande/uiJeffrey Wilcke2015-02-204-23/+26
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| Cut, Copy, Undo and Redo working in webview
| | * | Removed console logs from mist.jsAlexandre Van de Sande2015-02-182-7/+8
| | | | | | | | | | | | | | | | also fixed an issue where it would force reloads unnecessarily
| | * | Cut, Copy, Undo and Redo working in webviewAlexandre Van de Sande2015-02-183-18/+20
| | | |
| * | | Merge pull request #339 from tgerring/jsonlogTaylor Gerring2015-02-191-0/+1
| |\ \ \ | | |_|/ | |/| | JSON log updates
| | * | Re-add LogFormat to ConfigTaylor Gerring2015-02-181-0/+1
| | | |
* | | | Optimisations and fixed a couple of DDOS issues in the minerobscuren2015-02-202-17/+25
| | | |
* | | | WIP QT Clipboardobscuren2015-02-192-0/+2
|/ / /
* / / Disabled ability to disable whisper. Closes #334obscuren2015-02-183-2/+3
|/ /
* | removed old walletobscuren2015-02-181-1/+0
| |
* | Removed mined transactions from pending view. Closes #321obscuren2015-02-183-27/+12
| |
* | Changed to ChainEvent and fixed a nil pointer in transactobscuren2015-02-182-6/+4
| |
* | Implement register and watchTxobscuren2015-02-171-0/+2
| |
* | Merge branch 'alexvandesande-ui' into developobscuren2015-02-171-1/+1
|\ \
| * | commented peer count outobscuren2015-02-171-1/+1
| |/
* | Merge branch 'ui' of https://github.com/alexvandesande/go-ethereum into developobscuren2015-02-1715-187/+255
|\|