@forevermoney/sdk 0.5.4 → 0.5.5

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.5.5 — 2026-09-21
+
+- Discover destination off-ramps from the canonical CCIP router for the source
+  chain, retaining the configured legacy off-ramp for historical transfers.
+  Cache discovery for five minutes per provider and coalesce concurrent reads.
+- Recognise both legacy and CCIP v2 execution events and select the latest
+  execution across off-ramps. This fixes completed Finney-to-Robinhood SN80
+  deliveries remaining in the waiting state. Verified against a real delivery.
+
 ## 0.5.4 — 2026-09-21
 
 - Added the canonical Robinhood SN80 token to deployment metadata and enabled

package/dist/index.cjs

@@ -708,7 +708,8 @@ var CCIP_EXECUTION_ABI = Object.freeze([
   "event ExecutionStateChanged(uint64 indexed sourceChainSelector,uint64 indexed sequenceNumber,bytes32 indexed messageId,bytes32 messageHash,uint8 state,bytes returnData,uint256 gasUsed)"
 ]);
 var CCIP_ROUTER_ABI = Object.freeze([
-  "function isOffRamp(uint64 sourceChainSelector,address offRamp) view returns (bool)"
+  "function isOffRamp(uint64 sourceChainSelector,address offRamp) view returns (bool)",
+  "function getOffRamps() view returns ((uint64 sourceChainSelector,address offRamp)[])"
 ]);
 var foreverMoneyAbis = Object.freeze({
   alphaGateway: ALPHA_GATEWAY_ABI,
@@ -2072,6 +2073,41 @@ function bridgeMessageIdFromReceipt(direction, receipt) {
 // src/bridge/tracking.ts
 var ccipExecutionAbi = (0, import_viem11.parseAbi)(CCIP_EXECUTION_ABI);
 var alphaGatewayAbi2 = (0, import_viem11.parseAbi)(ALPHA_GATEWAY_ABI);
+var routerAbi = (0, import_viem11.parseAbi)(CCIP_ROUTER_ABI);
+var executionV2Abi = (0, import_viem11.parseAbi)([
+  "event ExecutionStateChanged(uint64 indexed sourceChainSelector,uint64 indexed sequenceNumber,bytes32 indexed messageId,uint8 state,bytes returnData)"
+]);
+var rampCache = /* @__PURE__ */ new WeakMap();
+function deliveryOffRamps(provider, client, router, selector, legacy) {
+  let cache = rampCache.get(provider);
+  if (!cache) {
+    cache = /* @__PURE__ */ new Map();
+    rampCache.set(provider, cache);
+  }
+  const key = `${router}:${selector}:${legacy}`;
+  const cached = cache.get(key);
+  if (cached && cached.expires > Date.now()) return cached.request;
+  const request = client.readContract({
+    address: router,
+    abi: routerAbi,
+    functionName: "getOffRamps"
+  }).then((ramps) => {
+    const addresses = /* @__PURE__ */ new Map([
+      [legacy.toLowerCase(), legacy]
+    ]);
+    for (const ramp of ramps) {
+      if (ramp.sourceChainSelector === selector)
+        addresses.set(ramp.offRamp.toLowerCase(), ramp.offRamp);
+    }
+    return [...addresses.values()];
+  });
+  const entry = { expires: Date.now() + 3e5, request };
+  cache.set(key, entry);
+  void request.catch(() => {
+    if (cache.get(key) === entry) cache.delete(key);
+  });
+  return request;
+}
 function destinationChainId(direction) {
   assertBridgeDirection(direction);
   const evm = getForeverMoneyEvmDeployment(
@@ -2185,13 +2221,29 @@ async function getCcipDeliveryStatus(provider, input) {
   const evmToSubtensor = isEvmToSubtensorDirection(input.direction);
   const sourceSelector = evmToSubtensor ? evm.ccipSelector : foreverMoneyDeployment.subtensor.ccipSelector;
   const offRamp = evmToSubtensor ? evmChain === "base" ? foreverMoneyDeployment.subtensor.contracts.ccipOffRampFromBase : foreverMoneyDeployment.subtensor.contracts.ccipOffRampFromRobinhood : evm.contracts.ccipOffRampFromSubtensor;
-  const logs = await client.getLogs({
-    address: offRamp,
-    fromBlock: BigInt(input.fromBlock),
-    toBlock: "latest",
-    event: ccipExecutionAbi[0],
-    args: { sourceChainSelector: sourceSelector, messageId },
-    strict: true
+  const offRamps = await deliveryOffRamps(
+    provider,
+    client,
+    evmToSubtensor ? foreverMoneyDeployment.subtensor.contracts.ccipRouter : evm.contracts.ccipRouter,
+    sourceSelector,
+    offRamp
+  );
+  const batches = await Promise.all(
+    [executionV2Abi[0], ccipExecutionAbi[0]].map(
+      (event) => client.getLogs({
+        address: offRamps.length === 1 ? offRamps[0] : [...offRamps],
+        fromBlock: BigInt(input.fromBlock),
+        toBlock: "latest",
+        event,
+        args: { sourceChainSelector: sourceSelector, messageId },
+        strict: true
+      })
+    )
+  );
+  const logs = batches.flat().sort((a, b) => {
+    const blockA = a.blockNumber ?? 0n;
+    const blockB = b.blockNumber ?? 0n;
+    return blockA === blockB ? (a.logIndex ?? 0) - (b.logIndex ?? 0) : blockA < blockB ? -1 : 1;
   });
   const latest = logs.at(-1);
   if (latest === void 0) return "waiting";