@kapa123456789/sdk 0.0.8 → 0.0.9

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

@@ -1,167 +0,0 @@
-import { isTronLike as e, 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 { ContractType as i } from "../../types/ethereum-network.types.mjs";
-import { insufficientResourcesErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
-import { randomBigInt as o } from "../../functions/web3/etherFunctions.mjs";
-import { caseInsensitiveEqual as s } from "../../functions/utils/caseInsensitive.utils.mjs";
-import { Utxo as c } from "../utxo/Utxo.mjs";
-import { getContractAddress as l } from "../../functions/utils/getContractAddress.mjs";
-import { createTronCallData as u, estimateTronFeeSunWithPadding as d, evmHexToTronBase58Address as f } from "../../functions/utils/tron.utils.mjs";
-import { Logger as p } from "../../error-handling/logger.mjs";
-import { isSameERC20Token as m, validateAndGetChainId as h } from "../../functions/utils/token-check.utils.mjs";
-import { calcStealthAddressStructure as g } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { constructAdminData as _ } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { ERC20ABI as v } from "../../externalABIs/index.mjs";
-import { waitForEthereumTransactionConfirmation as y } from "../../functions/utils/tx-confirmation.utils.mjs";
-import { simulateTronTransaction as b } from "../../functions/utils/tronSimulation.utils.mjs";
-import { buildApproveAndProoflessDepositCalls as x } from "../../functions/web3/functionCalls/constructBatchCall.mjs";
-import { waitForErc20Approvals as S, waitForTronErc20Approvals as C } from "../../functions/web3/functionCalls/waitForErc20Approvals.mjs";
-import { emitTxPublicData as w } from "../../API/admin-calls.mjs";
-//#region libs/shared/common/src/data-structures/Hinkal/hinkalProoflessDeposit.ts
-var T = (e, t) => {
-	let n = [], r = 0;
-	for (let i = 0; i < e.length; i += 1) {
-		let a = !1;
-		for (let o = 0; o < r; o += 1) if (m(n[o].token, e[i])) {
-			n[o].balance += t[i], a = !0;
-			break;
-		}
-		a || (n[r] = {
-			token: e[i],
-			balance: t[i]
-		}, r += 1);
-	}
-	return n;
-}, E = async (e, t, n, a) => {
-	for (let o = 0; o < a.length; o += 1) s(a[o].token.erc20TokenAddress, r) || await y(t, (await e.getContractWithSigner(t, i.ERC20Contract, a[o].token.erc20TokenAddress).approve(n, a[o].balance)).hash);
-}, D = async (e, t, r, i) => {
-	let a = Array.from(i.entries());
-	for (let i = 0; i < a.length; i += 1) {
-		let [o, s] = a[i], c = await e.contract(v, o).allowance(t, r).call({ from: t });
-		if (BigInt(String(c)) < s) {
-			let { transaction: i } = await e.transactionBuilder.triggerSmartContract(o, "approve(address,uint256)", { feeLimit: n }, [{
-				type: "address",
-				value: r
-			}, {
-				type: "uint256",
-				value: s.toString()
-			}], t), a = await e.trx.sign(i), c = await e.trx.sendRawTransaction(a);
-			if (!c.result) {
-				let e = c.code ?? "UNKNOWN", t = c.message ? Buffer.from(c.message, "hex").toString() : "no message";
-				throw Error(`Tron token approval failed: ${e} - ${t}`);
-			}
-		}
-	}
-}, O = (e) => {
-	let t = /* @__PURE__ */ new Set();
-	e.forEach(({ extraRandomization: e, stealthAddress: n }) => {
-		let r = `${e.toString()}:${n.toString()}`;
-		if (t.has(r)) throw Error("Duplicate randomization and stealth address pair detected in stealthAddressStructures");
-		t.add(r);
-	});
-}, k = async (e, i, o, c, l) => {
-	let m = e.getTronWeb(), { hinkalAddress: h } = t[i].contractData, g = f(h), _ = await e.getEthereumAddressByChain(i), v = o.map((e) => e.erc20TokenAddress), y = o.map(() => 0n), x = 0n, S = /* @__PURE__ */ new Map();
-	for (let e = 0; e < o.length; e += 1) {
-		let t = f(o[e].erc20TokenAddress);
-		if (s(o[e].erc20TokenAddress, r)) x += c[e];
-		else {
-			let n = S.get(t) ?? 0n;
-			S.set(t, n + c[e]);
-		}
-	}
-	await D(m, _, g, S), await C(m, _, g, Array.from(S.entries()).map(([e, t]) => ({
-		tokenAddress: e,
-		requiredAmount: t
-	})));
-	let w = l.map((e) => ({
-		extraRandomization: e.extraRandomization.toString(),
-		stealthAddress: e.stealthAddress.toString(),
-		H0: e.H0.toString(),
-		H1: e.H1.toString()
-	}));
-	if (await b(i, g, "prooflessDeposit", t[i].contractData.hinkalABI, [
-		v,
-		c.map(String),
-		y.map(String),
-		l.map((e) => [
-			e.extraRandomization.toString(),
-			e.stealthAddress.toString(),
-			e.H0.toString(),
-			e.H1.toString()
-		])
-	], _, x > 0n ? x : void 0), x > 0n) {
-		let e = BigInt(await m.trx.getBalance(_)), r = BigInt(n);
-		try {
-			let { hinkalABI: e } = t[i].contractData;
-			if (!e) throw Error("Hinkal ABI not found");
-			r = await d(m, i, g, _, u(e, "prooflessDeposit", [
-				v,
-				c.map(String),
-				y.map(String),
-				l.map((e) => [
-					e.extraRandomization.toString(),
-					e.stealthAddress.toString(),
-					e.H0.toString(),
-					e.H1.toString()
-				])
-			]), x);
-		} catch (e) {
-			p.error("Error estimating Tron prooflessDeposit fee", e);
-		}
-		if (e < x + r) throw Error(a.INSUFFICIENT_TRON_BALANCE_FOR_FEE);
-	}
-	let { transaction: T } = await m.transactionBuilder.triggerSmartContract(g, "prooflessDeposit(address[],uint256[],uint256[],(uint256,uint256,uint256,uint256)[])", {
-		feeLimit: n,
-		callValue: x > 0n ? Number(x) : 0
-	}, [
-		{
-			type: "address[]",
-			value: v
-		},
-		{
-			type: "uint256[]",
-			value: c.map(String)
-		},
-		{
-			type: "uint256[]",
-			value: y.map(String)
-		},
-		{
-			type: "tuple(uint256,uint256,uint256,uint256)[]",
-			value: w.map((e) => [
-				e.extraRandomization,
-				e.stealthAddress,
-				e.H0,
-				e.H1
-			])
-		}
-	], _), E = await m.trx.sign(T), O = await m.trx.sendRawTransaction(E);
-	if (!O.result) throw p.error("Tron prooflessDeposit broadcast failed", O), Error("Tron prooflessDeposit broadcast failed");
-	let k = typeof O == "string" ? O : O?.txid ?? O?.transaction?.txID;
-	if (!k) throw Error("Tron prooflessDeposit failed (missing txid)");
-	return k;
-}, A = async (t, n, a, u, d) => {
-	let f = h(n), p = e(f), m = await t.getEthereumAddressByChain(f), v = t.userKeys.getShieldedPrivateKey(), y = u ?? n.map(() => g(c.findCorrectRandomization(o(31), v), v));
-	if (y.length !== n.length) throw Error("Stealth address structures length must be equal to erc20 tokens length");
-	O(y);
-	let b;
-	if (p) b = await k(t, f, n, a, y);
-	else {
-		let e = t.getContractWithSigner(f, i.HinkalContract), o = t.getProviderAdapter(f), c = T(n, a), u = n.reduce((e, t, n) => s(t.erc20TokenAddress, r) ? e + a[n] : e, 0n), d = c.filter(({ token: e, balance: t }) => !s(e.erc20TokenAddress, r) && t > 0n), p;
-		if (d.length > 0 && await o.supportsBatchCall?.(f) && o.sendBatchCallsTransaction) {
-			let t = x(d.map(({ token: e }) => e.erc20TokenAddress), d.map(({ balance: e }) => e), l(e), e, n.map(({ erc20TokenAddress: e }) => e), a, n.map(() => 0n), y, u);
-			p = await o.sendBatchCallsTransaction(f, t);
-		} else {
-			await E(t, f, l(e), c);
-			let r = await t.getEthereumAddressByChain(f), i = c.map(({ token: e, balance: t }) => ({
-				tokenAddress: e.erc20TokenAddress,
-				requiredAmount: t
-			}));
-			await S(t, f, r, l(e), i), p = await e.prooflessDeposit(n.map(({ erc20TokenAddress: e }) => e), a, n.map(() => 0n), y, { value: u > 0n ? u : void 0 });
-		}
-		b = p.hash;
-	}
-	return w(_(d, f, n.map(({ erc20TokenAddress: e }) => e), a, m)), b;
-};
-//#endregion
-export { A as hinkalProoflessDeposit };

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

@@ -1 +0,0 @@
-require(`../../constants/protocol.constants.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../AccountActions/AccountActions.cjs`),i=require(`../../functions/pre-transaction/getFeeStructure.cjs`),a=require(`../../constants/addresses.constants.cjs`),o=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),s=require(`../../functions/private-wallet/emporium.swap.helpers.cjs`);var c=async(c,l,u,d,f,p,m,h,g,_=!1,v,y)=>{if(!h)throw Error(`Fee token is required in hinkalProxySwap`);let b=n.validateAndGetChainId(l),x=r.AccountActions.getAddressFromSubAccount(b,m);if(!x)throw Error(`Public account address is not available`);let S=l.map(e=>e.erc20TokenAddress),C=await c.getRandomRelay(b,!0);if(!C)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let w=await s.createSwapToEmporiumOps(c,b,d,a.SWAP_ROUTER_ADDRESSES[d][b],f,S[0],u[0],u[1],S[1],p,x,C,!0),T=g??await i.getFeeStructure(b,h,S,e.ExternalActionId.Emporium,w.map(e=>o.convertEmporiumOpToCallInfo(e,x,b)),35n),E=l.map((e,t)=>({token:e,amount:u[t]}));return c.actionPrivateWallet(b,[],[],[],w,E,m,h,T,C,_,v,y,void 0)};exports.hinkalProxySwap=c;

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

@@ -1,7 +0,0 @@
-import { ERC20Token } from '../../types/token.types';
-import { ExternalActionId } from '../../types/external-action.types';
-import { FeeStructure } from '../../types/hinkal.types';
-import { IHinkal } from './IHinkal';
-import { SubAccount } from '../../types/proxy.types';
-import { AdminTransactionType } from '../../types/admin.types';
-export declare const hinkalProxySwap: (hinkal: IHinkal, erc20Tokens: ERC20Token[], deltaAmounts: bigint[], externalActionId: ExternalActionId, data: string, isTheSameChainSwap: boolean, subAccount: SubAccount, feeToken?: string, feeStructureOverride?: FeeStructure, autoDepositBack?: boolean, maxGasInDollar?: string, action?: AdminTransactionType) => Promise<string>;

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

@@ -1,24 +0,0 @@
-import "../../constants/protocol.constants.mjs";
-import { ExternalActionId as e } from "../../types/external-action.types.mjs";
-import { transactionErrorCodes as t } from "../../error-handling/error-codes.constants.mjs";
-import { validateAndGetChainId as n } from "../../functions/utils/token-check.utils.mjs";
-import { AccountActions as r } from "../AccountActions/AccountActions.mjs";
-import { getFeeStructure as i } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { SWAP_ROUTER_ADDRESSES as a } from "../../constants/addresses.constants.mjs";
-import { convertEmporiumOpToCallInfo as o } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { createSwapToEmporiumOps as s } from "../../functions/private-wallet/emporium.swap.helpers.mjs";
-//#region libs/shared/common/src/data-structures/Hinkal/hinkalProxySwap.ts
-var c = async (c, l, u, d, f, p, m, h, g, _ = !1, v, y) => {
-	if (!h) throw Error("Fee token is required in hinkalProxySwap");
-	let b = n(l), x = r.getAddressFromSubAccount(b, m);
-	if (!x) throw Error("Public account address is not available");
-	let S = l.map((e) => e.erc20TokenAddress), C = await c.getRandomRelay(b, !0);
-	if (!C) throw Error(t.RELAYER_NOT_AVAILABLE);
-	let w = await s(c, b, d, a[d][b], f, S[0], u[0], u[1], S[1], p, x, C, !0), T = g ?? await i(b, h, S, e.Emporium, w.map((e) => o(e, x, b)), 35n), E = l.map((e, t) => ({
-		token: e,
-		amount: u[t]
-	}));
-	return c.actionPrivateWallet(b, [], [], [], w, E, m, h, T, C, _, v, y, void 0);
-};
-//#endregion
-export { c as hinkalProxySwap };

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

@@ -1 +0,0 @@
-const e=require(`../../types/external-action.types.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../functions/utils/addresses.cjs`),r=require(`../../functions/utils/token-check.utils.cjs`),i=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),a=require(`../AccountActions/AccountActions.cjs`),o=require(`../../functions/pre-transaction/getFeeStructure.cjs`),s=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),c=require(`../../functions/private-wallet/emporium.helpers.cjs`);var l=async(l,u,d,f,p,m,h,g)=>{if(!h)throw Error(`hinkalProxyToPrivate: subAccount should be provided`);if(!p)throw Error(`Fee token is required in hinkalProxyToPrivate`);if(!n.isValidPrivateAddress(f))throw Error(t.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let _=r.validateAndGetChainId(u),v=a.AccountActions.getAddressFromSubAccount(_,h);if(!v)throw Error(`Public account address is not available`);let y=u.map(e=>e.erc20TokenAddress),b=await i.modifyVolatileTokenAmountChanges(_,u,d,v),x=c.createTransaferEmporiumOpsBatch(l,_,y,b),S=m??await o.getFeeStructure(_,p,y,e.ExternalActionId.Emporium,x.map(e=>s.convertEmporiumOpToCallInfo(e,v,_))),C=u.map((e,t)=>({token:e,amount:-1n*b[t]}));return l.actionPrivateWallet(_,[u[0]],[0n],[!1],x,C,h,p,S,void 0,void 0,void 0,g,{recipientInfo:f,amount:b[0],token:u[0]})};exports.hinkalProxyToPrivate=l;

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

@@ -1,6 +0,0 @@
-import { ERC20Token } from '../../types/token.types';
-import { FeeStructure } from '../../types/hinkal.types';
-import { AdminTransactionType } from '../../types/admin.types';
-import { IHinkal } from './IHinkal';
-import { SubAccount } from '../../types/proxy.types';
-export declare const hinkalProxyToPrivate: (hinkal: IHinkal, erc20Tokens: ERC20Token[], deltaAmountsBase: bigint[], recipientInfo: string, feeToken?: string, feeStructureOverride?: FeeStructure, subAccount?: SubAccount, action?: AdminTransactionType) => Promise<string>;

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

@@ -1,28 +0,0 @@
-import { ExternalActionId as e } from "../../types/external-action.types.mjs";
-import { transactionErrorCodes as t } from "../../error-handling/error-codes.constants.mjs";
-import { isValidPrivateAddress as n } from "../../functions/utils/addresses.mjs";
-import { validateAndGetChainId as r } from "../../functions/utils/token-check.utils.mjs";
-import { modifyVolatileTokenAmountChanges as i } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
-import { AccountActions as a } from "../AccountActions/AccountActions.mjs";
-import { getFeeStructure as o } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { convertEmporiumOpToCallInfo as s } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { createTransaferEmporiumOpsBatch as c } from "../../functions/private-wallet/emporium.helpers.mjs";
-//#region libs/shared/common/src/data-structures/Hinkal/hinkalProxyToPrivate.ts
-var l = async (l, u, d, f, p, m, h, g) => {
-	if (!h) throw Error("hinkalProxyToPrivate: subAccount should be provided");
-	if (!p) throw Error("Fee token is required in hinkalProxyToPrivate");
-	if (!n(f)) throw Error(t.RECIPIENT_FORMAT_INCORRECT);
-	let _ = r(u), v = a.getAddressFromSubAccount(_, h);
-	if (!v) throw Error("Public account address is not available");
-	let y = u.map((e) => e.erc20TokenAddress), b = await i(_, u, d, v), x = c(l, _, y, b), S = m ?? await o(_, p, y, e.Emporium, x.map((e) => s(e, v, _))), C = u.map((e, t) => ({
-		token: e,
-		amount: -1n * b[t]
-	}));
-	return l.actionPrivateWallet(_, [u[0]], [0n], [!1], x, C, h, p, S, void 0, void 0, void 0, g, {
-		recipientInfo: f,
-		amount: b[0],
-		token: u[0]
-	});
-};
-//#endregion
-export { l as hinkalProxyToPrivate };

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

@@ -1 +0,0 @@
-const e=require(`../AccountActions/AccountActions.cjs`);require(`../AccountActions/index.cjs`);var t=async(t,n,r,i)=>{let a,o=e.AccountActions.getPrivateKeyFromSubAccount(t,i);if(!o)throw Error(`Private key is not available`);if(r)a=await e.AccountActions.signTypedDataFromPrivateKey(t,o,r.domain,r.types,r.value);else{if(!n)throw Error(`dataHash must be provided if typedData is not provided`);a=await e.AccountActions.signMessageFromPrivateKey(t,o,n)}return a};exports.hinkalSignSubAccount=t;

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

@@ -1,4 +0,0 @@
-import { SubAccount } from '../../types/proxy.types';
-import { TypedData } from '../../types/circom-data.types';
-export declare const hinkalSignSubAccount: (chainId: number, messageToSign: string | undefined, // it should be a hex number in string format
-typedData: TypedData | undefined, subAccount: SubAccount) => Promise<string>;

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

@@ -1,15 +0,0 @@
-import { AccountActions as e } from "../AccountActions/AccountActions.mjs";
-import "../AccountActions/index.mjs";
-//#region libs/shared/common/src/data-structures/Hinkal/hinkalSignSubAccount.ts
-var t = async (t, n, r, i) => {
-	let a, o = e.getPrivateKeyFromSubAccount(t, i);
-	if (!o) throw Error("Private key is not available");
-	if (r) a = await e.signTypedDataFromPrivateKey(t, o, r.domain, r.types, r.value);
-	else {
-		if (!n) throw Error("dataHash must be provided if typedData is not provided");
-		a = await e.signMessageFromPrivateKey(t, o, n);
-	}
-	return a;
-};
-//#endregion
-export { t as hinkalSignSubAccount };

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

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

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

@@ -1,5 +0,0 @@
-import { AdminTransactionType, 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>;

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

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

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

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

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

@@ -1,7 +0,0 @@
-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>;

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

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

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

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

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

@@ -1,6 +0,0 @@
-import { FeeStructure } from '../../types/hinkal.types';
-import { IHinkal } from './IHinkal';
-import { AdminTransactionType } from '../../types';
-import { ERC20Token } from '../../types/token.types';
-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>;