tapimo 0.8.0 → 0.9.0

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

@@ -17,6 +17,7 @@ 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)')
@@ -1506,7 +1507,7 @@ describe('createTracker', () => {
     }
   })
 
-  test('completes subsidized Relay delivery from authenticated chain evidence', async () => {
+  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)}`
@@ -1548,8 +1549,10 @@ describe('createTracker', () => {
       histogram() {},
     })
     const rpcMethods: string[] = []
-    let correlated = false
+    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)
@@ -1571,26 +1574,23 @@ describe('createTracker', () => {
                   ],
                 }
               : {
-                  requests: [
-                    {
-                      createdAt: '2026-01-04T00:01:00.000Z',
-                      data: { outTxs: [] },
-                      depositAddress: { depositTxHash: sourceTransactionHash },
-                      id: 'relay-observed-request',
-                      ...(() => {
-                        if (!correlated) return {}
-                        return {
+                  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',
-                    },
-                  ],
+                          status: 'pending',
+                          updatedAt: '2026-01-04T00:02:00.000Z',
+                        },
+                      ]
+                    : [],
                 },
           ),
         )
@@ -1614,10 +1614,14 @@ describe('createTracker', () => {
                 blockNumber: 0xf0,
                 from: solver,
                 hash: destinationTransactionHash,
-                input: AbiFunction.encodeData(
-                  AbiFunction.from('function transfer(address recipient,uint256 amount)'),
-                  [route.recipient as Address.Address, 1_000_000n],
-                ),
+                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({
@@ -1657,15 +1661,19 @@ describe('createTracker', () => {
           const filter = parameter as { address?: string | undefined }
           if (filter.address?.toLowerCase() === depository.toLowerCase())
             return [
-              relayDepositLog({
-                amount: 1_000_000n,
-                blockNumber: 0x81,
-                depository,
-                from: refundAddress,
-                orderId: ambiguousOrderId,
-                token: route.sourceToken.address,
-                transactionHash: ambiguousSweepTransactionHash,
-              }),
+              ...(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,
@@ -1747,6 +1755,50 @@ describe('createTracker', () => {
         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 (...parameters) => {
@@ -1757,25 +1809,30 @@ describe('createTracker', () => {
         providers: [provider],
         verifyTransfers: Evidence.createVerifier({ db }),
       })
-      const message = {
+      const pending = await tracker.reconcile({
         addressId: address.id,
-        requestId: 'relay-observed-request',
-        trigger: 'webhook',
+        trigger: 'chain',
         type: 'funding:deposit-address:reconcile',
-      } satisfies Provider.Webhook.receive.Dispatchable
-      const pending = await tracker.reconcile(message)
-      const [followUp] = dispatches
-      if (!followUp) throw new Error('Expected a delivery follow-up message.')
-      correlated = true
+      })
+      const [deliveryFollowUp] = dispatches
+      if (!deliveryFollowUp) throw new Error('Expected a delivery follow-up message.')
       delivered = true
-      const completed = await tracker.reconcile(followUp[0])
+      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,
       })
 
       expect({
+        ambiguousObservation,
+        attributed,
         completed,
+        completedRecord,
         counts,
         dispatches: dispatches.map(([message, dispatchOptions]) => [
           { ...message, addressId: '<address-id>' },
@@ -1784,6 +1841,8 @@ describe('createTracker', () => {
         pending,
         record,
         rpcMethods,
+        sourceObservation: observed.type,
+        uncorrelatedObservation,
       }).toMatchInlineSnapshot(
         {
           record: {
@@ -1793,14 +1852,144 @@ describe('createTracker', () => {
             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) },
+            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",
@@ -1811,37 +2000,47 @@ describe('createTracker', () => {
               },
             ],
             [
-              "funding_deposit_detection_count",
+              "funding_deposit_reconciliation_count",
               1,
               {
+                "outcome": "follow_up_enqueued",
                 "provider": "relay",
-                "trigger": "webhook",
+                "trigger": "chain",
               },
             ],
             [
               "funding_deposit_reconciliation_count",
               1,
               {
-                "outcome": "follow_up_enqueued",
+                "outcome": "completed",
+                "provider": "relay",
+                "trigger": "chain",
+              },
+            ],
+            [
+              "funding_deposit_delivery_observation_count",
+              1,
+              {
+                "outcome": "verified",
                 "provider": "relay",
-                "trigger": "webhook",
               },
             ],
             [
               "funding_deposit_reconciliation_count",
               1,
               {
-                "outcome": "completed",
+                "outcome": "follow_up_enqueued",
                 "provider": "relay",
-                "trigger": "webhook",
+                "trigger": "chain",
               },
             ],
             [
-              "funding_deposit_delivery_observation_count",
+              "funding_deposit_reconciliation_count",
               1,
               {
-                "outcome": "verified",
+                "outcome": "completed",
                 "provider": "relay",
+                "trigger": "chain",
               },
             ],
             [
@@ -1850,7 +2049,7 @@ describe('createTracker', () => {
               {
                 "outcome": "completed",
                 "provider": "relay",
-                "trigger": "webhook",
+                "trigger": "chain",
               },
             ],
           ],
@@ -1862,8 +2061,21 @@ describe('createTracker', () => {
                   "attempt": 0,
                   "kind": "delivery",
                 },
-                "requestId": "relay-observed-request",
-                "trigger": "webhook",
+                "trigger": "chain",
+                "type": "funding:deposit-address:reconcile",
+              },
+              {
+                "delaySeconds": 1,
+              },
+            ],
+            [
+              {
+                "addressId": "<address-id>",
+                "followUp": {
+                  "attempt": 0,
+                  "kind": "provider",
+                },
+                "trigger": "chain",
                 "type": "funding:deposit-address:reconcile",
               },
               {
@@ -1872,14 +2084,14 @@ describe('createTracker', () => {
             ],
           ],
           "pending": {
-            "created": 1,
+            "created": 0,
             "type": "completed",
             "updated": 1,
           },
           "record": {
             "createdAt": Any<String>,
             "depositAddressId": Any<String>,
-            "detectionTrigger": "webhook",
+            "detectionTrigger": "chain",
             "environment": "production",
             "id": Any<String>,
             "orgId": "org_delivery_observation",
@@ -1961,7 +2173,7 @@ describe('createTracker', () => {
               },
               "recipient": "0x1111111111111111111111111111111111111111",
               "refundAddress": "0x3838383838383838383838383838383838383838",
-              "sender": "0x3c3c3c3c3c3c3c3c3c3c3c3c3c3c3c3c3c3c3c3c",
+              "sender": "0x3838383838383838383838383838383838383838",
               "sourceAmount": {
                 "baseUnits": "1000000",
                 "currency": "USD",
@@ -1996,16 +2208,21 @@ describe('createTracker', () => {
             "subsidyAmount": null,
             "tempoGasPaid": null,
             "updatedAt": Any<String>,
-            "version": 5,
+            "version": 4,
             "webhookReceivedAt": null,
           },
           "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",
@@ -2015,10 +2232,31 @@ describe('createTracker', () => {
             "eth_getTransactionByHash",
             "eth_blockNumber",
             "eth_getLogs",
+            "eth_getTransactionReceipt",
+            "eth_blockNumber",
+            "eth_blockNumber",
+            "eth_getLogs",
             "eth_getTransactionByHash",
             "eth_getTransactionReceipt",
             "eth_blockNumber",
+            "eth_getTransactionReceipt",
+            "eth_blockNumber",
           ],
+          "sourceObservation": "created",
+          "uncorrelatedObservation": {
+            "providerState": {
+              "relay": {
+                "orderId": "0x3434343434343434343434343434343434343434343434343434343434343434",
+                "sourceDepository": "0x3232323232323232323232323232323232323232",
+                "sourceObservedAt": "2026-01-04T00:03:00.000Z",
+                "sourceSweepTransactionHash": "0x3636363636363636363636363636363636363636363636363636363636363636",
+              },
+            },
+            "providerTransactionHashes": [
+              "0x3636363636363636363636363636363636363636363636363636363636363636",
+            ],
+            "type": "pending",
+          },
         }
       `,
       )