@gurge/sdk 0.3.150 → 0.3.151

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

@@ -1,123 +1,58 @@
-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 { caseInsensitiveEqual as i } from "../../functions/utils/caseInsensitive.utils.mjs";
-import { ContractType as a } from "../../types/ethereum-network.types.mjs";
-import { Logger as o } from "../../error-handling/logger.mjs";
-import { assertTronSufficientBalance as s, createTronCallData as c, evmHexToTronBase58Address as l, splitTronTokensByNative as u } from "../../functions/utils/tron.utils.mjs";
-import { validateAndGetChainId as d } from "../../functions/utils/token-check.utils.mjs";
-import { constructAdminData as f } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { getStealthAddressStructureFromUserKeys as p } from "../../functions/utils/getRecipientInfoFromUserKeys.mjs";
-import { getContractAddress as m } from "../../functions/utils/getContractAddress.mjs";
-import { simulateTronTransaction as h } from "../../functions/utils/tronSimulation.utils.mjs";
-import { buildApproveAndProoflessDepositCalls as g } from "../../functions/web3/functionCalls/constructBatchCall.mjs";
-import { waitForErc20Approvals as _, waitForTronErc20Approvals as v } from "../../functions/web3/functionCalls/waitForErc20Approvals.mjs";
-import { emitTxPublicData as y } from "../../API/admin-calls.mjs";
-import { aggregateAmountsForApproval as b, approveTokens as x, approveTronTokens as S, assertNoDuplicateStealthAddressStructures as C } from "./hinkalProoflessDeposit.utils.mjs";
-import { hinkalEvmProoflessDepositViaWrapper as w, hinkalTronProoflessDepositViaWrapper as T } from "./hinkalProoflessDepositViaWrapper.mjs";
+import { isTronLike as e } from "../../constants/chains.constants.mjs";
+import { zeroAddress as t } from "../../constants/protocol.constants.mjs";
+import { zeroProoflessFeeStructure as n } from "../../types/hinkal.types.mjs";
+import { caseInsensitiveEqual as r } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { ContractType as i } from "../../types/ethereum-network.types.mjs";
+import { validateAndGetChainId as a } from "../../functions/utils/token-check.utils.mjs";
+import { constructAdminData as o } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getContractAddress as s } from "../../functions/utils/getContractAddress.mjs";
+import { buildApproveAndProoflessDepositCalls as c } from "../../functions/web3/functionCalls/constructBatchCall.mjs";
+import { waitForErc20Approvals as l } from "../../functions/web3/functionCalls/waitForErc20Approvals.mjs";
+import { emitTxPublicData as u } from "../../API/admin-calls.mjs";
+import { getStealthAddressStructureFromUserKeys as d } from "../../functions/utils/getRecipientInfoFromUserKeys.mjs";
+import { aggregateAmountsForApproval as f, approveTokens as p, assertNoDuplicateStealthAddressStructures as m, buildProoflessEncryptedOutputs as h, getOwnRecipientEncryptionKeys as g } from "./hinkalProoflessDeposit.utils.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalProoflessDeposit.ts
-var E = async (e, r, i, a, d, f = !1) => {
-	let p = e.getTronWeb(), { hinkalAddress: m } = t[r].contractData, g = l(m), _ = await e.getEthereumAddressByChain(r), y = i.map((e) => e.erc20TokenAddress), b = i.map(() => 0n), { totalTrxValue: x, tokensNeedingApproval: C } = u(i, a), w = d.map((e) => ({
-		extraRandomization: e.extraRandomization.toString(),
-		stealthAddress: e.stealthAddress.toString(),
-		H0: e.H0.toString(),
-		H1: e.H1.toString()
-	}));
-	if (x > 0n) {
-		let { hinkalABI: e } = t[r].contractData;
-		if (!e) throw Error("Hinkal ABI not found");
-		await s(p, r, g, _, c(e, "prooflessDeposit", [
-			y,
-			a.map(String),
-			b.map(String),
-			d.map((e) => [
-				e.extraRandomization.toString(),
-				e.stealthAddress.toString(),
-				e.H0.toString(),
-				e.H1.toString()
-			])
-		]), x);
-	}
-	let { transaction: T } = await p.transactionBuilder.triggerSmartContract(g, "prooflessDeposit(address[],uint256[],uint256[],(uint256,uint256,uint256,uint256)[])", {
-		feeLimit: n,
-		callValue: x > 0n ? Number(x) : 0
-	}, [
-		{
-			type: "address[]",
-			value: y
-		},
-		{
-			type: "uint256[]",
-			value: a.map(String)
-		},
-		{
-			type: "uint256[]",
-			value: b.map(String)
-		},
-		{
-			type: "tuple(uint256,uint256,uint256,uint256)[]",
-			value: w.map((e) => [
-				e.extraRandomization,
-				e.stealthAddress,
-				e.H0,
-				e.H1
-			])
-		}
-	], _);
-	if (f) return T;
-	await S(p, _, g, C), await v(p, _, g, Array.from(C.entries()).map(([e, t]) => ({
-		tokenAddress: e,
-		requiredAmount: t
-	}))), await h(r, g, "prooflessDeposit", t[r].contractData.hinkalABI, [
+var _ = async (_, v, y, b, x, S = !1, C = n, w = "", T, E = !1) => {
+	let D = a(v);
+	if (e(D)) throw Error("Proofless deposit is not supported on Tron");
+	let O = await _.getEthereumAddressByChain(D), k = b ?? v.map(() => d(_.userKeys));
+	if (k.length !== v.length) throw Error("Stealth address structures length must be equal to erc20 tokens length");
+	if (m(k), b && !x) throw Error("recipientEncryptionKeysOverride is required whenever stealthAddressStructuresOverride is provided");
+	if (x && x.length !== v.length) throw Error("recipientEncryptionKeysOverride length must be equal to erc20 tokens length");
+	let A = h(k, x ?? g(_.userKeys, v.length)), j = C.feeAmount > 0n, M = j ? _.getContractWithSigner(D, i.HinkalWrapperContract) : _.getContractWithSigner(D, i.HinkalContract), N = j ? [
+		v.map(({ erc20TokenAddress: e }) => e),
+		y,
+		k,
+		A,
+		S,
+		C,
+		w
+	] : [
+		v.map(({ erc20TokenAddress: e }) => e),
 		y,
-		a.map(String),
-		b.map(String),
-		d.map((e) => [
-			e.extraRandomization.toString(),
-			e.stealthAddress.toString(),
-			e.H0.toString(),
-			e.H1.toString()
-		])
-	], _, x > 0n ? x : void 0);
-	let E = await p.trx.sign(T), D = await p.trx.sendRawTransaction(E);
-	if (!D.result) throw o.error("Tron prooflessDeposit broadcast failed", D), Error("Tron prooflessDeposit broadcast failed");
-	let O = typeof D == "string" ? D : D?.txid ?? D?.transaction?.txID;
-	if (!O) throw Error("Tron prooflessDeposit failed (missing txid)");
-	return O;
-}, D = async (t, n, o, s, c, l = !1) => {
-	let u = d(n), h = e(u), v = await t.getEthereumAddressByChain(u), S = s ?? n.map(() => p(t.userKeys));
-	if (S.length !== n.length) throw Error("Stealth address structures length must be equal to erc20 tokens length");
-	C(S);
-	let w;
-	if (h) {
-		let e = await E(t, u, n, o, S, l);
-		if (l) return e;
-		w = e;
+		k,
+		A,
+		S,
+		w
+	], P = r(C.feeToken, t), F = v.reduce((e, n, i) => r(n.erc20TokenAddress, t) ? e + y[i] : e, 0n) + (P ? C.feeAmount : 0n);
+	if (E) return M.prooflessDeposit.populateTransaction(...N, { value: F > 0n ? F : void 0 });
+	let I = _.getProviderAdapter(D), L = f(!P && C.feeAmount > 0n ? [...v, {
+		erc20TokenAddress: C.feeToken,
+		chainId: D
+	}] : v, !P && C.feeAmount > 0n ? [...y, C.feeAmount] : y), R = L.filter(({ token: e, balance: n }) => !r(e.erc20TokenAddress, t) && n > 0n), z;
+	if (R.length > 0 && await I.supportsBatchCall?.(D) && I.sendBatchCallsTransaction) {
+		let e = c(R.map(({ token: e }) => e.erc20TokenAddress), R.map(({ balance: e }) => e), s(M), M, v.map(({ erc20TokenAddress: e }) => e), y, k, A, S, j ? C : void 0, w, F);
+		z = await I.sendBatchCallsTransaction(D, e);
 	} else {
-		let e = t.getContractWithSigner(u, a.HinkalContract), s = [
-			n.map(({ erc20TokenAddress: e }) => e),
-			o,
-			n.map(() => 0n),
-			S
-		];
-		if (l) return e.prooflessDeposit.populateTransaction(...s);
-		let c = t.getProviderAdapter(u), d = b(n, o), f = n.reduce((e, t, n) => i(t.erc20TokenAddress, r) ? e + o[n] : e, 0n), p = d.filter(({ token: e, balance: t }) => !i(e.erc20TokenAddress, r) && t > 0n), h;
-		if (p.length > 0 && await c.supportsBatchCall?.(u) && c.sendBatchCallsTransaction) {
-			let t = g(p.map(({ token: e }) => e.erc20TokenAddress), p.map(({ balance: e }) => e), m(e), e, ...s, f);
-			h = await c.sendBatchCallsTransaction(u, t);
-		} else {
-			await x(t, u, m(e), d);
-			let n = await t.getEthereumAddressByChain(u), r = d.map(({ token: e, balance: t }) => ({
-				tokenAddress: e.erc20TokenAddress,
-				requiredAmount: t
-			}));
-			await _(t, u, n, m(e), r), h = await e.prooflessDeposit(...s, { value: f > 0n ? f : void 0 });
-		}
-		w = h.hash;
+		await p(_, D, s(M), L);
+		let e = await _.getEthereumAddressByChain(D), t = L.map(({ token: e, balance: t }) => ({
+			tokenAddress: e.erc20TokenAddress,
+			requiredAmount: t
+		}));
+		await l(_, D, e, s(M), t), z = await M.prooflessDeposit(...N, { value: F > 0n ? F : void 0 });
 	}
-	return y(f(c, u, n.map(({ erc20TokenAddress: e }) => e), o, v)), w;
-}, O = async (n, r, i, a, o, s, c) => {
-	let l = a.map(() => i), u = i.erc20TokenAddress;
-	return e(r) ? T(n, r, u, s, l, a, o, c) : t[r]?.contractData?.hinkalWrapperAddress ? w(n, r, u, s, l, a, o, c) : await D(n, l, a, o, c, !0);
+	let B = z.hash;
+	return u(o(T, D, v.map(({ erc20TokenAddress: e }) => e), y, O)), B;
 };
 //#endregion
-export { D as hinkalProoflessDeposit, O as hinkalProoflessDepositWithPublicFee };
+export { _ as hinkalProoflessDeposit };

package/common/src/data-structures/Hinkal/hinkalProoflessDeposit.utils.cjs

@@ -1 +1 @@
-const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../functions/utils/caseInsensitive.utils.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../../externalABIs/index.cjs`),i=require(`../../functions/utils/token-check.utils.cjs`),a=require(`../../functions/utils/tx-confirmation.utils.cjs`);var o=(e,t)=>{let n=[],r=0;for(let a=0;a<e.length;a+=1){let o=!1;for(let s=0;s<r;s+=1)if(i.isSameERC20Token(n[s].token,e[a])){n[s].balance+=t[a],o=!0;break}o||(n[r]={token:e[a],balance:t[a]},r+=1)}return n},s=async(r,i,o,s)=>{for(let c=0;c<s.length;c+=1)t.caseInsensitiveEqual(s[c].token.erc20TokenAddress,e.zeroAddress)||await a.waitForEthereumTransactionConfirmation(i,(await r.getContractWithSigner(i,n.ContractType.ERC20Contract,s[c].token.erc20TokenAddress).approve(o,s[c].balance)).hash)},c=async(t,n,i,a)=>{let o=Array.from(a.entries());for(let a=0;a<o.length;a+=1){let[s,c]=o[a],l=await t.contract(r.ERC20ABI,s).allowance(n,i).call({from:n});if(BigInt(String(l))<c){let{transaction:r}=await t.transactionBuilder.triggerSmartContract(s,`approve(address,uint256)`,{feeLimit:e.TRON_DEFAULT_FEE_LIMIT_SUN},[{type:`address`,value:i},{type:`uint256`,value:c.toString()}],n),a=await t.trx.sign(r),o=await t.trx.sendRawTransaction(a);if(!o.result){let e=o.code??`UNKNOWN`,t=o.message?Buffer.from(o.message,`hex`).toString():`no message`;throw Error(`Tron token approval failed: ${e} - ${t}`)}}}},l=e=>{let t=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)})};exports.aggregateAmountsForApproval=o,exports.approveTokens=s,exports.approveTronTokens=c,exports.assertNoDuplicateStealthAddressStructures=l;
+const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../functions/utils/caseInsensitive.utils.cjs`),n=require(`../crypto-keys/keys.cjs`),r=require(`../../types/ethereum-network.types.cjs`),i=require(`../../functions/utils/token-check.utils.cjs`),a=require(`../crypto-keys/encryptDecryptUtxo.cjs`);require(`../../externalABIs/index.cjs`);const o=require(`../../functions/utils/tx-confirmation.utils.cjs`);var s=(e,t)=>{if(e.length!==t.length)throw Error(`stealthAddressStructures and recipientEncryptionKeys must have equal length`);return e.map((e,n)=>{let r=t[n];if(!r)throw Error(`Missing encryptionKey for proofless deposit output ${n}: required so the enclave can attribute this UTXO to its owner`);return`0x${Buffer.from(a.encryptEncryptionKeyAndStealthAddress(r,e.stealthAddress)).toString(`hex`)}`})},c=(e,t)=>{let r=n.UserKeys.getEncryptionKeyPair(e.getShieldedPrivateKey()).publicKey;return Array.from({length:t},()=>r)},l=(e,t)=>{let n=[],r=0;for(let a=0;a<e.length;a+=1){let o=!1;for(let s=0;s<r;s+=1)if(i.isSameERC20Token(n[s].token,e[a])){n[s].balance+=t[a],o=!0;break}o||(n[r]={token:e[a],balance:t[a]},r+=1)}return n},u=async(n,i,a,s)=>{for(let c=0;c<s.length;c+=1)t.caseInsensitiveEqual(s[c].token.erc20TokenAddress,e.zeroAddress)||await o.waitForEthereumTransactionConfirmation(i,(await n.getContractWithSigner(i,r.ContractType.ERC20Contract,s[c].token.erc20TokenAddress).approve(a,s[c].balance)).hash)},d=e=>{let t=new Set;e.forEach(({H0x: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)})};exports.aggregateAmountsForApproval=l,exports.approveTokens=u,exports.assertNoDuplicateStealthAddressStructures=d,exports.buildProoflessEncryptedOutputs=s,exports.getOwnRecipientEncryptionKeys=c;

package/common/src/data-structures/Hinkal/hinkalProoflessDeposit.utils.d.ts

@@ -1,6 +1,9 @@
 import { ERC20Token, TokenBalance } from '../../types/token.types';
 import { StealthAddressStructure } from '../../types/circom-data.types';
+import { UserKeys } from '../crypto-keys/keys';
 import { IHinkal } from './IHinkal';
+export declare const buildProoflessEncryptedOutputs: (stealthAddressStructures: StealthAddressStructure[], recipientEncryptionKeys: string[]) => string[];
+export declare const getOwnRecipientEncryptionKeys: (userKeys: UserKeys, count: number) => string[];
 export declare const aggregateAmountsForApproval: (erc20Tokens: ERC20Token[], amounts: bigint[]) => TokenBalance[];
 export declare const approveTokens: (hinkal: IHinkal, chainId: number, spenderAddress: string, tokensWithBalances: TokenBalance[]) => Promise<void>;
 export declare const approveTronTokens: (tronWeb: any, ethereumAddress: string, spenderAddress: string, tokensNeedingApproval: Map<string, bigint>) => Promise<void>;

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

@@ -1,51 +1,45 @@
-import { TRON_DEFAULT_FEE_LIMIT_SUN as e, zeroAddress as t } from "../../constants/protocol.constants.mjs";
-import { caseInsensitiveEqual as n } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { zeroAddress as e } from "../../constants/protocol.constants.mjs";
+import { caseInsensitiveEqual as t } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { UserKeys as n } from "../crypto-keys/keys.mjs";
 import { ContractType as r } from "../../types/ethereum-network.types.mjs";
-import { ERC20ABI as i } from "../../externalABIs/index.mjs";
-import { isSameERC20Token as a } from "../../functions/utils/token-check.utils.mjs";
+import { isSameERC20Token as i } from "../../functions/utils/token-check.utils.mjs";
+import { encryptEncryptionKeyAndStealthAddress as a } from "../crypto-keys/encryptDecryptUtxo.mjs";
+import "../../externalABIs/index.mjs";
 import { waitForEthereumTransactionConfirmation as o } from "../../functions/utils/tx-confirmation.utils.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalProoflessDeposit.utils.ts
 var s = (e, t) => {
+	if (e.length !== t.length) throw Error("stealthAddressStructures and recipientEncryptionKeys must have equal length");
+	return e.map((e, n) => {
+		let r = t[n];
+		if (!r) throw Error(`Missing encryptionKey for proofless deposit output ${n}: required so the enclave can attribute this UTXO to its owner`);
+		return `0x${Buffer.from(a(r, e.stealthAddress)).toString("hex")}`;
+	});
+}, c = (e, t) => {
+	let r = n.getEncryptionKeyPair(e.getShieldedPrivateKey()).publicKey;
+	return Array.from({ length: t }, () => r);
+}, l = (e, t) => {
 	let n = [], r = 0;
-	for (let i = 0; i < e.length; i += 1) {
+	for (let a = 0; a < e.length; a += 1) {
 		let o = !1;
-		for (let s = 0; s < r; s += 1) if (a(n[s].token, e[i])) {
-			n[s].balance += t[i], o = !0;
+		for (let s = 0; s < r; s += 1) if (i(n[s].token, e[a])) {
+			n[s].balance += t[a], o = !0;
 			break;
 		}
 		o || (n[r] = {
-			token: e[i],
-			balance: t[i]
+			token: e[a],
+			balance: t[a]
 		}, r += 1);
 	}
 	return n;
-}, c = async (e, i, a, s) => {
-	for (let c = 0; c < s.length; c += 1) n(s[c].token.erc20TokenAddress, t) || await o(i, (await e.getContractWithSigner(i, r.ERC20Contract, s[c].token.erc20TokenAddress).approve(a, s[c].balance)).hash);
-}, l = async (t, n, r, a) => {
-	let o = Array.from(a.entries());
-	for (let a = 0; a < o.length; a += 1) {
-		let [s, c] = o[a], l = await t.contract(i, s).allowance(n, r).call({ from: n });
-		if (BigInt(String(l)) < c) {
-			let { transaction: i } = await t.transactionBuilder.triggerSmartContract(s, "approve(address,uint256)", { feeLimit: e }, [{
-				type: "address",
-				value: r
-			}, {
-				type: "uint256",
-				value: c.toString()
-			}], n), a = await t.trx.sign(i), o = await t.trx.sendRawTransaction(a);
-			if (!o.result) {
-				let e = o.code ?? "UNKNOWN", t = o.message ? Buffer.from(o.message, "hex").toString() : "no message";
-				throw Error(`Tron token approval failed: ${e} - ${t}`);
-			}
-		}
-	}
-}, u = (e) => {
+}, u = async (n, i, a, s) => {
+	for (let c = 0; c < s.length; c += 1) t(s[c].token.erc20TokenAddress, e) || await o(i, (await n.getContractWithSigner(i, r.ERC20Contract, s[c].token.erc20TokenAddress).approve(a, s[c].balance)).hash);
+}, d = (e) => {
 	let t = /* @__PURE__ */ new Set();
-	e.forEach(({ extraRandomization: e, stealthAddress: n }) => {
+	e.forEach(({ H0x: 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);
 	});
 };
 //#endregion
-export { s as aggregateAmountsForApproval, c as approveTokens, l as approveTronTokens, u as assertNoDuplicateStealthAddressStructures };
+export { l as aggregateAmountsForApproval, u as approveTokens, d as assertNoDuplicateStealthAddressStructures, s as buildProoflessEncryptedOutputs, c as getOwnRecipientEncryptionKeys };

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

@@ -0,0 +1 @@
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../functions/utils/token-check.utils.cjs`),n=require(`../../functions/private-wallet/emporium.helpers.cjs`),r=require(`./hinkalSolanaProxySend.cjs`);var i=async(i,a,o,s,c,l,u,d)=>{let f=t.validateAndGetChainId(a);if(e.isSolanaLike(f))return r.hinkalSolanaProxySend(i,a[0],o[0],s,c,d);let p=n.createTransaferEmporiumOpsBatch(i,f,a.map(e=>e.erc20TokenAddress),o,c),m=a.map((e,t)=>({token:e,amount:-1n*o[t]}));return await i.actionPrivateWallet(f,[],[],[],p,m,s,l,u,void 0,void 0,void 0,d,void 0)};exports.hinkalProxySend=i;

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

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

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

@@ -0,0 +1,16 @@
+import { isSolanaLike as e } from "../../constants/chains.constants.mjs";
+import { validateAndGetChainId as t } from "../../functions/utils/token-check.utils.mjs";
+import { createTransaferEmporiumOpsBatch as n } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { hinkalSolanaProxySend as r } from "./hinkalSolanaProxySend.mjs";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalProxySend.ts
+var i = async (i, a, o, s, c, l, u, d) => {
+	let f = t(a);
+	if (e(f)) return r(i, a[0], o[0], s, c, d);
+	let p = n(i, f, a.map((e) => e.erc20TokenAddress), o, c), m = a.map((e, t) => ({
+		token: e,
+		amount: -1n * o[t]
+	}));
+	return await i.actionPrivateWallet(f, [], [], [], p, m, s, l, u, void 0, void 0, void 0, d, void 0);
+};
+//#endregion
+export { i as hinkalProxySend };

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

@@ -1 +1 @@
-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;
+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/utils/fees.utils.cjs`),c=require(`../../functions/private-wallet/emporium.swap.helpers.cjs`);var l=async(l,u,d,f,p,m,h,g,_,v=!1,y,b,x,S)=>{if(!g)throw Error(`Fee token is required in hinkalProxySwap`);let C=n.validateAndGetChainId(u),w=r.AccountActions.getAddressFromSubAccount(C,h);if(!w)throw Error(`Public account address is not available`);let T=u.map(e=>e.erc20TokenAddress),E=await l.getRandomRelay(C,!0);if(!E)throw Error(e.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let D=await c.createSwapToEmporiumOps(l,C,f,a.SWAP_ROUTER_ADDRESSES[f][C],p,T[0],d[0],d[1],T[1],m,w,E,!0),O=_??await i.getFeeStructure(C,g,T,t.ExternalActionId.Emporium,D.map(e=>o.convertEmporiumOpToCallInfo(e,w,C)),35n),k=u.map((e,t)=>({token:e,amount:d[t]})),A=x&&S!==void 0?await s.calculateModifiedFeeStructure(C,x,S,O):O;return l.actionPrivateWallet(C,[],[],[],D,k,h,g,A,E,v,y,b,void 0)};exports.hinkalProxySwap=l;

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

@@ -4,4 +4,4 @@ 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>;
+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, bridgedToken?: ERC20Token, bridgedTokenAmount?: bigint) => Promise<string>;

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

@@ -6,19 +6,20 @@ 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";
+import { calculateModifiedFeeStructure as s } from "../../functions/utils/fees.utils.mjs";
+import { createSwapToEmporiumOps as c } 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) => ({
+var l = async (l, u, d, f, p, m, h, g, _, v = !1, y, b, x, S) => {
+	if (!g) throw Error("Fee token is required in hinkalProxySwap");
+	let C = n(u), w = r.getAddressFromSubAccount(C, h);
+	if (!w) throw Error("Public account address is not available");
+	let T = u.map((e) => e.erc20TokenAddress), E = await l.getRandomRelay(C, !0);
+	if (!E) throw Error(e.RELAYER_NOT_AVAILABLE);
+	let D = await c(l, C, f, a[f][C], p, T[0], d[0], d[1], T[1], m, w, E, !0), O = _ ?? await i(C, g, T, t.Emporium, D.map((e) => o(e, w, C)), 35n), k = u.map((e, t) => ({
 		token: e,
-		amount: u[t]
-	}));
-	return c.actionPrivateWallet(b, [], [], [], w, E, m, h, T, C, _, v, y, void 0);
+		amount: d[t]
+	})), A = x && S !== void 0 ? await s(C, x, S, O) : O;
+	return l.actionPrivateWallet(C, [], [], [], D, k, h, g, A, E, v, y, b, void 0);
 };
 //#endregion
-export { c as hinkalProxySwap };
+export { l as hinkalProxySwap };

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

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

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

@@ -1,28 +1,30 @@
+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 { isValidPrivateAddress as n } from "../../functions/utils/addresses.mjs";
+import { isValidPrivateAddress as t } from "../../functions/utils/addresses.mjs";
+import { ExternalActionId as n } from "../../types/external-action.types.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";
+import { createTransaferEmporiumOpsBatch as s } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { convertEmporiumOpToCallInfo as c } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { calculateModifiedFeeStructureForTokens as l } from "../../functions/utils/fees.utils.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) => ({
+var u = async (u, d, f, p, m, h, g, _) => {
+	if (!g) throw Error("hinkalProxyToPrivate: subAccount should be provided");
+	if (!m) throw Error("Fee token is required in hinkalProxyToPrivate");
+	if (!t(p)) throw Error(e.RECIPIENT_FORMAT_INCORRECT);
+	let v = r(d), y = a.getAddressFromSubAccount(v, g);
+	if (!y) throw Error("Public account address is not available");
+	let b = d.map((e) => e.erc20TokenAddress), x = await i(v, d, f, y), S = s(u, v, b, x), C = await l(v, d, x, h ?? await o(v, m, b, n.Emporium, S.map((e) => c(e, y, v)), 25n)), w = d.map((e, t) => ({
 		token: e,
-		amount: -1n * b[t]
+		amount: -1n * x[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]
+	return u.actionPrivateWallet(v, [d[0]], [0n], [!1], S, w, g, m, C, void 0, void 0, void 0, _, {
+		recipientInfo: p,
+		amount: x[0],
+		token: d[0]
 	});
 };
 //#endregion
-export { l as hinkalProxyToPrivate };
+export { u as hinkalProxyToPrivate };

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

@@ -1 +1 @@
-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;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../crypto-keys/keys.cjs`),i=require(`../utxo/Utxo.cjs`),a=require(`../../types/external-action.types.cjs`),o=require(`../../types/solana-transact.types.cjs`);require(`../../types/index.cjs`);const s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/pre-transaction/getFeeStructure.cjs`),l=require(`./hinkalSolanaTransact.cjs`);var u=async(u,d,f,p,m)=>{let h=s.validateAndGetChainId([d]),g=d.erc20TokenAddress;if(f.getTokenAddress(h)!==g)throw Error(`Off-chain UTXO token mismatch`);let _=new r.UserKeys(p),v=_.getShieldedPrivateKey();if(f.nullifyingKey&&BigInt(f.nullifyingKey)!==BigInt(v))throw Error(`Claimable UTXO key mismatch`);let{originalDeployer:y}=e.networkRegistry[h].contractData;if(!y)throw Error(`missing data`);let b=i.Utxo.createFrom(f,{nullifyingKey:v}),x=m??await c.getFeeStructure(h,g,[g],a.ExternalActionId.Transact,void 0,void 0,{mintTo:g,nullifierCount:1,rootInsertCount:2});if(x.feeToken!==g)throw Error(`Claim fee token mismatch: fee must be paid from claimed UTXO token`);let S=x.variableRate>0n?x.variableRate:t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;if(b.amount<=x.flatFee)throw Error(n.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let C=b.amount-x.flatFee,w=C*S/10000n,T=C-w;if(T<=0n)throw Error(n.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);let E=x.flatFee+w,D=u.getRecipientInfo(),[O,k,A,,,j]=D.split(`,`);if(!k||!A||!O||!j)throw Error(`Invalid recipient info`);let M=new i.Utxo({amount:0n,erc20TokenAddress:b.erc20TokenAddress,mintAddress:b.mintAddress,nullifyingKey:_.getShieldedPrivateKey(),spendingPublicKey:_.getSpendingKeyPair().pubSpendingBJJPoint}),N=await u.getRandomRelay(h,!0);if(!N)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let P={recipient:N,mint:g===`11111111111111111111111111111111`?void 0:g};return l.hinkalSolanaTransact(u,{chainId:h,mintAddresses:[g],amountChanges:[-(T+E)],relayAddress:N,recipient:t.solanaNativeAddress,signer:N,functionName:`transfer`,accounts:P,relayerFee:E,recipientAddress:D,recipientAmounts:[T],inputUtxos:[[b,M]],userKeys:_,submit:{mode:o.SolanaSubmitMode.Relayer}})};exports.hinkalSolanaClaimUtxo=u;

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

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

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

@@ -1,91 +1,62 @@
 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 { UserKeys as i } from "../crypto-keys/keys.mjs";
+import { Utxo as a } from "../utxo/Utxo.mjs";
+import { ExternalActionId as o } from "../../types/external-action.types.mjs";
+import { SolanaSubmitMode as s } from "../../types/solana-transact.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";
+import { validateAndGetChainId as c } from "../../functions/utils/token-check.utils.mjs";
+import { getFeeStructure as l } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { hinkalSolanaTransact as u } from "./hinkalSolanaTransact.mjs";
 //#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
+var d = async (d, f, p, m, h) => {
+	let g = c([f]), _ = f.erc20TokenAddress;
+	if (p.getTokenAddress(g) !== _) throw Error("Off-chain UTXO token mismatch");
+	let v = new i(m), y = v.getShieldedPrivateKey();
+	if (p.nullifyingKey && BigInt(p.nullifyingKey) !== BigInt(y)) throw Error("Claimable UTXO key mismatch");
+	let { originalDeployer: b } = e[g].contractData;
+	if (!b) throw Error("missing data");
+	let x = a.createFrom(p, { nullifyingKey: y }), S = h ?? await l(g, _, [_], o.Transact, void 0, void 0, {
+		mintTo: _,
+		nullifierCount: 1,
+		rootInsertCount: 2
 	});
-	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({
+	if (S.feeToken !== _) throw Error("Claim fee token mismatch: fee must be paid from claimed UTXO token");
+	let C = S.variableRate > 0n ? S.variableRate : t;
+	if (x.amount <= S.flatFee) throw Error(r.INSUFFICIENT_FUNDS_TO_TRANSACT);
+	let w = x.amount - S.flatFee, T = w * C / 10000n, E = w - T;
+	if (E <= 0n) throw Error(r.RECIPIENT_AMOUNT_INVALID);
+	let D = S.flatFee + T, O = d.getRecipientInfo(), [k, A, j, , , M] = O.split(",");
+	if (!A || !j || !k || !M) throw Error("Invalid recipient info");
+	let N = new a({
 		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
+		erc20TokenAddress: x.erc20TokenAddress,
+		mintAddress: x.mintAddress,
+		nullifyingKey: v.getShieldedPrivateKey(),
+		spendingPublicKey: v.getSpendingKeyPair().pubSpendingBJJPoint
+	}), P = await d.getRandomRelay(g, !0);
+	if (!P) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let F = {
+		recipient: P,
+		mint: _ === "11111111111111111111111111111111" ? void 0 : _
 	};
-	return p({
-		chainId: b,
-		relayAddress: H,
+	return u(d, {
+		chainId: g,
+		mintAddresses: [_],
+		amountChanges: [-(E + D)],
+		relayAddress: P,
+		recipient: n,
+		signer: P,
 		functionName: "transfer",
-		args: {
-			proofAArr: K,
-			proofBArr: q,
-			proofCArr: J,
-			publicInputsArr: Y,
-			encryptedOutputs: G,
-			relayerFee: j.toString(),
-			dimensions: W
-		},
-		accounts: Z,
-		commitmentValidationData: X
+		accounts: F,
+		relayerFee: D,
+		recipientAddress: O,
+		recipientAmounts: [E],
+		inputUtxos: [[x, N]],
+		userKeys: v,
+		submit: { mode: s.Relayer }
 	});
 };
 //#endregion
-export { h as hinkalSolanaClaimUtxo };
+export { d as hinkalSolanaClaimUtxo };