@gurge/sdk 0.3.13 → 0.3.14

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

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

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

@@ -1,128 +0,0 @@
-import { networkRegistry as e } from "../../constants/chains.constants.mjs";
-import { TRON_DEFAULT_FEE_LIMIT_SUN as t, zeroAddress as n } from "../../constants/protocol.constants.mjs";
-import { ContractType as r } from "../../types/ethereum-network.types.mjs";
-import { caseInsensitiveEqual as i } from "../../functions/utils/caseInsensitive.utils.mjs";
-import { insufficientResourcesErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
-import { Logger as o } from "../../error-handling/logger.mjs";
-import { createTronCallData as s, estimateTronFeeSunWithPadding as c, evmHexToTronBase58Address as l } from "../../functions/utils/tron.utils.mjs";
-import { constructAdminData as u } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { simulateTronTransaction as d } from "../../functions/utils/tronSimulation.utils.mjs";
-import { buildApproveAndDepositWrapperCalls as f } from "../../functions/web3/functionCalls/constructBatchCall.mjs";
-import { waitForErc20Approvals as p, waitForTronErc20Approvals as m } from "../../functions/web3/functionCalls/waitForErc20Approvals.mjs";
-import { emitTxPublicData as h } from "../../API/admin-calls.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, r, a) => {
-	let o = i(e, n), s = r.reduce((e, t, r) => i(t.erc20TokenAddress, n) ? e + a[r] : e, 0n) + (o ? t : 0n), c = g(r, a), l = c.filter(({ token: e }) => !i(e.erc20TokenAddress, n)).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: r[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 (r, f, p, g, _, S, C, w) => {
-	x("hinkalTronProoflessDepositViaWrapper", _, S, C), y(C);
-	let { hinkalWrapperAddress: T, hinkalWrapperABI: E } = e[f]?.contractData ?? {};
-	if (!T || !E) throw Error(`No HinkalWrapper configured for chainId ${f}`);
-	let D = await r.getRandomRelay(f, !1);
-	if (!D) throw Error(`No relay available for chainId ${f}`);
-	let O = r.getTronWeb(), k = await r.getEthereumAddressByChain(f), A = l(T), j = i(p, n) ? p : l(p), { tokensForApproval: M, ethValue: N } = b(p, 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)), n = BigInt(t);
-		try {
-			n = await c(O, f, A, k, s(E, "prooflessDeposit", [
-				l(D),
-				j,
-				g.toString(),
-				P,
-				S.map(String),
-				F,
-				I
-			]), N);
-		} catch (e) {
-			o.error("Error estimating Tron wrapper deposit fee", e);
-		}
-		if (e < N + n) 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: t,
-		callValue: N > 0n ? Number(N) : 0
-	}, [
-		{
-			type: "address",
-			value: l(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 }) => [l(e.erc20TokenAddress), t]));
-	await v(O, k, A, R), R.size > 0 && await m(O, k, A, Array.from(R.entries()).map(([e, t]) => ({
-		tokenAddress: e,
-		requiredAmount: t
-	}))), await d(f, A, "prooflessDeposit", E, [
-		l(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 h(u(w, f, P, S, k)), V;
-}, C = async (t, n, i, a, o, s, c, l) => {
-	x("hinkalEvmProoflessDepositViaWrapper", o, s, c), y(c);
-	let d = e[n]?.contractData?.hinkalWrapperAddress;
-	if (!d) throw Error(`No HinkalWrapper configured for chainId ${n}`);
-	let m = await t.getRandomRelay(n, !1);
-	if (!m) throw Error(`No relay available for chainId ${n}`);
-	let g = o.map((e) => e.erc20TokenAddress), v = s.map(() => 0n), { tokensForApproval: S, ethValue: C } = b(i, a, o, s), w = await t.getEthereumAddressByChain(n), T = t.getProviderAdapter(n), E = t.getContractWithSigner(n, r.HinkalWrapper), D;
-	if (S.length > 0 && await T.supportsBatchCall?.(n) && T.sendBatchCallsTransaction) {
-		let e = f(S.map(({ token: e }) => e.erc20TokenAddress), S.map(({ balance: e }) => e), d, E.interface, m, i, a, g, s, v, c, C);
-		D = await T.sendBatchCallsTransaction(n, e);
-	} else await _(t, n, d, S), await p(t, n, w, d, S.map(({ token: e, balance: t }) => ({
-		tokenAddress: e.erc20TokenAddress,
-		requiredAmount: t
-	}))), D = await E.prooflessDeposit(m, i, a, g, s, v, c, { value: C > 0n ? C : void 0 });
-	return h(u(l, n, g, s, w)), D.hash;
-};
-//#endregion
-export { C as hinkalEvmProoflessDepositViaWrapper, S as hinkalTronProoflessDepositViaWrapper };

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

@@ -1 +0,0 @@
-require(`../../constants/protocol.constants.cjs`);const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../../types/external-action.types.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(e.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,t.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.mjs

@@ -1,24 +0,0 @@
-import "../../constants/protocol.constants.mjs";
-import { transactionErrorCodes as e } from "../../error-handling/error-codes.constants.mjs";
-import { ExternalActionId as t } from "../../types/external-action.types.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(e.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, t.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(`../../error-handling/error-codes.constants.cjs`),t=require(`../../types/external-action.types.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(e.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,t.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.mjs

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

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

@@ -1,91 +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 { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
-import { randomBigInt as i } from "../../functions/web3/etherFunctions.mjs";
-import { UserKeys as a } from "../crypto-keys/keys.mjs";
-import { getCurrentTimeInSeconds as o } from "../../functions/utils/time.utils.mjs";
-import { Utxo as s } from "../utxo/Utxo.mjs";
-import { ExternalActionId as c } from "../../types/external-action.types.mjs";
-import "../../types/index.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 { constructSolanaZkProof as f } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { solanaTransactCallRelayer as p } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ethers as m } from "ethers";
-//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaClaimUtxo.ts
-var h = async (h, g, _, v, y) => {
-	let b = l([g]), x = g.erc20TokenAddress;
-	if (_.getTokenAddress(b) !== x) throw Error("Off-chain UTXO token mismatch");
-	let S = y ? new a(y) : new a(_.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 } = e[b].contractData;
-	if (!w) throw Error("missing data");
-	let T = s.createFrom(_, { nullifyingKey: C }), E = v ?? await d(b, x, [x], c.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 : t;
-	if (T.amount <= E.flatFee) throw Error(r.INSUFFICIENT_FUNDS_TO_TRANSACT);
-	let O = T.amount - E.flatFee, k = O * D / 10000n, A = O - k;
-	if (A <= 0n) throw Error(r.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().toString(), L = new s({
-		amount: 0n,
-		erc20TokenAddress: T.erc20TokenAddress,
-		mintAddress: T.mintAddress,
-		nullifyingKey: S.getShieldedPrivateKey(),
-		...T.isNewStyle ? {
-			spendingPublicKey: S.getSpendingKeyPair().pubSpendingBJJPoint,
-			isNewStyle: !0
-		} : { isNewStyle: !1 }
-	}), R = new s({
-		amount: 0n,
-		erc20TokenAddress: T.erc20TokenAddress,
-		mintAddress: T.mintAddress,
-		nullifyingKey: S.getShieldedPrivateKey(),
-		timeStamp: I,
-		spendingPublicKey: S.getSpendingKeyPair().pubSpendingBJJPoint,
-		isNewStyle: !0
-	}), z = new s({
-		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.RELAYER_NOT_AVAILABLE);
-	let U = a.findCorrectRandomization(i(31), S.getShieldedPrivateKey()), W = {
-		tokenNumber: 1,
-		nullifierAmount: B.length,
-		outputAmount: V.length
-	}, G = u([V])[0].map((e) => Array.from(m.getBytes(e))), { proofAArr: K, proofBArr: q, proofCArr: J, publicInputsArr: Y, commitmentValidationData: X } = await f(h.generateProofRemotely, h.merkleTreeHinkalByChain[b], S, [x], [B], [V], U, j, 0n, n, H, W, G, b), Z = {
-		recipient: H,
-		mint: x === "11111111111111111111111111111111" ? void 0 : x
-	};
-	return p({
-		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
-	});
-};
-//#endregion
-export { h 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`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/solanaMint.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/snarkjs/common.snarkjs.cjs`),l=require(`../../functions/pre-transaction/solana.cjs`),u=require(`../../functions/pre-transaction/constructAdminData.cjs`),d=require(`../../error-handling/retrySolanaError.cjs`),f=require(`../../API/admin-calls.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=s.validateAndGetChainId([r]),o=r.erc20TokenAddress,{hinkalIdl:c,hinkalAddress:u,originalDeployer:d}=e.networkRegistry[i].contractData;if(!c)throw Error(`No IDL configured for Solana program on this network`);if(!d)throw Error(`missing original deployer`);let f=n.getSolanaProgram(c),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(u),{mintPublicKey:y}=a.formatMintAddress(o),b=y.toString()===t.solanaNativeAddress;return{chainId:i,mintAddress:o,program:f,publicKey:p,connection:m,wallet:g,originalDeployer:_,mintPublicKey:y,mint:b?null:y,atasValue:b?null:void 0,storageAccount:l.getStorageAccountPublicKey(v,_),storageVault:l.getStorageVaultPublicKey(v,_),merkleAccount:l.getMerkleAccountPublicKey(v,_)}},v=(e,t,n)=>{let r=n.map(e=>l.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(d.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,a=!1)=>{b(n,r);let o=_(e,t),s=u.constructAdminData(i,o.chainId,Array(n.length).fill(o.mintAddress),n,await e.getEthereumAddress()),c=await v(o,n,r);if(a){let{blockhash:e}=await o.connection.getLatestBlockhash(),t=new h.Transaction().add(c);return t.recentBlockhash=e,t.feePayer=o.publicKey,Buffer.from(t.serialize({requireAllSignatures:!1})).toString(`base64`)}let l=await y(o.connection,o.wallet,o.publicKey,[c]);return await f.emitTxPublicData(s),l},S=async(e,t,n,r,i,a)=>{b(n,r);let o=_(e,t),s=await e.getRandomRelay(o.chainId,!1);if(!s)throw Error(`No relay available for chainId ${o.chainId}`);let{instructions:c}=await p.buildSolanaTransferInstructions(o.connection,o.publicKey,new h.PublicKey(s),t,i),l=await v(o,n,r),d=u.constructAdminData(a,o.chainId,Array(n.length).fill(o.mintAddress),n,await e.getEthereumAddress()),m=await y(o.connection,o.wallet,o.publicKey,[...c,l]);return await f.emitTxPublicData(d),m},C=async(e,t,n,a=!1)=>{let o=e.userKeys.getShieldedPrivateKey(),s=c.calcStealthAddressStructure(i.UserKeys.findCorrectRandomization(r.randomBigInt(31),o),o,e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint);return x(e,n,[t],[s],void 0,a)},w=async(e,t,r,i,a=!1,s)=>{if(!o.isValidPrivateAddress(i))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let c=o.constructStealthAddressStructure(i);return x(e,r,[t],[c],s,a)};exports.hinkalSolanaDeposit=C,exports.hinkalSolanaDepositForOther=w,exports.hinkalSolanaProoflessDepositWithPublicFee=S,exports.submitSolanaProoflessDeposit=x;

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

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

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

@@ -1,24 +0,0 @@
-import { FeeStructure } from '../../types/hinkal.types';
-import { IHinkal } from './IHinkal';
-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, displayRecipients?: string[]) => Promise<string>;
-export declare const hinkalSolanaDepositAndWithdraw: (hinkal: IHinkal, token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, // Should be passed fee for only one withdraw transaction, multiplication happening in this function
-ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, displayRecipients?: string[]) => Promise<string>;

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

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

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

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