feat: add flag to enable/disable heavy queries and refactor apis

.github/workflows/build-test.yml → .github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Build Test
+name: Build
 
 on:
   push:
@@ -51,7 +51,3 @@ jobs:
     - name: Test Build
       run: |
         make build
-
-    - name: Uint Test
-      run: |
-        make test

cmd/gnfd/cmd/root.go

@@ -369,6 +369,7 @@ func (a appCreator) newApp(
 		baseapp.SetIAVLCacheSize(cast.ToInt(appOpts.Get(server.FlagIAVLCacheSize))),
 		baseapp.SetIAVLDisableFastNode(cast.ToBool(appOpts.Get(server.FlagDisableIAVLFastNode))),
 		baseapp.SetChainID(chainID),
+		baseapp.SetEnableUnsafeQuery(cast.ToBool(appOpts.Get(server.FlagEnableUnsafeQuery))),
 	)
 }
 

e2e/tests/payment_test.go

@@ -10,6 +10,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/cosmos/cosmos-sdk/types/query"
+
 	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/tx"
@@ -55,6 +57,27 @@ func (s *PaymentTestSuite) SetupTest() {
 	s.RefreshGVGFamilies()
 }
 
+func (s *PaymentTestSuite) TestQueryPaymentAccounts() {
+	_, err := s.Client.PaymentAccounts(context.Background(), &paymenttypes.QueryPaymentAccountsRequest{
+		Pagination: &query.PageRequest{
+			Offset: 10, // offset is not allowed
+		},
+	})
+	s.Require().Error(err)
+
+	_, err = s.Client.PaymentAccounts(context.Background(), &paymenttypes.QueryPaymentAccountsRequest{
+		Pagination: &query.PageRequest{
+			CountTotal: true, // count total = true is not allowed
+		},
+	})
+	s.Require().Error(err)
+
+	_, err = s.Client.PaymentAccounts(context.Background(), &paymenttypes.QueryPaymentAccountsRequest{
+		Pagination: &query.PageRequest{},
+	})
+	s.Require().NoError(err)
+}
+
 func (s *PaymentTestSuite) TestCreatePaymentAccount() {
 	user := s.GenAndChargeAccounts(1, 100)[0]
 	ctx := context.Background()
@@ -64,16 +87,16 @@ func (s *PaymentTestSuite) TestCreatePaymentAccount() {
 	}
 	_ = s.SendTxBlock(user, msgCreatePaymentAccount)
 	// query user's payment accounts
-	queryGetPaymentAccountsByOwnerRequest := paymenttypes.QueryGetPaymentAccountsByOwnerRequest{
+	queryGetPaymentAccountsByOwnerRequest := paymenttypes.QueryPaymentAccountsByOwnerRequest{
 		Owner: user.GetAddr().String(),
 	}
-	paymentAccounts, err := s.Client.GetPaymentAccountsByOwner(ctx, &queryGetPaymentAccountsByOwnerRequest)
+	paymentAccounts, err := s.Client.PaymentAccountsByOwner(ctx, &queryGetPaymentAccountsByOwnerRequest)
 	s.Require().NoError(err)
 	s.T().Log(paymentAccounts)
 	s.Require().Equal(1, len(paymentAccounts.PaymentAccounts))
 	paymentAccountAddr := paymentAccounts.PaymentAccounts[0]
 	// query this payment account
-	queryGetPaymentAccountRequest := paymenttypes.QueryGetPaymentAccountRequest{
+	queryGetPaymentAccountRequest := paymenttypes.QueryPaymentAccountRequest{
 		Addr: paymentAccountAddr,
 	}
 	paymentAccount, err := s.Client.PaymentAccount(ctx, &queryGetPaymentAccountRequest)
@@ -299,8 +322,8 @@ func (s *PaymentTestSuite) TestDeposit_ActiveAccount() {
 		Creator: userAddr,
 	}
 	_ = s.SendTxBlock(user, msgCreatePaymentAccount)
-	paymentAccountsReq := &paymenttypes.QueryGetPaymentAccountsByOwnerRequest{Owner: userAddr}
-	paymentAccounts, err := s.Client.PaymentQueryClient.GetPaymentAccountsByOwner(ctx, paymentAccountsReq)
+	paymentAccountsReq := &paymenttypes.QueryPaymentAccountsByOwnerRequest{Owner: userAddr}
+	paymentAccounts, err := s.Client.PaymentQueryClient.PaymentAccountsByOwner(ctx, paymentAccountsReq)
 	s.Require().NoError(err)
 	s.T().Logf("paymentAccounts %s", core.YamlString(paymentAccounts))
 	paymentAddr := paymentAccounts.PaymentAccounts[0]
@@ -384,8 +407,8 @@ func (s *PaymentTestSuite) TestDeposit_ResumeInOneBlock() {
 		Creator: userAddr,
 	}
 	_ = s.SendTxBlock(user, msgCreatePaymentAccount)
-	paymentAccountsReq := &paymenttypes.QueryGetPaymentAccountsByOwnerRequest{Owner: userAddr}
-	paymentAccounts, err := s.Client.PaymentQueryClient.GetPaymentAccountsByOwner(ctx, paymentAccountsReq)
+	paymentAccountsReq := &paymenttypes.QueryPaymentAccountsByOwnerRequest{Owner: userAddr}
+	paymentAccounts, err := s.Client.PaymentQueryClient.PaymentAccountsByOwner(ctx, paymentAccountsReq)
 	s.Require().NoError(err)
 	s.T().Logf("paymentAccounts %s", core.YamlString(paymentAccounts))
 	paymentAddr := paymentAccounts.PaymentAccounts[0]
@@ -501,8 +524,8 @@ func (s *PaymentTestSuite) TestDeposit_ResumeInBlocks() {
 		Creator: userAddr,
 	}
 	_ = s.SendTxBlock(user, msgCreatePaymentAccount)
-	paymentAccountsReq := &paymenttypes.QueryGetPaymentAccountsByOwnerRequest{Owner: userAddr}
-	paymentAccounts, err := s.Client.PaymentQueryClient.GetPaymentAccountsByOwner(ctx, paymentAccountsReq)
+	paymentAccountsReq := &paymenttypes.QueryPaymentAccountsByOwnerRequest{Owner: userAddr}
+	paymentAccounts, err := s.Client.PaymentQueryClient.PaymentAccountsByOwner(ctx, paymentAccountsReq)
 	s.Require().NoError(err)
 	s.T().Logf("paymentAccounts %s", core.YamlString(paymentAccounts))
 	paymentAddr := paymentAccounts.PaymentAccounts[0]
@@ -636,8 +659,8 @@ func (s *PaymentTestSuite) TestAutoSettle_InOneBlock() {
 		Creator: userAddr,
 	}
 	_ = s.SendTxBlock(user, msgCreatePaymentAccount)
-	paymentAccountsReq := &paymenttypes.QueryGetPaymentAccountsByOwnerRequest{Owner: userAddr}
-	paymentAccounts, err := s.Client.PaymentQueryClient.GetPaymentAccountsByOwner(ctx, paymentAccountsReq)
+	paymentAccountsReq := &paymenttypes.QueryPaymentAccountsByOwnerRequest{Owner: userAddr}
+	paymentAccounts, err := s.Client.PaymentQueryClient.PaymentAccountsByOwner(ctx, paymentAccountsReq)
 	s.Require().NoError(err)
 	s.T().Logf("paymentAccounts %s", core.YamlString(paymentAccounts))
 	paymentAddr := paymentAccounts.PaymentAccounts[0]
@@ -775,8 +798,8 @@ func (s *PaymentTestSuite) TestAutoSettle_InBlocks() {
 		Creator: userAddr,
 	}
 	_ = s.SendTxBlock(user, msgCreatePaymentAccount)
-	paymentAccountsReq := &paymenttypes.QueryGetPaymentAccountsByOwnerRequest{Owner: userAddr}
-	paymentAccounts, err := s.Client.PaymentQueryClient.GetPaymentAccountsByOwner(ctx, paymentAccountsReq)
+	paymentAccountsReq := &paymenttypes.QueryPaymentAccountsByOwnerRequest{Owner: userAddr}
+	paymentAccounts, err := s.Client.PaymentQueryClient.PaymentAccountsByOwner(ctx, paymentAccountsReq)
 	s.Require().NoError(err)
 	s.T().Logf("paymentAccounts %s", core.YamlString(paymentAccounts))
 	paymentAddr := paymentAccounts.PaymentAccounts[0]
@@ -872,8 +895,8 @@ func (s *PaymentTestSuite) TestWithdraw() {
 		Creator: userAddr,
 	}
 	_ = s.SendTxBlock(user, msgCreatePaymentAccount)
-	paymentAccountsReq := &paymenttypes.QueryGetPaymentAccountsByOwnerRequest{Owner: userAddr}
-	paymentAccounts, err := s.Client.PaymentQueryClient.GetPaymentAccountsByOwner(ctx, paymentAccountsReq)
+	paymentAccountsReq := &paymenttypes.QueryPaymentAccountsByOwnerRequest{Owner: userAddr}
+	paymentAccounts, err := s.Client.PaymentQueryClient.PaymentAccountsByOwner(ctx, paymentAccountsReq)
 	s.Require().NoError(err)
 	s.T().Logf("paymentAccounts %s", core.YamlString(paymentAccounts))
 	paymentAddr := paymentAccounts.PaymentAccounts[0]

e2e/tests/permission_test.go

@@ -1356,8 +1356,8 @@ func (s *StorageTestSuite) TestGroupMembersAndPolicyGC() {
 	s.Require().Equal(headGroupMemberResponse.GroupMember.GroupId, headGroupResponse.GetGroupInfo().Id)
 
 	// list group
-	queryListGroupReq := storagetypes.QueryListGroupRequest{GroupOwner: owner.GetAddr().String()}
-	queryListGroupResp, err := s.Client.ListGroup(ctx, &queryListGroupReq)
+	queryListGroupReq := storagetypes.QueryListGroupsRequest{GroupOwner: owner.GetAddr().String()}
+	queryListGroupResp, err := s.Client.ListGroups(ctx, &queryListGroupReq)
 	s.Require().NoError(err)
 	s.T().Log(queryListGroupResp.String())
 

e2e/tests/storage_bill_test.go

@@ -267,11 +267,11 @@ func (s *PaymentTestSuite) TestStorageBill_Smoke() {
 	s.checkStreamRecordsBeforeAndAfter(streamRecordsBeforeCreateEmptyObject, streamRecordsAfterCreateEmptyObject, readPrice, readChargeRate, primaryStorePrice, secondaryStorePrice, chargeSize, uint64(emptyPayloadSize))
 
 	// test query auto settle records
-	queryAllAutoSettleRecordRequest := paymenttypes.QueryAllAutoSettleRecordRequest{}
-	queryAllAutoSettleRecordResponse, err := s.Client.AutoSettleRecordAll(ctx, &queryAllAutoSettleRecordRequest)
+	queryAllAutoSettleRecordRequest := paymenttypes.QueryAutoSettleRecordsRequest{}
+	queryAllAutoSettleRecordResponse, err := s.Client.AutoSettleRecords(ctx, &queryAllAutoSettleRecordRequest)
 	s.Require().NoError(err)
 	s.T().Logf("queryAllAutoSettleRecordResponse %s", core.YamlString(queryAllAutoSettleRecordResponse))
-	s.Require().True(len(queryAllAutoSettleRecordResponse.AutoSettleRecord) >= 1)
+	s.Require().True(len(queryAllAutoSettleRecordResponse.AutoSettleRecords) >= 1)
 
 	// simulate delete object, check fee preview
 	deleteObjectMsg := storagetypes.NewMsgDeleteObject(user.GetAddr(), bucketName, objectName)
@@ -2107,10 +2107,10 @@ func (s *PaymentTestSuite) CreatePaymentAccount(user keys.KeyManager, amount, de
 	}
 	_ = s.SendTxBlock(user, msgCreatePaymentAccount)
 	// query user's payment accounts
-	queryGetPaymentAccountsByOwnerRequest := paymenttypes.QueryGetPaymentAccountsByOwnerRequest{
+	queryGetPaymentAccountsByOwnerRequest := paymenttypes.QueryPaymentAccountsByOwnerRequest{
 		Owner: user.GetAddr().String(),
 	}
-	paymentAccounts, err := s.Client.GetPaymentAccountsByOwner(ctx, &queryGetPaymentAccountsByOwnerRequest)
+	paymentAccounts, err := s.Client.PaymentAccountsByOwner(ctx, &queryGetPaymentAccountsByOwnerRequest)
 	s.Require().NoError(err)
 	s.T().Log(paymentAccounts)
 	paymentAccountAddr := paymentAccounts.PaymentAccounts[len(paymentAccounts.PaymentAccounts)-1]

e2e/tests/storage_test.go

@@ -295,8 +295,8 @@ func (s *StorageTestSuite) TestCreateGroup() {
 	s.Require().Equal(headGroupNftResponse.MetaData.GroupName, groupName)
 
 	// 3. ListGroup
-	queryListGroupReq := storagetypes.QueryListGroupRequest{GroupOwner: owner.GetAddr().String()}
-	queryListGroupResp, err := s.Client.ListGroup(ctx, &queryListGroupReq)
+	queryListGroupReq := storagetypes.QueryListGroupsRequest{GroupOwner: owner.GetAddr().String()}
+	queryListGroupResp, err := s.Client.ListGroups(ctx, &queryListGroupReq)
 	s.Require().NoError(err)
 	s.Require().GreaterOrEqual(len(queryListGroupResp.GroupInfos), 1)
 
@@ -367,8 +367,8 @@ func (s *StorageTestSuite) TestLeaveGroup() {
 	s.Require().Equal(headGroupNftResponse.MetaData.GroupName, groupName)
 
 	// 3. ListGroup
-	queryListGroupReq := storagetypes.QueryListGroupRequest{GroupOwner: owner.GetAddr().String()}
-	queryListGroupResp, err := s.Client.ListGroup(ctx, &queryListGroupReq)
+	queryListGroupReq := storagetypes.QueryListGroupsRequest{GroupOwner: owner.GetAddr().String()}
+	queryListGroupResp, err := s.Client.ListGroups(ctx, &queryListGroupReq)
 	s.Require().NoError(err)
 	s.Require().GreaterOrEqual(len(queryListGroupResp.GroupInfos), 1)
 

go.mod

@@ -176,7 +176,7 @@ replace (
 	github.com/cometbft/cometbft => github.com/bnb-chain/greenfield-cometbft v0.0.2-alpha.2
 	github.com/cometbft/cometbft-db => github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1
 	github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
-	github.com/cosmos/cosmos-sdk => github.com/bnb-chain/greenfield-cosmos-sdk v0.2.3-alpha.5
+	github.com/cosmos/cosmos-sdk => github.com/bnb-chain/greenfield-cosmos-sdk v0.2.3-alpha.3.0.20230803020148-9216a6aea390
 	github.com/cosmos/iavl => github.com/bnb-chain/greenfield-iavl v0.20.1-alpha.1
 	github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 )

go.sum

@@ -163,8 +163,8 @@ github.com/bnb-chain/greenfield-cometbft v0.0.2-alpha.2 h1:ys9kmgtRx04wcCextE6Cr
 github.com/bnb-chain/greenfield-cometbft v0.0.2-alpha.2/go.mod h1:EBmwmUdaNbGPyGjf1cMuoN3pAeM2tQu7Lfg95813EAw=
 github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1 h1:XcWulGacHVRiSCx90Q8Y//ajOrLNBQWR/KDB89dy3cU=
 github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1/go.mod h1:ey1CiK4bYo1RBNJLRiVbYr5CMdSxci9S/AZRINLtppI=
-github.com/bnb-chain/greenfield-cosmos-sdk v0.2.3-alpha.5 h1:VZKjhnM/GvdG6iTXj63SrBgDQLtXG4piDDG2fTMTiV4=
-github.com/bnb-chain/greenfield-cosmos-sdk v0.2.3-alpha.5/go.mod h1:EghjYxFg4NRNMfTJ6g9rVhjImhXQm+tuboknHqeGmJA=
+github.com/bnb-chain/greenfield-cosmos-sdk v0.2.3-alpha.3.0.20230803020148-9216a6aea390 h1:tuXCEm4WHJ/7mhYM9Nqq5z+Qu96xsSZ6pqw0LE0+Fqo=
+github.com/bnb-chain/greenfield-cosmos-sdk v0.2.3-alpha.3.0.20230803020148-9216a6aea390/go.mod h1:hpvg93+VGXHAcv/pVVdp24Ik/9miw4uRh8+tD0DDYas=
 github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230425074444-eb5869b05fe9 h1:6fLpmmI0EZvDTfPvI0zy5dBaaTUboHnEkoC5/p/w8TQ=
 github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230425074444-eb5869b05fe9/go.mod h1:rbc4o84RSEvhf09o2+4Qiazsv0snRJLiEZdk17HeIDw=
 github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20230425074444-eb5869b05fe9 h1:1ZdK+iR1Up02bOa2YTZCml7PBpP//kcdamOcK6aWO/s=

proto/greenfield/payment/query.proto

@@ -24,59 +24,59 @@ service Query {
     option (google.api.http).get = "/greenfield/payment/params";
   }
 
-  // ParamsByTimestamp queries the parameters of the module.
+  // ParamsByTimestamp queries the parameter of the module by timestamp.
   rpc ParamsByTimestamp(QueryParamsByTimestampRequest) returns (QueryParamsByTimestampResponse) {
     option (google.api.http).get = "/greenfield/payment/params/{timestamp}";
   }
 
-  // Queries a StreamRecord by index.
+  // Queries our flows by account.
   rpc OutFlows(QueryOutFlowsRequest) returns (QueryOutFlowsResponse) {
     option (google.api.http).get = "/greenfield/payment/out_flows/{account}";
   }
 
-  // Queries a StreamRecord by index.
+  // Queries a stream record by account.
   rpc StreamRecord(QueryGetStreamRecordRequest) returns (QueryGetStreamRecordResponse) {
     option (google.api.http).get = "/greenfield/payment/stream_record/{account}";
   }
 
-  // Queries a list of StreamRecord items.
-  rpc StreamRecordAll(QueryAllStreamRecordRequest) returns (QueryAllStreamRecordResponse) {
-    option (google.api.http).get = "/greenfield/payment/stream_record";
+  // Queries all stream records.
+  rpc StreamRecords(QueryStreamRecordsRequest) returns (QueryStreamRecordsResponse) {
+    option (google.api.http).get = "/greenfield/payment/stream_records";
   }
 
-  // Queries a PaymentAccountCount by index.
-  rpc PaymentAccountCount(QueryGetPaymentAccountCountRequest) returns (QueryGetPaymentAccountCountResponse) {
+  // Queries the count of payment account by owner.
+  rpc PaymentAccountCount(QueryPaymentAccountCountRequest) returns (QueryPaymentAccountCountResponse) {
     option (google.api.http).get = "/greenfield/payment/payment_account_count/{owner}";
   }
 
-  // Queries a list of PaymentAccountCount items.
-  rpc PaymentAccountCountAll(QueryAllPaymentAccountCountRequest) returns (QueryAllPaymentAccountCountResponse) {
-    option (google.api.http).get = "/greenfield/payment/payment_account_count";
+  // Queries all counts of payment account for all owners.
+  rpc PaymentAccountCounts(QueryPaymentAccountCountsRequest) returns (QueryPaymentAccountCountsResponse) {
+    option (google.api.http).get = "/greenfield/payment/payment_account_counts";
   }
 
-  // Queries a PaymentAccount by index.
-  rpc PaymentAccount(QueryGetPaymentAccountRequest) returns (QueryGetPaymentAccountResponse) {
+  // Queries a payment account by payment account address.
+  rpc PaymentAccount(QueryPaymentAccountRequest) returns (QueryPaymentAccountResponse) {
     option (google.api.http).get = "/greenfield/payment/payment_account/{addr}";
   }
 
-  // Queries a list of PaymentAccount items.
-  rpc PaymentAccountAll(QueryAllPaymentAccountRequest) returns (QueryAllPaymentAccountResponse) {
-    option (google.api.http).get = "/greenfield/payment/payment_account";
+  // Queries all payment accounts.
+  rpc PaymentAccounts(QueryPaymentAccountsRequest) returns (QueryPaymentAccountsResponse) {
+    option (google.api.http).get = "/greenfield/payment/payment_accounts";
   }
 
-  // Queries a list of DynamicBalance items.
+  // Queries dynamic balance of a payment account.
   rpc DynamicBalance(QueryDynamicBalanceRequest) returns (QueryDynamicBalanceResponse) {
     option (google.api.http).get = "/greenfield/payment/dynamic_balance/{account}";
   }
 
-  // Queries a list of GetPaymentAccountsByOwner items.
-  rpc GetPaymentAccountsByOwner(QueryGetPaymentAccountsByOwnerRequest) returns (QueryGetPaymentAccountsByOwnerResponse) {
-    option (google.api.http).get = "/greenfield/payment/get_payment_accounts_by_owner/{owner}";
+  // Queries all payment accounts by a owner.
+  rpc PaymentAccountsByOwner(QueryPaymentAccountsByOwnerRequest) returns (QueryPaymentAccountsByOwnerResponse) {
+    option (google.api.http).get = "/greenfield/payment/payment_accounts_by_owner/{owner}";
   }
 
-  // Queries a list of AutoSettleRecord items.
-  rpc AutoSettleRecordAll(QueryAllAutoSettleRecordRequest) returns (QueryAllAutoSettleRecordResponse) {
-    option (google.api.http).get = "/greenfield/payment/auto_settle_record";
+  // Queries all auto settle records.
+  rpc AutoSettleRecords(QueryAutoSettleRecordsRequest) returns (QueryAutoSettleRecordsResponse) {
+    option (google.api.http).get = "/greenfield/payment/auto_settle_records";
   }
 }
 
@@ -117,46 +117,46 @@ message QueryGetStreamRecordResponse {
   StreamRecord stream_record = 1 [(gogoproto.nullable) = false];
 }
 
-message QueryAllStreamRecordRequest {
+message QueryStreamRecordsRequest {
   cosmos.base.query.v1beta1.PageRequest pagination = 1;
 }
 
-message QueryAllStreamRecordResponse {
-  repeated StreamRecord stream_record = 1 [(gogoproto.nullable) = false];
+message QueryStreamRecordsResponse {
+  repeated StreamRecord stream_records = 1 [(gogoproto.nullable) = false];
   cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }
 
-message QueryGetPaymentAccountCountRequest {
+message QueryPaymentAccountCountRequest {
   string owner = 1;
 }
 
-message QueryGetPaymentAccountCountResponse {
+message QueryPaymentAccountCountResponse {
   PaymentAccountCount payment_account_count = 1 [(gogoproto.nullable) = false];
 }
 
-message QueryAllPaymentAccountCountRequest {
+message QueryPaymentAccountCountsRequest {
   cosmos.base.query.v1beta1.PageRequest pagination = 1;
 }
 
-message QueryAllPaymentAccountCountResponse {
-  repeated PaymentAccountCount payment_account_count = 1 [(gogoproto.nullable) = false];
+message QueryPaymentAccountCountsResponse {
+  repeated PaymentAccountCount payment_account_counts = 1 [(gogoproto.nullable) = false];
   cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }
 
-message QueryGetPaymentAccountRequest {
+message QueryPaymentAccountRequest {
   string addr = 1;
 }
 
-message QueryGetPaymentAccountResponse {
+message QueryPaymentAccountResponse {
   PaymentAccount payment_account = 1 [(gogoproto.nullable) = false];
 }
 
-message QueryAllPaymentAccountRequest {
+message QueryPaymentAccountsRequest {
   cosmos.base.query.v1beta1.PageRequest pagination = 1;
 }
 
-message QueryAllPaymentAccountResponse {
-  repeated PaymentAccount payment_account = 1 [(gogoproto.nullable) = false];
+message QueryPaymentAccountsResponse {
+  repeated PaymentAccount payment_accounts = 1 [(gogoproto.nullable) = false];
   cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }
 
@@ -201,19 +201,19 @@ message QueryDynamicBalanceResponse {
   ];
 }
 
-message QueryGetPaymentAccountsByOwnerRequest {
+message QueryPaymentAccountsByOwnerRequest {
   string owner = 1;
 }
 
-message QueryGetPaymentAccountsByOwnerResponse {
+message QueryPaymentAccountsByOwnerResponse {
   repeated string paymentAccounts = 1;
 }
 
-message QueryAllAutoSettleRecordRequest {
+message QueryAutoSettleRecordsRequest {
   cosmos.base.query.v1beta1.PageRequest pagination = 1;
 }
 
-message QueryAllAutoSettleRecordResponse {
-  repeated AutoSettleRecord auto_settle_record = 1 [(gogoproto.nullable) = false];
+message QueryAutoSettleRecordsResponse {
+  repeated AutoSettleRecord auto_settle_records = 1 [(gogoproto.nullable) = false];
   cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }