RanchiMall/blockbook
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Annotate error in eth rpc

Browse Source
This commit is contained in:
Martin Boehm 2018-03-26 18:14:26 +02:00
parent 3169446adb
commit a4b9a21445
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bchain/coins/eth/ethrpc.go
View File

@ -160,7 +160,7 @@ func (b *EthRPC) GetBlockHash(height uint32) (string, error) {
if err == ethereum.NotFound { if err == ethereum.NotFound {
return "", bchain.ErrBlockNotFound return "", bchain.ErrBlockNotFound
} }
return "", err return "", errors.Annotatef(err, "height %v", height)
} }
return ethHashToHash(h.Hash()), nil return ethHashToHash(h.Hash()), nil
} }
@ -189,7 +189,7 @@ func (b *EthRPC) GetBlockHeader(hash string) (*bchain.BlockHeader, error) {
if err == ethereum.NotFound { if err == ethereum.NotFound {
return nil, bchain.ErrBlockNotFound return nil, bchain.ErrBlockNotFound
} }
return nil, err return nil, errors.Annotatef(err, "hash %v", hash)
} }
return b.ethHeaderToBlockHeader(h) return b.ethHeaderToBlockHeader(h)
} }
@ -298,7 +298,7 @@ func (b *EthRPC) GetBlock(hash string, height uint32) (*bchain.Block, error) {
err = b.rpc.CallContext(ctx, &raw, "eth_getBlockByNumber", fmt.Sprintf("%#x", height), true) err = b.rpc.CallContext(ctx, &raw, "eth_getBlockByNumber", fmt.Sprintf("%#x", height), true)
} }
if err != nil { if err != nil {
return nil, err return nil, errors.Annotatef(err, "hash %v, height %v", hash, height)
} else if len(raw) == 0 { } else if len(raw) == 0 {
return nil, bchain.ErrBlockNotFound return nil, bchain.ErrBlockNotFound
} }
@ -306,33 +306,33 @@ func (b *EthRPC) GetBlock(hash string, height uint32) (*bchain.Block, error) {
var head *ethtypes.Header var head *ethtypes.Header
var body rpcBlock var body rpcBlock
if err := json.Unmarshal(raw, &head); err != nil { if err := json.Unmarshal(raw, &head); err != nil {
return nil, err return nil, errors.Annotatef(err, "hash %v, height %v", hash, height)
} }
if head == nil { if head == nil {
return nil, bchain.ErrBlockNotFound return nil, bchain.ErrBlockNotFound
} }
if err := json.Unmarshal(raw, &body); err != nil { if err := json.Unmarshal(raw, &body); err != nil {
return nil, err return nil, errors.Annotatef(err, "hash %v, height %v", hash, height)
} }
// Quick-verify transaction and uncle lists. This mostly helps with debugging the server. // Quick-verify transaction and uncle lists. This mostly helps with debugging the server.
if head.UncleHash == ethtypes.EmptyUncleHash && len(body.UncleHashes) > 0 { if head.UncleHash == ethtypes.EmptyUncleHash && len(body.UncleHashes) > 0 {
return nil, fmt.Errorf("server returned non-empty uncle list but block header indicates no uncles") return nil, errors.Annotatef(fmt.Errorf("server returned non-empty uncle list but block header indicates no uncles"), "hash %v, height %v", hash, height)
} }
if head.UncleHash != ethtypes.EmptyUncleHash && len(body.UncleHashes) == 0 { if head.UncleHash != ethtypes.EmptyUncleHash && len(body.UncleHashes) == 0 {
return nil, fmt.Errorf("server returned empty uncle list but block header indicates uncles") return nil, errors.Annotatef(fmt.Errorf("server returned empty uncle list but block header indicates uncles"), "hash %v, height %v", hash, height)
} }
if head.TxHash == ethtypes.EmptyRootHash && len(body.Transactions) > 0 { if head.TxHash == ethtypes.EmptyRootHash && len(body.Transactions) > 0 {
return nil, fmt.Errorf("server returned non-empty transaction list but block header indicates no transactions") return nil, errors.Annotatef(fmt.Errorf("server returned non-empty transaction list but block header indicates no transactions"), "hash %v, height %v", hash, height)
} }
if head.TxHash != ethtypes.EmptyRootHash && len(body.Transactions) == 0 { if head.TxHash != ethtypes.EmptyRootHash && len(body.Transactions) == 0 {
return nil, fmt.Errorf("server returned empty transaction list but block header indicates transactions") return nil, errors.Annotatef(fmt.Errorf("server returned empty transaction list but block header indicates transactions"), "hash %v, height %v", hash, height)
} }
bbh, err := b.ethHeaderToBlockHeader(head) bbh, err := b.ethHeaderToBlockHeader(head)
btxs := make([]bchain.Tx, len(body.Transactions)) btxs := make([]bchain.Tx, len(body.Transactions))
for i, tx := range body.Transactions { for i, tx := range body.Transactions {
btx, err := ethTxToTx(&tx, int64(head.Time.Uint64()), uint32(bbh.Confirmations)) btx, err := ethTxToTx(&tx, int64(head.Time.Uint64()), uint32(bbh.Confirmations))
if err != nil { if err != nil {
return nil, err return nil, errors.Annotatef(err, "hash %v, height %v, txid %v", hash, height, tx.Hash.String())
} }
btxs[i] = *btx btxs[i] = *btx
} }
@ -353,32 +353,32 @@ func (b *EthRPC) GetTransaction(txid string) (*bchain.Tx, error) {
} else if tx == nil { } else if tx == nil {
return nil, ethereum.NotFound return nil, ethereum.NotFound
} else if tx.R == "" { } else if tx.R == "" {
return nil, fmt.Errorf("server returned transaction without signature") return nil, errors.Annotatef(fmt.Errorf("server returned transaction without signature"), "txid %v", txid)
} }
var btx *bchain.Tx var btx *bchain.Tx
if tx.BlockNumber == "" { if tx.BlockNumber == "" {
// mempool tx // mempool tx
btx, err = ethTxToTx(tx, 0, 0) btx, err = ethTxToTx(tx, 0, 0)
if err != nil { if err != nil {
return nil, err return nil, errors.Annotatef(err, "txid %v", txid)
} }
} else { } else {
// non mempool tx - we must read the block header to get the block time // non mempool tx - we must read the block header to get the block time
n, err := ethNumber(tx.BlockNumber) n, err := ethNumber(tx.BlockNumber)
if err != nil { if err != nil {
return nil, err return nil, errors.Annotatef(err, "txid %v", txid)
} }
h, err := b.client.HeaderByHash(ctx, tx.BlockHash) h, err := b.client.HeaderByHash(ctx, tx.BlockHash)
if err != nil { if err != nil {
return nil, err return nil, errors.Annotatef(err, "txid %v", txid)
} }
confirmations, err := b.computeConfirmations(uint64(n)) confirmations, err := b.computeConfirmations(uint64(n))
if err != nil { if err != nil {
return nil, err return nil, errors.Annotatef(err, "txid %v", txid)
} }
btx, err = ethTxToTx(tx, h.Time.Int64(), confirmations) btx, err = ethTxToTx(tx, h.Time.Int64(), confirmations)
if err != nil { if err != nil {
return nil, err return nil, errors.Annotatef(err, "txid %v", txid)
} }
} }
return btx, nil return btx, nil