@toon-protocol/client-mcp 0.20.4 → 0.20.5

package/dist/{chunk-IYPIOSEF.js → chunk-7ZUHCA5C.js}

@@ -3511,7 +3511,7 @@ function buildIlpPrepare(params) {
   };
 }
 
-// ../client/dist/chunk-OM3MHJHC.js
+// ../client/dist/chunk-7TDAU43L.js
 var cachedO1js = null;
 var cachedPaymentChannel = null;
 var compiledContract = null;
@@ -3564,6 +3564,72 @@ async function getCompiledPaymentChannel() {
 function getCompiledVerificationKeyHash() {
   return compiledVerificationKeyHash;
 }
+function abandonLeakedMinaTransaction(o1js) {
+  const ctx = o1js.Mina.currentTransaction;
+  const c = ctx;
+  if (!c || typeof c.has !== "function" || typeof c.leave !== "function")
+    return;
+  for (let i = 0; i < 64 && c.has(); i += 1) {
+    try {
+      const id = typeof c.id === "function" ? c.id() : void 0;
+      c.leave(id);
+    } catch {
+      break;
+    }
+  }
+}
+async function buildMinaTransaction(o1js, feePayer, f) {
+  try {
+    return await o1js.Mina.transaction(feePayer, f);
+  } catch (err) {
+    abandonLeakedMinaTransaction(o1js);
+    throw err;
+  }
+}
+var MINA_ACCOUNT_CREATION_FEE_NANOMINA = 1000000000n;
+var MinaFeePayerUnfundedError = class extends Error {
+  constructor(address, requiredNanomina, haveNanomina, graphqlUrl) {
+    const mina = (n) => `${(Number(n) / 1e9).toFixed(3)} MINA`;
+    const state = haveNanomina === void 0 ? `does not exist on-chain (0 MINA)` : `holds only ${mina(haveNanomina)}`;
+    super(
+      `Mina fee-payer wallet ${address} ${state} but needs ~${mina(
+        requiredNanomina
+      )} to open a payment channel (\u22481 MINA account-creation fee + tx fees) on ${graphqlUrl}. Fund ${address} and retry \u2014 no circuit was compiled (this check runs before the ~1-3 min compile).`
+    );
+    this.address = address;
+    this.requiredNanomina = requiredNanomina;
+    this.haveNanomina = haveNanomina;
+    this.graphqlUrl = graphqlUrl;
+    this.name = "MinaFeePayerUnfundedError";
+  }
+  address;
+  requiredNanomina;
+  haveNanomina;
+  graphqlUrl;
+};
+async function assertMinaFeePayerFunded(params) {
+  const { o1js, payerPublicKey, requiredNanomina, graphqlUrl } = params;
+  const address = payerPublicKey.toBase58();
+  const res = await o1js.fetchAccount({ publicKey: payerPublicKey });
+  if (res.error || !res.account) {
+    throw new MinaFeePayerUnfundedError(
+      address,
+      requiredNanomina,
+      void 0,
+      graphqlUrl
+    );
+  }
+  const raw = res.account.balance?.toString();
+  const have = raw !== void 0 ? BigInt(raw) : 0n;
+  if (have < requiredNanomina) {
+    throw new MinaFeePayerUnfundedError(
+      address,
+      requiredNanomina,
+      have,
+      graphqlUrl
+    );
+  }
+}
 var MINA_CHANNEL_STATE_OPEN = 1n;
 var MINA_CHANNEL_STATE_UNINITIALIZED = 0n;
 async function openMinaChannelOnChain(params) {
@@ -3622,7 +3688,8 @@ async function openMinaChannelOnChain(params) {
     const tokenIdField = Field2(params.tokenId ?? "1");
     await fetchAccount({ publicKey: zkAppPublicKey });
     await fetchAccount({ publicKey: payerPublicKey });
-    const initTx = await Mina.transaction(
+    const initTx = await buildMinaTransaction(
+      await getO1js(),
       { sender: payerPublicKey, fee: Number(txFee) },
       async () => {
         await channel.initializeChannel(
@@ -3651,7 +3718,8 @@ async function openMinaChannelOnChain(params) {
     const channel = await getZkApp();
     await fetchAccount({ publicKey: zkAppPublicKey });
     const amountField = Field2(params.deposit.amount.toString());
-    const depositTx = await Mina.transaction(
+    const depositTx = await buildMinaTransaction(
+      await getO1js(),
       { sender: payerPublicKey, fee: Number(txFee) },
       async () => {
         await channel.deposit(amountField, payerPublicKey);
@@ -3693,31 +3761,48 @@ var APPSTATE_CHANNEL_HASH = 0;
 var APPSTATE_CHANNEL_STATE = 3;
 var STATE_UNINITIALIZED = 0n;
 var STATE_OPEN = 1n;
+function requiredDeployBalanceNanomina(feeNanomina) {
+  return MINA_ACCOUNT_CREATION_FEE_NANOMINA + feeNanomina * 2n;
+}
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 async function deployMinaChannelZkApp(params) {
   const { o1js } = await loadMinaRuntime();
   const { Mina, PrivateKey, AccountUpdate, fetchAccount } = o1js;
-  const progress = params.onProgress ?? (() => {
-  });
+  const progress = params.onProgress ?? (() => void 0);
   const network = Mina.Network(params.graphqlUrl);
   Mina.setActiveInstance(network);
   const payerKeyBase58 = hexToMinaBase58PrivateKey(params.payerPrivateKey);
   const payerPrivateKey = PrivateKey.fromBase58(payerKeyBase58);
   const payerPublicKey = payerPrivateKey.toPublicKey();
+  const feeNanomina = params.feeNanomina ?? 100000000n;
+  await assertMinaFeePayerFunded({
+    o1js,
+    payerPublicKey,
+    requiredNanomina: requiredDeployBalanceNanomina(feeNanomina),
+    graphqlUrl: params.graphqlUrl
+  });
+  const zkAppPrivateKey = params.zkAppPrivateKey ? PrivateKey.fromBase58(params.zkAppPrivateKey) : PrivateKey.random();
+  const zkAppPublicKey = zkAppPrivateKey.toPublicKey();
+  const zkAppAddress = zkAppPublicKey.toBase58();
+  if (!params.zkAppPrivateKey) {
+    await params.onDeploying?.({
+      zkAppAddress,
+      zkAppPrivateKey: zkAppPrivateKey.toBase58(),
+      feePayer: payerPublicKey.toBase58()
+    });
+  }
   progress(
     "compiling the PaymentChannel circuit (one-time, can take 1-3 minutes)\u2026"
   );
   const PaymentChannel = await getCompiledPaymentChannel();
-  const zkAppPrivateKey = PrivateKey.random();
-  const zkAppPublicKey = zkAppPrivateKey.toPublicKey();
-  const zkAppAddress = zkAppPublicKey.toBase58();
   const zkApp = new PaymentChannel(zkAppPublicKey);
   await fetchAccount({ publicKey: payerPublicKey });
   progress(
     `deploying a dedicated PaymentChannel zkApp ${zkAppAddress} (costs the 1 MINA account-creation fee + tx fee)\u2026`
   );
-  const fee = Number(params.feeNanomina ?? 100000000n);
-  const deployTx = await Mina.transaction(
+  const fee = Number(feeNanomina);
+  const deployTx = await buildMinaTransaction(
+    o1js,
     { sender: payerPublicKey, fee },
     async () => {
       AccountUpdate.fundNewAccount(payerPublicKey);
@@ -3759,8 +3844,7 @@ async function deployMinaChannelZkApp(params) {
 async function ensureOwnedMinaZkApp(params) {
   const { o1js } = await loadMinaRuntime();
   const { Mina, PrivateKey, PublicKey, Field: Field2, Poseidon, fetchAccount } = o1js;
-  const progress = params.onProgress ?? (() => {
-  });
+  const progress = params.onProgress ?? (() => void 0);
   const network = Mina.Network(params.graphqlUrl);
   Mina.setActiveInstance(network);
   const payerKeyBase58 = hexToMinaBase58PrivateKey(params.payerPrivateKey);
@@ -3786,13 +3870,19 @@ async function ensureOwnedMinaZkApp(params) {
       ownRecord: false
     });
   }
+  let pendingOwnKey;
   for (const candidate of candidates) {
     let appState;
     try {
       const res = await fetchAccount({
         publicKey: PublicKey.fromBase58(candidate.address)
       });
-      if (res.error || !res.account) continue;
+      if (res.error || !res.account) {
+        if (candidate.ownRecord && params.deployed?.zkAppPrivateKey) {
+          pendingOwnKey = params.deployed.zkAppPrivateKey;
+        }
+        continue;
+      }
       appState = res.account.zkapp?.appState;
     } catch {
       continue;
@@ -3812,7 +3902,11 @@ async function ensureOwnedMinaZkApp(params) {
       return { zkAppAddress: candidate.address, deployed: false };
     }
   }
-  const record = await deployMinaChannelZkApp(params);
+  const record = await deployMinaChannelZkApp({
+    ...params,
+    ...pendingOwnKey ? { zkAppPrivateKey: pendingOwnKey } : {},
+    ...params.onDeploying ? { onDeploying: params.onDeploying } : {}
+  });
   await params.onDeployed?.(record);
   return { zkAppAddress: record.zkAppAddress, deployed: true, record };
 }
@@ -3853,4 +3947,4 @@ export {
 @noble/curves/secp256k1.js:
   (*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) *)
 */
-//# sourceMappingURL=chunk-IYPIOSEF.js.map
+//# sourceMappingURL=chunk-7ZUHCA5C.js.map