diff --git a/projects/deltatrade.js b/projects/deltatrade.js index 815fecee3..784017fb2 100644 --- a/projects/deltatrade.js +++ b/projects/deltatrade.js @@ -1,4 +1,3 @@ -const ADDRESSES = require('./helper/coreAssets.json') const { sumTokens } = require('./helper/chain/near') const { getConfig } = require('./helper/cache') const { get } = require('./helper/http') @@ -12,34 +11,25 @@ const programId = new PublicKey('CNLGhYQgNwjyDfHZTEjHfk1MPkqwP96qZahWN82UfcLM'); const GRID_CONTRACT_ID = 'grid.deltatrade.near'; const DCA_CONTRACT_ID = 'dca.deltatrade.near'; -const tokens = [ - 'wrap.near', - '17208628f84f5d6ad33f0da3bbbeb27ffcb398eac501a31bd6ad2011e36133a1', - 'token.v2.ref-finance.near', - ADDRESSES.near.BURROW, - 'token.lonkingnearbackto2024.near', - 'blackdragon.tkn.near', - 'ftv2.nekotoken.near', - 'gear.enleap.near', - 'token.0xshitzu.near', - 'edge-fast.near', - '802d89b6e511b335f05024a65161bce7efc3f311.factory.bridge.near', -] +const nearApi = 'https://api.deltatrade.ai'; +const solanaApi = 'https://solapi.deltatrade.ai'; + module.exports = { timetravel: false, near: { - tvl: () => sumTokens({ tokens, owners: [GRID_CONTRACT_ID, DCA_CONTRACT_ID] }), + tvl: nearTVL, }, solana: { tvl: solanaTvl, } } -async function getTokens() { - return getConfig('deltatrade/sol-pairs', undefined, { +async function getTokens(chain) { + return getConfig(`deltatrade/${chain}-pairs`, undefined, { fetcher: async () => { - const { data } = await get('https://solapi.deltatrade.ai/api/bot/grid/pairs'); + const url = `${chain === 'solana' ? solanaApi : nearApi}/api/bot/grid/pairs`; + const { data } = await get(url); const tokenSet = new Set() data.forEach(pair => { tokenSet.add(pair.base_token.code) @@ -52,6 +42,11 @@ async function getTokens() { }) } +async function nearTVL(){ + const tokens = await getTokens('near'); + return sumTokens({ tokens, owners: [GRID_CONTRACT_ID, DCA_CONTRACT_ID] }) +} + function getGlobalBalanceUser(token) { const [globalBalPda] = PublicKey.findProgramAddressSync([Buffer.from("global_balance_user"), state.toBuffer(), new PublicKey(token).toBuffer()], programId); @@ -61,7 +56,7 @@ function getGlobalBalanceUser(token) { } async function solanaTvl() { - const tokens = await getTokens(); + const tokens = await getTokens('solana'); const tokenAccounts = tokens.map(getGlobalBalanceUser) return sumTokens2({ tokenAccounts }) } diff --git a/projects/helper/chain/near.js b/projects/helper/chain/near.js index c79feedea..55e6d4137 100644 --- a/projects/helper/chain/near.js +++ b/projects/helper/chain/near.js @@ -51,6 +51,9 @@ const tokenMapping = { 'blackdragon.tkn.near': { name: 'black-dragon', decimals: 24 }, 'gear.enleap.near': { name: 'near-tinker-union-gear', decimals: 18 }, 'token.0xshitzu.near': { name: 'shitzu', decimals: 18 }, + 'purge-558.meme-cooking.near': { name: 'forgive-me-father', decimals: 18 }, + 'mpdao-token.near': { name: 'meta-pool-dao', decimals: 6 }, + 'kat.token0.near': { name: 'nearkat', decimals: 18 }, } async function view_account(account_id) {