diff options
| author | zelig <viktor.tron@gmail.com> | 2015-03-16 23:50:29 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-03-16 23:50:29 +0800 |
| commit | b3e133dd159749a625c4b0245af293607ba12c8c (patch) | |
| tree | 9ba8e8c4afe9168f5bc83219d402efb00387d616 /cmd/ethereum/main.go | |
| parent | 8139d444f8d8163251d1c96ef8034d186825ce32 (diff) | |
| parent | 73af0302bed5076260ac935e452064aee423934d (diff) | |
| download | go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar.gz go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar.zst go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.zip | |
Merge branch 'frontier/js' into frontier/nodeadmin.js
Diffstat (limited to 'cmd/ethereum/main.go')
| -rw-r--r-- | cmd/ethereum/main.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index 0dae5b79b..64b9949d2 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -31,9 +31,9 @@ import ( "github.com/codegangsta/cli" "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/state" "github.com/peterh/liner" @@ -91,9 +91,9 @@ Use "ethereum dump 0" to dump the genesis block. { Action: console, Name: "console", - Usage: `Ethereum Frontier Console: interactive JavaScript environment`, + Usage: `Ethereum Console: interactive JavaScript environment`, Description: ` -Frontier Console is an interactive shell for the Ethereum Frontier JavaScript runtime environment which exposes a node admin interface as well as the DAPP JavaScript API. +Console is an interactive shell for the Ethereum JavaScript runtime environment which exposes a node admin interface as well as the DAPP JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Frontier-Console `, }, @@ -102,7 +102,7 @@ See https://github.com/ethereum/go-ethereum/wiki/Frontier-Console Name: "js", Usage: `executes the given JavaScript files in the Ethereum Frontier JavaScript VM`, Description: ` -The Ethereum Frontier JavaScript VM exposes a node admin interface as well as the DAPP JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Frontier-Console +The Ethereum JavaScript VM exposes a node admin interface as well as the DAPP JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Frontier-Console `, }, { @@ -218,7 +218,7 @@ func startEth(ctx *cli.Context, eth *eth.Ethereum) { } am := eth.AccountManager() // Attempt to unlock the account - err := am.Unlock(ethutil.FromHex(split[0]), split[1]) + err := am.Unlock(common.FromHex(split[0]), split[1]) if err != nil { utils.Fatalf("Unlock account failed '%v'", err) } @@ -302,7 +302,7 @@ func dump(ctx *cli.Context) { for _, arg := range ctx.Args() { var block *types.Block if hashish(arg) { - block = chainmgr.GetBlock(ethutil.Hex2Bytes(arg)) + block = chainmgr.GetBlock(common.Hex2Bytes(arg)) } else { num, _ := strconv.Atoi(arg) block = chainmgr.GetBlockByNumber(uint64(num)) |