[Backport release/v6.x] Optimize and reduce storage and some iterations

app/extend_vote.go

@@ -31,7 +31,7 @@ import (
 type OracleKeeper interface {
 	GetTimestampBefore(ctx context.Context, queryId []byte, timestamp time.Time) (time.Time, error)
 	GetTimestampAfter(ctx context.Context, queryId []byte, timestamp time.Time) (time.Time, error)
-	GetAggregatedReportsByHeight(ctx context.Context, height uint64) []oracletypes.Aggregate
+	GetAggregatedReportsByHeight(ctx context.Context, height uint64) ([]oracletypes.Aggregate, error)
 }
 
 type BridgeKeeper interface {

app/proposal_handler.go

@@ -128,6 +128,11 @@ func (h *ProposalHandler) PrepareProposalHandler(ctx sdk.Context, req *abci.Requ
 
 func (h *ProposalHandler) ProcessProposalHandler(ctx sdk.Context, req *abci.RequestProcessProposal) (*abci.ResponseProcessProposal, error) {
 	if req.Height > ctx.ConsensusParams().Abci.VoteExtensionsEnableHeight {
+		// in case proposer says 0 tx in a block after vote extensions enabled
+		if len(req.Txs) == 0 {
+			h.logger.Error("ProcessProposalHandler: rejecting proposal, empty transactions after vote extensions enabled")
+			return &abci.ResponseProcessProposal{Status: abci.ResponseProcessProposal_REJECT}, nil
+		}
 		var injectedVoteExtTx VoteExtTx
 		if err := json.Unmarshal(req.Txs[0], &injectedVoteExtTx); err != nil {
 			h.logger.Error("ProcessProposalHandler: failed to decode injected vote extension tx", "err", err)

app/proposal_handler_test.go

@@ -387,6 +387,25 @@ func (s *ProposalHandlerTestSuite) TestProcessProposalHandler() {
 	require.NotNil(res)
 }
 
+func (s *ProposalHandlerTestSuite) TestProcessProposalHandler_EmptyTxs() {
+	require := s.Require()
+	p := s.proposalHandler
+	ctx := s.ctx
+
+	ctx = ctx.WithBlockHeight(3)
+
+	// Empty Txs after vote extensions enabled should reject, not panic
+	req := abcitypes.RequestProcessProposal{
+		Txs:    [][]byte{},
+		Height: 3,
+	}
+
+	res, err := p.ProcessProposalHandler(ctx, &req)
+	require.NoError(err)
+	require.NotNil(res)
+	require.Equal(abcitypes.ResponseProcessProposal_REJECT, res.Status)
+}
+
 func (s *ProposalHandlerTestSuite) TestPreBlocker() {
 	require := s.Require()
 	p := s.proposalHandler

app/upgrades.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/tellor-io/layer/app/upgrades"
-	v_6_1_1 "github.com/tellor-io/layer/app/upgrades/v6.1.1"
+	v_6_1_2 "github.com/tellor-io/layer/app/upgrades/v6.1.2"
 
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 )
@@ -13,20 +13,20 @@ var (
 	// `Upgrades` defines the upgrade handlers and store loaders for the application.
 	// New upgrades should be added to this slice after they are implemented.
 	Upgrades = []*upgrades.Upgrade{
-		&v_6_1_1.Upgrade,
+		&v_6_1_2.Upgrade,
 	}
 	Forks = []upgrades.Fork{}
 )
 
 // setupUpgradeHandlers registers the upgrade handlers to perform custom upgrade
 // logic and state migrations for software upgrades.
 func (app *App) setupUpgradeHandlers() {
-	if app.UpgradeKeeper.HasHandler(v_6_1_1.UpgradeName) {
-		panic(fmt.Sprintf("Cannot register duplicate upgrade handler '%s'", v_6_1_1.UpgradeName))
+	if app.UpgradeKeeper.HasHandler(v_6_1_2.UpgradeName) {
+		panic(fmt.Sprintf("Cannot register duplicate upgrade handler '%s'", v_6_1_2.UpgradeName))
 	}
 	app.UpgradeKeeper.SetUpgradeHandler(
-		v_6_1_1.UpgradeName,
-		v_6_1_1.CreateUpgradeHandler(
+		v_6_1_2.UpgradeName,
+		v_6_1_2.CreateUpgradeHandler(
 			app.ModuleManager(),
 			app.configurator,
 		),

app/upgrades/v6.1.2/constants.go

@@ -0,0 +1,16 @@
+package v6_1_2
+
+import (
+	"github.com/tellor-io/layer/app/upgrades"
+
+	store "cosmossdk.io/store/types"
+)
+
+const (
+	UpgradeName = "v6.1.2"
+)
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:   UpgradeName,
+	StoreUpgrades: store.StoreUpgrades{},
+}

app/upgrades/v6.1.2/upgrade.go

@@ -0,0 +1,32 @@
+package v6_1_2
+
+import (
+	"context"
+	"fmt"
+
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+)
+
+/*
+Upgrade to v6.1.2 includes:
+  - Reporter stake caching: skip full recalculation when delegation state hasn't changed
+  - New reporter collections: LastValSetUpdateHeight, StakeRecalcFlag, RecalcAtTime
+  - Staking hooks now flag reporters for recalculation on validator set changes and delegation modifications
+  - Microreport pruning: oracle EndBlocker removes reports older than 30 days (batched, max 100/block)
+  - Simplified reporter PruneOldReports using oracle block-height lookup
+*/
+
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+) upgradetypes.UpgradeHandler {
+	return func(ctx context.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		sdkCtx := sdk.UnwrapSDKContext(ctx)
+		sdkCtx.Logger().Info(fmt.Sprintf("Running %s Upgrade...", UpgradeName))
+
+		return mm.RunMigrations(ctx, configurator, vm)
+	}
+}

cmd/layerd/cmd/root.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"io"
 	"os"
+	"time"
 
 	tmcfg "github.com/cometbft/cometbft/config"
 	tmcli "github.com/cometbft/cometbft/libs/cli"
@@ -122,6 +123,7 @@ func NewRootCmd(
 // return tmcfg.DefaultConfig if no custom configuration is required for the application.
 func initTendermintConfig() *tmcfg.Config {
 	cfg := tmcfg.DefaultConfig()
+	cfg.Consensus.TimeoutCommit = 3 * time.Second
 	return cfg
 }