|
|
|
@ -62,8 +62,9 @@ func NewPublicEthereumAPI(b Backend) *PublicEthereumAPI { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// GasPrice returns a suggestion for a gas price.
|
|
|
|
|
func (s *PublicEthereumAPI) GasPrice(ctx context.Context) (*big.Int, error) { |
|
|
|
|
return s.b.SuggestPrice(ctx) |
|
|
|
|
func (s *PublicEthereumAPI) GasPrice(ctx context.Context) (*hexutil.Big, error) { |
|
|
|
|
price, err := s.b.SuggestPrice(ctx) |
|
|
|
|
return (*hexutil.Big)(price), err |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// ProtocolVersion returns the current Ethereum protocol version this node supports
|
|
|
|
@ -487,21 +488,20 @@ func NewPublicBlockChainAPI(b Backend) *PublicBlockChainAPI { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// BlockNumber returns the block number of the chain head.
|
|
|
|
|
func (s *PublicBlockChainAPI) BlockNumber() *big.Int { |
|
|
|
|
func (s *PublicBlockChainAPI) BlockNumber() hexutil.Uint64 { |
|
|
|
|
header, _ := s.b.HeaderByNumber(context.Background(), rpc.LatestBlockNumber) // latest header should always be available
|
|
|
|
|
return header.Number |
|
|
|
|
return hexutil.Uint64(header.Number.Uint64()) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// GetBalance returns the amount of wei for the given address in the state of the
|
|
|
|
|
// given block number. The rpc.LatestBlockNumber and rpc.PendingBlockNumber meta
|
|
|
|
|
// block numbers are also allowed.
|
|
|
|
|
func (s *PublicBlockChainAPI) GetBalance(ctx context.Context, address common.Address, blockNr rpc.BlockNumber) (*big.Int, error) { |
|
|
|
|
func (s *PublicBlockChainAPI) GetBalance(ctx context.Context, address common.Address, blockNr rpc.BlockNumber) (*hexutil.Big, error) { |
|
|
|
|
state, _, err := s.b.StateAndHeaderByNumber(ctx, blockNr) |
|
|
|
|
if state == nil || err != nil { |
|
|
|
|
return nil, err |
|
|
|
|
} |
|
|
|
|
b := state.GetBalance(address) |
|
|
|
|
return b, state.Error() |
|
|
|
|
return (*hexutil.Big)(state.GetBalance(address)), state.Error() |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// GetBlockByNumber returns the requested block. When blockNr is -1 the chain head is returned. When fullTx is true all
|
|
|
|
|