refactor(feegrant): remove bech32 global

codec/address/bech32_codec.go

@@ -0,0 +1,48 @@
+package address
+
+import (
+	"cosmossdk.io/core/address"
+	errorsmod "cosmossdk.io/errors"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/bech32"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+)
+
+type Bech32Codec struct {
+	Bech32Prefix string
+}
+
+var _ address.Codec = &Bech32Codec{}
+
+func NewBech32Codec(prefix string) address.Codec {
+	return Bech32Codec{prefix}
+}
+
+// StringToBytes encodes text to bytes
+func (bc Bech32Codec) StringToBytes(text string) ([]byte, error) {
+	hrp, bz, err := bech32.DecodeAndConvert(text)
+	if err != nil {
+		return nil, err
+	}
+
+	if hrp != bc.Bech32Prefix {
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "hrp does not match bech32Prefix")
+	}
+
+	if err := sdk.VerifyAddressFormat(bz); err != nil {
+		return nil, err
+	}
+
+	return bz, nil
+}
+
+// BytesToString decodes bytes to text
+func (bc Bech32Codec) BytesToString(bz []byte) (string, error) {
+	text, err := bech32.ConvertAndEncode(bc.Bech32Prefix, bz)
+	if err != nil {
+		return "", err
+	}
+
+	return text, nil
+}

tests/e2e/feegrant/suite.go

@@ -13,6 +13,7 @@ import (
 	"cosmossdk.io/x/feegrant/client/cli"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
+	codecaddress "github.com/cosmos/cosmos-sdk/codec/address"
 	"github.com/cosmos/cosmos-sdk/crypto/hd"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	"github.com/cosmos/cosmos-sdk/testutil"
@@ -97,7 +98,7 @@ func (s *E2ETestSuite) createGrant(granter, grantee sdk.Address) {
 		commonFlags...,
 	)
 
-	cmd := cli.NewCmdFeeGrant()
+	cmd := cli.NewCmdFeeGrant(codecaddress.NewBech32Codec("cosmos"))
 
 	_, err := clitestutil.ExecTestCLICmd(clientCtx, cmd, args)
 	s.Require().NoError(err)
@@ -171,7 +172,7 @@ func (s *E2ETestSuite) TestCmdGetFeeGrant() {
 		tc := tc
 
 		s.Run(tc.name, func() {
-			cmd := cli.GetCmdQueryFeeGrant()
+			cmd := cli.GetCmdQueryFeeGrant(codecaddress.NewBech32Codec("cosmos"))
 			out, err := clitestutil.ExecTestCLICmd(clientCtx, cmd, tc.args)
 
 			if tc.expectErr {
@@ -237,7 +238,7 @@ func (s *E2ETestSuite) TestCmdGetFeeGrantsByGrantee() {
 		tc := tc
 
 		s.Run(tc.name, func() {
-			cmd := cli.GetCmdQueryFeeGrantsByGrantee()
+			cmd := cli.GetCmdQueryFeeGrantsByGrantee(codecaddress.NewBech32Codec("cosmos"))
 			out, err := clitestutil.ExecTestCLICmd(clientCtx, cmd, tc.args)
 
 			if tc.expectErr {
@@ -294,7 +295,7 @@ func (s *E2ETestSuite) TestCmdGetFeeGrantsByGranter() {
 		tc := tc
 
 		s.Run(tc.name, func() {
-			cmd := cli.GetCmdQueryFeeGrantsByGranter()
+			cmd := cli.GetCmdQueryFeeGrantsByGranter(codecaddress.NewBech32Codec("cosmos"))
 			out, err := clitestutil.ExecTestCLICmd(clientCtx, cmd, tc.args)
 
 			if tc.expectErr {
@@ -587,7 +588,7 @@ func (s *E2ETestSuite) TestNewCmdFeeGrant() {
 		tc := tc
 
 		s.Run(tc.name, func() {
-			cmd := cli.NewCmdFeeGrant()
+			cmd := cli.NewCmdFeeGrant(codecaddress.NewBech32Codec("cosmos"))
 			out, err := clitestutil.ExecTestCLICmd(clientCtx, cmd, tc.args)
 
 			if tc.expectErr {
@@ -615,10 +616,11 @@ func (s *E2ETestSuite) TestNewCmdRevokeFeegrant() {
 		fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()),
 	}
 
+	address := "cosmos16ydaqh0fcnh4qt7a3jme4mmztm2qel5axcpw00"
 	// Create new fee grant specifically to test amino.
-	aminoGrantee, err := sdk.AccAddressFromBech32("cosmos16ydaqh0fcnh4qt7a3jme4mmztm2qel5axcpw00")
+	aminoGrantee, err := codecaddress.NewBech32Codec("cosmos").StringToBytes(address)
 	s.Require().NoError(err)
-	s.createGrant(granter, aminoGrantee)
+	s.createGrant(granter, sdk.AccAddress(aminoGrantee))
 
 	testCases := []struct {
 		name         string
@@ -680,7 +682,7 @@ func (s *E2ETestSuite) TestNewCmdRevokeFeegrant() {
 			append(
 				[]string{
 					granter.String(),
-					aminoGrantee.String(),
+					address,
 					fmt.Sprintf("--%s=%s", flags.FlagFrom, granter),
 					fmt.Sprintf("--%s=%s", flags.FlagSignMode, flags.SignModeLegacyAminoJSON),
 				},
@@ -694,7 +696,7 @@ func (s *E2ETestSuite) TestNewCmdRevokeFeegrant() {
 		tc := tc
 
 		s.Run(tc.name, func() {
-			cmd := cli.NewCmdRevokeFeegrant()
+			cmd := cli.NewCmdRevokeFeegrant(codecaddress.NewBech32Codec("cosmos"))
 			out, err := clitestutil.ExecTestCLICmd(clientCtx, cmd, tc.args)
 
 			if tc.expectErr {
@@ -743,7 +745,7 @@ func (s *E2ETestSuite) TestTxWithFeeGrant() {
 		commonFlags...,
 	)
 
-	cmd := cli.NewCmdFeeGrant()
+	cmd := cli.NewCmdFeeGrant(codecaddress.NewBech32Codec("cosmos"))
 
 	_, err = clitestutil.ExecTestCLICmd(clientCtx, cmd, args)
 	s.Require().NoError(err)
@@ -878,7 +880,7 @@ func (s *E2ETestSuite) TestFilteredFeeAllowance() {
 		tc := tc
 
 		s.Run(tc.name, func() {
-			cmd := cli.NewCmdFeeGrant()
+			cmd := cli.NewCmdFeeGrant(codecaddress.NewBech32Codec("cosmos"))
 			out, err := clitestutil.ExecTestCLICmd(clientCtx, cmd, tc.args)
 
 			if tc.expectErr {
@@ -900,7 +902,7 @@ func (s *E2ETestSuite) TestFilteredFeeAllowance() {
 	}
 
 	// get filtered fee allowance and check info
-	cmd := cli.GetCmdQueryFeeGrant()
+	cmd := cli.GetCmdQueryFeeGrant(codecaddress.NewBech32Codec("cosmos"))
 	out, err := clitestutil.ExecTestCLICmd(clientCtx, cmd, args)
 	s.Require().NoError(err)
 
@@ -963,7 +965,7 @@ func (s *E2ETestSuite) TestFilteredFeeAllowance() {
 					},
 					commonFlags...,
 				)
-				cmd := cli.NewCmdFeeGrant()
+				cmd := cli.NewCmdFeeGrant(codecaddress.NewBech32Codec("cosmos"))
 				return clitestutil.ExecTestCLICmd(clientCtx, cmd, args)
 			},
 			&sdk.TxResponse{},

x/auth/keeper/bech32_codec.go

@@ -1,10 +1,10 @@
 package keeper
 
 import (
+	"cosmossdk.io/core/address"
 	errorsmod "cosmossdk.io/errors"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/address"
 	"github.com/cosmos/cosmos-sdk/types/bech32"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )

x/auth/keeper/deterministic_test.go

@@ -5,12 +5,11 @@ import (
 	"sort"
 	"testing"
 
+	storetypes "cosmossdk.io/store/types"
 	cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	"github.com/stretchr/testify/suite"
 	"pgregory.net/rapid"
 
-	storetypes "cosmossdk.io/store/types"
-
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	"github.com/cosmos/cosmos-sdk/testutil"

x/auth/keeper/grpc_query.go

@@ -246,3 +246,15 @@ func (ak AccountKeeper) AccountInfo(goCtx context.Context, req *types.QueryAccou
 		},
 	}, nil
 }
+
+// BytesToString converts an address from bytes to string, using the
+// keeper's bech32 prefix.
+func (ak AccountKeeper) BytesToString(address []byte) (string, error) {
+	return ak.addressCdc.BytesToString(address)
+}
+
+// StringToBytes converts an address from string to bytes, using the
+// keeper's bech32 prefix.
+func (ak AccountKeeper) StringToBytes(address string) ([]byte, error) {
+	return ak.addressCdc.StringToBytes(address)
+}

x/auth/keeper/keeper.go

@@ -6,13 +6,13 @@ import (
 	"cosmossdk.io/log"
 	gogotypes "github.com/cosmos/gogoproto/types"
 
+	"cosmossdk.io/core/address"
 	errorsmod "cosmossdk.io/errors"
 	storetypes "cosmossdk.io/store/types"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/address"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
 )

x/auth/module.go

@@ -11,15 +11,16 @@ import (
 
 	"cosmossdk.io/depinject"
 
+	"cosmossdk.io/core/address"
 	"cosmossdk.io/core/appmodule"
-	"github.com/cosmos/cosmos-sdk/types/address"
 
 	modulev1 "cosmossdk.io/api/cosmos/auth/module/v1"
 
 	store "cosmossdk.io/store/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
+	codecaddress "github.com/cosmos/cosmos-sdk/codec/address"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
@@ -206,7 +207,7 @@ func init() {
 // ProvideAddressCodec provides an address.Codec to the container for any
 // modules that want to do address string <> bytes conversion.
 func ProvideAddressCodec(config *modulev1.Module) address.Codec {
-	return keeper.NewBech32Codec(config.Bech32Prefix)
+	return codecaddress.NewBech32Codec(config.Bech32Prefix)
 }
 
 //nolint:revive

x/feegrant/CHANGELOG.md

@@ -27,4 +27,9 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Features
 
-* (x/feegrant) [14649](https://github.com/cosmos/cosmos-sdk/pull/14649) The `x/feegrant` module is extracted to have a separate go.mod file which allows it to be a standalone module. 
+* (x/feegrant) [14649](https://github.com/cosmos/cosmos-sdk/pull/14649) The `x/feegrant` module is extracted to have a separate go.mod file which allows it to be a standalone module. 
+
+### Api Breaking Changes
+
+* (keeper) [15347](https://github.com/cosmos/cosmos-sdk/pull/15347) Remove global bech32 usage in keeper. 
+* (keeper) [15347](https://github.com/cosmos/cosmos-sdk/pull/15347) `ValidateBasic` is treated as a no op now with with acceptance of RFC001

x/feegrant/client/cli/query.go

@@ -4,17 +4,17 @@ import (
 	"fmt"
 	"strings"
 
+	"cosmossdk.io/core/address"
 	"github.com/spf13/cobra"
 
 	"cosmossdk.io/x/feegrant"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/version"
 )
 
 // GetQueryCmd returns the cli query commands for this module
-func GetQueryCmd() *cobra.Command {
+func GetQueryCmd(ac address.Codec) *cobra.Command {
 	feegrantQueryCmd := &cobra.Command{
 		Use:                        feegrant.ModuleName,
 		Short:                      "Querying commands for the feegrant module",
@@ -24,16 +24,16 @@ func GetQueryCmd() *cobra.Command {
 	}
 
 	feegrantQueryCmd.AddCommand(
-		GetCmdQueryFeeGrant(),
-		GetCmdQueryFeeGrantsByGrantee(),
-		GetCmdQueryFeeGrantsByGranter(),
+		GetCmdQueryFeeGrant(ac),
+		GetCmdQueryFeeGrantsByGrantee(ac),
+		GetCmdQueryFeeGrantsByGranter(ac),
 	)
 
 	return feegrantQueryCmd
 }
 
 // GetCmdQueryFeeGrant returns cmd to query for a grant between granter and grantee.
-func GetCmdQueryFeeGrant() *cobra.Command {
+func GetCmdQueryFeeGrant(ac address.Codec) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "grant [granter] [grantee]",
 		Args:  cobra.ExactArgs(2),
@@ -50,21 +50,19 @@ $ %s query feegrant grant [granter] [grantee]
 			clientCtx := client.GetClientContextFromCmd(cmd)
 			queryClient := feegrant.NewQueryClient(clientCtx)
 
-			granterAddr, err := sdk.AccAddressFromBech32(args[0])
-			if err != nil {
+			if _, err := ac.StringToBytes(args[0]); err != nil {
 				return err
 			}
 
-			granteeAddr, err := sdk.AccAddressFromBech32(args[1])
-			if err != nil {
+			if _, err := ac.StringToBytes(args[1]); err != nil {
 				return err
 			}
 
 			res, err := queryClient.Allowance(
 				cmd.Context(),
 				&feegrant.QueryAllowanceRequest{
-					Granter: granterAddr.String(),
-					Grantee: granteeAddr.String(),
+					Granter: args[0],
+					Grantee: args[1],
 				},
 			)
 			if err != nil {
@@ -81,7 +79,7 @@ $ %s query feegrant grant [granter] [grantee]
 }
 
 // GetCmdQueryFeeGrantsByGrantee returns cmd to query for all grants for a grantee.
-func GetCmdQueryFeeGrantsByGrantee() *cobra.Command {
+func GetCmdQueryFeeGrantsByGrantee(ac address.Codec) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "grants-by-grantee [grantee]",
 		Args:  cobra.ExactArgs(1),
@@ -97,7 +95,7 @@ $ %s query feegrant grants-by-grantee [grantee]
 			clientCtx := client.GetClientContextFromCmd(cmd)
 			queryClient := feegrant.NewQueryClient(clientCtx)
 
-			granteeAddr, err := sdk.AccAddressFromBech32(args[0])
+			_, err := ac.StringToBytes(args[0])
 			if err != nil {
 				return err
 			}
@@ -110,7 +108,7 @@ $ %s query feegrant grants-by-grantee [grantee]
 			res, err := queryClient.Allowances(
 				cmd.Context(),
 				&feegrant.QueryAllowancesRequest{
-					Grantee:    granteeAddr.String(),
+					Grantee:    args[0],
 					Pagination: pageReq,
 				},
 			)
@@ -129,7 +127,7 @@ $ %s query feegrant grants-by-grantee [grantee]
 }
 
 // GetCmdQueryFeeGrantsByGranter returns cmd to query for all grants by a granter.
-func GetCmdQueryFeeGrantsByGranter() *cobra.Command {
+func GetCmdQueryFeeGrantsByGranter(ac address.Codec) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "grants-by-granter [granter]",
 		Args:  cobra.ExactArgs(1),
@@ -145,7 +143,7 @@ $ %s query feegrant grants-by-granter [granter]
 			clientCtx := client.GetClientContextFromCmd(cmd)
 			queryClient := feegrant.NewQueryClient(clientCtx)
 
-			granterAddr, err := sdk.AccAddressFromBech32(args[0])
+			_, err := ac.StringToBytes(args[0])
 			if err != nil {
 				return err
 			}
@@ -158,7 +156,7 @@ $ %s query feegrant grants-by-granter [granter]
 			res, err := queryClient.AllowancesByGranter(
 				cmd.Context(),
 				&feegrant.QueryAllowancesByGranterRequest{
-					Granter:    granterAddr.String(),
+					Granter:    args[0],
 					Pagination: pageReq,
 				},
 			)