tapimo 0.7.2 → 0.9.0

package/src/internal/funding/Reconciliation.test.ts

@@ -1,9 +1,11 @@
 import * as NodeBuffer from 'node:buffer'
 
-import { AbiEvent } from 'ox'
+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 TestApp from '../../../test/App.js'
 import * as TestFunding from '../../../test/Funding.js'
@@ -15,12 +17,13 @@ import * as Evidence from './Evidence.js'
 import * as Provider from './Provider.js'
 import * as Reconciliation from './Reconciliation.js'
 import * as Relay from './providers/relay.js'
+import * as SourceObservation from './SourceObservation.js'
 
 const db = TestApp.database()
 const transferTopic = AbiEvent.getSelector('event Transfer(address,address,uint256)')
 
 describe('createTracker', () => {
-  test('requires action when Relay completes without destination funds', async () => {
+  test('keeps Relay success pending without destination evidence', async () => {
     const route = TestFunding.transferSnapshot()
     const depositAddress = `0x${'44'.repeat(20)}`
     const sourceTransactionHash = `0x${'aa'.repeat(32)}`
@@ -44,6 +47,15 @@ describe('createTracker', () => {
         subsidize: false,
       },
     })
+    const counts: Parameters<Metrics.Metrics['count']>[] = []
+    const metrics = Metrics.from({
+      count(...parameters) {
+        counts.push(parameters)
+      },
+      flush() {},
+      gauge() {},
+      histogram() {},
+    })
     const server = await TestRelay.createServer(async (request, response) => {
       if (request.method === 'GET') {
         response.writeHead(200, { 'content-type': 'application/json' })
@@ -53,7 +65,7 @@ describe('createTracker', () => {
               {
                 createdAt: '2026-01-01T00:01:00.000Z',
                 data: {
-                  inTxs: [{ hash: providerTransactionHash }],
+                  inTxs: [{ txHash: providerTransactionHash }],
                   outTxs: [],
                 },
                 depositAddress: { depositTxHash: sourceTransactionHash },
@@ -132,6 +144,7 @@ describe('createTracker', () => {
         dispatch: async (message) => {
           messages.push(message)
         },
+        metrics,
         now: () => new Date('2027-01-01T00:00:00.000Z'),
         providers: [provider],
         verifyTransfers: Evidence.createVerifier({
@@ -142,15 +155,32 @@ describe('createTracker', () => {
       const tick = await tracker.tick()
       const message = messages[0]
       if (!message) throw new Error('Expected a reconciliation message.')
-      const reconciliation = await tracker.reconcile(message)
-      const duplicate = await tracker.reconcile(message)
+      const queuedBeforeAttribution: Provider.Webhook.receive.Queued = {
+        addressId: message.addressId,
+        pollLeaseVersion: message.pollLeaseVersion,
+        type: message.type,
+      }
+      const reconciliation = await tracker.reconcile(queuedBeforeAttribution)
+      const duplicate = await tracker.reconcile(queuedBeforeAttribution)
       const [record] = await FundingDeposits.listBySourceTransaction(db, {
         depositAddressId: address.id,
         sourceTransactionHash,
       })
+      const observation = await FundingDepositRequestObservations.get(db, {
+        depositAddressId: address.id,
+        providerRequestId: 'relay-child-request',
+      })
       const storedAddress = await FundingDepositAddresses.get(db, address.id)
 
-      expect({ duplicate, reconciliation, record, storedAddress, tick }).toMatchInlineSnapshot(
+      expect({
+        counts,
+        duplicate,
+        observation,
+        reconciliation,
+        record,
+        storedAddress,
+        tick,
+      }).toMatchInlineSnapshot(
         {
           record: {
             createdAt: expect.any(String),
@@ -159,6 +189,7 @@ describe('createTracker', () => {
             snapshot: { depositAddressId: expect.any(String) },
             updatedAt: expect.any(String),
           },
+          observation: { depositAddressId: expect.any(String) },
           storedAddress: {
             id: expect.any(String),
             providerOutputToken: expect.any(Object),
@@ -167,9 +198,52 @@ describe('createTracker', () => {
         },
         `
         {
+          "counts": [
+            [
+              "funding_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "enqueued",
+                "provider": "relay",
+                "trigger": "poll",
+              },
+            ],
+            [
+              "funding_deposit_detection_count",
+              1,
+              {
+                "provider": "relay",
+                "trigger": "poll",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "follow_up_enqueued",
+                "provider": "relay",
+                "trigger": "poll",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "completed",
+                "provider": "relay",
+                "trigger": "poll",
+              },
+            ],
+          ],
           "duplicate": {
             "type": "busy",
           },
+          "observation": {
+            "depositAddressId": Any<String>,
+            "pollObservedAt": "2027-01-01T00:00:00.000Z",
+            "providerRequestId": "relay-child-request",
+            "webhookReceivedAt": null,
+          },
           "reconciliation": {
             "created": 1,
             "type": "completed",
@@ -178,9 +252,11 @@ describe('createTracker', () => {
           "record": {
             "createdAt": Any<String>,
             "depositAddressId": Any<String>,
+            "detectionTrigger": "poll",
             "environment": "production",
             "id": Any<String>,
             "orgId": "org_reconciliation",
+            "pollObservedAt": "2027-01-01T00:00:00.000Z",
             "projectId": null,
             "providerOutputAmount": null,
             "providerOutputToken": {
@@ -258,15 +334,13 @@ describe('createTracker', () => {
             "sourceChainId": "eip155:8453",
             "sourceTransactionHash": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
             "sourceTransferIndex": 0,
-            "status": "action-required",
-            "statusReason": {
-              "code": "delivery_failed",
-              "message": "The provider completed without delivering destination funds.",
-            },
+            "status": "bridging",
+            "statusReason": null,
             "subsidyAmount": null,
             "tempoGasPaid": null,
             "updatedAt": Any<String>,
             "version": 3,
+            "webhookReceivedAt": null,
           },
           "storedAddress": {
             "address": "0x4444444444444444444444444444444444444444",
@@ -288,7 +362,9 @@ describe('createTracker', () => {
             "providerRequestIds": [],
             "providerState": {
               "reconciliation": {
-                "pendingRequestIds": [],
+                "pendingRequestIds": [
+                  "relay-child-request",
+                ],
                 "requestIds": [
                   "relay-child-request",
                 ],
@@ -403,6 +479,7 @@ describe('createTracker', () => {
           status: 'success',
           updatedAt: '2026-01-06T00:02:00.000Z',
         },
+        trigger: 'manual',
         verifyTransfers: Evidence.createVerifier({ db }),
       })
       const [record] = await FundingDeposits.listBySourceTransaction(db, {
@@ -425,9 +502,11 @@ describe('createTracker', () => {
           "record": {
             "createdAt": Any<String>,
             "depositAddressId": Any<String>,
+            "detectionTrigger": "manual",
             "environment": "production",
             "id": Any<String>,
             "orgId": "org_unsubsidized_reconciliation",
+            "pollObservedAt": null,
             "projectId": null,
             "providerOutputAmount": {
               "baseUnits": "950000",
@@ -532,6 +611,7 @@ describe('createTracker', () => {
             "tempoGasPaid": null,
             "updatedAt": Any<String>,
             "version": 3,
+            "webhookReceivedAt": null,
           },
           "result": {
             "created": 1,
@@ -577,7 +657,7 @@ describe('createTracker', () => {
             requests: [
               {
                 createdAt: '2026-01-04T00:01:00.000Z',
-                data: { inTxs: [{ hash: sourceTransactionHash }], outTxs: [] },
+                data: { inTxs: [{ txHash: sourceTransactionHash }], outTxs: [] },
                 depositAddress: { depositTxHash: sourceTransactionHash },
                 id: 'relay-observed-request',
                 status: 'pending',
@@ -688,6 +768,7 @@ describe('createTracker', () => {
                 "tokenKey": "eip155:4217/erc20:0x20c000000000000000000000b9537d11c60e8b50",
                 "verified": true,
               },
+              "detectionTrigger": "webhook",
               "id": Any<String>,
               "provider": {
                 "id": "relay",
@@ -750,9 +831,25 @@ describe('createTracker', () => {
         subsidize: false,
       },
     })
+    const counts: Parameters<Metrics.Metrics['count']>[] = []
+    const dispatches: Parameters<Reconciliation.createTracker.Options['dispatch']>[] = []
+    const histograms: Parameters<Metrics.Metrics['histogram']>[] = []
+    const metrics = Metrics.from({
+      count(...parameters) {
+        counts.push(parameters)
+      },
+      flush() {},
+      gauge() {},
+      histogram(...parameters) {
+        histograms.push(parameters)
+      },
+    })
     const requestTargets: string[] = []
     let delivered = false
+    let dispatchFailure = true
     let includeAddressRequest = true
+    let indexed = false
+    let providerUpdateVisible = false
     let returnOlderDirect = false
     const server = await TestRelay.createServer(async (request, response) => {
       if (request.method === 'GET') {
@@ -763,19 +860,20 @@ describe('createTracker', () => {
         response.end(
           JSON.stringify({
             requests:
-              includeAddressRequest || direct
+              indexed && (includeAddressRequest || direct)
                 ? [
                     {
                       createdAt: '2026-01-02T00:01:00.000Z',
                       data: {
-                        inTxs: [{ hash: sourceTransactionHash }],
-                        outTxs: delivered ? [{ hash: destinationTransactionHash }] : [],
+                        inTxs: [{ txHash: sourceTransactionHash }],
+                        outTxs: delivered ? [{ txHash: destinationTransactionHash }] : [],
                       },
                       depositAddress: { depositTxHash: sourceTransactionHash },
                       id: 'relay-pending-request',
                       status: delivered ? 'success' : 'pending',
                       updatedAt: (() => {
                         if (direct && returnOlderDirect) return '2026-01-01T00:00:00.000Z'
+                        if (!providerUpdateVisible) return '2026-01-02T00:02:00.000Z'
                         if (delivered) return '2026-01-02T00:03:00.500Z'
                         return '2026-01-02T00:03:00Z'
                       })(),
@@ -845,51 +943,906 @@ describe('createTracker', () => {
         routes: [],
         tokens: [],
       })
-      const provider = Relay.relay({ apiKey: 'relay-api-key', baseUrl: server.url })
+      const provider = Relay.relay({ apiKey: 'relay-api-key', baseUrl: server.url })
+      let trackerNow = new Date('2026-01-02T00:03:10.000Z')
+      const tracker = Reconciliation.createTracker({
+        db,
+        dispatch: async (...parameters) => {
+          if (dispatchFailure) {
+            dispatchFailure = false
+            throw new Error('Reconciliation queue unavailable.')
+          }
+          dispatches.push(parameters)
+        },
+        metrics,
+        now: () => trackerNow,
+        providers: [provider],
+        verifyTransfers: Evidence.createVerifier({ db }),
+      })
+
+      const message = {
+        addressId: address.id,
+        requestId: 'relay-pending-request',
+        trigger: 'webhook',
+        type: 'funding:deposit-address:reconcile',
+        webhookTiming: {
+          enqueuedAt: '2026-01-02T00:03:07.000Z',
+          providerStatus: 'pending',
+          providerUpdatedAt: '2026-01-02T00:03:00.000Z',
+          receivedAt: '2026-01-02T00:03:06.000Z',
+          sentAt: '2026-01-02T00:03:05.000Z',
+        },
+      } satisfies Provider.Webhook.receive.Dispatchable
+      await expect(tracker.reconcile(message)).rejects.toThrowErrorMatchingInlineSnapshot(
+        `[Error: Reconciliation queue unavailable.]`,
+      )
+      const pending = await tracker.reconcile(message)
+      const [firstFollowUp] = dispatches
+      if (!firstFollowUp) throw new Error('Expected a provider follow-up message.')
+      indexed = true
+      const pendingFollowUp = await tracker.reconcile(firstFollowUp[0])
+      const exhausted = await tracker.reconcile({
+        ...firstFollowUp[0],
+        followUp: { attempt: 5, kind: 'provider' },
+      })
+      const [, secondFollowUp] = dispatches
+      if (!secondFollowUp) throw new Error('Expected a second provider follow-up message.')
+      delivered = true
+      includeAddressRequest = false
+      providerUpdateVisible = true
+      trackerNow = new Date('2026-01-02T00:03:15.000Z')
+      const completed = await tracker.reconcile(secondFollowUp[0])
+      includeAddressRequest = true
+      const replay = await tracker.reconcile({
+        addressId: address.id,
+        trigger: 'webhook',
+        type: 'funding:deposit-address:reconcile',
+      })
+      includeAddressRequest = false
+      returnOlderDirect = true
+      const webhook = await tracker.reconcile({
+        addressId: address.id,
+        requestId: 'relay-pending-request',
+        trigger: 'webhook',
+        type: 'funding:deposit-address:reconcile',
+      })
+      const [record] = await FundingDeposits.listBySourceTransaction(db, {
+        depositAddressId: address.id,
+        sourceTransactionHash,
+      })
+      const storedAddress = await FundingDepositAddresses.get(db, address.id)
+
+      expect({
+        completed,
+        counts,
+        dispatches,
+        exhausted,
+        histograms,
+        pending,
+        pendingFollowUp,
+        record,
+        replay,
+        requestTargets,
+        storedAddress,
+        webhook,
+      }).toMatchInlineSnapshot(
+        {
+          dispatches: [
+            [{ addressId: expect.any(String) }, { delaySeconds: 5 }],
+            [{ addressId: expect.any(String) }, { delaySeconds: 5 }],
+          ],
+          record: {
+            createdAt: expect.any(String),
+            depositAddressId: expect.any(String),
+            id: expect.any(String),
+            snapshot: { depositAddressId: expect.any(String) },
+            updatedAt: expect.any(String),
+          },
+          storedAddress: {
+            id: expect.any(String),
+            providerOutputToken: expect.any(Object),
+            snapshot: expect.any(Object),
+          },
+        },
+        `
+        {
+          "completed": {
+            "created": 0,
+            "type": "completed",
+            "updated": 1,
+          },
+          "counts": [
+            [
+              "funding_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "follow_up_enqueue_failed",
+                "provider": "relay",
+                "trigger": "webhook",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "failed",
+                "provider": "relay",
+                "trigger": "webhook",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "follow_up_enqueued",
+                "provider": "relay",
+                "trigger": "webhook",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "completed",
+                "provider": "relay",
+                "trigger": "webhook",
+              },
+            ],
+            [
+              "funding_deposit_detection_count",
+              1,
+              {
+                "provider": "relay",
+                "trigger": "webhook",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "follow_up_enqueued",
+                "provider": "relay",
+                "trigger": "webhook",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "completed",
+                "provider": "relay",
+                "trigger": "webhook",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "follow_up_exhausted",
+                "provider": "relay",
+                "trigger": "webhook",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "completed",
+                "provider": "relay",
+                "trigger": "webhook",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "completed",
+                "provider": "relay",
+                "trigger": "webhook",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "completed",
+                "provider": "relay",
+                "trigger": "webhook",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "completed",
+                "provider": "relay",
+                "trigger": "webhook",
+              },
+            ],
+          ],
+          "dispatches": [
+            [
+              {
+                "addressId": Any<String>,
+                "followUp": {
+                  "attempt": 0,
+                  "kind": "provider",
+                },
+                "requestId": "relay-pending-request",
+                "trigger": "webhook",
+                "type": "funding:deposit-address:reconcile",
+                "webhookTiming": {
+                  "enqueuedAt": "2026-01-02T00:03:07.000Z",
+                  "providerStatus": "pending",
+                  "providerUpdatedAt": "2026-01-02T00:03:00.000Z",
+                  "receivedAt": "2026-01-02T00:03:06.000Z",
+                  "sentAt": "2026-01-02T00:03:05.000Z",
+                },
+              },
+              {
+                "delaySeconds": 5,
+              },
+            ],
+            [
+              {
+                "addressId": Any<String>,
+                "followUp": {
+                  "attempt": 1,
+                  "kind": "provider",
+                },
+                "requestId": "relay-pending-request",
+                "trigger": "webhook",
+                "type": "funding:deposit-address:reconcile",
+                "webhookTiming": {
+                  "enqueuedAt": "2026-01-02T00:03:07.000Z",
+                  "providerStatus": "pending",
+                  "providerUpdatedAt": "2026-01-02T00:03:00.000Z",
+                  "receivedAt": "2026-01-02T00:03:06.000Z",
+                  "sentAt": "2026-01-02T00:03:05.000Z",
+                },
+              },
+              {
+                "delaySeconds": 5,
+              },
+            ],
+          ],
+          "exhausted": {
+            "created": 0,
+            "type": "completed",
+            "updated": 1,
+          },
+          "histograms": [
+            [
+              "funding_deposit_reconciliation_duration_ms",
+              0,
+              {
+                "provider": "relay",
+                "trigger": "webhook",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_duration_ms",
+              0,
+              {
+                "provider": "relay",
+                "trigger": "webhook",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_duration_ms",
+              0,
+              {
+                "provider": "relay",
+                "trigger": "webhook",
+              },
+            ],
+            [
+              "funding_deposit_webhook_latency_ms",
+              5000,
+              {
+                "provider": "relay",
+                "segment": "provider_to_sent",
+                "status": "pending",
+              },
+            ],
+            [
+              "funding_deposit_webhook_latency_ms",
+              1000,
+              {
+                "provider": "relay",
+                "segment": "sent_to_received",
+                "status": "pending",
+              },
+            ],
+            [
+              "funding_deposit_webhook_latency_ms",
+              1000,
+              {
+                "provider": "relay",
+                "segment": "received_to_enqueued",
+                "status": "pending",
+              },
+            ],
+            [
+              "funding_deposit_webhook_latency_ms",
+              8000,
+              {
+                "provider": "relay",
+                "segment": "enqueued_to_reconciled",
+                "status": "pending",
+              },
+            ],
+            [
+              "funding_deposit_webhook_latency_ms",
+              15000,
+              {
+                "provider": "relay",
+                "segment": "provider_to_reconciled",
+                "status": "pending",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_duration_ms",
+              0,
+              {
+                "provider": "relay",
+                "trigger": "webhook",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_duration_ms",
+              0,
+              {
+                "provider": "relay",
+                "trigger": "webhook",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_duration_ms",
+              0,
+              {
+                "provider": "relay",
+                "trigger": "webhook",
+              },
+            ],
+          ],
+          "pending": {
+            "created": 0,
+            "type": "completed",
+            "updated": 0,
+          },
+          "pendingFollowUp": {
+            "created": 1,
+            "type": "completed",
+            "updated": 1,
+          },
+          "record": {
+            "createdAt": Any<String>,
+            "depositAddressId": Any<String>,
+            "detectionTrigger": "webhook",
+            "environment": "production",
+            "id": Any<String>,
+            "orgId": "org_pending_reconciliation",
+            "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": "relay-pending-request",
+            "providerRequestIds": [
+              "relay-pending-request",
+            ],
+            "providerState": null,
+            "providerTransactionHashes": [
+              "0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
+            ],
+            "providerTransferIndex": 0,
+            "retryState": null,
+            "settlementTransaction": null,
+            "settlementTransactionHash": null,
+            "snapshot": {
+              "depositAddressId": Any<String>,
+              "destinationAmount": {
+                "baseUnits": "1000000",
+                "currency": "USD",
+                "decimals": 6,
+                "formatted": "1",
+              },
+              "destinationAmountRequired": {
+                "baseUnits": "1000000",
+                "currency": "USD",
+                "decimals": 6,
+                "formatted": "1",
+              },
+              "destinationChain": {
+                "addressFormat": "hex",
+                "id": "eip155:4217",
+                "kind": "evm",
+                "name": "Tempo",
+              },
+              "destinationToken": {
+                "address": "0x20c000000000000000000000b9537d11c60e8b50",
+                "currency": "USD",
+                "decimals": 6,
+                "name": "Bridged USDC (Stargate)",
+                "standard": "TIP-20",
+                "symbol": "USDC.e",
+                "tokenKey": "eip155:4217/erc20:0x20c000000000000000000000b9537d11c60e8b50",
+                "verified": true,
+              },
+              "destinationTransactionHashes": [
+                "0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
+              ],
+              "provider": {
+                "id": "relay",
+                "name": "Relay",
+              },
+              "recipient": "0x1111111111111111111111111111111111111111",
+              "refundAddress": "0x9999999999999999999999999999999999999999",
+              "sender": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+              "sourceAmount": {
+                "baseUnits": "1000000",
+                "currency": "USD",
+                "decimals": 6,
+                "formatted": "1",
+              },
+              "sourceChain": {
+                "addressFormat": "hex",
+                "id": "eip155:8453",
+                "kind": "evm",
+                "name": "Base",
+              },
+              "sourceToken": {
+                "address": "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+                "currency": "USD",
+                "decimals": 6,
+                "name": "USD Coin",
+                "standard": "ERC-20",
+                "symbol": "USDC",
+                "tokenKey": "eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+                "verified": true,
+              },
+              "sourceTransactionHashes": [
+                "0xcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
+              ],
+            },
+            "sourceChainId": "eip155:8453",
+            "sourceTransactionHash": "0xcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
+            "sourceTransferIndex": 0,
+            "status": "completed",
+            "statusReason": null,
+            "subsidyAmount": null,
+            "tempoGasPaid": null,
+            "updatedAt": Any<String>,
+            "version": 7,
+            "webhookReceivedAt": null,
+          },
+          "replay": {
+            "created": 0,
+            "type": "completed",
+            "updated": 0,
+          },
+          "requestTargets": [
+            "/requests/v3?depositAddress=0x8888888888888888888888888888888888888888&includeChildRequests=true&limit=50&sortBy=updatedAt&sortDirection=desc",
+            "/requests/v3?id=relay-pending-request&includeChildRequests=true&limit=50&sortBy=updatedAt&sortDirection=desc",
+            "/requests/v3?depositAddress=0x8888888888888888888888888888888888888888&includeChildRequests=true&limit=50&sortBy=updatedAt&sortDirection=desc",
+            "/requests/v3?id=relay-pending-request&includeChildRequests=true&limit=50&sortBy=updatedAt&sortDirection=desc",
+            "/requests/v3?depositAddress=0x8888888888888888888888888888888888888888&includeChildRequests=true&limit=50&sortBy=updatedAt&sortDirection=desc",
+            "/requests/v3?depositAddress=0x8888888888888888888888888888888888888888&includeChildRequests=true&limit=50&sortBy=updatedAt&sortDirection=desc",
+            "/requests/v3?depositAddress=0x8888888888888888888888888888888888888888&includeChildRequests=true&limit=50&sortBy=updatedAt&sortDirection=desc",
+            "/requests/v3?id=relay-pending-request&includeChildRequests=true&limit=50&sortBy=updatedAt&sortDirection=desc",
+            "/requests/v3?depositAddress=0x8888888888888888888888888888888888888888&includeChildRequests=true&limit=50&sortBy=updatedAt&sortDirection=desc",
+            "/requests/v3?depositAddress=0x8888888888888888888888888888888888888888&includeChildRequests=true&limit=50&sortBy=updatedAt&sortDirection=desc",
+            "/requests/v3?id=relay-pending-request&includeChildRequests=true&limit=50&sortBy=updatedAt&sortDirection=desc",
+          ],
+          "storedAddress": {
+            "address": "0x8888888888888888888888888888888888888888",
+            "apiKeyId": "key_pending_reconciliation",
+            "createdAt": "2026-01-02T00:00:00.000Z",
+            "deliveryStrategy": "provider",
+            "destinationTokenKey": "eip155:4217/erc20:0x20c000000000000000000000b9537d11c60e8b50",
+            "environment": "production",
+            "id": Any<String>,
+            "lastPolledAt": "2026-01-02T00:03:15.000Z",
+            "nextPollAt": "2026-01-02T00:04:15.000Z",
+            "orgId": "org_pending_reconciliation",
+            "pollFailureCount": 0,
+            "pollLeaseUntil": null,
+            "pollLeaseVersion": 7,
+            "projectId": null,
+            "providerId": "relay",
+            "providerOutputToken": Any<Object>,
+            "providerRequestIds": [],
+            "providerState": {
+              "reconciliation": {
+                "pendingRequestIds": [],
+                "requestIds": [
+                  "relay-pending-request",
+                ],
+                "updatedAt": "2026-01-02T00:03:00.500Z",
+                "webhookTiming": {
+                  "enqueuedAt": "2026-01-02T00:03:07.000Z",
+                  "providerStatus": "pending",
+                  "providerUpdatedAt": "2026-01-02T00:03:00.000Z",
+                  "receivedAt": "2026-01-02T00:03:06.000Z",
+                  "reconciliationCompletedAt": "2026-01-02T00:03:15.000Z",
+                  "requestId": "relay-pending-request",
+                  "sentAt": "2026-01-02T00:03:05.000Z",
+                },
+              },
+            },
+            "recipient": "0x1111111111111111111111111111111111111111",
+            "refundAddress": "0x9999999999999999999999999999999999999999",
+            "snapshot": Any<Object>,
+            "sourceChainId": "eip155:8453",
+            "sourceTokenKey": "eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+            "status": "active",
+            "subsidize": false,
+            "updatedAt": "2026-01-02T00:00:00.000Z",
+            "version": 1,
+          },
+          "webhook": {
+            "created": 0,
+            "type": "completed",
+            "updated": 0,
+          },
+        }
+      `,
+      )
+    } finally {
+      await server.closeAsync()
+    }
+  })
+
+  test('completes chain-detected Relay delivery before provider attribution', async () => {
+    const route = TestFunding.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 refundAddress = `0x${'38'.repeat(20)}`
+    const solver = `0x${'35'.repeat(20)}`
+    const sourceSweepTransactionHash = `0x${'36'.repeat(32)}`
+    const sourceTransactionHash = `0x${'37'.repeat(32)}`
+    const address = await DepositAddress.create(db, {
+      apiKeyId: 'key_delivery_observation',
+      deliveryStrategy: 'provider',
+      environment: 'production',
+      now: new Date('2026-01-04T00:00:00.000Z'),
+      orgId: 'org_delivery_observation',
+      providerOutputToken: route.destinationToken,
+      snapshot: {
+        address: depositAddress,
+        destinationChain: route.destinationChain,
+        destinationToken: route.destinationToken,
+        provider: { id: 'relay', name: 'Relay' },
+        recipient: route.recipient,
+        refundAddress,
+        sourceChain: route.sourceChain,
+        sourceToken: route.sourceToken,
+        subsidize: true,
+      },
+    })
+    const counts: Parameters<Metrics.Metrics['count']>[] = []
+    const dispatches: Parameters<Reconciliation.createTracker.Options['dispatch']>[] = []
+    const metrics = Metrics.from({
+      count(...parameters) {
+        counts.push(parameters)
+      },
+      flush() {},
+      gauge() {},
+      histogram() {},
+    })
+    const rpcMethods: string[] = []
+    let ambiguous = true
+    let correlateDestination = false
+    let delivered = false
+    let indexed = false
+    const server = await TestRelay.createServer(async (request, response) => {
+      if (request.method === 'GET') {
+        const url = new URL(request.url ?? '/', server.url)
+        response.writeHead(200, { 'content-type': 'application/json' })
+        response.end(
+          JSON.stringify(
+            url.pathname === '/chains'
+              ? {
+                  chains: [
+                    {
+                      id: Number(route.sourceChain.id.slice('eip155:'.length)),
+                      protocol: { v2: { depository } },
+                      solverAddresses: [],
+                    },
+                    {
+                      id: Number(route.destinationChain.id.slice('eip155:'.length)),
+                      solverAddresses: [solver],
+                    },
+                  ],
+                }
+              : {
+                  requests: indexed
+                    ? [
+                        {
+                          createdAt: '2026-01-04T00:01:00.000Z',
+                          data: { outTxs: [] },
+                          depositAddress: { depositTxHash: sourceTransactionHash },
+                          id: 'relay-observed-request',
+                          protocol: {
+                            deposit: { origin: { depositor: refundAddress, depository } },
+                            orderId,
+                            solver: { address: solver },
+                          },
+                          status: 'pending',
+                          updatedAt: '2026-01-04T00:02:00.000Z',
+                        },
+                      ]
+                    : [],
+                },
+          ),
+        )
+        return
+      }
+
+      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 unknown[] | undefined
+      }
+      rpcMethods.push(body.method)
+      const parameter = body.params?.[0]
+      const result = (() => {
+        if (body.method === 'eth_blockNumber') return '0x100'
+        if (body.method === 'eth_getTransactionByHash')
+          return parameter === destinationTransactionHash
+            ? rpcTransaction({
+                blockNumber: 0xf0,
+                from: solver,
+                hash: destinationTransactionHash,
+                input: (() => {
+                  const input = AbiFunction.encodeData(
+                    AbiFunction.from('function transfer(address recipient,uint256 amount)'),
+                    [route.recipient as Address.Address, 1_000_000n],
+                  )
+                  if (!correlateDestination) return input
+                  return Hex.concat(input, orderId as Hex.Hex)
+                })(),
+                to: route.destinationToken.address,
+              })
+            : rpcTransaction({
+                blockNumber: 0x82,
+                from: depositAddress,
+                hash:
+                  parameter === sourceSweepTransactionHash
+                    ? sourceSweepTransactionHash
+                    : ambiguousSweepTransactionHash,
+                input: (() => {
+                  if (parameter === sourceSweepTransactionHash)
+                    return AbiFunction.encodeData(
+                      AbiFunction.from(
+                        'function depositErc20(address depositor,address token,bytes32 id)',
+                      ),
+                      [
+                        refundAddress as Address.Address,
+                        route.sourceToken.address as Address.Address,
+                        orderId as Hex.Hex,
+                      ],
+                    )
+                  return AbiFunction.encodeData(
+                    AbiFunction.from(
+                      'function depositErc20(address depositor,address token,uint256 amount,bytes32 id)',
+                    ),
+                    [
+                      refundAddress as Address.Address,
+                      route.sourceToken.address as Address.Address,
+                      1_000_000n,
+                      ambiguousOrderId as Hex.Hex,
+                    ],
+                  )
+                })(),
+                to: depository,
+              })
+        if (body.method === 'eth_getLogs') {
+          const filter = parameter as { address?: string | undefined }
+          if (filter.address?.toLowerCase() === depository.toLowerCase())
+            return [
+              ...(ambiguous
+                ? [
+                    relayDepositLog({
+                      amount: 1_000_000n,
+                      blockNumber: 0x81,
+                      depository,
+                      from: refundAddress,
+                      orderId: ambiguousOrderId,
+                      token: route.sourceToken.address,
+                      transactionHash: ambiguousSweepTransactionHash,
+                    }),
+                  ]
+                : []),
+              relayDepositLog({
+                amount: 1_000_000n,
+                blockNumber: 0x82,
+                depository,
+                from: refundAddress,
+                orderId,
+                token: route.sourceToken.address,
+                transactionHash: sourceSweepTransactionHash,
+              }),
+            ]
+          if (delivered)
+            return [
+              transferLog({
+                amount: 1_000_000n,
+                blockNumber: 0xf0,
+                recipient: route.recipient,
+                sender: solver,
+                token: route.destinationToken.address,
+                transactionHash: destinationTransactionHash,
+              }),
+            ]
+          return []
+        }
+        if (body.method === 'eth_getTransactionReceipt') {
+          const hash = parameter
+          return {
+            blockNumber: hash === sourceTransactionHash ? '0x80' : '0xf0',
+            logs: [
+              hash === sourceTransactionHash
+                ? transferLog({
+                    amount: 1_000_000n,
+                    recipient: depositAddress,
+                    sender: `0x${'3c'.repeat(20)}`,
+                    token: route.sourceToken.address,
+                  })
+                : transferLog({
+                    amount: 1_000_000n,
+                    recipient: route.recipient,
+                    sender: solver,
+                    token: route.destinationToken.address,
+                  }),
+            ],
+            status: '0x1',
+          }
+        }
+        throw new Error(`Unexpected RPC method: ${body.method}`)
+      })()
+      response.writeHead(200, { 'content-type': 'application/json' })
+      response.end(JSON.stringify({ id: body.id, jsonrpc: '2.0', result }))
+    })
+
+    try {
+      await FundingCatalog.publish(db, {
+        chainTokens: [],
+        chains: [
+          {
+            aliases: [],
+            id: route.destinationChain.id as Chain.Id,
+            name: route.destinationChain.name,
+            parentChainId: null,
+            rpcUrls: [server.url],
+            slug: 'destination',
+          },
+          {
+            aliases: [],
+            id: route.sourceChain.id as Chain.Id,
+            name: route.sourceChain.name,
+            parentChainId: null,
+            rpcUrls: [server.url],
+            slug: 'source',
+          },
+        ],
+        routes: [],
+        tokens: [],
+      })
+      const provider = Relay.relay({
+        apiKey: 'relay-api-key',
+        baseUrl: server.url,
+        now: () => new Date('2026-01-04T00:03:00.000Z'),
+        observation: { db },
+      })
+      if (!Provider.canObserveDepositAddressRequest(provider))
+        throw new Error('Expected Relay delivery observation.')
+      const ambiguousObservation = 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,
+      )
+      ambiguous = false
+      delivered = true
+      const uncorrelatedObservation = 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,
+      )
+      correlateDestination = true
+      delivered = false
+      const observed = await SourceObservation.observe(db, {
+        addressId: address.id,
+        amount: '1000000',
+        chainId: route.sourceChain.id,
+        now: new Date('2026-01-04T00:00:30.000Z'),
+        recipient: depositAddress,
+        sender: refundAddress,
+        tokenAddress: route.sourceToken.address,
+        transactionHash: sourceTransactionHash,
+        transferIndex: 0,
+      })
+      if (observed.type === 'ignored') throw new Error('Expected source observation.')
       const tracker = Reconciliation.createTracker({
         db,
-        dispatch: async () => undefined,
-        now: () => new Date('2027-01-02T00:00:00.000Z'),
+        dispatch: async (...parameters) => {
+          dispatches.push(parameters)
+        },
+        metrics,
+        now: () => new Date('2026-01-04T00:03:00.000Z'),
         providers: [provider],
         verifyTransfers: Evidence.createVerifier({ db }),
       })
-
       const pending = await tracker.reconcile({
         addressId: address.id,
+        trigger: 'chain',
         type: 'funding:deposit-address:reconcile',
       })
+      const [deliveryFollowUp] = dispatches
+      if (!deliveryFollowUp) throw new Error('Expected a delivery follow-up message.')
       delivered = true
-      includeAddressRequest = false
-      const completed = await tracker.reconcile({
-        addressId: address.id,
-        type: 'funding:deposit-address:reconcile',
-      })
-      includeAddressRequest = true
-      const replay = await tracker.reconcile({
-        addressId: address.id,
-        type: 'funding:deposit-address:reconcile',
-      })
-      includeAddressRequest = false
-      returnOlderDirect = true
-      const webhook = await tracker.reconcile({
-        addressId: address.id,
-        requestId: 'relay-pending-request',
-        type: 'funding:deposit-address:reconcile',
-      })
+      const completed = await tracker.reconcile(deliveryFollowUp[0])
+      const completedRecord = await FundingDeposits.get(db, observed.record.id)
+      const [, providerFollowUp] = dispatches
+      if (!providerFollowUp) throw new Error('Expected a provider follow-up message.')
+      indexed = true
+      const attributed = await tracker.reconcile(providerFollowUp[0])
       const [record] = await FundingDeposits.listBySourceTransaction(db, {
         depositAddressId: address.id,
         sourceTransactionHash,
       })
-      const storedAddress = await FundingDepositAddresses.get(db, address.id)
 
       expect({
+        ambiguousObservation,
+        attributed,
         completed,
+        completedRecord,
+        counts,
+        dispatches: dispatches.map(([message, dispatchOptions]) => [
+          { ...message, addressId: '<address-id>' },
+          dispatchOptions,
+        ]),
         pending,
         record,
-        replay,
-        requestTargets,
-        storedAddress,
-        webhook,
+        rpcMethods,
+        sourceObservation: observed.type,
+        uncorrelatedObservation,
       }).toMatchInlineSnapshot(
         {
           record: {
@@ -899,30 +1852,250 @@ describe('createTracker', () => {
             snapshot: { depositAddressId: expect.any(String) },
             updatedAt: expect.any(String),
           },
-          storedAddress: {
+          completedRecord: {
+            createdAt: expect.any(String),
+            depositAddressId: expect.any(String),
             id: expect.any(String),
-            providerOutputToken: expect.any(Object),
-            snapshot: expect.any(Object),
+            snapshot: { depositAddressId: expect.any(String) },
+            updatedAt: expect.any(String),
           },
         },
         `
         {
+          "ambiguousObservation": {
+            "type": "pending",
+          },
+          "attributed": {
+            "created": 0,
+            "type": "completed",
+            "updated": 1,
+          },
           "completed": {
             "created": 0,
             "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",
+              },
+            },
+            "providerTransactionHashes": [
+              "0x3636363636363636363636363636363636363636363636363636363636363636",
+              "0x3333333333333333333333333333333333333333333333333333333333333333",
+            ],
+            "providerTransferIndex": 0,
+            "retryState": null,
+            "settlementTransaction": null,
+            "settlementTransactionHash": null,
+            "snapshot": {
+              "depositAddressId": Any<String>,
+              "destinationAmount": {
+                "baseUnits": "1000000",
+                "currency": "USD",
+                "decimals": 6,
+                "formatted": "1",
+              },
+              "destinationChain": {
+                "addressFormat": "hex",
+                "id": "eip155:4217",
+                "kind": "evm",
+                "name": "Tempo",
+              },
+              "destinationToken": {
+                "address": "0x20c000000000000000000000b9537d11c60e8b50",
+                "currency": "USD",
+                "decimals": 6,
+                "name": "Bridged USDC (Stargate)",
+                "standard": "TIP-20",
+                "symbol": "USDC.e",
+                "tokenKey": "eip155:4217/erc20:0x20c000000000000000000000b9537d11c60e8b50",
+                "verified": true,
+              },
+              "destinationTransactionHashes": [
+                "0x3333333333333333333333333333333333333333333333333333333333333333",
+              ],
+              "provider": {
+                "id": "relay",
+                "name": "Relay",
+              },
+              "recipient": "0x1111111111111111111111111111111111111111",
+              "refundAddress": "0x3838383838383838383838383838383838383838",
+              "sender": "0x3838383838383838383838383838383838383838",
+              "sourceAmount": {
+                "baseUnits": "1000000",
+                "currency": "USD",
+                "decimals": 6,
+                "formatted": "1",
+              },
+              "sourceChain": {
+                "addressFormat": "hex",
+                "id": "eip155:8453",
+                "kind": "evm",
+                "name": "Base",
+              },
+              "sourceToken": {
+                "address": "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+                "currency": "USD",
+                "decimals": 6,
+                "name": "USD Coin",
+                "standard": "ERC-20",
+                "symbol": "USDC",
+                "tokenKey": "eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+                "verified": true,
+              },
+              "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",
+              1,
+              {
+                "outcome": "pending",
+                "provider": "relay",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "follow_up_enqueued",
+                "provider": "relay",
+                "trigger": "chain",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "completed",
+                "provider": "relay",
+                "trigger": "chain",
+              },
+            ],
+            [
+              "funding_deposit_delivery_observation_count",
+              1,
+              {
+                "outcome": "verified",
+                "provider": "relay",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "follow_up_enqueued",
+                "provider": "relay",
+                "trigger": "chain",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "completed",
+                "provider": "relay",
+                "trigger": "chain",
+              },
+            ],
+            [
+              "funding_deposit_reconciliation_count",
+              1,
+              {
+                "outcome": "completed",
+                "provider": "relay",
+                "trigger": "chain",
+              },
+            ],
+          ],
+          "dispatches": [
+            [
+              {
+                "addressId": "<address-id>",
+                "followUp": {
+                  "attempt": 0,
+                  "kind": "delivery",
+                },
+                "trigger": "chain",
+                "type": "funding:deposit-address:reconcile",
+              },
+              {
+                "delaySeconds": 1,
+              },
+            ],
+            [
+              {
+                "addressId": "<address-id>",
+                "followUp": {
+                  "attempt": 0,
+                  "kind": "provider",
+                },
+                "trigger": "chain",
+                "type": "funding:deposit-address:reconcile",
+              },
+              {
+                "delaySeconds": 1,
+              },
+            ],
+          ],
           "pending": {
-            "created": 1,
+            "created": 0,
             "type": "completed",
             "updated": 1,
           },
           "record": {
             "createdAt": Any<String>,
             "depositAddressId": Any<String>,
+            "detectionTrigger": "chain",
             "environment": "production",
             "id": Any<String>,
-            "orgId": "org_pending_reconciliation",
+            "orgId": "org_delivery_observation",
+            "pollObservedAt": null,
             "projectId": null,
             "providerOutputAmount": {
               "baseUnits": "1000000",
@@ -940,13 +2113,22 @@ describe('createTracker', () => {
               "tokenKey": "eip155:4217/erc20:0x20c000000000000000000000b9537d11c60e8b50",
               "verified": true,
             },
-            "providerRequestId": "relay-pending-request",
+            "providerRequestId": "relay-observed-request",
             "providerRequestIds": [
-              "relay-pending-request",
+              "relay-observed-request",
             ],
-            "providerState": null,
+            "providerState": {
+              "relay": {
+                "destinationObservedAt": "2026-01-04T00:03:00.000Z",
+                "orderId": "0x3434343434343434343434343434343434343434343434343434343434343434",
+                "sourceDepository": "0x3232323232323232323232323232323232323232",
+                "sourceObservedAt": "2026-01-04T00:03:00.000Z",
+                "sourceSweepTransactionHash": "0x3636363636363636363636363636363636363636363636363636363636363636",
+              },
+            },
             "providerTransactionHashes": [
-              "0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
+              "0x3636363636363636363636363636363636363636363636363636363636363636",
+              "0x3333333333333333333333333333333333333333333333333333333333333333",
             ],
             "providerTransferIndex": 0,
             "retryState": null,
@@ -983,15 +2165,15 @@ describe('createTracker', () => {
                 "verified": true,
               },
               "destinationTransactionHashes": [
-                "0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
+                "0x3333333333333333333333333333333333333333333333333333333333333333",
               ],
               "provider": {
                 "id": "relay",
                 "name": "Relay",
               },
               "recipient": "0x1111111111111111111111111111111111111111",
-              "refundAddress": "0x9999999999999999999999999999999999999999",
-              "sender": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+              "refundAddress": "0x3838383838383838383838383838383838383838",
+              "sender": "0x3838383838383838383838383838383838383838",
               "sourceAmount": {
                 "baseUnits": "1000000",
                 "currency": "USD",
@@ -1015,73 +2197,65 @@ describe('createTracker', () => {
                 "verified": true,
               },
               "sourceTransactionHashes": [
-                "0xcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
+                "0x3737373737373737373737373737373737373737373737373737373737373737",
               ],
             },
             "sourceChainId": "eip155:8453",
-            "sourceTransactionHash": "0xcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
+            "sourceTransactionHash": "0x3737373737373737373737373737373737373737373737373737373737373737",
             "sourceTransferIndex": 0,
             "status": "completed",
             "statusReason": null,
             "subsidyAmount": null,
             "tempoGasPaid": null,
             "updatedAt": Any<String>,
-            "version": 5,
-          },
-          "replay": {
-            "created": 0,
-            "type": "completed",
-            "updated": 0,
+            "version": 4,
+            "webhookReceivedAt": null,
           },
-          "requestTargets": [
-            "/requests/v2?depositAddress=0x8888888888888888888888888888888888888888&includeChildRequests=true&limit=50&sortBy=updatedAt&sortDirection=desc",
-            "/requests/v2?depositAddress=0x8888888888888888888888888888888888888888&includeChildRequests=true&limit=50&sortBy=updatedAt&sortDirection=desc",
-            "/requests/v2?id=relay-pending-request&limit=50&sortBy=updatedAt&sortDirection=desc",
-            "/requests/v2?depositAddress=0x8888888888888888888888888888888888888888&includeChildRequests=true&limit=50&sortBy=updatedAt&sortDirection=desc",
-            "/requests/v2?depositAddress=0x8888888888888888888888888888888888888888&includeChildRequests=true&limit=50&sortBy=updatedAt&sortDirection=desc",
-            "/requests/v2?id=relay-pending-request&limit=50&sortBy=updatedAt&sortDirection=desc",
+          "rpcMethods": [
+            "eth_getTransactionReceipt",
+            "eth_blockNumber",
+            "eth_getLogs",
+            "eth_getTransactionByHash",
+            "eth_getTransactionByHash",
+            "eth_getTransactionReceipt",
+            "eth_blockNumber",
+            "eth_getLogs",
+            "eth_getTransactionByHash",
+            "eth_blockNumber",
+            "eth_getLogs",
+            "eth_getTransactionByHash",
+            "eth_getTransactionReceipt",
+            "eth_blockNumber",
+            "eth_getTransactionReceipt",
+            "eth_blockNumber",
+            "eth_getLogs",
+            "eth_getTransactionByHash",
+            "eth_blockNumber",
+            "eth_getLogs",
+            "eth_getTransactionReceipt",
+            "eth_blockNumber",
+            "eth_blockNumber",
+            "eth_getLogs",
+            "eth_getTransactionByHash",
+            "eth_getTransactionReceipt",
+            "eth_blockNumber",
+            "eth_getTransactionReceipt",
+            "eth_blockNumber",
           ],
-          "storedAddress": {
-            "address": "0x8888888888888888888888888888888888888888",
-            "apiKeyId": "key_pending_reconciliation",
-            "createdAt": "2026-01-02T00:00:00.000Z",
-            "deliveryStrategy": "provider",
-            "destinationTokenKey": "eip155:4217/erc20:0x20c000000000000000000000b9537d11c60e8b50",
-            "environment": "production",
-            "id": Any<String>,
-            "lastPolledAt": "2027-01-02T00:00:00.000Z",
-            "nextPollAt": "2027-01-02T00:01:00.000Z",
-            "orgId": "org_pending_reconciliation",
-            "pollFailureCount": 0,
-            "pollLeaseUntil": null,
-            "pollLeaseVersion": 4,
-            "projectId": null,
-            "providerId": "relay",
-            "providerOutputToken": Any<Object>,
-            "providerRequestIds": [],
+          "sourceObservation": "created",
+          "uncorrelatedObservation": {
             "providerState": {
-              "reconciliation": {
-                "pendingRequestIds": [],
-                "requestIds": [
-                  "relay-pending-request",
-                ],
-                "updatedAt": "2026-01-02T00:03:00.500Z",
+              "relay": {
+                "orderId": "0x3434343434343434343434343434343434343434343434343434343434343434",
+                "sourceDepository": "0x3232323232323232323232323232323232323232",
+                "sourceObservedAt": "2026-01-04T00:03:00.000Z",
+                "sourceSweepTransactionHash": "0x3636363636363636363636363636363636363636363636363636363636363636",
               },
             },
-            "recipient": "0x1111111111111111111111111111111111111111",
-            "refundAddress": "0x9999999999999999999999999999999999999999",
-            "snapshot": Any<Object>,
-            "sourceChainId": "eip155:8453",
-            "sourceTokenKey": "eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
-            "status": "active",
-            "subsidize": false,
-            "updatedAt": "2026-01-02T00:00:00.000Z",
-            "version": 1,
-          },
-          "webhook": {
-            "created": 0,
-            "type": "completed",
-            "updated": 0,
+            "providerTransactionHashes": [
+              "0x3636363636363636363636363636363636363636363636363636363636363636",
+            ],
+            "type": "pending",
           },
         }
       `,
@@ -1136,6 +2310,7 @@ describe('createTracker', () => {
 
       const reconciliation = tracker.reconcile({
         addressId: address.id,
+        trigger: 'webhook',
         type: 'funding:deposit-address:reconcile',
       })
       await providerStarted.promise
@@ -1368,9 +2543,11 @@ describe('createTracker', () => {
             {
               "createdAt": Any<String>,
               "depositAddressId": Any<String>,
+              "detectionTrigger": "poll",
               "environment": "production",
               "id": Any<String>,
               "orgId": "org_source_evidence_reconciliation",
+              "pollObservedAt": null,
               "projectId": null,
               "providerOutputAmount": null,
               "providerOutputToken": {
@@ -1453,13 +2630,16 @@ describe('createTracker', () => {
               "tempoGasPaid": null,
               "updatedAt": Any<String>,
               "version": 2,
+              "webhookReceivedAt": null,
             },
             {
               "createdAt": Any<String>,
               "depositAddressId": Any<String>,
+              "detectionTrigger": "poll",
               "environment": "production",
               "id": Any<String>,
               "orgId": "org_source_evidence_reconciliation",
+              "pollObservedAt": null,
               "projectId": null,
               "providerOutputAmount": null,
               "providerOutputToken": {
@@ -1535,6 +2715,7 @@ describe('createTracker', () => {
               "tempoGasPaid": null,
               "updatedAt": Any<String>,
               "version": 1,
+              "webhookReceivedAt": null,
             },
           ],
           "result": {
@@ -1585,8 +2766,8 @@ describe('createTracker', () => {
               {
                 createdAt: '2026-01-03T00:01:00.000Z',
                 data: {
-                  inTxs: [{ hash: sourceTransactionHash }],
-                  outTxs: [{ hash: destinationTransactionHash }],
+                  inTxs: [{ txHash: sourceTransactionHash }],
+                  outTxs: [{ txHash: destinationTransactionHash }],
                 },
                 depositAddress: { depositTxHash: sourceTransactionHash },
                 id: 'relay-multiple-transfer-request',
@@ -1679,6 +2860,7 @@ describe('createTracker', () => {
 
       const result = await tracker.reconcile({
         addressId: address.id,
+        trigger: 'webhook',
         type: 'funding:deposit-address:reconcile',
       })
       const records = (
@@ -1723,9 +2905,11 @@ describe('createTracker', () => {
             {
               "createdAt": Any<String>,
               "depositAddressId": Any<String>,
+              "detectionTrigger": "webhook",
               "environment": "production",
               "id": Any<String>,
               "orgId": "org_precision_reconciliation",
+              "pollObservedAt": null,
               "projectId": null,
               "providerOutputAmount": {
                 "baseUnits": "2000000",
@@ -1830,13 +3014,16 @@ describe('createTracker', () => {
               "tempoGasPaid": null,
               "updatedAt": Any<String>,
               "version": 3,
+              "webhookReceivedAt": null,
             },
             {
               "createdAt": Any<String>,
               "depositAddressId": Any<String>,
+              "detectionTrigger": "webhook",
               "environment": "production",
               "id": Any<String>,
               "orgId": "org_precision_reconciliation",
+              "pollObservedAt": null,
               "projectId": null,
               "providerOutputAmount": {
                 "baseUnits": "1000000",
@@ -1941,6 +3128,7 @@ describe('createTracker', () => {
               "tempoGasPaid": null,
               "updatedAt": Any<String>,
               "version": 3,
+              "webhookReceivedAt": null,
             },
           ],
           "result": {
@@ -1999,19 +3187,86 @@ describe('createTracker', () => {
 function transferLog(options: transferLog.Options) {
   return {
     address: options.token,
+    ...(options.blockNumber !== undefined
+      ? { blockNumber: `0x${options.blockNumber.toString(16)}` }
+      : {}),
     data: `0x${options.amount.toString(16).padStart(64, '0')}`,
     logIndex: `0x${(options.logIndex ?? 0).toString(16)}`,
     topics: [transferTopic, topicAddress(options.sender), topicAddress(options.recipient)],
+    ...(options.transactionHash ? { transactionHash: options.transactionHash } : {}),
   }
 }
 
 declare namespace transferLog {
   type Options = {
     amount: bigint
+    blockNumber?: number | undefined
     logIndex?: number | undefined
     recipient: string
     sender: string
     token: string
+    transactionHash?: string | undefined
+  }
+}
+
+function relayDepositLog(options: relayDepositLog.Options) {
+  const event = AbiEvent.from(
+    'event RelayErc20Deposit(address from, address token, uint256 amount, bytes32 id)',
+  )
+  return {
+    address: options.depository,
+    blockNumber: `0x${options.blockNumber.toString(16)}`,
+    data: AbiParameters.encode(event.inputs, [
+      options.from as Address.Address,
+      options.token as Address.Address,
+      options.amount,
+      options.orderId as Hex.Hex,
+    ]),
+    logIndex: '0x0',
+    topics: [AbiEvent.getSelector(event)],
+    transactionHash: options.transactionHash,
+  }
+}
+
+declare namespace relayDepositLog {
+  type Options = {
+    amount: bigint
+    blockNumber: number
+    depository: string
+    from: string
+    orderId: string
+    token: string
+    transactionHash: string
+  }
+}
+
+function rpcTransaction(options: rpcTransaction.Options) {
+  return {
+    blockHash: `0x${'39'.repeat(32)}`,
+    blockNumber: `0x${options.blockNumber.toString(16)}`,
+    from: options.from,
+    gas: '0x5208',
+    gasPrice: '0x1',
+    hash: options.hash,
+    input: options.input,
+    nonce: '0x1',
+    r: `0x${'3a'.repeat(32)}`,
+    s: `0x${'3b'.repeat(32)}`,
+    to: options.to,
+    transactionIndex: '0x0',
+    type: '0x0',
+    v: '0x1b',
+    value: '0x0',
+  }
+}
+
+declare namespace rpcTransaction {
+  type Options = {
+    blockNumber: number
+    from: string
+    hash: string
+    input: string
+    to: string
   }
 }