@hinkal/common 0.2.30 → 0.2.32

package/functions/pre-transaction/sendV0Transaction.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../utils/serialize.utils.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../data-structures/AccountActions/AccountActions.cjs`),r=require(`../../types/fee.types.cjs`),i=require(`../web3/getSolanaPriorityFee.cjs`),a=require(`../utils/process.utils.cjs`);let o=require(`@solana/web3.js`),s=require(`@solana/spl-token`);var c=5e3,l=6e4,u=e=>e instanceof Error&&(e.message?.includes(`Blockhash not found`)||e.name===`TransactionExpiredBlockheightExceededError`||e.message?.includes(`block height exceeded`)),d=async(e,t,n=`confirmed`)=>await a.pollForValue(()=>e.getTransaction(t,{commitment:n,maxSupportedTransactionVersion:0}),{timeoutMs:l,intervalMs:c})??null,f=async(e,n,r,i)=>{try{let{blockhash:a}=await e.getLatestBlockhash(),s=new o.VersionedTransaction(new o.TransactionMessage({payerKey:n,recentBlockhash:a,instructions:[o.ComputeBudgetProgram.setComputeUnitLimit({units:t.MAX_COMPUTE_UNIT_LIMIT}),...r]}).compileToV0Message(i)),{unitsConsumed:c}=(await e.simulateTransaction(s,{sigVerify:!1,replaceRecentBlockhash:!0})).value;if(!c)return t.MAX_COMPUTE_UNIT_LIMIT;let l=Math.ceil(c*(1+t.COMPUTE_UNIT_PADDING_PERCENTAGE));return Math.max(t.MIN_COMPUTE_UNIT_LIMIT,Math.min(l,t.MAX_COMPUTE_UNIT_LIMIT))}catch{return t.MAX_COMPUTE_UNIT_LIMIT}},p=(e,t,n,r)=>{let i=new Set;return t&&i.add(t.toBase58()),n?.forEach(e=>i.add(e.toBase58())),e.forEach(e=>{i.add(e.programId.toBase58()),e.keys.forEach(e=>{i.add(e.pubkey.toBase58())})}),r&&r.forEach(e=>{i.add(e.key.toBase58()),e.state.addresses.forEach(e=>{i.add(e.toBase58())})}),[...i].map(e=>new o.PublicKey(e))},m=t=>{if(!t)throw Error(`Failed to fetch Solana transaction details for signature`);if(t.meta?.err){let n=e.safeJsonStringify(t.meta.err);throw Error(`Solana transaction failed on-chain: ${n}`)}},h=async(e,t,n,r,a)=>{let s=n.filter(e=>!e.programId.equals(o.ComputeBudgetProgram.programId)),c=await f(e,t,s,r),l=o.ComputeBudgetProgram.setComputeUnitLimit({units:c}),u=e.rpcEndpoint.includes(`helius`)?await i.getSolanaPriorityFee(p(s,t,[o.ComputeBudgetProgram.programId],r),a):0;return[l,o.ComputeBudgetProgram.setComputeUnitPrice({microLamports:u}),...s]},g=async(e,t,n,i,a)=>{if(t.length===0)return``;for(let s=0;s<10;s+=1){let c=s===9;try{let s=await h(e,n.publicKey,t,a,c?r.SolanaPriorityFeeMode.HIGH:r.SolanaPriorityFeeMode.RECOMMENDED),{blockhash:l,lastValidBlockHeight:u}=await e.getLatestBlockhash(),f=new o.VersionedTransaction(new o.TransactionMessage({payerKey:n.publicKey,instructions:s,recentBlockhash:l}).compileToV0Message(a));f.sign(i);let p=await e.sendTransaction(f);return await e.confirmTransaction({signature:p,blockhash:l,lastValidBlockHeight:u},`confirmed`),m(await d(e,p)),p}catch(e){if(u(e)&&!c)continue;throw e}}return``},_=async(e,t,n,r)=>{if(!n)return null;let i=await(0,s.getAssociatedTokenAddress)(n,r,!0,s.TOKEN_PROGRAM_ID,s.ASSOCIATED_TOKEN_PROGRAM_ID);return await e.getAccountInfo(i)||await g(e,[(0,s.createAssociatedTokenAccountInstruction)(t.publicKey,i,r,n,s.TOKEN_PROGRAM_ID,s.ASSOCIATED_TOKEN_PROGRAM_ID)],t,[t]),i},v=async({connection:e,chainId:t,subAccount:i,payerPublicKey:a,instructions:s,lookupTableAccounts:c})=>{let l=n.AccountActions.getPrivateKeyFromSubAccount(t,i);if(!l)throw Error(`Private key is not available`);for(let t=0;t<10;t+=1){let i=t===9;try{let t=await h(e,a,s,c,i?r.SolanaPriorityFeeMode.HIGH:r.SolanaPriorityFeeMode.RECOMMENDED),{blockhash:u,lastValidBlockHeight:f}=await e.getLatestBlockhash(),p=new o.VersionedTransaction(new o.TransactionMessage({payerKey:a,recentBlockhash:u,instructions:t}).compileToV0Message(c)),g=await n.AccountActions.sendAndSignSolanaTransactionFromPrivateKey(e,l,p,!0);return await e.confirmTransaction({signature:g,blockhash:u,lastValidBlockHeight:f},`confirmed`),m(await d(e,g)),g}catch(e){if(u(e)&&!i)continue;throw e}}throw Error(`Failed to send proxy v0 transaction due to expired blockheight after all retries`)},y=async(e,t,n,r)=>{let{blockhash:i}=await e.getLatestBlockhash(),a=new o.VersionedTransaction(new o.TransactionMessage({payerKey:t,recentBlockhash:i,instructions:await h(e,t,n,r)}).compileToV0Message(r));return Buffer.from(a.serialize()).toString(`base64`)};exports.ensureAtaExists=_,exports.estimateComputeUnitLimit=f,exports.fetchSolanaTransaction=d,exports.getAccountsFromInstructions=p,exports.sendProxyV0Transaction=v,exports.sendV0Transaction=g,exports.serializeProxyV0Transaction=y;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../utils/serialize.utils.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../data-structures/AccountActions/AccountActions.cjs`),r=require(`../../types/fee.types.cjs`),i=require(`../web3/getSolanaPriorityFee.cjs`),a=require(`../utils/process.utils.cjs`),o=require(`../../error-handling/retrySolanaError.cjs`);let s=require(`@solana/web3.js`),c=require(`@solana/spl-token`);var l=5e3,u=6e4,d=7,f=async(e,t,n=`confirmed`)=>await a.pollForValue(()=>e.getTransaction(t,{commitment:n,maxSupportedTransactionVersion:0}),{timeoutMs:u,intervalMs:l})??null,p=async(e,n,r,i)=>{try{let{blockhash:a}=await e.getLatestBlockhash(),o=new s.VersionedTransaction(new s.TransactionMessage({payerKey:n,recentBlockhash:a,instructions:[s.ComputeBudgetProgram.setComputeUnitLimit({units:t.MAX_COMPUTE_UNIT_LIMIT}),...r]}).compileToV0Message(i)),{unitsConsumed:c}=(await e.simulateTransaction(o,{sigVerify:!1,replaceRecentBlockhash:!0})).value;if(!c)return t.MAX_COMPUTE_UNIT_LIMIT;let l=Math.ceil(c*(1+t.COMPUTE_UNIT_PADDING_PERCENTAGE));return Math.max(t.MIN_COMPUTE_UNIT_LIMIT,Math.min(l,t.MAX_COMPUTE_UNIT_LIMIT))}catch{return t.MAX_COMPUTE_UNIT_LIMIT}},m=(e,t,n,r)=>{let i=new Set;return t&&i.add(t.toBase58()),n?.forEach(e=>i.add(e.toBase58())),e.forEach(e=>{i.add(e.programId.toBase58()),e.keys.forEach(e=>{i.add(e.pubkey.toBase58())})}),r&&r.forEach(e=>{i.add(e.key.toBase58()),e.state.addresses.forEach(e=>{i.add(e.toBase58())})}),[...i].map(e=>new s.PublicKey(e))},h=t=>{if(!t)throw Error(`Failed to fetch Solana transaction details for signature`);if(t.meta?.err){let n=e.safeJsonStringify(t.meta.err);throw Error(`Solana transaction failed on-chain: ${n}`)}},g=async(e,n,r,a,o)=>{if(r.some(e=>e.programId.equals(s.ComputeBudgetProgram.programId)))return r.map(e=>e.programId.equals(s.ComputeBudgetProgram.programId)&&e.data[0]===2?s.ComputeBudgetProgram.setComputeUnitLimit({units:t.MAX_COMPUTE_UNIT_LIMIT}):e);let c=r.filter(e=>!e.programId.equals(s.ComputeBudgetProgram.programId)),l=await p(e,n,c,a),u=s.ComputeBudgetProgram.setComputeUnitLimit({units:l}),d=e.rpcEndpoint.includes(`helius`)?await i.getSolanaPriorityFee(m(c,n,[s.ComputeBudgetProgram.programId],a),o):0;return[u,s.ComputeBudgetProgram.setComputeUnitPrice({microLamports:d}),...c]},_=async(e,t,n,i,a)=>{if(t.length===0)return``;for(let c=0;c<10;c+=1){let l=c===9;try{let o=await g(e,n.publicKey,t,a,c>=d?r.SolanaPriorityFeeMode.HIGH:r.SolanaPriorityFeeMode.RECOMMENDED),{blockhash:l,lastValidBlockHeight:u}=await e.getLatestBlockhash(),p=new s.VersionedTransaction(new s.TransactionMessage({payerKey:n.publicKey,instructions:o,recentBlockhash:l}).compileToV0Message(a));p.sign(i);let m=await e.sendTransaction(p);return await e.confirmTransaction({signature:m,blockhash:l,lastValidBlockHeight:u},`confirmed`),h(await f(e,m)),m}catch(e){if(o.shouldRetryForSolanaError(e)&&!l)continue;throw e}}return``},v=async(e,t,n,r)=>{if(!n)return null;let i=await(0,c.getAssociatedTokenAddress)(n,r,!0,c.TOKEN_PROGRAM_ID,c.ASSOCIATED_TOKEN_PROGRAM_ID);return await e.getAccountInfo(i)||await _(e,[(0,c.createAssociatedTokenAccountInstruction)(t.publicKey,i,r,n,c.TOKEN_PROGRAM_ID,c.ASSOCIATED_TOKEN_PROGRAM_ID)],t,[t]),i},y=async({connection:e,chainId:t,subAccount:i,payerPublicKey:a,instructions:c,lookupTableAccounts:l})=>{let u=n.AccountActions.getPrivateKeyFromSubAccount(t,i);if(!u)throw Error(`Private key is not available`);for(let t=0;t<10;t+=1){let i=t===9;try{let t=await g(e,a,c,l,i?r.SolanaPriorityFeeMode.HIGH:r.SolanaPriorityFeeMode.RECOMMENDED),{blockhash:o,lastValidBlockHeight:d}=await e.getLatestBlockhash(),p=new s.VersionedTransaction(new s.TransactionMessage({payerKey:a,recentBlockhash:o,instructions:t}).compileToV0Message(l)),m=await n.AccountActions.sendAndSignSolanaTransactionFromPrivateKey(e,u,p,!0);return await e.confirmTransaction({signature:m,blockhash:o,lastValidBlockHeight:d},`confirmed`),h(await f(e,m)),m}catch(e){if(o.shouldRetryForSolanaError(e)&&!i)continue;throw e}}throw Error(`Failed to send proxy v0 transaction due to expired blockheight after all retries`)},b=async(e,t,n,r)=>{let{blockhash:i}=await e.getLatestBlockhash(),a=new s.VersionedTransaction(new s.TransactionMessage({payerKey:t,recentBlockhash:i,instructions:await g(e,t,n,r)}).compileToV0Message(r));return Buffer.from(a.serialize()).toString(`base64`)};exports.ensureAtaExists=v,exports.estimateComputeUnitLimit=p,exports.fetchSolanaTransaction=f,exports.getAccountsFromInstructions=m,exports.sendProxyV0Transaction=y,exports.sendV0Transaction=_,exports.serializeProxyV0Transaction=b;

package/functions/pre-transaction/sendV0Transaction.mjs

@@ -4,32 +4,33 @@ import { AccountActions as i } from "../../data-structures/AccountActions/Accoun
 import { SolanaPriorityFeeMode as a } from "../../types/fee.types.mjs";
 import { getSolanaPriorityFee as o } from "../web3/getSolanaPriorityFee.mjs";
 import { pollForValue as s } from "../utils/process.utils.mjs";
-import { ComputeBudgetProgram as c, PublicKey as l, TransactionMessage as u, VersionedTransaction as d } from "@solana/web3.js";
-import { ASSOCIATED_TOKEN_PROGRAM_ID as f, TOKEN_PROGRAM_ID as p, createAssociatedTokenAccountInstruction as m, getAssociatedTokenAddress as h } from "@solana/spl-token";
+import { shouldRetryForSolanaError as c } from "../../error-handling/retrySolanaError.mjs";
+import { ComputeBudgetProgram as l, PublicKey as u, TransactionMessage as d, VersionedTransaction as f } from "@solana/web3.js";
+import { ASSOCIATED_TOKEN_PROGRAM_ID as p, TOKEN_PROGRAM_ID as m, createAssociatedTokenAccountInstruction as h, getAssociatedTokenAddress as g } from "@solana/spl-token";
 //#region libs/shared/common/src/functions/pre-transaction/sendV0Transaction.ts
-var g = 5e3, _ = 6e4, v = (e) => e instanceof Error && (e.message?.includes("Blockhash not found") || e.name === "TransactionExpiredBlockheightExceededError" || e.message?.includes("block height exceeded")), y = async (e, t, n = "confirmed") => await s(() => e.getTransaction(t, {
+var _ = 5e3, v = 6e4, y = 7, b = async (e, t, n = "confirmed") => await s(() => e.getTransaction(t, {
 	commitment: n,
 	maxSupportedTransactionVersion: 0
 }), {
-	timeoutMs: _,
-	intervalMs: g
-}) ?? null, b = async (e, i, a, o) => {
+	timeoutMs: v,
+	intervalMs: _
+}) ?? null, x = async (e, i, a, o) => {
 	try {
-		let { blockhash: s } = await e.getLatestBlockhash(), l = new d(new u({
+		let { blockhash: s } = await e.getLatestBlockhash(), c = new f(new d({
 			payerKey: i,
 			recentBlockhash: s,
-			instructions: [c.setComputeUnitLimit({ units: n }), ...a]
-		}).compileToV0Message(o)), { unitsConsumed: f } = (await e.simulateTransaction(l, {
+			instructions: [l.setComputeUnitLimit({ units: n }), ...a]
+		}).compileToV0Message(o)), { unitsConsumed: u } = (await e.simulateTransaction(c, {
 			sigVerify: !1,
 			replaceRecentBlockhash: !0
 		})).value;
-		if (!f) return n;
-		let p = Math.ceil(f * (1 + t));
+		if (!u) return n;
+		let p = Math.ceil(u * (1 + t));
 		return Math.max(r, Math.min(p, n));
 	} catch {
 		return n;
 	}
-}, x = (e, t, n, r) => {
+}, S = (e, t, n, r) => {
 	let i = /* @__PURE__ */ new Set();
 	return t && i.add(t.toBase58()), n?.forEach((e) => i.add(e.toBase58())), e.forEach((e) => {
 		i.add(e.programId.toBase58()), e.keys.forEach((e) => {
@@ -39,76 +40,77 @@ var g = 5e3, _ = 6e4, v = (e) => e instanceof Error && (e.message?.includes("Blo
 		i.add(e.key.toBase58()), e.state.addresses.forEach((e) => {
 			i.add(e.toBase58());
 		});
-	}), [...i].map((e) => new l(e));
-}, S = (t) => {
+	}), [...i].map((e) => new u(e));
+}, C = (t) => {
 	if (!t) throw Error("Failed to fetch Solana transaction details for signature");
 	if (t.meta?.err) {
 		let n = e(t.meta.err);
 		throw Error(`Solana transaction failed on-chain: ${n}`);
 	}
-}, C = async (e, t, n, r, i) => {
-	let a = n.filter((e) => !e.programId.equals(c.programId)), s = await b(e, t, a, r), l = c.setComputeUnitLimit({ units: s }), u = e.rpcEndpoint.includes("helius") ? await o(x(a, t, [c.programId], r), i) : 0;
+}, w = async (e, t, r, i, a) => {
+	if (r.some((e) => e.programId.equals(l.programId))) return r.map((e) => e.programId.equals(l.programId) && e.data[0] === 2 ? l.setComputeUnitLimit({ units: n }) : e);
+	let s = r.filter((e) => !e.programId.equals(l.programId)), c = await x(e, t, s, i), u = l.setComputeUnitLimit({ units: c }), d = e.rpcEndpoint.includes("helius") ? await o(S(s, t, [l.programId], i), a) : 0;
 	return [
-		l,
-		c.setComputeUnitPrice({ microLamports: u }),
-		...a
+		u,
+		l.setComputeUnitPrice({ microLamports: d }),
+		...s
 	];
-}, w = async (e, t, n, r, i) => {
+}, T = async (e, t, n, r, i) => {
 	if (t.length === 0) return "";
 	for (let o = 0; o < 10; o += 1) {
 		let s = o === 9;
 		try {
-			let o = await C(e, n.publicKey, t, i, s ? a.HIGH : a.RECOMMENDED), { blockhash: c, lastValidBlockHeight: l } = await e.getLatestBlockhash(), f = new d(new u({
+			let s = await w(e, n.publicKey, t, i, o >= y ? a.HIGH : a.RECOMMENDED), { blockhash: c, lastValidBlockHeight: l } = await e.getLatestBlockhash(), u = new f(new d({
 				payerKey: n.publicKey,
-				instructions: o,
+				instructions: s,
 				recentBlockhash: c
 			}).compileToV0Message(i));
-			f.sign(r);
-			let p = await e.sendTransaction(f);
+			u.sign(r);
+			let p = await e.sendTransaction(u);
 			return await e.confirmTransaction({
 				signature: p,
 				blockhash: c,
 				lastValidBlockHeight: l
-			}, "confirmed"), S(await y(e, p)), p;
+			}, "confirmed"), C(await b(e, p)), p;
 		} catch (e) {
-			if (v(e) && !s) continue;
+			if (c(e) && !s) continue;
 			throw e;
 		}
 	}
 	return "";
-}, T = async (e, t, n, r) => {
+}, E = async (e, t, n, r) => {
 	if (!n) return null;
-	let i = await h(n, r, !0, p, f);
-	return await e.getAccountInfo(i) || await w(e, [m(t.publicKey, i, r, n, p, f)], t, [t]), i;
-}, E = async ({ connection: e, chainId: t, subAccount: n, payerPublicKey: r, instructions: o, lookupTableAccounts: s }) => {
-	let c = i.getPrivateKeyFromSubAccount(t, n);
-	if (!c) throw Error("Private key is not available");
+	let i = await g(n, r, !0, m, p);
+	return await e.getAccountInfo(i) || await T(e, [h(t.publicKey, i, r, n, m, p)], t, [t]), i;
+}, D = async ({ connection: e, chainId: t, subAccount: n, payerPublicKey: r, instructions: o, lookupTableAccounts: s }) => {
+	let l = i.getPrivateKeyFromSubAccount(t, n);
+	if (!l) throw Error("Private key is not available");
 	for (let t = 0; t < 10; t += 1) {
 		let n = t === 9;
 		try {
-			let t = await C(e, r, o, s, n ? a.HIGH : a.RECOMMENDED), { blockhash: l, lastValidBlockHeight: f } = await e.getLatestBlockhash(), p = new d(new u({
+			let t = await w(e, r, o, s, n ? a.HIGH : a.RECOMMENDED), { blockhash: c, lastValidBlockHeight: u } = await e.getLatestBlockhash(), p = new f(new d({
 				payerKey: r,
-				recentBlockhash: l,
+				recentBlockhash: c,
 				instructions: t
-			}).compileToV0Message(s)), m = await i.sendAndSignSolanaTransactionFromPrivateKey(e, c, p, !0);
+			}).compileToV0Message(s)), m = await i.sendAndSignSolanaTransactionFromPrivateKey(e, l, p, !0);
 			return await e.confirmTransaction({
 				signature: m,
-				blockhash: l,
-				lastValidBlockHeight: f
-			}, "confirmed"), S(await y(e, m)), m;
+				blockhash: c,
+				lastValidBlockHeight: u
+			}, "confirmed"), C(await b(e, m)), m;
 		} catch (e) {
-			if (v(e) && !n) continue;
+			if (c(e) && !n) continue;
 			throw e;
 		}
 	}
 	throw Error("Failed to send proxy v0 transaction due to expired blockheight after all retries");
-}, D = async (e, t, n, r) => {
-	let { blockhash: i } = await e.getLatestBlockhash(), a = new d(new u({
+}, O = async (e, t, n, r) => {
+	let { blockhash: i } = await e.getLatestBlockhash(), a = new f(new d({
 		payerKey: t,
 		recentBlockhash: i,
-		instructions: await C(e, t, n, r)
+		instructions: await w(e, t, n, r)
 	}).compileToV0Message(r));
 	return Buffer.from(a.serialize()).toString("base64");
 };
 //#endregion
-export { T as ensureAtaExists, b as estimateComputeUnitLimit, y as fetchSolanaTransaction, x as getAccountsFromInstructions, E as sendProxyV0Transaction, w as sendV0Transaction, D as serializeProxyV0Transaction };
+export { E as ensureAtaExists, x as estimateComputeUnitLimit, b as fetchSolanaTransaction, S as getAccountsFromInstructions, D as sendProxyV0Transaction, T as sendV0Transaction, O as serializeProxyV0Transaction };

package/functions/pre-transaction/solana-public-signals.cjs

@@ -1 +1 @@
-var e=(e,t)=>{let n=t.tokenNumber,r=t.nullifierAmount,i=t.outputAmount,a=0,o=Uint8Array.from(e[a]);a+=1;let s=Uint8Array.from(e[a]);a+=1;let c=Uint8Array.from(e[a]);a+=1;let l=Uint8Array.from(e[a]);a+=1;let u=Uint8Array.from(e[a]);a+=1;let d=Uint8Array.from(e[a]);a+=1;let f=[];for(let t=0;t<n;t+=1)f.push(Uint8Array.from(e[a])),a+=1;let p=[];for(let t=0;t<n;t+=1)p.push(Uint8Array.from(e[a])),a+=1;let m=[];for(let t=0;t<n;t+=1){let t=[];for(let n=0;n<r;n+=1)t.push(Uint8Array.from(e[a])),a+=1;m.push(t)}let h=Uint8Array.from(e[a]);a+=1;let g=Uint8Array.from(e[a]);a+=1;let _=[];for(let t=0;t<n;t+=1)_.push(Uint8Array.from(e[a])),a+=1;let v=[];for(let t=0;t<n;t+=1){let t=[];for(let n=0;n<i;n+=1)t.push(Uint8Array.from(e[a])),a+=1;v.push(t)}let y=Uint8Array.from(e[a]);return a+=1,{swapperAccountAdditionalSeed:[...o],extraRandomizedStealthAddress:[...s],extraRandomizedStealthAddressSigns:[...c],extraRandomizedStealthAddressH0Ay:[...l],extraRandomizedStealthAddressH1Ay:[...u],rootHash:[...d],mintAccountPart1:f.map(e=>[...e]),mintAccountPart2:p.map(e=>[...e]),inNullifiers:m.map(e=>e.map(e=>[...e])),outTimestamp:[...h],extraRandomization:[...g],amountChanges:_.map(e=>[...e]),outCommitments:v.map(e=>e.map(e=>[...e])),calldataHash:[...y]}};exports.convertSolanaPublicSignals=e;
+var e=(e,t)=>{let n=t.tokenNumber,r=t.nullifierAmount,i=t.outputAmount,a=0,o=Uint8Array.from(e[a]);a+=1;let s=Uint8Array.from(e[a]);a+=1;let c=Uint8Array.from(e[a]);a+=1;let l=Uint8Array.from(e[a]);a+=1;let u=Uint8Array.from(e[a]);a+=1;let d=Uint8Array.from(e[a]);a+=1;let f=[];for(let t=0;t<n;t+=1)f.push(Uint8Array.from(e[a])),a+=1;let p=[];for(let t=0;t<n;t+=1)p.push(Uint8Array.from(e[a])),a+=1;let m=[];for(let t=0;t<n;t+=1)m.push(Uint8Array.from(e[a])),a+=1;let h=[];for(let t=0;t<n;t+=1){let t=[];for(let n=0;n<r;n+=1)t.push(Uint8Array.from(e[a])),a+=1;h.push(t)}let g=Uint8Array.from(e[a]);a+=1;let _=[];for(let t=0;t<n;t+=1){let t=[];for(let n=0;n<i;n+=1)t.push(Uint8Array.from(e[a])),a+=1;_.push(t)}let v=Uint8Array.from(e[a]);a+=1;let y=Uint8Array.from(e[a]);a+=1;let b=Uint8Array.from(e[a]);return{outH1Ay:[...o],outStealthAddress:[...s],message:[...c],swapperAccountAdditionalSeed:[...l],rootHash:[...u],signedMessageHash:[...d],mintAccountPart1:f.map(e=>[...e]),mintAccountPart2:p.map(e=>[...e]),amountChanges:m.map(e=>[...e]),inNullifiers:h.map(e=>e.map(e=>[...e])),outTimestamp:[...g],outCommitments:_.map(e=>e.map(e=>[...e])),calldataHash:[...v],h0Ax:[...y],h0Ay:[...b]}};exports.convertSolanaPublicSignals=e;

package/functions/pre-transaction/solana-public-signals.d.ts

@@ -3,18 +3,19 @@ export declare const convertSolanaPublicSignals: (publicInputsArr: number[][], d
     nullifierAmount: number;
     outputAmount: number;
 }) => {
+    outH1Ay: number[];
+    outStealthAddress: number[];
+    message: number[];
     swapperAccountAdditionalSeed: number[];
-    extraRandomizedStealthAddress: number[];
-    extraRandomizedStealthAddressSigns: number[];
-    extraRandomizedStealthAddressH0Ay: number[];
-    extraRandomizedStealthAddressH1Ay: number[];
     rootHash: number[];
+    signedMessageHash: number[];
     mintAccountPart1: number[][];
     mintAccountPart2: number[][];
+    amountChanges: number[][];
     inNullifiers: number[][][];
     outTimestamp: number[];
-    extraRandomization: number[];
-    amountChanges: number[][];
     outCommitments: number[][][];
     calldataHash: number[];
+    h0Ax: number[];
+    h0Ay: number[];
 };

package/functions/pre-transaction/solana-public-signals.mjs

@@ -17,39 +17,42 @@ var e = (e, t) => {
 	let p = [];
 	for (let t = 0; t < n; t += 1) p.push(Uint8Array.from(e[a])), a += 1;
 	let m = [];
+	for (let t = 0; t < n; t += 1) m.push(Uint8Array.from(e[a])), a += 1;
+	let h = [];
 	for (let t = 0; t < n; t += 1) {
 		let t = [];
 		for (let n = 0; n < r; n += 1) t.push(Uint8Array.from(e[a])), a += 1;
-		m.push(t);
+		h.push(t);
 	}
-	let h = Uint8Array.from(e[a]);
-	a += 1;
 	let g = Uint8Array.from(e[a]);
 	a += 1;
 	let _ = [];
-	for (let t = 0; t < n; t += 1) _.push(Uint8Array.from(e[a])), a += 1;
-	let v = [];
 	for (let t = 0; t < n; t += 1) {
 		let t = [];
 		for (let n = 0; n < i; n += 1) t.push(Uint8Array.from(e[a])), a += 1;
-		v.push(t);
+		_.push(t);
 	}
+	let v = Uint8Array.from(e[a]);
+	a += 1;
 	let y = Uint8Array.from(e[a]);
-	return a += 1, {
-		swapperAccountAdditionalSeed: [...o],
-		extraRandomizedStealthAddress: [...s],
-		extraRandomizedStealthAddressSigns: [...c],
-		extraRandomizedStealthAddressH0Ay: [...l],
-		extraRandomizedStealthAddressH1Ay: [...u],
-		rootHash: [...d],
+	a += 1;
+	let b = Uint8Array.from(e[a]);
+	return {
+		outH1Ay: [...o],
+		outStealthAddress: [...s],
+		message: [...c],
+		swapperAccountAdditionalSeed: [...l],
+		rootHash: [...u],
+		signedMessageHash: [...d],
 		mintAccountPart1: f.map((e) => [...e]),
 		mintAccountPart2: p.map((e) => [...e]),
-		inNullifiers: m.map((e) => e.map((e) => [...e])),
-		outTimestamp: [...h],
-		extraRandomization: [...g],
-		amountChanges: _.map((e) => [...e]),
-		outCommitments: v.map((e) => e.map((e) => [...e])),
-		calldataHash: [...y]
+		amountChanges: m.map((e) => [...e]),
+		inNullifiers: h.map((e) => e.map((e) => [...e])),
+		outTimestamp: [...g],
+		outCommitments: _.map((e) => e.map((e) => [...e])),
+		calldataHash: [...v],
+		h0Ax: [...y],
+		h0Ay: [...b]
 	};
 };
 //#endregion

package/functions/pre-transaction/solana.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../crypto/poseidon.cjs`);let t=require(`@solana/web3.js`),n=require(`@coral-xyz/anchor`);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.PublicKey.findProgramAddressSync(s,a);return c},s=(e,n)=>{let i=[r(`hinkal`),n.toBytes()],[a]=t.PublicKey.findProgramAddressSync(i,e);return a},c=(e,n)=>{let i=[r(`hinkal_merkle`),n.toBytes()],[a]=t.PublicKey.findProgramAddressSync(i,e);return a},l=(e,n)=>{let i=[r(`hinkal_merkle_access_token`),n.toBytes()],[a]=t.PublicKey.findProgramAddressSync(i,e);return a},u=(e,n)=>{let i=[r(`hinkal_access_token`),n.toBytes()],[a]=t.PublicKey.findProgramAddressSync(i,e);return a},d=(e,i,a)=>{let o=[r(`hinkal_swapper`),i.toBytes(),new Uint8Array(new n.BN(a.toString()).toArray(`be`,32))],[s]=t.PublicKey.findProgramAddressSync(o,e);return s},f=(t,n,r)=>d(t,n,e.poseidonFunction(r)),p=(e,n)=>{let i=[r(`hinkal_vault`),n.toBytes()],[a]=t.PublicKey.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.PublicKey.findProgramAddressSync(s,n);return c},h=(e,i,a,o)=>{let s=[r(`hinkal_proof_part1`),i.toBytes(),a.toBytes(),new Uint8Array(new n.BN(o.toString()).toArray(`be`,4))],[c]=t.PublicKey.findProgramAddressSync(s,e);return c},g=(e,i,a,o)=>{let s=[r(`hinkal_proof_part2`),i.toBytes(),a.toBytes(),new Uint8Array(new n.BN(o.toString()).toArray(`be`,4))],[c]=t.PublicKey.findProgramAddressSync(s,e);return c},_=(e,i,a,o)=>{let s=[r(`hinkal_encrypted_outputs`),i.toBytes(),a.toBytes(),new Uint8Array(new n.BN(o.toString()).toArray(`be`,4))],[c]=t.PublicKey.findProgramAddressSync(s,e);return c},v=(e,n,i)=>{let a=[r(`hinkal_token_limit`),n.toBytes(),i.toBytes()],[o]=t.PublicKey.findProgramAddressSync(a,e);return o},y=(e,i,a,o)=>{let s=[r(`hinkal_instructions`),i.toBytes(),a.toBytes(),new Uint8Array(new n.BN(o.toString()).toArray(`be`,4))],[c]=t.PublicKey.findProgramAddressSync(s,e);return c};exports.buildAnchorStealthAddressStructure=a,exports.encodeToByte32Array=i,exports.getAccessTokenAccountPublicKey=m,exports.getAccessTokenMerkleAccountPublicKey=l,exports.getAccessTokenStorageAccountPublicKey=u,exports.getEncryptedOutputsAccountPublicKey=_,exports.getInstructionsAccountPublicKey=y,exports.getMerkleAccountPublicKey=c,exports.getNullifierAccount=o,exports.getProofAccountPart1PublicKey=h,exports.getProofAccountPart2PublicKey=g,exports.getStorageAccountPublicKey=s,exports.getStorageVaultPublicKey=p,exports.getSwapperAccountPublicKey=d,exports.getSwapperAccountPublicKeyFromSalt=f,exports.getTokenLimitStorageAccountPublicKey=v;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../crypto/poseidon.cjs`);let t=require(`@solana/web3.js`),n=require(`@coral-xyz/anchor`);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.PublicKey.findProgramAddressSync(s,a);return c},s=(e,n)=>{let i=[r(`hinkal`),n.toBytes()],[a]=t.PublicKey.findProgramAddressSync(i,e);return a},c=(e,n)=>{let i=[r(`hinkal_merkle`),n.toBytes()],[a]=t.PublicKey.findProgramAddressSync(i,e);return a},l=(e,i,a)=>{let o=[r(`hinkal_swapper`),i.toBytes(),new Uint8Array(new n.BN(a.toString()).toArray(`be`,32))],[s]=t.PublicKey.findProgramAddressSync(o,e);return s},u=(t,n,r)=>l(t,n,e.poseidonFunction(r)),d=(e,n)=>{let i=[r(`hinkal_vault`),n.toBytes()],[a]=t.PublicKey.findProgramAddressSync(i,e);return a},f=(e,i,a,o)=>{let s=[r(`hinkal_proof_part1`),i.toBytes(),a.toBytes(),new Uint8Array(new n.BN(o.toString()).toArray(`be`,4))],[c]=t.PublicKey.findProgramAddressSync(s,e);return c},p=(e,i,a,o)=>{let s=[r(`hinkal_proof_part2`),i.toBytes(),a.toBytes(),new Uint8Array(new n.BN(o.toString()).toArray(`be`,4))],[c]=t.PublicKey.findProgramAddressSync(s,e);return c},m=(e,i,a,o)=>{let s=[r(`hinkal_encrypted_outputs`),i.toBytes(),a.toBytes(),new Uint8Array(new n.BN(o.toString()).toArray(`be`,4))],[c]=t.PublicKey.findProgramAddressSync(s,e);return c},h=(e,i,a,o)=>{let s=[r(`hinkal_instructions`),i.toBytes(),a.toBytes(),new Uint8Array(new n.BN(o.toString()).toArray(`be`,4))],[c]=t.PublicKey.findProgramAddressSync(s,e);return c};exports.buildAnchorStealthAddressStructure=a,exports.encodeToByte32Array=i,exports.getEncryptedOutputsAccountPublicKey=m,exports.getInstructionsAccountPublicKey=h,exports.getMerkleAccountPublicKey=c,exports.getNullifierAccount=o,exports.getProofAccountPart1PublicKey=f,exports.getProofAccountPart2PublicKey=p,exports.getStorageAccountPublicKey=s,exports.getStorageVaultPublicKey=d,exports.getSwapperAccountPublicKey=l,exports.getSwapperAccountPublicKeyFromSalt=u;

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

@@ -5,14 +5,10 @@ export declare const buildAnchorStealthAddressStructure: (structure: StealthAddr
 export declare const getNullifierAccount: (nullifier: bigint, originalDeployer: PublicKey, programId: PublicKey) => PublicKey;
 export declare const getStorageAccountPublicKey: (programId: PublicKey, originalDeployer: PublicKey) => PublicKey;
 export declare const getMerkleAccountPublicKey: (programId: PublicKey, originalDeployer: PublicKey) => PublicKey;
-export declare const getAccessTokenMerkleAccountPublicKey: (programId: PublicKey, originalDeployer: PublicKey) => PublicKey;
-export declare const getAccessTokenStorageAccountPublicKey: (programId: PublicKey, originalDeployer: PublicKey) => PublicKey;
 export declare const getSwapperAccountPublicKey: (programId: PublicKey, originalDeployer: PublicKey, swapperAccountAdditionalSeed: bigint) => PublicKey;
 export declare const getSwapperAccountPublicKeyFromSalt: (programId: PublicKey, originalDeployer: PublicKey, swapperAccountSalt: bigint) => PublicKey;
 export declare const getStorageVaultPublicKey: (programId: PublicKey, originalDeployer: PublicKey) => PublicKey;
-export declare const getAccessTokenAccountPublicKey: (accessKey: bigint, programId: PublicKey, originalDeployer: PublicKey) => PublicKey;
 export declare const getProofAccountPart1PublicKey: (programId: PublicKey, originalDeployer: PublicKey, signer: PublicKey, id: bigint) => PublicKey;
 export declare const getProofAccountPart2PublicKey: (programId: PublicKey, originalDeployer: PublicKey, signer: PublicKey, id: bigint) => PublicKey;
 export declare const getEncryptedOutputsAccountPublicKey: (programId: PublicKey, originalDeployer: PublicKey, signer: PublicKey, id: bigint) => PublicKey;
-export declare const getTokenLimitStorageAccountPublicKey: (programId: PublicKey, originalDeployer: PublicKey, mint: PublicKey) => PublicKey;
 export declare const getInstructionsAccountPublicKey: (programId: PublicKey, originalDeployer: PublicKey, signer: PublicKey, id: bigint) => PublicKey;

package/functions/pre-transaction/solana.mjs

@@ -25,30 +25,17 @@ var r = (e) => new TextEncoder().encode(e), i = (e) => {
 }, 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) => {
+}, l = (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) => {
+}, u = (t, n, r) => l(t, n, e(r)), d = (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) => {
+}, f = (e, i, a, o) => {
 	let s = [
 		r("hinkal_proof_part1"),
 		i.toBytes(),
@@ -56,7 +43,7 @@ var r = (e) => new TextEncoder().encode(e), i = (e) => {
 		new Uint8Array(new n(o.toString()).toArray("be", 4))
 	], [c] = t.findProgramAddressSync(s, e);
 	return c;
-}, g = (e, i, a, o) => {
+}, p = (e, i, a, o) => {
 	let s = [
 		r("hinkal_proof_part2"),
 		i.toBytes(),
@@ -64,7 +51,7 @@ var r = (e) => new TextEncoder().encode(e), i = (e) => {
 		new Uint8Array(new n(o.toString()).toArray("be", 4))
 	], [c] = t.findProgramAddressSync(s, e);
 	return c;
-}, _ = (e, i, a, o) => {
+}, m = (e, i, a, o) => {
 	let s = [
 		r("hinkal_encrypted_outputs"),
 		i.toBytes(),
@@ -72,14 +59,7 @@ var r = (e) => new TextEncoder().encode(e), i = (e) => {
 		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) => {
+}, h = (e, i, a, o) => {
 	let s = [
 		r("hinkal_instructions"),
 		i.toBytes(),
@@ -89,4 +69,4 @@ var r = (e) => new TextEncoder().encode(e), i = (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 };
+export { a as buildAnchorStealthAddressStructure, i as encodeToByte32Array, m as getEncryptedOutputsAccountPublicKey, h as getInstructionsAccountPublicKey, c as getMerkleAccountPublicKey, o as getNullifierAccount, f as getProofAccountPart1PublicKey, p as getProofAccountPart2PublicKey, s as getStorageAccountPublicKey, d as getStorageVaultPublicKey, l as getSwapperAccountPublicKey, u as getSwapperAccountPublicKeyFromSalt };

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

@@ -1 +1 @@
-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;
+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=s.length;await Promise.all(s.map(async(e,s)=>t.sendV0Transaction(n,[await r.methods.storeEncryptedOutputs(Number(o),Buffer.from(e),s,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

@@ -3,12 +3,12 @@ import { getEncryptedOutputsAccountPublicKey as e, getProofAccountPart1PublicKey
 import { sendV0Transaction as r } from "./sendV0Transaction.mjs";
 //#region libs/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({
+	let m = e(a.programId, s, o.publicKey, c), h = l.length;
+	await Promise.all(l.map(async (e, t) => r(i, [await a.methods.storeEncryptedOutputs(Number(c), Buffer.from(e), t, h).accounts({
 		originalDeployer: s,
 		signer: o.publicKey,
 		encryptedOutputsAccount: m
-	}).instruction()], o, [o]);
+	}).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,

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

@@ -1 +1 @@
-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;
+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(`../../error-handling/logger.cjs`),a=require(`../utils/create-provider.cjs`),o=require(`../../data-structures/AccountActions/AccountActions.cjs`),s=require(`../utils/getContractAddress.cjs`);require(`../utils/index.cjs`);let c=require(`ethers`);var l=e=>{if(typeof e.target==`string`)return e.target;if(e.address)return e.address;throw Error(`Contract address not found`)},u=({contract:e,func:t,args:n,callDataString:r,invokeWallet:i,value:a})=>{let o=new Uint8Array,s=r?c.ethers.getBytesCopy(r):new Uint8Array;if(typeof e==`object`){if(o=c.ethers.getBytesCopy(l(e)),r?.length&&r?.length>0)throw Error(`If function and args are providedm no calldata is needed`);t&&n&&!r&&(s=c.ethers.getBytesCopy(e.interface.encodeFunctionData(t,n)))}else o=c.ethers.getBytesCopy(e);let u=c.ethers.getBytesCopy(new Uint8Array([+!!i])),d=c.ethers.zeroPadValue(c.ethers.toBeHex(a??0n),16),f=c.ethers.concat([o,u,d,s]);return c.ethers.hexlify(f)},d=async(e,r,i,a,s,l)=>{let u=t.getOnchainChainId(e),d=i?await o.AccountActions.signTypedDataFromPrivateKey(u,i,{name:`Emporium`,version:`1.0.0`,chainId:u,verifyingContract:r},{EmporiumSignature:[{name:`message`,type:`uint256`},{name:`ops`,type:`bytes[]`}]},{message:s,ops:a}):void 0,{v:f,r:p,s:m}=d?c.ethers.Signature.from(d):{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:f,r:p,s:m,message:s??0n,signerAddress:l??n.zeroAddress,ops:a}])},f=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}},p=(e,t,n,r)=>u(e?{contract:e,func:`transfer`,args:[t,n],invokeWallet:r}:{contract:t,value:n,invokeWallet:r}),m=(t,i,a,o,c)=>{let l=t.getContractWithFetcher(i,e.ContractType.HinkalContract);return a.map((a,u)=>p(r.caseInsensitiveEqual(a,n.zeroAddress)?void 0:t.getContractWithFetcher(i,e.ContractType.ERC20Contract,a),c??s.getContractAddress(l),o[u],!0))},h=(e,t,n,r)=>u({contract:e,func:`approve`,args:[t,n],invokeWallet:r}),g=(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(p(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(h(n,u,c[a],!0))}}return d},_=(e,t,i,a,o,s,c,l)=>{let d=[],f=[o],p=[s];l.nativeFee>0n&&!r.caseInsensitiveEqual(o,n.zeroAddress)&&(f.push(n.zeroAddress),p.push(l.nativeFee));let m=g(e,t,f,p,[o],[c],i,a);d.push(...m);let h=l.nativeFee;return r.caseInsensitiveEqual(o,n.zeroAddress)&&(h+=c),d.push(u({contract:a,callDataString:l.calldata,value:h>0n?h:void 0,invokeWallet:!0})),d},v=`0xef0100`,y=async(e,t)=>{try{let n=a.createJsonRpcProvider(e),r=await n.getCode(t);if(r===`0x`||!r)return{delegated:!1,implementation:void 0,nonce:void 0};if(r.toLowerCase().startsWith(v)&&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 i.Logger.error(`checkEOAWithDelegation error`,{error:e}),e}},b=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},x=async(e,n)=>{if(e===t.chainIds.localhost||!n)return;let i=t.getOnchainChainId(e),{delegated:a,implementation:s}=await y(e,o.AccountActions.getSignerAddressFromPrivateKey(e,n)),c=b(e);if(!a||!r.caseInsensitiveEqual(s,c)){let e=await o.AccountActions.authorizeDelegation(i,n,c);return{v:e.signature.v.toString(),r:e.signature.r,s:e.signature.s,nonce:e.nonce.toString(),address:c,chainId:String(i)}}},S=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=y,exports.createApproveEmporiumOp=h,exports.createLifiBridgeOps=_,exports.createTransaferEmporiumOpsBatch=m,exports.createTransferToEmporiumOp=p,exports.decodeEmporiumMetadata=f,exports.emporiumOp=u,exports.encodeEmporiumMetadata=d,exports.generateFundAndApproveOps=g,exports.getAuthorizationDataIfNeeded=x,exports.recoverAuthorizationData=S;

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

@@ -2,8 +2,17 @@ import { ethers } from 'ethers';
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
 import { AuthorizationData } from '../../types/hinkal.types';
 import { BridgeQuote } from '../../types/bridging-tx.types';
+type EncodableContract = {
+    address?: string;
+    target?: string | {
+        toString(): string;
+    };
+    interface: {
+        encodeFunctionData: (...args: any[]) => string;
+    };
+};
 export declare const emporiumOp: ({ contract, func, args, callDataString, invokeWallet, value, }: {
-    contract: ethers.BaseContract | string;
+    contract: EncodableContract | string;
     func?: string;
     args?: unknown[];
     callDataString?: string;
@@ -19,9 +28,9 @@ export declare const decodeEmporiumMetadata: (metadata: string) => {
     signerAddress: string;
     ops: string[];
 };
-export declare const createTransferToEmporiumOp: (tokenContract: ethers.Contract | undefined, to: string, amount: bigint, invokeWallet: boolean) => string;
+export declare const createTransferToEmporiumOp: (tokenContract: EncodableContract | undefined, to: string, amount: bigint, invokeWallet: boolean) => 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 createApproveEmporiumOp: (tokenContract: EncodableContract, to: string, amount: bigint, invokeWallet: boolean) => 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<{
@@ -31,7 +40,8 @@ export declare const checkEOAWithDelegation: (chainId: number, eoaAddress: strin
 } | {
     delegated: boolean;
     implementation: string;
-    nonce: any;
+    nonce: number;
 }>;
 export declare const getAuthorizationDataIfNeeded: (chainId: number, privateKey: string | undefined) => Promise<AuthorizationData | undefined>;
 export declare const recoverAuthorizationData: (authorizationData: AuthorizationData | undefined) => ethers.Authorization | undefined;
+export {};