tapimo 0.13.0 → 0.15.0

package/src/internal/{funding → routes}/Reconciliation.test.ts

@@ -3,17 +3,21 @@ import * as NodeBuffer from 'node:buffer'
 import { AbiEvent, AbiFunction, AbiParameters, Address, Hex } from 'ox'
 
 import * as Metrics from '../../Metrics.js'
-import * as FundingCatalog from '../../db/tables/fundingCatalog.js'
-import * as FundingDepositAddresses from '../../db/tables/fundingDepositAddresses.js'
-import * as FundingDepositRequestObservations from '../../db/tables/fundingDepositRequestObservations.js'
-import * as FundingDeposits from '../../db/tables/fundingDeposits.js'
+import * as Organizations from '../../db/tables/organizations.js'
+import * as RoutesCatalog from '../../db/tables/routesCatalog.js'
+import * as RoutesDepositAddresses from '../../db/tables/routesDepositAddresses.js'
+import * as RoutesDepositRequestObservations from '../../db/tables/routesDepositRequestObservations.js'
+import * as RoutesDeposits from '../../db/tables/routesDeposits.js'
+import * as RoutesSubsidies from '../../db/tables/routesSubsidies.js'
+import * as StripeCustomers from '../../db/tables/stripeCustomers.js'
 import * as TestApp from '../../../test/App.js'
-import * as TestFunding from '../../../test/Funding.js'
+import * as TestRoutes from '../../../test/Routes.js'
 import * as TestRelay from '../../../test/Relay.js'
 import * as Chain from './Chain.js'
 import * as Deposit from './Deposit.js'
 import * as DepositAddress from './DepositAddress.js'
 import * as Evidence from './Evidence.js'
+import * as Observability from './Observability.js'
 import * as Provider from './Provider.js'
 import * as Reconciliation from './Reconciliation.js'
 import * as Relay from './providers/relay.js'
@@ -23,13 +27,80 @@ const db = TestApp.database()
 const transferTopic = AbiEvent.getSelector('event Transfer(address,address,uint256)')
 
 describe('createTracker', () => {
+  test('schedules one poll after a provider payload failure', async () => {
+    const route = TestRoutes.transferSnapshot()
+    const address = await DepositAddress.create(db, {
+      deliveryStrategy: 'provider',
+      environment: 'production',
+      // Keep this failed record beyond the clocks used by later tick tests.
+      now: new Date('2126-09-01T22:30:00.000Z'),
+      orgId: 'org_provider_payload_failure',
+      providerOutputToken: route.destinationToken,
+      snapshot: {
+        address: `0x${'41'.repeat(20)}`,
+        destinationChain: route.destinationChain,
+        destinationToken: route.destinationToken,
+        provider: { id: 'relay', name: 'Relay' },
+        recipient: route.recipient,
+        refundAddress: `0x${'42'.repeat(20)}`,
+        sourceChain: route.sourceChain,
+        sourceToken: route.sourceToken,
+        subsidize: false,
+      },
+    })
+    const server = await TestRelay.createServer((_request, response) => {
+      response.writeHead(200, { 'content-type': 'application/json' })
+      response.end(JSON.stringify({ requests: null }))
+    })
+
+    try {
+      const tracker = Reconciliation.createTracker({
+        db,
+        dispatch: async () => undefined,
+        now: () => new Date('2126-09-01T22:31:45.000Z'),
+        providers: [Relay.relay({ apiKey: 'relay-api-key', baseUrl: server.url })],
+        verifyTransfers: Evidence.createVerifier({ db }),
+      })
+
+      const result = await tracker.reconcile({
+        addressId: address.id,
+        trigger: 'webhook',
+        type: 'routes:deposit-address:reconcile',
+      })
+      const stored = await RoutesDepositAddresses.get(db, address.id)
+
+      expect({
+        nextPollAt: stored?.nextPollAt,
+        pollFailureCount: stored?.pollFailureCount,
+        pollLeaseUntil: stored?.pollLeaseUntil,
+        result,
+      }).toMatchInlineSnapshot(`
+        {
+          "nextPollAt": "2126-09-01T22:32:45.000Z",
+          "pollFailureCount": 1,
+          "pollLeaseUntil": null,
+          "result": {
+            "type": "provider_unavailable",
+          },
+        }
+      `)
+    } finally {
+      await server.closeAsync()
+    }
+  })
+
   test('keeps Relay success pending without destination evidence', async () => {
-    const route = TestFunding.transferSnapshot()
+    const route = TestRoutes.transferSnapshot()
     const depositAddress = `0x${'44'.repeat(20)}`
+    await db.kysely
+      .deleteFrom('routes_deposit_addresses')
+      .where('providerId', '=', 'relay')
+      .where('address', '=', depositAddress)
+      .execute()
+    const newerSourceTransactionHash = `0x${'bb'.repeat(32)}`
     const sourceTransactionHash = `0x${'aa'.repeat(32)}`
     const providerTransactionHash = `0x${'cc'.repeat(32)}`
     const address = await DepositAddress.create(db, {
-      apiKeyId: 'key_reconciliation',
       deliveryStrategy: 'provider',
       environment: 'production',
       now: new Date('2026-01-01T00:00:00.000Z'),
@@ -58,22 +129,37 @@ describe('createTracker', () => {
     })
     const server = await TestRelay.createServer(async (request, response) => {
       if (request.method === 'GET') {
+        const requestId = new URL(request.url!, 'http://localhost').searchParams.get('id')
+        const requests = [
+          {
+            createdAt: '2026-01-01T00:02:00.000Z',
+            data: {
+              inTxs: [{ txHash: providerTransactionHash }],
+              outTxs: [],
+            },
+            depositAddress: { depositTxHash: newerSourceTransactionHash },
+            id: 'relay-newer-request',
+            status: 'success',
+            updatedAt: '2026-01-01T00:03:00.000Z',
+          },
+          {
+            createdAt: '2026-01-01T00:01:00.000Z',
+            data: {
+              inTxs: [{ txHash: providerTransactionHash }],
+              outTxs: [],
+            },
+            depositAddress: { depositTxHash: sourceTransactionHash },
+            id: 'relay-child-request',
+            status: 'success',
+            updatedAt: '2026-01-01T00:02:00.000Z',
+          },
+        ]
         response.writeHead(200, { 'content-type': 'application/json' })
         response.end(
           JSON.stringify({
-            requests: [
-              {
-                createdAt: '2026-01-01T00:01:00.000Z',
-                data: {
-                  inTxs: [{ txHash: providerTransactionHash }],
-                  outTxs: [],
-                },
-                depositAddress: { depositTxHash: sourceTransactionHash },
-                id: 'relay-child-request',
-                status: 'success',
-                updatedAt: '2026-01-01T00:02:00.000Z',
-              },
-            ],
+            requests: requestId
+              ? requests.filter((candidate) => candidate.id === requestId)
+              : requests,
           }),
         )
         return
@@ -93,7 +179,7 @@ describe('createTracker', () => {
           : {
               blockNumber: '0x80',
               logs: [
-                hash === sourceTransactionHash
+                hash === sourceTransactionHash || hash === newerSourceTransactionHash
                   ? transferLog({
                       amount: 1_000_000n,
                       recipient: depositAddress,
@@ -114,7 +200,7 @@ describe('createTracker', () => {
     })
 
     try {
-      await FundingCatalog.publish(db, {
+      await RoutesCatalog.publish(db, {
         chainTokens: [],
         chains: [
           {
@@ -138,6 +224,7 @@ describe('createTracker', () => {
         tokens: [],
       })
       const messages: Provider.Webhook.receive.Dispatchable[] = []
+      const intervals: Observability.LifecycleInterval[] = []
       const provider = Relay.relay({ apiKey: 'relay-api-key', baseUrl: server.url })
       const tracker = Reconciliation.createTracker({
         db,
@@ -147,6 +234,9 @@ describe('createTracker', () => {
         metrics,
         now: () => new Date('2027-01-01T00:00:00.000Z'),
         providers: [provider],
+        recordLifecycleInterval: async (interval) => {
+          intervals.push(interval)
+        },
         verifyTransfers: Evidence.createVerifier({
           db,
         }),
@@ -161,21 +251,34 @@ describe('createTracker', () => {
         type: message.type,
       }
       const reconciliation = await tracker.reconcile(queuedBeforeAttribution)
+      expect(intervals).toEqual([
+        {
+          endedAt: '2026-01-01T00:01:00.000Z',
+          routesEnvironment: 'production',
+          method: 'deposit_address',
+          provider: 'relay',
+          resourceId: address.id,
+          stage: 'source_routes',
+          startedAt: '2026-01-01T00:00:00.000Z',
+        },
+      ])
       const duplicate = await tracker.reconcile(queuedBeforeAttribution)
-      const [record] = await FundingDeposits.listBySourceTransaction(db, {
+      expect(intervals).toHaveLength(1)
+      const [record] = await RoutesDeposits.listBySourceTransaction(db, {
         depositAddressId: address.id,
         sourceTransactionHash,
       })
-      const observation = await FundingDepositRequestObservations.get(db, {
+      const observation = await RoutesDepositRequestObservations.get(db, {
         depositAddressId: address.id,
         providerRequestId: 'relay-child-request',
       })
-      const storedAddress = await FundingDepositAddresses.get(db, address.id)
+      const storedAddress = await RoutesDepositAddresses.get(db, address.id)
 
       expect({
-        counts,
+        counts: counts.filter(([name]) => name !== 'routes_provider_operation_count'),
         duplicate,
         observation,
+        providerOperations: providerOperationCounts(counts),
         reconciliation,
         record,
         storedAddress,
@@ -187,6 +290,7 @@ describe('createTracker', () => {
             depositAddressId: expect.any(String),
             id: expect.any(String),
             snapshot: { depositAddressId: expect.any(String) },
+            statusUpdatedAt: expect.any(String),
             updatedAt: expect.any(String),
           },
           observation: { depositAddressId: expect.any(String) },
@@ -194,13 +298,14 @@ describe('createTracker', () => {
             id: expect.any(String),
             providerOutputToken: expect.any(Object),
             snapshot: expect.any(Object),
+            statusUpdatedAt: expect.any(String),
           },
         },
         `
         {
           "counts": [
             [
-              "funding_deposit_reconciliation_count",
+              "routes_deposit_reconciliation_count",
               1,
               {
                 "outcome": "enqueued",
@@ -209,15 +314,67 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_detection_count",
+              "routes_resource_transition_count",
+              1,
+              {
+                "from_status": "none",
+                "method": "deposit_address",
+                "provider": "relay",
+                "reason": "none",
+                "resource": "deposit",
+                "routes_environment": "production",
+                "to_status": "detected",
+              },
+            ],
+            [
+              "routes_resource_transition_count",
+              1,
+              {
+                "from_status": "detected",
+                "method": "deposit_address",
+                "provider": "relay",
+                "reason": "none",
+                "resource": "deposit",
+                "routes_environment": "production",
+                "to_status": "bridging",
+              },
+            ],
+            [
+              "routes_resource_transition_count",
+              1,
+              {
+                "from_status": "none",
+                "method": "deposit_address",
+                "provider": "relay",
+                "reason": "none",
+                "resource": "deposit",
+                "routes_environment": "production",
+                "to_status": "detected",
+              },
+            ],
+            [
+              "routes_resource_transition_count",
               1,
+              {
+                "from_status": "detected",
+                "method": "deposit_address",
+                "provider": "relay",
+                "reason": "none",
+                "resource": "deposit",
+                "routes_environment": "production",
+                "to_status": "bridging",
+              },
+            ],
+            [
+              "routes_deposit_detection_count",
+              2,
               {
                 "provider": "relay",
                 "trigger": "poll",
               },
             ],
             [
-              "funding_deposit_reconciliation_count",
+              "routes_deposit_reconciliation_count",
               1,
               {
                 "outcome": "follow_up_enqueued",
@@ -226,7 +383,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_count",
+              "routes_deposit_reconciliation_count",
               1,
               {
                 "outcome": "completed",
@@ -244,10 +401,13 @@ describe('createTracker', () => {
             "providerRequestId": "relay-child-request",
             "webhookReceivedAt": null,
           },
+          "providerOperations": {
+            "relay:listDepositAddressRequests:success": 1,
+          },
           "reconciliation": {
-            "created": 1,
+            "created": 2,
             "type": "completed",
-            "updated": 1,
+            "updated": 2,
           },
           "record": {
             "createdAt": Any<String>,
@@ -258,6 +418,7 @@ describe('createTracker', () => {
             "orgId": "org_reconciliation",
             "pollObservedAt": "2027-01-01T00:00:00.000Z",
             "projectId": null,
+            "providerDeliveredAt": null,
             "providerOutputAmount": null,
             "providerOutputToken": {
               "address": "0x20c000000000000000000000b9537d11c60e8b50",
@@ -274,6 +435,7 @@ describe('createTracker', () => {
               "relay-child-request",
             ],
             "providerState": null,
+            "providerSubsidy": null,
             "providerTransactionHashes": [],
             "providerTransferIndex": 0,
             "retryState": null,
@@ -336,7 +498,9 @@ describe('createTracker', () => {
             "sourceTransferIndex": 0,
             "status": "bridging",
             "statusReason": null,
+            "statusUpdatedAt": Any<String>,
             "subsidyAmount": null,
+            "subsidyMeterReportedAt": null,
             "tempoGasPaid": null,
             "updatedAt": Any<String>,
             "version": 3,
@@ -344,8 +508,8 @@ describe('createTracker', () => {
           },
           "storedAddress": {
             "address": "0x4444444444444444444444444444444444444444",
-            "apiKeyId": "key_reconciliation",
             "createdAt": "2026-01-01T00:00:00.000Z",
+            "creatorUserId": null,
             "deliveryStrategy": "provider",
             "destinationTokenKey": "eip155:4217/erc20:0x20c000000000000000000000b9537d11c60e8b50",
             "environment": "production",
@@ -363,12 +527,13 @@ describe('createTracker', () => {
             "providerState": {
               "reconciliation": {
                 "pendingRequestIds": [
+                  "relay-newer-request",
                   "relay-child-request",
                 ],
                 "requestIds": [
-                  "relay-child-request",
+                  "relay-newer-request",
                 ],
-                "updatedAt": "2026-01-01T00:02:00.000Z",
+                "updatedAt": "2026-01-01T00:03:00.000Z",
               },
             },
             "recipient": "0x1111111111111111111111111111111111111111",
@@ -377,6 +542,7 @@ describe('createTracker', () => {
             "sourceChainId": "eip155:8453",
             "sourceTokenKey": "eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
             "status": "active",
+            "statusUpdatedAt": Any<String>,
             "subsidize": false,
             "updatedAt": "2026-01-01T00:00:00.000Z",
             "version": 1,
@@ -394,12 +560,11 @@ describe('createTracker', () => {
   })
 
   test('completes an unsubsidized deposit at its verified provider output', async () => {
-    const route = TestFunding.transferSnapshot()
+    const route = TestRoutes.transferSnapshot()
     const depositAddress = `0x${'45'.repeat(20)}`
     const destinationTransactionHash = `0x${'cd'.repeat(32)}`
     const sourceTransactionHash = `0x${'ab'.repeat(32)}`
     const address = await DepositAddress.create(db, {
-      apiKeyId: 'key_unsubsidized_reconciliation',
       deliveryStrategy: 'provider',
       environment: 'production',
       now: new Date('2026-01-06T00:00:00.000Z'),
@@ -446,7 +611,7 @@ describe('createTracker', () => {
     })
 
     try {
-      await FundingCatalog.publish(db, {
+      await RoutesCatalog.publish(db, {
         chainTokens: [],
         chains: [
           {
@@ -483,7 +648,7 @@ describe('createTracker', () => {
         trigger: 'manual',
         verifyTransfers: Evidence.createVerifier({ db }),
       })
-      const [record] = await FundingDeposits.listBySourceTransaction(db, {
+      const [record] = await RoutesDeposits.listBySourceTransaction(db, {
         depositAddressId: address.id,
         sourceTransactionHash,
       })
@@ -494,7 +659,9 @@ describe('createTracker', () => {
             createdAt: expect.any(String),
             depositAddressId: expect.any(String),
             id: expect.any(String),
+            providerDeliveredAt: expect.any(String),
             snapshot: { depositAddressId: expect.any(String) },
+            statusUpdatedAt: expect.any(String),
             updatedAt: expect.any(String),
           },
         },
@@ -509,6 +676,7 @@ describe('createTracker', () => {
             "orgId": "org_unsubsidized_reconciliation",
             "pollObservedAt": null,
             "projectId": null,
+            "providerDeliveredAt": Any<String>,
             "providerOutputAmount": {
               "baseUnits": "950000",
               "currency": "USD",
@@ -530,6 +698,7 @@ describe('createTracker', () => {
               "unsubsidized-request",
             ],
             "providerState": null,
+            "providerSubsidy": null,
             "providerTransactionHashes": [
               "0xcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd",
             ],
@@ -608,7 +777,9 @@ describe('createTracker', () => {
             "sourceTransferIndex": 0,
             "status": "completed",
             "statusReason": null,
+            "statusUpdatedAt": Any<String>,
             "subsidyAmount": null,
+            "subsidyMeterReportedAt": null,
             "tempoGasPaid": null,
             "updatedAt": Any<String>,
             "version": 3,
@@ -627,8 +798,290 @@ describe('createTracker', () => {
     }
   })
 
+  test('applies live subsidy policy and billing to new top-ups', async () => {
+    const route = TestRoutes.transferSnapshot()
+    const scenarios = [
+      {
+        billing: 'missing',
+        delivered: 950_000n,
+        maxAmount: null,
+        name: 'policy disabled',
+      },
+      {
+        billing: 'missing',
+        delivered: 950_000n,
+        maxAmount: '1',
+        name: 'billing required',
+      },
+      {
+        billing: 'past_due',
+        delivered: 950_000n,
+        maxAmount: '1',
+        name: 'billing past due',
+      },
+      {
+        billing: 'active',
+        delivered: 950_000n,
+        maxAmount: '0.049999',
+        name: 'limit exceeded',
+      },
+      {
+        billing: 'missing',
+        delivered: 1_000_000n,
+        maxAmount: null,
+        name: 'provider delivered in full',
+      },
+    ] as const
+    const sourceTransactionHashes = new Set(
+      scenarios.map((_, index) => `0x${(index + 81).toString(16).repeat(32)}`),
+    )
+    const sourceRecipients = new Map<string, string>()
+    const destinationAmounts = new Map(
+      scenarios.map((scenario, index) => [
+        `0x${(index + 97).toString(16).repeat(32)}`,
+        scenario.delivered,
+      ]),
+    )
+    const server = await TestRelay.createServer(async (request, response) => {
+      const chunks: Uint8Array[] = []
+      for await (const chunk of request) chunks.push(chunk)
+      const body = JSON.parse(NodeBuffer.Buffer.concat(chunks).toString()) as {
+        id: number
+        method: string
+        params?: readonly string[] | undefined
+      }
+      const hash = body.params?.[0]
+      const source = hash !== undefined && sourceTransactionHashes.has(hash)
+      const amount = source ? 1_000_000n : destinationAmounts.get(hash ?? '')
+      const result =
+        body.method === 'eth_blockNumber'
+          ? '0x100'
+          : {
+              blockNumber: '0x80',
+              logs: [
+                transferLog({
+                  amount: amount ?? 0n,
+                  recipient: source ? (sourceRecipients.get(hash ?? '') ?? '') : route.recipient,
+                  sender: `0x${'71'.repeat(20)}`,
+                  token: source ? route.sourceToken.address : route.destinationToken.address,
+                }),
+              ],
+              status: '0x1',
+            }
+      response.writeHead(200, { 'content-type': 'application/json' })
+      response.end(JSON.stringify({ id: body.id, jsonrpc: '2.0', result }))
+    })
+
+    try {
+      await RoutesCatalog.publish(db, {
+        chainTokens: [],
+        chains: [
+          {
+            aliases: [],
+            id: route.destinationChain.id as Chain.Id,
+            name: route.destinationChain.name,
+            parentChainId: null,
+            rpcUrls: [server.url],
+            slug: 'destination-subsidy-policy',
+          },
+          {
+            aliases: [],
+            id: route.sourceChain.id as Chain.Id,
+            name: route.sourceChain.name,
+            parentChainId: null,
+            rpcUrls: [server.url],
+            slug: 'source-subsidy-policy',
+          },
+        ],
+        routes: [],
+        tokens: [],
+      })
+      const counts: Parameters<Metrics.Metrics['count']>[] = []
+      const metrics = Metrics.from({
+        count(...parameters) {
+          counts.push(parameters)
+        },
+        flush() {},
+        gauge() {},
+        histogram() {},
+      })
+      const records = []
+      for (const [index, scenario] of scenarios.entries()) {
+        const orgId = `org_subsidy_policy_${index}`
+        await Organizations.create(db, { id: orgId, name: scenario.name })
+        if (scenario.maxAmount !== null)
+          await RoutesSubsidies.upsertOrganization(db, {
+            frequency: 'tx',
+            maxAmount: scenario.maxAmount,
+            orgId,
+          })
+        if (scenario.billing !== 'missing') {
+          await StripeCustomers.create(db, {
+            orgId,
+            stripeCustomerId: `cus_subsidy_policy_${index}`,
+          })
+          await StripeCustomers.setStatus(db, orgId, scenario.billing)
+        }
+        const depositAddress = `0x${(index + 113).toString(16).repeat(20)}`
+        const address = await DepositAddress.create(db, {
+          deliveryStrategy: 'provider',
+          environment: 'production',
+          orgId,
+          providerOutputToken: route.destinationToken,
+          snapshot: {
+            address: depositAddress,
+            destinationChain: route.destinationChain,
+            destinationToken: route.destinationToken,
+            provider: { id: 'local', name: 'Local' },
+            recipient: route.recipient,
+            refundAddress: `0x${(index + 121).toString(16).repeat(20)}`,
+            sourceChain: route.sourceChain,
+            sourceToken: route.sourceToken,
+            subsidize: true,
+          },
+        })
+        const sourceTransactionHash = [...sourceTransactionHashes][index]!
+        sourceRecipients.set(sourceTransactionHash, depositAddress)
+        const destinationTransactionHash = [...destinationAmounts.keys()][index]!
+        const result = await Reconciliation.reconcileRequest(db, {
+          address,
+          metrics,
+          request: {
+            createdAt: '2026-01-06T00:01:00.000Z',
+            destinationTransactionHashes: [destinationTransactionHash],
+            id: `subsidy-policy-request-${index}`,
+            refundTransactionHashes: [],
+            sourceTransactionHashes: [sourceTransactionHash],
+            ...(scenario.name === 'provider delivered in full'
+              ? {
+                  subsidy: {
+                    amount: {
+                      baseUnits: '23838',
+                      currency: 'USD',
+                      decimals: 6,
+                      formatted: '0.023838',
+                    },
+                    provider: 'relay',
+                    token: route.sourceToken,
+                  },
+                }
+              : {}),
+            status: 'success',
+            updatedAt: '2026-01-06T00:02:00.000Z',
+          },
+          trigger: 'manual',
+          verifyTransfers: Evidence.createVerifier({ db }),
+        })
+        const [record] = await RoutesDeposits.listBySourceTransaction(db, {
+          depositAddressId: address.id,
+          sourceTransactionHash,
+        })
+        records.push({
+          name: scenario.name,
+          status: record?.status,
+          statusReason: record?.statusReason,
+          subsidies: record ? RoutesDeposits.subsidies(record) : [],
+          subsidyAmount: record?.subsidyAmount?.baseUnits ?? null,
+          terminal: result.terminal,
+        })
+      }
+
+      expect({
+        outcomes: counts
+          .filter(([name]) => name === 'routes_deposit_subsidy_count')
+          .map(([, , tags]) => tags?.['outcome']),
+        records,
+      }).toMatchInlineSnapshot(`
+        {
+          "outcomes": [
+            "routes_subsidy_not_enabled",
+            "billing_required",
+            "billing_past_due",
+            "routes_subsidy_limit_exceeded",
+          ],
+          "records": [
+            {
+              "name": "policy disabled",
+              "status": "action-required",
+              "statusReason": {
+                "code": "routes_subsidy_not_enabled",
+                "message": "Routes subsidies are not enabled for this organization.",
+              },
+              "subsidies": [],
+              "subsidyAmount": null,
+              "terminal": false,
+            },
+            {
+              "name": "billing required",
+              "status": "action-required",
+              "statusReason": {
+                "code": "billing_required",
+                "message": "Billing required.",
+              },
+              "subsidies": [],
+              "subsidyAmount": null,
+              "terminal": false,
+            },
+            {
+              "name": "billing past due",
+              "status": "action-required",
+              "statusReason": {
+                "code": "billing_past_due",
+                "message": "Billing past due.",
+              },
+              "subsidies": [],
+              "subsidyAmount": null,
+              "terminal": false,
+            },
+            {
+              "name": "limit exceeded",
+              "status": "action-required",
+              "statusReason": {
+                "code": "routes_subsidy_limit_exceeded",
+                "message": "The required subsidy exceeds the per-transaction limit.",
+              },
+              "subsidies": [],
+              "subsidyAmount": null,
+              "terminal": false,
+            },
+            {
+              "name": "provider delivered in full",
+              "status": "completed",
+              "statusReason": null,
+              "subsidies": [
+                {
+                  "amount": {
+                    "baseUnits": "23838",
+                    "currency": "USD",
+                    "decimals": 6,
+                    "formatted": "0.023838",
+                  },
+                  "provider": "relay",
+                  "token": {
+                    "address": "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+                    "currency": "USD",
+                    "decimals": 6,
+                    "name": "USD Coin",
+                    "standard": "ERC-20",
+                    "symbol": "USDC",
+                    "tokenKey": "eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+                    "verified": true,
+                  },
+                },
+              ],
+              "subsidyAmount": null,
+              "terminal": true,
+            },
+          ],
+        }
+      `)
+    } finally {
+      await server.closeAsync()
+    }
+  })
+
   test('verifies Relay refunds on the source chain before completing recovery', async () => {
-    const route = TestFunding.transferSnapshot()
+    const route = TestRoutes.transferSnapshot()
     const depositAddress = `0x${'48'.repeat(20)}`
     const firstRefundTransactionHash = `0x${'ce'.repeat(32)}`
     const refundAddress = `0x${'49'.repeat(20)}`
@@ -636,7 +1089,6 @@ describe('createTracker', () => {
     const settlementTransactionHash = `0x${'cf'.repeat(32)}`
     const sourceTransactionHash = `0x${'ac'.repeat(32)}`
     const address = await DepositAddress.create(db, {
-      apiKeyId: 'key_refund_reconciliation',
       deliveryStrategy: 'provider',
       environment: 'production',
       now: new Date('2026-01-07T00:00:00.000Z'),
@@ -738,7 +1190,7 @@ describe('createTracker', () => {
     })
 
     try {
-      await FundingCatalog.publish(db, {
+      await RoutesCatalog.publish(db, {
         chainTokens: [],
         chains: [
           {
@@ -778,7 +1230,7 @@ describe('createTracker', () => {
         request,
         verifyTransfers,
       })
-      const [firstRecord] = await FundingDeposits.listBySourceTransaction(db, {
+      const [firstRecord] = await RoutesDeposits.listBySourceTransaction(db, {
         depositAddressId: address.id,
         sourceTransactionHash,
       })
@@ -797,13 +1249,13 @@ describe('createTracker', () => {
         request,
         verifyTransfers,
       })
-      const [record] = await FundingDeposits.listBySourceTransaction(db, {
+      const [record] = await RoutesDeposits.listBySourceTransaction(db, {
         depositAddressId: address.id,
         sourceTransactionHash,
       })
-      if (!firstRecord || !record) throw new Error('Expected reconciled funding deposits.')
+      if (!firstRecord || !record) throw new Error('Expected reconciled route deposits.')
 
-      expect(depositUpdateVersions).toEqual([2, firstRecord.version, 4, record.version])
+      expect(depositUpdateVersions).toEqual([2, 3, 4])
 
       expect({
         counts,
@@ -820,6 +1272,7 @@ describe('createTracker', () => {
             depositAddressId: expect.any(String),
             id: expect.any(String),
             snapshot: { depositAddressId: expect.any(String) },
+            statusUpdatedAt: expect.any(String),
             updatedAt: expect.any(String),
           },
           record: {
@@ -827,6 +1280,7 @@ describe('createTracker', () => {
             depositAddressId: expect.any(String),
             id: expect.any(String),
             snapshot: { depositAddressId: expect.any(String) },
+            statusUpdatedAt: expect.any(String),
             updatedAt: expect.any(String),
           },
         },
@@ -834,7 +1288,46 @@ describe('createTracker', () => {
         {
           "counts": [
             [
-              "funding_deposit_refund_count",
+              "routes_resource_transition_count",
+              1,
+              {
+                "from_status": "none",
+                "method": "deposit_address",
+                "provider": "relay",
+                "reason": "none",
+                "resource": "deposit",
+                "routes_environment": "production",
+                "to_status": "detected",
+              },
+            ],
+            [
+              "routes_resource_transition_count",
+              1,
+              {
+                "from_status": "detected",
+                "method": "deposit_address",
+                "provider": "relay",
+                "reason": "none",
+                "resource": "deposit",
+                "routes_environment": "production",
+                "to_status": "bridging",
+              },
+            ],
+            [
+              "routes_resource_transition_count",
+              1,
+              {
+                "from_status": "bridging",
+                "method": "deposit_address",
+                "provider": "relay",
+                "reason": "none",
+                "resource": "deposit",
+                "routes_environment": "production",
+                "to_status": "refunding",
+              },
+            ],
+            [
+              "routes_deposit_refund_count",
               1,
               {
                 "outcome": "pending",
@@ -842,7 +1335,20 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_refund_count",
+              "routes_resource_transition_count",
+              1,
+              {
+                "from_status": "refunding",
+                "method": "deposit_address",
+                "provider": "relay",
+                "reason": "none",
+                "resource": "deposit",
+                "routes_environment": "production",
+                "to_status": "refunded",
+              },
+            ],
+            [
+              "routes_deposit_refund_count",
               1,
               {
                 "outcome": "verified",
@@ -870,6 +1376,7 @@ describe('createTracker', () => {
             "orgId": "org_refund_reconciliation",
             "pollObservedAt": null,
             "projectId": null,
+            "providerDeliveredAt": null,
             "providerOutputAmount": null,
             "providerOutputToken": {
               "address": "0x20c000000000000000000000b9537d11c60e8b50",
@@ -886,6 +1393,7 @@ describe('createTracker', () => {
               "relay-refund-request",
             ],
             "providerState": null,
+            "providerSubsidy": null,
             "providerTransactionHashes": [
               "0xcececececececececececececececececececececececececececececececece",
               "0xcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd",
@@ -951,7 +1459,9 @@ describe('createTracker', () => {
             "sourceTransferIndex": 0,
             "status": "refunding",
             "statusReason": null,
+            "statusUpdatedAt": Any<String>,
             "subsidyAmount": null,
+            "subsidyMeterReportedAt": null,
             "tempoGasPaid": null,
             "updatedAt": Any<String>,
             "version": 3,
@@ -966,6 +1476,7 @@ describe('createTracker', () => {
             "orgId": "org_refund_reconciliation",
             "pollObservedAt": null,
             "projectId": null,
+            "providerDeliveredAt": null,
             "providerOutputAmount": null,
             "providerOutputToken": {
               "address": "0x20c000000000000000000000b9537d11c60e8b50",
@@ -982,6 +1493,7 @@ describe('createTracker', () => {
               "relay-refund-request",
             ],
             "providerState": null,
+            "providerSubsidy": null,
             "providerTransactionHashes": [
               "0xcececececececececececececececececececececececececececececececece",
               "0xcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd",
@@ -1057,10 +1569,12 @@ describe('createTracker', () => {
             "sourceTransferIndex": 0,
             "status": "refunded",
             "statusReason": null,
+            "statusUpdatedAt": Any<String>,
             "subsidyAmount": null,
+            "subsidyMeterReportedAt": null,
             "tempoGasPaid": null,
             "updatedAt": Any<String>,
-            "version": 5,
+            "version": 4,
             "webhookReceivedAt": null,
           },
           "request": {
@@ -1094,13 +1608,12 @@ describe('createTracker', () => {
   })
 
   test('preserves refund allocations when retrying a partially committed request', async () => {
-    const route = TestFunding.transferSnapshot()
+    const route = TestRoutes.transferSnapshot()
     const depositAddress = `0x${'50'.repeat(20)}`
     const refundAddress = `0x${'51'.repeat(20)}`
     const refundTransactionHash = `0x${'d0'.repeat(32)}`
     const sourceTransactionHash = `0x${'b0'.repeat(32)}`
     const address = await DepositAddress.create(db, {
-      apiKeyId: 'key_refund_retry',
       deliveryStrategy: 'provider',
       environment: 'production',
       now: new Date('2026-01-09T00:00:00.000Z'),
@@ -1119,7 +1632,7 @@ describe('createTracker', () => {
       },
     })
     const first = await Deposit.create(db, {
-      id: 'fdp_refund_retry_0',
+      id: 'rdp_refund_retry_0',
       now: new Date('2026-01-09T00:01:00.000Z'),
       providerRequestId: 'relay-refund-retry-request',
       providerTransferIndex: 0,
@@ -1144,7 +1657,7 @@ describe('createTracker', () => {
       sourceTransferIndex: 0,
     })
     await Deposit.create(db, {
-      id: 'fdp_refund_retry_1',
+      id: 'rdp_refund_retry_1',
       now: new Date('2026-01-09T00:01:01.000Z'),
       providerRequestId: 'relay-refund-retry-request',
       providerTransferIndex: 1,
@@ -1242,7 +1755,7 @@ describe('createTracker', () => {
     })
 
     try {
-      await FundingCatalog.publish(db, {
+      await RoutesCatalog.publish(db, {
         chainTokens: [],
         chains: [
           {
@@ -1279,7 +1792,7 @@ describe('createTracker', () => {
         verifyTransfers: Evidence.createVerifier({ db }),
       })
       const records = (
-        await FundingDeposits.listBySourceTransaction(db, {
+        await RoutesDeposits.listBySourceTransaction(db, {
           depositAddressId: address.id,
           sourceTransactionHash,
         })
@@ -1314,7 +1827,7 @@ describe('createTracker', () => {
                 "tokenKey": "eip155:4217/erc20:0x20c000000000000000000000b9537d11c60e8b50",
                 "verified": true,
               },
-              "id": "fdp_refund_retry_0",
+              "id": "rdp_refund_retry_0",
               "provider": {
                 "id": "relay",
                 "name": "Relay",
@@ -1378,7 +1891,7 @@ describe('createTracker', () => {
                 "tokenKey": "eip155:4217/erc20:0x20c000000000000000000000b9537d11c60e8b50",
                 "verified": true,
               },
-              "id": "fdp_refund_retry_1",
+              "id": "rdp_refund_retry_1",
               "provider": {
                 "id": "relay",
                 "name": "Relay",
@@ -1439,12 +1952,11 @@ describe('createTracker', () => {
   })
 
   test('reconciles destination evidence reported with a Relay failure', async () => {
-    const route = TestFunding.transferSnapshot()
+    const route = TestRoutes.transferSnapshot()
     const depositAddress = `0x${'56'.repeat(20)}`
     const destinationTransactionHash = `0x${'d1'.repeat(32)}`
     const sourceTransactionHash = `0x${'b1'.repeat(32)}`
     const address = await DepositAddress.create(db, {
-      apiKeyId: 'key_failure_delivery',
       deliveryStrategy: 'provider',
       environment: 'production',
       now: new Date('2026-01-10T00:00:00.000Z'),
@@ -1504,7 +2016,7 @@ describe('createTracker', () => {
     })
 
     try {
-      await FundingCatalog.publish(db, {
+      await RoutesCatalog.publish(db, {
         chainTokens: [],
         chains: [
           {
@@ -1540,7 +2052,7 @@ describe('createTracker', () => {
         },
         verifyTransfers: Evidence.createVerifier({ db }),
       })
-      const [record] = await FundingDeposits.listBySourceTransaction(db, {
+      const [record] = await RoutesDeposits.listBySourceTransaction(db, {
         depositAddressId: address.id,
         sourceTransactionHash,
       })
@@ -1643,12 +2155,11 @@ describe('createTracker', () => {
   })
 
   test('keeps Relay failures with unverified destination transactions pending for recovery', async () => {
-    const route = TestFunding.transferSnapshot()
+    const route = TestRoutes.transferSnapshot()
     const depositAddress = `0x${'4d'.repeat(20)}`
     const sourceTransactionHash = `0x${'ad'.repeat(32)}`
     const unrelatedDestinationTransactionHash = `0x${'d2'.repeat(32)}`
     const address = await DepositAddress.create(db, {
-      apiKeyId: 'key_failed_reconciliation',
       deliveryStrategy: 'provider',
       environment: 'production',
       now: new Date('2026-01-08T00:00:00.000Z'),
@@ -1702,7 +2213,7 @@ describe('createTracker', () => {
     })
 
     try {
-      await FundingCatalog.publish(db, {
+      await RoutesCatalog.publish(db, {
         chainTokens: [],
         chains: [
           {
@@ -1739,7 +2250,7 @@ describe('createTracker', () => {
         },
         verifyTransfers: Evidence.createVerifier({ db }),
       })
-      const [record] = await FundingDeposits.listBySourceTransaction(db, {
+      const [record] = await RoutesDeposits.listBySourceTransaction(db, {
         depositAddressId: address.id,
         sourceTransactionHash,
       })
@@ -1751,6 +2262,7 @@ describe('createTracker', () => {
             depositAddressId: expect.any(String),
             id: expect.any(String),
             snapshot: { depositAddressId: expect.any(String) },
+            statusUpdatedAt: expect.any(String),
             updatedAt: expect.any(String),
           },
         },
@@ -1758,7 +2270,46 @@ describe('createTracker', () => {
         {
           "counts": [
             [
-              "funding_deposit_refund_count",
+              "routes_resource_transition_count",
+              1,
+              {
+                "from_status": "none",
+                "method": "deposit_address",
+                "provider": "relay",
+                "reason": "none",
+                "resource": "deposit",
+                "routes_environment": "production",
+                "to_status": "detected",
+              },
+            ],
+            [
+              "routes_resource_transition_count",
+              1,
+              {
+                "from_status": "detected",
+                "method": "deposit_address",
+                "provider": "relay",
+                "reason": "none",
+                "resource": "deposit",
+                "routes_environment": "production",
+                "to_status": "bridging",
+              },
+            ],
+            [
+              "routes_resource_transition_count",
+              1,
+              {
+                "from_status": "bridging",
+                "method": "deposit_address",
+                "provider": "relay",
+                "reason": "none",
+                "resource": "deposit",
+                "routes_environment": "production",
+                "to_status": "refunding",
+              },
+            ],
+            [
+              "routes_deposit_refund_count",
               1,
               {
                 "outcome": "provider_failed",
@@ -1775,6 +2326,7 @@ describe('createTracker', () => {
             "orgId": "org_failed_reconciliation",
             "pollObservedAt": null,
             "projectId": null,
+            "providerDeliveredAt": null,
             "providerOutputAmount": null,
             "providerOutputToken": {
               "address": "0x20c000000000000000000000b9537d11c60e8b50",
@@ -1791,6 +2343,7 @@ describe('createTracker', () => {
               "relay-failed-request",
             ],
             "providerState": null,
+            "providerSubsidy": null,
             "providerTransactionHashes": [],
             "providerTransferIndex": 0,
             "retryState": null,
@@ -1852,7 +2405,9 @@ describe('createTracker', () => {
             "sourceTransferIndex": 0,
             "status": "refunding",
             "statusReason": null,
+            "statusUpdatedAt": Any<String>,
             "subsidyAmount": null,
+            "subsidyMeterReportedAt": null,
             "tempoGasPaid": null,
             "updatedAt": Any<String>,
             "version": 3,
@@ -1873,11 +2428,10 @@ describe('createTracker', () => {
   })
 
   test('persists a detected deposit before source verification succeeds', async () => {
-    const route = TestFunding.transferSnapshot()
+    const route = TestRoutes.transferSnapshot()
     const depositAddress = `0x${'20'.repeat(20)}`
     const sourceTransactionHash = `0x${'21'.repeat(32)}`
     const address = await DepositAddress.create(db, {
-      apiKeyId: 'key_observed_reconciliation',
       deliveryStrategy: 'provider',
       environment: 'production',
       now: new Date('2026-01-04T00:00:00.000Z'),
@@ -1928,7 +2482,7 @@ describe('createTracker', () => {
     })
 
     try {
-      await FundingCatalog.publish(db, {
+      await RoutesCatalog.publish(db, {
         chainTokens: [],
         chains: [
           {
@@ -1968,14 +2522,14 @@ describe('createTracker', () => {
           await tracker
             .reconcile({
               addressId: address.id,
-              type: 'funding:deposit-address:reconcile',
+              type: 'routes:deposit-address:reconcile',
             })
             .then(
               () => false,
               () => true,
             ),
         )
-      const records = await FundingDeposits.listByAddress(
+      const records = await RoutesDeposits.listByAddress(
         db,
         { environment: 'production', orgId: 'org_observed_reconciliation' },
         address.id,
@@ -2061,12 +2615,11 @@ describe('createTracker', () => {
   })
 
   test('rechecks pending Relay requests by id until delivery is verified', async () => {
-    const route = TestFunding.transferSnapshot()
+    const route = TestRoutes.transferSnapshot()
     const depositAddress = `0x${'88'.repeat(20)}`
     const sourceTransactionHash = `0x${'cc'.repeat(32)}`
     const destinationTransactionHash = `0x${'dd'.repeat(32)}`
     const address = await DepositAddress.create(db, {
-      apiKeyId: 'key_pending_reconciliation',
       deliveryStrategy: 'provider',
       environment: 'production',
       now: new Date('2026-01-02T00:00:00.000Z'),
@@ -2173,7 +2726,7 @@ describe('createTracker', () => {
     })
 
     try {
-      await FundingCatalog.publish(db, {
+      await RoutesCatalog.publish(db, {
         chainTokens: [],
         chains: [
           {
@@ -2217,7 +2770,7 @@ describe('createTracker', () => {
         addressId: address.id,
         requestId: 'relay-pending-request',
         trigger: 'webhook',
-        type: 'funding:deposit-address:reconcile',
+        type: 'routes:deposit-address:reconcile',
         webhookTiming: {
           enqueuedAt: '2026-01-02T00:03:07.000Z',
           providerStatus: 'pending',
@@ -2233,10 +2786,13 @@ describe('createTracker', () => {
       const [firstFollowUp] = dispatches
       if (!firstFollowUp) throw new Error('Expected a provider follow-up message.')
       indexed = true
-      const pendingFollowUp = await tracker.reconcile(firstFollowUp[0])
+      const pendingFollowUp = await tracker.reconcile({
+        ...firstFollowUp[0],
+        followUp: { attempt: 6, kind: 'provider' },
+      })
       const exhausted = await tracker.reconcile({
         ...firstFollowUp[0],
-        followUp: { attempt: 5, kind: 'provider' },
+        followUp: { attempt: 23, kind: 'provider' },
       })
       const [, secondFollowUp] = dispatches
       if (!secondFollowUp) throw new Error('Expected a second provider follow-up message.')
@@ -2249,7 +2805,7 @@ describe('createTracker', () => {
       const replay = await tracker.reconcile({
         addressId: address.id,
         trigger: 'webhook',
-        type: 'funding:deposit-address:reconcile',
+        type: 'routes:deposit-address:reconcile',
       })
       includeAddressRequest = false
       returnOlderDirect = true
@@ -2257,22 +2813,33 @@ describe('createTracker', () => {
         addressId: address.id,
         requestId: 'relay-pending-request',
         trigger: 'webhook',
-        type: 'funding:deposit-address:reconcile',
+        type: 'routes:deposit-address:reconcile',
       })
-      const [record] = await FundingDeposits.listBySourceTransaction(db, {
+      const [record] = await RoutesDeposits.listBySourceTransaction(db, {
         depositAddressId: address.id,
         sourceTransactionHash,
       })
-      const storedAddress = await FundingDepositAddresses.get(db, address.id)
+      const storedAddress = await RoutesDepositAddresses.get(db, address.id)
+      const lifecycleDurations = histograms
+        .filter(([name]) => name === 'routes_lifecycle_duration_ms')
+        .map(([, duration]) => duration)
+      expect(lifecycleDurations.every((duration) => duration >= 0)).toBe(true)
 
       expect({
         completed,
-        counts,
+        counts: counts.filter(([name]) => name !== 'routes_provider_operation_count'),
         dispatches,
         exhausted,
-        histograms,
+        histograms: histograms
+          .filter(([name]) => name !== 'routes_provider_operation_duration_ms')
+          .map(([name, duration, tags]) => [
+            name,
+            name === 'routes_lifecycle_duration_ms' ? '<duration>' : duration,
+            tags,
+          ]),
         pending,
         pendingFollowUp,
+        providerOperations: providerOperationCounts(counts),
         record,
         replay,
         requestTargets,
@@ -2288,13 +2855,16 @@ describe('createTracker', () => {
             createdAt: expect.any(String),
             depositAddressId: expect.any(String),
             id: expect.any(String),
+            providerDeliveredAt: expect.any(String),
             snapshot: { depositAddressId: expect.any(String) },
+            statusUpdatedAt: expect.any(String),
             updatedAt: expect.any(String),
           },
           storedAddress: {
             id: expect.any(String),
             providerOutputToken: expect.any(Object),
             snapshot: expect.any(Object),
+            statusUpdatedAt: expect.any(String),
           },
         },
         `
@@ -2306,7 +2876,7 @@ describe('createTracker', () => {
           },
           "counts": [
             [
-              "funding_deposit_reconciliation_count",
+              "routes_deposit_reconciliation_count",
               1,
               {
                 "outcome": "follow_up_enqueue_failed",
@@ -2315,7 +2885,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_count",
+              "routes_deposit_reconciliation_count",
               1,
               {
                 "outcome": "failed",
@@ -2324,7 +2894,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_count",
+              "routes_deposit_reconciliation_count",
               1,
               {
                 "outcome": "follow_up_enqueued",
@@ -2333,7 +2903,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_count",
+              "routes_deposit_reconciliation_count",
               1,
               {
                 "outcome": "completed",
@@ -2342,7 +2912,33 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_detection_count",
+              "routes_resource_transition_count",
+              1,
+              {
+                "from_status": "none",
+                "method": "deposit_address",
+                "provider": "relay",
+                "reason": "none",
+                "resource": "deposit",
+                "routes_environment": "production",
+                "to_status": "detected",
+              },
+            ],
+            [
+              "routes_resource_transition_count",
+              1,
+              {
+                "from_status": "detected",
+                "method": "deposit_address",
+                "provider": "relay",
+                "reason": "none",
+                "resource": "deposit",
+                "routes_environment": "production",
+                "to_status": "bridging",
+              },
+            ],
+            [
+              "routes_deposit_detection_count",
               1,
               {
                 "provider": "relay",
@@ -2350,7 +2946,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_count",
+              "routes_deposit_reconciliation_count",
               1,
               {
                 "outcome": "follow_up_enqueued",
@@ -2359,7 +2955,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_count",
+              "routes_deposit_reconciliation_count",
               1,
               {
                 "outcome": "completed",
@@ -2368,7 +2964,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_count",
+              "routes_deposit_reconciliation_count",
               1,
               {
                 "outcome": "follow_up_exhausted",
@@ -2377,7 +2973,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_count",
+              "routes_deposit_reconciliation_count",
               1,
               {
                 "outcome": "completed",
@@ -2386,7 +2982,20 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_count",
+              "routes_resource_transition_count",
+              1,
+              {
+                "from_status": "bridging",
+                "method": "deposit_address",
+                "provider": "relay",
+                "reason": "none",
+                "resource": "deposit",
+                "routes_environment": "production",
+                "to_status": "completed",
+              },
+            ],
+            [
+              "routes_deposit_reconciliation_count",
               1,
               {
                 "outcome": "completed",
@@ -2395,7 +3004,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_count",
+              "routes_deposit_reconciliation_count",
               1,
               {
                 "outcome": "completed",
@@ -2404,7 +3013,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_count",
+              "routes_deposit_reconciliation_count",
               1,
               {
                 "outcome": "completed",
@@ -2423,7 +3032,7 @@ describe('createTracker', () => {
                 },
                 "requestId": "relay-pending-request",
                 "trigger": "webhook",
-                "type": "funding:deposit-address:reconcile",
+                "type": "routes:deposit-address:reconcile",
                 "webhookTiming": {
                   "enqueuedAt": "2026-01-02T00:03:07.000Z",
                   "providerStatus": "pending",
@@ -2440,12 +3049,12 @@ describe('createTracker', () => {
               {
                 "addressId": Any<String>,
                 "followUp": {
-                  "attempt": 1,
+                  "attempt": 7,
                   "kind": "provider",
                 },
                 "requestId": "relay-pending-request",
                 "trigger": "webhook",
-                "type": "funding:deposit-address:reconcile",
+                "type": "routes:deposit-address:reconcile",
                 "webhookTiming": {
                   "enqueuedAt": "2026-01-02T00:03:07.000Z",
                   "providerStatus": "pending",
@@ -2462,11 +3071,11 @@ describe('createTracker', () => {
           "exhausted": {
             "created": 0,
             "type": "completed",
-            "updated": 1,
+            "updated": 0,
           },
           "histograms": [
             [
-              "funding_deposit_reconciliation_duration_ms",
+              "routes_deposit_reconciliation_duration_ms",
               0,
               {
                 "provider": "relay",
@@ -2474,7 +3083,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_duration_ms",
+              "routes_deposit_reconciliation_duration_ms",
               0,
               {
                 "provider": "relay",
@@ -2482,7 +3091,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_duration_ms",
+              "routes_deposit_reconciliation_duration_ms",
               0,
               {
                 "provider": "relay",
@@ -2490,7 +3099,43 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_webhook_latency_ms",
+              "routes_lifecycle_duration_ms",
+              "<duration>",
+              {
+                "flow": "deposit_address",
+                "outcome": "success",
+                "provider": "relay",
+                "routes_environment": "production",
+                "segment": "detected_to_provider_delivery",
+              },
+            ],
+            [
+              "routes_customer_value_loss_bps",
+              0,
+              {
+                "destination_chain": "eip155:4217",
+                "destination_token": "eip155:4217/erc20:0x20c000000000000000000000b9537d11c60e8b50",
+                "method": "deposit_address",
+                "provider": "relay",
+                "routes_environment": "production",
+                "source_chain": "eip155:8453",
+                "source_token": "eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+                "stage": "executed",
+              },
+            ],
+            [
+              "routes_lifecycle_duration_ms",
+              "<duration>",
+              {
+                "flow": "deposit_address",
+                "outcome": "success",
+                "provider": "relay",
+                "routes_environment": "production",
+                "segment": "detected_to_completed",
+              },
+            ],
+            [
+              "routes_deposit_webhook_latency_ms",
               5000,
               {
                 "provider": "relay",
@@ -2499,7 +3144,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_webhook_latency_ms",
+              "routes_deposit_webhook_latency_ms",
               1000,
               {
                 "provider": "relay",
@@ -2508,7 +3153,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_webhook_latency_ms",
+              "routes_deposit_webhook_latency_ms",
               1000,
               {
                 "provider": "relay",
@@ -2517,7 +3162,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_webhook_latency_ms",
+              "routes_deposit_webhook_latency_ms",
               8000,
               {
                 "provider": "relay",
@@ -2526,7 +3171,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_webhook_latency_ms",
+              "routes_deposit_webhook_latency_ms",
               15000,
               {
                 "provider": "relay",
@@ -2535,7 +3180,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_duration_ms",
+              "routes_deposit_reconciliation_duration_ms",
               0,
               {
                 "provider": "relay",
@@ -2543,7 +3188,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_duration_ms",
+              "routes_deposit_reconciliation_duration_ms",
               0,
               {
                 "provider": "relay",
@@ -2551,7 +3196,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_duration_ms",
+              "routes_deposit_reconciliation_duration_ms",
               0,
               {
                 "provider": "relay",
@@ -2569,6 +3214,9 @@ describe('createTracker', () => {
             "type": "completed",
             "updated": 1,
           },
+          "providerOperations": {
+            "relay:listDepositAddressRequests:success": 11,
+          },
           "record": {
             "createdAt": Any<String>,
             "depositAddressId": Any<String>,
@@ -2578,6 +3226,7 @@ describe('createTracker', () => {
             "orgId": "org_pending_reconciliation",
             "pollObservedAt": null,
             "projectId": null,
+            "providerDeliveredAt": Any<String>,
             "providerOutputAmount": {
               "baseUnits": "1000000",
               "currency": "USD",
@@ -2599,6 +3248,7 @@ describe('createTracker', () => {
               "relay-pending-request",
             ],
             "providerState": null,
+            "providerSubsidy": null,
             "providerTransactionHashes": [
               "0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
             ],
@@ -2677,10 +3327,12 @@ describe('createTracker', () => {
             "sourceTransferIndex": 0,
             "status": "completed",
             "statusReason": null,
+            "statusUpdatedAt": Any<String>,
             "subsidyAmount": null,
+            "subsidyMeterReportedAt": null,
             "tempoGasPaid": null,
             "updatedAt": Any<String>,
-            "version": 7,
+            "version": 4,
             "webhookReceivedAt": null,
           },
           "replay": {
@@ -2703,8 +3355,8 @@ describe('createTracker', () => {
           ],
           "storedAddress": {
             "address": "0x8888888888888888888888888888888888888888",
-            "apiKeyId": "key_pending_reconciliation",
             "createdAt": "2026-01-02T00:00:00.000Z",
+            "creatorUserId": null,
             "deliveryStrategy": "provider",
             "destinationTokenKey": "eip155:4217/erc20:0x20c000000000000000000000b9537d11c60e8b50",
             "environment": "production",
@@ -2743,6 +3395,7 @@ describe('createTracker', () => {
             "sourceChainId": "eip155:8453",
             "sourceTokenKey": "eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
             "status": "active",
+            "statusUpdatedAt": Any<String>,
             "subsidize": false,
             "updatedAt": "2026-01-02T00:00:00.000Z",
             "version": 1,
@@ -2760,20 +3413,25 @@ describe('createTracker', () => {
     }
   })
 
-  test('completes chain-detected Relay delivery before provider attribution', async () => {
-    const route = TestFunding.transferSnapshot()
+  test('backfills late Relay subsidy after chain-detected delivery', async () => {
+    const route = TestRoutes.transferSnapshot()
     const ambiguousOrderId = `0x${'3d'.repeat(32)}`
     const ambiguousSweepTransactionHash = `0x${'3e'.repeat(32)}`
     const depositAddress = `0x${'31'.repeat(20)}`
     const depository = `0x${'32'.repeat(20)}`
     const destinationTransactionHash = `0x${'33'.repeat(32)}`
     const orderId = `0x${'34'.repeat(32)}`
+    const previousSourceTransactionHash = `0x${'39'.repeat(32)}`
     const refundAddress = `0x${'38'.repeat(20)}`
     const solver = `0x${'35'.repeat(20)}`
     const sourceSweepTransactionHash = `0x${'36'.repeat(32)}`
     const sourceTransactionHash = `0x${'37'.repeat(32)}`
+    const sponsorPayment = {
+      address: route.sourceToken.address,
+      amount: '23838',
+      chainId: Number(route.sourceChain.id.slice('eip155:'.length)),
+    }
     const address = await DepositAddress.create(db, {
-      apiKeyId: 'key_delivery_observation',
       deliveryStrategy: 'provider',
       environment: 'production',
       now: new Date('2026-01-04T00:00:00.000Z'),
@@ -2804,17 +3462,36 @@ describe('createTracker', () => {
     const rpcMethods: string[] = []
     let ambiguous = true
     let correlateDestination = false
+    let delayIndexedRequest = false
     let delivered = false
     let indexed = false
+    let indexedDelivery = false
+    let requestsUnavailable = false
+    let sponsorPaymentAvailable = true
     const server = await TestRelay.createServer(async (request, response) => {
       if (request.method === 'GET') {
         const url = new URL(request.url ?? '/', server.url)
+        const hideIndexedRequest = indexed && delayIndexedRequest
+        delayIndexedRequest = false
+        const indexedVisible = indexed && !hideIndexedRequest
+        if (url.pathname !== '/chains' && requestsUnavailable) {
+          response.writeHead(503, { 'content-type': 'application/json' })
+          response.end(JSON.stringify({ message: 'temporarily unavailable' }))
+          return
+        }
         response.writeHead(200, { 'content-type': 'application/json' })
         response.end(
           JSON.stringify(
             url.pathname === '/chains'
               ? {
                   chains: [
+                    {
+                      id: 792703809,
+                      protocol: {
+                        v2: { depository: '99vQwtBwYtrqqD9YSXbdum3KBdxPAVxYTaQ3cfnJSrN2' },
+                      },
+                      solverAddresses: ['F7p3dFrjRTbtRp8FRF6qHLomXbKRBzpvBLjtQcfcgmNe'],
+                    },
                     {
                       id: Number(route.sourceChain.id.slice('eip155:'.length)),
                       protocol: { v2: { depository } },
@@ -2827,16 +3504,30 @@ describe('createTracker', () => {
                   ],
                 }
               : {
-                  requests: indexed
+                  ...(indexedVisible && !url.searchParams.has('continuation')
+                    ? { continuation: 'next' }
+                    : {}),
+                  requests: indexedVisible
                     ? [
                         {
                           createdAt: '2026-01-04T00:01:00.000Z',
-                          data: { outTxs: [] },
-                          depositAddress: { depositTxHash: sourceTransactionHash },
+                          data: {
+                            ...(sponsorPaymentAvailable
+                              ? { feeSponsorship: { actual: { sponsorPayment } } }
+                              : {}),
+                            outTxs: indexedDelivery ? [{ txHash: destinationTransactionHash }] : [],
+                          },
+                          depositAddress: {
+                            depositTxHash: indexedDelivery
+                              ? previousSourceTransactionHash
+                              : sourceTransactionHash,
+                          },
                           id: 'relay-observed-request',
                           protocol: {
                             deposit: { origin: { depositor: refundAddress, depository } },
-                            orderId,
+                            orderId: url.searchParams.has('continuation')
+                              ? orderId
+                              : ambiguousOrderId,
                             solver: { address: solver },
                           },
                           status: 'pending',
@@ -2979,7 +3670,7 @@ describe('createTracker', () => {
     })
 
     try {
-      await FundingCatalog.publish(db, {
+      await RoutesCatalog.publish(db, {
         chainTokens: [],
         chains: [
           {
@@ -3025,6 +3716,7 @@ describe('createTracker', () => {
       )
       ambiguous = false
       delivered = true
+      requestsUnavailable = true
       const uncorrelatedObservation = await provider.observeDepositAddressRequest(
         {
           address: depositAddress,
@@ -3038,6 +3730,25 @@ describe('createTracker', () => {
         },
         new AbortController().signal,
       )
+      requestsUnavailable = false
+      indexed = true
+      indexedDelivery = true
+      const indexedObservation = await provider.observeDepositAddressRequest(
+        {
+          address: depositAddress,
+          destinationChain: route.destinationChain,
+          destinationToken: route.destinationToken,
+          recipient: route.recipient,
+          refundAddress,
+          source: { amount: '1000000', transactionHash: sourceTransactionHash },
+          sourceChain: route.sourceChain,
+          sourceToken: route.sourceToken,
+        },
+        new AbortController().signal,
+      )
+      sponsorPaymentAvailable = false
+      indexed = false
+      indexedDelivery = false
       correlateDestination = true
       delivered = false
       const observed = await SourceObservation.observe(db, {
@@ -3065,34 +3776,73 @@ describe('createTracker', () => {
       const pending = await tracker.reconcile({
         addressId: address.id,
         trigger: 'chain',
-        type: 'funding:deposit-address:reconcile',
+        type: 'routes:deposit-address:reconcile',
       })
-      const [deliveryFollowUp] = dispatches
+      let deliveryFollowUp = dispatches.at(-1)
       if (!deliveryFollowUp) throw new Error('Expected a delivery follow-up message.')
-      delivered = true
+      const dispatchCount = dispatches.length
+      await tracker.reconcile({
+        ...deliveryFollowUp[0],
+        followUp: { attempt: 5, kind: 'delivery' },
+      })
+      deliveryFollowUp = dispatches[dispatchCount]
+      if (!deliveryFollowUp) throw new Error('Expected another delivery follow-up message.')
+      delayIndexedRequest = true
+      indexed = true
+      indexedDelivery = true
       const completed = await tracker.reconcile(deliveryFollowUp[0])
-      const completedRecord = await FundingDeposits.get(db, observed.record.id)
-      const [, providerFollowUp] = dispatches
+      const completedRecord = await RoutesDeposits.get(db, observed.record.id)
+      const providerFollowUp = dispatches.find(([message]) => message.followUp?.kind === 'provider')
       if (!providerFollowUp) throw new Error('Expected a provider follow-up message.')
+      expect(providerFollowUp[1]).toStrictEqual({ delaySeconds: 5 })
+      delayIndexedRequest = true
       indexed = true
-      const attributed = await tracker.reconcile(providerFollowUp[0])
-      const [record] = await FundingDeposits.listBySourceTransaction(db, {
+      indexedDelivery = true
+      sponsorPaymentAvailable = true
+      const backfilled = await tracker.reconcile(providerFollowUp[0])
+      const backfilledRecord = await RoutesDeposits.get(db, observed.record.id)
+      const repeatedFollowUp = dispatches.at(-1)
+      if (!repeatedFollowUp) throw new Error('Expected another provider follow-up message.')
+      delayIndexedRequest = true
+      const repeated = await tracker.reconcile(repeatedFollowUp[0])
+      const [record] = await RoutesDeposits.listBySourceTransaction(db, {
         depositAddressId: address.id,
         sourceTransactionHash,
       })
+      const records = await RoutesDeposits.listByAddress(
+        db,
+        { environment: 'production', orgId: 'org_delivery_observation' },
+        address.id,
+        { limit: 10 },
+      )
 
       expect({
         ambiguousObservation,
-        attributed,
+        backfill: {
+          after: {
+            providerSubsidy: backfilledRecord?.providerSubsidy,
+            status: backfilledRecord?.status,
+            version: backfilledRecord?.version,
+          },
+          before: {
+            providerSubsidy: completedRecord?.providerSubsidy,
+            status: completedRecord?.status,
+            version: completedRecord?.version,
+          },
+          recordCount: records.length,
+        },
+        backfilled,
         completed,
-        completedRecord,
-        counts,
+        counts: counts.filter(([name]) => name !== 'routes_provider_operation_count'),
         dispatches: dispatches.map(([message, dispatchOptions]) => [
           { ...message, addressId: '<address-id>' },
           dispatchOptions,
         ]),
+        indexedObservation,
         pending,
+        providerOperations: providerOperationCounts(counts),
         record,
+        repeated,
         rpcMethods,
         sourceObservation: observed.type,
         uncorrelatedObservation,
@@ -3102,14 +3852,9 @@ describe('createTracker', () => {
             createdAt: expect.any(String),
             depositAddressId: expect.any(String),
             id: expect.any(String),
+            providerDeliveredAt: expect.any(String),
             snapshot: { depositAddressId: expect.any(String) },
-            updatedAt: expect.any(String),
-          },
-          completedRecord: {
-            createdAt: expect.any(String),
-            depositAddressId: expect.any(String),
-            id: expect.any(String),
-            snapshot: { depositAddressId: expect.any(String) },
+            statusUpdatedAt: expect.any(String),
             updatedAt: expect.any(String),
           },
         },
@@ -3118,7 +3863,38 @@ describe('createTracker', () => {
           "ambiguousObservation": {
             "type": "pending",
           },
-          "attributed": {
+          "backfill": {
+            "after": {
+              "providerSubsidy": {
+                "amount": {
+                  "baseUnits": "23838",
+                  "currency": "USD",
+                  "decimals": 6,
+                  "formatted": "0.023838",
+                },
+                "provider": "relay",
+                "token": {
+                  "address": "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+                  "currency": "USD",
+                  "decimals": 6,
+                  "name": "USD Coin",
+                  "standard": "ERC-20",
+                  "symbol": "USDC",
+                  "tokenKey": "eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+                  "verified": true,
+                },
+              },
+              "status": "completed",
+              "version": 4,
+            },
+            "before": {
+              "providerSubsidy": null,
+              "status": "completed",
+              "version": 3,
+            },
+            "recordCount": 1,
+          },
+          "backfilled": {
             "created": 0,
             "type": "completed",
             "updated": 1,
@@ -3128,132 +3904,95 @@ describe('createTracker', () => {
             "type": "completed",
             "updated": 1,
           },
-          "completedRecord": {
-            "createdAt": Any<String>,
-            "depositAddressId": Any<String>,
-            "detectionTrigger": "chain",
-            "environment": "production",
-            "id": Any<String>,
-            "orgId": "org_delivery_observation",
-            "pollObservedAt": null,
-            "projectId": null,
-            "providerOutputAmount": {
-              "baseUnits": "1000000",
-              "currency": "USD",
-              "decimals": 6,
-              "formatted": "1",
-            },
-            "providerOutputToken": {
-              "address": "0x20c000000000000000000000b9537d11c60e8b50",
-              "currency": "USD",
-              "decimals": 6,
-              "name": "Bridged USDC (Stargate)",
-              "standard": "TIP-20",
-              "symbol": "USDC.e",
-              "tokenKey": "eip155:4217/erc20:0x20c000000000000000000000b9537d11c60e8b50",
-              "verified": true,
-            },
-            "providerRequestId": null,
-            "providerRequestIds": [],
-            "providerState": {
-              "relay": {
-                "destinationObservedAt": "2026-01-04T00:03:00.000Z",
-                "orderId": "0x3434343434343434343434343434343434343434343434343434343434343434",
-                "sourceDepository": "0x3232323232323232323232323232323232323232",
-                "sourceObservedAt": "2026-01-04T00:03:00.000Z",
-                "sourceSweepTransactionHash": "0x3636363636363636363636363636363636363636363636363636363636363636",
+          "counts": [
+            [
+              "routes_deposit_delivery_observation_count",
+              1,
+              {
+                "outcome": "pending",
+                "provider": "relay",
               },
-            },
-            "providerTransactionHashes": [
-              "0x3636363636363636363636363636363636363636363636363636363636363636",
-              "0x3333333333333333333333333333333333333333333333333333333333333333",
             ],
-            "providerTransferIndex": 0,
-            "retryState": null,
-            "settlementTransaction": null,
-            "settlementTransactionHash": null,
-            "snapshot": {
-              "depositAddressId": Any<String>,
-              "destinationAmount": {
-                "baseUnits": "1000000",
-                "currency": "USD",
-                "decimals": 6,
-                "formatted": "1",
+            [
+              "routes_resource_transition_count",
+              1,
+              {
+                "from_status": "detected",
+                "method": "deposit_address",
+                "provider": "relay",
+                "reason": "none",
+                "resource": "deposit",
+                "routes_environment": "production",
+                "to_status": "bridging",
               },
-              "destinationChain": {
-                "addressFormat": "hex",
-                "id": "eip155:4217",
-                "kind": "evm",
-                "name": "Tempo",
+            ],
+            [
+              "routes_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "follow_up_enqueued",
+                "provider": "relay",
+                "trigger": "chain",
               },
-              "destinationToken": {
-                "address": "0x20c000000000000000000000b9537d11c60e8b50",
-                "currency": "USD",
-                "decimals": 6,
-                "name": "Bridged USDC (Stargate)",
-                "standard": "TIP-20",
-                "symbol": "USDC.e",
-                "tokenKey": "eip155:4217/erc20:0x20c000000000000000000000b9537d11c60e8b50",
-                "verified": true,
+            ],
+            [
+              "routes_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "completed",
+                "provider": "relay",
+                "trigger": "chain",
               },
-              "destinationTransactionHashes": [
-                "0x3333333333333333333333333333333333333333333333333333333333333333",
-              ],
-              "provider": {
-                "id": "relay",
-                "name": "Relay",
+            ],
+            [
+              "routes_deposit_delivery_observation_count",
+              1,
+              {
+                "outcome": "pending",
+                "provider": "relay",
               },
-              "recipient": "0x1111111111111111111111111111111111111111",
-              "refundAddress": "0x3838383838383838383838383838383838383838",
-              "sender": "0x3838383838383838383838383838383838383838",
-              "sourceAmount": {
-                "baseUnits": "1000000",
-                "currency": "USD",
-                "decimals": 6,
-                "formatted": "1",
+            ],
+            [
+              "routes_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "follow_up_enqueued",
+                "provider": "relay",
+                "trigger": "chain",
               },
-              "sourceChain": {
-                "addressFormat": "hex",
-                "id": "eip155:8453",
-                "kind": "evm",
-                "name": "Base",
+            ],
+            [
+              "routes_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "completed",
+                "provider": "relay",
+                "trigger": "chain",
               },
-              "sourceToken": {
-                "address": "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
-                "currency": "USD",
-                "decimals": 6,
-                "name": "USD Coin",
-                "standard": "ERC-20",
-                "symbol": "USDC",
-                "tokenKey": "eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
-                "verified": true,
+            ],
+            [
+              "routes_deposit_delivery_observation_count",
+              1,
+              {
+                "outcome": "verified",
+                "provider": "relay",
               },
-              "sourceTransactionHashes": [
-                "0x3737373737373737373737373737373737373737373737373737373737373737",
-              ],
-            },
-            "sourceChainId": "eip155:8453",
-            "sourceTransactionHash": "0x3737373737373737373737373737373737373737373737373737373737373737",
-            "sourceTransferIndex": 0,
-            "status": "completed",
-            "statusReason": null,
-            "subsidyAmount": null,
-            "tempoGasPaid": null,
-            "updatedAt": Any<String>,
-            "version": 3,
-            "webhookReceivedAt": null,
-          },
-          "counts": [
+            ],
             [
-              "funding_deposit_delivery_observation_count",
+              "routes_resource_transition_count",
               1,
               {
-                "outcome": "pending",
+                "from_status": "bridging",
+                "method": "deposit_address",
                 "provider": "relay",
+                "reason": "none",
+                "resource": "deposit",
+                "routes_environment": "production",
+                "to_status": "completed",
               },
             ],
             [
-              "funding_deposit_reconciliation_count",
+              "routes_deposit_reconciliation_count",
               1,
               {
                 "outcome": "follow_up_enqueued",
@@ -3262,7 +4001,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_count",
+              "routes_deposit_reconciliation_count",
               1,
               {
                 "outcome": "completed",
@@ -3271,7 +4010,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_delivery_observation_count",
+              "routes_deposit_delivery_observation_count",
               1,
               {
                 "outcome": "verified",
@@ -3279,7 +4018,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_count",
+              "routes_deposit_reconciliation_count",
               1,
               {
                 "outcome": "follow_up_enqueued",
@@ -3288,7 +4027,7 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_count",
+              "routes_deposit_reconciliation_count",
               1,
               {
                 "outcome": "completed",
@@ -3297,7 +4036,16 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_reconciliation_count",
+              "routes_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "follow_up_enqueued",
+                "provider": "relay",
+                "trigger": "chain",
+              },
+            ],
+            [
+              "routes_deposit_reconciliation_count",
               1,
               {
                 "outcome": "completed",
@@ -3315,7 +4063,21 @@ describe('createTracker', () => {
                   "kind": "delivery",
                 },
                 "trigger": "chain",
-                "type": "funding:deposit-address:reconcile",
+                "type": "routes:deposit-address:reconcile",
+              },
+              {
+                "delaySeconds": 1,
+              },
+            ],
+            [
+              {
+                "addressId": "<address-id>",
+                "followUp": {
+                  "attempt": 6,
+                  "kind": "delivery",
+                },
+                "trigger": "chain",
+                "type": "routes:deposit-address:reconcile",
               },
               {
                 "delaySeconds": 1,
@@ -3329,18 +4091,88 @@ describe('createTracker', () => {
                   "kind": "provider",
                 },
                 "trigger": "chain",
-                "type": "funding:deposit-address:reconcile",
+                "type": "routes:deposit-address:reconcile",
               },
               {
-                "delaySeconds": 1,
+                "delaySeconds": 5,
+              },
+            ],
+            [
+              {
+                "addressId": "<address-id>",
+                "followUp": {
+                  "attempt": 1,
+                  "kind": "provider",
+                },
+                "trigger": "chain",
+                "type": "routes:deposit-address:reconcile",
+              },
+              {
+                "delaySeconds": 5,
+              },
+            ],
+            [
+              {
+                "addressId": "<address-id>",
+                "followUp": {
+                  "attempt": 2,
+                  "kind": "provider",
+                },
+                "trigger": "chain",
+                "type": "routes:deposit-address:reconcile",
+              },
+              {
+                "delaySeconds": 5,
               },
             ],
           ],
+          "indexedObservation": {
+            "destinationTransactionHashes": [
+              "0x3333333333333333333333333333333333333333333333333333333333333333",
+            ],
+            "providerState": {
+              "relay": {
+                "destinationObservedAt": "2026-01-04T00:03:00.000Z",
+                "orderId": "0x3434343434343434343434343434343434343434343434343434343434343434",
+                "sourceDepository": "0x3232323232323232323232323232323232323232",
+                "sourceObservedAt": "2026-01-04T00:03:00.000Z",
+                "sourceSweepTransactionHash": "0x3636363636363636363636363636363636363636363636363636363636363636",
+              },
+            },
+            "providerTransactionHashes": [
+              "0x3636363636363636363636363636363636363636363636363636363636363636",
+              "0x3333333333333333333333333333333333333333333333333333333333333333",
+            ],
+            "subsidy": {
+              "amount": {
+                "baseUnits": "23838",
+                "currency": "USD",
+                "decimals": 6,
+                "formatted": "0.023838",
+              },
+              "provider": "relay",
+              "token": {
+                "address": "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+                "currency": "USD",
+                "decimals": 6,
+                "name": "USD Coin",
+                "standard": "ERC-20",
+                "symbol": "USDC",
+                "tokenKey": "eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+                "verified": true,
+              },
+            },
+            "type": "verified",
+          },
           "pending": {
             "created": 0,
             "type": "completed",
             "updated": 1,
           },
+          "providerOperations": {
+            "relay:listDepositAddressRequests:success": 5,
+            "relay:observeDepositAddressRequest:success": 4,
+          },
           "record": {
             "createdAt": Any<String>,
             "depositAddressId": Any<String>,
@@ -3350,6 +4182,7 @@ describe('createTracker', () => {
             "orgId": "org_delivery_observation",
             "pollObservedAt": null,
             "projectId": null,
+            "providerDeliveredAt": Any<String>,
             "providerOutputAmount": {
               "baseUnits": "1000000",
               "currency": "USD",
@@ -3366,10 +4199,8 @@ describe('createTracker', () => {
               "tokenKey": "eip155:4217/erc20:0x20c000000000000000000000b9537d11c60e8b50",
               "verified": true,
             },
-            "providerRequestId": "relay-observed-request",
-            "providerRequestIds": [
-              "relay-observed-request",
-            ],
+            "providerRequestId": null,
+            "providerRequestIds": [],
             "providerState": {
               "relay": {
                 "destinationObservedAt": "2026-01-04T00:03:00.000Z",
@@ -3379,6 +4210,25 @@ describe('createTracker', () => {
                 "sourceSweepTransactionHash": "0x3636363636363636363636363636363636363636363636363636363636363636",
               },
             },
+            "providerSubsidy": {
+              "amount": {
+                "baseUnits": "23838",
+                "currency": "USD",
+                "decimals": 6,
+                "formatted": "0.023838",
+              },
+              "provider": "relay",
+              "token": {
+                "address": "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+                "currency": "USD",
+                "decimals": 6,
+                "name": "USD Coin",
+                "standard": "ERC-20",
+                "symbol": "USDC",
+                "tokenKey": "eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+                "verified": true,
+              },
+            },
             "providerTransactionHashes": [
               "0x3636363636363636363636363636363636363636363636363636363636363636",
               "0x3333333333333333333333333333333333333333333333333333333333333333",
@@ -3458,12 +4308,19 @@ describe('createTracker', () => {
             "sourceTransferIndex": 0,
             "status": "completed",
             "statusReason": null,
+            "statusUpdatedAt": Any<String>,
             "subsidyAmount": null,
+            "subsidyMeterReportedAt": null,
             "tempoGasPaid": null,
             "updatedAt": Any<String>,
             "version": 4,
             "webhookReceivedAt": null,
           },
+          "repeated": {
+            "created": 0,
+            "type": "completed",
+            "updated": 0,
+          },
           "rpcMethods": [
             "eth_getTransactionReceipt",
             "eth_blockNumber",
@@ -3479,6 +4336,10 @@ describe('createTracker', () => {
             "eth_getTransactionByHash",
             "eth_getTransactionReceipt",
             "eth_blockNumber",
+            "eth_getLogs",
+            "eth_getTransactionByHash",
+            "eth_getTransactionReceipt",
+            "eth_blockNumber",
             "eth_getTransactionReceipt",
             "eth_blockNumber",
             "eth_getLogs",
@@ -3489,7 +4350,12 @@ describe('createTracker', () => {
             "eth_blockNumber",
             "eth_blockNumber",
             "eth_getLogs",
-            "eth_getTransactionByHash",
+            "eth_getTransactionReceipt",
+            "eth_blockNumber",
+            "eth_getTransactionReceipt",
+            "eth_blockNumber",
+            "eth_getTransactionReceipt",
+            "eth_blockNumber",
             "eth_getTransactionReceipt",
             "eth_blockNumber",
             "eth_getTransactionReceipt",
@@ -3519,10 +4385,9 @@ describe('createTracker', () => {
   })
 
   test('renews the address lease during a slow provider read', async () => {
-    const route = TestFunding.transferSnapshot()
+    const route = TestRoutes.transferSnapshot()
     const depositAddress = `0x${'16'.repeat(20)}`
     const address = await DepositAddress.create(db, {
-      apiKeyId: 'key_lease_reconciliation',
       deliveryStrategy: 'provider',
       environment: 'production',
       now: new Date('2026-01-04T00:00:00.000Z'),
@@ -3564,14 +4429,14 @@ describe('createTracker', () => {
       const reconciliation = tracker.reconcile({
         addressId: address.id,
         trigger: 'webhook',
-        type: 'funding:deposit-address:reconcile',
+        type: 'routes:deposit-address:reconcile',
       })
       await providerStarted.promise
       await vi.advanceTimersByTimeAsync(60)
-      const renewed = await FundingDepositAddresses.get(db, address.id)
+      const renewed = await RoutesDepositAddresses.get(db, address.id)
       providerReleased.resolve()
       const result = await reconciliation
-      const completed = await FundingDepositAddresses.get(db, address.id)
+      const completed = await RoutesDepositAddresses.get(db, address.id)
 
       expect({ completed, renewed, result }).toMatchInlineSnapshot(
         {
@@ -3579,19 +4444,21 @@ describe('createTracker', () => {
             id: expect.any(String),
             providerOutputToken: expect.any(Object),
             snapshot: expect.any(Object),
+            statusUpdatedAt: expect.any(String),
           },
           renewed: {
             id: expect.any(String),
             providerOutputToken: expect.any(Object),
             snapshot: expect.any(Object),
+            statusUpdatedAt: expect.any(String),
           },
         },
         `
         {
           "completed": {
             "address": "0x1616161616161616161616161616161616161616",
-            "apiKeyId": "key_lease_reconciliation",
             "createdAt": "2026-01-04T00:00:00.000Z",
+            "creatorUserId": null,
             "deliveryStrategy": "provider",
             "destinationTokenKey": "eip155:4217/erc20:0x20c000000000000000000000b9537d11c60e8b50",
             "environment": "production",
@@ -3618,14 +4485,15 @@ describe('createTracker', () => {
             "sourceChainId": "eip155:8453",
             "sourceTokenKey": "eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
             "status": "active",
+            "statusUpdatedAt": Any<String>,
             "subsidize": false,
             "updatedAt": "2026-01-04T00:00:00.000Z",
             "version": 1,
           },
           "renewed": {
             "address": "0x1616161616161616161616161616161616161616",
-            "apiKeyId": "key_lease_reconciliation",
             "createdAt": "2026-01-04T00:00:00.000Z",
+            "creatorUserId": null,
             "deliveryStrategy": "provider",
             "destinationTokenKey": "eip155:4217/erc20:0x20c000000000000000000000b9537d11c60e8b50",
             "environment": "production",
@@ -3647,6 +4515,7 @@ describe('createTracker', () => {
             "sourceChainId": "eip155:8453",
             "sourceTokenKey": "eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
             "status": "active",
+            "statusUpdatedAt": Any<String>,
             "subsidize": false,
             "updatedAt": "2026-01-04T00:00:00.000Z",
             "version": 1,
@@ -3667,13 +4536,12 @@ describe('createTracker', () => {
   })
 
   test('waits for every source transaction before allocating provider output', async () => {
-    const route = TestFunding.transferSnapshot()
+    const route = TestRoutes.transferSnapshot()
     const depositAddress = `0x${'21'.repeat(20)}`
     const firstSourceTransactionHash = `0x${'31'.repeat(32)}`
     const secondSourceTransactionHash = `0x${'32'.repeat(32)}`
     const destinationTransactionHash = `0x${'33'.repeat(32)}`
     const address = await DepositAddress.create(db, {
-      apiKeyId: 'key_source_evidence_reconciliation',
       deliveryStrategy: 'provider',
       environment: 'production',
       now: new Date('2026-01-05T00:00:00.000Z'),
@@ -3724,7 +4592,7 @@ describe('createTracker', () => {
     })
 
     try {
-      await FundingCatalog.publish(db, {
+      await RoutesCatalog.publish(db, {
         chainTokens: [],
         chains: [
           {
@@ -3761,7 +4629,7 @@ describe('createTracker', () => {
         verifyTransfers: Evidence.createVerifier({ db }),
       })
       const records = (
-        await FundingDeposits.listByAddress(
+        await RoutesDeposits.listByAddress(
           db,
           { environment: 'production', orgId: 'org_source_evidence_reconciliation' },
           address.id,
@@ -3779,6 +4647,7 @@ describe('createTracker', () => {
               depositAddressId: expect.any(String),
               id: expect.any(String),
               snapshot: { depositAddressId: expect.any(String) },
+              statusUpdatedAt: expect.any(String),
               updatedAt: expect.any(String),
             },
             {
@@ -3786,6 +4655,7 @@ describe('createTracker', () => {
               depositAddressId: expect.any(String),
               id: expect.any(String),
               snapshot: { depositAddressId: expect.any(String) },
+              statusUpdatedAt: expect.any(String),
               updatedAt: expect.any(String),
             },
           ],
@@ -3803,6 +4673,7 @@ describe('createTracker', () => {
               "orgId": "org_source_evidence_reconciliation",
               "pollObservedAt": null,
               "projectId": null,
+              "providerDeliveredAt": null,
               "providerOutputAmount": null,
               "providerOutputToken": {
                 "address": "0x20c000000000000000000000b9537d11c60e8b50",
@@ -3819,6 +4690,7 @@ describe('createTracker', () => {
                 "source-evidence-request",
               ],
               "providerState": null,
+              "providerSubsidy": null,
               "providerTransactionHashes": [],
               "providerTransferIndex": 0,
               "retryState": null,
@@ -3880,7 +4752,9 @@ describe('createTracker', () => {
               "sourceTransferIndex": 0,
               "status": "bridging",
               "statusReason": null,
+              "statusUpdatedAt": Any<String>,
               "subsidyAmount": null,
+              "subsidyMeterReportedAt": null,
               "tempoGasPaid": null,
               "updatedAt": Any<String>,
               "version": 2,
@@ -3895,6 +4769,7 @@ describe('createTracker', () => {
               "orgId": "org_source_evidence_reconciliation",
               "pollObservedAt": null,
               "projectId": null,
+              "providerDeliveredAt": null,
               "providerOutputAmount": null,
               "providerOutputToken": {
                 "address": "0x20c000000000000000000000b9537d11c60e8b50",
@@ -3911,6 +4786,7 @@ describe('createTracker', () => {
                 "source-evidence-request",
               ],
               "providerState": null,
+              "providerSubsidy": null,
               "providerTransactionHashes": [],
               "providerTransferIndex": 0,
               "retryState": null,
@@ -3965,7 +4841,9 @@ describe('createTracker', () => {
               "sourceTransferIndex": null,
               "status": "detected",
               "statusReason": null,
+              "statusUpdatedAt": Any<String>,
               "subsidyAmount": null,
+              "subsidyMeterReportedAt": null,
               "tempoGasPaid": null,
               "updatedAt": Any<String>,
               "version": 1,
@@ -3986,13 +4864,12 @@ describe('createTracker', () => {
   })
 
   test('records multiple source transfers with finer precision independently', async () => {
-    const route = TestFunding.transferSnapshot()
+    const route = TestRoutes.transferSnapshot()
     const sourceToken = { ...route.sourceToken, decimals: 18 }
     const depositAddress = `0x${'12'.repeat(20)}`
     const sourceTransactionHash = `0x${'ee'.repeat(32)}`
     const destinationTransactionHash = `0x${'ff'.repeat(32)}`
     const address = await DepositAddress.create(db, {
-      apiKeyId: 'key_precision_reconciliation',
       deliveryStrategy: 'provider',
       environment: 'production',
       now: new Date('2026-01-03T00:00:00.000Z'),
@@ -4020,6 +4897,15 @@ describe('createTracker', () => {
               {
                 createdAt: '2026-01-03T00:01:00.000Z',
                 data: {
+                  feeSponsorship: {
+                    actual: {
+                      sponsorPayment: {
+                        address: sourceToken.address,
+                        amount: '23838',
+                        chainId: 8453,
+                      },
+                    },
+                  },
                   inTxs: [{ txHash: sourceTransactionHash }],
                   outTxs: [{ txHash: destinationTransactionHash }],
                 },
@@ -4081,7 +4967,7 @@ describe('createTracker', () => {
     })
 
     try {
-      await FundingCatalog.publish(db, {
+      await RoutesCatalog.publish(db, {
         chainTokens: [],
         chains: [
           {
@@ -4115,10 +5001,10 @@ describe('createTracker', () => {
       const result = await tracker.reconcile({
         addressId: address.id,
         trigger: 'webhook',
-        type: 'funding:deposit-address:reconcile',
+        type: 'routes:deposit-address:reconcile',
       })
       const records = (
-        await FundingDeposits.listByAddress(
+        await RoutesDeposits.listByAddress(
           db,
           { environment: 'production', orgId: 'org_precision_reconciliation' },
           address.id,
@@ -4127,8 +5013,12 @@ describe('createTracker', () => {
       ).toSorted(
         (left, right) => (right.sourceTransferIndex ?? -1) - (left.sourceTransferIndex ?? -1),
       )
-      const storedAddress = await FundingDepositAddresses.get(db, address.id)
+      const storedAddress = await RoutesDepositAddresses.get(db, address.id)
 
+      expect(records.map((record) => record.providerSubsidy?.amount.baseUnits ?? null)).toEqual([
+        null,
+        '23838',
+      ])
       expect({ records, result, storedAddress }).toMatchInlineSnapshot(
         {
           records: [
@@ -4136,14 +5026,18 @@ describe('createTracker', () => {
               createdAt: expect.any(String),
               depositAddressId: expect.any(String),
               id: expect.any(String),
+              providerDeliveredAt: expect.any(String),
               snapshot: { depositAddressId: expect.any(String) },
+              statusUpdatedAt: expect.any(String),
               updatedAt: expect.any(String),
             },
             {
               createdAt: expect.any(String),
               depositAddressId: expect.any(String),
               id: expect.any(String),
+              providerDeliveredAt: expect.any(String),
               snapshot: { depositAddressId: expect.any(String) },
+              statusUpdatedAt: expect.any(String),
               updatedAt: expect.any(String),
             },
           ],
@@ -4151,6 +5045,7 @@ describe('createTracker', () => {
             id: expect.any(String),
             providerOutputToken: expect.any(Object),
             snapshot: expect.any(Object),
+            statusUpdatedAt: expect.any(String),
           },
         },
         `
@@ -4165,6 +5060,7 @@ describe('createTracker', () => {
               "orgId": "org_precision_reconciliation",
               "pollObservedAt": null,
               "projectId": null,
+              "providerDeliveredAt": Any<String>,
               "providerOutputAmount": {
                 "baseUnits": "2000000",
                 "currency": "USD",
@@ -4186,6 +5082,7 @@ describe('createTracker', () => {
                 "relay-multiple-transfer-request",
               ],
               "providerState": null,
+              "providerSubsidy": null,
               "providerTransactionHashes": [
                 "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
               ],
@@ -4264,7 +5161,9 @@ describe('createTracker', () => {
               "sourceTransferIndex": 1,
               "status": "completed",
               "statusReason": null,
+              "statusUpdatedAt": Any<String>,
               "subsidyAmount": null,
+              "subsidyMeterReportedAt": null,
               "tempoGasPaid": null,
               "updatedAt": Any<String>,
               "version": 3,
@@ -4279,6 +5178,7 @@ describe('createTracker', () => {
               "orgId": "org_precision_reconciliation",
               "pollObservedAt": null,
               "projectId": null,
+              "providerDeliveredAt": Any<String>,
               "providerOutputAmount": {
                 "baseUnits": "1000000",
                 "currency": "USD",
@@ -4300,6 +5200,25 @@ describe('createTracker', () => {
                 "relay-multiple-transfer-request",
               ],
               "providerState": null,
+              "providerSubsidy": {
+                "amount": {
+                  "baseUnits": "23838",
+                  "currency": "USD",
+                  "decimals": 18,
+                  "formatted": "0.000000000000023838",
+                },
+                "provider": "relay",
+                "token": {
+                  "address": "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+                  "currency": "USD",
+                  "decimals": 18,
+                  "name": "USD Coin",
+                  "standard": "ERC-20",
+                  "symbol": "USDC",
+                  "tokenKey": "eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+                  "verified": true,
+                },
+              },
               "providerTransactionHashes": [
                 "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
               ],
@@ -4378,7 +5297,9 @@ describe('createTracker', () => {
               "sourceTransferIndex": 0,
               "status": "completed",
               "statusReason": null,
+              "statusUpdatedAt": Any<String>,
               "subsidyAmount": null,
+              "subsidyMeterReportedAt": null,
               "tempoGasPaid": null,
               "updatedAt": Any<String>,
               "version": 3,
@@ -4392,8 +5313,8 @@ describe('createTracker', () => {
           },
           "storedAddress": {
             "address": "0x1212121212121212121212121212121212121212",
-            "apiKeyId": "key_precision_reconciliation",
             "createdAt": "2026-01-03T00:00:00.000Z",
+            "creatorUserId": null,
             "deliveryStrategy": "provider",
             "destinationTokenKey": "eip155:4217/erc20:0x20c000000000000000000000b9537d11c60e8b50",
             "environment": "production",
@@ -4425,6 +5346,7 @@ describe('createTracker', () => {
             "sourceChainId": "eip155:8453",
             "sourceTokenKey": "eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
             "status": "active",
+            "statusUpdatedAt": Any<String>,
             "subsidize": false,
             "updatedAt": "2026-01-03T00:00:00.000Z",
             "version": 1,
@@ -4438,6 +5360,18 @@ describe('createTracker', () => {
   })
 })
 
+function providerOperationCounts(events: readonly Parameters<Metrics.Metrics['count']>[]) {
+  const counts = new Map<string, number>()
+  for (const [name, value, tags] of events) {
+    if (name !== 'routes_provider_operation_count') continue
+    const key = [tags?.['provider'], tags?.['operation'], tags?.['outcome'], tags?.['failure']]
+      .filter(Boolean)
+      .join(':')
+    counts.set(key, (counts.get(key) ?? 0) + value)
+  }
+  return Object.fromEntries([...counts].sort(([a], [b]) => a.localeCompare(b)))
+}
+
 function transferLog(options: transferLog.Options) {
   return {
     address: options.token,