Repository navigation
Catch up dev with main, so the release PR is mergeable again - #3033
Merged
Merged
Conversation
…rage (#3025) (#3028) Adds Robinhood Chain (0.1 ETH -> USDG) to the evm-swap-quoting basket, probed by Route, KyberSwap and LI.FI, and a Route adapter to token-quote-coverage. Route adapters only register when ROUTE_API_KEY is set. Co-authored-by: Micah <146599453+micahalp@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Route went to main as a cherry-pick (#3028, 45faeaf) so it could ship without waiting for the release. dev carries the same change under its own SHA, so git sees two unrelated commits touching the same lines and #3021 went from clean to CONFLICTING. One file conflicts, benchmarks/evm-quote-latency.yml, and it is not a disagreement. Checked line by line before resolving: every non-blank line on main is present on dev, and dev adds 80 that main does not have, which is exactly the eight providers times ten lines of regions blocks from #3032. dev is a strict superset, so the resolution takes dev's side whole. token-quote-coverage.yml auto-merged with no help. Gates on the merge result: 253 specs valid, tsc clean, 597 tests pass.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#3021 went from clean to
CONFLICTINGovernight. The cause is the Route cherry-pick: it went tomainas #3028 (45faeafb) so Route could ship without waiting for the release, anddevcarries the same change under its own SHA, so git sees two unrelated commits touching the same lines.One file conflicts,
benchmarks/evm-quote-latency.yml, and it is not a disagreement. Checked line by line before resolving rather than assumed:80 is exactly eight providers times ten lines of
regions:block from #3032.devis a strict superset, so the resolution takes dev's side whole.token-quote-coverage.ymlauto-merged with no help.After this,
dev -> mainis a fast-forwardable-in-spirit release again and #3021 can be reviewed on its contents instead of its conflict marker.Gates on the merge result: 253 specs valid, tsc clean, 597 tests pass.