fix(mempool): Prevent runTx failures

cosmos/config/config.go

@@ -26,12 +26,13 @@ import (
 	"github.com/berachain/polaris/cosmos/config/flags"
 	"github.com/berachain/polaris/eth"
 	"github.com/berachain/polaris/eth/accounts"
-	"github.com/berachain/polaris/eth/node"
-	"github.com/berachain/polaris/eth/polar"
 
 	sdkflags "github.com/cosmos/cosmos-sdk/client/flags"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	version "github.com/cosmos/cosmos-sdk/version"
+
+	"github.com/ethereum/go-ethereum/common/hexutil"
 )
 
 type Config = eth.Config
@@ -49,17 +50,6 @@ func SetupCosmosConfig() {
 	config.Seal()
 }
 
-// DefaultConfig returns the default configuration for a polaris chain.
-func DefaultConfig() *Config {
-	nodeCfg := node.DefaultConfig()
-	nodeCfg.DataDir = ""
-	nodeCfg.KeyStoreDir = ""
-	return &Config{
-		Polar: *polar.DefaultConfig(),
-		Node:  *nodeCfg,
-	}
-}
-
 // MustReadConfigFromAppOpts reads the configuration options from the given
 // application options. Panics if the configuration cannot be read.
 func MustReadConfigFromAppOpts(opts servertypes.AppOptions) *Config {
@@ -105,6 +95,17 @@ func readConfigFromAppOptsParser(parser AppOptionsParser) (*Config, error) {
 		parser.GetHexutilBytes(flags.MinerExtraData); err != nil {
 		return nil, err
 	}
+
+	if len(conf.Polar.Miner.ExtraData) == 0 {
+		commit := version.NewInfo().GitCommit
+		if len(commit) != 40 { //nolint:gomnd // its okay.
+			return nil, err
+		}
+		conf.Polar.Miner.ExtraData = hexutil.Bytes(
+			commit[32:40],
+		)
+	}
+
 	if conf.Polar.Miner.GasFloor, err =
 		parser.GetUint64(flags.MinerGasFloor); err != nil {
 		return nil, err

cosmos/config/default.go

@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: BUSL-1.1
+//
+// Copyright (C) 2023, Berachain Foundation. All rights reserved.
+// Use of this software is govered by the Business Source License included
+// in the LICENSE file of this repository and at www.mariadb.com/bsl11.
+//
+// ANY USE OF THE LICENSED WORK IN VIOLATION OF THIS LICENSE WILL AUTOMATICALLY
+// TERMINATE YOUR RIGHTS UNDER THIS LICENSE FOR THE CURRENT AND ALL OTHER
+// VERSIONS OF THE LICENSED WORK.
+//
+// THIS LICENSE DOES NOT GRANT YOU ANY RIGHT IN ANY TRADEMARK OR LOGO OF
+// LICENSOR OR ITS AFFILIATES (PROVIDED THAT YOU MAY USE A TRADEMARK OR LOGO OF
+// LICENSOR AS EXPRESSLY REQUIRED BY THIS LICENSE).
+//
+// TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
+// AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
+// EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
+// TITLE.
+
+package config
+
+import (
+	"github.com/berachain/polaris/eth/node"
+	"github.com/berachain/polaris/eth/polar"
+
+	cmtcfg "github.com/cometbft/cometbft/config"
+
+	serverconfig "github.com/cosmos/cosmos-sdk/server/config"
+)
+
+// RecommendedCometBFTConfig returns the recommended CometBFT config
+// for the application.
+func RecommendedCometBFTConfig() *cmtcfg.Config {
+	cfg := cmtcfg.DefaultConfig()
+	cfg.Mempool.Size = 30000
+	cfg.Mempool.CacheSize = 30000
+	cfg.Mempool.Recheck = true
+	cfg.Mempool.Type = "flood"
+
+	cfg.P2P.MaxNumInboundPeers = 10
+	cfg.P2P.MaxNumOutboundPeers = 15
+
+	cfg.TxIndex.Indexer = "null"
+
+	cfg.Instrumentation.Prometheus = true
+	return cfg
+}
+
+// RecommendedServerConfig returns the recommended server config.
+func RecommendedServerConfig() *serverconfig.Config {
+	cfg := serverconfig.DefaultConfig()
+	cfg.MinGasPrices = "0abera"
+	cfg.API.Enable = true
+	cfg.Telemetry.Enabled = true
+	cfg.Telemetry.PrometheusRetentionTime = 180
+	cfg.Telemetry.EnableHostnameLabel = true
+	cfg.Telemetry.GlobalLabels = [][]string{}
+	cfg.IAVLCacheSize = 20000
+	return cfg
+}
+
+// DefaultPolarisConfig returns the default polaris config.
+func DefaultPolarisConfig() *Config {
+	nodeCfg := node.DefaultConfig()
+	nodeCfg.DataDir = ""
+	nodeCfg.KeyStoreDir = ""
+	return &Config{
+		Polar: *polar.DefaultConfig(),
+		Node:  *nodeCfg,
+	}
+}

cosmos/runtime/txpool/ante.go

@@ -27,6 +27,7 @@ import (
 	"github.com/berachain/polaris/cosmos/x/evm/types"
 	"github.com/berachain/polaris/lib/utils"
 
+	"github.com/cosmos/cosmos-sdk/telemetry"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -42,8 +43,10 @@ func (m *Mempool) AnteHandle(
 ) (sdk.Context, error) {
 	msgs := tx.GetMsgs()
 
+	// Record the time it takes to build a payload.
+
 	// We only want to eject transactions from comet on recheck.
-	if ctx.ExecMode() == sdk.ExecModeReCheck {
+	if ctx.ExecMode() == sdk.ExecModeCheck || ctx.ExecMode() == sdk.ExecModeReCheck {
 		if wet, ok := utils.GetAs[*types.WrappedEthereumTransaction](msgs[0]); ok {
 			if m.shouldEjectFromCometMempool(ctx.BlockTime(), wet.Unwrap()) {
 				return ctx, errors.New("eject from comet mempool")
@@ -57,6 +60,7 @@ func (m *Mempool) AnteHandle(
 func (m *Mempool) shouldEjectFromCometMempool(
 	currentTime time.Time, tx *ethtypes.Transaction,
 ) bool {
+	defer telemetry.MeasureSince(time.Now(), MetricKeyTimeShouldEject)
 	if tx == nil {
 		return false
 	}
@@ -66,21 +70,22 @@ func (m *Mempool) shouldEjectFromCometMempool(
 	// 1. If the transaction has been included in a block.
 	// 2. If the transaction is unknown to the node.
 	// 3. If the transaction has been in the mempool for longer than the configured timeout.
-	return txStatus == txpool.TxStatusIncluded || txStatus == txpool.TxStatusUnknown ||
+	return txStatus == txpool.TxStatusIncluded ||
 		currentTime.Sub(tx.Time()) > m.lifetime
 }
 
 // txStatus returns the status of the transaction.
 func (m *Mempool) txStatus(hash common.Hash) txpool.TxStatus {
-	// Looking for the transaction in txpool first.
-	status := m.txpool.Status(hash)
+	// // Looking for the transaction in txpool first.
+	// status := m.txpool.Status(hash)
 
-	// If the transaction is unknown to the pool, try looking it up locally.
-	if status == txpool.TxStatusUnknown {
-		lookup := m.chain.GetTransactionLookup(hash)
-		if lookup != nil {
-			status = txpool.TxStatusIncluded
-		}
+	// // If the transaction is unknown to the pool, try looking it up locally.
+	// if status == txpool.TxStatusUnknown {
+	var status txpool.TxStatus
+	lookup := m.chain.GetTransactionLookup(hash)
+	if lookup != nil {
+		status = txpool.TxStatusIncluded
 	}
+	// }
 	return status
 }

cosmos/runtime/txpool/handler.go

@@ -223,7 +223,9 @@ func (h *handler) broadcastTransaction(tx *ethtypes.Transaction, retries int) {
 		return
 	}
 
-	if rsp == nil || rsp.Code == 0 {
+	// If rsp == 1, likely the txn is already in a block, and thus the broadcast failing is actually
+	// the desired behaviour.
+	if rsp == nil || rsp.Code == 0 || rsp.Code == 1 {
 		return
 	}
 

cosmos/runtime/txpool/telemetry.go

@@ -23,4 +23,5 @@ package txpool
 const (
 	MetricKeyMempoolFull      = "polaris_cometbft_mempool_full"
 	MetricKeyBroadcastFailure = "polaris_cometbft_broadcast_failure"
+	MetricKeyTimeShouldEject  = "polaris_cometbft_time_should_eject"
 )

cosmos/x/evm/genesis_test.go

@@ -67,7 +67,7 @@ var _ = Describe("Genesis", func() {
 	BeforeEach(func() {
 		ctx, ak, _, _ = testutil.SetupMinimalKeepers(log.NewTestLogger(GinkgoT()))
 		ctx = ctx.WithBlockHeight(0)
-		cfg := config.DefaultConfig()
+		cfg := config.DefaultPolarisConfig()
 		ethGen.Config = params.DefaultChainConfig
 		cfg.Node.DataDir = GinkgoT().TempDir()
 		cfg.Node.KeyStoreDir = GinkgoT().TempDir()