Add disable tx gossip option

README.md

@@ -81,6 +81,10 @@ The historical RPC endpoint. op-erigon queries historical execution data that op
 
 For more information about legacy geth, refer the [Optimism's node operator guide](https://community.optimism.io/docs/developers/bedrock/node-operator-guide/#legacy-geth).
 
+### `--rollup.disabletxpoolgossip`
+**[New flag / Optional]** 
+Disables transaction pool gossiping. Though this is not required, it's useful to set this to true since transaction pool gossip is currently unsupported in the Optimism protocol. If not provided, default value is set to `false`.
+
 ### `--maxpeers=0`, `--nodiscover`
 **[Optional]** 
 Disable P2P. Execution-layer peering is currently not supported in the Optimism protocol. Though this is not required, it saves resources since TX pool gossip is currently not available.
@@ -120,6 +124,7 @@ $ ./build/bin/erigon \
     --authrpc.jwtsecret=$JWT_SECRET_FILE \
     --rollup.sequencerhttp="https://mainnet-sequencer.optimism.io" \
     --rollup.historicalrpc="https://mainnet.optimism.io" \
+    --rollup.disabletxpoolgossip=true \
     --chain=optimism-mainnet \
     --nodiscover
 ```

cmd/erigon-el/backend/backend.go

@@ -463,6 +463,7 @@ func NewBackend(stack *node.Node, config *ethconfig.Config, logger log.Logger) (
 		}
 		backend.historicalRPCService = client
 	}
+	config.TxPool.NoTxGossip = config.RollupDisableTxPoolGossip
 
 	var miningRPC txpool_proto.MiningServer
 	stateDiffClient := direct.NewStateDiffClientDirect(kvRPC)

cmd/rpcdaemon/cli/httpcfg/http_cfg.go

@@ -69,4 +69,5 @@ type HttpCfg struct {
 	RollupSequencerHTTP        string
 	RollupHistoricalRPC        string
 	RollupHistoricalRPCTimeout time.Duration
+	RollupDisableTxPoolGossip  bool
 }

cmd/txpool/main.go

@@ -53,7 +53,8 @@ var (
 	accountSlots uint64
 	priceBump    uint64
 
-	optimism bool
+	optimism   bool
+	noTxGossip bool
 
 	commitEvery time.Duration
 )
@@ -79,6 +80,7 @@ func init() {
 	rootCmd.PersistentFlags().Uint64Var(&priceBump, "txpool.pricebump", txpoolcfg.DefaultConfig.PriceBump, "Price bump percentage to replace an already existing transaction")
 	rootCmd.PersistentFlags().DurationVar(&commitEvery, utils.TxPoolCommitEveryFlag.Name, utils.TxPoolCommitEveryFlag.Value, utils.TxPoolCommitEveryFlag.Usage)
 	rootCmd.PersistentFlags().BoolVar(&optimism, "txpool.optimism", txpoolcfg.DefaultConfig.Optimism, "Enable Optimism Bedrock to make txpool account for L1 cost of transactions")
+	rootCmd.PersistentFlags().BoolVar(&noTxGossip, "txpool.disabletxpoolgossip", txpoolcfg.DefaultConfig.NoTxGossip, "Disable transaction pool gossip")
 	rootCmd.Flags().StringSliceVar(&traceSenders, utils.TxPoolTraceSendersFlag.Name, []string{}, utils.TxPoolTraceSendersFlag.Usage)
 }
 
@@ -147,6 +149,8 @@ func doTxpool(ctx context.Context) error {
 	cfg.MinFeeCap = priceLimit
 	cfg.AccountSlots = accountSlots
 	cfg.PriceBump = priceBump
+	cfg.Optimism = optimism
+	cfg.NoTxGossip = noTxGossip
 
 	cacheConfig := kvcache.DefaultCoherentConfig
 	cacheConfig.MetricsLabel = "txpool"

cmd/utils/flags.go

@@ -602,17 +602,19 @@ var (
 		Name:  "rollup.sequencerhttp",
 		Usage: "HTTP endpoint for the sequencer mempool",
 	}
-
 	RollupHistoricalRPCFlag = cli.StringFlag{
 		Name:  "rollup.historicalrpc",
 		Usage: "RPC endpoint for historical data.",
 	}
-
 	RollupHistoricalRPCTimeoutFlag = cli.StringFlag{
 		Name:  "rollup.historicalrpctimeout",
 		Usage: "Timeout for historical RPC requests.",
 		Value: "5s",
 	}
+	RollupDisableTxPoolGossipFlag = cli.StringFlag{
+		Name:  "rollup.disabletxpoolgossip",
+		Usage: "Disables transaction pool gossip.",
+	}
 
 	// Metrics flags
 	MetricsEnabledFlag = cli.BoolFlag{
@@ -1602,6 +1604,9 @@ func SetEthConfig(ctx *cli.Context, nodeConfig *nodecfg.Config, cfg *ethconfig.C
 	if ctx.IsSet(RollupHistoricalRPCTimeoutFlag.Name) {
 		cfg.RollupHistoricalRPCTimeout = ctx.Duration(RollupHistoricalRPCTimeoutFlag.Name)
 	}
+	if ctx.IsSet(RollupDisableTxPoolGossipFlag.Name) {
+		cfg.RollupDisableTxPoolGossip = ctx.Bool(RollupDisableTxPoolGossipFlag.Name)
+	}
 	// Override any default configs for hard coded networks.
 	chain := ctx.String(ChainFlag.Name)
 

eth/backend.go

@@ -489,6 +489,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 		}
 		backend.historicalRPCService = client
 	}
+	config.TxPool.NoTxGossip = config.RollupDisableTxPoolGossip
 
 	var miningRPC txpool_proto.MiningServer
 	stateDiffClient := direct.NewStateDiffClientDirect(kvRPC)

eth/ethconfig/config.go

@@ -255,6 +255,7 @@ type Config struct {
 	RollupSequencerHTTP        string
 	RollupHistoricalRPC        string
 	RollupHistoricalRPCTimeout time.Duration
+	RollupDisableTxPoolGossip  bool
 }
 
 type Sync struct {

go.mod

@@ -3,7 +3,7 @@ module github.com/ledgerwatch/erigon
 go 1.19
 
 //fork with minor protobuf file changes and txpool support
-replace github.com/ledgerwatch/erigon-lib v0.0.0-20230423044930-fc9dd74e6407 => github.com/testinprod-io/erigon-lib v0.0.0-20230616053951-ae06f5d5c536
+replace github.com/ledgerwatch/erigon-lib v0.0.0-20230423044930-fc9dd74e6407 => github.com/testinprod-io/erigon-lib v0.0.0-20230627022131-a6b80ff472f7
 
 //for local dev:
 //replace github.com/ledgerwatch/erigon-lib v0.0.0-20230423044930-fc9dd74e6407 => ../erigon-lib

go.sum

@@ -777,8 +777,8 @@ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/supranational/blst v0.3.10 h1:CMciDZ/h4pXDDXQASe8ZGTNKUiVNxVVA5hpci2Uuhuk=
 github.com/supranational/blst v0.3.10/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
-github.com/testinprod-io/erigon-lib v0.0.0-20230616053951-ae06f5d5c536 h1:xootH/fjZSJ0VNE3v0cGU1PleXRsqaseAyvjUWUDh8U=
-github.com/testinprod-io/erigon-lib v0.0.0-20230616053951-ae06f5d5c536/go.mod h1:6SIBkeREz7fob8A0EBsTCVzTqJIc+BBiuPAsb5sUYk0=
+github.com/testinprod-io/erigon-lib v0.0.0-20230627022131-a6b80ff472f7 h1:cFFBTMygHPJ4uGhXqdI0bS1/LQ8t8Q4sl6buk3NiXnQ=
+github.com/testinprod-io/erigon-lib v0.0.0-20230627022131-a6b80ff472f7/go.mod h1:6SIBkeREz7fob8A0EBsTCVzTqJIc+BBiuPAsb5sUYk0=
 github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e h1:cR8/SYRgyQCt5cNCMniB/ZScMkhI9nk8U5C7SbISXjo=
 github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e/go.mod h1:Tu4lItkATkonrYuvtVjG0/rhy15qrNGNTjPdaphtZ/8=
 github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg=

turbo/cli/default_flags.go

@@ -153,6 +153,7 @@ var DefaultFlags = []cli.Flag{
 	&utils.RollupSequencerHTTPFlag,
 	&utils.RollupHistoricalRPCFlag,
 	&utils.RollupHistoricalRPCTimeoutFlag,
+	&utils.RollupDisableTxPoolGossipFlag,
 
 	&utils.ConfigFlag,
 	&logging.LogConsoleVerbosityFlag,