fix(deps): bump @shapeshiftoss packages and read swapperMetadata

apps/swap-service/.env.example

@@ -7,6 +7,8 @@ SERVICE_API_KEY=
 VITE_BEBOP_API_KEY=
 VITE_CHAINFLIP_API_KEY=
 VITE_NEAR_INTENTS_API_KEY=
+VITE_RELAY_API_KEY=
+VITE_ACROSS_API_KEY=
 
 # Database Configuration
 DATABASE_URL="postgresql://postgres:password@db:5432/microservices"

apps/swap-service/src/env.ts

@@ -17,6 +17,8 @@ const schema = z.object({
   VITE_BEBOP_API_KEY: z.string().min(1),
   VITE_NEAR_INTENTS_API_KEY: z.string().min(1),
   VITE_CHAINFLIP_API_KEY: z.string().min(1),
+  VITE_RELAY_API_KEY: z.string().min(1),
+  VITE_ACROSS_API_KEY: z.string().min(1),
 
   // Database
   DATABASE_URL: z.string().min(1),

apps/swap-service/src/swaps/swapper-config.ts

@@ -13,6 +13,7 @@ import type { TronChainAdapterService } from '../lib/chain-adapters/tron.service
 import type { UtxoChainAdapterService } from '../lib/chain-adapters/utxo.service'
 
 export const getSwapperConfig = (): SwapperConfig => ({
+  VITE_ACROSS_API_KEY: env.VITE_ACROSS_API_KEY,
   VITE_ACROSS_API_URL: env.VITE_ACROSS_API_URL,
   VITE_ACROSS_INTEGRATOR_ID: '',
   VITE_BEBOP_API_KEY: env.VITE_BEBOP_API_KEY,
@@ -28,11 +29,9 @@ export const getSwapperConfig = (): SwapperConfig => ({
   VITE_MAYACHAIN_NODE_URL: env.VITE_MAYACHAIN_NODE_URL,
   VITE_NEAR_INTENTS_API_KEY: env.VITE_NEAR_INTENTS_API_KEY,
   VITE_PORTALS_BASE_URL: env.VITE_PORTALS_BASE_URL,
+  VITE_RELAY_API_KEY: env.VITE_RELAY_API_KEY,
   VITE_RELAY_API_URL: env.VITE_RELAY_API_URL,
   VITE_SUI_NODE_URL: env.VITE_SUI_NODE_URL,
-  VITE_TENDERLY_ACCOUNT_SLUG: '',
-  VITE_TENDERLY_API_KEY: '',
-  VITE_TENDERLY_PROJECT_SLUG: '',
   VITE_THORCHAIN_MIDGARD_URL: env.VITE_THORCHAIN_MIDGARD_URL,
   VITE_THORCHAIN_NODE_URL: env.VITE_THORCHAIN_NODE_URL,
   VITE_TRON_GRID_API_KEY: '',

apps/swap-service/src/swaps/types.ts

@@ -2,7 +2,7 @@ import type { Prisma, Swap as PrismaSwap } from '@prisma/client'
 import { Type } from 'class-transformer'
 import { IsInt, IsOptional, IsString, Max, Min } from 'class-validator'
 
-import type { SwapperName, SwapperSpecificMetadata } from '@shapeshiftoss/swapper'
+import type { SwapMetadata, SwapperName } from '@shapeshiftoss/swapper'
 import type { Asset } from '@shapeshiftoss/types'
 
 export type Swap = Omit<
@@ -12,7 +12,7 @@ export type Swap = Omit<
   sellAsset: Asset
   buyAsset: Asset
   swapperName: SwapperName
-  metadata: SwapperSpecificMetadata
+  metadata: SwapMetadata
   affiliateVerificationDetails: AffiliateVerificationDetails | null
 }
 

apps/swap-service/src/swaps/utils.ts

@@ -5,7 +5,7 @@ import type { CreateSwapDto } from '@shapeshift/shared-types'
 import { baseUnitToPrecision } from '@shapeshift/shared-utils'
 import { mayachainAssetId, thorchainAssetId } from '@shapeshiftoss/caip'
 import { bnOrZero } from '@shapeshiftoss/chain-adapters'
-import type { Swap as SwapperSwap, SwapperName, SwapperSpecificMetadata } from '@shapeshiftoss/swapper'
+import type { Swap as SwapperSwap, SwapMetadata, SwapperName } from '@shapeshiftoss/swapper'
 import type { Asset } from '@shapeshiftoss/types'
 
 import { getAssetPriceUsd } from '../utils/pricing'
@@ -37,7 +37,7 @@ export const toSwap = (swap: PrismaSwap): Swap => ({
   swapperName: swap.swapperName as SwapperName,
   sellAsset: swap.sellAsset as Asset,
   buyAsset: swap.buyAsset as Asset,
-  metadata: swap.metadata as SwapperSpecificMetadata,
+  metadata: swap.metadata as SwapMetadata,
   affiliateVerificationDetails: toAffiliateVerificationDetails(swap.affiliateVerificationDetails),
 })
 

apps/swap-service/src/verification/__tests__/fixtures/mayachain/swap.ts

@@ -57,13 +57,10 @@ export default {
   metadata: {
     quoteId: '562f173c-1515-4a4e-bf6b-cd1b35a9db1f',
     stepIndex: 0,
-    acrossTransactionMetadata: undefined,
-    chainflipSwapId: undefined,
-    debridgeTransactionMetadata: undefined,
-    relayerExplorerTxLink: undefined,
-    relayerTxHash: undefined,
-    relayTransactionMetadata: undefined,
-    streamingSwapMetadata: undefined,
+    swapperMetadata: {
+      name: 'mayachain',
+      maxStreamingQuantity: undefined,
+    },
   },
   userId: 'api',
   referralCode: null,

apps/swap-service/src/verification/__tests__/fixtures/near/swap.ts

@@ -51,18 +51,10 @@ export default {
   metadata: {
     quoteId: '6785cf2e-683b-4335-9050-eab792045af6',
     stepIndex: 0,
-    nearIntentsSpecific: {
-      deadline: '2026-04-28T17:52:55.658Z',
-      timeEstimate: 52,
+    swapperMetadata: {
+      name: 'nearIntents',
       depositAddress: '0xE08B3621624e6CA17B8F19a854fc5D6f14CAa120',
     },
-    acrossTransactionMetadata: undefined,
-    chainflipSwapId: undefined,
-    debridgeTransactionMetadata: undefined,
-    relayerExplorerTxLink: undefined,
-    relayerTxHash: undefined,
-    relayTransactionMetadata: undefined,
-    streamingSwapMetadata: undefined,
   },
   userId: 'api',
   referralCode: null,

apps/swap-service/src/verification/__tests__/fixtures/relay/swap.ts

@@ -51,22 +51,11 @@ export default {
   metadata: {
     quoteId: '5d674878-548f-4f36-8b50-dcb41ef1b0c0',
     stepIndex: 0,
-    relayTransactionMetadata: {
-      to: '0xb92fe925dc43a0ecde6c8b1a2709c170ec4fff4f',
-      data: '0xcd6e13f70000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000001e00000000000000000000000000000000000000000000000000000000000000a60000000000000000000000000b92fe925dc43a0ecde6c8b1a2709c170ec4fff4f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c4a6bd8c9600000000000000000000000000000000000000000000000000000600aea7d000000000000000000000000000f70da97812cb96acdf810712aa562db8dfa3dbef000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000215f30ab2f9dc7b36f0c2af18173c477fb716e7a8bb74912435b01ae52307536ee0100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ff3684f28c67538d4d072c2273400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003877df61eb000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000007c42213bc0b0000000000000000000000007f54f05635d15cde17a49502fedb9d1803a3be8a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003877df61eb0000000000000000000000000007f54f05635d15cde17a49502fedb9d1803a3be8a00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000006e41fff991f000000000000000000000000b92fe925dc43a0ecde6c8b1a2709c170ec4fff4f000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000000000000000000000000000000000000022552800000000000000000000000000000000000000000000000000000000000000a03d98144ca848477bf71835710af43c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000003a000000000000000000000000000000000000000000000000000000000000005600000000000000000000000000000000000000000000000000000000000000044bd01c2260000000000000000000000000000000000000000000000000000000069f0ff0f0000000000000000000000000000000000000000000000000003877df61eb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010438c9c147000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee0000000000000000000000000000000000000000000000000000000000002710000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000024d0e30db000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010438c9c147000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000002710000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000242e1a7d4d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000184f61460f90000000000000000000000007f54f05635d15cde17a49502fedb9d1803a3be8a000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee000000000000000000000000000000000000000000000000000000000000271000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000ffffffffffffffc5000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000043271000000000400065a8177fae2701a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48517e506700271aea091b02f42756f5e174af5230000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008434ee90ca000000000000000000000000f5c4f3dc02c3fb9279495a8fef7b0741da956157000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000000000000000000000000000000000000022ad960000000000000000000000000000000000000000000000000000000000002710000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b92fe925dc43a0ecde6c8b1a2709c170ec4fff4f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001a49bb43718000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000000001000000000000000000000000a44c286ba83bb771cd0107b2c1df678435bd15350000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000215f30ab2f9dc7b36f0c2af18173c477fb716e7a8bb74912435b01ae52307536ee00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000215f30ab2f9dc7b36f0c2af18173c477fb716e7a8bb74912435b01ae52307536ee0000000000000000000000000000000000000000000000000000000000000000ee63570325ea10b53421947bb8a7e617bf774c37181fa2c0f63b7cd9f2ba03f5',
-      from: '0xA44C286BA83Bb771cd0107B2c1Df678435Bd1535',
-      value: '1000000000000000',
+    swapperMetadata: {
+      name: 'relay',
       relayId: '0xee63570325ea10b53421947bb8a7e617bf774c37181fa2c0f63b7cd9f2ba03f5',
-      orderId: undefined,
-      gasLimit: '382740',
+      data: '0xcd6e13f70000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d600000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000001e00000000000000000000000000000000000000000000000000000000000000a60000000000000000000000000b92fe925dc43a0ecde6c8b1a2709c170ec4fff4f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c4a6bd8c9600000000000000000000000000000000000000000000000000000600aea7d000000000000000000000000000f70da97812cb96acdf810712aa562db8dfa3dbef000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000215f30ab2f9dc7b36f0c2af18173c477fb716e7a8bb74912435b01ae52307536ee0100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ff3684f28c67538d4d072c2273400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003877df61eb000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000007c42213bc0b0000000000000000000000007f54f05635d15cde17a49502fedb9d1803a3be8a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003877df61eb0000000000000000000000000007f54f05635d15cde17a49502fedb9d1803a3be8a00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000006e41fff991f000000000000000000000000b92fe925dc43a0ecde6c8b1a2709c170ec4fff4f000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000000000000000000000000000000000000022552800000000000000000000000000000000000000000000000000000000000000a03d98144ca848477bf71835710af43c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000003a000000000000000000000000000000000000000000000000000000000000005600000000000000000000000000000000000000000000000000000000000000044bd01c2260000000000000000000000000000000000000000000000000000000069f0ff0f0000000000000000000000000000000000000000000000000003877df61eb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010438c9c147000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee0000000000000000000000000000000000000000000000000000000000002710000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000024d0e30db000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010438c9c147000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000002710000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000242e1a7d4d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000184f61460f90000000000000000000000007f54f05635d15cde17a49502fedb9d1803a3be8a000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee000000000000000000000000000000000000000000000000000000000000271000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000ffffffffffffffc5000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000043271000000000400065a8177fae2701a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48517e506700271aea091b02f42756f5e174af5230000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008434ee90ca000000000000000000000000f5c4f3dc02c3fb9279495a8fef7b0741da956157000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000000000000000000000000000000000000022ad960000000000000000000000000000000000000000000000000000000000002710000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b92fe925dc43a0ecde6c8b1a2709c170ec4fff4f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001a49bb43718000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000000001000000000000000000000000a44c286ba83bb771cd0107b2c1df678435bd15350000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000215f30ab2f9dc7b36f0c2af18173c477fb716e7a8bb74912435b01ae52307536ee00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000215f30ab2f9dc7b36f0c2af18173c477fb716e7a8bb74912435b01ae52307536ee0000000000000000000000000000000000000000000000000000000000000000ee63570325ea10b53421947bb8a7e617bf774c37181fa2c0f63b7cd9f2ba03f5',
     },
-    acrossTransactionMetadata: undefined,
-    chainflipSwapId: undefined,
-    debridgeTransactionMetadata: undefined,
-    relayerExplorerTxLink: undefined,
-    relayerTxHash: undefined,
-    streamingSwapMetadata: undefined,
-    nearIntentsSpecific: undefined,
   },
   userId: 'api',
   referralCode: null,

apps/swap-service/src/verification/__tests__/fixtures/thorchain/swap.ts

@@ -57,13 +57,10 @@ export default {
   metadata: {
     quoteId: 'ca88e6ef-ca09-4848-98a6-1bd18e36fc81',
     stepIndex: 0,
-    acrossTransactionMetadata: undefined,
-    chainflipSwapId: undefined,
-    debridgeTransactionMetadata: undefined,
-    relayerExplorerTxLink: undefined,
-    relayerTxHash: undefined,
-    relayTransactionMetadata: undefined,
-    streamingSwapMetadata: undefined,
+    swapperMetadata: {
+      name: 'thorchain',
+      maxStreamingQuantity: undefined,
+    },
   },
   userId: 'api',
   referralCode: null,