cerc-io/laconicd-deprecated
19
0
Fork 1
Code Issues 21 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

rpc: fix panic (#611)

Browse Source 
* rpc: fix panic

* fix

* c++
This commit is contained in:
Federico Kunze Küllmer 2021-10-01 12:58:22 +02:00 committed by GitHub
parent 548bf48d7a
commit a1867a584a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -43,6 +43,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
### Bug Fixes ### Bug Fixes
* (rpc) [tharsis#611](https://github.com/tharsis/ethermint/pull/611) Fix panic on JSON-RPC when querying for an invalid block height.
* (cmd) [tharsis#483](https://github.com/tharsis/ethermint/pull/483) Use config values on genesis accounts. * (cmd) [tharsis#483](https://github.com/tharsis/ethermint/pull/483) Use config values on genesis accounts.
## [v0.6.0] - 2021-09-29 ## [v0.6.0] - 2021-09-29

15
ethereum/rpc/backend/backend.go
View File

@ -129,6 +129,11 @@ func (e *EVMBackend) GetBlockByNumber(blockNum types.BlockNumber, fullTx bool) (
return nil, err return nil, err
} }
// return if requested block height is greater than the current one
if resBlock == nil || resBlock.Block == nil {
return nil, nil
}
res, err := e.EthBlockFromTendermint(resBlock.Block, fullTx) res, err := e.EthBlockFromTendermint(resBlock.Block, fullTx)
if err != nil { if err != nil {
e.logger.Debug("EthBlockFromTendermint failed", "height", blockNum, "error", err.Error()) e.logger.Debug("EthBlockFromTendermint failed", "height", blockNum, "error", err.Error())
@ -172,18 +177,17 @@ func (e *EVMBackend) GetTendermintBlockByNumber(blockNum types.BlockNumber) (*tm
height = 1 height = 1
default: default:
if blockNum < 0 { if blockNum < 0 {
err := errors.Errorf("incorrect block height: %d", height) return nil, errors.Errorf("cannot fetch a negative block height: %d", height)
return nil, err }
} else if height > int64(currentBlockNumber) { if height > int64(currentBlockNumber) {
return nil, nil return nil, nil
} }
} }
resBlock, err := e.clientCtx.Client.Block(e.ctx, &height) resBlock, err := e.clientCtx.Client.Block(e.ctx, &height)
if err != nil { if err != nil {
// e.logger.Debug("GetBlockByNumber safely bumping down from %d to latest", height)
if resBlock, err = e.clientCtx.Client.Block(e.ctx, nil); err != nil { if resBlock, err = e.clientCtx.Client.Block(e.ctx, nil); err != nil {
e.logger.Debug("GetBlockByNumber failed to get latest block", "error", err.Error()) e.logger.Debug("tendermint client failed to get latest block", "height", height, "error", err.Error())
return nil, nil return nil, nil
} }
} }
@ -192,6 +196,7 @@ func (e *EVMBackend) GetTendermintBlockByNumber(blockNum types.BlockNumber) (*tm
e.logger.Debug("GetBlockByNumber block not found", "height", height) e.logger.Debug("GetBlockByNumber block not found", "height", height)
return nil, nil return nil, nil
} }
return resBlock, nil return resBlock, nil
} }