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

AUTO-6622 Enable v0.3 StreamsLookup to also use blockNumber #10986

Merged
merged 5 commits into from
Oct 18, 2023
Merged

AUTO-6622 Enable v0.3 StreamsLookup to also use blockNumber #10986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8379aee
AUTO-6622 Enable v0.3 StreamsLookup to also use blockNumber
cmalec Oct 17, 2023
3623cb2
add another test
cmalec Oct 17, 2023
29e7e48
Merge branch 'develop' into AUTO-6622-Enable-Mercury-v0.3-StreamsLook…
cmalec Oct 18, 2023
c85ba4a
Merge branch 'develop' into AUTO-6622-Enable-Mercury-v0.3-StreamsLook…
cmalec Oct 18, 2023
21fa2b5
format
cmalec Oct 18, 2023
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
6 changes: 3 additions & 3 deletions core/services/ocr2/plugins/ocr2keeper/evm21/streams_lookup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func (r *EvmRegistry) streamsLookup(ctx context.Context, checkResults []ocr2keep
checkResults[i].IneligibilityReason = uint8(encoding.UpkeepFailureReasonMercuryAccessNotAllowed)
continue
}
} else if l.FeedParamKey != feedIDs || l.TimeParamKey != timestamp {
} else if l.FeedParamKey != feedIDs {
// if mercury version cannot be determined, set failure reason
lggr.Debugf("at block %d upkeep %s NOT allowed to query Mercury server", block, upkeepId)
checkResults[i].IneligibilityReason = uint8(encoding.UpkeepFailureReasonInvalidRevertDataInput)
Expand Down Expand Up @@ -289,7 +289,7 @@ func (r *EvmRegistry) doMercuryRequest(ctx context.Context, sl *StreamsLookup, l
for i := range sl.Feeds {
go r.singleFeedRequest(ctx, ch, i, sl, lggr)
}
} else if sl.FeedParamKey == feedIDs && sl.TimeParamKey == timestamp {
} else if sl.FeedParamKey == feedIDs {
cmalec marked this conversation as resolved.
Show resolved Hide resolved
// only mercury v0.3
resultLen = 1
isMercuryV03 = true
Expand Down Expand Up @@ -441,7 +441,7 @@ func (r *EvmRegistry) multiFeedsRequest(ctx context.Context, ch chan<- MercuryDa
// feedIDs: {strings.Join(sl.Feeds, ",")},
// timestamp: {sl.Time.String()},
//}
params := fmt.Sprintf("%s=%s&%s=%s", feedIDs, strings.Join(sl.Feeds, ","), timestamp, sl.Time.String())
params := fmt.Sprintf("%s=%s&%s=%s", feedIDs, strings.Join(sl.Feeds, ","), sl.TimeParamKey, sl.Time.String())
reqUrl := fmt.Sprintf("%s%s%s", r.mercury.cred.URL, mercuryBatchPathV03, params)
lggr.Debugf("request URL for upkeep %s userId %s: %s", sl.upkeepId.String(), r.mercury.cred.Username, reqUrl)

Expand Down
Loading