@hinkal/common 0.2.18 → 0.2.19

package/functions/private-wallet/emporium.swap.helpers.mjs

@@ -1,157 +1,155 @@
-import { BigNumber as K, ethers as D } from "ethers";
-import { emporiumOp as u, createApproveEmporiumOp as I } from "./emporium.helpers.mjs";
+import { BigNumber as K, ethers as _ } from "ethers";
+import { emporiumOp as u, createApproveEmporiumOp as F } from "./emporium.helpers.mjs";
 import { NATIVE_TOKEN_WRAPPER_ADDRESSES as T, WRAPPER_TOKEN_EXCHANGE_ADDRESSES as q, SWAP_FEE_TAKER_ADDRESSES as V } from "../../constants/addresses.constants.mjs";
-import { ExternalActionId as O } from "../../types/external-action.types.mjs";
+import { ExternalActionId as h } from "../../types/external-action.types.mjs";
 import { ContractType as g } from "../../types/ethereum-network.types.mjs";
 import { getExternalSwapAddress as X } from "../pre-transaction/getExternalSwapAddress.mjs";
 import { replaceAllInstances as H } from "../utils/string.utils.mjs";
-import { zeroAddress as w, HINKAL_SWAP_VARIABLE_RATE as P } from "../../constants/protocol.constants.mjs";
+import { zeroAddress as S, HINKAL_SWAP_VARIABLE_RATE as N } from "../../constants/protocol.constants.mjs";
 import "../../constants/token-data/index.mjs";
 import { caseInsensitiveEqual as M } from "../utils/caseInsensitive.utils.mjs";
-import { Logger as l } from "../../error-handling/logger.mjs";
-import { getERC20Registry as v } from "../../constants/token-data/ERC20Registry.mjs";
-const z = (t, a, c, e, n, i, o = !1) => {
-  const r = K.from(i).toBigInt(), C = {
-    tokenIn: a,
-    tokenOut: e,
-    fee: r,
-    recipient: n,
-    amountIn: c,
+import { Logger as v } from "../../error-handling/logger.mjs";
+import { getERC20Registry as z } from "../../constants/token-data/ERC20Registry.mjs";
+const G = (c, t, r, a, i, n, f = !1) => {
+  const o = K.from(n).toBigInt(), e = {
+    tokenIn: t,
+    tokenOut: a,
+    fee: o,
+    recipient: i,
+    amountIn: r,
     amountOutMinimum: 0,
     sqrtPriceLimitX96: 0
-  }, m = [
+  }, w = [
     "function exactInputSingle(tuple(address tokenIn,address tokenOut,uint24 fee,address recipient,uint256 amountIn,uint256 amountOutMinimum,uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)"
-  ], h = new D.Contract(t, m);
+  ], E = new _.Contract(c, w);
   return u({
-    contract: h,
+    contract: E,
     func: "exactInputSingle",
-    args: [C],
-    invokeWallet: o
+    args: [e],
+    invokeWallet: f
   });
-}, N = (t, a, c, e, n, i, o = !1) => {
-  const r = X(t, a), C = H(e, r.slice(2), n.slice(2));
+}, U = (c, t, r, a, i, n, f = !1) => {
+  const o = X(c, t), e = H(a, o.slice(2), i.slice(2));
   return u({
-    contract: c,
-    callDataString: C,
-    value: i,
-    invokeWallet: o
+    contract: r,
+    callDataString: e,
+    value: n,
+    invokeWallet: f
   });
-}, G = (t, a) => {
-  const e = v(a).find((n) => n.symbol === "USDT");
-  return e ? M(t, e.erc20TokenAddress) : !1;
-}, L = async (t, a, c, e, n, i) => {
-  const o = c.address;
-  if (G(o, t.getCurrentChainId()))
+}, I = (c, t) => {
+  const a = z(t).find((i) => i.symbol === "USDT");
+  return a ? M(c, a.erc20TokenAddress) : !1;
+}, L = async (c, t, r, a, i, n) => {
+  const f = r.address;
+  if (I(f, c))
     try {
-      (await c.allowance(e, n)).toBigInt() > 0n && a.push(I(c, n, 0n, i));
-    } catch (r) {
-      l.error("Error in nullifyUsdtApprovalIfNeeded", r);
+      (await r.allowance(a, i)).toBigInt() > 0n && t.push(F(r, i, 0n, n));
+    } catch (o) {
+      v.error("Error in nullifyUsdtApprovalIfNeeded", o);
     }
-}, U = async (t, a, c, e, n, i, o) => {
-  if (a !== w) {
-    const r = V[t.getCurrentChainId()], C = t.getContractWithFetcher(g.ERC20Contract, a), m = await C.balanceOf(c);
+}, l = async (c, t, r, a, i, n, f, o) => {
+  if (r !== S) {
+    const e = V[t], w = c.getContractWithFetcher(t, g.ERC20Contract, r), E = await w.balanceOf(a);
     await L(
       t,
       n,
-      C,
-      c,
-      r,
-      i
-    ), n.push(I(C, r, 2n ** 256n - 1n, i));
-    const h = [
+      w,
+      a,
+      e,
+      f
+    ), n.push(F(w, e, 2n ** 256n - 1n, f));
+    const b = [
       "function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable"
-    ], f = new D.Contract(r, h), E = e;
+    ], s = new _.Contract(e, b), C = i;
     n.push(
       u({
-        contract: f,
+        contract: s,
         func: "takeSwapFee",
-        args: [a, m, P, E],
-        invokeWallet: i
+        args: [r, E, N, C],
+        invokeWallet: f
       })
     );
   } else {
-    const r = e;
+    const e = i;
     n.push(
       u({
-        contract: r,
-        value: o * P / 10000n,
-        invokeWallet: i
+        contract: e,
+        value: o * N / 10000n,
+        invokeWallet: f
       })
     );
   }
-}, rt = async (t, a, c, e, n, i, o, r, C, m, h, f = !1) => {
-  const E = i < 0n ? -1n * i : i, y = t.getCurrentChainId(), p = [], S = T[y];
-  let _ = !1, R;
-  if (a === O.OneInch || a === O.Lifi) {
-    if (n !== w) {
-      const b = t.getContractWithFetcher(g.ERC20Contract, n);
-      p.push(I(b, c, E, f));
+}, nt = async (c, t, r, a, i, n, f, o, e, w, E, b, s = !1) => {
+  const C = f < 0n ? -1n * f : f, m = [], R = T[t];
+  let B = !1, O;
+  if (r === h.OneInch || r === h.Lifi) {
+    if (n !== S) {
+      const y = c.getContractWithFetcher(t, g.ERC20Contract, n);
+      m.push(F(y, a, C, s));
     }
-    let s = 0n;
-    n === w && (s += E), o && r === w && o < 0n && (s += -1n * o);
-    const F = s > 0n ? s : void 0;
-    return R = N(
+    let p = 0n;
+    n === S && (p += C), o && e === S && o < 0n && (p += -1n * o);
+    const D = p > 0n ? p : void 0;
+    return O = U(
       t,
+      r,
       a,
-      c,
-      e,
-      m,
-      F,
-      f
-    ), p.push(R), (a === O.OneInch || C && a === O.Lifi) && r && o !== void 0 && await U(t, r, m, h, p, f, o), p;
+      i,
+      E,
+      D,
+      s
+    ), m.push(O), (r === h.OneInch || w && r === h.Lifi) && e && o !== void 0 && await l(c, t, e, E, b, m, s, o), m;
   }
-  if (!r || !o)
+  if (!e || !o)
     throw Error("There should be output token for UniSwap and Odos");
-  if (n === w) {
-    const s = t.getContractWithFetcher(g.ERC20Contract, S);
-    p.push(
+  if (n === S) {
+    const p = c.getContractWithFetcher(t, g.ERC20Contract, R);
+    m.push(
       u({
-        contract: s,
+        contract: p,
         func: "deposit",
-        value: E,
-        invokeWallet: f
+        value: C,
+        invokeWallet: s
       })
-    ), n = S;
+    ), n = R;
   }
-  let B = 0n;
-  if (r === w && (r = S, _ = !0, B = await t.getContractWithFetcher(g.ERC20Contract, S).balanceOf(m)), n !== w) {
-    const s = t.getContractWithFetcher(g.ERC20Contract, n);
-    await L(t, p, s, m, c, f), p.push(I(s, c, E, f));
+  let P = 0n;
+  if (e === S && (e = R, B = !0, P = await c.getContractWithFetcher(t, g.ERC20Contract, R).balanceOf(E)), n !== S) {
+    const p = c.getContractWithFetcher(t, g.ERC20Contract, n);
+    await L(t, m, p, E, a, s), m.push(F(p, a, C, s));
   }
-  if (a === O.Uniswap ? R = z(
-    c,
+  if (r === h.Uniswap ? O = G(
+    a,
     n,
-    E,
-    r,
-    m,
+    C,
     e,
-    f
-  ) : R = N(
+    E,
+    i,
+    s
+  ) : O = U(
     t,
+    r,
     a,
-    c,
-    e,
-    m,
+    i,
+    E,
     void 0,
-    f
-  ), p.push(R), await U(t, r, m, h, p, f, o), _) {
-    const s = q[y], F = t.getContractWithFetcher(g.ERC20Contract, S);
-    p.push(I(F, s, 2n ** 256n - 1n, f));
-    const b = ["function withdrawBalanceDifference(uint256 beforeBalance) external"], x = new D.Contract(s, b);
-    p.push(
+    s
+  ), m.push(O), await l(c, t, e, E, b, m, s, o), B) {
+    const p = q[t], D = c.getContractWithFetcher(t, g.ERC20Contract, R);
+    m.push(F(D, p, 2n ** 256n - 1n, s));
+    const y = ["function withdrawBalanceDifference(uint256 beforeBalance) external"], x = new _.Contract(p, y);
+    m.push(
       u({
         contract: x,
         func: "withdrawBalanceDifference",
-        args: [B],
-        invokeWallet: f
+        args: [P],
+        invokeWallet: s
       })
     );
   }
-  return p;
+  return m;
 };
 export {
-  z as createSwapToEmporiumOpForUniswap,
-  N as createSwapToEmporiumOpFromData,
-  rt as createSwapToEmporiumOps,
-  L as nullifyUsdtApprovalIfNeeded
+  G as createSwapToEmporiumOpForUniswap,
+  nt as createSwapToEmporiumOps
 };

package/functions/snarkjs/common.snarkjs.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("ethers"),d=require("../../constants/protocol.constants.cjs"),V=require("../../constants/conversion.constants.cjs"),S=require("../../data-structures/crypto-keys/keys.cjs"),E=require("../../data-structures/crypto-keys/encryptDecryptUtxo.cjs"),F=require("../../types/circom-data.types.cjs"),f=require("../utils/external-action.utils.cjs"),u=require("../../types/hinkal.types.cjs"),T=require("../utils/amounts.utils.cjs"),P=require("./getOriginalSender.cjs"),L=(e,a)=>e.map((s,t)=>s.map(n=>a[t]?"0":n.getNullifier())),R=(e,a,s)=>{let t=[];return e==="v1x0"?t=a.map((n,r)=>n.map(l=>s[r]?"0":l.getCommitment())):t=a.map(n=>n.map(r=>r.amount===0n?"0":r.getCommitment())),t},_=(e,a,s=!1)=>{const t=[];for(let n=0;n<e.length;n+=1){let r=0n,l=0n;for(let i=0;i<e[n].length;i+=1)r+=e[n][i].amount;for(let i=0;i<a[n].length;i+=1)l+=a[n][i].amount;l-r<0?s?t.push(l-r):t.push(d.CIRCOM_P+(l-r)):t.push(l-r)}return t},q=e=>e.useApprovalUtxoData.reduce((a,s)=>[...a,T.calculateBigIntSum(s.approvalChanges)],[]),x=(e,a)=>{const s=q(a),t=a.hinkalLogicAction,n=e.map((r,l)=>t===u.HinkalLogicAction.NONE||t===u.HinkalLogicAction.APPROVE?r+s[l]>=0n?0n:r+s[l]:r>=0n?0n:r);return t===u.HinkalLogicAction.RELEASE_BUFFER?e.forEach((r,l)=>{n[l]=r>0n?-r:r}):t===u.HinkalLogicAction.EXECUTE&&a.executeApprovalChanges.forEach((r,l)=>{n[l]=r+e[l]<0n?r+e[l]:0n}),n},M=(e,a)=>{if(e.length===0)return[];const s=[[""]];for(let t=0;t<e.length;t+=1)t>0&&s.push([""]),e[t].forEach((n,r)=>{s[t][r]=`0x${Buffer.from(E.encryptUtxo(n,a)).toString("hex")}`});return s},z=(e,a)=>{const s=[];for(let n=0;n<e.length;n+=1){s.push([]);for(let r=0;r<e[n].length;r+=1)s[n][r]=a.getSiblingHashesForVerification(BigInt(e[n][r].getCommitment())).map(l=>l.toString())}const t=[];for(let n=0;n<e.length;n+=1){t.push([]);for(let r=0;r<e[n].length;r+=1)t[n][r]=a.getSiblingSides(BigInt(e[n][r].getCommitment())).map(l=>l.toString())}return{inCommitmentSiblings:s,inCommitmentSiblingSides:t}},C=(e,a)=>{const s=a.getSiblingHashesForVerification(BigInt(e)).map(n=>n.toString()),t=a.getSiblingSides(BigInt(e)).map(n=>n.toString());return{accessTokenSiblings:s,accessTokenSiblingSides:t}},W=(e,a)=>C(e.getAccessKey(),a),j=e=>{const a={...e};if(a.amountChanges=e.amountChanges.map(s=>s.toString()),a.calldataHash=e.calldataHash.toString(),a.rootHashAccessToken=e.rootHashAccessToken?.toString(),a.stealthAddressStructure.extraRandomization=e.stealthAddressStructure.extraRandomization.toString(),a.stealthAddressStructure.stealthAddress=e.stealthAddressStructure.stealthAddress.toString(),a.stealthAddressStructure.H0=e.stealthAddressStructure.H0.toString(),a.stealthAddressStructure.H1=e.stealthAddressStructure.H1.toString(),a.rootHashHinkal=e.rootHashHinkal?.toString(),a.externalActionId=e.externalActionId?.toString(),"flatFees"in e){const s=a;return s.flatFees=e.flatFees.map(t=>t.toString()),s}else{const s=a;return s.slippageValues=e.slippageValues.map(t=>t.toString()),s.hinkalLogicArgs.inHinkalAddress=e.hinkalLogicArgs.inHinkalAddress.toString(),s.hinkalLogicArgs.executeApprovalChanges=e.hinkalLogicArgs.executeApprovalChanges.map(t=>t.toString()),s.hinkalLogicArgs.useApprovalUtxoData=e.hinkalLogicArgs.useApprovalUtxoData.map(t=>({approvalChanges:t.approvalChanges.map(n=>n.toString()),externalApprovalAddresses:t.externalApprovalAddresses,conversionInHinkalAddress:t.conversionInHinkalAddress.map(n=>n.toString())})),s.feeStructure.flatFee=e.feeStructure.flatFee.toString(),s.feeStructure.variableRate=e.feeStructure.variableRate.toString(),s}},w=e=>{const a={...e};if(a.amountChanges=e.amountChanges.map(s=>BigInt(s)),a.calldataHash=BigInt(e.calldataHash),a.rootHashAccessToken=BigInt(e.rootHashAccessToken),a.rootHashHinkal=BigInt(e.rootHashHinkal),a.externalActionId=BigInt(e.externalActionId),"flatFees"in e){const s=a;return s.flatFees=e.flatFees.map(t=>BigInt(t)),s}else{const s=a;return s.feeStructure.flatFee=BigInt(e.feeStructure.flatFee),s.feeStructure.variableRate=BigInt(e.feeStructure.variableRate),s.slippageValues=e.slippageValues.map(t=>BigInt(t)),s.hinkalLogicArgs.executeApprovalChanges=e.hinkalLogicArgs.executeApprovalChanges.map(t=>BigInt(t)),s.hinkalLogicArgs.inHinkalAddress=BigInt(e.hinkalLogicArgs.inHinkalAddress),s.hinkalLogicArgs.useApprovalUtxoData=e.hinkalLogicArgs.useApprovalUtxoData.map(t=>({approvalChanges:t.approvalChanges.map(n=>BigInt(n)),externalApprovalAddresses:t.externalApprovalAddresses,conversionInHinkalAddress:t.conversionInHinkalAddress.map(n=>BigInt(n))})),s}},K=(e,a,s,t,n,r,l,i,H,k,b,c,g,m,v)=>{const h=Object.values(H||F.defaultHookData),I=v??P.getOriginalSender(t??d.zeroAddress,s);if(e==="v1x0"){const p=o.ethers.utils.defaultAbiCoder.encode(["uint16","address","address","uint256","bytes","tuple(address, address, bytes, bytes)","bytes[][]","uint256[]"],[a,s,t,typeof n=="bigint"?n:f.getExternalActionIdHash(n),r,h,l,i]);return BigInt(o.ethers.utils.keccak256(p))%d.CIRCOM_P}else{const p=o.ethers.utils.defaultAbiCoder.encode(["uint16","address","address","uint256","bytes"],[a,s,t,typeof n=="bigint"?n:f.getExternalActionIdHash(n),r]),A=o.ethers.utils.defaultAbiCoder.encode(["tuple(address, address, bytes, bytes)","bytes[][]","tuple(address, uint256, uint256)","int256[]","bool[]","tuple(uint256, uint256,int256[],bool, tuple(int256[] approvalChanges, address[] externalApprovalAddresses, uint256[] conversionInHinkalAddress)[])","tuple(uint8 v, bytes32 r, bytes32 s, uint256 accessKey, uint256 nonce, address ethereumAddress)","address"],[h,l,[g.feeToken,g.flatFee,g.variableRate],k,b,[c.hinkalLogicAction,c.inHinkalAddress,c.executeApprovalChanges,c.doPreTxApproval,c.useApprovalUtxoData],m,I]),y=BigInt(o.ethers.utils.keccak256(p)),B=BigInt(o.ethers.utils.keccak256(A)),O=o.ethers.utils.defaultAbiCoder.encode(["uint256","uint256"],[y,B]);return BigInt(o.ethers.utils.keccak256(O))%d.CIRCOM_P}},N=e=>e.startsWith("swapperMO")||e.startsWith("swapperME")?2:e.startsWith("swapperMW")?1:(e.startsWith("swapperMHA"),0),J=(e,a,s,t,n,r)=>{if(e.startsWith("swapperMWMin0"))return 4;const l=N(e);return 10+a.length+s.length+t.flat().length+n.flat().length+l+r+V.APPROVED_UTXO_CONVERSION_COUNT*a.length},U=(e,a)=>{const{h0:s,h1:t}=S.UserKeys.getStealthAddressCompressedPoints(e,a),n=BigInt(S.UserKeys.getStealthAddress(e,a));return{extraRandomization:e,H0:s,H1:t,stealthAddress:n}};exports.buildInNullifiers=L;exports.buildOutCommitments=R;exports.calcAccessTokenSiblingAndSidesFromAccessKey=C;exports.calcAccessTokenSiblingsAndSides=W;exports.calcAmountChanges=_;exports.calcCommitmentsSiblingAndSides=z;exports.calcEncryptedOutputs=M;exports.calcPublicSignalCount=J;exports.calcStealthAddressStructure=U;exports.createCallDataHash=K;exports.deserializeCircomData=w;exports.getSlippageValues=x;exports.serializeCircomData=j;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("ethers"),d=require("../../constants/protocol.constants.cjs"),V=require("../../constants/conversion.constants.cjs"),S=require("../../data-structures/crypto-keys/keys.cjs"),E=require("../../data-structures/crypto-keys/encryptDecryptUtxo.cjs"),F=require("../../types/circom-data.types.cjs"),f=require("../utils/external-action.utils.cjs"),u=require("../../types/hinkal.types.cjs"),T=require("../utils/amounts.utils.cjs"),P=require("./getOriginalSender.cjs"),L=(e,s)=>e.map((t,a)=>t.map(n=>s[a]?"0":n.getNullifier())),R=(e,s,t)=>{let a=[];return e==="v1x0"?a=s.map((n,r)=>n.map(l=>t[r]?"0":l.getCommitment())):a=s.map(n=>n.map(r=>r.amount===0n?"0":r.getCommitment())),a},_=(e,s,t=!1)=>{const a=[];for(let n=0;n<e.length;n+=1){let r=0n,l=0n;for(let i=0;i<e[n].length;i+=1)r+=e[n][i].amount;for(let i=0;i<s[n].length;i+=1)l+=s[n][i].amount;l-r<0?t?a.push(l-r):a.push(d.CIRCOM_P+(l-r)):a.push(l-r)}return a},q=e=>e.useApprovalUtxoData.reduce((s,t)=>[...s,T.calculateBigIntSum(t.approvalChanges)],[]),x=(e,s)=>{const t=q(s),a=s.hinkalLogicAction,n=e.map((r,l)=>a===u.HinkalLogicAction.NONE||a===u.HinkalLogicAction.APPROVE?r+t[l]>=0n?0n:r+t[l]:r>=0n?0n:r);return a===u.HinkalLogicAction.RELEASE_BUFFER?e.forEach((r,l)=>{n[l]=r>0n?-r:r}):a===u.HinkalLogicAction.EXECUTE&&s.executeApprovalChanges.forEach((r,l)=>{n[l]=r+e[l]<0n?r+e[l]:0n}),n},M=e=>{if(e.length===0)return[];const s=[[""]];for(let t=0;t<e.length;t+=1)t>0&&s.push([""]),e[t].forEach((a,n)=>{s[t][n]=`0x${Buffer.from(E.encryptUtxo(a)).toString("hex")}`});return s},z=(e,s)=>{const t=[];for(let n=0;n<e.length;n+=1){t.push([]);for(let r=0;r<e[n].length;r+=1)t[n][r]=s.getSiblingHashesForVerification(BigInt(e[n][r].getCommitment())).map(l=>l.toString())}const a=[];for(let n=0;n<e.length;n+=1){a.push([]);for(let r=0;r<e[n].length;r+=1)a[n][r]=s.getSiblingSides(BigInt(e[n][r].getCommitment())).map(l=>l.toString())}return{inCommitmentSiblings:t,inCommitmentSiblingSides:a}},C=(e,s)=>{const t=s.getSiblingHashesForVerification(BigInt(e)).map(n=>n.toString()),a=s.getSiblingSides(BigInt(e)).map(n=>n.toString());return{accessTokenSiblings:t,accessTokenSiblingSides:a}},W=(e,s)=>C(e.getAccessKey(),s),j=e=>{const s={...e};if(s.amountChanges=e.amountChanges.map(t=>t.toString()),s.calldataHash=e.calldataHash.toString(),s.rootHashAccessToken=e.rootHashAccessToken?.toString(),s.stealthAddressStructure.extraRandomization=e.stealthAddressStructure.extraRandomization.toString(),s.stealthAddressStructure.stealthAddress=e.stealthAddressStructure.stealthAddress.toString(),s.stealthAddressStructure.H0=e.stealthAddressStructure.H0.toString(),s.stealthAddressStructure.H1=e.stealthAddressStructure.H1.toString(),s.rootHashHinkal=e.rootHashHinkal?.toString(),s.externalActionId=e.externalActionId?.toString(),"flatFees"in e){const t=s;return t.flatFees=e.flatFees.map(a=>a.toString()),t}else{const t=s;return t.slippageValues=e.slippageValues.map(a=>a.toString()),t.hinkalLogicArgs.inHinkalAddress=e.hinkalLogicArgs.inHinkalAddress.toString(),t.hinkalLogicArgs.executeApprovalChanges=e.hinkalLogicArgs.executeApprovalChanges.map(a=>a.toString()),t.hinkalLogicArgs.useApprovalUtxoData=e.hinkalLogicArgs.useApprovalUtxoData.map(a=>({approvalChanges:a.approvalChanges.map(n=>n.toString()),externalApprovalAddresses:a.externalApprovalAddresses,conversionInHinkalAddress:a.conversionInHinkalAddress.map(n=>n.toString())})),t.feeStructure.flatFee=e.feeStructure.flatFee.toString(),t.feeStructure.variableRate=e.feeStructure.variableRate.toString(),t}},w=e=>{const s={...e};if(s.amountChanges=e.amountChanges.map(t=>BigInt(t)),s.calldataHash=BigInt(e.calldataHash),s.rootHashAccessToken=BigInt(e.rootHashAccessToken),s.rootHashHinkal=BigInt(e.rootHashHinkal),s.externalActionId=BigInt(e.externalActionId),"flatFees"in e){const t=s;return t.flatFees=e.flatFees.map(a=>BigInt(a)),t}else{const t=s;return t.feeStructure.flatFee=BigInt(e.feeStructure.flatFee),t.feeStructure.variableRate=BigInt(e.feeStructure.variableRate),t.slippageValues=e.slippageValues.map(a=>BigInt(a)),t.hinkalLogicArgs.executeApprovalChanges=e.hinkalLogicArgs.executeApprovalChanges.map(a=>BigInt(a)),t.hinkalLogicArgs.inHinkalAddress=BigInt(e.hinkalLogicArgs.inHinkalAddress),t.hinkalLogicArgs.useApprovalUtxoData=e.hinkalLogicArgs.useApprovalUtxoData.map(a=>({approvalChanges:a.approvalChanges.map(n=>BigInt(n)),externalApprovalAddresses:a.externalApprovalAddresses,conversionInHinkalAddress:a.conversionInHinkalAddress.map(n=>BigInt(n))})),t}},K=(e,s,t,a,n,r,l,i,H,k,b,c,g,m,v)=>{const h=Object.values(H||F.defaultHookData),I=v??P.getOriginalSender(a??d.zeroAddress,t);if(e==="v1x0"){const p=o.ethers.utils.defaultAbiCoder.encode(["uint16","address","address","uint256","bytes","tuple(address, address, bytes, bytes)","bytes[][]","uint256[]"],[s,t,a,typeof n=="bigint"?n:f.getExternalActionIdHash(n),r,h,l,i]);return BigInt(o.ethers.utils.keccak256(p))%d.CIRCOM_P}else{const p=o.ethers.utils.defaultAbiCoder.encode(["uint16","address","address","uint256","bytes"],[s,t,a,typeof n=="bigint"?n:f.getExternalActionIdHash(n),r]),A=o.ethers.utils.defaultAbiCoder.encode(["tuple(address, address, bytes, bytes)","bytes[][]","tuple(address, uint256, uint256)","int256[]","bool[]","tuple(uint256, uint256,int256[],bool, tuple(int256[] approvalChanges, address[] externalApprovalAddresses, uint256[] conversionInHinkalAddress)[])","tuple(uint8 v, bytes32 r, bytes32 s, uint256 accessKey, uint256 nonce, address ethereumAddress)","address"],[h,l,[g.feeToken,g.flatFee,g.variableRate],k,b,[c.hinkalLogicAction,c.inHinkalAddress,c.executeApprovalChanges,c.doPreTxApproval,c.useApprovalUtxoData],m,I]),y=BigInt(o.ethers.utils.keccak256(p)),B=BigInt(o.ethers.utils.keccak256(A)),O=o.ethers.utils.defaultAbiCoder.encode(["uint256","uint256"],[y,B]);return BigInt(o.ethers.utils.keccak256(O))%d.CIRCOM_P}},N=e=>e.startsWith("swapperMO")||e.startsWith("swapperME")?2:e.startsWith("swapperMW")?1:(e.startsWith("swapperMHA"),0),J=(e,s,t,a,n,r)=>{if(e.startsWith("swapperMWMin0"))return 4;const l=N(e);return 10+s.length+t.length+a.flat().length+n.flat().length+l+r+V.APPROVED_UTXO_CONVERSION_COUNT*s.length},U=(e,s)=>{const{h0:t,h1:a}=S.UserKeys.getStealthAddressCompressedPoints(e,s),n=BigInt(S.UserKeys.getStealthAddress(e,s));return{extraRandomization:e,H0:t,H1:a,stealthAddress:n}};exports.buildInNullifiers=L;exports.buildOutCommitments=R;exports.calcAccessTokenSiblingAndSidesFromAccessKey=C;exports.calcAccessTokenSiblingsAndSides=W;exports.calcAmountChanges=_;exports.calcCommitmentsSiblingAndSides=z;exports.calcEncryptedOutputs=M;exports.calcPublicSignalCount=J;exports.calcStealthAddressStructure=U;exports.createCallDataHash=K;exports.deserializeCircomData=w;exports.getSlippageValues=x;exports.serializeCircomData=j;

package/functions/snarkjs/common.snarkjs.d.ts

@@ -9,7 +9,7 @@ export declare const buildInNullifiers: (inputUtxos: Utxo[][], onChainCreation:
 export declare const buildOutCommitments: (proverVersion: ProverVersion, outputUtxos: Utxo[][], onChainCreation: boolean[]) => string[][];
 export declare const calcAmountChanges: (inputUtxos: Utxo[][], outputUtxos: Utxo[][], forCircomData?: boolean) => bigint[];
 export declare const getSlippageValues: (amountChanges: bigint[], hinkalLogicArgs: HinkalLogicArgs) => bigint[];
-export declare const calcEncryptedOutputs: (outputUtxos: Utxo[][], forceZeroAmount: boolean) => string[][];
+export declare const calcEncryptedOutputs: (outputUtxos: Utxo[][]) => string[][];
 export declare const calcCommitmentsSiblingAndSides: (inputUtxos: Utxo[][], merkleTree: MerkleTree<bigint>) => {
     inCommitmentSiblings: string[][][];
     inCommitmentSiblingSides: string[][][];

package/functions/snarkjs/common.snarkjs.mjs

@@ -8,89 +8,89 @@ import { getExternalActionIdHash as f } from "../utils/external-action.utils.mjs
 import { HinkalLogicAction as d } from "../../types/hinkal.types.mjs";
 import { calculateBigIntSum as T } from "../utils/amounts.utils.mjs";
 import { getOriginalSender as R } from "./getOriginalSender.mjs";
-const $ = (e, r) => e.map((s, t) => s.map((n) => r[t] ? "0" : n.getNullifier())), q = (e, r, s) => {
-  let t = [];
-  return e === "v1x0" ? t = r.map(
-    (n, a) => n.map((l) => s[a] ? "0" : l.getCommitment())
-  ) : t = r.map((n) => n.map((a) => a.amount === 0n ? "0" : a.getCommitment())), t;
-}, G = (e, r, s = !1) => {
-  const t = [];
+const $ = (e, s) => e.map((t, r) => t.map((n) => s[r] ? "0" : n.getNullifier())), q = (e, s, t) => {
+  let r = [];
+  return e === "v1x0" ? r = s.map(
+    (n, a) => n.map((l) => t[a] ? "0" : l.getCommitment())
+  ) : r = s.map((n) => n.map((a) => a.amount === 0n ? "0" : a.getCommitment())), r;
+}, G = (e, s, t = !1) => {
+  const r = [];
   for (let n = 0; n < e.length; n += 1) {
     let a = 0n, l = 0n;
     for (let i = 0; i < e[n].length; i += 1)
       a += e[n][i].amount;
-    for (let i = 0; i < r[n].length; i += 1)
-      l += r[n][i].amount;
-    l - a < 0 ? s ? t.push(l - a) : t.push(c + (l - a)) : t.push(l - a);
+    for (let i = 0; i < s[n].length; i += 1)
+      l += s[n][i].amount;
+    l - a < 0 ? t ? r.push(l - a) : r.push(c + (l - a)) : r.push(l - a);
   }
-  return t;
-}, L = (e) => e.useApprovalUtxoData.reduce((r, s) => [...r, T(s.approvalChanges)], []), Q = (e, r) => {
-  const s = L(r), t = r.hinkalLogicAction, n = e.map((a, l) => t === d.NONE || t === d.APPROVE ? a + s[l] >= 0n ? 0n : a + s[l] : a >= 0n ? 0n : a);
-  return t === d.RELEASE_BUFFER ? e.forEach((a, l) => {
+  return r;
+}, L = (e) => e.useApprovalUtxoData.reduce((s, t) => [...s, T(t.approvalChanges)], []), Q = (e, s) => {
+  const t = L(s), r = s.hinkalLogicAction, n = e.map((a, l) => r === d.NONE || r === d.APPROVE ? a + t[l] >= 0n ? 0n : a + t[l] : a >= 0n ? 0n : a);
+  return r === d.RELEASE_BUFFER ? e.forEach((a, l) => {
     n[l] = a > 0n ? -a : a;
-  }) : t === d.EXECUTE && r.executeApprovalChanges.forEach((a, l) => {
+  }) : r === d.EXECUTE && s.executeApprovalChanges.forEach((a, l) => {
     n[l] = a + e[l] < 0n ? a + e[l] : 0n;
   }), n;
-}, Y = (e, r) => {
+}, Y = (e) => {
   if (e.length === 0)
     return [];
   const s = [[""]];
   for (let t = 0; t < e.length; t += 1)
-    t > 0 && s.push([""]), e[t].forEach((n, a) => {
-      s[t][a] = `0x${Buffer.from(y(n, r)).toString("hex")}`;
+    t > 0 && s.push([""]), e[t].forEach((r, n) => {
+      s[t][n] = `0x${Buffer.from(y(r)).toString("hex")}`;
     });
   return s;
-}, Z = (e, r) => {
-  const s = [];
+}, Z = (e, s) => {
+  const t = [];
   for (let n = 0; n < e.length; n += 1) {
-    s.push([]);
+    t.push([]);
     for (let a = 0; a < e[n].length; a += 1)
-      s[n][a] = r.getSiblingHashesForVerification(BigInt(e[n][a].getCommitment())).map((l) => l.toString());
+      t[n][a] = s.getSiblingHashesForVerification(BigInt(e[n][a].getCommitment())).map((l) => l.toString());
   }
-  const t = [];
+  const r = [];
   for (let n = 0; n < e.length; n += 1) {
-    t.push([]);
+    r.push([]);
     for (let a = 0; a < e[n].length; a += 1)
-      t[n][a] = r.getSiblingSides(BigInt(e[n][a].getCommitment())).map((l) => l.toString());
+      r[n][a] = s.getSiblingSides(BigInt(e[n][a].getCommitment())).map((l) => l.toString());
   }
-  return { inCommitmentSiblings: s, inCommitmentSiblingSides: t };
-}, P = (e, r) => {
-  const s = r.getSiblingHashesForVerification(BigInt(e)).map((n) => n.toString()), t = r.getSiblingSides(BigInt(e)).map((n) => n.toString());
-  return { accessTokenSiblings: s, accessTokenSiblingSides: t };
-}, D = (e, r) => P(e.getAccessKey(), r), ee = (e) => {
-  const r = { ...e };
-  if (r.amountChanges = e.amountChanges.map((s) => s.toString()), r.calldataHash = e.calldataHash.toString(), r.rootHashAccessToken = e.rootHashAccessToken?.toString(), r.stealthAddressStructure.extraRandomization = e.stealthAddressStructure.extraRandomization.toString(), r.stealthAddressStructure.stealthAddress = e.stealthAddressStructure.stealthAddress.toString(), r.stealthAddressStructure.H0 = e.stealthAddressStructure.H0.toString(), r.stealthAddressStructure.H1 = e.stealthAddressStructure.H1.toString(), r.rootHashHinkal = e.rootHashHinkal?.toString(), r.externalActionId = e.externalActionId?.toString(), "flatFees" in e) {
-    const s = r;
-    return s.flatFees = e.flatFees.map((t) => t.toString()), s;
+  return { inCommitmentSiblings: t, inCommitmentSiblingSides: r };
+}, P = (e, s) => {
+  const t = s.getSiblingHashesForVerification(BigInt(e)).map((n) => n.toString()), r = s.getSiblingSides(BigInt(e)).map((n) => n.toString());
+  return { accessTokenSiblings: t, accessTokenSiblingSides: r };
+}, D = (e, s) => P(e.getAccessKey(), s), ee = (e) => {
+  const s = { ...e };
+  if (s.amountChanges = e.amountChanges.map((t) => t.toString()), s.calldataHash = e.calldataHash.toString(), s.rootHashAccessToken = e.rootHashAccessToken?.toString(), s.stealthAddressStructure.extraRandomization = e.stealthAddressStructure.extraRandomization.toString(), s.stealthAddressStructure.stealthAddress = e.stealthAddressStructure.stealthAddress.toString(), s.stealthAddressStructure.H0 = e.stealthAddressStructure.H0.toString(), s.stealthAddressStructure.H1 = e.stealthAddressStructure.H1.toString(), s.rootHashHinkal = e.rootHashHinkal?.toString(), s.externalActionId = e.externalActionId?.toString(), "flatFees" in e) {
+    const t = s;
+    return t.flatFees = e.flatFees.map((r) => r.toString()), t;
   } else {
-    const s = r;
-    return s.slippageValues = e.slippageValues.map((t) => t.toString()), s.hinkalLogicArgs.inHinkalAddress = e.hinkalLogicArgs.inHinkalAddress.toString(), s.hinkalLogicArgs.executeApprovalChanges = e.hinkalLogicArgs.executeApprovalChanges.map(
-      (t) => t.toString()
-    ), s.hinkalLogicArgs.useApprovalUtxoData = e.hinkalLogicArgs.useApprovalUtxoData.map(
-      (t) => ({
-        approvalChanges: t.approvalChanges.map((n) => n.toString()),
-        externalApprovalAddresses: t.externalApprovalAddresses,
-        conversionInHinkalAddress: t.conversionInHinkalAddress.map((n) => n.toString())
+    const t = s;
+    return t.slippageValues = e.slippageValues.map((r) => r.toString()), t.hinkalLogicArgs.inHinkalAddress = e.hinkalLogicArgs.inHinkalAddress.toString(), t.hinkalLogicArgs.executeApprovalChanges = e.hinkalLogicArgs.executeApprovalChanges.map(
+      (r) => r.toString()
+    ), t.hinkalLogicArgs.useApprovalUtxoData = e.hinkalLogicArgs.useApprovalUtxoData.map(
+      (r) => ({
+        approvalChanges: r.approvalChanges.map((n) => n.toString()),
+        externalApprovalAddresses: r.externalApprovalAddresses,
+        conversionInHinkalAddress: r.conversionInHinkalAddress.map((n) => n.toString())
       })
-    ), s.feeStructure.flatFee = e.feeStructure.flatFee.toString(), s.feeStructure.variableRate = e.feeStructure.variableRate.toString(), s;
+    ), t.feeStructure.flatFee = e.feeStructure.flatFee.toString(), t.feeStructure.variableRate = e.feeStructure.variableRate.toString(), t;
   }
 }, te = (e) => {
-  const r = { ...e };
-  if (r.amountChanges = e.amountChanges.map((s) => BigInt(s)), r.calldataHash = BigInt(e.calldataHash), r.rootHashAccessToken = BigInt(e.rootHashAccessToken), r.rootHashHinkal = BigInt(e.rootHashHinkal), r.externalActionId = BigInt(e.externalActionId), "flatFees" in e) {
-    const s = r;
-    return s.flatFees = e.flatFees.map((t) => BigInt(t)), s;
+  const s = { ...e };
+  if (s.amountChanges = e.amountChanges.map((t) => BigInt(t)), s.calldataHash = BigInt(e.calldataHash), s.rootHashAccessToken = BigInt(e.rootHashAccessToken), s.rootHashHinkal = BigInt(e.rootHashHinkal), s.externalActionId = BigInt(e.externalActionId), "flatFees" in e) {
+    const t = s;
+    return t.flatFees = e.flatFees.map((r) => BigInt(r)), t;
   } else {
-    const s = r;
-    return s.feeStructure.flatFee = BigInt(e.feeStructure.flatFee), s.feeStructure.variableRate = BigInt(e.feeStructure.variableRate), s.slippageValues = e.slippageValues.map((t) => BigInt(t)), s.hinkalLogicArgs.executeApprovalChanges = e.hinkalLogicArgs.executeApprovalChanges.map((t) => BigInt(t)), s.hinkalLogicArgs.inHinkalAddress = BigInt(e.hinkalLogicArgs.inHinkalAddress), s.hinkalLogicArgs.useApprovalUtxoData = e.hinkalLogicArgs.useApprovalUtxoData.map(
-      (t) => ({
-        approvalChanges: t.approvalChanges.map((n) => BigInt(n)),
-        externalApprovalAddresses: t.externalApprovalAddresses,
-        conversionInHinkalAddress: t.conversionInHinkalAddress.map((n) => BigInt(n))
+    const t = s;
+    return t.feeStructure.flatFee = BigInt(e.feeStructure.flatFee), t.feeStructure.variableRate = BigInt(e.feeStructure.variableRate), t.slippageValues = e.slippageValues.map((r) => BigInt(r)), t.hinkalLogicArgs.executeApprovalChanges = e.hinkalLogicArgs.executeApprovalChanges.map((r) => BigInt(r)), t.hinkalLogicArgs.inHinkalAddress = BigInt(e.hinkalLogicArgs.inHinkalAddress), t.hinkalLogicArgs.useApprovalUtxoData = e.hinkalLogicArgs.useApprovalUtxoData.map(
+      (r) => ({
+        approvalChanges: r.approvalChanges.map((n) => BigInt(n)),
+        externalApprovalAddresses: r.externalApprovalAddresses,
+        conversionInHinkalAddress: r.conversionInHinkalAddress.map((n) => BigInt(n))
       })
-    ), s;
+    ), t;
   }
-}, se = (e, r, s, t, n, a, l, i, m, H, C, u, g, k, b) => {
-  const h = Object.values(m || O), v = b ?? R(t ?? E, s);
+}, se = (e, s, t, r, n, a, l, i, m, H, C, u, g, k, b) => {
+  const h = Object.values(m || O), v = b ?? R(r ?? E, t);
   if (e === "v1x0") {
     const p = o.utils.defaultAbiCoder.encode(
       [
@@ -104,9 +104,9 @@ const $ = (e, r) => e.map((s, t) => s.map((n) => r[t] ? "0" : n.getNullifier()))
         "uint256[]"
       ],
       [
-        r,
         s,
         t,
+        r,
         typeof n == "bigint" ? n : f(n),
         a,
         h,
@@ -119,9 +119,9 @@ const $ = (e, r) => e.map((s, t) => s.map((n) => r[t] ? "0" : n.getNullifier()))
     const p = o.utils.defaultAbiCoder.encode(
       ["uint16", "address", "address", "uint256", "bytes"],
       [
-        r,
         s,
         t,
+        r,
         typeof n == "bigint" ? n : f(n),
         a
       ]
@@ -155,18 +155,18 @@ const $ = (e, r) => e.map((s, t) => s.map((n) => r[t] ? "0" : n.getNullifier()))
     ), I = BigInt(o.utils.keccak256(p)), B = BigInt(o.utils.keccak256(A)), V = o.utils.defaultAbiCoder.encode(["uint256", "uint256"], [I, B]);
     return BigInt(o.utils.keccak256(V)) % c;
   }
-}, x = (e) => e.startsWith("swapperMO") || e.startsWith("swapperME") ? 2 : e.startsWith("swapperMW") ? 1 : (e.startsWith("swapperMHA"), 0), ne = (e, r, s, t, n, a) => {
+}, x = (e) => e.startsWith("swapperMO") || e.startsWith("swapperME") ? 2 : e.startsWith("swapperMW") ? 1 : (e.startsWith("swapperMHA"), 0), ne = (e, s, t, r, n, a) => {
   if (e.startsWith("swapperMWMin0"))
     return 4;
   const l = x(e);
   return 10 + // stealthAddressStructure.H1
-  r.length + s.length + t.flat().length + n.flat().length + l + a + F * r.length;
-}, re = (e, r) => {
-  const { h0: s, h1: t } = S.getStealthAddressCompressedPoints(e, r), n = BigInt(S.getStealthAddress(e, r));
+  s.length + t.length + r.flat().length + n.flat().length + l + a + F * s.length;
+}, re = (e, s) => {
+  const { h0: t, h1: r } = S.getStealthAddressCompressedPoints(e, s), n = BigInt(S.getStealthAddress(e, s));
   return {
     extraRandomization: e,
-    H0: s,
-    H1: t,
+    H0: t,
+    H1: r,
     stealthAddress: n
   };
 };

package/functions/snarkjs/constructEmporiumProof.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const de=require("../../data-structures/utxo/Utxo.cjs"),le=require("../../data-structures/crypto-keys/keys.cjs"),d=require("../../constants/protocol.constants.cjs"),ue=require("../../constants/chains.constants.cjs"),ge=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),pe=require("../../webworker/performTaskWithWorker.cjs"),Se=require("../../webworker/worker.registry.cjs"),s=require("./common.snarkjs.cjs"),O=require("../web3/etherFunctions.cjs"),Z=require("../private-wallet/emporium.helpers.cjs"),he=require("../../types/external-action.types.cjs"),fe=require("../../types/circom-data.types.cjs"),Ae=require("./generateCircomData.cjs"),qe=require("./generateZkProof.cjs"),$=require("../utils/time.utils.cjs"),ke=require("../../types/hinkal.types.cjs"),ye=require("../utils/fees.utils.cjs"),j=require("../../data-structures/Hinkal/hinkalCheckTokenRegistry.cjs"),He=require("../../crypto/poseidon.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const Ce=require("./getMerkleTreeSiblingsAndRootHashes.cjs"),Te=async(o,G,J,l,A,t,e,m,C,Q,T,X,Y,w=d.zeroAddress,c=ue.chainIds.localhost,u=t.map(()=>!1),q=t.map(()=>0n),g,n=void 0,L=!1,p,S=void 0,V,M=d.defaultSignatureData,x,U=!0)=>{const P=s.calcAmountChanges(t,e),k=s.calcEncryptedOutputs(e,!1),h=m.getShieldedPrivateKey(),z=de.Utxo.findCorrectRandomization(O.randomBigInt(31),h),ee=await j.hinkalCheckTokenRegistry(V??j.createHinkalHelperFromData(c),l,s.calcAmountChanges(t,e,!0)),D=t.map(a=>a.map(i=>i.getConstructableParams())),{inCommitmentSiblings:te,inCommitmentSiblingSides:ae,accessTokenSiblings:_,accessTokenSiblingSides:W,rootHashHinkal:b,rootHashAccessToken:y}=await Ce.getMerkleTreeSiblingsAndRootHashes(c,m,D,L,ee,G,J,U),v=await pe.performTaskWithWorker({type:Se.WorkerVariant.ZKProof,payload:{type:ge.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:D,onChainCreation:u,proverVersion:o}}}),E=s.buildOutCommitments(o,e,u),H=x??O.randomBigInt(31),re=He.poseidonFunction(H),r={rootHashHinkal:b,erc20TokenAddresses:l,tokenIds:A,inNullifiers:v,outTimeStamp:e.length>0?BigInt(e[0][0].timeStamp):$.getCurrentTimeInSeconds(),extraRandomization:z,amountChanges:P,outCommitments:E,rootHashAccessToken:y,calldataHash:0n,shieldedPrivateKey:h,accessTokenSiblings:_,accessTokenSiblingSides:W,outAmounts:e.map(a=>a.map(i=>i.amount)),outPublicKeys:e.map(a=>a.map(i=>i.getStealthAddress())),inAmounts:t.map(a=>a.map(i=>i.amount.toString())),inTimeStamps:t.map(a=>a.map(i=>i.timeStamp)),inRandomizations:t.map(a=>a.map(i=>i.randomization)),inCommitmentSiblings:te,inCommitmentSiblingSides:ae,messageSeed:H},ne=g?le.UserKeys.getSignerAddressFromPrivateKey(c,g.privateKey):void 0,I=T,R=he.ExternalActionId.Emporium,F=await Z.encodeEmporiumMetadata(c,T,g?.privateKey,X,re,ne),f=e.length===0?"swapperMWMin0":`swapperMW${C}x${Q}x${e[0].length}`,N=s.calcPublicSignalCount(f,r.erc20TokenAddresses,r.amountChanges,r.inNullifiers,r.outCommitments,A.length);if(n||(n=ke.defaultHinkalLogicArgs(P.length,m),n.interactionAddress="0x032f580aFFE7a5f17025fAF83c13B4277A880532",n.inHinkalAddress=m.getInHinkalAddress(n.interactionAddress)),o==="v1x1"){if(r.interactionAddress=n.interactionAddress,m.getInHinkalAddress(r.interactionAddress)!==n.inHinkalAddress)throw new Error("inHinkalAddress mismatch");r.externalApprovalAddresses=n?.useApprovalUtxoData?.map(({externalApprovalAddresses:a})=>a)??Array(C).fill([d.zeroAddress,d.zeroAddress,d.zeroAddress])}S||(S=ye.generateFeeStructure(q,l));const B=s.calcAmountChanges(t,e,!0);p||(p=s.getSlippageValues(B,n)),r.calldataHash=s.createCallDataHash(o,N,w,I,R,F,k,q,void 0,p,u,n,S,M);const K={outTimeStamp:$.getCurrentTimeInSeconds(),rootHashAccessToken:y,calldataHash:r.calldataHash,shieldedPrivateKey:h,accessTokenSiblings:_,accessTokenSiblingSides:W,messageSeed:H},{zkCallData:ie}=await qe.generateZkProof(o,c,f,f==="swapperMWMin0"?K:r,Y),se=s.calcStealthAddressStructure(z,h),oe=await Ae.generateCircomData(o,E,v,b,y,B,l,t,e,k,q,N,R,I,F,w,r.calldataHash,A,se,u,fe.defaultHookData,f==="swapperMWMin0"?K.outTimeStamp:r.outTimeStamp,n,p,S,M),ce={tokenNumber:t.length,nullifierAmount:t.length>0?t[0].length:0,outputAmount:e.length>0?e[0].length:0},me=await Z.getAuthorizationDataIfNeeded(c,g?.privateKey);return{zkCallData:ie,circomData:oe,dimData:ce,encryptedOutputs:k,authorizationData:me}};exports.constructEmporiumProof=Te;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const de=require("../../data-structures/utxo/Utxo.cjs"),le=require("../../data-structures/crypto-keys/keys.cjs"),d=require("../../constants/protocol.constants.cjs"),ue=require("../../constants/chains.constants.cjs"),ge=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),pe=require("../../webworker/performTaskWithWorker.cjs"),Se=require("../../webworker/worker.registry.cjs"),o=require("./common.snarkjs.cjs"),O=require("../web3/etherFunctions.cjs"),Z=require("../private-wallet/emporium.helpers.cjs"),he=require("../../types/external-action.types.cjs"),Ae=require("../../types/circom-data.types.cjs"),fe=require("./generateCircomData.cjs"),qe=require("./generateZkProof.cjs"),$=require("../utils/time.utils.cjs"),ke=require("../../types/hinkal.types.cjs"),ye=require("../utils/fees.utils.cjs"),j=require("../../data-structures/Hinkal/hinkalCheckTokenRegistry.cjs"),He=require("../../crypto/poseidon.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const Ce=require("./getMerkleTreeSiblingsAndRootHashes.cjs"),Te=async(s,G,J,l,f,t,e,m,C,Q,T,X,Y,w=d.zeroAddress,c=ue.chainIds.localhost,u=t.map(()=>!1),q=t.map(()=>0n),g,n=void 0,L=!1,p,S=void 0,V,M=d.defaultSignatureData,x,U=!0)=>{const P=o.calcAmountChanges(t,e),k=o.calcEncryptedOutputs(e),h=m.getShieldedPrivateKey(),z=de.Utxo.findCorrectRandomization(O.randomBigInt(31),h),ee=await j.hinkalCheckTokenRegistry(V??j.createHinkalHelperFromData(c),l,o.calcAmountChanges(t,e,!0)),D=t.map(a=>a.map(i=>i.getConstructableParams())),{inCommitmentSiblings:te,inCommitmentSiblingSides:ae,accessTokenSiblings:_,accessTokenSiblingSides:W,rootHashHinkal:b,rootHashAccessToken:y}=await Ce.getMerkleTreeSiblingsAndRootHashes(c,m,D,L,ee,G,J,U),v=await pe.performTaskWithWorker({type:Se.WorkerVariant.ZKProof,payload:{type:ge.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:D,onChainCreation:u,proverVersion:s}}}),E=o.buildOutCommitments(s,e,u),H=x??O.randomBigInt(31),re=He.poseidonFunction(H),r={rootHashHinkal:b,erc20TokenAddresses:l,tokenIds:f,inNullifiers:v,outTimeStamp:e.length>0?BigInt(e[0][0].timeStamp):$.getCurrentTimeInSeconds(),extraRandomization:z,amountChanges:P,outCommitments:E,rootHashAccessToken:y,calldataHash:0n,shieldedPrivateKey:h,accessTokenSiblings:_,accessTokenSiblingSides:W,outAmounts:e.map(a=>a.map(i=>i.amount)),outPublicKeys:e.map(a=>a.map(i=>i.getStealthAddress())),inAmounts:t.map(a=>a.map(i=>i.amount.toString())),inTimeStamps:t.map(a=>a.map(i=>i.timeStamp)),inRandomizations:t.map(a=>a.map(i=>i.randomization)),inCommitmentSiblings:te,inCommitmentSiblingSides:ae,messageSeed:H},ne=g?le.UserKeys.getSignerAddressFromPrivateKey(c,g.privateKey):void 0,I=T,R=he.ExternalActionId.Emporium,F=await Z.encodeEmporiumMetadata(c,T,g?.privateKey,X,re,ne),A=e.length===0?"swapperMWMin0":`swapperMW${C}x${Q}x${e[0].length}`,N=o.calcPublicSignalCount(A,r.erc20TokenAddresses,r.amountChanges,r.inNullifiers,r.outCommitments,f.length);if(n||(n=ke.defaultHinkalLogicArgs(P.length,m),n.interactionAddress="0x032f580aFFE7a5f17025fAF83c13B4277A880532",n.inHinkalAddress=m.getInHinkalAddress(n.interactionAddress)),s==="v1x1"){if(r.interactionAddress=n.interactionAddress,m.getInHinkalAddress(r.interactionAddress)!==n.inHinkalAddress)throw new Error("inHinkalAddress mismatch");r.externalApprovalAddresses=n?.useApprovalUtxoData?.map(({externalApprovalAddresses:a})=>a)??Array(C).fill([d.zeroAddress,d.zeroAddress,d.zeroAddress])}S||(S=ye.generateFeeStructure(q,l));const B=o.calcAmountChanges(t,e,!0);p||(p=o.getSlippageValues(B,n)),r.calldataHash=o.createCallDataHash(s,N,w,I,R,F,k,q,void 0,p,u,n,S,M);const K={outTimeStamp:$.getCurrentTimeInSeconds(),rootHashAccessToken:y,calldataHash:r.calldataHash,shieldedPrivateKey:h,accessTokenSiblings:_,accessTokenSiblingSides:W,messageSeed:H},{zkCallData:ie}=await qe.generateZkProof(s,c,A,A==="swapperMWMin0"?K:r,Y),oe=o.calcStealthAddressStructure(z,h),se=await fe.generateCircomData(s,E,v,b,y,B,l,t,e,k,q,N,R,I,F,w,r.calldataHash,f,oe,u,Ae.defaultHookData,A==="swapperMWMin0"?K.outTimeStamp:r.outTimeStamp,n,p,S,M),ce={tokenNumber:t.length,nullifierAmount:t.length>0?t[0].length:0,outputAmount:e.length>0?e[0].length:0},me=await Z.getAuthorizationDataIfNeeded(c,g?.privateKey);return{zkCallData:ie,circomData:se,dimData:ce,encryptedOutputs:k,authorizationData:me}};exports.constructEmporiumProof=Te;

package/functions/snarkjs/constructEmporiumProof.mjs

@@ -23,7 +23,7 @@ import "process";
 import "buffer";
 import { getMerkleTreeSiblingsAndRootHashes as Ia } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
 const mt = async (n, q, j, l, h, t, a, d, D, G, T, J, Q, P = A, o = ca.localhost, s = t.map(() => !1), H = t.map(() => 0n), c, r = void 0, X = !1, p, f = void 0, Y, k = sa, L, V = !0) => {
-  const v = C(t, a), w = ga(a, !1), S = d.getShieldedPrivateKey(), z = da.findCorrectRandomization($(31), S), x = await Wa(
+  const v = C(t, a), w = ga(a), S = d.getShieldedPrivateKey(), z = da.findCorrectRandomization($(31), S), x = await Wa(
     Y ?? ba(o),
     l,
     C(t, a, !0)

package/functions/snarkjs/constructGeneralZkProof.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const ae=require("../../constants/chains.constants.cjs"),d=require("../../constants/protocol.constants.cjs"),oe=require("../../data-structures/utxo/Utxo.cjs"),f=require("../../types/hinkal.stake.types.cjs"),re=require("../../webworker/performTaskWithWorker.cjs"),ie=require("../../webworker/worker.registry.cjs"),se=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),de=require("../web3/etherFunctions.cjs"),s=require("./common.snarkjs.cjs"),ce=require("./generateCircomData.cjs"),me=require("./generateZkProof.cjs"),le=require("../../types/hinkal.types.cjs"),ke=require("../utils/fees.utils.cjs"),j=require("../../data-structures/Hinkal/hinkalCheckTokenRegistry.cjs"),b=require("../../error-handling/logger.cjs"),ue=require("./getMerkleTreeSiblingsAndRootHashes.cjs"),Se=async(c,F,K,n,r,m,C,y,l,P,G,z=d.zeroAddress,h=ae.chainIds.localhost,k=n.map(()=>!1),H=n.map(()=>0n),R=void 0,i,J=!1,o=void 0,u,S=void 0,Q,_=d.defaultSignatureData,D,X=!0)=>{const I=s.calcAmountChanges(n,r),p=n.map(e=>e[0].erc20TokenAddress),T=s.calcEncryptedOutputs(r,(i&&i.mode!==f.HinkalStakeMode.Deposit)??!1),A=m.getShieldedPrivateKey(),w=oe.Utxo.findCorrectRandomization(de.randomBigInt(31),A),Y=await j.hinkalCheckTokenRegistry(Q??j.createHinkalHelperFromData(h),p,s.calcAmountChanges(n,r,!0)),W=n.map(e=>e.map(a=>a.getConstructableParams())),{inCommitmentSiblings:$,inCommitmentSiblingSides:L,accessTokenSiblings:V,accessTokenSiblingSides:U,rootHashHinkal:B,rootHashAccessToken:M}=await ue.getMerkleTreeSiblingsAndRootHashes(h,m,W,J,Y,F,K,X),Z=await re.performTaskWithWorker({type:ie.WorkerVariant.ZKProof,payload:{type:se.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:W,onChainCreation:k,proverVersion:c}}}),v=s.buildOutCommitments(c,r,k),t={rootHashHinkal:B,shieldedPrivateKey:A,erc20TokenAddresses:p,inAmounts:n.map(e=>e.map(a=>a.amount.toString())),inTimeStamps:n.map(e=>e.map(a=>a.timeStamp)),inRandomizations:n.map(e=>e.map(a=>a.randomization)),inNullifiers:Z,inCommitmentSiblings:$,inCommitmentSiblingSides:L,outAmounts:r.map(e=>e.map(a=>a.amount.toString())),outTimeStamp:BigInt(r[0][0].timeStamp),outPublicKeys:r.map(e=>e.map(a=>a.getStealthAddress())),extraRandomization:w,amountChanges:I,outCommitments:v,rootHashAccessToken:M,accessTokenSiblings:V,accessTokenSiblingSides:U,calldataHash:0n},g=n.map(e=>e[0].tokenId??0),N=g.reduce((e,a)=>e+a,0)>0?g.length:0;N>0&&(t.tokenIds=g);const q=s.calcPublicSignalCount(C,t.erc20TokenAddresses,t.amountChanges,t.inNullifiers,t.outCommitments,N);if(!o){o=le.defaultHinkalLogicArgs(I.length,m),o.interactionAddress=l??d.zeroAddress;const e=m.getInHinkalAddress(o.interactionAddress);o.inHinkalAddress=e}if(c==="v1x1"){if(t.interactionAddress=o?.interactionAddress??l??d.zeroAddress,m.getInHinkalAddress(t.interactionAddress)!==o.inHinkalAddress)throw new Error("inHinkalAddress mismatch");t.externalApprovalAddresses=o.useApprovalUtxoData?.map(({externalApprovalAddresses:e})=>e)??[d.zeroAddress,d.zeroAddress,d.zeroAddress]}S||(S=ke.generateFeeStructure(H,n.map(e=>e[0].erc20TokenAddress)));const O=s.calcAmountChanges(n,r,!0);u||(u=s.getSlippageValues(O,o)),b.Logger.log({publicSignalCount:q}),t.calldataHash=s.createCallDataHash(c,q,z,l,y,P,T,H,R,u,k,o,S,_,D),i&&(i.mode===f.HinkalStakeMode.Deposit&&(t.mode=0),i.mode===f.HinkalStakeMode.Stake&&(t.mode=1),i.mode===f.HinkalStakeMode.Unstake&&(t.mode=2),t.stakedTokenRecipient=i.stakedTokenRecipient,t.stakeBlinding=i.stakeBlinding,t.depositorAddress=i.depositorAddress);const{zkCallData:x,publicSignals:ee}=await me.generateZkProof(c,h,C,t,G);b.Logger.log({publicSignals:ee});const te=s.calcStealthAddressStructure(w,A),E=await ce.generateCircomData(c,v,Z,B,M,O,p,n,r,T,H,q,y,l,P,z,t.calldataHash,g,te,k,R,void 0,o,u,S,_,D);b.Logger.log({circomData:E});const ne={tokenNumber:n.length,nullifierAmount:n[0].length,outputAmount:r[0].length};return{zkCallData:x,circomData:E,dimData:ne,encryptedOutputs:T}};exports.constructZkProof=Se;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const te=require("../../constants/chains.constants.cjs"),i=require("../../constants/protocol.constants.cjs"),ne=require("../../data-structures/utxo/Utxo.cjs"),ae=require("../../webworker/performTaskWithWorker.cjs"),re=require("../../webworker/worker.registry.cjs"),oe=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),se=require("../web3/etherFunctions.cjs"),s=require("./common.snarkjs.cjs"),ie=require("./generateCircomData.cjs"),ce=require("./generateZkProof.cjs"),de=require("../../types/hinkal.types.cjs"),me=require("../utils/fees.utils.cjs"),E=require("../../data-structures/Hinkal/hinkalCheckTokenRegistry.cjs"),q=require("../../error-handling/logger.cjs"),le=require("./getMerkleTreeSiblingsAndRootHashes.cjs"),ke=async(c,j,F,t,o,d,b,C,m,p,M,P=i.zeroAddress,S=te.chainIds.localhost,l=t.map(()=>!1),A=t.map(()=>0n),y=void 0,K=!1,a=void 0,k,g=void 0,G,z=i.defaultSignatureData,I,J=!0)=>{const R=s.calcAmountChanges(t,o),h=t.map(e=>e[0].erc20TokenAddress),f=s.calcEncryptedOutputs(o),H=d.getShieldedPrivateKey(),_=ne.Utxo.findCorrectRandomization(se.randomBigInt(31),H),Q=await E.hinkalCheckTokenRegistry(G??E.createHinkalHelperFromData(S),h,s.calcAmountChanges(t,o,!0)),w=t.map(e=>e.map(n=>n.getConstructableParams())),{inCommitmentSiblings:X,inCommitmentSiblingSides:Y,accessTokenSiblings:$,accessTokenSiblingSides:L,rootHashHinkal:D,rootHashAccessToken:W}=await le.getMerkleTreeSiblingsAndRootHashes(S,d,w,K,Q,j,F,J),Z=await ae.performTaskWithWorker({type:re.WorkerVariant.ZKProof,payload:{type:oe.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:w,onChainCreation:l,proverVersion:c}}}),v=s.buildOutCommitments(c,o,l),r={rootHashHinkal:D,shieldedPrivateKey:H,erc20TokenAddresses:h,inAmounts:t.map(e=>e.map(n=>n.amount.toString())),inTimeStamps:t.map(e=>e.map(n=>n.timeStamp)),inRandomizations:t.map(e=>e.map(n=>n.randomization)),inNullifiers:Z,inCommitmentSiblings:X,inCommitmentSiblingSides:Y,outAmounts:o.map(e=>e.map(n=>n.amount.toString())),outTimeStamp:BigInt(o[0][0].timeStamp),outPublicKeys:o.map(e=>e.map(n=>n.getStealthAddress())),extraRandomization:_,amountChanges:R,outCommitments:v,rootHashAccessToken:W,accessTokenSiblings:$,accessTokenSiblingSides:L,calldataHash:0n},u=t.map(e=>e[0].tokenId??0),B=u.reduce((e,n)=>e+n,0)>0?u.length:0;B>0&&(r.tokenIds=u);const T=s.calcPublicSignalCount(b,r.erc20TokenAddresses,r.amountChanges,r.inNullifiers,r.outCommitments,B);if(!a){a=de.defaultHinkalLogicArgs(R.length,d),a.interactionAddress=m??i.zeroAddress;const e=d.getInHinkalAddress(a.interactionAddress);a.inHinkalAddress=e}if(c==="v1x1"){if(r.interactionAddress=a?.interactionAddress??m??i.zeroAddress,d.getInHinkalAddress(r.interactionAddress)!==a.inHinkalAddress)throw new Error("inHinkalAddress mismatch");r.externalApprovalAddresses=a.useApprovalUtxoData?.map(({externalApprovalAddresses:e})=>e)??[i.zeroAddress,i.zeroAddress,i.zeroAddress]}g||(g=me.generateFeeStructure(A,t.map(e=>e[0].erc20TokenAddress)));const N=s.calcAmountChanges(t,o,!0);k||(k=s.getSlippageValues(N,a)),q.Logger.log({publicSignalCount:T}),r.calldataHash=s.createCallDataHash(c,T,P,m,C,p,f,A,y,k,l,a,g,z,I);const{zkCallData:V,publicSignals:U}=await ce.generateZkProof(c,S,b,r,M);q.Logger.log({publicSignals:U});const x=s.calcStealthAddressStructure(_,H),O=await ie.generateCircomData(c,v,Z,D,W,N,h,t,o,f,A,T,C,m,p,P,r.calldataHash,u,x,l,y,void 0,a,k,g,z,I);q.Logger.log({circomData:O});const ee={tokenNumber:t.length,nullifierAmount:t[0].length,outputAmount:o[0].length};return{zkCallData:V,circomData:O,dimData:ee,encryptedOutputs:f}};exports.constructZkProof=ke;

package/functions/snarkjs/constructGeneralZkProof.d.ts

@@ -3,10 +3,9 @@ import { UserKeys } from '../../data-structures/crypto-keys/keys';
 import { Utxo } from '../../data-structures/utxo/Utxo';
 import { CircomDataV1x1, DimDataType, HookDataType } from '../../types/circom-data.types';
 import { ExternalActionId } from '../../types/external-action.types';
-import { StakeArgs } from '../../types/hinkal.stake.types';
 import { FeeStructure, HinkalLogicArgs, ProverVersion } from '../../types/hinkal.types';
 import { ethers } from 'ethers';
-export declare const constructZkProof: <T = CircomDataV1x1>(proverVersion: ProverVersion, merkleTree: MerkleTree<bigint>, merkleTreeAccessToken: MerkleTree<bigint>, inputUtxos: Utxo[][], outputUtxos: Utxo[][], userKeys: UserKeys, verifierName: string, externalActionId: ExternalActionId | 0n, externalAddress: string | undefined, externalActionMetadata: string, generateProofRemotely: boolean, relay?: string, chainId?: number, onChainCreation?: boolean[], flatFees?: bigint[], hookData?: HookDataType | undefined, stakeArgs?: StakeArgs, patchAccessTokenMerkleTree?: boolean, hinkalLogicArgs?: HinkalLogicArgs | undefined, slippageValues?: bigint[], feeStructure?: FeeStructure | undefined, hinkalHelper?: ethers.Contract, signatureData?: import('../../index.ts').SignatureData, originalSender?: string, hasLocalTrees?: boolean) => Promise<{
+export declare const constructZkProof: <T = CircomDataV1x1>(proverVersion: ProverVersion, merkleTree: MerkleTree<bigint>, merkleTreeAccessToken: MerkleTree<bigint>, inputUtxos: Utxo[][], outputUtxos: Utxo[][], userKeys: UserKeys, verifierName: string, externalActionId: ExternalActionId | 0n, externalAddress: string | undefined, externalActionMetadata: string, generateProofRemotely: boolean, relay?: string, chainId?: number, onChainCreation?: boolean[], flatFees?: bigint[], hookData?: HookDataType | undefined, patchAccessTokenMerkleTree?: boolean, hinkalLogicArgs?: HinkalLogicArgs | undefined, slippageValues?: bigint[], feeStructure?: FeeStructure | undefined, hinkalHelper?: ethers.Contract, signatureData?: import('../../index.ts').SignatureData, originalSender?: string, hasLocalTrees?: boolean) => Promise<{
     zkCallData: import('../../index.ts').NewZkCallDataType;
     circomData: T;
     dimData: DimDataType;