@fased/fased 0.1.62 → 0.1.64

package/dist/extensions/sat-mining/src/solana-submit.js

@@ -1,15 +1,20 @@
 import { loadConfig } from "../../../config/io.js";
-import { resolveWalletRuntimeConfig } from "../../../wallet/wallet-runtime-config.js";
+import { LEGACY_EMBEDDED_KEYSTORE_MIGRATION_MESSAGE } from "../../../wallet/legacy-embedded-keystore.js";
 import { readWalletProviderRegistry } from "../../../wallet/wallet-provider-registry.js";
 import { resolveSatBondProgramIdFromEnv, resolveSatMintAddressFromEnv, resolveSatMintProgramIdFromEnv, resolveSatProgramIdFromEnv } from "../../../config/sat-runtime-ids.js";
 import { callLocalSocketSigner, requireLocalSocketSignerPath } from "../../../wallet/providers/local-socket-signer-adapter.js";
 import { resolveWalletProviderId } from "../../../wallet/wallet-provider-resolver.js";
-import { enforceWalletCustodyForAutonomousSend } from "../../../wallet/wallet-custody.js";
+import { createSignerReviewApprovalRequest } from "../../../wallet/wallet-send-approvals.js";
 import "../../../plugin-sdk/sat-runtime.js";
-import { inspectSatCycleRegistryMeta, inspectSatMinerCyclesByAddress } from "./rpc-read.js";
+import { SAT_BOND_INSTRUCTION_DISCRIMINATORS, SAT_INSTRUCTION_DISCRIMINATORS, SAT_PROTOCOL_CONSTANTS, resolveSatGenesisProfileContract } from "./protocol-contract.js";
+import { inspectSatCycle, inspectSatCycleRegistryMeta, inspectSatMinerCyclesByAddress } from "./rpc-read.js";
 import { decodeHash32 } from "./hash-spec.js";
-import { SAT_BOND_INSTRUCTION_DISCRIMINATORS, SAT_INSTRUCTION_DISCRIMINATORS } from "./protocol-contract.js";
+import { resolveSatSignerCodec } from "./signer-codec-manifest.js";
+import { buildSatSubmissionOperationKey, claimSatSubmission, digestSatSubmissionIntent, updateSatSubmission, waitForSatSubmissionLease } from "./submission-ledger.js";
 import { createRequire } from "node:module";
+import { isDeepStrictEqual } from "node:util";
+import { createHash } from "node:crypto";
+import { AsyncLocalStorage } from "node:async_hooks";
 
 //#region extensions/sat-mining/src/solana-submit.ts
 const require = createRequire(import.meta.url);
@@ -37,13 +42,35 @@ const SAT_TREASURY_STATE_SEED = "sat_treasury_state";
 const SAT_REGISTRY_RESERVE_SEED = "sat_registry_reserve";
 const SAT_REBATE_VAULT_SEED = "sat_rebate_vault";
 const SAT_TREASURY_VAULT_SEED = "sat_treasury_vault";
+const SAT_UNLOCK_INTERVAL_STATE_SEED = "sat_unlock_interval_state";
 const SAT_CYCLE_REGISTRY_PAGE_CAPACITY = 64;
 const MINING_POOL_SEED = "mining_pool";
 const MINING_STAKE_SEED = "mining_stake";
 const TOKEN_PROGRAM_ID = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
 const ASSOCIATED_TOKEN_PROGRAM_ID = "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
+const SLOT_HASHES_SYSVAR_ID = "SysvarS1otHashes111111111111111111111111111";
 const IX = SAT_INSTRUCTION_DISCRIMINATORS;
 const BOND_IX = SAT_BOND_INSTRUCTION_DISCRIMINATORS;
+const VAULT_BOND_ACTIONS = new Set([
+	"updateBondTierPolicy",
+	"openBondPosition",
+	"increaseBondPosition",
+	"requestBondUnlock",
+	"cancelBondUnlock",
+	"finalizeBondUnlock",
+	"syncBondStakingRewards",
+	"syncBondStakingPosition",
+	"claimBondStakingRewards",
+	"claimUnallocatedStakingRewards"
+]);
+const satSubmissionWorkflowStorage = new AsyncLocalStorage();
+async function runWithSatSubmissionWorkflow(workflowId, task) {
+	const normalized = workflowId.trim();
+	if (!normalized || normalized.length > 240 || /[\u0000-\u001f\u007f]/u.test(normalized)) {
+		throw new Error("SAT submission idempotency key must contain 1-240 printable characters");
+	}
+	return await satSubmissionWorkflowStorage.run(normalized, task);
+}
 function satSubmitDebug(message) {
 	if (String(process.env.FASED_SAT_SUBMIT_DEBUG ?? "").trim() === "1") {
 		console.error(message);
@@ -84,6 +111,10 @@ function resolveSatWalletId(cfg) {
 	const value = cfg.plugins?.entries?.["sat-mining"]?.config?.walletId;
 	return typeof value === "string" && value.trim() ? value.trim() : undefined;
 }
+function resolveSatCluster(cfg) {
+	const value = cfg.plugins?.entries?.["sat-mining"]?.config?.network;
+	return value === "local" || value === "mainnet-beta" || value === "devnet" ? value : "devnet";
+}
 function resolveSatEffectiveEnv(cfg, env) {
 	return {
 		...env,
@@ -93,68 +124,46 @@ function resolveSatEffectiveEnv(cfg, env) {
 function resolveSatProviderId(cfg, env) {
 	const effectiveEnv = resolveSatEffectiveEnv(cfg, env);
 	const walletId = resolveSatWalletId(cfg);
+	const signerSocket = String(effectiveEnv.FASED_WALLET_LOCAL_SIGNER_SOCKET ?? "").trim();
 	if (walletId) {
-		const hasSelfHostedSignerMaterial = String(effectiveEnv.FASED_WALLET_LOCAL_SIGNER_SOCKET ?? "").trim() || String(effectiveEnv.FASED_WALLET_LOCAL_SIGNER_BACKEND_SOCKET ?? "").trim() || String(walletEnvValue(effectiveEnv, "FASED_WALLET_SOLANA_KEYSTORE_PATH", walletId) ?? "").trim();
-		try {
-			const wallet = readWalletProviderRegistry(effectiveEnv).wallets.find((entry) => entry.id === walletId);
-			if (wallet?.providerId === "local-socket-signer") {
-				return wallet.providerId;
-			}
-			if (hasSelfHostedSignerMaterial) {
-				return "local-socket-signer";
-			}
-			if (wallet?.providerId) {
-				return wallet.providerId;
-			}
-		} catch {}
-		if (hasSelfHostedSignerMaterial) {
-			return "local-socket-signer";
+		const wallet = readWalletProviderRegistry(effectiveEnv).wallets.find((entry) => entry.id === walletId);
+		if (wallet?.providerId === "embedded-keystore") {
+			throw new Error(LEGACY_EMBEDDED_KEYSTORE_MIGRATION_MESSAGE);
+		}
+		if (wallet?.providerId && wallet.providerId !== "local-socket-signer") {
+			return wallet.providerId;
+		}
+		if (wallet?.providerId === "local-socket-signer" && !signerSocket) {
+			throw new Error("SAT mining requires the actual protocol-v2 fased-signerd application socket; legacy keystore paths and backend sockets are not signer capability.");
+		}
+		if (wallet?.providerId === "local-socket-signer") {
+			return wallet.providerId;
 		}
 	}
-	return resolveWalletProviderId(cfg, effectiveEnv);
-}
-async function enforceSatCustodyAutonomousSigning(cfg, env) {
-	const effectiveEnv = resolveSatEffectiveEnv(cfg, env);
-	const walletCfg = resolveWalletRuntimeConfig(cfg, effectiveEnv);
-	const walletId = resolveSatWalletId(cfg);
-	if (walletCfg.execution.mode !== "autonomous") {
-		return;
-	}
-	const custodyGate = await enforceWalletCustodyForAutonomousSend({
-		wallet: walletCfg,
-		env: effectiveEnv,
-		cfg,
-		walletId,
-		approvalHost: String(effectiveEnv.FASED_WALLET_CUSTODY_ACTIVE_HOST ?? effectiveEnv.FASED_A2A_ORIGIN ?? "127.0.0.1")
-	});
-	if (!custodyGate.ok) {
-		throw new Error(custodyGate.message);
+	const providerId = resolveWalletProviderId(cfg, effectiveEnv);
+	if (providerId === "local-socket-signer" && !signerSocket) {
+		throw new Error("SAT mining requires the actual protocol-v2 fased-signerd application socket; configure FASED_WALLET_LOCAL_SIGNER_SOCKET.");
 	}
+	return providerId;
 }
-function resolveSatRegistrySolanaAddress(cfg, env) {
+async function resolveSatLocalSignerAddress(cfg, env, errorMessage, verifyCapabilities = true) {
 	const effectiveEnv = resolveSatEffectiveEnv(cfg, env);
 	const walletId = resolveSatWalletId(cfg);
 	if (!walletId) {
-		return "";
+		throw new Error("SAT mining local signer address lookup requires an attached walletId");
 	}
-	const wallet = readWalletProviderRegistry(effectiveEnv).wallets.find((entry) => entry.id === walletId);
-	return typeof wallet?.addresses?.solana === "string" ? wallet.addresses.solana.trim() : "";
-}
-async function resolveSatLocalSignerAddress(cfg, env, errorMessage) {
-	const effectiveEnv = resolveSatEffectiveEnv(cfg, env);
-	const walletId = resolveSatWalletId(cfg);
-	const result = await callLocalSocketSigner(requireLocalSocketSignerPath(effectiveEnv), {
-		op: "getAddresses",
-		...walletId ? { walletId } : {}
+	const socketPath = requireLocalSocketSignerPath(effectiveEnv);
+	if (verifyCapabilities) {
+		await requireTypedSatSignerCapabilities(socketPath, "solana.satAction");
+	}
+	const result = await callLocalSocketSigner(socketPath, {
+		op: "v2.wallet.get",
+		walletId
 	});
-	const signer = String(result.solana ?? "").trim();
+	const signer = String(result.publicKey ?? "").trim();
 	if (signer) {
 		return signer;
 	}
-	const fallback = resolveSatRegistrySolanaAddress(cfg, env);
-	if (fallback) {
-		return fallback;
-	}
 	throw new Error(errorMessage);
 }
 function encodeU64(value) {
@@ -203,7 +212,6 @@ function assertDedicatedBondProgram(env) {
 async function resolveSatValidatorAuthority(_config) {
 	const cfg = loadConfigForSatRuntime(_config);
 	const effectiveEnv = resolveSatEffectiveEnv(cfg, process.env);
-	await enforceSatCustodyAutonomousSigning(cfg, effectiveEnv);
 	if (resolveSatProviderId(cfg, effectiveEnv) !== "local-socket-signer") {
 		throw new Error("SAT mining unattended signing currently requires local-socket-signer for validator authority resolution");
 	}
@@ -214,7 +222,7 @@ async function prepareLocalSignerSubmitContext(cfg, env) {
 	const solana = await loadSolanaWeb3();
 	const walletId = resolveSatWalletId(cfg);
 	const socketPath = requireLocalSocketSignerPath(effectiveEnv);
-	const signerAddress = await resolveSatLocalSignerAddress(cfg, effectiveEnv, "local-socket-signer returned no Solana address for SAT mining wallet");
+	const signerAddress = await resolveSatLocalSignerAddress(cfg, effectiveEnv, "local-socket-signer returned no Solana address for SAT mining wallet", false);
 	const signer = new solana.PublicKey(signerAddress);
 	return {
 		effectiveEnv,
@@ -226,17 +234,407 @@ async function prepareLocalSignerSubmitContext(cfg, env) {
 	};
 }
 async function buildLocalSignerInstructionRequest(params) {
-	const keys = await params.spec.accountResolver(params.solana, params.signer);
-	satSubmitDebug(`[sat-submit-debug] data_len=${params.spec.data.length} disc=${params.spec.data[0] ?? -1} keys=${keys.length}`);
+	const resolved = await params.spec.accountResolver(params.solana, params.signer);
+	const keys = Array.isArray(resolved) ? resolved : resolved.keys;
+	const context = Array.isArray(resolved) ? undefined : resolved.context;
+	const programId = params.spec.programId ?? resolveSatProgramIdFromEnv(params.env);
+	const mainProgramId = resolveSatProgramIdFromEnv(params.env);
+	const bondProgramId = resolveSatBondProgramIdFromEnv(params.env).trim() || undefined;
+	const codec = resolveSatSignerCodec({
+		programId,
+		mainProgramId,
+		bondProgramId,
+		data: params.spec.data
+	});
+	satSubmitDebug(`[sat-submit-debug] action=${codec.action} data_len=${params.spec.data.length} disc=${params.spec.data[0] ?? -1} keys=${keys.length}`);
 	return {
-		...params.walletId ? { walletId: params.walletId } : {},
-		programId: params.spec.programId ?? SAT_PROGRAM_ID(),
+		action: codec.action,
+		programId,
 		dataBase64: params.spec.data.toString("base64"),
 		keys: keys.map((key) => ({
 			pubkey: key.pubkey.toBase58(),
 			isSigner: key.isSigner,
 			isWritable: key.isWritable
-		}))
+		})),
+		...context ? { context } : {}
+	};
+}
+const REQUIRED_SAT_SIGNER_FEATURES = [
+	"failClosedPolicies",
+	"policyHashes",
+	"durableCaps",
+	"atomicIdempotency",
+	"ambiguousBroadcastReconciliation",
+	"signerOwnedKeys",
+	"typedSolanaTransactions",
+	"typedSATActions"
+];
+async function requireTypedSatSignerCapabilities(socketPath, intentType) {
+	const result = await callLocalSocketSigner(socketPath, { op: "v2.capabilities" });
+	const capabilities = result.capabilities;
+	const protocol = capabilities?.protocol;
+	const features = new Set(capabilities?.features ?? []);
+	const states = new Set(capabilities?.operationStates ?? []);
+	const missingFeatures = REQUIRED_SAT_SIGNER_FEATURES.filter((feature) => !features.has(feature));
+	const missingStates = [
+		"reserved",
+		"broadcast",
+		"confirmed",
+		"failed",
+		"unknown"
+	].filter((state) => !states.has(state));
+	const missingVaultReviewFeatures = intentType === "solana.vaultBondAction" ? [
+		"signerOwnedReviewPrepareExecute",
+		"exactPreparedTransactions",
+		"reviewedVaultBondActions",
+		"signerOwnedStateRecheck",
+		"durableReviewAuthorization"
+	].filter((feature) => !features.has(feature)) : [];
+	if (result.ready !== true || protocol?.current !== 2 || typeof protocol.min !== "number" || protocol.min > 2 || typeof protocol.max !== "number" || protocol.max < 2 || !capabilities?.intentTypes?.includes(intentType) || missingFeatures.length > 0 || intentType === "solana.vaultBondAction" && !features.has("typedVaultBondActions") || missingVaultReviewFeatures.length > 0 || missingStates.length > 0) {
+		throw new Error(`local-socket-signer does not support the required typed SAT protocol-v2 contract${missingFeatures.length > 0 ? `; missing features: ${missingFeatures.join(", ")}` : ""}${missingVaultReviewFeatures.length > 0 ? `; missing reviewed Vault features: ${missingVaultReviewFeatures.join(", ")}` : ""}${missingStates.length > 0 ? `; missing states: ${missingStates.join(", ")}` : ""}`);
+	}
+}
+async function reconcileTypedSatOperation(params) {
+	let operation = params.operation ?? await callLocalSocketSigner(params.socketPath, {
+		op: "v2.operation.get",
+		walletId: params.walletId,
+		request: { requestId: params.requestId }
+	});
+	if (operation.state === "broadcast" || operation.state === "unknown") {
+		try {
+			operation = await callLocalSocketSigner(params.socketPath, {
+				op: "v2.operation.reconcile",
+				walletId: params.walletId,
+				request: { requestId: params.requestId }
+			});
+		} catch {}
+	}
+	return operation;
+}
+function assertSatSignerOperationIdentity(operation, requestId) {
+	if (operation.requestId !== requestId) {
+		throw new Error(`SAT signer returned request ${operation.requestId || "<empty>"} while reconciling ${requestId}`);
+	}
+	return operation;
+}
+function signerStateForLedger(state) {
+	return state;
+}
+var SatSubmissionUnresolvedError = class extends Error {
+	constructor(params) {
+		super(`SAT signer operation ${params.requestId} remains ${params.state}${params.signature ? ` with signature ${params.signature}` : ""}; it is unresolved and must be reconciled with the same idempotency key before any new submission${params.detail ? ` (${params.detail})` : ""}`);
+		this.name = "SatSubmissionUnresolvedError";
+		this.requestId = params.requestId;
+		this.signature = params.signature;
+	}
+};
+async function executeTypedSatIntent(params) {
+	const isVaultBond = params.action !== "cleanupBatch" && VAULT_BOND_ACTIONS.has(params.action);
+	const intentType = isVaultBond ? "solana.vaultBondAction" : "solana.satAction";
+	await requireTypedSatSignerCapabilities(params.socketPath, intentType);
+	const intent = isVaultBond ? (() => {
+		if (!params.instruction || params.instructions) {
+			throw new Error("typed Vault bond execution requires exactly one semantic instruction");
+		}
+		return {
+			type: "solana.vaultBondAction",
+			cluster: params.cluster,
+			...params.instruction
+		};
+	})() : {
+		type: "solana.satAction",
+		action: params.action,
+		...params.instruction ?? {},
+		...params.instructions ? { instructions: params.instructions } : {}
+	};
+	const policy = await callLocalSocketSigner(params.socketPath, {
+		op: "v2.policy.get",
+		walletId: params.walletId
+	});
+	const intentDigest = digestSatSubmissionIntent({
+		walletId: params.walletId,
+		policyHash: policy.hash,
+		intent
+	});
+	const operationKey = buildSatSubmissionOperationKey(intent);
+	const workflowId = satSubmissionWorkflowStorage.getStore() ?? `derived:${operationKey}:${intentDigest}`;
+	let claim = await claimSatSubmission({
+		walletId: params.walletId,
+		workflowId,
+		operationKey,
+		intentDigest,
+		action: params.action,
+		env: params.env
+	});
+	if (!claim.claimed) {
+		await waitForSatSubmissionLease({
+			walletId: params.walletId,
+			requestId: claim.record.requestId,
+			env: params.env
+		});
+		claim = await claimSatSubmission({
+			walletId: params.walletId,
+			workflowId,
+			operationKey,
+			intentDigest,
+			action: params.action,
+			env: params.env,
+			owner: claim.owner
+		});
+		if (!claim.claimed) {
+			throw new Error(`SAT submission ${claim.record.requestId} could not acquire its durable execution lease`);
+		}
+	}
+	const requestId = claim.record.requestId;
+	let resumedReviewedOperation;
+	if (intent.type === "solana.vaultBondAction") {
+		let reviewWasSigned = false;
+		try {
+			let review;
+			try {
+				review = await callLocalSocketSigner(params.socketPath, {
+					op: "v2.review.get",
+					walletId: params.walletId,
+					request: { requestId }
+				});
+			} catch (lookupError) {
+				if (!String(lookupError).includes("signer review not found")) {
+					throw lookupError;
+				}
+				review = await callLocalSocketSigner(params.socketPath, {
+					op: "v2.review.prepare",
+					walletId: params.walletId,
+					request: {
+						requestId,
+						policyHash: policy.hash,
+						mode: "reviewed",
+						intent
+					}
+				});
+			}
+			if (review.requestId !== requestId || review.policyHash !== policy.hash || review.mode !== "reviewed" || review.intentType !== intent.type || !isDeepStrictEqual(review.semanticIntent, intent)) {
+				throw new Error(`Vault bond review ${requestId} does not match the exact SAT intent`);
+			}
+			if (review.state === "prepared") {
+				const approval = createSignerReviewApprovalRequest({
+					review,
+					role: "vault",
+					walletId: params.walletId,
+					requestedBy: "sat-mining-vault",
+					assetSymbol: "SAT",
+					assetName: "SAT bond",
+					memo: `Reviewed Vault bond action: ${intent.action}`,
+					env: params.env
+				});
+				await updateSatSubmission({
+					walletId: params.walletId,
+					requestId,
+					intentDigest,
+					state: "reserved",
+					error: `review ${approval.id} pending`,
+					owner: claim.owner,
+					releaseLease: true,
+					env: params.env
+				});
+				throw new Error(`Vault bond review ${approval.id} is pending in Wallet Approvals for ${intent.action}; approve it there with the signer-owned passkey`);
+			}
+			reviewWasSigned = true;
+			resumedReviewedOperation = assertSatSignerOperationIdentity(await reconcileTypedSatOperation({
+				socketPath: params.socketPath,
+				walletId: params.walletId,
+				requestId
+			}), requestId);
+		} catch (error) {
+			await updateSatSubmission({
+				walletId: params.walletId,
+				requestId,
+				intentDigest,
+				state: reviewWasSigned ? "unknown" : "reserved",
+				error: error instanceof Error ? error.message : String(error),
+				owner: claim.owner,
+				releaseLease: true,
+				env: params.env
+			}).catch(() => undefined);
+			throw error;
+		}
+	}
+	const executeExactOrRecover = async () => {
+		try {
+			return await callLocalSocketSigner(params.socketPath, {
+				op: "v2.execute",
+				walletId: params.walletId,
+				request: {
+					requestId,
+					policyHash: policy.hash,
+					intent
+				}
+			});
+		} catch (executeError) {
+			try {
+				return await callLocalSocketSigner(params.socketPath, {
+					op: "v2.operation.get",
+					walletId: params.walletId,
+					request: { requestId }
+				});
+			} catch (lookupError) {
+				const detail = `${executeError instanceof Error ? executeError.message : String(executeError)}; ${lookupError instanceof Error ? lookupError.message : String(lookupError)}`;
+				await updateSatSubmission({
+					walletId: params.walletId,
+					requestId,
+					intentDigest,
+					state: claim.record.state === "confirmed" || claim.record.state === "failed" ? claim.record.state : "unknown",
+					...claim.record.signature ? { signature: claim.record.signature } : {},
+					error: detail,
+					owner: claim.owner,
+					releaseLease: true,
+					env: params.env
+				});
+				throw new SatSubmissionUnresolvedError({
+					requestId,
+					state: "unknown",
+					detail
+				});
+			}
+		}
+	};
+	let operation;
+	if (resumedReviewedOperation) {
+		operation = resumedReviewedOperation;
+	} else if (!claim.created) {
+		const callerStateWasAmbiguous = claim.record.state === "broadcast" || claim.record.state === "unknown";
+		try {
+			operation = assertSatSignerOperationIdentity(await callLocalSocketSigner(params.socketPath, {
+				op: "v2.operation.get",
+				walletId: params.walletId,
+				request: { requestId }
+			}), requestId);
+			operation = assertSatSignerOperationIdentity(await reconcileTypedSatOperation({
+				socketPath: params.socketPath,
+				walletId: params.walletId,
+				requestId,
+				operation
+			}), requestId);
+		} catch (lookupError) {
+			if (claim.record.signature) {
+				await updateSatSubmission({
+					walletId: params.walletId,
+					requestId,
+					intentDigest,
+					state: claim.record.state === "confirmed" ? "confirmed" : "unknown",
+					signature: claim.record.signature,
+					error: lookupError instanceof Error ? lookupError.message : String(lookupError),
+					owner: claim.owner,
+					releaseLease: true,
+					env: params.env
+				});
+				throw new SatSubmissionUnresolvedError({
+					requestId,
+					state: claim.record.state === "confirmed" ? "confirmed-but-unverified" : "unknown",
+					signature: claim.record.signature,
+					detail: lookupError instanceof Error ? lookupError.message : String(lookupError)
+				});
+			}
+			if (claim.record.state === "failed" || claim.record.state === "confirmed") {
+				const detail = lookupError instanceof Error ? lookupError.message : String(lookupError);
+				await updateSatSubmission({
+					walletId: params.walletId,
+					requestId,
+					intentDigest,
+					state: claim.record.state,
+					error: detail,
+					owner: claim.owner,
+					releaseLease: true,
+					env: params.env
+				});
+				if (claim.record.state === "failed") {
+					throw new Error(claim.record.error || `SAT signer operation ${requestId} failed`);
+				}
+				throw new SatSubmissionUnresolvedError({
+					requestId,
+					state: "confirmed-without-signature",
+					detail
+				});
+			}
+			operation = await executeExactOrRecover();
+		}
+		if (operation.state === "reserved" && !operation.signature) {
+			if (callerStateWasAmbiguous) {
+				const detail = `signer regressed to reserved after caller persisted ${claim.record.state}`;
+				await updateSatSubmission({
+					walletId: params.walletId,
+					requestId,
+					intentDigest,
+					state: "unknown",
+					...claim.record.signature ? { signature: claim.record.signature } : {},
+					error: detail,
+					owner: claim.owner,
+					releaseLease: true,
+					env: params.env
+				});
+				throw new SatSubmissionUnresolvedError({
+					requestId,
+					state: "unknown",
+					signature: claim.record.signature,
+					detail
+				});
+			}
+			operation = await executeExactOrRecover();
+		}
+	} else {
+		operation = await executeExactOrRecover();
+	}
+	try {
+		operation = assertSatSignerOperationIdentity(operation, requestId);
+		operation = assertSatSignerOperationIdentity(await reconcileTypedSatOperation({
+			socketPath: params.socketPath,
+			walletId: params.walletId,
+			requestId,
+			operation
+		}), requestId);
+	} catch (error) {
+		const detail = error instanceof Error ? error.message : String(error);
+		await updateSatSubmission({
+			walletId: params.walletId,
+			requestId,
+			intentDigest,
+			state: claim.record.state === "confirmed" || claim.record.state === "failed" ? claim.record.state : "unknown",
+			...claim.record.signature ? { signature: claim.record.signature } : {},
+			error: detail,
+			owner: claim.owner,
+			releaseLease: true,
+			env: params.env
+		});
+		throw new SatSubmissionUnresolvedError({
+			requestId,
+			state: "unknown",
+			detail
+		});
+	}
+	await updateSatSubmission({
+		walletId: params.walletId,
+		requestId,
+		intentDigest,
+		state: signerStateForLedger(operation.state),
+		...operation.signature ? { signature: operation.signature } : {},
+		...operation.error ? { error: operation.error } : {},
+		owner: claim.owner,
+		releaseLease: true,
+		env: params.env
+	});
+	if (operation.state === "failed") {
+		throw new Error(operation.error || `SAT signer operation ${requestId} failed`);
+	}
+	if (operation.state !== "confirmed" || !operation.signature) {
+		throw new SatSubmissionUnresolvedError({
+			requestId,
+			state: operation.state,
+			signature: operation.signature,
+			detail: operation.error
+		});
+	}
+	return {
+		...operation,
+		signature: operation.signature
 	};
 }
 async function submitInstructionViaLocalSigner(params) {
@@ -244,21 +642,29 @@ async function submitInstructionViaLocalSigner(params) {
 	const request = await buildLocalSignerInstructionRequest({
 		solana: context.solana,
 		signer: context.signer,
-		walletId: context.walletId,
+		env: context.effectiveEnv,
 		spec: params
 	});
-	const submitted = await callLocalSocketSigner(context.socketPath, {
-		op: "sendSolanaInstruction",
-		request
+	if (!context.walletId) {
+		throw new Error("typed SAT signing requires an explicit mining walletId");
+	}
+	const submitted = await executeTypedSatIntent({
+		socketPath: context.socketPath,
+		walletId: context.walletId,
+		action: request.action,
+		instruction: request,
+		cluster: resolveSatCluster(params.cfg),
+		env: context.effectiveEnv
 	});
 	return {
-		txHash: submitted.txHash,
-		signer: submitted.signer ?? context.signerAddress
+		txHash: submitted.signature,
+		signer: context.signerAddress,
+		signerState: submitted.state,
+		requestId: submitted.requestId
 	};
 }
 async function submitInstruction(params) {
 	const effectiveEnv = resolveSatEffectiveEnv(params.cfg, params.env);
-	await enforceSatCustodyAutonomousSigning(params.cfg, effectiveEnv);
 	if (resolveSatProviderId(params.cfg, effectiveEnv) !== "local-socket-signer") {
 		throw new Error("SAT mining unattended submission currently requires local-socket-signer");
 	}
@@ -278,7 +684,6 @@ async function submitInstructionBatch(params) {
 		throw new Error("SAT cleanup batch exceeds signer limit");
 	}
 	const effectiveEnv = resolveSatEffectiveEnv(params.cfg, params.env);
-	await enforceSatCustodyAutonomousSigning(params.cfg, effectiveEnv);
 	if (resolveSatProviderId(params.cfg, effectiveEnv) !== "local-socket-signer") {
 		throw new Error("SAT mining unattended batch submission currently requires local-socket-signer");
 	}
@@ -288,21 +693,26 @@ async function submitInstructionBatch(params) {
 		instructions.push(await buildLocalSignerInstructionRequest({
 			solana: context.solana,
 			signer: context.signer,
-			walletId: context.walletId,
+			env: context.effectiveEnv,
 			spec
 		}));
 	}
-	const submitted = await callLocalSocketSigner(context.socketPath, {
-		op: "sendSolanaInstructions",
-		request: {
-			...context.walletId ? { walletId: context.walletId } : {},
-			purpose: params.purpose,
-			instructions
-		}
+	if (!context.walletId) {
+		throw new Error("typed SAT cleanup signing requires an explicit mining walletId");
+	}
+	const submitted = await executeTypedSatIntent({
+		socketPath: context.socketPath,
+		walletId: context.walletId,
+		action: "cleanupBatch",
+		instructions,
+		cluster: resolveSatCluster(params.cfg),
+		env: context.effectiveEnv
 	});
 	return {
-		txHash: submitted.txHash,
-		signer: submitted.signer ?? context.signerAddress,
+		txHash: submitted.signature,
+		signer: context.signerAddress,
+		signerState: submitted.state,
+		requestId: submitted.requestId,
 		instructionCount: instructions.length
 	};
 }
@@ -390,12 +800,8 @@ function buildClaimData(params) {
 function buildMiningCrankData() {
 	return Buffer.from([IX.miningCrank]);
 }
-function buildBootstrapData(params) {
-	return Buffer.concat([
-		Buffer.from([IX.bootstrap]),
-		encodePubkey(params.authority),
-		encodeU64(params.initialStake)
-	]);
+function buildTopUpRegistryReserveData(params) {
+	return Buffer.concat([Buffer.from([IX.topUpRegistryReserve]), encodeU64(params.targetBalanceLamports)]);
 }
 function buildOpenCycleData(params) {
 	return Buffer.concat([Buffer.from([IX.openCycle]), encodeU64(params.cycleId)]);
@@ -412,16 +818,6 @@ function buildWithdrawMinerCapitalData(params) {
 function buildSetActiveCommitData(params) {
 	return Buffer.concat([Buffer.from([IX.setActiveCommit]), encodeU64(params.lamports)]);
 }
-function buildInitBondTierPolicyData(params) {
-	return Buffer.concat([
-		Buffer.from([BOND_IX.initTierPolicy]),
-		encodePubkey(params.updateAuthority),
-		encodeU64(params.basicMinRaw),
-		encodeU64(params.operatorMinRaw),
-		encodeU64(params.unlockDelaySlots),
-		encodeU64(params.scheduledEffectiveSlot ?? 0)
-	]);
-}
 function buildUpdateBondTierPolicyData(params) {
 	return Buffer.concat([
 		Buffer.from([BOND_IX.updateTierPolicy]),
@@ -452,14 +848,6 @@ function buildFinalizeBondUnlockData(env = process.env) {
 	assertDedicatedBondProgram(env);
 	return Buffer.from([BOND_IX.finalizeBondUnlock]);
 }
-function buildInitBondStakingDistributorData(params, env = process.env) {
-	assertDedicatedBondProgram(env);
-	return Buffer.concat([
-		Buffer.from([BOND_IX.initStakingDistributor]),
-		encodePubkey(params.updateAuthority),
-		encodeU64(params.minStakeRaw)
-	]);
-}
 function buildSyncBondStakingRewardsData(env = process.env) {
 	assertDedicatedBondProgram(env);
 	return Buffer.from([BOND_IX.syncStakingRewards]);
@@ -472,22 +860,75 @@ function buildClaimBondStakingRewardsData(env = process.env) {
 	assertDedicatedBondProgram(env);
 	return Buffer.from([BOND_IX.claimStakingRewards]);
 }
-function buildSubmitCycleData(params) {
-	if (params.allocationFp.length !== 25) {
-		throw new Error(`expected 25 allocation buckets, got ${params.allocationFp.length}`);
+function buildClaimUnallocatedStakingRewardsData(env = process.env) {
+	assertDedicatedBondProgram(env);
+	return Buffer.from([BOND_IX.claimUnallocatedStakingRewards]);
+}
+function encodeAllocationFp(allocationFp) {
+	if (allocationFp.length !== 25) {
+		throw new Error(`expected 25 allocation buckets, got ${allocationFp.length}`);
+	}
+	return Buffer.concat(allocationFp.map((value) => {
+		if (!Number.isSafeInteger(value) || value < 0 || value > 4294967295) {
+			throw new Error(`invalid allocation bucket value: ${value}`);
+		}
+		const out = Buffer.alloc(4);
+		out.writeUInt32LE(value);
+		return out;
+	}));
+}
+function buildSatCycleCommitment(params) {
+	if (params.nonce.length !== 32) {
+		throw new Error(`expected 32-byte cycle nonce, got ${params.nonce.length}`);
 	}
-	const body = Buffer.concat([
-		Buffer.from([IX.submitCycle]),
+	const allocation = encodeAllocationFp(params.allocationFp);
+	return createHash("sha256").update(Buffer.concat([
+		Buffer.from("sat-cycle-commit-v1"),
+		encodePubkey(params.programId ?? SAT_PROGRAM_ID()),
+		encodePubkey(params.authority),
 		encodeU64(params.cycleId),
-		Buffer.concat(params.allocationFp.map((value) => {
-			const out = Buffer.alloc(4);
-			out.writeUInt32LE(value);
-			return out;
-		})),
+		encodeU64(params.committedLamports),
+		params.nonce,
+		allocation
+	])).digest();
+}
+function buildCommitCycleData(params) {
+	if (params.commitment.length !== 32) {
+		throw new Error(`expected 32-byte cycle commitment, got ${params.commitment.length}`);
+	}
+	return Buffer.concat([
+		Buffer.from([IX.commitCycle]),
+		encodeU64(params.cycleId),
+		params.commitment
+	]);
+}
+function buildCloseCommitPhaseData(params) {
+	return Buffer.concat([Buffer.from([IX.closeCommitPhase]), encodeU64(params.cycleId)]);
+}
+function buildSealCycleEntropyData(params) {
+	return Buffer.concat([Buffer.from([IX.sealCycleEntropy]), encodeU64(params.cycleId)]);
+}
+function buildRevealCycleData(params) {
+	if (params.nonce.length !== 32) {
+		throw new Error(`expected 32-byte cycle nonce, got ${params.nonce.length}`);
+	}
+	return Buffer.concat([
+		Buffer.from([IX.revealCycle]),
+		encodeU64(params.cycleId),
+		params.nonce,
+		encodeAllocationFp(params.allocationFp),
 		Buffer.alloc(4)
 	]);
-	satSubmitDebug(`[sat-submit-build] allocs=${params.allocationFp.length} len=${body.length} cycle=${params.cycleId}`);
-	return body;
+}
+function buildReleaseUnrevealedCommitData(params) {
+	return Buffer.concat([
+		Buffer.from([IX.releaseUnrevealedCommit]),
+		encodeU64(params.cycleId),
+		encodePubkey(params.minerAuthority)
+	]);
+}
+function buildAbortEmptyCycleData(params) {
+	return Buffer.concat([Buffer.from([IX.abortEmptyCycle]), encodeU64(params.cycleId)]);
 }
 function buildClaimCycleRewardsData(params) {
 	return Buffer.concat([Buffer.from([IX.claimCycleRewards]), encodeU64(params.cycleId)]);
@@ -504,13 +945,6 @@ function buildClaimCycleRewardsBatchData(params) {
 		...params.cycleIds.map((cycleId) => encodeU64(cycleId))
 	]);
 }
-function buildSetProtocolRecipientsData(params) {
-	return Buffer.concat([
-		Buffer.from([IX.setProtocolRecipients]),
-		encodePubkey(params.treasuryRecipient),
-		encodePubkey(params.distributorRecipient)
-	]);
-}
 function buildClaimProtocolTreasuryData() {
 	return Buffer.from([IX.claimProtocolTreasury]);
 }
@@ -644,33 +1078,36 @@ async function submitSatValidatorAttestation(_config, params) {
 				encodeU64(params.microRoundId)
 			], programId);
 			const [miningStake] = solana.PublicKey.findProgramAddressSync([Buffer.from(MINING_STAKE_SEED), targetAuthority.toBuffer()], programId);
-			return [
-				{
-					pubkey: signer,
-					isSigner: true,
-					isWritable: true
-				},
-				{
-					pubkey: satEpoch,
-					isSigner: false,
-					isWritable: true
-				},
-				{
-					pubkey: satValidatorAttestation,
-					isSigner: false,
-					isWritable: true
-				},
-				{
-					pubkey: miningStake,
-					isSigner: false,
-					isWritable: true
-				},
-				{
-					pubkey: solana.SystemProgram.programId,
-					isSigner: false,
-					isWritable: false
-				}
-			];
+			return {
+				keys: [
+					{
+						pubkey: signer,
+						isSigner: true,
+						isWritable: true
+					},
+					{
+						pubkey: satEpoch,
+						isSigner: false,
+						isWritable: true
+					},
+					{
+						pubkey: satValidatorAttestation,
+						isSigner: false,
+						isWritable: true
+					},
+					{
+						pubkey: miningStake,
+						isSigner: false,
+						isWritable: true
+					},
+					{
+						pubkey: solana.SystemProgram.programId,
+						isSigner: false,
+						isWritable: false
+					}
+				],
+				context: { targetAuthority: targetAuthority.toBase58() }
+			};
 		}
 	});
 }
@@ -692,33 +1129,36 @@ async function submitSatOpenDispute(_config, params) {
 				encodeU64(params.microRoundId)
 			], programId);
 			const [miningStake] = solana.PublicKey.findProgramAddressSync([Buffer.from(MINING_STAKE_SEED), targetAuthority.toBuffer()], programId);
-			return [
-				{
-					pubkey: signer,
-					isSigner: true,
-					isWritable: true
-				},
-				{
-					pubkey: satEpoch,
-					isSigner: false,
-					isWritable: true
-				},
-				{
-					pubkey: satDispute,
-					isSigner: false,
-					isWritable: true
-				},
-				{
-					pubkey: miningStake,
-					isSigner: false,
-					isWritable: true
-				},
-				{
-					pubkey: solana.SystemProgram.programId,
-					isSigner: false,
-					isWritable: false
-				}
-			];
+			return {
+				keys: [
+					{
+						pubkey: signer,
+						isSigner: true,
+						isWritable: true
+					},
+					{
+						pubkey: satEpoch,
+						isSigner: false,
+						isWritable: true
+					},
+					{
+						pubkey: satDispute,
+						isSigner: false,
+						isWritable: true
+					},
+					{
+						pubkey: miningStake,
+						isSigner: false,
+						isWritable: true
+					},
+					{
+						pubkey: solana.SystemProgram.programId,
+						isSigner: false,
+						isWritable: false
+					}
+				],
+				context: { targetAuthority: targetAuthority.toBase58() }
+			};
 		}
 	});
 }
@@ -741,28 +1181,31 @@ async function submitSatResolveDispute(_config, params) {
 				encodeU64(params.epochId),
 				encodeU64(params.microRoundId)
 			], programId);
-			return [
-				{
-					pubkey: signer,
-					isSigner: true,
-					isWritable: true
-				},
-				{
-					pubkey: miningPool,
-					isSigner: false,
-					isWritable: false
-				},
-				{
-					pubkey: satEpoch,
-					isSigner: false,
-					isWritable: true
-				},
-				{
-					pubkey: satDispute,
-					isSigner: false,
-					isWritable: true
-				}
-			];
+			return {
+				keys: [
+					{
+						pubkey: signer,
+						isSigner: true,
+						isWritable: true
+					},
+					{
+						pubkey: miningPool,
+						isSigner: false,
+						isWritable: false
+					},
+					{
+						pubkey: satEpoch,
+						isSigner: false,
+						isWritable: true
+					},
+					{
+						pubkey: satDispute,
+						isSigner: false,
+						isWritable: true
+					}
+				],
+				context: { disputeAuthority: disputeAuthority.toBase58() }
+			};
 		}
 	});
 }
@@ -796,44 +1239,29 @@ async function submitSatRepublishEpochRoots(_config, params) {
 		}
 	});
 }
-async function submitSatBootstrap(_config, params = {}) {
+async function submitSatTopUpRegistryReserve(_config, params) {
 	const cfg = loadConfigForSatRuntime(_config);
+	const targetBalanceLamports = Math.max(0, Math.floor(params.targetBalanceLamports));
+	if (!Number.isSafeInteger(targetBalanceLamports)) {
+		throw new Error("registry reserve target must be a safe integer lamport amount");
+	}
+	const profile = resolveSatGenesisProfileContract(_config.network);
+	if (BigInt(targetBalanceLamports) > profile.registryReserveMaxLamports) {
+		throw new Error(`registry reserve target exceeds ${profile.cluster} genesis maximum ${profile.registryReserveMaxLamports}`);
+	}
 	return submitInstruction({
 		cfg,
 		env: process.env,
-		data: buildBootstrapData({
-			authority: params.authority ?? "",
-			initialStake: Math.max(0, Math.floor(params.initialStake ?? 0))
-		}),
+		data: buildTopUpRegistryReserveData({ targetBalanceLamports }),
 		accountResolver: async (solana, signer) => {
 			const programId = new solana.PublicKey(SAT_PROGRAM_ID());
-			const [satGlobalState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_GLOBAL_STATE_SEED)], programId);
-			const [treasury] = solana.PublicKey.findProgramAddressSync([Buffer.from("treasury")], programId);
-			const [satTreasuryState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_TREASURY_STATE_SEED)], programId);
 			const [satRegistryReserve] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_REGISTRY_RESERVE_SEED)], programId);
-			const [satRebateVault] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_REBATE_VAULT_SEED)], programId);
-			const [satTreasuryVault] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_TREASURY_VAULT_SEED)], programId);
 			return [
 				{
 					pubkey: signer,
 					isSigner: true,
 					isWritable: true
 				},
-				{
-					pubkey: satGlobalState,
-					isSigner: false,
-					isWritable: true
-				},
-				{
-					pubkey: treasury,
-					isSigner: false,
-					isWritable: true
-				},
-				{
-					pubkey: satTreasuryState,
-					isSigner: false,
-					isWritable: true
-				},
 				{
 					pubkey: satRegistryReserve,
 					isSigner: false,
@@ -843,16 +1271,6 @@ async function submitSatBootstrap(_config, params = {}) {
 					pubkey: solana.SystemProgram.programId,
 					isSigner: false,
 					isWritable: false
-				},
-				{
-					pubkey: satRebateVault,
-					isSigner: false,
-					isWritable: true
-				},
-				{
-					pubkey: satTreasuryVault,
-					isSigner: false,
-					isWritable: true
 				}
 			];
 		}
@@ -919,14 +1337,16 @@ async function submitSatOpenCycle(_config, params) {
 }
 async function submitSatInitMinerCapital(_config, params) {
 	const cfg = loadConfigForSatRuntime(_config);
+	const effectiveEnv = resolveSatEffectiveEnv(cfg, process.env);
+	const authority = params.authority?.trim() || await resolveSatLocalSignerAddress(cfg, effectiveEnv, "local-socket-signer returned no Solana address for SAT miner capital authority");
 	return submitInstruction({
 		cfg,
-		env: process.env,
-		data: buildInitMinerCapitalData({ authority: params.authority ?? "" }),
+		env: effectiveEnv,
+		data: buildInitMinerCapitalData({ authority }),
 		accountResolver: async (solana, signer) => {
 			const programId = new solana.PublicKey(SAT_PROGRAM_ID());
-			const authority = params.authority?.trim() ? new solana.PublicKey(params.authority) : signer;
-			const [satMinerCapitalState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_MINER_CAPITAL_STATE_SEED), authority.toBuffer()], programId);
+			const authorityKey = new solana.PublicKey(authority);
+			const [satMinerCapitalState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_MINER_CAPITAL_STATE_SEED), authorityKey.toBuffer()], programId);
 			return [
 				{
 					pubkey: signer,
@@ -1049,50 +1469,13 @@ function resolveSatBondAccounts(solana, signer, env = process.env) {
 		dedicated: hasDedicatedBondProgram(env)
 	};
 }
-async function submitSatInitBondTierPolicy(_config, params) {
-	const cfg = loadConfigForSatRuntime(_config);
-	const effectiveEnv = resolveSatEffectiveEnv(cfg, process.env);
-	if (!hasDedicatedBondProgram(effectiveEnv)) {
-		throw new Error("SAT bond tier policy init requires FASED_SAT_BOND_PROGRAM_ID");
-	}
-	const defaultUpdateAuthority = resolveSatRegistrySolanaAddress(cfg, effectiveEnv) || await resolveSatLocalSignerAddress(cfg, effectiveEnv, "local-socket-signer returned no Solana address for SAT bond policy authority");
-	return submitInstruction({
-		cfg,
-		env: effectiveEnv,
-		data: buildInitBondTierPolicyData({
-			...params,
-			updateAuthority: params.updateAuthority ?? defaultUpdateAuthority
-		}),
-		programId: resolveSatBondProgramIdFromEnv(effectiveEnv),
-		accountResolver: async (solana, signer) => {
-			const { bondTierPolicy } = resolveSatBondAccounts(solana, signer, effectiveEnv);
-			return [
-				{
-					pubkey: signer,
-					isSigner: true,
-					isWritable: true
-				},
-				{
-					pubkey: bondTierPolicy,
-					isSigner: false,
-					isWritable: true
-				},
-				{
-					pubkey: solana.SystemProgram.programId,
-					isSigner: false,
-					isWritable: false
-				}
-			];
-		}
-	});
-}
 async function submitSatUpdateBondTierPolicy(_config, params) {
 	const cfg = loadConfigForSatRuntime(_config);
 	const effectiveEnv = resolveSatEffectiveEnv(cfg, process.env);
 	if (!hasDedicatedBondProgram(effectiveEnv)) {
 		throw new Error("SAT bond tier policy update requires FASED_SAT_BOND_PROGRAM_ID");
 	}
-	const defaultUpdateAuthority = resolveSatRegistrySolanaAddress(cfg, effectiveEnv) || await resolveSatLocalSignerAddress(cfg, effectiveEnv, "local-socket-signer returned no Solana address for SAT bond policy authority");
+	const defaultUpdateAuthority = await resolveSatLocalSignerAddress(cfg, effectiveEnv, "local-socket-signer returned no Solana address for SAT bond policy authority");
 	return submitInstruction({
 		cfg,
 		env: effectiveEnv,
@@ -1231,7 +1614,7 @@ async function submitSatRequestBondUnlock(_config) {
 		data: buildRequestBondUnlockData(effectiveEnv),
 		programId: resolveSatBondProgramIdFromEnv(effectiveEnv),
 		accountResolver: async (solana, signer) => {
-			const { bondTierPolicy, bondPosition } = resolveSatBondAccounts(solana, signer, effectiveEnv);
+			const { bondTierPolicy, bondPosition, bondStakingDistributor, bondStakingPosition } = resolveSatBondAccounts(solana, signer, effectiveEnv);
 			const accounts = [{
 				pubkey: signer,
 				isSigner: true,
@@ -1245,6 +1628,14 @@ async function submitSatRequestBondUnlock(_config) {
 				pubkey: bondPosition,
 				isSigner: false,
 				isWritable: true
+			}, {
+				pubkey: bondStakingDistributor,
+				isSigner: false,
+				isWritable: true
+			}, {
+				pubkey: bondStakingPosition,
+				isSigner: false,
+				isWritable: true
 			});
 			return accounts;
 		}
@@ -1260,7 +1651,7 @@ async function submitSatCancelBondUnlock(_config) {
 		data: buildCancelBondUnlockData(effectiveEnv),
 		programId: resolveSatBondProgramIdFromEnv(effectiveEnv),
 		accountResolver: async (solana, signer) => {
-			const { bondTierPolicy, bondPosition } = resolveSatBondAccounts(solana, signer, effectiveEnv);
+			const { bondTierPolicy, bondPosition, bondStakingDistributor, bondStakingPosition } = resolveSatBondAccounts(solana, signer, effectiveEnv);
 			const accounts = [{
 				pubkey: signer,
 				isSigner: true,
@@ -1274,6 +1665,14 @@ async function submitSatCancelBondUnlock(_config) {
 				pubkey: bondPosition,
 				isSigner: false,
 				isWritable: true
+			}, {
+				pubkey: bondStakingDistributor,
+				isSigner: false,
+				isWritable: true
+			}, {
+				pubkey: bondStakingPosition,
+				isSigner: false,
+				isWritable: true
 			});
 			return accounts;
 		}
@@ -1289,7 +1688,7 @@ async function submitSatFinalizeBondUnlock(_config) {
 		data: buildFinalizeBondUnlockData(effectiveEnv),
 		programId: resolveSatBondProgramIdFromEnv(effectiveEnv),
 		accountResolver: async (solana, signer) => {
-			const { bondTierPolicy, bondPosition, signerTokenAccount, bondVault, mint } = resolveSatBondAccounts(solana, signer, effectiveEnv);
+			const { bondTierPolicy, bondPosition, bondStakingDistributor, bondStakingPosition, signerTokenAccount, bondVault, mint } = resolveSatBondAccounts(solana, signer, effectiveEnv);
 			const accounts = [{
 				pubkey: signer,
 				isSigner: true,
@@ -1303,6 +1702,14 @@ async function submitSatFinalizeBondUnlock(_config) {
 				pubkey: bondPosition,
 				isSigner: false,
 				isWritable: true
+			}, {
+				pubkey: bondStakingDistributor,
+				isSigner: false,
+				isWritable: true
+			}, {
+				pubkey: bondStakingPosition,
+				isSigner: false,
+				isWritable: true
 			}, {
 				pubkey: bondVault,
 				isSigner: false,
@@ -1324,66 +1731,11 @@ async function submitSatFinalizeBondUnlock(_config) {
 				isSigner: false,
 				isWritable: false
 			}, {
-				pubkey: new solana.PublicKey(ASSOCIATED_TOKEN_PROGRAM_ID),
-				isSigner: false,
-				isWritable: false
-			});
-			return accounts;
-		}
-	});
-}
-async function submitSatInitBondStakingDistributor(_config, params) {
-	const cfg = loadConfigForSatRuntime(_config);
-	const effectiveEnv = resolveSatEffectiveEnv(cfg, process.env);
-	assertDedicatedBondProgram(effectiveEnv);
-	const defaultUpdateAuthority = await resolveSatLocalSignerAddress(cfg, effectiveEnv, "local-socket-signer returned no Solana address for SAT bond staking distributor authority");
-	return submitInstruction({
-		cfg,
-		env: effectiveEnv,
-		data: buildInitBondStakingDistributorData({
-			minStakeRaw: params.minStakeRaw,
-			updateAuthority: params.updateAuthority ?? defaultUpdateAuthority
-		}, effectiveEnv),
-		programId: resolveSatBondProgramIdFromEnv(effectiveEnv),
-		accountResolver: async (solana, signer) => {
-			const { bondStakingDistributor, bondStakingRewardVault, mint } = resolveSatBondAccounts(solana, signer, effectiveEnv);
-			return [
-				{
-					pubkey: signer,
-					isSigner: true,
-					isWritable: true
-				},
-				{
-					pubkey: bondStakingDistributor,
-					isSigner: false,
-					isWritable: true
-				},
-				{
-					pubkey: bondStakingRewardVault,
-					isSigner: false,
-					isWritable: true
-				},
-				{
-					pubkey: mint,
-					isSigner: false,
-					isWritable: true
-				},
-				{
-					pubkey: solana.SystemProgram.programId,
-					isSigner: false,
-					isWritable: false
-				},
-				{
-					pubkey: new solana.PublicKey(TOKEN_PROGRAM_ID),
-					isSigner: false,
-					isWritable: false
-				},
-				{
-					pubkey: new solana.PublicKey(ASSOCIATED_TOKEN_PROGRAM_ID),
-					isSigner: false,
-					isWritable: false
-				}
-			];
+				pubkey: new solana.PublicKey(ASSOCIATED_TOKEN_PROGRAM_ID),
+				isSigner: false,
+				isWritable: false
+			});
+			return accounts;
 		}
 	});
 }
@@ -1535,34 +1887,88 @@ async function submitSatClaimBondStakingRewards(_config) {
 		}
 	});
 }
-async function submitSatCycle(_config, params) {
+async function submitSatClaimUnallocatedStakingRewards(_config, params) {
+	const cfg = loadConfigForSatRuntime(_config);
+	const effectiveEnv = resolveSatEffectiveEnv(cfg, process.env);
+	assertDedicatedBondProgram(effectiveEnv);
+	return submitInstruction({
+		cfg,
+		env: effectiveEnv,
+		data: buildClaimUnallocatedStakingRewardsData(effectiveEnv),
+		programId: resolveSatBondProgramIdFromEnv(effectiveEnv),
+		accountResolver: async (solana, signer) => {
+			const { bondStakingDistributor, bondStakingRewardVault, mint } = resolveSatBondAccounts(solana, signer, effectiveEnv);
+			const recipientOwner = new solana.PublicKey(params.recipientOwner);
+			const recipientTokenAccount = deriveAssociatedTokenAddress(solana, recipientOwner, mint);
+			return [
+				{
+					pubkey: signer,
+					isSigner: true,
+					isWritable: true
+				},
+				{
+					pubkey: bondStakingDistributor,
+					isSigner: false,
+					isWritable: true
+				},
+				{
+					pubkey: bondStakingRewardVault,
+					isSigner: false,
+					isWritable: true
+				},
+				{
+					pubkey: recipientTokenAccount,
+					isSigner: false,
+					isWritable: true
+				},
+				{
+					pubkey: recipientOwner,
+					isSigner: false,
+					isWritable: false
+				},
+				{
+					pubkey: mint,
+					isSigner: false,
+					isWritable: true
+				},
+				{
+					pubkey: solana.SystemProgram.programId,
+					isSigner: false,
+					isWritable: false
+				},
+				{
+					pubkey: new solana.PublicKey(TOKEN_PROGRAM_ID),
+					isSigner: false,
+					isWritable: false
+				},
+				{
+					pubkey: new solana.PublicKey(ASSOCIATED_TOKEN_PROGRAM_ID),
+					isSigner: false,
+					isWritable: false
+				}
+			];
+		}
+	});
+}
+async function submitSatCommitCycle(_config, params) {
 	const cfg = loadConfigForSatRuntime(_config);
+	const commitment = Buffer.from(params.commitmentHex, "hex");
 	return submitInstruction({
 		cfg,
 		env: process.env,
-		data: buildSubmitCycleData(params),
+		data: buildCommitCycleData({
+			cycleId: params.cycleId,
+			commitment
+		}),
 		accountResolver: async (solana, signer) => {
 			const programId = new solana.PublicKey(SAT_PROGRAM_ID());
-			const pageIndex = await resolveSatCycleRegistryPageIndex(_config, params.cycleId);
-			const [satGlobalState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_GLOBAL_STATE_SEED)], programId);
 			const [satCycleState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_CYCLE_STATE_SEED), encodeU64(params.cycleId)], programId);
-			const [satCycleRegistryMeta] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_CYCLE_REGISTRY_META_SEED), encodeU64(params.cycleId)], programId);
-			const [satCycleRegistryPage] = solana.PublicKey.findProgramAddressSync([
-				Buffer.from(SAT_CYCLE_REGISTRY_PAGE_SEED),
-				encodeU64(params.cycleId),
-				encodeU64(pageIndex)
-			], programId);
-			const [satCycleSettlementProgress] = solana.PublicKey.findProgramAddressSync([Buffer.from("sat_cycle_settlement_progress_v2"), encodeU64(params.cycleId)], programId);
 			const [satMinerCycleState] = solana.PublicKey.findProgramAddressSync([
 				Buffer.from(SAT_MINER_CYCLE_STATE_SEED),
 				signer.toBuffer(),
 				encodeU64(params.cycleId)
 			], programId);
 			const [satMinerCapitalState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_MINER_CAPITAL_STATE_SEED), signer.toBuffer()], programId);
-			const [satRegistryReserve] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_REGISTRY_RESERVE_SEED)], programId);
-			const [satTreasuryState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_TREASURY_STATE_SEED)], programId);
-			const [satRebateVault] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_REBATE_VAULT_SEED)], programId);
-			const [satTreasuryVault] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_TREASURY_VAULT_SEED)], programId);
 			return [
 				{
 					pubkey: signer,
@@ -1570,27 +1976,112 @@ async function submitSatCycle(_config, params) {
 					isWritable: true
 				},
 				{
-					pubkey: satGlobalState,
+					pubkey: satCycleState,
 					isSigner: false,
 					isWritable: true
 				},
 				{
-					pubkey: satCycleState,
+					pubkey: satMinerCycleState,
 					isSigner: false,
 					isWritable: true
 				},
 				{
-					pubkey: satCycleRegistryMeta,
+					pubkey: satMinerCapitalState,
 					isSigner: false,
 					isWritable: true
 				},
 				{
-					pubkey: satCycleRegistryPage,
+					pubkey: solana.SystemProgram.programId,
+					isSigner: false,
+					isWritable: false
+				}
+			];
+		}
+	});
+}
+async function submitSatCyclePhaseInstruction(_config, params) {
+	const cfg = loadConfigForSatRuntime(_config);
+	return submitInstruction({
+		cfg,
+		env: process.env,
+		data: params.phase === "close" ? buildCloseCommitPhaseData(params) : buildSealCycleEntropyData(params),
+		accountResolver: async (solana, signer) => {
+			const programId = new solana.PublicKey(SAT_PROGRAM_ID());
+			const [satCycleState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_CYCLE_STATE_SEED), encodeU64(params.cycleId)], programId);
+			const accounts = [{
+				pubkey: signer,
+				isSigner: true,
+				isWritable: false
+			}, {
+				pubkey: satCycleState,
+				isSigner: false,
+				isWritable: true
+			}];
+			let intervalStartCycleIdForSigner;
+			if (params.phase === "seal") {
+				const cycle = params.intervalStartCycleId == null ? await inspectSatCycle(_config, { cycleId: params.cycleId }) : null;
+				const intervalStartCycleId = params.intervalStartCycleId ?? cycle?.unlockIntervalStartCycleId;
+				if (intervalStartCycleId == null || !Number.isSafeInteger(intervalStartCycleId)) {
+					throw new Error(`SAT cycle ${params.cycleId} does not expose its unlock interval start`);
+				}
+				intervalStartCycleIdForSigner = intervalStartCycleId;
+				const [satUnlockIntervalState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_UNLOCK_INTERVAL_STATE_SEED), encodeU64(intervalStartCycleId)], programId);
+				accounts.push({
+					pubkey: satUnlockIntervalState,
 					isSigner: false,
 					isWritable: true
+				});
+				accounts.push({
+					pubkey: new solana.PublicKey(SLOT_HASHES_SYSVAR_ID),
+					isSigner: false,
+					isWritable: false
+				});
+			}
+			return {
+				keys: accounts,
+				...intervalStartCycleIdForSigner == null ? {} : { context: { intervalStartCycleId: String(intervalStartCycleIdForSigner) } }
+			};
+		}
+	});
+}
+async function submitSatCloseCommitPhase(_config, params) {
+	return submitSatCyclePhaseInstruction(_config, {
+		...params,
+		phase: "close"
+	});
+}
+async function submitSatSealCycleEntropy(_config, params) {
+	return submitSatCyclePhaseInstruction(_config, {
+		...params,
+		phase: "seal"
+	});
+}
+async function submitSatReleaseUnrevealedCommit(_config, params) {
+	const cfg = loadConfigForSatRuntime(_config);
+	return submitInstruction({
+		cfg,
+		env: process.env,
+		data: buildReleaseUnrevealedCommitData(params),
+		accountResolver: async (solana, signer) => {
+			const programId = new solana.PublicKey(SAT_PROGRAM_ID());
+			const minerAuthority = new solana.PublicKey(params.minerAuthority);
+			const [satCycleState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_CYCLE_STATE_SEED), encodeU64(params.cycleId)], programId);
+			const [satMinerCycleState] = solana.PublicKey.findProgramAddressSync([
+				Buffer.from(SAT_MINER_CYCLE_STATE_SEED),
+				minerAuthority.toBuffer(),
+				encodeU64(params.cycleId)
+			], programId);
+			const [satMinerCapitalState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_MINER_CAPITAL_STATE_SEED), minerAuthority.toBuffer()], programId);
+			const [satTreasuryState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_TREASURY_STATE_SEED)], programId);
+			const [satTreasuryVault] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_TREASURY_VAULT_SEED)], programId);
+			return [
+				{
+					pubkey: signer,
+					isSigner: true,
+					isWritable: false
 				},
 				{
-					pubkey: satCycleSettlementProgress,
+					pubkey: satCycleState,
 					isSigner: false,
 					isWritable: true
 				},
@@ -1605,27 +2096,42 @@ async function submitSatCycle(_config, params) {
 					isWritable: true
 				},
 				{
-					pubkey: satRegistryReserve,
+					pubkey: satTreasuryState,
 					isSigner: false,
 					isWritable: true
 				},
 				{
-					pubkey: satTreasuryState,
+					pubkey: satTreasuryVault,
 					isSigner: false,
 					isWritable: true
-				},
+				}
+			];
+		}
+	});
+}
+async function submitSatAbortEmptyCycle(_config, params) {
+	const cfg = loadConfigForSatRuntime(_config);
+	return submitInstruction({
+		cfg,
+		env: process.env,
+		data: buildAbortEmptyCycleData(params),
+		accountResolver: async (solana, signer) => {
+			const programId = new solana.PublicKey(SAT_PROGRAM_ID());
+			const [satCycleState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_CYCLE_STATE_SEED), encodeU64(params.cycleId)], programId);
+			const [satCycleRegistryMeta] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_CYCLE_REGISTRY_META_SEED), encodeU64(params.cycleId)], programId);
+			return [
 				{
-					pubkey: solana.SystemProgram.programId,
-					isSigner: false,
+					pubkey: signer,
+					isSigner: true,
 					isWritable: false
 				},
 				{
-					pubkey: satRebateVault,
+					pubkey: satCycleState,
 					isSigner: false,
 					isWritable: true
 				},
 				{
-					pubkey: satTreasuryVault,
+					pubkey: satCycleRegistryMeta,
 					isSigner: false,
 					isWritable: true
 				}
@@ -1633,6 +2139,101 @@ async function submitSatCycle(_config, params) {
 		}
 	});
 }
+async function submitSatRevealCycle(_config, params) {
+	const cfg = loadConfigForSatRuntime(_config);
+	const nonce = Buffer.from(params.nonceBase64, "base64");
+	return submitInstruction({
+		cfg,
+		env: process.env,
+		data: buildRevealCycleData({
+			...params,
+			nonce
+		}),
+		accountResolver: async (solana, signer) => {
+			const programId = new solana.PublicKey(SAT_PROGRAM_ID());
+			const pageIndex = await resolveSatCycleRegistryPageIndex(_config, params.cycleId);
+			const cycle = params.intervalStartCycleId == null ? await inspectSatCycle(_config, { cycleId: params.cycleId }) : null;
+			const intervalStartCycleId = params.intervalStartCycleId ?? cycle?.unlockIntervalStartCycleId;
+			if (intervalStartCycleId == null || !Number.isSafeInteger(intervalStartCycleId)) {
+				throw new Error(`SAT cycle ${params.cycleId} does not expose its unlock interval start`);
+			}
+			const [satCycleState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_CYCLE_STATE_SEED), encodeU64(params.cycleId)], programId);
+			const [satCycleRegistryMeta] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_CYCLE_REGISTRY_META_SEED), encodeU64(params.cycleId)], programId);
+			const [satCycleRegistryPage] = solana.PublicKey.findProgramAddressSync([
+				Buffer.from(SAT_CYCLE_REGISTRY_PAGE_SEED),
+				encodeU64(params.cycleId),
+				encodeU64(pageIndex)
+			], programId);
+			const [satCycleSettlementProgress] = solana.PublicKey.findProgramAddressSync([Buffer.from("sat_cycle_settlement_progress_v2"), encodeU64(params.cycleId)], programId);
+			const [satMinerCycleState] = solana.PublicKey.findProgramAddressSync([
+				Buffer.from(SAT_MINER_CYCLE_STATE_SEED),
+				signer.toBuffer(),
+				encodeU64(params.cycleId)
+			], programId);
+			const [satMinerCapitalState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_MINER_CAPITAL_STATE_SEED), signer.toBuffer()], programId);
+			const [satUnlockIntervalState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_UNLOCK_INTERVAL_STATE_SEED), encodeU64(intervalStartCycleId)], programId);
+			const [satRegistryReserve] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_REGISTRY_RESERVE_SEED)], programId);
+			return {
+				keys: [
+					{
+						pubkey: signer,
+						isSigner: true,
+						isWritable: true
+					},
+					{
+						pubkey: satCycleState,
+						isSigner: false,
+						isWritable: true
+					},
+					{
+						pubkey: satCycleRegistryMeta,
+						isSigner: false,
+						isWritable: true
+					},
+					{
+						pubkey: satCycleRegistryPage,
+						isSigner: false,
+						isWritable: true
+					},
+					{
+						pubkey: satCycleSettlementProgress,
+						isSigner: false,
+						isWritable: true
+					},
+					{
+						pubkey: satMinerCycleState,
+						isSigner: false,
+						isWritable: true
+					},
+					{
+						pubkey: satMinerCapitalState,
+						isSigner: false,
+						isWritable: true
+					},
+					{
+						pubkey: satUnlockIntervalState,
+						isSigner: false,
+						isWritable: true
+					},
+					{
+						pubkey: satRegistryReserve,
+						isSigner: false,
+						isWritable: true
+					},
+					{
+						pubkey: solana.SystemProgram.programId,
+						isSigner: false,
+						isWritable: false
+					}
+				],
+				context: {
+					intervalStartCycleId: String(intervalStartCycleId),
+					registryPageIndex: String(pageIndex)
+				}
+			};
+		}
+	});
+}
 async function submitSatSettleCyclePage(_config, params) {
 	const cfg = loadConfigForSatRuntime(_config);
 	return submitInstruction({
@@ -1728,7 +2329,22 @@ async function submitSatSettleCyclePage(_config, params) {
 					isWritable: true
 				});
 			}
-			return accounts;
+			const minerCycleAddresses = params.minerCycleAccounts ?? [];
+			const minerCycles = minerCycleAddresses.length > 0 ? await inspectSatMinerCyclesByAddress(_config, { addresses: minerCycleAddresses }) : [];
+			const minerAuthorities = minerCycles.map((entry, index) => {
+				const authority = String(entry?.authority ?? "").trim();
+				if (!authority) {
+					throw new Error(`SAT settleCyclePage could not resolve miner authority for ${minerCycleAddresses[index]}`);
+				}
+				return authority;
+			});
+			if (minerAuthorities.length !== minerCycleAddresses.length) {
+				throw new Error("SAT settleCyclePage miner authority count mismatch");
+			}
+			return {
+				keys: accounts,
+				...minerAuthorities.length > 0 ? { context: { minerAuthorities } } : {}
+			};
 		}
 	});
 }
@@ -1893,7 +2509,22 @@ async function submitSatScoreCyclePage(_config, params) {
 					isWritable: true
 				});
 			}
-			return accounts;
+			const minerCycleAddresses = params.minerCycleAccounts ?? [];
+			const minerCycles = minerCycleAddresses.length > 0 ? await inspectSatMinerCyclesByAddress(_config, { addresses: minerCycleAddresses }) : [];
+			const minerAuthorities = minerCycles.map((entry, index) => {
+				const authority = String(entry?.authority ?? "").trim();
+				if (!authority) {
+					throw new Error(`SAT scoreCyclePage could not resolve miner authority for ${minerCycleAddresses[index]}`);
+				}
+				return authority;
+			});
+			if (minerAuthorities.length !== minerCycleAddresses.length) {
+				throw new Error("SAT scoreCyclePage miner authority count mismatch");
+			}
+			return {
+				keys: accounts,
+				...minerAuthorities.length > 0 ? { context: { minerAuthorities } } : {}
+			};
 		}
 	});
 }
@@ -1921,6 +2552,7 @@ async function submitSatDistributeCyclePage(_config, params) {
 			], programId);
 			const [satSignerMinerCapitalState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_MINER_CAPITAL_STATE_SEED), signer.toBuffer()], programId);
 			const [satRebateVault] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_REBATE_VAULT_SEED)], programId);
+			const [satTreasuryVault] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_TREASURY_VAULT_SEED)], programId);
 			const accounts = [
 				{
 					pubkey: signer,
@@ -1945,7 +2577,7 @@ async function submitSatDistributeCyclePage(_config, params) {
 				{
 					pubkey: satGlobalState,
 					isSigner: false,
-					isWritable: true
+					isWritable: false
 				},
 				{
 					pubkey: satTreasuryState,
@@ -1966,10 +2598,16 @@ async function submitSatDistributeCyclePage(_config, params) {
 					pubkey: satRebateVault,
 					isSigner: false,
 					isWritable: true
+				},
+				{
+					pubkey: satTreasuryVault,
+					isSigner: false,
+					isWritable: true
 				}
 			];
 			const minerCycleAccounts = params.minerCycleAccounts ?? [];
 			const minerCycles = minerCycleAccounts.length > 0 ? await inspectSatMinerCyclesByAddress(_config, { addresses: minerCycleAccounts }).catch(() => []) : [];
+			const minerAuthorities = [];
 			for (const [index, minerCycleAccount] of minerCycleAccounts.entries()) {
 				const satMinerCycleState = new solana.PublicKey(minerCycleAccount);
 				const minerCycle = minerCycles[index] ?? null;
@@ -1977,6 +2615,7 @@ async function submitSatDistributeCyclePage(_config, params) {
 				if (!authorityKey) {
 					throw new Error(`SAT distributeCyclePage could not resolve miner authority for ${minerCycleAccount}`);
 				}
+				minerAuthorities.push(authorityKey.toBase58());
 				const [satMinerCapitalState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_MINER_CAPITAL_STATE_SEED), authorityKey.toBuffer()], programId);
 				accounts.push({
 					pubkey: satMinerCycleState,
@@ -1989,7 +2628,10 @@ async function submitSatDistributeCyclePage(_config, params) {
 					isWritable: true
 				});
 			}
-			return accounts;
+			return {
+				keys: accounts,
+				...minerAuthorities.length > 0 ? { context: { minerAuthorities } } : {}
+			};
 		}
 	});
 }
@@ -2199,27 +2841,6 @@ async function submitSatClaimCycleRewardsBatch(_config, params) {
 		}
 	});
 }
-async function submitSatSetProtocolRecipients(_config, params) {
-	const cfg = loadConfigForSatRuntime(_config);
-	return submitInstruction({
-		cfg,
-		env: process.env,
-		data: buildSetProtocolRecipientsData(params),
-		accountResolver: async (solana, signer) => {
-			const programId = new solana.PublicKey(SAT_PROGRAM_ID());
-			const [satGlobalState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_GLOBAL_STATE_SEED)], programId);
-			return [{
-				pubkey: signer,
-				isSigner: true,
-				isWritable: true
-			}, {
-				pubkey: satGlobalState,
-				isSigner: false,
-				isWritable: true
-			}];
-		}
-	});
-}
 async function submitSatClaimProtocolTreasury(_config, params) {
 	const cfg = loadConfigForSatRuntime(_config);
 	return submitInstruction({
@@ -2355,18 +2976,20 @@ async function submitSatRefillRegistryReserveFromTreasury(_config, params) {
 }
 async function submitSatClaimProtocolDistributorSat(_config, params) {
 	const cfg = loadConfigForSatRuntime(_config);
+	const effectiveEnv = resolveSatEffectiveEnv(cfg, process.env);
+	assertDedicatedBondProgram(effectiveEnv);
 	return submitInstruction({
 		cfg,
-		env: process.env,
+		env: effectiveEnv,
 		data: buildClaimProtocolDistributorSatData(),
 		accountResolver: async (solana, signer) => {
-			const programId = new solana.PublicKey(SAT_PROGRAM_ID());
+			const programId = new solana.PublicKey(resolveSatProgramIdFromEnv(effectiveEnv));
 			const recipientOwner = new solana.PublicKey(params.recipientOwner);
 			const [satGlobalState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_GLOBAL_STATE_SEED)], programId);
 			const [treasury] = solana.PublicKey.findProgramAddressSync([Buffer.from("treasury")], programId);
 			const [satTreasuryState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_TREASURY_STATE_SEED)], programId);
-			const [mintAuthority] = solana.PublicKey.findProgramAddressSync([Buffer.from("authority")], new solana.PublicKey(SAT_MINT_PROGRAM_ID()));
-			const recipientAta = deriveAssociatedTokenAddress(solana, recipientOwner, new solana.PublicKey(SAT_MINT_ADDRESS()));
+			const [mintAuthority] = solana.PublicKey.findProgramAddressSync([Buffer.from("authority")], new solana.PublicKey(resolveSatMintProgramIdFromEnv(effectiveEnv)));
+			const recipientAta = deriveAssociatedTokenAddress(solana, recipientOwner, new solana.PublicKey(resolveSatMintAddressFromEnv(effectiveEnv)));
 			return [
 				{
 					pubkey: signer,
@@ -2399,7 +3022,7 @@ async function submitSatClaimProtocolDistributorSat(_config, params) {
 					isWritable: true
 				},
 				{
-					pubkey: new solana.PublicKey(SAT_MINT_ADDRESS()),
+					pubkey: new solana.PublicKey(resolveSatMintAddressFromEnv(effectiveEnv)),
 					isSigner: false,
 					isWritable: true
 				},
@@ -2424,7 +3047,12 @@ async function submitSatClaimProtocolDistributorSat(_config, params) {
 					isWritable: false
 				},
 				{
-					pubkey: new solana.PublicKey(SAT_MINT_PROGRAM_ID()),
+					pubkey: new solana.PublicKey(resolveSatMintProgramIdFromEnv(effectiveEnv)),
+					isSigner: false,
+					isWritable: false
+				},
+				{
+					pubkey: new solana.PublicKey(resolveSatBondProgramIdFromEnv(effectiveEnv)),
 					isSigner: false,
 					isWritable: false
 				}
@@ -2442,6 +3070,8 @@ async function submitSatRetargetUnlock(_config, params) {
 			const programId = new solana.PublicKey(SAT_PROGRAM_ID());
 			const [satGlobalState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_GLOBAL_STATE_SEED)], programId);
 			const [satCycleState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_CYCLE_STATE_SEED), encodeU64(params.cycleId)], programId);
+			const intervalStartCycleId = Math.max(0, params.cycleId + 1 - SAT_PROTOCOL_CONSTANTS.cycleUnlockRetargetIntervalCycles);
+			const [satUnlockIntervalState] = solana.PublicKey.findProgramAddressSync([Buffer.from(SAT_UNLOCK_INTERVAL_STATE_SEED), encodeU64(intervalStartCycleId)], programId);
 			return [
 				{
 					pubkey: signer,
@@ -2457,6 +3087,11 @@ async function submitSatRetargetUnlock(_config, params) {
 					pubkey: satCycleState,
 					isSigner: false,
 					isWritable: false
+				},
+				{
+					pubkey: satUnlockIntervalState,
+					isSigner: false,
+					isWritable: true
 				}
 			];
 		}
@@ -2677,10 +3312,16 @@ async function submitSatCompactPendingCycleRange(_config, params) {
 					isWritable: false
 				});
 			}
-			return accounts;
+			return {
+				keys: accounts,
+				context: {
+					frontCycleIds: params.frontCycleIds.map(String),
+					backCycleIds: params.backCycleIds.map(String)
+				}
+			};
 		}
 	});
 }
 
 //#endregion
-export { submitSatCancelBondUnlock, submitSatClaimBondStakingRewards, submitSatFinalizeBondUnlock, submitSatIncreaseBondPosition, submitSatInitBondStakingDistributor, submitSatOpenBondPosition, submitSatRequestBondUnlock, submitSatSyncBondStakingPosition, submitSatSyncBondStakingRewards };
+export { runWithSatSubmissionWorkflow, submitSatCancelBondUnlock, submitSatClaimBondStakingRewards, submitSatFinalizeBondUnlock, submitSatIncreaseBondPosition, submitSatOpenBondPosition, submitSatRequestBondUnlock, submitSatSyncBondStakingPosition, submitSatSyncBondStakingRewards };