@hinkal/common 0.2.33 → 0.2.35

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,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],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),A=m.constructAdminData(E,i,[k],[_[a]],await e.getEthereumAddress()),{proofAArr:N,proofBArr:P,proofCArr:F,publicInputsArr:I,commitmentValidationData:L}=await b.constructSolanaZkProof(e.generateProofRemotely,e.merkleTreeHinkalByChain[i],e.userKeys,[k],[g],[v],x,D.flatFee,D.variableRate,t,j,S,[T],i),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:[T],relayerFee:D.flatFee.toString(),dimensions:S},accounts:R,adminData:A,commitmentValidationData:L,displayRecipient:O?.[a]}}));P.push(...a)}await S.safeUpdateDepositAndWithdrawStatus({id:v,chainId:i,hashedEthereumAddress:g,phase:r.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let F=await x.solanaTransactCallRelayerBatch(i,P,g,w,T,D);return await S.safeUpdateDepositAndWithdrawStatus({id:v,chainId:i,hashedEthereumAddress:g,phase:r.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:F}),F},A=async(t,n,r,a,o,s,c,l,u,f)=>{let p=d.validateAndGetChainId([n]),m=n.erc20TokenAddress,h=i.hashEthereumAddress(await t.getEthereumAddressByChain(p)),v=u?i.hashString(u):void 0,y=s??await g.getFeeStructure(p,m,[m],e.ExternalActionId.Transact,[],5n),{userDepositedUtxos:b,depositTxHash:x,statusId:S}=await O(t,p,n,r,a,y,h);return await _.waitForDepositedUtxosInMerkleTree(t,p,b),await k(t,p,n,b,y,h,r,S,o,c,l,v,f),x};exports.buildMultiPaymentDepositBuilder=D,exports.buildMultiPaymentDepositSetup=E,exports.hinkalSolanaDepositAndWithdraw=A,exports.hinkalSolanaWithdrawBatch=k;

package/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.d.ts

@@ -19,6 +19,6 @@ export type MultiPaymentDepositSetup = ReturnType<typeof buildMultiPaymentDeposi
 export declare const buildMultiPaymentDepositBuilder: (setup: MultiPaymentDepositSetup) => import('@coral-xyz/anchor/dist/cjs/program/namespace/methods').MethodsBuilder<import('@coral-xyz/anchor').Idl, import('@coral-xyz/anchor/dist/cjs/idl').IdlInstruction & {
     name: string;
 }, import('@coral-xyz/anchor/dist/cjs/idl').IdlInstructionAccountItem>;
-export declare const hinkalSolanaWithdrawBatch: (hinkal: IHinkal, chainId: number, token: ERC20Token, userDepositedUtxos: RecipientUtxo[], feeStructure: FeeStructure, hashedEthereumAddress: string, recipientAmounts: bigint[], statusId: string | undefined, txCompletionTime?: number, ref?: string, action?: AdminTransactionType, hashedDashboardAccountId?: string) => Promise<string>;
+export declare const hinkalSolanaWithdrawBatch: (hinkal: IHinkal, chainId: number, token: ERC20Token, userDepositedUtxos: RecipientUtxo[], feeStructure: FeeStructure, hashedEthereumAddress: string, recipientAmounts: bigint[], statusId: string | undefined, txCompletionTime?: number, ref?: string, action?: AdminTransactionType, hashedDashboardAccountId?: string, displayRecipients?: string[]) => Promise<string>;
 export declare const hinkalSolanaDepositAndWithdraw: (hinkal: IHinkal, token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, // Should be passed fee for only one withdraw transaction, multiplication happening in this function
-ref?: string, action?: AdminTransactionType, dashboardAccountId?: string) => Promise<string>;
+ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, displayRecipients?: string[]) => Promise<string>;

package/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.mjs

@@ -17,24 +17,23 @@ import { constructAdminData as y } from "../../functions/pre-transaction/constru
 import { fetchSolanaTransaction as b } from "../../functions/pre-transaction/sendV0Transaction.mjs";
 import { getFeeStructure as x } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import { waitForDepositedUtxosInMerkleTree as S } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
-import { buildCommitmentValidationData as C } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { getOnChainUtxosFromReceiptSolana as w } from "../../functions/utils/getUtxosFromReceiptSolana.mjs";
-import { calculateModifiedFeeStructure as T, calculateTotalFee as E } from "../../functions/utils/fees.utils.mjs";
+import { getOnChainUtxosFromReceiptSolana as C } from "../../functions/utils/getUtxosFromReceiptSolana.mjs";
+import { calculateModifiedFeeStructure as w, calculateTotalFee as T } from "../../functions/utils/fees.utils.mjs";
 import "../../functions/web3/index.mjs";
-import { constructSolanaZkProof as D } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { solanaTransactCallRelayerBatch as O } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { safeUpdateDepositAndWithdrawStatus as k, updateDepositAndWithdrawStatus as A } from "../../API/deposit-and-withdraw-status-calls.mjs";
+import { constructSolanaZkProof as E } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { solanaTransactCallRelayerBatch as D } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { safeUpdateDepositAndWithdrawStatus as O, updateDepositAndWithdrawStatus as k } from "../../API/deposit-and-withdraw-status-calls.mjs";
 import "../../functions/index.mjs";
-import { ethers as j } from "ethers";
-import { PublicKey as M } from "@solana/web3.js";
-import { BN as N } from "@coral-xyz/anchor";
+import { ethers as A } from "ethers";
+import { PublicKey as j } from "@solana/web3.js";
+import { BN as M } from "@coral-xyz/anchor";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.ts
-var P = (e, r, i, a) => {
+var N = (e, r, i, a) => {
 	let { hinkalIdl: o, hinkalAddress: l, originalDeployer: u } = t[r].contractData;
 	if (!o) throw Error("No IDL configured for Solana program on this network");
 	if (!u) throw Error("missing original deployer");
-	let f = e.userKeys.getShieldedPrivateKey(), p = e.getSolanaProgram(o), y = e.getSolanaPublicKey(), b = new M(u), x = new M(l), { mintPublicKey: S } = d(i.erc20TokenAddress), C = S.toString(), w = _(x, b), T = v(x, b), E = g(x, b), D = a.map(() => h(m(c.findCorrectRandomization(s(31), f), f, e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint))), O = C === n;
+	let f = e.userKeys.getShieldedPrivateKey(), p = e.getSolanaProgram(o), y = e.getSolanaPublicKey(), b = new j(u), x = new j(l), { mintPublicKey: S } = d(i.erc20TokenAddress), C = S.toString(), w = _(x, b), T = v(x, b), E = g(x, b), D = a.map(() => h(m(c.findCorrectRandomization(s(31), f), f, e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint))), O = C === n;
 	return {
 		program: p,
 		publicKey: y,
@@ -47,7 +46,7 @@ var P = (e, r, i, a) => {
 		amounts: a,
 		anchorStealthStructures: D
 	};
-}, F = (e) => e.program.methods.multiPaymentDeposit(e.amounts.map((e) => new N(e.toString())), e.anchorStealthStructures, !0).accounts({
+}, P = (e) => e.program.methods.multiPaymentDeposit(e.amounts.map((e) => new M(e.toString())), e.anchorStealthStructures, !0).accounts({
 	mint: e.mint,
 	signer: e.publicKey,
 	signerAta: e.atasValue,
@@ -56,12 +55,12 @@ var P = (e, r, i, a) => {
 	storageVault: e.storageVault,
 	merkleAccount: e.merkleAccount,
 	storageVaultAta: e.atasValue
-}), I = async (e, t, n, i, a, o, s) => {
-	let c = i.map((e) => e + E(e, o)), l = P(e, t, n, c), u = (await A({
+}), F = async (e, t, n, i, a, o, s) => {
+	let c = i.map((e) => e + T(e, o)), l = N(e, t, n, c), u = (await k({
 		chainId: t,
 		hashedEthereumAddress: s,
 		phase: r.BEFORE_DEPOSIT
-	})).id ?? void 0, f = await F(l).rpc(), p = await l.program.provider.connection.getLatestBlockhash();
+	})).id ?? void 0, f = await P(l).rpc(), p = await l.program.provider.connection.getLatestBlockhash();
 	await l.program.provider.connection.confirmTransaction({
 		blockhash: p.blockhash,
 		lastValidBlockHeight: p.lastValidBlockHeight,
@@ -69,14 +68,14 @@ var P = (e, r, i, a) => {
 	}, "finalized");
 	let m = await b(l.program.provider.connection, f, "finalized");
 	if (!m) throw Error("Transaction missing");
-	await k({
+	await O({
 		id: u,
 		chainId: t,
 		hashedEthereumAddress: s,
 		phase: r.AFTER_DEPOSIT,
 		depositTxHash: f
 	});
-	let { compressedAddress: h } = d(n.erc20TokenAddress), g = w(m, l.program, e.userKeys, h), _ = [], v = [...g];
+	let { compressedAddress: h } = d(n.erc20TokenAddress), g = C(m, l.program, e.userKeys, h), _ = [], v = [...g];
 	return a.forEach((e, t) => {
 		let n = c[t], r = v.find((e) => e.amount === n);
 		if (!r) throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);
@@ -89,19 +88,19 @@ var P = (e, r, i, a) => {
 		depositTxHash: f,
 		statusId: u
 	};
-}, L = async (e, i, a, f, m, h, g, _, v, b, x, S) => {
-	let w = a.erc20TokenAddress;
+}, I = async (e, i, a, f, m, h, g, _, v, b, x, S, C) => {
+	let T = a.erc20TokenAddress;
 	if (f.length === 0) throw Error("userDepositedUtxos must not be empty");
-	let { originalDeployer: E } = t[i].contractData;
-	if (!E) throw Error("missing data");
-	let A = await e.getRandomRelay(i, !0);
-	if (!A) throw Error(o.RELAYER_NOT_AVAILABLE);
+	let { originalDeployer: k } = t[i].contractData;
+	if (!k) throw Error("missing data");
+	let j = await e.getRandomRelay(i, !0);
+	if (!j) throw Error(o.RELAYER_NOT_AVAILABLE);
 	let M = l().toString(), N = e.generateProofRemotely ? 5 : 1, P = [];
 	for (let t = 0; t < f.length; t += N) {
 		let r = f.slice(t, t + N), o = await Promise.all(r.map(async ({ recipientAddress: t, utxo: r }, o) => {
 			let { compressedAddress: l } = d(n), f = new u({
 				amount: 0n,
-				mintAddress: w,
+				mintAddress: T,
 				erc20TokenAddress: l,
 				nullifyingKey: e.userKeys.getShieldedPrivateKey(),
 				timeStamp: M,
@@ -113,12 +112,12 @@ var P = (e, r, i, a) => {
 				tokenNumber: 1,
 				nullifierAmount: h.length,
 				outputAmount: _.length
-			}, S = p([_])[0][0], E = Array.from(j.getBytes(S)), O = await T(i, a, g[o], m), k = y(x, i, [w], [g[o]], await e.getEthereumAddress()), [{ proofAArr: N, proofBArr: P, proofCArr: F, publicInputsArr: I }, L] = await Promise.all([D(e.generateProofRemotely, e.merkleTreeHinkalByChain[i], e.userKeys, [w], [h], [_], v, O.flatFee, O.variableRate, t, A, b, [E], i), C(i, e.userKeys, [w], [h])]), R = {
+			}, S = p([_])[0][0], D = Array.from(A.getBytes(S)), O = await w(i, a, g[o], m), k = y(x, i, [T], [g[o]], await e.getEthereumAddress()), { proofAArr: N, proofBArr: P, proofCArr: F, publicInputsArr: I, commitmentValidationData: L } = await E(e.generateProofRemotely, e.merkleTreeHinkalByChain[i], e.userKeys, [T], [h], [_], v, O.flatFee, O.variableRate, t, j, b, [D], i), R = {
 				recipient: t,
-				mint: w === "11111111111111111111111111111111" ? void 0 : w
+				mint: T === "11111111111111111111111111111111" ? void 0 : T
 			};
 			return {
-				relayAddress: A,
+				relayAddress: j,
 				functionName: "transact",
 				chainId: i,
 				recipientAmount: g[o].toString(),
@@ -127,34 +126,35 @@ var P = (e, r, i, a) => {
 					proofBArr: P,
 					proofCArr: F,
 					publicInputsArr: I,
-					encryptedOutputs: [E],
+					encryptedOutputs: [D],
 					relayerFee: O.flatFee.toString(),
 					dimensions: b
 				},
 				accounts: R,
 				adminData: k,
-				commitmentValidationData: L
+				commitmentValidationData: L,
+				displayRecipient: C?.[o]
 			};
 		}));
 		P.push(...o);
 	}
-	await k({
+	await O({
 		id: _,
 		chainId: i,
 		hashedEthereumAddress: h,
 		phase: r.BEFORE_SCHEDULE_WITHDRAW
 	});
-	let F = await O(i, P, h, v, b, S);
-	return await k({
+	let F = await D(i, P, h, v, b, S);
+	return await O({
 		id: _,
 		chainId: i,
 		hashedEthereumAddress: h,
 		phase: r.AFTER_SCHEDULE_WITHDRAW,
 		scheduleId: F
 	}), F;
-}, R = async (t, n, r, o, s, c, l, u, d) => {
-	let p = f([n]), m = n.erc20TokenAddress, h = i(await t.getEthereumAddressByChain(p)), g = d ? a(d) : void 0, _ = c ?? await x(p, m, [m], e.Transact, [], 5n), { userDepositedUtxos: v, depositTxHash: y, statusId: b } = await I(t, p, n, r, o, _, h);
-	return await S(t, p, v), await L(t, p, n, v, _, h, r, b, s, l, u, g), y;
+}, L = async (t, n, r, o, s, c, l, u, d, p) => {
+	let m = f([n]), h = n.erc20TokenAddress, g = i(await t.getEthereumAddressByChain(m)), _ = d ? a(d) : void 0, v = c ?? await x(m, h, [h], e.Transact, [], 5n), { userDepositedUtxos: y, depositTxHash: b, statusId: C } = await F(t, m, n, r, o, v, g);
+	return await S(t, m, y), await I(t, m, n, y, v, g, r, C, s, l, u, _, p), b;
 };
 //#endregion
-export { F as buildMultiPaymentDepositBuilder, P as buildMultiPaymentDepositSetup, R as hinkalSolanaDepositAndWithdraw, L as hinkalSolanaWithdrawBatch };
+export { P as buildMultiPaymentDepositBuilder, N as buildMultiPaymentDepositSetup, L as hinkalSolanaDepositAndWithdraw, I as hinkalSolanaWithdrawBatch };

package/data-structures/Hinkal/hinkalSolanaProxySend.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../API/admin-calls.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../../functions/utils/create-provider.cjs`),i=require(`../../functions/pre-transaction/constructAdminData.cjs`),a=require(`../AccountActions/AccountActions.cjs`),o=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),s=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);let c=require(`@solana/web3.js`);var l=async(t,i,o,l)=>{let u=n.validateAndGetChainId([t]),d=a.AccountActions.getAddressFromSubAccount(u,o);if(!d)throw Error(`Public account address is not available`);let{fetchRpcUrl:f}=e.networkRegistry[u];if(!f)throw Error(`RPC URL not found for the specified chain ID`);let p=r.createCustomSolanaConnection(f),m=new c.PublicKey(d),{instructions:h,programId:g}=await s.buildSolanaTransferInstructions(p,m,new c.PublicKey(l),t,i);return{connection:p,chainId:u,senderAddress:d,senderPublickey:m,programId:g,instructions:h}},u=async(e,n,r,a,s,c)=>{let[{connection:u,chainId:d,senderPublickey:f,instructions:p},m]=await Promise.all([l(n,r,a,s),e.getEthereumAddress()]),h=await o.sendProxyV0Transaction({connection:u,chainId:d,subAccount:a,payerPublicKey:f,instructions:p});return t.emitTxPublicData(i.constructAdminData(c,d,[n.erc20TokenAddress],[r],m)),h},d=async(e,t,n,r)=>{let{connection:i,senderPublickey:a,instructions:s}=await l(e,t,n,r);return o.serializeProxyV0Transaction(i,a,s)};exports.getSolanaProxySendSerializedTransaction=d,exports.hinkalSolanaProxySend=u;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../API/admin-calls.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../../functions/pre-transaction/constructAdminData.cjs`),i=require(`../../functions/utils/create-provider.cjs`),a=require(`../AccountActions/AccountActions.cjs`),o=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),s=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);let c=require(`@solana/web3.js`);var l=async(t,r,o,l)=>{let u=n.validateAndGetChainId([t]),d=a.AccountActions.getAddressFromSubAccount(u,o);if(!d)throw Error(`Public account address is not available`);let{fetchRpcUrl:f}=e.networkRegistry[u];if(!f)throw Error(`RPC URL not found for the specified chain ID`);let p=i.createCustomSolanaConnection(f),m=new c.PublicKey(d),{instructions:h,programId:g}=await s.buildSolanaTransferInstructions(p,m,new c.PublicKey(l),t,r);return{connection:p,chainId:u,senderAddress:d,senderPublickey:m,programId:g,instructions:h}},u=async(e,n,i,a,s,c)=>{let[{connection:u,chainId:d,senderPublickey:f,instructions:p},m]=await Promise.all([l(n,i,a,s),e.getEthereumAddress()]),h=await o.sendProxyV0Transaction({connection:u,chainId:d,subAccount:a,payerPublicKey:f,instructions:p});return t.emitTxPublicData(r.constructAdminData(c,d,[n.erc20TokenAddress],[i],m)),h},d=async(e,t,n,r)=>{let{connection:i,senderPublickey:a,instructions:s}=await l(e,t,n,r);return o.serializeProxyV0Transaction(i,a,s)};exports.getSolanaProxySendSerializedTransaction=d,exports.hinkalSolanaProxySend=u;

package/data-structures/Hinkal/hinkalSolanaProxySend.mjs

@@ -1,19 +1,19 @@
 import { networkRegistry as e } from "../../constants/chains.constants.mjs";
 import { emitTxPublicData as t } from "../../API/admin-calls.mjs";
 import { validateAndGetChainId as n } from "../../functions/utils/token-check.utils.mjs";
-import { createCustomSolanaConnection as r } from "../../functions/utils/create-provider.mjs";
-import { constructAdminData as i } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { constructAdminData as r } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { createCustomSolanaConnection as i } from "../../functions/utils/create-provider.mjs";
 import { AccountActions as a } from "../AccountActions/AccountActions.mjs";
 import { sendProxyV0Transaction as o, serializeProxyV0Transaction as s } from "../../functions/pre-transaction/sendV0Transaction.mjs";
 import { buildSolanaTransferInstructions as c } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
 import { PublicKey as l } from "@solana/web3.js";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaProxySend.ts
-var u = async (t, i, o, s) => {
+var u = async (t, r, o, s) => {
 	let u = n([t]), d = a.getAddressFromSubAccount(u, o);
 	if (!d) throw Error("Public account address is not available");
 	let { fetchRpcUrl: f } = e[u];
 	if (!f) throw Error("RPC URL not found for the specified chain ID");
-	let p = r(f), m = new l(d), { instructions: h, programId: g } = await c(p, m, new l(s), t, i);
+	let p = i(f), m = new l(d), { instructions: h, programId: g } = await c(p, m, new l(s), t, r);
 	return {
 		connection: p,
 		chainId: u,
@@ -22,15 +22,15 @@ var u = async (t, i, o, s) => {
 		programId: g,
 		instructions: h
 	};
-}, d = async (e, n, r, a, s, c) => {
-	let [{ connection: l, chainId: d, senderPublickey: f, instructions: p }, m] = await Promise.all([u(n, r, a, s), e.getEthereumAddress()]), h = await o({
+}, d = async (e, n, i, a, s, c) => {
+	let [{ connection: l, chainId: d, senderPublickey: f, instructions: p }, m] = await Promise.all([u(n, i, a, s), e.getEthereumAddress()]), h = await o({
 		connection: l,
 		chainId: d,
 		subAccount: a,
 		payerPublicKey: f,
 		instructions: p
 	});
-	return t(i(c, d, [n.erc20TokenAddress], [r], m)), h;
+	return t(r(c, d, [n.erc20TokenAddress], [i], m)), h;
 }, f = async (e, t, n, r) => {
 	let { connection: i, senderPublickey: a, instructions: o } = await u(e, t, n, r);
 	return s(i, a, o);

package/data-structures/Hinkal/hinkalSolanaProxyShield.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../functions/utils/addresses.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../API/admin-calls.cjs`),i=require(`../../functions/utils/solanaMint.utils.cjs`),a=require(`../../functions/utils/token-check.utils.cjs`),o=require(`../../functions/pre-transaction/solana.cjs`),s=require(`../../functions/utils/create-provider.cjs`),c=require(`../../functions/pre-transaction/constructAdminData.cjs`),l=require(`../AccountActions/AccountActions.cjs`),u=require(`../../functions/pre-transaction/sendV0Transaction.cjs`);let d=require(`@solana/web3.js`),f=require(`@coral-xyz/anchor`),p=require(`@solana/spl-token`);var m=async({program:e,mintPublicKey:t,mintAddressString:n,tokenAmount:r,anchorStealthStructure:i,senderPublickey:a,originalDeployer:o,storageAccount:s,storageVault:c})=>{let l=new f.BN(r.toString()),u=n===`11111111111111111111111111111111`?null:t,d=n===`11111111111111111111111111111111`?null:void 0;return e.methods.prooflessDeposit(l,i).accounts({mint:u,signer:a,signerAta:d,originalDeployer:o,storageAccount:s,storageVault:c,storageVaultAta:d}).instruction()},h=async(r,a,c,u,f,h)=>{let g=h??r.getRecipientInfo();if(!t.isValidPrivateAddress(g))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let _=l.AccountActions.getAddressFromSubAccount(a,f);if(!_)throw Error(`Public account address is not available`);let{hinkalIdl:v,hinkalAddress:y,originalDeployer:b}=e.networkRegistry[a].contractData;if(!v)throw Error(`No IDL configured for Solana program on this network`);if(!b)throw Error(`missing original deployer`);let x=r.getSolanaProgram(v),S=new d.PublicKey(b),C=new d.PublicKey(y),w=new d.PublicKey(_),{erc20TokenAddress:T}=c,{fetchRpcUrl:E}=e.networkRegistry[a];if(!E)throw Error(`RPC URL not found for the specified chain ID`);let D=s.createCustomSolanaConnection(E),{mintPublicKey:O}=i.formatMintAddress(T),k=O.toString(),A=o.getStorageAccountPublicKey(C,S),j=o.getStorageVaultPublicKey(C,S),M=await m({program:x,mintPublicKey:O,mintAddressString:k,tokenAmount:u,anchorStealthStructure:o.buildAnchorStealthAddressStructure(t.constructStealthAddressStructure(g)),senderPublickey:w,originalDeployer:S,storageAccount:A,storageVault:j}),N=c.is2022Program?p.TOKEN_2022_PROGRAM_ID:p.TOKEN_PROGRAM_ID;return{connection:D,senderAddress:_,senderPublickey:w,instructions:[M],storageAccount:A,programId:N}},g=async(e,t,n,i,o,s)=>{if(!i)throw Error(`subAccount is required`);let l=a.validateAndGetChainId([t]),[{connection:d,senderPublickey:f,instructions:p},m]=await Promise.all([h(e,l,t,n,i,o),e.getEthereumAddress()]),g=await u.sendProxyV0Transaction({connection:d,chainId:l,subAccount:i,payerPublicKey:f,instructions:p});return r.emitTxPublicData(c.constructAdminData(s,l,[t.erc20TokenAddress],[n],m)),g},_=async(e,t,n,r,i)=>{let{connection:o,senderPublickey:s,instructions:c}=await h(e,a.validateAndGetChainId([t]),t,n,r,i);return u.serializeProxyV0Transaction(o,s,c)};exports.getSolanaProxyShieldSerializedTransaction=_,exports.hinkalSolanaProxyShield=g;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../functions/utils/addresses.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../API/admin-calls.cjs`),i=require(`../../functions/utils/solanaMint.utils.cjs`),a=require(`../../functions/utils/token-check.utils.cjs`),o=require(`../../functions/pre-transaction/solana.cjs`),s=require(`../../functions/pre-transaction/constructAdminData.cjs`),c=require(`../../functions/utils/create-provider.cjs`),l=require(`../AccountActions/AccountActions.cjs`),u=require(`../../functions/pre-transaction/sendV0Transaction.cjs`);let d=require(`@solana/web3.js`),f=require(`@coral-xyz/anchor`),p=require(`@solana/spl-token`);var m=async({program:e,mintPublicKey:t,mintAddressString:n,tokenAmount:r,anchorStealthStructure:i,senderPublickey:a,originalDeployer:o,storageAccount:s,storageVault:c})=>{let l=new f.BN(r.toString()),u=n===`11111111111111111111111111111111`?null:t,d=n===`11111111111111111111111111111111`?null:void 0;return e.methods.prooflessDeposit(l,i).accounts({mint:u,signer:a,signerAta:d,originalDeployer:o,storageAccount:s,storageVault:c,storageVaultAta:d}).instruction()},h=async(r,a,s,u,f,h)=>{let g=h??r.getRecipientInfo();if(!t.isValidPrivateAddress(g))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let _=l.AccountActions.getAddressFromSubAccount(a,f);if(!_)throw Error(`Public account address is not available`);let{hinkalIdl:v,hinkalAddress:y,originalDeployer:b}=e.networkRegistry[a].contractData;if(!v)throw Error(`No IDL configured for Solana program on this network`);if(!b)throw Error(`missing original deployer`);let x=r.getSolanaProgram(v),S=new d.PublicKey(b),C=new d.PublicKey(y),w=new d.PublicKey(_),{erc20TokenAddress:T}=s,{fetchRpcUrl:E}=e.networkRegistry[a];if(!E)throw Error(`RPC URL not found for the specified chain ID`);let D=c.createCustomSolanaConnection(E),{mintPublicKey:O}=i.formatMintAddress(T),k=O.toString(),A=o.getStorageAccountPublicKey(C,S),j=o.getStorageVaultPublicKey(C,S),M=await m({program:x,mintPublicKey:O,mintAddressString:k,tokenAmount:u,anchorStealthStructure:o.buildAnchorStealthAddressStructure(t.constructStealthAddressStructure(g)),senderPublickey:w,originalDeployer:S,storageAccount:A,storageVault:j}),N=s.is2022Program?p.TOKEN_2022_PROGRAM_ID:p.TOKEN_PROGRAM_ID;return{connection:D,senderAddress:_,senderPublickey:w,instructions:[M],storageAccount:A,programId:N}},g=async(e,t,n,i,o,c)=>{if(!i)throw Error(`subAccount is required`);let l=a.validateAndGetChainId([t]),[{connection:d,senderPublickey:f,instructions:p},m]=await Promise.all([h(e,l,t,n,i,o),e.getEthereumAddress()]),g=await u.sendProxyV0Transaction({connection:d,chainId:l,subAccount:i,payerPublicKey:f,instructions:p});return r.emitTxPublicData(s.constructAdminData(c,l,[t.erc20TokenAddress],[n],m)),g},_=async(e,t,n,r,i)=>{let{connection:o,senderPublickey:s,instructions:c}=await h(e,a.validateAndGetChainId([t]),t,n,r,i);return u.serializeProxyV0Transaction(o,s,c)};exports.getSolanaProxyShieldSerializedTransaction=_,exports.hinkalSolanaProxyShield=g;

package/data-structures/Hinkal/hinkalSolanaProxyShield.mjs

@@ -6,8 +6,8 @@ import { emitTxPublicData as i } from "../../API/admin-calls.mjs";
 import { formatMintAddress as a } from "../../functions/utils/solanaMint.utils.mjs";
 import { validateAndGetChainId as o } from "../../functions/utils/token-check.utils.mjs";
 import { buildAnchorStealthAddressStructure as s, getStorageAccountPublicKey as c, getStorageVaultPublicKey as l } from "../../functions/pre-transaction/solana.mjs";
-import { createCustomSolanaConnection as u } from "../../functions/utils/create-provider.mjs";
-import { constructAdminData as d } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { constructAdminData as u } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { createCustomSolanaConnection as d } from "../../functions/utils/create-provider.mjs";
 import { AccountActions as f } from "../AccountActions/AccountActions.mjs";
 import { sendProxyV0Transaction as p, serializeProxyV0Transaction as m } from "../../functions/pre-transaction/sendV0Transaction.mjs";
 import { PublicKey as h } from "@solana/web3.js";
@@ -25,7 +25,7 @@ var y = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount
 		storageVault: c,
 		storageVaultAta: d
 	}).instruction();
-}, b = async (i, o, d, p, m, g) => {
+}, b = async (i, o, u, p, m, g) => {
 	let b = g ?? i.getRecipientInfo();
 	if (!n(b)) throw Error(r.RECIPIENT_FORMAT_INCORRECT);
 	let x = f.getAddressFromSubAccount(o, m);
@@ -33,9 +33,9 @@ var y = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount
 	let { hinkalIdl: S, hinkalAddress: C, originalDeployer: w } = e[o].contractData;
 	if (!S) throw Error("No IDL configured for Solana program on this network");
 	if (!w) throw Error("missing original deployer");
-	let T = i.getSolanaProgram(S), E = new h(w), D = new h(C), O = new h(x), { erc20TokenAddress: k } = d, { fetchRpcUrl: A } = e[o];
+	let T = i.getSolanaProgram(S), E = new h(w), D = new h(C), O = new h(x), { erc20TokenAddress: k } = u, { fetchRpcUrl: A } = e[o];
 	if (!A) throw Error("RPC URL not found for the specified chain ID");
-	let j = u(A), { mintPublicKey: M } = a(k), N = M.toString(), P = c(D, E), F = l(D, E), I = await y({
+	let j = d(A), { mintPublicKey: M } = a(k), N = M.toString(), P = c(D, E), F = l(D, E), I = await y({
 		program: T,
 		mintPublicKey: M,
 		mintAddressString: N,
@@ -45,7 +45,7 @@ var y = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount
 		originalDeployer: E,
 		storageAccount: P,
 		storageVault: F
-	}), L = d.is2022Program ? _ : v;
+	}), L = u.is2022Program ? _ : v;
 	return {
 		connection: j,
 		senderAddress: x,
@@ -56,14 +56,14 @@ var y = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount
 	};
 }, x = async (e, t, n, r, a, s) => {
 	if (!r) throw Error("subAccount is required");
-	let c = o([t]), [{ connection: l, senderPublickey: u, instructions: f }, m] = await Promise.all([b(e, c, t, n, r, a), e.getEthereumAddress()]), h = await p({
+	let c = o([t]), [{ connection: l, senderPublickey: d, instructions: f }, m] = await Promise.all([b(e, c, t, n, r, a), e.getEthereumAddress()]), h = await p({
 		connection: l,
 		chainId: c,
 		subAccount: r,
-		payerPublicKey: u,
+		payerPublicKey: d,
 		instructions: f
 	});
-	return i(d(s, c, [t.erc20TokenAddress], [n], m)), h;
+	return i(u(s, c, [t.erc20TokenAddress], [n], m)), h;
 }, S = async (e, t, n, r, i) => {
 	let { connection: a, senderPublickey: s, instructions: c } = await b(e, o([t]), t, n, r, i);
 	return m(a, s, c);