@hinkal/common 0.2.26 → 0.2.28

package/data-structures/Hinkal/hinkalSolanaSwap.mjs

@@ -1,119 +1,141 @@
 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 { 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 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,
+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
     );
-    d.push([et[0]]);
+    u.push([t[0]]);
   }
-  const z = gt.findCorrectRandomization(yt(31), _), T = {
+  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: l[0].length,
+    nullifierAmount: S[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,
+  }, 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,
-    N,
-    F,
+    S,
     w,
-    D,
-    n,
-    l,
-    d,
-    z,
-    s.flatFee,
-    s.variableRate,
-    y.toString(),
-    g,
-    T,
-    I,
-    i,
-    O,
     H,
-    f,
+    i.flatFee,
+    i.variableRate,
+    I.toString(),
+    y,
     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
+    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: 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
+    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
     }))
-  };
-  return wt(i, {
-    relayAddress: g,
+  }, et = kt(
+    it.PrivateSwap,
+    t,
+    c,
+    o,
+    R,
+    n
+  );
+  return Pt({
+    chainId: t,
+    relayAddress: y,
     functionName: "swap",
-    args: tt,
-    accounts: $,
-    solanaAccessTokenData: !B && U ? {
-      ethereumAddress: await e.getEthereumAddress(),
-      accessKey: w.getAccessKey()
-    } : void 0
+    args: ot,
+    accounts: rt,
+    solanaAccessTokenData: !M && G ? {
+      ethereumAddress: R,
+      accessKey: b.getAccessKey()
+    } : void 0,
+    adminData: et
   });
 };
 export {
-  Mt as hinkalSolanaSwap
+  rr 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=$;
+"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;

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,150 @@
 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 { 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 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 { 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 { 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,
+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,
-    o[0],
-    l,
+    a[0],
+    t,
     void 0,
     !1
-  ), A = _[0], [U, C, B] = c.split(","), y = new I({
-    amount: i,
+  ), [c, d, l] = m.split(","), f = new O({
+    amount: p,
     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,
+    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
-  }, 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 = 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,
-    [r[0]],
-    [e],
-    [[A, y]],
-    h,
-    f,
+    y,
     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
+    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
   };
-  return Q(n, { relayAddress: s, functionName: "transfer", args: D, accounts: z });
+}, 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 {
-  Tt as hinkalSolanaTransfer
+  nt as buildSolanaTransferPlan,
+  Gt 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;
+"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;

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>;