@hinkal/common 0.2.31 → 0.2.32

package/data-structures/Hinkal/hinkalSolanaProxySwap.mjs

@@ -1,67 +1,83 @@
 import { ExternalActionId as e } from "../../types/external-action.types.mjs";
 import { networkRegistry as t } from "../../constants/chains.constants.mjs";
-import { AdminTransactionType as n } from "../../types/admin.types.mjs";
-import "../../types/index.mjs";
-import { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
+import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
 import "../../constants/index.mjs";
-import { emitTxPublicData as i } from "../../API/admin-calls.mjs";
-import { validateAndGetChainId as a } from "../../functions/utils/token-check.utils.mjs";
-import { createCustomSolanaConnection as o } from "../../functions/utils/create-provider.mjs";
-import { constructAdminData as s } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { AccountActions as c } from "../AccountActions/AccountActions.mjs";
-import { sendProxyV0Transaction as l, serializeProxyV0Transaction as u } from "../../functions/pre-transaction/sendV0Transaction.mjs";
-import { getFeeStructure as d } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { emitTxPublicData as r } from "../../API/admin-calls.mjs";
+import { validateAndGetChainId as i } from "../../functions/utils/token-check.utils.mjs";
+import { createCustomSolanaConnection as a } from "../../functions/utils/create-provider.mjs";
+import { constructAdminData as o } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { AccountActions as s } from "../AccountActions/AccountActions.mjs";
+import { sendProxyV0Transaction as c, serializeProxyV0Transaction as l } from "../../functions/pre-transaction/sendV0Transaction.mjs";
+import { getFeeStructure as u } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { buildSolanaTransferInstructions as d } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
 import "../AccountActions/index.mjs";
-import { buildSolanaTransferInstructions as f } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
-import { PublicKey as p, TransactionInstruction as m } from "@solana/web3.js";
+import { PublicKey as f, TransactionInstruction as p, TransactionMessage as m, VersionedTransaction as h } from "@solana/web3.js";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaProxySwap.ts
-var h = async (e, n, r) => {
-	let i = c.getAddressFromSubAccount(e, r);
-	if (!i) throw Error("Public account address is not available");
-	let { fetchRpcUrl: a } = t[e];
-	if (!a) throw Error("RPC URL not found for the specified chain ID");
-	let s = o(a), { addressLookupTableAccount: l, instructionLists: u } = JSON.parse(n).data, d = await Promise.all(l.map(async (e) => {
-		let t = await s.getAddressLookupTable(new p(e));
-		if (!t.value) throw Error(`Failed to fetch lookup table: ${e}`);
-		return t.value;
+var g = async (e, t) => {
+	let { addressLookupTableAccount: n, instructionLists: r } = JSON.parse(t).data, i = await Promise.all(n.map(async (t) => {
+		let n = await e.getAddressLookupTable(new f(t));
+		if (!n.value) throw Error(`Failed to fetch lookup table: ${t}`);
+		return n.value;
 	}));
-	if (u.length === 0) throw Error("No instructions found");
-	let f = u.map((e) => new m({
-		keys: e.accounts.map((e) => ({
-			pubkey: new p(e.pubkey),
-			isSigner: e.isSigner,
-			isWritable: e.isWritable
+	if (r.length === 0) throw Error("No instructions found");
+	return {
+		instructions: r.map((e) => new p({
+			keys: e.accounts.map((e) => ({
+				pubkey: new f(e.pubkey),
+				isSigner: e.isSigner,
+				isWritable: e.isWritable
+			})),
+			programId: new f(e.programId),
+			data: Buffer.from(e.data, "base64")
 		})),
-		programId: new p(e.programId),
-		data: Buffer.from(e.data, "base64")
-	}));
+		lookupTableAccounts: i
+	};
+}, _ = async (e, t) => {
+	let n = h.deserialize(Buffer.from(t, "base64")), r = await Promise.all(n.message.addressTableLookups.map(async ({ accountKey: t }) => {
+		let n = await e.getAddressLookupTable(t);
+		if (!n.value) throw Error(`Failed to fetch lookup table: ${t.toBase58()}`);
+		return n.value;
+	})), { instructions: i } = m.decompile(n.message, { addressLookupTableAccounts: r });
+	return {
+		instructions: i,
+		lookupTableAccounts: r
+	};
+}, v = async (n, r, i, o) => {
+	let c = s.getAddressFromSubAccount(n, i);
+	if (!c) throw Error("Public account address is not available");
+	let { fetchRpcUrl: l } = t[n];
+	if (!l) throw Error("RPC URL not found for the specified chain ID");
+	let u = a(l), d = new f(c), { instructions: p, lookupTableAccounts: m } = o === e.Lifi ? await _(u, r) : await g(u, r);
 	return {
-		connection: s,
-		walletAddress: i,
-		walletPublicKey: new p(i),
-		lookupTableAccounts: d,
-		instructions: f,
-		instructionLists: u
+		connection: u,
+		walletPublicKey: d,
+		instructions: p,
+		lookupTableAccounts: m
 	};
-}, g = async (t, o, c, u, m, g, _) => {
-	let v = a(o), y = o[1], b = c[1] * (_ ?? await d(v, g, o.map((e) => e.erc20TokenAddress), e.Emporium)).variableRate / 10000n, [{ connection: x, walletPublicKey: S, instructions: C, lookupTableAccounts: w }, T, E] = await Promise.all([
-		h(v, u, m),
-		t.getRandomRelay(v),
-		t.getEthereumAddressByChain(v)
-	]);
-	if (!T) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let { instructions: D } = await f(x, S, new p(T), y, b), O = await l({
+}, y = async (t, a, s, l, p, m, h, g, _) => {
+	let y = i(a), b = m === e.Lifi, [{ connection: x, walletPublicKey: S, instructions: C, lookupTableAccounts: w }, T, E] = await Promise.all([
+		v(y, l, p, m),
+		b ? Promise.resolve(null) : t.getRandomRelay(y),
+		t.getEthereumAddressByChain(y)
+	]), D = C;
+	if (!b) {
+		if (!T) throw Error(n.RELAYER_NOT_AVAILABLE);
+		let t = a[1], r = s[1] * (g ?? await u(y, h, a.map((e) => e.erc20TokenAddress), e.Emporium)).variableRate / 10000n, { instructions: i } = await d(x, S, new f(T), t, r);
+		D = [...C, ...i];
+	}
+	let O = await c({
 		connection: x,
-		chainId: v,
-		subAccount: m,
+		chainId: y,
+		subAccount: p,
 		payerPublicKey: S,
-		instructions: [...C, ...D],
+		instructions: D,
 		lookupTableAccounts: w
 	});
-	return i(s(n.PublicSwap, v, o.map((e) => e.erc20TokenAddress), c, E, o)), O;
-}, _ = async (e, t, n) => {
-	let { connection: r, walletPublicKey: i, instructions: a, lookupTableAccounts: o } = await h(e, t, n);
-	return u(r, i, a, o);
+	return r(o(_, y, a.map((e) => e.erc20TokenAddress), s, E, a)), O;
+}, b = async (t, n, r, i) => {
+	if (i === e.Lifi) return n;
+	let { connection: a, walletPublicKey: o, instructions: s, lookupTableAccounts: c } = await v(t, n, r, i);
+	return l(a, o, s, c);
 };
 //#endregion
-export { _ as getSolanaProxySwapSerializedTransaction, g as hinkalSolanaProxySwap };
+export { b as getSolanaProxySwapSerializedTransaction, y as hinkalSolanaProxySwap };

package/data-structures/Hinkal/hinkalSolanaSwap.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../types/admin.types.cjs`),i=require(`../../types/cache.types.cjs`);require(`../../types/index.cjs`);const a=require(`../../error-handling/error-codes.constants.cjs`),o=require(`../../functions/web3/etherFunctions.cjs`),s=require(`../../functions/utils/time.utils.cjs`),c=require(`../utxo/Utxo.cjs`),l=require(`../../functions/pre-transaction/solana.cjs`),u=require(`../../functions/utils/token-check.utils.cjs`),d=require(`../../functions/web3/events/getShieldedBalance.cjs`),f=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),ee=require(`../../functions/snarkjs/common.snarkjs.cjs`),te=require(`../../functions/pre-transaction/constructAdminData.cjs`),ne=require(`../../functions/pre-transaction/convert-okx-instructions.cjs`),re=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`),m=require(`../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs`),h=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),g=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let _=require(`ethers`),v=require(`@solana/web3.js`);var y=async(e,t,n,r)=>{let i=[...await d.addPaddingToUtxos(e,t,n,r,6)],a=s.getCurrentTimeInSeconds().toString(),o=[];for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=f.outputUtxoProcessing(e.userKeys,i[t],r[t],a,void 0,!1);o.push([n[0]])}return{inputUtxosArray:i,outputUtxosArray:o}},b=async(s,d,f,b,x,ie,ae,oe)=>{let S=u.validateAndGetChainId(d),C=new v.PublicKey(n.solanaNativeAddress),{hinkalAddress:se,originalDeployer:w,hinkalIdl:T}=t.networkRegistry[S].contractData;if(!w||!T)throw Error(`No IDL configured for Solana program on this network`);let E=new v.PublicKey(w),D=new v.PublicKey(se),O=d.map(e=>e.erc20TokenAddress),{userKeys:k,merkleTreeAccessTokenByChain:A,merkleTreeHinkalByChain:j}=s,M=s.getSolanaProgram(T),N=oe??await p.getFeeStructure(S,ae,O,e.ExternalActionId.Transact),P=f[1],F=Number(s.cacheDevice.get(i.StorageKeys.SLIPPAGE_PERCENTAGE)??0),I=d[1],L=o.getAmountInToken(I,P),R=Number(L)*F/100;f[1]-=o.getAmountInWei(I,R.toFixed(I.decimals));let z=P*BigInt(N.variableRate??0)/10000n+N.flatFee;if(f[1]-=z,f[1]<0)throw Error(a.transactionErrorCodes.LOW_OUTPUT_AMOUNT);let B=N.variableRate.toString(),[{patchAccessTokenMerkleTree:V,kycRequired:H,hasAccessToken:U},W,G,{inputUtxosArray:K,outputUtxosArray:q}]=await Promise.all([m.shouldPatchAccessTokenMerkleTree(s,S,O,f),s.getRandomRelay(S,!0),s.getEthereumAddressByChain(S),y(s,S,O,f)]);if(!W)throw Error(a.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let ce=s.userKeys.getShieldedPrivateKey(),le=c.Utxo.findCorrectRandomization(o.randomBigInt(31),ce),J={tokenNumber:2,nullifierAmount:K[0].length,outputAmount:1},Y=ee.calcEncryptedOutputs(q).map(e=>[..._.ethers.getBytes(e[0])]),X=l.getSwapperAccountPublicKeyFromSalt(D,E,b),{remainingAccounts:Z,hinkalInstructions:Q}=ne.convertOKXToHinkalInstructions(x,X);re.ensureAmountChanges(K,q,f);let{proofAArr:ue,proofBArr:de,proofCArr:fe,publicInputsArr:pe}=await h.constructSolanaZkProof(s.generateProofRemotely,w,j[S],A[S],k,M,O,K,q,le,N.flatFee,N.variableRate,C.toString(),W,J,Y,S,V,b,Q,Z),$=l.getStorageAccountPublicKey(D,E),me=l.getStorageVaultPublicKey(D,E),he=d[0].erc20TokenAddress===`11111111111111111111111111111111`?null:new v.PublicKey(d[0].erc20TokenAddress),ge=d[1].erc20TokenAddress===`11111111111111111111111111111111`?null:new v.PublicKey(d[1].erc20TokenAddress),_e={recipient:C.toString(),storageAccount:$.toString(),storageVault:me.toString(),swapperAccount:X.toString(),mintFrom:he?.toString()??null,mintTo:ge?.toString()??null,remainingAccounts:Z.map(e=>({pubkey:e.pubkey.toString(),isSigner:e.isSigner,isWritable:e.isWritable})),addressLookupTableAccount:ie},ve={encryptedOutputs:Y,proofAArr:ue,proofBArr:de,proofCArr:fe,publicInputsArr:pe,relayerFee:N.flatFee.toString(),variableRate:B,dimensions:J,hinkalInstructions:Q.map(e=>({accountIndexes:[...e.accountIndexes],data:[...e.data],programIndex:e.programIndex}))},ye=te.constructAdminData(r.AdminTransactionType.PrivateSwap,S,O,f,G,d);return g.solanaTransactCallRelayer({chainId:S,relayAddress:W,functionName:`swap`,args:ve,accounts:_e,solanaAccessTokenData:!U&&H?{ethereumAddress:G,accessKey:k.getAccessKey()}:void 0,adminData:ye})};exports.hinkalSolanaSwap=b;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../types/cache.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../functions/web3/etherFunctions.cjs`),o=require(`../crypto-keys/keys.cjs`),s=require(`../../functions/utils/time.utils.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),ee=require(`../../functions/snarkjs/common.snarkjs.cjs`),d=require(`../../functions/pre-transaction/solana.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../functions/pre-transaction/convert-okx-instructions.cjs`),m=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),h=require(`../../functions/pre-transaction/getFeeStructure.cjs`),g=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`),_=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let y=require(`ethers`),b=require(`@solana/web3.js`);var x=async(e,t,n,r)=>{let i=[...await l.addPaddingToUtxos(e,t,n,r,6)],a=s.getCurrentTimeInSeconds().toString(),o=[];for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=u.outputUtxoProcessing(e.userKeys,i[t],r[t],a);o.push([n[0]])}return{inputUtxosArray:i,outputUtxosArray:o}},S=async(s,l,u,S,C,w,te,T,E)=>{let D=c.validateAndGetChainId(l),O=new b.PublicKey(n.solanaNativeAddress),{hinkalAddress:ne,originalDeployer:k}=t.networkRegistry[D].contractData;if(!k)throw Error(`No IDL configured for Solana program on this network`);let A=new b.PublicKey(k),j=new b.PublicKey(ne),M=l.map(e=>e.erc20TokenAddress),{userKeys:N,merkleTreeHinkalByChain:P}=s,F=T??await h.getFeeStructure(D,te,M,e.ExternalActionId.Transact),I=u[1],L=Number(s.cacheDevice.get(r.StorageKeys.SLIPPAGE_PERCENTAGE)??0),R=l[1],z=a.getAmountInToken(R,I),B=Number(z)*L/100;u[1]-=a.getAmountInWei(R,B.toFixed(R.decimals));let V=I*BigInt(F.variableRate??0)/10000n+F.flatFee;if(u[1]-=V,u[1]<0)throw Error(i.transactionErrorCodes.LOW_OUTPUT_AMOUNT);let H=F.variableRate.toString(),[U,W,{inputUtxosArray:G,outputUtxosArray:K}]=await Promise.all([s.getRandomRelay(D,!0),s.getEthereumAddressByChain(D),x(s,D,M,u)]);if(!U)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let q=s.userKeys.getShieldedPrivateKey(),J=o.UserKeys.findCorrectRandomization(a.randomBigInt(31),q),Y={tokenNumber:2,nullifierAmount:G[0].length,outputAmount:1},X=ee.calcEncryptedOutputs(K).map(e=>[...y.ethers.getBytes(e[0])]),Z=d.getSwapperAccountPublicKeyFromSalt(j,A,S),{remainingAccounts:Q,hinkalInstructions:$}=p.convertOKXToHinkalInstructions(C,Z);m.ensureAmountChanges(G,K,u);let[{proofAArr:re,proofBArr:ie,proofCArr:ae,publicInputsArr:oe},se]=await Promise.all([_.constructSolanaZkProof(s.generateProofRemotely,P[D],N,M,G,K,J,F.flatFee,F.variableRate,O.toString(),U,Y,X,D,$,Q,S),g.buildCommitmentValidationData(D,N,M,G)]),ce=d.getStorageAccountPublicKey(j,A),le=d.getStorageVaultPublicKey(j,A),ue=l[0].erc20TokenAddress===`11111111111111111111111111111111`?null:new b.PublicKey(l[0].erc20TokenAddress),de=l[1].erc20TokenAddress===`11111111111111111111111111111111`?null:new b.PublicKey(l[1].erc20TokenAddress),fe={recipient:O.toString(),storageAccount:ce.toString(),storageVault:le.toString(),swapperAccount:Z.toString(),mintFrom:ue?.toString()??null,mintTo:de?.toString()??null,remainingAccounts:Q.map(e=>({pubkey:e.pubkey.toString(),isSigner:e.isSigner,isWritable:e.isWritable})),addressLookupTableAccount:w};return v.solanaTransactCallRelayer({chainId:D,relayAddress:U,functionName:`swap`,args:{encryptedOutputs:X,proofAArr:re,proofBArr:ie,proofCArr:ae,publicInputsArr:oe,relayerFee:F.flatFee.toString(),variableRate:H,dimensions:Y,hinkalInstructions:$.map(e=>({accountIndexes:[...e.accountIndexes],data:[...e.data],programIndex:e.programIndex}))},accounts:fe,commitmentValidationData:se,adminData:f.constructAdminData(E,D,M,u,W,l)})};exports.hinkalSolanaSwap=S;

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

@@ -1,4 +1,4 @@
-import { FeeStructure, OKXSwapResponseInstruction } from '../../types';
+import { AdminTransactionType, FeeStructure, OKXSwapResponseInstruction } from '../../types';
 import { IHinkal } from './IHinkal';
 import { ERC20Token } from '../../types/token.types';
-export declare const hinkalSolanaSwap: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], swapperAccountSalt: bigint, instructionLists: OKXSwapResponseInstruction[], addressLookupTableAccount: string[], feeToken?: string, feeStructureOverride?: FeeStructure) => Promise<string>;
+export declare const hinkalSolanaSwap: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], swapperAccountSalt: bigint, instructionLists: OKXSwapResponseInstruction[], addressLookupTableAccount: string[], feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<string>;

package/data-structures/Hinkal/hinkalSolanaSwap.mjs

@@ -1,98 +1,93 @@
 import { ExternalActionId as e } from "../../types/external-action.types.mjs";
 import { networkRegistry as t } from "../../constants/chains.constants.mjs";
 import { solanaNativeAddress as n } from "../../constants/protocol.constants.mjs";
-import { AdminTransactionType as r } from "../../types/admin.types.mjs";
-import { StorageKeys as i } from "../../types/cache.types.mjs";
+import { StorageKeys as r } from "../../types/cache.types.mjs";
 import "../../types/index.mjs";
-import { transactionErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
-import { getAmountInToken as o, getAmountInWei as ee, randomBigInt as te } from "../../functions/web3/etherFunctions.mjs";
-import { getCurrentTimeInSeconds as s } from "../../functions/utils/time.utils.mjs";
-import { Utxo as c } from "../utxo/Utxo.mjs";
-import { getStorageAccountPublicKey as l, getStorageVaultPublicKey as u, getSwapperAccountPublicKeyFromSalt as ne } from "../../functions/pre-transaction/solana.mjs";
-import { validateAndGetChainId as d } from "../../functions/utils/token-check.utils.mjs";
-import { addPaddingToUtxos as f } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as p } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { calcEncryptedOutputs as m } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { constructAdminData as h } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { convertOKXToHinkalInstructions as g } from "../../functions/pre-transaction/convert-okx-instructions.mjs";
-import { ensureAmountChanges as _ } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
-import { getFeeStructure as v } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { shouldPatchAccessTokenMerkleTree as y } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
-import { constructSolanaZkProof as b } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { solanaTransactCallRelayer as x } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ethers as re } from "ethers";
-import { PublicKey as S } from "@solana/web3.js";
+import { transactionErrorCodes as i } from "../../error-handling/error-codes.constants.mjs";
+import { getAmountInToken as a, getAmountInWei as o, randomBigInt as s } from "../../functions/web3/etherFunctions.mjs";
+import { UserKeys as c } from "../crypto-keys/keys.mjs";
+import { getCurrentTimeInSeconds as l } from "../../functions/utils/time.utils.mjs";
+import { validateAndGetChainId as u } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as d } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as f } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { calcEncryptedOutputs as p } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { getStorageAccountPublicKey as m, getStorageVaultPublicKey as h, getSwapperAccountPublicKeyFromSalt as g } from "../../functions/pre-transaction/solana.mjs";
+import { constructAdminData as _ } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { convertOKXToHinkalInstructions as v } from "../../functions/pre-transaction/convert-okx-instructions.mjs";
+import { ensureAmountChanges as y } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
+import { getFeeStructure as ee } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { buildCommitmentValidationData as b } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
+import { constructSolanaZkProof as x } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { solanaTransactCallRelayer as S } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ethers as C } from "ethers";
+import { PublicKey as w } from "@solana/web3.js";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaSwap.ts
-var ie = async (e, t, n, r) => {
-	let i = [...await f(e, t, n, r, 6)], a = s().toString(), o = [];
+var T = async (e, t, n, r) => {
+	let i = [...await d(e, t, n, r, 6)], a = l().toString(), o = [];
 	for (let t = 0; t < n.length; t += 1) {
-		let { outputUtxos: n } = p(e.userKeys, i[t], r[t], a, void 0, !1);
+		let { outputUtxos: n } = f(e.userKeys, i[t], r[t], a);
 		o.push([n[0]]);
 	}
 	return {
 		inputUtxosArray: i,
 		outputUtxosArray: o
 	};
-}, C = async (s, f, p, C, ae, oe, se, ce) => {
-	let w = d(f), T = new S(n), { hinkalAddress: E, originalDeployer: D, hinkalIdl: O } = t[w].contractData;
-	if (!D || !O) throw Error("No IDL configured for Solana program on this network");
-	let k = new S(D), A = new S(E), j = f.map((e) => e.erc20TokenAddress), { userKeys: M, merkleTreeAccessTokenByChain: N, merkleTreeHinkalByChain: P } = s, F = s.getSolanaProgram(O), I = ce ?? await v(w, se, j, e.Transact), L = p[1], R = Number(s.cacheDevice.get(i.SLIPPAGE_PERCENTAGE) ?? 0), z = f[1], B = o(z, L), V = Number(B) * R / 100;
-	p[1] -= ee(z, V.toFixed(z.decimals));
-	let H = L * BigInt(I.variableRate ?? 0) / 10000n + I.flatFee;
-	if (p[1] -= H, p[1] < 0) throw Error(a.LOW_OUTPUT_AMOUNT);
-	let U = I.variableRate.toString(), [{ patchAccessTokenMerkleTree: le, kycRequired: W, hasAccessToken: ue }, G, K, { inputUtxosArray: q, outputUtxosArray: J }] = await Promise.all([
-		y(s, w, j, p),
-		s.getRandomRelay(w, !0),
-		s.getEthereumAddressByChain(w),
-		ie(s, w, j, p)
+}, E = async (l, d, f, E, te, ne, re, ie, D) => {
+	let O = u(d), k = new w(n), { hinkalAddress: A, originalDeployer: j } = t[O].contractData;
+	if (!j) throw Error("No IDL configured for Solana program on this network");
+	let M = new w(j), N = new w(A), P = d.map((e) => e.erc20TokenAddress), { userKeys: F, merkleTreeHinkalByChain: I } = l, L = ie ?? await ee(O, re, P, e.Transact), R = f[1], z = Number(l.cacheDevice.get(r.SLIPPAGE_PERCENTAGE) ?? 0), B = d[1], V = a(B, R), H = Number(V) * z / 100;
+	f[1] -= o(B, H.toFixed(B.decimals));
+	let U = R * BigInt(L.variableRate ?? 0) / 10000n + L.flatFee;
+	if (f[1] -= U, f[1] < 0) throw Error(i.LOW_OUTPUT_AMOUNT);
+	let W = L.variableRate.toString(), [G, ae, { inputUtxosArray: K, outputUtxosArray: q }] = await Promise.all([
+		l.getRandomRelay(O, !0),
+		l.getEthereumAddressByChain(O),
+		T(l, O, P, f)
 	]);
-	if (!G) throw Error(a.RELAYER_NOT_AVAILABLE);
-	let de = s.userKeys.getShieldedPrivateKey(), fe = c.findCorrectRandomization(te(31), de), Y = {
+	if (!G) throw Error(i.RELAYER_NOT_AVAILABLE);
+	let J = l.userKeys.getShieldedPrivateKey(), oe = c.findCorrectRandomization(s(31), J), Y = {
 		tokenNumber: 2,
-		nullifierAmount: q[0].length,
+		nullifierAmount: K[0].length,
 		outputAmount: 1
-	}, X = m(J).map((e) => [...re.getBytes(e[0])]), Z = ne(A, k, C), { remainingAccounts: Q, hinkalInstructions: $ } = g(ae, Z);
-	_(q, J, p);
-	let { proofAArr: pe, proofBArr: me, proofCArr: he, publicInputsArr: ge } = await b(s.generateProofRemotely, D, P[w], N[w], M, F, j, q, J, fe, I.flatFee, I.variableRate, T.toString(), G, Y, X, w, le, C, $, Q), _e = l(A, k), ve = u(A, k), ye = f[0].erc20TokenAddress === "11111111111111111111111111111111" ? null : new S(f[0].erc20TokenAddress), be = f[1].erc20TokenAddress === "11111111111111111111111111111111" ? null : new S(f[1].erc20TokenAddress), xe = {
-		recipient: T.toString(),
-		storageAccount: _e.toString(),
-		storageVault: ve.toString(),
+	}, X = p(q).map((e) => [...C.getBytes(e[0])]), Z = g(N, M, E), { remainingAccounts: Q, hinkalInstructions: $ } = v(te, Z);
+	y(K, q, f);
+	let [{ proofAArr: se, proofBArr: ce, proofCArr: le, publicInputsArr: ue }, de] = await Promise.all([x(l.generateProofRemotely, I[O], F, P, K, q, oe, L.flatFee, L.variableRate, k.toString(), G, Y, X, O, $, Q, E), b(O, F, P, K)]), fe = m(N, M), pe = h(N, M), me = d[0].erc20TokenAddress === "11111111111111111111111111111111" ? null : new w(d[0].erc20TokenAddress), he = d[1].erc20TokenAddress === "11111111111111111111111111111111" ? null : new w(d[1].erc20TokenAddress), ge = {
+		recipient: k.toString(),
+		storageAccount: fe.toString(),
+		storageVault: pe.toString(),
 		swapperAccount: Z.toString(),
-		mintFrom: ye?.toString() ?? null,
-		mintTo: be?.toString() ?? null,
+		mintFrom: me?.toString() ?? null,
+		mintTo: he?.toString() ?? null,
 		remainingAccounts: Q.map((e) => ({
 			pubkey: e.pubkey.toString(),
 			isSigner: e.isSigner,
 			isWritable: e.isWritable
 		})),
-		addressLookupTableAccount: oe
-	}, Se = {
-		encryptedOutputs: X,
-		proofAArr: pe,
-		proofBArr: me,
-		proofCArr: he,
-		publicInputsArr: ge,
-		relayerFee: I.flatFee.toString(),
-		variableRate: U,
-		dimensions: Y,
-		hinkalInstructions: $.map((e) => ({
-			accountIndexes: [...e.accountIndexes],
-			data: [...e.data],
-			programIndex: e.programIndex
-		}))
-	}, Ce = h(r.PrivateSwap, w, j, p, K, f);
-	return x({
-		chainId: w,
+		addressLookupTableAccount: ne
+	};
+	return S({
+		chainId: O,
 		relayAddress: G,
 		functionName: "swap",
-		args: Se,
-		accounts: xe,
-		solanaAccessTokenData: !ue && W ? {
-			ethereumAddress: K,
-			accessKey: M.getAccessKey()
-		} : void 0,
-		adminData: Ce
+		args: {
+			encryptedOutputs: X,
+			proofAArr: se,
+			proofBArr: ce,
+			proofCArr: le,
+			publicInputsArr: ue,
+			relayerFee: L.flatFee.toString(),
+			variableRate: W,
+			dimensions: Y,
+			hinkalInstructions: $.map((e) => ({
+				accountIndexes: [...e.accountIndexes],
+				data: [...e.data],
+				programIndex: e.programIndex
+			}))
+		},
+		accounts: ge,
+		commitmentValidationData: de,
+		adminData: _(D, O, P, f, ae, d)
 	});
 };
 //#endregion
-export { C as hinkalSolanaSwap };
+export { E as hinkalSolanaSwap };

package/data-structures/Hinkal/hinkalSolanaTransfer.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`);require(`../../types/index.cjs`);const r=require(`../../functions/utils/addresses.cjs`),i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../functions/web3/etherFunctions.cjs`),o=require(`../../functions/utils/time.utils.cjs`),s=require(`../utxo/Utxo.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/snarkjs/common.snarkjs.cjs`),f=require(`../../functions/utils/fees.utils.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),m=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),h=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const g=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let v=require(`ethers`);var y=async(e,t,n,r,i,a)=>{let c=(await l.addPaddingToUtxos(e,t,n,r,6))[0],d=o.getCurrentTimeInSeconds().toString(),{outputUtxos:f}=u.outputUtxoProcessing(e.userKeys,c,r[0],d,void 0,!1),[p,m,h]=i.split(`,`);return{inputUtxos:c,senderOutputUtxos:f,recipientUtxo:new s.Utxo({amount:a,erc20TokenAddress:c[0].erc20TokenAddress,mintAddress:c[0].mintAddress,timeStamp:d,randomization:BigInt(p),stealthAddress:m,encryptionKey:h})}},b=async(o,l,u,_,b,x,S)=>{if(!r.isValidPrivateAddress(_))throw Error(i.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let C=c.validateAndGetChainId(l),w=[...u],{originalDeployer:T,hinkalIdl:E}=t.networkRegistry[C].contractData;if(!T||!E)throw Error(`missing data`);let{userKeys:D,merkleTreeAccessTokenByChain:O,merkleTreeHinkalByChain:k}=o,A=l.map(e=>e.erc20TokenAddress);if(A.length>1)throw Error(`Solana Transfer: Only one mint address is supported`);let j=x??await h.getFeeStructure(C,b,A,e.ExternalActionId.Transact,[],5n);j.variableRate||=n.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let M=f.calculateTotalFee(-w[0],j),N=-w[0];w[0]-=M;let[P,F,{inputUtxos:I,senderOutputUtxos:L,recipientUtxo:R}]=await Promise.all([o.getRandomRelay(C,!0),o.getEthereumAddressByChain(C),y(o,C,A,w,_,N)]);if(!P)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let z=L[0],B=s.Utxo.findCorrectRandomization(a.randomBigInt(31),o.userKeys.getShieldedPrivateKey()),V={tokenNumber:A.length,nullifierAmount:I.length,outputAmount:2},H=o.getSolanaProgram(E),U=d.calcEncryptedOutputs([[z,R]])[0].map(e=>Array.from(v.ethers.getBytes(e)));m.ensureAmountChanges([I],[L],w);let{proofAArr:W,proofBArr:G,proofCArr:K,publicInputsArr:q}=await g.constructSolanaZkProof(o.generateProofRemotely,T,k[C],O[C],D,H,[A[0]],[I],[[z,R]],B,M,0n,n.solanaNativeAddress,P,V,U,C),J={recipient:P,mint:A[0]===`11111111111111111111111111111111`?void 0:A[0]};return{chainId:C,relay:P,args:{proofAArr:W,proofBArr:G,proofCArr:K,publicInputsArr:q,encryptedOutputs:U,relayerFee:M.toString(),dimensions:V},accounts:J,adminData:p.constructAdminData(S,C,A,w,F),recipientUtxo:R}},x=async(e,t,n,r,i,a,o,s=!1)=>{if(s)throw Error(`onlyGasEstimate is not supported for Solana transfer`);let c=await b(e,t,n,r,i,a,o);return _.solanaTransactCallRelayer({chainId:c.chainId,relayAddress:c.relay,functionName:`transfer`,args:c.args,accounts:c.accounts,adminData:c.adminData})};exports.buildSolanaTransferPlan=b,exports.hinkalSolanaTransfer=x;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`);require(`../../types/index.cjs`);const r=require(`../../functions/utils/addresses.cjs`),i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../functions/web3/etherFunctions.cjs`),o=require(`../crypto-keys/keys.cjs`),s=require(`../../functions/utils/time.utils.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/snarkjs/common.snarkjs.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`),h=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const g=require(`../../functions/utils/fees.utils.cjs`),_=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let y=require(`ethers`);var b=async(e,t,n,r,i,a)=>{let o=(await l.addPaddingToUtxos(e,t,n,r,6))[0],c=s.getCurrentTimeInSeconds().toString(),{outputUtxos:d}=u.outputUtxoProcessing(e.userKeys,o,r[0],c,!0,i,a);return{inputUtxos:o,senderUtxo:d[0],recipientUtxo:d[1]}},x=async(s,l,u,v,x,S,C)=>{if(!r.isValidPrivateAddress(v))throw Error(i.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let w=c.validateAndGetChainId(l),T=[...u],{originalDeployer:E}=t.networkRegistry[w].contractData;if(!E)throw Error(`missing data`);let{userKeys:D,merkleTreeHinkalByChain:O}=s,k=l.map(e=>e.erc20TokenAddress);if(k.length>1)throw Error(`Solana Transfer: Only one mint address is supported`);let A=S??await m.getFeeStructure(w,x,k,e.ExternalActionId.Transact,[],5n);A.variableRate||=n.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let j=g.calculateTotalFee(-T[0],A),M=-T[0];T[0]-=j;let[N,P,{inputUtxos:F,senderUtxo:I,recipientUtxo:L}]=await Promise.all([s.getRandomRelay(w,!0),s.getEthereumAddressByChain(w),b(s,w,k,T,v,M)]);if(!N)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let R=o.UserKeys.findCorrectRandomization(a.randomBigInt(31),s.userKeys.getShieldedPrivateKey()),z={tokenNumber:k.length,nullifierAmount:F.length,outputAmount:2},B=d.calcEncryptedOutputs([[I,L]])[0].map(e=>Array.from(y.ethers.getBytes(e)));p.ensureAmountChanges([F],[[I]],T);let[{proofAArr:V,proofBArr:H,proofCArr:U,publicInputsArr:W},G]=await Promise.all([_.constructSolanaZkProof(s.generateProofRemotely,O[w],D,[k[0]],[F],[[I,L]],R,j,0n,n.solanaNativeAddress,N,z,B,w),h.buildCommitmentValidationData(w,D,k,[F])]),K={recipient:N,mint:k[0]===`11111111111111111111111111111111`?void 0:k[0]};return{chainId:w,relay:N,args:{proofAArr:V,proofBArr:H,proofCArr:U,publicInputsArr:W,encryptedOutputs:B,relayerFee:j.toString(),dimensions:z},accounts:K,adminData:f.constructAdminData(C,w,k,T,P),commitmentValidationData:G,recipientUtxo:L}},S=async(e,t,n,r,i,a,o,s=!1)=>{if(s)throw Error(`onlyGasEstimate is not supported for Solana transfer`);let c=await x(e,t,n,r,i,a,o);return v.solanaTransactCallRelayer({chainId:c.chainId,relayAddress:c.relay,functionName:`transfer`,args:c.args,accounts:c.accounts,adminData:c.adminData,commitmentValidationData:c.commitmentValidationData})};exports.buildSolanaTransferPlan=x,exports.hinkalSolanaTransfer=S;

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

@@ -1,10 +1,11 @@
-import { AdminTransactionType, ERC20Token, FeeStructure } from '../../types';
+import { AdminTransactionType, CommitmentValidationDataType, ERC20Token, FeeStructure } from '../../types';
 import { IHinkal } from './IHinkal';
 import { Utxo } from '../utxo/Utxo';
 import { constructAdminData } from '../../functions/pre-transaction';
 type SolanaTransferPlan = {
     chainId: number;
     relay: string;
+    commitmentValidationData?: CommitmentValidationDataType;
     args: {
         proofAArr: number[];
         proofBArr: number[];

package/data-structures/Hinkal/hinkalSolanaTransfer.mjs

@@ -5,89 +5,84 @@ import "../../types/index.mjs";
 import { isValidPrivateAddress as i } from "../../functions/utils/addresses.mjs";
 import { transactionErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
 import { randomBigInt as o } from "../../functions/web3/etherFunctions.mjs";
-import { getCurrentTimeInSeconds as s } from "../../functions/utils/time.utils.mjs";
-import { Utxo as c } from "../utxo/Utxo.mjs";
+import { UserKeys as s } from "../crypto-keys/keys.mjs";
+import { getCurrentTimeInSeconds as c } from "../../functions/utils/time.utils.mjs";
 import { validateAndGetChainId as l } from "../../functions/utils/token-check.utils.mjs";
 import { addPaddingToUtxos as u } from "../../functions/web3/events/getShieldedBalance.mjs";
 import { outputUtxoProcessing as d } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
 import { calcEncryptedOutputs as f } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { calculateTotalFee as p } from "../../functions/utils/fees.utils.mjs";
-import { constructAdminData as m } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { ensureAmountChanges as h } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
-import { getFeeStructure as g } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { constructAdminData as p } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { ensureAmountChanges as m } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
+import { getFeeStructure as h } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { buildCommitmentValidationData as g } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { constructSolanaZkProof as _ } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { solanaTransactCallRelayer as v } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ethers as y } from "ethers";
+import { calculateTotalFee as _ } from "../../functions/utils/fees.utils.mjs";
+import { constructSolanaZkProof as v } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { solanaTransactCallRelayer as y } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ethers as b } from "ethers";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaTransfer.ts
-var b = async (e, t, n, r, i, a) => {
-	let o = (await u(e, t, n, r, 6))[0], l = s().toString(), { outputUtxos: f } = d(e.userKeys, o, r[0], l, void 0, !1), [p, m, h] = i.split(",");
+var x = async (e, t, n, r, i, a) => {
+	let o = (await u(e, t, n, r, 6))[0], s = c().toString(), { outputUtxos: l } = d(e.userKeys, o, r[0], s, !0, i, a);
 	return {
 		inputUtxos: o,
-		senderOutputUtxos: f,
-		recipientUtxo: new c({
-			amount: a,
-			erc20TokenAddress: o[0].erc20TokenAddress,
-			mintAddress: o[0].mintAddress,
-			timeStamp: l,
-			randomization: BigInt(p),
-			stealthAddress: m,
-			encryptionKey: h
-		})
+		senderUtxo: l[0],
+		recipientUtxo: l[1]
 	};
-}, x = async (s, u, d, v, x, S, C) => {
-	if (!i(v)) throw Error(a.RECIPIENT_FORMAT_INCORRECT);
-	let w = l(u), T = [...d], { originalDeployer: E, hinkalIdl: D } = t[w].contractData;
-	if (!E || !D) throw Error("missing data");
-	let { userKeys: O, merkleTreeAccessTokenByChain: k, merkleTreeHinkalByChain: A } = s, j = u.map((e) => e.erc20TokenAddress);
-	if (j.length > 1) throw Error("Solana Transfer: Only one mint address is supported");
-	let M = S ?? await g(w, x, j, e.Transact, [], 5n);
-	M.variableRate ||= n;
-	let N = p(-T[0], M), P = -T[0];
-	T[0] -= N;
-	let [F, I, { inputUtxos: L, senderOutputUtxos: R, recipientUtxo: z }] = await Promise.all([
-		s.getRandomRelay(w, !0),
-		s.getEthereumAddressByChain(w),
-		b(s, w, j, T, v, P)
+}, S = async (c, u, d, y, S, C, w) => {
+	if (!i(y)) throw Error(a.RECIPIENT_FORMAT_INCORRECT);
+	let T = l(u), E = [...d], { originalDeployer: D } = t[T].contractData;
+	if (!D) throw Error("missing data");
+	let { userKeys: O, merkleTreeHinkalByChain: k } = c, A = u.map((e) => e.erc20TokenAddress);
+	if (A.length > 1) throw Error("Solana Transfer: Only one mint address is supported");
+	let j = C ?? await h(T, S, A, e.Transact, [], 5n);
+	j.variableRate ||= n;
+	let M = _(-E[0], j), N = -E[0];
+	E[0] -= M;
+	let [P, F, { inputUtxos: I, senderUtxo: L, recipientUtxo: R }] = await Promise.all([
+		c.getRandomRelay(T, !0),
+		c.getEthereumAddressByChain(T),
+		x(c, T, A, E, y, N)
 	]);
-	if (!F) throw Error(a.RELAYER_NOT_AVAILABLE);
-	let B = R[0], V = c.findCorrectRandomization(o(31), s.userKeys.getShieldedPrivateKey()), H = {
-		tokenNumber: j.length,
-		nullifierAmount: L.length,
+	if (!P) throw Error(a.RELAYER_NOT_AVAILABLE);
+	let z = s.findCorrectRandomization(o(31), c.userKeys.getShieldedPrivateKey()), B = {
+		tokenNumber: A.length,
+		nullifierAmount: I.length,
 		outputAmount: 2
-	}, U = s.getSolanaProgram(D), W = f([[B, z]])[0].map((e) => Array.from(y.getBytes(e)));
-	h([L], [R], T);
-	let { proofAArr: G, proofBArr: K, proofCArr: q, publicInputsArr: J } = await _(s.generateProofRemotely, E, A[w], k[w], O, U, [j[0]], [L], [[B, z]], V, N, 0n, r, F, H, W, w), Y = {
-		recipient: F,
-		mint: j[0] === "11111111111111111111111111111111" ? void 0 : j[0]
+	}, V = f([[L, R]])[0].map((e) => Array.from(b.getBytes(e)));
+	m([I], [[L]], E);
+	let [{ proofAArr: H, proofBArr: U, proofCArr: W, publicInputsArr: G }, K] = await Promise.all([v(c.generateProofRemotely, k[T], O, [A[0]], [I], [[L, R]], z, M, 0n, r, P, B, V, T), g(T, O, A, [I])]), q = {
+		recipient: P,
+		mint: A[0] === "11111111111111111111111111111111" ? void 0 : A[0]
 	};
 	return {
-		chainId: w,
-		relay: F,
+		chainId: T,
+		relay: P,
 		args: {
-			proofAArr: G,
-			proofBArr: K,
-			proofCArr: q,
-			publicInputsArr: J,
-			encryptedOutputs: W,
-			relayerFee: N.toString(),
-			dimensions: H
+			proofAArr: H,
+			proofBArr: U,
+			proofCArr: W,
+			publicInputsArr: G,
+			encryptedOutputs: V,
+			relayerFee: M.toString(),
+			dimensions: B
 		},
-		accounts: Y,
-		adminData: m(C, w, j, T, I),
-		recipientUtxo: z
+		accounts: q,
+		adminData: p(w, T, A, E, F),
+		commitmentValidationData: K,
+		recipientUtxo: R
 	};
-}, S = async (e, t, n, r, i, a, o, s = !1) => {
+}, C = async (e, t, n, r, i, a, o, s = !1) => {
 	if (s) throw Error("onlyGasEstimate is not supported for Solana transfer");
-	let c = await x(e, t, n, r, i, a, o);
-	return v({
+	let c = await S(e, t, n, r, i, a, o);
+	return y({
 		chainId: c.chainId,
 		relayAddress: c.relay,
 		functionName: "transfer",
 		args: c.args,
 		accounts: c.accounts,
-		adminData: c.adminData
+		adminData: c.adminData,
+		commitmentValidationData: c.commitmentValidationData
 	});
 };
 //#endregion
-export { x as buildSolanaTransferPlan, S as hinkalSolanaTransfer };
+export { S as buildSolanaTransferPlan, C as hinkalSolanaTransfer };

package/data-structures/Hinkal/hinkalSolanaWithdraw.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`),require(`../../types/index.cjs`);const n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`);require(`../../constants/index.cjs`);const i=require(`../../functions/utils/time.utils.cjs`),a=require(`../utxo/Utxo.cjs`),o=require(`../../functions/utils/token-check.utils.cjs`),s=require(`../../functions/web3/events/getShieldedBalance.cjs`),c=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),l=require(`../../functions/snarkjs/common.snarkjs.cjs`),u=require(`../../functions/utils/fees.utils.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`),m=require(`../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs`);require(`../../functions/pre-transaction/index.cjs`);const h=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),g=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let _=require(`ethers`);var v=async(e,t,n,r)=>{let a=[...await s.addPaddingToUtxos(e,t,n,r,6)][0],o=i.getCurrentTimeInSeconds().toString(),{outputUtxos:l}=c.outputUtxoProcessing(e.userKeys,a,r[0],o,void 0,!1);return{inputUtxos:a,outputUtxos:l}},y=async(i,s,c,y,b,x,S)=>{let C=o.validateAndGetChainId(s),w=s.map(e=>e.erc20TokenAddress),{originalDeployer:T,hinkalIdl:E}=t.networkRegistry[C].contractData;if(!T||!E)throw Error(`missing data`);let{userKeys:D,merkleTreeAccessTokenByChain:O,merkleTreeHinkalByChain:k}=i,A=x??await p.getFeeStructure(C,b,w,e.ExternalActionId.Transact),j=u.calculateTotalFee(-c[0],A),M={feeToken:A.feeToken,flatFee:j,variableRate:0n};c[0]-=M.flatFee;let[{patchAccessTokenMerkleTree:N,kycRequired:P,hasAccessToken:F},I,L,{inputUtxos:R,outputUtxos:z}]=await Promise.all([m.shouldPatchAccessTokenMerkleTree(i,C,w,c),i.getEthereumAddressByChain(C),i.getRandomRelay(C,!0),v(i,C,w,c)]);if(!L)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);if(w.length>1)throw Error(`Solana Withdraw: Only one mint address is supported`);let B=a.Utxo.findCorrectRandomization(r.randomBigInt(31),i.userKeys.getShieldedPrivateKey()),V={tokenNumber:w.length,nullifierAmount:R.length,outputAmount:z.length},H=i.getSolanaProgram(E),U=l.calcEncryptedOutputs([z])[0][0],W=Array.from(_.ethers.getBytes(U));f.ensureAmountChanges([R],[z],c);let{proofAArr:G,proofBArr:K,proofCArr:q,publicInputsArr:J}=await h.constructSolanaZkProof(i.generateProofRemotely,T,k[C],O[C],D,H,[w[0]],[R],[z],B,M.flatFee,M.variableRate,y,L,V,[W],C,N),Y={recipient:y,mint:w[0]===`11111111111111111111111111111111`?void 0:w[0]},X={proofAArr:G,proofBArr:K,proofCArr:q,publicInputsArr:J,encryptedOutputs:[W],relayerFee:M.flatFee.toString(),dimensions:V},Z=d.constructAdminData(S,C,w,c,await i.getEthereumAddress());return g.solanaTransactCallRelayer({chainId:C,relayAddress:L,functionName:`transact`,args:X,accounts:Y,solanaAccessTokenData:!F&&P?{ethereumAddress:I,accessKey:D.getAccessKey()}:void 0,adminData:Z})};exports.hinkalSolanaWithdraw=y;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`),require(`../../types/index.cjs`);const n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`);require(`../../constants/index.cjs`);const i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../../functions/utils/token-check.utils.cjs`),s=require(`../../functions/web3/events/getShieldedBalance.cjs`),c=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),l=require(`../../functions/snarkjs/common.snarkjs.cjs`),u=require(`../../functions/pre-transaction/constructAdminData.cjs`),d=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`),p=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const m=require(`../../functions/utils/fees.utils.cjs`),h=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),g=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let _=require(`ethers`);var v=async(e,t,n,r)=>{let i=[...await s.addPaddingToUtxos(e,t,n,r,6)][0],o=a.getCurrentTimeInSeconds().toString(),{outputUtxos:l}=c.outputUtxoProcessing(e.userKeys,i,r[0],o);return{inputUtxos:i,outputUtxos:l}},y=async(a,s,c,y,b,x,S)=>{let C=o.validateAndGetChainId(s),w=s.map(e=>e.erc20TokenAddress),T=s[0];if(!T)throw Error(`Solana Withdraw: No Token Found`);let{originalDeployer:E}=t.networkRegistry[C].contractData;if(!E)throw Error(`missing data`);let{userKeys:D,merkleTreeHinkalByChain:O}=a,k=x??await f.getFeeStructure(C,b,w,e.ExternalActionId.Transact),A=await m.calculateModifiedFeeStructure(C,T,-c[0],k);c[0]-=A.flatFee;let[j,{inputUtxos:M,outputUtxos:N}]=await Promise.all([a.getRandomRelay(C,!0),v(a,C,w,c)]);if(!j)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);if(w.length>1)throw Error(`Solana Withdraw: Only one mint address is supported`);let P=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),a.userKeys.getShieldedPrivateKey()),F={tokenNumber:w.length,nullifierAmount:M.length,outputAmount:N.length},I=l.calcEncryptedOutputs([N])[0][0],L=Array.from(_.ethers.getBytes(I));d.ensureAmountChanges([M],[N],c);let[{proofAArr:R,proofBArr:z,proofCArr:B,publicInputsArr:V},H]=await Promise.all([h.constructSolanaZkProof(a.generateProofRemotely,O[C],D,[w[0]],[M],[N],P,A.flatFee,A.variableRate,y,j,F,[L],C),p.buildCommitmentValidationData(C,D,w,[M])]),U={recipient:y,mint:w[0]===`11111111111111111111111111111111`?void 0:w[0]};return g.solanaTransactCallRelayer({chainId:C,relayAddress:j,functionName:`transact`,args:{proofAArr:R,proofBArr:z,proofCArr:B,publicInputsArr:V,encryptedOutputs:[L],relayerFee:A.flatFee.toString(),dimensions:F},accounts:U,commitmentValidationData:H,adminData:u.constructAdminData(S,C,w,c,await a.getEthereumAddress())})};exports.hinkalSolanaWithdraw=y;