@hinkal/common 0.3.2 → 0.3.3

package/common/src/data-structures/Hinkal/hinkalSolanaSwap.mjs

@@ -10,18 +10,18 @@ import "../../types/index.mjs";
 import { validateAndGetChainId as u } from "../../functions/utils/token-check.utils.mjs";
 import { addPaddingToUtxos as d } from "../../functions/web3/events/getShieldedBalance.mjs";
 import { outputUtxoProcessing as f } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { calcEncryptedOutputs as ee } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { getStorageAccountPublicKey as te, getStorageVaultPublicKey as p, getSwapperAccountPublicKeyFromSalt as m } from "../../functions/pre-transaction/solana.mjs";
-import { constructAdminData as h } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { convertOKXToHinkalInstructions as g } from "../../functions/pre-transaction/convert-okx-instructions.mjs";
-import { ensureAmountChanges as _ } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
-import { getFeeStructure as v } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { constructSolanaZkProof as y } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { getStorageAccountPublicKey as p, getStorageVaultPublicKey as m, getSwapperAccountPublicKeyFromSalt as h } from "../../functions/pre-transaction/solana.mjs";
+import { constructAdminData as g } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { finalizeSolanaTxEnclaveCallRelay as _, prepareSolanaTxEnclaveCall as v } from "../../functions/snarkjs/constructTxEnclave.mjs";
+import { calculateSolanaNullifierCount as y } from "../../functions/pre-transaction/calculateSolanaNullifierCount.mjs";
+import { convertOKXToHinkalInstructions as ee } from "../../functions/pre-transaction/convert-okx-instructions.mjs";
+import { ensureAmountChanges as te } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
+import { getFeeStructure as ne } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import { solanaTransactCallRelayer as b } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ethers as x } from "ethers";
+import { constructSolanaZkProof as x } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
 import { PublicKey as S } from "@solana/web3.js";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaSwap.ts
-var ne = async (e, t, n, r) => {
+var re = async (e, t, n, r) => {
 	let i = [...await d(e, t, n, r, 6)], a = s().toString(), o = [];
 	for (let t = 0; t < n.length; t += 1) {
 		let { outputUtxos: n } = f(e.userKeys, i[t], r[t], a);
@@ -31,61 +31,97 @@ var ne = async (e, t, n, r) => {
 		inputUtxosArray: i,
 		outputUtxosArray: o
 	};
-}, C = async (s, d, f, C, re, ie, ae, w, T) => {
-	let E = u(d), D = new S(t), { hinkalAddress: O, originalDeployer: k } = e[E].contractData;
-	if (!k) throw Error("No IDL configured for Solana program on this network");
-	let A = new S(k), j = new S(O), M = d.map((e) => e.erc20TokenAddress), { userKeys: N, merkleTreeHinkalByChain: P } = s, F = w ?? await v(E, ae, M, c.Transact), I = f[1], L = Number(s.cacheDevice.get(l.SLIPPAGE_PERCENTAGE) ?? 0), R = d[1], z = r(R, I), B = Number(z) * L / 100;
-	f[1] -= i(R, B.toFixed(R.decimals));
-	let V = I * BigInt(F.variableRate ?? 0) / 10000n + F.flatFee;
-	if (f[1] -= V, f[1] < 0) throw Error(n.LOW_OUTPUT_AMOUNT);
-	let H = F.variableRate.toString(), [U, oe, { inputUtxosArray: W, outputUtxosArray: G }] = await Promise.all([
-		s.getRandomRelay(E, !0),
-		s.getEthereumAddressByChain(E),
-		ne(s, E, M, f)
-	]);
-	if (!U) throw Error(n.RELAYER_NOT_AVAILABLE);
-	let K = s.userKeys.getShieldedPrivateKey(), q = o.findCorrectRandomization(a(31), K), J = {
-		tokenNumber: 2,
-		nullifierAmount: W[0].length,
-		outputAmount: 1
-	}, Y = ee(G).map((e) => [...x.getBytes(e[0])]), X = m(j, A, C), { remainingAccounts: Z, hinkalInstructions: Q } = g(re, X);
-	_(W, G, f);
-	let { proofAArr: $, proofBArr: se, proofCArr: ce, publicInputsArr: le, commitmentValidationData: ue } = await y(s.generateProofRemotely, P[E], N, M, W, G, q, F.flatFee, F.variableRate, D.toString(), U, J, Y, E, Q, Z, C), de = te(j, A), fe = p(j, A), pe = d[0].erc20TokenAddress === "11111111111111111111111111111111" ? null : new S(d[0].erc20TokenAddress), me = d[1].erc20TokenAddress === "11111111111111111111111111111111" ? null : new S(d[1].erc20TokenAddress), he = {
-		recipient: D.toString(),
-		storageAccount: de.toString(),
-		storageVault: fe.toString(),
-		swapperAccount: X.toString(),
-		mintFrom: pe?.toString() ?? null,
-		mintTo: me?.toString() ?? null,
-		remainingAccounts: Z.map((e) => ({
+}, ie = async (e, t, n, r, i, a, o, s, c, l, u, d, f, p) => {
+	let { jobId: m, signedMessageHash: h } = await v(e, {
+		chainId: t,
+		mintAddresses: n,
+		amountChanges: r,
+		relayAddress: a,
+		recipient: o,
+		signer: a,
+		functionName: "swap",
+		accounts: s,
+		onChainCreation: i,
+		relayerFee: c,
+		variableRate: l,
+		hinkalInstructions: u,
+		remainingAccounts: d,
+		swapperAccountSalt: f
+	}), { R8: g, S: y } = e.userKeys.signEddsa(BigInt(h));
+	return _(m, {
+		R8: g,
+		S: y
+	}, t, { adminData: p });
+}, C = async (s, d, f, _, v, C, w, T, E) => {
+	let D = u(d), O = new S(t), { hinkalAddress: k, originalDeployer: A } = e[D].contractData;
+	if (!A) throw Error("No IDL configured for Solana program on this network");
+	let j = new S(A), M = new S(k), N = d.map((e) => e.erc20TokenAddress), { userKeys: ae, merkleTreeHinkalByChain: oe } = s, se = w ?? N[1];
+	if (w && w !== N[1]) throw Error("Solana swap fee token must match the output token");
+	let ce = {
+		mintFrom: N[0],
+		mintTo: N[1],
+		nullifierCount: await y(s, D, N, f),
+		rootInsertCount: 2
+	}, P = T ?? await ne(D, se, N, c.Okx, [], void 0, ce), F = f[1], I = Number(s.cacheDevice.get(l.SLIPPAGE_PERCENTAGE) ?? 0), L = d[1], R = r(L, F), z = Number(R) * I / 100;
+	f[1] -= i(L, z.toFixed(L.decimals));
+	let B = F * BigInt(P.variableRate ?? 0) / 10000n + P.flatFee;
+	if (f[1] -= B, f[1] < 0) throw Error(n.LOW_OUTPUT_AMOUNT);
+	let V = P.variableRate.toString(), [H, U] = await Promise.all([s.getRandomRelay(D, !0), s.getEthereumAddressByChain(D)]);
+	if (!H) throw Error(n.RELAYER_NOT_AVAILABLE);
+	let W = h(M, j, _), { remainingAccounts: G, hinkalInstructions: K } = ee(v, W), le = p(M, j), ue = m(M, j), de = d[0].erc20TokenAddress === "11111111111111111111111111111111" ? null : new S(d[0].erc20TokenAddress), fe = d[1].erc20TokenAddress === "11111111111111111111111111111111" ? null : new S(d[1].erc20TokenAddress), q = {
+		recipient: O.toString(),
+		storageAccount: le.toString(),
+		storageVault: ue.toString(),
+		swapperAccount: W.toString(),
+		mintFrom: de?.toString() ?? null,
+		mintTo: fe?.toString() ?? null,
+		remainingAccounts: G.map((e) => ({
 			pubkey: e.pubkey.toString(),
 			isSigner: e.isSigner,
 			isWritable: e.isWritable
 		})),
-		addressLookupTableAccount: ie
+		addressLookupTableAccount: C
+	}, J = g(E, D, N, f, U, d), Y = [!1, !0];
+	if (s.generateProofRemotely) {
+		let e = K.map((e) => ({
+			accountIndexes: [...e.accountIndexes],
+			data: [...e.data],
+			programIndex: e.programIndex
+		}));
+		return ie(s, D, N, f, Y, H, O.toString(), q, P.flatFee, P.variableRate, e, q.remainingAccounts, _, J);
+	}
+	let { inputUtxosArray: X, outputUtxosArray: Z } = await re(s, D, N, f), pe = s.userKeys.getShieldedPrivateKey(), Q = o.findCorrectRandomization(a(31), pe), $ = {
+		tokenNumber: 2,
+		nullifierAmount: X[0].length,
+		outputAmount: 1
 	};
+	te(X, Z, f);
+	let { proofAArr: me, proofBArr: he, proofCArr: ge, publicInputsArr: _e, commitmentValidationData: ve, rootHashHinkalIndex: ye, encryptedOutputs: be, onChainEncryptedOutput: xe } = await x(oe[D], ae, N, X, Z, Q, P.flatFee, P.variableRate, O.toString(), H, $, Y, D, K, G, _);
 	return b({
-		chainId: E,
-		relayAddress: U,
+		chainId: D,
+		relayAddress: H,
 		functionName: "swap",
 		args: {
-			encryptedOutputs: Y,
-			proofAArr: $,
-			proofBArr: se,
-			proofCArr: ce,
-			publicInputsArr: le,
-			relayerFee: F.flatFee.toString(),
-			variableRate: H,
-			dimensions: J,
-			hinkalInstructions: Q.map((e) => ({
+			encryptedOutputs: be,
+			onChainEncryptedOutput: xe,
+			onChainCreation: Y,
+			proofAArr: me,
+			proofBArr: he,
+			proofCArr: ge,
+			publicInputsArr: _e,
+			relayerFee: P.flatFee.toString(),
+			variableRate: V,
+			dimensions: $,
+			rootHashIndex: ye.toString(),
+			hinkalInstructions: K.map((e) => ({
 				accountIndexes: [...e.accountIndexes],
 				data: [...e.data],
 				programIndex: e.programIndex
 			}))
 		},
-		accounts: he,
-		commitmentValidationData: ue,
-		adminData: h(T, E, M, f, oe, d)
+		accounts: q,
+		commitmentValidationData: ve,
+		adminData: J
 	});
 };
 //#endregion

package/common/src/data-structures/Hinkal/hinkalSolanaTransfer.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/snarkjs/common.snarkjs.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const h=require(`../../functions/utils/fees.utils.cjs`),g=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let v=require(`ethers`);var y=async(e,t,n,r,i,o)=>{let s=(await l.addPaddingToUtxos(e,t,n,r,6))[0],c=a.getCurrentTimeInSeconds().toString(),{outputUtxos:d}=u.outputUtxoProcessing(e.userKeys,s,r[0],c,!0,i,o);return{inputUtxos:s,senderUtxo:d[0],recipientUtxo:d[1]}},b=async(a,l,u,_,b,x,S)=>{if(!o.isValidPrivateAddress(_))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let C=c.validateAndGetChainId(l),w=[...u],{originalDeployer:T}=e.networkRegistry[C].contractData;if(!T)throw Error(`missing data`);let{userKeys:E,merkleTreeHinkalByChain:D}=a,O=l.map(e=>e.erc20TokenAddress);if(O.length>1)throw Error(`Solana Transfer: Only one mint address is supported`);let k=x??await m.getFeeStructure(C,b,O,s.ExternalActionId.Transact,[],5n);k.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let A=h.calculateTotalFee(-w[0],k),j=-w[0];w[0]-=A;let[M,N,{inputUtxos:P,senderUtxo:F,recipientUtxo:I}]=await Promise.all([a.getRandomRelay(C,!0),a.getEthereumAddressByChain(C),y(a,C,O,w,_,j)]);if(!M)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let L=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),a.userKeys.getShieldedPrivateKey()),R={tokenNumber:O.length,nullifierAmount:P.length,outputAmount:2},z=d.calcEncryptedOutputs([[F,I]])[0].map(e=>Array.from(v.ethers.getBytes(e)));p.ensureAmountChanges([P],[[F]],w);let{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,commitmentValidationData:W}=await g.constructSolanaZkProof(a.generateProofRemotely,D[C],E,[O[0]],[P],[[F,I]],L,A,0n,t.solanaNativeAddress,M,R,z,C),G={recipient:M,mint:O[0]===`11111111111111111111111111111111`?void 0:O[0]};return{chainId:C,relay:M,args:{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,encryptedOutputs:z,relayerFee:A.toString(),dimensions:R},accounts:G,adminData:f.constructAdminData(S,C,O,w,N),commitmentValidationData:W,recipientUtxo:I}},x=async(e,t,n,r,i,a,o,s=!1)=>{if(s)throw Error(`onlyGasEstimate is not supported for Solana transfer`);let c=await b(e,t,n,r,i,a,o);return _.solanaTransactCallRelayer({chainId:c.chainId,relayAddress:c.relay,functionName:`transfer`,args:c.args,accounts:c.accounts,adminData:c.adminData,commitmentValidationData:c.commitmentValidationData})};exports.hinkalSolanaTransfer=x;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/snarkjs/constructTxEnclave.cjs`),p=require(`../../functions/pre-transaction/calculateSolanaNullifierCount.cjs`),m=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),h=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const g=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),_=require(`../../functions/utils/fees.utils.cjs`),v=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`);var y=async(e,t,n,r,i,o)=>{let s=(await l.addPaddingToUtxos(e,t,n,r,6))[0],c=a.getCurrentTimeInSeconds().toString(),{outputUtxos:d}=u.outputUtxoProcessing(e.userKeys,s,r[0],c,!0,[i],[o]);return{inputUtxos:s,senderUtxo:d[0],recipientUtxo:d[1]}},b=async(e,n,r,i,a,o,s,c,l,u)=>{let{jobId:d,signedMessageHash:p}=await f.prepareSolanaTxEnclaveCall(e,{chainId:n,mintAddresses:r,amountChanges:i,relayAddress:s,recipient:t.solanaNativeAddress,signer:s,functionName:`transfer`,accounts:c,relayerFee:l,variableRate:0n,hinkalInstructions:[],remainingAccounts:[],recipientAddress:a,recipientAmounts:[o]}),{R8:m,S:h}=e.userKeys.signEddsa(BigInt(p));return f.finalizeSolanaTxEnclaveCallRelay(d,{R8:m,S:h},n,{adminData:u})},x=async(a,l,u,f,g,b,x)=>{if(!o.isValidPrivateAddress(f))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let S=c.validateAndGetChainId(l),C=[...u],{originalDeployer:w}=e.networkRegistry[S].contractData;if(!w)throw Error(`missing data`);let{userKeys:T,merkleTreeHinkalByChain:E}=a,D=l.map(e=>e.erc20TokenAddress);if(D.length>1)throw Error(`Solana Transfer: Only one mint address is supported`);let O=g??D[0],k={mintTo:O,nullifierCount:await p.calculateSolanaNullifierCount(a,S,D,C),rootInsertCount:2},A=b??await h.getFeeStructure(S,O,D,s.ExternalActionId.Transact,[],5n,k);A.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let j=_.calculateTotalFee(-C[0],A),M=-C[0];C[0]-=j;let[N,P,{inputUtxos:F,senderUtxo:I,recipientUtxo:L}]=await Promise.all([a.getRandomRelay(S,!0),a.getEthereumAddressByChain(S),y(a,S,D,C,f,M)]);if(!N)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let R=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),a.userKeys.getShieldedPrivateKey()),z={tokenNumber:D.length,nullifierAmount:F.length,outputAmount:2};m.ensureAmountChanges([F],[[I]],C);let{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,commitmentValidationData:W,rootHashHinkalIndex:G,encryptedOutputs:K}=await v.constructSolanaZkProof(E[S],T,[D[0]],[F],[[I,L]],R,j,0n,t.solanaNativeAddress,N,z,void 0,S),q={recipient:N,mint:D[0]===`11111111111111111111111111111111`?void 0:D[0]};return{chainId:S,relay:N,args:{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,encryptedOutputs:K,relayerFee:j.toString(),dimensions:z,rootHashIndex:G.toString()},accounts:q,adminData:d.constructAdminData(x,S,D,C,P),commitmentValidationData:W,recipientUtxo:L}},S=async(e,r,i,a,l,u,f,m=!1)=>{if(m)throw Error(`onlyGasEstimate is not supported for Solana transfer`);if(!o.isValidPrivateAddress(a))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let v=c.validateAndGetChainId(r),y=[...i],S=r.map(e=>e.erc20TokenAddress);if(S.length>1)throw Error(`Solana Transfer: Only one mint address is supported`);if(e.generateProofRemotely){let r=u??await h.getFeeStructure(v,l,S,s.ExternalActionId.Transact,[],5n,{mintTo:l??S[0],nullifierCount:await p.calculateSolanaNullifierCount(e,v,S,y),rootInsertCount:2});r.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let i=_.calculateTotalFee(-y[0],r),o=-y[0];y[0]-=i;let[c,m]=await Promise.all([e.getRandomRelay(v,!0),e.getEthereumAddressByChain(v)]);if(!c)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);return b(e,v,S,y,a,o,c,{recipient:c,mint:S[0]===`11111111111111111111111111111111`?void 0:S[0]},i,d.constructAdminData(f,v,S,y,m))}let C=await x(e,r,i,a,l,u,f);return g.solanaTransactCallRelayer({chainId:C.chainId,relayAddress:C.relay,functionName:`transfer`,args:C.args,accounts:C.accounts,adminData:C.adminData,commitmentValidationData:C.commitmentValidationData})};exports.hinkalSolanaTransfer=S;

package/common/src/data-structures/Hinkal/hinkalSolanaTransfer.d.ts

@@ -18,6 +18,7 @@ type SolanaTransferPlan = {
             nullifierAmount: number;
             outputAmount: number;
         };
+        rootHashIndex: string;
     };
     accounts: {
         recipient: string;

package/common/src/data-structures/Hinkal/hinkalSolanaTransfer.mjs

@@ -10,78 +10,123 @@ import "../../types/index.mjs";
 import { validateAndGetChainId as l } from "../../functions/utils/token-check.utils.mjs";
 import { addPaddingToUtxos as u } from "../../functions/web3/events/getShieldedBalance.mjs";
 import { outputUtxoProcessing as d } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { calcEncryptedOutputs as f } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { constructAdminData as p } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { ensureAmountChanges as m } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
-import { getFeeStructure as h } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { constructAdminData as f } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { finalizeSolanaTxEnclaveCallRelay as p, prepareSolanaTxEnclaveCall as m } from "../../functions/snarkjs/constructTxEnclave.mjs";
+import { calculateSolanaNullifierCount as h } from "../../functions/pre-transaction/calculateSolanaNullifierCount.mjs";
+import { ensureAmountChanges as g } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
+import { getFeeStructure as _ } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { calculateTotalFee as g } from "../../functions/utils/fees.utils.mjs";
-import { constructSolanaZkProof as _ } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
 import { solanaTransactCallRelayer as v } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ethers as y } from "ethers";
+import { calculateTotalFee as y } from "../../functions/utils/fees.utils.mjs";
+import { constructSolanaZkProof as b } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaTransfer.ts
-var b = async (e, t, n, r, i, a) => {
-	let s = (await u(e, t, n, r, 6))[0], c = o().toString(), { outputUtxos: l } = d(e.userKeys, s, r[0], c, !0, i, a);
+var x = async (e, t, n, r, i, a) => {
+	let s = (await u(e, t, n, r, 6))[0], c = o().toString(), { outputUtxos: l } = d(e.userKeys, s, r[0], c, !0, [i], [a]);
 	return {
 		inputUtxos: s,
 		senderUtxo: l[0],
 		recipientUtxo: l[1]
 	};
-}, x = async (o, u, d, v, x, S, C) => {
-	if (!s(v)) throw Error(r.RECIPIENT_FORMAT_INCORRECT);
-	let w = l(u), T = [...d], { originalDeployer: E } = e[w].contractData;
-	if (!E) throw Error("missing data");
-	let { userKeys: D, merkleTreeHinkalByChain: O } = o, k = u.map((e) => e.erc20TokenAddress);
-	if (k.length > 1) throw Error("Solana Transfer: Only one mint address is supported");
-	let A = S ?? await h(w, x, k, c.Transact, [], 5n);
-	A.variableRate ||= t;
-	let j = g(-T[0], A), M = -T[0];
-	T[0] -= j;
-	let [N, P, { inputUtxos: F, senderUtxo: I, recipientUtxo: L }] = await Promise.all([
-		o.getRandomRelay(w, !0),
-		o.getEthereumAddressByChain(w),
-		b(o, w, k, T, v, M)
+}, S = async (e, t, r, i, a, o, s, c, l, u) => {
+	let { jobId: d, signedMessageHash: f } = await m(e, {
+		chainId: t,
+		mintAddresses: r,
+		amountChanges: i,
+		relayAddress: s,
+		recipient: n,
+		signer: s,
+		functionName: "transfer",
+		accounts: c,
+		relayerFee: l,
+		variableRate: 0n,
+		hinkalInstructions: [],
+		remainingAccounts: [],
+		recipientAddress: a,
+		recipientAmounts: [o]
+	}), { R8: h, S: g } = e.userKeys.signEddsa(BigInt(f));
+	return p(d, {
+		R8: h,
+		S: g
+	}, t, { adminData: u });
+}, C = async (o, u, d, p, m, v, S) => {
+	if (!s(p)) throw Error(r.RECIPIENT_FORMAT_INCORRECT);
+	let C = l(u), w = [...d], { originalDeployer: T } = e[C].contractData;
+	if (!T) throw Error("missing data");
+	let { userKeys: E, merkleTreeHinkalByChain: D } = o, O = u.map((e) => e.erc20TokenAddress);
+	if (O.length > 1) throw Error("Solana Transfer: Only one mint address is supported");
+	let k = m ?? O[0], A = {
+		mintTo: k,
+		nullifierCount: await h(o, C, O, w),
+		rootInsertCount: 2
+	}, j = v ?? await _(C, k, O, c.Transact, [], 5n, A);
+	j.variableRate ||= t;
+	let M = y(-w[0], j), N = -w[0];
+	w[0] -= M;
+	let [P, F, { inputUtxos: I, senderUtxo: L, recipientUtxo: R }] = await Promise.all([
+		o.getRandomRelay(C, !0),
+		o.getEthereumAddressByChain(C),
+		x(o, C, O, w, p, N)
 	]);
-	if (!N) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let R = a.findCorrectRandomization(i(31), o.userKeys.getShieldedPrivateKey()), z = {
-		tokenNumber: k.length,
-		nullifierAmount: F.length,
+	if (!P) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let z = a.findCorrectRandomization(i(31), o.userKeys.getShieldedPrivateKey()), B = {
+		tokenNumber: O.length,
+		nullifierAmount: I.length,
 		outputAmount: 2
-	}, B = f([[I, L]])[0].map((e) => Array.from(y.getBytes(e)));
-	m([F], [[I]], T);
-	let { proofAArr: V, proofBArr: H, proofCArr: U, publicInputsArr: W, commitmentValidationData: G } = await _(o.generateProofRemotely, O[w], D, [k[0]], [F], [[I, L]], R, j, 0n, n, N, z, B, w), K = {
-		recipient: N,
-		mint: k[0] === "11111111111111111111111111111111" ? void 0 : k[0]
+	};
+	g([I], [[L]], w);
+	let { proofAArr: V, proofBArr: H, proofCArr: U, publicInputsArr: W, commitmentValidationData: G, rootHashHinkalIndex: K, encryptedOutputs: q } = await b(D[C], E, [O[0]], [I], [[L, R]], z, M, 0n, n, P, B, void 0, C), J = {
+		recipient: P,
+		mint: O[0] === "11111111111111111111111111111111" ? void 0 : O[0]
 	};
 	return {
-		chainId: w,
-		relay: N,
+		chainId: C,
+		relay: P,
 		args: {
 			proofAArr: V,
 			proofBArr: H,
 			proofCArr: U,
 			publicInputsArr: W,
-			encryptedOutputs: B,
-			relayerFee: j.toString(),
-			dimensions: z
+			encryptedOutputs: q,
+			relayerFee: M.toString(),
+			dimensions: B,
+			rootHashIndex: K.toString()
 		},
-		accounts: K,
-		adminData: p(C, w, k, T, P),
+		accounts: J,
+		adminData: f(S, C, O, w, F),
 		commitmentValidationData: G,
-		recipientUtxo: L
+		recipientUtxo: R
 	};
-}, S = async (e, t, n, r, i, a, o, s = !1) => {
-	if (s) throw Error("onlyGasEstimate is not supported for Solana transfer");
-	let c = await x(e, t, n, r, i, a, o);
+}, w = async (e, n, i, a, o, u, d, p = !1) => {
+	if (p) throw Error("onlyGasEstimate is not supported for Solana transfer");
+	if (!s(a)) throw Error(r.RECIPIENT_FORMAT_INCORRECT);
+	let m = l(n), g = [...i], b = n.map((e) => e.erc20TokenAddress);
+	if (b.length > 1) throw Error("Solana Transfer: Only one mint address is supported");
+	if (e.generateProofRemotely) {
+		let n = u ?? await _(m, o, b, c.Transact, [], 5n, {
+			mintTo: o ?? b[0],
+			nullifierCount: await h(e, m, b, g),
+			rootInsertCount: 2
+		});
+		n.variableRate ||= t;
+		let i = y(-g[0], n), s = -g[0];
+		g[0] -= i;
+		let [l, p] = await Promise.all([e.getRandomRelay(m, !0), e.getEthereumAddressByChain(m)]);
+		if (!l) throw Error(r.RELAYER_NOT_AVAILABLE);
+		return S(e, m, b, g, a, s, l, {
+			recipient: l,
+			mint: b[0] === "11111111111111111111111111111111" ? void 0 : b[0]
+		}, i, f(d, m, b, g, p));
+	}
+	let x = await C(e, n, i, a, o, u, d);
 	return v({
-		chainId: c.chainId,
-		relayAddress: c.relay,
+		chainId: x.chainId,
+		relayAddress: x.relay,
 		functionName: "transfer",
-		args: c.args,
-		accounts: c.accounts,
-		adminData: c.adminData,
-		commitmentValidationData: c.commitmentValidationData
+		args: x.args,
+		accounts: x.accounts,
+		adminData: x.adminData,
+		commitmentValidationData: x.commitmentValidationData
 	});
 };
 //#endregion
-export { S as hinkalSolanaTransfer };
+export { w as hinkalSolanaTransfer };

package/common/src/data-structures/Hinkal/hinkalSolanaWithdraw.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../functions/web3/etherFunctions.cjs`),r=require(`../crypto-keys/keys.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const o=require(`../../functions/utils/token-check.utils.cjs`),s=require(`../../functions/web3/events/getShieldedBalance.cjs`),c=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),l=require(`../../functions/snarkjs/common.snarkjs.cjs`),u=require(`../../functions/pre-transaction/constructAdminData.cjs`),d=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`),require(`../../constants/index.cjs`);const p=require(`../../functions/utils/fees.utils.cjs`),m=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),h=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let g=require(`ethers`);var _=async(e,t,n,r)=>{let a=[...await s.addPaddingToUtxos(e,t,n,r,6)][0],o=i.getCurrentTimeInSeconds().toString(),{outputUtxos:l}=c.outputUtxoProcessing(e.userKeys,a,r[0],o);return{inputUtxos:a,outputUtxos:l}},v=async(i,s,c,v,y,b,x)=>{let S=o.validateAndGetChainId(s),C=s.map(e=>e.erc20TokenAddress),w=s[0];if(!w)throw Error(`Solana Withdraw: No Token Found`);let{originalDeployer:T}=e.networkRegistry[S].contractData;if(!T)throw Error(`missing data`);let{userKeys:E,merkleTreeHinkalByChain:D}=i,O=b??await f.getFeeStructure(S,y,C,a.ExternalActionId.Transact),k=await p.calculateModifiedFeeStructure(S,w,-c[0],O);c[0]-=k.flatFee;let[A,{inputUtxos:j,outputUtxos:M}]=await Promise.all([i.getRandomRelay(S,!0),_(i,S,C,c)]);if(!A)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);if(C.length>1)throw Error(`Solana Withdraw: Only one mint address is supported`);let N=r.UserKeys.findCorrectRandomization(n.randomBigInt(31),i.userKeys.getShieldedPrivateKey()),P={tokenNumber:C.length,nullifierAmount:j.length,outputAmount:M.length},F=l.calcEncryptedOutputs([M])[0][0],I=Array.from(g.ethers.getBytes(F));d.ensureAmountChanges([j],[M],c);let{proofAArr:L,proofBArr:R,proofCArr:z,publicInputsArr:B,commitmentValidationData:V}=await m.constructSolanaZkProof(i.generateProofRemotely,D[S],E,[C[0]],[j],[M],N,k.flatFee,k.variableRate,v,A,P,[I],S),H={recipient:v,mint:C[0]===`11111111111111111111111111111111`?void 0:C[0]};return h.solanaTransactCallRelayer({chainId:S,relayAddress:A,functionName:`transact`,args:{proofAArr:L,proofBArr:R,proofCArr:z,publicInputsArr:B,encryptedOutputs:[I],relayerFee:k.flatFee.toString(),dimensions:P},accounts:H,commitmentValidationData:V,adminData:u.constructAdminData(x,S,C,c,await i.getEthereumAddress())})};exports.hinkalSolanaWithdraw=v;
+const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../functions/web3/etherFunctions.cjs`),r=require(`../crypto-keys/keys.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const o=require(`../../functions/utils/token-check.utils.cjs`),s=require(`../../functions/web3/events/getShieldedBalance.cjs`),c=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),l=require(`../../functions/pre-transaction/constructAdminData.cjs`),u=require(`../../functions/snarkjs/constructTxEnclave.cjs`),d=require(`../../functions/pre-transaction/calculateSolanaNullifierCount.cjs`),f=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const m=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);require(`../../constants/index.cjs`);const h=require(`../../functions/utils/fees.utils.cjs`),g=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`);var _=async(e,t,n,r)=>{let a=[...await s.addPaddingToUtxos(e,t,n,r,6)][0],o=i.getCurrentTimeInSeconds().toString(),{outputUtxos:l}=c.outputUtxoProcessing(e.userKeys,a,r[0],o);return{inputUtxos:a,outputUtxos:l}},v=async(e,t,n,r,i,a,o,s,c)=>{let{jobId:l,signedMessageHash:d}=await u.prepareSolanaTxEnclaveCall(e,{chainId:t,mintAddresses:n,amountChanges:r,relayAddress:a,recipient:i,signer:a,functionName:`transact`,accounts:o,relayerFee:s.flatFee,variableRate:s.variableRate,hinkalInstructions:[],remainingAccounts:[]}),{R8:f,S:p}=e.userKeys.signEddsa(BigInt(d));return u.finalizeSolanaTxEnclaveCallRelay(l,{R8:f,S:p},t,{adminData:c})},y=async(i,s,c,u,y,b,x)=>{let S=o.validateAndGetChainId(s),C=s.map(e=>e.erc20TokenAddress),w=s[0];if(!w)throw Error(`Solana Withdraw: No Token Found`);let{originalDeployer:T}=e.networkRegistry[S].contractData;if(!T)throw Error(`missing data`);let{userKeys:E,merkleTreeHinkalByChain:D}=i,O=y??C[0],k={mintTo:C[0],recipient:u,nullifierCount:await d.calculateSolanaNullifierCount(i,S,C,c)},A=b??await p.getFeeStructure(S,O,C,a.ExternalActionId.Transact,[],void 0,k),j=await h.calculateModifiedFeeStructure(S,w,-c[0],A);c[0]-=j.flatFee;let[M,N]=await Promise.all([i.getRandomRelay(S,!0),i.getEthereumAddress()]);if(!M)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);if(C.length>1)throw Error(`Solana Withdraw: Only one mint address is supported`);let P={recipient:u,mint:C[0]===`11111111111111111111111111111111`?void 0:C[0]},F=l.constructAdminData(x,S,C,c,N);if(i.generateProofRemotely)return v(i,S,C,c,u,M,P,j,F);let{inputUtxos:I,outputUtxos:L}=await _(i,S,C,c),R=r.UserKeys.findCorrectRandomization(n.randomBigInt(31),i.userKeys.getShieldedPrivateKey()),z={tokenNumber:C.length,nullifierAmount:I.length,outputAmount:L.length};f.ensureAmountChanges([I],[L],c);let{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,commitmentValidationData:W,rootHashHinkalIndex:G,encryptedOutputs:K}=await g.constructSolanaZkProof(D[S],E,[C[0]],[I],[L],R,j.flatFee,j.variableRate,u,M,z,void 0,S);return m.solanaTransactCallRelayer({chainId:S,relayAddress:M,functionName:`transact`,args:{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,encryptedOutputs:K,relayerFee:j.flatFee.toString(),dimensions:z,rootHashIndex:G.toString()},accounts:P,commitmentValidationData:W,adminData:F})};exports.hinkalSolanaWithdraw=y;

package/common/src/data-structures/Hinkal/hinkalSolanaWithdraw.mjs

@@ -9,60 +9,86 @@ import "../../types/index.mjs";
 import { validateAndGetChainId as o } from "../../functions/utils/token-check.utils.mjs";
 import { addPaddingToUtxos as s } from "../../functions/web3/events/getShieldedBalance.mjs";
 import { outputUtxoProcessing as c } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { calcEncryptedOutputs as l } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { constructAdminData as u } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { ensureAmountChanges as d } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
-import { getFeeStructure as f } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { constructAdminData as l } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { finalizeSolanaTxEnclaveCallRelay as u, prepareSolanaTxEnclaveCall as d } from "../../functions/snarkjs/constructTxEnclave.mjs";
+import { calculateSolanaNullifierCount as f } from "../../functions/pre-transaction/calculateSolanaNullifierCount.mjs";
+import { ensureAmountChanges as p } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
+import { getFeeStructure as m } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import "../../constants/index.mjs";
-import { calculateModifiedFeeStructure as p } from "../../functions/utils/fees.utils.mjs";
-import { constructSolanaZkProof as m } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
 import { solanaTransactCallRelayer as h } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ethers as g } from "ethers";
+import "../../constants/index.mjs";
+import { calculateModifiedFeeStructure as g } from "../../functions/utils/fees.utils.mjs";
+import { constructSolanaZkProof as _ } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaWithdraw.ts
-var _ = async (e, t, n, r) => {
+var v = async (e, t, n, r) => {
 	let a = [...await s(e, t, n, r, 6)][0], o = i().toString(), { outputUtxos: l } = c(e.userKeys, a, r[0], o);
 	return {
 		inputUtxos: a,
 		outputUtxos: l
 	};
-}, v = async (i, s, c, v, y, b, x) => {
+}, y = async (e, t, n, r, i, a, o, s, c) => {
+	let { jobId: l, signedMessageHash: f } = await d(e, {
+		chainId: t,
+		mintAddresses: n,
+		amountChanges: r,
+		relayAddress: a,
+		recipient: i,
+		signer: a,
+		functionName: "transact",
+		accounts: o,
+		relayerFee: s.flatFee,
+		variableRate: s.variableRate,
+		hinkalInstructions: [],
+		remainingAccounts: []
+	}), { R8: p, S: m } = e.userKeys.signEddsa(BigInt(f));
+	return u(l, {
+		R8: p,
+		S: m
+	}, t, { adminData: c });
+}, b = async (i, s, c, u, d, b, x) => {
 	let S = o(s), C = s.map((e) => e.erc20TokenAddress), w = s[0];
 	if (!w) throw Error("Solana Withdraw: No Token Found");
 	let { originalDeployer: T } = e[S].contractData;
 	if (!T) throw Error("missing data");
-	let { userKeys: E, merkleTreeHinkalByChain: D } = i, O = b ?? await f(S, y, C, a.Transact), k = await p(S, w, -c[0], O);
-	c[0] -= k.flatFee;
-	let [A, { inputUtxos: j, outputUtxos: M }] = await Promise.all([i.getRandomRelay(S, !0), _(i, S, C, c)]);
-	if (!A) throw Error(t.RELAYER_NOT_AVAILABLE);
+	let { userKeys: E, merkleTreeHinkalByChain: D } = i, O = d ?? C[0], k = {
+		mintTo: C[0],
+		recipient: u,
+		nullifierCount: await f(i, S, C, c)
+	}, A = b ?? await m(S, O, C, a.Transact, [], void 0, k), j = await g(S, w, -c[0], A);
+	c[0] -= j.flatFee;
+	let [M, N] = await Promise.all([i.getRandomRelay(S, !0), i.getEthereumAddress()]);
+	if (!M) throw Error(t.RELAYER_NOT_AVAILABLE);
 	if (C.length > 1) throw Error("Solana Withdraw: Only one mint address is supported");
-	let N = r.findCorrectRandomization(n(31), i.userKeys.getShieldedPrivateKey()), P = {
-		tokenNumber: C.length,
-		nullifierAmount: j.length,
-		outputAmount: M.length
-	}, F = l([M])[0][0], I = Array.from(g.getBytes(F));
-	d([j], [M], c);
-	let { proofAArr: L, proofBArr: R, proofCArr: z, publicInputsArr: B, commitmentValidationData: V } = await m(i.generateProofRemotely, D[S], E, [C[0]], [j], [M], N, k.flatFee, k.variableRate, v, A, P, [I], S), H = {
-		recipient: v,
+	let P = {
+		recipient: u,
 		mint: C[0] === "11111111111111111111111111111111" ? void 0 : C[0]
+	}, F = l(x, S, C, c, N);
+	if (i.generateProofRemotely) return y(i, S, C, c, u, M, P, j, F);
+	let { inputUtxos: I, outputUtxos: L } = await v(i, S, C, c), R = r.findCorrectRandomization(n(31), i.userKeys.getShieldedPrivateKey()), z = {
+		tokenNumber: C.length,
+		nullifierAmount: I.length,
+		outputAmount: L.length
 	};
+	p([I], [L], c);
+	let { proofAArr: B, proofBArr: V, proofCArr: H, publicInputsArr: U, commitmentValidationData: W, rootHashHinkalIndex: G, encryptedOutputs: K } = await _(D[S], E, [C[0]], [I], [L], R, j.flatFee, j.variableRate, u, M, z, void 0, S);
 	return h({
 		chainId: S,
-		relayAddress: A,
+		relayAddress: M,
 		functionName: "transact",
 		args: {
-			proofAArr: L,
-			proofBArr: R,
-			proofCArr: z,
-			publicInputsArr: B,
-			encryptedOutputs: [I],
-			relayerFee: k.flatFee.toString(),
-			dimensions: P
+			proofAArr: B,
+			proofBArr: V,
+			proofCArr: H,
+			publicInputsArr: U,
+			encryptedOutputs: K,
+			relayerFee: j.flatFee.toString(),
+			dimensions: z,
+			rootHashIndex: G.toString()
 		},
-		accounts: H,
-		commitmentValidationData: V,
-		adminData: u(x, S, C, c, await i.getEthereumAddress())
+		accounts: P,
+		commitmentValidationData: W,
+		adminData: F
 	});
 };
 //#endregion
-export { v as hinkalSolanaWithdraw };
+export { b as hinkalSolanaWithdraw };

package/common/src/data-structures/Hinkal/hinkalSwap.cjs

@@ -1 +1 @@
-require(`../../constants/protocol.constants.cjs`);const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../../functions/utils/time.utils.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../../functions/web3/events/getShieldedBalance.cjs`),i=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),a=require(`../../functions/pre-transaction/constructAdminData.cjs`),o=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const s=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),c=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),l=require(`../../functions/pre-transaction/getExternalSwapAddress.cjs`),u=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var d=async(e,n,a,o)=>{let s=[...await r.addPaddingToUtxos(e,n,a,o)],c=[],l=t.getCurrentTimeInSeconds().toString();for(let t=0;t<a.length;t+=1){let{outputUtxos:n}=i.outputUtxoProcessing(e.userKeys,s[t],o[t],l);c.push(n)}return{inputUtxosArray:s,outputUtxosArray:c}},f=async(t,r,i,f,p,m,h,g)=>{let _=n.validateAndGetChainId(r),v=r.map(e=>e.erc20TokenAddress),y=await t.getEthereumAddressByChain(_),b=h??await o.getFeeStructure(_,m,v,f,void 0,35n);await u.mergeWithFeeStructure(_,v,i,b);let x={externalActionId:f,externalAddress:l.getExternalSwapAddress(_,f),externalActionMetadata:p},[S,{inputUtxosArray:C,outputUtxosArray:w}]=await Promise.all([t.getRandomRelay(_,!0),d(t,_,v,i)]);if(!S)throw Error(e.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let T=[!1,!0,!1].slice(0,i.length),{zkCallData:E,circomData:D,dimData:O,commitmentValidationData:k}=await s.constructZkProof(t.merkleTreeHinkalByChain[_],C,w,t.userKeys,x.externalActionId,x.externalAddress,x.externalActionMetadata,t.generateProofRemotely,b,S,_,T);return await c.transactCallRelayer(_,E,O,D,k,void 0,void 0,a.constructAdminData(g,_,v,i,y,r))};exports.hinkalSwap=f;
+require(`../../constants/protocol.constants.cjs`);const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../../types/transact.types.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../../functions/pre-transaction/constructAdminData.cjs`),i=require(`../../functions/pre-transaction/getFeeStructure.cjs`),a=require(`../../functions/pre-transaction/getExternalSwapAddress.cjs`);require(`../../functions/pre-transaction/index.cjs`);const o=require(`./hinkalTransact.cjs`),s=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var c=async(c,l,u,d,f,p,m,h)=>{let g=n.validateAndGetChainId(l),_=l.map(e=>e.erc20TokenAddress),v=await c.getEthereumAddressByChain(g),y=m??await i.getFeeStructure(g,p,_,d,void 0,35n);await s.mergeWithFeeStructure(g,_,u,y);let b=a.getExternalSwapAddress(g,d),x=[!1,!0,!1].slice(0,u.length),S=await c.getRandomRelay(g,!0);if(!S)throw Error(e.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let C=r.constructAdminData(h,g,_,u,v,l);return o.hinkalTransact(c,{chainId:g,erc20Addresses:_,amountChanges:u,externalAddress:b,externalActionId:d,externalActionMetadata:f,onChainCreation:x,feeStructure:y,relay:S,submit:{mode:t.SubmitMode.Relayer,adminData:C}})};exports.hinkalSwap=c;

package/common/src/data-structures/Hinkal/hinkalSwap.mjs

@@ -1,42 +1,39 @@
 import "../../constants/protocol.constants.mjs";
 import { transactionErrorCodes as e } from "../../error-handling/error-codes.constants.mjs";
-import { getCurrentTimeInSeconds as t } from "../../functions/utils/time.utils.mjs";
+import { SubmitMode as t } from "../../types/transact.types.mjs";
 import { validateAndGetChainId as n } from "../../functions/utils/token-check.utils.mjs";
-import { addPaddingToUtxos as r } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as i } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructAdminData as a } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { getFeeStructure as o } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { constructAdminData as r } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getFeeStructure as i } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { getExternalSwapAddress as a } from "../../functions/pre-transaction/getExternalSwapAddress.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { constructZkProof as s } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayer as c } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { getExternalSwapAddress as l } from "../../functions/pre-transaction/getExternalSwapAddress.mjs";
-import { mergeWithFeeStructure as u } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { hinkalTransact as o } from "./hinkalTransact.mjs";
+import { mergeWithFeeStructure as s } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSwap.ts
-var d = async (e, n, a, o) => {
-	let s = [...await r(e, n, a, o)], c = [], l = t().toString();
-	for (let t = 0; t < a.length; t += 1) {
-		let { outputUtxos: n } = i(e.userKeys, s[t], o[t], l);
-		c.push(n);
-	}
-	return {
-		inputUtxosArray: s,
-		outputUtxosArray: c
-	};
-}, f = async (t, r, i, f, p, m, h, g) => {
-	let _ = n(r), v = r.map((e) => e.erc20TokenAddress), y = await t.getEthereumAddressByChain(_), b = h ?? await o(_, m, v, f, void 0, 35n);
-	await u(_, v, i, b);
-	let x = {
-		externalActionId: f,
-		externalAddress: l(_, f),
-		externalActionMetadata: p
-	}, [S, { inputUtxosArray: C, outputUtxosArray: w }] = await Promise.all([t.getRandomRelay(_, !0), d(t, _, v, i)]);
-	if (!S) throw Error(e.RELAYER_NOT_AVAILABLE);
-	let T = [
+var c = async (c, l, u, d, f, p, m, h) => {
+	let g = n(l), _ = l.map((e) => e.erc20TokenAddress), v = await c.getEthereumAddressByChain(g), y = m ?? await i(g, p, _, d, void 0, 35n);
+	await s(g, _, u, y);
+	let b = a(g, d), x = [
 		!1,
 		!0,
 		!1
-	].slice(0, i.length), { zkCallData: E, circomData: D, dimData: O, commitmentValidationData: k } = await s(t.merkleTreeHinkalByChain[_], C, w, t.userKeys, x.externalActionId, x.externalAddress, x.externalActionMetadata, t.generateProofRemotely, b, S, _, T);
-	return await c(_, E, O, D, k, void 0, void 0, a(g, _, v, i, y, r));
+	].slice(0, u.length), S = await c.getRandomRelay(g, !0);
+	if (!S) throw Error(e.RELAYER_NOT_AVAILABLE);
+	let C = r(h, g, _, u, v, l);
+	return o(c, {
+		chainId: g,
+		erc20Addresses: _,
+		amountChanges: u,
+		externalAddress: b,
+		externalActionId: d,
+		externalActionMetadata: f,
+		onChainCreation: x,
+		feeStructure: y,
+		relay: S,
+		submit: {
+			mode: t.Relayer,
+			adminData: C
+		}
+	});
 };
 //#endregion
-export { f as hinkalSwap };
+export { c as hinkalSwap };

package/common/src/data-structures/Hinkal/hinkalTransact.cjs

@@ -0,0 +1 @@
+const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../types/hinkal.types.cjs`),n=require(`../../functions/utils/time.utils.cjs`),r=require(`../utxo/Utxo.cjs`),i=require(`../../types/transact.types.cjs`),a=require(`../../functions/web3/events/getShieldedBalance.cjs`),o=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),s=require(`../../functions/snarkjs/common.snarkjs.cjs`),c=require(`../../functions/snarkjs/constructTxEnclave.cjs`),l=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),u=require(`../../functions/web3/functionCalls/submitProof.cjs`);var d=2,f=6,p=(e,t)=>{let n=Math.max(...t.map(e=>e.length))<=d?d:f;return t.map(t=>{let i=t[0];if(!i)throw Error(`hinkalTransact: inputUtxos must contain at least one note per token`);let a=[...t];for(;a.length<n;)a.push(new r.Utxo({amount:0n,erc20TokenAddress:i.erc20TokenAddress,mintAddress:i.mintAddress,nullifyingKey:e.getShieldedPrivateKey(),spendingPublicKey:e.getSpendingKeyPair().pubSpendingBJJPoint}));return a})},m=async(r,i,s)=>{let{chainId:c,erc20Addresses:u,amountChanges:d,externalAddress:f,externalActionId:m,externalActionMetadata:h,feeStructure:g,relay:_,onChainCreation:v,recipientAddress:y,recipientAmounts:b,useBlockedUtxos:x,inputUtxos:S,forceEmptyUtxos:C,originalSender:w,subAccountPrivateKey:T,emporiumOps:E}=i,D=S?p(s,S):[...await a.addPaddingToUtxos(r,c,u,d,void 0,C,x)],O=n.getCurrentTimeInSeconds().toString(),k=u.map((e,t)=>o.outputUtxoProcessing(s,D[t],d[t],O,!0,y,y===void 0?void 0:b?.map(e=>e[t]??0n)).outputUtxos),{zkCallData:A,circomData:j,dimData:M,commitmentValidationData:N}=await l.constructZkProof(r.merkleTreeHinkalByChain[c],D,k,s,m??0n,f,E??h??`0x00`,g??t.zeroFeeStructure,_??e.zeroAddress,c,v,void 0,w,T);return{zkCallData:A,circomData:j,dimData:M,commitmentValidationData:N}},h=async(e,t,n)=>{let{chainId:r,erc20Addresses:i,externalAddress:a,amountChanges:o,relay:s,feeStructure:l,externalActionId:u,externalActionMetadata:d,onChainCreation:f,recipientAddress:p,recipientAmounts:m,useBlockedUtxos:h,createBlockedUtxos:g,skipLock:_,selfOutputAmounts:v,forceEmptyUtxos:y,messageSeed:b,inputUtxos:x,originalSender:S}=t,{jobId:C,signedMessageHash:w}=await c.prepareTxEnclaveCall(e,{chainId:r,erc20Addresses:i,externalAddress:a,originalSender:S,amountChanges:o,relay:s,feeStructure:l,externalActionId:u,externalActionMetadata:d,onChainCreation:f,recipientAddress:p,recipientAmounts:m,useBlockedUtxos:h,createBlockedUtxos:g,skipLock:_,selfOutputAmounts:v,forceEmptyUtxos:y,messageSeed:b,inputCommitments:x?.flat().filter(e=>e.amount>0n).map(e=>e.getCommitment())},n),{R8:T,S:E}=n.signEddsa(BigInt(w));return{jobId:C,eddsaSignature:{R8:T,S:E}}},g=async(e,t,n)=>{let r=await u.submitProof(e,t,n);return t.submit.mode!==i.SubmitMode.ProofOnly&&t.onTxSubmitLocally?.(n.circomData),r},_=async(e,t)=>{if(t.userKeys&&!t.inputUtxos)throw Error(`hinkalTransact: userKeys requires explicit inputUtxos`);let n=t.userKeys??e.userKeys,{chainId:r,submit:a}=t;if(e.generateProofRemotely){let{jobId:o,eddsaSignature:l}=await h(e,t,n);if(a.mode===i.SubmitMode.Relayer)return c.finalizeTxEnclaveCallRelay(o,l,r,{adminData:a.adminData,authorizationData:a.authorizationData,withUniswapWorkAround:a.withUniswapWorkAround});let{zkCallData:u,circomData:d,dimData:f,commitmentValidationData:p,tronProofSignature:m}=await c.finalizeTxEnclaveCall(o,l);return g(e,t,{zkCallData:u,circomData:s.deserializeCircomData(d),dimData:f,commitmentValidationData:p,tronProofSignature:m})}return g(e,t,await m(e,t,n))};exports.hinkalTransact=_;