@rhea-finance/cross-chain-aggregation-dex 0.1.4 → 0.1.6

package/dist/index.d.mts

@@ -90,6 +90,8 @@ interface BaseExecuteParams {
     recipient: string;
     depositAddress?: string;
     deadline?: number;
+    /** Optional sender address (for native NEAR wrap operations) */
+    sender?: string;
 }
 /**
  * Recipient execute parameters (V2 NEAR, EVM, etc.)
@@ -429,6 +431,10 @@ interface CompleteQuoteParams {
     recipient: string;
     refundTo?: string;
     customRecipientMsg?: string;
+    appFees?: Array<{
+        recipient: string;
+        fee: number;
+    }>;
 }
 interface CompleteQuoteResult {
     intents: {

package/dist/index.d.ts

@@ -90,6 +90,8 @@ interface BaseExecuteParams {
     recipient: string;
     depositAddress?: string;
     deadline?: number;
+    /** Optional sender address (for native NEAR wrap operations) */
+    sender?: string;
 }
 /**
  * Recipient execute parameters (V2 NEAR, EVM, etc.)
@@ -429,6 +431,10 @@ interface CompleteQuoteParams {
     recipient: string;
     refundTo?: string;
     customRecipientMsg?: string;
+    appFees?: Array<{
+        recipient: string;
+        fee: number;
+    }>;
 }
 interface CompleteQuoteResult {
     intents: {

package/dist/index.js

@@ -147,6 +147,13 @@ function convertSlippageToBasisPoints(slippage) {
 }
 function normalizeDestinationAsset(assetId, wrapNearContractId = "wrap.near") {
   if (!assetId) return assetId;
+  if (assetId.startsWith("1cs_v1:")) {
+    const parts = assetId.split(":");
+    const nep141Index = parts.findIndex((p) => p === "nep141");
+    if (nep141Index >= 0 && nep141Index < parts.length - 1) {
+      return `nep141:${parts.slice(nep141Index + 1).join(":")}`;
+    }
+  }
   if (assetId.startsWith("nep141:") || assetId.startsWith("nep245:")) {
     return assetId;
   }
@@ -383,7 +390,43 @@ var NearSmartRouter = class {
         };
       }
       const finalRecipient = depositAddress || recipient;
+      const sender = params.sender || finalRecipient;
       const transactions = [];
+      const isNativeNear = quote.tokenIn.address === "near" || quote.tokenIn.address === this.wrapNearContractId && quote.tokenIn.symbol === "NEAR" || !quote.tokenIn.address && quote.tokenIn.symbol === "NEAR";
+      if (isNativeNear) {
+        let wrapNearStorageBalance = null;
+        try {
+          wrapNearStorageBalance = await this.nearChainAdapter.view({
+            contractId: this.wrapNearContractId,
+            methodName: "storage_balance_of",
+            args: {
+              account_id: sender
+            }
+          });
+        } catch (err) {
+          wrapNearStorageBalance = null;
+        }
+        if (!wrapNearStorageBalance) {
+          transactions.push({
+            contractId: this.wrapNearContractId,
+            methodName: "storage_deposit",
+            args: {
+              account_id: sender,
+              registration_only: true
+            },
+            gas: "50000000000000",
+            expandDeposit: "1250000000000000000000"
+            // 0.00125 NEAR
+          });
+        }
+        transactions.push({
+          contractId: this.wrapNearContractId,
+          methodName: "near_deposit",
+          args: {},
+          gas: "50000000000000",
+          expandDeposit: quote.amountIn
+        });
+      }
       if (finalRecipient && quote.tokenOut?.address) {
         let isRegistered = false;
         try {
@@ -419,8 +462,9 @@ var NearSmartRouter = class {
       if (finalRecipient) {
         swapMsg.swap_out_recipient = finalRecipient;
       }
+      const tokenInAddress = isNativeNear ? this.wrapNearContractId : quote.tokenIn.address;
       transactions.push({
-        contractId: quote.tokenIn.address,
+        contractId: tokenInAddress,
         methodName: "ft_transfer_call",
         args: {
           receiver_id: this.refExchangeId,
@@ -798,6 +842,47 @@ var AggregateDexRouter = class {
           expandDeposit: finalQuote.amountIn
         });
       }
+      const isWrappedNear = finalQuote.tokenIn.address === this.wrapNearContractId || finalQuote.tokenIn.symbol === "WNEAR" && finalQuote.tokenIn.address === this.wrapNearContractId;
+      if (isWrappedNear && !isNativeNear) {
+        let wNearBalance = "0";
+        try {
+          const wNearBalanceResult = await this.nearChainAdapter.view({
+            contractId: this.wrapNearContractId,
+            methodName: "ft_balance_of",
+            args: { account_id: sender }
+          });
+          wNearBalance = wNearBalanceResult || "0";
+        } catch (e) {
+        }
+        const requiredAmount = new Big3__default.default(finalQuote.amountIn);
+        const currentBalance = new Big3__default.default(wNearBalance);
+        if (currentBalance.lt(requiredAmount)) {
+          const amountToConvert = requiredAmount.minus(currentBalance);
+          const wrapNearStorageBalance = await getStorageBalance(
+            this.wrapNearContractId,
+            sender
+          ).catch(() => null);
+          if (!wrapNearStorageBalance) {
+            transactions.push({
+              contractId: this.wrapNearContractId,
+              methodName: "storage_deposit",
+              args: {
+                account_id: sender,
+                registration_only: true
+              },
+              gas: "50000000000000",
+              expandDeposit: this.NEW_ACCOUNT_STORAGE_COST
+            });
+          }
+          transactions.push({
+            contractId: this.wrapNearContractId,
+            methodName: "near_deposit",
+            args: {},
+            gas: "50000000000000",
+            expandDeposit: amountToConvert.toFixed(0)
+          });
+        }
+      }
       const tokensToCheck = dexs.length > 1 ? tokens : [finalQuote.tokenOut.address];
       const tokenStorageBalances = await Promise.all(
         tokensToCheck.map(
@@ -980,7 +1065,8 @@ async function completeQuote(params, config) {
     slippage,
     recipient,
     refundTo,
-    customRecipientMsg
+    customRecipientMsg,
+    appFees
   } = params;
   const {
     intentsQuotationAdapter,
@@ -1045,13 +1131,15 @@ async function completeQuote(params, config) {
         const bluechipTokenConfig = bluechipKey && bluechipTokens[bluechipKey] || void 0;
         const normalizedSourceAsset = bluechipTokenConfig?.assetId ? bluechipTokenConfig.assetId : `nep141:${bluechipToken.address}`;
         let normalizedTargetAsset = targetToken.address;
-        if (normalizedTargetAsset && !normalizedTargetAsset.startsWith("nep141:") && !normalizedTargetAsset.startsWith("nep245:") && normalizedTargetAsset.includes(".")) {
+        if (normalizedTargetAsset?.startsWith("1cs_v1:")) ; else if (normalizedTargetAsset && !normalizedTargetAsset.startsWith("nep141:") && !normalizedTargetAsset.startsWith("nep245:") && normalizedTargetAsset.includes(".")) {
           normalizedTargetAsset = `nep141:${normalizeTokenId(
             normalizedTargetAsset,
             wrapNearContractId
           )}`;
         }
-        normalizedTargetAsset = normalizeDestinationAsset(normalizedTargetAsset, wrapNearContractId) || normalizedTargetAsset;
+        if (!normalizedTargetAsset?.startsWith("1cs_v1:")) {
+          normalizedTargetAsset = normalizeDestinationAsset(normalizedTargetAsset, wrapNearContractId) || normalizedTargetAsset;
+        }
         const slippageBps = convertSlippageToBasisPoints(slippage);
         const intentsQuote = await intentsQuotationAdapter.quote({
           originAsset: normalizedSourceAsset,
@@ -1061,7 +1149,8 @@ async function completeQuote(params, config) {
           recipient,
           slippageTolerance: slippageBps,
           swapType: "FLEX_INPUT",
-          ...customRecipientMsg ? { customRecipientMsg } : {}
+          ...customRecipientMsg ? { customRecipientMsg } : {},
+          ...appFees ? { appFees } : {}
         });
         if (intentsQuote.quoteStatus !== "success") {
           throw new Error("Failed to get quote");
@@ -1104,13 +1193,15 @@ async function completeQuote(params, config) {
           }
         }
         let normalizedTargetAsset = targetToken.address;
-        if (normalizedTargetAsset && !normalizedTargetAsset.startsWith("nep141:") && !normalizedTargetAsset.startsWith("nep245:") && normalizedTargetAsset.includes(".")) {
+        if (normalizedTargetAsset?.startsWith("1cs_v1:")) ; else if (normalizedTargetAsset && !normalizedTargetAsset.startsWith("nep141:") && !normalizedTargetAsset.startsWith("nep245:") && normalizedTargetAsset.includes(".")) {
           normalizedTargetAsset = `nep141:${normalizeTokenId(
             normalizedTargetAsset,
             wrapNearContractId
           )}`;
         }
-        normalizedTargetAsset = normalizeDestinationAsset(normalizedTargetAsset, wrapNearContractId) || normalizedTargetAsset;
+        if (!normalizedTargetAsset?.startsWith("1cs_v1:")) {
+          normalizedTargetAsset = normalizeDestinationAsset(normalizedTargetAsset, wrapNearContractId) || normalizedTargetAsset;
+        }
         const slippageBps = convertSlippageToBasisPoints(slippage);
         const intentsQuote = await intentsQuotationAdapter.quote({
           originAsset: normalizedSourceAsset,