add txpublisher.enable flag

l2geth/cmd/geth/main.go

@@ -164,6 +164,7 @@ var (
 		utils.RollupFeeThresholdDownFlag,
 		utils.RollupFeeThresholdUpFlag,
 		utils.SequencerClientHttpFlag,
+		utils.TxPublisherEnableFlag,
 		utils.TxPublisherProjectIDFlag,
 		utils.TxPublisherTopicIDFlag,
 		utils.TxPublisherTimeoutFlag,

l2geth/cmd/geth/usage.go

@@ -78,6 +78,7 @@ var AppHelpFlagGroups = []flagGroup{
 			utils.RollupFeeThresholdDownFlag,
 			utils.RollupFeeThresholdUpFlag,
 			utils.SequencerClientHttpFlag,
+			utils.TxPublisherEnableFlag,
 			utils.TxPublisherProjectIDFlag,
 			utils.TxPublisherTopicIDFlag,
 			utils.TxPublisherTimeoutFlag,

l2geth/cmd/utils/flags.go

@@ -867,6 +867,11 @@ var (
 		Usage:  "HTTP endpoint for the sequencer client",
 		EnvVar: "SEQUENCER_CLIENT_HTTP",
 	}
+	TxPublisherEnableFlag = cli.BoolFlag{
+		Name:   "txpublisher.enable",
+		Usage:  "Enable Transaction logging to PubSub",
+		EnvVar: "TX_PUBLISHER_ENABLE",
+	}
 	TxPublisherProjectIDFlag = cli.StringFlag{
 		Name:   "txpublisher.projectid",
 		Usage:  "GCP Project ID for the tx PubSub",
@@ -1166,6 +1171,9 @@ func setRollup(ctx *cli.Context, cfg *rollup.Config) {
 // UsingOVM
 // setTxPublisher configures the transaction logger
 func setTxPublisher(ctx *cli.Context, cfg *pub.Config) {
+	if ctx.GlobalIsSet(TxPublisherEnableFlag.Name) {
+		cfg.Enable = ctx.GlobalBool(TxPublisherEnableFlag.Name)
+	}
 	if ctx.GlobalIsSet(TxPublisherProjectIDFlag.Name) {
 		cfg.ProjectID = ctx.GlobalString(TxPublisherProjectIDFlag.Name)
 	}

l2geth/eth/backend.go

@@ -207,13 +207,10 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
 	}
 	eth.txPool = core.NewTxPool(config.TxPool, chainConfig, eth.blockchain)
 
-	var txLogger pub.Publisher = &pub.NoopPublisher{}
-	if config.TxPublisher.ProjectID != "" {
-		var err error
-		txLogger, err = pub.NewGooglePublisher(context.Background(), config.TxPublisher)
-		if err != nil {
-			return nil, err
-		}
+	var txLogger pub.Publisher
+	txLogger, err = pub.NewGooglePublisher(context.Background(), config.TxPublisher)
+	if err != nil {
+		return nil, err
 	}
 
 	eth.syncService, err = rollup.NewSyncService(context.Background(), config.Rollup, eth.txPool, eth.blockchain, eth.chainDb, txLogger)

l2geth/rollup/pub/google.go

@@ -12,6 +12,7 @@ import (
 const messageOrderingKey = "o"
 
 type Config struct {
+	Enable    bool
 	ProjectID string
 	TopicID   string
 	Timeout   time.Duration
@@ -25,7 +26,11 @@ type GooglePublisher struct {
 	mutex           sync.Mutex
 }
 
-func NewGooglePublisher(ctx context.Context, config Config) (*GooglePublisher, error) {
+func NewGooglePublisher(ctx context.Context, config Config) (Publisher, error) {
+	if !config.Enable {
+		return &NoopPublisher{}, nil
+	}
+
 	client, err := pubsub.NewClient(ctx, config.ProjectID)
 	if err != nil {
 		return nil, err
@@ -43,6 +48,8 @@ func NewGooglePublisher(ctx context.Context, config Config) (*GooglePublisher, e
 		log.Info("Sanitizing publisher timeout to 2 seconds")
 		timeout = time.Second * 2
 	}
+
+	log.Info("Initialized transaction log to PubSub", "topic", config.TopicID)
 	return &GooglePublisher{
 		client:          client,
 		topic:           topic,