@pioneer-platform/thorchain-client 0.0.30 → 0.0.32

package/lib/index.js

@@ -163,23 +163,27 @@ var get_quote = function (quote) {
                 case 2:
                     pools = _a.sent();
                     poolIn = pools.find(function (p) { return p.asset === quote.sellAsset; });
-                    if (!poolIn) {
+                    poolOut = pools.find(function (p) { return p.asset === quote.buyAsset; });
+                    // If the sellAsset is RUNE, use the pool for the buyAsset
+                    if (quote.sellAsset === 'THOR.RUNE') {
+                        poolIn = null; // RUNE does not need an "in" pool, only "out"
+                        poolOut = pools.find(function (p) { return p.asset === quote.buyAsset; });
+                    }
+                    // If the buyAsset is RUNE, use the pool for the sellAsset
+                    if (quote.buyAsset === 'THOR.RUNE') {
+                        poolOut = null; // RUNE does not need an "out" pool, only "in"
+                        poolIn = pools.find(function (p) { return p.asset === quote.sellAsset; });
+                    }
+                    // Handle case where pools are not found
+                    if (!poolIn && quote.sellAsset !== 'THOR.RUNE') {
                         log.error(tag, "Pool for sellAsset (".concat(quote.sellAsset, ") not found."));
                         throw new Error("Pool for sellAsset (".concat(quote.sellAsset, ") not found."));
                     }
-                    poolOut = null;
-                    // Skip poolOut lookup if buyAsset is RUNE/THOR
-                    if (quote.buyAsset === 'THOR.RUNE' || quote.buyAsset === 'RUNE.RUNE') {
-                        log.info(tag, "BuyAsset (".concat(quote.buyAsset, ") is RUNE/THOR. Skipping poolOut lookup."));
-                    }
-                    else {
-                        poolOut = pools.find(function (p) { return p.asset === quote.buyAsset; });
-                        if (!poolOut) {
-                            log.error(tag, "Pool for buyAsset (".concat(quote.buyAsset, ") not found."));
-                            throw new Error("Pool for buyAsset (".concat(quote.buyAsset, ") not found."));
-                        }
+                    if (!poolOut && quote.buyAsset !== 'THOR.RUNE') {
+                        log.error(tag, "Pool for buyAsset (".concat(quote.buyAsset, ") not found."));
+                        throw new Error("Pool for buyAsset (".concat(quote.buyAsset, ") not found."));
                     }
-                    log.info(tag, "poolIn: ", poolIn, "poolOut: ", poolOut || 'N/A (RUNE/THOR as buyAsset)');
+                    log.info(tag, "poolIn: ", poolIn, "poolOut: ", poolOut);
                     sellAssetChain = quote.sellAsset.split(".")[0];
                     DECIMALS = Number(types_1.BaseDecimal[sellAssetChain]);
                     if (isNaN(DECIMALS))
@@ -235,3 +239,96 @@ var get_quote = function (quote) {
         });
     });
 };
+// const get_quote = async function (quote: any) {
+//     const tag = TAG + " | get_quote | ";
+//     try {
+//         let output: any = {};
+//         if (!quote.sellAsset) throw new Error("missing sellAsset");
+//         if (!quote.buyAsset) throw new Error("missing buyAsset");
+//         if (!quote.sellAmount) throw new Error("missing sellAmount");
+//         if (!quote.senderAddress) throw new Error("missing senderAddress");
+//         if (!quote.recipientAddress) throw new Error("missing recipientAddress");
+//         if (!quote.slippage) throw new Error("missing slippage");
+//
+//         // Get pools from network
+//         const pools = await getPools();
+//
+//         // Find the pool for the sellAsset
+//         const poolIn = pools.find((p: any) => p.asset === quote.sellAsset);
+//         if (!poolIn) {
+//             log.error(tag, `Pool for sellAsset (${quote.sellAsset}) not found.`);
+//             throw new Error(`Pool for sellAsset (${quote.sellAsset}) not found.`);
+//         }
+//
+//         let poolOut: any = null;
+//
+//         // Skip poolOut lookup if buyAsset is RUNE/THOR
+//         if (quote.buyAsset === 'THOR.RUNE' || quote.buyAsset === 'RUNE.RUNE') {
+//             log.info(tag, `BuyAsset (${quote.buyAsset}) is RUNE/THOR. Skipping poolOut lookup.`);
+//         } else {
+//             poolOut = pools.find((p: any) => p.asset === quote.buyAsset);
+//             if (!poolOut) {
+//                 log.error(tag, `Pool for buyAsset (${quote.buyAsset}) not found.`);
+//                 throw new Error(`Pool for buyAsset (${quote.buyAsset}) not found.`);
+//             }
+//         }
+//
+//         log.info(tag, "poolIn: ", poolIn, "poolOut: ", poolOut || 'N/A (RUNE/THOR as buyAsset)');
+//
+//         const sellAssetChain = quote.sellAsset.split(".")[0];
+//         const DECIMALS = Number(BaseDecimal[sellAssetChain]);
+//         if (isNaN(DECIMALS)) throw new Error(`Invalid DECIMALS value for asset: ${sellAssetChain}`);
+//         const BASE_UNIT = Math.pow(10, DECIMALS);
+//         const sellAmountInBaseUnits = parseFloat(quote.sellAmount) * BASE_UNIT;
+//
+//         // Create URL for the API
+//         const URL = `/thorchain/quote/swap?from_asset=${quote.sellAsset}&to_asset=${quote.buyAsset}&amount=${sellAmountInBaseUnits}&destination=${quote.recipientAddress}`;
+//         log.info(tag, "URL: ", URL);
+//
+//         const quoteFromNode = await nodeRequest(URL);
+//         if (quoteFromNode.error) throw new Error(quoteFromNode.error);
+//
+//         const amountOutMin = quoteFromNode.amount_out_min;
+//         const amountOutEstimated = (parseInt(quoteFromNode.expected_amount_out) / BASE_UNIT).toFixed(DECIMALS);
+//
+//         output.amountOut = amountOutEstimated;
+//
+//         const memoInput = {
+//             type: 'SWAP',
+//             asset: quote.buyAsset,
+//             destAddr: quote.recipientAddress,
+//             lim: amountOutMin,
+//         };
+//         const memo = createMemo(memoInput);
+//         log.info(tag, "memo: ", memo);
+//
+//         const txType = sellAssetChain === "MAYA" ? 'deposit' : 'transfer';
+//
+//         output.txs = [
+//             {
+//                 type: txType,
+//                 chain: ChainToNetworkId[sellAssetChain],
+//                 txParams: {
+//                     senderAddress: quote.senderAddress,
+//                     recipientAddress: quoteFromNode.inbound_address,
+//                     amount: quote.sellAmount,
+//                     token: quote.sellAsset.split(".")[1],
+//                     memo: quoteFromNode.memo || memo,
+//                 },
+//             },
+//         ];
+//
+//         output.meta = {
+//             quoteMode: "TC_SUPPORTED_TO_TC_SUPPORTED",
+//         };
+//         output.steps = 1;
+//         output.complete = true;
+//         output.source = 'thorchain';
+//         output.id = uuid();
+//
+//         return output;
+//     } catch (e) {
+//         log.error(tag, "Error: ", e);
+//         throw e;
+//     }
+// };

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@pioneer-platform/thorchain-client",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
     "@pioneer-platform/loggerdog": "^8.3.1",
-    "@pioneer-platform/pioneer-caip": "^9.2.34",
+    "@pioneer-platform/pioneer-caip": "^9.2.38",
     "@pioneer-platform/pioneer-coins": "^9.2.24",
     "axios": "^1.3.4",
     "dotenv": "^8.2.0",