refactor: streamline Raydium positions handling and update module exports

Author: g1nt0ki

projects/helper/solana.js

@@ -10,6 +10,7 @@ const { queryAllium } = require('./allium');
 
 const sdk = require('@defillama/sdk');
 const { endpointMap, endpoint } = require('./svmChainConfig.js')
+const { addRaydiumPositions } = require('../krystal/solana.js')
 
 /** Address of the SPL Token program */
 const TOKEN_PROGRAM_ID = new PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA')
@@ -743,4 +744,5 @@ module.exports = {
   i80f48ToNumber,
   runInChunks,
   getTokenAccountBalances,
+  addRaydiumPositions,
 };

projects/krystal/solana.js

@@ -1,4 +1,3 @@
-const { Program } = require("@coral-xyz/anchor");
 const { PublicKey } = require("@solana/web3.js");
 const {
   getConnection,
@@ -17,18 +16,25 @@ const CLMM_PROGRAM_ID = new PublicKey(
 const POSITION_SEED = Buffer.from("position", "utf8");
 
 async function tvl(api) {
+
+  // Load all the vaults in the program
+  const vaults = await program.account.userVault.all();
+  await addRaydiumPositions({ api, owners: vaults.map(i => i.publicKey) })
+
+}
+
+async function addRaydiumPositions({ api, owners = [], owner }) {
   const connection = getConnection();
 
-  const program = new Program(idl, { connection });
   const pools = new Map();
+
   const pdaPersonalPositionAddressesAll = []
+  if (owner) owners.push(owner)
 
-  // Load all the vaults in the program
-  const vaults = await program.account.userVault.all();
 
   const positions = [];
-  for (const account of vaults) {
-    const vault = account.publicKey;
+  for (let vault of owners) {
+    if (typeof vault === "string") vault = new PublicKey(vault);
     await findClmmPositionsByOwner(connection, vault);
   }
 
@@ -99,6 +105,7 @@ async function tvl(api) {
     const pdaPersonalPositionAddresses = tokenNftMints.map(getPdaPersonalPositionAddress)
     pdaPersonalPositionAddressesAll.push(...pdaPersonalPositionAddresses)
   }
+
 }
 
 
@@ -116,4 +123,4 @@ async function tvlApi(api) {
   api.addUSDValue(+res.tvl)
 }
 
-module.exports = { tvl: tvlApi };
+module.exports = { tvl: tvlApi, addRaydiumPositions, };