@hinkal/common 0.2.27 → 0.2.29

package/functions/pre-transaction/solana.mjs

@@ -1,105 +1,92 @@
-import { BN as u } from "@coral-xyz/anchor";
-import { PublicKey as r } from "@solana/web3.js";
-import { poseidonFunction as d } from "../../crypto/poseidon.mjs";
-const c = (t) => new TextEncoder().encode(t), a = (t) => {
-  const e = [];
-  let n = t;
-  for (; n > 0n; )
-    e.unshift(Number(n % 256n)), n /= 256n;
-  for (; e.length < 32; )
-    e.unshift(0);
-  return e;
-}, P = (t) => ({
-  extraRandomization: a(t.extraRandomization),
-  stealthAddress: a(t.stealthAddress),
-  h0: a(t.H0),
-  h1: a(t.H1)
-}), k = (t, e, n) => {
-  const o = a(t), s = [c("hinkal_nullifier"), e.toBytes(), new Uint8Array(o)], [i] = r.findProgramAddressSync(s, n);
-  return i;
-}, S = (t, e) => {
-  const n = [c("hinkal"), e.toBytes()], [o] = r.findProgramAddressSync(n, t);
-  return o;
-}, f = (t, e) => {
-  const n = [c("hinkal_merkle"), e.toBytes()], [o] = r.findProgramAddressSync(n, t);
-  return o;
-}, m = (t, e) => {
-  const n = [c("hinkal_merkle_access_token"), e.toBytes()], [o] = r.findProgramAddressSync(n, t);
-  return o;
-}, p = (t, e) => {
-  const n = [c("hinkal_access_token"), e.toBytes()], [o] = r.findProgramAddressSync(n, t);
-  return o;
-}, y = (t, e, n) => {
-  const o = [
-    c("hinkal_swapper"),
-    e.toBytes(),
-    new Uint8Array(new u(n.toString()).toArray("be", 32))
-  ], [s] = r.findProgramAddressSync(o, t);
-  return s;
-}, h = (t, e, n) => {
-  const o = d(n);
-  return y(t, e, o);
-}, B = (t, e) => {
-  const n = [c("hinkal_vault"), e.toBytes()], [o] = r.findProgramAddressSync(n, t);
-  return o;
-}, b = (t, e, n) => {
-  const o = a(t), s = [c("hinkal_access_keys"), n.toBytes(), new Uint8Array(o)], [i] = r.findProgramAddressSync(s, e);
-  return i;
-}, w = (t, e, n, o) => {
-  const s = [
-    c("hinkal_proof_part1"),
-    e.toBytes(),
-    n.toBytes(),
-    new Uint8Array(new u(o.toString()).toArray("be", 4))
-    // 4 here because type of id is u32
-  ], [i] = r.findProgramAddressSync(s, t);
-  return i;
-}, _ = (t, e, n, o) => {
-  const s = [
-    c("hinkal_proof_part2"),
-    e.toBytes(),
-    n.toBytes(),
-    new Uint8Array(new u(o.toString()).toArray("be", 4))
-    // 4 here because type of id is u32
-  ], [i] = r.findProgramAddressSync(s, t);
-  return i;
-}, K = (t, e, n, o) => {
-  const s = [
-    c("hinkal_encrypted_outputs"),
-    e.toBytes(),
-    n.toBytes(),
-    new Uint8Array(new u(o.toString()).toArray("be", 4))
-    // 4 here because type of id is u32
-  ], [i] = r.findProgramAddressSync(s, t);
-  return i;
-}, T = (t, e, n) => {
-  const o = [c("hinkal_token_limit"), e.toBytes(), n.toBytes()], [s] = r.findProgramAddressSync(o, t);
-  return s;
-}, U = (t, e, n, o) => {
-  const s = [
-    c("hinkal_instructions"),
-    e.toBytes(),
-    n.toBytes(),
-    new Uint8Array(new u(o.toString()).toArray("be", 4))
-    // 4 here because type of id is u32
-  ], [i] = r.findProgramAddressSync(s, t);
-  return i;
-};
-export {
-  P as buildAnchorStealthAddressStructure,
-  a as encodeToByte32Array,
-  b as getAccessTokenAccountPublicKey,
-  m as getAccessTokenMerkleAccountPublicKey,
-  p as getAccessTokenStorageAccountPublicKey,
-  K as getEncryptedOutputsAccountPublicKey,
-  U as getInstructionsAccountPublicKey,
-  f as getMerkleAccountPublicKey,
-  k as getNullifierAccount,
-  w as getProofAccountPart1PublicKey,
-  _ as getProofAccountPart2PublicKey,
-  S as getStorageAccountPublicKey,
-  B as getStorageVaultPublicKey,
-  y as getSwapperAccountPublicKey,
-  h as getSwapperAccountPublicKeyFromSalt,
-  T as getTokenLimitStorageAccountPublicKey
+import { poseidonFunction as e } from "../../crypto/poseidon.mjs";
+import { PublicKey as t } from "@solana/web3.js";
+import { BN as n } from "@coral-xyz/anchor";
+//#region ../shared/common/src/functions/pre-transaction/solana.ts
+var r = (e) => new TextEncoder().encode(e), i = (e) => {
+	let t = [], n = e;
+	for (; n > 0n;) t.unshift(Number(n % 256n)), n /= 256n;
+	for (; t.length < 32;) t.unshift(0);
+	return t;
+}, a = (e) => ({
+	extraRandomization: i(e.extraRandomization),
+	stealthAddress: i(e.stealthAddress),
+	h0: i(e.H0),
+	h1: i(e.H1)
+}), o = (e, n, a) => {
+	let o = i(e), s = [
+		r("hinkal_nullifier"),
+		n.toBytes(),
+		new Uint8Array(o)
+	], [c] = t.findProgramAddressSync(s, a);
+	return c;
+}, s = (e, n) => {
+	let i = [r("hinkal"), n.toBytes()], [a] = t.findProgramAddressSync(i, e);
+	return a;
+}, c = (e, n) => {
+	let i = [r("hinkal_merkle"), n.toBytes()], [a] = t.findProgramAddressSync(i, e);
+	return a;
+}, l = (e, n) => {
+	let i = [r("hinkal_merkle_access_token"), n.toBytes()], [a] = t.findProgramAddressSync(i, e);
+	return a;
+}, u = (e, n) => {
+	let i = [r("hinkal_access_token"), n.toBytes()], [a] = t.findProgramAddressSync(i, e);
+	return a;
+}, d = (e, i, a) => {
+	let o = [
+		r("hinkal_swapper"),
+		i.toBytes(),
+		new Uint8Array(new n(a.toString()).toArray("be", 32))
+	], [s] = t.findProgramAddressSync(o, e);
+	return s;
+}, f = (t, n, r) => d(t, n, e(r)), p = (e, n) => {
+	let i = [r("hinkal_vault"), n.toBytes()], [a] = t.findProgramAddressSync(i, e);
+	return a;
+}, m = (e, n, a) => {
+	let o = i(e), s = [
+		r("hinkal_access_keys"),
+		a.toBytes(),
+		new Uint8Array(o)
+	], [c] = t.findProgramAddressSync(s, n);
+	return c;
+}, h = (e, i, a, o) => {
+	let s = [
+		r("hinkal_proof_part1"),
+		i.toBytes(),
+		a.toBytes(),
+		new Uint8Array(new n(o.toString()).toArray("be", 4))
+	], [c] = t.findProgramAddressSync(s, e);
+	return c;
+}, g = (e, i, a, o) => {
+	let s = [
+		r("hinkal_proof_part2"),
+		i.toBytes(),
+		a.toBytes(),
+		new Uint8Array(new n(o.toString()).toArray("be", 4))
+	], [c] = t.findProgramAddressSync(s, e);
+	return c;
+}, _ = (e, i, a, o) => {
+	let s = [
+		r("hinkal_encrypted_outputs"),
+		i.toBytes(),
+		a.toBytes(),
+		new Uint8Array(new n(o.toString()).toArray("be", 4))
+	], [c] = t.findProgramAddressSync(s, e);
+	return c;
+}, v = (e, n, i) => {
+	let a = [
+		r("hinkal_token_limit"),
+		n.toBytes(),
+		i.toBytes()
+	], [o] = t.findProgramAddressSync(a, e);
+	return o;
+}, y = (e, i, a, o) => {
+	let s = [
+		r("hinkal_instructions"),
+		i.toBytes(),
+		a.toBytes(),
+		new Uint8Array(new n(o.toString()).toArray("be", 4))
+	], [c] = t.findProgramAddressSync(s, e);
+	return c;
 };
+//#endregion
+export { a as buildAnchorStealthAddressStructure, i as encodeToByte32Array, m as getAccessTokenAccountPublicKey, l as getAccessTokenMerkleAccountPublicKey, u as getAccessTokenStorageAccountPublicKey, _ as getEncryptedOutputsAccountPublicKey, y as getInstructionsAccountPublicKey, c as getMerkleAccountPublicKey, o as getNullifierAccount, h as getProofAccountPart1PublicKey, g as getProofAccountPart2PublicKey, s as getStorageAccountPublicKey, p as getStorageVaultPublicKey, d as getSwapperAccountPublicKey, f as getSwapperAccountPublicKeyFromSalt, v as getTokenLimitStorageAccountPublicKey };

package/functions/pre-transaction/solanaTransfer.utils.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("@solana/spl-token"),i=require("@solana/web3.js"),g=require("../../constants/protocol.constants.cjs"),p=async(l,e,c,T,a)=>{const{erc20TokenAddress:u,is2022Program:d,decimals:I}=T,s=[];if(u===g.solanaNativeAddress)return s.push(i.SystemProgram.transfer({fromPubkey:e,toPubkey:c,lamports:Number(a)})),{instructions:s,programId:i.SystemProgram.programId};const n=d?t.TOKEN_2022_PROGRAM_ID:t.TOKEN_PROGRAM_ID,r=new i.PublicKey(u),A=await t.getAssociatedTokenAddress(r,e,!0,n),o=await t.getAssociatedTokenAddress(r,c,!0,n);return await l.getAccountInfo(o)||s.push(t.createAssociatedTokenAccountInstruction(e,o,c,r,n)),d?s.push(t.createTransferCheckedInstruction(A,r,o,e,a,I,[],n)):s.push(t.createTransferInstruction(A,o,e,a,[],n)),{instructions:s,programId:n}};exports.buildSolanaTransferInstructions=p;
+require(`../../_virtual/_rolldown/runtime.cjs`),require(`../../constants/protocol.constants.cjs`);let e=require(`@solana/web3.js`),t=require(`@solana/spl-token`);var n=async(n,r,i,a,o)=>{let{erc20TokenAddress:s,is2022Program:c,decimals:l}=a,u=[];if(s===`11111111111111111111111111111111`)return u.push(e.SystemProgram.transfer({fromPubkey:r,toPubkey:i,lamports:Number(o)})),{instructions:u,programId:e.SystemProgram.programId};let d=c?t.TOKEN_2022_PROGRAM_ID:t.TOKEN_PROGRAM_ID,f=new e.PublicKey(s),p=await(0,t.getAssociatedTokenAddress)(f,r,!0,d),m=await(0,t.getAssociatedTokenAddress)(f,i,!0,d);return await n.getAccountInfo(m)||u.push((0,t.createAssociatedTokenAccountInstruction)(r,m,i,f,d)),c?u.push((0,t.createTransferCheckedInstruction)(p,f,m,r,o,l,[],d)):u.push((0,t.createTransferInstruction)(p,m,r,o,[],d)),{instructions:u,programId:d}};exports.buildSolanaTransferInstructions=n;

package/functions/pre-transaction/solanaTransfer.utils.mjs

@@ -1,38 +1,22 @@
-import { TOKEN_2022_PROGRAM_ID as f, TOKEN_PROGRAM_ID as T, getAssociatedTokenAddress as d, createAssociatedTokenAccountInstruction as g, createTransferCheckedInstruction as l, createTransferInstruction as h } from "@solana/spl-token";
-import { SystemProgram as A, PublicKey as _ } from "@solana/web3.js";
-import { solanaNativeAddress as w } from "../../constants/protocol.constants.mjs";
-const D = async (p, n, c, I, e) => {
-  const { erc20TokenAddress: a, is2022Program: i, decimals: m } = I, t = [];
-  if (a === w)
-    return t.push(
-      A.transfer({
-        fromPubkey: n,
-        toPubkey: c,
-        lamports: Number(e)
-      })
-    ), {
-      instructions: t,
-      programId: A.programId
-    };
-  const r = i ? f : T, o = new _(a), u = await d(o, n, !0, r), s = await d(o, c, !0, r);
-  return await p.getAccountInfo(s) || t.push(
-    g(n, s, c, o, r)
-  ), i ? t.push(
-    l(
-      u,
-      o,
-      s,
-      n,
-      e,
-      m,
-      [],
-      r
-    )
-  ) : t.push(h(u, s, n, e, [], r)), {
-    instructions: t,
-    programId: r
-  };
-};
-export {
-  D as buildSolanaTransferInstructions
+import "../../constants/protocol.constants.mjs";
+import { PublicKey as e, SystemProgram as t } from "@solana/web3.js";
+import { TOKEN_2022_PROGRAM_ID as n, TOKEN_PROGRAM_ID as r, createAssociatedTokenAccountInstruction as i, createTransferCheckedInstruction as a, createTransferInstruction as o, getAssociatedTokenAddress as s } from "@solana/spl-token";
+//#region ../shared/common/src/functions/pre-transaction/solanaTransfer.utils.ts
+var c = async (c, l, u, d, f) => {
+	let { erc20TokenAddress: p, is2022Program: m, decimals: h } = d, g = [];
+	if (p === "11111111111111111111111111111111") return g.push(t.transfer({
+		fromPubkey: l,
+		toPubkey: u,
+		lamports: Number(f)
+	})), {
+		instructions: g,
+		programId: t.programId
+	};
+	let _ = m ? n : r, v = new e(p), y = await s(v, l, !0, _), b = await s(v, u, !0, _);
+	return await c.getAccountInfo(b) || g.push(i(l, b, u, v, _)), m ? g.push(a(y, v, b, l, f, h, [], _)) : g.push(o(y, b, l, f, [], _)), {
+		instructions: g,
+		programId: _
+	};
 };
+//#endregion
+export { c as buildSolanaTransferInstructions };

package/functions/pre-transaction/store-instructions.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("./sendV0Transaction.cjs"),i=require("./solana.cjs"),a=async(o,n,t,s,c,e)=>{const r=await n.methods.storeInstructions(Number(c),e).accounts({signer:t.publicKey,originalDeployer:s}).instruction();return await u.sendV0Transaction(o,[r],t,[t]),i.getInstructionsAccountPublicKey(n.programId,s,t.publicKey,c)};exports.storeInstructions=a;
+const e=require(`./solana.cjs`),t=require(`./sendV0Transaction.cjs`);var n=async(n,r,i,a,o,s)=>{let c=e.getInstructionsAccountPublicKey(r.programId,a,i.publicKey,o);return await t.sendV0Transaction(n,[await r.methods.storeInstructions(Number(o),s).accounts({signer:i.publicKey,originalDeployer:a,instructionsAccount:c}).instruction()],i,[i]),c};exports.storeInstructions=n;

package/functions/pre-transaction/store-instructions.mjs

@@ -1,9 +1,13 @@
-import { sendV0Transaction as i } from "./sendV0Transaction.mjs";
 import { getInstructionsAccountPublicKey as e } from "./solana.mjs";
-const p = async (s, c, t, o, n, r) => {
-  const u = await c.methods.storeInstructions(Number(n), r).accounts({ signer: t.publicKey, originalDeployer: o }).instruction();
-  return await i(s, [u], t, [t]), e(c.programId, o, t.publicKey, n);
-};
-export {
-  p as storeInstructions
+import { sendV0Transaction as t } from "./sendV0Transaction.mjs";
+//#region ../shared/common/src/functions/pre-transaction/store-instructions.ts
+var n = async (n, r, i, a, o, s) => {
+	let c = e(r.programId, a, i.publicKey, o);
+	return await t(n, [await r.methods.storeInstructions(Number(o), s).accounts({
+		signer: i.publicKey,
+		originalDeployer: a,
+		instructionsAccount: c
+	}).instruction()], i, [i]), c;
 };
+//#endregion
+export { n as storeInstructions };

package/functions/pre-transaction/store-proof.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("./solana.cjs"),e=require("./sendV0Transaction.cjs"),f=require("../../constants/protocol.constants.cjs"),K=async(s,o,t,c,u,b,d,y,A,n)=>{const a=r.getEncryptedOutputsAccountPublicKey(o.programId,c,t.publicKey,u),N={outputs:b.map(I=>Buffer.from(I))},T=await o.methods.storeEncryptedOutputs(Number(u),N).accounts({originalDeployer:c,signer:t.publicKey,encryptedOutputsAccount:a}).instruction();await e.sendV0Transaction(s,[T],t,[t]);const P=r.getProofAccountPart1PublicKey(o.programId,c,t.publicKey,u),_=await o.methods.storeProofPart1(Number(u),d,y,A,n.slice(0,f.SOLANA_PUBLIC_INPUT_PART_ONE_LENGTH)).accounts({originalDeployer:c,signer:t.publicKey,proofAccountPart1:P}).instruction();await e.sendV0Transaction(s,[_],t,[t]);const p=r.getProofAccountPart2PublicKey(o.programId,c,t.publicKey,u),O=await o.methods.storeProofPart2(Number(u),n.slice(f.SOLANA_PUBLIC_INPUT_PART_ONE_LENGTH)).accounts({originalDeployer:c,signer:t.publicKey,proofAccountPart2:p}).instruction();return await e.sendV0Transaction(s,[O],t,[t]),{proofAccountPart1:P,proofAccountPart2:p,encryptedOutputsAccount:a}};exports.storeProof=K;
+require(`../../constants/protocol.constants.cjs`);const e=require(`./solana.cjs`),t=require(`./sendV0Transaction.cjs`);var n=async(n,r,i,a,o,s,c,l,u,d)=>{let f=e.getEncryptedOutputsAccountPublicKey(r.programId,a,i.publicKey,o),p={outputs:s.map(e=>Buffer.from(e))};await t.sendV0Transaction(n,[await r.methods.storeEncryptedOutputs(Number(o),p).accounts({originalDeployer:a,signer:i.publicKey,encryptedOutputsAccount:f}).instruction()],i,[i]);let m=e.getProofAccountPart1PublicKey(r.programId,a,i.publicKey,o);await t.sendV0Transaction(n,[await r.methods.storeProofPart1(Number(o),c,l,u,d.slice(0,15)).accounts({originalDeployer:a,signer:i.publicKey,proofAccountPart1:m}).instruction()],i,[i]);let h=e.getProofAccountPart2PublicKey(r.programId,a,i.publicKey,o);return await t.sendV0Transaction(n,[await r.methods.storeProofPart2(Number(o),d.slice(15)).accounts({originalDeployer:a,signer:i.publicKey,proofAccountPart2:h}).instruction()],i,[i]),{proofAccountPart1:m,proofAccountPart2:h,encryptedOutputsAccount:f}};exports.storeProof=n;

package/functions/pre-transaction/store-proof.mjs

@@ -1,55 +1,30 @@
-import { getEncryptedOutputsAccountPublicKey as O, getProofAccountPart1PublicKey as w, getProofAccountPart2PublicKey as E } from "./solana.mjs";
+import "../../constants/protocol.constants.mjs";
+import { getEncryptedOutputsAccountPublicKey as e, getProofAccountPart1PublicKey as t, getProofAccountPart2PublicKey as n } from "./solana.mjs";
 import { sendV0Transaction as r } from "./sendV0Transaction.mjs";
-import { SOLANA_PUBLIC_INPUT_PART_ONE_LENGTH as f } from "../../constants/protocol.constants.mjs";
-const B = async (s, c, t, o, u, n, m, b, y, p) => {
-  const e = O(
-    c.programId,
-    o,
-    t.publicKey,
-    u
-  ), K = {
-    outputs: n.map((N) => Buffer.from(N))
-  }, A = await c.methods.storeEncryptedOutputs(
-    Number(u),
-    K
-  ).accounts({
-    originalDeployer: o,
-    signer: t.publicKey,
-    encryptedOutputsAccount: e
-  }).instruction();
-  await r(s, [A], t, [t]);
-  const a = w(
-    c.programId,
-    o,
-    t.publicKey,
-    u
-  ), d = await c.methods.storeProofPart1(
-    Number(u),
-    m,
-    b,
-    y,
-    p.slice(0, f)
-  ).accounts({
-    originalDeployer: o,
-    signer: t.publicKey,
-    proofAccountPart1: a
-  }).instruction();
-  await r(s, [d], t, [t]);
-  const P = E(
-    c.programId,
-    o,
-    t.publicKey,
-    u
-  ), I = await c.methods.storeProofPart2(
-    Number(u),
-    p.slice(f)
-  ).accounts({
-    originalDeployer: o,
-    signer: t.publicKey,
-    proofAccountPart2: P
-  }).instruction();
-  return await r(s, [I], t, [t]), { proofAccountPart1: a, proofAccountPart2: P, encryptedOutputsAccount: e };
-};
-export {
-  B as storeProof
+//#region ../shared/common/src/functions/pre-transaction/store-proof.ts
+var i = async (i, a, o, s, c, l, u, d, f, p) => {
+	let m = e(a.programId, s, o.publicKey, c), h = { outputs: l.map((e) => Buffer.from(e)) };
+	await r(i, [await a.methods.storeEncryptedOutputs(Number(c), h).accounts({
+		originalDeployer: s,
+		signer: o.publicKey,
+		encryptedOutputsAccount: m
+	}).instruction()], o, [o]);
+	let g = t(a.programId, s, o.publicKey, c);
+	await r(i, [await a.methods.storeProofPart1(Number(c), u, d, f, p.slice(0, 15)).accounts({
+		originalDeployer: s,
+		signer: o.publicKey,
+		proofAccountPart1: g
+	}).instruction()], o, [o]);
+	let _ = n(a.programId, s, o.publicKey, c);
+	return await r(i, [await a.methods.storeProofPart2(Number(c), p.slice(15)).accounts({
+		originalDeployer: s,
+		signer: o.publicKey,
+		proofAccountPart2: _
+	}).instruction()], o, [o]), {
+		proofAccountPart1: g,
+		proofAccountPart2: _,
+		encryptedOutputsAccount: m
+	};
 };
+//#endregion
+export { i as storeProof };

package/functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs

@@ -0,0 +1 @@
+const e=require(`../utils/time.utils.cjs`);var t=60,n=(e,t)=>{if(!e.length)return!0;let n=new Set(t.map(e=>e.toString()));return e.every(({utxo:e})=>{let t=BigInt(e.getCommitment());return n.has(t.toString())})},r=(e,t,n=20)=>{let r=e.merkleTreeHinkalByChain[t],i=r.getStartIndex(),{count:a}=r.toJSON(),o=BigInt(a);if(o===0n)return[];let s=r.getMerkleData(),c=[],l=o<BigInt(n)?o:BigInt(n);for(let e=0n;e<l;e+=1n){let t=i+o-1n-e,n=s.get(t);n&&n!==0n&&c.push(n)}return c},i=async(i,a,o)=>{if(o.length){for(let s=0;s<t;s+=1){if(n(o,r(i,a)))return;await e.waitLittle()}throw Error(`Timeout while waiting for deposited UTXOs to appear in Merkle tree.`)}};exports.waitForDepositedUtxosInMerkleTree=i;

package/functions/pre-transaction/waitForDepositedUtxosInMerkleTree.d.ts

@@ -0,0 +1,3 @@
+import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
+import { RecipientUtxo } from '../../types';
+export declare const waitForDepositedUtxosInMerkleTree: (hinkal: IHinkal, chainId: number, userDepositedUtxos: RecipientUtxo[]) => Promise<void>;

package/functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs

@@ -0,0 +1,29 @@
+import { waitLittle as e } from "../utils/time.utils.mjs";
+//#region ../shared/common/src/functions/pre-transaction/waitForDepositedUtxosInMerkleTree.ts
+var t = 60, n = (e, t) => {
+	if (!e.length) return !0;
+	let n = new Set(t.map((e) => e.toString()));
+	return e.every(({ utxo: e }) => {
+		let t = BigInt(e.getCommitment());
+		return n.has(t.toString());
+	});
+}, r = (e, t, n = 20) => {
+	let r = e.merkleTreeHinkalByChain[t], i = r.getStartIndex(), { count: a } = r.toJSON(), o = BigInt(a);
+	if (o === 0n) return [];
+	let s = r.getMerkleData(), c = [], l = o < BigInt(n) ? o : BigInt(n);
+	for (let e = 0n; e < l; e += 1n) {
+		let t = i + o - 1n - e, n = s.get(t);
+		n && n !== 0n && c.push(n);
+	}
+	return c;
+}, i = async (i, a, o) => {
+	if (o.length) {
+		for (let s = 0; s < t; s += 1) {
+			if (n(o, r(i, a))) return;
+			await e();
+		}
+		throw Error("Timeout while waiting for deposited UTXOs to appear in Merkle tree.");
+	}
+};
+//#endregion
+export { i as waitForDepositedUtxosInMerkleTree };

package/functions/private-wallet/emporium.helpers.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("../../constants/protocol.constants.cjs"),y=require("../../types/ethereum-network.types.cjs");require("idb-keyval");const v=require("../../constants/chains.constants.cjs"),q=require("../utils/getContractAddress.cjs"),k=require("../utils/create-provider.cjs"),u=require("ethers");require("../../constants/token-data/index.cjs");require("../../error-handling/error-codes.constants.cjs");require("../utils/convertIntegrationProviderToExternalActionId.cjs");require("../../types/circom-data.types.cjs");require("../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");const f=require("../../data-structures/crypto-keys/keys.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../../data-structures/http/HttpClient.cjs");require("axios");const h=require("../utils/caseInsensitive.utils.cjs");require("../../API/getServerURL.cjs");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../utils/mutexes.utils.cjs");require("@coral-xyz/anchor");const w=require("../../error-handling/logger.cjs");require("@solana/web3.js");require("@solana/spl-token");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");require("../utils/userAgent.cjs");const D=require("../utils/string.utils.cjs");require("multiformats");require("../../API/tenderly.api.cjs");const W=require("../utils/replaceAddressInCalldata.cjs"),g=({contract:e,func:t,args:n,callDataString:r,invokeWallet:s,value:i})=>{let o=new Uint8Array,c=r?u.ethers.getBytesCopy(r):new Uint8Array;if(typeof e=="object"){if(o=u.ethers.getBytesCopy(q.getContractAddress(e)),r?.length&&r?.length>0)throw Error("If function and args are providedm no calldata is needed");t&&n&&!r&&(c=u.ethers.getBytesCopy(e.interface.encodeFunctionData(t,n)))}else o=u.ethers.getBytesCopy(e);const a=u.ethers.getBytesCopy(new Uint8Array([s?1:0])),d=u.ethers.zeroPadValue(u.ethers.toBeHex(i??0n),16),p=u.ethers.concat([o,a,d,c]);return u.ethers.hexlify(p)},P=async(e,t,n,r,s,i)=>{const o=n?await f.UserKeys.signTypedDataFromPrivateKey(e,n,{name:"Emporium",version:"1.0.0",chainId:e,verifyingContract:t},{EmporiumSignature:[{name:"message",type:"uint256"}]},{message:s}):void 0,{v:c,r:a,s:d}=o?u.ethers.Signature.from(o):{v:0,r:u.ethers.ZeroHash,s:u.ethers.ZeroHash};return u.ethers.AbiCoder.defaultAbiCoder().encode(["tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)"],[{v:c,r:a,s:d,message:s??0n,signerAddress:i??l.zeroAddress,ops:r}])},A=(e,t,n,r)=>g(e?{contract:e,func:"transfer",args:[t,n],invokeWallet:r}:{contract:t,value:n,invokeWallet:r}),B=(e,t,n,r)=>{const s=e.getContractWithFetcher(y.ContractType.HinkalContract),i=q.getContractAddress(s);return t.map((o,c)=>{const a=h.caseInsensitiveEqual(o,l.zeroAddress)?void 0:e.getContractWithFetcher(y.ContractType.ERC20Contract,o);return A(a,r??i,n[c],!0)})},F=(e,t,n,r)=>g({contract:e,func:"approve",args:[t,n],invokeWallet:r}),O=(e,t,n)=>{const r=e.getSelectedNetwork()?.contractData.hinkalAddress;if(!r)throw Error("No Hinkal Address Provided to modifyDataForProxy");return D.replaceAllInstances(n,r.slice(2),t.slice(2))},T=(e,t,n)=>{if(!t)throw Error("No private key provided to modifyDataForProxy");const r=f.UserKeys.getSignerAddressFromPrivateKey(e.getCurrentChainId(),t);return O(e,r,n)},C=(e,t,n,r,s,i,o)=>{const c=[];for(let a=0;a<t.length;a+=1){const d=t[a],p=h.caseInsensitiveEqual(d,l.zeroAddress)?void 0:e.getContractWithFetcher(y.ContractType.ERC20Contract,d);c.push(A(p,i,n[a],!1))}if(o)for(let a=0;a<r.length;a+=1){const d=r[a];if(!h.caseInsensitiveEqual(d,l.zeroAddress)){const p=e.getContractWithFetcher(y.ContractType.ERC20Contract,d);c.push(F(p,o,s[a],!0))}}return c},z=(e,t,n,r,s,i,o,c,a,d)=>{const p=C(e,t,n,r,s,i,o);if(!!c&&!!a){const m=e.getContractWithFetcher(y.ContractType.HinkalContract);p.push(g({contract:c,callDataString:W.replaceAddressesInCalldata(a,q.getContractAddress(m),i),value:d,invokeWallet:!0}))}return p},x=(e,t,n,r,s,i,o)=>{const c=[],a=[r],d=[s];o.nativeFee>0n&&!h.caseInsensitiveEqual(r,l.zeroAddress)&&(a.push(l.zeroAddress),d.push(o.nativeFee));const E=C(e,a,d,[r],[i],t,n);c.push(...E);let m=o.nativeFee;return h.caseInsensitiveEqual(r,l.zeroAddress)&&(m+=i),c.push(g({contract:n,callDataString:o.calldata,value:m>0n?m:void 0,invokeWallet:!0})),c},U="0xef0100",I=async(e,t)=>{try{const{fetchRpcUrl:n}=v.networkRegistry[e];if(!n)throw new Error("RPC URL not found for the specified chain ID");const r=k.createCustomRpcProvider(n),s=await r.getCode(t);if(s==="0x"||!s)return{delegated:!1,implementation:void 0,nonce:void 0};if(s.toLowerCase().startsWith(U)&&s.length===48){const i=`0x${s.slice(8)}`,o=await r.getTransactionCount(t);return{delegated:!0,implementation:u.ethers.getAddress(i),nonce:o}}else throw Error("checkEOAWithDelegation: It is a contract")}catch(n){throw w.Logger.error("checkEOAWithDelegation error",{error:n}),n}},H=e=>{const{hinkalWalletAddress:t}=v.networkRegistry[e].contractData;if(!t||h.caseInsensitiveEqual(t,l.zeroAddress))throw Error("Hinkal Wallet Address is not set");return t},N=async(e,t)=>{if(e===v.chainIds.localhost||!t)return;const n=f.UserKeys.getSignerAddressFromPrivateKey(e,t),{delegated:r,implementation:s}=await I(e,n),i=H(e);if(!r||!h.caseInsensitiveEqual(s,i)){const o=await f.UserKeys.authorizeDelegation(e,t,i);return{v:o.signature.v.toString(),r:o.signature.r,s:o.signature.s,nonce:o.nonce.toString(),address:i,chainId:String(e)}}},R=e=>{if(!e)return;const{v:t,r:n,s:r,nonce:s,chainId:i,address:o}=e;return{signature:u.ethers.Signature.from({v:t,r:n,s:r}),nonce:BigInt(s),chainId:BigInt(i),address:o}};exports.checkEOAWithDelegation=I;exports.createApproveEmporiumOp=F;exports.createLifiBridgeOps=x;exports.createTransaferEmporiumOpsBatch=B;exports.createTransferToEmporiumOp=A;exports.emporiumOp=g;exports.encodeEmporiumMetadata=P;exports.generateFundAndApproveOps=C;exports.generateFundApproveAndTransactOps=z;exports.getAuthorizationDataIfNeeded=N;exports.modifyDataForProxy=O;exports.modifyDataForProxyWithPrivateKey=T;exports.recoverAuthorizationData=R;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../utils/caseInsensitive.utils.cjs`),i=require(`../utils/getContractAddress.cjs`),a=require(`../../error-handling/logger.cjs`),o=require(`../utils/create-provider.cjs`),s=require(`../../data-structures/AccountActions/AccountActions.cjs`);require(`../utils/index.cjs`);let c=require(`ethers`);var l=({contract:e,func:t,args:n,callDataString:r,invokeWallet:a,value:o})=>{let s=new Uint8Array,l=r?c.ethers.getBytesCopy(r):new Uint8Array;if(typeof e==`object`){if(s=c.ethers.getBytesCopy(i.getContractAddress(e)),r?.length&&r?.length>0)throw Error(`If function and args are providedm no calldata is needed`);t&&n&&!r&&(l=c.ethers.getBytesCopy(e.interface.encodeFunctionData(t,n)))}else s=c.ethers.getBytesCopy(e);let u=c.ethers.getBytesCopy(new Uint8Array([+!!a])),d=c.ethers.zeroPadValue(c.ethers.toBeHex(o??0n),16),f=c.ethers.concat([s,u,d,l]);return c.ethers.hexlify(f)},u=async(e,t,r,i,a,o)=>{let l=r?await s.AccountActions.signTypedDataFromPrivateKey(e,r,{name:`Emporium`,version:`1.0.0`,chainId:e,verifyingContract:t},{EmporiumSignature:[{name:`message`,type:`uint256`}]},{message:a}):void 0,{v:u,r:d,s:f}=l?c.ethers.Signature.from(l):{v:0,r:c.ethers.ZeroHash,s:c.ethers.ZeroHash};return c.ethers.AbiCoder.defaultAbiCoder().encode([`tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)`],[{v:u,r:d,s:f,message:a??0n,signerAddress:o??n.zeroAddress,ops:i}])},d=e=>{let[t]=c.ethers.AbiCoder.defaultAbiCoder().decode([`tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)`],e),{v:n,r,s:i,message:a,signerAddress:o,ops:s}=t;return{v:n,r,s:i,message:a,signerAddress:o,ops:s}},f=(e,t,n,r)=>l(e?{contract:e,func:`transfer`,args:[t,n],invokeWallet:r}:{contract:t,value:n,invokeWallet:r}),p=(t,a,o,s,c)=>{let l=t.getContractWithFetcher(a,e.ContractType.HinkalContract);return o.map((o,u)=>f(r.caseInsensitiveEqual(o,n.zeroAddress)?void 0:t.getContractWithFetcher(a,e.ContractType.ERC20Contract,o),c??i.getContractAddress(l),s[u],!0))},m=(e,t,n,r)=>l({contract:e,func:`approve`,args:[t,n],invokeWallet:r}),h=(t,i,a,o,s,c,l,u)=>{let d=[];for(let s=0;s<a.length;s+=1){let c=a[s],u=r.caseInsensitiveEqual(c,n.zeroAddress)?void 0:t.getContractWithFetcher(i,e.ContractType.ERC20Contract,c);d.push(f(u,l,o[s],!1))}if(u)for(let a=0;a<s.length;a+=1){let o=s[a];if(!r.caseInsensitiveEqual(o,n.zeroAddress)){let n=t.getContractWithFetcher(i,e.ContractType.ERC20Contract,o);d.push(m(n,u,c[a],!0))}}return d},g=(e,t,i,a,o,s,c,u)=>{let d=[],f=[o],p=[s];u.nativeFee>0n&&!r.caseInsensitiveEqual(o,n.zeroAddress)&&(f.push(n.zeroAddress),p.push(u.nativeFee));let m=h(e,t,f,p,[o],[c],i,a);d.push(...m);let g=u.nativeFee;return r.caseInsensitiveEqual(o,n.zeroAddress)&&(g+=c),d.push(l({contract:a,callDataString:u.calldata,value:g>0n?g:void 0,invokeWallet:!0})),d},_=`0xef0100`,v=async(e,t)=>{try{let n=o.createCustomRpcProvider(e),r=await n.getCode(t);if(r===`0x`||!r)return{delegated:!1,implementation:void 0,nonce:void 0};if(r.toLowerCase().startsWith(_)&&r.length===48){let e=`0x${r.slice(8)}`,i=await n.getTransactionCount(t);return{delegated:!0,implementation:c.ethers.getAddress(e),nonce:i}}else throw Error(`checkEOAWithDelegation: It is a contract`)}catch(e){throw a.Logger.error(`checkEOAWithDelegation error`,{error:e}),e}},y=e=>{let{hinkalWalletAddress:i}=t.networkRegistry[e].contractData;if(!i||r.caseInsensitiveEqual(i,n.zeroAddress))throw Error(`Hinkal Wallet Address is not set`);return i},b=async(e,n)=>{if(e===t.chainIds.localhost||!n)return;let{delegated:i,implementation:a}=await v(e,s.AccountActions.getSignerAddressFromPrivateKey(e,n)),o=y(e);if(!i||!r.caseInsensitiveEqual(a,o)){let t=await s.AccountActions.authorizeDelegation(e,n,o);return{v:t.signature.v.toString(),r:t.signature.r,s:t.signature.s,nonce:t.nonce.toString(),address:o,chainId:String(e)}}},x=e=>{if(!e)return;let{v:t,r:n,s:r,nonce:i,chainId:a,address:o}=e;return{signature:c.ethers.Signature.from({v:t,r:n,s:r}),nonce:BigInt(i),chainId:BigInt(a),address:o}};exports.checkEOAWithDelegation=v,exports.createApproveEmporiumOp=m,exports.createLifiBridgeOps=g,exports.createTransaferEmporiumOpsBatch=p,exports.createTransferToEmporiumOp=f,exports.decodeEmporiumMetadata=d,exports.emporiumOp=l,exports.encodeEmporiumMetadata=u,exports.generateFundAndApproveOps=h,exports.getAuthorizationDataIfNeeded=b,exports.recoverAuthorizationData=x;

package/functions/private-wallet/emporium.helpers.d.ts

@@ -1,24 +1,29 @@
-import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
-import { type AuthorizationData } from '../../types/hinkal.types';
 import { ethers } from 'ethers';
+import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
+import { AuthorizationData } from '../../types/hinkal.types';
 import { BridgeQuote } from '../../types/bridging-tx.types';
 export declare const emporiumOp: ({ contract, func, args, callDataString, invokeWallet, value, }: {
     contract: ethers.BaseContract | string;
-    func?: string | undefined;
-    args?: unknown[] | undefined;
-    callDataString?: string | undefined;
-    invokeWallet?: boolean | undefined;
-    value?: bigint | undefined;
+    func?: string;
+    args?: unknown[];
+    callDataString?: string;
+    invokeWallet?: boolean;
+    value?: bigint;
 }) => string;
 export declare const encodeEmporiumMetadata: (chainId: number, emporiumAddress: string, privateKey: string | undefined, ops: string[], message?: bigint, signerAddress?: string) => Promise<string>;
+export declare const decodeEmporiumMetadata: (metadata: string) => {
+    v: number;
+    r: string;
+    s: string;
+    message: bigint;
+    signerAddress: string;
+    ops: string[];
+};
 export declare const createTransferToEmporiumOp: (tokenContract: ethers.Contract | undefined, to: string, amount: bigint, invokeWallet: boolean) => string;
-export declare const createTransaferEmporiumOpsBatch: (hinkal: IHinkal, erc20TokenAddresses: string[], amounts: bigint[], to?: string) => string[];
+export declare const createTransaferEmporiumOpsBatch: (hinkal: IHinkal, chainId: number, erc20TokenAddresses: string[], amounts: bigint[], to?: string) => string[];
 export declare const createApproveEmporiumOp: (tokenContract: ethers.Contract, to: string, amount: bigint, invokeWallet: boolean) => string;
-export declare const modifyDataForProxy: (hinkal: IHinkal, userAddress: string, data: string) => string;
-export declare const modifyDataForProxyWithPrivateKey: (hinkal: IHinkal, privateKey: string | undefined, data: string) => string;
-export declare const generateFundAndApproveOps: (hinkal: IHinkal, erc20AddressesToFund: string[], fundAmounts: bigint[], approveTokenAddresses: string[], approveAmounts: bigint[], walletAddress: string, spenderAddress: string | undefined) => string[];
-export declare const generateFundApproveAndTransactOps: (hinkal: IHinkal, erc20AddressesToFund: string[], fundAmounts: bigint[], approveTokenAddresses: string[], approveAmounts: bigint[], walletAddress: string, spenderAddress: string | undefined, to?: string, callDataString?: string, value?: bigint) => string[];
-export declare const createLifiBridgeOps: (hinkal: IHinkal, fromAddress: string, lifiRouterAddress: string, tokenAddress: string, fundAmount: bigint, bridgeAmount: bigint, quote: BridgeQuote) => string[];
+export declare const generateFundAndApproveOps: (hinkal: IHinkal, chainId: number, erc20AddressesToFund: string[], fundAmounts: bigint[], approveTokenAddresses: string[], approveAmounts: bigint[], walletAddress: string, spenderAddress: string | undefined) => string[];
+export declare const createLifiBridgeOps: (hinkal: IHinkal, chainId: number, fromAddress: string, lifiRouterAddress: string, tokenAddress: string, fundAmount: bigint, bridgeAmount: bigint, quote: BridgeQuote) => string[];
 export declare const checkEOAWithDelegation: (chainId: number, eoaAddress: string) => Promise<{
     delegated: boolean;
     implementation: undefined;