wip

MeteoraAg · Jan 3, 2025 · 94e8345 · 94e8345
1 parent 0be4b86
commit 94e8345
Show file tree

Hide file tree

Showing 7 changed files with 1,675 additions and 101 deletions.
diff --git a/artifacts/lb_clmm.so b/artifacts/lb_clmm.so
diff --git a/ts-client/src/dlmm/helpers/derive.ts b/ts-client/src/dlmm/helpers/derive.ts
@@ -217,3 +217,14 @@ export function deriveEventAuthority(programId: PublicKey) {
     programId
   );
 }
+
+export function deriveRewardVault(
+  lbPair: PublicKey,
+  rewardIndex: BN,
+  programId: PublicKey
+) {
+  return PublicKey.findProgramAddressSync(
+    [lbPair.toBuffer(), rewardIndex.toArrayLike(Buffer, "le", 8)],
+    programId
+  );
+}
diff --git a/ts-client/src/dlmm/helpers/index.ts b/ts-client/src/dlmm/helpers/index.ts
@@ -1,5 +1,6 @@
 import { BN, EventParser } from "@coral-xyz/anchor";
 import {
+  ASSOCIATED_TOKEN_PROGRAM_ID,
   NATIVE_MINT,
   TOKEN_PROGRAM_ID,
   TokenAccountNotFoundError,
@@ -37,11 +38,7 @@ export function chunks<T>(array: T[], size: number): T[][] {
   );
 }
 
-export function range<T>(
-  min: number,
-  max: number,
-  mapfn: (i: number) => T
-) {
+export function range<T>(min: number, max: number, mapfn: (i: number) => T) {
   const length = max - min + 1;
   return Array.from({ length }, (_, i) => mapfn(min + i));
 }
@@ -93,17 +90,21 @@ export const getOrCreateATAInstruction = async (
   connection: Connection,
   tokenMint: PublicKey,
   owner: PublicKey,
+  programId?: PublicKey,
   payer: PublicKey = owner,
   allowOwnerOffCurve = true
 ): Promise<GetOrCreateATAResponse> => {
+  programId = programId ?? TOKEN_PROGRAM_ID;
   const toAccount = getAssociatedTokenAddressSync(
     tokenMint,
     owner,
-    allowOwnerOffCurve
+    allowOwnerOffCurve,
+    programId,
+    ASSOCIATED_TOKEN_PROGRAM_ID
   );
 
   try {
-    await getAccount(connection, toAccount);
+    await getAccount(connection, toAccount, connection.commitment, programId);
 
     return { ataPubKey: toAccount, ix: undefined };
   } catch (e) {
@@ -115,7 +116,9 @@ export const getOrCreateATAInstruction = async (
         payer,
         toAccount,
         owner,
-        tokenMint
+        tokenMint,
+        programId,
+        ASSOCIATED_TOKEN_PROGRAM_ID
       );
 
       return { ataPubKey: toAccount, ix };