Skip to content

fix(dot/rpc): include unsafe flags to be considered by RPC layer #2483

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

Merged
EclesioMeloJunior merged 9 commits into from
Apr 18, 2022
Merged

fix(dot/rpc): include unsafe flags to be considered by RPC layer #2483

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5a5e00f
fix: include unsafe flags to be considered by RPC layer
EclesioMeloJunior Apr 14, 2022
e66752c
chore: improve comments
EclesioMeloJunior Apr 14, 2022
34ee274
chore: add unsafe to rpc tests
EclesioMeloJunior Apr 14, 2022
9d33f1c
Merge branch 'development' into eclesio/fix-rpc-unsafe
EclesioMeloJunior Apr 14, 2022
b27e723
chore: remove unsafe flags from polkadot js tests
EclesioMeloJunior Apr 14, 2022
9f77e8c
chore: uncomment important test check
EclesioMeloJunior Apr 16, 2022
0e0c298
chore: enable unsafe calls on tests
EclesioMeloJunior Apr 17, 2022
a0de174
chore: fiz the flag name
EclesioMeloJunior Apr 18, 2022
125cfa6
chore: not overwrite the config tomll value if flag not defined
EclesioMeloJunior Apr 18, 2022
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
18 changes: 18 additions & 0 deletions cmd/gossamer/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,6 +736,24 @@ func setDotRPCConfig(ctx *cli.Context, tomlCfg ctoml.RPCConfig, cfg *dot.RPCConf
cfg.External = false
}

// check --rpc-unsafe flag value
cfg.Unsafe = ctx.GlobalBool(RPCUnsafeEnabledFlag.Name)

// check --rpc-unsafe-external flag value
if externalUnsafe := ctx.GlobalBool(RPCUnsafeExternalFlag.Name); externalUnsafe {
cfg.Unsafe = true
cfg.UnsafeExternal = true
}

// check --ws-unsafe flag value
cfg.WSUnsafe = ctx.GlobalBool(WSUnsafeEnabledFlag.Name)

// check --ws-unsafe-external flag value
if wsExternalUnsafe := ctx.GlobalBool(WSUnsafeExternalFlag.Name); wsExternalUnsafe {
cfg.WSUnsafe = true
cfg.WSUnsafeExternal = true
}

// check --rpcport flag and update node configuration
if port := ctx.GlobalUint(RPCPortFlag.Name); port != 0 {
cfg.Port = uint32(port)
Expand Down
20 changes: 12 additions & 8 deletions cmd/gossamer/export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,18 @@ func dotConfigToToml(dcfg *dot.Config) *ctoml.Config {
}

cfg.RPC = ctoml.RPCConfig{
Enabled: dcfg.RPC.Enabled,
External: dcfg.RPC.External,
Port: dcfg.RPC.Port,
Host: dcfg.RPC.Host,
Modules: dcfg.RPC.Modules,
WSPort: dcfg.RPC.WSPort,
WS: dcfg.RPC.WS,
WSExternal: dcfg.RPC.WSExternal,
Enabled: dcfg.RPC.Enabled,
External: dcfg.RPC.External,
Unsafe: dcfg.RPC.Unsafe,
UnsafeExternal: dcfg.RPC.UnsafeExternal,
Port: dcfg.RPC.Port,
Host: dcfg.RPC.Host,
Modules: dcfg.RPC.Modules,
WSPort: dcfg.RPC.WSPort,
WS: dcfg.RPC.WS,
WSExternal: dcfg.RPC.WSExternal,
WSUnsafe: dcfg.RPC.WSUnsafe,
WSUnsafeExternal: dcfg.RPC.WSUnsafeExternal,
}

return cfg
Expand Down
4 changes: 2 additions & 2 deletions cmd/gossamer/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ var (
Usage: "Enable external websocket connections",
}
// WSFlag Enable the websockets server
WSUnsafeFlag = cli.BoolFlag{
WSUnsafeEnabledFlag = cli.BoolFlag{
Name: "ws-unsafe",
Usage: "Enable access to websocket unsafe calls",
}
Expand Down Expand Up @@ -436,7 +436,7 @@ var (
RPCModulesFlag,
WSFlag,
WSExternalFlag,
WSUnsafeFlag,
WSUnsafeEnabledFlag,
WSUnsafeExternalFlag,
WSPortFlag,

Expand Down
3 changes: 2 additions & 1 deletion tests/utils/gossamer_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ func startGossamer(t *testing.T, node Node, websocket bool) (
"--rpcport", node.RPCPort,
"--rpcmods", "system,author,chain,state,dev,rpc",
"--rpc",
"--rpc-unsafe",
Comment thread
EclesioMeloJunior marked this conversation as resolved.
Outdated
"--no-telemetry",
"--log", "info"}

Expand All @@ -135,7 +136,7 @@ func startGossamer(t *testing.T, node Node, websocket bool) (
}

if websocket {
params = append(params, "--ws",
params = append(params, "--ws", "--ws-unsafe",
Comment thread
EclesioMeloJunior marked this conversation as resolved.
Outdated
"--wsport", node.WSPort)
}
node.Process = exec.Command(gossamerCMD, params...)
Expand Down