chore: sync private to v1.1055.0 (#12728)

Author: kaladinlight

packages/public-api/src/env.ts

@@ -84,7 +84,7 @@ const envSchema = z.object({
   BOB_GATEWAY_API_KEY: z.string().default(''),
   CHAINFLIP_API_KEY: z.string().min(1),
   NEAR_INTENTS_API_KEY: z.string().min(1),
-  RELAY_API_KEY: z.string().default(''),
+  RELAY_API_KEY: z.string().min(1),
   TRON_GRID_API_KEY: z.string().default(''),
 
   // Feature flags

packages/swapper/src/swappers/BebopSwapper/utils/fetchFromBebop.ts

@@ -15,6 +15,12 @@ import { chainIdToBebopChain } from '../types'
 import { bebopServiceFactory } from './bebopService'
 import { assetIdToBebopSolanaToken, assetIdToBebopToken } from './helpers'
 
+// PMM charges the fee set against our api key, which nets exactly this bps
+const BEBOP_PMM_AFFILIATE_BPS = '60'
+
+const isPmmEligible = (affiliateBps: string | undefined) =>
+  bnOrZero(affiliateBps).eq(BEBOP_PMM_AFFILIATE_BPS)
+
 export const fetchBebopQuote = async ({
   buyAsset,
   sellAsset,
@@ -53,31 +59,32 @@ export const fetchBebopQuote = async ({
       approval_type: 'Standard',
       skip_validation: 'true',
       gasless: 'false',
-      // PMM fees are configured against our api key on Bebop's side, not sent per quote
       source: 'shapeshift',
     }
 
     const jamParams = new URLSearchParams(baseParams)
-    const pmmParams = new URLSearchParams(baseParams)
 
-    // JAM settles the fee on-chain, so it still takes our bps and a recipient per quote
-    if (affiliateBps && affiliateBps !== '0') {
-      jamParams.set('fee', affiliateBps)
-      jamParams.set('fee_recipient', getAddress(getTreasuryAddressFromChainId(buyAsset.chainId)))
-    }
+    // Without an explicit fee JAM charges our api key's flat fee, so 1 bps is the lowest it can go
+    jamParams.set('fee', affiliateBps && bnOrZero(affiliateBps).gt(0) ? affiliateBps : '1')
+    jamParams.set('fee_recipient', getAddress(getTreasuryAddressFromChainId(buyAsset.chainId)))
 
     const service = bebopServiceFactory({ apiKey })
 
-    const [maybeJam, maybePmm] = await Promise.all([
+    const requests = [
       service.get<BebopQuoteResponse>(`https://api.bebop.xyz/jam/${chainName}/v2/quote`, {
         params: jamParams,
       }),
-      service.get<BebopQuoteResponse>(`https://api.bebop.xyz/pmm/${chainName}/v3/quote`, {
-        params: pmmParams,
-      }),
-    ])
+    ]
 
-    const maybeResponses = [maybeJam, maybePmm]
+    if (isPmmEligible(affiliateBps)) {
+      requests.push(
+        service.get<BebopQuoteResponse>(`https://api.bebop.xyz/pmm/${chainName}/v3/quote`, {
+          params: new URLSearchParams(baseParams),
+        }),
+      )
+    }
+
+    const maybeResponses = await Promise.all(requests)
 
     if (maybeResponses.every(maybeResponse => maybeResponse.isErr())) {
       return Err(
@@ -129,6 +136,7 @@ export const fetchBebopSolanaQuote = async ({
   takerAddress,
   receiverAddress,
   slippageTolerancePercentageDecimal,
+  affiliateBps,
   apiKey,
 }: {
   buyAsset: Asset
@@ -137,9 +145,19 @@ export const fetchBebopSolanaQuote = async ({
   takerAddress: string
   receiverAddress: string
   slippageTolerancePercentageDecimal: string
+  affiliateBps?: string
   apiKey: string
 }): Promise<Result<BebopSolanaQuoteResponse, SwapErrorRight>> => {
   try {
+    if (!isPmmEligible(affiliateBps)) {
+      return Err(
+        makeSwapErrorRight({
+          message: 'Bebop Solana is PMM only and cannot take the requested bps',
+          code: TradeQuoteError.NoRouteFound,
+        }),
+      )
+    }
+
     // Bebop's Solana routes don't wrap native SOL on the input side, so selling native SOL
     // always fails on-chain. Reject up front instead of returning an unexecutable quote.
     if (sellAsset.assetId === solAssetId) {
@@ -166,7 +184,6 @@ export const fetchBebopSolanaQuote = async ({
       approval_type: 'Standard',
       skip_validation: 'false',
       gasless: 'true',
-      // Solana is PMM only, so its fees are configured against our api key on Bebop's side
       source: 'shapeshift',
     })
 

packages/swapper/src/swappers/BebopSwapper/utils/getBebopSolanaTradeContext.ts

@@ -50,6 +50,7 @@ export const getBebopSolanaTradeContext = async ({
     takerAddress,
     receiverAddress,
     slippageTolerancePercentageDecimal,
+    affiliateBps,
     apiKey: deps.config.VITE_BEBOP_API_KEY,
   })
 

packages/swapper/src/swappers/PortalsSwapper/endpoints.ts

@@ -85,7 +85,7 @@ export const portalsApi: SwapperApi = {
 
         return {
           status: txStatus,
-          buyTxHash: relayRequest.data?.outTxs?.[0]?.hash,
+          buyTxHash: relayRequest.data?.outTxs?.[0]?.txHash,
           message:
             txStatus === TxStatus.Failed
               ? getRelayRequestFailureMessage(relayRequest)
@@ -94,6 +94,8 @@ export const portalsApi: SwapperApi = {
               : 'Bridge in progress',
         }
       }
+    } else {
+      console.error('Failed to fetch relay request:', relayResult.unwrapErr())
     }
 
     const axelarscanResult = await fetchAxelarscanBridgeStatus(txHash)

packages/swapper/src/swappers/RelaySwapper/utils/relayStatus.ts

@@ -32,7 +32,7 @@ export const fetchRelayRequestByTxHash = async (
   config: SwapperConfig,
 ): Promise<Result<RelayRequest | undefined, SwapErrorRight>> => {
   const maybeResponse = await relayService.get<{ requests?: RelayRequest[] }>(
-    `${config.VITE_RELAY_API_URL}/requests/v2?hash=${txHash}`,
+    `${config.VITE_RELAY_API_URL}/requests/v3?depositTxHash=${txHash}`,
     getRelayRequestConfig(config),
   )
 
@@ -41,15 +41,15 @@ export const fetchRelayRequestByTxHash = async (
     ({ data }) =>
       data.requests?.find(
         ({ data: request }) =>
-          request?.inTxs?.some(({ hash }) => hash?.toLowerCase() === txHash.toLowerCase()),
+          request?.inTxs?.some(({ txHash: hash }) => hash?.toLowerCase() === txHash.toLowerCase()),
       ),
   )
 }
 
 export const getRelayRequestFailureMessage = (request: RelayRequest): string => {
   const { failReason, refundFailReason } = request.data ?? {}
 
-  // Relay report 'N/A' rather than omitting the reason when there isn't one
+  // Relay can report 'N/A' rather than null when there isn't one
   const reason = [failReason, refundFailReason].find(value => value && value !== 'N/A')
 
   return reason ?? 'Bridge failed'

packages/swapper/src/swappers/RelaySwapper/utils/types.ts

@@ -33,18 +33,18 @@ export type RelayMetadata = {
 }
 
 export type RelayRequestTransaction = {
-  hash?: string
+  txHash?: string
   chainId?: number
 }
 
 export type RelayRequestData = {
-  failReason?: string
-  refundFailReason?: string
+  failReason?: string | null
+  refundFailReason?: string | null
   inTxs?: RelayRequestTransaction[]
   outTxs?: RelayRequestTransaction[]
 }
 
-// A single entry of the /requests/v2 listing, keyed by origin tx hash
+// A single entry of the /requests/v3 listing, keyed by origin tx hash
 export type RelayRequest = {
   status?: RelayStatus['status']
   data?: RelayRequestData

src/config.ts

@@ -240,7 +240,7 @@ const validators = {
   VITE_FEATURE_THORCHAIN_TCY_WIDGET: bool({ default: false }),
   VITE_FEATURE_THORCHAIN_TCY_ACTIVITY: bool({ default: false }),
   VITE_RELAY_API_URL: url(),
-  VITE_RELAY_API_KEY: str({ default: '' }),
+  VITE_RELAY_API_KEY: str(),
   VITE_COINCAP_API_KEY: str(),
   VITE_FEATURE_MAYA_SWAP: bool({ default: false }),
   VITE_FEATURE_BUTTERSWAP: bool({ default: false }),

src/pages/RFOX/constants.ts

@@ -25,7 +25,7 @@ export const unstakeEvent = getAbiItem({ abi: RFOX_ABI, name: 'Unstake' })
 
 export const IPFS_GATEWAY = 'https://gateway.pinata.cloud/ipfs'
 
-export const CURRENT_EPOCH_IPFS_HASH = 'bafkreib3ftdt4rhq4fapplsyesyzyorayvnc3a4csdmmbzbaim6tb3gndi'
+export const CURRENT_EPOCH_IPFS_HASH = 'bafkreifcvn6ofyeychliwcrtvdbmxix3wcp6fgzcute4c3zkr3eiqo7gqm'
 export const STUB_RUNE_ADDRESS = 'thor1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqn8p0r8'
 export const RFOX_V3_UPGRADE_EPOCH = 18