feat!: Add bech32 prefix to authkeeper

docs/core/proto-docs.md

@@ -17,6 +17,12 @@
     - [PageResponse](#cosmos.base.query.v1beta1.PageResponse)
 
 - [cosmos/auth/v1beta1/query.proto](#cosmos/auth/v1beta1/query.proto)
+    - [AccAddrFromBech32Request](#cosmos.auth.v1beta1.AccAddrFromBech32Request)
+    - [AccAddrFromBech32Response](#cosmos.auth.v1beta1.AccAddrFromBech32Response)
+    - [Bech32FromAccAddrRequest](#cosmos.auth.v1beta1.Bech32FromAccAddrRequest)
+    - [Bech32FromAccAddrResponse](#cosmos.auth.v1beta1.Bech32FromAccAddrResponse)
+    - [Bech32PrefixRequest](#cosmos.auth.v1beta1.Bech32PrefixRequest)
+    - [Bech32PrefixResponse](#cosmos.auth.v1beta1.Bech32PrefixResponse)
     - [QueryAccountRequest](#cosmos.auth.v1beta1.QueryAccountRequest)
     - [QueryAccountResponse](#cosmos.auth.v1beta1.QueryAccountResponse)
     - [QueryAccountsRequest](#cosmos.auth.v1beta1.QueryAccountsRequest)
@@ -836,6 +842,91 @@ corresponding request message has used PageRequest.
 
 
 
+<a name="cosmos.auth.v1beta1.AccAddrFromBech32Request"></a>
+
+### AccAddrFromBech32Request
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `bech32` | [string](#string) |  |  |
+
+
+
+
+
+
+<a name="cosmos.auth.v1beta1.AccAddrFromBech32Response"></a>
+
+### AccAddrFromBech32Response
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `account_addr` | [bytes](#bytes) |  |  |
+
+
+
+
+
+
+<a name="cosmos.auth.v1beta1.Bech32FromAccAddrRequest"></a>
+
+### Bech32FromAccAddrRequest
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `account_addr` | [bytes](#bytes) |  |  |
+
+
+
+
+
+
+<a name="cosmos.auth.v1beta1.Bech32FromAccAddrResponse"></a>
+
+### Bech32FromAccAddrResponse
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `bech32` | [string](#string) |  |  |
+
+
+
+
+
+
+<a name="cosmos.auth.v1beta1.Bech32PrefixRequest"></a>
+
+### Bech32PrefixRequest
+
+
+
+
+
+
+
+<a name="cosmos.auth.v1beta1.Bech32PrefixResponse"></a>
+
+### Bech32PrefixResponse
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `bech32_prefix` | [string](#string) |  |  |
+
+
+
+
+
+
 <a name="cosmos.auth.v1beta1.QueryAccountRequest"></a>
 
 ### QueryAccountRequest
@@ -938,6 +1029,9 @@ Query defines the gRPC querier service.
 | `Accounts` | [QueryAccountsRequest](#cosmos.auth.v1beta1.QueryAccountsRequest) | [QueryAccountsResponse](#cosmos.auth.v1beta1.QueryAccountsResponse) | Accounts returns all the existing accounts | GET|/cosmos/auth/v1beta1/accounts|
 | `Account` | [QueryAccountRequest](#cosmos.auth.v1beta1.QueryAccountRequest) | [QueryAccountResponse](#cosmos.auth.v1beta1.QueryAccountResponse) | Account returns account details based on address. | GET|/cosmos/auth/v1beta1/accounts/{address}|
 | `Params` | [QueryParamsRequest](#cosmos.auth.v1beta1.QueryParamsRequest) | [QueryParamsResponse](#cosmos.auth.v1beta1.QueryParamsResponse) | Params queries all parameters. | GET|/cosmos/auth/v1beta1/params|
+| `Bech32Prefix` | [Bech32PrefixRequest](#cosmos.auth.v1beta1.Bech32PrefixRequest) | [Bech32PrefixResponse](#cosmos.auth.v1beta1.Bech32PrefixResponse) | Bech32 queries bech32Prefix | GET|/cosmos/auth/v1beta1/bech32|
+| `Bech32FromAccAddr` | [Bech32FromAccAddrRequest](#cosmos.auth.v1beta1.Bech32FromAccAddrRequest) | [Bech32FromAccAddrResponse](#cosmos.auth.v1beta1.Bech32FromAccAddrResponse) | Bech32FromAccAddr converts Bech32 to Account string | GET|/cosmos/auth/v1beta1/bech32|
+| `AccAddrFromBech32` | [AccAddrFromBech32Request](#cosmos.auth.v1beta1.AccAddrFromBech32Request) | [AccAddrFromBech32Response](#cosmos.auth.v1beta1.AccAddrFromBech32Response) | AccAddrFromBech32 converts Account string to Bech32 | GET|/cosmos/auth/v1beta1/bech32|
 
  <!-- end services -->
 

proto/cosmos/auth/v1beta1/query.proto

@@ -26,6 +26,21 @@ service Query {
   rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
     option (google.api.http).get = "/cosmos/auth/v1beta1/params";
   }
+
+  // Bech32 queries bech32Prefix
+  rpc Bech32Prefix(Bech32PrefixRequest) returns (Bech32PrefixResponse) {
+    option (google.api.http).get = "/cosmos/auth/v1beta1/bech32";
+  }
+
+  // Bech32FromAccAddr converts Bech32 to Account string
+  rpc Bech32FromAccAddr(Bech32FromAccAddrRequest) returns (Bech32FromAccAddrResponse) {
+    option (google.api.http).get = "/cosmos/auth/v1beta1/bech32";
+  }
+
+  // AccAddrFromBech32 converts Account string to Bech32
+  rpc AccAddrFromBech32(AccAddrFromBech32Request) returns (AccAddrFromBech32Response) {
+    option (google.api.http).get = "/cosmos/auth/v1beta1/bech32";
+  }
 }
 
 // QueryAccountsRequest is the request type for the Query/Accounts RPC method.
@@ -66,3 +81,31 @@ message QueryParamsResponse {
   // params defines the parameters of the module.
   Params params = 1 [(gogoproto.nullable) = false];
 }
+
+// Bech32PrefixRequest is the request type for Bech32Prefix rpc method
+message Bech32PrefixRequest  {}
+
+// Bech32PrefixResponse is the response type for Bech32Prefix rpc method
+message Bech32PrefixResponse  {
+  string bech32_prefix = 1;
+}
+
+// Bech32FromAccAddrRequest is the request type for Bech32FromAccAddr rpc method
+message Bech32FromAccAddrRequest {
+  bytes account_addr = 1;
+}
+
+// Bech32FromAccAddrResponse is the response type for Bech32FromAccAddr rpc method
+message Bech32FromAccAddrResponse {
+  string bech32 = 1;
+}
+
+// AccAddrFromBech32Request is the request type for AccAddrFromBech32 rpc method
+message AccAddrFromBech32Request {
+  string bech32 = 1;
+}
+
+// AccAddrFromBech32Response is the response type for AccAddrFromBech32 rpc method
+message AccAddrFromBech32Response {
+  bytes account_addr = 1;
+}

simapp/app.go

@@ -87,7 +87,10 @@ import (
 	_ "github.com/cosmos/cosmos-sdk/client/docs/statik"
 )
 
-const appName = "SimApp"
+const (
+	appName = "SimApp"
+	DefaultBech32Prefix = "cosmos"
+)
 
 var (
 	// DefaultNodeHome default home directories for the application daemon
@@ -230,7 +233,7 @@ func NewSimApp(
 
 	// add keepers
 	app.AccountKeeper = authkeeper.NewAccountKeeper(
-		appCodec, keys[authtypes.StoreKey], app.GetSubspace(authtypes.ModuleName), authtypes.ProtoBaseAccount, maccPerms,
+		appCodec, keys[authtypes.StoreKey], app.GetSubspace(authtypes.ModuleName), DefaultBech32Prefix, authtypes.ProtoBaseAccount, maccPerms,
 	)
 	app.BankKeeper = bankkeeper.NewBaseKeeper(
 		appCodec, keys[banktypes.StoreKey], app.AccountKeeper, app.GetSubspace(banktypes.ModuleName), app.ModuleAccountAddrs(),

x/auth/atlas/atlas-v0.39.1.md

@@ -39,7 +39,7 @@ account types for an application, as well as AnteHandler and authentication logi
    func NewApp(...) *App {
       // ...
       app.AccountKeeper = auth.NewAccountKeeper(
-       app.cdc, keys[auth.StoreKey], app.subspaces[auth.ModuleName], auth.ProtoBaseAccount,
+       app.cdc, keys[auth.StoreKey], app.subspaces[auth.ModuleName], DefaultBech32Prefix, auth.ProtoBaseAccount,
       )
    }
    ```

x/auth/keeper/grpc_query.go

@@ -2,9 +2,12 @@ package keeper
 
 import (
 	"context"
+	"errors"
+	"strings"
 
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	"github.com/cosmos/cosmos-sdk/types/query"
+	"github.com/cosmos/cosmos-sdk/types/bech32"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -83,3 +86,46 @@ func (ak AccountKeeper) Params(c context.Context, req *types.QueryParamsRequest)
 
 	return &types.QueryParamsResponse{Params: params}, nil
 }
+
+func (ak AccountKeeper) Bech32Prefix(ctx context.Context, req *types.Bech32PrefixRequest) (*types.Bech32PrefixResponse, error) {
+	bech32Prefix := ak.GetBech32Prefix()
+	return &types.Bech32PrefixResponse{Bech32Prefix: bech32Prefix}, nil
+}
+
+func (ak AccountKeeper) Bech32FromAccAddr(ctx context.Context, req *types.Bech32FromAccAddrRequest) (*types.Bech32FromAccAddrResponse, error) {
+	if req == nil {
+		return nil, status.Errorf(codes.InvalidArgument, "empty request")
+	}
+
+	if len(req.AccountAddr) == 0 {
+		return nil, errors.New("empty bech32 string is not allowed")
+	}
+
+	bech32,err := bech32.ConvertAndEncode(ak.bech32Prefix, req.AccountAddr)
+	if err != nil {
+		return nil, err
+	}
+
+	return &types.Bech32FromAccAddrResponse{Bech32: bech32},nil
+}
+
+func (ak AccountKeeper) AccAddrFromBech32(ctx context.Context, req *types.AccAddrFromBech32Request) (*types.AccAddrFromBech32Response, error) {
+	if req == nil {
+		return nil, status.Errorf(codes.InvalidArgument, "empty request")
+	}
+
+	if len(strings.TrimSpace(req.Bech32)) == 0 {
+		return nil, errors.New("empty bech32 string is not allowed")
+	}
+
+	_, bz, err := bech32.DecodeAndConvert(req.Bech32)
+	if err != nil {
+		return nil, err
+	}
+
+	if err := sdk.VerifyAddressFormat(bz); err != nil {
+		return nil, err
+	}
+
+	return &types.AccAddrFromBech32Response{AccountAddr: bz},nil
+}