Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forbid unlocking accounts with enabled external RPC #338

Merged
merged 1 commit into from
Jul 12, 2022
Merged

Forbid unlocking accounts with enabled external RPC #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions gossip/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ type (
// allows only for EIP155 transactions.
AllowUnprotectedTxs bool

ExtRPCEnabled bool

RPCBlockExt bool
}

Expand Down
5 changes: 5 additions & 0 deletions gossip/ethapi_backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ type EthAPIBackend struct {
allowUnprotectedTxs bool
}

// SetExtRPCEnabled updates extRPCEnabled
func (b *EthAPIBackend) SetExtRPCEnabled(v bool) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Setter is not needed, just assign it directly.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just wanted to highlight that this variable may be initialized after object creation

b.extRPCEnabled = v
}

// ChainConfig returns the active chain configuration.
func (b *EthAPIBackend) ChainConfig() *params.ChainConfig {
return b.svc.store.GetEvmChainConfig()
Expand Down
3 changes: 2 additions & 1 deletion gossip/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ func NewService(stack *node.Node, config Config, store *Store, blockProc BlockPr
svc.p2pServer = stack.Server()
svc.accountManager = stack.AccountManager()
svc.eventMux = stack.EventMux()
svc.EthAPI.SetExtRPCEnabled(stack.Config().ExtRPCEnabled())
// Create the net API service
svc.netRPCService = ethapi.NewPublicNetAPI(svc.p2pServer, store.GetRules().NetworkID)
svc.haltCheck = haltCheck
Expand Down Expand Up @@ -269,7 +270,7 @@ func newService(config Config, store *Store, blockProc BlockProc, engine lachesi
}

// create API backend
svc.EthAPI = &EthAPIBackend{config.ExtRPCEnabled, svc, stateReader, txSigner, config.AllowUnprotectedTxs}
svc.EthAPI = &EthAPIBackend{false, svc, stateReader, txSigner, config.AllowUnprotectedTxs}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it seems that we intend to init this with true? otherwise, it still work like before

Suggested change
svc.EthAPI = &EthAPIBackend{false, svc, stateReader, txSigner, config.AllowUnprotectedTxs}
svc.EthAPI = &EthAPIBackend{true, svc, stateReader, txSigner, config.AllowUnprotectedTxs}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's initialized by SetExtRPCEnabled later


svc.verWatcher = verwatcher.New(netVerStore)
svc.tflusher = svc.makePeriodicFlusher()
Expand Down