add --privkey flag to not use multiple enodes
Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
parent
4681e09cfe
commit
dbe4b8fa17
|
@ -1,10 +1,13 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/status-im/status-go/params"
|
"github.com/status-im/status-go/params"
|
||||||
)
|
)
|
||||||
|
|
||||||
func newNodeConfig(fleet string, networkID uint64) (*params.NodeConfig, error) {
|
func newNodeConfig(fleet string, networkID uint64, privKey string) (*params.NodeConfig, error) {
|
||||||
c, err := params.NewNodeConfig("", networkID)
|
c, err := params.NewNodeConfig("", networkID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -14,6 +17,13 @@ func newNodeConfig(fleet string, networkID uint64) (*params.NodeConfig, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cleanPrivKey := strings.TrimPrefix(privKey, "0x")
|
||||||
|
if len(cleanPrivKey) == 64 {
|
||||||
|
c.NodeKey = cleanPrivKey
|
||||||
|
} else if len(cleanPrivKey) != 64 && len(cleanPrivKey) != 0 {
|
||||||
|
return nil, errors.New("wrong private key length, expected 64 char hexadecimal")
|
||||||
|
}
|
||||||
|
|
||||||
c.ListenAddr = ":0"
|
c.ListenAddr = ":0"
|
||||||
c.MaxPeers = 10
|
c.MaxPeers = 10
|
||||||
c.IPCEnabled = true
|
c.IPCEnabled = true
|
||||||
|
|
|
@ -10,6 +10,7 @@ import (
|
||||||
var (
|
var (
|
||||||
fleet = pflag.StringP("fleet", "f", params.FleetProd, "cluster fleet")
|
fleet = pflag.StringP("fleet", "f", params.FleetProd, "cluster fleet")
|
||||||
datadir = pflag.StringP("datadir", "d", "/tmp", "home directory for node data")
|
datadir = pflag.StringP("datadir", "d", "/tmp", "home directory for node data")
|
||||||
|
privkey = pflag.StringP("privkey", "p", "", "private key for connecting to nodes, hexadecimal")
|
||||||
mailservers = pflag.StringArrayP("mailservers", "m", nil, "a list of mail servers")
|
mailservers = pflag.StringArrayP("mailservers", "m", nil, "a list of mail servers")
|
||||||
duration = pflag.DurationP("duration", "l", time.Hour*24, "length of time span from now")
|
duration = pflag.DurationP("duration", "l", time.Hour*24, "length of time span from now")
|
||||||
channels = pflag.StringArrayP("channels", "c", []string{"status"}, "name of one or more channels")
|
channels = pflag.StringArrayP("channels", "c", []string{"status"}, "name of one or more channels")
|
||||||
|
|
|
@ -34,7 +34,7 @@ func main() {
|
||||||
}()
|
}()
|
||||||
|
|
||||||
// create config
|
// create config
|
||||||
config, err := newNodeConfig(*fleet, params.MainNetworkID)
|
config, err := newNodeConfig(*fleet, params.MainNetworkID, *privkey)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Crit("failed to create a config", "err", err)
|
log.Crit("failed to create a config", "err", err)
|
||||||
}
|
}
|
||||||
|
@ -76,7 +76,7 @@ func main() {
|
||||||
nodeConfig := *config
|
nodeConfig := *config
|
||||||
log.Debug("using node config", "config", nodeConfig)
|
log.Debug("using node config", "config", nodeConfig)
|
||||||
|
|
||||||
work := NewWorkUnit(msEnode, &nodeConfig)
|
work := NewWorkUnit(msEnode, &nodeConfig, *privkey)
|
||||||
go func(work *WorkUnit) {
|
go func(work *WorkUnit) {
|
||||||
if err := work.Execute(workConfig); err != nil {
|
if err := work.Execute(workConfig); err != nil {
|
||||||
log.Crit("failed to execute work", "err", err, "enode", work.MailServerEnode)
|
log.Crit("failed to execute work", "err", err, "enode", work.MailServerEnode)
|
||||||
|
|
|
@ -5,6 +5,7 @@ import (
|
||||||
"crypto/ecdsa"
|
"crypto/ecdsa"
|
||||||
"fmt"
|
"fmt"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/ethereum/go-ethereum/accounts"
|
"github.com/ethereum/go-ethereum/accounts"
|
||||||
|
@ -25,6 +26,7 @@ import (
|
||||||
// to a mailserver and collect received envelopes.
|
// to a mailserver and collect received envelopes.
|
||||||
type WorkUnit struct {
|
type WorkUnit struct {
|
||||||
MailServerEnode string
|
MailServerEnode string
|
||||||
|
PrivKey string
|
||||||
MessageHashes []types.HexBytes // a list of collected messages.
|
MessageHashes []types.HexBytes // a list of collected messages.
|
||||||
|
|
||||||
config *params.NodeConfig
|
config *params.NodeConfig
|
||||||
|
@ -34,9 +36,10 @@ type WorkUnit struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewWorkUnit creates a new WorkUnit instance.
|
// NewWorkUnit creates a new WorkUnit instance.
|
||||||
func NewWorkUnit(mailEnode string, config *params.NodeConfig) *WorkUnit {
|
func NewWorkUnit(mailEnode string, config *params.NodeConfig, privKey string) *WorkUnit {
|
||||||
return &WorkUnit{
|
return &WorkUnit{
|
||||||
MailServerEnode: mailEnode,
|
MailServerEnode: mailEnode,
|
||||||
|
PrivKey: privKey,
|
||||||
config: config,
|
config: config,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -99,6 +102,14 @@ func (u *WorkUnit) Execute(config WorkUnitConfig) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (u *WorkUnit) generateKey() (*ecdsa.PrivateKey, error) {
|
||||||
|
if u.PrivKey != "" {
|
||||||
|
return crypto.HexToECDSA(strings.TrimPrefix(u.PrivKey, "0x"))
|
||||||
|
} else {
|
||||||
|
return crypto.GenerateKey()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (u *WorkUnit) startNode() error {
|
func (u *WorkUnit) startNode() error {
|
||||||
u.node = node.New()
|
u.node = node.New()
|
||||||
if err := u.node.Start(u.config, &accounts.Manager{}); err != nil {
|
if err := u.node.Start(u.config, &accounts.Manager{}); err != nil {
|
||||||
|
@ -112,7 +123,7 @@ func (u *WorkUnit) stopNode() error {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (u *WorkUnit) startMessenger() error {
|
func (u *WorkUnit) startMessenger() error {
|
||||||
key, err := crypto.GenerateKey()
|
key, err := u.generateKey()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue