fix grpc

crypto-org-chain · Mar 7, 2024 · 1790ad7 · 1790ad7
1 parent 0795efe
commit 1790ad7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/x/evm/keeper/grpc_query.go b/x/evm/keeper/grpc_query.go
@@ -124,8 +124,11 @@ func (k Keeper) ValidatorAccount(c context.Context, req *types.QueryValidatorAcc
 		return nil, fmt.Errorf("validator not found for %s, %w", consAddr.String(), err)
 	}
 
-	accAddr := sdk.AccAddress(validator.GetOperator())
-
+	bz, err := sdk.ValAddressFromBech32(validator.GetOperator())
+	if err != nil {
+		return nil, err
+	}
+	accAddr := sdk.AccAddress(bz)
 	res := types.QueryValidatorAccountResponse{
 		AccountAddress: accAddr.String(),
 	}

diff --git a/x/evm/keeper/grpc_query_test.go b/x/evm/keeper/grpc_query_test.go
@@ -111,7 +111,7 @@ func (suite *GRPCServerTestSuiteSuite) Commit() {
 	})
 
 	// update ctx
-	suite.Ctx = suite.App.BaseApp.NewContext(false).WithBlockHeader(header)
+	suite.Ctx = suite.App.BaseApp.NewUncachedContext(false, header).WithChainID(app.ChainID)
 	queryHelper := baseapp.NewQueryServerTestHelper(suite.Ctx, suite.App.InterfaceRegistry())
 	types.RegisterQueryServer(queryHelper, suite.App.EvmKeeper)
 	suite.queryClient = types.NewQueryClient(queryHelper)
@@ -278,7 +278,7 @@ func (suite *GRPCServerTestSuiteSuite) TestQueryCosmosAccount() {
 				expAccount = &types.QueryCosmosAccountResponse{
 					CosmosAddress: sdk.AccAddress(suite.Address.Bytes()).String(),
 					Sequence:      0,
-					AccountNumber: 0,
+					AccountNumber: suite.App.AccountKeeper.NextAccountNumber(suite.Ctx) - 1,
 				}
 				req = &types.QueryCosmosAccountRequest{
 					Address: suite.Address.String(),
@@ -291,13 +291,13 @@ func (suite *GRPCServerTestSuiteSuite) TestQueryCosmosAccount() {
 			func() {
 				acc := suite.App.AccountKeeper.GetAccount(suite.Ctx, suite.Address.Bytes())
 				suite.Require().NoError(acc.SetSequence(10))
-				suite.Require().NoError(acc.SetAccountNumber(1))
+				num := suite.App.AccountKeeper.NextAccountNumber(suite.Ctx)
+				suite.Require().NoError(acc.SetAccountNumber(num))
 				suite.App.AccountKeeper.SetAccount(suite.Ctx, acc)
-
 				expAccount = &types.QueryCosmosAccountResponse{
 					CosmosAddress: sdk.AccAddress(suite.Address.Bytes()).String(),
 					Sequence:      10,
-					AccountNumber: 1,
+					AccountNumber: num,
 				}
 				req = &types.QueryCosmosAccountRequest{
 					Address: suite.Address.String(),
@@ -594,7 +594,7 @@ func (suite *GRPCServerTestSuiteSuite) TestQueryValidatorAccount() {
 				expAccount = &types.QueryValidatorAccountResponse{
 					AccountAddress: sdk.AccAddress(suite.Address.Bytes()).String(),
 					Sequence:       0,
-					AccountNumber:  0,
+					AccountNumber:  suite.App.AccountKeeper.NextAccountNumber(suite.Ctx) - 1,
 				}
 				req = &types.QueryValidatorAccountRequest{
 					ConsAddress: suite.consAddress.String(),
@@ -607,13 +607,13 @@ func (suite *GRPCServerTestSuiteSuite) TestQueryValidatorAccount() {
 			func() {
 				acc := suite.App.AccountKeeper.GetAccount(suite.Ctx, suite.Address.Bytes())
 				suite.Require().NoError(acc.SetSequence(10))
-				suite.Require().NoError(acc.SetAccountNumber(1))
+				num := suite.App.AccountKeeper.NextAccountNumber(suite.Ctx)
+				suite.Require().NoError(acc.SetAccountNumber(num))
 				suite.App.AccountKeeper.SetAccount(suite.Ctx, acc)
-
 				expAccount = &types.QueryValidatorAccountResponse{
 					AccountAddress: sdk.AccAddress(suite.Address.Bytes()).String(),
 					Sequence:       10,
-					AccountNumber:  1,
+					AccountNumber:  num,
 				}
 				req = &types.QueryValidatorAccountRequest{
 					ConsAddress: suite.consAddress.String(),