yarikbratashchuk · Jun 13, 2024 · May 21, 2024 · May 21, 2024 · May 21, 2024 · May 21, 2024
diff --git a/cmd/rollkit/commands/intercept.go b/cmd/rollkit/commands/intercept.go
@@ -0,0 +1,107 @@
+package commands
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+
+	"github.com/BurntSushi/toml"
+	cometos "github.com/cometbft/cometbft/libs/os"
+	rollconf "github.com/rollkit/rollkit/config"
+)
+
+func InterceptCommand() error {
+	var err error
+	rollkitConfig, err = readTomlConfig()
+	if err != nil {
+		return err
+	}
+
+	if rollkitConfig.Entrypoint != "" {
+		flags := []string{}
+		if len(os.Args) >= 2 {
+			flags = os.Args[1:]
+		}
+		return runEntrypoint(rollkitConfig, flags)
+	}
+
+	return nil
+}
+
+func readTomlConfig() (rollconf.TomlConfig, error) {
+	var config rollconf.TomlConfig
+	startDir, err := os.Getwd()
+	if err != nil {
+		return config, fmt.Errorf("error getting current directory: %v", err)
+	}
+
+	configPath, err := findConfigFile(startDir)
+	if err != nil {
+		return config, err
+	}
+
+	if _, err := toml.DecodeFile(configPath, &config); err != nil {
+		return config, fmt.Errorf("error reading rollkit.toml: %v", err)
+	}
+
+	config.RootDir = filepath.Dir(configPath)
+
+	return config, nil
+}
+
+func findConfigFile(startDir string) (string, error) {
+	dir := startDir
+	for {
+		configPath := filepath.Join(dir, "rollkit.toml")
+		if _, err := os.Stat(configPath); err == nil {
+			return configPath, nil
+		}
+
+		parentDir := filepath.Dir(dir)
+		if parentDir == dir {
+			break
+		}
+		dir = parentDir
+	}
+	return "", fmt.Errorf("no rollkit.toml found")
+}
+
+func runEntrypoint(rollkitConfig rollconf.TomlConfig, args []string) error {
+	entrypointSourceFile := filepath.Join(rollkitConfig.RootDir, rollkitConfig.Entrypoint)
+	entrypointBinaryFile := filepath.Join(rollkitConfig.RootDir, rollupBinEntrypoint)
+
+	if !cometos.FileExists(entrypointBinaryFile) {
+		if !cometos.FileExists(entrypointSourceFile) {
+			return fmt.Errorf("rollkit: no such entrypoint file: %s", entrypointSourceFile)
+		}
+
+		// try to build the entrypoint
+		var buildArgs []string
+		buildArgs = append(buildArgs, "build")
+		buildArgs = append(buildArgs, "-o", entrypointBinaryFile)
+		buildArgs = append(buildArgs, entrypointSourceFile)
+		buildCmd := exec.Command("go", buildArgs...)
+		buildCmd.Stdout = os.Stdout
+		buildCmd.Stderr = os.Stderr
+		if err := buildCmd.Run(); err != nil {
+			return fmt.Errorf("rollkit: failed to build entrypoint: %w", err)
+		}
+	}
+
+	// run the entrypoint
+	var runArgs []string
+	runArgs = append(runArgs, args...)
+	// we have to pass --home flag to the entrypoint, so it reads the correct config root directory
+	runArgs = append(runArgs, "--home", rollkitConfig.Chain.ConfigDir)
+	fmt.Printf("Running entrypoint: %s %v\n", entrypointBinaryFile, runArgs)
+	entrypointCmd := exec.Command(entrypointBinaryFile, runArgs...)
+	entrypointCmd.Stdout = os.Stdout
+	entrypointCmd.Stderr = os.Stderr
+
+	if err := entrypointCmd.Run(); err != nil {
+		return fmt.Errorf("rollkit: failed to run entrypoint: %w", err)
+	}
+
+	return nil
+}
diff --git a/cmd/rollkit/commands/run_node.go b/cmd/rollkit/commands/run_node.go
@@ -33,15 +33,22 @@ import (
 	rolltypes "github.com/rollkit/rollkit/types"
 )
 
+const (
+	rollupBinEntrypoint = "entrypoint"
+)
+
 var (
 	// initialize the config with the cometBFT defaults
 	config = cometconf.DefaultConfig()
 
 	// initialize the rollkit configuration
-	rollkitConfig = rollconf.DefaultNodeConfig
+	nodeConfig = rollconf.DefaultNodeConfig
 
 	// initialize the logger with the cometBFT defaults
 	logger = cometlog.NewTMLogger(cometlog.NewSyncWriter(os.Stdout))
+
+	// rollkit.toml file configuration
+	rollkitConfig rollconf.TomlConfig
 )
 
 // NewRunNodeCmd returns the command that allows the CLI to start a node.
@@ -52,7 +59,6 @@ func NewRunNodeCmd() *cobra.Command {
 		Short:   "Run the rollkit node",
 		// PersistentPreRunE is used to parse the config and initial the config files
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-			// Parse the config
 			err := parseConfig(cmd)
 			if err != nil {
 				return err
@@ -105,8 +111,8 @@ func NewRunNodeCmd() *cobra.Command {
 			}
 
 			// get the node configuration
-			rollconf.GetNodeConfig(&rollkitConfig, config)
-			if err := rollconf.TranslateAddresses(&rollkitConfig); err != nil {
+			rollconf.GetNodeConfig(&nodeConfig, config)
+			if err := rollconf.TranslateAddresses(&nodeConfig); err != nil {
 				return err
 			}
 
@@ -126,10 +132,10 @@ func NewRunNodeCmd() *cobra.Command {
 			// create the rollkit node
 			rollnode, err := rollnode.NewNode(
 				context.Background(),
-				rollkitConfig,
+				nodeConfig,
 				p2pKey,
 				signingKey,
-				cometproxy.DefaultClientCreator(config.ProxyApp, config.ABCI, rollkitConfig.DBPath),
+				cometproxy.DefaultClientCreator(config.ProxyApp, config.ABCI, nodeConfig.DBPath),
 				genDoc,
 				metrics,
 				logger,
@@ -192,7 +198,7 @@ func NewRunNodeCmd() *cobra.Command {
 
 	// use aggregator by default
 	if !cmd.Flags().Lookup("rollkit.aggregator").Changed {
-		rollkitConfig.Aggregator = true
+		nodeConfig.Aggregator = true
 	}
 	return cmd
 }
@@ -212,7 +218,7 @@ func addNodeFlags(cmd *cobra.Command) {
 
 // startMockDAServJSONRPC starts a mock JSONRPC server
 func startMockDAServJSONRPC(ctx context.Context) (*proxy.Server, error) {
-	addr, _ := url.Parse(rollkitConfig.DAAddress)
+	addr, _ := url.Parse(nodeConfig.DAAddress)
 	srv := proxy.NewServer(addr.Hostname(), addr.Port(), goDATest.NewDummyDA())
 	err := srv.Start(ctx)
 	if err != nil {

diff --git a/cmd/rollkit/main.go b/cmd/rollkit/main.go
@@ -7,10 +7,15 @@ import (
 
 	"github.com/cometbft/cometbft/libs/cli"
 
+	"github.com/rollkit/rollkit/cmd/rollkit/commands"
 	cmd "github.com/rollkit/rollkit/cmd/rollkit/commands"
 )
 
 func main() {
+	if err := commands.InterceptCommand(); err == nil {
+		return
+	}
+
 	// Initiate the root command
 	rootCmd := cmd.RootCmd
 

diff --git a/config/config.go b/config/config.go
@@ -151,3 +151,14 @@ func AddFlags(cmd *cobra.Command) {
 	cmd.Flags().String(FlagTrustedHash, def.TrustedHash, "initial trusted hash to start the header exchange service")
 	cmd.Flags().Uint64(FlagMaxPendingBlocks, def.MaxPendingBlocks, "limit of blocks pending DA submission (0 for no limit)")
 }
+
+type TomlConfig struct {
+	Entrypoint string          `toml:"entrypoint"`
+	Chain      ChainTomlConfig `toml:"chain"`
+
+	RootDir string
+}
+
+type ChainTomlConfig struct {
+	ConfigDir string `toml:"config_dir"`
+}
diff --git a/go.mod b/go.mod
@@ -40,6 +40,7 @@ require (
 )
 
 require (
+	github.com/BurntSushi/toml v1.3.2 // indirect
 	github.com/benbjohnson/clock v1.3.5 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect

diff --git a/go.sum b/go.sum
@@ -81,6 +81,8 @@ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg6
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
+github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=