@pioneer-platform/thorchain-client 0.0.29 → 0.0.30

package/lib/index.js

@@ -41,10 +41,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var TAG = " | maya | ";
+var types_1 = require("@coinmasters/types");
 var uuid = require('uuidv4').uuid;
 var log = require('@pioneer-platform/loggerdog')();
 var _a = require("@pioneer-platform/pioneer-caip"), caipToNetworkId = _a.caipToNetworkId, shortListSymbolToCaip = _a.shortListSymbolToCaip, ChainToNetworkId = _a.ChainToNetworkId;
-var network = require("@pioneer-platform/midgard-client");
 var _b = require('@pioneer-platform/pioneer-coins'), createMemo = _b.createMemo, parseMemo = _b.parseMemo;
 var networkSupport = [
     ChainToNetworkId["BTC"],
@@ -65,13 +65,16 @@ function nodeRequest(path) {
                     return [4 /*yield*/, fetch("https://thornode.ninerealms.com".concat(path))];
                 case 1:
                     response = _a.sent();
+                    if (!response.ok) {
+                        throw new Error("Node request failed with status: ".concat(response.status, ", message: ").concat(response.statusText));
+                    }
                     return [4 /*yield*/, response.json()];
                 case 2:
                     data = _a.sent();
                     return [2 /*return*/, data];
                 case 3:
                     error_1 = _a.sent();
-                    console.error('Error fetching from node:', error_1);
+                    log.error("".concat(TAG, " Error fetching from node:"), error_1);
                     throw error_1;
                 case 4: return [2 /*return*/];
             }
@@ -96,40 +99,46 @@ module.exports = {
         return assets;
     },
     getQuote: function (quote) {
-        return get_quote(quote);
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, get_quote(quote)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
     },
 };
-function quoteFromPool(sellAmount, assetPoolAmount, runePoolAmount, maxSlippage) {
-    // Convert string inputs to numbers and scale the sell amount
-    var swapAmount = parseFloat(sellAmount) * 1e8; // Assuming 1e6 is the scaling factor for Maya
-    var assetDepth = parseFloat(assetPoolAmount);
-    var runeDepth = parseFloat(runePoolAmount);
-    // Calculate the constant product
-    var k = assetDepth * runeDepth;
-    // New amount of the asset in the pool after the swap
-    var newAssetDepth = assetDepth + swapAmount;
-    // Calculate the amount of Rune received (or the other asset in the pool)
-    var newRuneDepth = k / newAssetDepth;
-    var runeReceived = runeDepth - newRuneDepth;
-    // Scale back down the amount of Rune received
-    var scaledRuneReceived = runeReceived / 1e6; // Adjust as per Rune's scaling factor
-    // Calculate the actual rate of the swap
-    var actualRate = scaledRuneReceived / (swapAmount / 1e6);
-    // Calculate the ideal rate
-    var idealRate = runeDepth / assetDepth;
-    // Calculate the slippage
-    var slippage = ((idealRate - actualRate) / idealRate) * 100;
-    // Calculate amountOutMin considering the maximum slippage
-    var amountOutMin = scaledRuneReceived * (1 - maxSlippage / 100);
-    return {
-        amountOutMin: amountOutMin.toFixed(6).toString(),
-        amountOut: scaledRuneReceived.toFixed(6),
-        slippage: Math.max(slippage, 0).toFixed(6)
-    };
+function getPools() {
+    return __awaiter(this, void 0, void 0, function () {
+        var tag, pools, e_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    tag = TAG + " | getPools | ";
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, nodeRequest('/thorchain/pools')];
+                case 2:
+                    pools = _a.sent();
+                    if (!pools || pools.length === 0) {
+                        throw new Error("No pools fetched from network!");
+                    }
+                    log.info(tag, "Pools fetched: ", pools.map(function (p) { return p.asset; }));
+                    return [2 /*return*/, pools];
+                case 3:
+                    e_1 = _a.sent();
+                    log.error(tag, "Error fetching pools: ", e_1);
+                    throw new Error("Unable to fetch pools");
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
 }
 var get_quote = function (quote) {
     return __awaiter(this, void 0, void 0, function () {
-        var tag, output, pools, poolIn, poolOut, BaseDecimal_1, asset, DECIMALS, BASE_UNIT, sellAmountInBaseUnits, quoteFromNode, URL_1, amountOutMin, inboundAddress, amountOutEstimated, memoInput, memo, type, chain, tx, e_1;
+        var tag, output, pools, poolIn, poolOut, sellAssetChain, DECIMALS, BASE_UNIT, sellAmountInBaseUnits, URL_1, quoteFromNode, amountOutMin, amountOutEstimated, memoInput, memo, txType, e_2;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -150,109 +159,77 @@ var get_quote = function (quote) {
                         throw new Error("missing recipientAddress");
                     if (!quote.slippage)
                         throw new Error("missing slippage");
-                    return [4 /*yield*/, network.getPools()];
+                    return [4 /*yield*/, getPools()];
                 case 2:
                     pools = _a.sent();
-                    if (!pools)
-                        throw Error("Unable to get pools from network!");
-                    log.info(tag, "pools: ", pools);
-                    poolIn = pools.find(function (p) { return p.asset == quote.sellAsset; });
-                    log.info(tag, "poolIn: ", poolIn);
-                    poolOut = pools.find(function (p) { return p.asset == quote.buyAsset; });
-                    output.meta = {
-                        quoteMode: "TC_SUPPORTED_TO_TC_SUPPORTED"
-                    };
-                    output.steps = 1;
-                    output.complete = true;
-                    output.source = 'thorchain';
-                    output.id = uuid();
-                    BaseDecimal_1 = {
-                        ARB: 18,
-                        AVAX: 18,
-                        BCH: 8,
-                        BNB: 8,
-                        BSC: 18,
-                        BTC: 8,
-                        DASH: 8,
-                        DGB: 8,
-                        DOGE: 8,
-                        ETH: 18,
-                        BASE: 18,
-                        EOS: 6,
-                        GAIA: 6,
-                        KUJI: 6,
-                        LTC: 8,
-                        MATIC: 18,
-                        MAYA: 10,
-                        OP: 18,
-                        OSMO: 6,
-                        XRP: 6,
-                        THOR: 8,
-                        ZEC: 8
-                    };
-                    asset = quote.sellAsset.split(".")[0];
-                    if (!asset)
-                        throw Error("unable to pasre asset from quote.sellAsset");
-                    DECIMALS = BaseDecimal_1[asset];
-                    if (!DECIMALS)
-                        throw Error("unable to get DECIMALS for asset: " + asset);
+                    poolIn = pools.find(function (p) { return p.asset === quote.sellAsset; });
+                    if (!poolIn) {
+                        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."));
+                        }
+                    }
+                    log.info(tag, "poolIn: ", poolIn, "poolOut: ", poolOut || 'N/A (RUNE/THOR as buyAsset)');
+                    sellAssetChain = quote.sellAsset.split(".")[0];
+                    DECIMALS = Number(types_1.BaseDecimal[sellAssetChain]);
+                    if (isNaN(DECIMALS))
+                        throw new Error("Invalid DECIMALS value for asset: ".concat(sellAssetChain));
                     BASE_UNIT = Math.pow(10, DECIMALS);
                     sellAmountInBaseUnits = parseFloat(quote.sellAmount) * BASE_UNIT;
-                    quoteFromNode = void 0;
-                    URL_1 = "/quote/swap?from_asset=".concat(quote.sellAsset, "&to_asset=").concat(quote.buyAsset, "&amount=").concat(sellAmountInBaseUnits, "&destination=").concat(quote.recipientAddress);
-                    log.info("URL: ", URL_1);
+                    URL_1 = "/thorchain/quote/swap?from_asset=".concat(quote.sellAsset, "&to_asset=").concat(quote.buyAsset, "&amount=").concat(sellAmountInBaseUnits, "&destination=").concat(quote.recipientAddress);
+                    log.info(tag, "URL: ", URL_1);
                     return [4 /*yield*/, nodeRequest(URL_1)];
                 case 3:
                     quoteFromNode = _a.sent();
-                    log.info("quoteFromNode: ", quoteFromNode);
                     if (quoteFromNode.error)
-                        throw Error(quoteFromNode.error);
+                        throw new Error(quoteFromNode.error);
                     amountOutMin = quoteFromNode.amount_out_min;
-                    inboundAddress = quoteFromNode.inbound_address;
                     amountOutEstimated = (parseInt(quoteFromNode.expected_amount_out) / BASE_UNIT).toFixed(DECIMALS);
                     output.amountOut = amountOutEstimated;
                     memoInput = {
                         type: 'SWAP',
                         asset: quote.buyAsset,
                         destAddr: quote.recipientAddress,
-                        lim: null,
-                        interval: null,
-                        quantity: null,
-                        affiliate: null,
-                        fee: null,
-                        dexAggregatorAddr: null,
-                        finalAssetAddr: null,
-                        minAmountOut: null
+                        lim: amountOutMin,
                     };
                     memo = createMemo(memoInput);
                     log.info(tag, "memo: ", memo);
-                    type = void 0;
-                    chain = quote.sellAsset.split(".")[0];
-                    if (chain == "MAYA") {
-                        type = 'deposit';
-                    }
-                    else {
-                        type = 'transfer';
-                    }
-                    tx = {
-                        type: type,
-                        chain: ChainToNetworkId[quote.sellAsset.split(".")[0]],
-                        txParams: {
-                            senderAddress: quote.senderAddress,
-                            recipientAddress: quoteFromNode.inbound_address,
-                            amount: quote.sellAmount,
-                            token: quote.sellAsset.split(".")[1],
-                            memo: quoteFromNode.memo || memo
-                        }
-                    };
+                    txType = sellAssetChain === "MAYA" ? 'deposit' : 'transfer';
                     output.txs = [
-                        tx
+                        {
+                            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 [2 /*return*/, output];
                 case 4:
-                    e_1 = _a.sent();
-                    console.error(tag, "e: ", e_1);
-                    throw e_1;
+                    e_2 = _a.sent();
+                    log.error(tag, "Error: ", e_2);
+                    throw e_2;
                 case 5: return [2 /*return*/];
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pioneer-platform/thorchain-client",
-  "version": "0.0.29",
+  "version": "0.0.30",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {