chore: revert sdk changes not merged into feat/eureka (#7930)

* Revert "chore: use context.Context and appmodule.Environment in 08-wasm  (#7880)"

This reverts commit 98d7e75.

* Revert "chore: make all keepers use address codecs (#7896)"

This reverts commit 6a1986c.

* Revert "chore: migrate to address codec in transfer (#7892)"

This reverts commit c0365a3.

* Revert "chore: change usage of deprecated module.NewManager in SimApps (#7886)"

This reverts commit 3e0a689.

* Revert "chore: migrate to core modules (#7866)"

This reverts commit dcd6a3e.

e2e/testsuite/tx.go

@@ -21,7 +21,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
-	addresscodec "github.com/cosmos/cosmos-sdk/codec/address"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
@@ -154,13 +153,14 @@ func (s *E2ETestSuite) ExecuteAndPassGovV1Proposal(ctx context.Context, msg sdk.
 // ExecuteGovV1Proposal submits a v1 governance proposal using the provided user and message and uses all validators
 // to vote yes on the proposal.
 func (s *E2ETestSuite) ExecuteGovV1Proposal(ctx context.Context, msg sdk.Msg, chain ibc.Chain, user ibc.Wallet) error {
-	sender := s.ConvertToAccAddress(chain, user.FormattedAddress())
-
 	cosmosChain, ok := chain.(*cosmos.CosmosChain)
 	if !ok {
-		panic("ExecuteGovV1Proposal must be passed a cosmos.CosmosChain")
+		panic("ExecuteAndPassGovV1Proposal must be passed a cosmos.CosmosChain")
 	}
 
+	sender, err := sdk.AccAddressFromBech32(user.FormattedAddress())
+	s.Require().NoError(err)
+
 	proposalID := s.proposalIDs[cosmosChain.Config().ChainID]
 	defer func() {
 		s.proposalIDs[cosmosChain.Config().ChainID] = proposalID + 1
@@ -189,19 +189,6 @@ func (s *E2ETestSuite) ExecuteGovV1Proposal(ctx context.Context, msg sdk.Msg, ch
 	return s.waitForGovV1ProposalToPass(ctx, cosmosChain, proposalID)
 }
 
-func (s *E2ETestSuite) ConvertToAccAddress(chain ibc.Chain, formattedAddress string) sdk.AccAddress {
-	cosmosChain, ok := chain.(*cosmos.CosmosChain)
-	if !ok {
-		panic("ConvertToAccAddress must be passed a cosmos.CosmosChain")
-	}
-
-	addrCdc := addresscodec.NewBech32Codec(cosmosChain.Config().Bech32Prefix)
-	senderBytes, err := addrCdc.StringToBytes(formattedAddress)
-	s.Require().NoError(err)
-
-	return sdk.AccAddress(senderBytes)
-}
-
 // waitForGovV1ProposalToPass polls for the entire voting period to see if the proposal has passed.
 // if the proposal has not passed within the duration of the voting period, an error is returned.
 func (s *E2ETestSuite) waitForGovV1ProposalToPass(ctx context.Context, chain ibc.Chain, proposalID uint64) error {
@@ -289,13 +276,10 @@ func (*E2ETestSuite) waitForGovV1Beta1ProposalToPass(ctx context.Context, chain
 
 // ExecuteGovV1Beta1Proposal submits a v1beta1 governance proposal using the provided content.
 func (s *E2ETestSuite) ExecuteGovV1Beta1Proposal(ctx context.Context, chain ibc.Chain, user ibc.Wallet, content govtypesv1beta1.Content) sdk.TxResponse {
-	sender := s.ConvertToAccAddress(chain, user.FormattedAddress())
+	sender, err := sdk.AccAddressFromBech32(user.FormattedAddress())
+	s.Require().NoError(err)
 
-	msgSubmitProposal, err := govtypesv1beta1.NewMsgSubmitProposal(
-		content,
-		sdk.NewCoins(sdk.NewCoin(chain.Config().Denom, govtypesv1beta1.DefaultMinDepositTokens)),
-		sender.String(),
-	)
+	msgSubmitProposal, err := govtypesv1beta1.NewMsgSubmitProposal(content, sdk.NewCoins(sdk.NewCoin(chain.Config().Denom, govtypesv1beta1.DefaultMinDepositTokens)), sender.String())
 	s.Require().NoError(err)
 
 	return s.BroadcastMessages(ctx, chain, user, msgSubmitProposal)

modules/apps/27-interchain-accounts/controller/types/msgs_test.go

@@ -9,7 +9,6 @@ import (
 
 	banktypes "cosmossdk.io/x/bank/types"
 
-	addresscodec "github.com/cosmos/cosmos-sdk/codec/address"
 	"github.com/cosmos/cosmos-sdk/codec/testutil"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
@@ -109,10 +108,7 @@ func TestMsgRegisterInterchainAccountValidateBasic(t *testing.T) {
 }
 
 func TestMsgRegisterInterchainAccountGetSigners(t *testing.T) {
-	addrCdc := addresscodec.NewBech32Codec(sdk.GetConfig().GetBech32AccountAddrPrefix())
-	expSigerBytes, err := addrCdc.StringToBytes(ibctesting.TestAccAddress)
-	expSigner := sdk.AccAddress(expSigerBytes)
-
+	expSigner, err := sdk.AccAddressFromBech32(ibctesting.TestAccAddress)
 	require.NoError(t, err)
 
 	msg := types.NewMsgRegisterInterchainAccount(ibctesting.FirstConnectionID, ibctesting.TestAccAddress, "", channeltypes.ORDERED)

modules/apps/27-interchain-accounts/module.go

@@ -7,14 +7,14 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
-	"google.golang.org/grpc"
 
 	"cosmossdk.io/client/v2/autocli"
 	"cosmossdk.io/core/appmodule"
 	coreregistry "cosmossdk.io/core/registry"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 
@@ -34,10 +34,10 @@ var (
 	_ appmodule.AppModule             = (*AppModule)(nil)
 	_ appmodule.HasConsensusVersion   = (*AppModule)(nil)
 	_ appmodule.HasRegisterInterfaces = (*AppModule)(nil)
-	_ appmodule.HasMigrations         = (*AppModule)(nil)
 
 	_ module.AppModule      = (*AppModule)(nil)
 	_ module.HasGenesis     = (*AppModule)(nil)
+	_ module.HasServices    = (*AppModule)(nil)
 	_ module.HasGRPCGateway = (*AppModule)(nil)
 
 	// Sims
@@ -123,33 +123,28 @@ func (AppModule) GetQueryCmd() *cobra.Command {
 	return cli.GetQueryCmd()
 }
 
-func (am AppModule) RegisterMigrations(registrar appmodule.MigrationRegistrar) error {
+// RegisterServices registers module services
+func (am AppModule) RegisterServices(cfg module.Configurator) {
+	if am.controllerKeeper != nil {
+		controllertypes.RegisterMsgServer(cfg.MsgServer(), controllerkeeper.NewMsgServerImpl(am.controllerKeeper))
+		controllertypes.RegisterQueryServer(cfg.QueryServer(), am.controllerKeeper)
+	}
+
+	if am.hostKeeper != nil {
+		hosttypes.RegisterMsgServer(cfg.MsgServer(), hostkeeper.NewMsgServerImpl(am.hostKeeper))
+		hosttypes.RegisterQueryServer(cfg.QueryServer(), am.hostKeeper)
+	}
+
 	controllerMigrator := controllerkeeper.NewMigrator(am.controllerKeeper)
 	hostMigrator := hostkeeper.NewMigrator(am.hostKeeper)
-	if err := registrar.Register(types.ModuleName, 2, func(ctx context.Context) error {
+	if err := cfg.RegisterMigration(types.ModuleName, 2, func(ctx sdk.Context) error {
 		if err := hostMigrator.MigrateParams(ctx); err != nil {
 			return err
 		}
 		return controllerMigrator.MigrateParams(ctx)
 	}); err != nil {
-		return fmt.Errorf("failed to migrate interchainaccounts app from version 2 to 3 (self-managed params migration): %w", err)
-	}
-	return nil
-}
-
-// RegisterServices registers module services
-func (am AppModule) RegisterServices(cfg grpc.ServiceRegistrar) error {
-	if am.controllerKeeper != nil {
-		controllertypes.RegisterMsgServer(cfg, controllerkeeper.NewMsgServerImpl(am.controllerKeeper))
-		controllertypes.RegisterQueryServer(cfg, am.controllerKeeper)
+		panic(fmt.Errorf("failed to migrate interchainaccounts app from version 2 to 3 (self-managed params migration): %v", err))
 	}
-
-	if am.hostKeeper != nil {
-		hosttypes.RegisterMsgServer(cfg, hostkeeper.NewMsgServerImpl(am.hostKeeper))
-		hosttypes.RegisterQueryServer(cfg, am.hostKeeper)
-	}
-
-	return nil
 }
 
 // InitGenesis performs genesis initialization for the interchain accounts module.

modules/apps/29-fee/ibc_middleware.go

@@ -283,7 +283,7 @@ func (im IBCMiddleware) OnAcknowledgementPacket(
 		payee = relayer.String()
 	}
 
-	payeeAddr, err := im.keeper.AddrCodec.StringToBytes(payee)
+	payeeAddr, err := sdk.AccAddressFromBech32(payee)
 	if err != nil {
 		return errorsmod.Wrapf(err, "failed to create sdk.Address from payee: %s", payee)
 	}
@@ -329,7 +329,7 @@ func (im IBCMiddleware) OnTimeoutPacket(
 		payee = relayer.String()
 	}
 
-	payeeAddr, err := im.keeper.AddrCodec.StringToBytes(payee)
+	payeeAddr, err := sdk.AccAddressFromBech32(payee)
 	if err != nil {
 		return errorsmod.Wrapf(err, "failed to create sdk.Address from payee: %s", payee)
 	}

modules/apps/29-fee/keeper/escrow.go

@@ -18,7 +18,7 @@ import (
 // escrowPacketFee sends the packet fee to the 29-fee module account to hold in escrow
 func (k Keeper) escrowPacketFee(ctx context.Context, packetID channeltypes.PacketId, packetFee types.PacketFee) error {
 	// check if the refund address is valid
-	refundAddr, err := k.AddrCodec.StringToBytes(packetFee.RefundAddress)
+	refundAddr, err := sdk.AccAddressFromBech32(packetFee.RefundAddress)
 	if err != nil {
 		return err
 	}
@@ -52,7 +52,7 @@ func (k Keeper) DistributePacketFeesOnAcknowledgement(ctx context.Context, forwa
 	// if the escrow account has insufficient balance then we want to avoid partially distributing fees
 	if err := k.BranchService.Execute(ctx, func(ctx context.Context) error {
 		// forward relayer address will be empty if conversion fails
-		forwardAddr, _ := k.AddrCodec.StringToBytes(forwardRelayer)
+		forwardAddr, _ := sdk.AccAddressFromBech32(forwardRelayer)
 
 		for _, packetFee := range packetFees {
 			if !k.EscrowAccountHasBalance(ctx, packetFee.Fee.Total()) {
@@ -61,7 +61,7 @@ func (k Keeper) DistributePacketFeesOnAcknowledgement(ctx context.Context, forwa
 			}
 
 			// check if refundAcc address works
-			refundAddr, err := k.AddrCodec.StringToBytes(packetFee.RefundAddress)
+			refundAddr, err := sdk.AccAddressFromBech32(packetFee.RefundAddress)
 			if err != nil {
 				panic(fmt.Errorf("could not parse refundAcc %s to sdk.AccAddress", packetFee.RefundAddress))
 			}
@@ -117,7 +117,7 @@ func (k Keeper) DistributePacketFeesOnTimeout(ctx context.Context, timeoutRelaye
 			}
 
 			// check if refundAcc address works
-			refundAddr, err := k.AddrCodec.StringToBytes(packetFee.RefundAddress)
+			refundAddr, err := sdk.AccAddressFromBech32(packetFee.RefundAddress)
 			if err != nil {
 				panic(fmt.Errorf("could not parse refundAcc %s to sdk.AccAddress", packetFee.RefundAddress))
 			}
@@ -206,7 +206,7 @@ func (k Keeper) RefundFeesOnChannelClosure(ctx context.Context, portID, channelI
 					return ibcerrors.ErrInsufficientFunds
 				}
 
-				refundAddr, err := k.AddrCodec.StringToBytes(packetFee.RefundAddress)
+				refundAddr, err := sdk.AccAddressFromBech32(packetFee.RefundAddress)
 				if err != nil {
 					unRefundedFees = append(unRefundedFees, packetFee)
 					continue

modules/apps/29-fee/keeper/keeper.go

@@ -3,7 +3,6 @@ package keeper
 import (
 	"context"
 
-	"cosmossdk.io/core/address"
 	"cosmossdk.io/core/appmodule"
 	storetypes "cosmossdk.io/store/types"
 
@@ -25,8 +24,7 @@ var _ types.ChannelKeeper = (*Keeper)(nil)
 type Keeper struct {
 	appmodule.Environment
 
-	cdc       codec.BinaryCodec
-	AddrCodec address.Codec
+	cdc codec.BinaryCodec
 
 	authKeeper    types.AuthKeeper
 	ics4Wrapper   porttypes.ICS4Wrapper
@@ -36,13 +34,12 @@ type Keeper struct {
 
 // NewKeeper creates a new 29-fee Keeper instance
 func NewKeeper(
-	cdc codec.BinaryCodec, addrCdc address.Codec, env appmodule.Environment,
+	cdc codec.BinaryCodec, env appmodule.Environment,
 	ics4Wrapper porttypes.ICS4Wrapper, channelKeeper types.ChannelKeeper,
 	authKeeper types.AuthKeeper, bankKeeper types.BankKeeper,
 ) Keeper {
 	return Keeper{
 		cdc:           cdc,
-		AddrCodec:     addrCdc,
 		Environment:   env,
 		ics4Wrapper:   ics4Wrapper,
 		channelKeeper: channelKeeper,
@@ -223,17 +220,17 @@ func (k Keeper) GetAllPayees(ctx context.Context) []types.RegisteredPayee {
 
 // SetCounterpartyPayeeAddress maps the destination chain counterparty payee address to the source relayer address
 // The receiving chain must store the mapping from: address -> counterpartyPayeeAddress for the given channel
-func (k Keeper) SetCounterpartyPayeeAddress(ctx context.Context, addr, counterpartyAddress, channelID string) {
+func (k Keeper) SetCounterpartyPayeeAddress(ctx context.Context, address, counterpartyAddress, channelID string) {
 	store := k.KVStoreService.OpenKVStore(ctx)
-	if err := store.Set(types.KeyCounterpartyPayee(addr, channelID), []byte(counterpartyAddress)); err != nil {
+	if err := store.Set(types.KeyCounterpartyPayee(address, channelID), []byte(counterpartyAddress)); err != nil {
 		panic(err)
 	}
 }
 
 // GetCounterpartyPayeeAddress gets the counterparty payee address given a destination relayer address
-func (k Keeper) GetCounterpartyPayeeAddress(ctx context.Context, relayerAddr, channelID string) (string, bool) {
+func (k Keeper) GetCounterpartyPayeeAddress(ctx context.Context, address, channelID string) (string, bool) {
 	store := k.KVStoreService.OpenKVStore(ctx)
-	key := types.KeyCounterpartyPayee(relayerAddr, channelID)
+	key := types.KeyCounterpartyPayee(address, channelID)
 
 	addr, err := store.Get(key)
 	if err != nil {
@@ -272,9 +269,9 @@ func (k Keeper) GetAllCounterpartyPayees(ctx context.Context) []types.Registered
 }
 
 // SetRelayerAddressForAsyncAck sets the forward relayer address during OnRecvPacket in case of async acknowledgement
-func (k Keeper) SetRelayerAddressForAsyncAck(ctx context.Context, packetID channeltypes.PacketId, addr string) {
+func (k Keeper) SetRelayerAddressForAsyncAck(ctx context.Context, packetID channeltypes.PacketId, address string) {
 	store := k.KVStoreService.OpenKVStore(ctx)
-	if err := store.Set(types.KeyRelayerAddressForAsyncAck(packetID), []byte(addr)); err != nil {
+	if err := store.Set(types.KeyRelayerAddressForAsyncAck(packetID), []byte(address)); err != nil {
 		panic(err)
 	}
 }

modules/apps/29-fee/keeper/migrations.go

@@ -1,8 +1,6 @@
 package keeper
 
 import (
-	"context"
-
 	storetypes "cosmossdk.io/store/types"
 
 	"github.com/cosmos/cosmos-sdk/runtime"
@@ -26,18 +24,18 @@ func NewMigrator(keeper Keeper) Migrator {
 
 // Migrate1to2 migrates ibc-fee module from ConsensusVersion 1 to 2
 // by refunding leftover fees to the refund address.
-func (m Migrator) Migrate1to2(ctx context.Context) error {
+func (m Migrator) Migrate1to2(ctx sdk.Context) error {
 	store := runtime.KVStoreAdapter(m.keeper.KVStoreService.OpenKVStore(ctx))
 	iterator := storetypes.KVStorePrefixIterator(store, []byte(types.FeesInEscrowPrefix))
-	defer coretypes.LogDeferred(m.keeper.Logger, func() error { return iterator.Close() })
+	defer coretypes.LogDeferred(ctx.Logger(), func() error { return iterator.Close() })
 
 	for ; iterator.Valid(); iterator.Next() {
 		feesInEscrow := m.keeper.MustUnmarshalFees(iterator.Value())
 
 		for _, packetFee := range feesInEscrow.PacketFees {
 			refundCoins := legacyTotal(packetFee.Fee).Sub(packetFee.Fee.Total()...)
 
-			refundAddr, err := m.keeper.AddrCodec.StringToBytes(packetFee.RefundAddress)
+			refundAddr, err := sdk.AccAddressFromBech32(packetFee.RefundAddress)
 			if err != nil {
 				return err
 			}

modules/apps/29-fee/keeper/msg_server.go

@@ -5,6 +5,8 @@ import (
 
 	errorsmod "cosmossdk.io/errors"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/cosmos/ibc-go/v9/modules/apps/29-fee/types"
 	channeltypes "github.com/cosmos/ibc-go/v9/modules/core/04-channel/types"
 	ibcerrors "github.com/cosmos/ibc-go/v9/modules/core/errors"
@@ -18,7 +20,7 @@ var _ types.MsgServer = (*Keeper)(nil)
 // the source chain from which packets originate as this is where fee distribution takes place. This function may be
 // called more than once by a relayer, in which case, the latest payee is always used.
 func (k Keeper) RegisterPayee(ctx context.Context, msg *types.MsgRegisterPayee) (*types.MsgRegisterPayeeResponse, error) {
-	payee, err := k.AddrCodec.StringToBytes(msg.Payee)
+	payee, err := sdk.AccAddressFromBech32(msg.Payee)
 	if err != nil {
 		return nil, err
 	}
@@ -85,7 +87,7 @@ func (k Keeper) PayPacketFee(ctx context.Context, msg *types.MsgPayPacketFee) (*
 		return nil, types.ErrFeeModuleLocked
 	}
 
-	refundAcc, err := k.AddrCodec.StringToBytes(msg.Signer)
+	refundAcc, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
 		return nil, err
 	}
@@ -128,7 +130,7 @@ func (k Keeper) PayPacketFeeAsync(ctx context.Context, msg *types.MsgPayPacketFe
 		return nil, types.ErrFeeModuleLocked
 	}
 
-	refundAcc, err := k.AddrCodec.StringToBytes(msg.PacketFee.RefundAddress)
+	refundAcc, err := sdk.AccAddressFromBech32(msg.PacketFee.RefundAddress)
 	if err != nil {
 		return nil, err
 	}