fix(observer): remove error return in IsAuthorized (#1250)

* update function

* regenerate interfaces

* update for crosschain

x/crosschain/keeper/keeper_chain_nonces.go

@@ -4,13 +4,12 @@ import (
 	"context"
 	"fmt"
 
-	zetaObserverTypes "github.com/zeta-chain/zetacore/x/observer/types"
-
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/types/query"
 	"github.com/zeta-chain/zetacore/x/crosschain/types"
+	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
@@ -108,12 +107,11 @@ func (k msgServer) NonceVoter(goCtx context.Context, msg *types.MsgNonceVoter) (
 	ctx := sdk.UnwrapSDKContext(goCtx)
 	chain := k.zetaObserverKeeper.GetParams(ctx).GetChainFromChainID(msg.ChainId)
 	if chain == nil {
-		return nil, zetaObserverTypes.ErrSupportedChains
+		return nil, observertypes.ErrSupportedChains
 	}
 
-	ok, err := k.zetaObserverKeeper.IsAuthorized(ctx, msg.Creator, chain)
-	if !ok {
-		return nil, err
+	if ok := k.zetaObserverKeeper.IsAuthorized(ctx, msg.Creator, chain); !ok {
+		return nil, observertypes.ErrNotAuthorizedPolicy
 	}
 	chainNonce, isFound := k.GetChainNonces(ctx, chain.ChainName.String())
 

x/crosschain/keeper/keeper_cross_chain_tx_vote_inbound_tx.go

@@ -77,9 +77,8 @@ func (k msgServer) VoteOnObservedInboundTx(goCtx context.Context, msg *types.Msg
 		tssPub = tss.TssPubkey
 	}
 	// IsAuthorized does various checks against the list of observer mappers
-	ok, err := k.zetaObserverKeeper.IsAuthorized(ctx, msg.Creator, observationChain)
-	if !ok {
-		return nil, err
+	if ok := k.zetaObserverKeeper.IsAuthorized(ctx, msg.Creator, observationChain); !ok {
+		return nil, observerTypes.ErrNotAuthorizedPolicy
 	}
 
 	index := msg.Digest()

x/crosschain/keeper/keeper_cross_chain_tx_vote_outbound_tx.go

@@ -73,9 +73,8 @@ func (k msgServer) VoteOnObservedOutboundTx(goCtx context.Context, msg *types.Ms
 		return nil, err
 	}
 	//Check is msg.Creator is authorized to vote
-	ok, err := k.zetaObserverKeeper.IsAuthorized(ctx, msg.Creator, observationChain)
-	if !ok {
-		return nil, err
+	if ok := k.zetaObserverKeeper.IsAuthorized(ctx, msg.Creator, observationChain); !ok {
+		return nil, observerTypes.ErrNotAuthorizedPolicy
 	}
 
 	// Check if CCTX exists

x/crosschain/keeper/keeper_gas_price.go

@@ -13,7 +13,7 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/types/query"
 	"github.com/zeta-chain/zetacore/x/crosschain/types"
-	zetaObserverTypes "github.com/zeta-chain/zetacore/x/observer/types"
+	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
@@ -127,11 +127,10 @@ func (k msgServer) GasPriceVoter(goCtx context.Context, msg *types.MsgGasPriceVo
 
 	chain := k.zetaObserverKeeper.GetParams(ctx).GetChainFromChainID(msg.ChainId)
 	if chain == nil {
-		return nil, zetaObserverTypes.ErrSupportedChains
+		return nil, observertypes.ErrSupportedChains
 	}
-	ok, err := k.zetaObserverKeeper.IsAuthorized(ctx, msg.Creator, chain)
-	if !ok {
-		return nil, err
+	if ok := k.zetaObserverKeeper.IsAuthorized(ctx, msg.Creator, chain); !ok {
+		return nil, observertypes.ErrNotAuthorizedPolicy
 	}
 	if chain == nil {
 		return nil, sdkerrors.Wrap(types.ErrUnsupportedChain, fmt.Sprintf("ChainID : %d ", msg.ChainId))

x/crosschain/keeper/keeper_out_tx_tracker.go

@@ -173,11 +173,8 @@ func (k msgServer) AddToOutTxTracker(goCtx context.Context, msg *types.MsgAddToO
 		adminPolicyAccount := k.zetaObserverKeeper.GetParams(ctx).GetAdminPolicyAccount(observertypes.Policy_Type_group1)
 		isAdmin := msg.Creator == adminPolicyAccount
 
-		isObserver, err := k.zetaObserverKeeper.IsAuthorized(ctx, msg.Creator, chain)
-		if err != nil {
-			ctx.Logger().Error("Error while checking if the account is an observer", err)
-			return nil, cosmoserrors.Wrap(observertypes.ErrNotAuthorized, fmt.Sprintf("error  IsAuthorized %s", msg.Creator))
-		}
+		isObserver := k.zetaObserverKeeper.IsAuthorized(ctx, msg.Creator, chain)
+
 		// Sender needs to be either the admin policy account or an observer
 		if !(isAdmin || isObserver) {
 			return nil, cosmoserrors.Wrap(observertypes.ErrNotAuthorized, fmt.Sprintf("Creator %s", msg.Creator))

x/crosschain/types/expected_keepers.go

@@ -63,7 +63,7 @@ type ZetaObserverKeeper interface {
 	SetLastObserverCount(ctx sdk.Context, lbc *zetaObserverTypes.LastObserverCount)
 	AddVoteToBallot(ctx sdk.Context, ballot zetaObserverTypes.Ballot, address string, observationType zetaObserverTypes.VoteType) (zetaObserverTypes.Ballot, error)
 	CheckIfFinalizingVote(ctx sdk.Context, ballot zetaObserverTypes.Ballot) (zetaObserverTypes.Ballot, bool)
-	IsAuthorized(ctx sdk.Context, address string, chain *common.Chain) (bool, error)
+	IsAuthorized(ctx sdk.Context, address string, chain *common.Chain) bool
 	FindBallot(ctx sdk.Context, index string, chain *common.Chain, observationType zetaObserverTypes.ObservationType) (ballot zetaObserverTypes.Ballot, isNew bool, err error)
 	AddBallotToList(ctx sdk.Context, ballot zetaObserverTypes.Ballot)
 	GetBlockHeader(ctx sdk.Context, hash []byte) (val common.BlockHeader, found bool)

x/observer/keeper/keeper_utils.go

@@ -32,17 +32,17 @@ func (k Keeper) CheckIfFinalizingVote(ctx sdk.Context, ballot types.Ballot) (typ
 }
 
 // IsAuthorized checks whether a signer is authorized to sign , by checking their address against the observer mapper which contains the observer list for the chain and type
-func (k Keeper) IsAuthorized(ctx sdk.Context, address string, chain *common.Chain) (bool, error) {
+func (k Keeper) IsAuthorized(ctx sdk.Context, address string, chain *common.Chain) bool {
 	observerMapper, found := k.GetObserverMapper(ctx, chain)
 	if !found {
-		return false, errors.Wrap(types.ErrNotAuthorized, fmt.Sprintf("observer list not present for chain %s", chain.String()))
+		return false
 	}
 	for _, obs := range observerMapper.ObserverList {
 		if obs == address {
-			return true, nil
+			return true
 		}
 	}
-	return false, errors.Wrap(types.ErrNotAuthorized, fmt.Sprintf("address: %s", address))
+	return false
 }
 
 func (k Keeper) FindBallot(ctx sdk.Context, index string, chain *common.Chain, observationType types.ObservationType) (ballot types.Ballot, isNew bool, err error) {

x/observer/keeper/msg_server_add_blame_vote.go

@@ -19,9 +19,8 @@ func (k msgServer) AddBlameVote(goCtx context.Context, vote *types.MsgAddBlameVo
 		return nil, sdkerrors.Wrap(crosschainTypes.ErrUnsupportedChain, fmt.Sprintf("ChainID %d, Blame vote", vote.ChainId))
 	}
 	// IsAuthorized does various checks against the list of observer mappers
-	ok, err := k.IsAuthorized(ctx, vote.Creator, observationChain)
-	if !ok {
-		return nil, err
+	if ok := k.IsAuthorized(ctx, vote.Creator, observationChain); !ok {
+		return nil, types.ErrNotAuthorizedPolicy
 	}
 
 	index := vote.Digest()

x/observer/keeper/msg_server_add_block_header.go

@@ -17,9 +17,8 @@ func (k msgServer) AddBlockHeader(goCtx context.Context, msg *types.MsgAddBlockH
 
 	// check authorization for this chain
 	chain := common.GetChainFromChainID(msg.ChainId)
-	ok, err := k.IsAuthorized(ctx, msg.Creator, chain)
-	if !ok {
-		return nil, cosmoserrors.Wrap(types.ErrNotAuthorizedPolicy, err.Error())
+	if ok := k.IsAuthorized(ctx, msg.Creator, chain); !ok {
+		return nil, types.ErrNotAuthorizedPolicy
 	}
 
 	// add vote to ballot