|
|
@ -102,9 +102,10 @@ func (ec *Client) PeerCount(ctx context.Context) (uint64, error) { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
type rpcBlock struct { |
|
|
|
type rpcBlock struct { |
|
|
|
Hash common.Hash `json:"hash"` |
|
|
|
Hash common.Hash `json:"hash"` |
|
|
|
Transactions []rpcTransaction `json:"transactions"` |
|
|
|
Transactions []rpcTransaction `json:"transactions"` |
|
|
|
UncleHashes []common.Hash `json:"uncles"` |
|
|
|
UncleHashes []common.Hash `json:"uncles"` |
|
|
|
|
|
|
|
Withdrawals []*types.Withdrawal `json:"withdrawals,omitempty"` |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
func (ec *Client) getBlock(ctx context.Context, method string, args ...interface{}) (*types.Block, error) { |
|
|
|
func (ec *Client) getBlock(ctx context.Context, method string, args ...interface{}) (*types.Block, error) { |
|
|
@ -169,7 +170,7 @@ func (ec *Client) getBlock(ctx context.Context, method string, args ...interface |
|
|
|
} |
|
|
|
} |
|
|
|
txs[i] = tx.tx |
|
|
|
txs[i] = tx.tx |
|
|
|
} |
|
|
|
} |
|
|
|
return types.NewBlockWithHeader(head).WithBody(txs, uncles), nil |
|
|
|
return types.NewBlockWithHeader(head).WithBody(txs, uncles).WithWithdrawals(body.Withdrawals), nil |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// HeaderByHash returns the block header with the given hash.
|
|
|
|
// HeaderByHash returns the block header with the given hash.
|
|
|
|