fix balance overflow in rpc response

Closes #218
yihuang · Jul 2, 2021 · 40981c8 · 40981c8
1 parent f7d975a
commit 40981c8
Show file tree

Hide file tree

Showing 8 changed files with 408 additions and 187 deletions.
diff --git a/client/docs/statik/statik.go b/client/docs/statik/statik.go
diff --git a/client/docs/swagger-ui/swagger.yaml b/client/docs/swagger-ui/swagger.yaml
diff --git a/docs/core/proto-docs.md b/docs/core/proto-docs.md
@@ -390,7 +390,7 @@ QueryAccountResponse is the response type for the Query/Account RPC method.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `balance` | [int64](#int64) |  | balance is the balance of the EVM denomination. |
+| `balance` | [string](#string) |  | balance is the balance of the EVM denomination. |
 | `code_hash` | [string](#string) |  | code hash is the hex-formatted code bytes from the EOA. |
 | `nonce` | [uint64](#uint64) |  | nonce is the account's sequence number. |
 
@@ -422,7 +422,7 @@ QueryBalanceResponse is the response type for the Query/Balance RPC method.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `balance` | [int64](#int64) |  | balance is the balance of the EVM denomination. |
+| `balance` | [string](#string) |  | balance is the balance of the EVM denomination. |
 
 
 

diff --git a/ethereum/rpc/namespaces/eth/api.go b/ethereum/rpc/namespaces/eth/api.go
@@ -215,7 +215,12 @@ func (e *PublicAPI) GetBalance(address common.Address, blockNum rpctypes.BlockNu
 		return nil, err
 	}
 
-	return (*hexutil.Big)(big.NewInt(res.Balance)), nil
+	val, ok := sdk.NewIntFromString(res.Balance)
+	if !ok {
+		return nil, errors.New("invalid balance")
+	}
+
+	return (*hexutil.Big)(val.BigInt()), nil
 }
 
 // GetStorageAt returns the contract storage at the given address, block number, and key.
@@ -992,10 +997,15 @@ func (e *PublicAPI) GetProof(address common.Address, storageKeys []string, block
 		accProofStr = proof.String()
 	}
 
+	balance, ok := sdk.NewIntFromString(res.Balance)
+	if !ok {
+		return nil, errors.New("invalid balance")
+	}
+
 	return &rpctypes.AccountResult{
 		Address:      address,
 		AccountProof: []string{accProofStr},
-		Balance:      (*hexutil.Big)(big.NewInt(res.Balance)),
+		Balance:      (*hexutil.Big)(balance.BigInt()),
 		CodeHash:     common.HexToHash(res.CodeHash),
 		Nonce:        hexutil.Uint64(res.Nonce),
 		StorageHash:  common.Hash{}, // NOTE: Ethermint doesn't have a storage hash. TODO: implement?

diff --git a/proto/ethermint/evm/v1alpha1/query.proto b/proto/ethermint/evm/v1alpha1/query.proto
@@ -79,7 +79,7 @@ message QueryAccountRequest {
 // QueryAccountResponse is the response type for the Query/Account RPC method.
 message QueryAccountResponse {
   // balance is the balance of the EVM denomination.
-  int64 balance = 1;
+  string balance = 1;
   // code hash is the hex-formatted code bytes from the EOA.
   string code_hash = 2;
   // nonce is the account's sequence number.
@@ -136,7 +136,7 @@ message QueryBalanceRequest {
 // QueryBalanceResponse is the response type for the Query/Balance RPC method.
 message QueryBalanceResponse {
   // balance is the balance of the EVM denomination.
-  int64 balance = 1;
+  string balance = 1;
 }
 
 // QueryStorageRequest is the request type for the Query/Storage RPC method.

diff --git a/x/evm/keeper/grpc_query.go b/x/evm/keeper/grpc_query.go
@@ -36,7 +36,7 @@ func (k Keeper) Account(c context.Context, req *types.QueryAccountRequest) (*typ
 	k.WithContext(ctx)
 
 	return &types.QueryAccountResponse{
-		Balance:  k.GetBalance(addr).Int64(),
+		Balance:  k.GetBalance(addr).String(),
 		CodeHash: k.GetCodeHash(addr).Hex(),
 		Nonce:    k.GetNonce(addr),
 	}, nil
@@ -127,7 +127,7 @@ func (k Keeper) Balance(c context.Context, req *types.QueryBalanceRequest) (*typ
 	balanceInt := k.GetBalance(ethcmn.HexToAddress(req.Address))
 
 	return &types.QueryBalanceResponse{
-		Balance: balanceInt.Int64(),
+		Balance: balanceInt.String(),
 	}, nil
 }
 

diff --git a/x/evm/keeper/grpc_query_test.go b/x/evm/keeper/grpc_query_test.go
@@ -36,7 +36,7 @@ func (suite *KeeperTestSuite) TestQueryAccount() {
 			"invalid address",
 			func() {
 				expAccount = &types.QueryAccountResponse{
-					Balance:  0,
+					Balance:  "0",
 					CodeHash: common.BytesToHash(ethcrypto.Keccak256(nil)).Hex(),
 					Nonce:    0,
 				}
@@ -56,7 +56,7 @@ func (suite *KeeperTestSuite) TestQueryAccount() {
 				suite.Require().NoError(err)
 
 				expAccount = &types.QueryAccountResponse{
-					Balance:  100,
+					Balance:  "100",
 					CodeHash: common.BytesToHash(ethcrypto.Keccak256(nil)).Hex(),
 					Nonce:    0,
 				}
@@ -168,7 +168,7 @@ func (suite *KeeperTestSuite) TestQueryCosmosAccount() {
 func (suite *KeeperTestSuite) TestQueryBalance() {
 	var (
 		req        *types.QueryBalanceRequest
-		expBalance int64
+		expBalance string
 	)
 
 	testCases := []struct {
@@ -178,7 +178,7 @@ func (suite *KeeperTestSuite) TestQueryBalance() {
 	}{
 		{"invalid address",
 			func() {
-				expBalance = 0
+				expBalance = "0"
 				req = &types.QueryBalanceRequest{
 					Address: invalidAddress,
 				}
@@ -194,7 +194,7 @@ func (suite *KeeperTestSuite) TestQueryBalance() {
 				err = suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, suite.address.Bytes(), amt)
 				suite.Require().NoError(err)
 
-				expBalance = 100
+				expBalance = "100"
 				req = &types.QueryBalanceRequest{
 					Address: suite.address.String(),
 				}