forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 23:26:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge 5a9891bab8 into 431cf2a1e4

Browse source
This commit is contained in:
Jim McDonald 2017-06-20 15:29:08 +00:00 committed by GitHub
commit de9b25a755
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ethclient/ethclient.go
View file

@ -167,11 +167,11 @@ func (ec *Client) TransactionByHash(ctx context.Context, hash common.Hash) (tx *
} else if _, r, _ := tx.RawSignatureValues(); r == nil { } else if _, r, _ := tx.RawSignatureValues(); r == nil {
return nil, false, fmt.Errorf("server returned transaction without signature") return nil, false, fmt.Errorf("server returned transaction without signature")
} }
var block struct{ BlockHash *common.Hash } var block struct{ BlockNumber *string }
if err := json.Unmarshal(raw, &block); err != nil { if err := json.Unmarshal(raw, &block); err != nil {
return nil, false, err return nil, false, err
} }
return tx, block.BlockHash == nil, nil return tx, block.BlockNumber == nil, nil
} }
// TransactionCount returns the total number of transactions in the given block. // TransactionCount returns the total number of transactions in the given block.