@hinkal/common 0.2.32 → 0.2.34

package/data-structures/Hinkal/hinkalDepositAndBridge.mjs

@@ -15,109 +15,103 @@ import { validateAndGetChainId as m } from "../../functions/utils/token-check.ut
 import { constructAdminData as h } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { getFeeStructure as g } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import { waitForDepositedUtxosInMerkleTree as _ } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
-import { buildCommitmentValidationData as v } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
-import "../../functions/pre-transaction/index.mjs";
-import { convertEmporiumOpToCallInfo as y } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { calculateModifiedFeeStructure as b } from "../../functions/utils/fees.utils.mjs";
+import { convertEmporiumOpToCallInfo as v } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { calculateModifiedFeeStructure as y } from "../../functions/utils/fees.utils.mjs";
 import "../../functions/utils/index.mjs";
-import { createLifiBridgeOps as x, getAuthorizationDataIfNeeded as S } from "../../functions/private-wallet/emporium.helpers.mjs";
-import { constructZkProof as C } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayerBatch as w } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { safeUpdateDepositAndWithdrawStatus as T } from "../../API/deposit-and-withdraw-status-calls.mjs";
-import { hinkalDepositOnChainUtxos as E } from "./hinkalDepositOnChainUtxos.mjs";
+import { createLifiBridgeOps as b, getAuthorizationDataIfNeeded as x } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { constructZkProof as S } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayerBatch as C } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { safeUpdateDepositAndWithdrawStatus as w } from "../../API/deposit-and-withdraw-status-calls.mjs";
+import { hinkalDepositOnChainUtxos as T } from "./hinkalDepositOnChainUtxos.mjs";
 import "../../functions/index.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDepositAndBridge.ts
-var D = async (n, o, s, d, m, g, _, y, E, D, O) => {
+var E = async (n, o, s, d, m, g, _, v, T, E, D) => {
 	if (d.length === 0) throw Error("No recipients to bridge");
-	let k = s.erc20TokenAddress, { contractData: A } = t[o], { emporiumAddress: j } = A;
-	if (!j) throw Error("No Emporium Address");
-	let M = l[e.Lifi][o];
-	if (!M) throw Error(`LIFI not configured for chain ${o}`);
-	let N = await n.getRandomRelay(o);
-	if (!N) throw Error(u.RELAYER_NOT_AVAILABLE);
-	let P = await n.getEthereumAddressByChain(o), F = f().toString(), I = n.generateProofRemotely ? 5 : 1, L = [];
-	for (let t = 0; t < d.length; t += I) {
-		let i = d.slice(t, t + I), l = await Promise.all(i.map(async ({ utxo: t, nativeUtxo: i, bridgeAmount: l, quote: u, temporarySubAccount: d, recipientAddress: f }) => {
+	let O = s.erc20TokenAddress, { contractData: k } = t[o], { emporiumAddress: A } = k;
+	if (!A) throw Error("No Emporium Address");
+	let j = l[e.Lifi][o];
+	if (!j) throw Error(`LIFI not configured for chain ${o}`);
+	let M = await n.getRandomRelay(o);
+	if (!M) throw Error(u.RELAYER_NOT_AVAILABLE);
+	let N = await n.getEthereumAddressByChain(o), P = f().toString(), F = n.generateProofRemotely ? 5 : 1, I = [];
+	for (let t = 0; t < d.length; t += F) {
+		let i = d.slice(t, t + F), l = await Promise.all(i.map(async ({ utxo: t, nativeUtxo: i, bridgeAmount: l, quote: u, temporarySubAccount: d, recipientAddress: f }) => {
 			await c.addTemporaryWalletNonce(o, g, d.index);
-			let _ = u.nativeFee > 0n && !a(k, r), y = [k], w = [-t.amount], T = [!1], E = new p({
+			let _ = u.nativeFee > 0n && !a(O, r), v = [O], C = [-t.amount], w = [!1], T = new p({
 				amount: 0n,
-				erc20TokenAddress: k,
+				erc20TokenAddress: O,
 				nullifyingKey: n.userKeys.getShieldedPrivateKey(),
-				timeStamp: F,
+				timeStamp: P,
 				...t.isNewStyle ? {
 					spendingPublicKey: n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
 					isNewStyle: !0
 				} : { isNewStyle: !1 }
-			}), O = [[t, E]], A = [[E]];
+			}), D = [[t, T]], k = [[T]];
 			if (_ && i) {
 				let e = new p({
 					amount: 0n,
 					erc20TokenAddress: r,
 					nullifyingKey: n.userKeys.getShieldedPrivateKey(),
-					timeStamp: F,
+					timeStamp: P,
 					...i.isNewStyle ? {
 						spendingPublicKey: n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
 						isNewStyle: !0
 					} : { isNewStyle: !1 }
 				});
-				y.push(r), w.push(-i.amount), T.push(!1), O.push([i, e]), A.push([e]);
+				v.push(r), C.push(-i.amount), w.push(!1), D.push([i, e]), k.push([e]);
 			}
-			let I = x(n, o, d.ethAddress, M, k, t.amount, l, u), L = await b(o, s, l, m), R = h(D, o, y, [-t.amount], P), [{ zkCallData: z, circomData: B, dimData: V }, H, U] = await Promise.all([
-				C(n.merkleTreeHinkalByChain[o], O, A, n.userKeys, e.Emporium, j, I, n.generateProofRemotely, L, N ?? r, o, T, void 0, void 0, d.privateKey),
-				S(o, d.privateKey),
-				v(o, n.userKeys, y, O)
-			]);
+			let F = b(n, o, d.ethAddress, j, O, t.amount, l, u), I = await y(o, s, l, m), L = h(E, o, v, [-t.amount], N), [{ zkCallData: R, circomData: z, dimData: B, commitmentValidationData: V }, H] = await Promise.all([S(n.merkleTreeHinkalByChain[o], D, k, n.userKeys, e.Emporium, A, F, n.generateProofRemotely, I, M ?? r, o, w, void 0, void 0, d.privateKey), x(o, d.privateKey)]);
 			return {
-				zkCallData: z,
-				dimData: V,
-				circomData: B,
-				commitmentValidationData: U,
+				zkCallData: R,
+				dimData: B,
+				circomData: z,
+				commitmentValidationData: V,
 				authorizationData: H,
 				recipientAddress: f,
-				adminData: R
+				adminData: L
 			};
 		}));
-		L.push(...l);
+		I.push(...l);
 	}
-	await T({
+	await w({
 		id: _,
 		chainId: o,
 		hashedEthereumAddress: g,
 		phase: i.BEFORE_SCHEDULE_WITHDRAW
 	});
-	let R = await w(o, L, g, y, E, O);
-	return await T({
+	let L = await C(o, I, g, v, T, D);
+	return await w({
 		id: _,
 		chainId: o,
 		hashedEthereumAddress: g,
 		phase: i.AFTER_SCHEDULE_WITHDRAW,
-		scheduleId: R
-	}), R;
-}, O = async (t, i, c, u, f, p, h, v, b = !0) => {
-	let S = i.erc20TokenAddress, C = m([i]), w = v ? s(v) : void 0, T = o(await t.getEthereumAddressByChain(C)), O = l[e.Lifi][C];
+		scheduleId: L
+	}), L;
+}, D = async (t, i, c, u, f, p, h, y, x = !0) => {
+	let S = i.erc20TokenAddress, C = m([i]), w = y ? s(y) : void 0, D = o(await t.getEthereumAddressByChain(C)), O = l[e.Lifi][C];
 	if (!O) throw Error("LIFI router not configured");
 	let k;
 	if (f) k = f;
 	else {
-		let r = c[0], i = x(t, C, r.temporarySubAccount.ethAddress, O, S, r.bridgeAmount, r.bridgeAmount, r.quote).map((e) => y(e, r.temporarySubAccount.ethAddress, C));
+		let r = c[0], i = b(t, C, r.temporarySubAccount.ethAddress, O, S, r.bridgeAmount, r.bridgeAmount, r.quote).map((e) => v(e, r.temporarySubAccount.ethAddress, C));
 		k = await g(C, S, [S], e.Emporium, i, n);
 	}
 	let A = {
 		feeToken: k.feeToken,
 		flatFee: 0n,
 		variableRate: 0n
-	}, j = c.reduce((e, t) => e + t.quote.nativeFee, 0n) > 0n && !a(S, r), M = c.map((e) => e.bridgeAmount), N = c.map((e) => e.recipientAddress), { userDepositedUtxos: P, statusId: F, depositTxHash: I } = await E(t, C, i, M, N, k, T, b), L = [];
+	}, j = c.reduce((e, t) => e + t.quote.nativeFee, 0n) > 0n && !a(S, r), M = c.map((e) => e.bridgeAmount), N = c.map((e) => e.recipientAddress), { userDepositedUtxos: P, statusId: F, depositTxHash: I } = await T(t, C, i, M, N, k, D, x), L = [];
 	if (j) {
 		let e = d(r, C);
 		if (!e) throw Error("No native token");
-		let { userDepositedUtxos: n } = await E(t, C, e, c.map((e) => e.quote.nativeFee), N, A, T, b);
+		let { userDepositedUtxos: n } = await T(t, C, e, c.map((e) => e.quote.nativeFee), N, A, D, x);
 		L = n;
 	}
-	return await _(t, C, [...P, ...L]), await D(t, C, i, c.map((e, t) => ({
+	return await _(t, C, [...P, ...L]), await E(t, C, i, c.map((e, t) => ({
 		...e,
 		utxo: P[t].utxo,
 		nativeUtxo: j ? L[t]?.utxo : void 0
-	})), k, T, F, u, p, h, w), I;
+	})), k, D, F, u, p, h, w), I;
 };
 //#endregion
-export { O as hinkalDepositAndBridge };
+export { D as hinkalDepositAndBridge };

package/data-structures/Hinkal/hinkalDepositAndWithdraw.cjs

@@ -1 +1 @@
-const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../functions/utils/caseInsensitive.utils.cjs`),a=require(`../../functions/utils/addresses.cjs`),o=require(`../../error-handling/error-codes.constants.cjs`),s=require(`../../functions/utils/time.utils.cjs`),c=require(`../utxo/Utxo.cjs`),l=require(`../../functions/utils/tron.utils.cjs`),u=require(`../../functions/utils/token-check.utils.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`),p=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),m=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const h=require(`../../functions/utils/fees.utils.cjs`),g=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),v=require(`../../API/deposit-and-withdraw-status-calls.cjs`),y=require(`./hinkalDepositOnChainUtxos.cjs`);require(`../../functions/index.cjs`);var b=async(e,a,u,f,p,y,b,x,S,C,w,T)=>{let E=t.isTronLike(a);if(f.length===0)throw Error(`userDepositedUtxos must not be empty`);let D=u.erc20TokenAddress,[O,k]=await Promise.all([e.getRandomRelay(a),e.getEthereumAddressByChain(a)]);if(!O)throw Error(o.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let A=s.getCurrentTimeInSeconds().toString(),j=e.generateProofRemotely&&!E?5:1,M=[],N=l.addressToHexFormat(k);for(let t=0;t<f.length;t+=j){let r=f.slice(t,t+j),o=await Promise.all(r.map(async({recipientAddress:r,utxo:o},s)=>{let f=t+s,_=l.addressToHexFormat(r),v=new c.Utxo({amount:0n,erc20TokenAddress:D,nullifyingKey:e.userKeys.getShieldedPrivateKey(),timeStamp:A,...o.isNewStyle?{spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),b=[[i.caseInsensitiveEqual(o.erc20TokenAddress,D)?o:c.Utxo.createFrom(o,{erc20TokenAddress:D}),v]],x=[[v]],S={externalActionId:0n,externalAddress:_,externalActionMetadata:`0x00`},C=d.constructAdminData(w,a,[D],[-o.amount],N),T=await h.calculateModifiedFeeStructure(a,u,p[f],y),[{zkCallData:k,circomData:j,dimData:M},P]=await Promise.all([g.constructZkProof(e.merkleTreeHinkalByChain[a],b,x,e.userKeys,S.externalActionId,S.externalAddress,S.externalActionMetadata,e.generateProofRemotely,T,O??n.zeroAddress,a),m.buildCommitmentValidationData(a,e.userKeys,[D],b)]);return{zkCallData:k,dimData:M,circomData:j,commitmentValidationData:P,adminData:C,recipientAddress:r,tronProofSignature:await l.reorderZkCallData(E,k,M,j)}}));M.push(...o)}await v.safeUpdateDepositAndWithdrawStatus({id:x,chainId:a,hashedEthereumAddress:b,phase:r.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let P=await _.transactCallRelayerBatch(a,M,b,S,C,T);return await v.safeUpdateDepositAndWithdrawStatus({id:x,chainId:a,hashedEthereumAddress:b,phase:r.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:P}),P},x=async(t,n,r,i,o,s,c,d,m,h=!0)=>{let g=u.validateAndGetChainId([n]),_=m?a.hashString(m):void 0,v=n.erc20TokenAddress,x=a.hashEthereumAddress(l.addressToHexFormat(await t.getEthereumAddressByChain(g))),S=s??await f.getFeeStructure(g,v,[v],e.ExternalActionId.Transact,[],10n),{userDepositedUtxos:C,statusId:w,depositTxHash:T}=await y.hinkalDepositOnChainUtxos(t,g,n,r,i,S,x,h);return await p.waitForDepositedUtxosInMerkleTree(t,g,C),await b(t,g,n,C,r,S,x,w,o,c,d,_),T};exports.hinkalDepositAndWithdraw=x,exports.hinkalWithdrawBatch=b;
+const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../functions/utils/caseInsensitive.utils.cjs`),a=require(`../../functions/utils/addresses.cjs`),o=require(`../../error-handling/error-codes.constants.cjs`),s=require(`../../functions/utils/time.utils.cjs`),c=require(`../utxo/Utxo.cjs`),l=require(`../../functions/utils/tron.utils.cjs`),u=require(`../../functions/utils/token-check.utils.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`),p=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),m=require(`../../functions/utils/fees.utils.cjs`),h=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),g=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),_=require(`../../API/deposit-and-withdraw-status-calls.cjs`),v=require(`./hinkalDepositOnChainUtxos.cjs`);require(`../../functions/index.cjs`);var y=async(e,a,u,f,p,v,y,b,x,S,C,w)=>{let T=t.isTronLike(a);if(f.length===0)throw Error(`userDepositedUtxos must not be empty`);let E=u.erc20TokenAddress,[D,O]=await Promise.all([e.getRandomRelay(a),e.getEthereumAddressByChain(a)]);if(!D)throw Error(o.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let k=s.getCurrentTimeInSeconds().toString(),A=e.generateProofRemotely&&!T?5:1,j=[],M=l.addressToHexFormat(O);for(let t=0;t<f.length;t+=A){let r=f.slice(t,t+A),o=await Promise.all(r.map(async({recipientAddress:r,utxo:o},s)=>{let f=t+s,g=l.addressToHexFormat(r),_=new c.Utxo({amount:0n,erc20TokenAddress:E,nullifyingKey:e.userKeys.getShieldedPrivateKey(),timeStamp:k,...o.isNewStyle?{spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),y=[[i.caseInsensitiveEqual(o.erc20TokenAddress,E)?o:c.Utxo.createFrom(o,{erc20TokenAddress:E}),_]],b=[[_]],x={externalActionId:0n,externalAddress:g,externalActionMetadata:`0x00`},S=d.constructAdminData(C,a,[E],[-o.amount],M),w=await m.calculateModifiedFeeStructure(a,u,p[f],v),{zkCallData:O,circomData:A,dimData:j,commitmentValidationData:N}=await h.constructZkProof(e.merkleTreeHinkalByChain[a],y,b,e.userKeys,x.externalActionId,x.externalAddress,x.externalActionMetadata,e.generateProofRemotely,w,D??n.zeroAddress,a);return{zkCallData:O,dimData:j,circomData:A,commitmentValidationData:N,adminData:S,recipientAddress:r,tronProofSignature:await l.reorderZkCallData(T,O,j,A)}}));j.push(...o)}await _.safeUpdateDepositAndWithdrawStatus({id:b,chainId:a,hashedEthereumAddress:y,phase:r.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let N=await g.transactCallRelayerBatch(a,j,y,x,S,w);return await _.safeUpdateDepositAndWithdrawStatus({id:b,chainId:a,hashedEthereumAddress:y,phase:r.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:N}),N},b=async(t,n,r,i,o,s,c,d,m,h=!0)=>{let g=u.validateAndGetChainId([n]),_=m?a.hashString(m):void 0,b=n.erc20TokenAddress,x=a.hashEthereumAddress(l.addressToHexFormat(await t.getEthereumAddressByChain(g))),S=s??await f.getFeeStructure(g,b,[b],e.ExternalActionId.Transact,[],10n),{userDepositedUtxos:C,statusId:w,depositTxHash:T}=await v.hinkalDepositOnChainUtxos(t,g,n,r,i,S,x,h);return await p.waitForDepositedUtxosInMerkleTree(t,g,C),await y(t,g,n,C,r,S,x,w,o,c,d,_),T};exports.hinkalDepositAndWithdraw=b,exports.hinkalWithdrawBatch=y;

package/data-structures/Hinkal/hinkalDepositAndWithdraw.mjs

@@ -13,66 +13,64 @@ import { validateAndGetChainId as f } from "../../functions/utils/token-check.ut
 import { constructAdminData as p } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { getFeeStructure as m } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import { waitForDepositedUtxosInMerkleTree as h } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
-import { buildCommitmentValidationData as g } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
-import "../../functions/pre-transaction/index.mjs";
-import { calculateModifiedFeeStructure as _ } from "../../functions/utils/fees.utils.mjs";
-import { constructZkProof as v } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayerBatch as y } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { safeUpdateDepositAndWithdrawStatus as b } from "../../API/deposit-and-withdraw-status-calls.mjs";
-import { hinkalDepositOnChainUtxos as x } from "./hinkalDepositOnChainUtxos.mjs";
+import { calculateModifiedFeeStructure as g } from "../../functions/utils/fees.utils.mjs";
+import { constructZkProof as _ } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayerBatch as v } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { safeUpdateDepositAndWithdrawStatus as y } from "../../API/deposit-and-withdraw-status-calls.mjs";
+import { hinkalDepositOnChainUtxos as b } from "./hinkalDepositOnChainUtxos.mjs";
 import "../../functions/index.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDepositAndWithdraw.ts
-var S = async (e, a, o, f, m, h, x, S, C, w, T, E) => {
-	let D = t(a);
+var x = async (e, a, o, f, m, h, b, x, S, C, w, T) => {
+	let E = t(a);
 	if (f.length === 0) throw Error("userDepositedUtxos must not be empty");
-	let O = o.erc20TokenAddress, [k, A] = await Promise.all([e.getRandomRelay(a), e.getEthereumAddressByChain(a)]);
-	if (!k) throw Error(s.RELAYER_NOT_AVAILABLE);
-	let j = c().toString(), M = e.generateProofRemotely && !D ? 5 : 1, N = [], P = u(A);
-	for (let t = 0; t < f.length; t += M) {
-		let r = f.slice(t, t + M), s = await Promise.all(r.map(async ({ recipientAddress: r, utxo: s }, c) => {
-			let f = t + c, y = u(r), b = new l({
+	let D = o.erc20TokenAddress, [O, k] = await Promise.all([e.getRandomRelay(a), e.getEthereumAddressByChain(a)]);
+	if (!O) throw Error(s.RELAYER_NOT_AVAILABLE);
+	let A = c().toString(), j = e.generateProofRemotely && !E ? 5 : 1, M = [], N = u(k);
+	for (let t = 0; t < f.length; t += j) {
+		let r = f.slice(t, t + j), s = await Promise.all(r.map(async ({ recipientAddress: r, utxo: s }, c) => {
+			let f = t + c, v = u(r), y = new l({
 				amount: 0n,
-				erc20TokenAddress: O,
+				erc20TokenAddress: D,
 				nullifyingKey: e.userKeys.getShieldedPrivateKey(),
-				timeStamp: j,
+				timeStamp: A,
 				...s.isNewStyle ? {
 					spendingPublicKey: e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
 					isNewStyle: !0
 				} : { isNewStyle: !1 }
-			}), x = [[i(s.erc20TokenAddress, O) ? s : l.createFrom(s, { erc20TokenAddress: O }), b]], S = [[b]], C = {
+			}), b = [[i(s.erc20TokenAddress, D) ? s : l.createFrom(s, { erc20TokenAddress: D }), y]], x = [[y]], S = {
 				externalActionId: 0n,
-				externalAddress: y,
+				externalAddress: v,
 				externalActionMetadata: "0x00"
-			}, w = p(T, a, [O], [-s.amount], P), E = await _(a, o, m[f], h), [{ zkCallData: A, circomData: M, dimData: N }, F] = await Promise.all([v(e.merkleTreeHinkalByChain[a], x, S, e.userKeys, C.externalActionId, C.externalAddress, C.externalActionMetadata, e.generateProofRemotely, E, k ?? n, a), g(a, e.userKeys, [O], x)]);
+			}, C = p(w, a, [D], [-s.amount], N), T = await g(a, o, m[f], h), { zkCallData: k, circomData: j, dimData: M, commitmentValidationData: P } = await _(e.merkleTreeHinkalByChain[a], b, x, e.userKeys, S.externalActionId, S.externalAddress, S.externalActionMetadata, e.generateProofRemotely, T, O ?? n, a);
 			return {
-				zkCallData: A,
-				dimData: N,
-				circomData: M,
-				commitmentValidationData: F,
-				adminData: w,
+				zkCallData: k,
+				dimData: M,
+				circomData: j,
+				commitmentValidationData: P,
+				adminData: C,
 				recipientAddress: r,
-				tronProofSignature: await d(D, A, N, M)
+				tronProofSignature: await d(E, k, M, j)
 			};
 		}));
-		N.push(...s);
+		M.push(...s);
 	}
-	await b({
-		id: S,
+	await y({
+		id: x,
 		chainId: a,
-		hashedEthereumAddress: x,
+		hashedEthereumAddress: b,
 		phase: r.BEFORE_SCHEDULE_WITHDRAW
 	});
-	let F = await y(a, N, x, C, w, E);
-	return await b({
-		id: S,
+	let P = await v(a, M, b, S, C, T);
+	return await y({
+		id: x,
 		chainId: a,
-		hashedEthereumAddress: x,
+		hashedEthereumAddress: b,
 		phase: r.AFTER_SCHEDULE_WITHDRAW,
-		scheduleId: F
-	}), F;
-}, C = async (t, n, r, i, s, c, l, d, p, g = !0) => {
-	let _ = f([n]), v = p ? o(p) : void 0, y = n.erc20TokenAddress, b = a(u(await t.getEthereumAddressByChain(_))), C = c ?? await m(_, y, [y], e.Transact, [], 10n), { userDepositedUtxos: w, statusId: T, depositTxHash: E } = await x(t, _, n, r, i, C, b, g);
-	return await h(t, _, w), await S(t, _, n, w, r, C, b, T, s, l, d, v), E;
+		scheduleId: P
+	}), P;
+}, S = async (t, n, r, i, s, c, l, d, p, g = !0) => {
+	let _ = f([n]), v = p ? o(p) : void 0, y = n.erc20TokenAddress, S = a(u(await t.getEthereumAddressByChain(_))), C = c ?? await m(_, y, [y], e.Transact, [], 10n), { userDepositedUtxos: w, statusId: T, depositTxHash: E } = await b(t, _, n, r, i, C, S, g);
+	return await h(t, _, w), await x(t, _, n, w, r, C, S, T, s, l, d, v), E;
 };
 //#endregion
-export { C as hinkalDepositAndWithdraw, S as hinkalWithdrawBatch };
+export { S as hinkalDepositAndWithdraw, x as hinkalWithdrawBatch };

package/data-structures/Hinkal/hinkalPrivateWallet.cjs

@@ -1 +1 @@
-const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../types/admin.types.cjs`),r=require(`../../functions/utils/caseInsensitive.utils.cjs`),i=require(`../../functions/utils/addresses.cjs`),a=require(`../../error-handling/error-codes.constants.cjs`),o=require(`../../functions/utils/time.utils.cjs`),s=require(`../../functions/web3/events/getShieldedBalance.cjs`),c=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`);require(`../../error-handling/index.cjs`);const l=require(`../../functions/pre-transaction/constructAdminData.cjs`),u=require(`../AccountActions/AccountActions.cjs`),d=require(`../../functions/pre-transaction/recipientUtxoProcessing.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`),p=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const m=require(`../../functions/utils/involves-permit2-op.cjs`),h=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),g=require(`../../functions/private-wallet/emporium.helpers.cjs`),_=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),y=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`),b=require(`../../functions/pre-transaction/merge-with-fee-structure-emporium.cjs`),x=require(`./handleAutoDepositBack.cjs`);var S=async(e,t,n,r,i)=>{let a=[...await s.addPaddingToUtxos(e,t,n,r)],l=[],u=o.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=c.outputUtxoProcessing(e.userKeys,a[t],r[t],u);l.push(n)}return i&&d.recipientUtxoProcessing(i,l,r,u),{inputUtxosArray:a,outputUtxosArray:l}},C=async(o,s,c,d,C,w,T,E,D,O,k,A=!1,j,M,N)=>{if(N&&!i.isValidPrivateAddress(N.recipientInfo))throw Error(a.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);if(T.length>0&&!E)throw Error(`Subaccount is required for private wallet transactions`);let P=c.map(e=>e.erc20TokenAddress),F=await o.getEthereumAddressByChain(s),I=E?u.AccountActions.getAddressFromSubAccount(s,E):void 0,{contractData:L}=t.networkRegistry[s],{emporiumAddress:R}=L;if(!R)throw Error(`No Emporium Address Provided`);let z=O??await f.getFeeStructure(s,D,P,e.ExternalActionId.Emporium,w.map(e=>h.convertEmporiumOpToCallInfo(e,I??``,s)));for(I?await b.mergeWithFeeStructureEmporium(o,s,I,w,P,d,z,T.find(e=>r.caseInsensitiveEqual(e.token.erc20TokenAddress,z.feeToken))?.amount??0n):y.mergeWithFeeStructure(s,P,d,z);C.length<P.length;)C.push(!1);let[{inputUtxosArray:B,outputUtxosArray:V},H]=await Promise.all([S(o,s,P,d,N),k??await o.getRandomRelay(s,!0)]);if(!H)throw Error(a.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let U=E?u.AccountActions.getPrivateKeyFromSubAccount(s,E):void 0,[{zkCallData:W,circomData:G,dimData:K},q,J]=await Promise.all([_.constructZkProof(o.merkleTreeHinkalByChain[s],B,V,o.userKeys,e.ExternalActionId.Emporium,R,w,o.generateProofRemotely,z,H,s,C,void 0,void 0,U),g.getAuthorizationDataIfNeeded(s,U),p.buildCommitmentValidationData(s,o.userKeys,P,B)]),Y=await v.transactCallRelayer(s,W,K,G,J,m.uniswapWorkaround(w),q,l.constructAdminData(M,s,T.map(e=>e.token.erc20TokenAddress),T.map(e=>e.amount),F,M===n.AdminTransactionType.PublicSwap?T.map(({token:e})=>e):void 0));return A&&E&&x.handleAutoDepositBack(o,s,I,E,z.feeToken,j,T,G),Y};exports.hinkalPrivateWallet=C;
+const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../types/admin.types.cjs`),r=require(`../../functions/utils/caseInsensitive.utils.cjs`),i=require(`../../functions/utils/addresses.cjs`),a=require(`../../error-handling/error-codes.constants.cjs`),o=require(`../../functions/utils/time.utils.cjs`),s=require(`../../functions/web3/events/getShieldedBalance.cjs`),c=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`);require(`../../error-handling/index.cjs`);const l=require(`../../functions/pre-transaction/constructAdminData.cjs`),u=require(`../AccountActions/AccountActions.cjs`),d=require(`../../functions/pre-transaction/recipientUtxoProcessing.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const p=require(`../../functions/utils/involves-permit2-op.cjs`),m=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),h=require(`../../functions/private-wallet/emporium.helpers.cjs`),g=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),v=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`),y=require(`../../functions/pre-transaction/merge-with-fee-structure-emporium.cjs`),b=require(`./handleAutoDepositBack.cjs`);var x=async(e,t,n,r,i)=>{let a=[...await s.addPaddingToUtxos(e,t,n,r)],l=[],u=o.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=c.outputUtxoProcessing(e.userKeys,a[t],r[t],u);l.push(n)}return i&&d.recipientUtxoProcessing(i,l,r,u),{inputUtxosArray:a,outputUtxosArray:l}},S=async(o,s,c,d,S,C,w,T,E,D,O,k=!1,A,j,M)=>{if(M&&!i.isValidPrivateAddress(M.recipientInfo))throw Error(a.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);if(w.length>0&&!T)throw Error(`Subaccount is required for private wallet transactions`);let N=c.map(e=>e.erc20TokenAddress),P=await o.getEthereumAddressByChain(s),F=T?u.AccountActions.getAddressFromSubAccount(s,T):void 0,{contractData:I}=t.networkRegistry[s],{emporiumAddress:L}=I;if(!L)throw Error(`No Emporium Address Provided`);let R=D??await f.getFeeStructure(s,E,N,e.ExternalActionId.Emporium,C.map(e=>m.convertEmporiumOpToCallInfo(e,F??``,s)));for(F?await y.mergeWithFeeStructureEmporium(o,s,F,C,N,d,R,w.find(e=>r.caseInsensitiveEqual(e.token.erc20TokenAddress,R.feeToken))?.amount??0n):v.mergeWithFeeStructure(s,N,d,R);S.length<N.length;)S.push(!1);let[{inputUtxosArray:z,outputUtxosArray:B},V]=await Promise.all([x(o,s,N,d,M),O??await o.getRandomRelay(s,!0)]);if(!V)throw Error(a.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let H=T?u.AccountActions.getPrivateKeyFromSubAccount(s,T):void 0,[{zkCallData:U,circomData:W,dimData:G,commitmentValidationData:K},q]=await Promise.all([g.constructZkProof(o.merkleTreeHinkalByChain[s],z,B,o.userKeys,e.ExternalActionId.Emporium,L,C,o.generateProofRemotely,R,V,s,S,void 0,void 0,H),h.getAuthorizationDataIfNeeded(s,H)]),J=await _.transactCallRelayer(s,U,G,W,K,p.uniswapWorkaround(C),q,l.constructAdminData(j,s,w.map(e=>e.token.erc20TokenAddress),w.map(e=>e.amount),P,j===n.AdminTransactionType.PublicSwap?w.map(({token:e})=>e):void 0));return k&&T&&b.handleAutoDepositBack(o,s,F,T,R.feeToken,A,w,W),J};exports.hinkalPrivateWallet=S;

package/data-structures/Hinkal/hinkalPrivateWallet.mjs

@@ -12,18 +12,17 @@ import { constructAdminData as l } from "../../functions/pre-transaction/constru
 import { AccountActions as u } from "../AccountActions/AccountActions.mjs";
 import { recipientUtxoProcessing as d } from "../../functions/pre-transaction/recipientUtxoProcessing.mjs";
 import { getFeeStructure as f } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { buildCommitmentValidationData as p } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { uniswapWorkaround as m } from "../../functions/utils/involves-permit2-op.mjs";
-import { convertEmporiumOpToCallInfo as h } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { getAuthorizationDataIfNeeded as g } from "../../functions/private-wallet/emporium.helpers.mjs";
-import { constructZkProof as _ } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayer as v } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { mergeWithFeeStructure as y } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
-import { mergeWithFeeStructureEmporium as b } from "../../functions/pre-transaction/merge-with-fee-structure-emporium.mjs";
-import { handleAutoDepositBack as x } from "./handleAutoDepositBack.mjs";
+import { uniswapWorkaround as p } from "../../functions/utils/involves-permit2-op.mjs";
+import { convertEmporiumOpToCallInfo as m } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { getAuthorizationDataIfNeeded as h } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { constructZkProof as g } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayer as _ } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { mergeWithFeeStructure as v } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { mergeWithFeeStructureEmporium as y } from "../../functions/pre-transaction/merge-with-fee-structure-emporium.mjs";
+import { handleAutoDepositBack as b } from "./handleAutoDepositBack.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalPrivateWallet.ts
-var S = async (e, t, n, r, i) => {
+var x = async (e, t, n, r, i) => {
 	let a = [...await s(e, t, n, r)], l = [], u = o().toString();
 	for (let t = 0; t < n.length; t += 1) {
 		let { outputUtxos: n } = c(e.userKeys, a[t], r[t], u);
@@ -33,21 +32,17 @@ var S = async (e, t, n, r, i) => {
 		inputUtxosArray: a,
 		outputUtxosArray: l
 	};
-}, C = async (o, s, c, d, C, w, T, E, D, O, k, A = !1, j, M, N) => {
-	if (N && !i(N.recipientInfo)) throw Error(a.RECIPIENT_FORMAT_INCORRECT);
-	if (T.length > 0 && !E) throw Error("Subaccount is required for private wallet transactions");
-	let P = c.map((e) => e.erc20TokenAddress), F = await o.getEthereumAddressByChain(s), I = E ? u.getAddressFromSubAccount(s, E) : void 0, { contractData: L } = t[s], { emporiumAddress: R } = L;
-	if (!R) throw Error("No Emporium Address Provided");
-	let z = O ?? await f(s, D, P, e.Emporium, w.map((e) => h(e, I ?? "", s)));
-	for (I ? await b(o, s, I, w, P, d, z, T.find((e) => r(e.token.erc20TokenAddress, z.feeToken))?.amount ?? 0n) : y(s, P, d, z); C.length < P.length;) C.push(!1);
-	let [{ inputUtxosArray: B, outputUtxosArray: V }, H] = await Promise.all([S(o, s, P, d, N), k ?? await o.getRandomRelay(s, !0)]);
-	if (!H) throw Error(a.RELAYER_NOT_AVAILABLE);
-	let U = E ? u.getPrivateKeyFromSubAccount(s, E) : void 0, [{ zkCallData: W, circomData: G, dimData: K }, q, J] = await Promise.all([
-		_(o.merkleTreeHinkalByChain[s], B, V, o.userKeys, e.Emporium, R, w, o.generateProofRemotely, z, H, s, C, void 0, void 0, U),
-		g(s, U),
-		p(s, o.userKeys, P, B)
-	]), Y = await v(s, W, K, G, J, m(w), q, l(M, s, T.map((e) => e.token.erc20TokenAddress), T.map((e) => e.amount), F, M === n.PublicSwap ? T.map(({ token: e }) => e) : void 0));
-	return A && E && x(o, s, I, E, z.feeToken, j, T, G), Y;
+}, S = async (o, s, c, d, S, C, w, T, E, D, O, k = !1, A, j, M) => {
+	if (M && !i(M.recipientInfo)) throw Error(a.RECIPIENT_FORMAT_INCORRECT);
+	if (w.length > 0 && !T) throw Error("Subaccount is required for private wallet transactions");
+	let N = c.map((e) => e.erc20TokenAddress), P = await o.getEthereumAddressByChain(s), F = T ? u.getAddressFromSubAccount(s, T) : void 0, { contractData: I } = t[s], { emporiumAddress: L } = I;
+	if (!L) throw Error("No Emporium Address Provided");
+	let R = D ?? await f(s, E, N, e.Emporium, C.map((e) => m(e, F ?? "", s)));
+	for (F ? await y(o, s, F, C, N, d, R, w.find((e) => r(e.token.erc20TokenAddress, R.feeToken))?.amount ?? 0n) : v(s, N, d, R); S.length < N.length;) S.push(!1);
+	let [{ inputUtxosArray: z, outputUtxosArray: B }, V] = await Promise.all([x(o, s, N, d, M), O ?? await o.getRandomRelay(s, !0)]);
+	if (!V) throw Error(a.RELAYER_NOT_AVAILABLE);
+	let H = T ? u.getPrivateKeyFromSubAccount(s, T) : void 0, [{ zkCallData: U, circomData: W, dimData: G, commitmentValidationData: K }, q] = await Promise.all([g(o.merkleTreeHinkalByChain[s], z, B, o.userKeys, e.Emporium, L, C, o.generateProofRemotely, R, V, s, S, void 0, void 0, H), h(s, H)]), J = await _(s, U, G, W, K, p(C), q, l(j, s, w.map((e) => e.token.erc20TokenAddress), w.map((e) => e.amount), P, j === n.PublicSwap ? w.map(({ token: e }) => e) : void 0));
+	return k && T && b(o, s, F, T, R.feeToken, A, w, W), J;
 };
 //#endregion
-export { C as hinkalPrivateWallet };
+export { S as hinkalPrivateWallet };

package/data-structures/Hinkal/hinkalSolanaClaimUtxo.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`);require(`../../types/index.cjs`);const r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/web3/etherFunctions.cjs`),a=require(`../crypto-keys/keys.cjs`),o=require(`../../functions/utils/time.utils.cjs`),s=require(`../utxo/Utxo.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/snarkjs/common.snarkjs.cjs`),u=require(`../../functions/pre-transaction/getFeeStructure.cjs`),d=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const f=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),p=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let m=require(`ethers`);var h=async(h,g,_,v,y)=>{let b=c.validateAndGetChainId([g]),x=g.erc20TokenAddress;if(_.getTokenAddress(b)!==x)throw Error(`Off-chain UTXO token mismatch`);let S=y?new a.UserKeys(y):new a.UserKeys(_.nullifyingKey,_.nullifyingKey);if(!_.nullifyingKey&&!y)throw Error(`Claimable UTXO nullifyingKey is missing`);let C=S.getShieldedPrivateKey();if(_.nullifyingKey&&_.nullifyingKey!==C)throw Error(`Claimable UTXO key mismatch`);let{originalDeployer:w}=t.networkRegistry[b].contractData;if(!w)throw Error(`missing data`);let T=s.Utxo.createFrom(_,{nullifyingKey:C}),E=v??await u.getFeeStructure(b,x,[x],e.ExternalActionId.Transact,void 0,void 0,{mintTo:x,nullifierCount:1});if(E.feeToken!==x)throw Error(`Claim fee token mismatch: fee must be paid from claimed UTXO token`);let D=E.variableRate>0n?E.variableRate:n.HINKAL_PRIVATE_SEND_VARIABLE_RATE;if(T.amount<=E.flatFee)throw Error(r.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let O=T.amount-E.flatFee,k=O*D/10000n,A=O-k;if(A<=0n)throw Error(r.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);let j=E.flatFee+k,[M,N,P,,F]=h.getRecipientInfo().split(`,`);if(!N||!P||!M||!F)throw Error(`Invalid recipient info`);let I=o.getCurrentTimeInSeconds().toString(),L=new s.Utxo({amount:0n,erc20TokenAddress:T.erc20TokenAddress,mintAddress:T.mintAddress,nullifyingKey:S.getShieldedPrivateKey(),...T.isNewStyle?{spendingPublicKey:S.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),R=new s.Utxo({amount:0n,erc20TokenAddress:T.erc20TokenAddress,mintAddress:T.mintAddress,nullifyingKey:S.getShieldedPrivateKey(),timeStamp:I,spendingPublicKey:S.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}),z=new s.Utxo({amount:A,erc20TokenAddress:T.erc20TokenAddress,mintAddress:T.mintAddress,timeStamp:I,H0:[BigInt(N),BigInt(P)],stealthAddress:M,encryptionKey:F,isNewStyle:!0}),B=[T,L],V=[R,z],H=await h.getRandomRelay(b,!0);if(!H)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let U=a.UserKeys.findCorrectRandomization(i.randomBigInt(31),S.getShieldedPrivateKey()),W={tokenNumber:1,nullifierAmount:B.length,outputAmount:V.length},G=l.calcEncryptedOutputs([V])[0].map(e=>Array.from(m.ethers.getBytes(e))),[{proofAArr:K,proofBArr:q,proofCArr:J,publicInputsArr:Y},X]=await Promise.all([f.constructSolanaZkProof(h.generateProofRemotely,h.merkleTreeHinkalByChain[b],S,[x],[B],[V],U,j,0n,n.solanaNativeAddress,H,W,G,b),d.buildCommitmentValidationData(b,S,[x],[B])]),Z={recipient:H,mint:x===`11111111111111111111111111111111`?void 0:x};return p.solanaTransactCallRelayer({chainId:b,relayAddress:H,functionName:`transfer`,args:{proofAArr:K,proofBArr:q,proofCArr:J,publicInputsArr:Y,encryptedOutputs:G,relayerFee:j.toString(),dimensions:W},accounts:Z,commitmentValidationData:X})};exports.hinkalSolanaClaimUtxo=h;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`);require(`../../types/index.cjs`);const r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/web3/etherFunctions.cjs`),a=require(`../crypto-keys/keys.cjs`),o=require(`../../functions/utils/time.utils.cjs`),s=require(`../utxo/Utxo.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/snarkjs/common.snarkjs.cjs`),u=require(`../../functions/pre-transaction/getFeeStructure.cjs`),d=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),f=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let p=require(`ethers`);var m=async(m,h,g,_,v)=>{let y=c.validateAndGetChainId([h]),b=h.erc20TokenAddress;if(g.getTokenAddress(y)!==b)throw Error(`Off-chain UTXO token mismatch`);let x=v?new a.UserKeys(v):new a.UserKeys(g.nullifyingKey,g.nullifyingKey);if(!g.nullifyingKey&&!v)throw Error(`Claimable UTXO nullifyingKey is missing`);let S=x.getShieldedPrivateKey();if(g.nullifyingKey&&g.nullifyingKey!==S)throw Error(`Claimable UTXO key mismatch`);let{originalDeployer:C}=t.networkRegistry[y].contractData;if(!C)throw Error(`missing data`);let w=s.Utxo.createFrom(g,{nullifyingKey:S}),T=_??await u.getFeeStructure(y,b,[b],e.ExternalActionId.Transact,void 0,void 0,{mintTo:b,nullifierCount:1});if(T.feeToken!==b)throw Error(`Claim fee token mismatch: fee must be paid from claimed UTXO token`);let E=T.variableRate>0n?T.variableRate:n.HINKAL_PRIVATE_SEND_VARIABLE_RATE;if(w.amount<=T.flatFee)throw Error(r.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let D=w.amount-T.flatFee,O=D*E/10000n,k=D-O;if(k<=0n)throw Error(r.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);let A=T.flatFee+O,[j,M,N,,P]=m.getRecipientInfo().split(`,`);if(!M||!N||!j||!P)throw Error(`Invalid recipient info`);let F=o.getCurrentTimeInSeconds().toString(),I=new s.Utxo({amount:0n,erc20TokenAddress:w.erc20TokenAddress,mintAddress:w.mintAddress,nullifyingKey:x.getShieldedPrivateKey(),...w.isNewStyle?{spendingPublicKey:x.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),L=new s.Utxo({amount:0n,erc20TokenAddress:w.erc20TokenAddress,mintAddress:w.mintAddress,nullifyingKey:x.getShieldedPrivateKey(),timeStamp:F,spendingPublicKey:x.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}),R=new s.Utxo({amount:k,erc20TokenAddress:w.erc20TokenAddress,mintAddress:w.mintAddress,timeStamp:F,H0:[BigInt(M),BigInt(N)],stealthAddress:j,encryptionKey:P,isNewStyle:!0}),z=[w,I],B=[L,R],V=await m.getRandomRelay(y,!0);if(!V)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let H=a.UserKeys.findCorrectRandomization(i.randomBigInt(31),x.getShieldedPrivateKey()),U={tokenNumber:1,nullifierAmount:z.length,outputAmount:B.length},W=l.calcEncryptedOutputs([B])[0].map(e=>Array.from(p.ethers.getBytes(e))),{proofAArr:G,proofBArr:K,proofCArr:q,publicInputsArr:J,commitmentValidationData:Y}=await d.constructSolanaZkProof(m.generateProofRemotely,m.merkleTreeHinkalByChain[y],x,[b],[z],[B],H,A,0n,n.solanaNativeAddress,V,U,W,y),X={recipient:V,mint:b===`11111111111111111111111111111111`?void 0:b};return f.solanaTransactCallRelayer({chainId:y,relayAddress:V,functionName:`transfer`,args:{proofAArr:G,proofBArr:K,proofCArr:q,publicInputsArr:J,encryptedOutputs:W,relayerFee:A.toString(),dimensions:U},accounts:X,commitmentValidationData:Y})};exports.hinkalSolanaClaimUtxo=m;

package/data-structures/Hinkal/hinkalSolanaClaimUtxo.mjs

@@ -10,84 +10,82 @@ import { Utxo as c } from "../utxo/Utxo.mjs";
 import { validateAndGetChainId as l } from "../../functions/utils/token-check.utils.mjs";
 import { calcEncryptedOutputs as u } from "../../functions/snarkjs/common.snarkjs.mjs";
 import { getFeeStructure as d } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { buildCommitmentValidationData as f } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
-import "../../functions/pre-transaction/index.mjs";
-import { constructSolanaZkProof as p } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { solanaTransactCallRelayer as m } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ethers as h } from "ethers";
+import { constructSolanaZkProof as f } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { solanaTransactCallRelayer as p } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ethers as m } from "ethers";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaClaimUtxo.ts
-var g = async (g, _, v, y, b) => {
-	let x = l([_]), S = _.erc20TokenAddress;
-	if (v.getTokenAddress(x) !== S) throw Error("Off-chain UTXO token mismatch");
-	let C = b ? new o(b) : new o(v.nullifyingKey, v.nullifyingKey);
-	if (!v.nullifyingKey && !b) throw Error("Claimable UTXO nullifyingKey is missing");
-	let w = C.getShieldedPrivateKey();
-	if (v.nullifyingKey && v.nullifyingKey !== w) throw Error("Claimable UTXO key mismatch");
-	let { originalDeployer: T } = t[x].contractData;
-	if (!T) throw Error("missing data");
-	let E = c.createFrom(v, { nullifyingKey: w }), D = y ?? await d(x, S, [S], e.Transact, void 0, void 0, {
-		mintTo: S,
+var h = async (h, g, _, v, y) => {
+	let b = l([g]), x = g.erc20TokenAddress;
+	if (_.getTokenAddress(b) !== x) throw Error("Off-chain UTXO token mismatch");
+	let S = y ? new o(y) : new o(_.nullifyingKey, _.nullifyingKey);
+	if (!_.nullifyingKey && !y) throw Error("Claimable UTXO nullifyingKey is missing");
+	let C = S.getShieldedPrivateKey();
+	if (_.nullifyingKey && _.nullifyingKey !== C) throw Error("Claimable UTXO key mismatch");
+	let { originalDeployer: w } = t[b].contractData;
+	if (!w) throw Error("missing data");
+	let T = c.createFrom(_, { nullifyingKey: C }), E = v ?? await d(b, x, [x], e.Transact, void 0, void 0, {
+		mintTo: x,
 		nullifierCount: 1
 	});
-	if (D.feeToken !== S) throw Error("Claim fee token mismatch: fee must be paid from claimed UTXO token");
-	let O = D.variableRate > 0n ? D.variableRate : n;
-	if (E.amount <= D.flatFee) throw Error(i.INSUFFICIENT_FUNDS_TO_TRANSACT);
-	let k = E.amount - D.flatFee, A = k * O / 10000n, j = k - A;
-	if (j <= 0n) throw Error(i.RECIPIENT_AMOUNT_INVALID);
-	let M = D.flatFee + A, [N, P, F, , I] = g.getRecipientInfo().split(",");
-	if (!P || !F || !N || !I) throw Error("Invalid recipient info");
-	let L = s().toString(), R = new c({
+	if (E.feeToken !== x) throw Error("Claim fee token mismatch: fee must be paid from claimed UTXO token");
+	let D = E.variableRate > 0n ? E.variableRate : n;
+	if (T.amount <= E.flatFee) throw Error(i.INSUFFICIENT_FUNDS_TO_TRANSACT);
+	let O = T.amount - E.flatFee, k = O * D / 10000n, A = O - k;
+	if (A <= 0n) throw Error(i.RECIPIENT_AMOUNT_INVALID);
+	let j = E.flatFee + k, [M, N, P, , F] = h.getRecipientInfo().split(",");
+	if (!N || !P || !M || !F) throw Error("Invalid recipient info");
+	let I = s().toString(), L = new c({
 		amount: 0n,
-		erc20TokenAddress: E.erc20TokenAddress,
-		mintAddress: E.mintAddress,
-		nullifyingKey: C.getShieldedPrivateKey(),
-		...E.isNewStyle ? {
-			spendingPublicKey: C.getSpendingKeyPair().pubSpendingBJJPoint,
+		erc20TokenAddress: T.erc20TokenAddress,
+		mintAddress: T.mintAddress,
+		nullifyingKey: S.getShieldedPrivateKey(),
+		...T.isNewStyle ? {
+			spendingPublicKey: S.getSpendingKeyPair().pubSpendingBJJPoint,
 			isNewStyle: !0
 		} : { isNewStyle: !1 }
-	}), z = new c({
+	}), R = new c({
 		amount: 0n,
-		erc20TokenAddress: E.erc20TokenAddress,
-		mintAddress: E.mintAddress,
-		nullifyingKey: C.getShieldedPrivateKey(),
-		timeStamp: L,
-		spendingPublicKey: C.getSpendingKeyPair().pubSpendingBJJPoint,
+		erc20TokenAddress: T.erc20TokenAddress,
+		mintAddress: T.mintAddress,
+		nullifyingKey: S.getShieldedPrivateKey(),
+		timeStamp: I,
+		spendingPublicKey: S.getSpendingKeyPair().pubSpendingBJJPoint,
 		isNewStyle: !0
-	}), B = new c({
-		amount: j,
-		erc20TokenAddress: E.erc20TokenAddress,
-		mintAddress: E.mintAddress,
-		timeStamp: L,
-		H0: [BigInt(P), BigInt(F)],
-		stealthAddress: N,
-		encryptionKey: I,
+	}), z = new c({
+		amount: A,
+		erc20TokenAddress: T.erc20TokenAddress,
+		mintAddress: T.mintAddress,
+		timeStamp: I,
+		H0: [BigInt(N), BigInt(P)],
+		stealthAddress: M,
+		encryptionKey: F,
 		isNewStyle: !0
-	}), V = [E, R], H = [z, B], U = await g.getRandomRelay(x, !0);
-	if (!U) throw Error(i.RELAYER_NOT_AVAILABLE);
-	let W = o.findCorrectRandomization(a(31), C.getShieldedPrivateKey()), G = {
+	}), B = [T, L], V = [R, z], H = await h.getRandomRelay(b, !0);
+	if (!H) throw Error(i.RELAYER_NOT_AVAILABLE);
+	let U = o.findCorrectRandomization(a(31), S.getShieldedPrivateKey()), W = {
 		tokenNumber: 1,
-		nullifierAmount: V.length,
-		outputAmount: H.length
-	}, K = u([H])[0].map((e) => Array.from(h.getBytes(e))), [{ proofAArr: q, proofBArr: J, proofCArr: Y, publicInputsArr: X }, Z] = await Promise.all([p(g.generateProofRemotely, g.merkleTreeHinkalByChain[x], C, [S], [V], [H], W, M, 0n, r, U, G, K, x), f(x, C, [S], [V])]), Q = {
-		recipient: U,
-		mint: S === "11111111111111111111111111111111" ? void 0 : S
+		nullifierAmount: B.length,
+		outputAmount: V.length
+	}, G = u([V])[0].map((e) => Array.from(m.getBytes(e))), { proofAArr: K, proofBArr: q, proofCArr: J, publicInputsArr: Y, commitmentValidationData: X } = await f(h.generateProofRemotely, h.merkleTreeHinkalByChain[b], S, [x], [B], [V], U, j, 0n, r, H, W, G, b), Z = {
+		recipient: H,
+		mint: x === "11111111111111111111111111111111" ? void 0 : x
 	};
-	return m({
-		chainId: x,
-		relayAddress: U,
+	return p({
+		chainId: b,
+		relayAddress: H,
 		functionName: "transfer",
 		args: {
-			proofAArr: q,
-			proofBArr: J,
-			proofCArr: Y,
-			publicInputsArr: X,
-			encryptedOutputs: K,
-			relayerFee: M.toString(),
-			dimensions: G
+			proofAArr: K,
+			proofBArr: q,
+			proofCArr: J,
+			publicInputsArr: Y,
+			encryptedOutputs: G,
+			relayerFee: j.toString(),
+			dimensions: W
 		},
-		accounts: Q,
-		commitmentValidationData: Z
+		accounts: Z,
+		commitmentValidationData: X
 	});
 };
 //#endregion
-export { g as hinkalSolanaClaimUtxo };
+export { h as hinkalSolanaClaimUtxo };

package/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../functions/utils/addresses.cjs`),a=require(`../../error-handling/error-codes.constants.cjs`),o=require(`../../functions/web3/etherFunctions.cjs`),s=require(`../crypto-keys/keys.cjs`),c=require(`../../functions/utils/time.utils.cjs`),l=require(`../utxo/Utxo.cjs`),u=require(`../../functions/utils/solanaMint.utils.cjs`),d=require(`../../functions/utils/token-check.utils.cjs`),f=require(`../../functions/snarkjs/common.snarkjs.cjs`),p=require(`../../functions/pre-transaction/solana.cjs`),m=require(`../../functions/pre-transaction/constructAdminData.cjs`),h=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),g=require(`../../functions/pre-transaction/getFeeStructure.cjs`),_=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),v=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const y=require(`../../functions/utils/getUtxosFromReceiptSolana.cjs`),b=require(`../../functions/utils/fees.utils.cjs`);require(`../../functions/web3/index.cjs`);const x=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),S=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),C=require(`../../API/deposit-and-withdraw-status-calls.cjs`);require(`../../functions/index.cjs`);let w=require(`ethers`),T=require(`@solana/web3.js`),E=require(`@coral-xyz/anchor`);var D=(e,r,i,a)=>{let{hinkalIdl:c,hinkalAddress:l,originalDeployer:d}=t.networkRegistry[r].contractData;if(!c)throw Error(`No IDL configured for Solana program on this network`);if(!d)throw Error(`missing original deployer`);let m=e.userKeys.getShieldedPrivateKey(),h=e.getSolanaProgram(c),g=e.getSolanaPublicKey(),_=new T.PublicKey(d),v=new T.PublicKey(l),{mintPublicKey:y}=u.formatMintAddress(i.erc20TokenAddress),b=y.toString(),x=p.getStorageAccountPublicKey(v,_),S=p.getStorageVaultPublicKey(v,_),C=p.getMerkleAccountPublicKey(v,_),w=a.map(()=>p.buildAnchorStealthAddressStructure(f.calcStealthAddressStructure(s.UserKeys.findCorrectRandomization(o.randomBigInt(31),m),m,e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint))),E=b===n.solanaNativeAddress;return{program:h,publicKey:g,originalDeployer:_,mint:E?null:y,atasValue:E?null:void 0,storageAccount:x,storageVault:S,merkleAccount:C,amounts:a,anchorStealthStructures:w}},O=e=>e.program.methods.multiPaymentDeposit(e.amounts.map(e=>new E.BN(e.toString())),e.anchorStealthStructures,!0).accounts({mint:e.mint,signer:e.publicKey,signerAta:e.atasValue,originalDeployer:e.originalDeployer,storageAccount:e.storageAccount,storageVault:e.storageVault,merkleAccount:e.merkleAccount,storageVaultAta:e.atasValue}),k=async(e,t,n,i,a,o,s)=>{let c=i.map(e=>e+b.calculateTotalFee(e,o)),l=D(e,t,n,c),d=(await C.updateDepositAndWithdrawStatus({chainId:t,hashedEthereumAddress:s,phase:r.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,f=await O(l).rpc(),p=await l.program.provider.connection.getLatestBlockhash();await l.program.provider.connection.confirmTransaction({blockhash:p.blockhash,lastValidBlockHeight:p.lastValidBlockHeight,signature:f},`finalized`);let m=await h.fetchSolanaTransaction(l.program.provider.connection,f,`finalized`);if(!m)throw Error(`Transaction missing`);await C.safeUpdateDepositAndWithdrawStatus({id:d,chainId:t,hashedEthereumAddress:s,phase:r.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:f});let{compressedAddress:g}=u.formatMintAddress(n.erc20TokenAddress),_=y.getOnChainUtxosFromReceiptSolana(m,l.program,e.userKeys,g),v=[],x=[..._];return a.forEach((e,t)=>{let n=c[t],r=x.find(e=>e.amount===n);if(!r)throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);v.push({recipientAddress:e,utxo:r}),x.splice(x.indexOf(r),1)}),{userDepositedUtxos:v,depositTxHash:f,statusId:d}},A=async(e,i,d,p,h,g,_,y,T,E,D,O)=>{let k=d.erc20TokenAddress;if(p.length===0)throw Error(`userDepositedUtxos must not be empty`);let{originalDeployer:A}=t.networkRegistry[i].contractData;if(!A)throw Error(`missing data`);let j=await e.getRandomRelay(i,!0);if(!j)throw Error(a.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let M=c.getCurrentTimeInSeconds().toString(),N=e.generateProofRemotely?5:1,P=[];for(let t=0;t<p.length;t+=N){let r=p.slice(t,t+N),a=await Promise.all(r.map(async({recipientAddress:t,utxo:r},a)=>{let{compressedAddress:c}=u.formatMintAddress(n.solanaNativeAddress),p=new l.Utxo({amount:0n,mintAddress:k,erc20TokenAddress:c,nullifyingKey:e.userKeys.getShieldedPrivateKey(),timeStamp:M,...r.isNewStyle?{spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),g=[r,p],y=[p],S=s.UserKeys.findCorrectRandomization(o.randomBigInt(31),e.userKeys.getShieldedPrivateKey()),C={tokenNumber:1,nullifierAmount:g.length,outputAmount:y.length},T=f.calcEncryptedOutputs([y])[0][0],E=Array.from(w.ethers.getBytes(T)),O=await b.calculateModifiedFeeStructure(i,d,_[a],h),A=m.constructAdminData(D,i,[k],[_[a]],await e.getEthereumAddress()),[{proofAArr:N,proofBArr:P,proofCArr:F,publicInputsArr:I},L]=await Promise.all([x.constructSolanaZkProof(e.generateProofRemotely,e.merkleTreeHinkalByChain[i],e.userKeys,[k],[g],[y],S,O.flatFee,O.variableRate,t,j,C,[E],i),v.buildCommitmentValidationData(i,e.userKeys,[k],[g])]),R={recipient:t,mint:k===`11111111111111111111111111111111`?void 0:k};return{relayAddress:j,functionName:`transact`,chainId:i,recipientAmount:_[a].toString(),args:{proofAArr:N,proofBArr:P,proofCArr:F,publicInputsArr:I,encryptedOutputs:[E],relayerFee:O.flatFee.toString(),dimensions:C},accounts:R,adminData:A,commitmentValidationData:L}}));P.push(...a)}await C.safeUpdateDepositAndWithdrawStatus({id:y,chainId:i,hashedEthereumAddress:g,phase:r.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let F=await S.solanaTransactCallRelayerBatch(i,P,g,T,E,O);return await C.safeUpdateDepositAndWithdrawStatus({id:y,chainId:i,hashedEthereumAddress:g,phase:r.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:F}),F},j=async(t,n,r,a,o,s,c,l,u)=>{let f=d.validateAndGetChainId([n]),p=n.erc20TokenAddress,m=i.hashEthereumAddress(await t.getEthereumAddressByChain(f)),h=u?i.hashString(u):void 0,v=s??await g.getFeeStructure(f,p,[p],e.ExternalActionId.Transact,[],5n),{userDepositedUtxos:y,depositTxHash:b,statusId:x}=await k(t,f,n,r,a,v,m);return await _.waitForDepositedUtxosInMerkleTree(t,f,y),await A(t,f,n,y,v,m,r,x,o,c,l,h),b};exports.buildMultiPaymentDepositBuilder=O,exports.buildMultiPaymentDepositSetup=D,exports.hinkalSolanaDepositAndWithdraw=j,exports.hinkalSolanaWithdrawBatch=A;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../functions/utils/addresses.cjs`),a=require(`../../error-handling/error-codes.constants.cjs`),o=require(`../../functions/web3/etherFunctions.cjs`),s=require(`../crypto-keys/keys.cjs`),c=require(`../../functions/utils/time.utils.cjs`),l=require(`../utxo/Utxo.cjs`),u=require(`../../functions/utils/solanaMint.utils.cjs`),d=require(`../../functions/utils/token-check.utils.cjs`),f=require(`../../functions/snarkjs/common.snarkjs.cjs`),p=require(`../../functions/pre-transaction/solana.cjs`),m=require(`../../functions/pre-transaction/constructAdminData.cjs`),h=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),g=require(`../../functions/pre-transaction/getFeeStructure.cjs`),_=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`);require(`../../functions/pre-transaction/index.cjs`);const v=require(`../../functions/utils/getUtxosFromReceiptSolana.cjs`),y=require(`../../functions/utils/fees.utils.cjs`);require(`../../functions/web3/index.cjs`);const b=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),x=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),S=require(`../../API/deposit-and-withdraw-status-calls.cjs`);require(`../../functions/index.cjs`);let C=require(`ethers`),w=require(`@solana/web3.js`),T=require(`@coral-xyz/anchor`);var E=(e,r,i,a)=>{let{hinkalIdl:c,hinkalAddress:l,originalDeployer:d}=t.networkRegistry[r].contractData;if(!c)throw Error(`No IDL configured for Solana program on this network`);if(!d)throw Error(`missing original deployer`);let m=e.userKeys.getShieldedPrivateKey(),h=e.getSolanaProgram(c),g=e.getSolanaPublicKey(),_=new w.PublicKey(d),v=new w.PublicKey(l),{mintPublicKey:y}=u.formatMintAddress(i.erc20TokenAddress),b=y.toString(),x=p.getStorageAccountPublicKey(v,_),S=p.getStorageVaultPublicKey(v,_),C=p.getMerkleAccountPublicKey(v,_),T=a.map(()=>p.buildAnchorStealthAddressStructure(f.calcStealthAddressStructure(s.UserKeys.findCorrectRandomization(o.randomBigInt(31),m),m,e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint))),E=b===n.solanaNativeAddress;return{program:h,publicKey:g,originalDeployer:_,mint:E?null:y,atasValue:E?null:void 0,storageAccount:x,storageVault:S,merkleAccount:C,amounts:a,anchorStealthStructures:T}},D=e=>e.program.methods.multiPaymentDeposit(e.amounts.map(e=>new T.BN(e.toString())),e.anchorStealthStructures,!0).accounts({mint:e.mint,signer:e.publicKey,signerAta:e.atasValue,originalDeployer:e.originalDeployer,storageAccount:e.storageAccount,storageVault:e.storageVault,merkleAccount:e.merkleAccount,storageVaultAta:e.atasValue}),O=async(e,t,n,i,a,o,s)=>{let c=i.map(e=>e+y.calculateTotalFee(e,o)),l=E(e,t,n,c),d=(await S.updateDepositAndWithdrawStatus({chainId:t,hashedEthereumAddress:s,phase:r.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,f=await D(l).rpc(),p=await l.program.provider.connection.getLatestBlockhash();await l.program.provider.connection.confirmTransaction({blockhash:p.blockhash,lastValidBlockHeight:p.lastValidBlockHeight,signature:f},`finalized`);let m=await h.fetchSolanaTransaction(l.program.provider.connection,f,`finalized`);if(!m)throw Error(`Transaction missing`);await S.safeUpdateDepositAndWithdrawStatus({id:d,chainId:t,hashedEthereumAddress:s,phase:r.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:f});let{compressedAddress:g}=u.formatMintAddress(n.erc20TokenAddress),_=v.getOnChainUtxosFromReceiptSolana(m,l.program,e.userKeys,g),b=[],x=[..._];return a.forEach((e,t)=>{let n=c[t],r=x.find(e=>e.amount===n);if(!r)throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);b.push({recipientAddress:e,utxo:r}),x.splice(x.indexOf(r),1)}),{userDepositedUtxos:b,depositTxHash:f,statusId:d}},k=async(e,i,d,p,h,g,_,v,w,T,E,D)=>{let O=d.erc20TokenAddress;if(p.length===0)throw Error(`userDepositedUtxos must not be empty`);let{originalDeployer:k}=t.networkRegistry[i].contractData;if(!k)throw Error(`missing data`);let A=await e.getRandomRelay(i,!0);if(!A)throw Error(a.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let j=c.getCurrentTimeInSeconds().toString(),M=e.generateProofRemotely?5:1,N=[];for(let t=0;t<p.length;t+=M){let r=p.slice(t,t+M),a=await Promise.all(r.map(async({recipientAddress:t,utxo:r},a)=>{let{compressedAddress:c}=u.formatMintAddress(n.solanaNativeAddress),p=new l.Utxo({amount:0n,mintAddress:O,erc20TokenAddress:c,nullifyingKey:e.userKeys.getShieldedPrivateKey(),timeStamp:j,...r.isNewStyle?{spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),g=[r,p],v=[p],x=s.UserKeys.findCorrectRandomization(o.randomBigInt(31),e.userKeys.getShieldedPrivateKey()),S={tokenNumber:1,nullifierAmount:g.length,outputAmount:v.length},w=f.calcEncryptedOutputs([v])[0][0],T=Array.from(C.ethers.getBytes(w)),D=await y.calculateModifiedFeeStructure(i,d,_[a],h),k=m.constructAdminData(E,i,[O],[_[a]],await e.getEthereumAddress()),{proofAArr:M,proofBArr:N,proofCArr:P,publicInputsArr:F,commitmentValidationData:I}=await b.constructSolanaZkProof(e.generateProofRemotely,e.merkleTreeHinkalByChain[i],e.userKeys,[O],[g],[v],x,D.flatFee,D.variableRate,t,A,S,[T],i),L={recipient:t,mint:O===`11111111111111111111111111111111`?void 0:O};return{relayAddress:A,functionName:`transact`,chainId:i,recipientAmount:_[a].toString(),args:{proofAArr:M,proofBArr:N,proofCArr:P,publicInputsArr:F,encryptedOutputs:[T],relayerFee:D.flatFee.toString(),dimensions:S},accounts:L,adminData:k,commitmentValidationData:I}}));N.push(...a)}await S.safeUpdateDepositAndWithdrawStatus({id:v,chainId:i,hashedEthereumAddress:g,phase:r.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let P=await x.solanaTransactCallRelayerBatch(i,N,g,w,T,D);return await S.safeUpdateDepositAndWithdrawStatus({id:v,chainId:i,hashedEthereumAddress:g,phase:r.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:P}),P},A=async(t,n,r,a,o,s,c,l,u)=>{let f=d.validateAndGetChainId([n]),p=n.erc20TokenAddress,m=i.hashEthereumAddress(await t.getEthereumAddressByChain(f)),h=u?i.hashString(u):void 0,v=s??await g.getFeeStructure(f,p,[p],e.ExternalActionId.Transact,[],5n),{userDepositedUtxos:y,depositTxHash:b,statusId:x}=await O(t,f,n,r,a,v,m);return await _.waitForDepositedUtxosInMerkleTree(t,f,y),await k(t,f,n,y,v,m,r,x,o,c,l,h),b};exports.buildMultiPaymentDepositBuilder=D,exports.buildMultiPaymentDepositSetup=E,exports.hinkalSolanaDepositAndWithdraw=A,exports.hinkalSolanaWithdrawBatch=k;