c4ea921876
- 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)
490 lines
13 KiB
Go
490 lines
13 KiB
Go
/*
|
|
This file is part of go-ethereum
|
|
|
|
go-ethereum is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
go-ethereum is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
/**
|
|
* @authors
|
|
* Jeffrey Wilcke <i@jev.io>
|
|
*/
|
|
package main
|
|
|
|
import (
|
|
"bufio"
|
|
"fmt"
|
|
"os"
|
|
"runtime"
|
|
"strconv"
|
|
"time"
|
|
|
|
"github.com/codegangsta/cli"
|
|
"github.com/ethereum/ethash"
|
|
"github.com/ethereum/go-ethereum/accounts"
|
|
"github.com/ethereum/go-ethereum/cmd/utils"
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/core/state"
|
|
"github.com/ethereum/go-ethereum/core/types"
|
|
"github.com/ethereum/go-ethereum/eth"
|
|
"github.com/ethereum/go-ethereum/logger"
|
|
"github.com/peterh/liner"
|
|
)
|
|
|
|
const (
|
|
ClientIdentifier = "Ethereum(G)"
|
|
Version = "0.9.4"
|
|
)
|
|
|
|
var (
|
|
clilogger = logger.NewLogger("CLI")
|
|
app = utils.NewApp(Version, "the go-ethereum command line interface")
|
|
)
|
|
|
|
func init() {
|
|
app.Action = run
|
|
app.HideVersion = true // we have a command to print the version
|
|
app.Commands = []cli.Command{
|
|
blocktestCmd,
|
|
{
|
|
Action: makedag,
|
|
Name: "makedag",
|
|
Usage: "generate ethash dag (for testing)",
|
|
Description: `
|
|
The makedag command generates an ethash DAG in /tmp/dag.
|
|
|
|
This command exists to support the system testing project.
|
|
Regular users do not need to execute it.
|
|
`,
|
|
},
|
|
{
|
|
Action: version,
|
|
Name: "version",
|
|
Usage: "print ethereum version numbers",
|
|
Description: `
|
|
The output of this command is supposed to be machine-readable.
|
|
`,
|
|
},
|
|
{
|
|
Action: accountList,
|
|
Name: "account",
|
|
Usage: "manage accounts",
|
|
Subcommands: []cli.Command{
|
|
{
|
|
Action: accountList,
|
|
Name: "list",
|
|
Usage: "print account addresses",
|
|
Description: `
|
|
|
|
`,
|
|
},
|
|
{
|
|
Action: accountCreate,
|
|
Name: "new",
|
|
Usage: "create a new account",
|
|
Description: `
|
|
|
|
ethereum account new
|
|
|
|
Creates a new accountThe account is saved in encrypted format, you are prompted for a passphrase.
|
|
You must remember this passphrase to unlock your account in future.
|
|
For non-interactive use the passphrase can be specified with the --password flag:
|
|
|
|
ethereum --password <passwordfile> account new
|
|
|
|
`,
|
|
},
|
|
{
|
|
Action: accountImport,
|
|
Name: "import",
|
|
Usage: "import a private key into a new account",
|
|
Description: `
|
|
|
|
ethereum account import <keyfile>
|
|
|
|
Imports a private key from <keyfile> and creates a new account with the address derived from the key.
|
|
The keyfile is assumed to contain an unencrypted private key in canonical EC format.
|
|
|
|
The account is saved in encrypted format, you are prompted for a passphrase.
|
|
You must remember this passphrase to unlock your account in future.
|
|
For non-interactive use the passphrase can be specified with the --password flag:
|
|
|
|
ethereum --password <passwordfile> account import <keyfile>
|
|
|
|
`,
|
|
},
|
|
{
|
|
Action: accountExport,
|
|
Name: "export",
|
|
Usage: "export an account into key file",
|
|
Description: `
|
|
|
|
ethereum account export <address> <keyfile>
|
|
|
|
Exports the given account's private key into keyfile using the canonical EC format.
|
|
The account needs to be unlocked, if it is not the user is prompted for a passphrase to unlock it.
|
|
For non-interactive use, the password can be specified with the --unlock flag:
|
|
|
|
ethereum --unlock <passwrdfile> account export <address> <keyfile>
|
|
|
|
Note:
|
|
Since you can directly copy your encrypted accounts to another ethereum instance, this import/export mechanism is not needed when you transfer an account between nodes.
|
|
`,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Action: dump,
|
|
Name: "dump",
|
|
Usage: `dump a specific block from storage`,
|
|
Description: `
|
|
The arguments are interpreted as block numbers or hashes.
|
|
Use "ethereum dump 0" to dump the genesis block.
|
|
`,
|
|
},
|
|
{
|
|
Action: console,
|
|
Name: "console",
|
|
Usage: `Ethereum Console: interactive JavaScript environment`,
|
|
Description: `
|
|
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
|
|
`,
|
|
},
|
|
{
|
|
Action: execJSFiles,
|
|
Name: "js",
|
|
Usage: `executes the given JavaScript files in the Ethereum Frontier JavaScript VM`,
|
|
Description: `
|
|
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
|
|
`,
|
|
},
|
|
{
|
|
Action: importchain,
|
|
Name: "import",
|
|
Usage: `import a blockchain file`,
|
|
},
|
|
{
|
|
Action: exportchain,
|
|
Name: "export",
|
|
Usage: `export blockchain into file`,
|
|
},
|
|
}
|
|
app.Flags = []cli.Flag{
|
|
utils.UnlockedAccountFlag,
|
|
utils.PasswordFileFlag,
|
|
utils.BootnodesFlag,
|
|
utils.DataDirFlag,
|
|
utils.JSpathFlag,
|
|
utils.ListenPortFlag,
|
|
utils.LogFileFlag,
|
|
utils.LogJSONFlag,
|
|
utils.LogLevelFlag,
|
|
utils.MaxPeersFlag,
|
|
utils.MinerThreadsFlag,
|
|
utils.MiningEnabledFlag,
|
|
utils.NATFlag,
|
|
utils.NodeKeyFileFlag,
|
|
utils.NodeKeyHexFlag,
|
|
utils.RPCEnabledFlag,
|
|
utils.RPCListenAddrFlag,
|
|
utils.RPCPortFlag,
|
|
utils.UnencryptedKeysFlag,
|
|
utils.VMDebugFlag,
|
|
utils.ProtocolVersionFlag,
|
|
utils.NetworkIdFlag,
|
|
}
|
|
|
|
// missing:
|
|
// flag.StringVar(&ConfigFile, "conf", defaultConfigFile, "config file")
|
|
// flag.BoolVar(&DiffTool, "difftool", false, "creates output for diff'ing. Sets LogLevel=0")
|
|
// flag.StringVar(&DiffType, "diff", "all", "sets the level of diff output [vm, all]. Has no effect if difftool=false")
|
|
|
|
// potential subcommands:
|
|
// flag.StringVar(&SecretFile, "import", "", "imports the file given (hex or mnemonic formats)")
|
|
// flag.StringVar(&ExportDir, "export", "", "exports the session keyring to files in the directory given")
|
|
// flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key")
|
|
}
|
|
|
|
func main() {
|
|
runtime.GOMAXPROCS(runtime.NumCPU())
|
|
defer logger.Flush()
|
|
if err := app.Run(os.Args); err != nil {
|
|
fmt.Fprintln(os.Stderr, err)
|
|
os.Exit(1)
|
|
}
|
|
}
|
|
|
|
func run(ctx *cli.Context) {
|
|
fmt.Printf("Welcome to the FRONTIER\n")
|
|
utils.HandleInterrupt()
|
|
cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx)
|
|
ethereum, err := eth.New(cfg)
|
|
if err != nil {
|
|
utils.Fatalf("%v", err)
|
|
}
|
|
|
|
startEth(ctx, ethereum)
|
|
// this blocks the thread
|
|
ethereum.WaitForShutdown()
|
|
}
|
|
|
|
func console(ctx *cli.Context) {
|
|
cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx)
|
|
ethereum, err := eth.New(cfg)
|
|
if err != nil {
|
|
utils.Fatalf("%v", err)
|
|
}
|
|
|
|
startEth(ctx, ethereum)
|
|
repl := newJSRE(ethereum, ctx.String(utils.JSpathFlag.Name))
|
|
repl.interactive()
|
|
|
|
ethereum.Stop()
|
|
ethereum.WaitForShutdown()
|
|
}
|
|
|
|
func execJSFiles(ctx *cli.Context) {
|
|
cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx)
|
|
ethereum, err := eth.New(cfg)
|
|
if err != nil {
|
|
utils.Fatalf("%v", err)
|
|
}
|
|
|
|
startEth(ctx, ethereum)
|
|
repl := newJSRE(ethereum, ctx.String(utils.JSpathFlag.Name))
|
|
for _, file := range ctx.Args() {
|
|
repl.exec(file)
|
|
}
|
|
|
|
ethereum.Stop()
|
|
ethereum.WaitForShutdown()
|
|
}
|
|
|
|
func unlockAccount(ctx *cli.Context, am *accounts.Manager, account string) (passphrase string) {
|
|
if !ctx.GlobalBool(utils.UnencryptedKeysFlag.Name) {
|
|
var err error
|
|
// Load startup keys. XXX we are going to need a different format
|
|
// Attempt to unlock the account
|
|
passfile := ctx.GlobalString(utils.PasswordFileFlag.Name)
|
|
if len(passfile) == 0 {
|
|
fmt.Println("Please enter a passphrase now.")
|
|
auth, err := readPassword("Passphrase: ", true)
|
|
if err != nil {
|
|
utils.Fatalf("%v", err)
|
|
}
|
|
|
|
passphrase = auth
|
|
|
|
} else {
|
|
if passphrase, err = common.ReadAllFile(passfile); err != nil {
|
|
utils.Fatalf("Unable to read password file '%s': %v", passfile, err)
|
|
}
|
|
}
|
|
|
|
err = am.Unlock(common.FromHex(account), passphrase)
|
|
if err != nil {
|
|
utils.Fatalf("Unlock account failed '%v'", err)
|
|
}
|
|
}
|
|
return
|
|
}
|
|
|
|
func startEth(ctx *cli.Context, eth *eth.Ethereum) {
|
|
utils.StartEthereum(eth)
|
|
am := eth.AccountManager()
|
|
|
|
account := ctx.GlobalString(utils.UnlockedAccountFlag.Name)
|
|
if len(account) > 0 {
|
|
unlockAccount(ctx, am, account)
|
|
}
|
|
// Start auxiliary services if enabled.
|
|
if ctx.GlobalBool(utils.RPCEnabledFlag.Name) {
|
|
utils.StartRPC(eth, ctx)
|
|
}
|
|
if ctx.GlobalBool(utils.MiningEnabledFlag.Name) {
|
|
eth.StartMining()
|
|
}
|
|
}
|
|
|
|
func accountList(ctx *cli.Context) {
|
|
am := utils.GetAccountManager(ctx)
|
|
accts, err := am.Accounts()
|
|
if err != nil {
|
|
utils.Fatalf("Could not list accounts: %v", err)
|
|
}
|
|
for _, acct := range accts {
|
|
fmt.Printf("Address: %x\n", acct)
|
|
}
|
|
}
|
|
|
|
func getPassPhrase(ctx *cli.Context) (passphrase string) {
|
|
if !ctx.GlobalBool(utils.UnencryptedKeysFlag.Name) {
|
|
passfile := ctx.GlobalString(utils.PasswordFileFlag.Name)
|
|
if len(passfile) == 0 {
|
|
fmt.Println("The new account will be encrypted with a passphrase.")
|
|
fmt.Println("Please enter a passphrase now.")
|
|
auth, err := readPassword("Passphrase: ", true)
|
|
if err != nil {
|
|
utils.Fatalf("%v", err)
|
|
}
|
|
confirm, err := readPassword("Repeat Passphrase: ", false)
|
|
if err != nil {
|
|
utils.Fatalf("%v", err)
|
|
}
|
|
if auth != confirm {
|
|
utils.Fatalf("Passphrases did not match.")
|
|
}
|
|
passphrase = auth
|
|
|
|
} else {
|
|
var err error
|
|
if passphrase, err = common.ReadAllFile(passfile); err != nil {
|
|
utils.Fatalf("Unable to read password file '%s': %v", passfile, err)
|
|
}
|
|
}
|
|
}
|
|
return
|
|
}
|
|
|
|
func accountCreate(ctx *cli.Context) {
|
|
am := utils.GetAccountManager(ctx)
|
|
passphrase := getPassPhrase(ctx)
|
|
acct, err := am.NewAccount(passphrase)
|
|
if err != nil {
|
|
utils.Fatalf("Could not create the account: %v", err)
|
|
}
|
|
fmt.Printf("Address: %x\n", acct)
|
|
}
|
|
|
|
func accountImport(ctx *cli.Context) {
|
|
keyfile := ctx.Args().First()
|
|
if len(keyfile) == 0 {
|
|
utils.Fatalf("keyfile must be given as argument")
|
|
}
|
|
am := utils.GetAccountManager(ctx)
|
|
passphrase := getPassPhrase(ctx)
|
|
acct, err := am.Import(keyfile, passphrase)
|
|
if err != nil {
|
|
utils.Fatalf("Could not create the account: %v", err)
|
|
}
|
|
fmt.Printf("Address: %x\n", acct)
|
|
}
|
|
|
|
func accountExport(ctx *cli.Context) {
|
|
account := ctx.Args().First()
|
|
if len(account) == 0 {
|
|
utils.Fatalf("account address must be given as first argument")
|
|
}
|
|
keyfile := ctx.Args().Get(1)
|
|
if len(keyfile) == 0 {
|
|
utils.Fatalf("keyfile must be given as second argument")
|
|
}
|
|
am := utils.GetAccountManager(ctx)
|
|
auth := unlockAccount(ctx, am, account)
|
|
err := am.Export(keyfile, common.FromHex(account), auth)
|
|
if err != nil {
|
|
utils.Fatalf("Account export failed: %v", err)
|
|
}
|
|
}
|
|
|
|
func importchain(ctx *cli.Context) {
|
|
if len(ctx.Args()) != 1 {
|
|
utils.Fatalf("This command requires an argument.")
|
|
}
|
|
chainmgr, _, _ := utils.GetChain(ctx)
|
|
start := time.Now()
|
|
err := utils.ImportChain(chainmgr, ctx.Args().First())
|
|
if err != nil {
|
|
utils.Fatalf("Import error: %v\n", err)
|
|
}
|
|
fmt.Printf("Import done in %v", time.Since(start))
|
|
return
|
|
}
|
|
|
|
func exportchain(ctx *cli.Context) {
|
|
if len(ctx.Args()) != 1 {
|
|
utils.Fatalf("This command requires an argument.")
|
|
}
|
|
chainmgr, _, _ := utils.GetChain(ctx)
|
|
start := time.Now()
|
|
err := utils.ExportChain(chainmgr, ctx.Args().First())
|
|
if err != nil {
|
|
utils.Fatalf("Export error: %v\n", err)
|
|
}
|
|
fmt.Printf("Export done in %v", time.Since(start))
|
|
return
|
|
}
|
|
|
|
func dump(ctx *cli.Context) {
|
|
chainmgr, _, stateDb := utils.GetChain(ctx)
|
|
for _, arg := range ctx.Args() {
|
|
var block *types.Block
|
|
if hashish(arg) {
|
|
block = chainmgr.GetBlock(common.HexToHash(arg))
|
|
} else {
|
|
num, _ := strconv.Atoi(arg)
|
|
block = chainmgr.GetBlockByNumber(uint64(num))
|
|
}
|
|
if block == nil {
|
|
fmt.Println("{}")
|
|
utils.Fatalf("block not found")
|
|
} else {
|
|
statedb := state.New(block.Root(), stateDb)
|
|
fmt.Printf("%s\n", statedb.Dump())
|
|
// fmt.Println(block)
|
|
}
|
|
}
|
|
}
|
|
|
|
func makedag(ctx *cli.Context) {
|
|
chain, _, _ := utils.GetChain(ctx)
|
|
pow := ethash.New(chain)
|
|
fmt.Println("making cache")
|
|
pow.UpdateCache(true)
|
|
fmt.Println("making DAG")
|
|
pow.UpdateDAG()
|
|
}
|
|
|
|
func version(c *cli.Context) {
|
|
fmt.Printf(`%v
|
|
Version: %v
|
|
Protocol Version: %d
|
|
Network Id: %d
|
|
GO: %s
|
|
OS: %s
|
|
GOPATH=%s
|
|
GOROOT=%s
|
|
`, ClientIdentifier, Version, c.GlobalInt(utils.ProtocolVersionFlag.Name), c.GlobalInt(utils.NetworkIdFlag.Name), runtime.Version(), runtime.GOOS, os.Getenv("GOPATH"), runtime.GOROOT())
|
|
}
|
|
|
|
// hashish returns true for strings that look like hashes.
|
|
func hashish(x string) bool {
|
|
_, err := strconv.Atoi(x)
|
|
return err != nil
|
|
}
|
|
|
|
func readPassword(prompt string, warnTerm bool) (string, error) {
|
|
if liner.TerminalSupported() {
|
|
lr := liner.NewLiner()
|
|
defer lr.Close()
|
|
return lr.PasswordPrompt(prompt)
|
|
}
|
|
if warnTerm {
|
|
fmt.Println("!! Unsupported terminal, password will be echoed.")
|
|
}
|
|
fmt.Print(prompt)
|
|
input, err := bufio.NewReader(os.Stdin).ReadString('\n')
|
|
fmt.Println()
|
|
return input, err
|
|
}
|