@wireio/stake 2.1.1 → 2.2.1

package/lib/stake.d.ts

@@ -1323,6 +1323,7 @@ type SolanaProgramIds = {
     LIQSOL_TOKEN: PublicKey$1;
     VALIDATOR_LEADERBOARD: PublicKey$1;
     TRANSFER_HOOK: PublicKey$1;
+    ALT_LOOKUP_TABLE: PublicKey$1;
 };
 declare const PROGRAM_IDS_BY_CHAIN: Record<SupportedSolChainID, SolanaProgramIds>;
 declare const getProgramIds: (chainId: SolChainID) => SolanaProgramIds;
@@ -15395,13 +15396,7 @@ declare class DepositClient {
      *  - increments totalEncumberedFunds in global state
      *  - mints an NFT receipt (liqReceiptData + NFT ATA for owner)
      */
-    buildWithdrawTx(amount: bigint, user?: PublicKey$1): Promise<Transaction>;
-    /**
-     * Internal helper: build the liqsol_core::deposit instruction for a specific `user`.
-     * This is the exact same account wiring as buildDepositTx(), but returns the IX
-     * plus useful this.pgs.derived addresses/seed for Squads flows.
-     */
-    private buildDepositIxForUser;
+    buildWithdrawTx(amount: bigint, user?: PublicKey$1): Promise<TransactionInstruction>;
 }
 
 /**
@@ -15765,15 +15760,6 @@ declare class SolanaStakingClient implements IStakingClient {
     get feePayer(): PublicKey$1;
     get squadsX(): SquadsXConfig | null;
     constructor(config: StakerConfig);
-    createVaultLiqsolAtaOneShot(params: {
-        connection: Connection;
-        payer: PublicKey$1;
-        vaultPda: PublicKey$1;
-    }): Promise<{
-        tx: Transaction;
-        vaultAta: PublicKey$1;
-    } | null>;
-    private prepSquadsIxs;
     /**
      * Deposit native SOL into liqSOL (liqsol_core::deposit).
      * Handles tx build, sign, send, and confirmation.
@@ -15820,8 +15806,43 @@ declare class SolanaStakingClient implements IStakingClient {
      * Used by balance-correction flows and debugging.
      */
     getUserRecord(): Promise<DistributionUserRecord | null>;
-    get squadsMultisigPDA(): PublicKey$1 | null;
-    get squadsVaultPDA(): PublicKey$1 | null;
+    get squadsMultisigPDA(): PublicKey$1 | undefined;
+    get squadsVaultPDA(): PublicKey$1 | undefined;
+    private sendSquadsIxs;
+    buildAndSendIx(ix: TransactionInstruction | TransactionInstruction[]): Promise<string>;
+    /**
+     * Send a signed transaction over HTTP RPC.
+     *
+     * - Returns immediately on successful sendRawTransaction.
+     * - If sendRawTransaction throws a SendTransactionError with
+     *   "already been processed", we treat it as success and
+     *   just return a derived signature.
+     * - No confirmTransaction / polling / blockheight handling.
+     */
+    private sendAndConfirmHttp;
+    /**
+     * Sign a single Solana transaction using the connected wallet adapter.
+     */
+    signTransaction(tx: SolanaTransaction): Promise<SolanaTransaction>;
+    /**
+     * Generic "fire and forget" send helper if the caller already
+     * prepared and signed the transaction.
+     */
+    sendTransaction(signed: SolanaTransaction): Promise<TransactionSignature>;
+    /**
+     * Attach recent blockhash + fee payer to a transaction.
+     * Required before signing and sending.
+     */
+    prepareTx(tx: Transaction): Promise<{
+        tx: Transaction;
+        blockhash: string;
+        lastValidBlockHeight: number;
+    }>;
+    /**
+     * Guard for all write operations (deposit/withdraw/stake/unstake/buy).
+     * Ensures we have a Wire pubKey and an Anchor wallet pubKey, and that they match.
+     */
+    ensureUser(): void;
     /**
      * Unified, chain-agnostic tranche snapshot for Solana.
      *
@@ -15888,39 +15909,6 @@ declare class SolanaStakingClient implements IStakingClient {
     private cachedTxFee?;
     private static readonly FEE_CACHE_TTL_MS;
     private getSingleTxFeeLamports;
-    /**
-     * Send a signed transaction over HTTP RPC.
-     *
-     * - Returns immediately on successful sendRawTransaction.
-     * - If sendRawTransaction throws a SendTransactionError with
-     *   "already been processed", we treat it as success and
-     *   just return a derived signature.
-     * - No confirmTransaction / polling / blockheight handling.
-     */
-    private sendAndConfirmHttp;
-    /**
-     * Sign a single Solana transaction using the connected wallet adapter.
-     */
-    signTransaction(tx: SolanaTransaction): Promise<SolanaTransaction>;
-    /**
-     * Generic "fire and forget" send helper if the caller already
-     * prepared and signed the transaction.
-     */
-    sendTransaction(signed: SolanaTransaction): Promise<TransactionSignature>;
-    /**
-     * Attach recent blockhash + fee payer to a transaction.
-     * Required before signing and sending.
-     */
-    prepareTx(tx: Transaction): Promise<{
-        tx: Transaction;
-        blockhash: string;
-        lastValidBlockHeight: number;
-    }>;
-    /**
-     * Guard for all write operations (deposit/withdraw/stake/unstake/buy).
-     * Ensures we have a Wire pubKey and an Anchor wallet pubKey, and that they match.
-     */
-    ensureUser(): void;
 }
 
 export { ADDRESSES, ADDRESS_BOOK_BY_CHAIN, CHAINLINK_FEED, CHAINLINK_PROGRAM, CONTRACTS_BY_CHAIN, DEFAULT_AVERAGE_PAY_RATE, DEFAULT_PAY_RATE_LOOKBACK, DepositClient, DistributionClient, EPHEMERAL_RENT_EXEMPTION, ERC1155Abi, ERC20Abi, ERC721Abi, types$1 as ETH, EthereumContractService, EthereumStakingClient, HOODI_ADDRESSES, INDEX_SCALE, INITIAL_TRANCHE_SUPPLY, LAMPORTS_PER_SOL, LeaderboardClient, MAINNET_ADDRESSES, OutpostClient, PAY_RATE_SCALE_FACTOR, PDA_SEEDS, PROGRAM_IDS_BY_CHAIN, PurchaseAsset, ReceiptNFTKind, SCALE, types as SOL, SolanaStakingClient, Staker, SupportedEvmChainID, SupportedSolChainID, TokenClient, airdropSol, buildOutpostAccounts, buildSolanaTrancheLadder, buildSolanaTrancheSnapshot, ceilDiv, deriveEphemeralStakeAddress, generateRandomDepositAmount, generateTestKeypair, getEpochSnapshot, getErrorMessage, getProgramIds, lamportsToSol, msToEpochEnd, scheduledInstruction, sleep, solToLamports, toBigint, tokensToShares, waitForConfirmation, waitUntilSafeToExecuteFunction };

package/lib/stake.js

@@ -186,7 +186,7 @@ class DepositClient {
         true,
         splToken.TOKEN_2022_PROGRAM_ID
       );
-      const ix = yield this.program.methods.requestWithdraw(new anchor.BN(amount.toString())).accounts({
+      return yield this.program.methods.requestWithdraw(new anchor.BN(amount.toString())).accounts({
         user,
         owner,
         global,
@@ -212,71 +212,6 @@ class DepositClient {
         rent: web3_js.SYSVAR_RENT_PUBKEY,
         globalConfig
       }).instruction();
-      return new web3_js.Transaction().add(ix);
-    });
-  }
-  buildDepositIxForUser(amount, user) {
-    return __async$g(this, null, function* () {
-      if (!user) {
-        throw new Error("buildDepositIxForUser: user is required");
-      }
-      if (!amount || amount <= BigInt(0)) {
-        throw new Error("buildDepositIxForUser: amount must be > 0");
-      }
-      const depositAuthority = this.pgs.deriveDepositAuthorityPda();
-      const liqsolMint = this.pgs.deriveLiqsolMintPda();
-      const liqsolMintAuthority = this.pgs.deriveLiqsolMintAuthorityPda();
-      const reservePool = this.pgs.deriveReservePoolPda();
-      const vault = this.pgs.deriveVaultPda();
-      const controllerState = this.pgs.deriveStakeControllerStatePda();
-      const payoutState = this.pgs.derivePayoutStatePda();
-      const bucketAuthority = this.pgs.deriveBucketAuthorityPda();
-      const payRateHistory = this.pgs.derivePayRateHistoryPda();
-      const globalConfig = this.pgs.deriveGlobalConfigPda();
-      const userAta = splToken.getAssociatedTokenAddressSync(
-        liqsolMint,
-        user,
-        true,
-        splToken.TOKEN_2022_PROGRAM_ID
-      );
-      const distributionState = this.pgs.deriveDistributionStatePda();
-      const userRecord = this.pgs.deriveUserRecordPda(userAta);
-      const bucketTokenAccount = splToken.getAssociatedTokenAddressSync(
-        liqsolMint,
-        bucketAuthority,
-        true,
-        splToken.TOKEN_2022_PROGRAM_ID
-      );
-      const seed = Math.floor(Math.random() * __pow(2, 32));
-      const ephemeralStake = yield this.pgs.deriveEphemeralStakeAddress(user, seed);
-      const ix = yield this.program.methods.deposit(new anchor.BN(amount.toString()), seed).accounts({
-        user,
-        depositAuthority,
-        systemProgram: web3_js.SystemProgram.programId,
-        tokenProgram: splToken.TOKEN_2022_PROGRAM_ID,
-        associatedTokenProgram: splToken.ASSOCIATED_TOKEN_PROGRAM_ID,
-        liqsolProgram: this.pgs.PROGRAM_IDS.LIQSOL_TOKEN,
-        stakeProgram: web3_js.StakeProgram.programId,
-        liqsolMint,
-        userAta,
-        liqsolMintAuthority,
-        reservePool,
-        vault,
-        ephemeralStake,
-        controllerState,
-        payoutState,
-        bucketAuthority,
-        bucketTokenAccount,
-        userRecord,
-        distributionState,
-        payRateHistory,
-        instructionsSysvar: web3_js.SYSVAR_INSTRUCTIONS_PUBKEY,
-        clock: web3_js.SYSVAR_CLOCK_PUBKEY,
-        stakeHistory: web3_js.SYSVAR_STAKE_HISTORY_PUBKEY,
-        rent: web3_js.SYSVAR_RENT_PUBKEY,
-        globalConfig
-      }).instruction();
-      return { ix, seed, userAta, ephemeralStake };
     });
   }
 }
@@ -14727,13 +14662,15 @@ const MAINNET_PROGRAM_IDS = {
   LIQSOL_CORE: new web3_js.PublicKey(liqsolCoreMainnetJson.address),
   LIQSOL_TOKEN: new web3_js.PublicKey(liqsolTokenMainnetJson.address),
   VALIDATOR_LEADERBOARD: new web3_js.PublicKey(validatorLeaderboardMainnetJson.address),
-  TRANSFER_HOOK: new web3_js.PublicKey(mainnetTransferHookIDL.address)
+  TRANSFER_HOOK: new web3_js.PublicKey(mainnetTransferHookIDL.address),
+  ALT_LOOKUP_TABLE: new web3_js.PublicKey("AQXTHwkdNBEiXeQuVA5uCoxvzgYUmudRxthQY4vWKCPS")
 };
 const DEVNET_PROGRAM_IDS = {
   LIQSOL_CORE: new web3_js.PublicKey(liqsolCoreDevnetJson.address),
   LIQSOL_TOKEN: new web3_js.PublicKey(liqsolTokenDevnetJson.address),
   VALIDATOR_LEADERBOARD: new web3_js.PublicKey(validatorLeaderboardDevnetJson.address),
-  TRANSFER_HOOK: new web3_js.PublicKey(devnetTransferHookIDL.address)
+  TRANSFER_HOOK: new web3_js.PublicKey(devnetTransferHookIDL.address),
+  ALT_LOOKUP_TABLE: new web3_js.PublicKey("3MbupRDxUqPtJzoLLmjEYV3dXJdh1jojQrpDEQUqv7xb")
 };
 const PROGRAM_IDS_BY_CHAIN = {
   [core.SolChainID.Mainnet]: MAINNET_PROGRAM_IDS,
@@ -14976,7 +14913,7 @@ function buildOutpostAccounts(connection, user, pgs) {
     const userAta = yield splToken.getAssociatedTokenAddress(
       liqsolMint,
       user,
-      false,
+      true,
       splToken.TOKEN_2022_PROGRAM_ID
     );
     const bucketUserRecord = pgs.deriveUserRecordPda(bucketTokenAccount);
@@ -15459,15 +15396,14 @@ class OutpostClient {
       }
     });
   }
-  buildStakeIx(amountLamports, user) {
-    return __async$b(this, null, function* () {
-      const userPk = user != null ? user : this.wallet.publicKey;
-      if (!userPk) {
+  buildStakeIx(_0) {
+    return __async$b(this, arguments, function* (amountLamports, user = this.wallet.publicKey) {
+      if (!user) {
         throw new Error("OutpostClient.buildStakeIx: wallet not connected");
       }
-      const a = yield this.buildAccounts(userPk);
+      const a = yield this.buildAccounts(user);
       return this.program.methods.synd(new anchor.BN(amountLamports.toString())).accounts({
-        user: userPk,
+        user,
         liqsolMint: a.liqsolMint,
         globalState: a.globalState,
         distributionState: a.distributionState,
@@ -15619,6 +15555,7 @@ class TokenClient {
   buildPurchaseIx(_0) {
     return __async$a(this, arguments, function* (amountLamports, user = this.wallet.publicKey) {
       var _a, _b;
+      console.log("build purchase for", user.toBase58());
       const a = yield this.getAccounts(user);
       const extraAccountMetaList = this.pgs.deriveExtraAccountMetaListPda(a.liqsolMint);
       const liqsolCoreProgram = this.pgs.PROGRAM_IDS.LIQSOL_CORE;
@@ -16113,77 +16050,14 @@ const _SolanaStakingClient = class _SolanaStakingClient {
     const config = (_a = this.config.extras) == null ? void 0 : _a.squadsX;
     return config != null ? config : null;
   }
-  createVaultLiqsolAtaOneShot(params) {
-    return __async$8(this, null, function* () {
-      const { connection, payer, vaultPda } = params;
-      const liqsolMint = this.program.deriveLiqsolMintPda();
-      const vaultAta = splToken.getAssociatedTokenAddressSync(
-        liqsolMint,
-        vaultPda,
-        true,
-        splToken.TOKEN_2022_PROGRAM_ID,
-        splToken.ASSOCIATED_TOKEN_PROGRAM_ID
-      );
-      const info = yield connection.getAccountInfo(vaultAta, "confirmed");
-      if (info) return null;
-      const ix = splToken.createAssociatedTokenAccountInstruction(
-        payer,
-        vaultAta,
-        vaultPda,
-        liqsolMint,
-        splToken.TOKEN_2022_PROGRAM_ID,
-        splToken.ASSOCIATED_TOKEN_PROGRAM_ID
-      );
-      const tx = new web3_js.Transaction().add(ix);
-      return { tx, vaultAta };
-    });
-  }
-  prepSquadsIxs(ix) {
-    return __async$8(this, null, function* () {
-      var _a, _b, _c, _d;
-      if (!this.squadsX) throw new Error("Attempting to wrap Squads instruction without SquadsX config");
-      const multisigPda = this.squadsMultisigPDA;
-      const vaultPda = this.squadsVaultPDA;
-      const vaultIndex = (_b = (_a = this.squadsX) == null ? void 0 : _a.vaultIndex) != null ? _b : 0;
-      const creator = this.solPubKey;
-      const ms = yield multisig__namespace.accounts.Multisig.fromAccountAddress(this.connection, multisigPda);
-      const current = BigInt((_d = (_c = ms.transactionIndex) == null ? void 0 : _c.toString()) != null ? _d : 0);
-      const transactionIndex = current + BigInt(1);
-      const { blockhash } = yield this.connection.getLatestBlockhash("confirmed");
-      const transactionMessage = new web3_js.TransactionMessage({
-        payerKey: vaultPda,
-        recentBlockhash: blockhash,
-        instructions: [ix]
-      });
-      const createVaultTxIx = yield multisig__namespace.instructions.vaultTransactionCreate({
-        multisigPda,
-        transactionIndex,
-        creator,
-        vaultIndex,
-        transactionMessage,
-        ephemeralSigners: 0
-      });
-      const createProposalIx = yield multisig__namespace.instructions.proposalCreate({
-        multisigPda,
-        transactionIndex,
-        creator
-      });
-      return [createVaultTxIx, createProposalIx];
-    });
-  }
   deposit(amountLamports) {
     return __async$8(this, null, function* () {
       this.ensureUser();
-      if (amountLamports <= BigInt(0)) {
+      if (amountLamports <= BigInt(0))
         throw new Error("Deposit amount must be greater than zero.");
-      }
       try {
-        const cuIx = web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: 4e5 });
-        const ix = yield this.depositClient.buildDepositTx(amountLamports);
-        const tx = new web3_js.Transaction().add(ix);
-        const prepared = yield this.prepareTx(tx);
-        const signed = yield this.signTransaction(prepared.tx);
-        return this.sendAndConfirmHttp(signed, prepared);
+        const ix = yield this.depositClient.buildDepositTx(amountLamports, this.squadsVaultPDA);
+        return !!this.squadsX ? yield this.sendSquadsIxs(ix) : yield this.buildAndSendIx(ix);
       } catch (err) {
         console.log(`Failed to deposit Solana: ${err}`);
         throw err;
@@ -16193,16 +16067,11 @@ const _SolanaStakingClient = class _SolanaStakingClient {
   withdraw(amountLamports) {
     return __async$8(this, null, function* () {
       this.ensureUser();
-      if (amountLamports <= BigInt(0)) {
+      if (amountLamports <= BigInt(0))
         throw new Error("Withdraw amount must be greater than zero.");
-      }
       try {
-        const cuIx = web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: 4e5 });
-        const ix = yield this.depositClient.buildWithdrawTx(amountLamports);
-        const tx = new web3_js.Transaction().add(cuIx, ix);
-        const prepared = yield this.prepareTx(tx);
-        const signed = yield this.signTransaction(prepared.tx);
-        return this.sendAndConfirmHttp(signed, prepared);
+        const ix = yield this.depositClient.buildWithdrawTx(amountLamports, this.squadsVaultPDA);
+        return !!this.squadsX ? yield this.sendSquadsIxs(ix) : yield this.buildAndSendIx(ix);
       } catch (err) {
         console.log(`Failed to withdraw Solana: ${err}`);
         throw err;
@@ -16212,17 +16081,11 @@ const _SolanaStakingClient = class _SolanaStakingClient {
   stake(amountLamports) {
     return __async$8(this, null, function* () {
       this.ensureUser();
-      if (!amountLamports || amountLamports <= BigInt(0)) {
+      if (!amountLamports || amountLamports <= BigInt(0))
         throw new Error("Stake amount must be greater than zero.");
-      }
       try {
-        const user = this.solPubKey;
-        const cuIx = web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: 4e5 });
-        const ix = yield this.outpostClient.buildStakeIx(amountLamports, user);
-        const tx = new web3_js.Transaction().add(cuIx, ix);
-        const prepared = yield this.prepareTx(tx);
-        const signed = yield this.signTransaction(prepared.tx);
-        return this.sendAndConfirmHttp(signed, prepared);
+        const ix = yield this.outpostClient.buildStakeIx(amountLamports, this.squadsVaultPDA);
+        return !!this.squadsX ? yield this.sendSquadsIxs(ix) : yield this.buildAndSendIx(ix);
       } catch (err) {
         console.log(`Failed to stake Solana: ${err}`);
         throw err;
@@ -16232,17 +16095,11 @@ const _SolanaStakingClient = class _SolanaStakingClient {
   unstake(amountLamports) {
     return __async$8(this, null, function* () {
       this.ensureUser();
-      if (!amountLamports || amountLamports <= BigInt(0)) {
+      if (!amountLamports || amountLamports <= BigInt(0))
         throw new Error("Unstake amount must be greater than zero.");
-      }
       try {
-        const user = this.solPubKey;
-        const cuIx = web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: 4e5 });
-        const ix = yield this.outpostClient.buildUnstakeIx(amountLamports, user);
-        const tx = new web3_js.Transaction().add(cuIx, ix);
-        const prepared = yield this.prepareTx(tx);
-        const signed = yield this.signTransaction(prepared.tx);
-        return this.sendAndConfirmHttp(signed, prepared);
+        const ix = yield this.outpostClient.buildUnstakeIx(amountLamports, this.squadsVaultPDA);
+        return !!this.squadsX ? yield this.sendSquadsIxs(ix) : yield this.buildAndSendIx(ix);
       } catch (err) {
         console.log(`Failed to unstake Solana: ${err}`);
         throw err;
@@ -16252,17 +16109,11 @@ const _SolanaStakingClient = class _SolanaStakingClient {
   buy(amountLamports) {
     return __async$8(this, null, function* () {
       this.ensureUser();
-      if (!amountLamports || amountLamports <= BigInt(0)) {
+      if (!amountLamports || amountLamports <= BigInt(0))
         throw new Error("liqSOL pretoken purchase requires a positive amount.");
-      }
       try {
-        const user = this.solPubKey;
-        const cuIx = web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: 4e5 });
-        const ix = yield this.tokenClient.buildPurchaseIx(amountLamports, user);
-        const tx = new web3_js.Transaction().add(cuIx, ix);
-        const prepared = yield this.prepareTx(tx);
-        const signed = yield this.signTransaction(prepared.tx);
-        return this.sendAndConfirmHttp(signed, prepared);
+        const ix = yield this.tokenClient.buildPurchaseIx(amountLamports, this.squadsVaultPDA);
+        return !!this.squadsX ? yield this.sendSquadsIxs(ix) : yield this.buildAndSendIx(ix);
       } catch (err) {
         console.log(`Failed to buy liqSOL pretokens: ${err}`);
         throw err;
@@ -16272,7 +16123,6 @@ const _SolanaStakingClient = class _SolanaStakingClient {
   getPortfolio() {
     return __async$8(this, null, function* () {
       var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
-      if (!this.pubKey) throw new Error("User pubKey is undefined");
       try {
         const user = !!this.squadsX ? this.squadsVaultPDA : this.solPubKey;
         const reservePoolPDA = this.program.deriveReservePoolPda();
@@ -16367,17 +16217,131 @@ const _SolanaStakingClient = class _SolanaStakingClient {
     });
   }
   get squadsMultisigPDA() {
-    if (!this.squadsX) return null;
+    if (!this.squadsX) return void 0;
     return new web3_js.PublicKey(this.squadsX.multisigPDA);
   }
   get squadsVaultPDA() {
     var _a;
-    if (!this.squadsX || !this.squadsMultisigPDA) return null;
+    if (!this.squadsX || !this.squadsMultisigPDA) return void 0;
     const multisigPda = this.squadsMultisigPDA;
     const index = (_a = this.squadsX.vaultIndex) != null ? _a : 0;
     const pda = multisig__namespace.getVaultPda({ multisigPda, index });
     return pda[0];
   }
+  sendSquadsIxs(ix) {
+    return __async$8(this, null, function* () {
+      var _a, _b, _c, _d;
+      if (!this.squadsX) throw new Error("Attempting to wrap Squads instruction without SquadsX config");
+      const multisigPda = this.squadsMultisigPDA;
+      const vaultPda = this.squadsVaultPDA;
+      const vaultIndex = (_b = (_a = this.squadsX) == null ? void 0 : _a.vaultIndex) != null ? _b : 0;
+      const creator = this.solPubKey;
+      const ms = yield multisig__namespace.accounts.Multisig.fromAccountAddress(this.connection, multisigPda);
+      const current = BigInt((_d = (_c = ms.transactionIndex) == null ? void 0 : _c.toString()) != null ? _d : 0);
+      const transactionIndex = current + BigInt(1);
+      const altAddress = this.program.PROGRAM_IDS.ALT_LOOKUP_TABLE;
+      const altAccount = yield this.connection.getAddressLookupTable(altAddress);
+      if (!altAccount.value) throw new Error("ALT not found on-chain or not yet active.");
+      const lookupTable = altAccount.value;
+      const computeLimitIx = web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: 4e5 });
+      const computePriceIx = web3_js.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: 2e3 });
+      const { blockhash } = yield this.connection.getLatestBlockhash("confirmed");
+      const transactionMessage = new web3_js.TransactionMessage({
+        payerKey: vaultPda,
+        recentBlockhash: blockhash,
+        instructions: [computeLimitIx, computePriceIx, ix]
+      });
+      const createVaultTxIx = yield multisig__namespace.instructions.vaultTransactionCreate({
+        multisigPda,
+        transactionIndex,
+        creator,
+        vaultIndex,
+        transactionMessage,
+        ephemeralSigners: 0,
+        addressLookupTableAccounts: [lookupTable]
+      });
+      const vaultTransactionCreate = yield this.buildAndSendIx(createVaultTxIx);
+      console.log("SQUADSX: vaultTransactionCreate", vaultTransactionCreate);
+      const createProposalIx = yield multisig__namespace.instructions.proposalCreate({
+        multisigPda,
+        transactionIndex,
+        creator
+      });
+      const proposalCreate = yield this.buildAndSendIx(createProposalIx);
+      console.log("SQUADSX: proposalCreate", proposalCreate);
+      return proposalCreate;
+    });
+  }
+  buildAndSendIx(ix) {
+    return __async$8(this, null, function* () {
+      const cuIx = web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: 4e5 });
+      const ixs = Array.isArray(ix) ? ix : [ix];
+      const tx = new web3_js.Transaction().add(cuIx, ...ixs);
+      const prepared = yield this.prepareTx(tx);
+      const signed = yield this.signTransaction(prepared.tx);
+      return this.sendAndConfirmHttp(signed, prepared);
+    });
+  }
+  sendAndConfirmHttp(signed, _ctx) {
+    return __async$8(this, null, function* () {
+      var _a, _b, _c;
+      this.ensureUser();
+      const rawTx = signed.serialize();
+      try {
+        const signature = yield this.connection.sendRawTransaction(rawTx, {
+          skipPreflight: false,
+          preflightCommitment: commitment,
+          maxRetries: 3
+        });
+        return signature;
+      } catch (e) {
+        const msg = (_a = e == null ? void 0 : e.message) != null ? _a : "";
+        const isSendTxError = e instanceof web3_js.SendTransactionError || (e == null ? void 0 : e.name) === "SendTransactionError";
+        if (isSendTxError && msg.includes("already been processed")) {
+          console.warn(
+            'sendRawTransaction reports "already been processed"; treating as success without further confirmation.'
+          );
+          const legacy = signed;
+          const first = (_c = (_b = legacy.signatures) == null ? void 0 : _b[0]) == null ? void 0 : _c.signature;
+          if (first) {
+            return bs58.encode(first);
+          }
+          return "already-processed";
+        }
+        throw e;
+      }
+    });
+  }
+  signTransaction(tx) {
+    return __async$8(this, null, function* () {
+      this.ensureUser();
+      return this.anchor.wallet.signTransaction(tx);
+    });
+  }
+  sendTransaction(signed) {
+    return __async$8(this, null, function* () {
+      this.ensureUser();
+      return this.anchor.sendAndConfirm(signed);
+    });
+  }
+  prepareTx(tx) {
+    return __async$8(this, null, function* () {
+      const { blockhash, lastValidBlockHeight } = yield this.connection.getLatestBlockhash("confirmed");
+      tx.recentBlockhash = blockhash;
+      tx.feePayer = this.feePayer;
+      return { tx, blockhash, lastValidBlockHeight };
+    });
+  }
+  ensureUser() {
+    var _a;
+    if (!this.pubKey) throw new Error("User pubKey is undefined");
+    const wallet = (_a = this.anchor) == null ? void 0 : _a.wallet;
+    const pk = wallet == null ? void 0 : wallet.publicKey;
+    if (!pk) throw new Error("Wallet not connected");
+    if (typeof wallet.signTransaction !== "function") {
+      throw new Error("Wallet does not support signTransaction");
+    }
+  }
   getTrancheSnapshot(chainID) {
     return __async$8(this, null, function* () {
       try {
@@ -16424,10 +16388,24 @@ const _SolanaStakingClient = class _SolanaStakingClient {
         return Number(DEFAULT_AVERAGE_PAY_RATE) / Number(PAY_RATE_SCALE_FACTOR);
       }
       const currentIndex = Number(payRateHistory.currentIndex);
-      const latestIdx = (currentIndex - 1 + maxEntries) % maxEntries;
-      const latestEntry = payRateHistory.entries[latestIdx];
-      const raw = BigInt(latestEntry.scaledRate.toString());
-      return Number(raw) / Number(PAY_RATE_SCALE_FACTOR);
+      const processedCount = Math.min(totalEntriesAdded, maxEntries);
+      let sum = BigInt(0);
+      let validCount = 0;
+      let idx = (currentIndex - 1 + maxEntries) % maxEntries;
+      for (let i = 0; i < processedCount; i++) {
+        const entry = payRateHistory.entries[idx];
+        const scaledRate = BigInt(entry.scaledRate.toString());
+        if (scaledRate > BigInt(0)) {
+          sum += scaledRate;
+          validCount++;
+        }
+        idx = (idx - 1 + maxEntries) % maxEntries;
+      }
+      if (validCount === 0) {
+        return Number(DEFAULT_AVERAGE_PAY_RATE) / Number(PAY_RATE_SCALE_FACTOR);
+      }
+      const average = Number(sum / BigInt(validCount));
+      return average / Number(PAY_RATE_SCALE_FACTOR);
     });
   }
   getEpochsPerYearFromCluster() {
@@ -16574,66 +16552,6 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       return singleTxFeeLamports;
     });
   }
-  sendAndConfirmHttp(signed, _ctx) {
-    return __async$8(this, null, function* () {
-      var _a, _b, _c;
-      this.ensureUser();
-      const rawTx = signed.serialize();
-      try {
-        const signature = yield this.connection.sendRawTransaction(rawTx, {
-          skipPreflight: false,
-          preflightCommitment: commitment,
-          maxRetries: 3
-        });
-        return signature;
-      } catch (e) {
-        const msg = (_a = e == null ? void 0 : e.message) != null ? _a : "";
-        const isSendTxError = e instanceof web3_js.SendTransactionError || (e == null ? void 0 : e.name) === "SendTransactionError";
-        if (isSendTxError && msg.includes("already been processed")) {
-          console.warn(
-            'sendRawTransaction reports "already been processed"; treating as success without further confirmation.'
-          );
-          const legacy = signed;
-          const first = (_c = (_b = legacy.signatures) == null ? void 0 : _b[0]) == null ? void 0 : _c.signature;
-          if (first) {
-            return bs58.encode(first);
-          }
-          return "already-processed";
-        }
-        throw e;
-      }
-    });
-  }
-  signTransaction(tx) {
-    return __async$8(this, null, function* () {
-      this.ensureUser();
-      return this.anchor.wallet.signTransaction(tx);
-    });
-  }
-  sendTransaction(signed) {
-    return __async$8(this, null, function* () {
-      this.ensureUser();
-      return this.anchor.sendAndConfirm(signed);
-    });
-  }
-  prepareTx(tx) {
-    return __async$8(this, null, function* () {
-      const { blockhash, lastValidBlockHeight } = yield this.connection.getLatestBlockhash("confirmed");
-      tx.recentBlockhash = blockhash;
-      tx.feePayer = this.feePayer;
-      return { tx, blockhash, lastValidBlockHeight };
-    });
-  }
-  ensureUser() {
-    var _a;
-    if (!this.pubKey) throw new Error("User pubKey is undefined");
-    const wallet = (_a = this.anchor) == null ? void 0 : _a.wallet;
-    const pk = wallet == null ? void 0 : wallet.publicKey;
-    if (!pk) throw new Error("Wallet not connected");
-    if (typeof wallet.signTransaction !== "function") {
-      throw new Error("Wallet does not support signTransaction");
-    }
-  }
 };
 _SolanaStakingClient.EPOCHS_PER_YEAR_TTL_MS = 10 * 60 * 1e3;
 _SolanaStakingClient.FEE_CACHE_TTL_MS = 6e4;