@gurge/sdk 0.3.150 → 0.3.151

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

@@ -1,31 +1,3 @@
-import { AdminTransactionType, CommitmentValidationDataType, ERC20Token, FeeStructure } from '../../types';
+import { AdminTransactionType, 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[];
-        proofCArr: number[];
-        publicInputsArr: number[][];
-        encryptedOutputs: number[][];
-        relayerFee: string;
-        dimensions: {
-            tokenNumber: number;
-            nullifierAmount: number;
-            outputAmount: number;
-        };
-    };
-    accounts: {
-        recipient: string;
-        mint?: string;
-    };
-    adminData: ReturnType<typeof constructAdminData>;
-    recipientUtxo: Utxo;
-};
-export declare const buildSolanaTransferPlan: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChangesInput: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<SolanaTransferPlan>;
-export declare const hinkalSolanaTransfer: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, onlyGasEstimate?: boolean) => Promise<string>;
-export {};
+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

@@ -1,4 +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, action?: AdminTransactionType) => Promise<string>;
+export declare const hinkalSolanaWithdraw: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, variableRateOverride?: bigint, action?: AdminTransactionType) => Promise<string>;

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

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

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

@@ -1 +1 @@
-require(`../../constants/protocol.constants.cjs`);const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../../functions/utils/time.utils.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../../functions/web3/events/getShieldedBalance.cjs`),i=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),a=require(`../../functions/pre-transaction/constructAdminData.cjs`),o=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const s=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),c=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),l=require(`../../functions/pre-transaction/getExternalSwapAddress.cjs`),u=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var d=async(e,n,a,o)=>{let s=[...await r.addPaddingToUtxos(e,n,a,o)],c=[],l=t.getCurrentTimeInSeconds().toString();for(let t=0;t<a.length;t+=1){let{outputUtxos:n}=i.outputUtxoProcessing(e.userKeys,s[t],o[t],l);c.push(n)}return{inputUtxosArray:s,outputUtxosArray:c}},f=async(t,r,i,f,p,m,h,g)=>{let _=n.validateAndGetChainId(r),v=r.map(e=>e.erc20TokenAddress),y=await t.getEthereumAddressByChain(_),b=h??await o.getFeeStructure(_,m,v,f,void 0,35n);await u.mergeWithFeeStructure(_,v,i,b);let x={externalActionId:f,externalAddress:l.getExternalSwapAddress(_,f),externalActionMetadata:p},[S,{inputUtxosArray:C,outputUtxosArray:w}]=await Promise.all([t.getRandomRelay(_,!0),d(t,_,v,i)]);if(!S)throw Error(e.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let T=[!1,!0,!1].slice(0,i.length),{zkCallData:E,circomData:D,dimData:O,commitmentValidationData:k}=await s.constructZkProof(t.merkleTreeHinkalByChain[_],C,w,t.userKeys,x.externalActionId,x.externalAddress,x.externalActionMetadata,t.generateProofRemotely,b,S,_,T);return await c.transactCallRelayer(_,E,O,D,k,void 0,void 0,a.constructAdminData(g,_,v,i,y,r))};exports.hinkalSwap=f;
+require(`../../constants/protocol.constants.cjs`);const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../../types/transact.types.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../../functions/snarkjs/common.snarkjs.cjs`),i=require(`../../functions/pre-transaction/constructAdminData.cjs`),a=require(`../../functions/pre-transaction/getFeeStructure.cjs`),o=require(`../../functions/pre-transaction/getExternalSwapAddress.cjs`);require(`../../functions/pre-transaction/index.cjs`);const s=require(`./hinkalTransact.cjs`),c=require(`../../constants/bridging.constants.cjs`),l=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var u=async(u,d,f,p,m,h,g,_=c.DEFAULT_BRIDGING_SLIPPAGE,v)=>{let y=n.validateAndGetChainId(d),b=d.map(e=>e.erc20TokenAddress),x=await u.getEthereumAddressByChain(y),S=g??await a.getFeeStructure(y,h,b,p,void 0,35n);await l.mergeWithFeeStructure(y,b,f,S);let C=o.getExternalSwapAddress(y,p),w=[!1,!0,!1].slice(0,f.length),T=await u.getRandomRelay(y,!0);if(!T)throw Error(e.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let E=i.constructAdminData(v,y,b,f,x,d),D=r.buildSwapSlippageValues(f,_);return f.length>1&&(f[1]=0n),s.hinkalTransact(u,{chainId:y,erc20Addresses:b,amountChanges:f,externalAddress:C,externalActionId:p,externalActionMetadata:m,onChainCreation:w,feeStructure:S,relay:T,slippageValues:D,submit:{mode:t.SubmitMode.Relayer,adminData:E}})};exports.hinkalSwap=u;

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

@@ -4,4 +4,4 @@ import { FeeStructure } from '../../types/hinkal.types';
 import { ERC20Token } from '../../types/token.types';
 import { AdminTransactionType } from '../../types/admin.types';
 export declare const hinkalSwap: (hinkal: IHinkal, erc20tokens: ERC20Token[], deltaAmounts: bigint[], externalActionId: ExternalActionId, data: string, // call data used to call the router contracts.
-feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<string>;
+feeToken?: string, feeStructureOverride?: FeeStructure, slippagePercentage?: number, action?: AdminTransactionType) => Promise<string>;

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

@@ -1,42 +1,42 @@
 import "../../constants/protocol.constants.mjs";
 import { transactionErrorCodes as e } from "../../error-handling/error-codes.constants.mjs";
-import { getCurrentTimeInSeconds as t } from "../../functions/utils/time.utils.mjs";
+import { SubmitMode as t } from "../../types/transact.types.mjs";
 import { validateAndGetChainId as n } from "../../functions/utils/token-check.utils.mjs";
-import { addPaddingToUtxos as r } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as i } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructAdminData as a } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { getFeeStructure as o } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { buildSwapSlippageValues as r } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { constructAdminData as i } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getFeeStructure as a } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { getExternalSwapAddress as o } from "../../functions/pre-transaction/getExternalSwapAddress.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { constructZkProof as s } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayer as c } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { getExternalSwapAddress as l } from "../../functions/pre-transaction/getExternalSwapAddress.mjs";
-import { mergeWithFeeStructure as u } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { hinkalTransact as s } from "./hinkalTransact.mjs";
+import { DEFAULT_BRIDGING_SLIPPAGE as c } from "../../constants/bridging.constants.mjs";
+import { mergeWithFeeStructure as l } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSwap.ts
-var d = async (e, n, a, o) => {
-	let s = [...await r(e, n, a, o)], c = [], l = t().toString();
-	for (let t = 0; t < a.length; t += 1) {
-		let { outputUtxos: n } = i(e.userKeys, s[t], o[t], l);
-		c.push(n);
-	}
-	return {
-		inputUtxosArray: s,
-		outputUtxosArray: c
-	};
-}, f = async (t, r, i, f, p, m, h, g) => {
-	let _ = n(r), v = r.map((e) => e.erc20TokenAddress), y = await t.getEthereumAddressByChain(_), b = h ?? await o(_, m, v, f, void 0, 35n);
-	await u(_, v, i, b);
-	let x = {
-		externalActionId: f,
-		externalAddress: l(_, f),
-		externalActionMetadata: p
-	}, [S, { inputUtxosArray: C, outputUtxosArray: w }] = await Promise.all([t.getRandomRelay(_, !0), d(t, _, v, i)]);
-	if (!S) throw Error(e.RELAYER_NOT_AVAILABLE);
-	let T = [
+var u = async (u, d, f, p, m, h, g, _ = c, v) => {
+	let y = n(d), b = d.map((e) => e.erc20TokenAddress), x = await u.getEthereumAddressByChain(y), S = g ?? await a(y, h, b, p, void 0, 35n);
+	await l(y, b, f, S);
+	let C = o(y, p), w = [
 		!1,
 		!0,
 		!1
-	].slice(0, i.length), { zkCallData: E, circomData: D, dimData: O, commitmentValidationData: k } = await s(t.merkleTreeHinkalByChain[_], C, w, t.userKeys, x.externalActionId, x.externalAddress, x.externalActionMetadata, t.generateProofRemotely, b, S, _, T);
-	return await c(_, E, O, D, k, void 0, void 0, a(g, _, v, i, y, r));
+	].slice(0, f.length), T = await u.getRandomRelay(y, !0);
+	if (!T) throw Error(e.RELAYER_NOT_AVAILABLE);
+	let E = i(v, y, b, f, x, d), D = r(f, _);
+	return f.length > 1 && (f[1] = 0n), s(u, {
+		chainId: y,
+		erc20Addresses: b,
+		amountChanges: f,
+		externalAddress: C,
+		externalActionId: p,
+		externalActionMetadata: m,
+		onChainCreation: w,
+		feeStructure: S,
+		relay: T,
+		slippageValues: D,
+		submit: {
+			mode: t.Relayer,
+			adminData: E
+		}
+	});
 };
 //#endregion
-export { f as hinkalSwap };
+export { u as hinkalSwap };

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

@@ -0,0 +1 @@
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../utxo/Utxo.cjs`),i=require(`../../types/transact.types.cjs`),a=require(`../../functions/web3/events/getShieldedBalance.cjs`),o=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),s=require(`../../functions/snarkjs/common.snarkjs.cjs`),c=require(`../../functions/snarkjs/constructTxEnclave.cjs`),l=require(`../../functions/pre-transaction/speculativeUtxo.cjs`),u=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),d=require(`../../functions/web3/functionCalls/submitProof.cjs`);var f=2,p=6,m=(e,t)=>{let n=Math.max(...t.map(e=>e.length))<=f?f:p;return t.map(t=>{let i=t[0];if(!i)throw Error(`hinkalTransact: inputUtxos must contain at least one note per token`);let a=[...t];for(;a.length<n;)a.push(new r.Utxo({amount:0n,erc20TokenAddress:i.erc20TokenAddress,mintAddress:i.mintAddress,nullifyingKey:e.getShieldedPrivateKey(),spendingPublicKey:e.getSpendingKeyPair().pubSpendingBJJPoint}));return a})},h=(e,t,n)=>{if(t.length!==1||t[0].length!==1)throw Error(`selfOutputAmounts only supports a single token with a single self-output`);let i=t[0][0],a=n.reduce((e,t)=>e+t,0n);if(a!==i.amount)throw Error(`selfOutputAmounts sum to ${a}, expected ${i.amount}`);return[n.map(t=>new r.Utxo({amount:t,erc20TokenAddress:i.erc20TokenAddress,mintAddress:i.mintAddress,nullifyingKey:e.getShieldedPrivateKey(),timeStamp:i.timeStamp,spendingPublicKey:e.getSpendingKeyPair().pubSpendingBJJPoint}))]},g=async(e,r,i)=>{let{chainId:s,erc20Addresses:c,amountChanges:d,externalAddress:f,externalActionId:p,externalActionMetadata:g,feeStructure:_,relay:v,onChainCreation:y,recipientAddress:b,recipientAmounts:x,useBlockedUtxos:S,inputUtxos:C,forceEmptyUtxos:w,originalSender:T,subAccountPrivateKey:E,emporiumOps:D,createBlockedUtxos:O,selfOutputAmounts:k,speculative:A,slippageValues:j}=r,M=C?m(i,C):[...await a.addPaddingToUtxos(e,s,c,d,void 0,w,S,y)],N=o.buildOutputUtxos(i,M,d,b,x),P=k?h(i,N,k):N,F=e.merkleTreeHinkalByChain[s],I=A?l.speculativeMerkleTree(F,M,A.pendingLeaves):F,{zkCallData:L,circomData:R,dimData:z,commitmentValidationData:B}=await u.constructZkProof(I,M,P,i,p??0n,f,D??g??`0x00`,_??n.zeroFeeStructure,v??t.zeroAddress,s,y,void 0,T,E,void 0,O,I!==F,j);return{zkCallData:L,circomData:R,dimData:z,commitmentValidationData:B}},_=async(t,n,r)=>{let{chainId:i,erc20Addresses:a,externalAddress:o,amountChanges:s,relay:l,feeStructure:u,externalActionId:d,externalActionMetadata:f,onChainCreation:p,recipientAddress:m,recipientAmounts:h,useBlockedUtxos:g,createBlockedUtxos:_,skipLock:v,selfOutputAmounts:y,forceEmptyUtxos:b,messageSeed:x,inputUtxos:S,originalSender:C,speculative:w,slippageValues:T}=n,{jobId:E,signedMessageHash:D}=await c.prepareTxEnclaveCall(t,{chainId:i,hinkalAddress:e.networkRegistry[i].contractData.hinkalAddress,erc20Addresses:a,externalAddress:o,originalSender:C,amountChanges:s,relay:l,feeStructure:u,externalActionId:d,externalActionMetadata:f,onChainCreation:p,recipientAddress:m,recipientAmounts:h,useBlockedUtxos:g,createBlockedUtxos:_,skipLock:v,selfOutputAmounts:y,forceEmptyUtxos:b,messageSeed:x,inputCommitments:w?void 0:c.collectInputCommitments(S),speculative:w,slippageValues:T},r),{R8:O,S:k}=r.signEddsa(BigInt(D));return{jobId:E,eddsaSignature:{R8:O,S:k}}},v=async(e,t,n)=>{let r=await d.submitProof(e,t,n);return t.submit.mode!==i.SubmitMode.ProofOnly&&t.onTxSubmitLocally?.(n.circomData),r},y=async(e,t)=>{if(t.userKeys&&!t.inputUtxos)throw Error(`hinkalTransact: userKeys requires explicit inputUtxos`);let n=t.userKeys??e.userKeys,{chainId:r,submit:a}=t;if(e.generateProofRemotely){let{jobId:o,eddsaSignature:l}=await _(e,t,n);if(a.mode===i.SubmitMode.Relayer)return c.finalizeTxEnclaveCallRelay(o,l,r,{adminData:a.adminData,authorizationData:a.authorizationData,withUniswapWorkAround:a.withUniswapWorkAround});let{zkCallData:u,circomData:d,dimData:f,commitmentValidationData:p,tronProofSignature:m}=await c.finalizeTxEnclaveCall(o,l);return v(e,t,{zkCallData:u,circomData:s.deserializeCircomData(d),dimData:f,commitmentValidationData:p,tronProofSignature:m})}return v(e,t,await g(e,t,n))};exports.hinkalTransact=y;

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

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