@hinkal/common 0.2.12 → 0.2.14

package/functions/snarkjs/constructEmporiumProof.mjs

@@ -1,105 +1,169 @@
-import { Utxo as V } from "../../data-structures/utxo/Utxo.mjs";
-import { zeroAddress as j } from "../../constants/protocol.constants.mjs";
-import { chainIds as q } from "../../constants/chains.constants.mjs";
-import { ZKProofWorkerActionType as d } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
-import { performTaskWithWorker as p } from "../../webworker/performTaskWithWorker.mjs";
-import { WorkerVariant as S } from "../../webworker/worker.registry.mjs";
-import { calcAmountChanges as F, calcEncryptedOutputs as Q, buildOutCommitments as X, calcPublicSignalCount as Y, createCallDataHash as x, calcStealthAddressStructure as U } from "./common.snarkjs.mjs";
-import { randomBigInt as tt } from "../web3/etherFunctions.mjs";
-import { encodeEmporiumMetadata as at } from "../private-wallet/emporium.helpers.mjs";
-import { ExternalActionId as et } from "../../types/external-action.types.mjs";
-import { defaultHookData as ot } from "../../types/circom-data.types.mjs";
-import { generateCircomData as rt } from "./generateCircomData.mjs";
-import { generateZkProof as mt } from "./generateZkProof.mjs";
-const Ct = async (f, g, a, e, n, _, b, H, z, v, A = j, L = q.localhost, m = a.map(() => !1), h = a.map(() => 0n), i, nt, it) => {
-  const u = f.getRootHash(), k = g.getRootHash(), I = a.map((t) => t.map((r) => r.getConstructableParams())), C = n.getSignature(), { accessTokenSiblings: O, accessTokenSiblingSides: W } = await p({
-    type: S.ZKProof,
+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,
+    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: d.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,
+      type: y.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,
       data: {
-        userSignature: C,
-        merkleTreeAccessTokenSerialized: g.toJSON()
+        userSignature: O,
+        merkleTreeAccessTokenSerialized: oe
       }
     }
-  }), { inCommitmentSiblings: K, inCommitmentSiblingSides: M } = await p({
-    type: S.ZKProof,
+  }), { inCommitmentSiblings: me, inCommitmentSiblingSides: ie } = await N({
+    type: D.ZKProof,
     payload: {
-      type: d.CALC_COMMITMENTS_SIBLING_AND_SIDES,
-      data: { inputUtxosSerialized: I, userSignature: C, merkleTreeSerialized: f.toJSON() }
+      type: y.CALC_COMMITMENTS_SIBLING_AND_SIDES,
+      data: { inputUtxosSerialized: R, userSignature: O, merkleTreeSerialized: w.toJSON() }
     }
-  }), R = F(a, e), l = Q(e, !1), s = n.getShieldedPrivateKey(), y = V.findCorrectRandomization(tt(31), s), w = await p({
-    type: S.ZKProof,
+  }), Z = await N({
+    type: D.ZKProof,
     payload: {
-      type: d.BUILD_IN_NULLIFIERS,
-      data: { inputUtxosSerialized: I, onChainCreation: m }
+      type: y.BUILD_IN_NULLIFIERS,
+      data: { inputUtxosSerialized: R, onChainCreation: c, proverVersion: i }
     }
-  }), c = a.map((t) => t[0].tokenId ?? 0), o = {
-    rootHashHinkal: u,
-    erc20TokenAddresses: a.map((t) => t[0].erc20TokenAddress),
-    tokenIds: c,
-    inNullifiers: w,
-    outTimeStamp: BigInt(e[0][0].timeStamp),
-    extraRandomization: y,
-    amountChanges: R,
-    outCommitments: X(e, m).map((t) => t[0]),
-    rootHashAccessToken: k,
+  }), 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,
     calldataHash: 0n,
-    shieldedPrivateKey: s,
-    hinkalWalletNonce: i ?? 0n,
-    accessTokenSiblings: O,
-    accessTokenSiblingSides: W,
-    onChainCreation: m,
-    outAmounts: e.map((t) => t[0].amount),
-    outPublicKeys: e.map((t) => t[0].getStealthAddress()),
-    inAmounts: a.map((t) => t.map((r) => r.amount.toString())),
-    inTimeStamps: a.map((t) => t.map((r) => r.timeStamp)),
-    inRandomizations: a.map((t) => t.map((r) => r.randomization)),
-    inCommitmentSiblings: K,
-    inCommitmentSiblingSides: M
-  }, B = i ? n.getWalletSalt(i) : void 0;
-  let N = H, T = et.Emporium, D = at(z, B);
-  const E = `swapperMW${_}x${b}`, P = Y(
-    E,
-    o.erc20TokenAddresses,
-    o.amountChanges,
-    o.inNullifiers,
-    o.outCommitments,
-    c.length
+    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
   );
-  o.calldataHash = x(
-    P,
-    A,
-    N,
-    T,
-    D,
-    l,
+  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)
+      throw new Error("inHinkalAddress mismatch");
+    r.externalApprovalAddresses = n?.useApprovalUtxoData?.map(
+      ({ externalApprovalAddresses: e }) => e
+    ) ?? [d, d, d];
+  }
+  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,
+    W,
+    f,
+    G,
+    K,
     h,
-    void 0
+    S,
+    void 0,
+    l,
+    c,
+    n,
+    s,
+    Se
   );
-  const { zkCallData: Z } = await mt(L, E, o, v), G = U(y, s), J = await rt(
+  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,
-    k,
+    C,
+    C === "swapperMWMin0" ? ce : r,
+    ae
+  ), se = He(_, p), L = await De(
+    i,
+    J,
+    Z,
+    z,
+    I,
+    j,
     a,
-    e,
-    l,
+    t,
     h,
-    P,
-    T,
-    N,
-    D,
-    A,
-    o.calldataHash,
-    c,
+    S,
+    F,
     G,
-    m,
-    ot
-  ), $ = {
+    f,
+    K,
+    W,
+    r.calldataHash,
+    H,
+    se,
+    c,
+    Ne,
+    r.outTimeStamp,
+    n,
+    l,
+    s,
+    ne
+  );
+  E.log("circomdata in emporium proof", { circomData: L });
+  const pe = {
     tokenNumber: a.length,
-    nullifierAmount: a[0].length,
-    outputAmount: e[0].length
+    nullifierAmount: a.length > 0 ? a[0].length : 0,
+    outputAmount: t.length > 0 ? t[0].length : 0
   };
-  return { zkCallData: Z, circomData: J, dimData: $, encryptedOutputs: l };
+  return { zkCallData: le, circomData: L, dimData: pe, encryptedOutputs: h };
 };
 export {
-  Ct as constructEmporiumProof
+  xe as constructEmporiumProof
 };

package/functions/snarkjs/constructGeneralZkProof.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const F=require("../../constants/chains.constants.cjs"),Q=require("../../constants/protocol.constants.cjs"),X=require("../../data-structures/utxo/Utxo.cjs"),m=require("../../types/hinkal.stake.types.cjs"),S=require("../../webworker/performTaskWithWorker.cjs"),p=require("../../webworker/worker.registry.cjs"),u=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),Y=require("../web3/etherFunctions.cjs"),i=require("./common.snarkjs.cjs"),$=require("./generateCircomData.cjs"),U=require("./generateZkProof.cjs"),x=require("../../data-structures/merkle-tree/getPatchedAccessTokenMerkleTree.cjs"),ee=async(T,z,a,r,d,h,g,f,y,M,P=Q.zeroAddress,Z=F.chainIds.localhost,c=a.map(()=>!1),C=a.map(()=>0n),_=void 0,n,O=!0)=>{const I=x.getPatchedAccessTokenMerkleTree(z,d,O),A=I.getRootHash(),K=I.toJSON(),W=T.getRootHash(),H=a.map(e=>e.map(o=>o.getConstructableParams())),N=d.getSignature(),{accessTokenSiblings:R,accessTokenSiblingSides:B}=await S.performTaskWithWorker({type:p.WorkerVariant.ZKProof,payload:{type:u.ZKProofWorkerActionType.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,data:{userSignature:N,merkleTreeAccessTokenSerialized:K}}}),{inCommitmentSiblings:E,inCommitmentSiblingSides:L}=await S.performTaskWithWorker({type:p.WorkerVariant.ZKProof,payload:{type:u.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES,data:{inputUtxosSerialized:H,userSignature:N,merkleTreeSerialized:T.toJSON()}}}),w=i.calcAmountChanges(a,r),l=i.calcEncryptedOutputs(r,(n&&n.mode!==m.HinkalStakeMode.Deposit)??!1),k=d.getShieldedPrivateKey(),b=X.Utxo.findCorrectRandomization(Y.randomBigInt(31),k),v=await S.performTaskWithWorker({type:p.WorkerVariant.ZKProof,payload:{type:u.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:H,onChainCreation:c}}}),t={rootHashHinkal:W,shieldedPrivateKey:k,erc20TokenAddresses:a.map(e=>e[0].erc20TokenAddress),inAmounts:a.map(e=>e.map(o=>o.amount.toString())),inTimeStamps:a.map(e=>e.map(o=>o.timeStamp)),inRandomizations:a.map(e=>e.map(o=>o.randomization)),inNullifiers:v,inCommitmentSiblings:E,inCommitmentSiblingSides:L,outAmounts:r.map(e=>e.map(o=>o.amount.toString())),outTimeStamp:BigInt(r[0][0].timeStamp),outPublicKeys:r.map(e=>e.map(o=>o.getStealthAddress())),extraRandomization:b,amountChanges:w,outCommitments:i.buildOutCommitments(r,c),rootHashAccessToken:A,accessTokenSiblings:R,accessTokenSiblingSides:B,calldataHash:0n};n||(t.onChainCreation=c);const s=a.map(e=>e[0].tokenId??0),q=s.reduce((e,o)=>e+o,0)>0?s.length:0;q>0&&(t.tokenIds=s);const D=i.calcPublicSignalCount(h,t.erc20TokenAddresses,t.amountChanges,t.inNullifiers,t.outCommitments,q);t.calldataHash=i.createCallDataHash(D,P,f,g,y,l,C,_),n&&(n.mode===m.HinkalStakeMode.Deposit&&(t.mode=0),n.mode===m.HinkalStakeMode.Stake&&(t.mode=1),n.mode===m.HinkalStakeMode.Unstake&&(t.mode=2),t.stakedTokenRecipient=n.stakedTokenRecipient,t.stakeBlinding=n.stakeBlinding,t.depositorAddress=n.depositorAddress);const{zkCallData:J}=await U.generateZkProof(Z,h,t,M),V=i.calcStealthAddressStructure(b,k),j=await $.generateCircomData(W,A,a,r,l,C,D,g,f,y,P,t.calldataHash,s,V,c,_),G={tokenNumber:a.length,nullifierAmount:a[0].length,outputAmount:r[0].length};return{zkCallData:J,circomData:j,dimData:G,encryptedOutputs:l}};exports.constructZkProof=ee;
+"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;

package/functions/snarkjs/constructGeneralZkProof.d.ts

@@ -1,12 +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 { CircomDataType, DimDataType, HookDataType } from '../../types/circom-data.types';
+import { CircomDataBaseType, DimDataType, HookDataType } from '../../types/circom-data.types';
 import { ExternalActionId } from '../../types/external-action.types';
 import { StakeArgs } from '../../types/hinkal.stake.types';
-export declare const constructZkProof: (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, hasAccessToken?: boolean) => Promise<{
+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: CircomDataType;
+    circomData: CircomDataBaseType;
     dimData: DimDataType;
     encryptedOutputs: string[][];
 }>;

package/functions/snarkjs/constructGeneralZkProof.mjs

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

package/functions/snarkjs/generateCircomData.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const S=require("../../constants/protocol.constants.cjs"),W=require("../../types/circom-data.types.cjs"),I=require("../../webworker/performTaskWithWorker.cjs"),T=require("../../webworker/worker.registry.cjs"),b=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),h=require("../utils/external-action.utils.cjs"),s=require("./common.snarkjs.cjs"),C=async(i,c,r,t,m,u,d,o,a,k,l,p,g,y,n,f)=>{const D=s.calcAmountChanges(r,t,!0),_=r.map(e=>e.map(A=>A.getConstructableParams())),q=await I.performTaskWithWorker({type:T.WorkerVariant.ZKProof,payload:{type:b.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:_,onChainCreation:n}}});return{rootHashHinkal:i,erc20TokenAddresses:r.map(e=>e[0].erc20TokenAddress),tokenIds:g.map(e=>String(e)),amountChanges:D,inputNullifiers:q,outCommitments:s.buildOutCommitments(t,n),encryptedOutputs:m,flatFees:u,timeStamp:t[0][0].timeStamp,stealthAddressStructure:y,rootHashAccessToken:c,relay:l,externalAddress:a===void 0?S.zeroAddress:a,externalActionMetadata:k,externalActionId:typeof o=="bigint"?0n:h.getExternalActionIdHash(o),hookData:f||W.defaultHookData,publicSignalCount:d,calldataHash:p}};exports.generateCircomData=C;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("../../constants/protocol.constants.cjs"),V=require("../../types/circom-data.types.cjs"),_=require("../utils/external-action.utils.cjs"),x=require("./getOriginalSender.cjs"),z=async(c,d,g,l,u,m,S,a,D,p,A,i,t,f,o,k,h,C,q,y,b,v,H,O,T=n.defaultSignatureData)=>{const s={rootHashHinkal:l,erc20TokenAddresses:S.map(e=>e[0].erc20TokenAddress),tokenIds:h.map(e=>String(e)),amountChanges:m,inputNullifiers:g,outCommitments:d,encryptedOutputs:D,timeStamp:a.length>0?a[0][0].timeStamp:String(b??""),stealthAddressStructure:C,rootHashAccessToken:u,relay:o,externalAddress:t===void 0?n.zeroAddress:t,externalActionMetadata:f,externalActionId:typeof i=="bigint"?0n:_.getExternalActionIdHash(i),hookData:y||V.defaultHookData,publicSignalCount:A,calldataHash:k};if(c==="v1x0"){const e=s;return e.flatFees=p,e}else{const e=s;e.onChainCreation=q,e.slippageValues=H;const r=structuredClone(v);return"interactionAddress"in r&&delete r.interactionAddress,e.hinkalLogicArgs=r,e.feeStructure=O,e.signatureData=T,e.originalSender=x.getOriginalSender(t??n.zeroAddress,o),e}};exports.generateCircomData=z;

package/functions/snarkjs/generateCircomData.d.ts

@@ -1,4 +1,5 @@
+import { FeeStructure, HinkalLogicArgs, ProverVersion } from '../../types/hinkal.types';
 import { Utxo } from '../../data-structures/utxo/Utxo';
-import { CircomDataType, HookDataType, StealthAddressStructure } from '../../types/circom-data.types';
+import { CircomDataBaseType, HookDataType, StealthAddressStructure } from '../../types/circom-data.types';
 import { ExternalActionId } from '../../types/external-action.types';
-export declare const generateCircomData: (rootHashHinkal: bigint | undefined, rootHashAccessToken: bigint | undefined, inputUtxos: Utxo[][], outputUtxos: Utxo[][], encryptedOutputs: string[][], flatFees: bigint[], publicSignalCount: number, externalActionId: ExternalActionId | bigint, externalAddress: string | undefined, externalActionMetadata: string, relay: string, calldataHash: bigint, tokenIds: number[], stealthAddressStructure: StealthAddressStructure, onChainCreation: boolean[], hookData: HookDataType | undefined) => Promise<CircomDataType>;
+export declare const generateCircomData: (proverVersion: ProverVersion, outCommitments: string[][], inputNullifiers: string[][], rootHashHinkal: bigint | undefined, rootHashAccessToken: bigint | undefined, amountChanges: bigint[], inputUtxos: Utxo[][], outputUtxos: Utxo[][], encryptedOutputs: string[][], flatFees: bigint[], publicSignalCount: number, externalActionId: ExternalActionId | bigint, externalAddress: string | undefined, externalActionMetadata: string, relay: string, calldataHash: bigint, tokenIds: number[], stealthAddressStructure: StealthAddressStructure, onChainCreation: boolean[], hookData: HookDataType | undefined, timeStampFallback: number | undefined, hinkalLogicArgs: HinkalLogicArgs, slippageValues: bigint[], feeStructure: FeeStructure, signatureData?: import('../../index.ts').SignatureData) => Promise<CircomDataBaseType>;