@wireio/stake 0.7.3 → 0.9.1

package/lib/stake.browser.js

@@ -1,7 +1,8 @@
 import { PublicKey as PublicKey$1, KeyType, SolChainID, EvmChainID } from '@wireio/core';
-import { PublicKey, StakeProgram, SystemProgram, SYSVAR_INSTRUCTIONS_PUBKEY, SYSVAR_CLOCK_PUBKEY, SYSVAR_STAKE_HISTORY_PUBKEY, SYSVAR_RENT_PUBKEY, Transaction, Keypair, Connection, ComputeBudgetProgram } from '@solana/web3.js';
+import { PublicKey, StakeProgram, SystemProgram, SYSVAR_INSTRUCTIONS_PUBKEY, SYSVAR_CLOCK_PUBKEY, SYSVAR_STAKE_HISTORY_PUBKEY, SYSVAR_RENT_PUBKEY, TransactionMessage, Transaction, Keypair, Connection, ComputeBudgetProgram } from '@solana/web3.js';
 import { Program, BN, AnchorProvider } from '@coral-xyz/anchor';
-import { getAssociatedTokenAddressSync, TOKEN_2022_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddress } from '@solana/spl-token';
+import { getAssociatedTokenAddressSync, TOKEN_2022_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddress, createAssociatedTokenAccountInstruction } from '@solana/spl-token';
+import * as multisig from '@sqds/multisig';
 import { ethers, Contract, BigNumber } from 'ethers';
 
 var address$3 = "5nBtmutQLrRKBUxNfHJPDjiW5u8id6QM9Hhjg1D1g1XH";
@@ -12,68 +13,6 @@ var metadata$3 = {
 	description: "Created with Anchor"
 };
 var instructions$3 = [
-	{
-		name: "accumulate_unstake_request",
-		docs: [
-			"Accumulate unstake requests to be processed in next allocation cycle",
-			"Multiple requests can be accumulated before calculating allocations",
-			"Returns the target epoch when this unstake request will be processed",
-			"We should not be able to call this without development feature enabled",
-			""
-		],
-		discriminator: [
-			24,
-			73,
-			69,
-			139,
-			36,
-			209,
-			105,
-			252
-		],
-		accounts: [
-			{
-				name: "admin",
-				writable: true,
-				signer: true
-			},
-			{
-				name: "stake_allocation_state",
-				docs: [
-					"Stake allocation state - to accumulate pending unstake requests"
-				],
-				writable: true
-			},
-			{
-				name: "stake_metrics",
-				docs: [
-					"Stake metrics - to validate total unstake amount is available"
-				]
-			},
-			{
-				name: "maintenance_ledger",
-				docs: [
-					"Maintenance ledger - to determine target processing epoch"
-				]
-			},
-			{
-				name: "global_config",
-				docs: [
-					"Global config for min_unstake_request setting"
-				]
-			},
-			{
-				name: "clock"
-			}
-		],
-		args: [
-			{
-				name: "amount",
-				type: "u64"
-			}
-		],
-		returns: "u64"
-	},
 	{
 		name: "add_top_performers_batch",
 		docs: [
@@ -127,74 +66,6 @@ var instructions$3 = [
 		args: [
 		]
 	},
-	{
-		name: "add_validator_v2",
-		docs: [
-			"Add a new validator bbypassing the looking at leaderboard and getting validators form there"
-		],
-		discriminator: [
-			217,
-			158,
-			30,
-			19,
-			123,
-			99,
-			110,
-			30
-		],
-		accounts: [
-			{
-				name: "authority",
-				writable: true,
-				signer: true
-			},
-			{
-				name: "active_list",
-				docs: [
-					"Active list - will add the validator here"
-				],
-				writable: true
-			},
-			{
-				name: "validator_info",
-				docs: [
-					"Create the validator info account"
-				],
-				writable: true
-			},
-			{
-				name: "validator_transient",
-				docs: [
-					"Create the validator transient account"
-				],
-				writable: true
-			},
-			{
-				name: "stake_allocation_state",
-				docs: [
-					"Stake allocation state - to update total_active_vpp when adding validator"
-				],
-				writable: true
-			},
-			{
-				name: "system_program"
-			}
-		],
-		args: [
-			{
-				name: "vote_account",
-				type: "pubkey"
-			},
-			{
-				name: "name",
-				type: "string"
-			},
-			{
-				name: "performance_score",
-				type: "u8"
-			}
-		]
-	},
 	{
 		name: "aggregate_stake_metrics",
 		docs: [
@@ -234,43 +105,6 @@ var instructions$3 = [
 		args: [
 		]
 	},
-	{
-		name: "blacklist_validator",
-		docs: [
-			"Blacklist a validator (user-facing, maintenance will handle graveyard movement)",
-			"UnderPerforming is set automatically when score is updated",
-			"Another serious emergency stop function"
-		],
-		discriminator: [
-			125,
-			42,
-			36,
-			229,
-			27,
-			38,
-			226,
-			62
-		],
-		accounts: [
-			{
-				name: "validator_info",
-				writable: true
-			},
-			{
-				name: "stake_allocation_state",
-				docs: [
-					"Stake allocation state - to update total_active_vpp when VPP changes"
-				],
-				writable: true
-			}
-		],
-		args: [
-			{
-				name: "vote_account",
-				type: "pubkey"
-			}
-		]
-	},
 	{
 		name: "bond_role",
 		discriminator: [
@@ -2860,147 +2694,6 @@ var instructions$3 = [
 			}
 		]
 	},
-	{
-		name: "reset_distribution_state",
-		discriminator: [
-			159,
-			183,
-			162,
-			74,
-			228,
-			135,
-			157,
-			79
-		],
-		accounts: [
-			{
-				name: "admin",
-				signer: true
-			},
-			{
-				name: "distribution_state",
-				writable: true
-			}
-		],
-		args: [
-		]
-	},
-	{
-		name: "reset_global_state",
-		discriminator: [
-			252,
-			41,
-			117,
-			110,
-			248,
-			165,
-			48,
-			88
-		],
-		accounts: [
-			{
-				name: "admin",
-				signer: true
-			},
-			{
-				name: "global_config"
-			},
-			{
-				name: "global_state",
-				writable: true
-			},
-			{
-				name: "pool_authority"
-			},
-			{
-				name: "liqsol_mint"
-			},
-			{
-				name: "liqsol_pool_ata",
-				writable: true
-			},
-			{
-				name: "token_program"
-			},
-			{
-				name: "associated_token_program"
-			}
-		],
-		args: [
-		]
-	},
-	{
-		name: "reset_price_history",
-		discriminator: [
-			213,
-			231,
-			155,
-			139,
-			248,
-			60,
-			67,
-			199
-		],
-		accounts: [
-			{
-				name: "admin",
-				writable: true,
-				signer: true
-			},
-			{
-				name: "global_config"
-			},
-			{
-				name: "tranche_state",
-				writable: true
-			},
-			{
-				name: "price_history",
-				writable: true
-			},
-			{
-				name: "system_program"
-			}
-		],
-		args: [
-		]
-	},
-	{
-		name: "reset_tranche_state",
-		discriminator: [
-			106,
-			102,
-			143,
-			40,
-			152,
-			173,
-			165,
-			168
-		],
-		accounts: [
-			{
-				name: "admin",
-				writable: true,
-				signer: true
-			},
-			{
-				name: "global_config"
-			},
-			{
-				name: "tranche_state",
-				writable: true
-			},
-			{
-				name: "price_history",
-				writable: true
-			},
-			{
-				name: "system_program"
-			}
-		],
-		args: [
-		]
-	},
 	{
 		name: "set_admin",
 		discriminator: [
@@ -3023,8 +2716,7 @@ var instructions$3 = [
 				signer: true
 			},
 			{
-				name: "new_authority",
-				signer: true
+				name: "new_authority"
 			}
 		],
 		args: [
@@ -3052,52 +2744,12 @@ var instructions$3 = [
 				signer: true
 			},
 			{
-				name: "new_authority",
-				signer: true
+				name: "new_authority"
 			}
 		],
 		args: [
 		]
 	},
-	{
-		name: "set_last_state_change_epoch",
-		docs: [
-			"Admin function to directly set last_state_change_epoch (useful for testing cooldowns)"
-		],
-		discriminator: [
-			94,
-			57,
-			139,
-			195,
-			123,
-			224,
-			227,
-			106
-		],
-		accounts: [
-			{
-				name: "validator_info",
-				writable: true
-			},
-			{
-				name: "stake_allocation_state",
-				docs: [
-					"Stake allocation state - to update total_active_vpp when VPP changes"
-				],
-				writable: true
-			}
-		],
-		args: [
-			{
-				name: "vote_account",
-				type: "pubkey"
-			},
-			{
-				name: "epoch",
-				type: "u16"
-			}
-		]
-	},
 	{
 		name: "set_paused",
 		discriminator: [
@@ -3587,35 +3239,6 @@ var instructions$3 = [
 			}
 		]
 	},
-	{
-		name: "test_clear_active_list",
-		discriminator: [
-			17,
-			195,
-			59,
-			174,
-			184,
-			137,
-			149,
-			144
-		],
-		accounts: [
-			{
-				name: "active_list",
-				writable: true
-			},
-			{
-				name: "processing_state",
-				writable: true
-			},
-			{
-				name: "authority",
-				signer: true
-			}
-		],
-		args: [
-		]
-	},
 	{
 		name: "update_config_bool",
 		discriminator: [
@@ -4293,8 +3916,118 @@ var events = [
 var errors$3 = [
 	{
 		code: 6000,
-		name: "AccountBorrowFailed",
-		msg: "Util Acc borrow Failed"
+		name: "DestinationAccountDoesNotExist",
+		msg: "Destination stake account does not exist"
+	},
+	{
+		code: 6001,
+		name: "SourceAccountDoesNotExist",
+		msg: "Source stake account does not exist"
+	},
+	{
+		code: 6002,
+		name: "InvalidDestinationOwner",
+		msg: "Destination account not owned by stake program"
+	},
+	{
+		code: 6003,
+		name: "InvalidSourceOwner",
+		msg: "Source account not owned by stake program"
+	},
+	{
+		code: 6004,
+		name: "ClockBorrowFailed",
+		msg: "Failed to borrow clock data"
+	},
+	{
+		code: 6005,
+		name: "ClockDeserializeFailed",
+		msg: "Failed to deserialize clock"
+	},
+	{
+		code: 6006,
+		name: "DestinationAnalysisFailed",
+		msg: "Failed to analyze destination stake account"
+	},
+	{
+		code: 6007,
+		name: "SourceAnalysisFailed",
+		msg: "Failed to analyze source stake account"
+	},
+	{
+		code: 6008,
+		name: "DestinationStillActivating",
+		msg: "Destination stake is still activating"
+	},
+	{
+		code: 6009,
+		name: "DestinationDeactivating",
+		msg: "Destination stake is deactivating"
+	},
+	{
+		code: 6010,
+		name: "SourceStillActivating",
+		msg: "Source stake is still activating"
+	},
+	{
+		code: 6011,
+		name: "SourceDeactivating",
+		msg: "Source stake is deactivating"
+	},
+	{
+		code: 6012,
+		name: "DestinationBorrowFailed",
+		msg: "Failed to borrow destination account data"
+	},
+	{
+		code: 6013,
+		name: "DestinationParseFailed",
+		msg: "Failed to parse destination stake state"
+	},
+	{
+		code: 6014,
+		name: "SourceBorrowFailed",
+		msg: "Failed to borrow source account data"
+	},
+	{
+		code: 6015,
+		name: "SourceParseFailed",
+		msg: "Failed to parse source stake state"
+	},
+	{
+		code: 6016,
+		name: "DifferentValidators",
+		msg: "Stakes are delegated to different validators"
+	},
+	{
+		code: 6017,
+		name: "DifferentStakers",
+		msg: "Stakes have different staker authorities"
+	},
+	{
+		code: 6018,
+		name: "DifferentWithdrawers",
+		msg: "Stakes have different withdrawer authorities"
+	},
+	{
+		code: 6019,
+		name: "AuthoritiesNotFound",
+		msg: "Could not extract authorities from accounts"
+	},
+	{
+		code: 6020,
+		name: "MergeInstructionFailed",
+		msg: "Merge instruction failed"
+	},
+	{
+		code: 6021,
+		name: "EpochRewardsActive",
+		msg: "Epoch rewards distribution is active - stake operations blocked"
+	},
+	{
+		code: 6022,
+		name: "DifferentCreditsObserved",
+		msg: "Stakes have different credits_observed - cannot merge until both earn same rewards"
 	}
 ];
 var types$5 = [
@@ -6747,153 +6480,6 @@ var instructions$1 = [
 		args: [
 		]
 	},
-	{
-		name: "test_clear_leaderboard",
-		discriminator: [
-			118,
-			207,
-			26,
-			205,
-			180,
-			7,
-			75,
-			244
-		],
-		accounts: [
-			{
-				name: "leaderboard_state",
-				writable: true
-			},
-			{
-				name: "authority",
-				signer: true
-			}
-		],
-		args: [
-		]
-	},
-	{
-		name: "test_force_register_validator",
-		discriminator: [
-			136,
-			156,
-			132,
-			32,
-			96,
-			240,
-			7,
-			115
-		],
-		accounts: [
-			{
-				name: "registrant",
-				writable: true,
-				signer: true
-			},
-			{
-				name: "vote_account"
-			},
-			{
-				name: "validator_record",
-				writable: true
-			},
-			{
-				name: "leaderboard_state",
-				writable: true
-			},
-			{
-				name: "system_program"
-			},
-			{
-				name: "clock"
-			}
-		],
-		args: [
-			{
-				name: "vpp",
-				type: "u8"
-			}
-		]
-	},
-	{
-		name: "test_force_update_vpp",
-		discriminator: [
-			67,
-			51,
-			28,
-			174,
-			200,
-			214,
-			203,
-			162
-		],
-		accounts: [
-			{
-				name: "registrant",
-				writable: true,
-				signer: true
-			},
-			{
-				name: "vote_account"
-			},
-			{
-				name: "validator_record",
-				writable: true
-			},
-			{
-				name: "leaderboard_state",
-				writable: true
-			}
-		],
-		args: [
-			{
-				name: "vpp",
-				type: "u8"
-			}
-		]
-	},
-	{
-		name: "test_seed_random_validators",
-		discriminator: [
-			48,
-			155,
-			181,
-			112,
-			163,
-			242,
-			43,
-			146
-		],
-		accounts: [
-			{
-				name: "registrant",
-				writable: true,
-				signer: true
-			},
-			{
-				name: "leaderboard_state",
-				writable: true
-			}
-		],
-		args: [
-			{
-				name: "count",
-				type: "u16"
-			},
-			{
-				name: "seed",
-				type: "u64"
-			},
-			{
-				name: "min_vpp",
-				type: "u8"
-			},
-			{
-				name: "max_vpp",
-				type: "u8"
-			}
-		]
-	},
 	{
 		name: "update_commission",
 		discriminator: [
@@ -7807,7 +7393,7 @@ const deriveEphemeralStakeAddress = async (user, seed) => {
   return PublicKey.createWithSeed(user, seedStr, StakeProgram.programId);
 };
 const CHAINLINK_FEED = new PublicKey(
-  "99B2bTijsU6f1GCT73HmdR7HCFFjGMBcPZY6jZ96ynrR"
+  "CH31Xns5z3M1cTAbKW34jcxPPciazARpijcHj9rxtemt"
 );
 const CHAINLINK_PROGRAM = new PublicKey(
   "HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny"
@@ -7855,6 +7441,9 @@ class DepositClient {
     const svc = new SolanaProgramService(provider);
     this.program = svc.getProgram("liqsolCore");
   }
+  get connection() {
+    return this.provider.connection;
+  }
   get wallet() {
     return this.provider.wallet;
   }
@@ -7882,7 +7471,7 @@ class DepositClient {
     const userAta = getAssociatedTokenAddressSync(
       liqsolMint,
       user,
-      false,
+      true,
       TOKEN_2022_PROGRAM_ID
     );
     const distributionState = deriveDistributionStatePda();
@@ -7895,7 +7484,7 @@ class DepositClient {
     );
     const seed = Math.floor(Math.random() * 2 ** 32);
     const ephemeralStake = await deriveEphemeralStakeAddress(user, seed);
-    const ix = await this.program.methods.deposit(new BN(amount.toString()), seed).accounts({
+    return await this.program.methods.deposit(new BN(amount.toString()), seed).accounts({
       user,
       depositAuthority,
       systemProgram: SystemProgram.programId,
@@ -7922,7 +7511,58 @@ class DepositClient {
       rent: SYSVAR_RENT_PUBKEY,
       globalConfig
     }).instruction();
-    return new Transaction().add(ix);
+  }
+  async buildSquadsDepositProposalTx(params) {
+    const { connection, multisigPda, amountLamports, wallet } = params;
+    const vaultIndex = params.vaultIndex ?? 0;
+    if (!wallet?.publicKey) throw new Error("wallet.publicKey missing");
+    if (!amountLamports || amountLamports <= BigInt(0)) throw new Error("amountLamports must be > 0");
+    const [vaultPda] = multisig.getVaultPda({ multisigPda, index: vaultIndex });
+    const depositBuilt = await this.buildDepositIxForUser(amountLamports, vaultPda);
+    const ms = await multisig.accounts.Multisig.fromAccountAddress(connection, multisigPda);
+    const current = BigInt(ms.transactionIndex?.toString?.() ?? 0);
+    const transactionIndex = current + BigInt(1);
+    const { blockhash } = await connection.getLatestBlockhash("confirmed");
+    const message = new TransactionMessage({
+      payerKey: vaultPda,
+      recentBlockhash: blockhash,
+      instructions: [depositBuilt.ix]
+    });
+    const createVaultTxIx = await multisig.instructions.vaultTransactionCreate({
+      multisigPda,
+      transactionIndex,
+      creator: wallet.publicKey,
+      vaultIndex,
+      ephemeralSigners: 0,
+      transactionMessage: message
+    });
+    console.log("createVaultTxIx", createVaultTxIx);
+    const tx = new Transaction().add(createVaultTxIx);
+    return { tx, transactionIndex, vaultPda };
+  }
+  async buildSquadsDepositProposalTx2(params) {
+    const { connection, multisigPda, amountLamports, wallet } = params;
+    const vaultIndex = params.vaultIndex ?? 0;
+    if (!wallet?.publicKey) throw new Error("wallet.publicKey missing");
+    if (!amountLamports || amountLamports <= BigInt(0)) throw new Error("amountLamports must be > 0");
+    const [vaultPda] = multisig.getVaultPda({ multisigPda, index: vaultIndex });
+    const depositBuilt = await this.buildDepositIxForUser(amountLamports, vaultPda);
+    const ms = await multisig.accounts.Multisig.fromAccountAddress(connection, multisigPda);
+    const current = BigInt(ms.transactionIndex?.toString?.() ?? 0);
+    const transactionIndex = current + BigInt(1);
+    const { blockhash } = await connection.getLatestBlockhash("confirmed");
+    new TransactionMessage({
+      payerKey: vaultPda,
+      recentBlockhash: blockhash,
+      instructions: [depositBuilt.ix]
+    });
+    const createProposalIx = await multisig.instructions.proposalCreate({
+      multisigPda,
+      transactionIndex,
+      creator: wallet.publicKey
+    });
+    const tx = new Transaction().add(createProposalIx);
+    return { tx, transactionIndex, vaultPda };
   }
   async buildWithdrawTx(amount, user = this.wallet.publicKey) {
     if (!user) {
@@ -7939,7 +7579,7 @@ class DepositClient {
     const userAta = getAssociatedTokenAddressSync(
       liqsolMint,
       user,
-      false,
+      true,
       TOKEN_2022_PROGRAM_ID
     );
     const userRecord = deriveUserRecordPda(userAta);
@@ -7972,7 +7612,7 @@ class DepositClient {
     const nftAta = getAssociatedTokenAddressSync(
       nftMint,
       owner,
-      false,
+      true,
       TOKEN_2022_PROGRAM_ID
     );
     const bucketAuthority = deriveBucketAuthorityPda();
@@ -8010,6 +7650,68 @@ class DepositClient {
     }).instruction();
     return new Transaction().add(ix);
   }
+  async buildDepositIxForUser(amount, user) {
+    if (!user) {
+      throw new Error("buildDepositIxForUser: user is required");
+    }
+    if (!amount || amount <= BigInt(0)) {
+      throw new Error("buildDepositIxForUser: amount must be > 0");
+    }
+    const depositAuthority = deriveDepositAuthorityPda();
+    const liqsolMint = deriveLiqsolMintPda();
+    const liqsolMintAuthority = deriveLiqsolMintAuthorityPda();
+    const reservePool = deriveReservePoolPda();
+    const vault = deriveVaultPda();
+    const controllerState = deriveStakeControllerStatePda();
+    const payoutState = derivePayoutStatePda();
+    const bucketAuthority = deriveBucketAuthorityPda();
+    const payRateHistory = derivePayRateHistoryPda();
+    const globalConfig = deriveGlobalConfigPda();
+    const userAta = getAssociatedTokenAddressSync(
+      liqsolMint,
+      user,
+      true,
+      TOKEN_2022_PROGRAM_ID
+    );
+    const distributionState = deriveDistributionStatePda();
+    const userRecord = deriveUserRecordPda(userAta);
+    const bucketTokenAccount = getAssociatedTokenAddressSync(
+      liqsolMint,
+      bucketAuthority,
+      true,
+      TOKEN_2022_PROGRAM_ID
+    );
+    const seed = Math.floor(Math.random() * 2 ** 32);
+    const ephemeralStake = await deriveEphemeralStakeAddress(user, seed);
+    const ix = await this.program.methods.deposit(new BN(amount.toString()), seed).accounts({
+      user,
+      depositAuthority,
+      systemProgram: SystemProgram.programId,
+      tokenProgram: TOKEN_2022_PROGRAM_ID,
+      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
+      liqsolProgram: PROGRAM_IDS.LIQSOL_TOKEN,
+      stakeProgram: StakeProgram.programId,
+      liqsolMint,
+      userAta,
+      liqsolMintAuthority,
+      reservePool,
+      vault,
+      ephemeralStake,
+      controllerState,
+      payoutState,
+      bucketAuthority,
+      bucketTokenAccount,
+      userRecord,
+      distributionState,
+      payRateHistory,
+      instructionsSysvar: SYSVAR_INSTRUCTIONS_PUBKEY,
+      clock: SYSVAR_CLOCK_PUBKEY,
+      stakeHistory: SYSVAR_STAKE_HISTORY_PUBKEY,
+      rent: SYSVAR_RENT_PUBKEY,
+      globalConfig
+    }).instruction();
+    return { ix, seed, userAta, ephemeralStake };
+  }
 }
 
 const INDEX_SCALE = BigInt(1e12);
@@ -8498,7 +8200,7 @@ class DistributionClient {
       const ata = getAssociatedTokenAddressSync(
         liqsolMint,
         ownerOrAta,
-        false,
+        true,
         TOKEN_2022_PROGRAM_ID
       );
       const pdaFromWallet = deriveUserRecordPda(ata);
@@ -8777,7 +8479,7 @@ class OutpostClient {
     };
   }
   static tokensToShares(amount, currentIndex) {
-    const numerator = amount.mul(INDEX_SCALE$1);
+    const numerator = amount.mul(new BN(INDEX_SCALE$1));
     const shares = numerator.div(currentIndex);
     const remainder = numerator.mod(currentIndex);
     return remainder.eqn(0) ? shares : shares.addn(1);
@@ -8976,196 +8678,331 @@ const _SolanaStakingClient = class _SolanaStakingClient {
   get network() {
     return this.config.network;
   }
+  get feePayer() {
+    if (this.signer) return this.signer;
+    if (this.anchor.wallet.publicKey) return this.anchor.wallet.publicKey;
+    throw new Error("No signing authority available");
+  }
+  get squadsX() {
+    const config = this.config.extras?.squadsX;
+    return config ?? null;
+  }
+  async createVaultLiqsolAtaOneShot(params) {
+    const { connection, payer, vaultPda } = params;
+    const liqsolMint = deriveLiqsolMintPda();
+    const vaultAta = getAssociatedTokenAddressSync(
+      liqsolMint,
+      vaultPda,
+      true,
+      TOKEN_2022_PROGRAM_ID,
+      ASSOCIATED_TOKEN_PROGRAM_ID
+    );
+    const info = await connection.getAccountInfo(vaultAta, "confirmed");
+    console.log("info?", info);
+    if (info) return null;
+    const ix = createAssociatedTokenAccountInstruction(
+      payer,
+      vaultAta,
+      vaultPda,
+      liqsolMint,
+      TOKEN_2022_PROGRAM_ID,
+      ASSOCIATED_TOKEN_PROGRAM_ID
+    );
+    const tx = new Transaction().add(ix);
+    return { tx, vaultAta };
+  }
+  async prepSquadsIxs(ix) {
+    if (!this.squadsX) throw new Error("Attempting to wrap Squads instruction without SquadsX config");
+    const multisigPda = this.squadsMultisigPDA;
+    const vaultPda = this.squadsVaultPDA;
+    const vaultIndex = this.squadsX?.vaultIndex ?? 0;
+    const creator = this.solPubKey;
+    const ms = await multisig.accounts.Multisig.fromAccountAddress(this.connection, multisigPda);
+    const current = BigInt(ms.transactionIndex?.toString() ?? 0);
+    const transactionIndex = current + BigInt(1);
+    const { blockhash } = await this.connection.getLatestBlockhash("confirmed");
+    const transactionMessage = new TransactionMessage({
+      payerKey: vaultPda,
+      recentBlockhash: blockhash,
+      instructions: [ix]
+    });
+    const createVaultTxIx = await multisig.instructions.vaultTransactionCreate({
+      multisigPda,
+      transactionIndex,
+      creator,
+      vaultIndex,
+      transactionMessage,
+      ephemeralSigners: 0
+    });
+    const createProposalIx = await multisig.instructions.proposalCreate({
+      multisigPda,
+      transactionIndex,
+      creator
+    });
+    return [createVaultTxIx, createProposalIx];
+  }
   async deposit(amountLamports) {
     this.ensureUser();
     if (amountLamports <= BigInt(0)) {
       throw new Error("Deposit amount must be greater than zero.");
     }
-    const tx = await this.depositClient.buildDepositTx(amountLamports);
-    const { tx: prepared, blockhash, lastValidBlockHeight } = await this.prepareTx(tx);
-    const signed = await this.signTransaction(prepared);
-    return await this.sendAndConfirmHttp(signed, {
-      blockhash,
-      lastValidBlockHeight
-    });
+    try {
+      const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 4e5 });
+      if (!!this.squadsX) {
+        const createVaultTx = await this.createVaultLiqsolAtaOneShot({
+          connection: this.connection,
+          payer: this.solPubKey,
+          vaultPda: this.squadsVaultPDA
+        });
+        if (createVaultTx !== null) {
+          console.log("need to create vault ata first...");
+          const tx0 = new Transaction().add(createVaultTx.tx);
+          const prepared0 = await this.prepareTx(tx0);
+          const signed0 = await this.signTransaction(prepared0.tx);
+          const sent0 = await this.sendAndConfirmHttp(signed0, prepared0);
+          console.log("create Vault ATA", sent0);
+        }
+        const ix = await this.depositClient.buildDepositTx(amountLamports, this.squadsVaultPDA);
+        const squadIxs = await this.prepSquadsIxs(ix);
+        const tx1 = new Transaction().add(cuIx, squadIxs[0]);
+        const prepared1 = await this.prepareTx(tx1);
+        const signed1 = await this.signTransaction(prepared1.tx);
+        const sent1 = await this.sendAndConfirmHttp(signed1, prepared1);
+        console.log("SENT 1", sent1);
+        const tx2 = new Transaction().add(cuIx, squadIxs[1]);
+        const prepared2 = await this.prepareTx(tx2);
+        const signed2 = await this.signTransaction(prepared2.tx);
+        const sent2 = await this.sendAndConfirmHttp(signed2, prepared2);
+        console.log("SENT 2", sent2);
+        return sent2;
+      } else {
+        const ix = await this.depositClient.buildDepositTx(amountLamports);
+        const tx = new Transaction().add(ix);
+        const prepared = await this.prepareTx(tx);
+        const signed = await this.signTransaction(prepared.tx);
+        return this.sendAndConfirmHttp(signed, prepared);
+      }
+    } catch (err) {
+      throw new Error(`Failed to deposit Solana: ${err}`);
+    }
   }
   async withdraw(amountLamports) {
     this.ensureUser();
     if (amountLamports <= BigInt(0)) {
       throw new Error("Withdraw amount must be greater than zero.");
     }
-    const tx = await this.depositClient.buildWithdrawTx(amountLamports);
-    const { tx: prepared, blockhash, lastValidBlockHeight } = await this.prepareTx(tx);
-    const signed = await this.signTransaction(prepared);
-    return await this.sendAndConfirmHttp(signed, {
-      blockhash,
-      lastValidBlockHeight
-    });
+    try {
+      const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 4e5 });
+      const ix = await this.depositClient.buildWithdrawTx(amountLamports);
+      const tx = new Transaction().add(cuIx, ix);
+      const prepared = await this.prepareTx(tx);
+      const signed = await this.signTransaction(prepared.tx);
+      return this.sendAndConfirmHttp(signed, prepared);
+    } catch (err) {
+      throw new Error(`Failed to withdraw Solana: ${err}`);
+    }
   }
   async stake(amountLamports) {
     this.ensureUser();
     if (!amountLamports || amountLamports <= BigInt(0)) {
       throw new Error("Stake amount must be greater than zero.");
     }
-    const user = this.solPubKey;
-    const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 4e5 });
-    const ix = await this.outpostClient.buildStakeIx(amountLamports, user);
-    const tx = new Transaction().add(cuIx, ix);
-    const prepared = await this.prepareTx(tx);
-    const signed = await this.signTransaction(prepared.tx);
-    return this.sendAndConfirmHttp(signed, prepared);
+    try {
+      const user = this.solPubKey;
+      const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 4e5 });
+      const ix = await this.outpostClient.buildStakeIx(amountLamports, user);
+      const tx = new Transaction().add(cuIx, ix);
+      const prepared = await this.prepareTx(tx);
+      const signed = await this.signTransaction(prepared.tx);
+      return this.sendAndConfirmHttp(signed, prepared);
+    } catch (err) {
+      throw new Error(`Failed to stake Solana: ${err}`);
+    }
   }
   async unstake(amountLamports) {
     this.ensureUser();
     if (!amountLamports || amountLamports <= BigInt(0)) {
       throw new Error("Unstake amount must be greater than zero.");
     }
-    const user = this.solPubKey;
-    const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 4e5 });
-    const ix = await this.outpostClient.buildUnstakeIx(amountLamports, user);
-    const tx = new Transaction().add(cuIx, ix);
-    const prepared = await this.prepareTx(tx);
-    const signed = await this.signTransaction(prepared.tx);
-    return this.sendAndConfirmHttp(signed, prepared);
+    try {
+      const user = this.solPubKey;
+      const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 4e5 });
+      const ix = await this.outpostClient.buildUnstakeIx(amountLamports, user);
+      const tx = new Transaction().add(cuIx, ix);
+      const prepared = await this.prepareTx(tx);
+      const signed = await this.signTransaction(prepared.tx);
+      return this.sendAndConfirmHttp(signed, prepared);
+    } catch (err) {
+      throw new Error(`Failed to unstake Solana: ${err}`);
+    }
   }
   async buy(amountLamports) {
     this.ensureUser();
     if (!amountLamports || amountLamports <= BigInt(0)) {
       throw new Error("liqSOL pretoken purchase requires a positive amount.");
     }
-    const user = this.solPubKey;
-    const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 4e5 });
-    const ix = await this.tokenClient.buildPurchaseIx(amountLamports, user);
-    const tx = new Transaction().add(cuIx, ix);
-    const { tx: prepared, blockhash, lastValidBlockHeight } = await this.prepareTx(tx);
-    const signed = await this.signTransaction(prepared);
-    return await this.sendAndConfirmHttp(signed, {
-      blockhash,
-      lastValidBlockHeight
-    });
+    try {
+      const user = this.solPubKey;
+      const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 4e5 });
+      const ix = await this.tokenClient.buildPurchaseIx(amountLamports, user);
+      const tx = new Transaction().add(cuIx, ix);
+      const prepared = await this.prepareTx(tx);
+      const signed = await this.signTransaction(prepared.tx);
+      return this.sendAndConfirmHttp(signed, prepared);
+    } catch (err) {
+      throw new Error(`Failed to buy liqSOL pretokens: ${err}`);
+    }
   }
   async getPortfolio() {
     if (!this.pubKey) throw new Error("User pubKey is undefined");
-    const user = this.solPubKey;
-    const reservePoolPDA = deriveReservePoolPda();
-    const vaultPDA = deriveVaultPda();
-    const liqsolMint = deriveLiqsolMintPda();
-    const userLiqsolAta = getAssociatedTokenAddressSync(
-      liqsolMint,
-      user,
-      false,
-      TOKEN_2022_PROGRAM_ID,
-      ASSOCIATED_TOKEN_PROGRAM_ID
-    );
-    const [nativeLamports, actualBalResp, snapshot] = await Promise.all([
-      this.connection.getBalance(user, "confirmed"),
-      this.connection.getTokenAccountBalance(userLiqsolAta, "confirmed").catch(() => null),
-      this.outpostClient.fetchWireState(user).catch(() => null)
-    ]);
-    const LIQSOL_DECIMALS = 9;
-    const actualAmountStr = actualBalResp?.value?.amount ?? "0";
-    const globalState = snapshot?.globalState ?? null;
-    const outpostAccount = snapshot?.outpostAccount ?? null;
-    const trancheState = snapshot?.trancheState ?? null;
-    const userPretokenRecord = snapshot?.userPretokenRecord ?? null;
-    const stakedLiqsolStr = outpostAccount?.stakedLiqsol?.toString?.() ?? "0";
-    const wirePretokensStr = userPretokenRecord?.totalPretokensPurchased?.toString?.() ?? "0";
-    const currentIndexStr = globalState?.currentIndex?.toString?.() ?? "0";
-    const totalSharesStr = globalState?.totalShares?.toString?.() ?? "0";
-    const userSharesStr = outpostAccount?.stakedShares?.toString?.() ?? "0";
-    const stakedLiqsol = BigInt(stakedLiqsolStr);
-    const currentIndex = BigInt(currentIndexStr);
-    const totalShares = BigInt(totalSharesStr);
-    const userShares = BigInt(userSharesStr);
-    let estimatedClaim = BigInt(0);
-    let estimatedYield = BigInt(0);
-    if (userShares > BigInt(0) && currentIndex > BigInt(0)) {
-      estimatedClaim = userShares * currentIndex / INDEX_SCALE$1;
-      if (estimatedClaim > stakedLiqsol) {
-        estimatedYield = estimatedClaim - stakedLiqsol;
+    try {
+      const user = !!this.squadsX ? this.squadsVaultPDA : this.solPubKey;
+      console.log("get portfolio for user", user.toBase58());
+      const reservePoolPDA = deriveReservePoolPda();
+      const vaultPDA = deriveVaultPda();
+      const liqsolMint = deriveLiqsolMintPda();
+      const userLiqsolAta = getAssociatedTokenAddressSync(
+        liqsolMint,
+        user,
+        true,
+        TOKEN_2022_PROGRAM_ID,
+        ASSOCIATED_TOKEN_PROGRAM_ID
+      );
+      const [nativeLamports, actualBalResp, snapshot] = await Promise.all([
+        this.connection.getBalance(user, "confirmed"),
+        this.connection.getTokenAccountBalance(userLiqsolAta, "confirmed").catch(() => null),
+        this.outpostClient.fetchWireState(user).catch(() => null)
+      ]);
+      const LIQSOL_DECIMALS = 9;
+      const actualAmountStr = actualBalResp?.value?.amount ?? "0";
+      const globalState = snapshot?.globalState ?? null;
+      const outpostAccount = snapshot?.outpostAccount ?? null;
+      const trancheState = snapshot?.trancheState ?? null;
+      const userPretokenRecord = snapshot?.userPretokenRecord ?? null;
+      const stakedLiqsolStr = outpostAccount?.stakedLiqsol?.toString?.() ?? "0";
+      const wirePretokensStr = userPretokenRecord?.totalPretokensPurchased?.toString?.() ?? "0";
+      const currentIndexStr = globalState?.currentIndex?.toString?.() ?? "0";
+      const totalSharesStr = globalState?.totalShares?.toString?.() ?? "0";
+      const userSharesStr = outpostAccount?.stakedShares?.toString?.() ?? "0";
+      const stakedLiqsol = BigInt(stakedLiqsolStr);
+      const currentIndex = BigInt(currentIndexStr);
+      const totalShares = BigInt(totalSharesStr);
+      const userShares = BigInt(userSharesStr);
+      let estimatedClaim = BigInt(0);
+      let estimatedYield = BigInt(0);
+      if (userShares > BigInt(0) && currentIndex > BigInt(0)) {
+        estimatedClaim = userShares * currentIndex / INDEX_SCALE$1;
+        if (estimatedClaim > stakedLiqsol) {
+          estimatedYield = estimatedClaim - stakedLiqsol;
+        }
       }
+      return {
+        native: {
+          amount: BigInt(nativeLamports),
+          symbol: "SOL",
+          decimals: 9
+        },
+        liq: {
+          amount: BigInt(actualAmountStr),
+          symbol: "LiqSOL",
+          decimals: LIQSOL_DECIMALS,
+          ata: userLiqsolAta
+        },
+        staked: {
+          amount: stakedLiqsol,
+          symbol: "LiqSOL",
+          decimals: LIQSOL_DECIMALS
+        },
+        wire: {
+          amount: BigInt(wirePretokensStr),
+          symbol: "$WIRE",
+          decimals: 8
+        },
+        yield: {
+          currentIndex,
+          indexScale: INDEX_SCALE$1,
+          totalShares,
+          userShares,
+          estimatedClaim,
+          estimatedYield
+        },
+        extras: {
+          userLiqsolAta: userLiqsolAta.toBase58(),
+          reservePoolPDA: reservePoolPDA.toBase58(),
+          vaultPDA: vaultPDA.toBase58(),
+          globalIndex: globalState?.currentIndex?.toString(),
+          totalShares: globalState?.totalShares?.toString(),
+          currentTrancheNumber: trancheState?.currentTrancheNumber?.toString(),
+          currentTranchePriceUsd: trancheState?.currentTranchePriceUsd?.toString()
+        },
+        chainID: this.network.chainId
+      };
+    } catch (err) {
+      throw new Error(`Failed to get Solana portfolio: ${err}`);
     }
-    return {
-      native: {
-        amount: BigInt(nativeLamports),
-        symbol: "SOL",
-        decimals: 9
-      },
-      liq: {
-        amount: BigInt(actualAmountStr),
-        symbol: "LiqSOL",
-        decimals: LIQSOL_DECIMALS,
-        ata: userLiqsolAta
-      },
-      staked: {
-        amount: stakedLiqsol,
-        symbol: "LiqSOL",
-        decimals: LIQSOL_DECIMALS
-      },
-      wire: {
-        amount: BigInt(wirePretokensStr),
-        symbol: "$WIRE",
-        decimals: 8
-      },
-      yield: {
-        currentIndex,
-        indexScale: INDEX_SCALE$1,
-        totalShares,
-        userShares,
-        estimatedClaim,
-        estimatedYield
-      },
-      extras: {
-        userLiqsolAta: userLiqsolAta.toBase58(),
-        reservePoolPDA: reservePoolPDA.toBase58(),
-        vaultPDA: vaultPDA.toBase58(),
-        globalIndex: globalState?.currentIndex?.toString(),
-        totalShares: globalState?.totalShares?.toString(),
-        currentTrancheNumber: trancheState?.currentTrancheNumber?.toString(),
-        currentTranchePriceUsd: trancheState?.currentTranchePriceUsd?.toString()
-      },
-      chainID: this.network.chainId
-    };
   }
   async getUserRecord() {
     if (!this.pubKey) throw new Error("User pubKey is undefined");
     return this.distributionClient.getUserRecord(this.solPubKey);
   }
+  get squadsMultisigPDA() {
+    if (!this.squadsX) return null;
+    return new PublicKey(this.squadsX.multisigPDA);
+  }
+  get squadsVaultPDA() {
+    if (!this.squadsX || !this.squadsMultisigPDA) return null;
+    const multisigPda = this.squadsMultisigPDA;
+    const index = this.squadsX.vaultIndex ?? 0;
+    const pda = multisig.getVaultPda({ multisigPda, index });
+    return pda[0];
+  }
   async getTrancheSnapshot(options) {
-    const {
-      chainID = SolChainID.WireTestnet,
-      windowBefore,
-      windowAfter
-    } = options ?? {};
-    const [globalState, trancheState] = await Promise.all([
-      this.tokenClient.fetchGlobalState(),
-      this.tokenClient.fetchTrancheState()
-    ]);
-    const { price: solPriceUsd, timestamp } = await this.tokenClient.getSolPriceUsdSafe();
-    return buildSolanaTrancheSnapshot({
-      chainID,
-      globalState,
-      trancheState,
-      solPriceUsd,
-      nativePriceTimestamp: timestamp,
-      ladderWindowBefore: windowBefore,
-      ladderWindowAfter: windowAfter
-    });
+    try {
+      const {
+        chainID = SolChainID.WireTestnet,
+        windowBefore,
+        windowAfter
+      } = options ?? {};
+      const [globalState, trancheState] = await Promise.all([
+        this.tokenClient.fetchGlobalState(),
+        this.tokenClient.fetchTrancheState()
+      ]);
+      const { price: solPriceUsd, timestamp } = await this.tokenClient.getSolPriceUsdSafe();
+      return buildSolanaTrancheSnapshot({
+        chainID,
+        globalState,
+        trancheState,
+        solPriceUsd,
+        nativePriceTimestamp: timestamp,
+        ladderWindowBefore: windowBefore,
+        ladderWindowAfter: windowAfter
+      });
+    } catch (err) {
+      throw new Error(`Failed to build Solana tranche snapshot: ${err}`);
+    }
   }
   async getSystemAPY() {
-    const ratePerEpoch = await this.getEpochRateDecimalFromProgram();
-    const epochsPerYear = await this.getEpochsPerYearFromCluster();
-    const apyDecimal = Math.pow(1 + ratePerEpoch, epochsPerYear) - 1;
-    const apyPercent = apyDecimal * 100;
-    return apyPercent;
+    try {
+      const ratePerEpoch = await this.getEpochRateDecimalFromProgram();
+      const epochsPerYear = await this.getEpochsPerYearFromCluster();
+      const apyDecimal = Math.pow(1 + ratePerEpoch, epochsPerYear) - 1;
+      const apyPercent = apyDecimal * 100;
+      return apyPercent;
+    } catch (err) {
+      throw new Error(`Failed to compute Solana system APY: ${err}`);
+    }
   }
   async getEpochRateDecimalFromProgram() {
-    const liqSolCoreProgram = this.program.getProgram("liqsolCore");
-    const stakeMetricsPda = deriveStakeMetricsPda();
-    const stakeMetrics = await liqSolCoreProgram.account.stakeMetrics.fetch(stakeMetricsPda);
-    const raw = BigInt(stakeMetrics.solSystemPayRate.toString());
-    const rateDecimal = Number(raw) / Number(PAY_RATE_SCALE_FACTOR);
-    return rateDecimal;
+    try {
+      const liqSolCoreProgram = this.program.getProgram("liqsolCore");
+      const stakeMetricsPda = deriveStakeMetricsPda();
+      const stakeMetrics = await liqSolCoreProgram.account.stakeMetrics.fetch(stakeMetricsPda);
+      const raw = BigInt(stakeMetrics.solSystemPayRate.toString());
+      const rateDecimal = Number(raw) / Number(PAY_RATE_SCALE_FACTOR);
+      return rateDecimal;
+    } catch (err) {
+      throw new Error(`Failed to read stakeMetrics from program: ${err}`);
+    }
   }
   async getEpochsPerYearFromCluster() {
     const now = Date.now();
@@ -9225,8 +9062,7 @@ const _SolanaStakingClient = class _SolanaStakingClient {
   }
   async getDepositBuffer(options) {
     this.ensureUser();
-    const payer = this.solPubKey;
-    const balanceLamports = options?.balanceOverrideLamports ?? BigInt(await this.connection.getBalance(payer, commitment));
+    const balanceLamports = options?.balanceOverrideLamports ?? BigInt(await this.connection.getBalance(this.feePayer, commitment));
     if (balanceLamports <= BigInt(0)) {
       return BigInt(0);
     }
@@ -9282,7 +9118,7 @@ const _SolanaStakingClient = class _SolanaStakingClient {
     if (this.cachedTxFee && now - this.cachedTxFee.fetchedAt < _SolanaStakingClient.FEE_CACHE_TTL_MS) {
       return this.cachedTxFee.value;
     }
-    const payer = this.solPubKey;
+    const payer = this.feePayer;
     const dummyIx = SystemProgram.transfer({
       fromPubkey: payer,
       toPubkey: payer,
@@ -9337,17 +9173,16 @@ const _SolanaStakingClient = class _SolanaStakingClient {
   async prepareTx(tx) {
     const { blockhash, lastValidBlockHeight } = await this.connection.getLatestBlockhash("confirmed");
     tx.recentBlockhash = blockhash;
-    tx.feePayer = this.solPubKey;
+    tx.feePayer = this.feePayer;
     return { tx, blockhash, lastValidBlockHeight };
   }
   ensureUser() {
-    if (!this.pubKey || !this.anchor.wallet.publicKey) {
-      throw new Error("User Authorization required: pubKey is undefined");
-    }
-    if (this.solPubKey.toBase58() !== this.anchor.wallet.publicKey.toBase58()) {
-      throw new Error(
-        "Write access requires connected wallet to match pubKey"
-      );
+    if (!this.pubKey) throw new Error("User pubKey is undefined");
+    const wallet = this.anchor?.wallet;
+    const pk = wallet?.publicKey;
+    if (!pk) throw new Error("Wallet not connected");
+    if (typeof wallet.signTransaction !== "function") {
+      throw new Error("Wallet does not support signTransaction");
     }
   }
 };
@@ -34883,10 +34718,6 @@ const CONTRACTS = {
     address: ADDRESSES.ReceiptNFT,
     abi: ReceiptNFTArtifact.abi
   },
-  MockAggregator: {
-    address: ADDRESSES.MockAggregator,
-    abi: AggregatorArtifact.abi
-  },
   Pool: {
     address: ADDRESSES.Pool,
     abi: PoolArtifact.abi
@@ -34926,6 +34757,10 @@ const CONTRACTS = {
   Depositor: {
     address: ADDRESSES.Depositor,
     abi: DepositorArtifact.abi
+  },
+  MockAggregator: {
+    address: ADDRESSES.MockAggregator,
+    abi: AggregatorArtifact.abi
   }
 };
 class EthereumContractService {
@@ -35493,18 +35328,22 @@ class OPPClient {
     };
   }
   async getMessages(address) {
-    const oppMessageFilter = this.contract.OPP.filters.OPPMessage();
-    const events = await this.contract.OPP.queryFilter(oppMessageFilter, 0, "latest");
-    const allAssertions = [];
-    for (const event of events) {
-      const assertions = await this.extractAssertionsFromEvent(event);
-      allAssertions.push(...assertions);
+    try {
+      const oppMessageFilter = this.contract.OPP.filters.OPPMessage();
+      const events = await this.contract.OPP.queryFilter(oppMessageFilter, 0, "latest");
+      const allAssertions = [];
+      for (const event of events) {
+        const assertions = await this.extractAssertionsFromEvent(event);
+        allAssertions.push(...assertions);
+      }
+      const normalized = address ? address.toLowerCase() : null;
+      const filtered = allAssertions.filter(
+        (a) => a.from && a.from.toLowerCase() === normalized || a.to && a.to.toLowerCase() === normalized
+      );
+      return filtered.reverse();
+    } catch (error) {
+      return [];
     }
-    const normalized = address ? address.toLowerCase() : null;
-    const filtered = allAssertions.filter(
-      (a) => a.from && a.from.toLowerCase() === normalized || a.to && a.to.toLowerCase() === normalized
-    );
-    return filtered.reverse();
   }
   async extractAssertionsFromEvent(event) {
     const header = event.args.header;
@@ -35740,7 +35579,12 @@ class ReceiptClient {
     return this.fetchPreLaunchReceipts(address);
   }
   async stakeReceipts(address) {
-    return this.fetchPreLaunchReceipts(address, ReceiptNFTKind.STAKE);
+    try {
+      const receipts = await this.fetchPreLaunchReceipts(address, ReceiptNFTKind.STAKE);
+      return receipts;
+    } catch (err) {
+      return [];
+    }
   }
   async pretokenReceipts(address) {
     return this.fetchPreLaunchReceipts(address, ReceiptNFTKind.PRETOKEN_PURCHASE);
@@ -35870,80 +35714,81 @@ class EthereumStakingClient {
   async buy(amount) {
     this.ensureUser();
     const buyer = await this.signer.getAddress();
-    const network = await this.provider.getNetwork();
-    const chainId = network.chainId;
-    const allowedTestChains =  new Set([560048]);
-    if (allowedTestChains.has(chainId)) await this.updateMockAggregatorPrice();
     let result = await this.pretokenClient.purchasePretokensWithLiqETH(amount, buyer);
     return result && result.txHash ? result.txHash : "Error - no resulting txHash";
   }
   async getPortfolio() {
-    if (!this.signer) return Promise.resolve(null);
-    const walletAddress = await this.signer.getAddress();
-    const nativeBalance = await this.provider.getBalance(walletAddress);
-    const nativeDecimals = this.network?.nativeCurrency?.decimals ?? 18;
-    const nativeSymbol = this.network?.nativeCurrency?.symbol ?? "ETH";
-    const liqBalance = await this.contract.LiqEthToken.balanceOf(walletAddress);
-    const liqSymbol = "Liq" + (this.network?.nativeCurrency?.symbol ?? "ETH");
-    let stakeReceipts = await this.receiptClient.stakeReceipts(walletAddress);
-    let stakeBalanceBN = BigNumber.from(0);
-    for (let r of stakeReceipts) {
-      stakeBalanceBN = stakeBalanceBN.add(BigNumber.from(r.receipt.principal.amount));
-    }
-    let stakeSharesBN = BigNumber.from(0);
-    for (let r of stakeReceipts) {
-      stakeSharesBN = stakeSharesBN.add(BigNumber.from(r.receipt.shares.amount));
-    }
-    const wireBalance = await this.contract.Pretoken.balanceOf(walletAddress);
-    let currentIndex = BigInt(0);
-    let totalShares = BigInt(0);
-    let userShares = BigInt(0);
-    const indexScale = BigInt(1e27);
     try {
-      const [indexBn, totalSharesBn] = await Promise.all([
-        this.contract.Depositor.index().catch(() => BigNumber.from(0)),
-        this.contract.Depositor.totalShares().catch(() => BigNumber.from(0))
-      ]);
-      const userSharesBn = stakeSharesBN;
-      currentIndex = BigInt(indexBn.toString());
-      totalShares = BigInt(totalSharesBn.toString());
-      userShares = BigInt(userSharesBn.toString());
-    } catch {
+      if (!this.signer) return Promise.resolve(null);
+      const walletAddress = await this.signer.getAddress();
+      const nativeBalance = await this.provider.getBalance(walletAddress);
+      const nativeDecimals = this.network?.nativeCurrency?.decimals ?? 18;
+      const nativeSymbol = this.network?.nativeCurrency?.symbol ?? "ETH";
+      const liqBalance = await this.contract.LiqEthToken.balanceOf(walletAddress);
+      const liqSymbol = "Liq" + (this.network?.nativeCurrency?.symbol ?? "ETH");
+      let stakeReceipts = await this.receiptClient.stakeReceipts(walletAddress);
+      let stakeBalanceBN = BigNumber.from(0);
+      for (let r of stakeReceipts) {
+        stakeBalanceBN = stakeBalanceBN.add(BigNumber.from(r.receipt.principal.amount));
+      }
+      let stakeSharesBN = BigNumber.from(0);
+      for (let r of stakeReceipts) {
+        stakeSharesBN = stakeSharesBN.add(BigNumber.from(r.receipt.shares.amount));
+      }
+      const wireBalance = await this.contract.Pretoken.balanceOf(walletAddress);
+      let currentIndex = BigInt(0);
+      let totalShares = BigInt(0);
+      let userShares = BigInt(0);
+      const indexScale = BigInt(1e27);
+      try {
+        const [indexBn, totalSharesBn] = await Promise.all([
+          this.contract.Depositor.index().catch(() => BigNumber.from(0)),
+          this.contract.Depositor.totalShares().catch(() => BigNumber.from(0))
+        ]);
+        const userSharesBn = stakeSharesBN;
+        currentIndex = BigInt(indexBn.toString());
+        totalShares = BigInt(totalSharesBn.toString());
+        userShares = BigInt(userSharesBn.toString());
+      } catch (error) {
+        console.log("Error fetching staking index/shares:", error);
+      }
+      let estimatedClaim = BigInt(0);
+      let estimatedYield = BigInt(0);
+      const portfolio = {
+        native: {
+          amount: nativeBalance.toBigInt(),
+          decimals: nativeDecimals,
+          symbol: nativeSymbol
+        },
+        liq: {
+          amount: liqBalance.toBigInt(),
+          decimals: nativeDecimals,
+          symbol: liqSymbol
+        },
+        staked: {
+          amount: stakeBalanceBN.toBigInt(),
+          decimals: nativeDecimals,
+          symbol: liqSymbol
+        },
+        wire: {
+          amount: wireBalance.toBigInt(),
+          decimals: 18,
+          symbol: "$WIRE"
+        },
+        yield: {
+          currentIndex,
+          indexScale,
+          totalShares,
+          userShares,
+          estimatedClaim,
+          estimatedYield
+        },
+        chainID: this.network.chainId
+      };
+      return portfolio;
+    } catch (error) {
+      throw error;
     }
-    let estimatedClaim = BigInt(0);
-    let estimatedYield = BigInt(0);
-    const portfolio = {
-      native: {
-        amount: nativeBalance.toBigInt(),
-        decimals: nativeDecimals,
-        symbol: nativeSymbol
-      },
-      liq: {
-        amount: liqBalance.toBigInt(),
-        decimals: nativeDecimals,
-        symbol: liqSymbol
-      },
-      staked: {
-        amount: stakeBalanceBN.toBigInt(),
-        decimals: nativeDecimals,
-        symbol: liqSymbol
-      },
-      wire: {
-        amount: wireBalance.toBigInt(),
-        decimals: 18,
-        symbol: "$WIRE"
-      },
-      yield: {
-        currentIndex,
-        indexScale,
-        totalShares,
-        userShares,
-        estimatedClaim,
-        estimatedYield
-      },
-      chainID: this.network.chainId
-    };
-    return portfolio;
   }
   async fetchPrelaunchReceipts(address) {
     this.ensureUser();
@@ -35987,7 +35832,7 @@ class EthereumStakingClient {
   }
   async getTrancheSnapshot(options) {
     const {
-      chainID = EvmChainID.Hoodi,
+      chainID = EvmChainID.Ethereum,
       windowBefore,
       windowAfter
     } = options ?? {};
@@ -36008,10 +35853,8 @@ class EthereumStakingClient {
       ]);
       const totalTrancheSupply = BigInt(totalSupplyBn.toString()) / BigInt(1e10);
       const currentTrancheSupply = BigInt(trancheSupplyBn.toString()) / BigInt(1e10);
-      const [roundId, answer, startedAt, updatedAt, answeredInRound] = await this.contract.MockAggregator.latestRoundData();
       let ethPriceUsdBn = await this.contract.EthUsdPriceConsumer.getPrice18Decimals();
       let ethPriceUsd = BigInt(ethPriceUsdBn.toString()) / BigInt(1e10);
-      let nativePriceTimestamp = Number(updatedAt);
       const initialTrancheSupply = BigInt(INITIAL_TRANCHE_SUPPLY) * BigInt(1e8);
       return buildEthereumTrancheSnapshot({
         chainID,
@@ -36027,7 +35870,6 @@ class EthereumStakingClient {
         minPriceUsd,
         maxPriceUsd,
         ethPriceUsd,
-        nativePriceTimestamp,
         ladderWindowBefore: windowBefore,
         ladderWindowAfter: windowAfter
       });
@@ -36060,34 +35902,6 @@ class EthereumStakingClient {
     }
     return bufferWei;
   }
-  async updateMockAggregatorPrice() {
-    const aggregator = this.contract.MockAggregator;
-    const [roundId, answer, startedAt, updatedAt, answeredInRound] = await aggregator.latestRoundData();
-    const now = (await this.provider.getBlock("latest")).timestamp;
-    const ageSec = Number(now) - Number(updatedAt);
-    const ONE_HOUR = 1 * 3600;
-    if (ageSec > ONE_HOUR) {
-      const network = await this.provider.getNetwork();
-      const chainId = network.chainId;
-      const allowedTestChains =  new Set([560048]);
-      if (!allowedTestChains.has(chainId)) {
-        console.warn(`MockAggregator is stale (${ageSec}s) but chainId ${chainId} is not a test/local network \u2014 skipping update.`);
-        return;
-      }
-      const res = await fetch("https://api.coingecko.com/api/v3/simple/price?ids=ethereum&vs_currencies=usd");
-      const data = await res.json();
-      const ethUsd = data.ethereum.usd;
-      const currentEthPrice = ethers.utils.parseUnits(ethUsd.toString(), 8);
-      try {
-        const tx = await aggregator.updateAnswer(currentEthPrice);
-        const txreceipt = await tx.wait(1);
-      } catch (err) {
-        console.error("MockAggregator updateAnswer failed", err?.message || err);
-      }
-    } else {
-      console.log(`MockAggregator updated ${ageSec}s ago \u2014 no update needed`);
-    }
-  }
 }
 
 class Staker {
@@ -36098,10 +35912,8 @@ class Staker {
     config.forEach((cfg) => {
       switch (cfg.network.chainId) {
         case SolChainID.Devnet:
-        case SolChainID.WireTestnet:
           this.clients.set(cfg.network.chainId, new SolanaStakingClient(cfg));
           break;
-        case EvmChainID.Ethereum:
         case EvmChainID.Hoodi:
           this.clients.set(cfg.network.chainId, new EthereumStakingClient(cfg));
           break;
@@ -36142,7 +35954,6 @@ const CONTRACT_NAMES = [
   "Base58",
   "sysio_merkle",
   "ReceiptNFT",
-  "MockAggregator",
   "Pool",
   "OutpostManager",
   "sysio_write",
@@ -36152,7 +35963,8 @@ const CONTRACT_NAMES = [
   "OPP",
   "Pretoken",
   "OPPInbound",
-  "Depositor"
+  "Depositor",
+  "MockAggregator"
 ];
 
 var types$1 = /*#__PURE__*/Object.freeze({