@hinkal/common 0.3.5 → 0.3.7

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

@@ -3,56 +3,57 @@ import { addPaddingToUtxos as t } from "../../functions/web3/events/getShieldedB
 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 { solanaTransactCallRelayer as c } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { constructSolanaZkProof as l } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { ethers as u } from "ethers";
-import { PublicKey as d } from "@solana/web3.js";
+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 f = (e = []) => e.map(({ accountIndexes: e, data: t, programIndex: n }) => ({
+var p = (e = []) => e.map(({ accountIndexes: e, data: t, programIndex: n }) => ({
 	accountIndexes: Buffer.from(e),
 	data: Buffer.from(t),
 	programIndex: n
-})), p = (e = []) => e.map(({ pubkey: e, isSigner: t, isWritable: n }) => ({
-	pubkey: new d(e),
+})), m = (e = []) => e.map(({ pubkey: e, isSigner: t, isWritable: n }) => ({
+	pubkey: new f(e),
 	isSigner: t,
 	isWritable: n
-})), m = async (e, n) => {
+})), h = async (e, n) => {
 	let { inputUtxos: r, chainId: i, mintAddresses: a, amountChanges: o, useBlockedUtxos: s } = n;
 	return r || [...await t(e, i, a, o, void 0, void 0, s)];
-}, h = (e, t, r) => {
+}, 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 ?? []]);
-}, g = async (e, t, n) => {
-	let { chainId: i, mintAddresses: a, relayAddress: o, recipient: s, relayerFee: c, variableRate: d, functionName: g, hinkalInstructions: _, remainingAccounts: v, swapperAccountSalt: y, onChainCreation: b } = t, x = await m(e, t), S = h(t, n, x), C = {
+}, _ = 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: x[0].length,
-		outputAmount: S[0].length
-	}, { proofAArr: w, proofBArr: T, proofCArr: E, publicInputsArr: D, commitmentValidationData: O, rootHashHinkalIndex: k, encryptedOutputs: A, onChainEncryptedOutput: j } = await l(e.merkleTreeHinkalByChain[i], n, a, x, S, c ?? 0n, d ?? 0n, s, o, C, b, i, f(_), p(v), y);
+		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: w,
-			proofBArr: T,
-			proofCArr: E,
-			publicInputsArr: D,
-			encryptedOutputs: A,
-			relayerFee: (c ?? 0n).toString(),
-			...g === "swap" ? {
-				variableRate: (d ?? 0n).toString(),
-				onChainEncryptedOutput: j,
-				onChainCreation: b ?? [],
-				hinkalInstructions: _ ?? []
+			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: C,
-			rootHashIndex: k.toString()
+			dimensions: D,
+			rootHashIndex: N.toString()
 		},
-		commitmentValidationData: O,
+		commitmentValidationData: M,
 		notes: {
-			inputNullifiers: x.flat().filter((e) => e.amount > 0n).map((e) => e.getNullifier()),
-			outCommitments: r(S).flat(),
-			encryptedOutputs: A.map((e) => u.hexlify(new Uint8Array(e)))
+			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)))
 		}
 	};
-}, _ = async (e, t, n) => {
+}, v = async (e, t, n) => {
 	let { inputUtxos: r } = t, { jobId: a, signedMessageHash: o } = await s(e, {
 		chainId: t.chainId,
 		mintAddresses: t.mintAddresses,
@@ -74,7 +75,8 @@ var f = (e = []) => e.map(({ accountIndexes: e, data: t, programIndex: n }) => (
 		displayRecipient: t.displayRecipient,
 		useBlockedUtxos: t.useBlockedUtxos,
 		messageSeed: t.messageSeed,
-		inputCommitments: i(r)
+		inputCommitments: t.speculative ? void 0 : i(r),
+		speculative: t.speculative
 	}, n), { R8: c, S: l } = n.signEddsa(BigInt(o));
 	return {
 		jobId: a,
@@ -83,10 +85,10 @@ var f = (e = []) => e.map(({ accountIndexes: e, data: t, programIndex: n }) => (
 			S: l
 		}
 	};
-}, v = (t, n) => {
+}, 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 c({
+	return l({
 		chainId: r,
 		relayAddress: i,
 		functionName: a,
@@ -95,23 +97,23 @@ var f = (e = []) => e.map(({ accountIndexes: e, data: t, programIndex: n }) => (
 		commitmentValidationData: n.commitmentValidationData,
 		adminData: s.adminData
 	});
-}, y = async (t, n) => {
+}, b = async (t, n) => {
 	if (t.submit.mode !== e.Relayer) return n;
-	let r = await v(t, n);
+	let r = await y(t, n);
 	return n.notes && t.onTxSubmitLocally?.(n.notes), r;
-}, b = async (t, n) => {
+}, 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 _(t, n, r);
+		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 y(n, {
+		return b(n, {
 			args: u,
 			commitmentValidationData: d
 		});
 	}
-	return y(n, await g(t, n, r));
+	return b(n, await _(t, n, r));
 };
 //#endregion
-export { b as hinkalSolanaTransact };
+export { x as hinkalSolanaTransact };

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

@@ -1 +1 @@
-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 _=i.validateAndGetChainId(d),v=d.map(e=>e.erc20TokenAddress),y=d[0];if(!y)throw Error(`Solana Withdraw: No Token Found`);let{originalDeployer:b}=e.networkRegistry[_].contractData;if(!b)throw Error(`missing data`);let x=m??v[0],S={mintTo:v[0],recipient:p,nullifierCount:await o.calculateSolanaNullifierCount(u,_,v,f)},C=h??await s.getFeeStructure(_,x,v,n.ExternalActionId.Transact,[],void 0,S),w=await c.calculateModifiedFeeStructure(_,y,-f[0],C);f[0]-=w.flatFee;let[T,E]=await Promise.all([u.getRandomRelay(_,!0),u.getEthereumAddress()]);if(!T)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);if(v.length>1)throw Error(`Solana Withdraw: Only one mint address is supported`);let D={recipient:p,mint:v[0]===`11111111111111111111111111111111`?void 0:v[0]},O=a.constructAdminData(g,_,v,f,E);return l.hinkalSolanaTransact(u,{chainId:_,mintAddresses:v,amountChanges:f,relayAddress:T,recipient:p,signer:T,functionName:`transact`,accounts:D,relayerFee:w.flatFee,variableRate:w.variableRate,submit:{mode:r.SolanaSubmitMode.Relayer,adminData:O}})};exports.hinkalSolanaWithdraw=u;
+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

@@ -13,38 +13,43 @@ import "../../constants/index.mjs";
 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 u = async (u, d, f, p, m, h, g) => {
-	let _ = i(d), v = d.map((e) => e.erc20TokenAddress), y = d[0];
-	if (!y) throw Error("Solana Withdraw: No Token Found");
-	let { originalDeployer: b } = e[_].contractData;
-	if (!b) throw Error("missing data");
-	let x = m ?? v[0], S = {
-		mintTo: v[0],
+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, f)
-	}, C = h ?? await s(_, x, v, n.Transact, [], void 0, S), w = await c(_, y, -f[0], C);
-	f[0] -= w.flatFee;
-	let [T, E] = await Promise.all([u.getRandomRelay(_, !0), u.getEthereumAddress()]);
-	if (!T) throw Error(t.RELAYER_NOT_AVAILABLE);
-	if (v.length > 1) throw Error("Solana Withdraw: Only one mint address is supported");
-	let D = {
+		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: v[0] === "11111111111111111111111111111111" ? void 0 : v[0]
-	}, O = a(g, _, v, f, E);
+		mint: y[0] === "11111111111111111111111111111111" ? void 0 : y[0]
+	}, k = a(_, v, y, f, D);
 	return l(u, {
-		chainId: _,
-		mintAddresses: v,
+		chainId: v,
+		mintAddresses: y,
 		amountChanges: f,
-		relayAddress: T,
+		relayAddress: E,
 		recipient: p,
-		signer: T,
+		signer: E,
 		functionName: "transact",
-		accounts: D,
-		relayerFee: w.flatFee,
-		variableRate: w.variableRate,
+		accounts: O,
+		relayerFee: T.flatFee,
+		variableRate: T.variableRate,
 		submit: {
 			mode: r.Relayer,
-			adminData: O
+			adminData: k
 		}
 	});
 };

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(`../../types/transact.types.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../../functions/pre-transaction/constructAdminData.cjs`),i=require(`../../functions/pre-transaction/getFeeStructure.cjs`),a=require(`../../functions/pre-transaction/getExternalSwapAddress.cjs`);require(`../../functions/pre-transaction/index.cjs`);const o=require(`./hinkalTransact.cjs`),s=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var c=async(c,l,u,d,f,p,m,h)=>{let g=n.validateAndGetChainId(l),_=l.map(e=>e.erc20TokenAddress),v=await c.getEthereumAddressByChain(g),y=m??await i.getFeeStructure(g,p,_,d,void 0,35n);await s.mergeWithFeeStructure(g,_,u,y);let b=a.getExternalSwapAddress(g,d),x=[!1,!0,!1].slice(0,u.length),S=await c.getRandomRelay(g,!0);if(!S)throw Error(e.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let C=r.constructAdminData(h,g,_,u,v,l);return o.hinkalTransact(c,{chainId:g,erc20Addresses:_,amountChanges:u,externalAddress:b,externalActionId:d,externalActionMetadata:f,onChainCreation:x,feeStructure:y,relay:S,submit:{mode:t.SubmitMode.Relayer,adminData:C}})};exports.hinkalSwap=c;
+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

@@ -2,38 +2,41 @@ import "../../constants/protocol.constants.mjs";
 import { transactionErrorCodes as e } from "../../error-handling/error-codes.constants.mjs";
 import { SubmitMode as t } from "../../types/transact.types.mjs";
 import { validateAndGetChainId as n } from "../../functions/utils/token-check.utils.mjs";
-import { constructAdminData as r } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { getFeeStructure as i } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { getExternalSwapAddress as a } from "../../functions/pre-transaction/getExternalSwapAddress.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 { hinkalTransact as o } from "./hinkalTransact.mjs";
-import { mergeWithFeeStructure as s } 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 c = async (c, l, u, d, f, p, m, h) => {
-	let g = n(l), _ = l.map((e) => e.erc20TokenAddress), v = await c.getEthereumAddressByChain(g), y = m ?? await i(g, p, _, d, void 0, 35n);
-	await s(g, _, u, y);
-	let b = a(g, d), x = [
+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, u.length), S = await c.getRandomRelay(g, !0);
-	if (!S) throw Error(e.RELAYER_NOT_AVAILABLE);
-	let C = r(h, g, _, u, v, l);
-	return o(c, {
-		chainId: g,
-		erc20Addresses: _,
-		amountChanges: u,
-		externalAddress: b,
-		externalActionId: d,
-		externalActionMetadata: f,
-		onChainCreation: x,
-		feeStructure: y,
-		relay: S,
+	].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: C
+			adminData: E
 		}
 	});
 };
 //#endregion
-export { c as hinkalSwap };
+export { u as hinkalSwap };

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

@@ -1 +1 @@
-const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../types/hinkal.types.cjs`),n=require(`../utxo/Utxo.cjs`),r=require(`../../types/transact.types.cjs`),i=require(`../../functions/web3/events/getShieldedBalance.cjs`),a=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),o=require(`../../functions/snarkjs/common.snarkjs.cjs`),s=require(`../../functions/snarkjs/constructTxEnclave.cjs`),c=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),l=require(`../../functions/web3/functionCalls/submitProof.cjs`);var u=2,d=6,f=(e,t)=>{let r=Math.max(...t.map(e=>e.length))<=u?u:d;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<r;)a.push(new n.Utxo({amount:0n,erc20TokenAddress:i.erc20TokenAddress,mintAddress:i.mintAddress,nullifyingKey:e.getShieldedPrivateKey(),spendingPublicKey:e.getSpendingKeyPair().pubSpendingBJJPoint}));return a})},p=async(n,r,o)=>{let{chainId:s,erc20Addresses:l,amountChanges:u,externalAddress:d,externalActionId:p,externalActionMetadata:m,feeStructure:h,relay:g,onChainCreation:_,recipientAddress:v,recipientAmounts:y,useBlockedUtxos:b,inputUtxos:x,forceEmptyUtxos:S,originalSender:C,subAccountPrivateKey:w,emporiumOps:T}=r,E=x?f(o,x):[...await i.addPaddingToUtxos(n,s,l,u,void 0,S,b)],D=a.buildOutputUtxos(o,E,u,v,y),{zkCallData:O,circomData:k,dimData:A,commitmentValidationData:j}=await c.constructZkProof(n.merkleTreeHinkalByChain[s],E,D,o,p??0n,d,T??m??`0x00`,h??t.zeroFeeStructure,g??e.zeroAddress,s,_,void 0,C,w);return{zkCallData:O,circomData:k,dimData:A,commitmentValidationData:j}},m=async(e,t,n)=>{let{chainId:r,erc20Addresses:i,externalAddress:a,amountChanges:o,relay:c,feeStructure:l,externalActionId:u,externalActionMetadata:d,onChainCreation:f,recipientAddress:p,recipientAmounts:m,useBlockedUtxos:h,createBlockedUtxos:g,skipLock:_,selfOutputAmounts:v,forceEmptyUtxos:y,messageSeed:b,inputUtxos:x,originalSender:S}=t,{jobId:C,signedMessageHash:w}=await s.prepareTxEnclaveCall(e,{chainId:r,erc20Addresses:i,externalAddress:a,originalSender:S,amountChanges:o,relay:c,feeStructure:l,externalActionId:u,externalActionMetadata:d,onChainCreation:f,recipientAddress:p,recipientAmounts:m,useBlockedUtxos:h,createBlockedUtxos:g,skipLock:_,selfOutputAmounts:v,forceEmptyUtxos:y,messageSeed:b,inputCommitments:s.collectInputCommitments(x)},n),{R8:T,S:E}=n.signEddsa(BigInt(w));return{jobId:C,eddsaSignature:{R8:T,S:E}}},h=async(e,t,n)=>{let i=await l.submitProof(e,t,n);return t.submit.mode!==r.SubmitMode.ProofOnly&&t.onTxSubmitLocally?.(n.circomData),i},g=async(e,t)=>{if(t.userKeys&&!t.inputUtxos)throw Error(`hinkalTransact: userKeys requires explicit inputUtxos`);let n=t.userKeys??e.userKeys,{chainId:i,submit:a}=t;if(e.generateProofRemotely){let{jobId:c,eddsaSignature:l}=await m(e,t,n);if(a.mode===r.SubmitMode.Relayer)return s.finalizeTxEnclaveCallRelay(c,l,i,{adminData:a.adminData,authorizationData:a.authorizationData,withUniswapWorkAround:a.withUniswapWorkAround});let{zkCallData:u,circomData:d,dimData:f,commitmentValidationData:p,tronProofSignature:g}=await s.finalizeTxEnclaveCall(c,l);return h(e,t,{zkCallData:u,circomData:o.deserializeCircomData(d),dimData:f,commitmentValidationData:p,tronProofSignature:g})}return h(e,t,await p(e,t,n))};exports.hinkalTransact=g;
+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)],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.mjs

@@ -1,21 +1,23 @@
-import { zeroAddress as e } from "../../constants/protocol.constants.mjs";
-import { zeroFeeStructure as t } from "../../types/hinkal.types.mjs";
-import { Utxo as n } from "../utxo/Utxo.mjs";
-import { SubmitMode as r } from "../../types/transact.types.mjs";
-import { addPaddingToUtxos as i } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { buildOutputUtxos as a } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { deserializeCircomData as o } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { collectInputCommitments as s, finalizeTxEnclaveCall as c, finalizeTxEnclaveCallRelay as l, prepareTxEnclaveCall as u } from "../../functions/snarkjs/constructTxEnclave.mjs";
-import { constructZkProof as d } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { submitProof as f } from "../../functions/web3/functionCalls/submitProof.mjs";
+import { networkRegistry as e } from "../../constants/chains.constants.mjs";
+import { zeroAddress as t } from "../../constants/protocol.constants.mjs";
+import { zeroFeeStructure as n } from "../../types/hinkal.types.mjs";
+import { Utxo as r } from "../utxo/Utxo.mjs";
+import { SubmitMode as i } from "../../types/transact.types.mjs";
+import { addPaddingToUtxos as a } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { buildOutputUtxos as o } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { deserializeCircomData as s } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { collectInputCommitments as c, finalizeTxEnclaveCall as l, finalizeTxEnclaveCallRelay as u, prepareTxEnclaveCall as d } from "../../functions/snarkjs/constructTxEnclave.mjs";
+import { speculativeMerkleTree as f } from "../../functions/pre-transaction/speculativeUtxo.mjs";
+import { constructZkProof as p } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { submitProof as m } from "../../functions/web3/functionCalls/submitProof.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalTransact.ts
-var p = 2, m = 6, h = (e, t) => {
-	let r = Math.max(...t.map((e) => e.length)) <= p ? p : m;
+var h = 2, g = 6, _ = (e, t) => {
+	let n = Math.max(...t.map((e) => e.length)) <= h ? h : g;
 	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 < r;) a.push(new n({
+		for (; a.length < n;) a.push(new r({
 			amount: 0n,
 			erc20TokenAddress: i.erc20TokenAddress,
 			mintAddress: i.mintAddress,
@@ -24,66 +26,81 @@ var p = 2, m = 6, h = (e, t) => {
 		}));
 		return a;
 	});
-}, g = async (n, r, o) => {
-	let { chainId: s, erc20Addresses: c, amountChanges: l, externalAddress: u, externalActionId: f, externalActionMetadata: p, feeStructure: m, relay: g, onChainCreation: _, recipientAddress: v, recipientAmounts: y, useBlockedUtxos: b, inputUtxos: x, forceEmptyUtxos: S, originalSender: C, subAccountPrivateKey: w, emporiumOps: T } = r, E = x ? h(o, x) : [...await i(n, s, c, l, void 0, S, b)], D = a(o, E, l, v, y), { zkCallData: O, circomData: k, dimData: A, commitmentValidationData: j } = await d(n.merkleTreeHinkalByChain[s], E, D, o, f ?? 0n, u, T ?? p ?? "0x00", m ?? t, g ?? e, s, _, void 0, C, w);
+}, v = (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({
+		amount: t,
+		erc20TokenAddress: i.erc20TokenAddress,
+		mintAddress: i.mintAddress,
+		nullifyingKey: e.getShieldedPrivateKey(),
+		timeStamp: i.timeStamp,
+		spendingPublicKey: e.getSpendingKeyPair().pubSpendingBJJPoint
+	}))];
+}, y = async (e, r, i) => {
+	let { chainId: s, erc20Addresses: c, amountChanges: l, externalAddress: u, externalActionId: d, externalActionMetadata: m, feeStructure: h, relay: g, 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 ? _(i, C) : [...await a(e, s, c, l, void 0, w, S)], N = o(i, M, l, b, x), P = k ? v(i, N, k) : N, F = e.merkleTreeHinkalByChain[s], I = A ? f(F, M, A.pendingLeaves) : F, { zkCallData: L, circomData: R, dimData: z, commitmentValidationData: B } = await p(I, M, P, i, d ?? 0n, u, D ?? m ?? "0x00", h ?? n, g ?? t, s, y, void 0, T, E, void 0, O, I !== F, j);
 	return {
-		zkCallData: O,
-		circomData: k,
-		dimData: A,
-		commitmentValidationData: j
+		zkCallData: L,
+		circomData: R,
+		dimData: z,
+		commitmentValidationData: B
 	};
-}, _ = async (e, t, n) => {
-	let { chainId: r, erc20Addresses: i, externalAddress: a, amountChanges: o, relay: c, feeStructure: l, 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 } = t, { jobId: w, signedMessageHash: T } = await u(e, {
-		chainId: r,
-		erc20Addresses: i,
-		externalAddress: a,
-		originalSender: C,
-		amountChanges: o,
-		relay: c,
-		feeStructure: l,
-		externalActionId: d,
-		externalActionMetadata: f,
-		onChainCreation: p,
-		recipientAddress: m,
-		recipientAmounts: h,
-		useBlockedUtxos: g,
-		createBlockedUtxos: _,
-		skipLock: v,
-		selfOutputAmounts: y,
-		forceEmptyUtxos: b,
-		messageSeed: x,
-		inputCommitments: s(S)
-	}, n), { R8: E, S: D } = n.signEddsa(BigInt(T));
+}, b = async (t, n, r) => {
+	let { chainId: i, erc20Addresses: a, externalAddress: o, amountChanges: s, relay: l, feeStructure: u, externalActionId: f, externalActionMetadata: p, onChainCreation: m, recipientAddress: h, recipientAmounts: g, useBlockedUtxos: _, createBlockedUtxos: v, skipLock: y, selfOutputAmounts: b, forceEmptyUtxos: x, messageSeed: S, inputUtxos: C, originalSender: w, speculative: T, slippageValues: E } = n, { jobId: D, signedMessageHash: O } = await d(t, {
+		chainId: i,
+		hinkalAddress: e[i].contractData.hinkalAddress,
+		erc20Addresses: a,
+		externalAddress: o,
+		originalSender: w,
+		amountChanges: s,
+		relay: l,
+		feeStructure: u,
+		externalActionId: f,
+		externalActionMetadata: p,
+		onChainCreation: m,
+		recipientAddress: h,
+		recipientAmounts: g,
+		useBlockedUtxos: _,
+		createBlockedUtxos: v,
+		skipLock: y,
+		selfOutputAmounts: b,
+		forceEmptyUtxos: x,
+		messageSeed: S,
+		inputCommitments: T ? void 0 : c(C),
+		speculative: T,
+		slippageValues: E
+	}, r), { R8: k, S: A } = r.signEddsa(BigInt(O));
 	return {
-		jobId: w,
+		jobId: D,
 		eddsaSignature: {
-			R8: E,
-			S: D
+			R8: k,
+			S: A
 		}
 	};
-}, v = async (e, t, n) => {
-	let i = await f(e, t, n);
-	return t.submit.mode !== r.ProofOnly && t.onTxSubmitLocally?.(n.circomData), i;
-}, y = async (e, t) => {
+}, x = async (e, t, n) => {
+	let r = await m(e, t, n);
+	return t.submit.mode !== i.ProofOnly && t.onTxSubmitLocally?.(n.circomData), r;
+}, S = async (e, t) => {
 	if (t.userKeys && !t.inputUtxos) throw Error("hinkalTransact: userKeys requires explicit inputUtxos");
-	let n = t.userKeys ?? e.userKeys, { chainId: i, submit: a } = t;
+	let n = t.userKeys ?? e.userKeys, { chainId: r, submit: a } = t;
 	if (e.generateProofRemotely) {
-		let { jobId: s, eddsaSignature: u } = await _(e, t, n);
-		if (a.mode === r.Relayer) return l(s, u, i, {
+		let { jobId: o, eddsaSignature: c } = await b(e, t, n);
+		if (a.mode === i.Relayer) return u(o, c, r, {
 			adminData: a.adminData,
 			authorizationData: a.authorizationData,
 			withUniswapWorkAround: a.withUniswapWorkAround
 		});
-		let { zkCallData: d, circomData: f, dimData: p, commitmentValidationData: m, tronProofSignature: h } = await c(s, u);
-		return v(e, t, {
+		let { zkCallData: d, circomData: f, dimData: p, commitmentValidationData: m, tronProofSignature: h } = await l(o, c);
+		return x(e, t, {
 			zkCallData: d,
-			circomData: o(f),
+			circomData: s(f),
 			dimData: p,
 			commitmentValidationData: m,
 			tronProofSignature: h
 		});
 	}
-	return v(e, t, await g(e, t, n));
+	return x(e, t, await y(e, t, n));
 };
 //#endregion
-export { y as hinkalTransact };
+export { S as hinkalTransact };

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

@@ -1 +1 @@
-const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../../functions/utils/tron.utils.cjs`),n=require(`../../types/external-action.types.cjs`),r=require(`../../types/transact.types.cjs`),i=require(`../../functions/utils/token-check.utils.cjs`),a=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),o=require(`../../functions/pre-transaction/constructAdminData.cjs`),s=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const c=require(`./hinkalTransact.cjs`),l=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var u=async(u,d,f,p,m,h,g,_)=>{let v=i.validateAndGetChainId(d),y=t.addressToHexFormat(await u.getEthereumAddressByChain(v)),b=d.map(e=>e.erc20TokenAddress),x=await a.modifyVolatileTokenAmountChanges(v,d,f),S=d[0];if(!S)throw Error(`Withdraw Action: No Token Found`);let C;m||(C=g??await s.getFeeStructure(v,h,b,n.ExternalActionId.Transact),await l.mergeWithFeeStructure(v,b,x,C));let w=m?void 0:await u.getRandomRelay(v,!0);if(!m&&!w)throw Error(e.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let T=m?{mode:r.SubmitMode.Self,erc20Tokens:[S],approvalAmounts:[x[0]]}:{mode:r.SubmitMode.Relayer,adminData:o.constructAdminData(_,v,b,x,y)};return c.hinkalTransact(u,{chainId:v,erc20Addresses:b,amountChanges:x,externalAddress:t.addressToHexFormat(p),feeStructure:C,relay:w,originalSender:m?y:void 0,submit:T})};exports.hinkalWithdraw=u;
+const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../../functions/utils/tron.utils.cjs`),n=require(`../../types/external-action.types.cjs`),r=require(`../../types/transact.types.cjs`),i=require(`../../functions/utils/token-check.utils.cjs`),a=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),o=require(`../../functions/pre-transaction/constructAdminData.cjs`),s=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const c=require(`./hinkalTransact.cjs`),l=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var u=async(u,d,f,p,m,h,g,_,v)=>{let y=i.validateAndGetChainId(d),b=t.addressToHexFormat(await u.getEthereumAddressByChain(y)),x=d.map(e=>e.erc20TokenAddress),S=await a.modifyVolatileTokenAmountChanges(y,d,f),C=d[0];if(!C)throw Error(`Withdraw Action: No Token Found`);let w;m||(w=g??await s.getFeeStructure(y,h,x,n.ExternalActionId.Transact,[],_),g&&_!==void 0&&(w={...w,variableRate:_}),await l.mergeWithFeeStructure(y,x,S,w));let T=m?void 0:await u.getRandomRelay(y,!0);if(!m&&!T)throw Error(e.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let E=m?{mode:r.SubmitMode.Self,erc20Tokens:[C],approvalAmounts:[S[0]]}:{mode:r.SubmitMode.Relayer,adminData:o.constructAdminData(v,y,x,S,b)};return c.hinkalTransact(u,{chainId:y,erc20Addresses:x,amountChanges:S,externalAddress:t.addressToHexFormat(p),feeStructure:w,relay:T,originalSender:m?b:void 0,submit:E})};exports.hinkalWithdraw=u;

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

@@ -4,4 +4,4 @@ import { AdminTransactionType, ERC20Token } from '../../types';
 import { ethers } from 'ethers';
 export declare const hinkalWithdraw: (hinkal: IHinkal, erc20Tokens: ERC20Token[], deltaAmountsBase: bigint[], // should differentiate now: amountChanges is about off-chain utxos
 recipientAddress: string, // for Tron this address may be passed as base58
-isRelayerOff: boolean, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<ethers.TransactionResponse | string>;
+isRelayerOff: boolean, feeToken?: string, feeStructureOverride?: FeeStructure, variableRateOverride?: bigint, action?: AdminTransactionType) => Promise<ethers.TransactionResponse | string>;

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

@@ -10,30 +10,33 @@ import "../../functions/pre-transaction/index.mjs";
 import { hinkalTransact as c } from "./hinkalTransact.mjs";
 import { mergeWithFeeStructure as l } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalWithdraw.ts
-var u = async (u, d, f, p, m, h, g, _) => {
-	let v = i(d), y = t(await u.getEthereumAddressByChain(v)), b = d.map((e) => e.erc20TokenAddress), x = await a(v, d, f), S = d[0];
-	if (!S) throw Error("Withdraw Action: No Token Found");
-	let C;
-	m || (C = g ?? await s(v, h, b, n.Transact), await l(v, b, x, C));
-	let w = m ? void 0 : await u.getRandomRelay(v, !0);
-	if (!m && !w) throw Error(e.RELAYER_NOT_AVAILABLE);
-	let T = m ? {
+var u = async (u, d, f, p, m, h, g, _, v) => {
+	let y = i(d), b = t(await u.getEthereumAddressByChain(y)), x = d.map((e) => e.erc20TokenAddress), S = await a(y, d, f), C = d[0];
+	if (!C) throw Error("Withdraw Action: No Token Found");
+	let w;
+	m || (w = g ?? await s(y, h, x, n.Transact, [], _), g && _ !== void 0 && (w = {
+		...w,
+		variableRate: _
+	}), await l(y, x, S, w));
+	let T = m ? void 0 : await u.getRandomRelay(y, !0);
+	if (!m && !T) throw Error(e.RELAYER_NOT_AVAILABLE);
+	let E = m ? {
 		mode: r.Self,
-		erc20Tokens: [S],
-		approvalAmounts: [x[0]]
+		erc20Tokens: [C],
+		approvalAmounts: [S[0]]
 	} : {
 		mode: r.Relayer,
-		adminData: o(_, v, b, x, y)
+		adminData: o(v, y, x, S, b)
 	};
 	return c(u, {
-		chainId: v,
-		erc20Addresses: b,
-		amountChanges: x,
+		chainId: y,
+		erc20Addresses: x,
+		amountChanges: S,
 		externalAddress: t(p),
-		feeStructure: C,
-		relay: w,
-		originalSender: m ? y : void 0,
-		submit: T
+		feeStructure: w,
+		relay: T,
+		originalSender: m ? b : void 0,
+		submit: E
 	});
 };
 //#endregion