good morning!!!!
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
bor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open
bor
Commits
0662b70d
Commit
0662b70d
authored
Jan 24, 2022
by
Manav Darji
Browse files
Options
Downloads
Patches
Plain Diff
enable dummy developer account for dev mode
parent
ca0f04cf
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
internal/cli/server/config.go
+52
-22
52 additions, 22 deletions
internal/cli/server/config.go
internal/cli/server/config_test.go
+1
-1
1 addition, 1 deletion
internal/cli/server/config_test.go
internal/cli/server/server.go
+33
-11
33 additions, 11 deletions
internal/cli/server/server.go
with
86 additions
and
34 deletions
internal/cli/server/config.go
+
52
−
22
View file @
0662b70d
...
@@ -14,6 +14,8 @@ import (
...
@@ -14,6 +14,8 @@ import (
godebug
"runtime/debug"
godebug
"runtime/debug"
"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/accounts/keystore"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/fdlimit"
"github.com/ethereum/go-ethereum/common/fdlimit"
"github.com/ethereum/go-ethereum/eth/downloader"
"github.com/ethereum/go-ethereum/eth/downloader"
...
@@ -611,7 +613,7 @@ func (c *Config) loadChain() error {
...
@@ -611,7 +613,7 @@ func (c *Config) loadChain() error {
return
nil
return
nil
}
}
func
(
c
*
Config
)
buildEth
()
(
*
ethconfig
.
Config
,
error
)
{
func
(
c
*
Config
)
buildEth
(
stack
*
node
.
Node
)
(
*
ethconfig
.
Config
,
error
)
{
dbHandles
,
err
:=
makeDatabaseHandles
()
dbHandles
,
err
:=
makeDatabaseHandles
()
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
...
@@ -665,8 +667,36 @@ func (c *Config) buildEth() (*ethconfig.Config, error) {
...
@@ -665,8 +667,36 @@ func (c *Config) buildEth() (*ethconfig.Config, error) {
// update for developer mode
// update for developer mode
if
c
.
Developer
.
Enabled
{
if
c
.
Developer
.
Enabled
{
// Get a keystore
var
ks
*
keystore
.
KeyStore
if
keystores
:=
stack
.
AccountManager
()
.
Backends
(
keystore
.
KeyStoreType
);
len
(
keystores
)
>
0
{
ks
=
keystores
[
0
]
.
(
*
keystore
.
KeyStore
)
}
// Create new developer account or reuse existing one
var
(
developer
accounts
.
Account
passphrase
string
err
error
)
// etherbase has been set above, configuring the miner address from command line flags.
if
n
.
Miner
.
Etherbase
!=
(
common
.
Address
{})
{
developer
=
accounts
.
Account
{
Address
:
n
.
Miner
.
Etherbase
}
}
else
if
accs
:=
ks
.
Accounts
();
len
(
accs
)
>
0
{
developer
=
ks
.
Accounts
()[
0
]
}
else
{
developer
,
err
=
ks
.
NewAccount
(
passphrase
)
if
err
!=
nil
{
Fatalf
(
"Failed to create developer account: %v"
,
err
)
}
}
if
err
:=
ks
.
Unlock
(
developer
,
passphrase
);
err
!=
nil
{
Fatalf
(
"Failed to unlock developer account: %v"
,
err
)
}
log
.
Info
(
"Using developer account"
,
"address"
,
developer
.
Address
)
// get developer mode chain config
// get developer mode chain config
c
.
chain
=
chains
.
GetDeveloperChain
(
c
.
Developer
.
Period
,
n
.
Miner
.
Etherbase
)
c
.
chain
=
chains
.
GetDeveloperChain
(
c
.
Developer
.
Period
,
developer
.
Address
)
// update the parameters
// update the parameters
n
.
NetworkId
=
c
.
chain
.
NetworkId
n
.
NetworkId
=
c
.
chain
.
NetworkId
...
@@ -841,9 +871,6 @@ func (c *Config) buildNode() (*node.Config, error) {
...
@@ -841,9 +871,6 @@ func (c *Config) buildNode() (*node.Config, error) {
cfg
.
P2P
.
ListenAddr
=
""
cfg
.
P2P
.
ListenAddr
=
""
cfg
.
P2P
.
NoDial
=
true
cfg
.
P2P
.
NoDial
=
true
cfg
.
P2P
.
DiscoveryV5
=
false
cfg
.
P2P
.
DiscoveryV5
=
false
// data dir
cfg
.
DataDir
=
""
}
}
// enable jsonrpc endpoints
// enable jsonrpc endpoints
...
@@ -864,6 +891,8 @@ func (c *Config) buildNode() (*node.Config, error) {
...
@@ -864,6 +891,8 @@ func (c *Config) buildNode() (*node.Config, error) {
}
}
cfg
.
P2P
.
NAT
=
natif
cfg
.
P2P
.
NAT
=
natif
// only check for non-developer modes
if
!
c
.
Developer
.
Enabled
{
// Discovery
// Discovery
// if no bootnodes are defined, use the ones from the chain file.
// if no bootnodes are defined, use the ones from the chain file.
bootnodes
:=
c
.
P2P
.
Discovery
.
Bootnodes
bootnodes
:=
c
.
P2P
.
Discovery
.
Bootnodes
...
@@ -882,6 +911,7 @@ func (c *Config) buildNode() (*node.Config, error) {
...
@@ -882,6 +911,7 @@ func (c *Config) buildNode() (*node.Config, error) {
if
cfg
.
P2P
.
TrustedNodes
,
err
=
parseBootnodes
(
c
.
P2P
.
Discovery
.
TrustedNodes
);
err
!=
nil
{
if
cfg
.
P2P
.
TrustedNodes
,
err
=
parseBootnodes
(
c
.
P2P
.
Discovery
.
TrustedNodes
);
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
}
if
c
.
P2P
.
NoDiscover
{
if
c
.
P2P
.
NoDiscover
{
// Disable networking, for now, we will not even allow incomming connections
// Disable networking, for now, we will not even allow incomming connections
...
...
This diff is collapsed.
Click to expand it.
internal/cli/server/config_test.go
+
1
−
1
View file @
0662b70d
...
@@ -16,7 +16,7 @@ func TestConfigDefault(t *testing.T) {
...
@@ -16,7 +16,7 @@ func TestConfigDefault(t *testing.T) {
_
,
err
:=
config
.
buildNode
()
_
,
err
:=
config
.
buildNode
()
assert
.
NoError
(
t
,
err
)
assert
.
NoError
(
t
,
err
)
_
,
err
=
config
.
buildEth
()
_
,
err
=
config
.
buildEth
(
nil
)
assert
.
NoError
(
t
,
err
)
assert
.
NoError
(
t
,
err
)
}
}
...
...
This diff is collapsed.
Click to expand it.
internal/cli/server/server.go
+
33
−
11
View file @
0662b70d
...
@@ -7,6 +7,7 @@ import (
...
@@ -7,6 +7,7 @@ import (
"net"
"net"
"net/http"
"net/http"
"os"
"os"
"runtime"
"strings"
"strings"
"time"
"time"
...
@@ -69,11 +70,22 @@ func NewServer(config *Config) (*Server, error) {
...
@@ -69,11 +70,22 @@ func NewServer(config *Config) (*Server, error) {
}
}
srv
.
node
=
stack
srv
.
node
=
stack
// setup account manager (only keystore)
{
keydir
:=
stack
.
KeyStoreDir
()
n
,
p
:=
keystore
.
StandardScryptN
,
keystore
.
StandardScryptP
if
config
.
Accounts
.
UseLightweightKDF
{
n
,
p
=
keystore
.
LightScryptN
,
keystore
.
LightScryptP
}
stack
.
AccountManager
()
.
AddBackend
(
keystore
.
NewKeyStore
(
keydir
,
n
,
p
))
}
// register the ethereum backend
// register the ethereum backend
ethCfg
,
err
:=
config
.
buildEth
()
ethCfg
,
err
:=
config
.
buildEth
(
stack
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
backend
,
err
:=
eth
.
New
(
stack
,
ethCfg
)
backend
,
err
:=
eth
.
New
(
stack
,
ethCfg
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
...
@@ -97,16 +109,6 @@ func NewServer(config *Config) (*Server, error) {
...
@@ -97,16 +109,6 @@ func NewServer(config *Config) (*Server, error) {
}
}
}
}
// setup account manager (only keystore)
{
keydir
:=
stack
.
KeyStoreDir
()
n
,
p
:=
keystore
.
StandardScryptN
,
keystore
.
StandardScryptP
if
config
.
Accounts
.
UseLightweightKDF
{
n
,
p
=
keystore
.
LightScryptN
,
keystore
.
LightScryptP
}
stack
.
AccountManager
()
.
AddBackend
(
keystore
.
NewKeyStore
(
keydir
,
n
,
p
))
}
// sealing (if enabled) or in dev mode
// sealing (if enabled) or in dev mode
if
config
.
Sealer
.
Enabled
||
config
.
Developer
.
Enabled
{
if
config
.
Sealer
.
Enabled
||
config
.
Developer
.
Enabled
{
if
err
:=
backend
.
StartMining
(
1
);
err
!=
nil
{
if
err
:=
backend
.
StartMining
(
1
);
err
!=
nil
{
...
@@ -283,3 +285,23 @@ func setupLogger(logLevel string) {
...
@@ -283,3 +285,23 @@ func setupLogger(logLevel string) {
}
}
log
.
Root
()
.
SetHandler
(
glogger
)
log
.
Root
()
.
SetHandler
(
glogger
)
}
}
// Fatalf formats a message to standard error and exits the program.
// The message is also printed to standard output if standard error
// is redirected to a different file.
func
Fatalf
(
format
string
,
args
...
interface
{})
{
w
:=
io
.
MultiWriter
(
os
.
Stdout
,
os
.
Stderr
)
if
runtime
.
GOOS
==
"windows"
{
// The SameFile check below doesn't work on Windows.
// stdout is unlikely to get redirected though, so just print there.
w
=
os
.
Stdout
}
else
{
outf
,
_
:=
os
.
Stdout
.
Stat
()
errf
,
_
:=
os
.
Stderr
.
Stat
()
if
outf
!=
nil
&&
errf
!=
nil
&&
os
.
SameFile
(
outf
,
errf
)
{
w
=
os
.
Stderr
}
}
fmt
.
Fprintf
(
w
,
"Fatal: "
+
format
+
"
\n
"
,
args
...
)
os
.
Exit
(
1
)
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment