Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Problem: Int64 is not checked in gas related api #425

Merged
merged 3 commits into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
- (evm) [#405](https://github.com/crypto-org-chain/ethermint/pull/405) Avoid duplicate cache events emitted from evm hooks.
- (rpc) [#406](https://github.com/crypto-org-chain/ethermint/pull/406) Align filter rule for eth_getLogs when toBlock is newer than latest or extract error occurs.
- (rpc) [#409](https://github.com/crypto-org-chain/ethermint/pull/409) Fix nextBaseFee in eth_feeHistory before fee market param change.
- (rpc) [#425](https://github.com/crypto-org-chain/ethermint/pull/425) Avoid Int64() out of bound error in gas related api.

### Improvements

Expand Down
2 changes: 1 addition & 1 deletion rpc/backend/chain_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ func (b *Backend) FeeHistory(
// Although we don't support tx prioritization yet, but we return a positive value to help client to
// mitigate the base fee changes.
func (b *Backend) SuggestGasTipCap(baseFee *big.Int) (*big.Int, error) {
if baseFee == nil {
mmsqe marked this conversation as resolved.
Show resolved Hide resolved
if baseFee == nil || !baseFee.IsInt64() {
// london hardfork not enabled or feemarket not enabled
return big.NewInt(0), nil
}
Expand Down
6 changes: 3 additions & 3 deletions rpc/backend/node_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -345,10 +345,10 @@
}

minGasPrice := b.cfg.GetMinGasPrices()
amt := minGasPrice.AmountOf(evmParams.Params.EvmDenom).TruncateInt64()
if amt == 0 {
amt := minGasPrice.AmountOf(evmParams.Params.EvmDenom).TruncateInt()
if !amt.IsInt64() || amt.IsZero() {
return ethermint.DefaultGasPrice
}

return amt
return amt.Int64()

Check warning on line 353 in rpc/backend/node_info.go

View check run for this annotation

Codecov / codecov/patch

rpc/backend/node_info.go#L353

Added line #L353 was not covered by tests
mmsqe marked this conversation as resolved.
Show resolved Hide resolved
}
12 changes: 12 additions & 0 deletions rpc/backend/node_info_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"math/big"

"cosmossdk.io/math"
tmrpcclient "github.com/cometbft/cometbft/rpc/client"
sdk "github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
Expand Down Expand Up @@ -41,6 +42,17 @@ func (suite *BackendTestSuite) TestRPCMinGasPrice() {
ethermint.DefaultGasPrice,
true,
},
{
"pass - min gas price exceeds math.MaxUint64",
func() {
queryClient := suite.backend.queryClient.QueryClient.(*mocks.EVMQueryClient)
RegisterParamsWithoutHeader(queryClient, 1)
amt, _ := math.NewIntFromString("18446744073709551616")
suite.backend.cfg.SetMinGasPrices([]sdk.DecCoin{sdk.NewDecCoin(ethermint.AttoPhoton, amt)})
},
ethermint.DefaultGasPrice,
true,
},
}

for _, tc := range testCases {
Expand Down
Loading