chore: added new field account-id with uint64 in AccountAddressByID

CHANGELOG.md

@@ -85,6 +85,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * [#13236](https://github.com/cosmos/cosmos-sdk/pull/13236) Integrate Filter Logging
 * [#13528](https://github.com/cosmos/cosmos-sdk/pull/13528) Update `ValidateMemoDecorator` to only check memo against `MaxMemoCharacters` param when a memo is present.
 * [#13651](https://github.com/cosmos/cosmos-sdk/pull/13651) Update `server/config/config.GetConfig` function.
+* [#13780](https://github.com/cosmos/cosmos-sdk/pull/13780) `id` (type of int64) in `AccountAddressByID` grpc query is now deprecated, update to use account-id(type of uint64) to request `AccountAddressByID`.
 * [#13781](https://github.com/cosmos/cosmos-sdk/pull/13781) Remove `client/keys.KeysCdc`.
 * [#13803](https://github.com/cosmos/cosmos-sdk/pull/13803) Add an error log if iavl set operation failed.
 * [#13802](https://github.com/cosmos/cosmos-sdk/pull/13802) Add --output-document flag to the export CLI command to allow writing genesis state to a file.

proto/cosmos/auth/v1beta1/query.proto

@@ -197,10 +197,19 @@ message AddressStringToBytesResponse {
 //
 // Since: cosmos-sdk 0.46.2
 message QueryAccountAddressByIDRequest {
+  // Deprecated, use account_id instead
+  // 
   // id is the account number of the address to be queried. This field
   // should have been an uint64 (like all account numbers), and will be
   // updated to uint64 in a future version of the auth query.
-  int64 id = 1;
+  int64 id = 1 [deprecated = true];
+
+  // account_id is the account number of the address to be queried. This field
+  // should have been an uint64 (like all account numbers), and will be
+  // updated to uint64 in a future version of the auth query.
+  // 
+  // Since: cosmos-sdk 0.47
+  uint64 account_id = 2;
 }
 
 // QueryAccountAddressByIDResponse is the response type for AccountAddressByID rpc method

x/auth/client/cli/query.go

@@ -146,8 +146,17 @@ func GetAccountAddressByIDCmd() *cobra.Command {
 				return err
 			}
 
+			accNumUint, err := strconv.ParseUint(args[0], 10, 64)
+			if err != nil {
+				return err
+			}
+
 			queryClient := types.NewQueryClient(clientCtx)
-			res, err := queryClient.AccountAddressByID(cmd.Context(), &types.QueryAccountAddressByIDRequest{Id: accNum})
+			res, err := queryClient.AccountAddressByID(cmd.Context(), &types.QueryAccountAddressByIDRequest{
+				Id:        accNum,
+				AccountId: accNumUint,
+			})
+
 			if err != nil {
 				return err
 			}

x/auth/keeper/grpc_query.go

@@ -25,11 +25,21 @@ func (ak AccountKeeper) AccountAddressByID(c context.Context, req *types.QueryAc
 	}
 
 	if req.Id < 0 {
-		return nil, status.Error(codes.InvalidArgument, "invalid account number")
+		return nil, status.Errorf(codes.InvalidArgument, "invalid account number %d", req.Id)
+	}
+
+	var accId uint64
+	switch {
+	case req.AccountId > 0 && req.Id > 0 && req.AccountId != uint64(req.Id): //nolint:gosec
+		return nil, status.Errorf(codes.InvalidArgument, "different values passed for id (%d) & account-id (%d)", req.Id, req.AccountId)
+	case req.AccountId > 0:
+		accId = req.AccountId
+	case req.Id > 0:
+		accId = uint64(req.Id) //nolint:gosec
 	}
 
 	ctx := sdk.UnwrapSDKContext(c)
-	address := ak.GetAccountAddressByID(ctx, uint64(req.GetId()))
+	address := ak.GetAccountAddressByID(ctx, accId)
 	if len(address) == 0 {
 		return nil, status.Errorf(codes.NotFound, "account address not found with account number %d", req.Id)
 	}

x/auth/keeper/grpc_query_test.go

@@ -174,6 +174,22 @@ func (suite *KeeperTestSuite) TestGRPCQueryAccountAddressByID() {
 			false,
 			func(res *types.QueryAccountAddressByIDResponse) {},
 		},
+		{
+			"invalid: account-id, id are not same",
+			func() {
+				req = &types.QueryAccountAddressByIDRequest{AccountId: 0, Id: 1}
+			},
+			false,
+			func(res *types.QueryAccountAddressByIDResponse) {},
+		},
+		{
+			"invalid: account-id, id are not same",
+			func() {
+				req = &types.QueryAccountAddressByIDRequest{AccountId: 1, Id: -1}
+			},
+			false,
+			func(res *types.QueryAccountAddressByIDResponse) {},
+		},
 		{
 			"account address not found",
 			func() {
@@ -182,6 +198,18 @@ func (suite *KeeperTestSuite) TestGRPCQueryAccountAddressByID() {
 			false,
 			func(res *types.QueryAccountAddressByIDResponse) {},
 		},
+		{
+			"valid account-id",
+			func() {
+				account := suite.accountKeeper.NewAccountWithAddress(suite.ctx, addr)
+				suite.accountKeeper.SetAccount(suite.ctx, account)
+				req = &types.QueryAccountAddressByIDRequest{AccountId: account.GetAccountNumber()}
+			},
+			true,
+			func(res *types.QueryAccountAddressByIDResponse) {
+				suite.Require().NotNil(res.AccountAddress)
+			},
+		},
 		{
 			"valid request",
 			func() {