LogPoller DSL Parser #959
LogPoller DSL Parser #959
Conversation
# Conflicts: # go.mod # go.sum # integration-tests/go.mod # integration-tests/go.sum
EasterTheBunny
changed the base branch from
develop
to
feature/NONEVM-745-logpoller-db-models
| @@ -156,3 +157,27 @@ func (o *DSORM) SelectLogs(ctx context.Context, start, end int64, address Public | |||
| } | |||
| return logs, nil | |||
| } | |||
|
|
|||
| func (o *DSORM) FilteredLogs(ctx context.Context, filter []query.Expression, limitAndSort query.LimitAndSort, _ string) ([]Log, error) { | |||
There was a problem hiding this comment.
I was thinking the FilteredLogs method that calls this would also be in this PR, but I guess it makes more sense if I just include it in my Main LogPoller Loop PR... probably too difficult to add it here without the struct that's defined in RegisterFilters PR.
There was a problem hiding this comment.
Oh, I do think we should add some tests of this function to orm_tests.go.
In evm, there are several tests that test it in different ways: TestORM_IndexedLogs, TestORM_SelectLogsCreatedAfter, TestORM_SelectIndexedLogsByTxHash, TestORM_SelectLogsWithSigsByBlockRangeFilter. Those also test the corresponding legacy functions which we don't need. But maybe we could just combine the parts that test FilteredLogs together into a single TestFilteredLogs here?
pkg/solana/logpoller/parser_test.go
Outdated
|
|
||
| result, args, err := parser.buildQuery(chainID, expressions, limiter) | ||
| expected := logsQuery( | ||
| " WHERE chain_id = :solana_chain_id " + |
There was a problem hiding this comment.
I think this should just be :chain_id rather than :solana_chain_id, to match the db schema.
Also, hoping we can move this code to chainlink-framework at some point to re-use it for many chain families, abstracting it a bit to fill in the custom data types.
| ErrInvalidCursorDir = errors.New("invalid cursor direction") | ||
| ErrInvalidCursorFormat = errors.New("invalid cursor format") | ||
| ErrInvalidSortDir = errors.New("invalid sort direction") | ||
| ErrInvalidSortType = errors.New("invalid sort by type") |
There was a problem hiding this comment.
Good call on defining these all together! This will help later with abstraction.
pkg/solana/logpoller/parser.go
Outdated
| } | ||
|
|
||
| func (v *pgDSLParser) whereClause(expressions []query.Expression, limiter query.LimitAndSort) (string, error) { | ||
| segment := fmt.Sprintf("WHERE %s = :solana_chain_id", chainIDFieldName) |
There was a problem hiding this comment.
| segment := fmt.Sprintf("WHERE %s = :solana_chain_id", chainIDFieldName) | |
| segment := fmt.Sprintf("WHERE %s = :chain_id", chainIDFieldName) |
(see my comment in parser_test.go about this... probably should have left it here instead)
| case *pgDSLParser: | ||
| v.VisitEventSigFilter(f) | ||
| } | ||
| } |
There was a problem hiding this comment.
I think we're missing an essential feature here that CCIP will require, and that we won't be able to implement QueryKey without. You have eventSigFilter and eventByAddressFitler, but we also need an eventBySubKeyFilter so that we can filter by subkey.
We'll need that to implement support for IndexedSequencesKeyFilter and several other IndexedSequences... filters that can be passed to QueryKey. CCIP definitely uses some of those.
There was a problem hiding this comment.
See: func (b *EventBinding) encodeComparator(comparator *primitives.Comparator) (query.Expression, error) in chainlink/core/services/relay/evm/read/event.go)
We'll have to call NewEventBySubKey there instead of NewEventByTopicFilter and NewEventByWordFilter.
There was a problem hiding this comment.
I will be adding this when I do the remapping.
pkg/solana/logpoller/parser.go
Outdated
| v.expression = fmt.Sprintf( | ||
| "%s = :%s", | ||
| txHashFieldName, | ||
| v.args.withIndexedField(txHashFieldName, txHash), |
There was a problem hiding this comment.
solana.PublicKey does not implement Value method, so not sure if the query won't error. Might need to wrap it into type defined in types file.
EasterTheBunny
had a problem deploying
to
integration
GitHub Actions
Failure
EasterTheBunny
temporarily deployed
to
integration
GitHub Actions
Inactive
EasterTheBunny
temporarily deployed
to
integration
GitHub Actions
Inactive
EasterTheBunny
temporarily deployed
to
integration
GitHub Actions
Inactive
|
dhaidashenko
force-pushed
the
feature/NONEVM-745-logpoller-db-models
branch
from
8de5211 to
df7ab9f
Compare
dhaidashenko
force-pushed
the
feature/NONEVM-745-logpoller-db-models
branch
from
df7ab9f to
4178d4c
Compare
Description
This PR adds a DSL parser that converts basic query filters into postgresql queries for logpoller. Additionally solana address and transaction hashes are handled.
NONEVM-744
Requires Dependencies