forked from cerc-io/plugeth
ethclient: ensure tx json is not nil before accessing it (#19653)
TransactionInBlock crashed if json was nil and there was an error because it tried to access fields `From` and `BlockHash` of the nil object.
This commit is contained in:
parent
17381ecc66
commit
15f24ff189
@ -241,13 +241,14 @@ func (ec *Client) TransactionCount(ctx context.Context, blockHash common.Hash) (
|
|||||||
func (ec *Client) TransactionInBlock(ctx context.Context, blockHash common.Hash, index uint) (*types.Transaction, error) {
|
func (ec *Client) TransactionInBlock(ctx context.Context, blockHash common.Hash, index uint) (*types.Transaction, error) {
|
||||||
var json *rpcTransaction
|
var json *rpcTransaction
|
||||||
err := ec.c.CallContext(ctx, &json, "eth_getTransactionByBlockHashAndIndex", blockHash, hexutil.Uint64(index))
|
err := ec.c.CallContext(ctx, &json, "eth_getTransactionByBlockHashAndIndex", blockHash, hexutil.Uint64(index))
|
||||||
if err == nil {
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
if json == nil {
|
if json == nil {
|
||||||
return nil, ethereum.NotFound
|
return nil, ethereum.NotFound
|
||||||
} else if _, r, _ := json.tx.RawSignatureValues(); r == nil {
|
} else if _, r, _ := json.tx.RawSignatureValues(); r == nil {
|
||||||
return nil, fmt.Errorf("server returned transaction without signature")
|
return nil, fmt.Errorf("server returned transaction without signature")
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if json.From != nil && json.BlockHash != nil {
|
if json.From != nil && json.BlockHash != nil {
|
||||||
setSenderFromServer(json.tx, *json.From, *json.BlockHash)
|
setSenderFromServer(json.tx, *json.From, *json.BlockHash)
|
||||||
}
|
}
|
||||||
|
@ -301,3 +301,21 @@ func TestBalanceAt(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestTransactionInBlockInterrupted(t *testing.T) {
|
||||||
|
backend, _ := newTestBackend(t)
|
||||||
|
client, _ := backend.Attach()
|
||||||
|
defer backend.Stop()
|
||||||
|
defer client.Close()
|
||||||
|
|
||||||
|
ec := NewClient(client)
|
||||||
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
cancel()
|
||||||
|
tx, err := ec.TransactionInBlock(ctx, common.Hash{1}, 1)
|
||||||
|
if tx != nil {
|
||||||
|
t.Fatal("transaction should be nil")
|
||||||
|
}
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("error should not be nil")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user