From cfef44490939a9270c51dba24d15fca4ceea26b0 Mon Sep 17 00:00:00 2001 From: Manav Darji Date: Tue, 1 Aug 2023 15:10:33 +0530 Subject: [PATCH] add rpc.enabledeprecatedpersonal flag --- builder/files/config.toml | 1 + docs/cli/bootnode.md | 2 +- docs/cli/debug_pprof.md | 2 +- docs/cli/example_config.toml | 1 + docs/cli/server.md | 8 +++++--- internal/cli/server/config.go | 5 +++++ internal/cli/server/flags.go | 7 +++++++ packaging/templates/mainnet-v1/archive/config.toml | 1 + .../templates/mainnet-v1/sentry/sentry/bor/config.toml | 1 + .../templates/mainnet-v1/sentry/validator/bor/config.toml | 1 + .../templates/mainnet-v1/without-sentry/bor/config.toml | 1 + packaging/templates/testnet-v4/archive/config.toml | 1 + .../templates/testnet-v4/sentry/sentry/bor/config.toml | 1 + .../templates/testnet-v4/sentry/validator/bor/config.toml | 1 + .../templates/testnet-v4/without-sentry/bor/config.toml | 1 + 15 files changed, 29 insertions(+), 5 deletions(-) diff --git a/builder/files/config.toml b/builder/files/config.toml index 2e758bc8ee..15c357cb6c 100644 --- a/builder/files/config.toml +++ b/builder/files/config.toml @@ -81,6 +81,7 @@ syncmode = "full" # evmtimeout = "5s" # txfeecap = 5.0 # allow-unprotected-txs = false +# enabledeprecatedpersonal = false # [jsonrpc.http] # enabled = false # port = 8545 diff --git a/docs/cli/bootnode.md b/docs/cli/bootnode.md index 465eadd9ff..e4111160a0 100644 --- a/docs/cli/bootnode.md +++ b/docs/cli/bootnode.md @@ -16,4 +16,4 @@ - ```save-key```: path to save the ecdsa private key -- ```dry-run```: validates parameters and prints bootnode configurations, but does not start bootnode (default: false) +- ```dry-run```: validates parameters and prints bootnode configurations, but does not start bootnode (default: false) \ No newline at end of file diff --git a/docs/cli/debug_pprof.md b/docs/cli/debug_pprof.md index fbc9a70c52..78e75f2134 100644 --- a/docs/cli/debug_pprof.md +++ b/docs/cli/debug_pprof.md @@ -10,4 +10,4 @@ The ```debug pprof ``` command will create an archive containing bor ppro - ```output```: Output directory -- ```skiptrace```: Skip running the trace (default: false) +- ```skiptrace```: Skip running the trace (default: false) \ No newline at end of file diff --git a/docs/cli/example_config.toml b/docs/cli/example_config.toml index f62fcfebdb..ef15d6bfdd 100644 --- a/docs/cli/example_config.toml +++ b/docs/cli/example_config.toml @@ -82,6 +82,7 @@ devfakeauthor = false # Run miner without validator set authorization evmtimeout = "5s" # Sets a timeout used for eth_call (0=infinite) txfeecap = 5.0 # Sets a cap on transaction fee (in ether) that can be sent via the RPC APIs (0 = no cap) allow-unprotected-txs = false # Allow for unprotected (non EIP155 signed) transactions to be submitted via RPC (default: false) + enabledeprecatedpersonal = false # Enables the (deprecated) personal namespace [jsonrpc.http] enabled = false # Enable the HTTP-RPC server port = 8545 # http.port diff --git a/docs/cli/server.md b/docs/cli/server.md index d7a9a1296e..13e8cda447 100644 --- a/docs/cli/server.md +++ b/docs/cli/server.md @@ -60,7 +60,7 @@ The ```bor server``` command runs the Bor client. - ```gpo.maxblockhistory```: Maximum block history of gasprice oracle (default: 1024) -- ```gpo.maxprice```: Maximum gas price will be recommended by gpo (default: 5000000000000) +- ```gpo.maxprice```: Maximum gas price will be recommended by gpo (default: 500000000000) - ```gpo.ignoreprice```: Gas price below which gpo will ignore transactions (default: 2) @@ -134,6 +134,8 @@ The ```bor server``` command runs the Bor client. - ```rpc.allow-unprotected-txs```: Allow for unprotected (non EIP155 signed) transactions to be submitted via RPC (default: false) +- ```rpc.enabledeprecatedpersonal```: Enables the (deprecated) personal namespace (default: false) + - ```ipcdisable```: Disable the IPC-RPC server (default: false) - ```ipcpath```: Filename for IPC socket/pipe within the datadir (explicit paths escape it) @@ -258,7 +260,7 @@ The ```bor server``` command runs the Bor client. - ```metrics.prometheus-addr```: Address for Prometheus Server (default: 127.0.0.1:7071) -- ```metrics.opencollector-endpoint```: OpenCollector Endpoint (host:port) (default: 127.0.0.1:4317) +- ```metrics.opencollector-endpoint```: OpenCollector Endpoint (host:port) - ```metrics.influxdbv2```: Enable metrics export/push to an external InfluxDB v2 database (default: false) @@ -290,4 +292,4 @@ The ```bor server``` command runs the Bor client. - ```txpool.globalqueue```: Maximum number of non-executable transaction slots for all accounts (default: 32768) -- ```txpool.lifetime```: Maximum amount of time non-executable transaction are queued (default: 3h0m0s) +- ```txpool.lifetime```: Maximum amount of time non-executable transaction are queued (default: 3h0m0s) \ No newline at end of file diff --git a/internal/cli/server/config.go b/internal/cli/server/config.go index e1e6614ed1..dcee1e26f5 100644 --- a/internal/cli/server/config.go +++ b/internal/cli/server/config.go @@ -350,6 +350,9 @@ type JsonRPCConfig struct { HttpTimeout *HttpTimeouts `hcl:"timeouts,block" toml:"timeouts,block"` AllowUnprotectedTxs bool `hcl:"allow-unprotected-txs,optional" toml:"allow-unprotected-txs,optional"` + + // EnablePersonal enables the deprecated personal namespace. + EnablePersonal bool `hcl:"enabledeprecatedpersonal,optional" toml:"enabledeprecatedpersonal,optional"` } type AUTHConfig struct { @@ -662,6 +665,7 @@ func DefaultConfig() *Config { TxFeeCap: ethconfig.Defaults.RPCTxFeeCap, RPCEVMTimeout: ethconfig.Defaults.RPCEVMTimeout, AllowUnprotectedTxs: false, + EnablePersonal: false, Http: &APIConfig{ Enabled: false, Port: 8545, @@ -1280,6 +1284,7 @@ func (c *Config) buildNode() (*node.Config, error) { Version: params.VersionWithCommit(gitCommit, gitDate), IPCPath: ipcPath, AllowUnprotectedTxs: c.JsonRPC.AllowUnprotectedTxs, + EnablePersonal: c.JsonRPC.EnablePersonal, P2P: p2p.Config{ MaxPeers: int(c.P2P.MaxPeers), MaxPendingPeers: int(c.P2P.MaxPendPeers), diff --git a/internal/cli/server/flags.go b/internal/cli/server/flags.go index 470a377012..d0a53aa4b8 100644 --- a/internal/cli/server/flags.go +++ b/internal/cli/server/flags.go @@ -471,6 +471,13 @@ func (c *Command) Flags() *flagset.Flagset { Default: c.cliConfig.JsonRPC.AllowUnprotectedTxs, Group: "JsonRPC", }) + f.BoolFlag(&flagset.BoolFlag{ + Name: "rpc.enabledeprecatedpersonal", + Usage: "Enables the (deprecated) personal namespace", + Value: &c.cliConfig.JsonRPC.EnablePersonal, + Default: c.cliConfig.JsonRPC.EnablePersonal, + Group: "JsonRPC", + }) f.BoolFlag(&flagset.BoolFlag{ Name: "ipcdisable", Usage: "Disable the IPC-RPC server", diff --git a/packaging/templates/mainnet-v1/archive/config.toml b/packaging/templates/mainnet-v1/archive/config.toml index 869dae3c58..3c0f3f40f7 100644 --- a/packaging/templates/mainnet-v1/archive/config.toml +++ b/packaging/templates/mainnet-v1/archive/config.toml @@ -75,6 +75,7 @@ gcmode = "archive" # evmtimeout = "5s" # txfeecap = 5.0 # allow-unprotected-txs = false + # enabledeprecatedpersonal = false [jsonrpc.http] enabled = true port = 8545 diff --git a/packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml b/packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml index 7413bc63f2..38631041c9 100644 --- a/packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml +++ b/packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml @@ -75,6 +75,7 @@ syncmode = "full" # evmtimeout = "5s" # txfeecap = 5.0 # allow-unprotected-txs = false + # enabledeprecatedpersonal = false [jsonrpc.http] enabled = true port = 8545 diff --git a/packaging/templates/mainnet-v1/sentry/validator/bor/config.toml b/packaging/templates/mainnet-v1/sentry/validator/bor/config.toml index 1b21818adc..19d0776193 100644 --- a/packaging/templates/mainnet-v1/sentry/validator/bor/config.toml +++ b/packaging/templates/mainnet-v1/sentry/validator/bor/config.toml @@ -77,6 +77,7 @@ syncmode = "full" # evmtimeout = "5s" # txfeecap = 5.0 # allow-unprotected-txs = false + # enabledeprecatedpersonal = false [jsonrpc.http] enabled = true port = 8545 diff --git a/packaging/templates/mainnet-v1/without-sentry/bor/config.toml b/packaging/templates/mainnet-v1/without-sentry/bor/config.toml index ffbaf984ca..15ca789262 100644 --- a/packaging/templates/mainnet-v1/without-sentry/bor/config.toml +++ b/packaging/templates/mainnet-v1/without-sentry/bor/config.toml @@ -77,6 +77,7 @@ syncmode = "full" # evmtimeout = "5s" # txfeecap = 5.0 # allow-unprotected-txs = false + # enabledeprecatedpersonal = false [jsonrpc.http] enabled = true port = 8545 diff --git a/packaging/templates/testnet-v4/archive/config.toml b/packaging/templates/testnet-v4/archive/config.toml index 6b372e9b60..bc6a2d68f1 100644 --- a/packaging/templates/testnet-v4/archive/config.toml +++ b/packaging/templates/testnet-v4/archive/config.toml @@ -75,6 +75,7 @@ gcmode = "archive" # evmtimeout = "5s" # txfeecap = 5.0 # allow-unprotected-txs = false + # enabledeprecatedpersonal = false [jsonrpc.http] enabled = true port = 8545 diff --git a/packaging/templates/testnet-v4/sentry/sentry/bor/config.toml b/packaging/templates/testnet-v4/sentry/sentry/bor/config.toml index cf81d9a9d6..27fbd6593a 100644 --- a/packaging/templates/testnet-v4/sentry/sentry/bor/config.toml +++ b/packaging/templates/testnet-v4/sentry/sentry/bor/config.toml @@ -75,6 +75,7 @@ syncmode = "full" # evmtimeout = "5s" # txfeecap = 5.0 # allow-unprotected-txs = false + # enabledeprecatedpersonal = false [jsonrpc.http] enabled = true port = 8545 diff --git a/packaging/templates/testnet-v4/sentry/validator/bor/config.toml b/packaging/templates/testnet-v4/sentry/validator/bor/config.toml index 57e3ed286c..c1b455dddf 100644 --- a/packaging/templates/testnet-v4/sentry/validator/bor/config.toml +++ b/packaging/templates/testnet-v4/sentry/validator/bor/config.toml @@ -77,6 +77,7 @@ syncmode = "full" # evmtimeout = "5s" # txfeecap = 5.0 # allow-unprotected-txs = false + # enabledeprecatedpersonal = false [jsonrpc.http] enabled = true port = 8545 diff --git a/packaging/templates/testnet-v4/without-sentry/bor/config.toml b/packaging/templates/testnet-v4/without-sentry/bor/config.toml index 1f0dabff5d..f78f6f8525 100644 --- a/packaging/templates/testnet-v4/without-sentry/bor/config.toml +++ b/packaging/templates/testnet-v4/without-sentry/bor/config.toml @@ -77,6 +77,7 @@ syncmode = "full" # evmtimeout = "5s" # txfeecap = 5.0 # allow-unprotected-txs = false + # enabledeprecatedpersonal = false [jsonrpc.http] enabled = true port = 8545