@hinkal/common 0.2.33 → 0.2.35

package/functions/snarkjs/constructSolanaZkProof.mjs

@@ -3,69 +3,70 @@ import { randomBigInt as t } from "../web3/etherFunctions.mjs";
 import { poseidonFunction as n } from "../../crypto/poseidon.mjs";
 import { takeOffHighestBit as r } from "../utils/bit.operations.mjs";
 import { formatMintAddress as i } from "../utils/solanaMint.utils.mjs";
-import { buildOutCommitments as a, calcAmountChanges as ee, calcStealthAddressStructure as o, getUtxoCircuitH0Coords as s, getUtxoCircuitInRandomization as c } from "./common.snarkjs.mjs";
-import { encodeToByte32Array as l } from "../pre-transaction/solana.mjs";
-import { computeSignedMessageHashSolana as u } from "./signedMessageHash.mjs";
-import { generateZkProof as d } from "./generateZkProof.mjs";
+import { buildOutCommitments as a, calcAmountChanges as o, calcStealthAddressStructure as s, getUtxoCircuitH0Coords as c, getUtxoCircuitInRandomization as l } from "./common.snarkjs.mjs";
+import { encodeToByte32Array as u } from "../pre-transaction/solana.mjs";
+import { computeSignedMessageHashSolana as d } from "./signedMessageHash.mjs";
 import "../pre-transaction/index.mjs";
+import { generateMainAndCommitmentZkProof as ee } from "./generateMainAndCommitmentZkProof.mjs";
 import "../utils/index.mjs";
 import { getDataFromWorkers as f } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
 import { getSolanaCalldataHash as p } from "../pre-transaction/getSolanaCalldataHash.mjs";
 import "../web3/index.mjs";
 import { PublicKey as m } from "@solana/web3.js";
 //#region libs/shared/common/src/functions/snarkjs/constructSolanaZkProof.ts
-var h = async (h, g, _, te, v, y, b, x, S, C, w, T, E, D = e.solanaLocalnet, O = [], k = [], A = 0n) => {
-	let j = new m(C), M = new m(w), N = _.getShieldedPrivateKey(), { pubSpendingBJJPoint: P } = _.getSpendingKeyPair(), F = o(b, N, _.getSpendingKeyPair().pubSpendingBJJPoint), I = t(31), L = n(I), R = n(A), z = te.map((e) => i(e)), B = z.map((e) => e.mintAccountPart1), V = z.map((e) => e.mintAccountPart2), H = p(T, j, M, E, x, S, O, k), U = `${T.tokenNumber}x${T.nullifierAmount}x${T.outputAmount}`, W = ee(v, y), { inCommitmentSiblings: G, inCommitmentSiblingSides: K, rootHashHinkal: q, inNullifiers: J } = await f(D, g, v.map((e) => e.map((e) => e.getConstructableParams()))), Y = a(y), X = r(F.extraRandomization), Z = F.H0, Q = u({
+var h = async (h, g, _, v, y, b, x, S, C, w, T, E, D, O = e.solanaLocalnet, k = [], A = [], j = 0n) => {
+	let M = new m(w), N = new m(T), P = _.getShieldedPrivateKey(), { pubSpendingBJJPoint: F } = _.getSpendingKeyPair(), I = s(x, P, _.getSpendingKeyPair().pubSpendingBJJPoint), L = t(31), R = n(L), z = n(j), B = v.map((e) => i(e)), V = B.map((e) => e.mintAccountPart1), H = B.map((e) => e.mintAccountPart2), U = p(E, M, N, D, S, C, k, A), te = `${E.tokenNumber}x${E.nullifierAmount}x${E.outputAmount}`, W = o(y, b), { inCommitmentSiblings: G, inCommitmentSiblingSides: K, rootHashHinkal: q, inNullifiers: J } = await f(O, g, y.map((e) => e.map((e) => e.getConstructableParams()))), Y = a(b), X = r(I.extraRandomization), Z = I.H0, Q = d({
 		rootHashHinkal: q,
-		mintAccountPart1: B,
-		mintAccountPart2: V,
+		mintAccountPart1: V,
+		mintAccountPart2: H,
 		amountChanges: W,
-		outTimeStamp: BigInt(y[0][0].timeStamp),
+		outTimeStamp: BigInt(b[0][0].timeStamp),
 		inNullifiers: J,
 		outCommitments: Y,
-		calldataHash: H,
-		message: L,
-		swapperAccountAdditionalSeed: R,
-		outH1Ay: F.H1,
+		calldataHash: U,
+		message: R,
+		swapperAccountAdditionalSeed: z,
+		outH1Ay: I.H1,
 		H0Ax: X,
 		H0Ay: Z
 	}), { R8: $, S: ne } = _.signEddsa(Q), re = {
 		rootHashHinkal: q,
-		spendingPublicKey: P,
+		spendingPublicKey: F,
 		eddsaSignature: [
 			$[0],
 			$[1],
 			ne
 		],
 		signedMessageHash: Q,
-		nullifyingPrivateKey: N,
-		mintAccountPart1: B,
-		mintAccountPart2: V,
+		nullifyingPrivateKey: P,
+		mintAccountPart1: V,
+		mintAccountPart2: H,
 		amountChanges: W,
-		inAmounts: v.map((e) => e.map((e) => e.amount.toString())),
-		inRandomizations: v.map((e) => e.map((e) => c(e))),
-		inH0Ax: v.map((e) => e.map((e) => s(e)[0].toString())),
-		inH0Ay: v.map((e) => e.map((e) => s(e)[1].toString())),
-		isNewStyle: v.map((e) => e.map((e) => !!e.isNewStyle)),
-		inTimeStamps: v.map((e) => e.map((e) => e.timeStamp)),
+		inAmounts: y.map((e) => e.map((e) => e.amount.toString())),
+		inRandomizations: y.map((e) => e.map((e) => l(e))),
+		inH0Ax: y.map((e) => e.map((e) => c(e)[0].toString())),
+		inH0Ay: y.map((e) => e.map((e) => c(e)[1].toString())),
+		isNewStyle: y.map((e) => e.map((e) => !!e.isNewStyle)),
+		inTimeStamps: y.map((e) => e.map((e) => e.timeStamp)),
 		inNullifiers: J,
 		inCommitmentSiblings: G,
 		inCommitmentSiblingSides: K,
-		outAmounts: y.map((e) => e.map((e) => e.amount.toString())),
-		outTimeStamp: BigInt(y[0][0].timeStamp),
-		outPublicKeys: y.map((e) => e.map((e) => e.getStealthAddress())),
+		outAmounts: b.map((e) => e.map((e) => e.amount.toString())),
+		outTimeStamp: BigInt(b[0][0].timeStamp),
+		outPublicKeys: b.map((e) => e.map((e) => e.getStealthAddress())),
 		outCommitments: Y,
-		calldataHash: H,
-		messageSeed: I,
-		swapperAccountSalt: A,
+		calldataHash: U,
+		messageSeed: L,
+		swapperAccountSalt: j,
 		H0Ax: X,
 		H0Ay: Z
-	}, { publicSignals: ie, zkCallData: ae } = await d(D, `mainSolanaCircuit${U}`, re, h), [oe, se, ce] = ae;
+	}, { zkCallData: ie, publicSignals: ae, commitmentValidationData: oe } = await ee(O, _, v, y, `mainSolanaCircuit${te}`, re, h), [se, ce, le] = ie;
 	return {
-		proofAArr: oe.map(BigInt).map(l).flat(),
-		proofBArr: se.flat().map(BigInt).map(l).flat(),
-		proofCArr: ce.map(BigInt).map(l).flat(),
-		publicInputsArr: ie.map(BigInt).map(l)
+		proofAArr: se.map(BigInt).map(u).flat(),
+		proofBArr: ce.flat().map(BigInt).map(u).flat(),
+		proofCArr: le.map(BigInt).map(u).flat(),
+		publicInputsArr: ae.map(BigInt).map(u),
+		commitmentValidationData: oe
 	};
 };
 //#endregion

package/functions/snarkjs/generateMainAndCommitmentZkProof.cjs

@@ -0,0 +1 @@
+const e=require(`../pre-transaction/buildCommitmentValidationData.cjs`);require(`../pre-transaction/index.cjs`);const t=require(`./generateZkProof.cjs`);var n=async(n,r,i,a,o,s,c)=>{let l=await e.buildCommitmentValidationData(n,r,i,a),u=[o],d=[s];l&&(u.push(l.verifierName),d.push(l.commitmentInput));let f=await t.generateZkProof(n,u,d,c),{zkCallData:p,publicSignals:m}=f[0];return{zkCallData:p,publicSignals:m,commitmentValidationData:e.buildCommitmentValidationDataFromProof(l,f[1])}};exports.generateMainAndCommitmentZkProof=n;

package/functions/snarkjs/generateMainAndCommitmentZkProof.d.ts

@@ -0,0 +1,11 @@
+import { UserKeys } from '../../data-structures/crypto-keys/keys';
+import { Utxo } from '../../data-structures/utxo/Utxo';
+import { CommitmentValidationDataType } from '../../types/circom-data.types';
+import { NewZkCallDataType } from '../../types/snark.types';
+interface GenerateMainAndCommitmentZkProofResponse {
+    zkCallData: NewZkCallDataType;
+    publicSignals: string[];
+    commitmentValidationData: CommitmentValidationDataType | undefined;
+}
+export declare const generateMainAndCommitmentZkProof: (chainId: number, userKeys: UserKeys, tokenAddresses: string[], inputUtxos: Utxo[][], mainVerifierName: string, mainCircuitInput: unknown, generateProofRemotely: boolean) => Promise<GenerateMainAndCommitmentZkProofResponse>;
+export {};

package/functions/snarkjs/generateMainAndCommitmentZkProof.mjs

@@ -0,0 +1,16 @@
+import { buildCommitmentValidationData as e, buildCommitmentValidationDataFromProof as t } from "../pre-transaction/buildCommitmentValidationData.mjs";
+import "../pre-transaction/index.mjs";
+import { generateZkProof as n } from "./generateZkProof.mjs";
+//#region libs/shared/common/src/functions/snarkjs/generateMainAndCommitmentZkProof.ts
+var r = async (r, i, a, o, s, c, l) => {
+	let u = await e(r, i, a, o), d = [s], f = [c];
+	u && (d.push(u.verifierName), f.push(u.commitmentInput));
+	let p = await n(r, d, f, l), { zkCallData: m, publicSignals: h } = p[0];
+	return {
+		zkCallData: m,
+		publicSignals: h,
+		commitmentValidationData: t(u, p[1])
+	};
+};
+//#endregion
+export { r as generateMainAndCommitmentZkProof };

package/functions/snarkjs/generateZkProof.cjs

@@ -1 +1 @@
-const e=require(`../utils/customEnclaveFunctionsRegister.cjs`),t=require(`../../error-handling/logger.cjs`),n=require(`./getZKFiles.cjs`),r=require(`./generateZkProofEnclave.cjs`),i=require(`./generateZkProofSelf.cjs`);var a=async(a,o,s,c)=>{if(c)try{let t=e.getCustomProofGenerator();if(t){let{zkCallData:e,publicSignals:r}=await t(s,n.getWASMFile(o,a),n.getZKeyFile(o,a));return{zkCallData:e,publicSignals:r}}return await r.generateZkProofEnclave(a,o,s)}catch(e){t.Logger.error(`enclave proof error`,e)}return i.generateZkProofSelf(a,o,s)};exports.generateZkProof=a;
+const e=require(`../utils/customEnclaveFunctionsRegister.cjs`),t=require(`../../error-handling/logger.cjs`),n=require(`./getZKFiles.cjs`),r=require(`./generateZkProofEnclave.cjs`),i=require(`./generateZkProofSelf.cjs`);var a=async(a,o,s,c)=>{if(c)try{let t=e.getCustomProofGenerator();return t?(await t(s,o.map(e=>n.getWASMFile(e,a)),o.map(e=>n.getZKeyFile(e,a)))).map(({zkCallData:e,publicSignals:t})=>({zkCallData:e,publicSignals:t})):await r.generateZkProofEnclave(a,o,s)}catch(e){t.Logger.error(`enclave proof error`,e)}return Promise.all(o.map((e,t)=>i.generateZkProofSelf(a,e,s[t])))};exports.generateZkProof=a;

package/functions/snarkjs/generateZkProof.d.ts

@@ -1,5 +1,5 @@
-import { NewZkCallDataType } from '../../types';
-export declare const generateZkProof: (chainId: number, verifierName: string, input: any, remotely?: boolean) => Promise<{
+import { NewZkCallDataType } from '../../types/snark.types';
+export declare const generateZkProof: (chainId: number, verifierNames: string[], inputs: any[], remotely?: boolean) => Promise<{
     zkCallData: NewZkCallDataType;
     publicSignals: string[];
-}>;
+}[]>;

package/functions/snarkjs/generateZkProof.mjs

@@ -7,18 +7,14 @@ import { generateZkProofSelf as a } from "./generateZkProofSelf.mjs";
 var o = async (o, s, c, l) => {
 	if (l) try {
 		let t = e();
-		if (t) {
-			let { zkCallData: e, publicSignals: i } = await t(c, n(s, o), r(s, o));
-			return {
-				zkCallData: e,
-				publicSignals: i
-			};
-		}
-		return await i(o, s, c);
+		return t ? (await t(c, s.map((e) => n(e, o)), s.map((e) => r(e, o)))).map(({ zkCallData: e, publicSignals: t }) => ({
+			zkCallData: e,
+			publicSignals: t
+		})) : await i(o, s, c);
 	} catch (e) {
 		t.error("enclave proof error", e);
 	}
-	return a(o, s, c);
+	return Promise.all(s.map((e, t) => a(o, e, c[t])));
 };
 //#endregion
 export { o as generateZkProof };

package/functions/snarkjs/generateZkProofEnclave.cjs

@@ -1 +1 @@
-const e=require(`../../data-structures/http/HttpClient.cjs`);require(`../../data-structures/http/index.cjs`);const t=require(`./constant.cjs`),n=require(`../utils/encryptInputForEnclave.cjs`),r=require(`./getZKFiles.cjs`);var i=e=>{if(e.startsWith(`http`)){let t=e.split(`/`).at(-1);if(!t)throw Error(`invalid verifierName`);return t}return e},a=async(a,o,s)=>{let c=i(r.getWASMFile(o,a)),l=i(r.getZKeyFile(o,a)),{keyCiphertext:u,inputCiphertext:d}=await n.makeEnclaveHandshakeAndEncryptInput(s),f={circuit_wasm:c,circuit_zkey:l,input:d,key:u},{public_signals:p,zk_calldata:m}=await e.httpClient.post(`${t.ENCLAVE_URL}/generate`,f);return{zkCallData:m,publicSignals:p}};exports.generateZkProofEnclave=a;
+const e=require(`../../data-structures/http/HttpClient.cjs`);require(`../../data-structures/http/index.cjs`);const t=require(`./constant.cjs`),n=require(`../utils/encryptInputForEnclave.cjs`),r=require(`./getZKFiles.cjs`);var i=e=>{if(e.startsWith(`http`)){let t=e.split(`/`).at(-1);if(!t)throw Error(`invalid verifierName`);return t}return e},a=async(a,o,s)=>{let c=o.map(e=>i(r.getWASMFile(e,a))),l=o.map(e=>i(r.getZKeyFile(e,a))),{keyCiphertext:u,inputCiphertext:d}=await n.makeEnclaveHandshakeAndEncryptInput(s),f={circuit_wasms:c,circuit_zkeys:l,inputs:d,key:u};return(await e.httpClient.post(`${t.ENCLAVE_URL}/generate-proofs`,f)).map(({zk_calldata:e,public_signals:t})=>({zkCallData:e,publicSignals:t}))};exports.generateZkProofEnclave=a;

package/functions/snarkjs/generateZkProofEnclave.d.ts

@@ -1,5 +1,5 @@
 import { NewZkCallDataType } from '../../types/snark.types';
-export declare const generateZkProofEnclave: (chainId: number, verifierName: string, input: any) => Promise<{
+export declare const generateZkProofEnclave: (chainId: number, verifierNames: string[], inputs: any[]) => Promise<{
     zkCallData: NewZkCallDataType;
     publicSignals: string[];
-}>;
+}[]>;

package/functions/snarkjs/generateZkProofEnclave.mjs

@@ -12,16 +12,16 @@ var a = (e) => {
 	}
 	return e;
 }, o = async (o, s, c) => {
-	let l = a(r(s, o)), u = a(i(s, o)), { keyCiphertext: d, inputCiphertext: f } = await n(c), p = {
-		circuit_wasm: l,
-		circuit_zkey: u,
-		input: f,
+	let l = s.map((e) => a(r(e, o))), u = s.map((e) => a(i(e, o))), { keyCiphertext: d, inputCiphertext: f } = await n(c), p = {
+		circuit_wasms: l,
+		circuit_zkeys: u,
+		inputs: f,
 		key: d
-	}, { public_signals: m, zk_calldata: h } = await e.post(`${t}/generate`, p);
-	return {
-		zkCallData: h,
-		publicSignals: m
 	};
+	return (await e.post(`${t}/generate-proofs`, p)).map(({ zk_calldata: e, public_signals: t }) => ({
+		zkCallData: e,
+		publicSignals: t
+	}));
 };
 //#endregion
 export { o as generateZkProofEnclave };

package/functions/snarkjs/generateZkProofSelf.cjs

@@ -1 +1 @@
-const e=require(`./getZKFiles.cjs`),t=require(`../../webworker/worker.registry.cjs`),n=require(`../../webworker/performTaskWithWorker.cjs`),r=require(`../../webworker/snarkjsWorker/snarkjsWorker.types.cjs`);var i=async(i,a,o)=>{let s=e.getWASMFile(a,i),c=e.getZKeyFile(a,i),{publicSignals:l,zkCallData:u}=await n.performTaskWithWorker({type:t.WorkerVariant.SnarkJS,payload:{type:r.SnarkJSWorkerActionType.FULL_PROVE,data:{input:o,chainId:i,wasmFilePath:s,zKeyFilePath:c}}});return{zkCallData:u,publicSignals:l}};exports.generateZkProofSelf=i;
+const e=require(`../../webworker/worker.registry.cjs`),t=require(`../../webworker/performTaskWithWorker.cjs`),n=require(`./getZKFiles.cjs`),r=require(`../../webworker/snarkjsWorker/snarkjsWorker.types.cjs`);var i=async(i,a,o)=>{let s=n.getWASMFile(a,i),c=n.getZKeyFile(a,i),{publicSignals:l,zkCallData:u}=await t.performTaskWithWorker({type:e.WorkerVariant.SnarkJS,payload:{type:r.SnarkJSWorkerActionType.FULL_PROVE,data:{input:o,chainId:i,wasmFilePath:s,zKeyFilePath:c}}});return{zkCallData:u,publicSignals:l}};exports.generateZkProofSelf=i;

package/functions/snarkjs/generateZkProofSelf.mjs

@@ -1,11 +1,11 @@
-import { getWASMFile as e, getZKeyFile as t } from "./getZKFiles.mjs";
-import { WorkerVariant as n } from "../../webworker/worker.registry.mjs";
-import { performTaskWithWorker as r } from "../../webworker/performTaskWithWorker.mjs";
+import { WorkerVariant as e } from "../../webworker/worker.registry.mjs";
+import { performTaskWithWorker as t } from "../../webworker/performTaskWithWorker.mjs";
+import { getWASMFile as n, getZKeyFile as r } from "./getZKFiles.mjs";
 import { SnarkJSWorkerActionType as i } from "../../webworker/snarkjsWorker/snarkjsWorker.types.mjs";
 //#region libs/shared/common/src/functions/snarkjs/generateZkProofSelf.ts
 var a = async (a, o, s) => {
-	let c = e(o, a), l = t(o, a), { publicSignals: u, zkCallData: d } = await r({
-		type: n.SnarkJS,
+	let c = n(o, a), l = r(o, a), { publicSignals: u, zkCallData: d } = await t({
+		type: e.SnarkJS,
 		payload: {
 			type: i.FULL_PROVE,
 			data: {

package/functions/snarkjs/index.cjs

@@ -1 +1 @@
-require(`./common.snarkjs.cjs`),require(`./signedMessageHash.cjs`),require(`./generateZkProof.cjs`),require(`./fetchOnChainRootHashes.cjs`),require(`./constructGeneralZkProof.cjs`),require(`./constructSolanaZkProof.cjs`),require(`./verifyCommitmentValidationData.cjs`);
+require(`./common.snarkjs.cjs`),require(`./signedMessageHash.cjs`),require(`./generateZkProof.cjs`),require(`./generateMainAndCommitmentZkProof.cjs`),require(`./fetchOnChainRootHashes.cjs`),require(`./constructGeneralZkProof.cjs`),require(`./constructSolanaZkProof.cjs`),require(`./verifyCommitmentValidationData.cjs`);

package/functions/snarkjs/index.d.ts

@@ -2,6 +2,7 @@ export * from './constructGeneralZkProof';
 export * from './common.snarkjs';
 export * from './signedMessageHash';
 export * from './generateZkProof';
+export * from './generateMainAndCommitmentZkProof';
 export * from './constructSolanaZkProof';
 export * from './fetchOnChainRootHashes';
 export * from './verifyCommitmentValidationData';

package/functions/snarkjs/index.mjs

@@ -1,6 +1,7 @@
 import "./common.snarkjs.mjs";
 import "./signedMessageHash.mjs";
 import "./generateZkProof.mjs";
+import "./generateMainAndCommitmentZkProof.mjs";
 import "./fetchOnChainRootHashes.mjs";
 import "./constructGeneralZkProof.mjs";
 import "./constructSolanaZkProof.mjs";

package/functions/snarkjs/verifyCommitmentValidationData.cjs

@@ -1 +1 @@
-const e=require(`../../_virtual/_rolldown/runtime.cjs`),t=require(`../../data-structures/http/HttpClient.cjs`),n=require(`../utils/bytes32.utils.cjs`),r=require(`./common.snarkjs.cjs`),i=require(`./getZKFiles.cjs`),a=require(`../pre-transaction/solana-public-signals.cjs`);let o=require(`ethers`),s=require(`snarkjs`);s=e.__toESM(s);var c=e=>e.flat().map(e=>BigInt(e).toString()),l=(e,t)=>{let n=t.inNullifiers[0]?.length??0;return i.getVKFile(`commitmentCalculator${t.tokenAddresses.length}x${n}`,e)},u=async(e,n)=>{let r=l(e,n);return t.httpClient.get(r)},d=e=>({pi_a:[...e.a],pi_b:[[e.b[0][1],e.b[0][0]],[e.b[1][1],e.b[1][0]]],pi_c:[...e.c],protocol:`groth16`}),f=e=>{let t=e.tokenAddresses.map(e=>o.ethers.getBigInt(e).toString()),n=c(e.inCommitments),r=c(e.inNullifiers);return[...t,...n,...r]},p=async(e,t,n)=>{if(c(t.inNullifiers).join(`,`)!==n.join(`,`))throw Error(`commitmentValidationData.inNullifiers mismatch with request input`);let r=await u(e,t),i=f(t),a=d(t.proof);if(!await s.groth16.verify(r,i,a))throw Error(`Invalid commitment validation proof`)},m=async e=>{let t=e.commitmentValidationData;if(!t)return;let n=c(r.deserializeCircomData(e.circomData).inputNullifiers);await p(e.chainId,t,n)},h=async e=>{let t=e.commitmentValidationData;if(!t)return;let r=a.convertSolanaPublicSignals(e.args.publicInputsArr,e.args.dimensions).inNullifiers.flat().map(e=>n.convertBytes32ToBigInt(e).toString());await p(e.chainId,t,r)};exports.verifyCommitmentValidationData=m,exports.verifyCommitmentValidationDataSolana=h;
+const e=require(`../../_virtual/_rolldown/runtime.cjs`),t=require(`../../data-structures/http/HttpClient.cjs`),n=require(`../utils/bytes32.utils.cjs`),r=require(`./common.snarkjs.cjs`),i=require(`../pre-transaction/solana-public-signals.cjs`),a=require(`./getZKFiles.cjs`);let o=require(`ethers`),s=require(`snarkjs`);s=e.__toESM(s);var c=e=>e.flat().map(e=>BigInt(e).toString()),l=(e,t)=>{let n=t.inNullifiers[0]?.length??0;return a.getVKFile(`commitmentCalculator${t.tokenAddresses.length}x${n}`,e)},u=async(e,n)=>{let r=l(e,n);return t.httpClient.get(r)},d=e=>({pi_a:[...e.a],pi_b:[[e.b[0][1],e.b[0][0]],[e.b[1][1],e.b[1][0]]],pi_c:[...e.c],protocol:`groth16`}),f=e=>{let t=e.tokenAddresses.map(e=>o.ethers.getBigInt(e).toString()),n=c(e.inCommitments),r=c(e.inNullifiers);return[...t,...n,...r]},p=async(e,t,n)=>{if(c(t.inNullifiers).join(`,`)!==n.join(`,`))throw Error(`commitmentValidationData.inNullifiers mismatch with request input`);let r=await u(e,t),i=f(t),a=d(t.proof);if(!await s.groth16.verify(r,i,a))throw Error(`Invalid commitment validation proof`)},m=async e=>{let t=e.commitmentValidationData;if(!t)return;let n=c(r.deserializeCircomData(e.circomData).inputNullifiers);await p(e.chainId,t,n)},h=async e=>{let t=e.commitmentValidationData;if(!t)return;let r=i.convertSolanaPublicSignals(e.args.publicInputsArr,e.args.dimensions).inNullifiers.flat().map(e=>n.convertBytes32ToBigInt(e).toString());await p(e.chainId,t,r)};exports.verifyCommitmentValidationData=m,exports.verifyCommitmentValidationDataSolana=h;

package/functions/snarkjs/verifyCommitmentValidationData.mjs

@@ -1,14 +1,14 @@
 import { httpClient as e } from "../../data-structures/http/HttpClient.mjs";
 import { convertBytes32ToBigInt as t } from "../utils/bytes32.utils.mjs";
 import { deserializeCircomData as n } from "./common.snarkjs.mjs";
-import { getVKFile as r } from "./getZKFiles.mjs";
-import { convertSolanaPublicSignals as i } from "../pre-transaction/solana-public-signals.mjs";
+import { convertSolanaPublicSignals as r } from "../pre-transaction/solana-public-signals.mjs";
+import { getVKFile as i } from "./getZKFiles.mjs";
 import { ethers as a } from "ethers";
 import * as o from "snarkjs";
 //#region libs/shared/common/src/functions/snarkjs/verifyCommitmentValidationData.ts
 var s = (e) => e.flat().map((e) => BigInt(e).toString()), c = (e, t) => {
 	let n = t.inNullifiers[0]?.length ?? 0;
-	return r(`commitmentCalculator${t.tokenAddresses.length}x${n}`, e);
+	return i(`commitmentCalculator${t.tokenAddresses.length}x${n}`, e);
 }, l = async (t, n) => {
 	let r = c(t, n);
 	return e.get(r);
@@ -36,8 +36,8 @@ var s = (e) => e.flat().map((e) => BigInt(e).toString()), c = (e, t) => {
 }, m = async (e) => {
 	let n = e.commitmentValidationData;
 	if (!n) return;
-	let r = i(e.args.publicInputsArr, e.args.dimensions).inNullifiers.flat().map((e) => t(e).toString());
-	await f(e.chainId, n, r);
+	let i = r(e.args.publicInputsArr, e.args.dimensions).inNullifiers.flat().map((e) => t(e).toString());
+	await f(e.chainId, n, i);
 };
 //#endregion
 export { p as verifyCommitmentValidationData, m as verifyCommitmentValidationDataSolana };

package/functions/utils/customEnclaveFunctionsRegister.d.ts

@@ -1,12 +1,12 @@
-import { NewZkCallDataType } from '../../types/snark.types';
 import { RemoteProofType } from '../../types/remote-proof.types';
 import { EncryptedOutputWithSign } from '../../types/commitments.types';
 import { IUtxoConstructor } from '../../data-structures/utxo/Utxo';
-export type ProofGeneratorFn = (input: any, circuitWasm: string, circuitZkey: string) => Promise<{
+import { NewZkCallDataType } from '../../types/snark.types';
+export type ProofGeneratorFn = (inputs: any[], circuitWasmFilenames: string[], circuitZkeyFilenames: string[]) => Promise<{
     proof: RemoteProofType;
     publicSignals: string[];
     zkCallData: NewZkCallDataType;
-}>;
+}[]>;
 export type UtxoDecryptorFn = (chainId: number, keysData: Uint8Array) => Promise<{
     utxos: IUtxoConstructor<string>[];
     encryptedOutputs: EncryptedOutputWithSign[];

package/functions/utils/enclave-signature-storage.cjs

@@ -1 +1 @@
-const e=require(`./encryptInputForEnclave.cjs`),t=require(`../../API/enclaveSignatureCalls.cjs`);var n=async(n,r,i,a)=>{let{keyCiphertext:o,inputCiphertext:s}=await e.makeEnclaveHandshakeAndEncryptInput(r),{signature:c}=await t.storeAndGetSignatureEnclaveCall(n,s,o,i,a);return c};exports.storeAndGetSignatureFromEnclave=n;
+const e=require(`./encryptInputForEnclave.cjs`),t=require(`../../API/enclaveSignatureCalls.cjs`);var n=async(n,r,i=!1,a)=>{let{keyCiphertext:o,inputCiphertext:s}=await e.makeEnclaveHandshakeAndEncryptInput(r),{signature:c}=await t.storeAndGetSignatureEnclaveCall(n,s,o,i,a);return c};exports.storeAndGetSignatureFromEnclave=n;

package/functions/utils/enclave-signature-storage.d.ts

@@ -1 +1 @@
-export declare const storeAndGetSignatureFromEnclave: (ethAddress: string, authSignature: string, isSolanaLedger: boolean, txMessageForSolanaLedger?: string) => Promise<string>;
+export declare const storeAndGetSignatureFromEnclave: (ethAddress: string, authSignature: string, isSolanaLedger?: boolean, txMessageForSolanaLedger?: string) => Promise<string>;

package/functions/utils/enclave-signature-storage.mjs

@@ -1,7 +1,7 @@
 import { makeEnclaveHandshakeAndEncryptInput as e } from "./encryptInputForEnclave.mjs";
 import { storeAndGetSignatureEnclaveCall as t } from "../../API/enclaveSignatureCalls.mjs";
 //#region libs/shared/common/src/functions/utils/enclave-signature-storage.ts
-var n = async (n, r, i, a) => {
+var n = async (n, r, i = !1, a) => {
 	let { keyCiphertext: o, inputCiphertext: s } = await e(r), { signature: c } = await t(n, s, o, i, a);
 	return c;
 };

package/functions/utils/index.cjs

@@ -1 +1 @@
-require(`./serialize.utils.cjs`),require(`./get-signature-header.cjs`),require(`./caseInsensitive.utils.cjs`),require(`./addresses.cjs`),require(`./auth.utils.cjs`),require(`./amounts.utils.cjs`),require(`./erc20tokenFunctions.cjs`),require(`./bytes32.utils.cjs`),require(`./time.utils.cjs`),require(`./bit.operations.cjs`),require(`./upToDateState.cjs`),require(`./getDataFromTransaction.cjs`),require(`./cacheFunctions.cjs`),require(`./encryptInputForEnclave.cjs`),require(`./solanaMint.utils.cjs`),require(`./customEnclaveFunctionsRegister.cjs`),require(`./tron.utils.cjs`),require(`./string.utils.cjs`),require(`./token-check.utils.cjs`),require(`./mutexes.utils.cjs`),require(`../pre-transaction/outputUtxoProcessing.cjs`),require(`./external-action.utils.cjs`),require(`../pre-transaction/solana.cjs`),require(`./serialize-utxos.utils.cjs`),require(`./create-provider.cjs`),require(`./requireEnv.cjs`),require(`./resolve-sync.utils.cjs`),require(`./convertIntegrationProviderToExternalActionId.cjs`),require(`../pre-transaction/interaction-to-action.cjs`),require(`../pre-transaction/process-gas-estimates.cjs`),require(`../pre-transaction/getFlatFees.cjs`),require(`../pre-transaction/getVolatileTransferAmount.cjs`),require(`../pre-transaction/constructAdminData.cjs`),require(`../pre-transaction/calculateSolanaNullifierCount.cjs`),require(`../pre-transaction/addressTableLookup.cjs`),require(`../pre-transaction/solana-public-signals.cjs`),require(`../pre-transaction/convert-okx-instructions.cjs`),require(`./process.utils.cjs`),require(`../pre-transaction/sendV0Transaction.cjs`),require(`../pre-transaction/store-proof.cjs`),require(`../pre-transaction/sendInitNullifiersTransaction.cjs`),require(`../pre-transaction/recipientUtxoProcessing.cjs`),require(`../pre-transaction/store-instructions.cjs`),require(`../pre-transaction/ensureAmountChanges.cjs`),require(`../pre-transaction/getFeeStructure.cjs`),require(`../pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),require(`../pre-transaction/buildCommitmentValidationData.cjs`),require(`../pre-transaction/index.cjs`),require(`./evmNetworkFunctions.cjs`),require(`./userAgent.cjs`),require(`./reloadPage.cjs`),require(`./nickname.utils.cjs`),require(`./cacheDevice.utils.cjs`),require(`./getBlockExplorerUrl.cjs`),require(`./involves-permit2-op.cjs`),require(`./convertEmporiumOpToCallInfo.cjs`),require(`./getRecipientInfoFromUserKeys.cjs`),require(`./publicBalance.utils.cjs`),require(`./rpc-int-encode.cjs`),require(`./arraysMatch.cjs`),require(`./trimFieldValues.cjs`),require(`./walletBalances.utils.cjs`),require(`./nftTokenFunctions.cjs`),require(`./inLogicMetadata.cjs`),require(`./networks.utils.cjs`),require(`./is-valid-url.cjs`),require(`./postToOffscreen.cjs`),require(`./solanaSendPreflight.utils.cjs`),require(`./prepareHinkal.cjs`),require(`./getContractAddress.cjs`),require(`./getUtxosFromReceipt.utils.cjs`),require(`./getUtxosFromReceiptSolana.cjs`),require(`./fees.utils.cjs`),require(`./proxyAvatar.utils.cjs`),require(`./validateUsername.cjs`),require(`./enclave-utxo-storage.cjs`),require(`./enclave-signature-storage.cjs`),require(`./tx-confirmation.utils.cjs`),require(`./buildClaimableDepositPlan.cjs`),require(`./pay-routing.utils.cjs`),require(`./formatter.cjs`),require(`./tronSimulation.utils.cjs`),require(`./getSignerFromContract.cjs`),require(`./deposit-claimable.utils.cjs`),require(`./transfer-claimable.utils.cjs`),require(`./getWalletGroupKey.utils.cjs`),require(`./dispatchBalanceRefreshes.cjs`),require(`./lifi.utils.cjs`),require(`./enclave-recipient-info-storage.cjs`),require(`./solana-memo.cjs`),require(`./mnemonics.cjs`);
+require(`./serialize.utils.cjs`),require(`./get-signature-header.cjs`),require(`./caseInsensitive.utils.cjs`),require(`./addresses.cjs`),require(`./auth.utils.cjs`),require(`./amounts.utils.cjs`),require(`./erc20tokenFunctions.cjs`),require(`./bytes32.utils.cjs`),require(`./time.utils.cjs`),require(`./bit.operations.cjs`),require(`./upToDateState.cjs`),require(`./getDataFromTransaction.cjs`),require(`./cacheFunctions.cjs`),require(`./encryptInputForEnclave.cjs`),require(`./solanaMint.utils.cjs`),require(`./customEnclaveFunctionsRegister.cjs`),require(`./tron.utils.cjs`),require(`./string.utils.cjs`),require(`./token-check.utils.cjs`),require(`./mutexes.utils.cjs`),require(`../pre-transaction/outputUtxoProcessing.cjs`),require(`./external-action.utils.cjs`),require(`../pre-transaction/solana.cjs`),require(`../pre-transaction/interaction-to-action.cjs`),require(`../pre-transaction/process-gas-estimates.cjs`),require(`../pre-transaction/getFlatFees.cjs`),require(`../pre-transaction/getVolatileTransferAmount.cjs`),require(`../pre-transaction/constructAdminData.cjs`),require(`./create-provider.cjs`),require(`../pre-transaction/calculateSolanaNullifierCount.cjs`),require(`../pre-transaction/addressTableLookup.cjs`),require(`../pre-transaction/solana-public-signals.cjs`),require(`../pre-transaction/convert-okx-instructions.cjs`),require(`./process.utils.cjs`),require(`../pre-transaction/sendV0Transaction.cjs`),require(`../pre-transaction/store-proof.cjs`),require(`../pre-transaction/sendInitNullifiersTransaction.cjs`),require(`../pre-transaction/recipientUtxoProcessing.cjs`),require(`../pre-transaction/store-instructions.cjs`),require(`../pre-transaction/ensureAmountChanges.cjs`),require(`../pre-transaction/getFeeStructure.cjs`),require(`../pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),require(`../pre-transaction/buildCommitmentValidationData.cjs`),require(`../pre-transaction/index.cjs`),require(`./serialize-utxos.utils.cjs`),require(`./requireEnv.cjs`),require(`./resolve-sync.utils.cjs`),require(`./convertIntegrationProviderToExternalActionId.cjs`),require(`./evmNetworkFunctions.cjs`),require(`./userAgent.cjs`),require(`./reloadPage.cjs`),require(`./nickname.utils.cjs`),require(`./cacheDevice.utils.cjs`),require(`./getBlockExplorerUrl.cjs`),require(`./involves-permit2-op.cjs`),require(`./convertEmporiumOpToCallInfo.cjs`),require(`./getRecipientInfoFromUserKeys.cjs`),require(`./publicBalance.utils.cjs`),require(`./rpc-int-encode.cjs`),require(`./arraysMatch.cjs`),require(`./trimFieldValues.cjs`),require(`./walletBalances.utils.cjs`),require(`./nftTokenFunctions.cjs`),require(`./inLogicMetadata.cjs`),require(`./networks.utils.cjs`),require(`./is-valid-url.cjs`),require(`./postToOffscreen.cjs`),require(`./solanaSendPreflight.utils.cjs`),require(`./prepareHinkal.cjs`),require(`./getContractAddress.cjs`),require(`./getUtxosFromReceipt.utils.cjs`),require(`./getUtxosFromReceiptSolana.cjs`),require(`./fees.utils.cjs`),require(`./proxyAvatar.utils.cjs`),require(`./validateUsername.cjs`),require(`./enclave-utxo-storage.cjs`),require(`./enclave-signature-storage.cjs`),require(`./tx-confirmation.utils.cjs`),require(`./buildClaimableDepositPlan.cjs`),require(`./pay-routing.utils.cjs`),require(`./formatter.cjs`),require(`./tronSimulation.utils.cjs`),require(`./getSignerFromContract.cjs`),require(`./deposit-claimable.utils.cjs`),require(`./transfer-claimable.utils.cjs`),require(`./getWalletGroupKey.utils.cjs`),require(`./dispatchBalanceRefreshes.cjs`),require(`./lifi.utils.cjs`),require(`./enclave-recipient-info-storage.cjs`),require(`./solana-memo.cjs`),require(`./mnemonics.cjs`),require(`./nearIntents.utils.cjs`);

package/functions/utils/index.d.ts

@@ -69,3 +69,4 @@ export * from './solana-memo';
 export * from './mnemonics';
 export * from './customEnclaveFunctionsRegister';
 export * from './bit.operations';
+export * from './nearIntents.utils';

package/functions/utils/index.mjs

@@ -21,16 +21,12 @@ import "./mutexes.utils.mjs";
 import "../pre-transaction/outputUtxoProcessing.mjs";
 import "./external-action.utils.mjs";
 import "../pre-transaction/solana.mjs";
-import "./serialize-utxos.utils.mjs";
-import "./create-provider.mjs";
-import "./requireEnv.mjs";
-import "./resolve-sync.utils.mjs";
-import "./convertIntegrationProviderToExternalActionId.mjs";
 import "../pre-transaction/interaction-to-action.mjs";
 import "../pre-transaction/process-gas-estimates.mjs";
 import "../pre-transaction/getFlatFees.mjs";
 import "../pre-transaction/getVolatileTransferAmount.mjs";
 import "../pre-transaction/constructAdminData.mjs";
+import "./create-provider.mjs";
 import "../pre-transaction/calculateSolanaNullifierCount.mjs";
 import "../pre-transaction/addressTableLookup.mjs";
 import "../pre-transaction/solana-public-signals.mjs";
@@ -46,6 +42,10 @@ import "../pre-transaction/getFeeStructure.mjs";
 import "../pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
 import "../pre-transaction/buildCommitmentValidationData.mjs";
 import "../pre-transaction/index.mjs";
+import "./serialize-utxos.utils.mjs";
+import "./requireEnv.mjs";
+import "./resolve-sync.utils.mjs";
+import "./convertIntegrationProviderToExternalActionId.mjs";
 import "./evmNetworkFunctions.mjs";
 import "./userAgent.mjs";
 import "./reloadPage.mjs";
@@ -89,3 +89,4 @@ import "./lifi.utils.mjs";
 import "./enclave-recipient-info-storage.mjs";
 import "./solana-memo.mjs";
 import "./mnemonics.mjs";
+import "./nearIntents.utils.mjs";

package/functions/utils/nearIntents.utils.cjs

@@ -0,0 +1 @@
+const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`./caseInsensitive.utils.cjs`),i=require(`./addresses.cjs`),a=require(`../../API/callNearIntentsAPI.cjs`),o=require(`./erc20tokenFunctions.cjs`),s=require(`../../constants/bridging.constants.cjs`),c=require(`./tron.utils.cjs`),l=require(`../pre-transaction/getFeeStructure.cjs`);var u=(e,n)=>{if(!n||!t.isTronLike(e))return n;try{return c.addressToHexFormat(n)}catch{return n}},d=e=>{let t=s.NEAR_INTENTS_CHAIN_ID_BY_BLOCKCHAIN[e.blockchain];if(t===void 0)return;let n=u(t,e.contractAddress);return(n?o.getERC20Token(n,t):void 0)??o.getERC20TokenBySymbol(e.symbol,t)},f=async(e,t)=>{let n=s.NEAR_INTENTS_BLOCKCHAIN_BY_CHAIN_ID[e];if(!n)throw Error(`NEAR Intents does not support chain ${e}`);let o=(await a.getNearIntentsTokens()).filter(e=>e.blockchain===n),c=i.isNativePlaceholderAddress(t)?o.find(e=>!e.contractAddress):o.find(n=>n.contractAddress&&r.caseInsensitiveEqual(u(e,n.contractAddress),t));if(!c)throw Error(`No NEAR Intents asset for token ${t} on chain ${e}`);return c.assetId},p=(t,r,i)=>l.getFeeStructure(t,r.erc20TokenAddress,[r.erc20TokenAddress],e.ExternalActionId.Transact,[],n.HINKAL_PRIVATE_SEND_VARIABLE_RATE,{mintTo:r.erc20TokenAddress,recipient:i,nullifierCount:r.erc20TokenAddress===`11111111111111111111111111111111`?0:1});exports.buildNearBridgeFeeStructure=p,exports.getErc20TokenForNearAsset=d,exports.resolveNearAssetId=f;

package/functions/utils/nearIntents.utils.d.ts

@@ -0,0 +1,11 @@
+import { FeeStructure } from '../../types/hinkal.types';
+import { NearIntentsToken } from '../../types/near-intents.types';
+import { ERC20Token } from '../../types/token.types';
+/**
+ * Reverse of resolveNearAssetId: map a NEAR Intents token back to the in-app ERC20Token so a
+ * bridge refund sitting in the user's Intents account can be displayed and claimed like any other
+ * balance. Returns undefined for assets on chains/tokens the app does not support.
+ */
+export declare const getErc20TokenForNearAsset: (token: NearIntentsToken) => ERC20Token | undefined;
+export declare const resolveNearAssetId: (chainId: number, tokenAddress: string) => Promise<string>;
+export declare const buildNearBridgeFeeStructure: (chainId: number, token: ERC20Token, recipient: string) => Promise<FeeStructure>;

package/functions/utils/nearIntents.utils.mjs

@@ -0,0 +1,36 @@
+import { ExternalActionId as e } from "../../types/external-action.types.mjs";
+import { isTronLike as t } from "../../constants/chains.constants.mjs";
+import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as n } from "../../constants/protocol.constants.mjs";
+import { caseInsensitiveEqual as r } from "./caseInsensitive.utils.mjs";
+import { isNativePlaceholderAddress as i } from "./addresses.mjs";
+import { getNearIntentsTokens as a } from "../../API/callNearIntentsAPI.mjs";
+import { getERC20Token as o, getERC20TokenBySymbol as s } from "./erc20tokenFunctions.mjs";
+import { NEAR_INTENTS_BLOCKCHAIN_BY_CHAIN_ID as c, NEAR_INTENTS_CHAIN_ID_BY_BLOCKCHAIN as l } from "../../constants/bridging.constants.mjs";
+import { addressToHexFormat as u } from "./tron.utils.mjs";
+import { getFeeStructure as d } from "../pre-transaction/getFeeStructure.mjs";
+//#region libs/shared/common/src/functions/utils/nearIntents.utils.ts
+var f = (e, n) => {
+	if (!n || !t(e)) return n;
+	try {
+		return u(n);
+	} catch {
+		return n;
+	}
+}, p = (e) => {
+	let t = l[e.blockchain];
+	if (t === void 0) return;
+	let n = f(t, e.contractAddress);
+	return (n ? o(n, t) : void 0) ?? s(e.symbol, t);
+}, m = async (e, t) => {
+	let n = c[e];
+	if (!n) throw Error(`NEAR Intents does not support chain ${e}`);
+	let o = (await a()).filter((e) => e.blockchain === n), s = i(t) ? o.find((e) => !e.contractAddress) : o.find((n) => n.contractAddress && r(f(e, n.contractAddress), t));
+	if (!s) throw Error(`No NEAR Intents asset for token ${t} on chain ${e}`);
+	return s.assetId;
+}, h = (t, r, i) => d(t, r.erc20TokenAddress, [r.erc20TokenAddress], e.Transact, [], n, {
+	mintTo: r.erc20TokenAddress,
+	recipient: i,
+	nullifierCount: r.erc20TokenAddress === "11111111111111111111111111111111" ? 0 : 1
+});
+//#endregion
+export { h as buildNearBridgeFeeStructure, p as getErc20TokenForNearAsset, m as resolveNearAssetId };

package/functions/utils/time.utils.cjs

@@ -1 +1 @@
-var e=1e3*60*60*24,t=(e=1e3)=>new Promise(t=>{setTimeout(()=>{t(void 0)},e)}),n=()=>Math.floor(Date.now()/1e3),r=e=>new Date(e).toISOString(),i=()=>{let e=new Date,t=new Date(Date.UTC(e.getUTCFullYear(),e.getUTCMonth(),e.getUTCDate(),6,0,0,0));return e<t?new Date(t.setUTCDate(t.getUTCDate()-1)):t},a=()=>{let e=i(),t=new Date(e);return t.setUTCDate(t.getUTCDate()-6),t},o=()=>{let e=i(),t=(e.getUTCDay()+6)%7,n=new Date(e);return n.setUTCDate(e.getUTCDate()-t),n.setUTCHours(6,0,0,0),n},s=()=>{let e=o();return e.setUTCDate(e.getUTCDate()-7),e},c=()=>{let e=new Date,t=new Date(e);return t.setUTCHours(6,0,0,0),t<=e&&t.setUTCDate(t.getUTCDate()+1),t.getTime()-e.getTime()},l=()=>{let e=new Date,t=new Date(e);return t.setUTCHours(8,0,0,0),t<=e&&t.setUTCDate(t.getUTCDate()+1),t.getTime()-e.getTime()},u=()=>{let e=new Date,t=new Date(Date.UTC(e.getUTCFullYear(),e.getUTCMonth(),e.getUTCDate(),6,0,0,0));return e<t&&t.setUTCDate(t.getUTCDate()-1),t},d=(e=new Date)=>new Date(Date.UTC(e.getUTCFullYear(),e.getUTCMonth(),e.getUTCDate())),f=()=>{let e=new Date,t=new Date(e);return t.setUTCHours(6,0,0,0),t<=e&&t.setUTCDate(t.getUTCDate()+1),t.toISOString()},p=e=>{let t=new Date().getFullYear()===e.getFullYear()?{month:`long`,day:`numeric`}:{month:`long`,day:`numeric`,year:`numeric`};return e.toLocaleDateString(void 0,t)},m=e=>{try{let t=new Date(e);if(Number.isNaN(t.getTime()))return``;let n=t.getDate(),r=t.getFullYear();return`${t.toLocaleString(`en-US`,{month:`short`})} ${n}, ${r}, ${String(t.getHours()).padStart(2,`0`)}:${String(t.getMinutes()).padStart(2,`0`)}`}catch{return``}},h=e=>{let t=new Date,n=new Date(e),r=t.getTime()-n.getTime(),i=Math.floor(r/1e3),a=Math.floor(i/60),o=Math.floor(a/60),s=Math.floor(o/24),c=Math.floor(s/7),l=Math.floor(s/30),u=Math.floor(s/365);return i<60?`${Math.max(1,i)} sec${i===1?``:`s`} ago`:a<60?`${a} min${a===1?``:`s`} ago`:o<24?`${o} hour${o===1?``:`s`} ago`:s<7?`${s} day${s===1?``:`s`} ago`:c<4?`${c} week${c===1?``:`s`} ago`:l<12?`${l} month${l===1?``:`s`} ago`:`${u} year${u===1?``:`s`} ago`},g=(e,t)=>e.getFullYear()===t.getFullYear()&&e.getMonth()===t.getMonth()&&e.getDate()===t.getDate(),_=e=>e.toLocaleDateString(`en-US`,{month:`short`,day:`numeric`,year:`numeric`}),v=(t,n)=>(new Date().getTime()-t.getTime())/e<=n;exports.MS_PER_DAY=e,exports.calculateRelativeTime=h,exports.formatDate=p,exports.formatTimestampDate=_,exports.formatTxTimestamp=m,exports.getCurrentDayStart=u,exports.getCurrentTimeInSeconds=n,exports.getCurrentWeekStart=o,exports.getDelayUntilUtc8=l,exports.getEffectiveSevenDaysAgo=a,exports.getEffectiveToday=i,exports.getNextDayDelay=c,exports.getNextDayISO=f,exports.getPreviousWeekStart=s,exports.getUtcDayStart=d,exports.isSameDay=g,exports.isWithinDays=v,exports.msToISOString=r,exports.waitLittle=t;
+var e=1e3*60*60*24,t=(e=1e3)=>new Promise(t=>{setTimeout(()=>{t(void 0)},e)}),n=()=>Math.floor(Date.now()/1e3),r=e=>new Date(e).toISOString(),i=()=>{let e=new Date,t=new Date(Date.UTC(e.getUTCFullYear(),e.getUTCMonth(),e.getUTCDate(),6,0,0,0));return e<t?new Date(t.setUTCDate(t.getUTCDate()-1)):t},a=()=>{let e=i(),t=new Date(e);return t.setUTCDate(t.getUTCDate()-6),t},o=()=>{let e=i(),t=(e.getUTCDay()+6)%7,n=new Date(e);return n.setUTCDate(e.getUTCDate()-t),n.setUTCHours(6,0,0,0),n},s=()=>{let e=o();return e.setUTCDate(e.getUTCDate()-7),e},c=()=>{let e=new Date,t=new Date(e);return t.setUTCHours(6,0,0,0),t<=e&&t.setUTCDate(t.getUTCDate()+1),t.getTime()-e.getTime()},l=()=>{let e=new Date,t=new Date(e);return t.setUTCHours(8,0,0,0),t<=e&&t.setUTCDate(t.getUTCDate()+1),t.getTime()-e.getTime()},u=()=>{let e=new Date,t=new Date(Date.UTC(e.getUTCFullYear(),e.getUTCMonth(),e.getUTCDate(),6,0,0,0));return e<t&&t.setUTCDate(t.getUTCDate()-1),t},d=(e=new Date)=>new Date(Date.UTC(e.getUTCFullYear(),e.getUTCMonth(),e.getUTCDate())),f=()=>{let e=new Date,t=new Date(e);return t.setUTCHours(6,0,0,0),t<=e&&t.setUTCDate(t.getUTCDate()+1),t.toISOString()},p=e=>{let t=new Date().getFullYear()===e.getFullYear()?{month:`long`,day:`numeric`}:{month:`long`,day:`numeric`,year:`numeric`};return e.toLocaleDateString(void 0,t)},m=e=>{try{let t=new Date(e);if(Number.isNaN(t.getTime()))return``;let n=t.getDate(),r=t.getFullYear();return`${t.toLocaleString(`en-US`,{month:`short`})} ${n}, ${r}, ${String(t.getHours()).padStart(2,`0`)}:${String(t.getMinutes()).padStart(2,`0`)}`}catch{return``}},h=e=>{let t=new Date,n=new Date(e),r=t.getTime()-n.getTime(),i=Math.floor(r/1e3),a=Math.floor(i/60),o=Math.floor(a/60),s=Math.floor(o/24),c=Math.floor(s/7),l=Math.floor(s/30),u=Math.floor(s/365);return i<60?`${Math.max(1,i)} sec${i===1?``:`s`} ago`:a<60?`${a} min${a===1?``:`s`} ago`:o<24?`${o} hour${o===1?``:`s`} ago`:s<7?`${s} day${s===1?``:`s`} ago`:c<4?`${c} week${c===1?``:`s`} ago`:l<12?`${l} month${l===1?``:`s`} ago`:`${u} year${u===1?``:`s`} ago`},g=(e,t)=>e.getFullYear()===t.getFullYear()&&e.getMonth()===t.getMonth()&&e.getDate()===t.getDate(),_=e=>e.toLocaleDateString(`en-US`,{month:`short`,day:`numeric`,year:`numeric`}),v=e=>e===void 0?Date.now():e*1e3,y=(t,n)=>(new Date().getTime()-t.getTime())/e<=n;exports.MS_PER_DAY=e,exports.calculateRelativeTime=h,exports.formatDate=p,exports.formatTimestampDate=_,exports.formatTxTimestamp=m,exports.getCurrentDayStart=u,exports.getCurrentTimeInSeconds=n,exports.getCurrentWeekStart=o,exports.getDelayUntilUtc8=l,exports.getEffectiveSevenDaysAgo=a,exports.getEffectiveToday=i,exports.getNextDayDelay=c,exports.getNextDayISO=f,exports.getPreviousWeekStart=s,exports.getUtcDayStart=d,exports.isSameDay=g,exports.isWithinDays=y,exports.msToISOString=r,exports.secondsToMs=v,exports.waitLittle=t;

package/functions/utils/time.utils.d.ts

@@ -16,4 +16,5 @@ export declare const formatTxTimestamp: (input: string) => string;
 export declare const calculateRelativeTime: (targetDate: string) => string;
 export declare const isSameDay: (a: Date, b: Date) => boolean;
 export declare const formatTimestampDate: (date: Date) => string;
+export declare const secondsToMs: (seconds?: number) => number;
 export declare const isWithinDays: (date: Date, days: number) => boolean;

package/functions/utils/time.utils.mjs

@@ -53,6 +53,6 @@ var e = 1e3 * 60 * 60 * 24, t = (e = 1e3) => new Promise((t) => {
 	month: "short",
 	day: "numeric",
 	year: "numeric"
-}), v = (t, n) => ((/* @__PURE__ */ new Date()).getTime() - t.getTime()) / e <= n;
+}), v = (e) => e === void 0 ? Date.now() : e * 1e3, y = (t, n) => ((/* @__PURE__ */ new Date()).getTime() - t.getTime()) / e <= n;
 //#endregion
-export { e as MS_PER_DAY, h as calculateRelativeTime, p as formatDate, _ as formatTimestampDate, m as formatTxTimestamp, u as getCurrentDayStart, n as getCurrentTimeInSeconds, o as getCurrentWeekStart, l as getDelayUntilUtc8, a as getEffectiveSevenDaysAgo, i as getEffectiveToday, c as getNextDayDelay, f as getNextDayISO, s as getPreviousWeekStart, d as getUtcDayStart, g as isSameDay, v as isWithinDays, r as msToISOString, t as waitLittle };
+export { e as MS_PER_DAY, h as calculateRelativeTime, p as formatDate, _ as formatTimestampDate, m as formatTxTimestamp, u as getCurrentDayStart, n as getCurrentTimeInSeconds, o as getCurrentWeekStart, l as getDelayUntilUtc8, a as getEffectiveSevenDaysAgo, i as getEffectiveToday, c as getNextDayDelay, f as getNextDayISO, s as getPreviousWeekStart, d as getUtcDayStart, g as isSameDay, y as isWithinDays, r as msToISOString, v as secondsToMs, t as waitLittle };

package/functions/web3/oneInchAPI.cjs

@@ -1 +1 @@
-const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../constants/protocol.constants.cjs`);require(`../../types/index.cjs`);const n=require(`../../API/callOneInchAPI.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`./etherFunctions.cjs`);require(`../../constants/index.cjs`);const a=require(`../../error-handling/logger.cjs`),o=require(`./getContractMetadata.cjs`);require(`../../error-handling/index.cjs`);var s=async(s,c,l,u,d=.7)=>{try{let r=await n.callOneInchAPI(s,{fromTokenAddress:c.erc20TokenAddress===t.zeroAddress?t.oneInchZeroAddress:c.erc20TokenAddress,toTokenAddress:l.erc20TokenAddress===t.zeroAddress?t.oneInchZeroAddress:l.erc20TokenAddress,fromAddress:t.zeroAddress,destReceiver:o.getContractMetadata(e.ContractType.OneInchExternalActionContract,s).address,amount:i.getAmountInWei(c,u),slippage:d,disableEstimate:!0,allowPartialFill:!1});if(!r||!r.tx)throw Error(`OneInch API price fetch error`);return{outSwapAmountValue:BigInt(r.toAmount),oneInchDataValue:r.tx.data}}catch(e){throw a.Logger.log({error:e}),Error(r.transactionErrorCodes.NO_ONEINCH_PRICE)}};exports.getOneInchPrice=s;
+const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../constants/protocol.constants.cjs`);require(`../../types/index.cjs`);const n=require(`../../API/callOneInchAPI.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`./etherFunctions.cjs`);require(`../../constants/index.cjs`);const a=require(`../../error-handling/logger.cjs`);require(`../../error-handling/index.cjs`);const o=require(`./getContractMetadata.cjs`);var s=async(s,c,l,u,d=.7)=>{try{let r=await n.callOneInchAPI(s,{fromTokenAddress:c.erc20TokenAddress===t.zeroAddress?t.oneInchZeroAddress:c.erc20TokenAddress,toTokenAddress:l.erc20TokenAddress===t.zeroAddress?t.oneInchZeroAddress:l.erc20TokenAddress,fromAddress:t.zeroAddress,destReceiver:o.getContractMetadata(e.ContractType.OneInchExternalActionContract,s).address,amount:i.getAmountInWei(c,u),slippage:d,disableEstimate:!0,allowPartialFill:!1});if(!r||!r.tx)throw Error(`OneInch API price fetch error`);return{outSwapAmountValue:BigInt(r.toAmount),oneInchDataValue:r.tx.data}}catch(e){throw a.Logger.log({error:e}),Error(r.transactionErrorCodes.NO_ONEINCH_PRICE)}};exports.getOneInchPrice=s;

package/functions/web3/oneInchAPI.mjs

@@ -6,8 +6,8 @@ import { transactionErrorCodes as i } from "../../error-handling/error-codes.con
 import { getAmountInWei as a } from "./etherFunctions.mjs";
 import "../../constants/index.mjs";
 import { Logger as o } from "../../error-handling/logger.mjs";
-import { getContractMetadata as s } from "./getContractMetadata.mjs";
 import "../../error-handling/index.mjs";
+import { getContractMetadata as s } from "./getContractMetadata.mjs";
 //#region libs/shared/common/src/functions/web3/oneInchAPI.ts
 var c = async (c, l, u, d, f = .7) => {
 	try {