@hinkal/common 0.2.27 → 0.2.29

package/data-structures/Hinkal/hinkalSolanaSwap.mjs

@@ -1,119 +1,98 @@
-import "../../types/circom-data.types.mjs";
-import { ExternalActionId as ot } from "../../types/external-action.types.mjs";
-import { solanaNativeAddress as A } from "../../constants/protocol.constants.mjs";
-import "../../types/activities.types.mjs";
-import { StorageKeys as rt } from "../../types/cache.types.mjs";
-import { addPaddingToUtxos as nt } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as st } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { getCurrentTimeInSeconds as at } from "../../functions/utils/time.utils.mjs";
-import { getFeeStructure as it } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { calcEncryptedOutputs as ct } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { networkRegistry as mt } from "../../constants/chains.constants.mjs";
-import { PublicKey as a } from "@solana/web3.js";
-import { getSwapperAccountPublicKeyFromSalt as ut, getStorageAccountPublicKey as pt, getStorageVaultPublicKey as lt } from "../../functions/pre-transaction/solana.mjs";
-import { constructSolanaZkProof as dt } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { Utxo as gt } from "../utxo/Utxo.mjs";
-import { getAmountInToken as At, getAmountInWei as ft, randomBigInt as yt } from "../../functions/web3/etherFunctions.mjs";
-import { convertOKXToHinkalInstructions as St } from "../../functions/pre-transaction/convert-okx-instructions.mjs";
-import { solanaTransactCallRelayer as wt } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { transactionErrorCodes as Tt } from "../../error-handling/error-codes.constants.mjs";
-import { shouldPatchAccessTokenMerkleTree as It } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
-import { ethers as Pt } from "ethers";
-const Mt = async (e, r, o, f, E, x, K, R, h = !1) => {
-  if (h)
-    throw new Error("onlyGasEstimate is not supported for Solana swap");
-  const i = e.getCurrentChainId(), y = new a(A), { hinkalAddress: v, originalDeployer: c, hinkalIdl: S } = mt[i].contractData;
-  if (!c || !S)
-    throw new Error("No IDL configured for Solana program on this network");
-  const m = new a(c), u = new a(v), n = r.map((t) => t.erc20TokenAddress), { userKeys: w, merkleTreeAccessToken: F, merkleTreeHinkal: N } = e, D = e.getSolanaProgram(S), s = R ?? await it(i, K, n, ot.Transact), { patchAccessTokenMerkleTree: O, kycRequired: U, hasAccessToken: B } = await It(
-    e,
-    n,
-    o
-  );
-  o[1] -= s.flatFee;
-  const L = s.variableRate.toString(), C = Number(e.cacheDevice.get(rt.SLIPPAGE_PERCENTAGE) ?? 0), p = r[1], V = At(p, o[1]), G = Number(V) * C / 100;
-  o[1] -= ft(p, G.toFixed(p.decimals));
-  const l = [...await nt(e, n, o, 6)], W = at().toString(), _ = e.userKeys.getShieldedPrivateKey(), d = [];
-  for (let t = 0; t < n.length; t += 1) {
-    const { outputUtxos: et } = st(
-      e.userKeys,
-      l[t],
-      o[t],
-      W,
-      void 0,
-      !1
-    );
-    d.push([et[0]]);
-  }
-  const z = gt.findCorrectRandomization(yt(31), _), T = {
-    tokenNumber: 2,
-    nullifierAmount: l[0].length,
-    outputAmount: 1
-  }, H = [!1, !0].slice(0, o.length), g = await e.getRandomRelay(!0);
-  if (!g)
-    throw Error(Tt.RELAYER_NOT_AVAILABLE);
-  const I = ct(d).map((t) => [...Pt.getBytes(t[0])]), P = ut(u, m, f), { remainingAccounts: b, hinkalInstructions: k } = St(E, P), { proofAArr: M, proofBArr: q, proofCArr: X, publicInputsArr: Y } = await dt(
-    e.generateProofRemotely,
-    c,
-    N,
-    F,
-    w,
-    D,
-    n,
-    l,
-    d,
-    z,
-    s.flatFee,
-    s.variableRate,
-    y.toString(),
-    g,
-    T,
-    I,
-    i,
-    O,
-    H,
-    f,
-    k,
-    b
-  ), Z = pt(u, m), j = lt(u, m), J = r[0].erc20TokenAddress !== A ? new a(r[0].erc20TokenAddress) : null, Q = r[1].erc20TokenAddress !== A ? new a(r[1].erc20TokenAddress) : null, $ = {
-    recipient: y.toString(),
-    storageAccount: Z.toString(),
-    storageVault: j.toString(),
-    swapperAccount: P.toString(),
-    mintFrom: J?.toString() ?? null,
-    mintTo: Q?.toString() ?? null,
-    remainingAccounts: b.map((t) => ({
-      pubkey: t.pubkey.toString(),
-      isSigner: t.isSigner,
-      isWritable: t.isWritable
-    })),
-    addressLookupTableAccount: x
-  }, tt = {
-    encryptedOutputs: I,
-    proofAArr: M,
-    proofBArr: q,
-    proofCArr: X,
-    publicInputsArr: Y,
-    relayerFee: s.flatFee.toString(),
-    variableRate: L,
-    dimensions: T,
-    hinkalInstructions: k.map((t) => ({
-      accountIndexes: [...t.accountIndexes],
-      data: [...t.data],
-      programIndex: t.programIndex
-    }))
-  };
-  return wt(i, {
-    relayAddress: g,
-    functionName: "swap",
-    args: tt,
-    accounts: $,
-    solanaAccessTokenData: !B && U ? {
-      ethereumAddress: await e.getEthereumAddress(),
-      accessKey: w.getAccessKey()
-    } : void 0
-  });
-};
-export {
-  Mt 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 z=require("../../types/external-action.types.cjs"),c=require("../../constants/protocol.constants.cjs");require("../../types/activities.types.cjs");const D=require("../../functions/web3/events/getShieldedBalance.cjs"),M=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),j=require("../../functions/utils/time.utils.cjs"),u=require("../../error-handling/error-codes.constants.cjs"),H=require("../../functions/pre-transaction/getFeeStructure.cjs"),Z=require("../../functions/snarkjs/common.snarkjs.cjs"),Y=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),I=require("../utxo/Utxo.cjs"),G=require("../../functions/web3/etherFunctions.cjs"),J=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),Q=require("../../functions/utils/addresses.cjs"),W=require("../../constants/chains.constants.cjs"),X=require("ethers"),$=async(e,R,r,d,S,q,l=!1)=>{if(l)throw new Error("onlyGasEstimate is not supported for Solana transfer");if(!Q.isValidPrivateAddress(d))throw Error(u.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const n=e.getCurrentChainId(),{originalDeployer:p,hinkalIdl:A}=W.networkRegistry[n].contractData;if(!p||!A)throw new Error("missing data");const{userKeys:_,merkleTreeAccessToken:w,merkleTreeHinkal:x}=e,t=R.map(i=>i.erc20TokenAddress);if(t.length>1)throw new Error("Solana Transfer: Only one mint address is supported");const N=q??await H.getFeeStructure(n,S,t,z.ExternalActionId.Transact),a=-r[0]*(10000n-c.HINKAL_PRIVATE_SEND_VARIABLE_RATE)/10000n;if(r[0]-=N.flatFee,a<=0n)throw Error(u.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);const m=-r[0]-a,o=(await D.addPaddingToUtxos(e,t,r,6))[0],y=j.getCurrentTimeInSeconds().toString(),{outputUtxos:P}=M.outputUtxoProcessing(e.userKeys,o,r[0],y,void 0,!1),f=P[0],[C,O,U]=d.split(","),g=new I.Utxo({amount:a,erc20TokenAddress:o[0].erc20TokenAddress,mintAddress:o[0].mintAddress,timeStamp:y,randomization:BigInt(C),stealthAddress:O,encryptionKey:U}),s=await e.getRandomRelay(!l);if(!s)throw Error(u.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const h=I.Utxo.findCorrectRandomization(G.randomBigInt(31),e.userKeys.getShieldedPrivateKey()),E={tokenNumber:t.length,nullifierAmount:o.length,outputAmount:2},k=e.getSolanaProgram(A),T=Z.calcEncryptedOutputs([[f,g]])[0].map(i=>Array.from(X.ethers.getBytes(i))),{proofAArr:v,proofBArr:B,proofCArr:F,publicInputsArr:K}=await Y.constructSolanaZkProof(e.generateProofRemotely,p,x,w,_,k,[t[0]],[o],[[f,g]],h,m,0n,c.solanaNativeAddress,s,E,T,n),L=t[0]===c.solanaNativeAddress,V={recipient:s,mint:L?void 0:t[0]},b={proofAArr:v,proofBArr:B,proofCArr:F,publicInputsArr:K,encryptedOutputs:T,relayerFee:m.toString(),dimensions:E};return J.solanaTransactCallRelayer(n,{relayAddress:s,functionName:"transfer",args:b,accounts:V})};exports.hinkalSolanaTransfer=$;
+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.d.ts

@@ -1,3 +1,30 @@
-import { ERC20Token, FeeStructure } from '../../types';
+import { AdminTransactionType, ERC20Token, FeeStructure } from '../../types';
 import { IHinkal } from './IHinkal';
-export declare const hinkalSolanaTransfer: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean) => Promise<import('../../types/relayer.types').RelayerTransaction>;
+import { Utxo } from '../utxo/Utxo';
+import { constructAdminData } from '../../functions/pre-transaction';
+type SolanaTransferPlan = {
+    chainId: number;
+    relay: string;
+    args: {
+        proofAArr: number[];
+        proofBArr: number[];
+        proofCArr: number[];
+        publicInputsArr: number[][];
+        encryptedOutputs: number[][];
+        relayerFee: string;
+        dimensions: {
+            tokenNumber: number;
+            nullifierAmount: number;
+            outputAmount: number;
+        };
+    };
+    accounts: {
+        recipient: string;
+        mint?: string;
+    };
+    adminData: ReturnType<typeof constructAdminData>;
+    recipientUtxo: Utxo;
+};
+export declare const buildSolanaTransferPlan: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChangesInput: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<SolanaTransferPlan>;
+export declare const hinkalSolanaTransfer: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, onlyGasEstimate?: boolean) => Promise<string>;
+export {};

package/data-structures/Hinkal/hinkalSolanaTransfer.mjs

@@ -1,88 +1,93 @@
-import "../../types/circom-data.types.mjs";
-import { ExternalActionId as b } from "../../types/external-action.types.mjs";
-import { solanaNativeAddress as T, HINKAL_PRIVATE_SEND_VARIABLE_RATE as H } from "../../constants/protocol.constants.mjs";
-import "../../types/activities.types.mjs";
-import { addPaddingToUtxos as M } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as Y } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { getCurrentTimeInSeconds as Z } from "../../functions/utils/time.utils.mjs";
-import { transactionErrorCodes as m } from "../../error-handling/error-codes.constants.mjs";
-import { getFeeStructure as j } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { calcEncryptedOutputs as q } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { constructSolanaZkProof as G } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { Utxo as I } 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 { networkRegistry as X } from "../../constants/chains.constants.mjs";
-import { ethers as $ } from "ethers";
-const Tt = async (t, R, o, c, w, S, d = !1) => {
-  if (d)
-    throw new Error("onlyGasEstimate is not supported for Solana transfer");
-  if (!W(c))
-    throw Error(m.RECIPIENT_FORMAT_INCORRECT);
-  const n = t.getCurrentChainId(), { originalDeployer: p, hinkalIdl: u } = X[n].contractData;
-  if (!p || !u)
-    throw new Error("missing data");
-  const { userKeys: N, merkleTreeAccessToken: x, merkleTreeHinkal: O } = t, r = R.map((a) => a.erc20TokenAddress);
-  if (r.length > 1)
-    throw new Error("Solana Transfer: Only one mint address is supported");
-  const P = S ?? await j(n, w, r, b.Transact), i = -o[0] * (10000n - H) / 10000n;
-  if (o[0] -= P.flatFee, i <= 0n)
-    throw Error(m.RECIPIENT_AMOUNT_INVALID);
-  const f = -o[0] - i, e = (await M(t, r, o, 6))[0], l = Z().toString(), { outputUtxos: _ } = Y(
-    t.userKeys,
-    e,
-    o[0],
-    l,
-    void 0,
-    !1
-  ), A = _[0], [U, C, B] = c.split(","), y = new I({
-    amount: i,
-    erc20TokenAddress: e[0].erc20TokenAddress,
-    mintAddress: e[0].mintAddress,
-    timeStamp: l,
-    randomization: BigInt(U),
-    stealthAddress: C,
-    encryptionKey: B
-  }), s = await t.getRandomRelay(!d);
-  if (!s)
-    throw Error(m.RELAYER_NOT_AVAILABLE);
-  const h = I.findCorrectRandomization(J(31), t.userKeys.getShieldedPrivateKey()), E = {
-    tokenNumber: r.length,
-    nullifierAmount: e.length,
-    outputAmount: 2
-  }, v = t.getSolanaProgram(u), g = q([[A, y]])[0].map((a) => Array.from($.getBytes(a))), { proofAArr: K, proofBArr: L, proofCArr: k, publicInputsArr: F } = await G(
-    t.generateProofRemotely,
-    p,
-    O,
-    x,
-    N,
-    v,
-    [r[0]],
-    [e],
-    [[A, y]],
-    h,
-    f,
-    0n,
-    T,
-    s,
-    E,
-    g,
-    n
-  ), V = r[0] === T, z = {
-    recipient: s,
-    mint: V ? void 0 : r[0]
-  }, D = {
-    proofAArr: K,
-    proofBArr: L,
-    proofCArr: k,
-    publicInputsArr: F,
-    encryptedOutputs: g,
-    relayerFee: f.toString(),
-    dimensions: E
-  };
-  return Q(n, { relayAddress: s, functionName: "transfer", args: D, accounts: z });
-};
-export {
-  Tt 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 B=require("../../types/external-action.types.cjs"),C=require("../../constants/protocol.constants.cjs");require("../../types/activities.types.cjs");const K=require("../../functions/web3/events/getShieldedBalance.cjs"),b=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),N=require("../../functions/utils/time.utils.cjs"),M=require("../../error-handling/error-codes.constants.cjs"),D=require("../../functions/pre-transaction/getFeeStructure.cjs"),L=require("../../functions/snarkjs/common.snarkjs.cjs"),W=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),j=require("../utxo/Utxo.cjs"),z=require("../../functions/web3/etherFunctions.cjs"),Z=require("../../functions/web3/functionCalls/transactCallRelayer.cjs");require("../../constants/token-data/index.cjs");const H=require("../../constants/chains.constants.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");const V=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),Y=require("ethers"),G=async(e,r,t,i,g,f,u=!1)=>{if(u)throw new Error("onlyGasEstimate is not supported for Solana withdraw");const o=e.getCurrentChainId(),h=await e.getEthereumAddress(),{originalDeployer:l,hinkalIdl:d}=H.networkRegistry[o].contractData;if(!l||!d)throw new Error("missing data");const{userKeys:q,merkleTreeAccessToken:w,merkleTreeHinkal:S}=e,n=f??await D.getFeeStructure(o,g,r,B.ExternalActionId.Transact);t[0]-=n.flatFee;const{patchAccessTokenMerkleTree:m,kycRequired:A,hasAccessToken:T}=await V.shouldPatchAccessTokenMerkleTree(e,r,t);if(r.length>1)throw new Error("Solana Withdraw: Only one mint address is supported");const a=[...await K.addPaddingToUtxos(e,r,t,6)][0],k=N.getCurrentTimeInSeconds().toString(),{outputUtxos:s}=b.outputUtxoProcessing(e.userKeys,a,t[0],k,void 0,!1),c=await e.getRandomRelay(!u);if(!c)throw Error(M.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const R=j.Utxo.findCorrectRandomization(z.randomBigInt(31),e.userKeys.getShieldedPrivateKey()),p={tokenNumber:r.length,nullifierAmount:a.length,outputAmount:s.length},E=e.getSolanaProgram(d),P=L.calcEncryptedOutputs([s])[0][0],y=Array.from(Y.ethers.getBytes(P)),{proofAArr:x,proofBArr:v,proofCArr:I,publicInputsArr:_}=await W.constructSolanaZkProof(e.generateProofRemotely,l,S,w,q,E,[r[0]],[a],[s],R,n.flatFee,n.variableRate,i,c,p,[y],o,m),F=r[0]===C.solanaNativeAddress,O={recipient:i,mint:F?void 0:r[0]},U={proofAArr:x,proofBArr:v,proofCArr:I,publicInputsArr:_,encryptedOutputs:[y],relayerFee:n.flatFee.toString(),dimensions:p};return Z.solanaTransactCallRelayer(o,{relayAddress:c,functionName:"transact",args:U,accounts:O,solanaAccessTokenData:!T&&A?{ethereumAddress:h,accessKey:q.getAccessKey()}:void 0})};exports.hinkalSolanaWithdraw=G;
+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;

package/data-structures/Hinkal/hinkalSolanaWithdraw.d.ts

@@ -1,3 +1,4 @@
-import { FeeStructure } from '../../types';
+import { AdminTransactionType, FeeStructure } from '../../types';
 import { IHinkal } from './IHinkal';
-export declare const hinkalSolanaWithdraw: (hinkal: IHinkal, mintAddresses: string[], amountChanges: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean) => Promise<import('../../types/relayer.types').RelayerTransaction>;
+import { ERC20Token } from '../../types/token.types';
+export declare const hinkalSolanaWithdraw: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<string>;