Skip to content
This repository has been archived by the owner on Aug 22, 2022. It is now read-only.

Commit

Permalink
Fixed default flags
Browse files Browse the repository at this point in the history
Signed-off-by: mxmar <macht4tech@gmail.com>
  • Loading branch information
mxmar committed Jan 25, 2022
1 parent f5301ce commit 422b7ce
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 20 deletions.
30 changes: 14 additions & 16 deletions cmd/lukso-cli/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ const (
CLP2PUDPPort = "cl-p2p-port-udp"
CLETHApiPort = "cl-eth-api-port"
CLGRPCGatewayPort = "cl-grpc-gateway-port"
CLRPCPort = "cl-rpc-port"
CLDisableSyncFlag = "cl-disable-sync"
CLOutputFileFlag = "cl-output-file"

Expand Down Expand Up @@ -184,8 +185,8 @@ var (
},
&cli.StringFlag{
Name: validatorCLRpcProviderFlag,
Usage: fmt.Sprintf("provide url without prefix, example: localhost:%d", DefaultCLGRPCPort),
Value: fmt.Sprintf("localhost:%d", DefaultCLGRPCPort),
Usage: fmt.Sprintf("provide url without prefix, example: 127.0.0.1:%d", DefaultCLGRPCPort),
Value: fmt.Sprintf("127.0.0.1:%d", DefaultCLGRPCPort),
},
&cli.StringFlag{
Name: CLChainConfigFlag,
Expand Down Expand Up @@ -304,6 +305,11 @@ var (
},
&cli.StringFlag{
Name: CLGRPCGatewayPort,
Usage: fmt.Sprintf("provide p2p port for udp, default: %d", DefaultCLGRPCGatewayPort),
Value: fmt.Sprintf("%d", DefaultCLGRPCGatewayPort),
},
&cli.StringFlag{
Name: CLRPCPort,
Usage: fmt.Sprintf("provide p2p port for udp, default: %d", DefaultCLGRPCPort),
Value: fmt.Sprintf("%d", DefaultCLGRPCPort),
},
Expand Down Expand Up @@ -372,17 +378,6 @@ func prepareCLFlags(ctx *cli.Context) (CLArguments []string) {
"--http-web3provider=%s",
ctx.String(CLWeb3ProviderFlag),
))
// TODO: check if needed
//CLArguments = append(CLArguments, fmt.Sprintf(
// "--deposit-contract=%s",
// ctx.String(CLDepositContractFlag),
//))
//CLArguments = append(CLArguments, fmt.Sprintf(
// "--contract-deployment-block=%s",
// ctx.String(CLContractDeploymentBlockFlag),
//))
CLArguments = append(CLArguments, "--rpc-host=0.0.0.0")
CLArguments = append(CLArguments, "--monitoring-host=0.0.0.0")
CLArguments = append(CLArguments, "--verbosity")
CLArguments = append(CLArguments, ctx.String(CLVerbosityFlag))
CLArguments = append(CLArguments, fmt.Sprintf(
Expand Down Expand Up @@ -434,8 +429,11 @@ func prepareCLFlags(ctx *cli.Context) (CLArguments []string) {

CLArguments = append(CLArguments, "--grpc-gateway-port")
CLArguments = append(CLArguments, ctx.String(CLGRPCGatewayPort))
// Localhost setup support only
CLGrpcEndpoint = fmt.Sprintf("127.0.0.1:%s", ctx.String(CLGRPCGatewayPort))

CLArguments = append(CLArguments, fmt.Sprintf(
"--rpc-port=%s",
ctx.String(CLRPCPort),
))

return
}
Expand Down Expand Up @@ -471,7 +469,7 @@ func prepareValidatorFlags(ctx *cli.Context) (validatorArguments []string) {
))
validatorArguments = append(validatorArguments, fmt.Sprintf(
"--datadir=%s",
ctx.String(CLDatadirFlag),
ctx.String(validatorDatadirFlag),
))

validatorArguments = append(validatorArguments, fmt.Sprintf(
Expand Down
8 changes: 4 additions & 4 deletions cmd/lukso-cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ const (
DefaultELWSPort = 8599
DefaultELP2PPort = 30398

DefaultCLGRPCPort = 4098
DefaultCLP2PTCPPort = 13098
DefaultCLP2PUDPPort = 13098
DefaultValidatorPort = 3598
DefaultCLGRPCPort = 4098
DefaultCLGRPCGatewayPort = 3598
DefaultCLP2PTCPPort = 13098
DefaultCLP2PUDPPort = 13098

PidFilename = "pid"
)
Expand Down

0 comments on commit 422b7ce

Please sign in to comment.