@hinkal/common 0.2.31 → 0.2.32

package/data-structures/Hinkal/hinkalProoflessDepositViaWrapper.mjs

@@ -0,0 +1,128 @@
+import { ContractType as e } from "../../types/ethereum-network.types.mjs";
+import { networkRegistry as t } from "../../constants/chains.constants.mjs";
+import { TRON_DEFAULT_FEE_LIMIT_SUN as n, zeroAddress as r } from "../../constants/protocol.constants.mjs";
+import { caseInsensitiveEqual as i } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { insufficientResourcesErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
+import { emitTxPublicData as o } from "../../API/admin-calls.mjs";
+import { Logger as s } from "../../error-handling/logger.mjs";
+import { createTronCallData as c, estimateTronFeeSunWithPadding as l, evmHexToTronBase58Address as u } from "../../functions/utils/tron.utils.mjs";
+import { constructAdminData as d } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { simulateTronTransaction as f } from "../../functions/utils/tronSimulation.utils.mjs";
+import { buildApproveAndDepositWrapperCalls as p } from "../../functions/web3/functionCalls/constructBatchCall.mjs";
+import { waitForErc20Approvals as m, waitForTronErc20Approvals as h } from "../../functions/web3/functionCalls/waitForErc20Approvals.mjs";
+import { aggregateAmountsForApproval as g, approveTokens as _, approveTronTokens as v, assertNoDuplicateStealthAddressStructures as y } from "./hinkalProoflessDeposit.utils.mjs";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalProoflessDepositViaWrapper.ts
+var b = (e, t, n, a) => {
+	let o = i(e, r), s = n.reduce((e, t, n) => i(t.erc20TokenAddress, r) ? e + a[n] : e, 0n) + (o ? t : 0n), c = g(n, a), l = c.filter(({ token: e }) => !i(e.erc20TokenAddress, r)).map((n) => !o && i(n.token.erc20TokenAddress, e) ? {
+		token: n.token,
+		balance: n.balance + t
+	} : n).filter(({ balance: e }) => e > 0n);
+	return !o && t > 0n && (c.some(({ token: t }) => i(t.erc20TokenAddress, e)) || l.push({
+		token: {
+			erc20TokenAddress: e,
+			chainId: n[0]?.chainId
+		},
+		balance: t
+	})), {
+		tokensForApproval: l,
+		ethValue: s
+	};
+}, x = (e, t, n, r) => {
+	if (t.length !== n.length || n.length !== r.length) throw Error(`${e}: array length mismatch`);
+}, S = async (e, p, m, g, _, S, C, w) => {
+	x("hinkalTronProoflessDepositViaWrapper", _, S, C), y(C);
+	let { hinkalWrapperAddress: T, hinkalWrapperABI: E } = t[p]?.contractData ?? {};
+	if (!T || !E) throw Error(`No HinkalWrapper configured for chainId ${p}`);
+	let D = await e.getRandomRelay(p, !1);
+	if (!D) throw Error(`No relay available for chainId ${p}`);
+	let O = e.getTronWeb(), k = await e.getEthereumAddressByChain(p), A = u(T), j = i(m, r) ? m : u(m), { tokensForApproval: M, ethValue: N } = b(m, g, _, S), P = _.map((e) => e.erc20TokenAddress), F = S.map(() => "0"), I = C.map((e) => [
+		e.extraRandomization.toString(),
+		e.stealthAddress.toString(),
+		e.H0.toString(),
+		e.H1.toString()
+	]);
+	if (N > 0n) {
+		let e = BigInt(await O.trx.getBalance(k)), t = BigInt(n);
+		try {
+			t = await l(O, p, A, k, c(E, "prooflessDeposit", [
+				u(D),
+				j,
+				g.toString(),
+				P,
+				S.map(String),
+				F,
+				I
+			]), N);
+		} catch (e) {
+			s.error("Error estimating Tron wrapper deposit fee", e);
+		}
+		if (e < N + t) throw Error(a.INSUFFICIENT_TRON_BALANCE_FOR_FEE);
+	}
+	let { transaction: L } = await O.transactionBuilder.triggerSmartContract(A, "prooflessDeposit(address,address,uint256,address[],uint256[],uint256[],(uint256,uint256,uint256,uint256)[])", {
+		feeLimit: n,
+		callValue: N > 0n ? Number(N) : 0
+	}, [
+		{
+			type: "address",
+			value: u(D)
+		},
+		{
+			type: "address",
+			value: j
+		},
+		{
+			type: "uint256",
+			value: g.toString()
+		},
+		{
+			type: "address[]",
+			value: P
+		},
+		{
+			type: "uint256[]",
+			value: S.map(String)
+		},
+		{
+			type: "uint256[]",
+			value: F
+		},
+		{
+			type: "tuple(uint256,uint256,uint256,uint256)[]",
+			value: I
+		}
+	], k), R = new Map(M.map(({ token: e, balance: t }) => [u(e.erc20TokenAddress), t]));
+	await v(O, k, A, R), R.size > 0 && await h(O, k, A, Array.from(R.entries()).map(([e, t]) => ({
+		tokenAddress: e,
+		requiredAmount: t
+	}))), await f(p, A, "prooflessDeposit", E, [
+		u(D),
+		j,
+		g.toString(),
+		P,
+		S.map(String),
+		F,
+		I
+	], k, N > 0n ? N : void 0);
+	let z = await O.trx.sign(L), B = await O.trx.sendRawTransaction(z);
+	if (!B.result) throw Error("Tron wrapper deposit failed");
+	let V = typeof B == "string" ? B : B?.txid ?? B?.transaction?.txID;
+	if (!V) throw Error("Tron wrapper deposit failed (missing txid)");
+	return o(d(w, p, P, S, k)), V;
+}, C = async (n, r, i, a, s, c, l, u) => {
+	x("hinkalEvmProoflessDepositViaWrapper", s, c, l), y(l);
+	let f = t[r]?.contractData?.hinkalWrapperAddress;
+	if (!f) throw Error(`No HinkalWrapper configured for chainId ${r}`);
+	let h = await n.getRandomRelay(r, !1);
+	if (!h) throw Error(`No relay available for chainId ${r}`);
+	let g = s.map((e) => e.erc20TokenAddress), v = c.map(() => 0n), { tokensForApproval: S, ethValue: C } = b(i, a, s, c), w = await n.getEthereumAddressByChain(r), T = n.getProviderAdapter(r), E = n.getContractWithSigner(r, e.HinkalWrapper), D;
+	if (S.length > 0 && await T.supportsBatchCall?.(r) && T.sendBatchCallsTransaction) {
+		let e = p(S.map(({ token: e }) => e.erc20TokenAddress), S.map(({ balance: e }) => e), f, E.interface, h, i, a, g, c, v, l, C);
+		D = await T.sendBatchCallsTransaction(r, e);
+	} else await _(n, r, f, S), await m(n, r, w, f, S.map(({ token: e, balance: t }) => ({
+		tokenAddress: e.erc20TokenAddress,
+		requiredAmount: t
+	}))), D = await E.prooflessDeposit(h, i, a, g, c, v, l, { value: C > 0n ? C : void 0 });
+	return o(d(u, r, g, c, w)), D.hash;
+};
+//#endregion
+export { C as hinkalEvmProoflessDepositViaWrapper, S as hinkalTronProoflessDepositViaWrapper };

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

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

@@ -1,5 +1,5 @@
-import { AdminTransactionType, ERC20Token } from '../../types';
+import { ERC20Token } from '../../types';
 import { FeeStructure } from '../../types/hinkal.types';
 import { Utxo } from '../utxo/Utxo';
 import { IHinkal } from './IHinkal';
-export declare const hinkalSolanaClaimUtxo: (hinkal: IHinkal, erc20Token: ERC20Token, utxo: Utxo, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<string>;
+export declare const hinkalSolanaClaimUtxo: (hinkal: IHinkal, erc20Token: ERC20Token, utxo: Utxo, feeStructureOverride?: FeeStructure, claimableSignature?: string) => Promise<string>;

package/data-structures/Hinkal/hinkalSolanaClaimUtxo.mjs

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

package/data-structures/Hinkal/hinkalSolanaDeposit.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../types/admin.types.cjs`),n=require(`../../functions/utils/addresses.cjs`),r=require(`../../API/API.cjs`),i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../functions/web3/etherFunctions.cjs`),o=require(`../../API/admin-calls.cjs`);require(`../../API/index.cjs`);const s=require(`../utxo/Utxo.cjs`),c=require(`../../functions/pre-transaction/solana.cjs`),l=require(`./hinkalCheckSolanaTokenRegistry.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/constructAdminData.cjs`),m=require(`../../functions/web3/signAndSendSerializedTransaction.cjs`);let h=require(`@solana/web3.js`),g=require(`@coral-xyz/anchor`);var _=async(t,n,i,a,s)=>{if(i.length===0)throw Error(`amounts must not be empty`);if(i.length!==a.length)throw Error(`amounts and stealthAddressStructures length mismatch`);if(i.some(e=>e<=0n))throw Error(`all amounts must be positive`);let f=d.validateAndGetChainId([n]),_=n.erc20TokenAddress,{hinkalIdl:v,hinkalAddress:y,originalDeployer:b}=e.networkRegistry[f].contractData;if(!v)throw Error(`No IDL configured for Solana program on this network`);if(!b)throw Error(`missing original deployer`);let x=p.constructAdminData(s,f,Array(i.length).fill(_),i,await t.getEthereumAddress()),S=t.getSolanaProgram(v),C=t.getSolanaPublicKey(),w=new h.PublicKey(b),T=new h.PublicKey(y),{mintPublicKey:E}=u.formatMintAddress(_),D=E.toString(),O=c.getStorageAccountPublicKey(T,w),k=c.getStorageVaultPublicKey(T,w),A=c.getMerkleAccountPublicKey(T,w),j=a.map(e=>c.buildAnchorStealthAddressStructure(e)),M=i.reduce((e,t)=>e+t,0n),N=await l.hinkalCheckSolanaTokenRegistry(S,new h.PublicKey(w),[_],[M]),P=i.map(e=>e.toString());if(N){let{serializedTransaction:e,blockhash:n,lastValidBlockHeight:i}=await r.API.generateMultiPaymentDepositLimitless({amounts:P,payer:C.toBase58(),ethereumAddress:await t.getEthereumAddressByChain(f),mint:_,stealthAddressStructures:j,chainId:f,createBlockedUtxos:!1}),a=await m.signAndSendSerializedTransaction(S.provider,e,n,i);return await o.emitTxPublicData(x),a}let F=c.getTokenLimitStorageAccountPublicKey(S.programId,w,E),I=D===`11111111111111111111111111111111`?null:E,L=D===`11111111111111111111111111111111`?null:void 0,R=await S.methods.multiPaymentDeposit(P.map(e=>new g.BN(e)),j,!1).accounts({mint:I,signer:C,signerAta:L,originalDeployer:w,storageAccount:O,storageVault:k,merkleAccount:A,tokenLimitStorage:F,storageVaultAta:L,accessTokenOwner:null}).rpc();return await o.emitTxPublicData(x),R},v=async(e,n,r)=>{let i=e.userKeys.getShieldedPrivateKey(),o=f.calcStealthAddressStructure(s.Utxo.findCorrectRandomization(a.randomBigInt(31),i),i);return _(e,r,[n],[o],t.AdminTransactionType.ProoflessDeposit)},y=async(e,r,a,o)=>{if(!n.isValidPrivateAddress(o))throw Error(i.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let s=n.constructStealthAddressStructure(o);return _(e,a,[r],[s],t.AdminTransactionType.PaymentLink)};exports.hinkalSolanaDeposit=v,exports.hinkalSolanaDepositForOther=y,exports.submitSolanaProoflessDeposit=_;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../functions/utils/addresses.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/web3/etherFunctions.cjs`),a=require(`../../API/admin-calls.cjs`),o=require(`../crypto-keys/keys.cjs`),s=require(`../../functions/utils/solanaMint.utils.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/snarkjs/common.snarkjs.cjs`),u=require(`../../functions/pre-transaction/solana.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../error-handling/retrySolanaError.cjs`),p=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`),m=require(`./hinkalProoflessDeposit.utils.cjs`);let h=require(`@solana/web3.js`),g=require(`@coral-xyz/anchor`);var _=(n,r)=>{let i=c.validateAndGetChainId([r]),a=r.erc20TokenAddress,{hinkalIdl:o,hinkalAddress:l,originalDeployer:d}=e.networkRegistry[i].contractData;if(!o)throw Error(`No IDL configured for Solana program on this network`);if(!d)throw Error(`missing original deployer`);let f=n.getSolanaProgram(o),p=n.getSolanaPublicKey(),{connection:m,wallet:g}=f.provider;if(!g)throw Error(`missing solana wallet`);let _=new h.PublicKey(d),v=new h.PublicKey(l),{mintPublicKey:y}=s.formatMintAddress(a),b=y.toString()===t.solanaNativeAddress;return{chainId:i,mintAddress:a,program:f,publicKey:p,connection:m,wallet:g,originalDeployer:_,mintPublicKey:y,mint:b?null:y,atasValue:b?null:void 0,storageAccount:u.getStorageAccountPublicKey(v,_),storageVault:u.getStorageVaultPublicKey(v,_),merkleAccount:u.getMerkleAccountPublicKey(v,_)}},v=(e,t,n)=>{let r=n.map(e=>u.buildAnchorStealthAddressStructure(e));return e.program.methods.multiPaymentDeposit(t.map(e=>new g.BN(e.toString())),r,!1).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}).instruction()},y=async(e,t,n,r)=>{for(let i=0;i<10;i+=1){let a=i===9;try{let{blockhash:i,lastValidBlockHeight:a}=await e.getLatestBlockhash(),o=new h.VersionedTransaction(new h.TransactionMessage({payerKey:n,recentBlockhash:i,instructions:r}).compileToV0Message()),s=await t.signTransaction(o),c=await e.sendTransaction(s);return await e.confirmTransaction({signature:c,blockhash:i,lastValidBlockHeight:a},`confirmed`),c}catch(e){if(f.shouldRetryForSolanaError(e)&&!a)continue;throw e}}return``},b=(e,t)=>{if(e.length===0)throw Error(`amounts must not be empty`);if(e.length!==t.length)throw Error(`amounts and stealthAddressStructures length mismatch`);if(e.some(e=>e<=0n))throw Error(`all amounts must be positive`);m.assertNoDuplicateStealthAddressStructures(t)},x=async(e,t,n,r,i,o=!1)=>{b(n,r);let s=_(e,t),c=d.constructAdminData(i,s.chainId,Array(n.length).fill(s.mintAddress),n,await e.getEthereumAddress()),l=await v(s,n,r);if(o){let{blockhash:e}=await s.connection.getLatestBlockhash(),t=new h.Transaction().add(l);return t.recentBlockhash=e,t.feePayer=s.publicKey,Buffer.from(t.serialize({requireAllSignatures:!1})).toString(`base64`)}let u=await y(s.connection,s.wallet,s.publicKey,[l]);return await a.emitTxPublicData(c),u},S=async(e,t,n,r,i,o)=>{b(n,r);let s=_(e,t),c=await e.getRandomRelay(s.chainId,!1);if(!c)throw Error(`No relay available for chainId ${s.chainId}`);let{instructions:l}=await p.buildSolanaTransferInstructions(s.connection,s.publicKey,new h.PublicKey(c),t,i),u=await v(s,n,r),f=d.constructAdminData(o,s.chainId,Array(n.length).fill(s.mintAddress),n,await e.getEthereumAddress()),m=await y(s.connection,s.wallet,s.publicKey,[...l,u]);return await a.emitTxPublicData(f),m},C=async(e,t,n,r=!1)=>{let a=e.userKeys.getShieldedPrivateKey(),s=l.calcStealthAddressStructure(o.UserKeys.findCorrectRandomization(i.randomBigInt(31),a),a,e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint);return x(e,n,[t],[s],void 0,r)},w=async(e,t,i,a,o=!1,s)=>{if(!n.isValidPrivateAddress(a))throw Error(r.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let c=n.constructStealthAddressStructure(a);return x(e,i,[t],[c],s,o)};exports.hinkalSolanaDeposit=C,exports.hinkalSolanaDepositForOther=w,exports.hinkalSolanaProoflessDepositWithPublicFee=S,exports.submitSolanaProoflessDeposit=x;

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

@@ -2,6 +2,7 @@ import { StealthAddressStructure } from '../../types/circom-data.types';
 import { ERC20Token } from '../../types/token.types';
 import { IHinkal } from './IHinkal';
 import { AdminTransactionType } from '../../types/admin.types';
-export declare const submitSolanaProoflessDeposit: (hinkal: IHinkal, token: ERC20Token, amounts: bigint[], stealthAddressStructures: StealthAddressStructure[], action?: AdminTransactionType) => Promise<string>;
-export declare const hinkalSolanaDeposit: (hinkal: IHinkal, amount: bigint, token: ERC20Token) => Promise<string>;
-export declare const hinkalSolanaDepositForOther: (hinkal: IHinkal, amount: bigint, token: ERC20Token, recipientInfo: string) => Promise<string>;
+export declare const submitSolanaProoflessDeposit: (hinkal: IHinkal, token: ERC20Token, amounts: bigint[], stealthAddressStructures: StealthAddressStructure[], action?: AdminTransactionType, returnTxData?: boolean) => Promise<string>;
+export declare const hinkalSolanaProoflessDepositWithPublicFee: (hinkal: IHinkal, token: ERC20Token, amounts: bigint[], stealthAddressStructures: StealthAddressStructure[], feeAmount: bigint, action?: AdminTransactionType) => Promise<string>;
+export declare const hinkalSolanaDeposit: (hinkal: IHinkal, amount: bigint, token: ERC20Token, returnTxData?: boolean) => Promise<string>;
+export declare const hinkalSolanaDepositForOther: (hinkal: IHinkal, amount: bigint, token: ERC20Token, recipientInfo: string, returnTxData?: boolean, action?: AdminTransactionType) => Promise<string>;

package/data-structures/Hinkal/hinkalSolanaDeposit.mjs

@@ -1,63 +1,102 @@
 import { networkRegistry as e } from "../../constants/chains.constants.mjs";
-import "../../constants/protocol.constants.mjs";
-import { AdminTransactionType as t } from "../../types/admin.types.mjs";
+import { solanaNativeAddress as t } from "../../constants/protocol.constants.mjs";
 import { constructStealthAddressStructure as n, isValidPrivateAddress as r } from "../../functions/utils/addresses.mjs";
-import { API as i } from "../../API/API.mjs";
-import { transactionErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
-import { randomBigInt as o } from "../../functions/web3/etherFunctions.mjs";
-import { emitTxPublicData as s } from "../../API/admin-calls.mjs";
-import "../../API/index.mjs";
-import { Utxo as c } from "../utxo/Utxo.mjs";
-import { buildAnchorStealthAddressStructure as l, getMerkleAccountPublicKey as u, getStorageAccountPublicKey as d, getStorageVaultPublicKey as f, getTokenLimitStorageAccountPublicKey as p } from "../../functions/pre-transaction/solana.mjs";
-import { hinkalCheckSolanaTokenRegistry as m } from "./hinkalCheckSolanaTokenRegistry.mjs";
-import { formatMintAddress as h } from "../../functions/utils/solanaMint.utils.mjs";
-import { validateAndGetChainId as g } from "../../functions/utils/token-check.utils.mjs";
-import { calcStealthAddressStructure as _ } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { constructAdminData as v } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { signAndSendSerializedTransaction as y } from "../../functions/web3/signAndSendSerializedTransaction.mjs";
-import { PublicKey as b } from "@solana/web3.js";
-import { BN as x } from "@coral-xyz/anchor";
+import { transactionErrorCodes as i } from "../../error-handling/error-codes.constants.mjs";
+import { randomBigInt as a } from "../../functions/web3/etherFunctions.mjs";
+import { emitTxPublicData as o } from "../../API/admin-calls.mjs";
+import { UserKeys as s } from "../crypto-keys/keys.mjs";
+import { formatMintAddress as c } from "../../functions/utils/solanaMint.utils.mjs";
+import { validateAndGetChainId as l } from "../../functions/utils/token-check.utils.mjs";
+import { calcStealthAddressStructure as u } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { buildAnchorStealthAddressStructure as d, getMerkleAccountPublicKey as f, getStorageAccountPublicKey as p, getStorageVaultPublicKey as m } from "../../functions/pre-transaction/solana.mjs";
+import { constructAdminData as h } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { shouldRetryForSolanaError as g } from "../../error-handling/retrySolanaError.mjs";
+import { buildSolanaTransferInstructions as _ } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
+import { assertNoDuplicateStealthAddressStructures as v } from "./hinkalProoflessDeposit.utils.mjs";
+import { PublicKey as y, Transaction as b, TransactionMessage as x, VersionedTransaction as S } from "@solana/web3.js";
+import { BN as C } from "@coral-xyz/anchor";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaDeposit.ts
-var S = async (t, n, r, a, o) => {
-	if (r.length === 0) throw Error("amounts must not be empty");
-	if (r.length !== a.length) throw Error("amounts and stealthAddressStructures length mismatch");
-	if (r.some((e) => e <= 0n)) throw Error("all amounts must be positive");
-	let c = g([n]), _ = n.erc20TokenAddress, { hinkalIdl: S, hinkalAddress: C, originalDeployer: w } = e[c].contractData;
-	if (!S) throw Error("No IDL configured for Solana program on this network");
-	if (!w) throw Error("missing original deployer");
-	let T = v(o, c, Array(r.length).fill(_), r, await t.getEthereumAddress()), E = t.getSolanaProgram(S), D = t.getSolanaPublicKey(), O = new b(w), k = new b(C), { mintPublicKey: A } = h(_), j = A.toString(), M = d(k, O), N = f(k, O), P = u(k, O), F = a.map((e) => l(e)), I = r.reduce((e, t) => e + t, 0n), L = await m(E, new b(O), [_], [I]), R = r.map((e) => e.toString());
-	if (L) {
-		let { serializedTransaction: e, blockhash: n, lastValidBlockHeight: r } = await i.generateMultiPaymentDepositLimitless({
-			amounts: R,
-			payer: D.toBase58(),
-			ethereumAddress: await t.getEthereumAddressByChain(c),
-			mint: _,
-			stealthAddressStructures: F,
-			chainId: c,
-			createBlockedUtxos: !1
-		}), a = await y(E.provider, e, n, r);
-		return await s(T), a;
+var w = (n, r) => {
+	let i = l([r]), a = r.erc20TokenAddress, { hinkalIdl: o, hinkalAddress: s, originalDeployer: u } = e[i].contractData;
+	if (!o) throw Error("No IDL configured for Solana program on this network");
+	if (!u) throw Error("missing original deployer");
+	let d = n.getSolanaProgram(o), h = n.getSolanaPublicKey(), { connection: g, wallet: _ } = d.provider;
+	if (!_) throw Error("missing solana wallet");
+	let v = new y(u), b = new y(s), { mintPublicKey: x } = c(a), S = x.toString() === t;
+	return {
+		chainId: i,
+		mintAddress: a,
+		program: d,
+		publicKey: h,
+		connection: g,
+		wallet: _,
+		originalDeployer: v,
+		mintPublicKey: x,
+		mint: S ? null : x,
+		atasValue: S ? null : void 0,
+		storageAccount: p(b, v),
+		storageVault: m(b, v),
+		merkleAccount: f(b, v)
+	};
+}, T = (e, t, n) => {
+	let r = n.map((e) => d(e));
+	return e.program.methods.multiPaymentDeposit(t.map((e) => new C(e.toString())), r, !1).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
+	}).instruction();
+}, E = async (e, t, n, r) => {
+	for (let i = 0; i < 10; i += 1) {
+		let a = i === 9;
+		try {
+			let { blockhash: i, lastValidBlockHeight: a } = await e.getLatestBlockhash(), o = new S(new x({
+				payerKey: n,
+				recentBlockhash: i,
+				instructions: r
+			}).compileToV0Message()), s = await t.signTransaction(o), c = await e.sendTransaction(s);
+			return await e.confirmTransaction({
+				signature: c,
+				blockhash: i,
+				lastValidBlockHeight: a
+			}, "confirmed"), c;
+		} catch (e) {
+			if (g(e) && !a) continue;
+			throw e;
+		}
 	}
-	let z = p(E.programId, O, A), B = j === "11111111111111111111111111111111" ? null : A, V = j === "11111111111111111111111111111111" ? null : void 0, H = await E.methods.multiPaymentDeposit(R.map((e) => new x(e)), F, !1).accounts({
-		mint: B,
-		signer: D,
-		signerAta: V,
-		originalDeployer: O,
-		storageAccount: M,
-		storageVault: N,
-		merkleAccount: P,
-		tokenLimitStorage: z,
-		storageVaultAta: V,
-		accessTokenOwner: null
-	}).rpc();
-	return await s(T), H;
-}, C = async (e, n, r) => {
-	let i = e.userKeys.getShieldedPrivateKey(), a = _(c.findCorrectRandomization(o(31), i), i);
-	return S(e, r, [n], [a], t.ProoflessDeposit);
-}, w = async (e, i, o, s) => {
-	if (!r(s)) throw Error(a.RECIPIENT_FORMAT_INCORRECT);
-	let c = n(s);
-	return S(e, o, [i], [c], t.PaymentLink);
+	return "";
+}, D = (e, t) => {
+	if (e.length === 0) throw Error("amounts must not be empty");
+	if (e.length !== t.length) throw Error("amounts and stealthAddressStructures length mismatch");
+	if (e.some((e) => e <= 0n)) throw Error("all amounts must be positive");
+	v(t);
+}, O = async (e, t, n, r, i, a = !1) => {
+	D(n, r);
+	let s = w(e, t), c = h(i, s.chainId, Array(n.length).fill(s.mintAddress), n, await e.getEthereumAddress()), l = await T(s, n, r);
+	if (a) {
+		let { blockhash: e } = await s.connection.getLatestBlockhash(), t = new b().add(l);
+		return t.recentBlockhash = e, t.feePayer = s.publicKey, Buffer.from(t.serialize({ requireAllSignatures: !1 })).toString("base64");
+	}
+	let u = await E(s.connection, s.wallet, s.publicKey, [l]);
+	return await o(c), u;
+}, k = async (e, t, n, r, i, a) => {
+	D(n, r);
+	let s = w(e, t), c = await e.getRandomRelay(s.chainId, !1);
+	if (!c) throw Error(`No relay available for chainId ${s.chainId}`);
+	let { instructions: l } = await _(s.connection, s.publicKey, new y(c), t, i), u = await T(s, n, r), d = h(a, s.chainId, Array(n.length).fill(s.mintAddress), n, await e.getEthereumAddress()), f = await E(s.connection, s.wallet, s.publicKey, [...l, u]);
+	return await o(d), f;
+}, A = async (e, t, n, r = !1) => {
+	let i = e.userKeys.getShieldedPrivateKey(), o = u(s.findCorrectRandomization(a(31), i), i, e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint);
+	return O(e, n, [t], [o], void 0, r);
+}, j = async (e, t, a, o, s = !1, c) => {
+	if (!r(o)) throw Error(i.RECIPIENT_FORMAT_INCORRECT);
+	let l = n(o);
+	return O(e, a, [t], [l], c, s);
 };
 //#endregion
-export { C as hinkalSolanaDeposit, w as hinkalSolanaDepositForOther, S as submitSolanaProoflessDeposit };
+export { A as hinkalSolanaDeposit, j as hinkalSolanaDepositForOther, k as hinkalSolanaProoflessDepositWithPublicFee, O as submitSolanaProoflessDeposit };

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

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

@@ -1,6 +1,24 @@
 import { FeeStructure } from '../../types/hinkal.types';
 import { IHinkal } from './IHinkal';
-import { AdminTransactionType } from '../../types';
+import { PublicKey } from '@solana/web3.js';
+import { AdminTransactionType, RecipientUtxo } from '../../types';
 import { ERC20Token } from '../../types/token.types';
+export declare const buildMultiPaymentDepositSetup: (hinkal: IHinkal, chainId: number, token: ERC20Token, amounts: bigint[]) => {
+    program: import('@coral-xyz/anchor').Program<import('@coral-xyz/anchor').Idl>;
+    publicKey: PublicKey;
+    originalDeployer: PublicKey;
+    mint: PublicKey | null;
+    atasValue: null | undefined;
+    storageAccount: PublicKey;
+    storageVault: PublicKey;
+    merkleAccount: PublicKey;
+    amounts: bigint[];
+    anchorStealthStructures: import('../..').AnchorStealthAddressStructure[];
+};
+export type MultiPaymentDepositSetup = ReturnType<typeof buildMultiPaymentDepositSetup>;
+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 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) => Promise<string>;
+ref?: string, action?: AdminTransactionType, dashboardAccountId?: string) => Promise<string>;