@rhea-finance/cross-chain-aggregation-dex 0.1.1 → 0.1.2

package/dist/index.d.mts

@@ -396,20 +396,12 @@ declare class AggregateDexRouter implements DexRouter {
      */
     quote(params: QuoteParams): Promise<QuoteResult>;
     /**
-     * Finalize quote with depositAddress (deprecated)
-     *
-     * @deprecated No longer needed. executeSwap automatically fetches final quote using receiveUser (depositAddress).
-     * Kept for interface compatibility only.
+     * @deprecated No longer needed. Kept for interface compatibility only.
      */
     finalizeQuote(params: QuoteParams, depositAddress: string): Promise<QuoteResult>;
-    /**
-     * Execute swap with V2 Router
-     * Automatically fetches final quote using receiveUser (depositAddress) to ensure correct routerMsg and signature.
-     */
+    private reFetchQuoteWithBalance;
+    private ensureQuoteAmountWithinBalance;
     executeSwap(params: ExecuteParams): Promise<ExecuteResult>;
-    /**
-     * Query user token registration status in AGGREGATE_DEX contract
-     */
     private queryUserTokensRegistered;
 }
 

package/dist/index.d.ts

@@ -396,20 +396,12 @@ declare class AggregateDexRouter implements DexRouter {
      */
     quote(params: QuoteParams): Promise<QuoteResult>;
     /**
-     * Finalize quote with depositAddress (deprecated)
-     *
-     * @deprecated No longer needed. executeSwap automatically fetches final quote using receiveUser (depositAddress).
-     * Kept for interface compatibility only.
+     * @deprecated No longer needed. Kept for interface compatibility only.
      */
     finalizeQuote(params: QuoteParams, depositAddress: string): Promise<QuoteResult>;
-    /**
-     * Execute swap with V2 Router
-     * Automatically fetches final quote using receiveUser (depositAddress) to ensure correct routerMsg and signature.
-     */
+    private reFetchQuoteWithBalance;
+    private ensureQuoteAmountWithinBalance;
     executeSwap(params: ExecuteParams): Promise<ExecuteResult>;
-    /**
-     * Query user token registration status in AGGREGATE_DEX contract
-     */
     private queryUserTokensRegistered;
 }
 

package/dist/index.js

@@ -625,14 +625,6 @@ var AggregateDexRouter = class {
       }
       const slippageBps = convertSlippageToBasisPoints(slippage);
       const slippageDecimalForApi = slippageBps / 1e4;
-      logger.debug("AggregateDexRouter quote - Calling swapMultiDexPath:", {
-        tokenIn: normalizedTokenIn,
-        tokenOut: normalizedTokenOut,
-        amountIn,
-        slippage: slippageDecimalForApi,
-        sender,
-        recipient
-      });
       const response = await this.swapMultiDexPathAdapter.swapMultiDexPath({
         amountIn: String(amountIn),
         tokenIn: normalizedTokenIn,
@@ -642,11 +634,6 @@ var AggregateDexRouter = class {
         user: sender,
         receiveUser: recipient
       });
-      logger.debug("AggregateDexRouter quote - swapMultiDexPath response:", {
-        result_code: response?.result_code,
-        result_message: response?.result_message,
-        hasData: !!response?.result_data
-      });
       if (response.result_code !== 0 || !response.result_data) {
         return {
           success: false,
@@ -698,10 +685,7 @@ var AggregateDexRouter = class {
     }
   }
   /**
-   * Finalize quote with depositAddress (deprecated)
-   * 
-   * @deprecated No longer needed. executeSwap automatically fetches final quote using receiveUser (depositAddress).
-   * Kept for interface compatibility only.
+   * @deprecated No longer needed. Kept for interface compatibility only.
    */
   async finalizeQuote(params, depositAddress) {
     if (!requiresRecipient(params)) {
@@ -712,10 +696,70 @@ var AggregateDexRouter = class {
       recipient: depositAddress
     });
   }
-  /**
-   * Execute swap with V2 Router
-   * Automatically fetches final quote using receiveUser (depositAddress) to ensure correct routerMsg and signature.
-   */
+  async reFetchQuoteWithBalance(quoteParams, actualBalance, context) {
+    const balanceBig = new Big2__default.default(actualBalance);
+    const adjustedParams = {
+      ...quoteParams,
+      amountIn: balanceBig.toFixed(0)
+    };
+    logger.warn(`AggregateDexRouter - ${context}: re-fetching quote with actual balance:`, {
+      requestedAmount: quoteParams.amountIn,
+      actualBalance
+    });
+    const adjustedQuote = await this.quote(adjustedParams);
+    if (adjustedQuote.success && adjustedQuote.routerMsg && adjustedQuote.signature) {
+      return adjustedQuote;
+    } else {
+      throw new Error(`Failed to re-fetch quote with actual balance: ${adjustedQuote.error || "Unknown error"}`);
+    }
+  }
+  async ensureQuoteAmountWithinBalance(quoteParams, actualBalance, context) {
+    const requestedAmountBig = new Big2__default.default(quoteParams.amountIn);
+    const balanceBig = new Big2__default.default(actualBalance);
+    const isNativeNear = (quoteParams.tokenIn.symbol === "NEAR" || quoteParams.tokenIn.address === "near" || !quoteParams.tokenIn.address && quoteParams.tokenIn.symbol === "NEAR") && quoteParams.tokenIn.address !== this.wrapNearContractId;
+    let effectiveBalanceBig = balanceBig;
+    let effectiveBalanceStr = actualBalance;
+    if (isNativeNear) {
+      const reserveAmount = new Big2__default.default("50000000000000000000000");
+      if (balanceBig.gt(reserveAmount)) {
+        effectiveBalanceBig = balanceBig.minus(reserveAmount);
+        effectiveBalanceStr = effectiveBalanceBig.toFixed(0);
+      } else {
+        effectiveBalanceBig = new Big2__default.default(0);
+        effectiveBalanceStr = "0";
+      }
+    }
+    if (requestedAmountBig.gt(effectiveBalanceBig) && balanceBig.gt(0)) {
+      return await this.reFetchQuoteWithBalance(quoteParams, effectiveBalanceStr, `${context} (requested amount exceeds available balance${isNativeNear ? " minus gas reserve" : ""})`);
+    }
+    if (balanceBig.gt(0) && requestedAmountBig.lt(balanceBig)) {
+      const diff = balanceBig.minus(requestedAmountBig);
+      const diffPercent = diff.div(balanceBig).times(100);
+      const isMaxSwap = diffPercent.lt(0.1) || diff.lt(1e3);
+      if (isMaxSwap) {
+        return await this.reFetchQuoteWithBalance(quoteParams, effectiveBalanceStr, `${context} (MAX swap detected, using ${isNativeNear ? "balance minus gas reserve" : "actual balance"})`);
+      }
+    }
+    const quote = await this.quote(quoteParams);
+    if (!quote.success) {
+      throw new Error(`Failed to fetch quote: ${quote.error || "Unknown error"}`);
+    }
+    if (quote.amountIn !== quoteParams.amountIn) {
+      const apiAmountBig = new Big2__default.default(quote.amountIn);
+      if (apiAmountBig.gt(effectiveBalanceBig) && balanceBig.gt(0)) {
+        return await this.reFetchQuoteWithBalance(quoteParams, effectiveBalanceStr, `${context} (API returned amount_in exceeds available balance)`);
+      }
+      if (apiAmountBig.lt(balanceBig) && balanceBig.gt(0)) {
+        const diff = balanceBig.minus(apiAmountBig);
+        const diffPercent = diff.div(balanceBig).times(100);
+        const isMaxSwap = diffPercent.lt(0.1) || diff.lt(1e3);
+        if (isMaxSwap) {
+          return await this.reFetchQuoteWithBalance(quoteParams, effectiveBalanceStr, `${context} (API returned amount_in close to balance, MAX swap detected)`);
+        }
+      }
+    }
+    return quote;
+  }
   async executeSwap(params) {
     try {
       if (!requiresRecipientInExecute(params)) {
@@ -743,16 +787,17 @@ var AggregateDexRouter = class {
           error: `receiveUser appears to be an EVM address (${receiveUser}). For NEAR chain swaps, depositAddress must be a NEAR account (64 hex chars or .near format)`
         };
       }
-      logger.debug("AggregateDexRouter - executeSwap params:", {
-        sender,
-        receiveUser,
-        tokenIn: quote.tokenIn.address,
-        tokenOut: quote.tokenOut.address,
-        amountIn: quote.amountIn,
-        tokens: quote.tokens,
-        dexs: quote.dexs
-      });
       const slippage = quote.slippage || 5e-3;
+      let tokenBalanceAtExecution = "0";
+      try {
+        const balanceResult = await this.nearChainAdapter.view({
+          contractId: quote.tokenIn.address,
+          methodName: "ft_balance_of",
+          args: { account_id: sender }
+        });
+        tokenBalanceAtExecution = balanceResult || "0";
+      } catch (e) {
+      }
       const finalQuoteParams = {
         tokenIn: quote.tokenIn,
         tokenOut: quote.tokenOut,
@@ -763,13 +808,11 @@ var AggregateDexRouter = class {
       };
       let finalQuote;
       try {
-        finalQuote = await this.quote(finalQuoteParams);
-        if (!finalQuote.success) {
-          return {
-            success: false,
-            error: `Failed to fetch quote with receiveUser="${receiveUser}": ${finalQuote.error}`
-          };
-        }
+        finalQuote = await this.ensureQuoteAmountWithinBalance(
+          finalQuoteParams,
+          tokenBalanceAtExecution,
+          "Re-fetching quote with receiveUser"
+        );
       } catch (error) {
         logger.error("AggregateDexRouter - Failed to fetch quote with receiveUser:", error);
         return {
@@ -785,12 +828,6 @@ var AggregateDexRouter = class {
           error: `Quote fetched with receiveUser="${receiveUser}" is missing routerMsg or signature.`
         };
       }
-      logger.debug("AggregateDexRouter - Successfully fetched final quote:", {
-        receiveUser,
-        quoteRecipient: finalQuote.recipient,
-        routerMsgLength: routerMsg.length,
-        signatureLength: signature.length
-      });
       const tokens = finalQuote.tokens || [];
       const dexs = finalQuote.dexs || [];
       const transactions = [];
@@ -805,7 +842,7 @@ var AggregateDexRouter = class {
           return null;
         }
       };
-      const isNativeNear = finalQuote.tokenIn.symbol === "NEAR" || finalQuote.tokenIn.address === "near" || !finalQuote.tokenIn.address && finalQuote.tokenIn.symbol === "NEAR";
+      const isNativeNear = (finalQuote.tokenIn.symbol === "NEAR" || finalQuote.tokenIn.address === "near" || !finalQuote.tokenIn.address && finalQuote.tokenIn.symbol === "NEAR") && finalQuote.tokenIn.address !== this.wrapNearContractId;
       if (isNativeNear) {
         const wrapNearStorageBalance = await getStorageBalance(
           this.wrapNearContractId,
@@ -852,11 +889,6 @@ var AggregateDexRouter = class {
         }
       });
       if (receiveUser && receiveUser !== sender) {
-        logger.debug("AggregateDexRouter - Checking receiveUser registration in tokenOut:", {
-          receiveUser,
-          tokenOut: finalQuote.tokenOut.address,
-          tokenOutSymbol: finalQuote.tokenOut.symbol
-        });
         const receiveUserStorageBalance = await getStorageBalance(
           finalQuote.tokenOut.address,
           receiveUser
@@ -869,12 +901,6 @@ var AggregateDexRouter = class {
           return null;
         });
         if (!receiveUserStorageBalance) {
-          logger.debug("AggregateDexRouter - receiveUser not registered in tokenOut, adding registration transaction:", {
-            receiveUser,
-            tokenOut: finalQuote.tokenOut.address,
-            tokenOutSymbol: finalQuote.tokenOut.symbol,
-            storageCost: this.NEW_ACCOUNT_STORAGE_COST
-          });
           transactions.push({
             contractId: finalQuote.tokenOut.address,
             methodName: "storage_deposit",
@@ -920,7 +946,7 @@ var AggregateDexRouter = class {
           const depositPerToken = new Big2__default.default("0.005").mul(
             new Big2__default.default("1000000000000000000000000")
           );
-          const totalDeposit2 = depositPerToken.mul(unregisteredTokens.length);
+          const totalDeposit = depositPerToken.mul(unregisteredTokens.length);
           transactions.push({
             contractId: this.aggregateDexContractId,
             methodName: "tokens_storage_deposit",
@@ -929,50 +955,57 @@ var AggregateDexRouter = class {
               tokens: unregisteredTokens
             },
             gas: "30000000000000",
-            expandDeposit: totalDeposit2.toFixed(0)
+            expandDeposit: totalDeposit.toFixed(0)
           });
         }
       }
-      const msgString = JSON.stringify({
-        msg: routerMsg,
-        signature
+      try {
+        const balanceResult = await this.nearChainAdapter.view({
+          contractId: finalQuote.tokenIn.address,
+          methodName: "ft_balance_of",
+          args: { account_id: sender }
+        });
+        tokenBalanceAtExecution = balanceResult || "0";
+      } catch (e) {
+      }
+      const finalBalanceQuoteParams = {
+        tokenIn: finalQuote.tokenIn,
+        tokenOut: finalQuote.tokenOut,
+        amountIn: finalQuote.amountIn,
+        slippage,
+        sender,
+        recipient: receiveUser
+      };
+      let finalQuoteForExecution;
+      try {
+        finalQuoteForExecution = await this.ensureQuoteAmountWithinBalance(
+          finalBalanceQuoteParams,
+          tokenBalanceAtExecution,
+          "Final balance check before execution"
+        );
+      } catch (error) {
+        logger.error("AggregateDexRouter - Failed final balance check:", error);
+        return {
+          success: false,
+          error: `Failed final balance check: ${error?.message || "Unknown error"}`
+        };
+      }
+      const finalAmountToTransfer = finalQuoteForExecution.amountIn;
+      const finalMsgString = JSON.stringify({
+        msg: finalQuoteForExecution.routerMsg,
+        signature: finalQuoteForExecution.signature
       });
       transactions.push({
         contractId: finalQuote.tokenIn.address,
         methodName: "ft_transfer_call",
         args: {
           receiver_id: this.aggregateDexContractId,
-          amount: finalQuote.amountIn,
-          msg: msgString
+          amount: finalAmountToTransfer,
+          msg: finalMsgString
         },
         gas: "300000000000000",
         expandDeposit: this.ONE_YOCTO_NEAR
       });
-      const totalDeposit = transactions.reduce((sum, tx) => {
-        if (tx.expandDeposit) {
-          return sum.plus(tx.expandDeposit);
-        }
-        return sum;
-      }, new Big2__default.default(0));
-      logger.debug("AggregateDexRouter - Executing swap (following mature codebase logic):", {
-        contractId: finalQuote.tokenIn.address,
-        receiver_id: this.aggregateDexContractId,
-        amount: finalQuote.amountIn,
-        transactionsCount: transactions.length,
-        sender,
-        receiveUser,
-        tokens: tokens.length,
-        dexs: dexs.length,
-        totalDepositYocto: totalDeposit.toFixed(0),
-        totalDepositNEAR: totalDeposit.div(new Big2__default.default("1000000000000000000000000")).toFixed(6),
-        transactions: transactions.map((tx, idx) => ({
-          index: idx,
-          contractId: tx.contractId,
-          methodName: tx.methodName,
-          expandDeposit: tx.expandDeposit,
-          expandDepositNEAR: tx.expandDeposit ? new Big2__default.default(tx.expandDeposit).div(new Big2__default.default("1000000000000000000000000")).toFixed(6) : "0"
-        }))
-      });
       const result = await this.nearChainAdapter.call({
         transactions
       });
@@ -996,9 +1029,6 @@ var AggregateDexRouter = class {
       };
     }
   }
-  /**
-   * Query user token registration status in AGGREGATE_DEX contract
-   */
   async queryUserTokensRegistered({
     user,
     tokens