Skip to content
This repository has been archived by the owner on Apr 4, 2024. It is now read-only.

Fix get block #781

Merged
merged 7 commits into from
Nov 26, 2021
Merged

Fix get block #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9693909
filter block txs by block result
crypto-facs Nov 25, 2021
b388f5d
filter block txs by block result
crypto-facs Nov 25, 2021
5b1934f
Merge branch 'main' into fix-get-block
fedekunze Nov 25, 2021
3edc00e
update changelog
crypto-facs Nov 26, 2021
db882cf
Merge branch 'fix-get-block' of github.com:crypto-facs/ethermint into…
crypto-facs Nov 26, 2021
4cf7cc3
Merge branch 'main' of github.com:tharsis/ethermint
crypto-facs Nov 26, 2021
693d17c
update changelog
crypto-facs Nov 26, 2021
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ Ref: https://keepachangelog.com/en/1.0.0/

* (feemarket) [tharsis#770](https://github.com/tharsis/ethermint/pull/770) Enable fee market (EIP1559) by default.
* (rpc) [tharsis#769](https://github.com/tharsis/ethermint/pull/769) Fix default Ethereum signer for JSON-RPC.
* (rpc) [tharsis#781](https://github.com/tharsis/ethermint/pull/781) Fix get block invalid transactions filter.
* (rpc) [tharsis#782](https://github.com/tharsis/ethermint/pull/782) Fix wrong block gas limit returned by JSON-RPC.

## [v0.8.0] - 2021-11-17
Expand Down
22 changes: 11 additions & 11 deletions rpc/ethereum/backend/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,13 @@ func (e *EVMBackend) EthBlockFromTendermint(
return nil, err
}

resBlockResult, err := e.clientCtx.Client.BlockResults(ctx, &block.Height)
if err != nil {
return nil, err
}

txResults := resBlockResult.TxsResults

for i, txBz := range block.Txs {
tx, err := e.clientCtx.TxConfig.TxDecoder()(txBz)
if err != nil {
Expand All @@ -375,10 +382,9 @@ func (e *EVMBackend) EthBlockFromTendermint(

tx := ethMsg.AsTransaction()

// check tx exists on EVM and it has the correct block height
ethTx, err := e.GetTxByEthHash(tx.Hash())
if err != nil || ethTx.Height != block.Height {
e.logger.Debug("failed to query eth tx", "hash", tx.Hash().Hex())
// check tx exists on EVM by cross checking with blockResults
if txResults[i].Code != 0 {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if Code is not 0, it's EVM tx?
maybe add some comment about it

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if Code != 0, it's a failed transaction.

e.logger.Debug("invalid tx result code", "hash", tx.Hash().Hex())
continue
}

Expand Down Expand Up @@ -435,15 +441,9 @@ func (e *EVMBackend) EthBlockFromTendermint(
e.logger.Error("failed to query consensus params", "error", err.Error())
}

resBlockResult, err := e.clientCtx.Client.BlockResults(e.ctx, &block.Height)
if err != nil {
e.logger.Debug("EthBlockFromTendermint block result not found", "height", block.Height, "error", err.Error())
return nil, err
}

gasUsed := uint64(0)

for _, txsResult := range resBlockResult.TxsResults {
for _, txsResult := range txResults {
gasUsed += uint64(txsResult.GetGasUsed())
}

Expand Down