@jup-ag/lend 0.0.69 → 0.0.71

package/dist/earn/index.mjs

@@ -117,7 +117,12 @@ async function getWithdrawContext({
   const tokenProgram = await getAccountOwner(asset, connection);
   return {
     signer,
-    ownerTokenAccount: getAssociatedTokenAddressSync(lendingToken, signer),
+    ownerTokenAccount: getAssociatedTokenAddressSync(
+      lendingToken,
+      signer,
+      false,
+      tokenProgram
+    ),
     recipientTokenAccount: getAssociatedTokenAddressSync(
       asset,
       signer,

package/dist/index.d.mts

@@ -130,6 +130,28 @@ declare namespace flashloan {
   };
 }
 
+declare const getMerkleAdmin: () => PublicKey;
+declare const ROLE_TO_INDEX: {
+    readonly none: 0;
+    readonly proposer: 1;
+    readonly approver: 2;
+};
+type RoleType = "proposer" | "approver" | "none";
+declare const getRole: (role: RoleType, address: PublicKey) => PublicKey;
+declare const getRewardsDistributor: (rewardToken: PublicKey, nextDistributorId: number) => PublicKey;
+declare const getClaimStatus: (user: PublicKey, positionId: PublicKey) => PublicKey;
+
+declare const merkleDistributor_ROLE_TO_INDEX: typeof ROLE_TO_INDEX;
+type merkleDistributor_RoleType = RoleType;
+declare const merkleDistributor_getClaimStatus: typeof getClaimStatus;
+declare const merkleDistributor_getMerkleAdmin: typeof getMerkleAdmin;
+declare const merkleDistributor_getRewardsDistributor: typeof getRewardsDistributor;
+declare const merkleDistributor_getRole: typeof getRole;
+declare namespace merkleDistributor {
+  export { merkleDistributor_ROLE_TO_INDEX as ROLE_TO_INDEX, merkleDistributor_getClaimStatus as getClaimStatus, merkleDistributor_getMerkleAdmin as getMerkleAdmin, merkleDistributor_getRewardsDistributor as getRewardsDistributor, merkleDistributor_getRole as getRole };
+  export type { merkleDistributor_RoleType as RoleType };
+}
+
 declare const version: string;
 
-export { borrow as borrowPda, flashloan as flashloanPda, lending as lendingPda, lendingRewardRateModel as lendingRewardRateModelPda, liquidity as liquidityPda, version };
+export { borrow as borrowPda, flashloan as flashloanPda, lending as lendingPda, lendingRewardRateModel as lendingRewardRateModelPda, liquidity as liquidityPda, merkleDistributor as merkleDistributorPda, version };

package/dist/index.d.ts

@@ -130,6 +130,28 @@ declare namespace flashloan {
   };
 }
 
+declare const getMerkleAdmin: () => PublicKey;
+declare const ROLE_TO_INDEX: {
+    readonly none: 0;
+    readonly proposer: 1;
+    readonly approver: 2;
+};
+type RoleType = "proposer" | "approver" | "none";
+declare const getRole: (role: RoleType, address: PublicKey) => PublicKey;
+declare const getRewardsDistributor: (rewardToken: PublicKey, nextDistributorId: number) => PublicKey;
+declare const getClaimStatus: (user: PublicKey, positionId: PublicKey) => PublicKey;
+
+declare const merkleDistributor_ROLE_TO_INDEX: typeof ROLE_TO_INDEX;
+type merkleDistributor_RoleType = RoleType;
+declare const merkleDistributor_getClaimStatus: typeof getClaimStatus;
+declare const merkleDistributor_getMerkleAdmin: typeof getMerkleAdmin;
+declare const merkleDistributor_getRewardsDistributor: typeof getRewardsDistributor;
+declare const merkleDistributor_getRole: typeof getRole;
+declare namespace merkleDistributor {
+  export { merkleDistributor_ROLE_TO_INDEX as ROLE_TO_INDEX, merkleDistributor_getClaimStatus as getClaimStatus, merkleDistributor_getMerkleAdmin as getMerkleAdmin, merkleDistributor_getRewardsDistributor as getRewardsDistributor, merkleDistributor_getRole as getRole };
+  export type { merkleDistributor_RoleType as RoleType };
+}
+
 declare const version: string;
 
-export { borrow as borrowPda, flashloan as flashloanPda, lending as lendingPda, lendingRewardRateModel as lendingRewardRateModelPda, liquidity as liquidityPda, version };
+export { borrow as borrowPda, flashloan as flashloanPda, lending as lendingPda, lendingRewardRateModel as lendingRewardRateModelPda, liquidity as liquidityPda, merkleDistributor as merkleDistributorPda, version };

package/dist/index.mjs

@@ -2,11 +2,12 @@ export { l as lendingPda, a as lendingRewardRateModelPda } from './shared/lend.B
 export { l as liquidityPda } from './shared/lend.BzG5ldOV.mjs';
 export { b as borrowPda } from './shared/lend.uRnzld7B.mjs';
 export { f as flashloanPda } from './shared/lend.hlqlrp9r.mjs';
+export { m as merkleDistributorPda } from './shared/lend.BEoyE4dT.mjs';
 import '@solana/web3.js';
 import './shared/lend.CioR9-te.mjs';
 import '@solana/spl-token';
 import 'bn.js';
 
-const version = "0.0.69";
+const version = "0.0.71";
 
 export { version };

package/dist/merkle-distributor/index.d.mts

@@ -0,0 +1,36 @@
+import * as _solana_web3_js from '@solana/web3.js';
+import { Connection, PublicKey } from '@solana/web3.js';
+import BN from 'bn.js';
+
+type ConnectionParams = {
+    connection: Connection;
+    signer: PublicKey;
+};
+type ClaimContextParams = {
+    rewardToken: PublicKey;
+    distributorId: number;
+    positionId: PublicKey;
+} & ConnectionParams;
+type ClaimParams = {
+    cumulativeAmount: BN;
+    positionType: number;
+    cycle: number;
+    merkleProof: Uint8Array<ArrayBufferLike>[];
+    metadata: Buffer;
+} & ClaimContextParams;
+declare function getClaimRewardsContext({ rewardToken, distributorId, positionId, connection, signer, }: ClaimContextParams): Promise<{
+    signer: PublicKey;
+    distributor: PublicKey;
+    merkleAdmin: PublicKey;
+    mint: PublicKey;
+    claimStatus: PublicKey;
+    vaultTokenAccount: PublicKey;
+    recipientTokenAccount: PublicKey;
+    tokenProgram: PublicKey;
+    associatedTokenProgram: PublicKey;
+    systemProgram: PublicKey;
+}>;
+declare function getClaimIx({ cumulativeAmount, positionType, positionId, cycle, merkleProof, metadata, signer, rewardToken, distributorId, connection, }: ClaimParams): Promise<_solana_web3_js.TransactionInstruction>;
+
+export { getClaimIx, getClaimRewardsContext };
+export type { ClaimContextParams, ClaimParams, ConnectionParams };

package/dist/merkle-distributor/index.d.ts

@@ -0,0 +1,36 @@
+import * as _solana_web3_js from '@solana/web3.js';
+import { Connection, PublicKey } from '@solana/web3.js';
+import BN from 'bn.js';
+
+type ConnectionParams = {
+    connection: Connection;
+    signer: PublicKey;
+};
+type ClaimContextParams = {
+    rewardToken: PublicKey;
+    distributorId: number;
+    positionId: PublicKey;
+} & ConnectionParams;
+type ClaimParams = {
+    cumulativeAmount: BN;
+    positionType: number;
+    cycle: number;
+    merkleProof: Uint8Array<ArrayBufferLike>[];
+    metadata: Buffer;
+} & ClaimContextParams;
+declare function getClaimRewardsContext({ rewardToken, distributorId, positionId, connection, signer, }: ClaimContextParams): Promise<{
+    signer: PublicKey;
+    distributor: PublicKey;
+    merkleAdmin: PublicKey;
+    mint: PublicKey;
+    claimStatus: PublicKey;
+    vaultTokenAccount: PublicKey;
+    recipientTokenAccount: PublicKey;
+    tokenProgram: PublicKey;
+    associatedTokenProgram: PublicKey;
+    systemProgram: PublicKey;
+}>;
+declare function getClaimIx({ cumulativeAmount, positionType, positionId, cycle, merkleProof, metadata, signer, rewardToken, distributorId, connection, }: ClaimParams): Promise<_solana_web3_js.TransactionInstruction>;
+
+export { getClaimIx, getClaimRewardsContext };
+export type { ClaimContextParams, ClaimParams, ConnectionParams };

package/dist/merkle-distributor/index.mjs

@@ -0,0 +1,81 @@
+import { SystemProgram } from '@solana/web3.js';
+import { g as getClaimStatus, a as getMerkleAdmin, b as getRewardsDistributor, c as merkleDistributor } from '../shared/lend.BEoyE4dT.mjs';
+import { Program } from '@coral-xyz/anchor';
+import { ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync } from '@solana/spl-token';
+import 'bn.js';
+
+const getAccountOwner = async (account, connection) => {
+  const info = await connection.getAccountInfo(account);
+  if (!info)
+    throw new Error(`Account info not found for ${account.toString()}`);
+  return info.owner;
+};
+async function getClaimRewardsContext({
+  rewardToken,
+  distributorId,
+  positionId,
+  connection,
+  signer
+}) {
+  const tokenProgram = await getAccountOwner(rewardToken, connection);
+  return {
+    signer,
+    distributor: getRewardsDistributor(
+      rewardToken,
+      distributorId
+    ),
+    merkleAdmin: getMerkleAdmin(),
+    mint: rewardToken,
+    claimStatus: getClaimStatus(signer, positionId),
+    vaultTokenAccount: getAssociatedTokenAddressSync(
+      rewardToken,
+      getMerkleAdmin(),
+      true,
+      tokenProgram
+    ),
+    recipientTokenAccount: getAssociatedTokenAddressSync(
+      rewardToken,
+      signer,
+      false,
+      tokenProgram
+    ),
+    tokenProgram,
+    associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
+    systemProgram: SystemProgram.programId
+  };
+}
+async function getClaimIx({
+  cumulativeAmount,
+  positionType,
+  positionId,
+  cycle,
+  merkleProof,
+  metadata,
+  signer,
+  rewardToken,
+  distributorId,
+  connection
+}) {
+  const program = new Program(merkleDistributor, {
+    connection,
+    publicKey: signer
+  });
+  const accounts = await getClaimRewardsContext({
+    rewardToken,
+    distributorId,
+    positionId,
+    connection,
+    signer
+  });
+  const ix = await program.methods.claim(
+    cumulativeAmount,
+    positionType,
+    positionId,
+    cycle,
+    merkleProof.map((proof) => [...proof]),
+    metadata
+  ).accounts(accounts).instruction();
+  return ix;
+}
+
+export { getClaimIx, getClaimRewardsContext };