Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get logs #1028

Merged
merged 24 commits into from
Sep 3, 2020
Merged

Get logs #1028

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e87e64f
it compiles
JekaMas Sep 1, 2020
32b6b21
Merge branch 'master' into getLogs
JekaMas Sep 1, 2020
18f6b8a
after recent master
JekaMas Sep 1, 2020
39756b2
fix linters warnings
JekaMas Sep 2, 2020
c3626c1
grpc
JekaMas Sep 2, 2020
07cccf1
grpcV7
JekaMas Sep 2, 2020
07d9d2f
go mod tidy
JekaMas Sep 2, 2020
6e4f724
unmarshall adresses or adress
JekaMas Sep 2, 2020
03e4091
fix linters
JekaMas Sep 2, 2020
9847613
after cr
JekaMas Sep 2, 2020
47cb19a
after cr
JekaMas Sep 2, 2020
657da94
after cr
JekaMas Sep 2, 2020
2013415
after cr
JekaMas Sep 2, 2020
9d93b55
fix tests
JekaMas Sep 2, 2020
f23245f
remove dev version
JekaMas Sep 2, 2020
9a1ef59
it compiles
JekaMas Sep 2, 2020
1623cb4
mod tidy
AlexeyAkhunov Sep 3, 2020
a109bb0
fix bin deps
AskAlexSharov Sep 3, 2020
0a4ccd3
use stable version of grpc
AskAlexSharov Sep 3, 2020
186d77e
switch back to master constructor
AskAlexSharov Sep 3, 2020
3d42ec9
switch back to master constructor
AskAlexSharov Sep 3, 2020
8f6955c
Merge branch 'master' into getLogs
AskAlexSharov Sep 3, 2020
94b915c
add a bit docs
AskAlexSharov Sep 3, 2020
1c03845
add a bit docs
AskAlexSharov Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions cmd/rpcdaemon/commands/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/ledgerwatch/turbo-geth/common"
"github.com/ledgerwatch/turbo-geth/common/hexutil"
"github.com/ledgerwatch/turbo-geth/core/rawdb"
"github.com/ledgerwatch/turbo-geth/eth/stagedsync/stages"
"github.com/ledgerwatch/turbo-geth/core/types"
"github.com/ledgerwatch/turbo-geth/ethdb"
"github.com/ledgerwatch/turbo-geth/rpc"
"github.com/ledgerwatch/turbo-geth/turbo/adapter/ethapi"
Expand All @@ -17,17 +17,9 @@ import (
// GetBlockByNumber see https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_getblockbynumber
// see internal/ethapi.PublicBlockChainAPI.GetBlockByNumber
func (api *APIImpl) GetBlockByNumber(ctx context.Context, number rpc.BlockNumber, fullTx bool) (map[string]interface{}, error) {
var blockNum uint64
if number == rpc.LatestBlockNumber || number == rpc.PendingBlockNumber {
var err error
blockNum, _, err = stages.GetStageProgress(api.dbReader, stages.Execution)
if err != nil {
return nil, fmt.Errorf("getting latest block number: %v", err)
}
} else if number == rpc.EarliestBlockNumber {
blockNum = 0
} else {
blockNum = uint64(number.Int64())
blockNum, err := getBlockNumber(number, api.dbReader)
if err != nil {
return nil, err
}
additionalFields := make(map[string]interface{})

Expand Down Expand Up @@ -71,6 +63,24 @@ func (api *APIImpl) GetBlockByHash(ctx context.Context, hash common.Hash, fullTx
return response, err
}

func (api *APIImpl) GetHeaderByNumber(_ context.Context, number rpc.BlockNumber) (*types.Header, error) {
header := rawdb.ReadHeaderByNumber(api.dbReader, uint64(number.Int64()))
if header == nil {
return nil, fmt.Errorf("block header not found: %d", number.Int64())
}

return header, nil
}

func (api *APIImpl) GetHeaderByHash(_ context.Context, hash common.Hash) (*types.Header, error) {
header := rawdb.ReadHeaderByHash(api.dbReader, hash)
if header == nil {
return nil, fmt.Errorf("block header not found: %s", hash.String())
}

return header, nil
}

func APIList(db ethdb.KV, eth ethdb.Backend, cfg cli.Flags, customApiList []rpc.API) []rpc.API {
var defaultAPIList []rpc.API

Expand Down
18 changes: 6 additions & 12 deletions cmd/rpcdaemon/commands/eth_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package commands
import (
"context"
"fmt"
ethereum "github.com/ledgerwatch/turbo-geth"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, I've never seen that one before, what does it import?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found it. It is interfaces.go


"github.com/ledgerwatch/turbo-geth/common"
"github.com/ledgerwatch/turbo-geth/common/hexutil"
Expand All @@ -23,7 +24,7 @@ type EthAPI interface {
GetBlockByHash(ctx context.Context, hash common.Hash, fullTx bool) (map[string]interface{}, error)
GetBalance(ctx context.Context, address common.Address, blockNrOrHash rpc.BlockNumberOrHash) (*hexutil.Big, error)
GetTransactionReceipt(ctx context.Context, hash common.Hash) (map[string]interface{}, error)
GetLogs(ctx context.Context, hash common.Hash) ([][]*types.Log, error)
GetLogs(ctx context.Context, crit ethereum.FilterQuery) ([]*types.Log, error)
Call(ctx context.Context, args ethapi.CallArgs, blockNrOrHash rpc.BlockNumberOrHash, overrides *map[common.Address]ethapi.Account) (hexutil.Bytes, error)
EstimateGas(ctx context.Context, args ethapi.CallArgs) (hexutil.Uint64, error)
SendRawTransaction(ctx context.Context, encodedTx hexutil.Bytes) (common.Hash, error)
Expand Down Expand Up @@ -83,18 +84,11 @@ func (api *APIImpl) Syncing(ctx context.Context) (interface{}, error) {
}

func (api *APIImpl) GetBlockTransactionCountByNumber(ctx context.Context, blockNr rpc.BlockNumber) (*hexutil.Uint, error) {
var blockNum uint64
if blockNr == rpc.LatestBlockNumber || blockNr == rpc.PendingBlockNumber {
var err error
blockNum, _, err = stages.GetStageProgress(api.dbReader, stages.Execution)
if err != nil {
return nil, fmt.Errorf("getting latest block number: %v", err)
}
} else if blockNr == rpc.EarliestBlockNumber {
blockNum = 0
} else {
blockNum = uint64(blockNr.Int64())
blockNum, err := getBlockNumber(blockNr, api.dbReader)
if err != nil {
return nil, err
}

block := rawdb.ReadBlockByNumber(api.dbReader, blockNum)
if block == nil {
return nil, fmt.Errorf("block not found: %d", blockNum)
Expand Down
Loading