@toon-protocol/client 0.20.3 → 0.21.1

package/dist/index.d.ts

@@ -177,8 +177,49 @@ interface SolanaChannelClientOptions {
 interface MinaChannelClientOptions {
     /** Mina GraphQL URL used to open the channel + read zkApp state. */
     graphqlUrl: string;
-    /** Deployed payment-channel zkApp address (B62 base58). */
-    zkAppAddress: string;
+    /**
+     * Deployed payment-channel zkApp address (B62 base58). Optional when
+     * `autoDeploy` is set — the open path then resolves (or deploys) a
+     * pair-owned zkApp itself.
+     */
+    zkAppAddress?: string;
+    /**
+     * Per-pair zkApp auto-deploy: the Mina `PaymentChannel` zkApp is
+     * single-pair (its on-chain channelHash bakes the participant pair at
+     * initialization), so a fresh identity can never reuse a shared/announced
+     * zkApp. With `autoDeploy`, opening a Mina channel first checks whether
+     * the recorded/configured zkApp is provably OURS for this pair and deploys
+     * a dedicated one otherwise (compile ≈1-3 min, inclusion ≈3-6 min,
+     * ~1.1 MINA + fees — surfaced through `onProgress`).
+     */
+    autoDeploy?: {
+        /** A previously recorded own deployment for this identity, if any. */
+        deployed?: {
+            zkAppAddress: string;
+            zkAppPrivateKey: string;
+        };
+        /**
+         * Persist hook — called with the zkApp address + key BEFORE the deploy tx
+         * is sent (and before the circuit compiles), so a crash between send and
+         * on-chain confirmation reuses the SAME zkApp next run instead of
+         * deploying (and paying ~1.1 MINA for) a second one.
+         */
+        onDeploying?: (record: {
+            zkAppAddress: string;
+            zkAppPrivateKey: string;
+            feePayer: string;
+        }) => void | Promise<void>;
+        /** Persist hook — called BEFORE the open proceeds on a fresh deploy. */
+        onDeployed?: (record: {
+            zkAppAddress: string;
+            zkAppPrivateKey: string;
+            feePayer: string;
+            deployTxHash?: string;
+            vkHash?: string;
+        }) => void | Promise<void>;
+        /** Progress lines for the slow compile/deploy/inclusion phases. */
+        onProgress?: (line: string) => void;
+    };
     /** Channel settlement timeout in slots for `initializeChannel` (default 86400). */
     challengeDuration?: number;
     /** Mina token id field (decimal string) for `initializeChannel` (default '1'). */
@@ -2571,7 +2612,50 @@ interface SolanaChannelConfig {
 interface MinaChannelConfig {
     graphqlUrl: string;
     privateKey: string;
-    zkAppAddress: string;
+    /**
+     * Deployed payment-channel zkApp address (B62). Optional when `autoDeploy`
+     * is set — the open path then resolves (or deploys) a pair-owned zkApp
+     * itself; see `mina-channel-deploy.ts`.
+     */
+    zkAppAddress?: string;
+    /**
+     * Per-pair zkApp auto-deploy (the Mina `PaymentChannel` zkApp is
+     * single-pair: one deployment serves exactly one client↔connector pair).
+     * When set, `openMinaChannel` first resolves a zkApp that is provably OURS
+     * — the recorded `deployed` one, or `zkAppAddress` when its on-chain
+     * channelHash matches this pair — and deploys a fresh one otherwise
+     * (compile ≈1-3 min; inclusion ≈3-6 min; costs ~1.1 MINA + fees).
+     * Without it, behavior is exactly the pre-autoDeploy contract: the
+     * configured `zkAppAddress` is required and used verbatim.
+     */
+    autoDeploy?: {
+        /** A previously recorded own deployment for this identity, if any. */
+        deployed?: {
+            zkAppAddress: string;
+            zkAppPrivateKey: string;
+        };
+        /**
+         * Persist hook — called with the zkApp address + key BEFORE the deploy tx
+         * is sent (and before the circuit compiles), so a crash between send and
+         * on-chain confirmation reuses the SAME zkApp next run instead of
+         * deploying (and paying ~1.1 MINA for) a second one.
+         */
+        onDeploying?: (record: {
+            zkAppAddress: string;
+            zkAppPrivateKey: string;
+            feePayer: string;
+        }) => void | Promise<void>;
+        /** Persist hook — called BEFORE the open proceeds on a fresh deploy. */
+        onDeployed?: (record: {
+            zkAppAddress: string;
+            zkAppPrivateKey: string;
+            feePayer: string;
+            deployTxHash?: string;
+            vkHash?: string;
+        }) => void | Promise<void>;
+        /** Progress lines (compile/deploy/inclusion phases take minutes). */
+        onProgress?: (line: string) => void;
+    };
     /**
      * Channel settlement timeout in slots for `initializeChannel`. Defaults to
      * `OpenChannelParams.settlementTimeout` or 86400.
@@ -4344,4 +4428,132 @@ declare function loadKeystore(path: string, password: string): string;
  */
 declare function writeKeystoreFile(path: string, keystore: EncryptedKeystore): void;
 
-export { type BackupPayload, type BalanceProofParams, BtpRuntimeClient, type BtpRuntimeClientConfig, type BuildSwapSettlementsParams, CLAIM_TYPEHASH, CONDITION_LENGTH, COOP_CLOSE_TYPEHASH, type ChainMetadata, type ChainSigner, ChannelFundingError, ChannelManager, type ClaimMessage, type ClaimResolver, type ClaimSignature, ConnectorError, type DiscoveredIlpPeer, type EVMClaimMessage, type EncryptedKeystore, type EvmClaimDomainContext, type EvmClaimMessage, type EvmClaimVerifyResult, type EvmCooperativeCloseMessage, EvmSigner, type ExecutionConditionPair, FULFILLMENT_MISMATCH_CODE, FULFILLMENT_MISMATCH_MESSAGE, type FaucetChain, type FundWalletOptions, type FundWalletResult, type H402FetchOptions, Http402Client, type Http402ClientConfig, HttpConnectorAdmin, type HttpConnectorAdminConfig, HttpIlpClient, type HttpIlpClientConfig, type HttpIlpClientFactory, HttpRuntimeClient, type HttpRuntimeClientConfig, ILP_CLAIM_HEADER, ILP_CLAIM_WRAPPED_HEADER, ILP_PEER_ID_HEADER, type IlpSendParams, type IlpSendResultWithFulfillment, type IlpTransportChoice, InMemoryPreimageRetentionStore, InMemoryReceivedClaimStore, type IngestAndRevealParams, type IngestAndRevealResult, type IngestReceivedClaimsParams, type IngestReceivedClaimsResult, JsonFileReceivedClaimStore, KeyManager, type KeyManagerConfig, MINA_CHANNEL_STATE, type MinaChannelStateReader, type MinaClaimMessage, type MinaClaimSubmitArgs, type MinaClaimSubmitter, type MinaCoSignInputs, type MinaCoSignedClaim, type MinaDepositReader, type MinaOnChainChannelState, type MinaSettlementContext, MinaSettlementError, type MinaSettlementErrorCode, type MinaSettlementResult, type MinaSignaturePair, MinaSigner, type MinaSignerOptions, NetworkError, OnChainChannelClient, type OnChainChannelClientConfig, type ParsedFulfillHttp, type ParsedX402Challenge, type PasskeyInfo, type PreimageRetentionStore, type PublishEventResult, ROLLING_SWAP_DOMAIN_NAME, ROLLING_SWAP_DOMAIN_VERSION, type ReceivedClaimEntry, type ReceivedClaimRejection, type ReceivedClaimRejectionCode, type ReceivedClaimStore, type RequestBlobStorageParams, type RequestBlobStorageResult, type RetainedPreimage, type RetryOptions, type RevealDecision, type RevealFn, type RevealResult, type RevealedClaim, type RolledBackClaim, type SelectIlpTransportOptions, type SignedBalanceProof, type SolanaChannelClientOptions, type SolanaClaimMessage, SolanaSigner, type SubmitEvmSettlementParams, type SubmitEvmSettlementResult, type SwapSettlementBuild, type ToonChannelAccept, ToonClient, type ToonClientConfig, ToonClientError, type ToonIdentity, type ToonSigners, type ToonStartResult, ValidationError, type VaultData, type VerifiedReceivedClaim, type WalletBalance, type WalletBalanceSources, type WalletChainBalances, type WalletTokenAmount, applyDefaults, applyNetworkPresets, assertValidCondition, buildBackupEvent, buildBackupFilter, buildMinaCoSignedClaim, buildSettlementInfo, buildStoreWriteEnvelope, buildSwapSettlements, createO1jsMinaClaimSubmitter, decodeEvmSettlementTx, decryptMnemonic, defaultFaucetTimeout, deriveFromNsec, deriveFullIdentity, deriveNostrKeyFromMnemonic, encryptMnemonic, entryToAccumulatedClaim, evmClaimDigest, evmCooperativeCloseDigest, extractArweaveTxId, fulfillmentMatchesCondition, fundWallet, generateKeystore, generateMnemonic, generateRandomIdentity, getNetworkStatus, hasSettlementMetadata, httpEndpointToBtpUrl, importKeystore, ingestAndReveal, ingestReceivedClaims, isInsufficientGasError, isPrfSupported, isZeroCondition, loadKeystore, mintExecutionCondition, parseBackupPayload, parseEvmChainId, parseFulfillHttp, parseFulfillHttpBytes, parseHttpResponse, parseX402Body, parseX402Challenge, proxyIlpEndpoint, readDiscoveredIlpPeer, readEvmNativeBalance, readEvmTokenBalance, readMinaBalance, readMinaChannelState, readMinaDepositTotal, readSolanaNativeBalance, readSolanaTokenBalance, readWalletBalances, recoverEvmClaimSigner, requestBlobStorage, selectIlpTransport, serializeHttpRequest, submitEvmSettlement, submitMinaSettlement, validateConfig, validateMnemonic, verifyEvmClaimSignature, withRetry, writeKeystoreFile };
+/**
+ * Per-pair Mina `PaymentChannel` zkApp deployment — the missing zero-config
+ * piece of the Mina channel-open path.
+ *
+ * The `PaymentChannel` zkApp is SINGLE-PAIR: `initializeChannel` bakes
+ * `channelHash = Poseidon([participantA.x, participantB.x, nonce])` into the
+ * zkApp's on-chain state, and the zkApp address IS the channel id. One
+ * deployment therefore serves exactly one client↔connector pair — a fresh
+ * client cannot reuse the pair-bound zkApp another identity opened (its claim
+ * would fail `mina_claim_verification_failed`: wrong on-chain channelHash).
+ *
+ * {@link ensureOwnedMinaZkApp} makes the open path self-sufficient:
+ *
+ *   1. Check the candidates (a previously recorded own deployment first, then
+ *      the announce/preset-resolved address) for a zkApp that is ALREADY OURS
+ *      — on-chain OPEN with channelHash == Poseidon([client.x, peer.x, 0]),
+ *      or our own recorded deployment still awaiting initialization.
+ *   2. Otherwise deploy a FRESH zkApp (new random zkApp key) from the same
+ *      npm `@toon-protocol/mina-zkapp` + o1js build the claim verifier uses —
+ *      the deployed verification key is the locally compiled one BY
+ *      CONSTRUCTION, so the "vk drift" class of failure cannot occur.
+ *
+ * The connector accepts claims against ANY zkApp it can read on-chain (its
+ * inbound verify resolves the claim's `zkAppAddress` on-chain and registers
+ * unknown channels dynamically), so no connector-side registration step is
+ * needed.
+ *
+ * Deploy and initialize are SEPARATE transactions (connector Issue #128:
+ * `initializeChannel`'s `getAndRequireEquals` precondition fails while the
+ * account does not exist yet) — this module only DEPLOYS; the normal
+ * {@link openMinaChannelOnChain} initialize+deposit flow runs afterwards.
+ *
+ * Reuses the `createRequire`-anchored o1js loader from `mina-channel-open.ts`
+ * (one shared CJS o1js instance — the ESM/CJS split instance bug) and stays
+ * lazy so npm consumers who never touch Mina never load the WASM runtime.
+ *
+ * @module
+ */
+/** Everything worth persisting about an auto-deployed zkApp. */
+interface MinaZkAppDeployRecord {
+    /** The deployed zkApp B62 address (== the channel id). */
+    zkAppAddress: string;
+    /** The zkApp's `EK…` base58 private key (needed to co-sign future txs). */
+    zkAppPrivateKey: string;
+    /** The fee payer (client Mina B62) that funded the deployment. */
+    feePayer: string;
+    /** Deploy tx hash, when the send surfaced one. */
+    deployTxHash?: string;
+    /** Verification-key hash of the compiled contract that was deployed. */
+    vkHash?: string;
+}
+interface DeployMinaZkAppParams {
+    /** Mina GraphQL endpoint to deploy through. */
+    graphqlUrl: string;
+    /** Fee payer private key (hex scalar or `EK…` base58 — same as the opener). */
+    payerPrivateKey: string;
+    /**
+     * Deploy fee in nanomina. Default 100_000_000 (0.1 MINA); the new zkApp
+     * account additionally costs the protocol's 1 MINA account-creation fee,
+     * charged to the payer via `AccountUpdate.fundNewAccount`.
+     */
+    feeNanomina?: bigint;
+    /**
+     * Reuse THIS zkApp key (`EK…` base58) instead of generating a fresh one.
+     * Used to re-attempt a deployment whose key was already recorded (so a
+     * crashed/pending first attempt does not orphan a NEW ~1.1-MINA zkApp on
+     * every retry — the SAME address is redeployed).
+     */
+    zkAppPrivateKey?: string;
+    /**
+     * Called with the zkApp address + key IMMEDIATELY after the key is known and
+     * the fee-payer preflight passes — BEFORE the circuit compiles or the deploy
+     * tx is sent. The rig store persists this so a crash between send and
+     * confirmation reuses the SAME zkApp next run rather than deploying (and
+     * paying for) a second one. Fired only for a freshly-generated key (a
+     * redeploy of a recorded key is already persisted).
+     */
+    onDeploying?: (record: {
+        zkAppAddress: string;
+        zkAppPrivateKey: string;
+        feePayer: string;
+    }) => void | Promise<void>;
+    /** Progress lines (compile/deploy/inclusion phases take minutes). */
+    onProgress?: (line: string) => void;
+    /** Inclusion poll interval ms (default 15_000; tests shrink it). */
+    pollIntervalMs?: number;
+    /** Inclusion poll budget ms (default 540_000 ≈ 9 min). */
+    pollTimeoutMs?: number;
+}
+interface EnsureOwnedMinaZkAppParams extends DeployMinaZkAppParams {
+    /** The connector peer's Mina settlement B62 (participantB of the pair). */
+    peerPublicKey: string;
+    /** A previously recorded own deployment for this identity/pair, if any. */
+    deployed?: {
+        zkAppAddress: string;
+        zkAppPrivateKey: string;
+    };
+    /** The announce/preset-resolved zkApp address (checked after `deployed`). */
+    candidateZkAppAddress?: string;
+    /**
+     * Called with the record IMMEDIATELY after a fresh deployment is confirmed
+     * on-chain — BEFORE this function returns — so the zkApp key is persisted
+     * even if the caller's subsequent initialize fails.
+     */
+    onDeployed?: (record: MinaZkAppDeployRecord) => void | Promise<void>;
+}
+interface EnsureOwnedMinaZkAppResult {
+    /** The zkApp to open the channel on (ours — reused or freshly deployed). */
+    zkAppAddress: string;
+    /** True when this call deployed a fresh zkApp. */
+    deployed: boolean;
+    /** The deploy record (fresh deploys only). */
+    record?: MinaZkAppDeployRecord;
+}
+/**
+ * Deploy a fresh `PaymentChannel` zkApp (BARE — no initialization) and wait
+ * for the account to exist on-chain. Returns the full deploy record; the
+ * caller persists it (losing the zkApp key would strand the ~1.1 MINA the
+ * deployment cost).
+ */
+declare function deployMinaChannelZkApp(params: DeployMinaZkAppParams): Promise<MinaZkAppDeployRecord>;
+/**
+ * Resolve the zkApp this (client, peer) pair should open its channel on:
+ * reuse one that is provably ours, else deploy fresh. See the module doc for
+ * the decision table.
+ */
+declare function ensureOwnedMinaZkApp(params: EnsureOwnedMinaZkAppParams): Promise<EnsureOwnedMinaZkAppResult>;
+
+export { type BackupPayload, type BalanceProofParams, BtpRuntimeClient, type BtpRuntimeClientConfig, type BuildSwapSettlementsParams, CLAIM_TYPEHASH, CONDITION_LENGTH, COOP_CLOSE_TYPEHASH, type ChainMetadata, type ChainSigner, ChannelFundingError, ChannelManager, type ClaimMessage, type ClaimResolver, type ClaimSignature, ConnectorError, type DeployMinaZkAppParams, type DiscoveredIlpPeer, type EVMClaimMessage, type EncryptedKeystore, type EnsureOwnedMinaZkAppParams, type EnsureOwnedMinaZkAppResult, type EvmClaimDomainContext, type EvmClaimMessage, type EvmClaimVerifyResult, type EvmCooperativeCloseMessage, EvmSigner, type ExecutionConditionPair, FULFILLMENT_MISMATCH_CODE, FULFILLMENT_MISMATCH_MESSAGE, type FaucetChain, type FundWalletOptions, type FundWalletResult, type H402FetchOptions, Http402Client, type Http402ClientConfig, HttpConnectorAdmin, type HttpConnectorAdminConfig, HttpIlpClient, type HttpIlpClientConfig, type HttpIlpClientFactory, HttpRuntimeClient, type HttpRuntimeClientConfig, ILP_CLAIM_HEADER, ILP_CLAIM_WRAPPED_HEADER, ILP_PEER_ID_HEADER, type IlpSendParams, type IlpSendResultWithFulfillment, type IlpTransportChoice, InMemoryPreimageRetentionStore, InMemoryReceivedClaimStore, type IngestAndRevealParams, type IngestAndRevealResult, type IngestReceivedClaimsParams, type IngestReceivedClaimsResult, JsonFileReceivedClaimStore, KeyManager, type KeyManagerConfig, MINA_CHANNEL_STATE, type MinaChannelStateReader, type MinaClaimMessage, type MinaClaimSubmitArgs, type MinaClaimSubmitter, type MinaCoSignInputs, type MinaCoSignedClaim, type MinaDepositReader, type MinaOnChainChannelState, type MinaSettlementContext, MinaSettlementError, type MinaSettlementErrorCode, type MinaSettlementResult, type MinaSignaturePair, MinaSigner, type MinaSignerOptions, type MinaZkAppDeployRecord, NetworkError, OnChainChannelClient, type OnChainChannelClientConfig, type ParsedFulfillHttp, type ParsedX402Challenge, type PasskeyInfo, type PreimageRetentionStore, type PublishEventResult, ROLLING_SWAP_DOMAIN_NAME, ROLLING_SWAP_DOMAIN_VERSION, type ReceivedClaimEntry, type ReceivedClaimRejection, type ReceivedClaimRejectionCode, type ReceivedClaimStore, type RequestBlobStorageParams, type RequestBlobStorageResult, type RetainedPreimage, type RetryOptions, type RevealDecision, type RevealFn, type RevealResult, type RevealedClaim, type RolledBackClaim, type SelectIlpTransportOptions, type SignedBalanceProof, type SolanaChannelClientOptions, type SolanaClaimMessage, SolanaSigner, type SubmitEvmSettlementParams, type SubmitEvmSettlementResult, type SwapSettlementBuild, type ToonChannelAccept, ToonClient, type ToonClientConfig, ToonClientError, type ToonIdentity, type ToonSigners, type ToonStartResult, ValidationError, type VaultData, type VerifiedReceivedClaim, type WalletBalance, type WalletBalanceSources, type WalletChainBalances, type WalletTokenAmount, applyDefaults, applyNetworkPresets, assertValidCondition, buildBackupEvent, buildBackupFilter, buildMinaCoSignedClaim, buildSettlementInfo, buildStoreWriteEnvelope, buildSwapSettlements, createO1jsMinaClaimSubmitter, decodeEvmSettlementTx, decryptMnemonic, defaultFaucetTimeout, deployMinaChannelZkApp, deriveFromNsec, deriveFullIdentity, deriveNostrKeyFromMnemonic, encryptMnemonic, ensureOwnedMinaZkApp, entryToAccumulatedClaim, evmClaimDigest, evmCooperativeCloseDigest, extractArweaveTxId, fulfillmentMatchesCondition, fundWallet, generateKeystore, generateMnemonic, generateRandomIdentity, getNetworkStatus, hasSettlementMetadata, httpEndpointToBtpUrl, importKeystore, ingestAndReveal, ingestReceivedClaims, isInsufficientGasError, isPrfSupported, isZeroCondition, loadKeystore, mintExecutionCondition, parseBackupPayload, parseEvmChainId, parseFulfillHttp, parseFulfillHttpBytes, parseHttpResponse, parseX402Body, parseX402Challenge, proxyIlpEndpoint, readDiscoveredIlpPeer, readEvmNativeBalance, readEvmTokenBalance, readMinaBalance, readMinaChannelState, readMinaDepositTotal, readSolanaNativeBalance, readSolanaTokenBalance, readWalletBalances, recoverEvmClaimSigner, requestBlobStorage, selectIlpTransport, serializeHttpRequest, submitEvmSettlement, submitMinaSettlement, validateConfig, validateMnemonic, verifyEvmClaimSignature, withRetry, writeKeystoreFile };

package/dist/index.js

@@ -25,6 +25,11 @@ import {
   selectLatestAddressable,
   verifyRendererTrust
 } from "./chunk-QEMD5EAI.js";
+import {
+  deployMinaChannelZkApp,
+  ensureOwnedMinaZkApp,
+  openMinaChannelOnChain
+} from "./chunk-7TDAU43L.js";
 
 // src/ToonClient.ts
 import { generateSecretKey as generateSecretKey3, getPublicKey as getPublicKey2, finalizeEvent } from "nostr-tools/pure";
@@ -2186,181 +2191,6 @@ async function depositSolanaChannel(params) {
   return { depositTxSignature };
 }
 
-// src/channel/mina-channel-open.ts
-import { hexToMinaBase58PrivateKey as hexToMinaBase58PrivateKey2 } from "@toon-protocol/core";
-var cachedO1js = null;
-var cachedPaymentChannel = null;
-var compiledContract = null;
-var runtimeOverride = null;
-async function loadMinaRuntime() {
-  if (cachedO1js && cachedPaymentChannel) {
-    return { o1js: cachedO1js, PaymentChannel: cachedPaymentChannel };
-  }
-  if (runtimeOverride) {
-    const injected = await runtimeOverride();
-    cachedO1js = injected.o1js;
-    cachedPaymentChannel = injected.PaymentChannel;
-    return injected;
-  }
-  const { createRequire } = await import("module");
-  const nodePath = await import("path");
-  const requireHere = createRequire(import.meta.url);
-  const mzkPkgPath = requireHere.resolve(
-    "@toon-protocol/mina-zkapp/package.json"
-  );
-  const requireFromMzk = createRequire(mzkPkgPath);
-  const o1js = requireFromMzk("o1js");
-  const mzkPkgJson = requireFromMzk(mzkPkgPath);
-  const mzkDir = nodePath.dirname(mzkPkgPath);
-  const mzkEntry = nodePath.join(mzkDir, mzkPkgJson.main ?? "dist/index.js");
-  const mzk = requireFromMzk(mzkEntry);
-  const PaymentChannel = mzk.PaymentChannel ?? mzk.default?.PaymentChannel;
-  if (!PaymentChannel) {
-    throw new Error(
-      "@toon-protocol/mina-zkapp does not export PaymentChannel \u2014 cannot open a Mina channel"
-    );
-  }
-  cachedO1js = o1js;
-  cachedPaymentChannel = PaymentChannel;
-  return { o1js, PaymentChannel };
-}
-async function getO1js() {
-  return (await loadMinaRuntime()).o1js;
-}
-async function getCompiledPaymentChannel() {
-  const { PaymentChannel } = await loadMinaRuntime();
-  if (!compiledContract) {
-    await PaymentChannel.compile();
-    compiledContract = PaymentChannel;
-  }
-  return compiledContract;
-}
-var MINA_CHANNEL_STATE_OPEN = 1n;
-var MINA_CHANNEL_STATE_UNINITIALIZED = 0n;
-async function openMinaChannelOnChain(params) {
-  const { Mina, PrivateKey, PublicKey, Field, AccountUpdate, fetchAccount } = await getO1js();
-  const network = Mina.Network(params.graphqlUrl);
-  Mina.setActiveInstance(network);
-  const txFee = params.feeNanomina ?? 100000000n;
-  const payerKeyBase58 = hexToMinaBase58PrivateKey2(params.payerPrivateKey);
-  const payerPrivateKey = PrivateKey.fromBase58(payerKeyBase58);
-  const payerPublicKey = payerPrivateKey.toPublicKey();
-  const zkAppPublicKey = PublicKey.fromBase58(params.zkAppAddress);
-  const readChannelState = async () => {
-    const res = await fetchAccount({ publicKey: zkAppPublicKey });
-    if (res.error || !res.account) {
-      throw new Error(
-        `Mina zkApp account ${params.zkAppAddress} not found on-chain (${String(
-          res.error
-        )}) \u2014 deploy the PaymentChannel zkApp before opening a channel`
-      );
-    }
-    const appState = res.account.zkapp?.appState;
-    const raw = appState?.[3]?.toString() ?? "0";
-    return BigInt(raw);
-  };
-  const readDepositTotal = async () => {
-    const res = await fetchAccount({ publicKey: zkAppPublicKey });
-    if (res.error || !res.account) {
-      throw new Error(
-        `Mina zkApp account ${params.zkAppAddress} not found on-chain (${String(
-          res.error
-        )}) \u2014 deploy the PaymentChannel zkApp before opening a channel`
-      );
-    }
-    const appState = res.account.zkapp?.appState;
-    const raw = appState?.[4]?.toString() ?? "0";
-    return BigInt(raw);
-  };
-  const currentState = await readChannelState();
-  await fetchAccount({ publicKey: payerPublicKey });
-  let opened = false;
-  let initTxHash;
-  let zkApp;
-  const getZkApp = async () => {
-    if (!zkApp) {
-      const PaymentChannel = await getCompiledPaymentChannel();
-      zkApp = new PaymentChannel(zkAppPublicKey);
-    }
-    return zkApp;
-  };
-  if (currentState === MINA_CHANNEL_STATE_UNINITIALIZED) {
-    const channel = await getZkApp();
-    const participantA = payerPublicKey;
-    const participantB = params.peerPublicKey ? PublicKey.fromBase58(params.peerPublicKey) : payerPublicKey;
-    const nonce = Field(0);
-    const timeoutField = Field((params.timeout ?? 86400n).toString());
-    const tokenIdField = Field(params.tokenId ?? "1");
-    await fetchAccount({ publicKey: zkAppPublicKey });
-    await fetchAccount({ publicKey: payerPublicKey });
-    const initTx = await Mina.transaction(
-      { sender: payerPublicKey, fee: Number(txFee) },
-      async () => {
-        await channel.initializeChannel(
-          participantA,
-          participantB,
-          nonce,
-          timeoutField,
-          tokenIdField
-        );
-      }
-    );
-    await initTx.prove();
-    const sentInit = await initTx.sign([payerPrivateKey]).send();
-    initTxHash = sentInit.hash ?? void 0;
-    opened = true;
-    await sentInit.wait();
-    await fetchAccount({ publicKey: zkAppPublicKey });
-    await fetchAccount({ publicKey: payerPublicKey });
-  } else if (currentState !== MINA_CHANNEL_STATE_OPEN) {
-    throw new Error(
-      `Mina channel ${params.zkAppAddress} is in state ${currentState} (not UNINITIALIZED/OPEN) \u2014 cannot open`
-    );
-  }
-  let depositTxHash;
-  if (params.deposit && params.deposit.amount > 0n) {
-    const channel = await getZkApp();
-    await fetchAccount({ publicKey: zkAppPublicKey });
-    const amountField = Field(params.deposit.amount.toString());
-    const depositTx = await Mina.transaction(
-      { sender: payerPublicKey, fee: Number(txFee) },
-      async () => {
-        await channel.deposit(amountField, payerPublicKey);
-      }
-    );
-    await depositTx.prove();
-    const sentDeposit = await depositTx.sign([payerPrivateKey]).send();
-    depositTxHash = sentDeposit.hash ?? void 0;
-    await sentDeposit.wait();
-    await fetchAccount({ publicKey: zkAppPublicKey });
-    await fetchAccount({ publicKey: payerPublicKey });
-  }
-  let finalState;
-  try {
-    finalState = Number(await readChannelState());
-  } catch {
-    finalState = opened ? Number(MINA_CHANNEL_STATE_OPEN) : Number(currentState);
-  }
-  if (opened && finalState === Number(MINA_CHANNEL_STATE_UNINITIALIZED)) {
-    finalState = Number(MINA_CHANNEL_STATE_OPEN);
-  }
-  void AccountUpdate;
-  let depositTotal;
-  try {
-    depositTotal = await readDepositTotal();
-  } catch {
-    depositTotal = 0n;
-  }
-  return {
-    zkAppAddress: params.zkAppAddress,
-    opened,
-    initTxHash,
-    depositTxHash,
-    channelState: finalState,
-    depositTotal
-  };
-}
-
 // src/channel/OnChainChannelClient.ts
 var TOKEN_NETWORK_ABI = [
   {
@@ -2585,7 +2415,9 @@ var OnChainChannelClient = class {
       return this.depositSolana(channelId, amount, opts.currentDeposit);
     }
     if (chainPrefix === "mina") {
-      throw new Error("Deposit on mina is not yet supported (EVM + Solana today; Mina follow-up).");
+      throw new Error(
+        "Deposit on mina is not yet supported (EVM + Solana today; Mina follow-up)."
+      );
     }
     return this.depositEvm(channelId, amount, opts.currentDeposit, ctx);
   }
@@ -2601,7 +2433,9 @@ var OnChainChannelClient = class {
     }
     const cfg = this.solanaConfig;
     const payerSeed = cfg.keypair.slice(0, 32);
-    const payerPubkey = base58Encode2(new Uint8Array(ed255192.getPublicKey(payerSeed)));
+    const payerPubkey = base58Encode2(
+      new Uint8Array(ed255192.getPublicKey(payerSeed))
+    );
     let payerTokenAccount = cfg.deposit?.payerTokenAccount;
     if (!payerTokenAccount) {
       if (!cfg.tokenMint) {
@@ -2609,7 +2443,10 @@ var OnChainChannelClient = class {
           "Solana deposit requires solanaConfig.deposit.payerTokenAccount or solanaConfig.tokenMint to derive the payer ATA."
         );
       }
-      payerTokenAccount = deriveAssociatedTokenAccount(payerPubkey, cfg.tokenMint);
+      payerTokenAccount = deriveAssociatedTokenAccount(
+        payerPubkey,
+        cfg.tokenMint
+      );
     }
     const { depositTxSignature } = await depositSolanaChannel({
       rpcUrl: cfg.rpcUrl,
@@ -2620,7 +2457,10 @@ var OnChainChannelClient = class {
       payerTokenAccount,
       amount
     });
-    return { txHash: depositTxSignature, depositTotal: currentDeposit + amount };
+    return {
+      txHash: depositTxSignature,
+      depositTotal: currentDeposit + amount
+    };
   }
   /**
    * EVM deposit: approve the token-network for the delta if the allowance is
@@ -2689,7 +2529,11 @@ var OnChainChannelClient = class {
       args: [channelId]
     });
     await publicClient.waitForTransactionReceipt({ hash: closeHash });
-    const info = await this.readEvmChannel(publicClient, tokenNetworkAddr, channelId);
+    const info = await this.readEvmChannel(
+      publicClient,
+      tokenNetworkAddr,
+      channelId
+    );
     return {
       txHash: closeHash,
       closedAt: info.closedAt,
@@ -2733,13 +2577,20 @@ var OnChainChannelClient = class {
    */
   async getChannelCloseInfo(channelId) {
     const ctx = this.channelContext.get(channelId);
-    if (!ctx) throw new Error(`No on-chain context for channel "${channelId}".`);
+    if (!ctx)
+      throw new Error(`No on-chain context for channel "${channelId}".`);
     const chainPrefix = ctx.chain.split(":")[0];
     if (chainPrefix === "solana" || chainPrefix === "mina") {
-      throw new Error(`getChannelCloseInfo on ${chainPrefix} is not supported.`);
+      throw new Error(
+        `getChannelCloseInfo on ${chainPrefix} is not supported.`
+      );
     }
     const { publicClient } = this.createClients(ctx.chain);
-    const info = await this.readEvmChannel(publicClient, ctx.tokenNetworkAddress, channelId);
+    const info = await this.readEvmChannel(
+      publicClient,
+      ctx.tokenNetworkAddress,
+      channelId
+    );
     return {
       status: STATE_MAP2[info.state] ?? "open",
       closedAt: info.closedAt,
@@ -2755,7 +2606,11 @@ var OnChainChannelClient = class {
       functionName: "channels",
       args: [channelId]
     });
-    return { settlementTimeout: res[0], state: Number(res[1]), closedAt: res[2] };
+    return {
+      settlementTimeout: res[0],
+      state: Number(res[1]),
+      closedAt: res[2]
+    };
   }
   /**
    * Read a participant's on-chain channel state — `deposit` (locked collateral),
@@ -2870,15 +2725,29 @@ var OnChainChannelClient = class {
         "Mina channel config not provided \u2014 cannot open Mina channel"
       );
     }
-    const zkAppAddress = this.minaConfig.zkAppAddress;
-    if (!zkAppAddress) {
+    if (!params.peerAddress) {
       throw new Error(
-        "Mina channel requires a deployed zkAppAddress (minaConfig.zkAppAddress)"
+        "Mina channel requires peerAddress (apex Mina settlement B62) so the on-chain channel is opened two-party \u2014 the participant-form claim cannot settle against a single-party channel"
       );
     }
-    if (!params.peerAddress) {
+    let zkAppAddress = this.minaConfig.zkAppAddress;
+    if (this.minaConfig.autoDeploy) {
+      const { ensureOwnedMinaZkApp: ensureOwnedMinaZkApp2 } = await import("./mina-channel-deploy-5GPMFBGR.js");
+      const ensured = await ensureOwnedMinaZkApp2({
+        graphqlUrl: this.minaConfig.graphqlUrl,
+        payerPrivateKey: this.minaConfig.privateKey,
+        peerPublicKey: params.peerAddress,
+        ...this.minaConfig.autoDeploy.deployed ? { deployed: this.minaConfig.autoDeploy.deployed } : {},
+        ...zkAppAddress ? { candidateZkAppAddress: zkAppAddress } : {},
+        ...this.minaConfig.autoDeploy.onDeploying ? { onDeploying: this.minaConfig.autoDeploy.onDeploying } : {},
+        ...this.minaConfig.autoDeploy.onDeployed ? { onDeployed: this.minaConfig.autoDeploy.onDeployed } : {},
+        ...this.minaConfig.autoDeploy.onProgress ? { onProgress: this.minaConfig.autoDeploy.onProgress } : {}
+      });
+      zkAppAddress = ensured.zkAppAddress;
+    }
+    if (!zkAppAddress) {
       throw new Error(
-        "Mina channel requires peerAddress (apex Mina settlement B62) so the on-chain channel is opened two-party \u2014 the participant-form claim cannot settle against a single-party channel"
+        "Mina channel requires a deployed zkAppAddress (minaConfig.zkAppAddress)"
       );
     }
     const timeout = BigInt(
@@ -3327,7 +3196,7 @@ var SolanaSigner = class {
 };
 
 // src/signing/mina-signer.ts
-import { hexToMinaBase58PrivateKey as hexToMinaBase58PrivateKey3 } from "@toon-protocol/core";
+import { hexToMinaBase58PrivateKey as hexToMinaBase58PrivateKey2 } from "@toon-protocol/core";
 import { sha256 as sha2563 } from "@noble/hashes/sha2.js";
 import { bytesToHex } from "@noble/hashes/utils.js";
 
@@ -3574,7 +3443,7 @@ var MinaSigner = class {
         "MinaSigner requires a zkAppAddress (channel id) to sign a balance proof"
       );
     }
-    const minaPrivateKey = hexToMinaBase58PrivateKey3(this.privateKey);
+    const minaPrivateKey = hexToMinaBase58PrivateKey2(this.privateKey);
     const tokenId = params.metadata.tokenId ?? DEFAULT_MINA_TOKEN_ID;
     const salt = deriveMinaSalt(zkAppAddress, params.nonce);
     const clientPubKey = this.publicKeyBase58 ?? await this.deriveOwnPublicKey(minaPrivateKey);
@@ -4861,7 +4730,7 @@ async function submitEvmSettlement(bundle, params) {
 }
 
 // src/swap/mina-settlement.ts
-import { hexToMinaBase58PrivateKey as hexToMinaBase58PrivateKey4 } from "@toon-protocol/core";
+import { hexToMinaBase58PrivateKey as hexToMinaBase58PrivateKey3 } from "@toon-protocol/core";
 var MinaSettlementError = class extends Error {
   code;
   constructor(code, message) {
@@ -4930,7 +4799,7 @@ async function buildMinaCoSignedClaim(inputs) {
     balanceB,
     salt
   ).toString();
-  const recipientPrivateKeyBase58 = hexToMinaBase58PrivateKey4(
+  const recipientPrivateKeyBase58 = hexToMinaBase58PrivateKey3(
     inputs.recipientPrivateKey
   );
   const built = await buildMinaPaymentChannelProof({
@@ -5057,7 +4926,7 @@ function createO1jsMinaClaimSubmitter() {
         const PaymentChannel = zkAppMod.PaymentChannel;
         Mina.setActiveInstance(Mina.Network(args.graphqlUrl));
         const feePayerKey = PrivateKey.fromBase58(
-          hexToMinaBase58PrivateKey4(args.feePayerPrivateKey)
+          hexToMinaBase58PrivateKey3(args.feePayerPrivateKey)
         );
         const feePayerPub = feePayerKey.toPublicKey();
         await PaymentChannel.compile();
@@ -5350,7 +5219,8 @@ var ToonClient = class {
         if (this.config.minaChannel && this.minaPrivateKey) {
           initialization.onChainChannelClient.setMinaConfig({
             graphqlUrl: this.config.minaChannel.graphqlUrl,
-            zkAppAddress: this.config.minaChannel.zkAppAddress,
+            ...this.config.minaChannel.zkAppAddress !== void 0 ? { zkAppAddress: this.config.minaChannel.zkAppAddress } : {},
+            ...this.config.minaChannel.autoDeploy !== void 0 ? { autoDeploy: this.config.minaChannel.autoDeploy } : {},
             privateKey: this.minaPrivateKey,
             ...this.config.minaChannel.challengeDuration !== void 0 ? { challengeDuration: this.config.minaChannel.challengeDuration } : {},
             ...this.config.minaChannel.tokenId !== void 0 ? { tokenId: this.config.minaChannel.tokenId } : {},
@@ -8093,11 +7963,13 @@ export {
   decodeEvmSettlementTx,
   decryptMnemonic2 as decryptMnemonic,
   defaultFaucetTimeout,
+  deployMinaChannelZkApp,
   deriveFromNsec,
   deriveFullIdentity,
   deriveNostrKeyFromMnemonic,
   deterministicGenerator,
   encryptMnemonic2 as encryptMnemonic,
+  ensureOwnedMinaZkApp,
   entryToAccumulatedClaim,
   evmClaimDigest,
   evmCooperativeCloseDigest,