|
|
@ -52,17 +52,17 @@ func NewPublicEthereumAPI(e *Ethereum) *PublicEthereumAPI { |
|
|
|
return &PublicEthereumAPI{e} |
|
|
|
return &PublicEthereumAPI{e} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Etherbase is the address that mining rewards will be send to
|
|
|
|
// Etherbase is the address that mining rewards will be send to.
|
|
|
|
func (api *PublicEthereumAPI) Etherbase() (common.Address, error) { |
|
|
|
func (api *PublicEthereumAPI) Etherbase() (common.Address, error) { |
|
|
|
return api.e.Etherbase() |
|
|
|
return api.e.Etherbase() |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Coinbase is the address that mining rewards will be send to (alias for Etherbase)
|
|
|
|
// Coinbase is the address that mining rewards will be send to (alias for Etherbase).
|
|
|
|
func (api *PublicEthereumAPI) Coinbase() (common.Address, error) { |
|
|
|
func (api *PublicEthereumAPI) Coinbase() (common.Address, error) { |
|
|
|
return api.Etherbase() |
|
|
|
return api.Etherbase() |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Hashrate returns the POW hashrate
|
|
|
|
// Hashrate returns the POW hashrate.
|
|
|
|
func (api *PublicEthereumAPI) Hashrate() hexutil.Uint64 { |
|
|
|
func (api *PublicEthereumAPI) Hashrate() hexutil.Uint64 { |
|
|
|
return hexutil.Uint64(api.e.Miner().Hashrate()) |
|
|
|
return hexutil.Uint64(api.e.Miner().Hashrate()) |
|
|
|
} |
|
|
|
} |
|
|
@ -136,7 +136,7 @@ func (api *PrivateMinerAPI) SetGasLimit(gasLimit hexutil.Uint64) bool { |
|
|
|
return true |
|
|
|
return true |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// SetEtherbase sets the etherbase of the miner
|
|
|
|
// SetEtherbase sets the etherbase of the miner.
|
|
|
|
func (api *PrivateMinerAPI) SetEtherbase(etherbase common.Address) bool { |
|
|
|
func (api *PrivateMinerAPI) SetEtherbase(etherbase common.Address) bool { |
|
|
|
api.e.SetEtherbase(etherbase) |
|
|
|
api.e.SetEtherbase(etherbase) |
|
|
|
return true |
|
|
|
return true |
|
|
@ -160,7 +160,7 @@ func NewPrivateAdminAPI(eth *Ethereum) *PrivateAdminAPI { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// ExportChain exports the current blockchain into a local file,
|
|
|
|
// ExportChain exports the current blockchain into a local file,
|
|
|
|
// or a range of blocks if first and last are non-nil
|
|
|
|
// or a range of blocks if first and last are non-nil.
|
|
|
|
func (api *PrivateAdminAPI) ExportChain(file string, first *uint64, last *uint64) (bool, error) { |
|
|
|
func (api *PrivateAdminAPI) ExportChain(file string, first *uint64, last *uint64) (bool, error) { |
|
|
|
if first == nil && last != nil { |
|
|
|
if first == nil && last != nil { |
|
|
|
return false, errors.New("last cannot be specified without first") |
|
|
|
return false, errors.New("last cannot be specified without first") |
|
|
@ -328,7 +328,7 @@ type BadBlockArgs struct { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// GetBadBlocks returns a list of the last 'bad blocks' that the client has seen on the network
|
|
|
|
// GetBadBlocks returns a list of the last 'bad blocks' that the client has seen on the network
|
|
|
|
// and returns them as a JSON list of block-hashes
|
|
|
|
// and returns them as a JSON list of block hashes.
|
|
|
|
func (api *PrivateDebugAPI) GetBadBlocks(ctx context.Context) ([]*BadBlockArgs, error) { |
|
|
|
func (api *PrivateDebugAPI) GetBadBlocks(ctx context.Context) ([]*BadBlockArgs, error) { |
|
|
|
var ( |
|
|
|
var ( |
|
|
|
err error |
|
|
|
err error |
|
|
|