Merge branch 'develop' into feat/keytypes

.github/CODEOWNERS

@@ -1,4 +1,4 @@
 # CODEOWNERS: https://help.github.com/articles/about-codeowners/
 
 # Primary repo maintainers
-*       @joe-bowman @ajansari95 @aljo242
+*       @joe-bowman @ajansari95 @aljo242 @muku314115

x/participationrewards/keeper/hooks.go

@@ -1,8 +1,6 @@
 package keeper
 
 import (
-	"errors"
-
 	"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
@@ -56,11 +54,7 @@ func (k *Keeper) AfterEpochEnd(ctx sdk.Context, epochIdentifier string, _ int64)
 			k.GetParams(ctx).DistributionProportions,
 		)
 		if err != nil {
-			if errors.Is(err, types.ErrNothingToAllocate) {
-				k.Logger(ctx).Info(err.Error())
-			} else {
-				k.Logger(ctx).Error(err.Error())
-			}
+			k.Logger(ctx).Error(err.Error())
 		}
 
 		k.Logger(ctx).Info("Triggering submodule hooks")
@@ -74,6 +68,12 @@ func (k *Keeper) AfterEpochEnd(ctx sdk.Context, epochIdentifier string, _ int64)
 			return nil
 		}
 
+		if allocation == nil {
+			// if allocation is unset, then return early to avoid panic
+			k.Logger(ctx).Error("nil allocation", "error", err.Error())
+			return nil
+		}
+
 		if err := k.AllocateZoneRewards(ctx, tvs, *allocation); err != nil {
 			k.Logger(ctx).Error(err.Error())
 			return err