Merge branch 'main' into statedb-refactor

evmos · Jan 5, 2022 · 33d9d29 · 33d9d29
2 parents 02e701a + e9f1ab6
commit 33d9d29
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -69,6 +69,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (rpc) [tharsis#860](https://github.com/tharsis/ethermint/pull/860) Fix `eth_getLogs` when specify blockHash without address/topics, and limit the response size.
 * (rpc) [tharsis#865](https://github.com/tharsis/ethermint/pull/865) Fix RPC Filter parameters being ignored
 * (evm) [tharsis#871](https://github.com/tharsis/ethermint/pull/871) Set correct nonce in `EthCall` and `EstimateGas` grpc query.
+* (rpc) [tharsis#878](https://github.com/tharsis/ethermint/pull/878) Workaround to make GetBlock RPC api report correct block gas used.
 
 ## [v0.9.0] - 2021-12-01
 

diff --git a/rpc/ethereum/backend/backend.go b/rpc/ethereum/backend/backend.go
@@ -443,6 +443,11 @@ func (e *EVMBackend) EthBlockFromTendermint(
 	gasUsed := uint64(0)
 
 	for _, txsResult := range txResults {
+		// workaround for cosmos-sdk bug. https://github.com/cosmos/cosmos-sdk/issues/10832
+		if txsResult.GetCode() == 11 && txsResult.GetLog() == "no block gas left to run tx: out of gas" {
+			// block gas limit has exceeded, other txs must have failed with same reason.
+			break
+		}
 		gasUsed += uint64(txsResult.GetGasUsed())
 	}