@clonegod/ttd-core 3.1.96 → 3.1.98

package/dist/pool/pool_util.js

@@ -10,11 +10,11 @@ const token_util_1 = require("../token/token_util");
 function get_pair_name(native_token, pool_name) {
     pool_name = pool_name.split('/').map((s) => (0, __1.format_pair_symbol)(s)).join('/');
     const symbols = pool_name.split('/');
-    if (pool_name.includes(native_token) && (pool_name.includes('USDC') || pool_name.includes('USDT') || pool_name.includes('USD1'))) {
+    if (pool_name.includes(native_token) && (pool_name.includes('USDC') || pool_name.includes('USDT') || pool_name.includes('USD1') || pool_name.includes('USDG'))) {
         if (pool_name.endsWith(native_token)) {
             symbols.reverse();
         }
-        return symbols.join('/').replace('USDC', 'USDT').replace('USD1', 'USDT');
+        return symbols.join('/').replace('USDC', 'USDT').replace('USD1', 'USDT').replace('USDG', 'USDT');
     }
     if (symbols.includes(native_token)) {
         if (symbols[1] !== native_token) {
@@ -22,11 +22,11 @@ function get_pair_name(native_token, pool_name) {
         }
         return symbols.join('/');
     }
-    if (symbols.includes('USDC') || symbols.includes('USDT') || symbols.includes('USD1')) {
-        if (symbols[1] !== 'USDC' && symbols[1] !== 'USDT' && symbols[1] !== 'USD1') {
+    if (symbols.includes('USDC') || symbols.includes('USDT') || symbols.includes('USD1') || symbols.includes('USDG')) {
+        if (symbols[1] !== 'USDC' && symbols[1] !== 'USDT' && symbols[1] !== 'USD1' && symbols[1] !== 'USDG') {
             symbols.reverse();
         }
-        return symbols.join('/').replace('USDC', 'USDT').replace('USD1', 'USDT');
+        return symbols.join('/').replace('USDC', 'USDT').replace('USD1', 'USDT').replace('USDG', 'USDT');
     }
     return pool_name;
 }

package/dist/token/is_not_arb_token.js

@@ -9,11 +9,7 @@ const is_not_arb_token = (token_or_pool_name) => {
         || symbols.includes('FDUSD')
         || symbols.includes('LUSD')
         || symbols.includes('RZUSD')
-        || symbols.includes('USDE')
         || symbols.includes('AXLUSDC')
-        || symbols.includes('USDS')
-        || symbols.includes('USDG')
-        || symbols.includes('USDY')
         || symbols.includes('EURC')
         || symbols.includes('BSOL')
         || symbols.includes('JITOSOL')

package/dist/token/price/get_eth_token_price.js

@@ -15,16 +15,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.get_eth_token_price_info = get_eth_token_price_info;
 require('dotenv').config();
 const axios_1 = __importDefault(require("axios"));
-const chains_1 = require("../../chains");
 const index_1 = require("../../index");
 const defi_llama_1 = require("./defi_llama");
 const gecko_terminal_1 = require("./gecko_terminal");
 const price_cache_1 = require("./price_cache");
 function get_eth_token_price_info(evm_chain_info, addresses, opts) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const source = (_a = opts === null || opts === void 0 ? void 0 : opts.source) !== null && _a !== void 0 ? _a : 'cache_only';
         addresses = addresses.map(addr => addr.toLowerCase());
+        const ZERO_ADDR = '0x0000000000000000000000000000000000000000';
+        const wrappedNativeAddr = (_b = evm_chain_info.weth_addr) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+        const wantsNative = !!wrappedNativeAddr && addresses.includes(ZERO_ADDR);
+        if (wantsNative) {
+            addresses = addresses.map(a => a === ZERO_ADDR ? wrappedNativeAddr : a);
+            addresses = Array.from(new Set(addresses));
+        }
         const result = new Map();
         const cachedChannel = {
             name: 'CachedPrice',
@@ -104,6 +110,11 @@ function get_eth_token_price_info(evm_chain_info, addresses, opts) {
             if (source !== 'cache_only' && addresses.length > 0) {
                 (0, index_1.log_warn)(`[get_token_price_info] Failed to get prices for ${addresses.length} tokens after trying all channels: ${addresses.join(', ')}`);
             }
+            if (wantsNative) {
+                const wrappedInfo = result.get(wrappedNativeAddr);
+                if (wrappedInfo)
+                    result.set(ZERO_ADDR, wrappedInfo);
+            }
             (0, index_1.log_debug)(`[get_token_price_info] Completed price fetching for ${result.size} tokens`);
             return result;
         }
@@ -178,15 +189,4 @@ function fetchPriceFromUniSwap(chain_name, addresses) {
     });
 }
 if (require.main === module) {
-    (() => __awaiter(void 0, void 0, void 0, function* () {
-        let evm_chain_info = chains_1.EvmChainConfig.ROBINHOOD;
-        let addresses = [
-            "0x0bd7d308f8e1639fab988df18a8011f41eacad73",
-            "0x5fc5360d0400a0fd4f2af552add042d716f1d168".toLowerCase(),
-            "0x020bfc650a365f8bb26819deaabf3e21291018b4".toLowerCase(),
-        ];
-        console.log(yield get_eth_token_price_info(evm_chain_info, addresses, { source: 'force_fetch' }));
-        console.log(yield fetchPriceFromUniSwap(evm_chain_info.chain_full_name, addresses));
-        console.log(yield (0, gecko_terminal_1.fetchPriceFromGeckoTerminal)(evm_chain_info.chain_short_name, addresses));
-    }))();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clonegod/ttd-core",
-    "version": "3.1.96",
+    "version": "3.1.98",
     "description": "Common types and utilities for trading systems - use `npm run push` to publish",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",