Query Filter Comparator Remaping #1016

EasterTheBunny · 2025-01-15T18:16:36Z

Description

This PR adds support for remapping chain agnostic filters to solana specific filters.

Requires Dependencies

Nested Value Codec Access chainlink-common#990

reductionista · 2025-01-22T03:52:44Z

pkg/solana/logpoller/parser.go

 	switch v := visitor.(type) {
 	case *pgDSLParser:
-		v.VisitEventSigFilter(f)
+		v.VisitEventSubkeyFilter(f)
 	}
 }


We can't combine the eventSigFilter and eventSubkeyFIlter. Unlike in evm where the event sig is just "topic 0" the event sig in Solana has nothing to do with the event subkeys. They are two separate columns in the db table, one has to compare the event_sig column and the other references an index into the subkey_values column.

Also the event sigs have a specific format, it must always be an 8 byte discriminator--we should validate that if we can I guess. Whereas the subkey values are fields in a struct, and can be any primitive type; these have to be converted with NewIndexedValue before storing in the appropriate slot of subkey_values

Ahhh. I messed that one up. I don't know what I was thinking. So essentially we need both: the event sig filter when subkey filters are provided.

Looking at evm again, event sig is always provided. I'll make that change.

Just backing out these changes to parser.go should be fine, as long as you're okay with merging my changes first (which add VisitEventSubkeyFilter while keeping VisitEventSigFilter)

reductionista · 2025-01-22T04:07:29Z

pkg/solana/chainreader/event_read_binding.go

+
+	for idx, comp := range comparator.ValueComparators {
+		// need to do a transform and then extract the value for the subkey
+		newValue, err := b.modifier.TransformToOnChain(comp.Value, itemType)


We can't call this function, unless we modify the codec to skip the Borsh-encoding step.

I'm still not clear on whether we actually need to call this at all, but if we do then it either has to be without the Borsh-encoding or we'll need to decode it as soon as it finishes encoding.

TransformToOnchain is a modifier function and doesn't handle encoding/decoding.

reductionista · 2025-01-22T04:14:52Z

pkg/solana/chainreader/event_read_binding.go

+	modifier               commoncodec.Modifier
+	key                    solana.PublicKey
+	remapper               remapHelper
+	indexedSubkeys         map[string]string


I would lean towards calling this subKeys rather than indexedSubkeys. The latter might give someone the impression that we support non-indexed subKeys.

This comes from the config where the name is IndexedSubkeys where I think it is good to imply they are indexed.

reductionista · 2025-01-22T04:25:14Z

pkg/solana/codec/solana.go

@@ -174,6 +174,40 @@ func NewIDLInstructionsCodec(idl IDL, builder commonencodings.Builder) (commonty
 	return typeCodecs, nil
 }

+func NewIDLEventCodec(idl IDL, builder commonencodings.Builder) (commontypes.RemoteCodec, error) {


There are two definitions of this and eventFieldsAsStandardFields now, probably happened because I included that in my PR and then you rebased onto it. I think they are identical, so just get rid of one or the other shouldn't matter.

reductionista · 2025-01-22T04:31:48Z

pkg/solana/chainreader/event_read_binding.go

+func (b *eventReadBinding) decodeLog(ctx context.Context, log *logpoller.Log, into any) error {
+	itemType := codec.WrapItemType(false, b.namespace, b.genericName, codec.ChainConfigTypeEventDef)
+
+	// decode non indexed topics and apply output modifiers


This is an evm-specific comment. For Solana, it should just say "decode event data".

Good callout.

cl-sonarqube-production · 2025-01-22T15:48:35Z

Quality Gate failed

Failed conditions
25.8% Coverage on New Code (required ≥ 75%)

See analysis details on SonarQube

EasterTheBunny had a problem deploying to integration January 15, 2025 18:16 — with GitHub Actions Failure

EasterTheBunny temporarily deployed to integration January 15, 2025 18:16 — with GitHub Actions Inactive

EasterTheBunny temporarily deployed to integration January 15, 2025 18:17 — with GitHub Actions Inactive

EasterTheBunny closed this Jan 15, 2025

EasterTheBunny force-pushed the NONEVM-1063/dsl-remapper branch from 7e672c2 to 74b7a72 Compare January 15, 2025 19:41

EasterTheBunny reopened this Jan 16, 2025

EasterTheBunny had a problem deploying to integration January 16, 2025 15:54 — with GitHub Actions Error

EasterTheBunny had a problem deploying to integration January 16, 2025 15:54 — with GitHub Actions Failure

EasterTheBunny temporarily deployed to integration January 16, 2025 15:54 — with GitHub Actions Inactive

EasterTheBunny temporarily deployed to integration January 16, 2025 15:55 — with GitHub Actions Inactive

EasterTheBunny had a problem deploying to integration January 16, 2025 16:55 — with GitHub Actions Failure

EasterTheBunny temporarily deployed to integration January 16, 2025 16:55 — with GitHub Actions Inactive

EasterTheBunny force-pushed the NONEVM-1063/dsl-remapper branch from 318aaa4 to 8757e07 Compare January 21, 2025 16:10

EasterTheBunny temporarily deployed to integration January 21, 2025 16:10 — with GitHub Actions Inactive

EasterTheBunny had a problem deploying to integration January 21, 2025 16:10 — with GitHub Actions Failure

EasterTheBunny temporarily deployed to integration January 21, 2025 16:10 — with GitHub Actions Inactive

EasterTheBunny force-pushed the NONEVM-1063/dsl-remapper branch from 8757e07 to cf7a682 Compare January 21, 2025 18:55

EasterTheBunny had a problem deploying to integration January 21, 2025 18:55 — with GitHub Actions Failure

EasterTheBunny temporarily deployed to integration January 21, 2025 18:56 — with GitHub Actions Inactive

reductionista reviewed Jan 22, 2025

View reviewed changes

EasterTheBunny added 3 commits January 22, 2025 07:33

complete remapper

510bfea

test cleanup

1f76db5

add events source interface

f510fdd

EasterTheBunny force-pushed the NONEVM-1063/dsl-remapper branch from cf7a682 to f510fdd Compare January 22, 2025 13:33

EasterTheBunny had a problem deploying to integration January 22, 2025 13:33 — with GitHub Actions Failure

EasterTheBunny temporarily deployed to integration January 22, 2025 13:33 — with GitHub Actions Inactive

add filters and connect QueryKey to logpoller

aaeedff

EasterTheBunny temporarily deployed to integration January 22, 2025 15:40 — with GitHub Actions Inactive

reductionista mentioned this pull request Jan 22, 2025

Add logpoller.FilteredLogs and support for filtering on subkey #1020

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Query Filter Comparator Remaping #1016

Query Filter Comparator Remaping #1016

EasterTheBunny commented Jan 15, 2025 •

edited by jira bot

Loading

reductionista Jan 22, 2025

EasterTheBunny Jan 22, 2025

EasterTheBunny Jan 22, 2025

reductionista Jan 22, 2025

reductionista Jan 22, 2025

EasterTheBunny Jan 22, 2025

reductionista Jan 22, 2025

EasterTheBunny Jan 22, 2025

reductionista Jan 22, 2025

reductionista Jan 22, 2025

EasterTheBunny Jan 22, 2025

cl-sonarqube-production bot commented Jan 22, 2025

Query Filter Comparator Remaping #1016

Are you sure you want to change the base?

Query Filter Comparator Remaping #1016

Conversation

EasterTheBunny commented Jan 15, 2025 • edited by jira bot Loading

Description

Requires Dependencies

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cl-sonarqube-production bot commented Jan 22, 2025

Quality Gate failed

EasterTheBunny commented Jan 15, 2025 •

edited by jira bot

Loading