aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/geth
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/geth')
-rw-r--r--cmd/geth/admin.go4
-rw-r--r--cmd/geth/blocktestcmd.go (renamed from cmd/geth/blocktest.go)2
-rw-r--r--cmd/geth/chaincmd.go159
-rw-r--r--cmd/geth/js.go64
-rw-r--r--cmd/geth/main.go216
5 files changed, 221 insertions, 224 deletions
diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go
index 8f9a009d7..f0be444c6 100644
--- a/cmd/geth/admin.go
+++ b/cmd/geth/admin.go
@@ -262,8 +262,8 @@ func (js *jsre) setHead(call otto.FunctionCall) otto.Value {
}
func (js *jsre) downloadProgress(call otto.FunctionCall) otto.Value {
- current, max := js.ethereum.Downloader().Stats()
- v, _ := call.Otto.ToValue(fmt.Sprintf("%d/%d", current, max))
+ pending, cached := js.ethereum.Downloader().Stats()
+ v, _ := call.Otto.ToValue(map[string]interface{}{"pending": pending, "cached": cached})
return v
}
diff --git a/cmd/geth/blocktest.go b/cmd/geth/blocktestcmd.go
index 81a64b5f2..f4dcb0286 100644
--- a/cmd/geth/blocktest.go
+++ b/cmd/geth/blocktestcmd.go
@@ -12,7 +12,7 @@ import (
"github.com/ethereum/go-ethereum/tests"
)
-var blocktestCmd = cli.Command{
+var blocktestCommand = cli.Command{
Action: runBlockTest,
Name: "blocktest",
Usage: `loads a block test file`,
diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go
new file mode 100644
index 000000000..947532f40
--- /dev/null
+++ b/cmd/geth/chaincmd.go
@@ -0,0 +1,159 @@
+package main
+
+import (
+ "fmt"
+ "os"
+ "path/filepath"
+ "strconv"
+ "time"
+
+ "github.com/codegangsta/cli"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/logger/glog"
+)
+
+var (
+ importCommand = cli.Command{
+ Action: importChain,
+ Name: "import",
+ Usage: `import a blockchain file`,
+ }
+ exportCommand = cli.Command{
+ Action: exportChain,
+ Name: "export",
+ Usage: `export blockchain into file`,
+ }
+ upgradedbCommand = cli.Command{
+ Action: upgradeDB,
+ Name: "upgradedb",
+ Usage: "upgrade chainblock database",
+ }
+ removedbCommand = cli.Command{
+ Action: removeDB,
+ Name: "removedb",
+ Usage: "Remove blockchain and state databases",
+ }
+ dumpCommand = cli.Command{
+ 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.
+`,
+ }
+)
+
+func importChain(ctx *cli.Context) {
+ if len(ctx.Args()) != 1 {
+ utils.Fatalf("This command requires an argument.")
+ }
+ chain, blockDB, stateDB, extraDB := utils.MakeChain(ctx)
+ start := time.Now()
+ err := utils.ImportChain(chain, ctx.Args().First())
+ closeAll(blockDB, stateDB, extraDB)
+ if err != nil {
+ utils.Fatalf("Import error: %v", err)
+ }
+ fmt.Printf("Import done in %v", time.Since(start))
+}
+
+func exportChain(ctx *cli.Context) {
+ if len(ctx.Args()) != 1 {
+ utils.Fatalf("This command requires an argument.")
+ }
+ chain, _, _, _ := utils.MakeChain(ctx)
+ start := time.Now()
+ if err := utils.ExportChain(chain, ctx.Args().First()); err != nil {
+ utils.Fatalf("Export error: %v\n", err)
+ }
+ fmt.Printf("Export done in %v", time.Since(start))
+}
+
+func removeDB(ctx *cli.Context) {
+ confirm, err := utils.PromptConfirm("Remove local databases?")
+ if err != nil {
+ utils.Fatalf("%v", err)
+ }
+
+ if confirm {
+ fmt.Println("Removing chain and state databases...")
+ start := time.Now()
+
+ os.RemoveAll(filepath.Join(ctx.GlobalString(utils.DataDirFlag.Name), "blockchain"))
+ os.RemoveAll(filepath.Join(ctx.GlobalString(utils.DataDirFlag.Name), "state"))
+
+ fmt.Printf("Removed in %v\n", time.Since(start))
+ } else {
+ fmt.Println("Operation aborted")
+ }
+}
+
+func upgradeDB(ctx *cli.Context) {
+ glog.Infoln("Upgrading blockchain database")
+
+ chain, blockDB, stateDB, extraDB := utils.MakeChain(ctx)
+ v, _ := blockDB.Get([]byte("BlockchainVersion"))
+ bcVersion := int(common.NewValue(v).Uint())
+ if bcVersion == 0 {
+ bcVersion = core.BlockChainVersion
+ }
+
+ // Export the current chain.
+ filename := fmt.Sprintf("blockchain_%d_%s.chain", bcVersion, time.Now().Format("20060102_150405"))
+ exportFile := filepath.Join(ctx.GlobalString(utils.DataDirFlag.Name), filename)
+ if err := utils.ExportChain(chain, exportFile); err != nil {
+ utils.Fatalf("Unable to export chain for reimport %s", err)
+ }
+ closeAll(blockDB, stateDB, extraDB)
+ os.RemoveAll(filepath.Join(ctx.GlobalString(utils.DataDirFlag.Name), "blockchain"))
+ os.RemoveAll(filepath.Join(ctx.GlobalString(utils.DataDirFlag.Name), "state"))
+
+ // Import the chain file.
+ chain, blockDB, stateDB, extraDB = utils.MakeChain(ctx)
+ blockDB.Put([]byte("BlockchainVersion"), common.NewValue(core.BlockChainVersion).Bytes())
+ err := utils.ImportChain(chain, exportFile)
+ closeAll(blockDB, stateDB, extraDB)
+ if err != nil {
+ utils.Fatalf("Import error %v (a backup is made in %s, use the import command to import it)", err, exportFile)
+ } else {
+ os.Remove(exportFile)
+ glog.Infoln("Import finished")
+ }
+}
+
+func dump(ctx *cli.Context) {
+ chain, _, stateDB, _ := utils.MakeChain(ctx)
+ for _, arg := range ctx.Args() {
+ var block *types.Block
+ if hashish(arg) {
+ block = chain.GetBlock(common.HexToHash(arg))
+ } else {
+ num, _ := strconv.Atoi(arg)
+ block = chain.GetBlockByNumber(uint64(num))
+ }
+ if block == nil {
+ fmt.Println("{}")
+ utils.Fatalf("block not found")
+ } else {
+ state := state.New(block.Root(), stateDB)
+ fmt.Printf("%s\n", state.Dump())
+ }
+ }
+}
+
+// hashish returns true for strings that look like hashes.
+func hashish(x string) bool {
+ _, err := strconv.Atoi(x)
+ return err != nil
+}
+
+func closeAll(dbs ...common.Database) {
+ for _, db := range dbs {
+ db.Close()
+ }
+}
diff --git a/cmd/geth/js.go b/cmd/geth/js.go
index 0fb234d45..706bc6554 100644
--- a/cmd/geth/js.go
+++ b/cmd/geth/js.go
@@ -22,6 +22,7 @@ import (
"fmt"
"math/big"
"os"
+ "os/signal"
"path/filepath"
"strings"
@@ -47,7 +48,8 @@ type dumbterm struct{ r *bufio.Reader }
func (r dumbterm) Prompt(p string) (string, error) {
fmt.Print(p)
- return r.r.ReadString('\n')
+ line, err := r.r.ReadString('\n')
+ return strings.TrimSuffix(line, "\n"), err
}
func (r dumbterm) PasswordPrompt(p string) (string, error) {
@@ -182,30 +184,52 @@ func (self *jsre) exec(filename string) error {
}
func (self *jsre) interactive() {
- for {
- input, err := self.Prompt(self.ps1)
- if err != nil {
- break
+ // Read input lines.
+ prompt := make(chan string)
+ inputln := make(chan string)
+ go func() {
+ defer close(inputln)
+ for {
+ line, err := self.Prompt(<-prompt)
+ if err != nil {
+ return
+ }
+ inputln <- line
}
- if input == "" {
- continue
+ }()
+ // Wait for Ctrl-C, too.
+ sig := make(chan os.Signal, 1)
+ signal.Notify(sig, os.Interrupt)
+
+ defer func() {
+ if self.atexit != nil {
+ self.atexit()
}
- str += input + "\n"
- self.setIndent()
- if indentCount <= 0 {
- if input == "exit" {
- break
+ self.re.Stop(false)
+ }()
+ for {
+ prompt <- self.ps1
+ select {
+ case <-sig:
+ fmt.Println("caught interrupt, exiting")
+ return
+ case input, ok := <-inputln:
+ if !ok || indentCount <= 0 && input == "exit" {
+ return
+ }
+ if input == "" {
+ continue
+ }
+ str += input + "\n"
+ self.setIndent()
+ if indentCount <= 0 {
+ hist := str[:len(str)-1]
+ self.AppendHistory(hist)
+ self.parseInput(str)
+ str = ""
}
- hist := str[:len(str)-1]
- self.AppendHistory(hist)
- self.parseInput(str)
- str = ""
}
}
- if self.atexit != nil {
- self.atexit()
- }
- self.re.Stop(false)
}
func (self *jsre) withHistory(op func(*os.File)) {
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 0cbf8e41a..ab46fdd3e 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -24,31 +24,27 @@ import (
"fmt"
"io"
"io/ioutil"
+ _ "net/http/pprof"
"os"
"path/filepath"
"runtime"
"strconv"
"strings"
- "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"
- "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/mattn/go-colorable"
"github.com/mattn/go-isatty"
)
-import _ "net/http/pprof"
const (
ClientIdentifier = "Geth"
- Version = "0.9.25"
+ Version = "0.9.26"
)
var (
@@ -68,7 +64,12 @@ func init() {
app.Action = run
app.HideVersion = true // we have a command to print the version
app.Commands = []cli.Command{
- blocktestCmd,
+ blocktestCommand,
+ importCommand,
+ exportCommand,
+ upgradedbCommand,
+ removedbCommand,
+ dumpCommand,
{
Action: makedag,
Name: "makedag",
@@ -194,15 +195,6 @@ 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: `Geth Console: interactive JavaScript environment`,
@@ -221,26 +213,6 @@ The JavaScript VM exposes a node admin interface as well as the Ðapp
JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Console
`,
},
- {
- Action: importchain,
- Name: "import",
- Usage: `import a blockchain file`,
- },
- {
- Action: exportchain,
- Name: "export",
- Usage: `export blockchain into file`,
- },
- {
- Action: upgradeDb,
- Name: "upgradedb",
- Usage: "upgrade chainblock database",
- },
- {
- Action: removeDb,
- Name: "removedb",
- Usage: "Remove blockchain and state databases",
- },
}
app.Flags = []cli.Flag{
utils.IdentityFlag,
@@ -282,17 +254,12 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
utils.SolcPathFlag,
}
app.Before = func(ctx *cli.Context) error {
+ utils.SetupLogger(ctx)
if ctx.GlobalBool(utils.PProfEanbledFlag.Name) {
utils.StartPProf(ctx)
}
return nil
}
-
- // 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")
-
}
func main() {
@@ -373,13 +340,13 @@ func unlockAccount(ctx *cli.Context, am *accounts.Manager, account string) (pass
var err error
// Load startup keys. XXX we are going to need a different format
- if len(account) == 0 {
+ if !((len(account) == 40) || (len(account) == 42)) { // with or without 0x
utils.Fatalf("Invalid account address '%s'", account)
}
// Attempt to unlock the account 3 times
attempts := 3
for tries := 0; tries < attempts; tries++ {
- msg := fmt.Sprintf("Unlocking account %s...%s | Attempt %d/%d", account[:8], account[len(account)-6:], tries+1, attempts)
+ msg := fmt.Sprintf("Unlocking account %s | Attempt %d/%d", account, tries+1, attempts)
passphrase = getPassPhrase(ctx, msg, false)
err = am.Unlock(common.HexToAddress(account), passphrase)
if err == nil {
@@ -427,7 +394,7 @@ func startEth(ctx *cli.Context, eth *eth.Ethereum) {
}
func accountList(ctx *cli.Context) {
- am := utils.GetAccountManager(ctx)
+ am := utils.MakeAccountManager(ctx)
accts, err := am.Accounts()
if err != nil {
utils.Fatalf("Could not list accounts: %v", err)
@@ -469,7 +436,7 @@ func getPassPhrase(ctx *cli.Context, desc string, confirmation bool) (passphrase
}
func accountCreate(ctx *cli.Context) {
- am := utils.GetAccountManager(ctx)
+ am := utils.MakeAccountManager(ctx)
passphrase := getPassPhrase(ctx, "Your new account is locked with a password. Please give a password. Do not forget this password.", true)
acct, err := am.NewAccount(passphrase)
if err != nil {
@@ -488,7 +455,7 @@ func importWallet(ctx *cli.Context) {
utils.Fatalf("Could not read wallet file: %v", err)
}
- am := utils.GetAccountManager(ctx)
+ am := utils.MakeAccountManager(ctx)
passphrase := getPassPhrase(ctx, "", false)
acct, err := am.ImportPreSaleKey(keyJson, passphrase)
@@ -503,7 +470,7 @@ func accountImport(ctx *cli.Context) {
if len(keyfile) == 0 {
utils.Fatalf("keyfile must be given as argument")
}
- am := utils.GetAccountManager(ctx)
+ am := utils.MakeAccountManager(ctx)
passphrase := getPassPhrase(ctx, "Your new account is locked with a password. Please give a password. Do not forget this password.", true)
acct, err := am.Import(keyfile, passphrase)
if err != nil {
@@ -512,153 +479,6 @@ func accountImport(ctx *cli.Context) {
fmt.Printf("Address: %x\n", acct)
}
-func importchain(ctx *cli.Context) {
- if len(ctx.Args()) != 1 {
- utils.Fatalf("This command requires an argument.")
- }
-
- cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx)
- cfg.SkipBcVersionCheck = true
-
- ethereum, err := eth.New(cfg)
- if err != nil {
- utils.Fatalf("%v\n", err)
- }
-
- chainmgr := ethereum.ChainManager()
- start := time.Now()
- err = utils.ImportChain(chainmgr, ctx.Args().First())
- if err != nil {
- utils.Fatalf("Import error: %v\n", err)
- }
-
- // force database flush
- ethereum.BlockDb().Flush()
- ethereum.StateDb().Flush()
- ethereum.ExtraDb().Flush()
-
- 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.")
- }
-
- cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx)
- cfg.SkipBcVersionCheck = true
-
- ethereum, err := eth.New(cfg)
- if err != nil {
- utils.Fatalf("%v\n", err)
- }
-
- chainmgr := ethereum.ChainManager()
- 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 removeDb(ctx *cli.Context) {
- confirm, err := utils.PromptConfirm("Remove local databases?")
- if err != nil {
- utils.Fatalf("%v", err)
- }
-
- if confirm {
- fmt.Println("Removing chain and state databases...")
- start := time.Now()
-
- os.RemoveAll(filepath.Join(ctx.GlobalString(utils.DataDirFlag.Name), "blockchain"))
- os.RemoveAll(filepath.Join(ctx.GlobalString(utils.DataDirFlag.Name), "state"))
-
- fmt.Printf("Removed in %v\n", time.Since(start))
- } else {
- fmt.Println("Operation aborted")
- }
-}
-
-func upgradeDb(ctx *cli.Context) {
- fmt.Println("Upgrade blockchain DB")
-
- cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx)
- cfg.SkipBcVersionCheck = true
-
- ethereum, err := eth.New(cfg)
- if err != nil {
- utils.Fatalf("%v\n", err)
- }
-
- v, _ := ethereum.BlockDb().Get([]byte("BlockchainVersion"))
- bcVersion := int(common.NewValue(v).Uint())
-
- if bcVersion == 0 {
- bcVersion = core.BlockChainVersion
- }
-
- filename := fmt.Sprintf("blockchain_%d_%s.chain", bcVersion, time.Now().Format("20060102_150405"))
- exportFile := filepath.Join(ctx.GlobalString(utils.DataDirFlag.Name), filename)
-
- err = utils.ExportChain(ethereum.ChainManager(), exportFile)
- if err != nil {
- utils.Fatalf("Unable to export chain for reimport %s\n", err)
- }
-
- ethereum.BlockDb().Close()
- ethereum.StateDb().Close()
- ethereum.ExtraDb().Close()
-
- os.RemoveAll(filepath.Join(ctx.GlobalString(utils.DataDirFlag.Name), "blockchain"))
- os.RemoveAll(filepath.Join(ctx.GlobalString(utils.DataDirFlag.Name), "state"))
-
- ethereum, err = eth.New(cfg)
- if err != nil {
- utils.Fatalf("%v\n", err)
- }
-
- ethereum.BlockDb().Put([]byte("BlockchainVersion"), common.NewValue(core.BlockChainVersion).Bytes())
-
- err = utils.ImportChain(ethereum.ChainManager(), exportFile)
- if err != nil {
- utils.Fatalf("Import error %v (a backup is made in %s, use the import command to import it)\n", err, exportFile)
- }
-
- // force database flush
- ethereum.BlockDb().Flush()
- ethereum.StateDb().Flush()
- ethereum.ExtraDb().Flush()
-
- os.Remove(exportFile)
-
- fmt.Println("Import finished")
-}
-
-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())
- }
- }
-}
-
func makedag(ctx *cli.Context) {
args := ctx.Args()
wrongArgs := func() {
@@ -701,9 +521,3 @@ func version(c *cli.Context) {
fmt.Printf("GOPATH=%s\n", os.Getenv("GOPATH"))
fmt.Printf("GOROOT=%s\n", runtime.GOROOT())
}
-
-// hashish returns true for strings that look like hashes.
-func hashish(x string) bool {
- _, err := strconv.Atoi(x)
- return err != nil
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 15:53:44 +0800