@kamino-finance/klend-sdk 5.0.7 → 5.1.0

package/src/referrals/instructions.ts

@@ -1,6 +1,6 @@
 import { PublicKey, SYSVAR_RENT_PUBKEY, SystemProgram, TransactionInstruction, Connection } from '@solana/web3.js';
 import { KaminoMarket } from '../classes';
-import { checkIfAccountExists, referrerStatePda, referrerTokenStatePda, shortUrlPda, userMetadataPda } from '../utils';
+import { PublicKeySet, referrerStatePda, referrerTokenStatePda, shortUrlPda, userMetadataPda } from '../utils';
 import {
   PROGRAM_ID,
   ReferrerState,
@@ -12,9 +12,11 @@ import {
 export const getInitAllReferrerTokenStateIxns = async ({
   referrer,
   kaminoMarket,
+  payer = referrer,
 }: {
   referrer: PublicKey;
   kaminoMarket: KaminoMarket;
+  payer?: PublicKey;
 }) => {
   if (referrer.equals(PublicKey.default)) {
     throw new Error('Referrer not set');
@@ -25,27 +27,32 @@ export const getInitAllReferrerTokenStateIxns = async ({
   const initReferrerTokenStateIxns: TransactionInstruction[] = [];
 
   const tokenStatesToCreate: [PublicKey, PublicKey][] = [];
-  for (const reserve of kaminoMarket.reserves.values()) {
-    const referrerTokenStateAddress = referrerTokenStatePda(referrer, reserve.address, kaminoMarket.programId)[0];
-
-    if (!(await checkIfAccountExists(kaminoMarket.getConnection(), referrerTokenStateAddress))) {
-      tokenStatesToCreate.push([referrerTokenStateAddress, reserve?.address]);
+  const reserves = kaminoMarket.getReserves();
+  const referrerTokenStates = reserves.map((reserve) => {
+    return referrerTokenStatePda(referrer, reserve.address, kaminoMarket.programId)[0];
+  });
+  const uniqueReferrerTokenStates = new PublicKeySet<PublicKey>(referrerTokenStates).toArray();
+  const accounts = await kaminoMarket.getConnection().getMultipleAccountsInfo(uniqueReferrerTokenStates);
+  for (let i = 0; i < uniqueReferrerTokenStates.length; i++) {
+    if (!accounts[i]) {
+      tokenStatesToCreate.push([uniqueReferrerTokenStates[i], reserves[i].address]);
     }
   }
 
   tokenStatesToCreate.forEach(([referrerTokenStateAddress, reserveAddress]) => {
     const initReferrerTokenStateIx = initReferrerTokenState(
       {
-        referrer: referrer,
+        referrer,
       },
       {
         lendingMarket: kaminoMarket.getAddress(),
-        payer: referrer,
+        payer,
         reserve: reserveAddress,
         referrerTokenState: referrerTokenStateAddress,
         rent: SYSVAR_RENT_PUBKEY,
         systemProgram: SystemProgram.programId,
-      }
+      },
+      kaminoMarket.programId
     );
 
     initReferrerTokenStateIxns.push(initReferrerTokenStateIx);

package/src/utils/ata.ts

@@ -98,11 +98,6 @@ export function createAtasIdempotent(
   return res;
 }
 
-export const checkIfAccountExists = async (connection: Connection, account: PublicKey): Promise<boolean> => {
-  const acc = await connection.getAccountInfo(account);
-  return acc !== null;
-};
-
 export function getDepositWsolIxns(owner: PublicKey, ata: PublicKey, amountLamports: Decimal) {
   const ixns: TransactionInstruction[] = [];
 
@@ -158,15 +153,14 @@ export async function getTokenAccountBalance(provider: AnchorProvider, tokenAcco
 export async function getTokenAccountBalanceDecimal(
   connection: Connection,
   mint: PublicKey,
-  owner: PublicKey
+  owner: PublicKey,
+  tokenProgram: PublicKey = TOKEN_PROGRAM_ID,
 ): Promise<Decimal> {
-  const tokenAta = getAssociatedTokenAddress(mint, owner);
-  const ataExists = await checkIfAccountExists(connection, tokenAta);
-
-  if (!ataExists) {
-    return new Decimal(0);
-  } else {
-    const tokenData = (await connection.getTokenAccountBalance(tokenAta)).value;
-    return new Decimal(tokenData.uiAmountString!);
+  const ata = getAssociatedTokenAddress(mint, owner, true, tokenProgram);
+  const accInfo = await connection.getAccountInfo(ata);
+  if (accInfo === null) {
+    return new Decimal('0');
   }
+  const { value } = await connection.getTokenAccountBalance(ata);
+  return new Decimal(value.uiAmountString!);
 }