@sabaaa1/common 0.1.7 → 0.1.14

package/functions/snarkjs/constructEmporiumProof.mjs

@@ -2,15 +2,15 @@ import { Utxo as fa } from "../../data-structures/utxo/Utxo.mjs";
 import { UserKeys as Sa } from "../../data-structures/crypto-keys/keys.mjs";
 import { zeroAddress as A, defaultSignatureData as ga } from "../../constants/protocol.constants.mjs";
 import { chainIds as Aa } from "../../constants/chains.constants.mjs";
-import { ZKProofWorkerActionType as N } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
-import { performTaskWithWorker as k } from "../../webworker/performTaskWithWorker.mjs";
-import { WorkerVariant as w } from "../../webworker/worker.registry.mjs";
-import { calcAmountChanges as D, calcEncryptedOutputs as ha, buildOutCommitments as Ha, calcPublicSignalCount as ya, getSlippageValues as Ta, createCallDataHash as Ca, calcStealthAddressStructure as Ia } from "./common.snarkjs.mjs";
+import { ZKProofWorkerActionType as k } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
+import { performTaskWithWorker as w } from "../../webworker/performTaskWithWorker.mjs";
+import { WorkerVariant as D } from "../../webworker/worker.registry.mjs";
+import { calcAmountChanges as I, calcEncryptedOutputs as ha, buildOutCommitments as Ha, calcPublicSignalCount as ya, getSlippageValues as Ta, createCallDataHash as Ca, calcStealthAddressStructure as Ma } from "./common.snarkjs.mjs";
 import { randomBigInt as X } from "../web3/etherFunctions.mjs";
-import { encodeEmporiumMetadata as Ma, getAuthorizationDataIfNeeded as Na } from "../private-wallet/emporium.helpers.mjs";
-import { ExternalActionId as ka } from "../../types/external-action.types.mjs";
-import { defaultHookData as wa } from "../../types/circom-data.types.mjs";
-import { generateCircomData as Da } from "./generateCircomData.mjs";
+import { encodeEmporiumMetadata as Na, getAuthorizationDataIfNeeded as ka } from "../private-wallet/emporium.helpers.mjs";
+import { ExternalActionId as wa } from "../../types/external-action.types.mjs";
+import { defaultHookData as Da } from "../../types/circom-data.types.mjs";
+import { generateCircomData as Ia } from "./generateCircomData.mjs";
 import { generateZkProof as Ea } from "./generateZkProof.mjs";
 import { getCurrentTimeInSeconds as Y } from "../utils/time.utils.mjs";
 import { defaultHinkalLogicArgs as Pa } from "../../types/hinkal.types.mjs";
@@ -24,10 +24,10 @@ import "libsodium-wrappers";
 import "process";
 import "buffer";
 const nt = async (i, E, L, d, h, t, a, n, P, V, z, x, U, _ = A, c = Aa.localhost, l = t.map(() => !1), H = t.map(() => 0n), s, m = void 0, aa = !1, p, f = void 0, ta, v = ga, ea) => {
-  const y = D(t, a), T = ha(a, !1), S = n.getShieldedPrivateKey(), R = fa.findCorrectRandomization(X(31), S), W = await _a(
+  const y = I(t, a), T = ha(a, !1), S = n.getShieldedPrivateKey(), R = fa.findCorrectRandomization(X(31), S), W = await _a(
     ta ?? va(c),
     d,
-    D(t, a, !0)
+    I(t, a, !0)
   ), C = Ra(
     L,
     n,
@@ -35,28 +35,28 @@ const nt = async (i, E, L, d, h, t, a, n, P, V, z, x, U, _ = A, c = Aa.localhost
     W
   );
   Wa.log({ kycRequiredEmporium: W, patchedMerkleTree: C, amountChanges: y, erc20TokenAddresses: d });
-  const ra = C.toJSON(), K = E.getRootHash(), I = C.getRootHash(), O = t.map((e) => e.map((o) => o.getConstructableParams())), b = n.getSignature(), { accessTokenSiblings: u, accessTokenSiblingSides: B } = await k({
-    type: w.ZKProof,
+  const ra = C.toJSON(), K = E.getRootHash(), M = C.getRootHash(), O = t.map((e) => e.map((o) => o.getConstructableParams())), b = n.getSignature(), { accessTokenSiblings: u, accessTokenSiblingSides: B } = await w({
+    type: D.ZKProof,
     payload: {
-      type: N.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,
+      type: k.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,
       data: {
         userSignature: b,
         merkleTreeAccessTokenSerialized: ra
       }
     }
-  }), { inCommitmentSiblings: ma, inCommitmentSiblingSides: oa } = await k({
-    type: w.ZKProof,
+  }), { inCommitmentSiblings: ma, inCommitmentSiblingSides: oa } = await w({
+    type: D.ZKProof,
     payload: {
-      type: N.CALC_COMMITMENTS_SIBLING_AND_SIDES,
+      type: k.CALC_COMMITMENTS_SIBLING_AND_SIDES,
       data: { inputUtxosSerialized: O, userSignature: b, merkleTreeSerialized: E.toJSON() }
     }
-  }), F = await k({
-    type: w.ZKProof,
+  }), F = await w({
+    type: D.ZKProof,
     payload: {
-      type: N.BUILD_IN_NULLIFIERS,
+      type: k.BUILD_IN_NULLIFIERS,
       data: { inputUtxosSerialized: O, onChainCreation: l, proverVersion: i }
     }
-  }), Z = Ha(i, a, l), M = ea ?? X(31), ia = Ka(M), r = {
+  }), Z = Ha(i, a, l), N = ea ?? X(31), ia = Ka(N), r = {
     rootHashHinkal: K,
     erc20TokenAddresses: d,
     tokenIds: h,
@@ -65,20 +65,20 @@ const nt = async (i, E, L, d, h, t, a, n, P, V, z, x, U, _ = A, c = Aa.localhost
     extraRandomization: R,
     amountChanges: y,
     outCommitments: Z,
-    rootHashAccessToken: I,
+    rootHashAccessToken: M,
     calldataHash: 0n,
     shieldedPrivateKey: S,
     accessTokenSiblings: u,
     accessTokenSiblingSides: B,
-    outAmounts: a.map((e) => e[0].amount),
-    outPublicKeys: a.map((e) => e[0].getStealthAddress()),
+    outAmounts: a.map((e) => e.map((o) => o.amount)),
+    outPublicKeys: a.map((e) => e.map((o) => o.getStealthAddress())),
     inAmounts: t.map((e) => e.map((o) => o.amount.toString())),
     inTimeStamps: t.map((e) => e.map((o) => o.timeStamp)),
     inRandomizations: t.map((e) => e.map((o) => o.randomization)),
     inCommitmentSiblings: ma,
     inCommitmentSiblingSides: oa,
-    messageSeed: M
-  }, na = s ? Sa.getSignerAddressFromPrivateKey(s.privateKey) : void 0, J = z, $ = ka.Emporium, q = await Ma(
+    messageSeed: N
+  }, na = s ? Sa.getSignerAddressFromPrivateKey(c, s.privateKey) : void 0, J = z, $ = wa.Emporium, q = await Na(
     c,
     z,
     s?.privateKey,
@@ -99,7 +99,7 @@ const nt = async (i, E, L, d, h, t, a, n, P, V, z, x, U, _ = A, c = Aa.localhost
     r.externalApprovalAddresses = m?.useApprovalUtxoData?.map(({ externalApprovalAddresses: e }) => e) ?? Array(P).fill([A, A, A]);
   }
   f || (f = za(H, d));
-  const j = D(t, a, !0);
+  const j = I(t, a, !0);
   p || (p = Ta(j, m)), r.calldataHash = Ca(
     i,
     G,
@@ -118,24 +118,24 @@ const nt = async (i, E, L, d, h, t, a, n, P, V, z, x, U, _ = A, c = Aa.localhost
   );
   const Q = {
     outTimeStamp: Y(),
-    rootHashAccessToken: I,
+    rootHashAccessToken: M,
     calldataHash: r.calldataHash,
     shieldedPrivateKey: S,
     accessTokenSiblings: u,
     accessTokenSiblingSides: B,
-    messageSeed: M
+    messageSeed: N
   }, { zkCallData: da } = await Ea(
     i,
     c,
     g,
     g === "swapperMWMin0" ? Q : r,
     U
-  ), ca = Ia(R, S), la = await Da(
+  ), ca = Ma(R, S), la = await Ia(
     i,
     Z,
     F,
     K,
-    I,
+    M,
     j,
     d,
     t,
@@ -151,7 +151,7 @@ const nt = async (i, E, L, d, h, t, a, n, P, V, z, x, U, _ = A, c = Aa.localhost
     h,
     ca,
     l,
-    wa,
+    Da,
     g === "swapperMWMin0" ? Q.outTimeStamp : r.outTimeStamp,
     // although these variables seem to contain the same value, there can actually be a single second difference if the timing is unlucky
     m,
@@ -162,7 +162,7 @@ const nt = async (i, E, L, d, h, t, a, n, P, V, z, x, U, _ = A, c = Aa.localhost
     tokenNumber: t.length,
     nullifierAmount: t.length > 0 ? t[0].length : 0,
     outputAmount: a.length > 0 ? a[0].length : 0
-  }, pa = await Na(
+  }, pa = await ka(
     c,
     s?.privateKey
   );

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

package/functions/snarkjs/constructGeneralZkProof.d.ts

@@ -6,7 +6,7 @@ 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) => 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, stakeArgs?: StakeArgs, patchAccessTokenMerkleTree?: boolean, hinkalLogicArgs?: HinkalLogicArgs | undefined, slippageValues?: bigint[], feeStructure?: FeeStructure | undefined, hinkalHelper?: ethers.Contract, signatureData?: import('../../index.ts').SignatureData, originalSender?: string) => Promise<{
     zkCallData: import('../../index.ts').NewZkCallDataType;
     circomData: T;
     dimData: DimDataType;

package/functions/snarkjs/constructGeneralZkProof.mjs

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

package/functions/snarkjs/constructSolanaZkProof.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("ethers");require("circomlibjs-hinkal-fork");require("../../error-handling/error-codes.constants.cjs");require("../../data-structures/crypto-keys/keys.cjs");const oe=require("../../constants/chains.constants.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../../data-structures/http/HttpClient.cjs");require("axios");require("../../constants/token-data/index.cjs");require("../../API/getServerURL.cjs");require("libsodium-wrappers");require("process");require("buffer");const ae=require("../../data-structures/merkle-tree/getPatchedAccessTokenMerkleTree.cjs");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../utils/mutexes.utils.cjs");require("@coral-xyz/anchor");const c=require("@solana/web3.js"),n=require("../pre-transaction/solana.cjs");require("@solana/spl-token");const ne=require("../utils/solanaMint.utils.cjs"),ie=require("./common.snarkjs.cjs"),ce=require("../../data-structures/Hinkal/hinkalCheckSolanaTokenRegistry.cjs"),se=require("./generateZkProof.cjs"),s=require("../../webworker/worker.registry.cjs"),m=require("../../webworker/performTaskWithWorker.cjs"),u=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),me=require("../pre-transaction/getSolanaCalldataHash.cjs"),ue=async(f,P,l,h,i,y,p,t,o,A,C,b,I,_,a,W,B=oe.chainIds.solanaLocalnet,K=!1,N=t.map(()=>!1),w=[],Z=[])=>{const k="v1x1",M=new c.PublicKey(I),L=new c.PublicKey(_),z=i.getShieldedPrivateKey(),S=p.map(e=>ne.formatMintAddress(e)),H=S.map(e=>e.mintAccountPart1),R=S.map(e=>e.mintAccountPart2),D=me.getSolanaCalldataHash(a,M,L,W,C,b,w,Z),E=`${a.tokenNumber}x${a.nullifierAmount}x${a.outputAmount}`,g=ie.calcAmountChanges(t,o),v=await ce.hinkalCheckSolanaTokenRegistry(y,new c.PublicKey(P),p,g),q=ae.getPatchedAccessTokenMerkleTree(h,i,K,v),d=t.map(e=>e.map(r=>r.getConstructableParams())),T=i.getSignature(),{accessTokenSiblings:O,accessTokenSiblingSides:V}=await m.performTaskWithWorker({type:s.WorkerVariant.ZKProof,payload:{type:u.ZKProofWorkerActionType.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,data:{userSignature:T,merkleTreeAccessTokenSerialized:q.toJSON()}}}),{inCommitmentSiblings:$,inCommitmentSiblingSides:j}=await m.performTaskWithWorker({type:s.WorkerVariant.ZKProof,payload:{type:u.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES,data:{inputUtxosSerialized:d,userSignature:T,merkleTreeSerialized:l.toJSON()}}}),G=await m.performTaskWithWorker({type:s.WorkerVariant.ZKProof,payload:{type:u.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:d,onChainCreation:N,proverVersion:k}}}),J={rootHashHinkal:l.getRootHash(),shieldedPrivateKey:z,rootHashAccessToken:q.getRootHash(),accessTokenSiblings:O,accessTokenSiblingSides:V,mintAccountPart1:H,mintAccountPart2:R,inAmounts:t.map(e=>e.map(r=>r.amount)),inTimeStamps:t.map(e=>e.map(r=>r.timeStamp)),inRandomizations:t.map(e=>e.map(r=>r.randomization)),inNullifiers:G,inCommitmentSiblings:$,inCommitmentSiblingSides:j,outAmounts:o.map(e=>e.map(r=>r.amount.toString())),outTimeStamp:BigInt(o[0][0].timeStamp),outPublicKeys:o.map(e=>e.map(r=>r.getStealthAddress())),extraRandomization:A,amountChanges:g,outCommitments:o.map(e=>e.map(r=>r.amount===0n?0n:r.getCommitment())),calldataHash:D},{publicSignals:F,zkCallData:Q}=await se.generateZkProof(k,B,`basicSolana${E}`,J,f),[X,Y,x]=Q,U=X.map(BigInt).map(n.encodeToByte32Array).flat(),ee=Y.flat().map(BigInt).map(n.encodeToByte32Array).flat(),re=x.map(BigInt).map(n.encodeToByte32Array).flat(),te=F.map(BigInt).map(n.encodeToByte32Array);return{proofAArr:U,proofBArr:ee,proofCArr:re,publicInputsArr:te}};exports.constructSolanaZkProof=ue;

package/functions/snarkjs/constructSolanaZkProof.d.ts

@@ -0,0 +1,13 @@
+import { HinkalInstruction } from '../pre-transaction';
+import { Utxo } from '../../data-structures/utxo/Utxo';
+import { AccountMeta } from '@solana/web3.js';
+import { DimDataType } from '../../types/circom-data.types';
+import { MerkleTree } from '../../data-structures/merkle-tree';
+import { UserKeys } from '../../data-structures/crypto-keys/keys';
+import { Program } from '@coral-xyz/anchor';
+export declare const constructSolanaZkProof: (generateProofRemotely: boolean, originalDeployer: string, merkleTreeHinkal: MerkleTree<bigint>, merkleTreeAccessToken: MerkleTree<bigint>, userKeys: UserKeys, hinkalProgram: Program, mintAddresses: string[], inputUtxosArray: Utxo[][], outputUtxosArray: Utxo[][], extraRandomization: bigint, relayerFee: bigint, variableRate: bigint, recipientAddress: string, signerAddress: string, dimensions: DimDataType, encryptedOutputs: number[][], chainId?: number, patchAccessTokenMerkleTree?: boolean, onChainCreation?: boolean[], instructions?: HinkalInstruction[], remainingAccounts?: AccountMeta[]) => Promise<{
+    proofAArr: number[];
+    proofBArr: number[];
+    proofCArr: number[];
+    publicInputsArr: number[][];
+}>;

package/functions/snarkjs/constructSolanaZkProof.mjs

@@ -0,0 +1,109 @@
+import "../../types/circom-data.types.mjs";
+import "../../types/transactions.types.mjs";
+import "../../types/activities.types.mjs";
+import "ethers";
+import "circomlibjs-hinkal-fork";
+import "../../error-handling/error-codes.constants.mjs";
+import "../../data-structures/crypto-keys/keys.mjs";
+import { chainIds as mt } from "../../constants/chains.constants.mjs";
+import "../../constants/server.constants.mjs";
+import "../../constants/vite.constants.mjs";
+import "../../data-structures/http/HttpClient.mjs";
+import "axios";
+import "../../constants/token-data/index.mjs";
+import "../../API/getServerURL.mjs";
+import "libsodium-wrappers";
+import "process";
+import "buffer";
+import { getPatchedAccessTokenMerkleTree as it } from "../../data-structures/merkle-tree/getPatchedAccessTokenMerkleTree.mjs";
+import "../../constants/save-depths.mjs";
+import "../../constants/reorg-depths.constants.mjs";
+import "../utils/mutexes.utils.mjs";
+import "@coral-xyz/anchor";
+import { PublicKey as r } from "@solana/web3.js";
+import { encodeToByte32Array as e } from "../pre-transaction/solana.mjs";
+import "@solana/spl-token";
+import { formatMintAddress as et } from "../utils/solanaMint.utils.mjs";
+import { calcAmountChanges as nt } from "./common.snarkjs.mjs";
+import { hinkalCheckSolanaTokenRegistry as rt } from "../../data-structures/Hinkal/hinkalCheckSolanaTokenRegistry.mjs";
+import { generateZkProof as pt } from "./generateZkProof.mjs";
+import { WorkerVariant as p } from "../../webworker/worker.registry.mjs";
+import { performTaskWithWorker as c } from "../../webworker/performTaskWithWorker.mjs";
+import { ZKProofWorkerActionType as s } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
+import { getSolanaCalldataHash as ct } from "../pre-transaction/getSolanaCalldataHash.mjs";
+const Gt = async (P, A, l, C, n, T, S, a, m, h, b, N, _, y, i, B, K = mt.solanaLocalnet, w = !1, L = a.map(() => !1), z = [], D = []) => {
+  const f = "v1x1", E = new r(_), H = new r(y), M = n.getShieldedPrivateKey(), g = S.map((t) => et(t)), R = g.map((t) => t.mintAccountPart1), Z = g.map((t) => t.mintAccountPart2), v = ct(
+    i,
+    E,
+    H,
+    B,
+    b,
+    N,
+    z,
+    D
+  ), O = `${i.tokenNumber}x${i.nullifierAmount}x${i.outputAmount}`, d = nt(a, m), W = await rt(
+    T,
+    new r(A),
+    S,
+    d
+  ), u = it(
+    C,
+    n,
+    w,
+    W
+  ), k = a.map((t) => t.map((o) => o.getConstructableParams())), I = n.getSignature(), { accessTokenSiblings: $, accessTokenSiblingSides: G } = await c({
+    type: p.ZKProof,
+    payload: {
+      type: s.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,
+      data: {
+        userSignature: I,
+        merkleTreeAccessTokenSerialized: u.toJSON()
+      }
+    }
+  }), { inCommitmentSiblings: J, inCommitmentSiblingSides: V } = await c({
+    type: p.ZKProof,
+    payload: {
+      type: s.CALC_COMMITMENTS_SIBLING_AND_SIDES,
+      data: { inputUtxosSerialized: k, userSignature: I, merkleTreeSerialized: l.toJSON() }
+    }
+  }), q = await c({
+    type: p.ZKProof,
+    payload: {
+      type: s.BUILD_IN_NULLIFIERS,
+      data: { inputUtxosSerialized: k, onChainCreation: L, proverVersion: f }
+    }
+  }), F = {
+    rootHashHinkal: l.getRootHash(),
+    shieldedPrivateKey: M,
+    rootHashAccessToken: u.getRootHash(),
+    accessTokenSiblings: $,
+    accessTokenSiblingSides: G,
+    mintAccountPart1: R,
+    mintAccountPart2: Z,
+    inAmounts: a.map((t) => t.map((o) => o.amount)),
+    inTimeStamps: a.map((t) => t.map((o) => o.timeStamp)),
+    inRandomizations: a.map((t) => t.map((o) => o.randomization)),
+    inNullifiers: q,
+    inCommitmentSiblings: J,
+    inCommitmentSiblingSides: V,
+    outAmounts: m.map((t) => t.map((o) => o.amount.toString())),
+    outTimeStamp: BigInt(m[0][0].timeStamp),
+    outPublicKeys: m.map((t) => t.map((o) => o.getStealthAddress())),
+    extraRandomization: h,
+    amountChanges: d,
+    outCommitments: m.map(
+      (t) => t.map((o) => o.amount === 0n ? 0n : o.getCommitment())
+    ),
+    calldataHash: v
+  }, { publicSignals: j, zkCallData: Q } = await pt(
+    f,
+    K,
+    `basicSolana${O}`,
+    F,
+    P
+  ), [X, Y, x] = Q, U = X.map(BigInt).map(e).flat(), tt = Y.flat().map(BigInt).map(e).flat(), ot = x.map(BigInt).map(e).flat(), at = j.map(BigInt).map(e);
+  return { proofAArr: U, proofBArr: tt, proofCArr: ot, publicInputsArr: at };
+};
+export {
+  Gt as constructSolanaZkProof
+};

package/functions/snarkjs/generateCircomData.cjs

@@ -1 +1 @@
-"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"),z=require("./getOriginalSender.cjs"),I=async(s,g,l,d,u,m,S,L,a,D,p,f,i,t,A,o,h,k,C,q,y,b,v,x,H,O=n.defaultSignatureData)=>{const c={rootHashHinkal:d,erc20TokenAddresses:S,tokenIds:k.map(e=>String(e)),amountChanges:m,inputNullifiers:l,outCommitments:g,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:A,externalActionId:typeof i=="bigint"?0n:_.getExternalActionIdHash(i),hookData:y||V.defaultHookData,publicSignalCount:f,calldataHash:h};if(s==="v1x0"){const e=c;return e.flatFees=p,e}else{const e=c;e.onChainCreation=q,e.slippageValues=x;const r=structuredClone(v);return"interactionAddress"in r&&delete r.interactionAddress,e.hinkalLogicArgs=r,e.feeStructure=H,e.signatureData=O,e.originalSender=z.getOriginalSender(t??n.zeroAddress,o),e}};exports.generateCircomData=I;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("../../constants/protocol.constants.cjs"),_=require("../../types/circom-data.types.cjs"),z=require("../utils/external-action.utils.cjs"),I=require("./getOriginalSender.cjs"),L=async(s,g,l,d,u,m,S,j,a,D,p,f,i,t,A,o,h,k,C,q,y,b,v,x,H,O=n.defaultSignatureData,V)=>{const c={rootHashHinkal:d,erc20TokenAddresses:S,tokenIds:k.map(e=>String(e)),amountChanges:m,inputNullifiers:l,outCommitments:g,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:A,externalActionId:typeof i=="bigint"?0n:z.getExternalActionIdHash(i),hookData:y||_.defaultHookData,publicSignalCount:f,calldataHash:h};if(s==="v1x0"){const e=c;return e.flatFees=p,e}else{const e=c;e.onChainCreation=q,e.slippageValues=x;const r=structuredClone(v);return"interactionAddress"in r&&delete r.interactionAddress,e.hinkalLogicArgs=r,e.feeStructure=H,e.signatureData=O,e.originalSender=V??I.getOriginalSender(t??n.zeroAddress,o),e}};exports.generateCircomData=L;

package/functions/snarkjs/generateCircomData.d.ts

@@ -2,4 +2,4 @@ import { FeeStructure, HinkalLogicArgs, ProverVersion } from '../../types/hinkal
 import { Utxo } from '../../data-structures/utxo/Utxo';
 import { CircomDataBaseType, HookDataType, StealthAddressStructure } from '../../types/circom-data.types';
 import { ExternalActionId } from '../../types/external-action.types';
-export declare const generateCircomData: (proverVersion: ProverVersion, outCommitments: string[][], inputNullifiers: string[][], rootHashHinkal: bigint | undefined, rootHashAccessToken: bigint | undefined, amountChanges: bigint[], erc20TokenAddresses: string[], 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>;
+export declare const generateCircomData: (proverVersion: ProverVersion, outCommitments: string[][], inputNullifiers: string[][], rootHashHinkal: bigint | undefined, rootHashAccessToken: bigint | undefined, amountChanges: bigint[], erc20TokenAddresses: string[], 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, originalSender?: string) => Promise<CircomDataBaseType>;

package/functions/snarkjs/generateCircomData.mjs

@@ -1,8 +1,8 @@
-import { zeroAddress as c, defaultSignatureData as w } from "../../constants/protocol.constants.mjs";
-import { defaultHookData as y } from "../../types/circom-data.types.mjs";
-import { getExternalActionIdHash as z } from "../utils/external-action.utils.mjs";
-import { getOriginalSender as E } from "./getOriginalSender.mjs";
-const G = async (s, m, g, d, l, f, p, F, r, u, D, S, a, e, h, n, k, A, C, x, H, V, v, I, L, b = w) => {
+import { zeroAddress as c, defaultSignatureData as y } from "../../constants/protocol.constants.mjs";
+import { defaultHookData as z } from "../../types/circom-data.types.mjs";
+import { getExternalActionIdHash as E } from "../utils/external-action.utils.mjs";
+import { getOriginalSender as F } from "./getOriginalSender.mjs";
+const J = async (s, m, g, d, l, f, p, O, r, u, D, S, a, e, h, n, k, A, C, x, H, V, v, I, L, b = y, w) => {
   const o = {
     rootHashHinkal: d,
     erc20TokenAddresses: p,
@@ -17,8 +17,8 @@ const G = async (s, m, g, d, l, f, p, F, r, u, D, S, a, e, h, n, k, A, C, x, H,
     relay: n,
     externalAddress: e === void 0 ? c : e,
     externalActionMetadata: h,
-    externalActionId: typeof a == "bigint" ? 0n : z(a),
-    hookData: H || y,
+    externalActionId: typeof a == "bigint" ? 0n : E(a),
+    hookData: H || z,
     publicSignalCount: S,
     calldataHash: k
   };
@@ -29,9 +29,9 @@ const G = async (s, m, g, d, l, f, p, F, r, u, D, S, a, e, h, n, k, A, C, x, H,
     const t = o;
     t.onChainCreation = x, t.slippageValues = I;
     const i = structuredClone(v);
-    return "interactionAddress" in i && delete i.interactionAddress, t.hinkalLogicArgs = i, t.feeStructure = L, t.signatureData = b, t.originalSender = E(e ?? c, n), t;
+    return "interactionAddress" in i && delete i.interactionAddress, t.hinkalLogicArgs = i, t.feeStructure = L, t.signatureData = b, t.originalSender = w ?? F(e ?? c, n), t;
   }
 };
 export {
-  G as generateCircomData
+  J as generateCircomData
 };

package/functions/snarkjs/generateZkProofEnclave.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("./getZKFiles.cjs"),k=require("./constant.cjs"),E=require("../utils/encryptInputForEnclave.cjs"),f=require("axios"),i=t=>{if(t.startsWith("http")){const e=t.split("/").at(-1);if(!e)throw new Error("invalid verifierName");return e}return t},m=async(t,n,e,r)=>{const s=i(a.getWASMFile(t,e,n)),c=i(a.getZKeyFile(t,e,n)),{keyCiphertext:o,inputCiphertext:l}=await E.makeEnclaveHandshakeAndEncryptInput(r),u={chainId:n,circuit_wasm:s,circuit_zkey:c,input:l,key:o,version:t},{data:p}=await f.post(`${k.ENCLAVE_EC2_URL}/generate`,u),{public_signals:g,zk_calldata:y}=p;return{zkCallData:y,publicSignals:g}};exports.generateZkProofEnclave=m;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("./getZKFiles.cjs"),k=require("./constant.cjs"),E=require("../utils/encryptInputForEnclave.cjs"),f=require("../../data-structures/http/HttpClient.cjs");require("axios");const r=t=>{if(t.startsWith("http")){const e=t.split("/").at(-1);if(!e)throw new Error("invalid verifierName");return e}return t},m=async(t,n,e,a)=>{const s=r(i.getWASMFile(t,e,n)),c=r(i.getZKeyFile(t,e,n)),{keyCiphertext:l,inputCiphertext:o}=await E.makeEnclaveHandshakeAndEncryptInput(a),u={chainId:n,circuit_wasm:s,circuit_zkey:c,input:o,key:l,version:t},p=await f.httpClient.post(`${k.ENCLAVE_EC2_URL}/generate`,u),{public_signals:g,zk_calldata:y}=p;return{zkCallData:y,publicSignals:g}};exports.generateZkProofEnclave=m;