revert: auth account query (#2869)

app/app.go

@@ -129,6 +129,7 @@ import (
 	"github.com/irisnet/irishub/v2/modules/internft"
 	mintkeeper "github.com/irisnet/irishub/v2/modules/mint/keeper"
 	minttypes "github.com/irisnet/irishub/v2/modules/mint/types"
+	"github.com/irisnet/irishub/v2/rpc"
 	iristypes "github.com/irisnet/irishub/v2/types"
 )
 
@@ -689,7 +690,8 @@ func NewIrisApp(
 	)
 	app.mm.RegisterInvariants(app.CrisisKeeper)
 	// app.mm.RegisterRoutes(app.Router(), app.QueryRouter(), encodingConfig.Amino)
-	app.mm.RegisterServices(app.configurator)
+	// app.mm.RegisterServices(app.configurator)
+	app.RegisterServices()
 
 	// create the simulation manager and define the order of the modules for deterministic simulations
 	//
@@ -883,6 +885,27 @@ func (app *IrisApp) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.APICo
 	}
 }
 
+// RegisterServices implements the Application.RegisterTxService method.
+func (app *IrisApp) RegisterServices() {
+	for _, mod := range app.mm.Modules {
+		m, ok := mod.(module.AppModule)
+		if !ok {
+			panic("unable to cast mod into AppModule")
+		}
+
+		if m.Name() == authtypes.ModuleName {
+			rpc.RegisterAuthServices(app.configurator,
+				app.GetKey(authtypes.StoreKey),
+				app.AccountKeeper,
+				app.GetSubspace(authtypes.ModuleName))
+		} else {
+			if mod, ok := mod.(module.HasServices); ok {
+				mod.RegisterServices(app.configurator)
+			}
+		}
+	}
+}
+
 // RegisterTxService implements the Application.RegisterTxService method.
 func (app *IrisApp) RegisterTxService(clientCtx client.Context) {
 	authtx.RegisterTxService(

rpc/auth.go

@@ -0,0 +1,170 @@
+package rpc
+
+import (
+	"context"
+	"fmt"
+
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+
+	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
+	"github.com/cosmos/cosmos-sdk/store/prefix"
+	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	"github.com/cosmos/cosmos-sdk/types/query"
+	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
+	"github.com/cosmos/cosmos-sdk/x/auth/types"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
+
+	ethermint "github.com/evmos/ethermint/types"
+)
+
+var _ authtypes.QueryServer = authQueryServer{}
+
+type authQueryServer struct {
+	key storetypes.StoreKey
+	k   authkeeper.AccountKeeper
+}
+
+func RegisterAuthServices(cfg module.Configurator,
+	key storetypes.StoreKey,
+	k authkeeper.AccountKeeper,
+	ls paramstypes.Subspace) {
+	types.RegisterMsgServer(cfg.MsgServer(), authkeeper.NewMsgServerImpl(k))
+	types.RegisterQueryServer(cfg.QueryServer(), authQueryServer{key, k})
+
+	m := authkeeper.NewMigrator(k, cfg.QueryServer(), ls)
+	if err := cfg.RegisterMigration(types.ModuleName, 3, m.Migrate3to4); err != nil {
+		panic(fmt.Sprintf("failed to migrate x/%s from version 3 to 4: %v", types.ModuleName, err))
+	}
+}
+
+// Since: cosmos-sdk 0.43
+// Accounts returns all the existing accounts
+func (a authQueryServer) Accounts(c context.Context, req *types.QueryAccountsRequest) (*types.QueryAccountsResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "empty request")
+	}
+
+	ctx := sdk.UnwrapSDKContext(c)
+	store := ctx.KVStore(a.key)
+	accountsStore := prefix.NewStore(store, types.AddressStoreKeyPrefix)
+
+	var accounts []*codectypes.Any
+	pageRes, err := query.Paginate(accountsStore, req.Pagination, func(key, value []byte) error {
+		account := a.decodeAccount(value)
+		any, err := codectypes.NewAnyWithValue(account)
+		if err != nil {
+			return err
+		}
+
+		accounts = append(accounts, any)
+		return nil
+	})
+	if err != nil {
+		return nil, status.Errorf(codes.Internal, "paginate: %v", err)
+	}
+
+	return &types.QueryAccountsResponse{Accounts: accounts, Pagination: pageRes}, err
+}
+
+// Account returns account details based on address.
+func (a authQueryServer) Account(c context.Context, req *types.QueryAccountRequest) (*types.QueryAccountResponse, error) {
+	if req == nil {
+		return nil, status.Errorf(codes.InvalidArgument, "empty request")
+	}
+
+	if req.Address == "" {
+		return nil, status.Error(codes.InvalidArgument, "Address cannot be empty")
+	}
+
+	ctx := sdk.UnwrapSDKContext(c)
+	addr, err := sdk.AccAddressFromBech32(req.Address)
+	if err != nil {
+		return nil, err
+	}
+
+	account := a.k.GetAccount(ctx, addr)
+	if account == nil {
+		return nil, status.Errorf(codes.NotFound, "account %s not found", req.Address)
+	}
+
+	ethAcc, ok := account.(*ethermint.EthAccount)
+	if ok {
+		account = ethAcc.BaseAccount
+	}
+
+	any, err := codectypes.NewAnyWithValue(account)
+	if err != nil {
+		return nil, status.Errorf(codes.Internal, err.Error())
+	}
+
+	return &types.QueryAccountResponse{Account: any}, nil
+}
+
+// AccountAddressByID returns account address based on account number.
+//
+// Since: cosmos-sdk 0.46.2
+func (a authQueryServer) AccountAddressByID(c context.Context, req *types.QueryAccountAddressByIDRequest) (*types.QueryAccountAddressByIDResponse, error) {
+	return a.k.AccountAddressByID(c, req)
+}
+
+// Params queries all parameters.
+func (a authQueryServer) Params(ctx context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) {
+	return a.k.Params(ctx, req)
+}
+
+// ModuleAccounts returns all the existing module accounts.
+//
+// Since: cosmos-sdk 0.46
+func (a authQueryServer) ModuleAccounts(ctx context.Context, req *types.QueryModuleAccountsRequest) (*types.QueryModuleAccountsResponse, error) {
+	return a.k.ModuleAccounts(ctx, req)
+}
+
+// ModuleAccountByName returns the module account info by module name
+func (a authQueryServer) ModuleAccountByName(ctx context.Context, req *types.QueryModuleAccountByNameRequest) (*types.QueryModuleAccountByNameResponse, error) {
+	return a.k.ModuleAccountByName(ctx, req)
+}
+
+// Bech32Prefix queries bech32Prefix
+//
+// Since: cosmos-sdk 0.46
+func (a authQueryServer) Bech32Prefix(ctx context.Context, req *types.Bech32PrefixRequest) (*types.Bech32PrefixResponse, error) {
+	return a.k.Bech32Prefix(ctx, req)
+}
+
+// AddressBytesToString converts Account Address bytes to string
+//
+// Since: cosmos-sdk 0.46
+func (a authQueryServer) AddressBytesToString(ctx context.Context, req *types.AddressBytesToStringRequest) (*types.AddressBytesToStringResponse, error) {
+	return a.k.AddressBytesToString(ctx, req)
+}
+
+// AddressStringToBytes converts Address string to bytes
+//
+// Since: cosmos-sdk 0.46
+func (a authQueryServer) AddressStringToBytes(ctx context.Context, req *types.AddressStringToBytesRequest) (*types.AddressStringToBytesResponse, error) {
+	return a.k.AddressStringToBytes(ctx, req)
+}
+
+// AccountInfo queries account info which is common to all account types.
+//
+// Since: cosmos-sdk 0.47
+func (a authQueryServer) AccountInfo(ctx context.Context, req *types.QueryAccountInfoRequest) (*types.QueryAccountInfoResponse, error) {
+	return a.k.AccountInfo(ctx, req)
+}
+
+func (a authQueryServer) decodeAccount(bz []byte) types.AccountI {
+	acc, err := a.k.UnmarshalAccount(bz)
+	if err != nil {
+		panic(err)
+	}
+
+	ethAcc, ok := acc.(*ethermint.EthAccount)
+	if ok {
+		return ethAcc.BaseAccount
+	}
+	return acc
+}