Merge branch 'main' into allow-msgs

berachain · Nov 5, 2023 · f98add1 · f98add1
2 parents 014109d + 2c82469
commit f98add1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/cosmos/config/config.go b/cosmos/config/config.go
@@ -279,6 +279,15 @@ func readConfigFromAppOptsParser(parser AppOptionsParser) (*Config, error) {
 		return nil, err
 	}
 
+	if conf.Polar.LegacyTxPool.Journal == "" {
+		conf.Polar.LegacyTxPool.Journal, err =
+			parser.GetString(sdkflags.FlagHome)
+		if err != nil {
+			return nil, err
+		}
+		conf.Polar.LegacyTxPool.Journal += "/data/transactions.rlp"
+	}
+
 	if conf.Polar.LegacyTxPool.Rejournal, err =
 		parser.GetTimeDuration(flags.ReJournal); err != nil {
 		return nil, err

diff --git a/eth/polar/config.go b/eth/polar/config.go
@@ -51,12 +51,14 @@ func DefaultConfig() *Config {
 	gpoConfig.Default = big.NewInt(gpoDefault)
 	minerCfg := miner.DefaultConfig
 	minerCfg.Etherbase = common.HexToAddress(developmentCoinbase)
-	// TODO: setup proper command line flags
+	legacyPool := legacypool.DefaultConfig
+	legacyPool.Journal = ""
+
 	return &Config{
 		Chain:         *params.DefaultChainConfig,
 		Miner:         minerCfg,
 		GPO:           gpoConfig,
-		LegacyTxPool:  legacypool.DefaultConfig,
+		LegacyTxPool:  legacyPool,
 		RPCGasCap:     ethconfig.Defaults.RPCGasCap,
 		RPCTxFeeCap:   ethconfig.Defaults.RPCTxFeeCap,
 		RPCEVMTimeout: ethconfig.Defaults.RPCEVMTimeout,