Skip to content

fix(server): improve flag parsing #48

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
julienrbrt merged 3 commits into from
Apr 16, 2025
Merged

fix(server): improve flag parsing #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
223908b
fix(server): improve flag parsing
julienrbrt Apr 15, 2025
10328c0
go mod tidy
julienrbrt Apr 15, 2025
1602d37
updates
julienrbrt Apr 16, 2025
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
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ require (
github.com/cosmos/cosmos-sdk v0.50.13
github.com/gorilla/rpc v1.2.1
github.com/rollkit/go-da v0.9.0
github.com/rollkit/rollkit v0.14.2-0.20250411093031-de183ff4a312
github.com/rollkit/rollkit/core v0.0.0-20250411093031-de183ff4a312
github.com/rollkit/rollkit/da v0.0.0-20250411093031-de183ff4a312
github.com/rollkit/rollkit v0.14.2-0.20250416080857-e320b1e7f96c
github.com/rollkit/rollkit/core v0.0.0-20250416080857-e320b1e7f96c
github.com/rollkit/rollkit/da v0.0.0-20250416080857-e320b1e7f96c
)

replace github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.0-beta
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,12 +1196,12 @@ github.com/rollkit/go-da v0.9.0 h1:ECpS7RSLE84w61Y5a93RfaZrAZKeiyfjVwGxzjsW2cU=
github.com/rollkit/go-da v0.9.0/go.mod h1:LQImomegjZ/dEQLKDJA7RdUnOLINSZJwI7q1CvFPWJw=
github.com/rollkit/go-sequencing v0.4.1 h1:P0x1wUFIAhdEeqUbrRAF343iExKhq9UkVOBbi45l750=
github.com/rollkit/go-sequencing v0.4.1/go.mod h1:QnOk8mqyVgFWdMnjvZVBG4x8GC/TsRtoN5XdPZzfCSs=
github.com/rollkit/rollkit v0.14.2-0.20250411093031-de183ff4a312 h1:RApOeKJukKBisgZytbuhbLtShLdkTV/WJ5al9U2AGNg=
github.com/rollkit/rollkit v0.14.2-0.20250411093031-de183ff4a312/go.mod h1:vGAiHw/XSrYIcQz26TJX4rVpn4FNxe/W1x/ShQRnM/0=
github.com/rollkit/rollkit/core v0.0.0-20250411093031-de183ff4a312 h1:JPcAH7Bt6rtgcCsKFdHt2nfFzpe2Z10xnnOt55uB/YQ=
github.com/rollkit/rollkit/core v0.0.0-20250411093031-de183ff4a312/go.mod h1:0RhbqC8Is970KRhr6zPUQOZkmKt6/WqPRDQWfd2P7P0=
github.com/rollkit/rollkit/da v0.0.0-20250411093031-de183ff4a312 h1:tDfepy5U5qZ8z4/3QhfSzk5Wy0EF5d13TOZU6JdXZDY=
github.com/rollkit/rollkit/da v0.0.0-20250411093031-de183ff4a312/go.mod h1:2VJGEF0xTVaz7Jwg1svjUM5Q2OSmDyRX82bdAXQjyvg=
github.com/rollkit/rollkit v0.14.2-0.20250416080857-e320b1e7f96c h1:fW4H7N/5ecanBGC5i/LncwnhTk9HHCxqaX6ZfQMLuGE=
github.com/rollkit/rollkit v0.14.2-0.20250416080857-e320b1e7f96c/go.mod h1:vGAiHw/XSrYIcQz26TJX4rVpn4FNxe/W1x/ShQRnM/0=
github.com/rollkit/rollkit/core v0.0.0-20250416080857-e320b1e7f96c h1:1sF+rG0N17KSfEEIP9+ekDtm78Y5K2a0AIu5GvVxqM0=
github.com/rollkit/rollkit/core v0.0.0-20250416080857-e320b1e7f96c/go.mod h1:0RhbqC8Is970KRhr6zPUQOZkmKt6/WqPRDQWfd2P7P0=
github.com/rollkit/rollkit/da v0.0.0-20250416080857-e320b1e7f96c h1:yw/yDE4QcwEP0RRf3q+0IrG/kqQkWgxCPBRWdNoGnh0=
github.com/rollkit/rollkit/da v0.0.0-20250416080857-e320b1e7f96c/go.mod h1:2VJGEF0xTVaz7Jwg1svjUM5Q2OSmDyRX82bdAXQjyvg=
github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA=
github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
Expand Down
15 changes: 7 additions & 8 deletions server/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
"github.com/hashicorp/go-metrics"
"github.com/rollkit/go-execution-abci/adapter"
"github.com/spf13/cobra"

"github.com/cometbft/cometbft/mempool"
"github.com/rollkit/go-execution-abci/rpc"
Expand Down Expand Up @@ -59,7 +58,7 @@ const (
type StartCommandHandler = func(svrCtx *server.Context, clientCtx client.Context, appCreator sdktypes.AppCreator, withCmt bool, opts server.StartCmdOptions) error

// StartHandler starts the Rollkit server with the provided application and options.
func StartHandler(rootCmd *cobra.Command) StartCommandHandler {
func StartHandler() StartCommandHandler {
return func(svrCtx *server.Context, clientCtx client.Context, appCreator sdktypes.AppCreator, inProcess bool, opts server.StartCmdOptions) error {
svrCfg, err := getAndValidateConfig(svrCtx)
if err != nil {
Expand All @@ -79,7 +78,7 @@ func StartHandler(rootCmd *cobra.Command) StartCommandHandler {

emitServerInfoMetrics()

return startInProcess(rootCmd, svrCtx, svrCfg, clientCtx, app, metrics, opts)
return startInProcess(svrCtx, svrCfg, clientCtx, app, metrics, opts)
}
}

Expand All @@ -106,7 +105,7 @@ func startApp(svrCtx *server.Context, appCreator sdktypes.AppCreator, opts serve
return app, cleanupFn, nil
}

func startInProcess(rootCmd *cobra.Command, svrCtx *server.Context, svrCfg serverconfig.Config, clientCtx client.Context, app sdktypes.Application,
func startInProcess(svrCtx *server.Context, svrCfg serverconfig.Config, clientCtx client.Context, app sdktypes.Application,
metrics *telemetry.Metrics, opts server.StartCmdOptions,
) error {
cmtCfg := svrCtx.Config
Expand All @@ -119,7 +118,7 @@ func startInProcess(rootCmd *cobra.Command, svrCtx *server.Context, svrCfg serve
svrCfg.GRPC.Enable = true
} else {
svrCtx.Logger.Info("starting node with ABCI CometBFT in-process")
_, rpcServer, cleanupFn, err := startNode(ctx, svrCtx.Logger, rootCmd, cmtCfg, app)
_, rpcServer, cleanupFn, err := startNode(ctx, svrCtx, cmtCfg, app)
if err != nil {
return err
}
Expand Down Expand Up @@ -257,11 +256,11 @@ func startTelemetry(cfg serverconfig.Config) (*telemetry.Metrics, error) {

func startNode(
ctx context.Context,
logger log.Logger,
rootCmd *cobra.Command,
srvCtx *server.Context,
cfg *cmtcfg.Config,
app sdktypes.Application,
) (rolllkitNode node.Node, rpcServer *rpc.RPCServer, cleanupFn func(), err error) {
logger := srvCtx.Logger.With("module", "rollkit")
logger.Info("starting node with Rollkit in-process")

pval := pvm.LoadOrGenFilePV(cfg.PrivValidatorKeyFile(), cfg.PrivValidatorStateFile())
Expand All @@ -272,7 +271,7 @@ func startNode(

nodeKey := &key.NodeKey{PrivKey: signingKey, PubKey: signingKey.GetPublic()}

rollkitcfg, err := config.Load(rootCmd)
rollkitcfg, err := config.LoadFromViper(srvCtx.Viper)
if err != nil {
return nil, nil, cleanupFn, err
}
Expand Down
Loading