@kamino-finance/klend-sdk 5.11.2-beta.0 → 5.11.2

package/src/utils/seeds.ts

@@ -38,10 +38,6 @@ export const BASE_SEED_REFERRER_STATE = 'ref_state';
  * Short url seed
  */
 export const BASE_SEED_SHORT_URL = 'short_url';
-/**
- * Farm user state seed
- */
-export const BASE_SEED_USER_STATE = 'user';
 
 /**
  * User farm state seed
@@ -192,15 +188,9 @@ export function shortUrlPda(shortUrl: string, programId: PublicKey = PROGRAM_ID)
   return PublicKey.findProgramAddressSync([Buffer.from(BASE_SEED_SHORT_URL), Buffer.from(shortUrl)], programId);
 }
 
-/**
- * Returns the PDA for the obligation farm state
- * @param farm
- * @param obligation
- * @returns pda
- */
-export function obligationFarmStatePda(farm: PublicKey, obligation: PublicKey) {
+export function obligationFarmStatePda(obligation: PublicKey, farm: PublicKey, programId: PublicKey = farmsId) {
   return PublicKey.findProgramAddressSync(
-    [Buffer.from(BASE_SEED_USER_STATE), farm.toBytes(), obligation.toBytes()],
-    farmsId
-  )[0];
+    [Buffer.from(BASE_SEED_FARM_USER_STATE), farm.toBuffer(), obligation.toBuffer()],
+    programId
+  );
 }

package/src/utils/userMetadata.ts

@@ -267,18 +267,18 @@ function getMultiplyObligationAndObligationFarmStateAddresses(
       if (!collReserve.state.farmCollateral.equals(PublicKey.default)) {
         farmUserStates.push({
           address: obligationFarmStatePda(
-            collReserve.state.farmCollateral!,
-            multiplyObligation.toPda(kaminoMarket.getAddress(), user)
-          ),
+            multiplyObligation.toPda(kaminoMarket.getAddress(), user),
+            collReserve.state.farmCollateral!
+          )[0],
           log: 'collReserve farmState for multiply obligation coll: ' + collMintString + ' debt: ' + debtMintString,
         });
       }
       if (!debtReserve.state.farmDebt.equals(PublicKey.default)) {
         farmUserStates.push({
           address: obligationFarmStatePda(
-            debtReserve.state.farmDebt!,
-            multiplyObligation.toPda(kaminoMarket.getAddress(), user)
-          ),
+            multiplyObligation.toPda(kaminoMarket.getAddress(), user),
+            debtReserve.state.farmDebt!
+          )[0],
           log: 'debtReserve farmState for multiply obligation coll: ' + collMintString + ' debt: ' + debtMintString,
         });
       }
@@ -310,18 +310,18 @@ function getLeverageObligationAndObligationFarmStateAddresses(
       if (!collReserve.state.farmCollateral.equals(PublicKey.default)) {
         farmUserStates.push({
           address: obligationFarmStatePda(
-            collReserve.state.farmCollateral!,
-            leverageObligation.toPda(kaminoMarket.getAddress(), user)
-          ),
+            leverageObligation.toPda(kaminoMarket.getAddress(), user),
+            collReserve.state.farmCollateral!
+          )[0],
           log: 'collReserve farmState for leverage obligation coll: ' + collMintString + ' debt: ' + debtMintString,
         });
       }
       if (!debtReserve.state.farmDebt.equals(PublicKey.default)) {
         farmUserStates.push({
           address: obligationFarmStatePda(
-            debtReserve.state.farmDebt!,
-            leverageObligation.toPda(kaminoMarket.getAddress(), user)
-          ),
+            leverageObligation.toPda(kaminoMarket.getAddress(), user),
+            debtReserve.state.farmDebt!
+          )[0],
           log: 'debtReserve farmState for leverage obligation coll: ' + collMintString + ' debt: ' + debtMintString,
         });
       }
@@ -342,7 +342,7 @@ function getRepayWithCollObligationFarmStateAddresses(
     const borrowReserve = kaminoMarket.getReserveByMint(borrow.mintAddress)!;
     if (!borrowReserve.state.farmDebt.equals(PublicKey.default)) {
       farmUserStates.push({
-        address: obligationFarmStatePda(borrowReserve.state.farmDebt!, obligation.obligationAddress),
+        address: obligationFarmStatePda(obligation.obligationAddress, borrowReserve.state.farmDebt!)[0],
         log: 'debtReserve farmState for vanilla obligation: ' + obligationString,
       });
     }
@@ -352,7 +352,7 @@ function getRepayWithCollObligationFarmStateAddresses(
     const depositReserve = kaminoMarket.getReserveByMint(deposit.mintAddress)!;
     if (!depositReserve.state.farmCollateral.equals(PublicKey.default)) {
       farmUserStates.push({
-        address: obligationFarmStatePda(depositReserve.state.farmCollateral!, obligation.obligationAddress),
+        address: obligationFarmStatePda(obligation.obligationAddress, depositReserve.state.farmCollateral!)[0],
         log: 'collReserve farmState for vanilla obligation' + obligationString,
       });
     }