@toon-protocol/client 0.20.2 → 0.21.0

package/dist/index.js

@@ -25,6 +25,11 @@ import {
   selectLatestAddressable,
   verifyRendererTrust
 } from "./chunk-QEMD5EAI.js";
+import {
+  deployMinaChannelZkApp,
+  ensureOwnedMinaZkApp,
+  openMinaChannelOnChain
+} from "./chunk-OM3MHJHC.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 = [
   {
@@ -2870,15 +2700,28 @@ 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-CO2LMPPB.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.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 +3170,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 +3417,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);
@@ -4059,6 +3902,7 @@ var JsonFileChannelStore = class {
 
 // src/balance/WalletBalanceReader.ts
 import { createPublicClient as createPublicClient2, http as http2, defineChain as defineChain2 } from "viem";
+import { sha256 as sha2564 } from "@noble/hashes/sha2.js";
 var ERC20_READ_ABI = [
   { name: "balanceOf", type: "function", stateMutability: "view", inputs: [{ name: "account", type: "address" }], outputs: [{ type: "uint256" }] },
   { name: "decimals", type: "function", stateMutability: "view", inputs: [], outputs: [{ type: "uint8" }] },
@@ -4173,6 +4017,62 @@ async function readMinaBalance(opts) {
     assetScale: 9
   };
 }
+var BASE58_ALPHABET2 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+function base58encode(bytes) {
+  let num = 0n;
+  for (const b of bytes) num = num * 256n + BigInt(b);
+  let out = "";
+  while (num > 0n) {
+    out = BASE58_ALPHABET2[Number(num % 58n)] + out;
+    num /= 58n;
+  }
+  for (const b of bytes) {
+    if (b === 0) out = "1" + out;
+    else break;
+  }
+  return out;
+}
+function minaTokenIdToBase58(tokenId) {
+  if (!/^\d+$/.test(tokenId)) {
+    throw new Error(`Mina tokenId must be a decimal Field string: "${tokenId}"`);
+  }
+  let field = BigInt(tokenId);
+  const le = new Uint8Array(32);
+  for (let i = 0; i < 32; i++) {
+    le[i] = Number(field & 0xffn);
+    field >>= 8n;
+  }
+  const body = new Uint8Array(1 + 32);
+  body[0] = 28;
+  body.set(le, 1);
+  const checksum = sha2564(sha2564(body)).slice(0, 4);
+  const raw = new Uint8Array(body.length + 4);
+  raw.set(body, 0);
+  raw.set(checksum, body.length);
+  return base58encode(raw);
+}
+async function readMinaTokenBalance(opts) {
+  const fetchImpl = opts.fetchImpl ?? fetch;
+  const token = minaTokenIdToBase58(opts.tokenId);
+  const query = "query($pk:PublicKey!,$t:TokenId){account(publicKey:$pk,token:$t){balance{total}}}";
+  const res = await fetchImpl(opts.graphqlUrl, {
+    method: "POST",
+    headers: { "content-type": "application/json" },
+    body: JSON.stringify({ query, variables: { pk: opts.owner, t: token } })
+  });
+  if (!res.ok) throw new Error(`Mina GraphQL request failed: HTTP ${res.status}`);
+  const json = await res.json();
+  if (json.errors && json.errors.length > 0) {
+    throw new Error(`Mina GraphQL error: ${json.errors[0]?.message ?? "unknown"}`);
+  }
+  return {
+    chain: "mina",
+    address: opts.owner,
+    amount: String(json.data?.account?.balance?.total ?? "0"),
+    asset: "USDC",
+    assetScale: 9
+  };
+}
 var errText = (e) => e instanceof Error ? e.message : String(e);
 function foldNative(out, settled, errors) {
   if (settled.status === "fulfilled") out.native = settled.value;
@@ -4237,24 +4137,28 @@ async function readWalletBalances(sources) {
     );
   }
   if (sources.mina) {
-    const { chainKey = "mina", graphqlUrl, owner } = sources.mina;
+    const { chainKey = "mina", graphqlUrl, owner, tokenId } = sources.mina;
     tasks.push(
       (async () => {
         const out = { chain: "mina", chainKey, address: owner, tokens: [] };
         const errors = [];
-        const nativeR = await Promise.allSettled([readMinaBalance({ graphqlUrl, owner, fetchImpl })]);
+        const [nativeR, tokenR] = await Promise.allSettled([
+          readMinaBalance({ graphqlUrl, owner, fetchImpl }),
+          tokenId ? readMinaTokenBalance({ graphqlUrl, owner, tokenId, fetchImpl }) : Promise.resolve(void 0)
+        ]);
         foldNative(
           out,
-          nativeR[0].status === "fulfilled" ? {
+          nativeR.status === "fulfilled" ? {
             status: "fulfilled",
             value: {
-              symbol: nativeR[0].value.asset,
-              amount: nativeR[0].value.amount,
-              decimals: nativeR[0].value.assetScale
+              symbol: nativeR.value.asset,
+              amount: nativeR.value.amount,
+              decimals: nativeR.value.assetScale
             }
-          } : nativeR[0],
+          } : nativeR,
           errors
         );
+        foldToken(out, tokenR, void 0, errors);
         finalizeChain(out, errors);
         return out;
       })()
@@ -4800,7 +4704,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) {
@@ -4869,7 +4773,7 @@ async function buildMinaCoSignedClaim(inputs) {
     balanceB,
     salt
   ).toString();
-  const recipientPrivateKeyBase58 = hexToMinaBase58PrivateKey4(
+  const recipientPrivateKeyBase58 = hexToMinaBase58PrivateKey3(
     inputs.recipientPrivateKey
   );
   const built = await buildMinaPaymentChannelProof({
@@ -4996,7 +4900,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();
@@ -5289,7 +5193,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 } : {},
@@ -5938,7 +5843,12 @@ var ToonClient = class {
     if (mina?.graphqlUrl) {
       const minaAddress = this.getMinaAddress() ?? (await ensureDerived())?.mina.publicKey;
       if (minaAddress) {
-        sources.mina = { chainKey: "mina", graphqlUrl: mina.graphqlUrl, owner: minaAddress };
+        sources.mina = {
+          chainKey: "mina",
+          graphqlUrl: mina.graphqlUrl,
+          owner: minaAddress,
+          ...mina.tokenId ? { tokenId: mina.tokenId } : {}
+        };
       }
     }
     return readWalletBalances(sources);
@@ -8027,11 +7937,13 @@ export {
   decodeEvmSettlementTx,
   decryptMnemonic2 as decryptMnemonic,
   defaultFaucetTimeout,
+  deployMinaChannelZkApp,
   deriveFromNsec,
   deriveFullIdentity,
   deriveNostrKeyFromMnemonic,
   deterministicGenerator,
   encryptMnemonic2 as encryptMnemonic,
+  ensureOwnedMinaZkApp,
   entryToAccumulatedClaim,
   evmClaimDigest,
   evmCooperativeCloseDigest,