@soltracer/nft-staking 0.2.0 → 0.2.1

package/dist/client.js

@@ -1,6 +1,6 @@
 import { BN, Program } from "@coral-xyz/anchor";
 import { PublicKey, SystemProgram } from "@solana/web3.js";
-import { getStakeConfigPda, getStakePoolPda, getStakeEntryPda, getStakerAccountPda, getCollectionPda, getPoolAuthorityPda, getPoolSecondaryRewardsPda, getStakerSecondaryRewardsPda, getProjectPda, getUtilityConfigPda, getAta, decodeAccount, getFeeConfigPda, getTreasuryPda, PROJECT_MANAGEMENT_PROGRAM_ID, ADMIN_PROGRAM_ID, TOKEN_PROGRAM_ID, TOKEN_2022_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID, MPL_CORE_PROGRAM_ID, } from "@soltracer/core";
+import { getStakeConfigPda, getStakePoolPda, getStakeEntryPda, getStakerAccountPda, getCollectionPda, getPoolAuthorityPda, getPoolSecondaryRewardsPda, getStakerSecondaryRewardsPda, getProjectPda, getUtilityConfigPda, getProgramRegistryPda, getAta, decodeAccount, getFeeConfigPda, getTreasuryPda, PROJECT_MANAGEMENT_PROGRAM_ID, ADMIN_PROGRAM_ID, TOKEN_PROGRAM_ID, TOKEN_2022_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID, MPL_CORE_PROGRAM_ID, } from "@soltracer/core";
 import NftStakingIDL from "./idl.json";
 /** Well-known program IDs for cNFT operations. */
 const BUBBLEGUM_PROGRAM_ID = new PublicKey("BGUMAp9Gq7iTEuizy4pqaxsTyUCBK68MDfK752saRPUY");
@@ -32,6 +32,12 @@ function base58HashToArray(hash) {
 function getTreeConfigPda(merkleTree) {
     return PublicKey.findProgramAddressSync([merkleTree.toBytes()], BUBBLEGUM_PROGRAM_ID);
 }
+function toPk(v) {
+    return typeof v === "string" ? new PublicKey(v) : v;
+}
+function toBN(v) {
+    return typeof v === "number" ? new BN(v) : v;
+}
 export class NftStakingClient {
     program;
     provider;
@@ -136,6 +142,7 @@ export class NftStakingClient {
     resolveFeeAccounts(fee) {
         const programId = this.program.programId;
         const [feeConfig] = getFeeConfigPda(programId);
+        const [programRegistry] = getProgramRegistryPda(programId);
         const [treasury] = getTreasuryPda();
         let referralAccount = ADMIN_PROGRAM_ID;
         if (fee?.referralAccount) {
@@ -147,6 +154,7 @@ export class NftStakingClient {
         }
         return {
             feeConfig,
+            programRegistry,
             treasury,
             referralAccount,
             solUsdPriceFeed: NftStakingClient.PYTH_SOL_USD_FEED,
@@ -172,14 +180,14 @@ export class NftStakingClient {
         return this.applyPoolDecimals(pool, decimals);
     }
     async fetchStakeEntry(poolId, nftMint) {
-        const [pda] = getStakeEntryPda(poolId, nftMint);
+        const [pda] = getStakeEntryPda(poolId, toPk(nftMint));
         const raw = await this.program.account.stakeEntry.fetchNullable(pda);
         if (!raw)
             return null;
         return decodeAccount(raw);
     }
     async fetchStakerAccount(poolId, wallet, rewardDecimals) {
-        const [pda] = getStakerAccountPda(poolId, wallet);
+        const [pda] = getStakerAccountPda(poolId, toPk(wallet));
         const raw = await this.program.account.stakerAccount.fetchNullable(pda);
         if (!raw)
             return null;
@@ -211,8 +219,9 @@ export class NftStakingClient {
     }
     /** Fetch all active stake entries for a wallet in a specific pool via gPA. */
     async fetchStakeEntriesByOwner(_poolId, owner) {
+        const _owner = toPk(owner);
         const entries = await this.program.account.stakeEntry.all([
-            { memcmp: { offset: 72, bytes: owner.toBase58() } },
+            { memcmp: { offset: 72, bytes: _owner.toBase58() } },
         ]);
         return entries
             .map(({ account }) => decodeAccount(account))
@@ -225,7 +234,7 @@ export class NftStakingClient {
     async fetchStakeEntriesForMints(poolId, nftMints) {
         if (nftMints.length === 0)
             return [];
-        const pdas = nftMints.map((mint) => getStakeEntryPda(poolId, mint)[0]);
+        const pdas = nftMints.map((mint) => getStakeEntryPda(poolId, toPk(mint))[0]);
         const accounts = await this.program.account.stakeEntry.fetchMultiple(pdas);
         return accounts
             .filter((a) => a !== null)
@@ -270,11 +279,12 @@ export class NftStakingClient {
         return stakers.map(({ account }) => decodeAccount(account));
     }
     async closeLegacyCollection(collectionMint, projectId) {
+        const _collMint = toPk(collectionMint);
         const pid = this.resolveProjectId(projectId);
-        const [collection] = PublicKey.findProgramAddressSync([Buffer.from("project_collection"), new BN(pid).toArrayLike(Buffer, "le", 8), collectionMint.toBuffer()], this.program.programId);
+        const [collection] = PublicKey.findProgramAddressSync([Buffer.from("project_collection"), new BN(pid).toArrayLike(Buffer, "le", 8), _collMint.toBuffer()], this.program.programId);
         const [project] = getProjectPda(pid);
         return this.program.methods
-            .closeLegacyCollection(new BN(pid), collectionMint)
+            .closeLegacyCollection(new BN(pid), _collMint)
             .accountsStrict({
             collection,
             authority: this.provider.wallet.publicKey,
@@ -299,17 +309,19 @@ export class NftStakingClient {
             .instruction();
     }
     async createStakePool(stakingMode, rewardConfig, lockConfigs, collectionMint, opts) {
+        const _collMint = toPk(collectionMint);
+        const _rewardMint = toPk(rewardConfig.rewardMint);
         const pid = this.resolveProjectId(opts?.projectId);
         const rewardEndAt = opts?.rewardEndAt ?? 0;
         const maxStaked = opts?.maxStaked ?? 0;
         const config = await this.fetchStakeConfig(pid);
         const nextPoolId = config ? config.totalPools : 0;
-        const tokenProgram = await this.resolveTokenProgram(rewardConfig.rewardMint);
-        const decimals = await this.getMintDecimals(rewardConfig.rewardMint);
+        const tokenProgram = await this.resolveTokenProgram(_rewardMint);
+        const decimals = await this.getMintDecimals(_rewardMint);
         const multiplier = 10 ** decimals;
         const rawRewardConfig = {
             rewardType: rewardConfig.rewardType,
-            rewardMint: rewardConfig.rewardMint,
+            rewardMint: _rewardMint,
             baseRate: new BN(Math.round(rewardConfig.baseRate * multiplier)),
             rateInterval: new BN(rewardConfig.rateInterval),
             traitBonusMode: rewardConfig.traitBonusMode,
@@ -322,9 +334,9 @@ export class NftStakingClient {
         }));
         const [configPda] = getStakeConfigPda(pid);
         const [poolPda] = getStakePoolPda(pid, nextPoolId);
-        const [collectionConfigPda] = getCollectionPda(pid, collectionMint);
+        const [collectionConfigPda] = getCollectionPda(pid, _collMint);
         const [poolAuthority] = getPoolAuthorityPda(nextPoolId);
-        const rewardVault = getAta(poolAuthority, rewardConfig.rewardMint, tokenProgram);
+        const rewardVault = getAta(poolAuthority, _rewardMint, tokenProgram);
         const [utilityConfig] = getUtilityConfigPda(pid, this.program.programId);
         return this.program.methods
             .createStakePool(new BN(pid), stakingMode, rawRewardConfig, rawLockConfigs, new BN(rewardEndAt), new BN(maxStaked))
@@ -333,8 +345,8 @@ export class NftStakingClient {
             pool: poolPda,
             collectionConfig: collectionConfigPda,
             poolAuthority,
-            collectionMint,
-            rewardMint: rewardConfig.rewardMint,
+            collectionMint: _collMint,
+            rewardMint: _rewardMint,
             rewardVault,
             utilityConfig,
             projectManagementProgram: PROJECT_MANAGEMENT_PROGRAM_ID,
@@ -350,7 +362,7 @@ export class NftStakingClient {
         const rewardConfig = updates.rewardConfig ?? null;
         const lockConfigs = updates.lockConfigs ?? null;
         const isActive = updates.isActive ?? null;
-        const traitAuthority = updates.traitAuthority ?? null;
+        const traitAuthority = updates.traitAuthority != null ? toPk(updates.traitAuthority) : null;
         const canBurn = updates.canBurn ?? null;
         const merkleRoot = updates.merkleRoot ?? null;
         const gateType = updates.gateType ?? null;
@@ -359,11 +371,12 @@ export class NftStakingClient {
         let rawRewardConfig = null;
         let rawLockConfigs = null;
         if (rewardConfig) {
-            const decimals = await this.getMintDecimals(rewardConfig.rewardMint);
+            const _rMint = toPk(rewardConfig.rewardMint);
+            const decimals = await this.getMintDecimals(_rMint);
             const multiplier = 10 ** decimals;
             rawRewardConfig = {
                 rewardType: rewardConfig.rewardType,
-                rewardMint: rewardConfig.rewardMint,
+                rewardMint: _rMint,
                 baseRate: new BN(Math.round(rewardConfig.baseRate * multiplier)),
                 rateInterval: new BN(rewardConfig.rateInterval),
                 traitBonusMode: rewardConfig.traitBonusMode,
@@ -371,7 +384,7 @@ export class NftStakingClient {
             };
         }
         if (lockConfigs && rewardConfig) {
-            const decimals = await this.getMintDecimals(rewardConfig.rewardMint);
+            const decimals = await this.getMintDecimals(toPk(rewardConfig.rewardMint));
             const multiplier = 10 ** decimals;
             rawLockConfigs = lockConfigs.map((lc) => ({
                 lockDuration: new BN(lc.lockDuration),
@@ -402,14 +415,14 @@ export class NftStakingClient {
     async fundRewardVault(poolId, amount, opts) {
         const pid = this.resolveProjectId(opts?.projectId);
         const pool = await this.getPoolData(pid, poolId);
-        const rewardMint = opts?.rewardMint ?? new PublicKey(pool.rewardConfig.rewardMint);
+        const rewardMint = opts?.rewardMint ? toPk(opts.rewardMint) : new PublicKey(pool.rewardConfig.rewardMint);
         const tokenProgram = await this.resolveTokenProgram(rewardMint);
         const [poolPda] = getStakePoolPda(pid, poolId);
         const [poolAuthority] = getPoolAuthorityPda(poolId);
         const rewardVault = getAta(poolAuthority, rewardMint, tokenProgram);
-        const funderAta = opts?.funderTokenAccount ?? getAta(this.provider.wallet.publicKey, rewardMint, tokenProgram);
+        const funderAta = opts?.funderTokenAccount ? toPk(opts.funderTokenAccount) : getAta(this.provider.wallet.publicKey, rewardMint, tokenProgram);
         return this.program.methods
-            .fundRewardVault(new BN(pid), new BN(poolId), amount)
+            .fundRewardVault(new BN(pid), new BN(poolId), toBN(amount))
             .accountsStrict({
             pool: poolPda,
             poolAuthority,
@@ -425,14 +438,14 @@ export class NftStakingClient {
     async withdrawRewardVault(poolId, amount, opts) {
         const pid = this.resolveProjectId(opts?.projectId);
         const pool = await this.getPoolData(pid, poolId);
-        const rewardMint = opts?.rewardMint ?? new PublicKey(pool.rewardConfig.rewardMint);
+        const rewardMint = opts?.rewardMint ? toPk(opts.rewardMint) : new PublicKey(pool.rewardConfig.rewardMint);
         const tokenProgram = await this.resolveTokenProgram(rewardMint);
         const [poolPda] = getStakePoolPda(pid, poolId);
         const [poolAuthority] = getPoolAuthorityPda(poolId);
         const rewardVault = getAta(poolAuthority, rewardMint, tokenProgram);
-        const destAta = opts?.destinationTokenAccount ?? getAta(this.provider.wallet.publicKey, rewardMint, tokenProgram);
+        const destAta = opts?.destinationTokenAccount ? toPk(opts.destinationTokenAccount) : getAta(this.provider.wallet.publicKey, rewardMint, tokenProgram);
         return this.program.methods
-            .withdrawRewardVault(new BN(pid), new BN(poolId), amount)
+            .withdrawRewardVault(new BN(pid), new BN(poolId), toBN(amount))
             .accountsStrict({
             pool: poolPda,
             poolAuthority,
@@ -451,40 +464,44 @@ export class NftStakingClient {
             .closeStakePool(new BN(pid), new BN(poolId))
             .accountsStrict({
             pool: poolPda,
+            rewardVault: null,
+            tokenProgram: null,
             authority: this.provider.wallet.publicKey,
         })
             .instruction();
     }
     /** Stake a legacy/pNFT. Auto-resolves stakingMode from pool. */
     async stakeNft(poolId, nftMint, opts) {
+        const _nftMint = toPk(nftMint);
         const pid = this.resolveProjectId(opts?.projectId);
         const pool = await this.getPoolData(pid, poolId);
         const stakingMode = pool.stakingMode;
         const lockTierIndex = opts?.lockTierIndex ?? null;
         const gateProof = opts?.gateProof ?? [];
         const [poolPda] = getStakePoolPda(pid, poolId);
-        const [stakeEntry] = getStakeEntryPda(poolId, nftMint);
+        const [stakeEntry] = getStakeEntryPda(poolId, _nftMint);
         const staker = this.provider.wallet.publicKey;
         const [stakerAccount] = getStakerAccountPda(poolId, staker);
         const [poolAuthority] = getPoolAuthorityPda(poolId);
-        const nftTokenProgram = await this.resolveTokenProgram(nftMint);
-        const stakerNftAccount = getAta(staker, nftMint, nftTokenProgram);
+        const nftTokenProgram = await this.resolveTokenProgram(_nftMint);
+        const stakerNftAccount = getAta(staker, _nftMint, nftTokenProgram);
         const isEscrow = stakingMode !== 1;
         const escrowNftAccount = isEscrow
-            ? getAta(poolAuthority, nftMint, nftTokenProgram)
+            ? getAta(poolAuthority, _nftMint, nftTokenProgram)
             : null;
-        const nftMetadata = getMetadataPda(nftMint);
-        const nftEdition = getEditionPda(nftMint);
+        const nftMetadata = getMetadataPda(_nftMint);
+        const nftEdition = getEditionPda(_nftMint);
         const feeAccts = this.resolveFeeAccounts(opts?.fee);
+        const [project] = getProjectPda(pid);
         const [utilityConfig] = getUtilityConfigPda(pid, this.program.programId);
         return this.program.methods
-            .stakeNft(new BN(pid), new BN(poolId), nftMint, lockTierIndex, gateProof)
+            .stakeNft(new BN(pid), new BN(poolId), _nftMint, lockTierIndex, gateProof)
             .accountsStrict({
             pool: poolPda,
             stakeEntry,
             stakerAccount,
             poolAuthority,
-            nftMint,
+            nftMint: _nftMint,
             stakerNftAccount,
             escrowNftAccount,
             nftMetadata,
@@ -495,10 +512,12 @@ export class NftStakingClient {
             destinationTokenRecord: null,
             utilityConfig,
             feeConfig: feeAccts.feeConfig,
+            programRegistry: feeAccts.programRegistry,
             treasury: feeAccts.treasury,
             referralAccount: feeAccts.referralAccount,
             solUsdPriceFeed: feeAccts.solUsdPriceFeed,
             adminProgram: feeAccts.adminProgram,
+            project,
             staker,
             tokenProgram: nftTokenProgram,
             associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -508,35 +527,35 @@ export class NftStakingClient {
     }
     /** Unstake a legacy/pNFT. Auto-resolves rewardMint and stakingMode from pool. */
     async unstakeNft(poolId, nftMint, opts) {
+        const _nftMint = toPk(nftMint);
         const pid = this.resolveProjectId(opts?.projectId);
         const pool = await this.getPoolData(pid, poolId);
         const rewardMint = new PublicKey(pool.rewardConfig.rewardMint);
         const stakingMode = pool.stakingMode;
         const rewardTokenProgram = await this.resolveTokenProgram(rewardMint);
-        const nftTokenProgram = await this.resolveTokenProgram(nftMint);
+        const nftTokenProgram = await this.resolveTokenProgram(_nftMint);
         const [poolPda] = getStakePoolPda(pid, poolId);
-        const [stakeEntry] = getStakeEntryPda(poolId, nftMint);
+        const [stakeEntry] = getStakeEntryPda(poolId, _nftMint);
         const staker = this.provider.wallet.publicKey;
         const [stakerAccount] = getStakerAccountPda(poolId, staker);
         const [poolAuthority] = getPoolAuthorityPda(poolId);
-        const stakerNftAccount = getAta(staker, nftMint, nftTokenProgram);
+        const stakerNftAccount = getAta(staker, _nftMint, nftTokenProgram);
         const isEscrow = stakingMode !== 1;
         const escrowNftAccount = isEscrow
-            ? getAta(poolAuthority, nftMint, nftTokenProgram)
+            ? getAta(poolAuthority, _nftMint, nftTokenProgram)
             : null;
         const rewardVault = getAta(poolAuthority, rewardMint, rewardTokenProgram);
         const stakerRewardAccount = getAta(staker, rewardMint, rewardTokenProgram);
-        const nftMetadata = getMetadataPda(nftMint);
-        const nftEdition = getEditionPda(nftMint);
-        const feeAccts = this.resolveFeeAccounts(opts?.fee);
+        const nftMetadata = getMetadataPda(_nftMint);
+        const nftEdition = getEditionPda(_nftMint);
         return this.program.methods
-            .unstakeNft(new BN(pid), new BN(poolId), nftMint)
+            .unstakeNft(new BN(pid), new BN(poolId), _nftMint)
             .accountsStrict({
             pool: poolPda,
             stakeEntry,
             stakerAccount,
             poolAuthority,
-            nftMint,
+            nftMint: _nftMint,
             stakerNftAccount,
             escrowNftAccount,
             rewardVault,
@@ -548,11 +567,6 @@ export class NftStakingClient {
             sysvarInstructions: SYSVAR_INSTRUCTIONS_ID,
             tokenRecord: null,
             destinationTokenRecord: null,
-            feeConfig: feeAccts.feeConfig,
-            treasury: feeAccts.treasury,
-            referralAccount: feeAccts.referralAccount,
-            solUsdPriceFeed: feeAccts.solUsdPriceFeed,
-            adminProgram: feeAccts.adminProgram,
             staker,
             tokenProgram: nftTokenProgram,
             rewardTokenProgram,
@@ -576,6 +590,7 @@ export class NftStakingClient {
         const stakerRewardAccount = getAta(staker, rewardMint, tokenProgram);
         const [stakeConfig] = getStakeConfigPda(pid);
         const feeAccts = this.resolveFeeAccounts(opts?.fee);
+        const [project] = getProjectPda(pid);
         return this.program.methods
             .claimRewards(new BN(pid), new BN(poolId), traitBonusRate)
             .accountsStrict({
@@ -588,10 +603,12 @@ export class NftStakingClient {
             stakeConfig,
             instructionsSysvar: new PublicKey("Sysvar1nstructions1111111111111111111111111"),
             feeConfig: feeAccts.feeConfig,
+            programRegistry: feeAccts.programRegistry,
             treasury: feeAccts.treasury,
             referralAccount: feeAccts.referralAccount,
             solUsdPriceFeed: feeAccts.solUsdPriceFeed,
             adminProgram: feeAccts.adminProgram,
+            project,
             staker,
             tokenProgram,
             associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -601,34 +618,38 @@ export class NftStakingClient {
     }
     /** Stake a Core NFT. Auto-resolves collection from pool. */
     async stakeCoreNft(poolId, nftAsset, opts) {
+        const _nftAsset = toPk(nftAsset);
         const pid = this.resolveProjectId(opts?.projectId);
         const pool = await this.getPoolData(pid, poolId);
         const collection = new PublicKey(pool.collectionMint);
         const lockTierIndex = opts?.lockTierIndex ?? null;
         const gateProof = opts?.gateProof ?? [];
         const [poolPda] = getStakePoolPda(pid, poolId);
-        const [stakeEntry] = getStakeEntryPda(poolId, nftAsset);
+        const [stakeEntry] = getStakeEntryPda(poolId, _nftAsset);
         const staker = this.provider.wallet.publicKey;
         const [stakerAccount] = getStakerAccountPda(poolId, staker);
         const [poolAuthority] = getPoolAuthorityPda(poolId);
         const feeAccts = this.resolveFeeAccounts(opts?.fee);
+        const [project] = getProjectPda(pid);
         const [utilityConfig] = getUtilityConfigPda(pid, this.program.programId);
         return this.program.methods
-            .stakeCoreNft(new BN(pid), new BN(poolId), nftAsset, lockTierIndex, gateProof)
+            .stakeCoreNft(new BN(pid), new BN(poolId), _nftAsset, lockTierIndex, gateProof)
             .accountsStrict({
             pool: poolPda,
             stakeEntry,
             stakerAccount,
             poolAuthority,
-            nftAsset,
+            nftAsset: _nftAsset,
             collection,
             mplCoreProgram: MPL_CORE_PROGRAM_ID,
             utilityConfig,
             feeConfig: feeAccts.feeConfig,
+            programRegistry: feeAccts.programRegistry,
             treasury: feeAccts.treasury,
             referralAccount: feeAccts.referralAccount,
             solUsdPriceFeed: feeAccts.solUsdPriceFeed,
             adminProgram: feeAccts.adminProgram,
+            project,
             staker,
             systemProgram: SystemProgram.programId,
         })
@@ -636,37 +657,32 @@ export class NftStakingClient {
     }
     /** Unstake a Core NFT. Auto-resolves collection and rewardMint from pool. */
     async unstakeCoreNft(poolId, nftAsset, opts) {
+        const _nftAsset = toPk(nftAsset);
         const pid = this.resolveProjectId(opts?.projectId);
         const pool = await this.getPoolData(pid, poolId);
         const collection = new PublicKey(pool.collectionMint);
         const rewardMint = new PublicKey(pool.rewardConfig.rewardMint);
         const rewardTokenProgram = await this.resolveTokenProgram(rewardMint);
         const [poolPda] = getStakePoolPda(pid, poolId);
-        const [stakeEntry] = getStakeEntryPda(poolId, nftAsset);
+        const [stakeEntry] = getStakeEntryPda(poolId, _nftAsset);
         const staker = this.provider.wallet.publicKey;
         const [stakerAccount] = getStakerAccountPda(poolId, staker);
         const [poolAuthority] = getPoolAuthorityPda(poolId);
         const rewardVault = getAta(poolAuthority, rewardMint, rewardTokenProgram);
         const stakerRewardAccount = getAta(staker, rewardMint, rewardTokenProgram);
-        const feeAccts = this.resolveFeeAccounts(opts?.fee);
         return this.program.methods
-            .unstakeCoreNft(new BN(pid), new BN(poolId), nftAsset)
+            .unstakeCoreNft(new BN(pid), new BN(poolId), _nftAsset)
             .accountsStrict({
             pool: poolPda,
             stakeEntry,
             stakerAccount,
             poolAuthority,
-            nftAsset,
+            nftAsset: _nftAsset,
             collection,
             mplCoreProgram: MPL_CORE_PROGRAM_ID,
             rewardVault,
             stakerRewardAccount,
             rewardMint,
-            feeConfig: feeAccts.feeConfig,
-            treasury: feeAccts.treasury,
-            referralAccount: feeAccts.referralAccount,
-            solUsdPriceFeed: feeAccts.solUsdPriceFeed,
-            adminProgram: feeAccts.adminProgram,
             staker,
             rewardTokenProgram,
             associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -691,6 +707,7 @@ export class NftStakingClient {
         const [stakerAccount] = getStakerAccountPda(poolId, staker);
         const [poolAuthority] = getPoolAuthorityPda(poolId);
         const feeAccts = this.resolveFeeAccounts(opts?.fee);
+        const [project] = getProjectPda(pid);
         const [utilityConfig] = getUtilityConfigPda(pid, this.program.programId);
         const remainingAccounts = proofNodes.map((node) => ({
             pubkey: new PublicKey(node),
@@ -711,10 +728,12 @@ export class NftStakingClient {
             bubblegumProgram: BUBBLEGUM_PROGRAM_ID,
             utilityConfig,
             feeConfig: feeAccts.feeConfig,
+            programRegistry: feeAccts.programRegistry,
             treasury: feeAccts.treasury,
             referralAccount: feeAccts.referralAccount,
             solUsdPriceFeed: feeAccts.solUsdPriceFeed,
             adminProgram: feeAccts.adminProgram,
+            project,
             staker,
             systemProgram: SystemProgram.programId,
         })
@@ -738,7 +757,6 @@ export class NftStakingClient {
         const staker = this.provider.wallet.publicKey;
         const [stakerAccount] = getStakerAccountPda(poolId, staker);
         const [poolAuthority] = getPoolAuthorityPda(poolId);
-        const feeAccts = this.resolveFeeAccounts(opts?.fee);
         const rewardVaultPk = getAta(poolAuthority, rewardMintPk);
         const stakerRewardAccountPk = getAta(staker, rewardMintPk);
         const remainingAccounts = proofNodes.map((node) => ({
@@ -761,11 +779,6 @@ export class NftStakingClient {
             rewardVault: rewardVaultPk,
             stakerRewardAccount: stakerRewardAccountPk,
             rewardMint: rewardMintPk,
-            feeConfig: feeAccts.feeConfig,
-            treasury: feeAccts.treasury,
-            referralAccount: feeAccts.referralAccount,
-            solUsdPriceFeed: feeAccts.solUsdPriceFeed,
-            adminProgram: feeAccts.adminProgram,
             staker,
             tokenProgram: TOKEN_PROGRAM_ID,
             associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -776,29 +789,31 @@ export class NftStakingClient {
     }
     /** Burn a permanently-locked legacy/pNFT. Auto-resolves stakingMode from pool. */
     async burnStakedNft(poolId, nftMint, opts) {
+        const _nftMint = toPk(nftMint);
         const pid = this.resolveProjectId(opts?.projectId);
         const pool = await this.getPoolData(pid, poolId);
         const stakingMode = pool.stakingMode;
-        const nftTokenProgram = await this.resolveTokenProgram(nftMint);
+        const nftTokenProgram = await this.resolveTokenProgram(_nftMint);
         const [poolPda] = getStakePoolPda(pid, poolId);
-        const [stakeEntry] = getStakeEntryPda(poolId, nftMint);
+        const [stakeEntry] = getStakeEntryPda(poolId, _nftMint);
         const staker = this.provider.wallet.publicKey;
         const [stakerAccount] = getStakerAccountPda(poolId, staker);
         const [poolAuthority] = getPoolAuthorityPda(poolId);
         const feeAccts = this.resolveFeeAccounts(opts?.fee);
+        const [project] = getProjectPda(pid);
         const isWalletLock = stakingMode === 1;
-        const escrowNftAccount = isWalletLock ? null : getAta(poolAuthority, nftMint, nftTokenProgram);
-        const stakerNftAccount = isWalletLock ? getAta(staker, nftMint, nftTokenProgram) : null;
-        const nftMetadata = isWalletLock ? getMetadataPda(nftMint) : null;
-        const nftEdition = isWalletLock ? getEditionPda(nftMint) : null;
+        const escrowNftAccount = isWalletLock ? null : getAta(poolAuthority, _nftMint, nftTokenProgram);
+        const stakerNftAccount = isWalletLock ? getAta(staker, _nftMint, nftTokenProgram) : null;
+        const nftMetadata = isWalletLock ? getMetadataPda(_nftMint) : null;
+        const nftEdition = isWalletLock ? getEditionPda(_nftMint) : null;
         return this.program.methods
-            .burnStakedNft(new BN(pid), new BN(poolId), nftMint)
+            .burnStakedNft(new BN(pid), new BN(poolId), _nftMint)
             .accountsStrict({
             pool: poolPda,
             stakeEntry,
             stakerAccount,
             poolAuthority,
-            nftMint,
+            nftMint: _nftMint,
             escrowNftAccount,
             stakerNftAccount,
             nftMetadata,
@@ -808,10 +823,12 @@ export class NftStakingClient {
             tokenRecord: null,
             collectionMetadata: null,
             feeConfig: feeAccts.feeConfig,
+            programRegistry: feeAccts.programRegistry,
             treasury: feeAccts.treasury,
             referralAccount: feeAccts.referralAccount,
             solUsdPriceFeed: feeAccts.solUsdPriceFeed,
             adminProgram: feeAccts.adminProgram,
+            project,
             staker,
             tokenProgram: nftTokenProgram,
             systemProgram: SystemProgram.programId,
@@ -820,30 +837,34 @@ export class NftStakingClient {
     }
     /** Burn a permanently-locked Core NFT. Auto-resolves collection from pool. */
     async burnStakedCoreNft(poolId, nftAsset, opts) {
+        const _nftAsset = toPk(nftAsset);
         const pid = this.resolveProjectId(opts?.projectId);
         const pool = await this.getPoolData(pid, poolId);
         const collection = new PublicKey(pool.collectionMint);
         const [poolPda] = getStakePoolPda(pid, poolId);
-        const [stakeEntry] = getStakeEntryPda(poolId, nftAsset);
+        const [stakeEntry] = getStakeEntryPda(poolId, _nftAsset);
         const staker = this.provider.wallet.publicKey;
         const [stakerAccount] = getStakerAccountPda(poolId, staker);
         const [poolAuthority] = getPoolAuthorityPda(poolId);
         const feeAccts = this.resolveFeeAccounts(opts?.fee);
+        const [project] = getProjectPda(pid);
         return this.program.methods
-            .burnStakedCoreNft(new BN(pid), new BN(poolId), nftAsset)
+            .burnStakedCoreNft(new BN(pid), new BN(poolId), _nftAsset)
             .accountsStrict({
             pool: poolPda,
             stakeEntry,
             stakerAccount,
             poolAuthority,
-            nftAsset,
+            nftAsset: _nftAsset,
             collection,
             mplCoreProgram: MPL_CORE_PROGRAM_ID,
             feeConfig: feeAccts.feeConfig,
+            programRegistry: feeAccts.programRegistry,
             treasury: feeAccts.treasury,
             referralAccount: feeAccts.referralAccount,
             solUsdPriceFeed: feeAccts.solUsdPriceFeed,
             adminProgram: feeAccts.adminProgram,
+            project,
             staker,
             systemProgram: SystemProgram.programId,
         })
@@ -856,16 +877,19 @@ export class NftStakingClient {
         const staker = this.provider.wallet.publicKey;
         const [stakerAccount] = getStakerAccountPda(poolId, staker);
         const feeAccts = this.resolveFeeAccounts(opts?.fee);
+        const [project] = getProjectPda(pid);
         return this.program.methods
-            .spendPoints(new BN(pid), new BN(poolId), amount)
+            .spendPoints(new BN(pid), new BN(poolId), toBN(amount))
             .accountsStrict({
             pool: poolPda,
             stakerAccount,
             feeConfig: feeAccts.feeConfig,
+            programRegistry: feeAccts.programRegistry,
             treasury: feeAccts.treasury,
             referralAccount: feeAccts.referralAccount,
             solUsdPriceFeed: feeAccts.solUsdPriceFeed,
             adminProgram: feeAccts.adminProgram,
+            project,
             staker,
             systemProgram: SystemProgram.programId,
         })
@@ -879,7 +903,7 @@ export class NftStakingClient {
         return decodeAccount(raw);
     }
     async fetchStakerSecondaryRewards(poolId, wallet) {
-        const [pda] = getStakerSecondaryRewardsPda(poolId, wallet);
+        const [pda] = getStakerSecondaryRewardsPda(poolId, toPk(wallet));
         const raw = await this.program.account.stakerSecondaryRewards.fetchNullable(pda);
         if (!raw)
             return null;
@@ -887,18 +911,19 @@ export class NftStakingClient {
     }
     async addPoolSecondaryReward(poolId, rewardMint, baseRate, lockTierRates, projectId) {
         const pid = this.resolveProjectId(projectId);
+        const _rewardMint = toPk(rewardMint);
         const [poolPda] = getStakePoolPda(pid, poolId);
         const [poolSecondary] = getPoolSecondaryRewardsPda(poolId);
         const [poolAuthority] = getPoolAuthorityPda(poolId);
-        const tokenProgram = await this.resolveTokenProgram(rewardMint);
-        const vault = getAta(poolAuthority, rewardMint, tokenProgram);
+        const tokenProgram = await this.resolveTokenProgram(_rewardMint);
+        const vault = getAta(poolAuthority, _rewardMint, tokenProgram);
         return this.program.methods
-            .addPoolSecondaryReward(new BN(pid), new BN(poolId), baseRate, lockTierRates)
+            .addPoolSecondaryReward(new BN(pid), new BN(poolId), toBN(baseRate), lockTierRates.map(toBN))
             .accountsStrict({
             pool: poolPda,
             poolSecondary,
             poolAuthority,
-            secondaryRewardMint: rewardMint,
+            secondaryRewardMint: _rewardMint,
             secondaryVault: vault,
             authority: this.provider.wallet.publicKey,
             tokenProgram,
@@ -922,21 +947,22 @@ export class NftStakingClient {
     }
     async fundSecondaryVault(poolId, rewardIndex, amount, rewardMint, opts) {
         const pid = this.resolveProjectId(opts?.projectId);
-        const tokenProgram = await this.resolveTokenProgram(rewardMint);
+        const _rewardMint = toPk(rewardMint);
+        const tokenProgram = await this.resolveTokenProgram(_rewardMint);
         const [poolPda] = getStakePoolPda(pid, poolId);
         const [poolSecondary] = getPoolSecondaryRewardsPda(poolId);
         const [poolAuthority] = getPoolAuthorityPda(poolId);
-        const vault = getAta(poolAuthority, rewardMint, tokenProgram);
-        const funderAta = opts?.funderTokenAccount ?? getAta(this.provider.wallet.publicKey, rewardMint, tokenProgram);
+        const vault = getAta(poolAuthority, _rewardMint, tokenProgram);
+        const funderAta = opts?.funderTokenAccount ? toPk(opts.funderTokenAccount) : getAta(this.provider.wallet.publicKey, _rewardMint, tokenProgram);
         return this.program.methods
-            .fundSecondaryVault(new BN(pid), new BN(poolId), rewardIndex, amount)
+            .fundSecondaryVault(new BN(pid), new BN(poolId), rewardIndex, toBN(amount))
             .accountsStrict({
             pool: poolPda,
             poolSecondary,
             poolAuthority,
             secondaryVault: vault,
             funderTokenAccount: funderAta,
-            secondaryRewardMint: rewardMint,
+            secondaryRewardMint: _rewardMint,
             authority: this.provider.wallet.publicKey,
             tokenProgram,
         })
@@ -944,21 +970,22 @@ export class NftStakingClient {
     }
     async withdrawSecondaryVault(poolId, rewardIndex, amount, rewardMint, opts) {
         const pid = this.resolveProjectId(opts?.projectId);
-        const tokenProgram = await this.resolveTokenProgram(rewardMint);
+        const _rewardMint = toPk(rewardMint);
+        const tokenProgram = await this.resolveTokenProgram(_rewardMint);
         const [poolPda] = getStakePoolPda(pid, poolId);
         const [poolSecondary] = getPoolSecondaryRewardsPda(poolId);
         const [poolAuthority] = getPoolAuthorityPda(poolId);
-        const vault = getAta(poolAuthority, rewardMint, tokenProgram);
-        const destAta = opts?.destinationTokenAccount ?? getAta(this.provider.wallet.publicKey, rewardMint, tokenProgram);
+        const vault = getAta(poolAuthority, _rewardMint, tokenProgram);
+        const destAta = opts?.destinationTokenAccount ? toPk(opts.destinationTokenAccount) : getAta(this.provider.wallet.publicKey, _rewardMint, tokenProgram);
         return this.program.methods
-            .withdrawSecondaryVault(new BN(pid), new BN(poolId), rewardIndex, amount)
+            .withdrawSecondaryVault(new BN(pid), new BN(poolId), rewardIndex, toBN(amount))
             .accountsStrict({
             pool: poolPda,
             poolSecondary,
             poolAuthority,
             secondaryVault: vault,
             destinationTokenAccount: destAta,
-            secondaryRewardMint: rewardMint,
+            secondaryRewardMint: _rewardMint,
             authority: this.provider.wallet.publicKey,
             tokenProgram,
         })
@@ -990,12 +1017,14 @@ export class NftStakingClient {
         const [stakerSecondary] = getStakerSecondaryRewardsPda(poolId, staker);
         const [poolAuthority] = getPoolAuthorityPda(poolId);
         const feeAccts = this.resolveFeeAccounts(opts?.fee);
+        const [project] = getProjectPda(pid);
         const remainingAccounts = [];
         for (const sr of secondaryRewards) {
-            const tokenProgram = await this.resolveTokenProgram(sr.mint);
-            const vault = getAta(poolAuthority, sr.mint, tokenProgram);
-            const stakerAta = getAta(staker, sr.mint, tokenProgram);
-            remainingAccounts.push({ pubkey: vault, isSigner: false, isWritable: true }, { pubkey: stakerAta, isSigner: false, isWritable: true }, { pubkey: sr.mint, isSigner: false, isWritable: false }, { pubkey: tokenProgram, isSigner: false, isWritable: false });
+            const _srMint = toPk(sr.mint);
+            const tokenProgram = await this.resolveTokenProgram(_srMint);
+            const vault = getAta(poolAuthority, _srMint, tokenProgram);
+            const stakerAta = getAta(staker, _srMint, tokenProgram);
+            remainingAccounts.push({ pubkey: vault, isSigner: false, isWritable: true }, { pubkey: stakerAta, isSigner: false, isWritable: true }, { pubkey: _srMint, isSigner: false, isWritable: false }, { pubkey: tokenProgram, isSigner: false, isWritable: false });
         }
         return this.program.methods
             .claimSecondaryRewards(new BN(pid), new BN(poolId))
@@ -1006,10 +1035,12 @@ export class NftStakingClient {
             stakerSecondary,
             poolAuthority,
             feeConfig: feeAccts.feeConfig,
+            programRegistry: feeAccts.programRegistry,
             treasury: feeAccts.treasury,
             referralAccount: feeAccts.referralAccount,
             solUsdPriceFeed: feeAccts.solUsdPriceFeed,
             adminProgram: feeAccts.adminProgram,
+            project,
             staker,
             tokenProgram: TOKEN_PROGRAM_ID,
             associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -1018,5 +1049,18 @@ export class NftStakingClient {
             .remainingAccounts(remainingAccounts)
             .instruction();
     }
+    async updatePoolSecondaryReward(poolId, rewardIndex, baseRate, lockTierRates, projectId) {
+        const pid = this.resolveProjectId(projectId);
+        const [poolPda] = getStakePoolPda(pid, poolId);
+        const [poolSecondary] = getPoolSecondaryRewardsPda(poolId);
+        return this.program.methods
+            .updatePoolSecondaryReward(new BN(pid), new BN(poolId), rewardIndex, toBN(baseRate), lockTierRates.map(toBN))
+            .accountsStrict({
+            pool: poolPda,
+            poolSecondary,
+            authority: this.provider.wallet.publicKey,
+        })
+            .instruction();
+    }
 }
 //# sourceMappingURL=client.js.map