diff --git a/Makefile b/Makefile index e93e688dbb..1bec6a23e0 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ IGNORE_CHECK_GO=false install_rocksdb_version:=$(ROCKSDB_VERSION) -Version=v1.6.7.3 +Version=v1.6.7.4 CosmosSDK=v0.39.2 Tendermint=v0.33.9 Iavl=v0.14.3 diff --git a/app/rpc/namespaces/eth/api.go b/app/rpc/namespaces/eth/api.go index 60d96cefcc..a5eff039fa 100644 --- a/app/rpc/namespaces/eth/api.go +++ b/app/rpc/namespaces/eth/api.go @@ -505,14 +505,14 @@ func (api *PublicEthereumAPI) GetTransactionCount(address common.Address, blockN monitor := monitor.GetMonitor("eth_getTransactionCount", api.logger, api.Metrics).OnBegin() defer monitor.OnEnd("address", address, "block number", blockNrOrHash) - var err error - blockNum := rpctypes.LatestBlockNumber + blockNum, err := api.backend.ConvertToBlockNumber(blockNrOrHash) + if err != nil { + return nil, err + } + // do not support block number param when node is pruning everything - if !api.backend.PruneEverything() { - blockNum, err = api.backend.ConvertToBlockNumber(blockNrOrHash) - if err != nil { - return nil, err - } + if api.backend.PruneEverything() && blockNum != rpctypes.PendingBlockNumber { + blockNum = rpctypes.LatestBlockNumber } clientCtx := api.clientCtx