@hinkal/common 0.2.28 → 0.2.29

package/data-structures/Hinkal/hinkalSolanaSwap.mjs

@@ -1,141 +1,98 @@
-import "../../types/circom-data.types.mjs";
-import { ExternalActionId as nt } from "../../types/external-action.types.mjs";
-import { networkRegistry as st } from "../../constants/chains.constants.mjs";
-import { solanaNativeAddress as T } from "../../constants/protocol.constants.mjs";
-import { AdminTransactionType as it } from "../../types/admin.types.mjs";
-import "../../types/activities.types.mjs";
-import { StorageKeys as at } from "../../types/cache.types.mjs";
-import { addPaddingToUtxos as ct } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as mt } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { getCurrentTimeInSeconds as pt } from "../../functions/utils/time.utils.mjs";
-import { getFeeStructure as ut } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { calcEncryptedOutputs as lt } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { PublicKey as m } from "@solana/web3.js";
-import { getSwapperAccountPublicKeyFromSalt as dt, getStorageAccountPublicKey as At, getStorageVaultPublicKey as gt } from "../../functions/pre-transaction/solana.mjs";
-import { constructSolanaZkProof as ft } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { Utxo as yt } from "../utxo/Utxo.mjs";
-import { getAmountInToken as St, getAmountInWei as wt, randomBigInt as Tt } from "../../functions/web3/etherFunctions.mjs";
-import { convertOKXToHinkalInstructions as It } from "../../functions/pre-transaction/convert-okx-instructions.mjs";
-import { solanaTransactCallRelayer as Pt } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { transactionErrorCodes as U } from "../../error-handling/error-codes.constants.mjs";
-import { shouldPatchAccessTokenMerkleTree as bt } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
-import { ethers as xt } from "ethers";
-import { validateAndGetChainId as Rt } from "../../functions/utils/token-check.utils.mjs";
-import { constructAdminData as kt } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { ensureAmountChanges as vt } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
-const Et = async (r, n, o, a) => {
-  const p = [...await ct(r, n, o, a, 6)], l = pt().toString(), u = [];
-  for (let s = 0; s < o.length; s += 1) {
-    const { outputUtxos: t } = mt(
-      r.userKeys,
-      p[s],
-      a[s],
-      l,
-      void 0,
-      !1
-    );
-    u.push([t[0]]);
-  }
-  return { inputUtxosArray: p, outputUtxosArray: u };
-}, rr = async (r, n, o, a, p, l, u, s) => {
-  const t = Rt(n), I = new m(T), { hinkalAddress: O, originalDeployer: d, hinkalIdl: P } = st[t].contractData;
-  if (!d || !P)
-    throw new Error("No IDL configured for Solana program on this network");
-  const A = new m(d), g = new m(O), c = n.map((e) => e.erc20TokenAddress), { userKeys: b, merkleTreeAccessTokenByChain: F, merkleTreeHinkalByChain: B } = r, D = r.getSolanaProgram(P), i = s ?? await ut(t, u, c, nt.Transact), x = o[1], N = Number(r.cacheDevice.get(at.SLIPPAGE_PERCENTAGE) ?? 0), f = n[1], L = St(f, x), _ = Number(L) * N / 100;
-  o[1] -= wt(f, _.toFixed(f.decimals));
-  const C = x * BigInt(i.variableRate ?? 0) / 10000n + i.flatFee;
-  if (o[1] -= C, o[1] < 0)
-    throw new Error(U.LOW_OUTPUT_AMOUNT);
-  const V = i.variableRate.toString(), [
-    { patchAccessTokenMerkleTree: W, kycRequired: G, hasAccessToken: M },
-    y,
-    R,
-    { inputUtxosArray: S, outputUtxosArray: w }
-  ] = await Promise.all([
-    bt(r, t, c, o),
-    r.getRandomRelay(t, !0),
-    r.getEthereumAddressByChain(t),
-    Et(r, t, c, o)
-  ]);
-  if (!y)
-    throw Error(U.RELAYER_NOT_AVAILABLE);
-  const z = r.userKeys.getShieldedPrivateKey(), H = yt.findCorrectRandomization(Tt(31), z), k = {
-    tokenNumber: 2,
-    nullifierAmount: S[0].length,
-    outputAmount: 1
-  }, q = [!1, !0].slice(0, o.length), v = lt(w).map((e) => [...xt.getBytes(e[0])]), E = dt(g, A, a), { remainingAccounts: K, hinkalInstructions: h } = It(p, E);
-  vt(S, w, o);
-  const { proofAArr: X, proofBArr: Y, proofCArr: Z, publicInputsArr: j } = await ft(
-    r.generateProofRemotely,
-    d,
-    B[t],
-    F[t],
-    b,
-    D,
-    c,
-    S,
-    w,
-    H,
-    i.flatFee,
-    i.variableRate,
-    I.toString(),
-    y,
-    k,
-    v,
-    t,
-    W,
-    q,
-    a,
-    h,
-    K
-  ), J = At(g, A), Q = gt(g, A), $ = n[0].erc20TokenAddress !== T ? new m(n[0].erc20TokenAddress) : null, tt = n[1].erc20TokenAddress !== T ? new m(n[1].erc20TokenAddress) : null, rt = {
-    recipient: I.toString(),
-    storageAccount: J.toString(),
-    storageVault: Q.toString(),
-    swapperAccount: E.toString(),
-    mintFrom: $?.toString() ?? null,
-    mintTo: tt?.toString() ?? null,
-    remainingAccounts: K.map((e) => ({
-      pubkey: e.pubkey.toString(),
-      isSigner: e.isSigner,
-      isWritable: e.isWritable
-    })),
-    addressLookupTableAccount: l
-  }, ot = {
-    encryptedOutputs: v,
-    proofAArr: X,
-    proofBArr: Y,
-    proofCArr: Z,
-    publicInputsArr: j,
-    relayerFee: i.flatFee.toString(),
-    variableRate: V,
-    dimensions: k,
-    hinkalInstructions: h.map((e) => ({
-      accountIndexes: [...e.accountIndexes],
-      data: [...e.data],
-      programIndex: e.programIndex
-    }))
-  }, et = kt(
-    it.PrivateSwap,
-    t,
-    c,
-    o,
-    R,
-    n
-  );
-  return Pt({
-    chainId: t,
-    relayAddress: y,
-    functionName: "swap",
-    args: ot,
-    accounts: rt,
-    solanaAccessTokenData: !M && G ? {
-      ethereumAddress: R,
-      accessKey: b.getAccessKey()
-    } : void 0,
-    adminData: et
-  });
-};
-export {
-  rr as hinkalSolanaSwap
+import { ExternalActionId as e } from "../../types/external-action.types.mjs";
+import { networkRegistry as t } from "../../constants/chains.constants.mjs";
+import { solanaNativeAddress as n } from "../../constants/protocol.constants.mjs";
+import { AdminTransactionType as r } from "../../types/admin.types.mjs";
+import { StorageKeys as i } from "../../types/cache.types.mjs";
+import "../../types/index.mjs";
+import { transactionErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
+import { getAmountInToken as o, getAmountInWei as ee, randomBigInt as te } from "../../functions/web3/etherFunctions.mjs";
+import { getCurrentTimeInSeconds as s } from "../../functions/utils/time.utils.mjs";
+import { Utxo as c } from "../utxo/Utxo.mjs";
+import { getStorageAccountPublicKey as l, getStorageVaultPublicKey as u, getSwapperAccountPublicKeyFromSalt as ne } from "../../functions/pre-transaction/solana.mjs";
+import { validateAndGetChainId as d } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as f } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as p } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { calcEncryptedOutputs as m } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { constructAdminData as h } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { convertOKXToHinkalInstructions as g } from "../../functions/pre-transaction/convert-okx-instructions.mjs";
+import { ensureAmountChanges as _ } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
+import { getFeeStructure as v } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { shouldPatchAccessTokenMerkleTree as y } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { constructSolanaZkProof as b } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { solanaTransactCallRelayer as x } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ethers as re } from "ethers";
+import { PublicKey as S } from "@solana/web3.js";
+//#region ../shared/common/src/data-structures/Hinkal/hinkalSolanaSwap.ts
+var ie = async (e, t, n, r) => {
+	let i = [...await f(e, t, n, r, 6)], a = s().toString(), o = [];
+	for (let t = 0; t < n.length; t += 1) {
+		let { outputUtxos: n } = p(e.userKeys, i[t], r[t], a, void 0, !1);
+		o.push([n[0]]);
+	}
+	return {
+		inputUtxosArray: i,
+		outputUtxosArray: o
+	};
+}, C = async (s, f, p, C, ae, oe, se, ce) => {
+	let w = d(f), T = new S(n), { hinkalAddress: E, originalDeployer: D, hinkalIdl: O } = t[w].contractData;
+	if (!D || !O) throw Error("No IDL configured for Solana program on this network");
+	let k = new S(D), A = new S(E), j = f.map((e) => e.erc20TokenAddress), { userKeys: M, merkleTreeAccessTokenByChain: N, merkleTreeHinkalByChain: P } = s, F = s.getSolanaProgram(O), I = ce ?? await v(w, se, j, e.Transact), L = p[1], R = Number(s.cacheDevice.get(i.SLIPPAGE_PERCENTAGE) ?? 0), z = f[1], B = o(z, L), V = Number(B) * R / 100;
+	p[1] -= ee(z, V.toFixed(z.decimals));
+	let H = L * BigInt(I.variableRate ?? 0) / 10000n + I.flatFee;
+	if (p[1] -= H, p[1] < 0) throw Error(a.LOW_OUTPUT_AMOUNT);
+	let U = I.variableRate.toString(), [{ patchAccessTokenMerkleTree: le, kycRequired: W, hasAccessToken: ue }, G, K, { inputUtxosArray: q, outputUtxosArray: J }] = await Promise.all([
+		y(s, w, j, p),
+		s.getRandomRelay(w, !0),
+		s.getEthereumAddressByChain(w),
+		ie(s, w, j, p)
+	]);
+	if (!G) throw Error(a.RELAYER_NOT_AVAILABLE);
+	let de = s.userKeys.getShieldedPrivateKey(), fe = c.findCorrectRandomization(te(31), de), Y = {
+		tokenNumber: 2,
+		nullifierAmount: q[0].length,
+		outputAmount: 1
+	}, X = m(J).map((e) => [...re.getBytes(e[0])]), Z = ne(A, k, C), { remainingAccounts: Q, hinkalInstructions: $ } = g(ae, Z);
+	_(q, J, p);
+	let { proofAArr: pe, proofBArr: me, proofCArr: he, publicInputsArr: ge } = await b(s.generateProofRemotely, D, P[w], N[w], M, F, j, q, J, fe, I.flatFee, I.variableRate, T.toString(), G, Y, X, w, le, C, $, Q), _e = l(A, k), ve = u(A, k), ye = f[0].erc20TokenAddress === "11111111111111111111111111111111" ? null : new S(f[0].erc20TokenAddress), be = f[1].erc20TokenAddress === "11111111111111111111111111111111" ? null : new S(f[1].erc20TokenAddress), xe = {
+		recipient: T.toString(),
+		storageAccount: _e.toString(),
+		storageVault: ve.toString(),
+		swapperAccount: Z.toString(),
+		mintFrom: ye?.toString() ?? null,
+		mintTo: be?.toString() ?? null,
+		remainingAccounts: Q.map((e) => ({
+			pubkey: e.pubkey.toString(),
+			isSigner: e.isSigner,
+			isWritable: e.isWritable
+		})),
+		addressLookupTableAccount: oe
+	}, Se = {
+		encryptedOutputs: X,
+		proofAArr: pe,
+		proofBArr: me,
+		proofCArr: he,
+		publicInputsArr: ge,
+		relayerFee: I.flatFee.toString(),
+		variableRate: U,
+		dimensions: Y,
+		hinkalInstructions: $.map((e) => ({
+			accountIndexes: [...e.accountIndexes],
+			data: [...e.data],
+			programIndex: e.programIndex
+		}))
+	}, Ce = h(r.PrivateSwap, w, j, p, K, f);
+	return x({
+		chainId: w,
+		relayAddress: G,
+		functionName: "swap",
+		args: Se,
+		accounts: xe,
+		solanaAccessTokenData: !ue && W ? {
+			ethereumAddress: K,
+			accessKey: M.getAccessKey()
+		} : void 0,
+		adminData: Ce
+	});
 };
+//#endregion
+export { C as hinkalSolanaSwap };

package/data-structures/Hinkal/hinkalSolanaTransfer.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../types/circom-data.types.cjs");const V=require("../../types/external-action.types.cjs"),z=require("../../constants/chains.constants.cjs"),A=require("../../constants/protocol.constants.cjs");require("../../types/activities.types.cjs");const H=require("../../functions/web3/events/getShieldedBalance.cjs"),j=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),G=require("../../functions/utils/time.utils.cjs"),_=require("../../error-handling/error-codes.constants.cjs"),M=require("../../functions/pre-transaction/getFeeStructure.cjs"),Z=require("../../functions/snarkjs/common.snarkjs.cjs"),Y=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),C=require("../utxo/Utxo.cjs"),J=require("../../functions/web3/etherFunctions.cjs"),Q=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),W=require("../../functions/utils/addresses.cjs"),X=require("ethers"),$=require("../../functions/utils/token-check.utils.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("../http/HttpClient.cjs");require("axios");require("../../constants/vite.constants.cjs");require("../../constants/token-data/index.cjs");require("../../constants/tokens.constants.cjs");const ee=require("../../functions/pre-transaction/constructAdminData.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("circomlibjs-hinkal-fork");require("@solana/spl-token");require("tweetnacl");require("bs58");require("buffer");const te=require("../../functions/pre-transaction/ensureAmountChanges.cjs");require("../../API/enclaveUtxoCalls.cjs");const re=require("../../functions/utils/fees.utils.cjs"),ne=async(r,a,i,s,c,u)=>{const n=(await H.addPaddingToUtxos(r,a,i,s,6))[0],e=G.getCurrentTimeInSeconds().toString(),{outputUtxos:t}=j.outputUtxoProcessing(r.userKeys,n,s[0],e,void 0,!1),[d,l,p]=c.split(","),q=new C.Utxo({amount:u,erc20TokenAddress:n[0].erc20TokenAddress,mintAddress:n[0].mintAddress,timeStamp:e,randomization:BigInt(d),stealthAddress:l,encryptionKey:p});return{inputUtxos:n,senderOutputUtxos:t,recipientUtxo:q}},x=async(r,a,i,s,c,u,n)=>{if(!W.isValidPrivateAddress(s))throw Error(_.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const e=$.validateAndGetChainId(a),t=[...i],{originalDeployer:d,hinkalIdl:l}=z.networkRegistry[e].contractData;if(!d||!l)throw new Error("missing data");const{userKeys:p,merkleTreeAccessTokenByChain:q,merkleTreeHinkalByChain:P}=r,o=a.map(h=>h.erc20TokenAddress);if(o.length>1)throw new Error("Solana Transfer: Only one mint address is supported");const y=u??await M.getFeeStructure(e,c,o,V.ExternalActionId.Transact,[],A.HINKAL_PRIVATE_SEND_VARIABLE_RATE);y.variableRate||(y.variableRate=A.HINKAL_PRIVATE_SEND_VARIABLE_RATE);const g=re.calculateTotalFee(-t[0],y),w=-t[0];t[0]-=g;const[m,U,{inputUtxos:f,senderOutputUtxos:T,recipientUtxo:E}]=await Promise.all([r.getRandomRelay(e,!0),r.getEthereumAddressByChain(e),ne(r,e,o,t,s,w)]);if(!m)throw Error(_.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const R=T[0],O=C.Utxo.findCorrectRandomization(J.randomBigInt(31),r.userKeys.getShieldedPrivateKey()),S={tokenNumber:o.length,nullifierAmount:f.length,outputAmount:2},B=r.getSolanaProgram(l),I=Z.calcEncryptedOutputs([[R,E]])[0].map(h=>Array.from(X.ethers.getBytes(h)));te.ensureAmountChanges([f],[T],t);const{proofAArr:N,proofBArr:v,proofCArr:k,publicInputsArr:D}=await Y.constructSolanaZkProof(r.generateProofRemotely,d,P[e],q[e],p,B,[o[0]],[f],[[R,E]],O,g,0n,A.solanaNativeAddress,m,S,I,e),b=o[0]===A.solanaNativeAddress,F={recipient:m,mint:b?void 0:o[0]},K={proofAArr:N,proofBArr:v,proofCArr:k,publicInputsArr:D,encryptedOutputs:I,relayerFee:g.toString(),dimensions:S},L=ee.constructAdminData(n,e,o,t,U);return{chainId:e,relay:m,args:K,accounts:F,adminData:L,recipientUtxo:E}},oe=async(r,a,i,s,c,u,n,e=!1)=>{if(e)throw new Error("onlyGasEstimate is not supported for Solana transfer");const t=await x(r,a,i,s,c,u,n);return Q.solanaTransactCallRelayer({chainId:t.chainId,relayAddress:t.relay,functionName:"transfer",args:t.args,accounts:t.accounts,adminData:t.adminData})};exports.buildSolanaTransferPlan=x;exports.hinkalSolanaTransfer=oe;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`);require(`../../types/index.cjs`);const r=require(`../../functions/utils/addresses.cjs`),i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../functions/web3/etherFunctions.cjs`),o=require(`../../functions/utils/time.utils.cjs`),s=require(`../utxo/Utxo.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/snarkjs/common.snarkjs.cjs`),f=require(`../../functions/utils/fees.utils.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),m=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),h=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const g=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let v=require(`ethers`);var y=async(e,t,n,r,i,a)=>{let c=(await l.addPaddingToUtxos(e,t,n,r,6))[0],d=o.getCurrentTimeInSeconds().toString(),{outputUtxos:f}=u.outputUtxoProcessing(e.userKeys,c,r[0],d,void 0,!1),[p,m,h]=i.split(`,`);return{inputUtxos:c,senderOutputUtxos:f,recipientUtxo:new s.Utxo({amount:a,erc20TokenAddress:c[0].erc20TokenAddress,mintAddress:c[0].mintAddress,timeStamp:d,randomization:BigInt(p),stealthAddress:m,encryptionKey:h})}},b=async(o,l,u,_,b,x,S)=>{if(!r.isValidPrivateAddress(_))throw Error(i.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let C=c.validateAndGetChainId(l),w=[...u],{originalDeployer:T,hinkalIdl:E}=t.networkRegistry[C].contractData;if(!T||!E)throw Error(`missing data`);let{userKeys:D,merkleTreeAccessTokenByChain:O,merkleTreeHinkalByChain:k}=o,A=l.map(e=>e.erc20TokenAddress);if(A.length>1)throw Error(`Solana Transfer: Only one mint address is supported`);let j=x??await h.getFeeStructure(C,b,A,e.ExternalActionId.Transact,[],5n);j.variableRate||=n.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let M=f.calculateTotalFee(-w[0],j),N=-w[0];w[0]-=M;let[P,F,{inputUtxos:I,senderOutputUtxos:L,recipientUtxo:R}]=await Promise.all([o.getRandomRelay(C,!0),o.getEthereumAddressByChain(C),y(o,C,A,w,_,N)]);if(!P)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let z=L[0],B=s.Utxo.findCorrectRandomization(a.randomBigInt(31),o.userKeys.getShieldedPrivateKey()),V={tokenNumber:A.length,nullifierAmount:I.length,outputAmount:2},H=o.getSolanaProgram(E),U=d.calcEncryptedOutputs([[z,R]])[0].map(e=>Array.from(v.ethers.getBytes(e)));m.ensureAmountChanges([I],[L],w);let{proofAArr:W,proofBArr:G,proofCArr:K,publicInputsArr:q}=await g.constructSolanaZkProof(o.generateProofRemotely,T,k[C],O[C],D,H,[A[0]],[I],[[z,R]],B,M,0n,n.solanaNativeAddress,P,V,U,C),J={recipient:P,mint:A[0]===`11111111111111111111111111111111`?void 0:A[0]};return{chainId:C,relay:P,args:{proofAArr:W,proofBArr:G,proofCArr:K,publicInputsArr:q,encryptedOutputs:U,relayerFee:M.toString(),dimensions:V},accounts:J,adminData:p.constructAdminData(S,C,A,w,F),recipientUtxo:R}},x=async(e,t,n,r,i,a,o,s=!1)=>{if(s)throw Error(`onlyGasEstimate is not supported for Solana transfer`);let c=await b(e,t,n,r,i,a,o);return _.solanaTransactCallRelayer({chainId:c.chainId,relayAddress:c.relay,functionName:`transfer`,args:c.args,accounts:c.accounts,adminData:c.adminData})};exports.buildSolanaTransferPlan=b,exports.hinkalSolanaTransfer=x;

package/data-structures/Hinkal/hinkalSolanaTransfer.mjs

@@ -1,150 +1,93 @@
-import "../../types/circom-data.types.mjs";
-import { ExternalActionId as V } from "../../types/external-action.types.mjs";
-import { networkRegistry as G } from "../../constants/chains.constants.mjs";
-import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as x, solanaNativeAddress as C } from "../../constants/protocol.constants.mjs";
-import "../../types/activities.types.mjs";
-import { addPaddingToUtxos as H } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as M } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { getCurrentTimeInSeconds as Y } from "../../functions/utils/time.utils.mjs";
-import { transactionErrorCodes as S } from "../../error-handling/error-codes.constants.mjs";
-import { getFeeStructure as Z } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { calcEncryptedOutputs as j } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { constructSolanaZkProof as q } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { Utxo as O } from "../utxo/Utxo.mjs";
-import { randomBigInt as J } from "../../functions/web3/etherFunctions.mjs";
-import { solanaTransactCallRelayer as Q } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { isValidPrivateAddress as W } from "../../functions/utils/addresses.mjs";
-import { ethers as X } from "ethers";
-import { validateAndGetChainId as $ } from "../../functions/utils/token-check.utils.mjs";
-import "../../constants/server.constants.mjs";
-import "../../API/getServerURL.mjs";
-import "../http/HttpClient.mjs";
-import "axios";
-import "../../constants/vite.constants.mjs";
-import "../../constants/token-data/index.mjs";
-import "../../constants/tokens.constants.mjs";
-import { constructAdminData as tt } from "../../functions/pre-transaction/constructAdminData.mjs";
-import "@coral-xyz/anchor";
-import "@solana/web3.js";
-import "circomlibjs-hinkal-fork";
-import "@solana/spl-token";
-import "tweetnacl";
-import "bs58";
-import "buffer";
-import { ensureAmountChanges as rt } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
-import "../../API/enclaveUtxoCalls.mjs";
-import { calculateTotalFee as ot } from "../../functions/utils/fees.utils.mjs";
-const et = async (o, s, i, a, m, p) => {
-  const e = (await H(o, s, i, a, 6))[0], t = Y().toString(), { outputUtxos: r } = M(
-    o.userKeys,
-    e,
-    a[0],
-    t,
-    void 0,
-    !1
-  ), [c, d, l] = m.split(","), f = new O({
-    amount: p,
-    erc20TokenAddress: e[0].erc20TokenAddress,
-    mintAddress: e[0].mintAddress,
-    timeStamp: t,
-    randomization: BigInt(c),
-    stealthAddress: d,
-    encryptionKey: l
-  });
-  return { inputUtxos: e, senderOutputUtxos: r, recipientUtxo: f };
-}, nt = async (o, s, i, a, m, p, e) => {
-  if (!W(a))
-    throw Error(S.RECIPIENT_FORMAT_INCORRECT);
-  const t = $(s), r = [...i], { originalDeployer: c, hinkalIdl: d } = G[t].contractData;
-  if (!c || !d)
-    throw new Error("missing data");
-  const { userKeys: l, merkleTreeAccessTokenByChain: f, merkleTreeHinkalByChain: U } = o, n = s.map((T) => T.erc20TokenAddress);
-  if (n.length > 1)
-    throw new Error("Solana Transfer: Only one mint address is supported");
-  const A = p ?? await Z(
-    t,
-    m,
-    n,
-    V.Transact,
-    [],
-    x
-  );
-  A.variableRate || (A.variableRate = x);
-  const y = ot(-r[0], A), P = -r[0];
-  r[0] -= y;
-  const [u, B, { inputUtxos: g, senderOutputUtxos: I, recipientUtxo: E }] = await Promise.all([
-    o.getRandomRelay(t, !0),
-    o.getEthereumAddressByChain(t),
-    et(o, t, n, r, a, P)
-  ]);
-  if (!u)
-    throw Error(S.RELAYER_NOT_AVAILABLE);
-  const R = I[0], v = O.findCorrectRandomization(J(31), o.userKeys.getShieldedPrivateKey()), h = {
-    tokenNumber: n.length,
-    nullifierAmount: g.length,
-    outputAmount: 2
-  }, N = o.getSolanaProgram(d), w = j([[R, E]])[0].map((T) => Array.from(X.getBytes(T)));
-  rt([g], [I], r);
-  const { proofAArr: _, proofBArr: D, proofCArr: K, publicInputsArr: b } = await q(
-    o.generateProofRemotely,
-    c,
-    U[t],
-    f[t],
-    l,
-    N,
-    [n[0]],
-    [g],
-    [[R, E]],
-    v,
-    y,
-    0n,
-    C,
-    u,
-    h,
-    w,
-    t
-  ), F = n[0] === C, L = {
-    recipient: u,
-    mint: F ? void 0 : n[0]
-  }, k = {
-    proofAArr: _,
-    proofBArr: D,
-    proofCArr: K,
-    publicInputsArr: b,
-    encryptedOutputs: w,
-    relayerFee: y.toString(),
-    dimensions: h
-  }, z = tt(e, t, n, r, B);
-  return {
-    chainId: t,
-    relay: u,
-    args: k,
-    accounts: L,
-    adminData: z,
-    recipientUtxo: E
-  };
-}, Gt = async (o, s, i, a, m, p, e, t = !1) => {
-  if (t)
-    throw new Error("onlyGasEstimate is not supported for Solana transfer");
-  const r = await nt(
-    o,
-    s,
-    i,
-    a,
-    m,
-    p,
-    e
-  );
-  return Q({
-    chainId: r.chainId,
-    relayAddress: r.relay,
-    functionName: "transfer",
-    args: r.args,
-    accounts: r.accounts,
-    adminData: r.adminData
-  });
-};
-export {
-  nt as buildSolanaTransferPlan,
-  Gt as hinkalSolanaTransfer
+import { ExternalActionId as e } from "../../types/external-action.types.mjs";
+import { networkRegistry as t } from "../../constants/chains.constants.mjs";
+import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as n, solanaNativeAddress as r } from "../../constants/protocol.constants.mjs";
+import "../../types/index.mjs";
+import { isValidPrivateAddress as i } from "../../functions/utils/addresses.mjs";
+import { transactionErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
+import { randomBigInt as o } from "../../functions/web3/etherFunctions.mjs";
+import { getCurrentTimeInSeconds as s } from "../../functions/utils/time.utils.mjs";
+import { Utxo as c } from "../utxo/Utxo.mjs";
+import { validateAndGetChainId as l } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as u } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as d } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { calcEncryptedOutputs as f } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { calculateTotalFee as p } from "../../functions/utils/fees.utils.mjs";
+import { constructAdminData as m } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { ensureAmountChanges as h } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
+import { getFeeStructure as g } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import "../../functions/pre-transaction/index.mjs";
+import { constructSolanaZkProof as _ } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { solanaTransactCallRelayer as v } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ethers as y } from "ethers";
+//#region ../shared/common/src/data-structures/Hinkal/hinkalSolanaTransfer.ts
+var b = async (e, t, n, r, i, a) => {
+	let o = (await u(e, t, n, r, 6))[0], l = s().toString(), { outputUtxos: f } = d(e.userKeys, o, r[0], l, void 0, !1), [p, m, h] = i.split(",");
+	return {
+		inputUtxos: o,
+		senderOutputUtxos: f,
+		recipientUtxo: new c({
+			amount: a,
+			erc20TokenAddress: o[0].erc20TokenAddress,
+			mintAddress: o[0].mintAddress,
+			timeStamp: l,
+			randomization: BigInt(p),
+			stealthAddress: m,
+			encryptionKey: h
+		})
+	};
+}, x = async (s, u, d, v, x, S, C) => {
+	if (!i(v)) throw Error(a.RECIPIENT_FORMAT_INCORRECT);
+	let w = l(u), T = [...d], { originalDeployer: E, hinkalIdl: D } = t[w].contractData;
+	if (!E || !D) throw Error("missing data");
+	let { userKeys: O, merkleTreeAccessTokenByChain: k, merkleTreeHinkalByChain: A } = s, j = u.map((e) => e.erc20TokenAddress);
+	if (j.length > 1) throw Error("Solana Transfer: Only one mint address is supported");
+	let M = S ?? await g(w, x, j, e.Transact, [], 5n);
+	M.variableRate ||= n;
+	let N = p(-T[0], M), P = -T[0];
+	T[0] -= N;
+	let [F, I, { inputUtxos: L, senderOutputUtxos: R, recipientUtxo: z }] = await Promise.all([
+		s.getRandomRelay(w, !0),
+		s.getEthereumAddressByChain(w),
+		b(s, w, j, T, v, P)
+	]);
+	if (!F) throw Error(a.RELAYER_NOT_AVAILABLE);
+	let B = R[0], V = c.findCorrectRandomization(o(31), s.userKeys.getShieldedPrivateKey()), H = {
+		tokenNumber: j.length,
+		nullifierAmount: L.length,
+		outputAmount: 2
+	}, U = s.getSolanaProgram(D), W = f([[B, z]])[0].map((e) => Array.from(y.getBytes(e)));
+	h([L], [R], T);
+	let { proofAArr: G, proofBArr: K, proofCArr: q, publicInputsArr: J } = await _(s.generateProofRemotely, E, A[w], k[w], O, U, [j[0]], [L], [[B, z]], V, N, 0n, r, F, H, W, w), Y = {
+		recipient: F,
+		mint: j[0] === "11111111111111111111111111111111" ? void 0 : j[0]
+	};
+	return {
+		chainId: w,
+		relay: F,
+		args: {
+			proofAArr: G,
+			proofBArr: K,
+			proofCArr: q,
+			publicInputsArr: J,
+			encryptedOutputs: W,
+			relayerFee: N.toString(),
+			dimensions: H
+		},
+		accounts: Y,
+		adminData: m(C, w, j, T, I),
+		recipientUtxo: z
+	};
+}, S = async (e, t, n, r, i, a, o, s = !1) => {
+	if (s) throw Error("onlyGasEstimate is not supported for Solana transfer");
+	let c = await x(e, t, n, r, i, a, o);
+	return v({
+		chainId: c.chainId,
+		relayAddress: c.relay,
+		functionName: "transfer",
+		args: c.args,
+		accounts: c.accounts,
+		adminData: c.adminData
+	});
 };
+//#endregion
+export { x as buildSolanaTransferPlan, S as hinkalSolanaTransfer };

package/data-structures/Hinkal/hinkalSolanaWithdraw.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../types/circom-data.types.cjs");const K=require("../../types/external-action.types.cjs"),N=require("../../constants/chains.constants.cjs"),M=require("../../constants/protocol.constants.cjs");require("../../types/activities.types.cjs");const L=require("../../functions/web3/events/getShieldedBalance.cjs"),W=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),j=require("../../functions/utils/time.utils.cjs"),z=require("../../error-handling/error-codes.constants.cjs"),Z=require("../../functions/pre-transaction/getFeeStructure.cjs"),G=require("../../functions/snarkjs/common.snarkjs.cjs"),H=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),V=require("../utxo/Utxo.cjs"),Y=require("../../functions/web3/etherFunctions.cjs"),J=require("../../functions/web3/functionCalls/transactCallRelayer.cjs");require("../../constants/token-data/index.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/reorg-depths.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("../../constants/schedule.constants.cjs");require("../../constants/tokens.constants.cjs");const Q=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),X=require("ethers"),$=require("../../functions/utils/token-check.utils.cjs");require("../../API/getServerURL.cjs");require("../http/HttpClient.cjs");require("axios");const ee=require("../../functions/pre-transaction/constructAdminData.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("circomlibjs-hinkal-fork");require("@solana/spl-token");require("tweetnacl");require("bs58");require("buffer");const re=require("../../functions/pre-transaction/ensureAmountChanges.cjs");require("../../API/enclaveUtxoCalls.cjs");require("tronweb");const te=require("../../functions/utils/fees.utils.cjs"),oe=async(e,s,o,n)=>{const i=[...await L.addPaddingToUtxos(e,s,o,n,6)][0],u=j.getCurrentTimeInSeconds().toString(),{outputUtxos:l}=W.outputUtxoProcessing(e.userKeys,i,n[0],u,void 0,!1);return{inputUtxos:i,outputUtxos:l}},ne=async(e,s,o,n,i,u,l)=>{const r=$.validateAndGetChainId(s),t=s.map(D=>D.erc20TokenAddress),{originalDeployer:p,hinkalIdl:y}=N.networkRegistry[r].contractData;if(!p||!y)throw new Error("missing data");const{userKeys:A,merkleTreeAccessTokenByChain:h,merkleTreeHinkalByChain:T}=e,m=u??await Z.getFeeStructure(r,i,t,K.ExternalActionId.Transact),S=te.calculateTotalFee(-o[0],m),a={feeToken:m.feeToken,flatFee:S,variableRate:0n};o[0]-=a.flatFee;const[{patchAccessTokenMerkleTree:k,kycRequired:R,hasAccessToken:w},x,d,{inputUtxos:q,outputUtxos:c}]=await Promise.all([Q.shouldPatchAccessTokenMerkleTree(e,r,t,o),e.getEthereumAddressByChain(r),e.getRandomRelay(r,!0),oe(e,r,t,o)]);if(!d)throw Error(z.transactionErrorCodes.RELAYER_NOT_AVAILABLE);if(t.length>1)throw new Error("Solana Withdraw: Only one mint address is supported");const P=V.Utxo.findCorrectRandomization(Y.randomBigInt(31),e.userKeys.getShieldedPrivateKey()),g={tokenNumber:t.length,nullifierAmount:q.length,outputAmount:c.length},E=e.getSolanaProgram(y),F=G.calcEncryptedOutputs([c])[0][0],f=Array.from(X.ethers.getBytes(F));re.ensureAmountChanges([q],[c],o);const{proofAArr:v,proofBArr:U,proofCArr:_,publicInputsArr:B}=await H.constructSolanaZkProof(e.generateProofRemotely,p,T[r],h[r],A,E,[t[0]],[q],[c],P,a.flatFee,a.variableRate,n,d,g,[f],r,k),I=t[0]===M.solanaNativeAddress,C={recipient:n,mint:I?void 0:t[0]},O={proofAArr:v,proofBArr:U,proofCArr:_,publicInputsArr:B,encryptedOutputs:[f],relayerFee:a.flatFee.toString(),dimensions:g},b=ee.constructAdminData(l,r,t,o,await e.getEthereumAddress());return J.solanaTransactCallRelayer({chainId:r,relayAddress:d,functionName:"transact",args:O,accounts:C,solanaAccessTokenData:!w&&R?{ethereumAddress:x,accessKey:A.getAccessKey()}:void 0,adminData:b})};exports.hinkalSolanaWithdraw=ne;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`),require(`../../types/index.cjs`);const n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`);require(`../../constants/index.cjs`);const i=require(`../../functions/utils/time.utils.cjs`),a=require(`../utxo/Utxo.cjs`),o=require(`../../functions/utils/token-check.utils.cjs`),s=require(`../../functions/web3/events/getShieldedBalance.cjs`),c=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),l=require(`../../functions/snarkjs/common.snarkjs.cjs`),u=require(`../../functions/utils/fees.utils.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`),m=require(`../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs`);require(`../../functions/pre-transaction/index.cjs`);const h=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),g=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let _=require(`ethers`);var v=async(e,t,n,r)=>{let a=[...await s.addPaddingToUtxos(e,t,n,r,6)][0],o=i.getCurrentTimeInSeconds().toString(),{outputUtxos:l}=c.outputUtxoProcessing(e.userKeys,a,r[0],o,void 0,!1);return{inputUtxos:a,outputUtxos:l}},y=async(i,s,c,y,b,x,S)=>{let C=o.validateAndGetChainId(s),w=s.map(e=>e.erc20TokenAddress),{originalDeployer:T,hinkalIdl:E}=t.networkRegistry[C].contractData;if(!T||!E)throw Error(`missing data`);let{userKeys:D,merkleTreeAccessTokenByChain:O,merkleTreeHinkalByChain:k}=i,A=x??await p.getFeeStructure(C,b,w,e.ExternalActionId.Transact),j=u.calculateTotalFee(-c[0],A),M={feeToken:A.feeToken,flatFee:j,variableRate:0n};c[0]-=M.flatFee;let[{patchAccessTokenMerkleTree:N,kycRequired:P,hasAccessToken:F},I,L,{inputUtxos:R,outputUtxos:z}]=await Promise.all([m.shouldPatchAccessTokenMerkleTree(i,C,w,c),i.getEthereumAddressByChain(C),i.getRandomRelay(C,!0),v(i,C,w,c)]);if(!L)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);if(w.length>1)throw Error(`Solana Withdraw: Only one mint address is supported`);let B=a.Utxo.findCorrectRandomization(r.randomBigInt(31),i.userKeys.getShieldedPrivateKey()),V={tokenNumber:w.length,nullifierAmount:R.length,outputAmount:z.length},H=i.getSolanaProgram(E),U=l.calcEncryptedOutputs([z])[0][0],W=Array.from(_.ethers.getBytes(U));f.ensureAmountChanges([R],[z],c);let{proofAArr:G,proofBArr:K,proofCArr:q,publicInputsArr:J}=await h.constructSolanaZkProof(i.generateProofRemotely,T,k[C],O[C],D,H,[w[0]],[R],[z],B,M.flatFee,M.variableRate,y,L,V,[W],C,N),Y={recipient:y,mint:w[0]===`11111111111111111111111111111111`?void 0:w[0]},X={proofAArr:G,proofBArr:K,proofCArr:q,publicInputsArr:J,encryptedOutputs:[W],relayerFee:M.flatFee.toString(),dimensions:V},Z=d.constructAdminData(S,C,w,c,await i.getEthereumAddress());return g.solanaTransactCallRelayer({chainId:C,relayAddress:L,functionName:`transact`,args:X,accounts:Y,solanaAccessTokenData:!F&&P?{ethereumAddress:I,accessKey:D.getAccessKey()}:void 0,adminData:Z})};exports.hinkalSolanaWithdraw=y;