@hinkal/common 0.2.15 → 0.2.16

package/functions/snarkjs/constructEmporiumProof.mjs

@@ -1,169 +1,166 @@
-import { Utxo as fe } from "../../data-structures/utxo/Utxo.mjs";
-import { zeroAddress as d, defaultSignatureData as Se } from "../../constants/protocol.constants.mjs";
-import { chainIds as ke } from "../../constants/chains.constants.mjs";
-import { ZKProofWorkerActionType as y } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
-import { performTaskWithWorker as N } from "../../webworker/performTaskWithWorker.mjs";
-import { WorkerVariant as D } from "../../webworker/worker.registry.mjs";
-import { calcAmountChanges as M, calcEncryptedOutputs as Ae, buildOutCommitments as ge, calcPublicSignalCount as he, getSlippageValues as Te, createCallDataHash as Ie, calcStealthAddressStructure as He } from "./common.snarkjs.mjs";
-import { randomBigInt as Q } from "../web3/etherFunctions.mjs";
-import { encodeEmporiumMetadata as Ce } from "../private-wallet/emporium.helpers.mjs";
-import { ExternalActionId as ye } from "../../types/external-action.types.mjs";
-import { defaultHookData as Ne } from "../../types/circom-data.types.mjs";
-import { generateCircomData as De } from "./generateCircomData.mjs";
-import { generateZkProof as Me } from "./generateZkProof.mjs";
-import { utils as P } from "ethers";
-import { getCurrentTimeInSeconds as X } from "../utils/time.utils.mjs";
-import { defaultHinkalLogicArgs as Pe } from "../../types/hinkal.types.mjs";
-import { generateFeeStructure as Ee } from "../utils/fees.utils.mjs";
-import { hinkalCheckTokenRegistry as we, createHinkalHelperFromData as We } from "../../data-structures/Hinkal/hinkalCheckTokenRegistry.mjs";
-import { getPatchedAccessTokenMerkleTree as ue } from "../../data-structures/merkle-tree/getPatchedAccessTokenMerkleTree.mjs";
-import { Logger as E } from "../../error-handling/logger.mjs";
-const xe = async (i, w, Y, a, t, o, V, x, U, ee, ae, W = d, u = ke.localhost, c = a.map(() => !1), S = a.map(() => 0n), k, n = void 0, te = !1, l, s = void 0, re, ne) => {
-  const A = M(a, t), g = a.map((e) => e[0].erc20TokenAddress), h = Ae(t, !1), p = o.getShieldedPrivateKey(), _ = fe.findCorrectRandomization(Q(31), p), b = await we(
-    re ?? We(u),
-    g,
-    M(a, t, !0)
-  ), T = ue(
-    Y,
+import { Utxo as da } from "../../data-structures/utxo/Utxo.mjs";
+import { UserKeys as la } from "../../data-structures/crypto-keys/keys.mjs";
+import { zeroAddress as A, defaultSignatureData as sa } from "../../constants/protocol.constants.mjs";
+import { chainIds as ca } from "../../constants/chains.constants.mjs";
+import { ZKProofWorkerActionType as pa } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
+import { performTaskWithWorker as fa } from "../../webworker/performTaskWithWorker.mjs";
+import { WorkerVariant as Sa } from "../../webworker/worker.registry.mjs";
+import { calcAmountChanges as C, calcEncryptedOutputs as ga, buildOutCommitments as Aa, calcPublicSignalCount as ha, getSlippageValues as Ha, createCallDataHash as wa, calcStealthAddressStructure as ya } from "./common.snarkjs.mjs";
+import { randomBigInt as $ } from "../web3/etherFunctions.mjs";
+import { encodeEmporiumMetadata as Ma, getAuthorizationDataIfNeeded as Ca } from "../private-wallet/emporium.helpers.mjs";
+import { ExternalActionId as Da } from "../../types/external-action.types.mjs";
+import { defaultHookData as Ta } from "../../types/circom-data.types.mjs";
+import { generateCircomData as Pa } from "./generateCircomData.mjs";
+import { generateZkProof as ka } from "./generateZkProof.mjs";
+import { getCurrentTimeInSeconds as _ } from "../utils/time.utils.mjs";
+import { defaultHinkalLogicArgs as va } from "../../types/hinkal.types.mjs";
+import { generateFeeStructure as za } from "../utils/fees.utils.mjs";
+import { hinkalCheckTokenRegistry as Wa, createHinkalHelperFromData as ba } from "../../data-structures/Hinkal/hinkalCheckTokenRegistry.mjs";
+import { poseidonFunction as Ea } from "../../crypto/poseidon.mjs";
+import "circomlibjs-hinkal-fork";
+import "libsodium-wrappers";
+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(
+    Y ?? ba(o),
+    l,
+    C(t, a, !0)
+  ), W = t.map((e) => e.map((i) => i.getConstructableParams())), {
+    inCommitmentSiblings: U,
+    inCommitmentSiblingSides: aa,
+    accessTokenSiblings: b,
+    accessTokenSiblingSides: E,
+    rootHashHinkal: I,
+    rootHashAccessToken: y
+  } = await Ia(
     o,
-    te,
-    b
-  );
-  E.log({ kycRequiredEmporium: b, patchedMerkleTree: T, amountChanges: A, erc20TokenAddresses: g });
-  const oe = T.toJSON(), z = w.getRootHash(), I = T.getRootHash(), R = a.map((e) => e.map((m) => m.getConstructableParams())), O = o.getSignature(), { accessTokenSiblings: v, accessTokenSiblingSides: B } = await N({
-    type: D.ZKProof,
-    payload: {
-      type: y.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,
-      data: {
-        userSignature: O,
-        merkleTreeAccessTokenSerialized: oe
-      }
-    }
-  }), { inCommitmentSiblings: me, inCommitmentSiblingSides: ie } = await N({
-    type: D.ZKProof,
-    payload: {
-      type: y.CALC_COMMITMENTS_SIBLING_AND_SIDES,
-      data: { inputUtxosSerialized: R, userSignature: O, merkleTreeSerialized: w.toJSON() }
-    }
-  }), Z = await N({
-    type: D.ZKProof,
+    d,
+    W,
+    X,
+    x,
+    q,
+    j,
+    V
+  ), N = await fa({
+    type: Sa.ZKProof,
     payload: {
-      type: y.BUILD_IN_NULLIFIERS,
-      data: { inputUtxosSerialized: R, onChainCreation: c, proverVersion: i }
+      type: pa.BUILD_IN_NULLIFIERS,
+      data: { inputUtxosSerialized: W, onChainCreation: s, proverVersion: n }
     }
-  }), J = ge(i, t, c), H = a.map((e) => e[0].tokenId ?? 0), r = {
-    rootHashHinkal: z,
-    erc20TokenAddresses: g,
-    tokenIds: H,
-    inNullifiers: Z,
-    outTimeStamp: t.length > 0 ? BigInt(t[0][0].timeStamp) : X(),
-    extraRandomization: _,
-    amountChanges: A,
-    outCommitments: J,
-    rootHashAccessToken: I,
+  }), R = Aa(n, a, s), M = L ?? $(31), ta = Ea(M), m = {
+    rootHashHinkal: I,
+    erc20TokenAddresses: l,
+    tokenIds: h,
+    inNullifiers: N,
+    outTimeStamp: a.length > 0 ? BigInt(a[0][0].timeStamp) : _(),
+    extraRandomization: z,
+    amountChanges: v,
+    outCommitments: R,
+    rootHashAccessToken: y,
     calldataHash: 0n,
-    shieldedPrivateKey: p,
-    hinkalWalletNonce: k ?? 0n,
-    accessTokenSiblings: v,
-    accessTokenSiblingSides: B,
-    outAmounts: t.map((e) => e[0].amount),
-    outPublicKeys: t.map((e) => e[0].getStealthAddress()),
-    inAmounts: a.map((e) => e.map((m) => m.amount.toString())),
-    inTimeStamps: a.map((e) => e.map((m) => m.timeStamp)),
-    inRandomizations: a.map((e) => e.map((m) => m.randomization)),
-    inCommitmentSiblings: me,
-    inCommitmentSiblingSides: ie
-  }, $ = k ? o.getWalletSalt(k) : void 0, de = $ ? P.hexlify(P.zeroPad(P.arrayify($), 32)) : void 0, q = a.length === 0 ? Q(30) : 0n, f = U, G = ye.Emporium, K = Ce(ee, de, q), C = t.length === 0 ? "swapperMWMin0" : `swapperMW${V}x${x}x${t[0].length}`, F = he(
-    C,
-    r.erc20TokenAddresses,
-    r.amountChanges,
-    r.inNullifiers,
-    r.outCommitments,
-    H.length
+    shieldedPrivateKey: S,
+    accessTokenSiblings: b,
+    accessTokenSiblingSides: E,
+    outAmounts: a.map((e) => e.map((i) => i.amount)),
+    outPublicKeys: a.map((e) => e.map((i) => i.getStealthAddress())),
+    inAmounts: t.map((e) => e.map((i) => i.amount.toString())),
+    inTimeStamps: t.map((e) => e.map((i) => i.timeStamp)),
+    inRandomizations: t.map((e) => e.map((i) => i.randomization)),
+    inCommitmentSiblings: U,
+    inCommitmentSiblingSides: aa,
+    messageSeed: M
+  }, ea = c ? la.getSignerAddressFromPrivateKey(o, c.privateKey) : void 0, F = T, K = Da.Emporium, B = await Ma(
+    o,
+    T,
+    c?.privateKey,
+    J,
+    ta,
+    ea
+  ), g = a.length === 0 ? "swapperMWMin0" : `swapperMW${D}x${G}x${a[0].length}`, u = ha(
+    g,
+    m.erc20TokenAddresses,
+    m.amountChanges,
+    m.inNullifiers,
+    m.outCommitments,
+    h.length
   );
-  if (!n) {
-    n = Pe(A.length, o), n.interactionAddress = f ?? d;
-    const e = o.getInHinkalAddress(f ?? d);
-    n.inHinkalAddress = e;
-  }
-  if (i === "v1x1") {
-    if (r.interactionAddress = n.interactionAddress, o.getInHinkalAddress(r.interactionAddress) !== n.inHinkalAddress)
+  if (r || (r = va(v.length, d), r.interactionAddress = "0x032f580aFFE7a5f17025fAF83c13B4277A880532", r.inHinkalAddress = d.getInHinkalAddress(r.interactionAddress)), n === "v1x1") {
+    if (m.interactionAddress = r.interactionAddress, d.getInHinkalAddress(m.interactionAddress) !== r.inHinkalAddress)
       throw new Error("inHinkalAddress mismatch");
-    r.externalApprovalAddresses = n?.useApprovalUtxoData?.map(
-      ({ externalApprovalAddresses: e }) => e
-    ) ?? [d, d, d];
+    m.externalApprovalAddresses = r?.useApprovalUtxoData?.map(({ externalApprovalAddresses: e }) => e) ?? Array(D).fill([A, A, A]);
   }
-  s || (s = Ee(
-    S,
-    a.map((e) => e[0].erc20TokenAddress)
-  )), E.log("after feeStructure");
-  const j = M(a, t, !0);
-  l || (l = Te(j, n)), r.calldataHash = Ie(
-    i,
+  f || (f = za(H, l));
+  const O = C(t, a, !0);
+  p || (p = Ha(O, r)), m.calldataHash = wa(
+    n,
+    u,
+    P,
     F,
-    W,
-    f,
-    G,
     K,
-    h,
-    S,
+    B,
+    w,
+    H,
     void 0,
-    l,
-    c,
-    n,
+    p,
     s,
-    Se
+    r,
+    f,
+    k
   );
-  const ce = {
-    replayProtection: q,
-    outTimeStamp: X(),
-    rootHashAccessToken: I,
-    calldataHash: r.calldataHash,
-    shieldedPrivateKey: p,
-    hinkalWalletNonce: r.hinkalWalletNonce,
-    accessTokenSiblings: v,
-    accessTokenSiblingSides: B
-  }, { zkCallData: le } = await Me(
-    i,
-    u,
-    C,
-    C === "swapperMWMin0" ? ce : r,
-    ae
-  ), se = He(_, p), L = await De(
-    i,
-    J,
-    Z,
-    z,
+  const Z = {
+    outTimeStamp: _(),
+    rootHashAccessToken: y,
+    calldataHash: m.calldataHash,
+    shieldedPrivateKey: S,
+    accessTokenSiblings: b,
+    accessTokenSiblingSides: E,
+    messageSeed: M
+  }, { zkCallData: ma } = await ka(
+    n,
+    o,
+    g,
+    g === "swapperMWMin0" ? Z : m,
+    Q
+  ), ra = ya(z, S), ia = await Pa(
+    n,
+    R,
+    N,
     I,
-    j,
-    a,
+    y,
+    O,
+    l,
     t,
-    h,
-    S,
-    F,
-    G,
-    f,
-    K,
-    W,
-    r.calldataHash,
+    a,
+    w,
     H,
-    se,
-    c,
-    Ne,
-    r.outTimeStamp,
-    n,
-    l,
+    u,
+    K,
+    F,
+    B,
+    P,
+    m.calldataHash,
+    h,
+    ra,
     s,
-    ne
+    Ta,
+    g === "swapperMWMin0" ? Z.outTimeStamp : m.outTimeStamp,
+    // although these variables seem to contain the same value, there can actually be a single second difference if the timing is unlucky
+    r,
+    p,
+    f,
+    k
+  ), na = {
+    tokenNumber: t.length,
+    nullifierAmount: t.length > 0 ? t[0].length : 0,
+    outputAmount: a.length > 0 ? a[0].length : 0
+  }, oa = await Ca(
+    o,
+    c?.privateKey
   );
-  E.log("circomdata in emporium proof", { circomData: L });
-  const pe = {
-    tokenNumber: a.length,
-    nullifierAmount: a.length > 0 ? a[0].length : 0,
-    outputAmount: t.length > 0 ? t[0].length : 0
-  };
-  return { zkCallData: le, circomData: L, dimData: pe, encryptedOutputs: h };
+  return { zkCallData: ma, circomData: ia, dimData: na, encryptedOutputs: w, authorizationData: oa };
 };
 export {
-  xe as constructEmporiumProof
+  mt as constructEmporiumProof
 };

package/functions/snarkjs/constructGeneralZkProof.cjs

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

package/functions/snarkjs/constructGeneralZkProof.d.ts

@@ -1,14 +1,14 @@
 import { MerkleTree } from '../../data-structures/merkle-tree';
 import { UserKeys } from '../../data-structures/crypto-keys/keys';
 import { Utxo } from '../../data-structures/utxo/Utxo';
-import { CircomDataBaseType, DimDataType, HookDataType } from '../../types/circom-data.types';
+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: (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) => Promise<{
-    zkCallData: import('../../index.ts').NewZkCallDataType;
-    circomData: CircomDataBaseType;
+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("../..").SignatureData, originalSender?: string, hasLocalTrees?: boolean) => Promise<{
+    zkCallData: import("../..").NewZkCallDataType;
+    circomData: T;
     dimData: DimDataType;
     encryptedOutputs: string[][];
 }>;