|
|
|
// Copyright 2014 The go-ethereum Authors
|
|
|
|
// This file is part of the go-ethereum library.
|
|
|
|
//
|
|
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
|
|
// (at your option) any later version.
|
|
|
|
//
|
|
|
|
// The go-ethereum library 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 Lesser General Public License for more details.
|
|
|
|
//
|
|
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
package node
|
|
|
|
|
|
|
|
import (
|
|
|
|
"crypto/ecdsa"
|
|
|
|
"fmt"
|
|
|
|
"io/ioutil"
|
|
|
|
"os"
|
|
|
|
"path/filepath"
|
|
|
|
"runtime"
|
|
|
|
"strings"
|
|
|
|
"sync"
|
|
|
|
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
|
|
"github.com/ethereum/go-ethereum/crypto"
|
|
|
|
"github.com/ethereum/go-ethereum/log"
|
|
|
|
"github.com/ethereum/go-ethereum/p2p"
|
all: new p2p node representation (#17643)
Package p2p/enode provides a generalized representation of p2p nodes
which can contain arbitrary information in key/value pairs. It is also
the new home for the node database. The "v4" identity scheme is also
moved here from p2p/enr to remove the dependency on Ethereum crypto from
that package.
Record signature handling is changed significantly. The identity scheme
registry is removed and acceptable schemes must be passed to any method
that needs identity. This means records must now be validated explicitly
after decoding.
The enode API is designed to make signature handling easy and safe: most
APIs around the codebase work with enode.Node, which is a wrapper around
a valid record. Going from enr.Record to enode.Node requires a valid
signature.
* p2p/discover: port to p2p/enode
This ports the discovery code to the new node representation in
p2p/enode. The wire protocol is unchanged, this can be considered a
refactoring change. The Kademlia table can now deal with nodes using an
arbitrary identity scheme. This requires a few incompatible API changes:
- Table.Lookup is not available anymore. It used to take a public key
as argument because v4 protocol requires one. Its replacement is
LookupRandom.
- Table.Resolve takes *enode.Node instead of NodeID. This is also for
v4 protocol compatibility because nodes cannot be looked up by ID
alone.
- Types Node and NodeID are gone. Further commits in the series will be
fixes all over the the codebase to deal with those removals.
* p2p: port to p2p/enode and discovery changes
This adapts package p2p to the changes in p2p/discover. All uses of
discover.Node and discover.NodeID are replaced by their equivalents from
p2p/enode.
New API is added to retrieve the enode.Node instance of a peer. The
behavior of Server.Self with discovery disabled is improved. It now
tries much harder to report a working IP address, falling back to
127.0.0.1 if no suitable address can be determined through other means.
These changes were needed for tests of other packages later in the
series.
* p2p/simulations, p2p/testing: port to p2p/enode
No surprises here, mostly replacements of discover.Node, discover.NodeID
with their new equivalents. The 'interesting' API changes are:
- testing.ProtocolSession tracks complete nodes, not just their IDs.
- adapters.NodeConfig has a new method to create a complete node.
These changes were needed to make swarm tests work.
Note that the NodeID change makes the code incompatible with old
simulation snapshots.
* whisper/whisperv5, whisper/whisperv6: port to p2p/enode
This port was easy because whisper uses []byte for node IDs and
URL strings in the API.
* eth: port to p2p/enode
Again, easy to port because eth uses strings for node IDs and doesn't
care about node information in any way.
* les: port to p2p/enode
Apart from replacing discover.NodeID with enode.ID, most changes are in
the server pool code. It now deals with complete nodes instead
of (Pubkey, IP, Port) triples. The database format is unchanged for now,
but we should probably change it to use the node database later.
* node: port to p2p/enode
This change simply replaces discover.Node and discover.NodeID with their
new equivalents.
* swarm/network: port to p2p/enode
Swarm has its own node address representation, BzzAddr, containing both
an overlay address (the hash of a secp256k1 public key) and an underlay
address (enode:// URL).
There are no changes to the BzzAddr format in this commit, but certain
operations such as creating a BzzAddr from a node ID are now impossible
because node IDs aren't public keys anymore.
Most swarm-related changes in the series remove uses of
NewAddrFromNodeID, replacing it with NewAddr which takes a complete node
as argument. ToOverlayAddr is removed because we can just use the node
ID directly.
6 years ago
|
|
|
"github.com/ethereum/go-ethereum/p2p/enode"
|
|
|
|
"github.com/ethereum/go-ethereum/rpc"
|
|
|
|
)
|
|
|
|
|
|
|
|
const (
|
|
|
|
datadirPrivateKey = "nodekey" // Path within the datadir to the node's private key
|
|
|
|
datadirJWTKey = "jwtsecret" // Path within the datadir to the node's jwt secret
|
|
|
|
datadirDefaultKeyStore = "keystore" // Path within the datadir to the keystore
|
|
|
|
datadirStaticNodes = "static-nodes.json" // Path within the datadir to the static node list
|
|
|
|
datadirTrustedNodes = "trusted-nodes.json" // Path within the datadir to the trusted node list
|
|
|
|
datadirNodeDatabase = "nodes" // Path within the datadir to store the node infos
|
|
|
|
)
|
|
|
|
|
|
|
|
// Config represents a small collection of configuration values to fine tune the
|
|
|
|
// P2P network layer of a protocol stack. These values can be further extended by
|
|
|
|
// all registered services.
|
|
|
|
type Config struct {
|
|
|
|
// Name sets the instance name of the node. It must not contain the / character and is
|
|
|
|
// used in the devp2p node identifier. The instance name of geth is "geth". If no
|
|
|
|
// value is specified, the basename of the current executable is used.
|
|
|
|
Name string `toml:"-"`
|
|
|
|
|
|
|
|
// UserIdent, if set, is used as an additional component in the devp2p node identifier.
|
|
|
|
UserIdent string `toml:",omitempty"`
|
|
|
|
|
|
|
|
// Version should be set to the version number of the program. It is used
|
|
|
|
// in the devp2p node identifier.
|
|
|
|
Version string `toml:"-"`
|
|
|
|
|
|
|
|
// DataDir is the file system folder the node should use for any data storage
|
|
|
|
// requirements. The configured data directory will not be directly shared with
|
|
|
|
// registered services, instead those can use utility methods to create/access
|
|
|
|
// databases or flat files. This enables ephemeral nodes which can fully reside
|
|
|
|
// in memory.
|
|
|
|
DataDir string
|
|
|
|
|
|
|
|
// Configuration of peer-to-peer networking.
|
|
|
|
P2P p2p.Config
|
|
|
|
|
|
|
|
// KeyStoreDir is the file system folder that contains private keys. The directory can
|
|
|
|
// be specified as a relative path, in which case it is resolved relative to the
|
|
|
|
// current directory.
|
|
|
|
//
|
|
|
|
// If KeyStoreDir is empty, the default location is the "keystore" subdirectory of
|
|
|
|
// DataDir. If DataDir is unspecified and KeyStoreDir is empty, an ephemeral directory
|
|
|
|
// is created by New and destroyed when the node is stopped.
|
|
|
|
KeyStoreDir string `toml:",omitempty"`
|
|
|
|
|
accounts, eth, clique, signer: support for external signer API (#18079)
* accounts, eth, clique: implement external backend + move sighash calc to backend
* signer: implement account_Version on external API
* accounts/external: enable ipc, add copyright
* accounts, internal, signer: formatting
* node: go fmt
* flags: disallow --dev in combo with --externalsigner
* accounts: remove clique-specific signing method, replace with more generic
* accounts, consensus: formatting + fix error in tests
* signer/core: remove (test-) import cycle
* clique: remove unused import
* accounts: remove CliqueHash and avoid dependency on package crypto
* consensus/clique: unduplicate header encoding
6 years ago
|
|
|
// ExternalSigner specifies an external URI for a clef-type signer
|
|
|
|
ExternalSigner string `toml:",omitempty"`
|
accounts, eth, clique, signer: support for external signer API (#18079)
* accounts, eth, clique: implement external backend + move sighash calc to backend
* signer: implement account_Version on external API
* accounts/external: enable ipc, add copyright
* accounts, internal, signer: formatting
* node: go fmt
* flags: disallow --dev in combo with --externalsigner
* accounts: remove clique-specific signing method, replace with more generic
* accounts, consensus: formatting + fix error in tests
* signer/core: remove (test-) import cycle
* clique: remove unused import
* accounts: remove CliqueHash and avoid dependency on package crypto
* consensus/clique: unduplicate header encoding
6 years ago
|
|
|
|
|
|
|
// UseLightweightKDF lowers the memory and CPU requirements of the key store
|
|
|
|
// scrypt KDF at the expense of security.
|
|
|
|
UseLightweightKDF bool `toml:",omitempty"`
|
|
|
|
|
|
|
|
// InsecureUnlockAllowed allows user to unlock accounts in unsafe http environment.
|
|
|
|
InsecureUnlockAllowed bool `toml:",omitempty"`
|
|
|
|
|
|
|
|
// NoUSB disables hardware wallet monitoring and connectivity.
|
|
|
|
// Deprecated: USB monitoring is disabled by default and must be enabled explicitly.
|
|
|
|
NoUSB bool `toml:",omitempty"`
|
|
|
|
|
|
|
|
// USB enables hardware wallet monitoring and connectivity.
|
|
|
|
USB bool `toml:",omitempty"`
|
|
|
|
|
|
|
|
// SmartCardDaemonPath is the path to the smartcard daemon's socket
|
|
|
|
SmartCardDaemonPath string `toml:",omitempty"`
|
|
|
|
|
|
|
|
// IPCPath is the requested location to place the IPC endpoint. If the path is
|
|
|
|
// a simple file name, it is placed inside the data directory (or on the root
|
|
|
|
// pipe path on Windows), whereas if it's a resolvable path name (absolute or
|
|
|
|
// relative), then that specific path is enforced. An empty path disables IPC.
|
|
|
|
IPCPath string
|
|
|
|
|
|
|
|
// HTTPHost is the host interface on which to start the HTTP RPC server. If this
|
|
|
|
// field is empty, no HTTP API endpoint will be started.
|
|
|
|
HTTPHost string
|
|
|
|
|
|
|
|
// HTTPPort is the TCP port number on which to start the HTTP RPC server. The
|
|
|
|
// default zero value is/ valid and will pick a port number randomly (useful
|
|
|
|
// for ephemeral nodes).
|
|
|
|
HTTPPort int `toml:",omitempty"`
|
|
|
|
|
|
|
|
// Authport is the port number on which the authenticated API is provided.
|
|
|
|
AuthPort int `toml:",omitempty"`
|
|
|
|
|
|
|
|
// HTTPCors is the Cross-Origin Resource Sharing header to send to requesting
|
|
|
|
// clients. Please be aware that CORS is a browser enforced security, it's fully
|
|
|
|
// useless for custom HTTP clients.
|
|
|
|
HTTPCors []string `toml:",omitempty"`
|
|
|
|
|
|
|
|
// HTTPVirtualHosts is the list of virtual hostnames which are allowed on incoming requests.
|
|
|
|
// This is by default {'localhost'}. Using this prevents attacks like
|
|
|
|
// DNS rebinding, which bypasses SOP by simply masquerading as being within the same
|
|
|
|
// origin. These attacks do not utilize CORS, since they are not cross-domain.
|
|
|
|
// By explicitly checking the Host-header, the server will not allow requests
|
|
|
|
// made against the server with a malicious host domain.
|
|
|
|
// Requests using ip address directly are not affected
|
|
|
|
HTTPVirtualHosts []string `toml:",omitempty"`
|
|
|
|
|
|
|
|
// HTTPModules is a list of API modules to expose via the HTTP RPC interface.
|
|
|
|
// If the module list is empty, all RPC API endpoints designated public will be
|
|
|
|
// exposed.
|
|
|
|
HTTPModules []string
|
|
|
|
|
|
|
|
// HTTPTimeouts allows for customization of the timeout values used by the HTTP RPC
|
|
|
|
// interface.
|
|
|
|
HTTPTimeouts rpc.HTTPTimeouts
|
|
|
|
|
|
|
|
// HTTPPathPrefix specifies a path prefix on which http-rpc is to be served.
|
|
|
|
HTTPPathPrefix string `toml:",omitempty"`
|
|
|
|
|
|
|
|
// WSHost is the host interface on which to start the websocket RPC server. If
|
|
|
|
// this field is empty, no websocket API endpoint will be started.
|
|
|
|
WSHost string
|
|
|
|
|
|
|
|
// WSPort is the TCP port number on which to start the websocket RPC server. The
|
|
|
|
// default zero value is/ valid and will pick a port number randomly (useful for
|
|
|
|
// ephemeral nodes).
|
|
|
|
WSPort int `toml:",omitempty"`
|
|
|
|
|
|
|
|
// WSPathPrefix specifies a path prefix on which ws-rpc is to be served.
|
|
|
|
WSPathPrefix string `toml:",omitempty"`
|
|
|
|
|
|
|
|
// WSOrigins is the list of domain to accept websocket requests from. Please be
|
|
|
|
// aware that the server can only act upon the HTTP request the client sends and
|
|
|
|
// cannot verify the validity of the request header.
|
|
|
|
WSOrigins []string `toml:",omitempty"`
|
|
|
|
|
|
|
|
// WSModules is a list of API modules to expose via the websocket RPC interface.
|
|
|
|
// If the module list is empty, all RPC API endpoints designated public will be
|
|
|
|
// exposed.
|
|
|
|
WSModules []string
|
|
|
|
|
|
|
|
// WSExposeAll exposes all API modules via the WebSocket RPC interface rather
|
|
|
|
// than just the public ones.
|
|
|
|
//
|
|
|
|
// *WARNING* Only set this if the node is running in a trusted network, exposing
|
|
|
|
// private APIs to untrusted users is a major security risk.
|
|
|
|
WSExposeAll bool `toml:",omitempty"`
|
|
|
|
|
|
|
|
// GraphQLCors is the Cross-Origin Resource Sharing header to send to requesting
|
|
|
|
// clients. Please be aware that CORS is a browser enforced security, it's fully
|
|
|
|
// useless for custom HTTP clients.
|
|
|
|
GraphQLCors []string `toml:",omitempty"`
|
|
|
|
|
|
|
|
// GraphQLVirtualHosts is the list of virtual hostnames which are allowed on incoming requests.
|
|
|
|
// This is by default {'localhost'}. Using this prevents attacks like
|
|
|
|
// DNS rebinding, which bypasses SOP by simply masquerading as being within the same
|
|
|
|
// origin. These attacks do not utilize CORS, since they are not cross-domain.
|
|
|
|
// By explicitly checking the Host-header, the server will not allow requests
|
|
|
|
// made against the server with a malicious host domain.
|
|
|
|
// Requests using ip address directly are not affected
|
|
|
|
GraphQLVirtualHosts []string `toml:",omitempty"`
|
|
|
|
|
|
|
|
// Logger is a custom logger to use with the p2p.Server.
|
|
|
|
Logger log.Logger `toml:",omitempty"`
|
|
|
|
|
|
|
|
staticNodesWarning bool
|
|
|
|
trustedNodesWarning bool
|
|
|
|
oldGethResourceWarning bool
|
|
|
|
|
|
|
|
// AllowUnprotectedTxs allows non EIP-155 protected transactions to be send over RPC.
|
|
|
|
AllowUnprotectedTxs bool `toml:",omitempty"`
|
|
|
|
|
|
|
|
// JWTSecret is the hex-encoded jwt secret.
|
|
|
|
JWTSecret string `toml:",omitempty"`
|
|
|
|
}
|
|
|
|
|
|
|
|
// IPCEndpoint resolves an IPC endpoint based on a configured value, taking into
|
|
|
|
// account the set data folders as well as the designated platform we're currently
|
|
|
|
// running on.
|
|
|
|
func (c *Config) IPCEndpoint() string {
|
|
|
|
// Short circuit if IPC has not been enabled
|
|
|
|
if c.IPCPath == "" {
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
// On windows we can only use plain top-level pipes
|
|
|
|
if runtime.GOOS == "windows" {
|
|
|
|
if strings.HasPrefix(c.IPCPath, `\\.\pipe\`) {
|
|
|
|
return c.IPCPath
|
|
|
|
}
|
|
|
|
return `\\.\pipe\` + c.IPCPath
|
|
|
|
}
|
|
|
|
// Resolve names into the data directory full paths otherwise
|
|
|
|
if filepath.Base(c.IPCPath) == c.IPCPath {
|
|
|
|
if c.DataDir == "" {
|
|
|
|
return filepath.Join(os.TempDir(), c.IPCPath)
|
|
|
|
}
|
|
|
|
return filepath.Join(c.DataDir, c.IPCPath)
|
|
|
|
}
|
|
|
|
return c.IPCPath
|
|
|
|
}
|
|
|
|
|
|
|
|
// NodeDB returns the path to the discovery node database.
|
|
|
|
func (c *Config) NodeDB() string {
|
|
|
|
if c.DataDir == "" {
|
|
|
|
return "" // ephemeral
|
|
|
|
}
|
cmd, dashboard, log: log collection and exploration (#17097)
* cmd, dashboard, internal, log, node: logging feature
* cmd, dashboard, internal, log: requested changes
* dashboard, vendor: gofmt, govendor, use vendored file watcher
* dashboard, log: gofmt -s -w, goimports
* dashboard, log: gosimple
6 years ago
|
|
|
return c.ResolvePath(datadirNodeDatabase)
|
|
|
|
}
|
|
|
|
|
|
|
|
// DefaultIPCEndpoint returns the IPC path used by default.
|
|
|
|
func DefaultIPCEndpoint(clientIdentifier string) string {
|
|
|
|
if clientIdentifier == "" {
|
|
|
|
clientIdentifier = strings.TrimSuffix(filepath.Base(os.Args[0]), ".exe")
|
|
|
|
if clientIdentifier == "" {
|
|
|
|
panic("empty executable name")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
config := &Config{DataDir: DefaultDataDir(), IPCPath: clientIdentifier + ".ipc"}
|
|
|
|
return config.IPCEndpoint()
|
|
|
|
}
|
|
|
|
|
|
|
|
// HTTPEndpoint resolves an HTTP endpoint based on the configured host interface
|
|
|
|
// and port parameters.
|
|
|
|
func (c *Config) HTTPEndpoint() string {
|
|
|
|
if c.HTTPHost == "" {
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
return fmt.Sprintf("%s:%d", c.HTTPHost, c.HTTPPort)
|
|
|
|
}
|
|
|
|
|
|
|
|
// DefaultHTTPEndpoint returns the HTTP endpoint used by default.
|
|
|
|
func DefaultHTTPEndpoint() string {
|
|
|
|
config := &Config{HTTPHost: DefaultHTTPHost, HTTPPort: DefaultHTTPPort, AuthPort: DefaultAuthPort}
|
|
|
|
return config.HTTPEndpoint()
|
|
|
|
}
|
|
|
|
|
|
|
|
// WSEndpoint resolves a websocket endpoint based on the configured host interface
|
|
|
|
// and port parameters.
|
|
|
|
func (c *Config) WSEndpoint() string {
|
|
|
|
if c.WSHost == "" {
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
return fmt.Sprintf("%s:%d", c.WSHost, c.WSPort)
|
|
|
|
}
|
|
|
|
|
|
|
|
// DefaultWSEndpoint returns the websocket endpoint used by default.
|
|
|
|
func DefaultWSEndpoint() string {
|
|
|
|
config := &Config{WSHost: DefaultWSHost, WSPort: DefaultWSPort}
|
|
|
|
return config.WSEndpoint()
|
|
|
|
}
|
|
|
|
|
|
|
|
// ExtRPCEnabled returns the indicator whether node enables the external
|
|
|
|
// RPC(http, ws or graphql).
|
|
|
|
func (c *Config) ExtRPCEnabled() bool {
|
|
|
|
return c.HTTPHost != "" || c.WSHost != ""
|
|
|
|
}
|
|
|
|
|
|
|
|
// NodeName returns the devp2p node identifier.
|
|
|
|
func (c *Config) NodeName() string {
|
|
|
|
name := c.name()
|
|
|
|
// Backwards compatibility: previous versions used title-cased "Geth", keep that.
|
|
|
|
if name == "geth" || name == "geth-testnet" {
|
|
|
|
name = "Geth"
|
|
|
|
}
|
|
|
|
if c.UserIdent != "" {
|
|
|
|
name += "/" + c.UserIdent
|
|
|
|
}
|
|
|
|
if c.Version != "" {
|
|
|
|
name += "/v" + c.Version
|
|
|
|
}
|
|
|
|
name += "/" + runtime.GOOS + "-" + runtime.GOARCH
|
|
|
|
name += "/" + runtime.Version()
|
|
|
|
return name
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Config) name() string {
|
|
|
|
if c.Name == "" {
|
|
|
|
progname := strings.TrimSuffix(filepath.Base(os.Args[0]), ".exe")
|
|
|
|
if progname == "" {
|
|
|
|
panic("empty executable name, set Config.Name")
|
|
|
|
}
|
|
|
|
return progname
|
|
|
|
}
|
|
|
|
return c.Name
|
|
|
|
}
|
|
|
|
|
|
|
|
// These resources are resolved differently for "geth" instances.
|
|
|
|
var isOldGethResource = map[string]bool{
|
|
|
|
"chaindata": true,
|
|
|
|
"nodes": true,
|
|
|
|
"nodekey": true,
|
|
|
|
"static-nodes.json": false, // no warning for these because they have their
|
|
|
|
"trusted-nodes.json": false, // own separate warning.
|
|
|
|
}
|
|
|
|
|
cmd, dashboard, log: log collection and exploration (#17097)
* cmd, dashboard, internal, log, node: logging feature
* cmd, dashboard, internal, log: requested changes
* dashboard, vendor: gofmt, govendor, use vendored file watcher
* dashboard, log: gofmt -s -w, goimports
* dashboard, log: gosimple
6 years ago
|
|
|
// ResolvePath resolves path in the instance directory.
|
|
|
|
func (c *Config) ResolvePath(path string) string {
|
|
|
|
if filepath.IsAbs(path) {
|
|
|
|
return path
|
|
|
|
}
|
|
|
|
if c.DataDir == "" {
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
// Backwards-compatibility: ensure that data directory files created
|
|
|
|
// by geth 1.4 are used if they exist.
|
|
|
|
if warn, isOld := isOldGethResource[path]; isOld {
|
|
|
|
oldpath := ""
|
|
|
|
if c.name() == "geth" {
|
|
|
|
oldpath = filepath.Join(c.DataDir, path)
|
|
|
|
}
|
|
|
|
if oldpath != "" && common.FileExist(oldpath) {
|
|
|
|
if warn {
|
|
|
|
c.warnOnce(&c.oldGethResourceWarning, "Using deprecated resource file %s, please move this file to the 'geth' subdirectory of datadir.", oldpath)
|
|
|
|
}
|
|
|
|
return oldpath
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return filepath.Join(c.instanceDir(), path)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Config) instanceDir() string {
|
|
|
|
if c.DataDir == "" {
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
return filepath.Join(c.DataDir, c.name())
|
|
|
|
}
|
|
|
|
|
|
|
|
// NodeKey retrieves the currently configured private key of the node, checking
|
|
|
|
// first any manually set key, falling back to the one found in the configured
|
|
|
|
// data folder. If no key can be found, a new one is generated.
|
|
|
|
func (c *Config) NodeKey() *ecdsa.PrivateKey {
|
|
|
|
// Use any specifically configured key.
|
|
|
|
if c.P2P.PrivateKey != nil {
|
|
|
|
return c.P2P.PrivateKey
|
|
|
|
}
|
|
|
|
// Generate ephemeral key if no datadir is being used.
|
|
|
|
if c.DataDir == "" {
|
|
|
|
key, err := crypto.GenerateKey()
|
|
|
|
if err != nil {
|
|
|
|
log.Crit(fmt.Sprintf("Failed to generate ephemeral node key: %v", err))
|
|
|
|
}
|
|
|
|
return key
|
|
|
|
}
|
|
|
|
|
cmd, dashboard, log: log collection and exploration (#17097)
* cmd, dashboard, internal, log, node: logging feature
* cmd, dashboard, internal, log: requested changes
* dashboard, vendor: gofmt, govendor, use vendored file watcher
* dashboard, log: gofmt -s -w, goimports
* dashboard, log: gosimple
6 years ago
|
|
|
keyfile := c.ResolvePath(datadirPrivateKey)
|
|
|
|
if key, err := crypto.LoadECDSA(keyfile); err == nil {
|
|
|
|
return key
|
|
|
|
}
|
|
|
|
// No persistent key found, generate and store a new one.
|
|
|
|
key, err := crypto.GenerateKey()
|
|
|
|
if err != nil {
|
|
|
|
log.Crit(fmt.Sprintf("Failed to generate node key: %v", err))
|
|
|
|
}
|
|
|
|
instanceDir := filepath.Join(c.DataDir, c.name())
|
|
|
|
if err := os.MkdirAll(instanceDir, 0700); err != nil {
|
|
|
|
log.Error(fmt.Sprintf("Failed to persist node key: %v", err))
|
|
|
|
return key
|
|
|
|
}
|
|
|
|
keyfile = filepath.Join(instanceDir, datadirPrivateKey)
|
|
|
|
if err := crypto.SaveECDSA(keyfile, key); err != nil {
|
|
|
|
log.Error(fmt.Sprintf("Failed to persist node key: %v", err))
|
|
|
|
}
|
|
|
|
return key
|
|
|
|
}
|
|
|
|
|
|
|
|
// StaticNodes returns a list of node enode URLs configured as static nodes.
|
all: new p2p node representation (#17643)
Package p2p/enode provides a generalized representation of p2p nodes
which can contain arbitrary information in key/value pairs. It is also
the new home for the node database. The "v4" identity scheme is also
moved here from p2p/enr to remove the dependency on Ethereum crypto from
that package.
Record signature handling is changed significantly. The identity scheme
registry is removed and acceptable schemes must be passed to any method
that needs identity. This means records must now be validated explicitly
after decoding.
The enode API is designed to make signature handling easy and safe: most
APIs around the codebase work with enode.Node, which is a wrapper around
a valid record. Going from enr.Record to enode.Node requires a valid
signature.
* p2p/discover: port to p2p/enode
This ports the discovery code to the new node representation in
p2p/enode. The wire protocol is unchanged, this can be considered a
refactoring change. The Kademlia table can now deal with nodes using an
arbitrary identity scheme. This requires a few incompatible API changes:
- Table.Lookup is not available anymore. It used to take a public key
as argument because v4 protocol requires one. Its replacement is
LookupRandom.
- Table.Resolve takes *enode.Node instead of NodeID. This is also for
v4 protocol compatibility because nodes cannot be looked up by ID
alone.
- Types Node and NodeID are gone. Further commits in the series will be
fixes all over the the codebase to deal with those removals.
* p2p: port to p2p/enode and discovery changes
This adapts package p2p to the changes in p2p/discover. All uses of
discover.Node and discover.NodeID are replaced by their equivalents from
p2p/enode.
New API is added to retrieve the enode.Node instance of a peer. The
behavior of Server.Self with discovery disabled is improved. It now
tries much harder to report a working IP address, falling back to
127.0.0.1 if no suitable address can be determined through other means.
These changes were needed for tests of other packages later in the
series.
* p2p/simulations, p2p/testing: port to p2p/enode
No surprises here, mostly replacements of discover.Node, discover.NodeID
with their new equivalents. The 'interesting' API changes are:
- testing.ProtocolSession tracks complete nodes, not just their IDs.
- adapters.NodeConfig has a new method to create a complete node.
These changes were needed to make swarm tests work.
Note that the NodeID change makes the code incompatible with old
simulation snapshots.
* whisper/whisperv5, whisper/whisperv6: port to p2p/enode
This port was easy because whisper uses []byte for node IDs and
URL strings in the API.
* eth: port to p2p/enode
Again, easy to port because eth uses strings for node IDs and doesn't
care about node information in any way.
* les: port to p2p/enode
Apart from replacing discover.NodeID with enode.ID, most changes are in
the server pool code. It now deals with complete nodes instead
of (Pubkey, IP, Port) triples. The database format is unchanged for now,
but we should probably change it to use the node database later.
* node: port to p2p/enode
This change simply replaces discover.Node and discover.NodeID with their
new equivalents.
* swarm/network: port to p2p/enode
Swarm has its own node address representation, BzzAddr, containing both
an overlay address (the hash of a secp256k1 public key) and an underlay
address (enode:// URL).
There are no changes to the BzzAddr format in this commit, but certain
operations such as creating a BzzAddr from a node ID are now impossible
because node IDs aren't public keys anymore.
Most swarm-related changes in the series remove uses of
NewAddrFromNodeID, replacing it with NewAddr which takes a complete node
as argument. ToOverlayAddr is removed because we can just use the node
ID directly.
6 years ago
|
|
|
func (c *Config) StaticNodes() []*enode.Node {
|
|
|
|
return c.parsePersistentNodes(&c.staticNodesWarning, c.ResolvePath(datadirStaticNodes))
|
|
|
|
}
|
|
|
|
|
|
|
|
// TrustedNodes returns a list of node enode URLs configured as trusted nodes.
|
all: new p2p node representation (#17643)
Package p2p/enode provides a generalized representation of p2p nodes
which can contain arbitrary information in key/value pairs. It is also
the new home for the node database. The "v4" identity scheme is also
moved here from p2p/enr to remove the dependency on Ethereum crypto from
that package.
Record signature handling is changed significantly. The identity scheme
registry is removed and acceptable schemes must be passed to any method
that needs identity. This means records must now be validated explicitly
after decoding.
The enode API is designed to make signature handling easy and safe: most
APIs around the codebase work with enode.Node, which is a wrapper around
a valid record. Going from enr.Record to enode.Node requires a valid
signature.
* p2p/discover: port to p2p/enode
This ports the discovery code to the new node representation in
p2p/enode. The wire protocol is unchanged, this can be considered a
refactoring change. The Kademlia table can now deal with nodes using an
arbitrary identity scheme. This requires a few incompatible API changes:
- Table.Lookup is not available anymore. It used to take a public key
as argument because v4 protocol requires one. Its replacement is
LookupRandom.
- Table.Resolve takes *enode.Node instead of NodeID. This is also for
v4 protocol compatibility because nodes cannot be looked up by ID
alone.
- Types Node and NodeID are gone. Further commits in the series will be
fixes all over the the codebase to deal with those removals.
* p2p: port to p2p/enode and discovery changes
This adapts package p2p to the changes in p2p/discover. All uses of
discover.Node and discover.NodeID are replaced by their equivalents from
p2p/enode.
New API is added to retrieve the enode.Node instance of a peer. The
behavior of Server.Self with discovery disabled is improved. It now
tries much harder to report a working IP address, falling back to
127.0.0.1 if no suitable address can be determined through other means.
These changes were needed for tests of other packages later in the
series.
* p2p/simulations, p2p/testing: port to p2p/enode
No surprises here, mostly replacements of discover.Node, discover.NodeID
with their new equivalents. The 'interesting' API changes are:
- testing.ProtocolSession tracks complete nodes, not just their IDs.
- adapters.NodeConfig has a new method to create a complete node.
These changes were needed to make swarm tests work.
Note that the NodeID change makes the code incompatible with old
simulation snapshots.
* whisper/whisperv5, whisper/whisperv6: port to p2p/enode
This port was easy because whisper uses []byte for node IDs and
URL strings in the API.
* eth: port to p2p/enode
Again, easy to port because eth uses strings for node IDs and doesn't
care about node information in any way.
* les: port to p2p/enode
Apart from replacing discover.NodeID with enode.ID, most changes are in
the server pool code. It now deals with complete nodes instead
of (Pubkey, IP, Port) triples. The database format is unchanged for now,
but we should probably change it to use the node database later.
* node: port to p2p/enode
This change simply replaces discover.Node and discover.NodeID with their
new equivalents.
* swarm/network: port to p2p/enode
Swarm has its own node address representation, BzzAddr, containing both
an overlay address (the hash of a secp256k1 public key) and an underlay
address (enode:// URL).
There are no changes to the BzzAddr format in this commit, but certain
operations such as creating a BzzAddr from a node ID are now impossible
because node IDs aren't public keys anymore.
Most swarm-related changes in the series remove uses of
NewAddrFromNodeID, replacing it with NewAddr which takes a complete node
as argument. ToOverlayAddr is removed because we can just use the node
ID directly.
6 years ago
|
|
|
func (c *Config) TrustedNodes() []*enode.Node {
|
|
|
|
return c.parsePersistentNodes(&c.trustedNodesWarning, c.ResolvePath(datadirTrustedNodes))
|
|
|
|
}
|
|
|
|
|
|
|
|
// parsePersistentNodes parses a list of discovery node URLs loaded from a .json
|
|
|
|
// file from within the data directory.
|
|
|
|
func (c *Config) parsePersistentNodes(w *bool, path string) []*enode.Node {
|
|
|
|
// Short circuit if no node config is present
|
|
|
|
if c.DataDir == "" {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
if _, err := os.Stat(path); err != nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
c.warnOnce(w, "Found deprecated node list file %s, please use the TOML config file instead.", path)
|
|
|
|
|
|
|
|
// Load the nodes from the config file.
|
|
|
|
var nodelist []string
|
|
|
|
if err := common.LoadJSON(path, &nodelist); err != nil {
|
|
|
|
log.Error(fmt.Sprintf("Can't load node list file: %v", err))
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
// Interpret the list as a discovery node array
|
all: new p2p node representation (#17643)
Package p2p/enode provides a generalized representation of p2p nodes
which can contain arbitrary information in key/value pairs. It is also
the new home for the node database. The "v4" identity scheme is also
moved here from p2p/enr to remove the dependency on Ethereum crypto from
that package.
Record signature handling is changed significantly. The identity scheme
registry is removed and acceptable schemes must be passed to any method
that needs identity. This means records must now be validated explicitly
after decoding.
The enode API is designed to make signature handling easy and safe: most
APIs around the codebase work with enode.Node, which is a wrapper around
a valid record. Going from enr.Record to enode.Node requires a valid
signature.
* p2p/discover: port to p2p/enode
This ports the discovery code to the new node representation in
p2p/enode. The wire protocol is unchanged, this can be considered a
refactoring change. The Kademlia table can now deal with nodes using an
arbitrary identity scheme. This requires a few incompatible API changes:
- Table.Lookup is not available anymore. It used to take a public key
as argument because v4 protocol requires one. Its replacement is
LookupRandom.
- Table.Resolve takes *enode.Node instead of NodeID. This is also for
v4 protocol compatibility because nodes cannot be looked up by ID
alone.
- Types Node and NodeID are gone. Further commits in the series will be
fixes all over the the codebase to deal with those removals.
* p2p: port to p2p/enode and discovery changes
This adapts package p2p to the changes in p2p/discover. All uses of
discover.Node and discover.NodeID are replaced by their equivalents from
p2p/enode.
New API is added to retrieve the enode.Node instance of a peer. The
behavior of Server.Self with discovery disabled is improved. It now
tries much harder to report a working IP address, falling back to
127.0.0.1 if no suitable address can be determined through other means.
These changes were needed for tests of other packages later in the
series.
* p2p/simulations, p2p/testing: port to p2p/enode
No surprises here, mostly replacements of discover.Node, discover.NodeID
with their new equivalents. The 'interesting' API changes are:
- testing.ProtocolSession tracks complete nodes, not just their IDs.
- adapters.NodeConfig has a new method to create a complete node.
These changes were needed to make swarm tests work.
Note that the NodeID change makes the code incompatible with old
simulation snapshots.
* whisper/whisperv5, whisper/whisperv6: port to p2p/enode
This port was easy because whisper uses []byte for node IDs and
URL strings in the API.
* eth: port to p2p/enode
Again, easy to port because eth uses strings for node IDs and doesn't
care about node information in any way.
* les: port to p2p/enode
Apart from replacing discover.NodeID with enode.ID, most changes are in
the server pool code. It now deals with complete nodes instead
of (Pubkey, IP, Port) triples. The database format is unchanged for now,
but we should probably change it to use the node database later.
* node: port to p2p/enode
This change simply replaces discover.Node and discover.NodeID with their
new equivalents.
* swarm/network: port to p2p/enode
Swarm has its own node address representation, BzzAddr, containing both
an overlay address (the hash of a secp256k1 public key) and an underlay
address (enode:// URL).
There are no changes to the BzzAddr format in this commit, but certain
operations such as creating a BzzAddr from a node ID are now impossible
because node IDs aren't public keys anymore.
Most swarm-related changes in the series remove uses of
NewAddrFromNodeID, replacing it with NewAddr which takes a complete node
as argument. ToOverlayAddr is removed because we can just use the node
ID directly.
6 years ago
|
|
|
var nodes []*enode.Node
|
|
|
|
for _, url := range nodelist {
|
|
|
|
if url == "" {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
node, err := enode.Parse(enode.ValidSchemes, url)
|
|
|
|
if err != nil {
|
|
|
|
log.Error(fmt.Sprintf("Node URL %s: %v\n", url, err))
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
nodes = append(nodes, node)
|
|
|
|
}
|
|
|
|
return nodes
|
|
|
|
}
|
|
|
|
|
|
|
|
// KeyDirConfig determines the settings for keydirectory
|
|
|
|
func (c *Config) KeyDirConfig() (string, error) {
|
|
|
|
var (
|
|
|
|
keydir string
|
|
|
|
err error
|
|
|
|
)
|
|
|
|
switch {
|
|
|
|
case filepath.IsAbs(c.KeyStoreDir):
|
|
|
|
keydir = c.KeyStoreDir
|
|
|
|
case c.DataDir != "":
|
|
|
|
if c.KeyStoreDir == "" {
|
|
|
|
keydir = filepath.Join(c.DataDir, datadirDefaultKeyStore)
|
|
|
|
} else {
|
|
|
|
keydir, err = filepath.Abs(c.KeyStoreDir)
|
|
|
|
}
|
|
|
|
case c.KeyStoreDir != "":
|
|
|
|
keydir, err = filepath.Abs(c.KeyStoreDir)
|
|
|
|
}
|
|
|
|
return keydir, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// getKeyStoreDir retrieves the key directory and will create
|
|
|
|
// and ephemeral one if necessary.
|
|
|
|
func getKeyStoreDir(conf *Config) (string, bool, error) {
|
|
|
|
keydir, err := conf.KeyDirConfig()
|
|
|
|
if err != nil {
|
|
|
|
return "", false, err
|
|
|
|
}
|
|
|
|
isEphemeral := false
|
|
|
|
if keydir == "" {
|
|
|
|
// There is no datadir.
|
|
|
|
keydir, err = ioutil.TempDir("", "go-ethereum-keystore")
|
|
|
|
isEphemeral = true
|
|
|
|
}
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
return "", false, err
|
|
|
|
}
|
|
|
|
if err := os.MkdirAll(keydir, 0700); err != nil {
|
|
|
|
return "", false, err
|
|
|
|
}
|
accounts, eth, clique, signer: support for external signer API (#18079)
* accounts, eth, clique: implement external backend + move sighash calc to backend
* signer: implement account_Version on external API
* accounts/external: enable ipc, add copyright
* accounts, internal, signer: formatting
* node: go fmt
* flags: disallow --dev in combo with --externalsigner
* accounts: remove clique-specific signing method, replace with more generic
* accounts, consensus: formatting + fix error in tests
* signer/core: remove (test-) import cycle
* clique: remove unused import
* accounts: remove CliqueHash and avoid dependency on package crypto
* consensus/clique: unduplicate header encoding
6 years ago
|
|
|
|
|
|
|
return keydir, isEphemeral, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
var warnLock sync.Mutex
|
|
|
|
|
|
|
|
func (c *Config) warnOnce(w *bool, format string, args ...interface{}) {
|
|
|
|
warnLock.Lock()
|
|
|
|
defer warnLock.Unlock()
|
|
|
|
|
|
|
|
if *w {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
l := c.Logger
|
|
|
|
if l == nil {
|
|
|
|
l = log.Root()
|
|
|
|
}
|
|
|
|
l.Warn(fmt.Sprintf(format, args...))
|
|
|
|
*w = true
|
|
|
|
}
|