@gurge/sdk 0.3.150 → 0.3.151

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

@@ -0,0 +1,106 @@
+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 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 < n;) a.push(new r({
+			amount: 0n,
+			erc20TokenAddress: i.erc20TokenAddress,
+			mintAddress: i.mintAddress,
+			nullifyingKey: e.getShieldedPrivateKey(),
+			spendingPublicKey: e.getSpendingKeyPair().pubSpendingBJJPoint
+		}));
+		return a;
+	});
+}, 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, y)], 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: L,
+		circomData: R,
+		dimData: z,
+		commitmentValidationData: B
+	};
+}, 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: D,
+		eddsaSignature: {
+			R8: k,
+			S: A
+		}
+	};
+}, 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: r, submit: a } = t;
+	if (e.generateProofRemotely) {
+		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 l(o, c);
+		return x(e, t, {
+			zkCallData: d,
+			circomData: s(f),
+			dimData: p,
+			commitmentValidationData: m,
+			tronProofSignature: h
+		});
+	}
+	return x(e, t, await y(e, t, n));
+};
+//#endregion
+export { S as hinkalTransact };

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

@@ -1 +1 @@
-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/time.utils.cjs`),i=require(`../../types/external-action.types.cjs`),a=require(`../../functions/utils/addresses.cjs`),o=require(`../../functions/utils/tron.utils.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/web3/events/getShieldedBalance.cjs`),l=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),u=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const p=require(`../../functions/utils/fees.utils.cjs`),m=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),h=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),g=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var _=async(e,t,n,i,a,o)=>{let s=[...await c.addPaddingToUtxos(e,t,n,i)],u=[],d=r.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=l.outputUtxoProcessing(e.userKeys,s[t],i[t],d,!0,a,t===0?o:0n);u.push(n)}return{inputUtxosArray:s,outputUtxosArray:u}},v=async(r,c,l,v,y,b,x)=>{let S=s.validateAndGetChainId(c),C=e.isTronLike(S);if(!a.isValidPrivateAddress(v))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let w=o.addressToHexFormat(await r.getEthereumAddressByChain(S)),T=c.map(e=>e.erc20TokenAddress),E=await u.modifyVolatileTokenAmountChanges(S,c,l),D=b??await f.getFeeStructure(S,y,T,i.ExternalActionId.Transact,[],5n);D.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let O=c[0];if(!O)throw Error(`Transfer Action: No Token Found`);let k=-E[0],A=await p.calculateModifiedFeeStructure(S,O,k,D);await g.mergeWithFeeStructure(S,T,E,A);let[j,{inputUtxosArray:M,outputUtxosArray:N}]=await Promise.all([r.getRandomRelay(S,!0),_(r,S,T,E,v,k)]);if(!j)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let P={externalActionId:0n,externalAddress:j,externalActionMetadata:`0x00`},{zkCallData:F,circomData:I,dimData:L,commitmentValidationData:R}=await m.constructZkProof(r.merkleTreeHinkalByChain[S],M,N,r.userKeys,P.externalActionId,P.externalAddress,P.externalActionMetadata,r.generateProofRemotely,A,j,S),z=await o.reorderZkCallData(C,F,L,I);return await h.transactCallRelayer(S,F,L,I,R,void 0,void 0,d.constructAdminData(x,S,T,E,w),z)};exports.hinkalTransfer=v;
+const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../functions/utils/tron.utils.cjs`),r=require(`../../functions/utils/addresses.cjs`),i=require(`../../types/external-action.types.cjs`),a=require(`../../types/transact.types.cjs`),o=require(`../../functions/utils/token-check.utils.cjs`),s=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),c=require(`../../functions/pre-transaction/constructAdminData.cjs`),l=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const u=require(`./hinkalTransact.cjs`),d=require(`../../functions/utils/fees.utils.cjs`),f=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var p=async(p,m,h,g,_,v,y)=>{let b=o.validateAndGetChainId(m);if(!r.isValidPrivateAddress(g))throw Error(t.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let x=n.addressToHexFormat(await p.getEthereumAddressByChain(b)),S=m.map(e=>e.erc20TokenAddress),C=await s.modifyVolatileTokenAmountChanges(b,m,h),w=v??await l.getFeeStructure(b,_,S,i.ExternalActionId.Transact,[],25n);w.variableRate||=e.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let T=m[0];if(!T)throw Error(`Transfer Action: No Token Found`);let E=-C[0],D=await d.calculateModifiedFeeStructure(b,T,E,w);await f.mergeWithFeeStructure(b,S,C,D);let O=await p.getRandomRelay(b,!0);if(!O)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let k=c.constructAdminData(y,b,S,C,x);return u.hinkalTransact(p,{chainId:b,erc20Addresses:S,amountChanges:C,externalAddress:O,feeStructure:D,relay:O,recipientAddress:[g],recipientAmounts:[S.map((e,t)=>t===0?E:0n)],submit:{mode:a.SubmitMode.Relayer,adminData:k}})};exports.hinkalTransfer=p;

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

@@ -1,49 +1,44 @@
-import { isTronLike as e } from "../../constants/chains.constants.mjs";
-import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as t } from "../../constants/protocol.constants.mjs";
-import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
-import { getCurrentTimeInSeconds as r } from "../../functions/utils/time.utils.mjs";
+import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as e } from "../../constants/protocol.constants.mjs";
+import { transactionErrorCodes as t } from "../../error-handling/error-codes.constants.mjs";
+import { addressToHexFormat as n } from "../../functions/utils/tron.utils.mjs";
+import { isValidPrivateAddress as r } from "../../functions/utils/addresses.mjs";
 import { ExternalActionId as i } from "../../types/external-action.types.mjs";
-import { isValidPrivateAddress as a } from "../../functions/utils/addresses.mjs";
-import { addressToHexFormat as o, reorderZkCallData as s } from "../../functions/utils/tron.utils.mjs";
-import { validateAndGetChainId as c } from "../../functions/utils/token-check.utils.mjs";
-import { addPaddingToUtxos as l } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as u } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { modifyVolatileTokenAmountChanges as d } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
-import { constructAdminData as f } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { getFeeStructure as p } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { SubmitMode as a } from "../../types/transact.types.mjs";
+import { validateAndGetChainId as o } from "../../functions/utils/token-check.utils.mjs";
+import { modifyVolatileTokenAmountChanges as s } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
+import { constructAdminData as c } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getFeeStructure as l } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { calculateModifiedFeeStructure as m } from "../../functions/utils/fees.utils.mjs";
-import { constructZkProof as h } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayer as g } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { mergeWithFeeStructure as _ } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { hinkalTransact as u } from "./hinkalTransact.mjs";
+import { calculateModifiedFeeStructure as d } from "../../functions/utils/fees.utils.mjs";
+import { mergeWithFeeStructure as f } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalTransfer.ts
-var v = async (e, t, n, i, a, o) => {
-	let s = [...await l(e, t, n, i)], c = [], d = r().toString();
-	for (let t = 0; t < n.length; t += 1) {
-		let { outputUtxos: n } = u(e.userKeys, s[t], i[t], d, !0, a, t === 0 ? o : 0n);
-		c.push(n);
-	}
-	return {
-		inputUtxosArray: s,
-		outputUtxosArray: c
-	};
-}, y = async (r, l, u, y, b, x, S) => {
-	let C = c(l), w = e(C);
-	if (!a(y)) throw Error(n.RECIPIENT_FORMAT_INCORRECT);
-	let T = o(await r.getEthereumAddressByChain(C)), E = l.map((e) => e.erc20TokenAddress), D = await d(C, l, u), O = x ?? await p(C, b, E, i.Transact, [], 5n);
-	O.variableRate ||= t;
-	let k = l[0];
-	if (!k) throw Error("Transfer Action: No Token Found");
-	let A = -D[0], j = await m(C, k, A, O);
-	await _(C, E, D, j);
-	let [M, { inputUtxosArray: N, outputUtxosArray: P }] = await Promise.all([r.getRandomRelay(C, !0), v(r, C, E, D, y, A)]);
-	if (!M) throw Error(n.RELAYER_NOT_AVAILABLE);
-	let F = {
-		externalActionId: 0n,
-		externalAddress: M,
-		externalActionMetadata: "0x00"
-	}, { zkCallData: I, circomData: L, dimData: R, commitmentValidationData: z } = await h(r.merkleTreeHinkalByChain[C], N, P, r.userKeys, F.externalActionId, F.externalAddress, F.externalActionMetadata, r.generateProofRemotely, j, M, C), B = await s(w, I, R, L);
-	return await g(C, I, R, L, z, void 0, void 0, f(S, C, E, D, T), B);
+var p = async (p, m, h, g, _, v, y) => {
+	let b = o(m);
+	if (!r(g)) throw Error(t.RECIPIENT_FORMAT_INCORRECT);
+	let x = n(await p.getEthereumAddressByChain(b)), S = m.map((e) => e.erc20TokenAddress), C = await s(b, m, h), w = v ?? await l(b, _, S, i.Transact, [], 25n);
+	w.variableRate ||= e;
+	let T = m[0];
+	if (!T) throw Error("Transfer Action: No Token Found");
+	let E = -C[0], D = await d(b, T, E, w);
+	await f(b, S, C, D);
+	let O = await p.getRandomRelay(b, !0);
+	if (!O) throw Error(t.RELAYER_NOT_AVAILABLE);
+	let k = c(y, b, S, C, x);
+	return u(p, {
+		chainId: b,
+		erc20Addresses: S,
+		amountChanges: C,
+		externalAddress: O,
+		feeStructure: D,
+		relay: O,
+		recipientAddress: [g],
+		recipientAmounts: [S.map((e, t) => t === 0 ? E : 0n)],
+		submit: {
+			mode: a.Relayer,
+			adminData: k
+		}
+	});
 };
 //#endregion
-export { y as hinkalTransfer };
+export { p as hinkalTransfer };

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../../types/external-action.types.cjs`),o=require(`../../functions/utils/tron.utils.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/web3/events/getShieldedBalance.cjs`),l=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),u=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const p=require(`../../functions/utils/fees.utils.cjs`),m=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),h=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),g=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),_=require(`../../functions/web3/functionCalls/transactCallDirectTron.cjs`),v=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var y=async(e,t,n,r)=>{let a=[...await c.addPaddingToUtxos(e,t,n,r)],o=[],s=i.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=l.outputUtxoProcessing(e.userKeys,a[t],r[t],s);o.push(n)}return{inputUtxosArray:a,outputUtxosArray:o}},b=async(i,c,l,b,x,S,C,w)=>{let T=s.validateAndGetChainId(c),E=e.isTronLike(T),D=o.addressToHexFormat(await i.getEthereumAddressByChain(T)),O=c.map(e=>e.erc20TokenAddress),k=await u.modifyVolatileTokenAmountChanges(T,c,l),A=c[0];if(!A)throw Error(`Deposit Action: No Token Found`);let j;if(!x){let e=C??await f.getFeeStructure(T,S,O,a.ExternalActionId.Transact);j=await p.calculateModifiedFeeStructure(T,A,-k[0],e),await v.mergeWithFeeStructure(T,O,k,j)}let M={externalActionId:0n,externalAddress:o.addressToHexFormat(b),externalActionMetadata:`0x00`},[N,{inputUtxosArray:P,outputUtxosArray:F}]=await Promise.all([i.getRandomRelay(T,!0),y(i,T,O,k)]);if(!x&&!N)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let{zkCallData:I,circomData:L,dimData:R,commitmentValidationData:z}=await m.constructZkProof(i.merkleTreeHinkalByChain[T],P,F,i.userKeys,M.externalActionId,M.externalAddress,M.externalActionMetadata,i.generateProofRemotely,j??n.zeroFeeStructure,x?t.zeroAddress:N,T,void 0,void 0,x?D:void 0),B=E&&x?void 0:await o.reorderZkCallData(E,I,R,L);if(x){if(!A)throw Error(`Withdraw Action: No Token Found`);return E?await _.transactCallDirectTron(i,T,k[0],A,I,L,R):await h.transactCallDirect(i,T,k[0],A,I,L,R)}return await g.transactCallRelayer(T,I,R,L,z,void 0,void 0,d.constructAdminData(w,T,O,k,D),B)};exports.hinkalWithdraw=b;
+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

@@ -1,54 +1,43 @@
-import { isTronLike 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 { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
-import { getCurrentTimeInSeconds as i } from "../../functions/utils/time.utils.mjs";
-import { ExternalActionId as a } from "../../types/external-action.types.mjs";
-import { addressToHexFormat as o, reorderZkCallData as s } from "../../functions/utils/tron.utils.mjs";
-import { validateAndGetChainId as c } from "../../functions/utils/token-check.utils.mjs";
-import { addPaddingToUtxos as l } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as u } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { modifyVolatileTokenAmountChanges as d } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
-import { constructAdminData as f } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { getFeeStructure as p } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { transactionErrorCodes as e } from "../../error-handling/error-codes.constants.mjs";
+import { addressToHexFormat as t } from "../../functions/utils/tron.utils.mjs";
+import { ExternalActionId as n } from "../../types/external-action.types.mjs";
+import { SubmitMode as r } from "../../types/transact.types.mjs";
+import { validateAndGetChainId as i } from "../../functions/utils/token-check.utils.mjs";
+import { modifyVolatileTokenAmountChanges as a } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
+import { constructAdminData as o } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getFeeStructure as s } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { calculateModifiedFeeStructure as m } from "../../functions/utils/fees.utils.mjs";
-import { constructZkProof as h } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallDirect as g } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-import { transactCallRelayer as _ } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { transactCallDirectTron as v } from "../../functions/web3/functionCalls/transactCallDirectTron.mjs";
-import { mergeWithFeeStructure as y } from "../../functions/pre-transaction/merge-with-fee-structure.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 b = async (e, t, n, r) => {
-	let a = [...await l(e, t, n, r)], o = [], s = i().toString();
-	for (let t = 0; t < n.length; t += 1) {
-		let { outputUtxos: n } = u(e.userKeys, a[t], r[t], s);
-		o.push(n);
-	}
-	return {
-		inputUtxosArray: a,
-		outputUtxosArray: o
+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: [C],
+		approvalAmounts: [S[0]]
+	} : {
+		mode: r.Relayer,
+		adminData: o(v, y, x, S, b)
 	};
-}, x = async (i, l, u, x, S, C, w, T) => {
-	let E = c(l), D = e(E), O = o(await i.getEthereumAddressByChain(E)), k = l.map((e) => e.erc20TokenAddress), A = await d(E, l, u), j = l[0];
-	if (!j) throw Error("Deposit Action: No Token Found");
-	let M;
-	if (!S) {
-		let e = w ?? await p(E, C, k, a.Transact);
-		M = await m(E, j, -A[0], e), await y(E, k, A, M);
-	}
-	let N = {
-		externalActionId: 0n,
-		externalAddress: o(x),
-		externalActionMetadata: "0x00"
-	}, [P, { inputUtxosArray: F, outputUtxosArray: I }] = await Promise.all([i.getRandomRelay(E, !0), b(i, E, k, A)]);
-	if (!S && !P) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let { zkCallData: L, circomData: R, dimData: z, commitmentValidationData: B } = await h(i.merkleTreeHinkalByChain[E], F, I, i.userKeys, N.externalActionId, N.externalAddress, N.externalActionMetadata, i.generateProofRemotely, M ?? n, S ? t : P, E, void 0, void 0, S ? O : void 0), V = D && S ? void 0 : await s(D, L, z, R);
-	if (S) {
-		if (!j) throw Error("Withdraw Action: No Token Found");
-		return D ? await v(i, E, A[0], j, L, R, z) : await g(i, E, A[0], j, L, R, z);
-	}
-	return await _(E, L, z, R, B, void 0, void 0, f(T, E, k, A, O), V);
+	return c(u, {
+		chainId: y,
+		erc20Addresses: x,
+		amountChanges: S,
+		externalAddress: t(p),
+		feeStructure: w,
+		relay: T,
+		originalSender: m ? b : void 0,
+		submit: E
+	});
 };
 //#endregion
-export { x as hinkalWithdraw };
+export { u as hinkalWithdraw };

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../functions/utils/amounts.utils.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(`../../functions/utils/encodeTokenWithId.cjs`),s=require(`../../types/external-action.types.cjs`),c=require(`../../functions/utils/tron.utils.cjs`),l=require(`../../functions/web3/events/getInputUtxoAndBalance.cjs`),u=require(`../../functions/utils/token-check.utils.cjs`),d=require(`../../functions/web3/events/getShieldedBalance.cjs`),f=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),p=require(`../../functions/snarkjs/common.snarkjs.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`),h=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),g=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),v=require(`../../functions/auto-deposit-back-helpers/update-hinkal.cjs`),y=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);let b=require(`ethers`);var x=6,S=async(e,t,n,r)=>{let i=[...await d.addPaddingToUtxos(e,t,n,r,void 0,void 0,!1,!0)],o=[],s=a.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=f.outputUtxoProcessing(e.userKeys,i[t],r[t],s);o.push(n)}return{inputUtxosArray:i,outputUtxosArray:o}},C=async(e,t,n,r)=>{let i=[...await d.addPaddingToUtxos(e,t,n,r,6,void 0,!1,!0)][0],o=a.getCurrentTimeInSeconds().toString(),{outputUtxos:s}=f.outputUtxoProcessing(e.userKeys,i,r[0],o);return{inputUtxos:i,outputUtxos:s}},w=async(t,r,i,a,o)=>{let l=e.isTronLike(r),u=[i.erc20TokenAddress],d=i.erc20TokenAddress,[f,p]=await Promise.all([m.getFeeStructure(r,d,u,s.ExternalActionId.Transact),t.getRandomRelay(r,!0)]);if(!p)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let g=c.addressToHexFormat(o),b=a-f.flatFee;if(b<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${a}, Fee: ${f.flatFee}`);let x=[-b];await y.mergeWithFeeStructure(r,u,x,f);let C={externalActionId:0n,externalAddress:g,externalActionMetadata:`0x00`},{inputUtxosArray:w,outputUtxosArray:T}=await S(t,r,u,x),{zkCallData:E,circomData:D,dimData:O,commitmentValidationData:k}=await h.constructZkProof(t.merkleTreeHinkalByChain[r],w,T,t.userKeys,C.externalActionId,C.externalAddress,C.externalActionMetadata,t.generateProofRemotely,f,p,r),A=await c.reorderZkCallData(l,E,O,D);return v.updateHinkal(r,t,D.inputNullifiers?.flat(),D.outCommitments?.flat(),D.encryptedOutputs?.flat()),{tx:await _.transactCallRelayer(r,E,O,D,k,void 0,void 0,void 0,A),amountToRecipient:b}},T=async(t,a,o,c,l,u)=>{let d=[o.erc20TokenAddress],{originalDeployer:f}=e.networkRegistry[a].contractData;if(!f)throw Error(`missing data`);let{userKeys:h,merkleTreeHinkalByChain:y}=t,x=o.erc20TokenAddress,[S,w]=await Promise.all([m.getFeeStructure(a,x,d,s.ExternalActionId.Transact,void 0,void 0,{mintTo:d[0],recipient:l,nullifierCount:u}),t.getRandomRelay(a,!0)]);if(!w)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let T=c-S.flatFee;if(T<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${c}, Fee: ${S.flatFee}`);let E=[-T];E[0]-=S.flatFee;let{inputUtxos:D,outputUtxos:O}=await C(t,a,d,E),k=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),t.userKeys.getShieldedPrivateKey()),A={tokenNumber:d.length,nullifierAmount:D.length,outputAmount:O.length},j=p.calcEncryptedOutputs([O])[0][0],M=Array.from(b.ethers.getBytes(j)),{proofAArr:N,proofBArr:P,proofCArr:F,publicInputsArr:I,commitmentValidationData:L}=await g.constructSolanaZkProof(t.generateProofRemotely,y[a],h,[d[0]],[D],[O],k,S.flatFee,S.variableRate,l,w,A,[M],a),R={recipient:l,mint:d[0]===`11111111111111111111111111111111`?void 0:d[0]},z={proofAArr:N,proofBArr:P,proofCArr:F,publicInputsArr:I,encryptedOutputs:[M],relayerFee:S.flatFee.toString(),dimensions:A};return v.updateHinkal(a,t,D.map(e=>e.getNullifier()),p.buildOutCommitments([O]).flat(),[j]),{tx:await _.solanaTransactCallRelayer({chainId:a,relayAddress:w,functionName:`transact`,args:z,accounts:R,commitmentValidationData:L}),amountToRecipient:T}},E=async(t,n,r,i,a,o)=>e.isSolanaLike(n)?T(t,n,r,i,a,o):w(t,n,r,i,a),D=async(e,n,r)=>{let i=[],a=u.validateAndGetChainId([n]),s=o.encodeTokenWithId(a,{erc20TokenAddress:n.erc20TokenAddress,tokenId:0});await e.resetMerkleTreesIfNecessary([a]);let c=((await l.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,useBlockedUtxos:!0,chainId:a,allowRemoteDecryption:e.generateProofRemotely}))?.get(s)??[]).filter(e=>e.amount>0n).sort((e,t)=>Number(t.amount-e.amount));for(let o=0;o<c.length;o+=x){let s=c.slice(o,o+x),{tx:l}=await E(e,a,n,t.countTotalAmountInUtxos(s),r,s.length);i.push(l)}return i};exports.hinkalWithdrawStuckUtxos=D;
+const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../functions/utils/caseInsensitive.utils.cjs`),n=require(`../../functions/utils/amounts.utils.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/utils/encodeTokenWithId.cjs`),a=require(`../../error-handling/logger.cjs`),o=require(`../../functions/utils/tron.utils.cjs`),s=require(`../../functions/utils/addresses.cjs`),c=require(`../../functions/web3/events/getInputUtxoAndBalance.cjs`),l=require(`../../types/external-action.types.cjs`),u=require(`../../types/transact.types.cjs`),d=require(`../../types/solana-transact.types.cjs`),f=require(`../../functions/utils/token-check.utils.cjs`),p=require(`../../functions/snarkjs/constructTxEnclave.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`),h=require(`./hinkalTransact.cjs`),g=require(`../../functions/auto-deposit-back-helpers/update-hinkal.cjs`),_=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`),v=require(`./hinkalSolanaTransact.cjs`);var y=6,b=async(t,n,i,c)=>{let u=i.erc20TokenAddress,d=await t.getEthereumAddressByChain(n),[f,h]=await Promise.all([m.getFeeStructure(n,u,[u],l.ExternalActionId.Transact),t.getRandomRelay(n,!0)]);if(!h)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let g=await p.prepareStuckWithdrawEnclaveCall(t,{chainId:n,hinkalAddress:e.networkRegistry[n].contractData.hinkalAddress,erc20Address:u,externalAddress:o.addressToHexFormat(c),relay:h,feeStructure:f,hashedEthereumAddress:s.hashEthereumAddress(d)}),_=[];for(let e=0;e<g.length;e+=1)try{let{jobId:r,signedMessageHash:i}=g[e],{R8:a,S:o}=t.userKeys.signEddsa(BigInt(i));_.push(await p.finalizeTxEnclaveCallRelay(r,{R8:a,S:o},n))}catch(e){if(!_.length)throw e;return a.Logger.error(`Stuck withdrawal partially submitted (${_.length}/${g.length})`,e),_}return _},x=async(e,t,n)=>{let r=await Promise.all(Array.from({length:y},async(r,i)=>{let a=i+1,o=await m.getFeeStructure(e,t,[t],l.ExternalActionId.Transact,void 0,void 0,{mintTo:t,recipient:n,nullifierCount:a});return[String(a),o]}));return Object.fromEntries(r)},S=async(e,t,n,i)=>{let a=n.erc20TokenAddress,[o,c,l]=await Promise.all([e.getEthereumAddressByChain(t),e.getRandomRelay(t,!0),x(t,a,i)]);if(!c)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let u=await p.prepareSolanaStuckWithdrawEnclaveCall(e,{chainId:t,mintAddress:a,recipient:i,relayAddress:c,accounts:{recipient:i,mint:a===`11111111111111111111111111111111`?void 0:a},feeStructures:l,hashedEthereumAddress:s.hashEthereumAddress(o)}),d=[];for(let n=0;n<u.length;n+=1){let{jobId:r,signedMessageHash:i}=u[n],{R8:a,S:o}=e.userKeys.signEddsa(BigInt(i));d.push(await p.finalizeSolanaTxEnclaveCallRelay(r,{R8:a,S:o},t))}return d},C=async(e,t,n,i,a)=>{let s=[n.erc20TokenAddress],c=n.erc20TokenAddress,[d,f]=await Promise.all([m.getFeeStructure(t,c,s,l.ExternalActionId.Transact),e.getRandomRelay(t,!0)]);if(!f)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let p=o.addressToHexFormat(a),v=i-d.flatFee;if(v<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${i}, Fee: ${d.flatFee}`);let y=[-v];return await _.mergeWithFeeStructure(t,s,y,d),{tx:await h.hinkalTransact(e,{chainId:t,erc20Addresses:s,amountChanges:y,externalAddress:p,feeStructure:d,relay:f,useBlockedUtxos:!0,onTxSubmitLocally:n=>{g.updateHinkal(t,e,n.inputNullifiers?.flat(),n.outCommitments?.flat(),n.encryptedOutputs?.flat())},submit:{mode:u.SubmitMode.Relayer}}),amountToRecipient:v}},w=async(t,n,i,a,o,s)=>{let c=[i.erc20TokenAddress],{originalDeployer:u}=e.networkRegistry[n].contractData;if(!u)throw Error(`missing data`);let f=i.erc20TokenAddress,[p,h]=await Promise.all([m.getFeeStructure(n,f,c,l.ExternalActionId.Transact,void 0,void 0,{mintTo:c[0],recipient:o,nullifierCount:s}),t.getRandomRelay(n,!0)]);if(!h)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let _=a-p.flatFee;if(_<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${a}, Fee: ${p.flatFee}`);let y=[-_];return y[0]-=p.flatFee,{tx:await v.hinkalSolanaTransact(t,{chainId:n,mintAddresses:c,amountChanges:y,relayAddress:h,recipient:o,signer:h,functionName:`transact`,accounts:{recipient:o,mint:c[0]===`11111111111111111111111111111111`?void 0:c[0]},relayerFee:p.flatFee,variableRate:p.variableRate,useBlockedUtxos:!0,onTxSubmitLocally:({inputNullifiers:e,outCommitments:r,encryptedOutputs:i})=>{g.updateHinkal(n,t,e,r,i)},submit:{mode:d.SolanaSubmitMode.Relayer}}),amountToRecipient:_}},T=async(t,n,r,i,a,o)=>e.isSolanaLike(n)?w(t,n,r,i,a,o):C(t,n,r,i,a),E=async(e,n,r)=>{try{return((await e.getStuckShieldedBalances([n])).get(n)??[]).find(e=>t.caseInsensitiveEqual(e.token.erc20TokenAddress,r.erc20TokenAddress))?.balance??0n}catch(e){return a.Logger.error(`Failed to read stuck balance after an empty stuck withdrawal`,e),0n}},D=async(t,o,s)=>{let l=f.validateAndGetChainId([o]);if(t.generateProofRemotely){let n=e.isSolanaLike(l)?await S(t,l,o,s):await b(t,l,o,s);if(!n.length)throw await E(t,l,o)>0n?Error(r.DIRECTLY_SHOW_MESSAGE_ERROR_CODES.INSUFFICIENT_FUNDS_FOR_RECOVERY_FEES):Error(r.transactionErrorCodes.NO_STUCK_BALANCE_TO_WITHDRAW);return n}let u=[],d=i.normalizeTokenAddress(l,o.erc20TokenAddress);await t.resetMerkleTreesIfNecessary([l]);let p=((await c.getInputUtxoAndBalancePerToken({hinkal:t,sliceIfMore6:!1,useBlockedUtxos:!0,chainId:l}))?.get(d)??[]).filter(e=>e.amount>0n).sort((e,t)=>Number(t.amount-e.amount));if(!p.length)throw Error(r.transactionErrorCodes.NO_STUCK_BALANCE_TO_WITHDRAW);for(let e=0;e<p.length;e+=y){let r=p.slice(e,e+y),i=n.countTotalAmountInUtxos(r);try{let{tx:e}=await T(t,l,o,i,s,r.length);u.push(e)}catch(e){if(!u.length)throw e;return a.Logger.error(`Stuck withdrawal partially submitted (${u.length}/${Math.ceil(p.length/y)})`,e),u}}return u};exports.hinkalWithdrawStuckUtxos=D;