@wireio/stake 0.7.3 → 0.9.1

package/lib/stake.js

@@ -4,8 +4,28 @@ var core = require('@wireio/core');
 var web3_js = require('@solana/web3.js');
 var anchor = require('@coral-xyz/anchor');
 var splToken = require('@solana/spl-token');
+var multisig = require('@sqds/multisig');
 var ethers = require('ethers');
 
+function _interopNamespaceDefault(e) {
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+
+var multisig__namespace = /*#__PURE__*/_interopNamespaceDefault(multisig);
+
 var address$3 = "5nBtmutQLrRKBUxNfHJPDjiW5u8id6QM9Hhjg1D1g1XH";
 var metadata$3 = {
 	name: "liqsol_core",
@@ -14,68 +34,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: [
@@ -129,74 +87,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: [
@@ -236,43 +126,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: [
@@ -2862,147 +2715,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: [
@@ -3025,8 +2737,7 @@ var instructions$3 = [
 				signer: true
 			},
 			{
-				name: "new_authority",
-				signer: true
+				name: "new_authority"
 			}
 		],
 		args: [
@@ -3054,52 +2765,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: [
@@ -3589,35 +3260,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: [
@@ -4295,8 +3937,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 = [
@@ -6749,153 +6501,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: [
@@ -7829,7 +7434,7 @@ const deriveEphemeralStakeAddress = (user, seed) => __async$f(null, null, functi
   return web3_js.PublicKey.createWithSeed(user, seedStr, web3_js.StakeProgram.programId);
 });
 const CHAINLINK_FEED = new web3_js.PublicKey(
-  "99B2bTijsU6f1GCT73HmdR7HCFFjGMBcPZY6jZ96ynrR"
+  "CH31Xns5z3M1cTAbKW34jcxPPciazARpijcHj9rxtemt"
 );
 const CHAINLINK_PROGRAM = new web3_js.PublicKey(
   "HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny"
@@ -7917,6 +7522,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;
   }
@@ -7945,7 +7553,7 @@ class DepositClient {
       const userAta = splToken.getAssociatedTokenAddressSync(
         liqsolMint,
         user,
-        false,
+        true,
         splToken.TOKEN_2022_PROGRAM_ID
       );
       const distributionState = deriveDistributionStatePda();
@@ -7958,7 +7566,7 @@ class DepositClient {
       );
       const seed = Math.floor(Math.random() * __pow(2, 32));
       const ephemeralStake = yield deriveEphemeralStakeAddress(user, seed);
-      const ix = yield this.program.methods.deposit(new anchor.BN(amount.toString()), seed).accounts({
+      return yield this.program.methods.deposit(new anchor.BN(amount.toString()), seed).accounts({
         user,
         depositAuthority,
         systemProgram: web3_js.SystemProgram.programId,
@@ -7985,7 +7593,64 @@ class DepositClient {
         rent: web3_js.SYSVAR_RENT_PUBKEY,
         globalConfig
       }).instruction();
-      return new web3_js.Transaction().add(ix);
+    });
+  }
+  buildSquadsDepositProposalTx(params) {
+    return __async$e(this, null, function* () {
+      var _a, _b, _c, _d;
+      const { connection, multisigPda, amountLamports, wallet } = params;
+      const vaultIndex = (_a = params.vaultIndex) != null ? _a : 0;
+      if (!(wallet == null ? void 0 : wallet.publicKey)) throw new Error("wallet.publicKey missing");
+      if (!amountLamports || amountLamports <= BigInt(0)) throw new Error("amountLamports must be > 0");
+      const [vaultPda] = multisig__namespace.getVaultPda({ multisigPda, index: vaultIndex });
+      const depositBuilt = yield this.buildDepositIxForUser(amountLamports, vaultPda);
+      const ms = yield multisig__namespace.accounts.Multisig.fromAccountAddress(connection, multisigPda);
+      const current = BigInt((_d = (_c = (_b = ms.transactionIndex) == null ? void 0 : _b.toString) == null ? void 0 : _c.call(_b)) != null ? _d : 0);
+      const transactionIndex = current + BigInt(1);
+      const { blockhash } = yield connection.getLatestBlockhash("confirmed");
+      const message = new web3_js.TransactionMessage({
+        payerKey: vaultPda,
+        recentBlockhash: blockhash,
+        instructions: [depositBuilt.ix]
+      });
+      const createVaultTxIx = yield multisig__namespace.instructions.vaultTransactionCreate({
+        multisigPda,
+        transactionIndex,
+        creator: wallet.publicKey,
+        vaultIndex,
+        ephemeralSigners: 0,
+        transactionMessage: message
+      });
+      console.log("createVaultTxIx", createVaultTxIx);
+      const tx = new web3_js.Transaction().add(createVaultTxIx);
+      return { tx, transactionIndex, vaultPda };
+    });
+  }
+  buildSquadsDepositProposalTx2(params) {
+    return __async$e(this, null, function* () {
+      var _a, _b, _c, _d;
+      const { connection, multisigPda, amountLamports, wallet } = params;
+      const vaultIndex = (_a = params.vaultIndex) != null ? _a : 0;
+      if (!(wallet == null ? void 0 : wallet.publicKey)) throw new Error("wallet.publicKey missing");
+      if (!amountLamports || amountLamports <= BigInt(0)) throw new Error("amountLamports must be > 0");
+      const [vaultPda] = multisig__namespace.getVaultPda({ multisigPda, index: vaultIndex });
+      const depositBuilt = yield this.buildDepositIxForUser(amountLamports, vaultPda);
+      const ms = yield multisig__namespace.accounts.Multisig.fromAccountAddress(connection, multisigPda);
+      const current = BigInt((_d = (_c = (_b = ms.transactionIndex) == null ? void 0 : _b.toString) == null ? void 0 : _c.call(_b)) != null ? _d : 0);
+      const transactionIndex = current + BigInt(1);
+      const { blockhash } = yield connection.getLatestBlockhash("confirmed");
+      new web3_js.TransactionMessage({
+        payerKey: vaultPda,
+        recentBlockhash: blockhash,
+        instructions: [depositBuilt.ix]
+      });
+      const createProposalIx = yield multisig__namespace.instructions.proposalCreate({
+        multisigPda,
+        transactionIndex,
+        creator: wallet.publicKey
+      });
+      const tx = new web3_js.Transaction().add(createProposalIx);
+      return { tx, transactionIndex, vaultPda };
     });
   }
   buildWithdrawTx(_0) {
@@ -8004,7 +7669,7 @@ class DepositClient {
       const userAta = splToken.getAssociatedTokenAddressSync(
         liqsolMint,
         user,
-        false,
+        true,
         splToken.TOKEN_2022_PROGRAM_ID
       );
       const userRecord = deriveUserRecordPda(userAta);
@@ -8037,7 +7702,7 @@ class DepositClient {
       const nftAta = splToken.getAssociatedTokenAddressSync(
         nftMint,
         owner,
-        false,
+        true,
         splToken.TOKEN_2022_PROGRAM_ID
       );
       const bucketAuthority = deriveBucketAuthorityPda();
@@ -8076,6 +7741,70 @@ class DepositClient {
       return new web3_js.Transaction().add(ix);
     });
   }
+  buildDepositIxForUser(amount, user) {
+    return __async$e(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 = 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 = splToken.getAssociatedTokenAddressSync(
+        liqsolMint,
+        user,
+        true,
+        splToken.TOKEN_2022_PROGRAM_ID
+      );
+      const distributionState = deriveDistributionStatePda();
+      const userRecord = 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 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: 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 };
+    });
+  }
 }
 
 var __async$d = (__this, __arguments, generator) => {
@@ -8649,7 +8378,7 @@ class DistributionClient {
         const ata = splToken.getAssociatedTokenAddressSync(
           liqsolMint,
           ownerOrAta,
-          false,
+          true,
           splToken.TOKEN_2022_PROGRAM_ID
         );
         const pdaFromWallet = deriveUserRecordPda(ata);
@@ -8992,7 +8721,7 @@ class OutpostClient {
     };
   }
   static tokensToShares(amount, currentIndex) {
-    const numerator = amount.mul(INDEX_SCALE$1);
+    const numerator = amount.mul(new anchor.BN(INDEX_SCALE$1));
     const shares = numerator.div(currentIndex);
     const remainder = numerator.mod(currentIndex);
     return remainder.eqn(0) ? shares : shares.addn(1);
@@ -9256,19 +8985,120 @@ 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() {
+    var _a;
+    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 = 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");
+      console.log("info?", info);
+      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)) {
         throw new Error("Deposit amount must be greater than zero.");
       }
-      const tx = yield this.depositClient.buildDepositTx(amountLamports);
-      const { tx: prepared, blockhash, lastValidBlockHeight } = yield this.prepareTx(tx);
-      const signed = yield this.signTransaction(prepared);
-      return yield this.sendAndConfirmHttp(signed, {
-        blockhash,
-        lastValidBlockHeight
-      });
+      try {
+        const cuIx = web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: 4e5 });
+        if (!!this.squadsX) {
+          const createVaultTx = yield 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 web3_js.Transaction().add(createVaultTx.tx);
+            const prepared0 = yield this.prepareTx(tx0);
+            const signed0 = yield this.signTransaction(prepared0.tx);
+            const sent0 = yield this.sendAndConfirmHttp(signed0, prepared0);
+            console.log("create Vault ATA", sent0);
+          }
+          const ix = yield this.depositClient.buildDepositTx(amountLamports, this.squadsVaultPDA);
+          const squadIxs = yield this.prepSquadsIxs(ix);
+          const tx1 = new web3_js.Transaction().add(cuIx, squadIxs[0]);
+          const prepared1 = yield this.prepareTx(tx1);
+          const signed1 = yield this.signTransaction(prepared1.tx);
+          const sent1 = yield this.sendAndConfirmHttp(signed1, prepared1);
+          console.log("SENT 1", sent1);
+          const tx2 = new web3_js.Transaction().add(cuIx, squadIxs[1]);
+          const prepared2 = yield this.prepareTx(tx2);
+          const signed2 = yield this.signTransaction(prepared2.tx);
+          const sent2 = yield this.sendAndConfirmHttp(signed2, prepared2);
+          console.log("SENT 2", sent2);
+          return sent2;
+        } else {
+          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);
+        }
+      } catch (err) {
+        throw new Error(`Failed to deposit Solana: ${err}`);
+      }
     });
   }
   withdraw(amountLamports) {
@@ -9277,13 +9107,16 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       if (amountLamports <= BigInt(0)) {
         throw new Error("Withdraw amount must be greater than zero.");
       }
-      const tx = yield this.depositClient.buildWithdrawTx(amountLamports);
-      const { tx: prepared, blockhash, lastValidBlockHeight } = yield this.prepareTx(tx);
-      const signed = yield this.signTransaction(prepared);
-      return yield this.sendAndConfirmHttp(signed, {
-        blockhash,
-        lastValidBlockHeight
-      });
+      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);
+      } catch (err) {
+        throw new Error(`Failed to withdraw Solana: ${err}`);
+      }
     });
   }
   stake(amountLamports) {
@@ -9292,13 +9125,17 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       if (!amountLamports || amountLamports <= BigInt(0)) {
         throw new Error("Stake amount must be greater than zero.");
       }
-      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);
+      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);
+      } catch (err) {
+        throw new Error(`Failed to stake Solana: ${err}`);
+      }
     });
   }
   unstake(amountLamports) {
@@ -9307,13 +9144,17 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       if (!amountLamports || amountLamports <= BigInt(0)) {
         throw new Error("Unstake amount must be greater than zero.");
       }
-      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);
+      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);
+      } catch (err) {
+        throw new Error(`Failed to unstake Solana: ${err}`);
+      }
     });
   }
   buy(amountLamports) {
@@ -9322,102 +9163,108 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       if (!amountLamports || amountLamports <= BigInt(0)) {
         throw new Error("liqSOL pretoken purchase requires a positive amount.");
       }
-      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 { tx: prepared, blockhash, lastValidBlockHeight } = yield this.prepareTx(tx);
-      const signed = yield this.signTransaction(prepared);
-      return yield this.sendAndConfirmHttp(signed, {
-        blockhash,
-        lastValidBlockHeight
-      });
+      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);
+      } catch (err) {
+        throw new Error(`Failed to buy liqSOL pretokens: ${err}`);
+      }
     });
   }
   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");
-      const user = this.solPubKey;
-      const reservePoolPDA = deriveReservePoolPda();
-      const vaultPDA = deriveVaultPda();
-      const liqsolMint = deriveLiqsolMintPda();
-      const userLiqsolAta = splToken.getAssociatedTokenAddressSync(
-        liqsolMint,
-        user,
-        false,
-        splToken.TOKEN_2022_PROGRAM_ID,
-        splToken.ASSOCIATED_TOKEN_PROGRAM_ID
-      );
-      const [nativeLamports, actualBalResp, snapshot] = yield 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 = (_b = (_a = actualBalResp == null ? void 0 : actualBalResp.value) == null ? void 0 : _a.amount) != null ? _b : "0";
-      const globalState = (_c = snapshot == null ? void 0 : snapshot.globalState) != null ? _c : null;
-      const outpostAccount = (_d = snapshot == null ? void 0 : snapshot.outpostAccount) != null ? _d : null;
-      const trancheState = (_e = snapshot == null ? void 0 : snapshot.trancheState) != null ? _e : null;
-      const userPretokenRecord = (_f = snapshot == null ? void 0 : snapshot.userPretokenRecord) != null ? _f : null;
-      const stakedLiqsolStr = (_i = (_h = (_g = outpostAccount == null ? void 0 : outpostAccount.stakedLiqsol) == null ? void 0 : _g.toString) == null ? void 0 : _h.call(_g)) != null ? _i : "0";
-      const wirePretokensStr = (_l = (_k = (_j = userPretokenRecord == null ? void 0 : userPretokenRecord.totalPretokensPurchased) == null ? void 0 : _j.toString) == null ? void 0 : _k.call(_j)) != null ? _l : "0";
-      const currentIndexStr = (_o = (_n = (_m = globalState == null ? void 0 : globalState.currentIndex) == null ? void 0 : _m.toString) == null ? void 0 : _n.call(_m)) != null ? _o : "0";
-      const totalSharesStr = (_r = (_q = (_p = globalState == null ? void 0 : globalState.totalShares) == null ? void 0 : _p.toString) == null ? void 0 : _q.call(_p)) != null ? _r : "0";
-      const userSharesStr = (_u = (_t = (_s = outpostAccount == null ? void 0 : outpostAccount.stakedShares) == null ? void 0 : _s.toString) == null ? void 0 : _t.call(_s)) != null ? _u : "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 = splToken.getAssociatedTokenAddressSync(
+          liqsolMint,
+          user,
+          true,
+          splToken.TOKEN_2022_PROGRAM_ID,
+          splToken.ASSOCIATED_TOKEN_PROGRAM_ID
+        );
+        const [nativeLamports, actualBalResp, snapshot] = yield 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 = (_b = (_a = actualBalResp == null ? void 0 : actualBalResp.value) == null ? void 0 : _a.amount) != null ? _b : "0";
+        const globalState = (_c = snapshot == null ? void 0 : snapshot.globalState) != null ? _c : null;
+        const outpostAccount = (_d = snapshot == null ? void 0 : snapshot.outpostAccount) != null ? _d : null;
+        const trancheState = (_e = snapshot == null ? void 0 : snapshot.trancheState) != null ? _e : null;
+        const userPretokenRecord = (_f = snapshot == null ? void 0 : snapshot.userPretokenRecord) != null ? _f : null;
+        const stakedLiqsolStr = (_i = (_h = (_g = outpostAccount == null ? void 0 : outpostAccount.stakedLiqsol) == null ? void 0 : _g.toString) == null ? void 0 : _h.call(_g)) != null ? _i : "0";
+        const wirePretokensStr = (_l = (_k = (_j = userPretokenRecord == null ? void 0 : userPretokenRecord.totalPretokensPurchased) == null ? void 0 : _j.toString) == null ? void 0 : _k.call(_j)) != null ? _l : "0";
+        const currentIndexStr = (_o = (_n = (_m = globalState == null ? void 0 : globalState.currentIndex) == null ? void 0 : _m.toString) == null ? void 0 : _n.call(_m)) != null ? _o : "0";
+        const totalSharesStr = (_r = (_q = (_p = globalState == null ? void 0 : globalState.totalShares) == null ? void 0 : _p.toString) == null ? void 0 : _q.call(_p)) != null ? _r : "0";
+        const userSharesStr = (_u = (_t = (_s = outpostAccount == null ? void 0 : outpostAccount.stakedShares) == null ? void 0 : _s.toString) == null ? void 0 : _t.call(_s)) != null ? _u : "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: (_v = globalState == null ? void 0 : globalState.currentIndex) == null ? void 0 : _v.toString(),
+            totalShares: (_w = globalState == null ? void 0 : globalState.totalShares) == null ? void 0 : _w.toString(),
+            currentTrancheNumber: (_x = trancheState == null ? void 0 : trancheState.currentTrancheNumber) == null ? void 0 : _x.toString(),
+            currentTranchePriceUsd: (_y = trancheState == null ? void 0 : trancheState.currentTranchePriceUsd) == null ? void 0 : _y.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: (_v = globalState == null ? void 0 : globalState.currentIndex) == null ? void 0 : _v.toString(),
-          totalShares: (_w = globalState == null ? void 0 : globalState.totalShares) == null ? void 0 : _w.toString(),
-          currentTrancheNumber: (_x = trancheState == null ? void 0 : trancheState.currentTrancheNumber) == null ? void 0 : _x.toString(),
-          currentTranchePriceUsd: (_y = trancheState == null ? void 0 : trancheState.currentTranchePriceUsd) == null ? void 0 : _y.toString()
-        },
-        chainID: this.network.chainId
-      };
     });
   }
   getUserRecord() {
@@ -9426,46 +9273,70 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       return this.distributionClient.getUserRecord(this.solPubKey);
     });
   }
+  get squadsMultisigPDA() {
+    if (!this.squadsX) return null;
+    return new web3_js.PublicKey(this.squadsX.multisigPDA);
+  }
+  get squadsVaultPDA() {
+    var _a;
+    if (!this.squadsX || !this.squadsMultisigPDA) return null;
+    const multisigPda = this.squadsMultisigPDA;
+    const index = (_a = this.squadsX.vaultIndex) != null ? _a : 0;
+    const pda = multisig__namespace.getVaultPda({ multisigPda, index });
+    return pda[0];
+  }
   getTrancheSnapshot(options) {
     return __async$8(this, null, function* () {
-      const {
-        chainID = core.SolChainID.WireTestnet,
-        windowBefore,
-        windowAfter
-      } = options != null ? options : {};
-      const [globalState, trancheState] = yield Promise.all([
-        this.tokenClient.fetchGlobalState(),
-        this.tokenClient.fetchTrancheState()
-      ]);
-      const { price: solPriceUsd, timestamp } = yield this.tokenClient.getSolPriceUsdSafe();
-      return buildSolanaTrancheSnapshot({
-        chainID,
-        globalState,
-        trancheState,
-        solPriceUsd,
-        nativePriceTimestamp: timestamp,
-        ladderWindowBefore: windowBefore,
-        ladderWindowAfter: windowAfter
-      });
+      try {
+        const {
+          chainID = core.SolChainID.WireTestnet,
+          windowBefore,
+          windowAfter
+        } = options != null ? options : {};
+        const [globalState, trancheState] = yield Promise.all([
+          this.tokenClient.fetchGlobalState(),
+          this.tokenClient.fetchTrancheState()
+        ]);
+        const { price: solPriceUsd, timestamp } = yield 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}`);
+      }
     });
   }
   getSystemAPY() {
     return __async$8(this, null, function* () {
-      const ratePerEpoch = yield this.getEpochRateDecimalFromProgram();
-      const epochsPerYear = yield this.getEpochsPerYearFromCluster();
-      const apyDecimal = Math.pow(1 + ratePerEpoch, epochsPerYear) - 1;
-      const apyPercent = apyDecimal * 100;
-      return apyPercent;
+      try {
+        const ratePerEpoch = yield this.getEpochRateDecimalFromProgram();
+        const epochsPerYear = yield 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}`);
+      }
     });
   }
   getEpochRateDecimalFromProgram() {
     return __async$8(this, null, function* () {
-      const liqSolCoreProgram = this.program.getProgram("liqsolCore");
-      const stakeMetricsPda = deriveStakeMetricsPda();
-      const stakeMetrics = yield 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 = yield 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}`);
+      }
     });
   }
   getEpochsPerYearFromCluster() {
@@ -9533,8 +9404,7 @@ const _SolanaStakingClient = class _SolanaStakingClient {
     return __async$8(this, null, function* () {
       var _a, _b, _c, _d;
       this.ensureUser();
-      const payer = this.solPubKey;
-      const balanceLamports = (_a = options == null ? void 0 : options.balanceOverrideLamports) != null ? _a : BigInt(yield this.connection.getBalance(payer, commitment));
+      const balanceLamports = (_a = options == null ? void 0 : options.balanceOverrideLamports) != null ? _a : BigInt(yield this.connection.getBalance(this.feePayer, commitment));
       if (balanceLamports <= BigInt(0)) {
         return BigInt(0);
       }
@@ -9593,7 +9463,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 = web3_js.SystemProgram.transfer({
         fromPubkey: payer,
         toPubkey: payer,
@@ -9656,18 +9526,18 @@ const _SolanaStakingClient = class _SolanaStakingClient {
     return __async$8(this, null, function* () {
       const { blockhash, lastValidBlockHeight } = yield 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"
-      );
+    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");
     }
   }
 };
@@ -35223,10 +35093,6 @@ const CONTRACTS = {
     address: ADDRESSES.ReceiptNFT,
     abi: ReceiptNFTArtifact.abi
   },
-  MockAggregator: {
-    address: ADDRESSES.MockAggregator,
-    abi: AggregatorArtifact.abi
-  },
   Pool: {
     address: ADDRESSES.Pool,
     abi: PoolArtifact.abi
@@ -35266,6 +35132,10 @@ const CONTRACTS = {
   Depositor: {
     address: ADDRESSES.Depositor,
     abi: DepositorArtifact.abi
+  },
+  MockAggregator: {
+    address: ADDRESSES.MockAggregator,
+    abi: AggregatorArtifact.abi
   }
 };
 class EthereumContractService {
@@ -35965,18 +35835,22 @@ class OPPClient {
   }
   getMessages(address) {
     return __async$2(this, null, function* () {
-      const oppMessageFilter = this.contract.OPP.filters.OPPMessage();
-      const events = yield this.contract.OPP.queryFilter(oppMessageFilter, 0, "latest");
-      const allAssertions = [];
-      for (const event of events) {
-        const assertions = yield this.extractAssertionsFromEvent(event);
-        allAssertions.push(...assertions);
+      try {
+        const oppMessageFilter = this.contract.OPP.filters.OPPMessage();
+        const events = yield this.contract.OPP.queryFilter(oppMessageFilter, 0, "latest");
+        const allAssertions = [];
+        for (const event of events) {
+          const assertions = yield 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();
     });
   }
   extractAssertionsFromEvent(event) {
@@ -36239,7 +36113,12 @@ class ReceiptClient {
   }
   stakeReceipts(address) {
     return __async$1(this, null, function* () {
-      return this.fetchPreLaunchReceipts(address, ReceiptNFTKind.STAKE);
+      try {
+        const receipts = yield this.fetchPreLaunchReceipts(address, ReceiptNFTKind.STAKE);
+        return receipts;
+      } catch (err) {
+        return [];
+      }
     });
   }
   pretokenReceipts(address) {
@@ -36408,10 +36287,6 @@ class EthereumStakingClient {
     return __async(this, null, function* () {
       this.ensureUser();
       const buyer = yield this.signer.getAddress();
-      const network = yield this.provider.getNetwork();
-      const chainId = network.chainId;
-      const allowedTestChains =  new Set([560048]);
-      if (allowedTestChains.has(chainId)) yield this.updateMockAggregatorPrice();
       let result = yield this.pretokenClient.purchasePretokensWithLiqETH(amount, buyer);
       return result && result.txHash ? result.txHash : "Error - no resulting txHash";
     });
@@ -36419,72 +36294,77 @@ class EthereumStakingClient {
   getPortfolio() {
     return __async(this, null, function* () {
       var _a, _b, _c, _d, _e, _f, _g, _h, _i;
-      if (!this.signer) return Promise.resolve(null);
-      const walletAddress = yield this.signer.getAddress();
-      const nativeBalance = yield this.provider.getBalance(walletAddress);
-      const nativeDecimals = (_c = (_b = (_a = this.network) == null ? void 0 : _a.nativeCurrency) == null ? void 0 : _b.decimals) != null ? _c : 18;
-      const nativeSymbol = (_f = (_e = (_d = this.network) == null ? void 0 : _d.nativeCurrency) == null ? void 0 : _e.symbol) != null ? _f : "ETH";
-      const liqBalance = yield this.contract.LiqEthToken.balanceOf(walletAddress);
-      const liqSymbol = "Liq" + ((_i = (_h = (_g = this.network) == null ? void 0 : _g.nativeCurrency) == null ? void 0 : _h.symbol) != null ? _i : "ETH");
-      let stakeReceipts = yield this.receiptClient.stakeReceipts(walletAddress);
-      let stakeBalanceBN = ethers.BigNumber.from(0);
-      for (let r of stakeReceipts) {
-        stakeBalanceBN = stakeBalanceBN.add(ethers.BigNumber.from(r.receipt.principal.amount));
-      }
-      let stakeSharesBN = ethers.BigNumber.from(0);
-      for (let r of stakeReceipts) {
-        stakeSharesBN = stakeSharesBN.add(ethers.BigNumber.from(r.receipt.shares.amount));
-      }
-      const wireBalance = yield 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] = yield Promise.all([
-          this.contract.Depositor.index().catch(() => ethers.BigNumber.from(0)),
-          this.contract.Depositor.totalShares().catch(() => ethers.BigNumber.from(0))
-        ]);
-        const userSharesBn = stakeSharesBN;
-        currentIndex = BigInt(indexBn.toString());
-        totalShares = BigInt(totalSharesBn.toString());
-        userShares = BigInt(userSharesBn.toString());
-      } catch (e) {
+        if (!this.signer) return Promise.resolve(null);
+        const walletAddress = yield this.signer.getAddress();
+        const nativeBalance = yield this.provider.getBalance(walletAddress);
+        const nativeDecimals = (_c = (_b = (_a = this.network) == null ? void 0 : _a.nativeCurrency) == null ? void 0 : _b.decimals) != null ? _c : 18;
+        const nativeSymbol = (_f = (_e = (_d = this.network) == null ? void 0 : _d.nativeCurrency) == null ? void 0 : _e.symbol) != null ? _f : "ETH";
+        const liqBalance = yield this.contract.LiqEthToken.balanceOf(walletAddress);
+        const liqSymbol = "Liq" + ((_i = (_h = (_g = this.network) == null ? void 0 : _g.nativeCurrency) == null ? void 0 : _h.symbol) != null ? _i : "ETH");
+        let stakeReceipts = yield this.receiptClient.stakeReceipts(walletAddress);
+        let stakeBalanceBN = ethers.BigNumber.from(0);
+        for (let r of stakeReceipts) {
+          stakeBalanceBN = stakeBalanceBN.add(ethers.BigNumber.from(r.receipt.principal.amount));
+        }
+        let stakeSharesBN = ethers.BigNumber.from(0);
+        for (let r of stakeReceipts) {
+          stakeSharesBN = stakeSharesBN.add(ethers.BigNumber.from(r.receipt.shares.amount));
+        }
+        const wireBalance = yield 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] = yield Promise.all([
+            this.contract.Depositor.index().catch(() => ethers.BigNumber.from(0)),
+            this.contract.Depositor.totalShares().catch(() => ethers.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;
     });
   }
   fetchPrelaunchReceipts(address) {
@@ -36542,7 +36422,7 @@ class EthereumStakingClient {
   getTrancheSnapshot(options) {
     return __async(this, null, function* () {
       const {
-        chainID = core.EvmChainID.Hoodi,
+        chainID = core.EvmChainID.Ethereum,
         windowBefore,
         windowAfter
       } = options != null ? options : {};
@@ -36563,10 +36443,8 @@ class EthereumStakingClient {
         ]);
         const totalTrancheSupply = BigInt(totalSupplyBn.toString()) / BigInt(1e10);
         const currentTrancheSupply = BigInt(trancheSupplyBn.toString()) / BigInt(1e10);
-        const [roundId, answer, startedAt, updatedAt, answeredInRound] = yield this.contract.MockAggregator.latestRoundData();
         let ethPriceUsdBn = yield 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,
@@ -36582,7 +36460,6 @@ class EthereumStakingClient {
           minPriceUsd,
           maxPriceUsd,
           ethPriceUsd,
-          nativePriceTimestamp,
           ladderWindowBefore: windowBefore,
           ladderWindowAfter: windowAfter
         });
@@ -36619,36 +36496,6 @@ class EthereumStakingClient {
       return bufferWei;
     });
   }
-  updateMockAggregatorPrice() {
-    return __async(this, null, function* () {
-      const aggregator = this.contract.MockAggregator;
-      const [roundId, answer, startedAt, updatedAt, answeredInRound] = yield aggregator.latestRoundData();
-      const now = (yield this.provider.getBlock("latest")).timestamp;
-      const ageSec = Number(now) - Number(updatedAt);
-      const ONE_HOUR = 1 * 3600;
-      if (ageSec > ONE_HOUR) {
-        const network = yield 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 = yield fetch("https://api.coingecko.com/api/v3/simple/price?ids=ethereum&vs_currencies=usd");
-        const data = yield res.json();
-        const ethUsd = data.ethereum.usd;
-        const currentEthPrice = ethers.ethers.utils.parseUnits(ethUsd.toString(), 8);
-        try {
-          const tx = yield aggregator.updateAnswer(currentEthPrice);
-          const txreceipt = yield tx.wait(1);
-        } catch (err) {
-          console.error("MockAggregator updateAnswer failed", (err == null ? void 0 : err.message) || err);
-        }
-      } else {
-        console.log(`MockAggregator updated ${ageSec}s ago \u2014 no update needed`);
-      }
-    });
-  }
 }
 
 class Staker {
@@ -36659,10 +36506,8 @@ class Staker {
     config.forEach((cfg) => {
       switch (cfg.network.chainId) {
         case core.SolChainID.Devnet:
-        case core.SolChainID.WireTestnet:
           this.clients.set(cfg.network.chainId, new SolanaStakingClient(cfg));
           break;
-        case core.EvmChainID.Ethereum:
         case core.EvmChainID.Hoodi:
           this.clients.set(cfg.network.chainId, new EthereumStakingClient(cfg));
           break;
@@ -36703,7 +36548,6 @@ const CONTRACT_NAMES = [
   "Base58",
   "sysio_merkle",
   "ReceiptNFT",
-  "MockAggregator",
   "Pool",
   "OutpostManager",
   "sysio_write",
@@ -36713,7 +36557,8 @@ const CONTRACT_NAMES = [
   "OPP",
   "Pretoken",
   "OPPInbound",
-  "Depositor"
+  "Depositor",
+  "MockAggregator"
 ];
 
 var types$1 = /*#__PURE__*/Object.freeze({