@wireio/stake 2.3.0 → 2.3.1

package/lib/stake.browser.js

@@ -15040,6 +15040,7 @@ let ConvertClient$1 = class ConvertClient {
   }
 };
 
+const INDEX_SCALE_BN = new BN("1000000000000");
 class DistributionClient {
   constructor(provider, pgs) {
     this.provider = provider;
@@ -15049,6 +15050,14 @@ class DistributionClient {
   get connection() {
     return this.provider.connection;
   }
+  async getTokenBalance(ata) {
+    try {
+      const bal = await this.connection.getTokenAccountBalance(ata);
+      return new BN(bal.value.amount);
+    } catch {
+      return new BN(0);
+    }
+  }
   async getDistributionState() {
     const pda = this.pgs.deriveDistributionStatePda();
     try {
@@ -15116,6 +15125,81 @@ class DistributionClient {
     }
     return { shares: userShares, totalShares, ratio };
   }
+  async getClaimableLiqsol(user) {
+    const liqsolMint = this.pgs.deriveLiqsolMintPda();
+    const bucketAuthority = this.pgs.deriveBucketAuthorityPda();
+    const userAta = getAssociatedTokenAddressSync(
+      liqsolMint,
+      user,
+      true,
+      TOKEN_2022_PROGRAM_ID
+    );
+    const bucketTokenAccount = getAssociatedTokenAddressSync(
+      liqsolMint,
+      bucketAuthority,
+      true,
+      TOKEN_2022_PROGRAM_ID
+    );
+    const [distributionState, userRecord, actualBalance, bucketBalance] = await Promise.all([
+      this.getDistributionState(),
+      this.getUserRecord(user),
+      this.getTokenBalance(userAta),
+      this.getTokenBalance(bucketTokenAccount)
+    ]);
+    if (!distributionState || !userRecord) {
+      return new BN(0);
+    }
+    let syncedIndex = new BN(distributionState.currentIndex.toString());
+    const totalShares = new BN(distributionState.totalShares.toString());
+    const lastBucketBalance = new BN(distributionState.lastBucketBalance.toString());
+    if (totalShares.gt(new BN(0)) && bucketBalance.gt(lastBucketBalance)) {
+      const delta = bucketBalance.sub(lastBucketBalance);
+      const indexDelta = delta.mul(INDEX_SCALE_BN).div(totalShares);
+      if (indexDelta.gt(new BN(0))) {
+        syncedIndex = syncedIndex.add(indexDelta);
+      }
+    }
+    const shares = new BN(userRecord.shares.toString());
+    const entitled = shares.mul(syncedIndex).div(INDEX_SCALE_BN);
+    if (entitled.lte(actualBalance)) {
+      return new BN(0);
+    }
+    return entitled.sub(actualBalance);
+  }
+  async buildClaimRewardsIx(user) {
+    const liqsolMint = this.pgs.deriveLiqsolMintPda();
+    const distributionState = this.pgs.deriveDistributionStatePda();
+    const bucketAuthority = this.pgs.deriveBucketAuthorityPda();
+    const userAta = getAssociatedTokenAddressSync(
+      liqsolMint,
+      user,
+      true,
+      TOKEN_2022_PROGRAM_ID
+    );
+    const bucketTokenAccount = getAssociatedTokenAddressSync(
+      liqsolMint,
+      bucketAuthority,
+      true,
+      TOKEN_2022_PROGRAM_ID
+    );
+    const userRecord = this.pgs.deriveUserRecordPda(userAta);
+    const bucketUserRecord = this.pgs.deriveUserRecordPda(bucketTokenAccount);
+    const extraAccountMetaList = this.pgs.deriveExtraAccountMetaListPda(liqsolMint);
+    return this.program.methods.claimRewards().accounts({
+      user,
+      userAta,
+      userRecord,
+      bucketUserRecord,
+      distributionState,
+      extraAccountMetaList,
+      liqsolCoreProgram: this.pgs.PROGRAM_IDS.LIQSOL_CORE,
+      transferHookProgram: this.pgs.PROGRAM_IDS.TRANSFER_HOOK,
+      liqsolMint,
+      bucketAuthority,
+      bucketTokenAccount,
+      tokenProgram: TOKEN_2022_PROGRAM_ID
+    }).instruction();
+  }
   async getAverageScaledPayRate(windowSize = 5) {
     const history = await this.getPayRateHistory();
     if (!history) {
@@ -15872,6 +15956,17 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       throw err;
     }
   }
+  async claimLiqsolRewards() {
+    this.ensureUser();
+    const owner = this.squadsVaultPDA ?? this.anchor.wallet.publicKey;
+    try {
+      const ix = await this.distributionClient.buildClaimRewardsIx(owner);
+      return !!this.squadsX ? await this.sendSquadsIxs(ix) : await this.buildAndSendIx(ix);
+    } catch (err) {
+      console.log(`Failed to claim liqSOL rewards on Solana: ${err}`);
+      throw err;
+    }
+  }
   async stake(amountLamports) {
     this.ensureUser();
     if (!amountLamports || amountLamports <= BigInt(0))
@@ -15921,10 +16016,11 @@ const _SolanaStakingClient = class _SolanaStakingClient {
         TOKEN_2022_PROGRAM_ID,
         ASSOCIATED_TOKEN_PROGRAM_ID
       );
-      const [nativeLamports, actualBalResp, snapshot] = await Promise.all([
+      const [nativeLamports, actualBalResp, snapshot, claimableLamports] = await Promise.all([
         this.connection.getBalance(user, "confirmed"),
         this.connection.getTokenAccountBalance(userLiqsolAta, "confirmed").catch(() => null),
-        this.outpostClient.fetchWireState(user).catch(() => null)
+        this.outpostClient.fetchWireState(user).catch(() => null),
+        this.distributionClient.getClaimableLiqsol(user).catch(() => new BN(0))
       ]);
       const LIQSOL_DECIMALS = 9;
       const actualAmountStr = actualBalResp?.value?.amount ?? "0";
@@ -15961,6 +16057,12 @@ const _SolanaStakingClient = class _SolanaStakingClient {
           decimals: LIQSOL_DECIMALS,
           ata: userLiqsolAta
         },
+        claimable: {
+          amount: BigInt(claimableLamports.toString()),
+          symbol: "LiqSOL",
+          decimals: LIQSOL_DECIMALS,
+          ata: userLiqsolAta
+        },
         staked: {
           amount: stakedLiqsol,
           symbol: "LiqSOL",
@@ -41534,6 +41636,9 @@ class EthereumStakingClient {
   get network() {
     return this.config.network;
   }
+  get address() {
+    return this.signer?.getAddress();
+  }
   async deposit(amount) {
     this.ensureUser();
     const amountWei = BigNumber.isBigNumber(amount) ? amount : BigNumber.from(amount);
@@ -41542,14 +41647,14 @@ class EthereumStakingClient {
   }
   async withdraw(amount) {
     this.ensureUser();
-    const address = await this.signer.getAddress();
+    const address = await this.address;
     const amountWei = BigNumber.from(amount);
     const result = await this.convertClient.performWithdraw(address, amountWei);
     return result.txHash;
   }
   async getPendingWithdraws() {
     this.ensureUser();
-    const address = await this.signer.getAddress();
+    const address = await this.address;
     return await this.receiptClient.fetchWithdrawReceipts(address);
   }
   async claimWithdraw(tokenId) {
@@ -41560,7 +41665,7 @@ class EthereumStakingClient {
   }
   async stake(amount) {
     this.ensureUser();
-    const walletAddress = await this.signer.getAddress();
+    const walletAddress = await this.address;
     const amountWei = BigNumber.from(amount);
     const result = await this.stakeClient.performStake(amountWei, walletAddress);
     return result.txHash;
@@ -41576,7 +41681,7 @@ class EthereumStakingClient {
   }
   async buy(amount) {
     this.ensureUser();
-    const buyer = await this.signer.getAddress();
+    const buyer = await this.address;
     let result = await this.pretokenClient.purchasePretokensWithLiqETH(amount, buyer);
     return result && result.txHash ? result.txHash : "Error - no resulting txHash";
   }
@@ -41588,7 +41693,7 @@ class EthereumStakingClient {
   async getPortfolio() {
     try {
       if (!this.signer) return Promise.resolve(null);
-      const walletAddress = await this.signer.getAddress();
+      const walletAddress = await this.address;
       const nativeBalance = await this.provider.getBalance(walletAddress);
       const nativeDecimals = this.network?.nativeCurrency?.decimals ?? 18;
       const nativeSymbol = this.network?.nativeCurrency?.symbol ?? "ETH";
@@ -41666,12 +41771,12 @@ class EthereumStakingClient {
   }
   async fetchPrelaunchReceipts(address) {
     this.ensureUser();
-    if (address === void 0) address = await this.signer.getAddress();
+    if (address === void 0) address = await this.address;
     return await this.receiptClient.stakeReceipts(address);
   }
   async getOPPMessages(address) {
     this.ensureUser();
-    if (!address) address = await this.signer.getAddress();
+    if (!address) address = await this.address;
     return await this.oppClient.getMessages(address);
   }
   ensureUser() {
@@ -41746,7 +41851,7 @@ class EthereumStakingClient {
   }
   async getDepositBuffer(options) {
     this.ensureUser();
-    const walletAddress = await this.signer.getAddress();
+    const walletAddress = await this.address;
     const baseGas = await this.provider.estimateGas({
       from: walletAddress,
       to: walletAddress,