From 660dc03b47109d5e61876c15f5c2180eb231d9fa Mon Sep 17 00:00:00 2001
From: kaladinlight <35275952+kaladinlight@users.noreply.github.com>
Date: Mon, 18 May 2026 13:08:47 -0600
Subject: [PATCH] chore(swap-service): use relayTokenToAssetId from
 @shapeshiftoss/swapper

Replaces inline assetId construction with the canonical helper from the
swapper package (bumped to 17.7.3), which handles non-EVM chains and
Relay's chain-id mapping correctly. Adds the function to the test mock.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../src/verification/__tests__/setup.ts       |  6 +++++
 .../verification/swap-verification.service.ts | 22 +++++++++++--------
 apps/swap-service/src/verification/types.ts   | 10 ++++-----
 package.json                                  |  2 +-
 yarn.lock                                     | 10 ++++-----
 5 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/apps/swap-service/src/verification/__tests__/setup.ts b/apps/swap-service/src/verification/__tests__/setup.ts
index 15f955b..cd35b37 100644
--- a/apps/swap-service/src/verification/__tests__/setup.ts
+++ b/apps/swap-service/src/verification/__tests__/setup.ts
@@ -60,4 +60,10 @@ jest.mock('@shapeshiftoss/swapper', () => ({
   },
   assertGetCowNetwork: jest.fn(),
   getTreasuryAddressFromChainId: jest.fn(),
+  relayTokenToAssetId: (token: { chainId: number; address: string }) => {
+    const isNative = token.address.toLowerCase() === '0x0000000000000000000000000000000000000000'
+    return isNative
+      ? `eip155:${token.chainId}/slip44:60`
+      : `eip155:${token.chainId}/erc20:${token.address.toLowerCase()}`
+  },
 }))
diff --git a/apps/swap-service/src/verification/swap-verification.service.ts b/apps/swap-service/src/verification/swap-verification.service.ts
index b72a86d..1e0db47 100644
--- a/apps/swap-service/src/verification/swap-verification.service.ts
+++ b/apps/swap-service/src/verification/swap-verification.service.ts
@@ -4,7 +4,12 @@ import { Injectable, Logger } from '@nestjs/common'
 import { firstValueFrom } from 'rxjs'
 
 import { SwapVerificationResult } from '@shapeshift/shared-types'
-import { assertGetCowNetwork, getTreasuryAddressFromChainId, SwapperName } from '@shapeshiftoss/swapper'
+import {
+  assertGetCowNetwork,
+  getTreasuryAddressFromChainId,
+  relayTokenToAssetId,
+  SwapperName,
+} from '@shapeshiftoss/swapper'
 
 import { env } from '../env'
 import type { Swap } from '../swaps/types'
@@ -179,18 +184,17 @@ export class SwapVerificationService {
 
     // Relay's appFeeCurrencyObject is the source of truth for which asset the affiliate fee was paid in —
     // it can be the sell asset, the buy asset, or neither, depending on the route.
-    // TODO: replace with `relayTokenToAssetId` from `@shapeshiftoss/swapper`
     const actualAffiliateFeeAssetId = (() => {
       if (!shapeshiftFee) return
 
-      const chainId = request.data.appFeeCurrencyObject?.chainId
-      const address = request.data.appFeeCurrencyObject?.address?.toLowerCase()
-
-      if (!chainId || !address) return
-
-      const isNative = address === '0x0000000000000000000000000000000000000000'
+      const currency = request.data.appFeeCurrencyObject
+      if (!currency) return
 
-      return isNative ? `eip155:${chainId}/slip44:60` : `eip155:${chainId}/erc20:${address}`
+      try {
+        return relayTokenToAssetId(currency)
+      } catch {
+        return
+      }
     })()
 
     const actualAffiliateFeeUsd = await (async () => {
diff --git a/apps/swap-service/src/verification/types.ts b/apps/swap-service/src/verification/types.ts
index 69b5054..38ee315 100644
--- a/apps/swap-service/src/verification/types.ts
+++ b/apps/swap-service/src/verification/types.ts
@@ -57,11 +57,11 @@ interface RelayAppFee {
 }
 
 interface RelayToken {
-  chainId?: number
-  address?: string
-  symbol?: string
-  name?: string
-  decimals?: number
+  chainId: number
+  address: string
+  symbol: string
+  name: string
+  decimals: number
 }
 
 interface RelayCurrencyAmount {
diff --git a/package.json b/package.json
index ff1e155..f73a20e 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@pulumi/pulumi": "3.160.0",
     "@shapeshiftoss/caip": "8.16.7",
     "@shapeshiftoss/chain-adapters": "11.3.9",
-    "@shapeshiftoss/swapper": "17.7.0",
+    "@shapeshiftoss/swapper": "17.7.3",
     "@shapeshiftoss/types": "8.6.7",
     "@shapeshiftoss/unchained-client": "10.14.10",
     "@shapeshiftoss/unchained-pulumi": "1.0.2",
diff --git a/yarn.lock b/yarn.lock
index d818c25..d53f0fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5473,9 +5473,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@shapeshiftoss/swapper@npm:17.7.0":
-  version: 17.7.0
-  resolution: "@shapeshiftoss/swapper@npm:17.7.0"
+"@shapeshiftoss/swapper@npm:17.7.3":
+  version: 17.7.3
+  resolution: "@shapeshiftoss/swapper@npm:17.7.3"
   dependencies:
     "@arbitrum/sdk": "npm:^4.0.1"
     "@avnu/avnu-sdk": "npm:^4.0.1"
@@ -5512,7 +5512,7 @@ __metadata:
     retry-axios: "npm:^2.6.0"
     uuid: "npm:^9.0.0"
     viem: "npm:2.43.5"
-  checksum: 10/488518817eec6f91b5c8d7f712a7d5e5c815f8caa6439757faea00b9456056fb309b4d7e4c2eb92ebf90f989093f7e34b56affaaaeffd59ce878b13dc604933f
+  checksum: 10/8c91468552e92bd64efa4a230c1c1c80b3dcabaccb787ce9f52cb4de76f918e9e284695bd1a0411d5e5ded2e4ce630884277388ac62bee08a449a0a8e4506926
   languageName: node
   linkType: hard
 
@@ -16987,7 +16987,7 @@ __metadata:
     "@pulumi/pulumi": "npm:3.160.0"
     "@shapeshiftoss/caip": "npm:8.16.7"
     "@shapeshiftoss/chain-adapters": "npm:11.3.9"
-    "@shapeshiftoss/swapper": "npm:17.7.0"
+    "@shapeshiftoss/swapper": "npm:17.7.3"
     "@shapeshiftoss/types": "npm:8.6.7"
     "@shapeshiftoss/unchained-client": "npm:10.14.10"
     "@shapeshiftoss/unchained-pulumi": "npm:1.0.2"