@funkit/fun-relay 2.1.16-next.2 → 2.2.0-next.4

package/dist/index.mjs

@@ -34,6 +34,8 @@ var FUN_SOLANA_CHAIN_ID_NUMBER = 1151111081099710;
 var FUN_HYPERCORE_CHAIN_ID_NUMBER = 1337;
 var RELAY_LIGHTER_CHAIN_ID_NUMBER = 3586256;
 var RELAY_LIGHTER_CHAIN_ID = `${RELAY_LIGHTER_CHAIN_ID_NUMBER}`;
+var RELAY_TRON_CHAIN_ID_NUMBER = 728126428;
+var RELAY_TRON_CHAIN_ID = `${RELAY_TRON_CHAIN_ID_NUMBER}`;
 var FUNKIT_NATIVE_TOKEN = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
 var RELAY_NATIVE_TOKEN = "0x0000000000000000000000000000000000000000";
 var RELAY_NATIVE_TOKEN_HYPERCORE = "0x00000000000000000000000000000000";
@@ -167,6 +169,15 @@ function indexBy(items, getKey) {
   }
   return indexedItems;
 }
+function filterNullishHeaders(params) {
+  const result = {};
+  for (const [key, value] of Object.entries(params)) {
+    if (value != null) {
+      result[key] = value;
+    }
+  }
+  return result;
+}
 
 // src/execution.ts
 function getTxHash({
@@ -184,7 +195,7 @@ function getTxHash({
   };
   logger.info(`${logPrefix}:started`, logProps);
   const getTxHashFromTxHashes = () => {
-    const rawTxHashWithUnreliableTyping = txHashes[0].txHash;
+    const rawTxHashWithUnreliableTyping = txHashes[0]?.txHash;
     const txHash = typeof rawTxHashWithUnreliableTyping === "object" ? rawTxHashWithUnreliableTyping.id : rawTxHashWithUnreliableTyping;
     logger.info(`${logPrefix}:txHashesMode`, {
       ...logProps,
@@ -319,12 +330,14 @@ async function executeRelayQuote({
         ) {
           logger.info(`${logPrefix}:onTransactionConfirmed`, txHashes);
           isTransactionConfirmed = true;
-          if (relayQuote.steps[0].requestId) {
+          const firstStep = relayQuote.steps[0];
+          const firstItem = firstStep?.items[0];
+          if (firstStep?.requestId && firstItem) {
             manuallyRegisterIndex(logger, {
-              requestId: relayQuote.steps[0].requestId,
-              chainId: relayQuote.steps[0].items[0].data.chainId,
+              requestId: firstStep.requestId,
+              chainId: firstItem.data.chainId,
               tx: jsonStringifyWithBigIntSanitization({
-                ...relayQuote.steps[0].items[0].data,
+                ...firstItem.data,
                 txHash
               })
             });
@@ -378,9 +391,11 @@ async function manuallyRegisterIndex(logger, registerRequest) {
     });
   }
 }
-async function getRelayExecutionInfo(requestId) {
+async function getRelayExecutionInfo(requestId, apiKey) {
   const url = `${MAINNET_RELAY_API2}/intents/status/v2?requestId=${requestId}`;
-  const response = await fetch(url);
+  const response = await fetch(url, {
+    headers: { "x-api-key": apiKey }
+  });
   if (!response.ok) {
     throw Error(response.statusText);
   }
@@ -462,7 +477,8 @@ function parseRelayFees({
 import { MAINNET_RELAY_API as MAINNET_RELAY_API3 } from "@relayprotocol/relay-sdk";
 async function getRelayAssetPriceInfo({
   chainId,
-  address
+  address,
+  apiKey
 }) {
   const relayChainId = convertFunToRelayChainId(Number(chainId));
   const relayTokenAddress = convertFunToRelayTokenAddress(
@@ -470,7 +486,8 @@ async function getRelayAssetPriceInfo({
     relayChainId
   );
   const url = `${MAINNET_RELAY_API3}/currencies/token/price?chainId=${relayChainId}&address=${relayTokenAddress}`;
-  const response = await fetch(url);
+  const headers = filterNullishHeaders({ "x-api-key": apiKey });
+  const response = await fetch(url, { headers });
   if (!response.ok) {
     throw Error(response.statusText);
   }
@@ -482,7 +499,8 @@ async function getRelayAssetPriceInfo({
 import { MAINNET_RELAY_API as MAINNET_RELAY_API4 } from "@relayprotocol/relay-sdk";
 async function getRelayAssetInfo({
   chainId,
-  address
+  address,
+  apiKey
 }) {
   const relayChainId = convertFunToRelayChainId(Number(chainId));
   const relayTokenAddress = convertFunToRelayTokenAddress(
@@ -490,13 +508,17 @@ async function getRelayAssetInfo({
     relayChainId
   );
   const url = `${MAINNET_RELAY_API4}/currencies/v2`;
+  const headers = filterNullishHeaders({
+    "Content-Type": "application/json",
+    "x-api-key": apiKey
+  });
   const body = {
     chainIds: [relayChainId],
     address: relayTokenAddress
   };
   const response = await fetch(url, {
     method: "POST",
-    headers: { "Content-Type": "application/json" },
+    headers,
     body: JSON.stringify(body)
   });
   if (!response.ok) {
@@ -515,7 +537,8 @@ async function getQuoteEstUsdValue({
   tokenChainId,
   tokenAddress,
   tokenAmountBaseUnit,
-  logger
+  logger,
+  apiKey
 }) {
   try {
     const normalizedChainId = convertFunToRelayChainId(
@@ -528,11 +551,13 @@ async function getQuoteEstUsdValue({
     const [tokenPriceRes, tokenInfoRes] = await Promise.all([
       getRelayAssetPriceInfo({
         chainId: normalizedChainId,
-        address: normalizedTokenAddress
+        address: normalizedTokenAddress,
+        apiKey
       }),
       getRelayAssetInfo({
         chainId: normalizedChainId,
-        address: normalizedTokenAddress
+        address: normalizedTokenAddress,
+        apiKey
       })
     ]);
     const isWUsdeEthereal = normalizedChainId === "5064014" && normalizedTokenAddress.toLowerCase() === "0xB6fC4B1BFF391e5F6b4a3D2C7Bda1FeE3524692D".toLowerCase();
@@ -563,11 +588,9 @@ var RelayQuoteClientError = class extends Error {
     Object.setPrototypeOf(this, new.target.prototype);
   }
 };
-var getHeaders = (funRelayConfig, subsidizeFeesSecretKey) => {
-  const subsidizeFees = !!funRelayConfig.config.options.subsidizeFees;
+var getHeaders = (funRelayConfig, apiKey) => {
   const headers = {
-    // only apply subsidizeFeesSecretKey if subsidizeFees is true
-    ...subsidizeFees && subsidizeFeesSecretKey ? { "x-api-key": subsidizeFeesSecretKey } : {},
+    "x-api-key": apiKey,
     // Remote headers will override passed in headers
     ...funRelayConfig.headers ? { ...funRelayConfig.headers } : {}
   };
@@ -589,7 +612,7 @@ async function getRelayQuote({
     toTokenAddress,
     tradeType,
     userAddress,
-    subsidizeFeesSecretKey
+    apiKey
   } = params;
   const vmType = walletClient && "vmType" in walletClient ? walletClient.vmType : "evm";
   try {
@@ -622,7 +645,8 @@ async function getRelayQuote({
       tokenChainId: queryTokenChainId,
       tokenAddress: queryTokenAddress,
       tokenAmountBaseUnit: queryTokenAmountBaseUnit.toString(),
-      logger
+      logger,
+      apiKey
     });
     const funRelayConfig = await getFunRelayFees({
       clientId,
@@ -634,7 +658,7 @@ async function getRelayQuote({
       toTokenAddress,
       toChainId
     });
-    const headers = getHeaders(funRelayConfig, subsidizeFeesSecretKey);
+    const headers = getHeaders(funRelayConfig, apiKey);
     const appFeeBp = funRelayConfig.b + funRelayConfig.v;
     logger.info("getRelayQuoteParams", {
       ...params,
@@ -795,6 +819,12 @@ function getSolanaWallet(walletAddress, connection, signTransaction, payerKey) {
   );
 }
 
+// src/tron.ts
+import { adaptTronWallet } from "@relayprotocol/relay-tron-wallet-adapter";
+function getTronWallet(walletAddress, tronWeb) {
+  return adaptTronWallet(walletAddress, tronWeb);
+}
+
 // src/dynamicRoutes/lighter.ts
 import {
   concat,
@@ -1644,6 +1674,7 @@ export {
   getRelayExecutionState,
   getRelayQuote,
   getSolanaWallet,
+  getTronWallet,
   initDynamicRouting,
   initializeRelayClient,
   isRelayExecutionTerminalStatus,