@wireio/stake 0.4.1 → 0.4.3

package/lib/stake.js

@@ -6,7 +6,7 @@ var anchor = require('@coral-xyz/anchor');
 var splToken = require('@solana/spl-token');
 var ethers = require('ethers');
 
-var address$3 = "2qSsCXBYUSwF7zrzTT9jFpRpCmWoDpEyHr9exfCMq56P";
+var address$3 = "5nBtmutQLrRKBUxNfHJPDjiW5u8id6QM9Hhjg1D1g1XH";
 var metadata$3 = {
 	name: "liqsol_core",
 	version: "0.1.0",
@@ -20,7 +20,8 @@ var instructions$3 = [
 			"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"
+			"We should not be able to call this without development feature enabled",
+			""
 		],
 		discriminator: [
 			24,
@@ -57,6 +58,12 @@ var instructions$3 = [
 					"Maintenance ledger - to determine target processing epoch"
 				]
 			},
+			{
+				name: "global_config",
+				docs: [
+					"Global config for min_unstake_request setting"
+				]
+			},
 			{
 				name: "clock"
 			}
@@ -108,6 +115,12 @@ var instructions$3 = [
 				name: "processing_state",
 				writable: true
 			},
+			{
+				name: "global_config",
+				docs: [
+					"Global config for threshold parameters"
+				]
+			},
 			{
 				name: "authority",
 				signer: true
@@ -184,44 +197,6 @@ var instructions$3 = [
 			}
 		]
 	},
-	{
-		name: "advance_serviceability",
-		docs: [
-			"Advance the max servicable receipt ID"
-		],
-		discriminator: [
-			139,
-			89,
-			79,
-			2,
-			90,
-			211,
-			173,
-			240
-		],
-		accounts: [
-			{
-				name: "authority",
-				docs: [
-					"Authority that can update serviceable epoch"
-				],
-				signer: true
-			},
-			{
-				name: "global",
-				writable: true
-			},
-			{
-				name: "runtime_program"
-			}
-		],
-		args: [
-			{
-				name: "resolved_epoch",
-				type: "u64"
-			}
-		]
-	},
 	{
 		name: "aggregate_stake_metrics",
 		docs: [
@@ -383,6 +358,12 @@ var instructions$3 = [
 					"Maintenance ledger - to track last unstake allocation epoch"
 				],
 				writable: true
+			},
+			{
+				name: "global_config",
+				docs: [
+					"Global config for late epoch slot gate"
+				]
 			}
 		],
 		args: [
@@ -447,6 +428,12 @@ var instructions$3 = [
 				docs: [
 					"Global withdraw operator state - to read total_encumbered_funds"
 				]
+			},
+			{
+				name: "global_config",
+				docs: [
+					"Global config for rebalancing thresholds"
+				]
 			}
 		],
 		args: [
@@ -571,6 +558,12 @@ var instructions$3 = [
 			{
 				name: "stake_history"
 			},
+			{
+				name: "global_config",
+				docs: [
+					"Global config for claim_withdrawals_enabled check"
+				]
+			},
 			{
 				name: "token_program"
 			},
@@ -623,6 +616,12 @@ var instructions$3 = [
 					"Stake controller state - used to verify authority"
 				]
 			},
+			{
+				name: "global_config",
+				docs: [
+					"Global config for cooldown_epochs"
+				]
+			},
 			{
 				name: "clock"
 			},
@@ -962,6 +961,12 @@ var instructions$3 = [
 				name: "controller_state",
 				writable: true
 			},
+			{
+				name: "global_config",
+				docs: [
+					"Global config for deposit settings"
+				]
+			},
 			{
 				name: "payout_state",
 				writable: true
@@ -1098,47 +1103,6 @@ var instructions$3 = [
 			}
 		]
 	},
-	{
-		name: "force_validator_unstake",
-		docs: [
-			"A function you can call to directly influence the amount to unstake from a particular validator",
-			"Tbh this is a bypass of the system and should not be called unless you know what you are doing"
-		],
-		discriminator: [
-			7,
-			208,
-			146,
-			241,
-			10,
-			219,
-			109,
-			30
-		],
-		accounts: [
-			{
-				name: "admin",
-				writable: true,
-				signer: true
-			},
-			{
-				name: "validator_info",
-				docs: [
-					"Validator info account to update"
-				],
-				writable: true
-			}
-		],
-		args: [
-			{
-				name: "vote_account",
-				type: "pubkey"
-			},
-			{
-				name: "amount",
-				type: "u64"
-			}
-		]
-	},
 	{
 		name: "get_min_max_resolved_epoch_deactivations",
 		docs: [
@@ -1384,6 +1348,38 @@ var instructions$3 = [
 		args: [
 		]
 	},
+	{
+		name: "initialize_global_config",
+		discriminator: [
+			113,
+			216,
+			122,
+			131,
+			225,
+			209,
+			22,
+			55
+		],
+		accounts: [
+			{
+				name: "global_config",
+				writable: true
+			},
+			{
+				name: "controller_state"
+			},
+			{
+				name: "payer",
+				writable: true,
+				signer: true
+			},
+			{
+				name: "system_program"
+			}
+		],
+		args: [
+		]
+	},
 	{
 		name: "initialize_graveyard_list",
 		docs: [
@@ -1914,6 +1910,10 @@ var instructions$3 = [
 				],
 				writable: true
 			},
+			{
+				name: "withdraw_global",
+				writable: true
+			},
 			{
 				name: "stake_program"
 			},
@@ -1978,6 +1978,12 @@ var instructions$3 = [
 				name: "processing_state",
 				writable: true
 			},
+			{
+				name: "global_config",
+				docs: [
+					"Global config for late epoch slot gate"
+				]
+			},
 			{
 				name: "clock"
 			},
@@ -2052,6 +2058,12 @@ var instructions$3 = [
 			},
 			{
 				name: "instructions"
+			},
+			{
+				name: "global_config",
+				docs: [
+					"Global config for process_pay_cycle_enabled check"
+				]
 			}
 		],
 		args: [
@@ -2124,6 +2136,12 @@ var instructions$3 = [
 			},
 			{
 				name: "rent"
+			},
+			{
+				name: "global_config",
+				docs: [
+					"Global config for process_stake_orders_enabled check"
+				]
 			}
 		],
 		args: [
@@ -2233,6 +2251,12 @@ var instructions$3 = [
 			},
 			{
 				name: "stake_program"
+			},
+			{
+				name: "global_config",
+				docs: [
+					"Global config for process_unstake_orders_enabled check"
+				]
 			}
 		],
 		args: [
@@ -2510,6 +2534,12 @@ var instructions$3 = [
 			},
 			{
 				name: "active_list"
+			},
+			{
+				name: "global_config",
+				docs: [
+					"Global config for late epoch slot gate"
+				]
 			}
 		],
 		args: [
@@ -2551,6 +2581,12 @@ var instructions$3 = [
 			},
 			{
 				name: "active_list"
+			},
+			{
+				name: "global_config",
+				docs: [
+					"Global config for late epoch slot gate"
+				]
 			}
 		],
 		args: [
@@ -2645,6 +2681,12 @@ var instructions$3 = [
 			{
 				name: "allocation_state"
 			},
+			{
+				name: "global_config",
+				docs: [
+					"Global config for late epoch slot gate"
+				]
+			},
 			{
 				name: "authority",
 				signer: true
@@ -2776,6 +2818,12 @@ var instructions$3 = [
 					"Maintenance ledger - for accumulate_unstake_request"
 				]
 			},
+			{
+				name: "global_config",
+				docs: [
+					"Global config for min_unstake_request setting"
+				]
+			},
 			{
 				name: "clock"
 			},
@@ -3157,6 +3205,12 @@ var instructions$3 = [
 				name: "allocation_state",
 				writable: true
 			},
+			{
+				name: "global_config",
+				docs: [
+					"Global config for late epoch slot gate"
+				]
+			},
 			{
 				name: "system_program",
 				docs: [
@@ -3225,6 +3279,12 @@ var instructions$3 = [
 				name: "maintenance_ledger",
 				writable: true
 			},
+			{
+				name: "global_config",
+				docs: [
+					"Global config for late epoch slot gate"
+				]
+			},
 			{
 				name: "authority",
 				signer: true
@@ -3234,37 +3294,32 @@ var instructions$3 = [
 		]
 	},
 	{
-		name: "sync_distribution_index",
+		name: "sync_leaderboard_scores_batch",
 		discriminator: [
-			82,
-			159,
-			232,
-			125,
-			12,
-			29,
-			9,
-			226
+			52,
+			11,
+			210,
+			173,
+			90,
+			5,
+			48,
+			50
 		],
 		accounts: [
 			{
-				name: "authority",
-				docs: [
-					"Admin or crank that triggers the index sync"
-				],
-				signer: true
+				name: "leaderboard_state"
 			},
 			{
-				name: "distribution_state",
+				name: "processing_state",
 				writable: true
 			},
 			{
-				name: "bucket_authority",
-				docs: [
-					"The bucket's associated token account holding liqSOL"
-				]
+				name: "maintenance_ledger",
+				writable: true
 			},
 			{
-				name: "bucket_token_account"
+				name: "authority",
+				signer: true
 			}
 		],
 		args: [
@@ -3352,6 +3407,12 @@ var instructions$3 = [
 				name: "maintenance_ledger",
 				writable: true
 			},
+			{
+				name: "global_config",
+				docs: [
+					"Global config for min_vpp_entry and min_vpp_exit"
+				]
+			},
 			{
 				name: "authority",
 				signer: true
@@ -3483,63 +3544,235 @@ var instructions$3 = [
 		]
 	},
 	{
-		name: "update_growth_parameters",
+		name: "update_config_bool",
 		discriminator: [
-			172,
-			187,
-			237,
-			233,
-			250,
-			160,
-			115,
-			239
+			79,
+			36,
+			65,
+			239,
+			188,
+			35,
+			13,
+			160
 		],
 		accounts: [
 			{
-				name: "admin",
-				writable: true,
-				signer: true
-			},
-			{
-				name: "tranche_state",
+				name: "global_config",
 				writable: true
 			},
 			{
-				name: "price_history",
-				writable: true
+				name: "controller_state"
 			},
 			{
-				name: "system_program"
+				name: "authority",
+				docs: [
+					"Authority must match StakeControllerState.authority"
+				],
+				signer: true
 			}
 		],
 		args: [
 			{
-				name: "supply_growth_bps",
-				type: "u16"
+				name: "key",
+				type: {
+					defined: {
+						name: "ConfigKeyBool"
+					}
+				}
 			},
 			{
-				name: "price_growth_bps",
-				type: "u16"
+				name: "value",
+				type: "bool"
 			}
 		]
 	},
 	{
-		name: "update_price_bounds",
+		name: "update_config_u16",
 		discriminator: [
-			241,
-			116,
-			141,
-			65,
-			61,
-			95,
-			232,
-			28
+			149,
+			9,
+			244,
+			25,
+			46,
+			136,
+			59,
+			173
 		],
 		accounts: [
 			{
-				name: "admin",
-				writable: true,
-				signer: true
+				name: "global_config",
+				writable: true
+			},
+			{
+				name: "controller_state"
+			},
+			{
+				name: "authority",
+				docs: [
+					"Authority must match StakeControllerState.authority"
+				],
+				signer: true
+			}
+		],
+		args: [
+			{
+				name: "key",
+				type: {
+					defined: {
+						name: "ConfigKeyU16"
+					}
+				}
+			},
+			{
+				name: "value",
+				type: "u16"
+			}
+		]
+	},
+	{
+		name: "update_config_u64",
+		discriminator: [
+			120,
+			43,
+			124,
+			106,
+			97,
+			80,
+			208,
+			123
+		],
+		accounts: [
+			{
+				name: "global_config",
+				writable: true
+			},
+			{
+				name: "controller_state"
+			},
+			{
+				name: "authority",
+				docs: [
+					"Authority must match StakeControllerState.authority"
+				],
+				signer: true
+			}
+		],
+		args: [
+			{
+				name: "key",
+				type: {
+					defined: {
+						name: "ConfigKeyU64"
+					}
+				}
+			},
+			{
+				name: "value",
+				type: "u64"
+			}
+		]
+	},
+	{
+		name: "update_config_u8",
+		discriminator: [
+			17,
+			160,
+			31,
+			134,
+			222,
+			250,
+			229,
+			253
+		],
+		accounts: [
+			{
+				name: "global_config",
+				writable: true
+			},
+			{
+				name: "controller_state"
+			},
+			{
+				name: "authority",
+				docs: [
+					"Authority must match StakeControllerState.authority"
+				],
+				signer: true
+			}
+		],
+		args: [
+			{
+				name: "key",
+				type: {
+					defined: {
+						name: "ConfigKeyU8"
+					}
+				}
+			},
+			{
+				name: "value",
+				type: "u8"
+			}
+		]
+	},
+	{
+		name: "update_growth_parameters",
+		discriminator: [
+			172,
+			187,
+			237,
+			233,
+			250,
+			160,
+			115,
+			239
+		],
+		accounts: [
+			{
+				name: "admin",
+				writable: true,
+				signer: true
+			},
+			{
+				name: "tranche_state",
+				writable: true
+			},
+			{
+				name: "price_history",
+				writable: true
+			},
+			{
+				name: "system_program"
+			}
+		],
+		args: [
+			{
+				name: "supply_growth_bps",
+				type: "u16"
+			},
+			{
+				name: "price_growth_bps",
+				type: "u16"
+			}
+		]
+	},
+	{
+		name: "update_price_bounds",
+		discriminator: [
+			241,
+			116,
+			141,
+			65,
+			61,
+			95,
+			232,
+			28
+		],
+		accounts: [
+			{
+				name: "admin",
+				writable: true,
+				signer: true
 			},
 			{
 				name: "tranche_state",
@@ -3556,11 +3789,11 @@ var instructions$3 = [
 		args: [
 			{
 				name: "min_price_usd",
-				type: "i128"
+				type: "u64"
 			},
 			{
 				name: "max_price_usd",
-				type: "i128"
+				type: "u64"
 			},
 			{
 				name: "max_staleness_seconds",
@@ -3609,6 +3842,19 @@ var accounts$2 = [
 			127
 		]
 	},
+	{
+		name: "GlobalConfig",
+		discriminator: [
+			149,
+			8,
+			156,
+			202,
+			160,
+			252,
+			176,
+			217
+		]
+	},
 	{
 		name: "GlobalState",
 		discriminator: [
@@ -4170,6 +4416,13 @@ var types$5 = [
 					],
 					type: "u16"
 				},
+				{
+					name: "leaderboard_scores_next_index",
+					docs: [
+						"Next leaderboard registry index to process for score sync"
+					],
+					type: "u16"
+				},
 				{
 					name: "removal_next_index",
 					docs: [
@@ -4217,6 +4470,130 @@ var types$5 = [
 			]
 		}
 	},
+	{
+		name: "ConfigKeyBool",
+		docs: [
+			"Keys for bool config values (feature flags) - stored as bits in a u16",
+			"Bit positions: 0=Deposits, 1=Withdrawals, 2=ClaimWithdrawals, 3=ProcessStake,",
+			"4=ProcessUnstake, 5=ProcessPayCycle, 6=Rebalancing, 7-15=Reserved"
+		],
+		type: {
+			kind: "enum",
+			variants: [
+				{
+					name: "DepositsEnabled"
+				},
+				{
+					name: "WithdrawalsEnabled"
+				},
+				{
+					name: "ClaimWithdrawalsEnabled"
+				},
+				{
+					name: "ProcessStakeOrdersEnabled"
+				},
+				{
+					name: "ProcessUnstakeOrdersEnabled"
+				},
+				{
+					name: "ProcessPayCycleEnabled"
+				},
+				{
+					name: "RebalancingEnabled"
+				}
+			]
+		}
+	},
+	{
+		name: "ConfigKeyU16",
+		docs: [
+			"Keys for u16 config values (small counts, thresholds, ranks)"
+		],
+		type: {
+			kind: "enum",
+			variants: [
+				{
+					name: "CooldownEpochs"
+				},
+				{
+					name: "DepositFeeEpochsMultiplier"
+				},
+				{
+					name: "MinVppEntry"
+				},
+				{
+					name: "MinVppExit"
+				},
+				{
+					name: "TinyNetworkThreshold"
+				},
+				{
+					name: "SmallNetworkThreshold"
+				},
+				{
+					name: "MediumNetworkThreshold"
+				},
+				{
+					name: "LargeNetworkEntryRank"
+				},
+				{
+					name: "LargeNetworkExitRank"
+				}
+			]
+		}
+	},
+	{
+		name: "ConfigKeyU64",
+		docs: [
+			"Keys for u64 config values (large amounts, rates)"
+		],
+		type: {
+			kind: "enum",
+			variants: [
+				{
+					name: "MinUserDeposit"
+				},
+				{
+					name: "MinUnstakeRequest"
+				},
+				{
+					name: "MinRebalanceStakeDelta"
+				},
+				{
+					name: "MinRebalanceUnstakeDelta"
+				},
+				{
+					name: "TransientThreshold"
+				},
+				{
+					name: "MinLateEpochSlotGate"
+				}
+			]
+		}
+	},
+	{
+		name: "ConfigKeyU8",
+		docs: [
+			"Keys for u8 config values (percentages 0-100)"
+		],
+		type: {
+			kind: "enum",
+			variants: [
+				{
+					name: "SmallNetworkEntryPercent"
+				},
+				{
+					name: "SmallNetworkExitPercent"
+				},
+				{
+					name: "MediumNetworkEntryPercent"
+				},
+				{
+					name: "MediumNetworkExitPercent"
+				}
+			]
+		}
+	},
 	{
 		name: "DistributionState",
 		type: {
@@ -4227,130 +4604,337 @@ var types$5 = [
 					type: "pubkey"
 				},
 				{
-					name: "current_index",
+					name: "current_index",
+					type: "u64"
+				},
+				{
+					name: "total_shares",
+					docs: [
+						"Sum of all user shares across the system"
+					],
+					type: "u64"
+				},
+				{
+					name: "last_bucket_balance",
+					docs: [
+						"Last observed bucket balance used for incremental index updates"
+					],
+					type: "u64"
+				},
+				{
+					name: "bump",
+					type: "u8"
+				},
+				{
+					name: "bucket_bump",
+					docs: [
+						"Cached bucket authority bump to avoid repeated find_program_address calls"
+					],
+					type: "u8"
+				},
+				{
+					name: "pool_bump",
+					docs: [
+						"Cached pool authority bump to avoid repeated find_program_address calls"
+					],
+					type: "u8"
+				},
+				{
+					name: "bucket_authority",
+					docs: [
+						"Cached bucket authority pubkey for transfer-hook optimization"
+					],
+					type: "pubkey"
+				},
+				{
+					name: "pool_authority",
+					docs: [
+						"Cached pool authority pubkey for transfer-hook optimization"
+					],
+					type: "pubkey"
+				}
+			]
+		}
+	},
+	{
+		name: "EpochResolved",
+		type: {
+			kind: "struct",
+			fields: [
+				{
+					name: "validator",
+					type: "pubkey"
+				},
+				{
+					name: "epoch",
+					type: "u64"
+				},
+				{
+					name: "total_stake_amount",
+					type: "u64"
+				},
+				{
+					name: "max_index",
+					type: "u32"
+				}
+			]
+		}
+	},
+	{
+		name: "Global",
+		docs: [
+			"Global operator state. Epoch-based model: receipts are serviceable",
+			"when `epoch <= serviceable_epoch` as reported by an external runtime."
+		],
+		type: {
+			kind: "struct",
+			fields: [
+				{
+					name: "bump",
+					type: "u8"
+				},
+				{
+					name: "authority",
+					docs: [
+						"Authority that can update serviceable_epoch"
+					],
+					type: "pubkey"
+				},
+				{
+					name: "liqsol_mint",
+					docs: [
+						"Token-2022 liqSOL mint burned on withdraw."
+					],
+					type: "pubkey"
+				},
+				{
+					name: "serviceable_epoch",
+					docs: [
+						"Highest epoch that is currently claimable."
+					],
+					type: "u64"
+				},
+				{
+					name: "total_encumbered_funds",
+					docs: [
+						"Total SOL encumbered for pending withdrawal requests.",
+						"This amount is reserved from the reserve pool and will be paid out when receipts are claimed."
+					],
+					type: "u64"
+				},
+				{
+					name: "next_receipt_id",
+					docs: [
+						"Monotonic counter for generating unique receipt IDs"
+					],
+					type: "u64"
+				}
+			]
+		}
+	},
+	{
+		name: "GlobalConfig",
+		docs: [
+			"Zero-copy global config PDA",
+			"Authority is taken from StakeControllerState, not stored here"
+		],
+		serialization: "bytemuckunsafe",
+		repr: {
+			kind: "c"
+		},
+		type: {
+			kind: "struct",
+			fields: [
+				{
+					name: "bump",
+					type: "u8"
+				},
+				{
+					name: "_padding",
+					type: {
+						array: [
+							"u8",
+							7
+						]
+					}
+				},
+				{
+					name: "min_user_deposit",
+					docs: [
+						"Minimum SOL amount a user can deposit"
+					],
+					type: "u64"
+				},
+				{
+					name: "min_unstake_request",
+					docs: [
+						"Minimum SOL amount for an unstake/withdrawal request"
+					],
+					type: "u64"
+				},
+				{
+					name: "min_rebalance_stake_delta",
+					docs: [
+						"Minimum stake delta to trigger a stake rebalance order"
+					],
+					type: "u64"
+				},
+				{
+					name: "min_rebalance_unstake_delta",
+					docs: [
+						"Minimum unstake delta to trigger an unstake rebalance order"
+					],
 					type: "u64"
 				},
 				{
-					name: "total_shares",
+					name: "transient_threshold",
 					docs: [
-						"Sum of all user shares across the system"
+						"Minimum transient stake to include in effective stake calculations"
 					],
 					type: "u64"
 				},
 				{
-					name: "last_bucket_balance",
+					name: "min_late_epoch_slot_gate",
 					docs: [
-						"Last observed bucket balance used for incremental index updates"
+						"Minimum slots that must have elapsed in the epoch before late epoch operations can execute"
 					],
 					type: "u64"
 				},
 				{
-					name: "bump",
-					type: "u8"
+					name: "_reserved_u64",
+					type: {
+						array: [
+							"u64",
+							2
+						]
+					}
 				},
 				{
-					name: "bucket_bump",
+					name: "cooldown_epochs",
 					docs: [
-						"Cached bucket authority bump to avoid repeated find_program_address calls"
+						"Epochs a validator must wait in the graveyard before it is booted. This begins after the last recorded state change"
 					],
-					type: "u8"
+					type: "u16"
 				},
 				{
-					name: "pool_bump",
+					name: "deposit_fee_multiplier",
 					docs: [
-						"Cached pool authority bump to avoid repeated find_program_address calls"
+						"Multiplier for deposit fee calculation, this would be average \"pay rate x number of epochs we expect the stake to warm up\""
 					],
-					type: "u8"
+					type: "u16"
 				},
 				{
-					name: "bucket_authority",
+					name: "min_vpp_entry",
 					docs: [
-						"Cached bucket authority pubkey for transfer-hook optimization"
+						"Minimum VPP score required to enter the active validator set, this is a fall back for when the val set is really small"
 					],
-					type: "pubkey"
+					type: "u16"
 				},
 				{
-					name: "pool_authority",
+					name: "min_vpp_exit",
 					docs: [
-						"Cached pool authority pubkey for transfer-hook optimization"
+						"VPP score threshold below which a validator is removed from active set, again a fall back"
 					],
-					type: "pubkey"
-				}
-			]
-		}
-	},
-	{
-		name: "EpochResolved",
-		type: {
-			kind: "struct",
-			fields: [
+					type: "u16"
+				},
 				{
-					name: "validator",
-					type: "pubkey"
+					name: "tiny_network_threshold",
+					docs: [
+						"Max validators for \"tiny\" network band (uses fixed VPP thresholds) as above"
+					],
+					type: "u16"
 				},
 				{
-					name: "epoch",
-					type: "u64"
+					name: "small_network_threshold",
+					docs: [
+						"Max validators for \"small\" network band (uses percentile-based selection)"
+					],
+					type: "u16"
 				},
 				{
-					name: "total_stake_amount",
-					type: "u64"
+					name: "medium_network_threshold",
+					docs: [
+						"Max validators for \"medium\" network band (uses percentile-based selection)"
+					],
+					type: "u16"
 				},
 				{
-					name: "max_index",
-					type: "u32"
-				}
-			]
-		}
-	},
-	{
-		name: "Global",
-		docs: [
-			"Global operator state. Epoch-based model: receipts are serviceable",
-			"when `epoch <= serviceable_epoch` as reported by an external runtime."
-		],
-		type: {
-			kind: "struct",
-			fields: [
+					name: "large_network_entry_rank",
+					docs: [
+						"Fixed rank threshold to enter active set in large networks (0-indexed)"
+					],
+					type: "u16"
+				},
 				{
-					name: "bump",
-					type: "u8"
+					name: "large_network_exit_rank",
+					docs: [
+						"Fixed rank threshold to exit active set in large networks (0-indexed)"
+					],
+					type: "u16"
 				},
 				{
-					name: "authority",
+					name: "_reserved_u16",
+					type: {
+						array: [
+							"u16",
+							3
+						]
+					}
+				},
+				{
+					name: "small_network_entry_percent",
 					docs: [
-						"Authority that can update serviceable_epoch"
+						"Percentile rank required to enter active set in small networks"
 					],
-					type: "pubkey"
+					type: "u8"
 				},
 				{
-					name: "liqsol_mint",
+					name: "small_network_exit_percent",
 					docs: [
-						"Token-2022 liqSOL mint burned on withdraw."
+						"Percentile rank below which validators exit in small networks"
 					],
-					type: "pubkey"
+					type: "u8"
 				},
 				{
-					name: "serviceable_epoch",
+					name: "medium_network_entry_percent",
 					docs: [
-						"Highest epoch that is currently claimable."
+						"Percentile rank required to enter active set in medium networks"
 					],
-					type: "u64"
+					type: "u8"
 				},
 				{
-					name: "total_encumbered_funds",
+					name: "medium_network_exit_percent",
 					docs: [
-						"Total SOL encumbered for pending withdrawal requests.",
-						"This amount is reserved from the reserve pool and will be paid out when receipts are claimed."
+						"Percentile rank below which validators exit in medium networks"
 					],
-					type: "u64"
+					type: "u8"
 				},
 				{
-					name: "next_receipt_id",
+					name: "_reserved_u8",
+					type: {
+						array: [
+							"u8",
+							2
+						]
+					}
+				},
+				{
+					name: "feature_flags",
 					docs: [
-						"Monotonic counter for generating unique receipt IDs"
+						"Bit 0: DepositsEnabled, Bit 1: WithdrawalsEnabled, Bit 2: ClaimWithdrawalsEnabled,",
+						"Bit 3: ProcessStakeOrdersEnabled, Bit 4: ProcessUnstakeOrdersEnabled,",
+						"Bit 5: ProcessPayCycleEnabled, Bit 6: RebalancingEnabled, Bits 7-15: Reserved"
 					],
-					type: "u64"
+					type: "u16"
+				},
+				{
+					name: "_reserved_flags",
+					type: {
+						array: [
+							"u16",
+							1
+						]
+					}
 				}
 			]
 		}
@@ -4621,6 +5205,10 @@ var types$5 = [
 					name: "last_validator_score_sync_epoch",
 					type: "u16"
 				},
+				{
+					name: "last_leaderboard_scores_sync_epoch",
+					type: "u16"
+				},
 				{
 					name: "last_active_infos_synced_epoch",
 					type: "u16"
@@ -4910,7 +5498,7 @@ var types$5 = [
 				},
 				{
 					name: "pretokens_purchased",
-					type: "i128"
+					type: "u64"
 				}
 			]
 		}
@@ -4938,7 +5526,7 @@ var types$5 = [
 					],
 					type: {
 						array: [
-							"i128",
+							"u64",
 							10
 						]
 					}
@@ -5114,6 +5702,30 @@ var types$5 = [
 					],
 					type: "u64"
 				},
+				{
+					name: "is_small_distribution_mode",
+					docs: [
+						"Whether we're in small distribution mode (not enough for VPP-based distribution)",
+						"In this mode, we distribute evenly to first N validators instead of using VPP ratios"
+					],
+					type: "bool"
+				},
+				{
+					name: "validators_to_fund_this_rebalance",
+					docs: [
+						"Number of validators to fund in small distribution mode",
+						"Calculated as floor(total_to_distribute / MIN_STAKE_DELEGATION)"
+					],
+					type: "u16"
+				},
+				{
+					name: "amount_per_validator_this_rebalance",
+					docs: [
+						"Amount each validator gets in small distribution mode",
+						"Calculated as total_to_distribute / validators_to_fund"
+					],
+					type: "u64"
+				},
 				{
 					name: "selection_entry_threshold_vpp",
 					docs: [
@@ -5290,8 +5902,7 @@ var types$5 = [
 	{
 		name: "TrancheState",
 		docs: [
-			"All i128 values use 8-decimal precision (SCALE = 1e8 = 100,000,000)",
-			"This matches Chainlink SOL/USD's native format, avoiding conversion overhead",
+			"All u64 values use 8-decimal precision (SCALE = 1e8 = 100,000,000)",
 			"Example: $193.32 is stored as 19332000000"
 		],
 		type: {
@@ -5310,19 +5921,19 @@ var types$5 = [
 				},
 				{
 					name: "current_tranche_supply",
-					type: "i128"
+					type: "u64"
 				},
 				{
 					name: "current_tranche_price_usd",
-					type: "i128"
+					type: "u64"
 				},
 				{
 					name: "total_pretokens_sold",
-					type: "i128"
+					type: "u64"
 				},
 				{
 					name: "initial_tranche_supply",
-					type: "i128"
+					type: "u64"
 				},
 				{
 					name: "supply_growth_bps",
@@ -5343,14 +5954,14 @@ var types$5 = [
 					docs: [
 						"Minimum valid SOL/USD price for validation (8-dec)"
 					],
-					type: "i128"
+					type: "u64"
 				},
 				{
 					name: "max_price_usd",
 					docs: [
 						"Maximum valid SOL/USD price for validation (8-dec)"
 					],
-					type: "i128"
+					type: "u64"
 				},
 				{
 					name: "max_staleness_seconds",
@@ -5395,7 +6006,7 @@ var types$5 = [
 				},
 				{
 					name: "total_pretokens_purchased",
-					type: "i128"
+					type: "u64"
 				},
 				{
 					name: "last_tranche_number",
@@ -5403,7 +6014,7 @@ var types$5 = [
 				},
 				{
 					name: "last_tranche_price_usd",
-					type: "i128"
+					type: "u64"
 				},
 				{
 					name: "bump",
@@ -5931,7 +6542,7 @@ var liqsolCoreIDL = {
 	types: types$5
 };
 
-var address$2 = "6hiJ8PrSyYLr7H9MA9VYh9fvGoHxZ2TXdDAMzjeUVSXZ";
+var address$2 = "5MRFSLCkXPEzfR6gkcZCVttq9g83mMUHyTZ85Z3TSpvU";
 var metadata$2 = {
 	name: "liqsol_token",
 	version: "0.1.0",
@@ -6120,7 +6731,7 @@ var liqsolTokenJson = {
 	types: types$4
 };
 
-var address$1 = "H6CWj2PgxCE9Z5dPi9nMrR2VxT1C4DQcqR1QjmLeon47";
+var address$1 = "5v7mWL1735qp2Th9B5WNf7spGynR5ZaxwyCYoQw13DP2";
 var metadata$1 = {
 	name: "validator_leaderboard",
 	version: "0.1.0",
@@ -6242,6 +6853,9 @@ var instructions$1 = [
 			},
 			{
 				name: "system_program"
+			},
+			{
+				name: "clock"
 			}
 		],
 		args: [
@@ -6849,7 +7463,7 @@ var validatorLeaderboardJson = {
 	types: types$3
 };
 
-var address = "EtqCLddkPNGjkgiH9rVUmK3M5X2FKFprQvgscBJ8g6hX";
+var address = "HbBpH9opFW9gcYVanHLweKuHhWQ8P3Kcc1mbpAx1vojz";
 var metadata = {
 	name: "transfer_hook",
 	version: "0.1.0",
@@ -6974,6 +7588,11 @@ var errors = [
 	{
 		code: 6002,
 		name: "TlvAccountResolutionError"
+	},
+	{
+		code: 6003,
+		name: "CannotTransferToBucket",
+		msg: "Cannot transfer liqSOL directly to bucket - only protocol minting is allowed"
 	}
 ];
 var types$2 = [
@@ -7082,6 +7701,7 @@ const {
   TRANSFER_HOOK
 } = PROGRAM_IDS;
 const PDA_SEEDS = {
+  GLOBAL_CONFIG: "global_config",
   DEPOSIT_AUTHORITY: "deposit_authority",
   VAULT: "vault",
   RESERVE_POOL: "reserve_pool",
@@ -7115,6 +7735,10 @@ const PDA_SEEDS = {
   LIQ_RECEIPT_DATA: "liq_receipt_data",
   WITHDRAW_MINT: "mint"
 };
+const deriveGlobalConfigPda = () => web3_js.PublicKey.findProgramAddressSync(
+  [Buffer.from(PDA_SEEDS.GLOBAL_CONFIG)],
+  LIQSOL_CORE
+)[0];
 const deriveLiqsolMintPda = () => web3_js.PublicKey.findProgramAddressSync(
   [Buffer.from(PDA_SEEDS.LIQSOL_MINT)],
   LIQSOL_TOKEN
@@ -7365,6 +7989,7 @@ class DepositClient {
       const payoutState = derivePayoutStatePda();
       const bucketAuthority = deriveBucketAuthorityPda();
       const payRateHistory = derivePayRateHistoryPda();
+      const globalConfig = deriveGlobalConfigPda();
       const userAta = splToken.getAssociatedTokenAddressSync(
         liqsolMint,
         user,
@@ -7405,7 +8030,8 @@ class DepositClient {
         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
+        rent: web3_js.SYSVAR_RENT_PUBKEY,
+        globalConfig
       }).instruction();
       return new web3_js.Transaction().add(ix);
     });
@@ -7436,6 +8062,7 @@ class DepositClient {
       const stakeAllocationState = deriveStakeAllocationStatePda();
       const stakeMetrics = deriveStakeMetricsPda();
       const maintenanceLedger = deriveMaintenanceLedgerPda();
+      const globalConfig = deriveGlobalConfigPda();
       const globalState = yield this.program.account.global.fetch(global);
       const receiptId = globalState.nextReceiptId.toBigInt();
       const mintAuthority = deriveWithdrawMintAuthorityPda();
@@ -7479,7 +8106,8 @@ class DepositClient {
         tokenInterface: splToken.TOKEN_2022_PROGRAM_ID,
         associatedTokenProgram: splToken.ASSOCIATED_TOKEN_PROGRAM_ID,
         systemProgram: web3_js.SystemProgram.programId,
-        rent: web3_js.SYSVAR_RENT_PUBKEY
+        rent: web3_js.SYSVAR_RENT_PUBKEY,
+        globalConfig
       }).instruction();
       return new web3_js.Transaction().add(ix);
     });
@@ -8565,7 +9193,7 @@ class SolanaStakingClient {
   }
   deposit(amountLamports) {
     return __async$8(this, null, function* () {
-      this.ensureWriteAccess();
+      this.ensureUser();
       if (amountLamports <= BigInt(0)) {
         throw new Error("Deposit amount must be greater than zero.");
       }
@@ -8580,7 +9208,7 @@ class SolanaStakingClient {
   }
   withdraw(amountLamports) {
     return __async$8(this, null, function* () {
-      this.ensureWriteAccess();
+      this.ensureUser();
       if (amountLamports <= BigInt(0)) {
         throw new Error("Withdraw amount must be greater than zero.");
       }
@@ -8595,13 +9223,14 @@ class SolanaStakingClient {
   }
   stake(amountLamports) {
     return __async$8(this, null, function* () {
-      this.ensureWriteAccess();
+      this.ensureUser();
       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(ix);
+      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);
@@ -8609,13 +9238,14 @@ class SolanaStakingClient {
   }
   unstake(amountLamports) {
     return __async$8(this, null, function* () {
-      this.ensureWriteAccess();
+      this.ensureUser();
       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(ix);
+      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);
@@ -8623,7 +9253,7 @@ class SolanaStakingClient {
   }
   buy(amountLamports) {
     return __async$8(this, null, function* () {
-      this.ensureWriteAccess();
+      this.ensureUser();
       if (!amountLamports || amountLamports <= BigInt(0)) {
         throw new Error("liqSOL pretoken purchase requires a positive amount.");
       }
@@ -8674,12 +9304,12 @@ class SolanaStakingClient {
       const currentIndex = BigInt(currentIndexStr);
       const totalShares = BigInt(totalSharesStr);
       const userShares = BigInt(userSharesStr);
-      let estimatedClaimLiqsol = BigInt(0);
-      let estimatedYieldLiqsol = BigInt(0);
+      let estimatedClaim = BigInt(0);
+      let estimatedYield = BigInt(0);
       if (userShares > BigInt(0) && currentIndex > BigInt(0)) {
-        estimatedClaimLiqsol = userShares * currentIndex / INDEX_SCALE$1;
-        if (estimatedClaimLiqsol > stakedLiqsol) {
-          estimatedYieldLiqsol = estimatedClaimLiqsol - stakedLiqsol;
+        estimatedClaim = userShares * currentIndex / INDEX_SCALE$1;
+        if (estimatedClaim > stakedLiqsol) {
+          estimatedYield = estimatedClaim - stakedLiqsol;
         }
       }
       return {
@@ -8709,8 +9339,8 @@ class SolanaStakingClient {
           indexScale: INDEX_SCALE$1,
           totalShares,
           userShares,
-          estimatedClaimLiqsol,
-          estimatedYieldLiqsol
+          estimatedClaim,
+          estimatedYield
         },
         extras: {
           userLiqsolAta: userLiqsolAta.toBase58(),
@@ -8725,6 +9355,18 @@ class SolanaStakingClient {
       };
     });
   }
+  getUserRecord() {
+    return __async$8(this, null, function* () {
+      if (!this.pubKey) throw new Error("User pubKey is undefined");
+      return this.distributionClient.getUserRecord(this.solPubKey);
+    });
+  }
+  getSystemAPY() {
+    return Promise.resolve(0);
+  }
+  getDepositFee(amount) {
+    return Promise.resolve(amount * BigInt(1) / BigInt(100));
+  }
   getTrancheSnapshot(options) {
     return __async$8(this, null, function* () {
       const {
@@ -8748,15 +9390,9 @@ class SolanaStakingClient {
       });
     });
   }
-  getUserRecord() {
-    return __async$8(this, null, function* () {
-      if (!this.pubKey) throw new Error("User pubKey is undefined");
-      return this.distributionClient.getUserRecord(this.solPubKey);
-    });
-  }
   sendAndConfirmHttp(signed, ctx) {
     return __async$8(this, null, function* () {
-      this.ensureWriteAccess();
+      this.ensureUser();
       const signature = yield this.connection.sendRawTransaction(
         signed.serialize(),
         {
@@ -8783,13 +9419,13 @@ class SolanaStakingClient {
   }
   signTransaction(tx) {
     return __async$8(this, null, function* () {
-      this.ensureWriteAccess();
+      this.ensureUser();
       return this.anchor.wallet.signTransaction(tx);
     });
   }
   sendTransaction(signed) {
     return __async$8(this, null, function* () {
-      this.ensureWriteAccess();
+      this.ensureUser();
       return this.anchor.sendAndConfirm(signed);
     });
   }
@@ -8801,7 +9437,7 @@ class SolanaStakingClient {
       return { tx, blockhash, lastValidBlockHeight };
     });
   }
-  ensureWriteAccess() {
+  ensureUser() {
     if (!this.pubKey || !this.anchor.wallet.publicKey) {
       throw new Error("User Authorization required: pubKey is undefined");
     }
@@ -29640,8 +30276,12 @@ class EthereumStakingClient {
   constructor(config) {
     this.config = config;
     try {
-      this.provider = config.provider;
-      this.signer = this.provider.getSigner();
+      if (config.provider) {
+        this.provider = config.provider;
+        this.signer = this.provider.getSigner();
+      } else {
+        this.provider = new ethers.ethers.providers.JsonRpcProvider(config.network.rpcUrls[0]);
+      }
       this.pubKey = config.pubKey;
       this.contractService = new EthereumContractService({
         provider: this.provider,
@@ -29664,6 +30304,7 @@ class EthereumStakingClient {
   }
   deposit(amount) {
     return __async(this, null, function* () {
+      this.ensureUser();
       const amountWei = ethers.BigNumber.isBigNumber(amount) ? amount : ethers.BigNumber.from(amount);
       const result = yield this.convertClient.performDeposit(amountWei);
       return result.txHash;
@@ -29671,6 +30312,7 @@ class EthereumStakingClient {
   }
   withdraw(amount) {
     return __async(this, null, function* () {
+      this.ensureUser();
       const address = yield this.signer.getAddress();
       const amountWei = ethers.BigNumber.from(amount);
       const result = yield this.convertClient.performWithdraw(address, amountWei);
@@ -29679,6 +30321,7 @@ class EthereumStakingClient {
   }
   stake(amount) {
     return __async(this, null, function* () {
+      this.ensureUser();
       const walletAddress = yield this.signer.getAddress();
       const amountWei = ethers.BigNumber.from(amount);
       const result = yield this.stakeClient.performStake(amountWei, walletAddress);
@@ -29692,6 +30335,7 @@ class EthereumStakingClient {
   }
   unstakePrelaunch(tokenId, recipient) {
     return __async(this, null, function* () {
+      this.ensureUser();
       const tokenIdBigNum = ethers.BigNumber.from(tokenId);
       const result = yield this.stakeClient.performWithdrawStake(tokenIdBigNum, recipient);
       return result.txHash;
@@ -29699,44 +30343,17 @@ class EthereumStakingClient {
   }
   buy(amount) {
     return __async(this, null, function* () {
+      this.ensureUser();
       const buyer = yield this.signer.getAddress();
       yield this.updateMockAggregatorPrice();
       let result = yield this.pretokenClient.purchasePretokensWithLiqETH(amount, buyer);
       return result && result.txHash ? result.txHash : "Error - no resulting txHash";
     });
   }
-  getOPPMessages(address) {
-    return __async(this, null, function* () {
-      if (!address) address = yield this.signer.getAddress();
-      return yield this.oppClient.getMessages(address);
-    });
-  }
-  getOPPStatus() {
-    return __async(this, null, function* () {
-      return yield this.oppClient.getStatus();
-    });
-  }
-  fetchPrelaunchReceipts(address) {
-    return __async(this, null, function* () {
-      if (address === void 0) address = yield this.signer.getAddress();
-      return yield this.receiptClient.stakeReceipts(address);
-    });
-  }
-  getEthStats() {
-    return __async(this, null, function* () {
-      let withdrawDelay = yield this.contract.DepositManager.withdrawDelay();
-      let minDeposit = yield this.contract.DepositManager.minDeposit();
-      let rewardCooldown = yield this.contract.DepositManager.rewardCooldown();
-      return {
-        withdrawDelay,
-        minDeposit,
-        rewardCooldown
-      };
-    });
-  }
   getPortfolio() {
     return __async(this, null, function* () {
       var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+      this.ensureUser();
       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;
@@ -29748,7 +30365,28 @@ class EthereumStakingClient {
       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) {
+      }
+      let estimatedClaim = BigInt(0);
+      let estimatedYield = BigInt(0);
       const portfolio = {
         native: {
           amount: nativeBalance.toBigInt(),
@@ -29770,11 +30408,69 @@ class EthereumStakingClient {
           decimals: 18,
           symbol: "$WIRE"
         },
+        yield: {
+          currentIndex,
+          indexScale,
+          totalShares,
+          userShares,
+          estimatedClaim,
+          estimatedYield
+        },
         chainID: this.network.chainId
       };
       return portfolio;
     });
   }
+  fetchPrelaunchReceipts(address) {
+    return __async(this, null, function* () {
+      this.ensureUser();
+      if (address === void 0) address = yield this.signer.getAddress();
+      return yield this.receiptClient.stakeReceipts(address);
+    });
+  }
+  getOPPMessages(address) {
+    return __async(this, null, function* () {
+      this.ensureUser();
+      if (!address) address = yield this.signer.getAddress();
+      return yield this.oppClient.getMessages(address);
+    });
+  }
+  ensureUser() {
+    if (!this.signer) {
+      throw new Error(
+        "EthereumStakingClient: write operation requires a wallet-connected Web3 provider"
+      );
+    }
+  }
+  getSystemAPY() {
+    return __async(this, null, function* () {
+      const annualBpsBn = yield this.contract.DepositManager.dailyRateBPS();
+      return annualBpsBn.toNumber() / 1e4;
+    });
+  }
+  getDepositFee(amountWei) {
+    return __async(this, null, function* () {
+      const feeBn = yield this.contract.DepositManager.procFee(amountWei);
+      return BigInt(feeBn.toString());
+    });
+  }
+  getOPPStatus() {
+    return __async(this, null, function* () {
+      return yield this.oppClient.getStatus();
+    });
+  }
+  getEthStats() {
+    return __async(this, null, function* () {
+      let withdrawDelay = yield this.contract.DepositManager.withdrawDelay();
+      let minDeposit = yield this.contract.DepositManager.minDeposit();
+      let rewardCooldown = yield this.contract.DepositManager.rewardCooldown();
+      return {
+        withdrawDelay,
+        minDeposit,
+        rewardCooldown
+      };
+    });
+  }
   getTrancheSnapshot(options) {
     return __async(this, null, function* () {
       const {
@@ -29963,6 +30659,7 @@ exports.deriveDepositAuthorityPda = deriveDepositAuthorityPda;
 exports.deriveDistributionStatePda = deriveDistributionStatePda;
 exports.deriveEphemeralStakeAddress = deriveEphemeralStakeAddress;
 exports.deriveExtraAccountMetaListPda = deriveExtraAccountMetaListPda;
+exports.deriveGlobalConfigPda = deriveGlobalConfigPda;
 exports.deriveLeaderboardStatePda = deriveLeaderboardStatePda;
 exports.deriveLiqReceiptDataPda = deriveLiqReceiptDataPda;
 exports.deriveLiqsolMintAuthorityPda = deriveLiqsolMintAuthorityPda;