aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/geth/chaincmd.go69
-rw-r--r--cmd/geth/main.go1
-rw-r--r--cmd/puppeth/wizard.go13
-rw-r--r--cmd/puppeth/wizard_ethstats.go31
-rw-r--r--cmd/utils/flags.go21
5 files changed, 116 insertions, 19 deletions
diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go
index 12bc1d7c6..4a9a7b11b 100644
--- a/cmd/geth/chaincmd.go
+++ b/cmd/geth/chaincmd.go
@@ -31,7 +31,9 @@ import (
"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/downloader"
"github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/trie"
"github.com/syndtr/goleveldb/leveldb/util"
@@ -71,7 +73,7 @@ It expects the genesis file as argument.`,
The import command imports blocks from an RLP-encoded form. The form can be one file
with several RLP-encoded blocks, or several files can be used.
-If only one file is used, import error will result in failure. If several files are used,
+If only one file is used, import error will result in failure. If several files are used,
processing will proceed even if an individual RLP-file import failure occurs.`,
}
exportCommand = cli.Command{
@@ -91,6 +93,23 @@ Optional second and third arguments control the first and
last block to write. In this mode, the file will be appended
if already existing.`,
}
+ copydbCommand = cli.Command{
+ Action: utils.MigrateFlags(copyDb),
+ Name: "copydb",
+ Usage: "Create a local chain from a target chaindata folder",
+ ArgsUsage: "<sourceChaindataDir>",
+ Flags: []cli.Flag{
+ utils.DataDirFlag,
+ utils.CacheFlag,
+ utils.SyncModeFlag,
+ utils.FakePoWFlag,
+ utils.TestnetFlag,
+ utils.RinkebyFlag,
+ },
+ Category: "BLOCKCHAIN COMMANDS",
+ Description: `
+The first argument must be the directory containing the blockchain to download from`,
+ }
removedbCommand = cli.Command{
Action: utils.MigrateFlags(removeDB),
Name: "removedb",
@@ -268,6 +287,54 @@ func exportChain(ctx *cli.Context) error {
return nil
}
+func copyDb(ctx *cli.Context) error {
+ // Ensure we have a source chain directory to copy
+ if len(ctx.Args()) != 1 {
+ utils.Fatalf("Source chaindata directory path argument missing")
+ }
+ // Initialize a new chain for the running node to sync into
+ stack := makeFullNode(ctx)
+ chain, chainDb := utils.MakeChain(ctx, stack)
+
+ syncmode := *utils.GlobalTextMarshaler(ctx, utils.SyncModeFlag.Name).(*downloader.SyncMode)
+ dl := downloader.New(syncmode, chainDb, new(event.TypeMux), chain, nil, nil)
+
+ // Create a source peer to satisfy downloader requests from
+ db, err := ethdb.NewLDBDatabase(ctx.Args().First(), ctx.GlobalInt(utils.CacheFlag.Name), 256)
+ if err != nil {
+ return err
+ }
+ hc, err := core.NewHeaderChain(db, chain.Config(), chain.Engine(), func() bool { return false })
+ if err != nil {
+ return err
+ }
+ peer := downloader.NewFakePeer("local", db, hc, dl)
+ if err = dl.RegisterPeer("local", 63, peer); err != nil {
+ return err
+ }
+ // Synchronise with the simulated peer
+ start := time.Now()
+
+ currentHeader := hc.CurrentHeader()
+ if err = dl.Synchronise("local", currentHeader.Hash(), hc.GetTd(currentHeader.Hash(), currentHeader.Number.Uint64()), syncmode); err != nil {
+ return err
+ }
+ for dl.Synchronising() {
+ time.Sleep(10 * time.Millisecond)
+ }
+ fmt.Printf("Database copy done in %v\n", time.Since(start))
+
+ // Compact the entire database to remove any sync overhead
+ start = time.Now()
+ fmt.Println("Compacting entire database...")
+ if err = chainDb.(*ethdb.LDBDatabase).LDB().CompactRange(util.Range{}); err != nil {
+ utils.Fatalf("Compaction failed: %v", err)
+ }
+ fmt.Printf("Compaction done in %v.\n\n", time.Since(start))
+
+ return nil
+}
+
func removeDB(ctx *cli.Context) error {
stack, _ := makeConfigNode(ctx)
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 8166c9ce8..88f3528f3 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -146,6 +146,7 @@ func init() {
initCommand,
importCommand,
exportCommand,
+ copydbCommand,
removedbCommand,
dumpCommand,
// See monitorcmd.go:
diff --git a/cmd/puppeth/wizard.go b/cmd/puppeth/wizard.go
index 3fdd639f8..5fbc11cb9 100644
--- a/cmd/puppeth/wizard.go
+++ b/cmd/puppeth/wizard.go
@@ -302,8 +302,10 @@ func (w *wizard) readJSON() string {
}
// readIPAddress reads a single line from stdin, trimming if from spaces and
-// converts it to a network IP address.
-func (w *wizard) readIPAddress() net.IP {
+// returning it if it's convertible to an IP address. The reason for keeping
+// the user input format instead of returning a Go net.IP is to match with
+// weird formats used by ethstats, which compares IPs textually, not by value.
+func (w *wizard) readIPAddress() string {
for {
// Read the IP address from the user
fmt.Printf("> ")
@@ -312,14 +314,13 @@ func (w *wizard) readIPAddress() net.IP {
log.Crit("Failed to read user input", "err", err)
}
if text = strings.TrimSpace(text); text == "" {
- return nil
+ return ""
}
// Make sure it looks ok and return it if so
- ip := net.ParseIP(text)
- if ip == nil {
+ if ip := net.ParseIP(text); ip == nil {
log.Error("Invalid IP address, please retry")
continue
}
- return ip
+ return text
}
}
diff --git a/cmd/puppeth/wizard_ethstats.go b/cmd/puppeth/wizard_ethstats.go
index 504d8fd9c..8bfa1d6e5 100644
--- a/cmd/puppeth/wizard_ethstats.go
+++ b/cmd/puppeth/wizard_ethstats.go
@@ -18,6 +18,7 @@ package main
import (
"fmt"
+ "sort"
"github.com/ethereum/go-ethereum/log"
)
@@ -64,17 +65,37 @@ func (w *wizard) deployEthstats() {
fmt.Println()
fmt.Printf("Keep existing IP %v blacklist (y/n)? (default = yes)\n", infos.banned)
if w.readDefaultString("y") != "y" {
- infos.banned = nil
-
+ // The user might want to clear the entire list, although generally probably not
+ fmt.Println()
+ fmt.Printf("Clear out blacklist and start over (y/n)? (default = no)\n")
+ if w.readDefaultString("n") != "n" {
+ infos.banned = nil
+ }
+ // Offer the user to explicitly add/remove certain IP addresses
+ fmt.Println()
+ fmt.Println("Which additional IP addresses should be blacklisted?")
+ for {
+ if ip := w.readIPAddress(); ip != "" {
+ infos.banned = append(infos.banned, ip)
+ continue
+ }
+ break
+ }
fmt.Println()
- fmt.Println("Which IP addresses should be blacklisted?")
+ fmt.Println("Which IP addresses should not be blacklisted?")
for {
- if ip := w.readIPAddress(); ip != nil {
- infos.banned = append(infos.banned, ip.String())
+ if ip := w.readIPAddress(); ip != "" {
+ for i, addr := range infos.banned {
+ if ip == addr {
+ infos.banned = append(infos.banned[:i], infos.banned[i+1:]...)
+ break
+ }
+ }
continue
}
break
}
+ sort.Strings(infos.banned)
}
// Try to deploy the ethstats server on the host
trusted := make([]string, 0, len(w.servers))
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index a62b4940b..bfef619f6 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -31,6 +31,8 @@ import (
"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/accounts/keystore"
"github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/consensus/clique"
"github.com/ethereum/go-ethereum/consensus/ethash"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/state"
@@ -1086,17 +1088,22 @@ func MakeChain(ctx *cli.Context, stack *node.Node) (chain *core.BlockChain, chai
var err error
chainDb = MakeChainDatabase(ctx, stack)
- engine := ethash.NewFaker()
- if !ctx.GlobalBool(FakePoWFlag.Name) {
- engine = ethash.New(
- stack.ResolvePath(eth.DefaultConfig.EthashCacheDir), eth.DefaultConfig.EthashCachesInMem, eth.DefaultConfig.EthashCachesOnDisk,
- stack.ResolvePath(eth.DefaultConfig.EthashDatasetDir), eth.DefaultConfig.EthashDatasetsInMem, eth.DefaultConfig.EthashDatasetsOnDisk,
- )
- }
config, _, err := core.SetupGenesisBlock(chainDb, MakeGenesis(ctx))
if err != nil {
Fatalf("%v", err)
}
+ var engine consensus.Engine
+ if config.Clique != nil {
+ engine = clique.New(config.Clique, chainDb)
+ } else {
+ engine = ethash.NewFaker()
+ if !ctx.GlobalBool(FakePoWFlag.Name) {
+ engine = ethash.New(
+ stack.ResolvePath(eth.DefaultConfig.EthashCacheDir), eth.DefaultConfig.EthashCachesInMem, eth.DefaultConfig.EthashCachesOnDisk,
+ stack.ResolvePath(eth.DefaultConfig.EthashDatasetDir), eth.DefaultConfig.EthashDatasetsInMem, eth.DefaultConfig.EthashDatasetsOnDisk,
+ )
+ }
+ }
vmcfg := vm.Config{EnablePreimageRecording: ctx.GlobalBool(VMEnableDebugFlag.Name)}
chain, err = core.NewBlockChain(chainDb, config, engine, vmcfg)
if err != nil {
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 03:56:23 +0800