@gurge/sdk 0.3.142 → 0.3.151

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

@@ -7,8 +7,8 @@ import { createCustomSolanaConnection as a } from "../../functions/utils/create-
 import { AccountActions as o } from "../AccountActions/AccountActions.mjs";
 import { sendProxyV0Transaction as s } from "../../functions/pre-transaction/sendV0Transaction.mjs";
 import { getFeeStructure as c } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import "../../constants/index.mjs";
 import { emitTxPublicData as l } from "../../API/admin-calls.mjs";
+import "../../constants/index.mjs";
 import { buildSolanaTransferInstructions as u } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
 import "../AccountActions/index.mjs";
 import { PublicKey as d, TransactionInstruction as f, TransactionMessage as p, VersionedTransaction as m } from "@solana/web3.js";
@@ -45,35 +45,33 @@ var h = async (e, t) => {
 }, _ = async (t, r, i, s) => {
 	let c = o.getAddressFromSubAccount(t, i);
 	if (!c) throw Error("Public account address is not available");
-	let { fetchRpcUrl: l } = e[t];
-	if (!l) throw Error("RPC URL not found for the specified chain ID");
-	let u = a(l), f = new d(c), { instructions: p, lookupTableAccounts: m } = s === n.Lifi ? await g(u, r) : await h(u, r);
+	let { rpcUrl: l } = e[t], u = a(l), f = new d(c), { instructions: p, lookupTableAccounts: m } = s === n.Lifi ? await g(u, r) : await h(u, r);
 	return {
 		connection: u,
 		walletPublicKey: f,
 		instructions: p,
 		lookupTableAccounts: m
 	};
-}, v = async (e, a, o, f, p, m, h, g, v) => {
-	let y = r(a), b = m === n.Lifi, [{ connection: x, walletPublicKey: S, instructions: C, lookupTableAccounts: w }, T, E] = await Promise.all([
-		_(y, f, p, m),
-		b ? Promise.resolve(null) : e.getRandomRelay(y),
-		e.getEthereumAddressByChain(y)
+}, v = async (e, a, o, f, p, m, h, g, v, y) => {
+	let b = r(a), [{ connection: x, walletPublicKey: S, instructions: C, lookupTableAccounts: w }, T, E] = await Promise.all([
+		_(b, f, p, m),
+		h ? e.getRandomRelay(b) : Promise.resolve(null),
+		e.getEthereumAddressByChain(b)
 	]), D = C;
-	if (!b) {
+	if (h) {
 		if (!T) throw Error(t.RELAYER_NOT_AVAILABLE);
-		let e = a[1], r = o[1] * (g ?? await c(y, h, a.map((e) => e.erc20TokenAddress), n.Emporium)).variableRate / 10000n, { instructions: i } = await u(x, S, new d(T), e, r);
+		let e = a[1], r = o[1] * (v ?? await c(b, g, a.map((e) => e.erc20TokenAddress), n.Emporium)).variableRate / 10000n, { instructions: i } = await u(x, S, new d(T), e, r);
 		D = [...C, ...i];
 	}
 	let O = await s({
 		connection: x,
-		chainId: y,
+		chainId: b,
 		subAccount: p,
 		payerPublicKey: S,
 		instructions: D,
 		lookupTableAccounts: w
 	});
-	return l(i(v, y, a.map((e) => e.erc20TokenAddress), o, E, a)), O;
+	return l(i(y, b, a.map((e) => e.erc20TokenAddress), o, E, a)), O;
 };
 //#endregion
 export { v as hinkalSolanaProxySwap };

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

@@ -0,0 +1 @@
+const e=require(`../../types/solana.types.cjs`),t=require(`../../functions/utils/token-check.utils.cjs`),n=require(`../../functions/pre-transaction/constructAdminData.cjs`),r=require(`../AccountActions/AccountActions.cjs`),i=require(`../../API/admin-calls.cjs`),a=require(`../../functions/utils/solana-sponsored.utils.cjs`);var o=async(o,s,c,l,u,d,f)=>{let p=t.validateAndGetChainId([s]),m=r.AccountActions.getAddressFromSubAccount(p,c);if(!m)throw Error(`Missing temp wallet address for bridge shield`);let h=await o.getRandomRelay(p,!0);if(!h)throw Error(`No Solana relayer available for bridge shield`);let{txHash:g,feeWei:_}=await a.sendSolanaSponsoredTx({chainId:p,tempSubAccount:c,intent:{kind:e.SolanaSponsoredTxKind.Shield,tokenAddress:s.erc20TokenAddress,amount:l.toString(),senderAddress:m,relayAddress:h,recipientInfo:u,variableRate:f?.toString()}}),v=l-_;return i.emitTxPublicData(n.constructAdminData(d,p,[s.erc20TokenAddress],[v],m)),{txHash:g,shieldedAmount:v}};exports.hinkalSolanaSponsoredShield=o;

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

@@ -0,0 +1,8 @@
+import { AdminTransactionType } from '../../types/admin.types';
+import { SubAccount } from '../../types/proxy.types';
+import { ERC20Token } from '../../types/token.types';
+import { IHinkal } from './IHinkal';
+export declare const hinkalSolanaSponsoredShield: (hinkal: IHinkal, token: ERC20Token, tempSubAccount: SubAccount, landedAmount: bigint, recipientInfo: string, action?: AdminTransactionType, variableRate?: bigint) => Promise<{
+    txHash: string;
+    shieldedAmount: bigint;
+}>;

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

@@ -0,0 +1,32 @@
+import { SolanaSponsoredTxKind as e } from "../../types/solana.types.mjs";
+import { validateAndGetChainId as t } from "../../functions/utils/token-check.utils.mjs";
+import { constructAdminData as n } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { AccountActions as r } from "../AccountActions/AccountActions.mjs";
+import { emitTxPublicData as i } from "../../API/admin-calls.mjs";
+import { sendSolanaSponsoredTx as a } from "../../functions/utils/solana-sponsored.utils.mjs";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaSponsoredShield.ts
+var o = async (o, s, c, l, u, d, f) => {
+	let p = t([s]), m = r.getAddressFromSubAccount(p, c);
+	if (!m) throw Error("Missing temp wallet address for bridge shield");
+	let h = await o.getRandomRelay(p, !0);
+	if (!h) throw Error("No Solana relayer available for bridge shield");
+	let { txHash: g, feeWei: _ } = await a({
+		chainId: p,
+		tempSubAccount: c,
+		intent: {
+			kind: e.Shield,
+			tokenAddress: s.erc20TokenAddress,
+			amount: l.toString(),
+			senderAddress: m,
+			relayAddress: h,
+			recipientInfo: u,
+			variableRate: f?.toString()
+		}
+	}), v = l - _;
+	return i(n(d, p, [s.erc20TokenAddress], [v], m)), {
+		txHash: g,
+		shieldedAmount: v
+	};
+};
+//#endregion
+export { o as hinkalSolanaSponsoredShield };

package/common/src/data-structures/Hinkal/hinkalSolanaSwap.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(`../../types/external-action.types.cjs`),s=require(`../../types/cache.types.cjs`);require(`../../types/index.cjs`);const 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/solana.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),ee=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/snarkjs/constructSolanaZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let v=require(`ethers`),y=require(`@solana/web3.js`);var b=async(e,t,n,r)=>{let i=[...await l.addPaddingToUtxos(e,t,n,r,6)],o=a.getCurrentTimeInSeconds().toString(),s=[];for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=u.outputUtxoProcessing(e.userKeys,i[t],r[t],o);s.push([n[0]])}return{inputUtxosArray:i,outputUtxosArray:s}},x=async(a,l,u,x,te,S,C,w,T)=>{let E=c.validateAndGetChainId(l),D=new y.PublicKey(t.solanaNativeAddress),{hinkalAddress:ne,originalDeployer:O}=e.networkRegistry[E].contractData;if(!O)throw Error(`No IDL configured for Solana program on this network`);let k=new y.PublicKey(O),A=new y.PublicKey(ne),j=l.map(e=>e.erc20TokenAddress),{userKeys:M,merkleTreeHinkalByChain:N}=a,P=w??await h.getFeeStructure(E,C,j,o.ExternalActionId.Transact),F=u[1],I=Number(a.cacheDevice.get(s.StorageKeys.SLIPPAGE_PERCENTAGE)??0),L=l[1],R=r.getAmountInToken(L,F),z=Number(R)*I/100;u[1]-=r.getAmountInWei(L,z.toFixed(L.decimals));let B=F*BigInt(P.variableRate??0)/10000n+P.flatFee;if(u[1]-=B,u[1]<0)throw Error(n.transactionErrorCodes.LOW_OUTPUT_AMOUNT);let V=P.variableRate.toString(),[H,U,{inputUtxosArray:W,outputUtxosArray:G}]=await Promise.all([a.getRandomRelay(E,!0),a.getEthereumAddressByChain(E),b(a,E,j,u)]);if(!H)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let K=a.userKeys.getShieldedPrivateKey(),q=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),K),J={tokenNumber:2,nullifierAmount:W[0].length,outputAmount:1},Y=d.calcEncryptedOutputs(G).map(e=>[...v.ethers.getBytes(e[0])]),X=f.getSwapperAccountPublicKeyFromSalt(A,k,x),{remainingAccounts:Z,hinkalInstructions:Q}=ee.convertOKXToHinkalInstructions(te,X);m.ensureAmountChanges(W,G,u);let{proofAArr:re,proofBArr:ie,proofCArr:ae,publicInputsArr:oe,commitmentValidationData:$}=await g.constructSolanaZkProof(a.generateProofRemotely,N[E],M,j,W,G,q,P.flatFee,P.variableRate,D.toString(),H,J,Y,E,Q,Z,x),se=f.getStorageAccountPublicKey(A,k),ce=f.getStorageVaultPublicKey(A,k),le=l[0].erc20TokenAddress===`11111111111111111111111111111111`?null:new y.PublicKey(l[0].erc20TokenAddress),ue=l[1].erc20TokenAddress===`11111111111111111111111111111111`?null:new y.PublicKey(l[1].erc20TokenAddress),de={recipient:D.toString(),storageAccount:se.toString(),storageVault:ce.toString(),swapperAccount:X.toString(),mintFrom:le?.toString()??null,mintTo:ue?.toString()??null,remainingAccounts:Z.map(e=>({pubkey:e.pubkey.toString(),isSigner:e.isSigner,isWritable:e.isWritable})),addressLookupTableAccount:S};return _.solanaTransactCallRelayer({chainId:E,relayAddress:H,functionName:`swap`,args:{encryptedOutputs:Y,proofAArr:re,proofBArr:ie,proofCArr:ae,publicInputsArr:oe,relayerFee:P.flatFee.toString(),variableRate:V,dimensions:J,hinkalInstructions:Q.map(e=>({accountIndexes:[...e.accountIndexes],data:[...e.data],programIndex:e.programIndex}))},accounts:de,commitmentValidationData:$,adminData:p.constructAdminData(T,E,j,u,U,l)})};exports.hinkalSolanaSwap=x;
+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(`../../types/external-action.types.cjs`),a=require(`../../types/cache.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/solana.cjs`),l=require(`../../functions/pre-transaction/constructAdminData.cjs`),u=require(`../../functions/pre-transaction/calculateSolanaNullifierCount.cjs`),d=require(`../../functions/pre-transaction/convert-okx-instructions.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`),p=require(`./hinkalSolanaTransact.cjs`);let m=require(`@solana/web3.js`);var h=async(h,g,_,v,y,b,x,S,C)=>{let w=s.validateAndGetChainId(g),T=new m.PublicKey(t.solanaNativeAddress),{hinkalAddress:E,originalDeployer:D}=e.networkRegistry[w].contractData;if(!D)throw Error(`No IDL configured for Solana program on this network`);let O=new m.PublicKey(D),k=new m.PublicKey(E),A=g.map(e=>e.erc20TokenAddress),j=x??A[1];if(x&&x!==A[1])throw Error(`Solana swap fee token must match the output token`);let M={mintFrom:A[0],mintTo:A[1],nullifierCount:await u.calculateSolanaNullifierCount(h,w,A,_),rootInsertCount:2},N=S??await f.getFeeStructure(w,j,A,i.ExternalActionId.Okx,[],void 0,M),P=_[1],F=Number(h.cacheDevice.get(a.StorageKeys.SLIPPAGE_PERCENTAGE)??0),I=g[1],L=r.getAmountInToken(I,P),R=Number(L)*F/100;_[1]-=r.getAmountInWei(I,R.toFixed(I.decimals));let z=P*BigInt(N.variableRate??0)/10000n+N.flatFee;if(_[1]-=z,_[1]<0)throw Error(n.transactionErrorCodes.LOW_OUTPUT_AMOUNT);let[B,V]=await Promise.all([h.getRandomRelay(w,!0),h.getEthereumAddressByChain(w)]);if(!B)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let{remainingAccounts:H,hinkalInstructions:U}=d.convertOKXToHinkalInstructions(y,c.getSwapperAccountPublicKeyFromSalt(k,O,v)),W=g[0].erc20TokenAddress===`11111111111111111111111111111111`?null:new m.PublicKey(g[0].erc20TokenAddress),G=g[1].erc20TokenAddress===`11111111111111111111111111111111`?null:new m.PublicKey(g[1].erc20TokenAddress),K={recipient:T.toString(),mintFrom:W?.toString()??null,mintTo:G?.toString()??null,remainingAccounts:H.map(e=>({pubkey:e.pubkey.toString(),isSigner:e.isSigner,isWritable:e.isWritable})),addressLookupTableAccount:b},q=l.constructAdminData(C,w,A,_,V,g),J=U.map(e=>({accountIndexes:[...e.accountIndexes],data:[...e.data],programIndex:e.programIndex}));return p.hinkalSolanaTransact(h,{chainId:w,mintAddresses:A,amountChanges:_,relayAddress:B,recipient:T.toString(),signer:B,functionName:`swap`,accounts:K,onChainCreation:[!1,!0],relayerFee:N.flatFee,variableRate:N.variableRate,hinkalInstructions:J,remainingAccounts:K.remainingAccounts,swapperAccountSalt:v,submit:{mode:o.SolanaSubmitMode.Relayer,adminData:q}})};exports.hinkalSolanaSwap=h;

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

@@ -0,0 +1,4 @@
+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, action?: AdminTransactionType) => Promise<string>;

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

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

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

@@ -0,0 +1 @@
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/solana-transact.types.cjs`),t=require(`../../functions/web3/events/getShieldedBalance.cjs`),n=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),r=require(`../../functions/snarkjs/common.snarkjs.cjs`),i=require(`../../functions/snarkjs/constructTxEnclave.cjs`),a=require(`../../functions/pre-transaction/speculativeUtxo.cjs`),o=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),s=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`);let c=require(`ethers`),l=require(`@solana/web3.js`);var u=(e=[])=>e.map(({accountIndexes:e,data:t,programIndex:n})=>({accountIndexes:Buffer.from(e),data:Buffer.from(t),programIndex:n})),d=(e=[])=>e.map(({pubkey:e,isSigner:t,isWritable:n})=>({pubkey:new l.PublicKey(e),isSigner:t,isWritable:n})),f=async(e,n)=>{let{inputUtxos:r,chainId:i,mintAddresses:a,amountChanges:o,useBlockedUtxos:s,onChainCreation:c}=n;return r||[...await t.addPaddingToUtxos(e,i,a,o,void 0,void 0,s,c)]},p=(e,t,r)=>{let{amountChanges:i,recipientAddress:a,recipientAmounts:o}=e;return n.buildOutputUtxos(t,r,i,a===void 0?void 0:[a],a===void 0?void 0:[o??[]])},m=async(e,t,n)=>{let{chainId:i,mintAddresses:o,relayAddress:l,recipient:m,relayerFee:h,variableRate:g,functionName:_,hinkalInstructions:v,remainingAccounts:y,swapperAccountSalt:b,onChainCreation:x,speculative:S}=t,C=await f(e,t),w=p(t,n,C),T=e.merkleTreeHinkalByChain[i],E=S?a.speculativeMerkleTree(T,C,S.pendingLeaves):T,D={tokenNumber:o.length,nullifierAmount:C[0].length,outputAmount:w[0].length},{proofAArr:O,proofBArr:k,proofCArr:A,publicInputsArr:j,commitmentValidationData:M,rootHashHinkalIndex:N,encryptedOutputs:P,onChainEncryptedOutput:F}=await s.constructSolanaZkProof(E,n,o,C,w,h??0n,g??0n,m,l,D,x,i,u(v),d(y),b,E!==T);return{args:{proofAArr:O,proofBArr:k,proofCArr:A,publicInputsArr:j,encryptedOutputs:P,relayerFee:(h??0n).toString(),..._===`swap`?{variableRate:(g??0n).toString(),onChainEncryptedOutput:F,onChainCreation:x??[],hinkalInstructions:v??[]}:{},dimensions:D,rootHashIndex:N.toString()},commitmentValidationData:M,notes:{inputNullifiers:C.flat().filter(e=>e.amount>0n).map(e=>e.getNullifier()),outCommitments:r.buildOutCommitments(w).flat(),encryptedOutputs:P.map(e=>c.ethers.hexlify(new Uint8Array(e)))}}},h=async(e,t,n)=>{let{inputUtxos:r}=t,{jobId:a,signedMessageHash:o}=await i.prepareSolanaTxEnclaveCall(e,{chainId:t.chainId,mintAddresses:t.mintAddresses,amountChanges:t.amountChanges,relayAddress:t.relayAddress,recipient:t.recipient,signer:t.signer,functionName:t.functionName,accounts:t.accounts,onChainCreation:t.onChainCreation,relayerFee:t.relayerFee,variableRate:t.variableRate,swapperAccountSalt:t.swapperAccountSalt,hinkalInstructions:t.hinkalInstructions,remainingAccounts:t.remainingAccounts,recipientAddress:t.recipientAddress,recipientAmounts:t.recipientAmounts,recipientAmount:t.recipientAmount,displayRecipient:t.displayRecipient,useBlockedUtxos:t.useBlockedUtxos,messageSeed:t.messageSeed,inputCommitments:t.speculative?void 0:i.collectInputCommitments(r),speculative:t.speculative},n),{R8:s,S:c}=n.signEddsa(BigInt(o));return{jobId:a,eddsaSignature:{R8:s,S:c}}},g=(t,n)=>{let{chainId:r,relayAddress:i,functionName:a,accounts:s,submit:c}=t;if(c.mode!==e.SolanaSubmitMode.Relayer)throw Error(`hinkalSolanaTransact: relayer submit expected`);return o.solanaTransactCallRelayer({chainId:r,relayAddress:i,functionName:a,args:n.args,accounts:s,commitmentValidationData:n.commitmentValidationData,adminData:c.adminData})},_=async(t,n)=>{if(t.submit.mode!==e.SolanaSubmitMode.Relayer)return n;let r=await g(t,n);return n.notes&&t.onTxSubmitLocally?.(n.notes),r},v=async(t,n)=>{if(n.userKeys&&!n.inputUtxos)throw Error(`hinkalSolanaTransact: userKeys requires explicit inputUtxos`);let r=n.userKeys??t.userKeys,{chainId:a,submit:o}=n;if(t.generateProofRemotely){let{jobId:s,eddsaSignature:c}=await h(t,n,r);if(o.mode===e.SolanaSubmitMode.Relayer)return i.finalizeSolanaTxEnclaveCallRelay(s,c,a,{adminData:o.adminData});let{solanaArgs:l,commitmentValidationData:u}=await i.finalizeSolanaTxEnclaveCall(s,c);return _(n,{args:l,commitmentValidationData:u})}return _(n,await m(t,n,r))};exports.hinkalSolanaTransact=v;

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

@@ -0,0 +1,3 @@
+import { HinkalSolanaTransactParams, SolanaTransactResult } from '../../types/solana-transact.types';
+import { IHinkal } from './IHinkal';
+export declare const hinkalSolanaTransact: (hinkal: IHinkal, params: HinkalSolanaTransactParams) => Promise<SolanaTransactResult>;

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

@@ -0,0 +1,119 @@
+import { SolanaSubmitMode as e } from "../../types/solana-transact.types.mjs";
+import { addPaddingToUtxos as t } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { buildOutputUtxos as n } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { buildOutCommitments as r } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { collectInputCommitments as i, finalizeSolanaTxEnclaveCall as a, finalizeSolanaTxEnclaveCallRelay as o, prepareSolanaTxEnclaveCall as s } from "../../functions/snarkjs/constructTxEnclave.mjs";
+import { speculativeMerkleTree as c } from "../../functions/pre-transaction/speculativeUtxo.mjs";
+import { solanaTransactCallRelayer as l } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { constructSolanaZkProof as u } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { ethers as d } from "ethers";
+import { PublicKey as f } from "@solana/web3.js";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaTransact.ts
+var p = (e = []) => e.map(({ accountIndexes: e, data: t, programIndex: n }) => ({
+	accountIndexes: Buffer.from(e),
+	data: Buffer.from(t),
+	programIndex: n
+})), m = (e = []) => e.map(({ pubkey: e, isSigner: t, isWritable: n }) => ({
+	pubkey: new f(e),
+	isSigner: t,
+	isWritable: n
+})), h = async (e, n) => {
+	let { inputUtxos: r, chainId: i, mintAddresses: a, amountChanges: o, useBlockedUtxos: s, onChainCreation: c } = n;
+	return r || [...await t(e, i, a, o, void 0, void 0, s, c)];
+}, g = (e, t, r) => {
+	let { amountChanges: i, recipientAddress: a, recipientAmounts: o } = e;
+	return n(t, r, i, a === void 0 ? void 0 : [a], a === void 0 ? void 0 : [o ?? []]);
+}, _ = async (e, t, n) => {
+	let { chainId: i, mintAddresses: a, relayAddress: o, recipient: s, relayerFee: l, variableRate: f, functionName: _, hinkalInstructions: v, remainingAccounts: y, swapperAccountSalt: b, onChainCreation: x, speculative: S } = t, C = await h(e, t), w = g(t, n, C), T = e.merkleTreeHinkalByChain[i], E = S ? c(T, C, S.pendingLeaves) : T, D = {
+		tokenNumber: a.length,
+		nullifierAmount: C[0].length,
+		outputAmount: w[0].length
+	}, { proofAArr: O, proofBArr: k, proofCArr: A, publicInputsArr: j, commitmentValidationData: M, rootHashHinkalIndex: N, encryptedOutputs: P, onChainEncryptedOutput: F } = await u(E, n, a, C, w, l ?? 0n, f ?? 0n, s, o, D, x, i, p(v), m(y), b, E !== T);
+	return {
+		args: {
+			proofAArr: O,
+			proofBArr: k,
+			proofCArr: A,
+			publicInputsArr: j,
+			encryptedOutputs: P,
+			relayerFee: (l ?? 0n).toString(),
+			..._ === "swap" ? {
+				variableRate: (f ?? 0n).toString(),
+				onChainEncryptedOutput: F,
+				onChainCreation: x ?? [],
+				hinkalInstructions: v ?? []
+			} : {},
+			dimensions: D,
+			rootHashIndex: N.toString()
+		},
+		commitmentValidationData: M,
+		notes: {
+			inputNullifiers: C.flat().filter((e) => e.amount > 0n).map((e) => e.getNullifier()),
+			outCommitments: r(w).flat(),
+			encryptedOutputs: P.map((e) => d.hexlify(new Uint8Array(e)))
+		}
+	};
+}, v = async (e, t, n) => {
+	let { inputUtxos: r } = t, { jobId: a, signedMessageHash: o } = await s(e, {
+		chainId: t.chainId,
+		mintAddresses: t.mintAddresses,
+		amountChanges: t.amountChanges,
+		relayAddress: t.relayAddress,
+		recipient: t.recipient,
+		signer: t.signer,
+		functionName: t.functionName,
+		accounts: t.accounts,
+		onChainCreation: t.onChainCreation,
+		relayerFee: t.relayerFee,
+		variableRate: t.variableRate,
+		swapperAccountSalt: t.swapperAccountSalt,
+		hinkalInstructions: t.hinkalInstructions,
+		remainingAccounts: t.remainingAccounts,
+		recipientAddress: t.recipientAddress,
+		recipientAmounts: t.recipientAmounts,
+		recipientAmount: t.recipientAmount,
+		displayRecipient: t.displayRecipient,
+		useBlockedUtxos: t.useBlockedUtxos,
+		messageSeed: t.messageSeed,
+		inputCommitments: t.speculative ? void 0 : i(r),
+		speculative: t.speculative
+	}, n), { R8: c, S: l } = n.signEddsa(BigInt(o));
+	return {
+		jobId: a,
+		eddsaSignature: {
+			R8: c,
+			S: l
+		}
+	};
+}, y = (t, n) => {
+	let { chainId: r, relayAddress: i, functionName: a, accounts: o, submit: s } = t;
+	if (s.mode !== e.Relayer) throw Error("hinkalSolanaTransact: relayer submit expected");
+	return l({
+		chainId: r,
+		relayAddress: i,
+		functionName: a,
+		args: n.args,
+		accounts: o,
+		commitmentValidationData: n.commitmentValidationData,
+		adminData: s.adminData
+	});
+}, b = async (t, n) => {
+	if (t.submit.mode !== e.Relayer) return n;
+	let r = await y(t, n);
+	return n.notes && t.onTxSubmitLocally?.(n.notes), r;
+}, x = async (t, n) => {
+	if (n.userKeys && !n.inputUtxos) throw Error("hinkalSolanaTransact: userKeys requires explicit inputUtxos");
+	let r = n.userKeys ?? t.userKeys, { chainId: i, submit: s } = n;
+	if (t.generateProofRemotely) {
+		let { jobId: c, eddsaSignature: l } = await v(t, n, r);
+		if (s.mode === e.Relayer) return o(c, l, i, { adminData: s.adminData });
+		let { solanaArgs: u, commitmentValidationData: d } = await a(c, l);
+		return b(n, {
+			args: u,
+			commitmentValidationData: d
+		});
+	}
+	return b(n, await _(t, n, r));
+};
+//#endregion
+export { x as hinkalSolanaTransact };

package/common/src/data-structures/Hinkal/hinkalSolanaTransfer.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(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const s=require(`../../functions/utils/addresses.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`);require(`../../functions/pre-transaction/index.cjs`);const h=require(`../../functions/utils/fees.utils.cjs`),g=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let v=require(`ethers`);var y=async(e,t,n,r,i,o)=>{let s=(await l.addPaddingToUtxos(e,t,n,r,6))[0],c=a.getCurrentTimeInSeconds().toString(),{outputUtxos:d}=u.outputUtxoProcessing(e.userKeys,s,r[0],c,!0,i,o);return{inputUtxos:s,senderUtxo:d[0],recipientUtxo:d[1]}},b=async(a,l,u,_,b,x,S)=>{if(!s.isValidPrivateAddress(_))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let C=c.validateAndGetChainId(l),w=[...u],{originalDeployer:T}=e.networkRegistry[C].contractData;if(!T)throw Error(`missing data`);let{userKeys:E,merkleTreeHinkalByChain:D}=a,O=l.map(e=>e.erc20TokenAddress);if(O.length>1)throw Error(`Solana Transfer: Only one mint address is supported`);let k=x??await m.getFeeStructure(C,b,O,o.ExternalActionId.Transact,[],5n);k.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let A=h.calculateTotalFee(-w[0],k),j=-w[0];w[0]-=A;let[M,N,{inputUtxos:P,senderUtxo:F,recipientUtxo:I}]=await Promise.all([a.getRandomRelay(C,!0),a.getEthereumAddressByChain(C),y(a,C,O,w,_,j)]);if(!M)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let L=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),a.userKeys.getShieldedPrivateKey()),R={tokenNumber:O.length,nullifierAmount:P.length,outputAmount:2},z=d.calcEncryptedOutputs([[F,I]])[0].map(e=>Array.from(v.ethers.getBytes(e)));p.ensureAmountChanges([P],[[F]],w);let{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,commitmentValidationData:W}=await g.constructSolanaZkProof(a.generateProofRemotely,D[C],E,[O[0]],[P],[[F,I]],L,A,0n,t.solanaNativeAddress,M,R,z,C),G={recipient:M,mint:O[0]===`11111111111111111111111111111111`?void 0:O[0]};return{chainId:C,relay:M,args:{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,encryptedOutputs:z,relayerFee:A.toString(),dimensions:R},accounts:G,adminData:f.constructAdminData(S,C,O,w,N),commitmentValidationData:W,recipientUtxo:I}},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,commitmentValidationData:c.commitmentValidationData})};exports.hinkalSolanaTransfer=x;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/utils/addresses.cjs`),i=require(`../../types/external-action.types.cjs`),a=require(`../../types/solana-transact.types.cjs`);require(`../../types/index.cjs`);const o=require(`../../functions/utils/token-check.utils.cjs`),s=require(`../../functions/pre-transaction/constructAdminData.cjs`),c=require(`../../functions/pre-transaction/calculateSolanaNullifierCount.cjs`),l=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const u=require(`../../functions/utils/fees.utils.cjs`),d=require(`./hinkalSolanaTransact.cjs`);var f=async(f,p,m,h,g,_,v,y=!1)=>{if(y)throw Error(`onlyGasEstimate is not supported for Solana transfer`);if(!r.isValidPrivateAddress(h))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let b=o.validateAndGetChainId(p),x=[...m],S=p.map(e=>e.erc20TokenAddress);if(S.length>1)throw Error(`Solana Transfer: Only one mint address is supported`);let{originalDeployer:C}=e.networkRegistry[b].contractData;if(!C)throw Error(`missing data`);let w=g??S[0],T={mintTo:w,nullifierCount:await c.calculateSolanaNullifierCount(f,b,S,x),rootInsertCount:2},E=_??await l.getFeeStructure(b,w,S,i.ExternalActionId.Transact,[],25n,T);E.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let D=-x[0],O=u.calculateTotalFee(D,E);x[0]-=O;let[k,A]=await Promise.all([f.getRandomRelay(b,!0),f.getEthereumAddressByChain(b)]);if(!k)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let j={recipient:k,mint:S[0]===`11111111111111111111111111111111`?void 0:S[0]},M=s.constructAdminData(v,b,S,x,A);return d.hinkalSolanaTransact(f,{chainId:b,mintAddresses:S,amountChanges:x,relayAddress:k,recipient:t.solanaNativeAddress,signer:k,functionName:`transfer`,accounts:j,relayerFee:O,recipientAddress:h,recipientAmounts:[D],submit:{mode:a.SolanaSubmitMode.Relayer,adminData:M}})};exports.hinkalSolanaTransfer=f;

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

@@ -0,0 +1,3 @@
+import { AdminTransactionType, ERC20Token, FeeStructure } from '../../types';
+import { IHinkal } from './IHinkal';
+export declare const hinkalSolanaTransfer: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChangesInput: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, onlyGasEstimate?: boolean) => Promise<string>;

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

@@ -1,87 +1,56 @@
 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 { ExternalActionId as s } from "../../types/external-action.types.mjs";
+import { isValidPrivateAddress as i } from "../../functions/utils/addresses.mjs";
+import { ExternalActionId as a } from "../../types/external-action.types.mjs";
+import { SolanaSubmitMode as o } from "../../types/solana-transact.types.mjs";
 import "../../types/index.mjs";
-import { isValidPrivateAddress as c } from "../../functions/utils/addresses.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 { 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 { validateAndGetChainId as s } from "../../functions/utils/token-check.utils.mjs";
+import { constructAdminData as c } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { calculateSolanaNullifierCount as l } from "../../functions/pre-transaction/calculateSolanaNullifierCount.mjs";
+import { getFeeStructure as u } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { calculateTotalFee as g } from "../../functions/utils/fees.utils.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 d } from "../../functions/utils/fees.utils.mjs";
+import { hinkalSolanaTransact as f } from "./hinkalSolanaTransact.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaTransfer.ts
-var b = async (e, t, n, r, i, a) => {
-	let s = (await u(e, t, n, r, 6))[0], c = o().toString(), { outputUtxos: l } = d(e.userKeys, s, r[0], c, !0, i, a);
-	return {
-		inputUtxos: s,
-		senderUtxo: l[0],
-		recipientUtxo: l[1]
-	};
-}, x = async (o, u, d, v, x, S, C) => {
-	if (!c(v)) throw Error(r.RECIPIENT_FORMAT_INCORRECT);
-	let w = l(u), T = [...d], { originalDeployer: E } = e[w].contractData;
-	if (!E) throw Error("missing data");
-	let { userKeys: D, merkleTreeHinkalByChain: O } = o, k = u.map((e) => e.erc20TokenAddress);
-	if (k.length > 1) throw Error("Solana Transfer: Only one mint address is supported");
-	let A = S ?? await h(w, x, k, s.Transact, [], 5n);
-	A.variableRate ||= t;
-	let j = g(-T[0], A), M = -T[0];
-	T[0] -= j;
-	let [N, P, { inputUtxos: F, senderUtxo: I, recipientUtxo: L }] = await Promise.all([
-		o.getRandomRelay(w, !0),
-		o.getEthereumAddressByChain(w),
-		b(o, w, k, T, v, M)
-	]);
-	if (!N) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let R = a.findCorrectRandomization(i(31), o.userKeys.getShieldedPrivateKey()), z = {
-		tokenNumber: k.length,
-		nullifierAmount: F.length,
-		outputAmount: 2
-	}, B = f([[I, L]])[0].map((e) => Array.from(y.getBytes(e)));
-	m([F], [[I]], T);
-	let { proofAArr: V, proofBArr: H, proofCArr: U, publicInputsArr: W, commitmentValidationData: G } = await _(o.generateProofRemotely, O[w], D, [k[0]], [F], [[I, L]], R, j, 0n, n, N, z, B, w), 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: p(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({
-		chainId: c.chainId,
-		relayAddress: c.relay,
+var p = async (p, m, h, g, _, v, y, b = !1) => {
+	if (b) throw Error("onlyGasEstimate is not supported for Solana transfer");
+	if (!i(g)) throw Error(r.RECIPIENT_FORMAT_INCORRECT);
+	let x = s(m), S = [...h], C = m.map((e) => e.erc20TokenAddress);
+	if (C.length > 1) throw Error("Solana Transfer: Only one mint address is supported");
+	let { originalDeployer: w } = e[x].contractData;
+	if (!w) throw Error("missing data");
+	let T = _ ?? C[0], E = {
+		mintTo: T,
+		nullifierCount: await l(p, x, C, S),
+		rootInsertCount: 2
+	}, D = v ?? await u(x, T, C, a.Transact, [], 25n, E);
+	D.variableRate ||= t;
+	let O = -S[0], k = d(O, D);
+	S[0] -= k;
+	let [A, j] = await Promise.all([p.getRandomRelay(x, !0), p.getEthereumAddressByChain(x)]);
+	if (!A) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let M = {
+		recipient: A,
+		mint: C[0] === "11111111111111111111111111111111" ? void 0 : C[0]
+	}, N = c(y, x, C, S, j);
+	return f(p, {
+		chainId: x,
+		mintAddresses: C,
+		amountChanges: S,
+		relayAddress: A,
+		recipient: n,
+		signer: A,
 		functionName: "transfer",
-		args: c.args,
-		accounts: c.accounts,
-		adminData: c.adminData,
-		commitmentValidationData: c.commitmentValidationData
+		accounts: M,
+		relayerFee: k,
+		recipientAddress: g,
+		recipientAmounts: [O],
+		submit: {
+			mode: o.Relayer,
+			adminData: N
+		}
 	});
 };
 //#endregion
-export { S as hinkalSolanaTransfer };
+export { p as hinkalSolanaTransfer };

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../functions/web3/etherFunctions.cjs`),r=require(`../crypto-keys/keys.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const 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`);require(`../../functions/pre-transaction/index.cjs`),require(`../../constants/index.cjs`);const p=require(`../../functions/utils/fees.utils.cjs`),m=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),h=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let g=require(`ethers`);var _=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);return{inputUtxos:a,outputUtxos:l}},v=async(i,s,c,v,y,b,x)=>{let S=o.validateAndGetChainId(s),C=s.map(e=>e.erc20TokenAddress),w=s[0];if(!w)throw Error(`Solana Withdraw: No Token Found`);let{originalDeployer:T}=e.networkRegistry[S].contractData;if(!T)throw Error(`missing data`);let{userKeys:E,merkleTreeHinkalByChain:D}=i,O=b??await f.getFeeStructure(S,y,C,a.ExternalActionId.Transact),k=await p.calculateModifiedFeeStructure(S,w,-c[0],O);c[0]-=k.flatFee;let[A,{inputUtxos:j,outputUtxos:M}]=await Promise.all([i.getRandomRelay(S,!0),_(i,S,C,c)]);if(!A)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);if(C.length>1)throw Error(`Solana Withdraw: Only one mint address is supported`);let N=r.UserKeys.findCorrectRandomization(n.randomBigInt(31),i.userKeys.getShieldedPrivateKey()),P={tokenNumber:C.length,nullifierAmount:j.length,outputAmount:M.length},F=l.calcEncryptedOutputs([M])[0][0],I=Array.from(g.ethers.getBytes(F));d.ensureAmountChanges([j],[M],c);let{proofAArr:L,proofBArr:R,proofCArr:z,publicInputsArr:B,commitmentValidationData:V}=await m.constructSolanaZkProof(i.generateProofRemotely,D[S],E,[C[0]],[j],[M],N,k.flatFee,k.variableRate,v,A,P,[I],S),H={recipient:v,mint:C[0]===`11111111111111111111111111111111`?void 0:C[0]};return h.solanaTransactCallRelayer({chainId:S,relayAddress:A,functionName:`transact`,args:{proofAArr:L,proofBArr:R,proofCArr:z,publicInputsArr:B,encryptedOutputs:[I],relayerFee:k.flatFee.toString(),dimensions:P},accounts:H,commitmentValidationData:V,adminData:u.constructAdminData(x,S,C,c,await i.getEthereumAddress())})};exports.hinkalSolanaWithdraw=v;
+const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../types/external-action.types.cjs`),r=require(`../../types/solana-transact.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../functions/utils/token-check.utils.cjs`),a=require(`../../functions/pre-transaction/constructAdminData.cjs`),o=require(`../../functions/pre-transaction/calculateSolanaNullifierCount.cjs`),s=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`),require(`../../constants/index.cjs`);const c=require(`../../functions/utils/fees.utils.cjs`),l=require(`./hinkalSolanaTransact.cjs`);var u=async(u,d,f,p,m,h,g,_)=>{let v=i.validateAndGetChainId(d),y=d.map(e=>e.erc20TokenAddress),b=d[0];if(!b)throw Error(`Solana Withdraw: No Token Found`);let{originalDeployer:x}=e.networkRegistry[v].contractData;if(!x)throw Error(`missing data`);let S=m??y[0],C={mintTo:y[0],recipient:p,nullifierCount:await o.calculateSolanaNullifierCount(u,v,y,f)},w=h??await s.getFeeStructure(v,S,y,n.ExternalActionId.Transact,[],g,C);h&&g!==void 0&&(w={...w,variableRate:g});let T=await c.calculateModifiedFeeStructure(v,b,-f[0],w);f[0]-=T.flatFee;let[E,D]=await Promise.all([u.getRandomRelay(v,!0),u.getEthereumAddress()]);if(!E)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);if(y.length>1)throw Error(`Solana Withdraw: Only one mint address is supported`);let O={recipient:p,mint:y[0]===`11111111111111111111111111111111`?void 0:y[0]},k=a.constructAdminData(_,v,y,f,D);return l.hinkalSolanaTransact(u,{chainId:v,mintAddresses:y,amountChanges:f,relayAddress:E,recipient:p,signer:E,functionName:`transact`,accounts:O,relayerFee:T.flatFee,variableRate:T.variableRate,submit:{mode:r.SolanaSubmitMode.Relayer,adminData:k}})};exports.hinkalSolanaWithdraw=u;

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

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