tapimo 0.7.0 → 0.7.2

package/src/{apps/data/FundingQuoteProviders.test.ts → internal/funding/providers/index.test.ts}

@@ -1,57 +1,33 @@
-import * as FundingQuotes from '../../internal/FundingQuotes.js'
-import * as FundingQuoteProviders from './FundingQuoteProviders.js'
+import * as TestFunding from '../../../../test/Funding.js'
+import * as FundingProvider from '../Provider.js'
+import * as Across from './across.js'
+import * as Relay from './relay.js'
+import * as Rhino from './rhino.js'
+import * as Squid from './squid.js'
+import * as Symbiosis from './symbiosis.js'
 
 const now = () => new Date('2026-01-01T00:00:00.000Z')
-
-describe('FundingQuoteProviders', () => {
-  test('requires every Across deployment binding when any is configured', () => {
-    expect(FundingQuoteProviders.configureAcross()).toBeUndefined()
-    expect(() =>
-      FundingQuoteProviders.configureAcross({ apiKey: 'across-api-key' }),
-    ).toThrowErrorMatchingInlineSnapshot(`[FundingQuoteProviders.ProviderConfigurationError]`)
-    expect(
-      FundingQuoteProviders.configureAcross({
-        apiKey: 'across-api-key',
-        integratorId: '0xdead',
-        userAddress: '0x1111111111111111111111111111111111111111',
-      }),
-    ).toEqual({
-      apiKey: 'across-api-key',
-      integratorId: '0xdead',
-      userAddress: '0x1111111111111111111111111111111111111111',
-    })
-  })
-
-  test('requires every Squid deployment binding when any is configured', () => {
-    expect(FundingQuoteProviders.configureSquid()).toBeUndefined()
-    expect(() =>
-      FundingQuoteProviders.configureSquid({ integratorId: 'squid-integrator-id' }),
-    ).toThrowErrorMatchingInlineSnapshot(`[FundingQuoteProviders.ProviderConfigurationError]`)
-    expect(
-      FundingQuoteProviders.configureSquid({
-        integratorId: 'squid-integrator-id',
-        userAddress: '0x1111111111111111111111111111111111111111',
-      }),
-    ).toEqual({
-      integratorId: 'squid-integrator-id',
-      userAddress: '0x1111111111111111111111111111111111111111',
-    })
-  })
-
-  test('configures Symbiosis only when its quote user is present', () => {
-    expect(FundingQuoteProviders.configureSymbiosis()).toBeUndefined()
-    expect(
-      FundingQuoteProviders.configureSymbiosis({
-        userAddress: '0x1111111111111111111111111111111111111111',
-      }),
-    ).toEqual({ userAddress: '0x1111111111111111111111111111111111111111' })
-  })
-
-  test('maps successful Across quotes to available quote probes', async () => {
+const providers = [
+  Across.across({
+    apiKey: 'across-api-key',
+    integratorId: '0xdead',
+    userAddress: '0x1111111111111111111111111111111111111111',
+  }),
+  Relay.relay({ userAddress: '0x1111111111111111111111111111111111111111' }),
+  Rhino.rhino(),
+  Squid.squid({
+    integratorId: 'squid-integrator-id',
+    userAddress: '0x1111111111111111111111111111111111111111',
+  }),
+  Symbiosis.symbiosis({ userAddress: '0x1111111111111111111111111111111111111111' }),
+] as const
+
+describe('funding providers', () => {
+  test('maps successful Across quotes to available quote results', async () => {
     const requests: RecordedRequest[] = []
     const candidate = quoteCandidate('across')
     const fetch = recordingFetch(requests, async () => jsonResponse(acrossQuote(candidate)))
-    const adapter = FundingQuoteProviders.across({
+    const provider = Across.across({
       apiKey: 'across-api-key',
       baseUrl: 'https://across.test/api/',
       fetch,
@@ -60,7 +36,7 @@ describe('FundingQuoteProviders', () => {
       userAddress: '0x1111111111111111111111111111111111111111',
     })
 
-    const result = await adapter.probeQuote(probeInput(candidate), new AbortController().signal)
+    const result = await provider.getQuote(getQuoteInput(candidate), new AbortController().signal)
 
     expect(requests).toHaveLength(1)
     expect(requests[0]?.url.pathname).toBe('/api/swap/approval')
@@ -82,8 +58,8 @@ describe('FundingQuoteProviders', () => {
     )
     expect(result).toMatchObject({
       expiresAt: '2026-01-01T00:01:00.000Z',
-      minimumOutputAmount: '988000',
-      outputAmount: '990000',
+      destinationAmountMin: '988000',
+      destinationAmount: '990000',
       quality: {
         estimatedSeconds: 2,
         liquiditySource: 'providerQuote',
@@ -95,10 +71,10 @@ describe('FundingQuoteProviders', () => {
     })
   })
 
-  test('maps recognized Across quote errors to unavailable probes', async () => {
+  test('maps recognized Across quote errors to unavailable results', async () => {
     const candidate = quoteCandidate('across')
     const fetch = recordingFetch([], async () => jsonResponse({ code: 'NO_ROUTE' }, 400))
-    const adapter = FundingQuoteProviders.across({
+    const provider = Across.across({
       apiKey: 'across-api-key',
       fetch,
       integratorId: '0xdead',
@@ -107,7 +83,7 @@ describe('FundingQuoteProviders', () => {
     })
 
     await expect(
-      adapter.probeQuote(probeInput(candidate), new AbortController().signal),
+      provider.getQuote(getQuoteInput(candidate), new AbortController().signal),
     ).resolves.toMatchObject({
       quality: {
         liquiditySource: 'providerQuote',
@@ -123,7 +99,7 @@ describe('FundingQuoteProviders', () => {
     const fetch = recordingFetch([], async () =>
       jsonResponse({ ...acrossQuote(candidate), expectedOutputAmount: '0' }),
     )
-    const adapter = FundingQuoteProviders.across({
+    const provider = Across.across({
       apiKey: 'across-api-key',
       fetch,
       integratorId: '0xdead',
@@ -132,21 +108,21 @@ describe('FundingQuoteProviders', () => {
     })
 
     await expect(
-      adapter.probeQuote(probeInput(candidate), new AbortController().signal),
-    ).rejects.toThrowErrorMatchingInlineSnapshot(`[FundingQuoteProviders.ProviderPayloadError]`)
+      provider.getQuote(getQuoteInput(candidate), new AbortController().signal),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(`[FundingProvider.ProviderPayloadError]`)
   })
 
   test('rejects invalid Across configuration', () => {
     expect(() =>
-      FundingQuoteProviders.across({
+      Across.across({
         apiKey: 'across-api-key',
         integratorId: 'tempo',
         userAddress: '0x1111111111111111111111111111111111111111',
       }),
-    ).toThrowErrorMatchingInlineSnapshot(`[FundingQuoteProviders.ProviderConfigurationError]`)
+    ).toThrowErrorMatchingInlineSnapshot(`[FundingProvider.ProviderConfigurationError]`)
   })
 
-  test('maps successful Relay quotes to available quote probes', async () => {
+  test('maps successful Relay quotes to available quote results', async () => {
     const requests: RecordedRequest[] = []
     const candidate = quoteCandidate()
     const fetch = recordingFetch(requests, async () =>
@@ -161,14 +137,14 @@ describe('FundingQuoteProviders', () => {
         },
       }),
     )
-    const adapter = FundingQuoteProviders.relay({
+    const provider = Relay.relay({
       apiKey: 'relay-api-key',
       fetch,
       now,
       userAddress: '0x1111111111111111111111111111111111111111',
     })
 
-    const result = await adapter.probeQuote(probeInput(candidate), new AbortController().signal)
+    const result = await provider.getQuote(getQuoteInput(candidate), new AbortController().signal)
 
     expect(requests.map((request) => request.url.pathname)).toEqual(['/quote/v2'])
     expect(new Headers(requests[0]?.init?.headers).get('x-api-key')).toBe('relay-api-key')
@@ -182,8 +158,8 @@ describe('FundingQuoteProviders', () => {
       user: '0x1111111111111111111111111111111111111111',
     })
     expect(result).toMatchObject({
-      minimumOutputAmount: '980000',
-      outputAmount: '990000',
+      destinationAmountMin: '980000',
+      destinationAmount: '990000',
       quality: {
         estimatedSeconds: 15,
         liquiditySource: 'providerQuote',
@@ -195,11 +171,32 @@ describe('FundingQuoteProviders', () => {
     })
   })
 
-  test('maps successful Squid quotes to available quote probes', async () => {
+  test('keeps Relay preparation available without an indicative quote wallet', async () => {
+    const provider = Relay.relay({ now })
+    const result = await provider.getQuote(
+      getQuoteInput(quoteCandidate()),
+      new AbortController().signal,
+    )
+
+    expect(FundingProvider.canPrepareTransfer(provider)).toBe(true)
+    expect(result).toMatchInlineSnapshot(`
+      {
+        "quality": {
+          "liquiditySource": "providerQuote",
+          "sourceDetail": "relay:quote-v2:QUOTE_USER_NOT_CONFIGURED",
+          "tier": "unavailable",
+        },
+        "sampledAt": "2026-01-01T00:00:00.000Z",
+        "status": "unavailable",
+      }
+    `)
+  })
+
+  test('maps successful Squid quotes to available quote results', async () => {
     const requests: RecordedRequest[] = []
     const candidate = quoteCandidate('squid')
     const fetch = recordingFetch(requests, async () => jsonResponse(squidQuote(candidate)))
-    const adapter = FundingQuoteProviders.squid({
+    const provider = Squid.squid({
       baseUrl: 'https://squid.test/v2/',
       fetch,
       integratorId: 'squid-integrator-id',
@@ -207,7 +204,7 @@ describe('FundingQuoteProviders', () => {
       userAddress: '0x1111111111111111111111111111111111111111',
     })
 
-    const result = await adapter.probeQuote(probeInput(candidate), new AbortController().signal)
+    const result = await provider.getQuote(getQuoteInput(candidate), new AbortController().signal)
 
     expect(requests).toHaveLength(1)
     expect(requests[0]?.url.pathname).toBe('/v2/route')
@@ -226,8 +223,8 @@ describe('FundingQuoteProviders', () => {
       toToken: candidate.destinationToken.address,
     })
     expect(result).toEqual({
-      minimumOutputAmount: '989622',
-      outputAmount: '999620',
+      destinationAmountMin: '989622',
+      destinationAmount: '999620',
       quality: {
         estimatedSeconds: 10,
         liquiditySource: 'providerQuote',
@@ -239,9 +236,9 @@ describe('FundingQuoteProviders', () => {
     })
   })
 
-  test('maps unavailable Squid routes to unavailable quote probes', async () => {
+  test('maps unavailable Squid routes to unavailable quote results', async () => {
     const candidate = quoteCandidate('squid')
-    const adapter = FundingQuoteProviders.squid({
+    const provider = Squid.squid({
       fetch: recordingFetch([], async () =>
         jsonResponse(
           {
@@ -258,7 +255,7 @@ describe('FundingQuoteProviders', () => {
     })
 
     await expect(
-      adapter.probeQuote(probeInput(candidate), new AbortController().signal),
+      provider.getQuote(getQuoteInput(candidate), new AbortController().signal),
     ).resolves.toMatchObject({
       quality: {
         sourceDetail: 'squid:route-v2:AMOUNT_TOO_LOW',
@@ -268,18 +265,18 @@ describe('FundingQuoteProviders', () => {
     })
   })
 
-  test('maps successful Symbiosis quotes to available quote probes', async () => {
+  test('maps successful Symbiosis quotes to available quote results', async () => {
     const requests: RecordedRequest[] = []
     const candidate = quoteCandidate('symbiosis')
     const fetch = recordingFetch(requests, async () => jsonResponse(symbiosisQuote(candidate)))
-    const adapter = FundingQuoteProviders.symbiosis({
+    const provider = Symbiosis.symbiosis({
       baseUrl: 'https://symbiosis.test/crosschain/',
       fetch,
       now,
       userAddress: '0x1111111111111111111111111111111111111111',
     })
 
-    const result = await adapter.probeQuote(probeInput(candidate), new AbortController().signal)
+    const result = await provider.getQuote(getQuoteInput(candidate), new AbortController().signal)
 
     expect(requests).toHaveLength(1)
     expect(requests[0]?.url.pathname).toBe('/crosschain/v2/quote')
@@ -303,8 +300,8 @@ describe('FundingQuoteProviders', () => {
       },
     })
     expect(result).toEqual({
-      minimumOutputAmount: '979000',
-      outputAmount: '989000',
+      destinationAmountMin: '979000',
+      destinationAmount: '989000',
       quality: {
         estimatedSeconds: 18,
         liquiditySource: 'providerQuote',
@@ -324,13 +321,13 @@ describe('FundingQuoteProviders', () => {
       sourceToken: 'USDT',
     })
     const fetch = recordingFetch(requests, async () => jsonResponse(symbiosisQuote(candidate)))
-    const adapter = FundingQuoteProviders.symbiosis({
+    const provider = Symbiosis.symbiosis({
       fetch,
       now,
       userAddress: '0x1111111111111111111111111111111111111111',
     })
 
-    await adapter.probeQuote(probeInput(candidate), new AbortController().signal)
+    await provider.getQuote(getQuoteInput(candidate), new AbortController().signal)
 
     expect(jsonRequestBody(requests[0])).toMatchObject({
       tokenAmountIn: {
@@ -355,21 +352,21 @@ describe('FundingQuoteProviders', () => {
       tokenAmountOut: quote.tokenAmountOut,
       tokenAmountOutMin: quote.tokenAmountOutMin,
     }
-    const adapter = FundingQuoteProviders.symbiosis({
+    const provider = Symbiosis.symbiosis({
       fetch: recordingFetch([], async () => jsonResponse(response)),
       now,
       userAddress: '0x1111111111111111111111111111111111111111',
     })
 
     await expect(
-      adapter.probeQuote(probeInput(candidate), new AbortController().signal),
-    ).rejects.toThrowErrorMatchingInlineSnapshot(`[FundingQuoteProviders.ProviderPayloadError]`)
+      provider.getQuote(getQuoteInput(candidate), new AbortController().signal),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(`[FundingProvider.ProviderPayloadError]`)
   })
 
   test('enforces the Symbiosis provider quota before fetching', async () => {
     const requests: RecordedRequest[] = []
     const candidate = quoteCandidate('symbiosis')
-    const adapter = FundingQuoteProviders.symbiosis({
+    const provider = Symbiosis.symbiosis({
       fetch: recordingFetch(requests, async () => jsonResponse(symbiosisQuote(candidate))),
       now,
       userAddress: '0x1111111111111111111111111111111111111111',
@@ -377,34 +374,40 @@ describe('FundingQuoteProviders', () => {
 
     await Promise.all(
       Array.from({ length: 4 }, () =>
-        adapter.probeQuote(probeInput(candidate), new AbortController().signal),
+        provider.getQuote(getQuoteInput(candidate), new AbortController().signal),
       ),
     )
-    const cause = await adapter
-      .probeQuote(probeInput(candidate), new AbortController().signal)
+    const cause = await provider
+      .getQuote(getQuoteInput(candidate), new AbortController().signal)
       .catch((error: unknown) => error)
 
     expect(requests).toHaveLength(4)
     expect(cause).toMatchObject({
-      name: 'FundingQuoteProviders.ProviderRateLimitError',
+      name: 'FundingProvider.ProviderRateLimitError',
     })
-    expect(FundingQuoteProviders.providerFailure({ cause, provider: 'symbiosis' })).toEqual({
+    expect(
+      FundingProvider.failure({
+        cause,
+        operation: 'getQuote',
+        provider: getProvider('symbiosis'),
+      }),
+    ).toEqual({
       failure: 'rate_limit',
       id: 'symbiosis',
-      operation: 'v2/quote',
+      operation: 'getQuote',
     })
   })
 
-  test('maps unavailable Symbiosis routes to unavailable quote probes', async () => {
+  test('maps unavailable Symbiosis routes to unavailable quote results', async () => {
     const candidate = quoteCandidate('symbiosis')
-    const adapter = FundingQuoteProviders.symbiosis({
+    const provider = Symbiosis.symbiosis({
       fetch: recordingFetch([], async () => jsonResponse({ code: 'NO_ROUTE' }, 400)),
       now,
       userAddress: '0x1111111111111111111111111111111111111111',
     })
 
     await expect(
-      adapter.probeQuote(probeInput(candidate), new AbortController().signal),
+      provider.getQuote(getQuoteInput(candidate), new AbortController().signal),
     ).resolves.toMatchObject({
       quality: {
         sourceDetail: 'symbiosis:quote-v2:NO_ROUTE',
@@ -414,9 +417,9 @@ describe('FundingQuoteProviders', () => {
     })
   })
 
-  test('maps Symbiosis fee-floor errors to unavailable quote probes', async () => {
+  test('maps Symbiosis fee-floor errors to unavailable quote results', async () => {
     const candidate = quoteCandidate('symbiosis')
-    const adapter = FundingQuoteProviders.symbiosis({
+    const provider = Symbiosis.symbiosis({
       fetch: recordingFetch([], async () =>
         jsonResponse({ code: 0, message: 'Amount is too low to cover fees' }, 400),
       ),
@@ -425,7 +428,7 @@ describe('FundingQuoteProviders', () => {
     })
 
     await expect(
-      adapter.probeQuote(probeInput(candidate), new AbortController().signal),
+      provider.getQuote(getQuoteInput(candidate), new AbortController().signal),
     ).resolves.toMatchObject({
       quality: {
         sourceDetail: 'symbiosis:quote-v2:AMOUNT_TOO_LOW',
@@ -437,11 +440,11 @@ describe('FundingQuoteProviders', () => {
 
   test('rejects invalid Symbiosis configuration', () => {
     expect(() =>
-      FundingQuoteProviders.symbiosis({ userAddress: 'invalid' }),
-    ).toThrowErrorMatchingInlineSnapshot(`[FundingQuoteProviders.ProviderConfigurationError]`)
+      Symbiosis.symbiosis({ userAddress: 'invalid' }),
+    ).toThrowErrorMatchingInlineSnapshot(`[FundingProvider.ProviderConfigurationError]`)
   })
 
-  test('maps successful Rhino quotes to available quote probes', async () => {
+  test('maps successful Rhino quotes to available quote results', async () => {
     const requests: RecordedRequest[] = []
     const candidate = quoteCandidate('rhino')
     const fetch = recordingFetch(requests, async () =>
@@ -455,13 +458,13 @@ describe('FundingQuoteProviders', () => {
         token: 'USDC',
       }),
     )
-    const adapter = FundingQuoteProviders.rhino({
+    const provider = Rhino.rhino({
       baseUrl: 'https://rhino.test/bridge/',
       fetch,
       now,
     })
 
-    const result = await adapter.probeQuote(probeInput(candidate), new AbortController().signal)
+    const result = await provider.getQuote(getQuoteInput(candidate), new AbortController().signal)
 
     expect(requests).toHaveLength(1)
     expect(requests[0]?.url.pathname).toBe('/bridge/quote/bridge-swap/public')
@@ -475,7 +478,7 @@ describe('FundingQuoteProviders', () => {
       tokenOut: 'USDC',
     })
     expect(result).toEqual({
-      outputAmount: '983000',
+      destinationAmount: '983000',
       quality: {
         estimatedSeconds: 2,
         liquiditySource: 'providerQuote',
@@ -487,15 +490,15 @@ describe('FundingQuoteProviders', () => {
     })
   })
 
-  test('maps unavailable Rhino routes to unavailable quote probes', async () => {
+  test('maps unavailable Rhino routes to unavailable quote results', async () => {
     const candidate = quoteCandidate('rhino')
-    const adapter = FundingQuoteProviders.rhino({
+    const provider = Rhino.rhino({
       fetch: recordingFetch([], async () => jsonResponse({ _tag: 'NoRouteFoundError' }, 404)),
       now,
     })
 
     await expect(
-      adapter.probeQuote(probeInput(candidate), new AbortController().signal),
+      provider.getQuote(getQuoteInput(candidate), new AbortController().signal),
     ).resolves.toMatchObject({
       quality: {
         sourceDetail: 'rhino:bridge-swap-public:NoRouteFoundError',
@@ -525,7 +528,7 @@ describe('FundingQuoteProviders', () => {
 
     for (const testCase of cases) {
       const requests: RecordedRequest[] = []
-      const adapter = FundingQuoteProviders.rhino({
+      const provider = Rhino.rhino({
         fetch: recordingFetch(requests, async () =>
           jsonResponse({
             _tag: 'bridge',
@@ -540,8 +543,8 @@ describe('FundingQuoteProviders', () => {
       })
 
       await expect(
-        adapter.probeQuote(probeInput(testCase.candidate), new AbortController().signal),
-      ).resolves.toMatchObject({ outputAmount: '983000', status: 'available' })
+        provider.getQuote(getQuoteInput(testCase.candidate), new AbortController().signal),
+      ).resolves.toMatchObject({ destinationAmount: '983000', status: 'available' })
       expect(requests[0]?.url.searchParams.get('chainIn')).toBe(testCase.chainIn)
       expect(requests[0]?.url.searchParams.get('tokenOut')).toBe(testCase.tokenOut)
     }
@@ -549,15 +552,15 @@ describe('FundingQuoteProviders', () => {
 
   test('surfaces Rhino request decoding failures', async () => {
     const candidate = quoteCandidate('rhino')
-    const adapter = FundingQuoteProviders.rhino({
+    const provider = Rhino.rhino({
       fetch: recordingFetch([], async () => jsonResponse({ _tag: 'HttpApiDecodeError' }, 400)),
       now,
     })
 
     await expect(
-      adapter.probeQuote(probeInput(candidate), new AbortController().signal),
+      provider.getQuote(getQuoteInput(candidate), new AbortController().signal),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `[FundingQuoteProviders.ProviderResponseError: Provider request failed with status 400]`,
+      `[FundingProvider.ProviderResponseError: Provider request failed with status 400]`,
     )
   })
 
@@ -569,15 +572,15 @@ describe('FundingQuoteProviders', () => {
     ] as const
 
     for (const failure of failures) {
-      const adapter = FundingQuoteProviders.rhino({
+      const provider = Rhino.rhino({
         fetch: recordingFetch([], async () => jsonResponse(failure.body, failure.status)),
         now,
       })
-      const cause = await adapter
-        .probeQuote(probeInput(candidate), new AbortController().signal)
+      const cause = await provider
+        .getQuote(getQuoteInput(candidate), new AbortController().signal)
         .catch((error: unknown) => error)
       expect(cause).toMatchObject({
-        name: 'FundingQuoteProviders.ProviderResponseError',
+        name: 'FundingProvider.ProviderResponseError',
         status: failure.status,
       })
     }
@@ -585,7 +588,7 @@ describe('FundingQuoteProviders', () => {
 
   test('rejects mismatched Rhino quote payloads', async () => {
     const candidate = quoteCandidate('rhino')
-    const adapter = FundingQuoteProviders.rhino({
+    const provider = Rhino.rhino({
       fetch: recordingFetch([], async () =>
         jsonResponse({
           _tag: 'bridge',
@@ -600,13 +603,13 @@ describe('FundingQuoteProviders', () => {
     })
 
     await expect(
-      adapter.probeQuote(probeInput(candidate), new AbortController().signal),
-    ).rejects.toThrowErrorMatchingInlineSnapshot(`[FundingQuoteProviders.ProviderPayloadError]`)
+      provider.getQuote(getQuoteInput(candidate), new AbortController().signal),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(`[FundingProvider.ProviderPayloadError]`)
   })
 
   test('rejects non-representable Rhino output precision', async () => {
     const candidate = quoteCandidate('rhino')
-    const adapter = FundingQuoteProviders.rhino({
+    const provider = Rhino.rhino({
       fetch: recordingFetch([], async () =>
         jsonResponse({
           _tag: 'bridge',
@@ -621,8 +624,8 @@ describe('FundingQuoteProviders', () => {
     })
 
     await expect(
-      adapter.probeQuote(probeInput(candidate), new AbortController().signal),
-    ).rejects.toThrowErrorMatchingInlineSnapshot(`[FundingQuoteProviders.ProviderPayloadError]`)
+      provider.getQuote(getQuoteInput(candidate), new AbortController().signal),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(`[FundingProvider.ProviderPayloadError]`)
   })
 
   test('calls the runtime fetch method with its global receiver', async () => {
@@ -641,13 +644,13 @@ describe('FundingQuoteProviders', () => {
     vi.stubGlobal('fetch', fetch)
 
     try {
-      const adapter = FundingQuoteProviders.relay({
+      const provider = Relay.relay({
         now,
         userAddress: '0x1111111111111111111111111111111111111111',
       })
-      const result = await adapter.probeQuote(probeInput(candidate), new AbortController().signal)
+      const result = await provider.getQuote(getQuoteInput(candidate), new AbortController().signal)
 
-      expect(result.outputAmount).toBe('990000')
+      expect(result.destinationAmount).toBe('990000')
       expect(fetch).toHaveBeenCalledTimes(1)
     } finally {
       vi.unstubAllGlobals()
@@ -692,7 +695,7 @@ describe('FundingQuoteProviders', () => {
       const candidate = quoteCandidate('across')
       const body = acrossQuote(candidate)
       mutate(body)
-      const adapter = FundingQuoteProviders.across({
+      const provider = Across.across({
         apiKey: 'across-api-key',
         fetch: recordingFetch([], async () => jsonResponse(body)),
         integratorId: '0xdead',
@@ -701,8 +704,8 @@ describe('FundingQuoteProviders', () => {
       })
 
       await expect(
-        adapter.probeQuote(probeInput(candidate), new AbortController().signal),
-      ).rejects.toThrowErrorMatchingInlineSnapshot(`[FundingQuoteProviders.ProviderPayloadError]`)
+        provider.getQuote(getQuoteInput(candidate), new AbortController().signal),
+      ).rejects.toThrowErrorMatchingInlineSnapshot(`[FundingProvider.ProviderPayloadError]`)
     })
 
   const invalidSquidQuotes = [
@@ -751,7 +754,7 @@ describe('FundingQuoteProviders', () => {
       const candidate = quoteCandidate('squid')
       const body = squidQuote(candidate)
       mutate(body)
-      const adapter = FundingQuoteProviders.squid({
+      const provider = Squid.squid({
         fetch: recordingFetch([], async () => jsonResponse(body)),
         integratorId: 'squid-integrator-id',
         now,
@@ -759,8 +762,8 @@ describe('FundingQuoteProviders', () => {
       })
 
       await expect(
-        adapter.probeQuote(probeInput(candidate), new AbortController().signal),
-      ).rejects.toThrowErrorMatchingInlineSnapshot(`[FundingQuoteProviders.ProviderPayloadError]`)
+        provider.getQuote(getQuoteInput(candidate), new AbortController().signal),
+      ).rejects.toThrowErrorMatchingInlineSnapshot(`[FundingProvider.ProviderPayloadError]`)
     })
 
   const invalidSymbiosisQuotes = [
@@ -819,20 +822,20 @@ describe('FundingQuoteProviders', () => {
       const candidate = quoteCandidate('symbiosis')
       const body = symbiosisQuote(candidate)
       mutate(body)
-      const adapter = FundingQuoteProviders.symbiosis({
+      const provider = Symbiosis.symbiosis({
         fetch: recordingFetch([], async () => jsonResponse(body)),
         now,
         userAddress: '0x1111111111111111111111111111111111111111',
       })
 
       await expect(
-        adapter.probeQuote(probeInput(candidate), new AbortController().signal),
-      ).rejects.toThrowErrorMatchingInlineSnapshot(`[FundingQuoteProviders.ProviderPayloadError]`)
+        provider.getQuote(getQuoteInput(candidate), new AbortController().signal),
+      ).rejects.toThrowErrorMatchingInlineSnapshot(`[FundingProvider.ProviderPayloadError]`)
     })
 
   test('returns bounded Across failure diagnostics', async () => {
     const candidate = quoteCandidate('across')
-    const adapter = FundingQuoteProviders.across({
+    const provider = Across.across({
       apiKey: 'across-api-key',
       fetch: recordingFetch([], async () =>
         jsonResponse({ apiKey: 'secret', code: 'UNAUTHORIZED' }, 401),
@@ -841,55 +844,64 @@ describe('FundingQuoteProviders', () => {
       now,
       userAddress: '0x1111111111111111111111111111111111111111',
     })
-    const cause = await adapter
-      .probeQuote(probeInput(candidate), new AbortController().signal)
+    const cause = await provider
+      .getQuote(getQuoteInput(candidate), new AbortController().signal)
       .catch((error: unknown) => error)
 
-    expect(FundingQuoteProviders.providerFailure({ cause, provider: 'across' })).toEqual({
+    expect(
+      FundingProvider.failure({
+        cause,
+        operation: 'getQuote',
+        provider: getProvider('across'),
+      }),
+    ).toEqual({
       code: 'UNAUTHORIZED',
       failure: 'http',
       id: 'across',
-      operation: 'swap/approval',
+      operation: 'getQuote',
       status: 401,
     })
   })
 
   test('returns explicit timeout failure diagnostics', () => {
     expect(
-      FundingQuoteProviders.providerFailure({
-        cause: new FundingQuotes.ProviderAdapterTimeoutError(),
-        provider: 'across',
+      FundingProvider.failure({
+        cause: new FundingProvider.ProviderTimeoutError(),
+        operation: 'getQuote',
+        provider: getProvider('across'),
       }),
     ).toEqual({
       failure: 'timeout',
       id: 'across',
-      operation: 'swap/approval',
+      operation: 'getQuote',
     })
   })
 
   test('returns bounded Squid failure diagnostics', () => {
     expect(
-      FundingQuoteProviders.providerFailure({
+      FundingProvider.failure({
         cause: new TypeError('network failure'),
-        provider: 'squid',
+        operation: 'getQuote',
+        provider: getProvider('squid'),
       }),
     ).toEqual({
       failure: 'network',
       id: 'squid',
-      operation: 'v2/route',
+      operation: 'getQuote',
     })
   })
 
   test('returns bounded Symbiosis failure diagnostics', () => {
     expect(
-      FundingQuoteProviders.providerFailure({
+      FundingProvider.failure({
         cause: new TypeError('network failure'),
-        provider: 'symbiosis',
+        operation: 'getQuote',
+        provider: getProvider('symbiosis'),
       }),
     ).toEqual({
       failure: 'network',
       id: 'symbiosis',
-      operation: 'v2/quote',
+      operation: 'getQuote',
     })
   })
 })
@@ -900,12 +912,14 @@ type RecordedRequest = {
 }
 
 function quoteCandidate(
-  provider: FundingQuotes.ProviderId = 'relay',
+  provider: FundingProvider.ProviderId = 'relay',
   options: quoteCandidate.Options = {},
-): FundingQuotes.QuoteProbeInput['candidate'] {
-  const [candidate] = FundingQuotes.listQuoteCandidates({
+): FundingProvider.getQuote.Parameters['candidate'] {
+  const [candidate] = FundingProvider.getQuoteCandidates({
+    catalog: TestFunding.snapshot,
     destinationToken: options.destinationToken,
     provider,
+    providers,
     sourceAmount: '1000000',
     sourceAmountUnits: 'baseUnits',
     sourceChain: options.sourceChain ?? 'base',
@@ -915,6 +929,12 @@ function quoteCandidate(
   return candidate
 }
 
+function getProvider(id: FundingProvider.ProviderId) {
+  const provider = providers.find((entry) => entry.id === id)
+  if (!provider) throw new Error(`Missing ${id} provider`)
+  return provider
+}
+
 declare namespace quoteCandidate {
   type Options = {
     destinationToken?: string | undefined
@@ -923,7 +943,7 @@ declare namespace quoteCandidate {
   }
 }
 
-function acrossQuote(candidate: FundingQuotes.QuoteProbeInput['candidate']) {
+function acrossQuote(candidate: FundingProvider.getQuote.Parameters['candidate']) {
   return {
     amountType: 'exactInput',
     expectedFillTime: 2,
@@ -946,7 +966,7 @@ function acrossQuote(candidate: FundingQuotes.QuoteProbeInput['candidate']) {
   }
 }
 
-function squidQuote(candidate: FundingQuotes.QuoteProbeInput['candidate']) {
+function squidQuote(candidate: FundingProvider.getQuote.Parameters['candidate']) {
   return {
     route: {
       estimate: {
@@ -969,7 +989,7 @@ function squidQuote(candidate: FundingQuotes.QuoteProbeInput['candidate']) {
   }
 }
 
-function symbiosisQuote(candidate: FundingQuotes.QuoteProbeInput['candidate']) {
+function symbiosisQuote(candidate: FundingProvider.getQuote.Parameters['candidate']) {
   const source =
     candidate.sourceChain.kind === 'tron'
       ? {
@@ -1004,9 +1024,9 @@ function symbiosisQuote(candidate: FundingQuotes.QuoteProbeInput['candidate']) {
   }
 }
 
-function probeInput(
-  candidate: FundingQuotes.QuoteProbeInput['candidate'],
-): FundingQuotes.QuoteProbeInput {
+function getQuoteInput(
+  candidate: FundingProvider.getQuote.Parameters['candidate'],
+): FundingProvider.getQuote.Parameters {
   return {
     candidate,
     cache: { bypass: false },
@@ -1019,6 +1039,7 @@ function probeInput(
       sourceChain: candidate.sourceChain.id,
       sourceToken: candidate.sourceToken.symbol,
     },
+    route: candidate.route,
     sourceAmount: candidate.sourceAmount,
     sourceChain: candidate.sourceChain,
     sourceToken: candidate.sourceToken,