forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

old rpc flags aliased and still functional

Browse source
This commit is contained in:
renaynay 2020-04-17 14:02:52 +02:00
parent f7a4af8c8d
commit aaa051cb0b
No known key found for this signature in database
GPG key ID: 6557F5413D663EDB
3 changed files with 64 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/geth/main.go
View file

@ -158,12 +158,18 @@ var (
utils.HTTPPortFlag,
utils.HTTPCORSDomainFlag,
utils.HTTPVirtualHostsFlag,
utils.RPCLegacyEnabledFlag,
utils.RPCLegacyListenAddrFlag,
utils.RPCLegacyPortFlag,
utils.RPCLegacyCORSDomainFlag,
utils.RPCLegacyVirtualHostsFlag,
utils.GraphQLEnabledFlag,
utils.GraphQLListenAddrFlag,
utils.GraphQLPortFlag,
utils.GraphQLCORSDomainFlag,
utils.GraphQLVirtualHostsFlag,
utils.HTTPApiFlag,
utils.RPCLegacyApiFlag,
utils.WSEnabledFlag,
utils.WSListenAddrFlag,
utils.WSPortFlag,

8
cmd/geth/usage.go
View file

@ -243,8 +243,14 @@ var AppHelpFlagGroups = []flagGroup{
Flags: whisperFlags,
},
{
Name: "DEPRECATED",
Name: "ALIASED OPTIONS (deprecated)",
Flags: []cli.Flag{
utils.RPCLegacyEnabledFlag,
utils.RPCLegacyListenAddrFlag,
utils.RPCLegacyPortFlag,
utils.RPCLegacyCORSDomainFlag,
utils.RPCLegacyVirtualHostsFlag,
utils.RPCLegacyApiFlag,
utils.LegacyTestnetFlag,
utils.LightLegacyServFlag,
utils.LightLegacyPeersFlag,

51
cmd/utils/flags.go
View file

@ -533,31 +533,60 @@ var (
Name: "http",
Usage: "Enable the HTTP-RPC server",
}
RPCLegacyEnabledFlag = cli.BoolFlag{
Name: "rpc",
Usage: "Enable the HTTP-RPC server",
}
HTTPListenAddrFlag = cli.StringFlag{
Name: "httpaddr",
Usage: "HTTP-RPC server listening interface",
Value: node.DefaultHTTPHost,
}
RPCLegacyListenAddrFlag = cli.StringFlag{
Name: "rpcaddr",
Usage: "HTTP-RPC server listening interface",
Value: node.DefaultHTTPHost,
}
HTTPPortFlag = cli.IntFlag{
Name: "httpport",
Usage: "HTTP-RPC server listening port",
Value: node.DefaultHTTPPort,
}
RPCLegacyPortFlag = cli.IntFlag{
Name: "rpcport",
Usage: "HTTP-RPC server listening port",
Value: node.DefaultHTTPPort,
}
HTTPCORSDomainFlag = cli.StringFlag{
Name: "httpcorsdomain",
Usage: "Comma separated list of domains from which to accept cross origin requests (browser enforced)",
Value: "",
}
RPCLegacyCORSDomainFlag = cli.StringFlag{
Name: "rpccorsdomain",
Usage: "Comma separated list of domains from which to accept cross origin requests (browser enforced)",
Value: "",
}
HTTPVirtualHostsFlag = cli.StringFlag{
Name: "httpvhosts",
Usage: "Comma separated list of virtual hostnames from which to accept requests (server enforced). Accepts '*' wildcard.",
Value: strings.Join(node.DefaultConfig.HTTPVirtualHosts, ","),
}
RPCLegacyVirtualHostsFlag = cli.StringFlag{
Name: "rpcvhosts",
Usage: "Comma separated list of virtual hostnames from which to accept requests (server enforced). Accepts '*' wildcard.",
Value: strings.Join(node.DefaultConfig.HTTPVirtualHosts, ","),
}
HTTPApiFlag = cli.StringFlag{
Name: "httpapi",
Usage: "API's offered over the HTTP-RPC interface",
Value: "",
}
RPCLegacyApiFlag = cli.StringFlag{
Name: "rpcapi",
Usage: "API's offered over the HTTP-RPC interface",
Value: "",
}
WSEnabledFlag = cli.BoolFlag{
Name: "ws",
Usage: "Enable the WS-RPC server",
@ -924,21 +953,43 @@ func splitAndTrim(input string) []string {
// setHTTP creates the HTTP RPC listener interface string from the set
// command line flags, returning empty if the HTTP endpoint is disabled.
func setHTTP(ctx *cli.Context, cfg *node.Config) {
if ctx.GlobalBool(RPCLegacyEnabledFlag.Name) && cfg.HTTPHost == "" {
cfg.HTTPHost = "127.0.0.1"
if ctx.GlobalIsSet(RPCLegacyListenAddrFlag.Name) {
cfg.HTTPHost = ctx.GlobalString(RPCLegacyListenAddrFlag.Name)
}
}
if ctx.GlobalBool(HTTPEnabledFlag.Name) && cfg.HTTPHost == "" {
cfg.HTTPHost = "127.0.0.1"
if ctx.GlobalIsSet(HTTPListenAddrFlag.Name) {
cfg.HTTPHost = ctx.GlobalString(HTTPListenAddrFlag.Name)
}
}
if ctx.GlobalIsSet(RPCLegacyPortFlag.Name) {
cfg.HTTPPort = ctx.GlobalInt(RPCLegacyPortFlag.Name)
}
if ctx.GlobalIsSet(HTTPPortFlag.Name) {
cfg.HTTPPort = ctx.GlobalInt(HTTPPortFlag.Name)
}
if ctx.GlobalIsSet(RPCLegacyCORSDomainFlag.Name) {
cfg.HTTPCors = splitAndTrim(ctx.GlobalString(RPCLegacyCORSDomainFlag.Name))
}
if ctx.GlobalIsSet(HTTPCORSDomainFlag.Name) {
cfg.HTTPCors = splitAndTrim(ctx.GlobalString(HTTPCORSDomainFlag.Name))
}
if ctx.GlobalIsSet(RPCLegacyApiFlag.Name) {
cfg.HTTPModules = splitAndTrim(ctx.GlobalString(RPCLegacyApiFlag.Name))
}
if ctx.GlobalIsSet(HTTPApiFlag.Name) {
cfg.HTTPModules = splitAndTrim(ctx.GlobalString(HTTPApiFlag.Name))
}
if ctx.GlobalIsSet(RPCLegacyVirtualHostsFlag.Name) {
cfg.HTTPVirtualHosts = splitAndTrim(ctx.GlobalString(RPCLegacyVirtualHostsFlag.Name))
}
if ctx.GlobalIsSet(HTTPVirtualHostsFlag.Name) {
cfg.HTTPVirtualHosts = splitAndTrim(ctx.GlobalString(HTTPVirtualHostsFlag.Name))
}