add l1/l2 node version flags

Author: cyberhorsey

cmd/flags/prover.go

@@ -190,6 +190,18 @@ var (
 		Value:    false,
 		Category: proverCategory,
 	}
+	L1NodeVersion = &cli.StringFlag{
+		Name:     "prover.l1NodeVersion",
+		Usage:    "Version or tag or the L1 Node Version used as an L1 RPC Url by this guardian prover",
+		Category: proverCategory,
+		Value:    "",
+	}
+	L2NodeVersion = &cli.StringFlag{
+		Name:     "prover.l1NodeVersion",
+		Usage:    "Version or tag or the L1 Node Version used as an L1 RPC Url by this guardian prover",
+		Category: proverCategory,
+		Value:    "",
+	}
 )
 
 // ProverFlags All prover flags.
@@ -227,4 +239,6 @@ var ProverFlags = MergeFlags(CommonFlags, []cli.Flag{
 	DatabaseCacheSize,
 	ProverAssignmentHookAddress,
 	Allowance,
+	L1NodeVersion,
+	L2NodeVersion,
 })

prover/config.go

@@ -2,6 +2,7 @@ package prover
 
 import (
 	"crypto/ecdsa"
+	"errors"
 	"fmt"
 	"math/big"
 	"net/url"
@@ -57,6 +58,8 @@ type Config struct {
 	Allowance                               *big.Int
 	GuardianProverHealthCheckServerEndpoint *url.URL
 	RaikoHostEndpoint                       string
+	L1NodeVersion                           string
+	L2NodeVersion                           string
 }
 
 // NewConfigFromCliContext creates a new config instance from command line flags.
@@ -114,9 +117,19 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) {
 		if err := c.Set(flags.ProveUnassignedBlocks.Name, "true"); err != nil {
 			return nil, err
 		}
+
 		if err := c.Set(flags.ContesterMode.Name, "true"); err != nil {
 			return nil, err
 		}
+
+		// l1 and l2 node version flags are required only if guardian prover
+		if !c.IsSet(flags.L1NodeVersion.Name) {
+			return nil, errors.New("L1NodeVersion is required if guardian prover is set")
+		}
+
+		if !c.IsSet(flags.L2NodeVersion.Name) {
+			return nil, errors.New("L2NodeVersion is required if guardian prover is set")
+		}
 	}
 
 	if !c.IsSet(flags.GuardianProver.Name) && !c.IsSet(flags.RaikoHostEndpoint.Name) {
@@ -165,5 +178,7 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) {
 		DatabasePath:                            c.String(flags.DatabasePath.Name),
 		DatabaseCacheSize:                       c.Uint64(flags.DatabaseCacheSize.Name),
 		Allowance:                               allowance,
+		L1NodeVersion:                           c.String(flags.L1NodeVersion.Name),
+		L2NodeVersion:                           c.String(flags.L2NodeVersion.Name),
 	}, nil
 }

prover/config_test.go

@@ -15,8 +15,10 @@ import (
 var (
 	l1WsEndpoint   = os.Getenv("L1_NODE_WS_ENDPOINT")
 	l1HttpEndpoint = os.Getenv("L1_NODE_HTTP_ENDPOINT")
+	l1NodeVersion  = "1.0.0"
 	l2WsEndpoint   = os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT")
 	l2HttpEndpoint = os.Getenv("L2_EXECUTION_ENGINE_HTTP_ENDPOINT")
+	l2NodeVersion  = "0.1.0"
 	taikoL1        = os.Getenv("TAIKO_L1_ADDRESS")
 	taikoL2        = os.Getenv("TAIKO_L2_ADDRESS")
 	allowance      = "10000000000000000000000000000000000000000000000000"
@@ -50,6 +52,8 @@ func (s *ProverTestSuite) TestNewConfigFromCliContextGuardianProver() {
 		s.Equal(uint64(minTierFee), c.MinPseZkevmTierFee.Uint64())
 		s.Equal(uint64(3), c.ProveBlockTxReplacementMultiplier)
 		s.Equal(uint64(256), c.ProveBlockMaxTxGasTipCap.Uint64())
+		s.Equal(c.L1NodeVersion, l1NodeVersion)
+		s.Equal(c.L2NodeVersion, l2NodeVersion)
 		s.Nil(new(Prover).InitFromCli(context.Background(), ctx))
 		s.True(c.ProveUnassignedBlocks)
 		s.Equal("dbPath", c.DatabasePath)
@@ -88,6 +92,8 @@ func (s *ProverTestSuite) TestNewConfigFromCliContextGuardianProver() {
 		"--" + flags.DatabaseCacheSize.Name, "128",
 		"--" + flags.MaxProposedIn.Name, "100",
 		"--" + flags.Allowance.Name, allowance,
+		"--" + flags.L1NodeVersion.Name, l1NodeVersion,
+		"--" + flags.L2NodeVersion.Name, l2NodeVersion,
 	}))
 }
 
@@ -129,6 +135,8 @@ func (s *ProverTestSuite) SetupApp() *cli.App {
 		&cli.StringFlag{Name: flags.ProverAssignmentHookAddress.Name},
 		&cli.StringFlag{Name: flags.Allowance.Name},
 		&cli.StringFlag{Name: flags.ContesterMode.Name},
+		&cli.StringFlag{Name: flags.L1NodeVersion.Name},
+		&cli.StringFlag{Name: flags.L2NodeVersion.Name},
 	}
 	app.Action = func(ctx *cli.Context) error {
 		_, err := NewConfigFromCliContext(ctx)

prover/prover.go

@@ -405,8 +405,8 @@ func (p *Prover) Start() error {
 			p.ctx,
 			version.CommitVersion(),
 			version.CommitVersion(),
-			"placeholder", // todo: get l1 node version
-			"placeholder", // todo: get l2 node version
+			p.cfg.L1NodeVersion,
+			p.cfg.L2NodeVersion,
 		); err != nil {
 			log.Crit("Failed to send guardian prover startup", "error", err)
 		}