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

rpc: fix eth_getBlockByNumber (#78)

Browse Source
This commit is contained in:
Federico Kunze 2021-06-07 07:02:52 -04:00 committed by GitHub
parent 1ff3c46663
commit fcb7c114d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ethereum/rpc/backend.go
View File

@ -137,13 +137,14 @@ func (e *EVMBackend) EthBlockFromTendermint(
txReceiptsResp, err := queryClient.TxReceiptsByBlockHeight(types.ContextWithHeight(block.Height), req) txReceiptsResp, err := queryClient.TxReceiptsByBlockHeight(types.ContextWithHeight(block.Height), req)
if err != nil { if err != nil {
e.logger.Debugf("TxReceiptsByBlockHeight fail: %s", err.Error()) e.logger.WithError(err).Debugln("TxReceiptsByBlockHeight failed")
return nil, err
} }
gasUsed := big.NewInt(0) gasUsed := big.NewInt(0)
ethRPCTxs := make([]interface{}, 0, len(txReceiptsResp.Receipts)) ethRPCTxs := []interface{}{}
if txReceiptsResp != nil {
for _, receipt := range txReceiptsResp.Receipts { for _, receipt := range txReceiptsResp.Receipts {
hash := common.HexToHash(receipt.Hash) hash := common.HexToHash(receipt.Hash)
@ -170,11 +171,13 @@ func (e *EVMBackend) EthBlockFromTendermint(
ethRPCTxs = append(ethRPCTxs, hash) ethRPCTxs = append(ethRPCTxs, hash)
} }
} }
}
blockBloomResp, err := queryClient.BlockBloom(types.ContextWithHeight(block.Height), &evmtypes.QueryBlockBloomRequest{}) blockBloomResp, err := queryClient.BlockBloom(types.ContextWithHeight(block.Height), &evmtypes.QueryBlockBloomRequest{})
if err != nil { if err != nil {
e.logger.WithError(err).Debugln("failed to query BlockBloom at height", block.Height) e.logger.WithError(err).Debugln("failed to query BlockBloom", "height", block.Height)
blockBloomResp.Bloom = ethtypes.Bloom{}.Bytes()
blockBloomResp = &evmtypes.QueryBlockBloomResponse{Bloom: ethtypes.Bloom{}.Bytes()}
} }
bloom := ethtypes.BytesToBloom(blockBloomResp.Bloom) bloom := ethtypes.BytesToBloom(blockBloomResp.Bloom)

2
ethereum/rpc/types/utils.go
View File

@ -199,7 +199,7 @@ func FormatBlock(
"receiptsRoot": ethtypes.EmptyRootHash, "receiptsRoot": ethtypes.EmptyRootHash,
"uncles": []common.Hash{}, "uncles": []common.Hash{},
"transactions": transactions.([]common.Hash), "transactions": transactions,
"totalDifficulty": (*hexutil.Big)(big.NewInt(0)), "totalDifficulty": (*hexutil.Big)(big.NewInt(0)),
} }
} }