@hinkal/common 0.2.22 → 0.2.24

package/data-structures/Hinkal/hinkalProoflessDeposit.mjs

@@ -1,40 +1,41 @@
-import { calcStealthAddressStructure as m } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { calcStealthAddressStructure as h } from "../../functions/snarkjs/common.snarkjs.mjs";
 import { randomBigInt as g } from "../../functions/web3/etherFunctions.mjs";
-import { ContractType as l } from "../../types/ethereum-network.types.mjs";
+import { ContractType as d } from "../../types/ethereum-network.types.mjs";
 import { Utxo as A } from "../utxo/Utxo.mjs";
-import { zeroAddress as h } from "../../constants/protocol.constants.mjs";
-import { caseInsensitiveEqual as p } from "../../functions/utils/caseInsensitive.utils.mjs";
-const C = (r, e) => {
-  const n = [];
-  let o = 0;
+import { zeroAddress as p } from "../../constants/protocol.constants.mjs";
+import { caseInsensitiveEqual as m } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { getContractAddress as C } from "../../functions/utils/getContractAddress.mjs";
+const k = (r, e) => {
+  const o = [];
+  let n = 0;
   for (let a = 0; a < r.length; a += 1) {
     let s = !1;
-    for (let t = 0; t < o; t += 1)
-      if (p(n[t].token.erc20TokenAddress, r[a].erc20TokenAddress)) {
-        n[t].balance += e[a], s = !0;
+    for (let t = 0; t < n; t += 1)
+      if (m(o[t].token.erc20TokenAddress, r[a].erc20TokenAddress)) {
+        o[t].balance += e[a], s = !0;
         break;
       }
-    s || (n[o] = {
+    s || (o[n] = {
       token: r[a],
       balance: e[a]
-    }, o += 1);
+    }, n += 1);
   }
-  return n;
-}, k = async (r, e, n) => {
-  const o = C(e, n), s = r.getContractWithSigner(l.HinkalContract).address;
-  for (let t = 0; t < o.length; t += 1)
-    p(o[t].token.erc20TokenAddress, h) || await (await r.getContractWithSigner(
-      l.ERC20Contract,
-      o[t].token.erc20TokenAddress
-    ).approve(s, o[t].balance)).wait();
-}, q = async (r, e, n, o) => {
-  const a = r.getContractWithSigner(l.HinkalContract), s = r.userKeys.getShieldedPrivateKey(), t = A.findCorrectRandomization(g(31), s), i = o ?? Array(e.length).fill(m(t, s));
+  return o;
+}, w = async (r, e, o) => {
+  const n = k(e, o), a = r.getContractWithSigner(d.HinkalContract), s = C(a);
+  for (let t = 0; t < n.length; t += 1)
+    m(n[t].token.erc20TokenAddress, p) || await (await r.getContractWithSigner(
+      d.ERC20Contract,
+      n[t].token.erc20TokenAddress
+    ).approve(s, n[t].balance)).wait();
+}, W = async (r, e, o, n) => {
+  const a = r.getContractWithSigner(d.HinkalContract), s = r.userKeys.getShieldedPrivateKey(), t = A.findCorrectRandomization(g(31), s), i = n ?? Array(e.length).fill(h(t, s));
   if (i.length !== e.length)
     throw new Error("Stealth address structures length must be equal to erc20 tokens length");
-  await k(r, e, n);
-  const d = e.findIndex((c) => c.erc20TokenAddress === h), u = n[d] ?? 0n, f = await a.prooflessDeposit(
+  await w(r, e, o);
+  const l = e.findIndex((c) => c.erc20TokenAddress === p), u = o[l] ?? 0n, f = await a.prooflessDeposit(
     e.map(({ erc20TokenAddress: c }) => c),
-    n,
+    o,
     e.map(() => 0n),
     i,
     { value: u }
@@ -42,5 +43,5 @@ const C = (r, e) => {
   return await f.wait(), f;
 };
 export {
-  q as hinkalProoflessDeposit
+  W as hinkalProoflessDeposit
 };

package/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const M=require("../../functions/web3/etherFunctions.cjs"),z=require("../utxo/Utxo.cjs"),Y=require("../../error-handling/error-codes.constants.cjs"),G=require("ethers");require("idb-keyval");const j=require("../../constants/chains.constants.cjs");require("../crypto-keys/keys.cjs");require("node-forge");require("../../constants/vite.constants.cjs");require("libsodium-wrappers");require("../http/HttpClient.cjs");require("axios");const $=require("../../functions/utils/solanaMint.utils.cjs"),N=require("@solana/web3.js"),J=require("../../functions/utils/addresses.cjs");require("../../constants/server.constants.cjs");require("../../constants/token-data/index.cjs");const _=require("../../constants/protocol.constants.cjs"),Q=require("../../API/API.cjs");require("../../functions/utils/mutexes.utils.cjs");require("../../types/circom-data.types.cjs");const ee=require("../../types/external-action.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const B=require("../../types/scheduled-transactions.types.cjs");require("../../functions/web3/events/getApprovedBalance.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.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("../../functions/utils/convertIntegrationProviderToExternalActionId.cjs");require("../../API/getServerURL.cjs");require("circomlibjs-hinkal-fork");require("process");require("buffer");require("../../constants/save-depths.cjs");const te=require("@coral-xyz/anchor"),E=require("../../functions/pre-transaction/solana.cjs");require("@solana/spl-token");require("../../functions/utils/userAgent.cjs");const re=require("../../functions/utils/time.utils.cjs");require("multiformats");require("../../API/tenderly.api.cjs");const oe=require("../../functions/utils/fees.utils.cjs");require("../../functions/web3/getTokenHolder.cjs");const ne=require("../../functions/web3/signAndSendSerializedTransaction.cjs"),Z=require("../../functions/snarkjs/common.snarkjs.cjs"),ae=require("./hinkalCheckSolanaTokenRegistry.cjs"),se=require("../../functions/utils/getUtxosFromReceiptSolana.cjs"),ie=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),ce=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),ue=require("../../functions/pre-transaction/getFeeStructure.cjs"),W=require("../../API/deposit-and-withdraw-status-calls.cjs"),de=async(e,r,d,l,g,h)=>{const p=d.map(t=>t+oe.calculateTotalFee(t,g)),{hinkalIdl:m,hinkalAddress:q,originalDeployer:i}=j.networkRegistry[e.getCurrentChainId()].contractData;if(!m)throw new Error("No IDL configured for Solana program on this network");if(!i)throw new Error("missing original deployer");const w=e.userKeys.getShieldedPrivateKey(),P=z.Utxo.findCorrectRandomization(M.randomBigInt(31),w),S=Z.calcStealthAddressStructure(P,w),o=e.getSolanaProgram(m),b=e.getSolanaPublicKey(),n=new N.PublicKey(i),A=new N.PublicKey(q),{mintPublicKey:c}=$.formatMintAddress(r),D=c.toString(),O=E.getStorageAccountPublicKey(A,n),R=E.getStorageVaultPublicKey(A,n),F=E.getMerkleAccountPublicKey(A,n),v=E.buildAnchorStealthAddressStructure(S),f=e.getCurrentChainId(),x=p.reduce((t,s)=>t+s,0n),I=await ae.hinkalCheckSolanaTokenRegistry(o,new N.PublicKey(n),[r],[x]),K=p.map(t=>`${t}`);let a="";const T=(await W.updateDepositAndWithdrawStatus(f,{hashedEthereumAddress:h,phase:B.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0;if(I){const{serializedTransaction:t,blockhash:s,lastValidBlockHeight:y}=await Q.API.generateMultiPaymentDepositLimitless(f,{amounts:K,payer:e.getSolanaPublicKey().toBase58(),ethereumAddress:await e.getEthereumAddress(),mint:r,stealthAddressStructure:v}),{wallet:u}=o.provider;if(!u)throw new Error("missing wallet");a=await ne.signAndSendSerializedTransaction(o.provider,t,s,y)}else{const t=E.getTokenLimitStorageAccountPublicKey(o.programId,n,c),s=D===_.solanaNativeAddress?null:c,y=D===_.solanaNativeAddress?null:void 0;a=await o.methods.multiPaymentDeposit(K.map(L=>new te.BN(L)),v).accounts({mint:s,signer:b,signerAta:y,originalDeployer:n,storageAccount:O,storageVault:R,merkleAccount:F,tokenLimitStorage:t,storageVaultAta:y,accessTokenOwner:null}).rpc();const u=await o.provider.connection.getLatestBlockhash();await o.provider.connection.confirmTransaction({blockhash:u.blockhash,lastValidBlockHeight:u.lastValidBlockHeight,signature:a},"confirmed")}const k=await o.provider.connection.getTransaction(a,{commitment:"confirmed",maxSupportedTransactionVersion:0});if(!k)throw new Error("Transaction missing");await W.safeUpdateDepositAndWithdrawStatus(f,{id:T,hashedEthereumAddress:h,phase:B.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:a});const H=se.getUtxosFromReceiptSolana(k,o,e.userKeys),U=[],C=[...H];return l.forEach((t,s)=>{const y=p[s],u=C.find(X=>X.amount===y);if(!u)throw new Error(`Could not find newly created UTXO with amount ${y} for recipient ${t}.`);U.push({recipientAddress:t,utxo:u});const L=C.indexOf(u);C.splice(L,1)}),{userDepositedUtxos:U,signature:a,statusId:T}},le=async(e,r,d,l,g,h,p,m)=>{const q=e.getCurrentChainId();if(d.length===0)throw new Error("userDepositedUtxos must not be empty");const{hinkalIdl:i,originalDeployer:w}=j.networkRegistry[e.getCurrentChainId()].contractData;if(!w||!i)throw new Error("missing data");const P=e.getSolanaProgram(i),S=await e.getRandomRelay(!0);if(!S)throw new Error(Y.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const o=re.getCurrentTimeInSeconds().toString(),b=e.generateProofRemotely?5:1,n=[];for(let c=0;c<d.length;c+=b){const D=d.slice(c,c+b),O=await Promise.all(D.map(async({recipientAddress:R,utxo:F})=>{const{compressedAddress:v}=$.formatMintAddress(_.solanaNativeAddress),f=new z.Utxo({amount:0n,mintAddress:r,erc20TokenAddress:v,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:o,tokenId:0}),x=[F,f],I=[f],K=z.Utxo.findCorrectRandomization(M.randomBigInt(31),e.userKeys.getShieldedPrivateKey()),a={tokenNumber:1,nullifierAmount:x.length,outputAmount:I.length},V=Z.calcEncryptedOutputs([I])[0][0],T=Array.from(G.ethers.utils.arrayify(V)),{proofAArr:k,proofBArr:H,proofCArr:U,publicInputsArr:C}=await ie.constructSolanaZkProof(e.generateProofRemotely,w,e.merkleTreeHinkal,e.merkleTreeAccessToken,e.userKeys,P,[r],[x],[I],K,l.flatFee,l.variableRate,R,S,a,[T],e.getCurrentChainId(),void 0,void 0,void 0,void 0,void 0,!1),t=r===_.solanaNativeAddress,s={recipient:R,mint:t?void 0:r};return{relayAddress:S,functionName:"transact",args:{proofAArr:k,proofBArr:H,proofCArr:U,publicInputsArr:C,encryptedOutputs:[T],relayerFee:l.flatFee.toString(),dimensions:a},accounts:s}}));n.push(...O)}await W.safeUpdateDepositAndWithdrawStatus(q,{id:h,hashedEthereumAddress:g,phase:B.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});const A=await ce.solanaTransactCallRelayerBatch(e.getCurrentChainId(),n,g,p,m);return await W.safeUpdateDepositAndWithdrawStatus(q,{id:h,hashedEthereumAddress:g,phase:B.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:A}),A},ge=async(e,r,d,l,g,h,p)=>{const m=J.hashEthereumAddress(await e.getEthereumAddress()),q=e.getCurrentChainId(),i=h??await ue.getFeeStructure(q,r,[r],ee.ExternalActionId.Transact,[],0n),{userDepositedUtxos:w,statusId:P}=await de(e,r,d,l,i,m);return await le(e,r,w,i,m,P,g,p)};exports.hinkalSolanaDepositAndWithdraw=ge;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const M=require("../../functions/web3/etherFunctions.cjs"),z=require("../utxo/Utxo.cjs"),Y=require("../../error-handling/error-codes.constants.cjs");require("idb-keyval");const j=require("../../constants/chains.constants.cjs"),G=require("ethers");require("../crypto-keys/keys.cjs");require("node-forge");require("../../constants/vite.constants.cjs");require("libsodium-wrappers");require("../http/HttpClient.cjs");require("axios");const $=require("../../functions/utils/solanaMint.utils.cjs"),N=require("@solana/web3.js"),J=require("../../functions/utils/addresses.cjs");require("../../constants/server.constants.cjs");require("../../constants/token-data/index.cjs");const _=require("../../constants/protocol.constants.cjs"),Q=require("../../API/API.cjs");require("../../functions/utils/mutexes.utils.cjs");require("../../types/circom-data.types.cjs");const ee=require("../../types/external-action.types.cjs");require("../../types/activities.types.cjs");const B=require("../../types/scheduled-transactions.types.cjs");require("../../functions/web3/events/getApprovedBalance.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.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("../../functions/utils/convertIntegrationProviderToExternalActionId.cjs");require("../../API/getServerURL.cjs");require("circomlibjs-hinkal-fork");require("process");require("buffer");require("../../constants/save-depths.cjs");const te=require("@coral-xyz/anchor"),E=require("../../functions/pre-transaction/solana.cjs");require("@solana/spl-token");require("../../functions/utils/userAgent.cjs");const re=require("../../functions/utils/time.utils.cjs");require("multiformats");require("../../API/tenderly.api.cjs");const oe=require("../../functions/utils/fees.utils.cjs");require("../../functions/web3/getTokenHolder.cjs");const ne=require("../../functions/web3/signAndSendSerializedTransaction.cjs"),Z=require("../../functions/snarkjs/common.snarkjs.cjs"),ae=require("./hinkalCheckSolanaTokenRegistry.cjs"),se=require("../../functions/utils/getUtxosFromReceiptSolana.cjs"),ie=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),ce=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),ue=require("../../functions/pre-transaction/getFeeStructure.cjs"),W=require("../../API/deposit-and-withdraw-status-calls.cjs"),de=async(e,r,d,l,g,p)=>{const h=d.map(t=>t+oe.calculateTotalFee(t,g)),{hinkalIdl:m,hinkalAddress:S,originalDeployer:i}=j.networkRegistry[e.getCurrentChainId()].contractData;if(!m)throw new Error("No IDL configured for Solana program on this network");if(!i)throw new Error("missing original deployer");const w=e.userKeys.getShieldedPrivateKey(),P=z.Utxo.findCorrectRandomization(M.randomBigInt(31),w),y=Z.calcStealthAddressStructure(P,w),o=e.getSolanaProgram(m),b=e.getSolanaPublicKey(),n=new N.PublicKey(i),A=new N.PublicKey(S),{mintPublicKey:c}=$.formatMintAddress(r),x=c.toString(),O=E.getStorageAccountPublicKey(A,n),D=E.getStorageVaultPublicKey(A,n),F=E.getMerkleAccountPublicKey(A,n),R=E.buildAnchorStealthAddressStructure(y),f=e.getCurrentChainId(),v=h.reduce((t,s)=>t+s,0n),T=await ae.hinkalCheckSolanaTokenRegistry(o,new N.PublicKey(n),[r],[v]),K=h.map(t=>`${t}`);let a="";const I=(await W.updateDepositAndWithdrawStatus(f,{hashedEthereumAddress:p,phase:B.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0;if(T){const{serializedTransaction:t,blockhash:s,lastValidBlockHeight:q}=await Q.API.generateMultiPaymentDepositLimitless(f,{amounts:K,payer:e.getSolanaPublicKey().toBase58(),ethereumAddress:await e.getEthereumAddress(),mint:r,stealthAddressStructure:R}),{wallet:u}=o.provider;if(!u)throw new Error("missing wallet");a=await ne.signAndSendSerializedTransaction(o.provider,t,s,q)}else{const t=E.getTokenLimitStorageAccountPublicKey(o.programId,n,c),s=x===_.solanaNativeAddress?null:c,q=x===_.solanaNativeAddress?null:void 0;a=await o.methods.multiPaymentDeposit(K.map(L=>new te.BN(L)),R).accounts({mint:s,signer:b,signerAta:q,originalDeployer:n,storageAccount:O,storageVault:D,merkleAccount:F,tokenLimitStorage:t,storageVaultAta:q,accessTokenOwner:null}).rpc();const u=await o.provider.connection.getLatestBlockhash();await o.provider.connection.confirmTransaction({blockhash:u.blockhash,lastValidBlockHeight:u.lastValidBlockHeight,signature:a},"confirmed")}const k=await o.provider.connection.getTransaction(a,{commitment:"confirmed",maxSupportedTransactionVersion:0});if(!k)throw new Error("Transaction missing");await W.safeUpdateDepositAndWithdrawStatus(f,{id:I,hashedEthereumAddress:p,phase:B.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:a});const H=se.getUtxosFromReceiptSolana(k,o,e.userKeys),U=[],C=[...H];return l.forEach((t,s)=>{const q=h[s],u=C.find(X=>X.amount===q);if(!u)throw new Error(`Could not find newly created UTXO with amount ${q} for recipient ${t}.`);U.push({recipientAddress:t,utxo:u});const L=C.indexOf(u);C.splice(L,1)}),{userDepositedUtxos:U,depositTxHash:a,statusId:I}},le=async(e,r,d,l,g,p,h,m)=>{const S=e.getCurrentChainId();if(d.length===0)throw new Error("userDepositedUtxos must not be empty");const{hinkalIdl:i,originalDeployer:w}=j.networkRegistry[e.getCurrentChainId()].contractData;if(!w||!i)throw new Error("missing data");const P=e.getSolanaProgram(i),y=await e.getRandomRelay(!0);if(!y)throw new Error(Y.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const o=re.getCurrentTimeInSeconds().toString(),b=e.generateProofRemotely?5:1,n=[];for(let c=0;c<d.length;c+=b){const x=d.slice(c,c+b),O=await Promise.all(x.map(async({recipientAddress:D,utxo:F})=>{const{compressedAddress:R}=$.formatMintAddress(_.solanaNativeAddress),f=new z.Utxo({amount:0n,mintAddress:r,erc20TokenAddress:R,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:o,tokenId:0}),v=[F,f],T=[f],K=z.Utxo.findCorrectRandomization(M.randomBigInt(31),e.userKeys.getShieldedPrivateKey()),a={tokenNumber:1,nullifierAmount:v.length,outputAmount:T.length},V=Z.calcEncryptedOutputs([T])[0][0],I=Array.from(G.ethers.getBytes(V)),{proofAArr:k,proofBArr:H,proofCArr:U,publicInputsArr:C}=await ie.constructSolanaZkProof(e.generateProofRemotely,w,e.merkleTreeHinkal,e.merkleTreeAccessToken,e.userKeys,P,[r],[v],[T],K,l.flatFee,l.variableRate,D,y,a,[I],e.getCurrentChainId(),void 0,void 0,void 0,void 0,void 0,!1),t=r===_.solanaNativeAddress,s={recipient:D,mint:t?void 0:r};return{relayAddress:y,functionName:"transact",args:{proofAArr:k,proofBArr:H,proofCArr:U,publicInputsArr:C,encryptedOutputs:[I],relayerFee:l.flatFee.toString(),dimensions:a},accounts:s}}));n.push(...O)}await W.safeUpdateDepositAndWithdrawStatus(S,{id:p,hashedEthereumAddress:g,phase:B.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});const A=await ce.solanaTransactCallRelayerBatch(e.getCurrentChainId(),n,g,h,m);return await W.safeUpdateDepositAndWithdrawStatus(S,{id:p,hashedEthereumAddress:g,phase:B.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:A}),A},ge=async(e,r,d,l,g,p,h)=>{const m=J.hashEthereumAddress(await e.getEthereumAddress()),S=e.getCurrentChainId(),i=p??await ue.getFeeStructure(S,r,[r],ee.ExternalActionId.Transact,[],0n),{userDepositedUtxos:w,statusId:P,depositTxHash:y}=await de(e,r,d,l,i,m);return await le(e,r,w,i,m,P,g,h),y};exports.hinkalSolanaDepositAndWithdraw=ge;

package/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.mjs

@@ -1,9 +1,9 @@
 import { randomBigInt as M } from "../../functions/web3/etherFunctions.mjs";
 import { Utxo as z } from "../utxo/Utxo.mjs";
 import { transactionErrorCodes as Y } from "../../error-handling/error-codes.constants.mjs";
-import { ethers as Z } from "ethers";
 import "idb-keyval";
 import { networkRegistry as $ } from "../../constants/chains.constants.mjs";
+import { ethers as Z } from "ethers";
 import "../crypto-keys/keys.mjs";
 import "node-forge";
 import "../../constants/vite.constants.mjs";
@@ -20,7 +20,6 @@ import { API as G } from "../../API/API.mjs";
 import "../../functions/utils/mutexes.utils.mjs";
 import "../../types/circom-data.types.mjs";
 import { ExternalActionId as J } from "../../types/external-action.types.mjs";
-import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
 import { DepositAndWithdrawPhase as k } from "../../types/scheduled-transactions.types.mjs";
 import "../../functions/web3/events/getApprovedBalance.mjs";
@@ -41,10 +40,10 @@ import "process";
 import "buffer";
 import "../../constants/save-depths.mjs";
 import { BN as Q } from "@coral-xyz/anchor";
-import { getStorageAccountPublicKey as tt, getStorageVaultPublicKey as ot, getMerkleAccountPublicKey as rt, buildAnchorStealthAddressStructure as et, getTokenLimitStorageAccountPublicKey as it } from "../../functions/pre-transaction/solana.mjs";
+import { getStorageAccountPublicKey as tt, getStorageVaultPublicKey as ot, getMerkleAccountPublicKey as rt, buildAnchorStealthAddressStructure as et, getTokenLimitStorageAccountPublicKey as at } from "../../functions/pre-transaction/solana.mjs";
 import "@solana/spl-token";
 import "../../functions/utils/userAgent.mjs";
-import { getCurrentTimeInSeconds as at } from "../../functions/utils/time.utils.mjs";
+import { getCurrentTimeInSeconds as it } from "../../functions/utils/time.utils.mjs";
 import "multiformats";
 import "../../API/tenderly.api.mjs";
 import { calculateTotalFee as nt } from "../../functions/utils/fees.utils.mjs";
@@ -52,66 +51,66 @@ import "../../functions/web3/getTokenHolder.mjs";
 import { signAndSendSerializedTransaction as st } from "../../functions/web3/signAndSendSerializedTransaction.mjs";
 import { calcStealthAddressStructure as ct, calcEncryptedOutputs as mt } from "../../functions/snarkjs/common.snarkjs.mjs";
 import { hinkalCheckSolanaTokenRegistry as pt } from "./hinkalCheckSolanaTokenRegistry.mjs";
-import { getUtxosFromReceiptSolana as lt } from "../../functions/utils/getUtxosFromReceiptSolana.mjs";
-import { constructSolanaZkProof as dt } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { getUtxosFromReceiptSolana as dt } from "../../functions/utils/getUtxosFromReceiptSolana.mjs";
+import { constructSolanaZkProof as lt } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
 import { solanaTransactCallRelayerBatch as ut } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
 import { getFeeStructure as gt } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import { updateDepositAndWithdrawStatus as ht, safeUpdateDepositAndWithdrawStatus as N } from "../../API/deposit-and-withdraw-status-calls.mjs";
-const ft = async (t, r, p, l, d, u) => {
-  const g = p.map((o) => o + nt(o, d)), {
+const ft = async (t, r, p, d, l, u) => {
+  const g = p.map((o) => o + nt(o, l)), {
     hinkalIdl: h,
-    hinkalAddress: y,
+    hinkalAddress: S,
     originalDeployer: s
   } = $[t.getCurrentChainId()].contractData;
   if (!h)
     throw new Error("No IDL configured for Solana program on this network");
   if (!s)
     throw new Error("missing original deployer");
-  const f = t.userKeys.getShieldedPrivateKey(), E = z.findCorrectRandomization(M(31), f), S = ct(E, f), e = t.getSolanaProgram(h), v = t.getSolanaPublicKey(), i = new W(s), A = new W(y), { mintPublicKey: c } = q(r), R = c.toString(), F = tt(A, i), b = ot(A, i), H = rt(A, i), x = et(S), I = t.getCurrentChainId(), D = g.reduce((o, n) => o + n, 0n), T = await pt(
+  const f = t.userKeys.getShieldedPrivateKey(), E = z.findCorrectRandomization(M(31), f), w = ct(E, f), e = t.getSolanaProgram(h), v = t.getSolanaPublicKey(), a = new W(s), A = new W(S), { mintPublicKey: c } = q(r), x = c.toString(), H = tt(A, a), R = ot(A, a), F = rt(A, a), b = et(w), T = t.getCurrentChainId(), D = g.reduce((o, n) => o + n, 0n), I = await pt(
     e,
-    new W(i),
+    new W(a),
     [r],
     [D]
   ), K = g.map((o) => `${o}`);
-  let a = "";
-  const P = (await ht(I, {
+  let i = "";
+  const P = (await ht(T, {
     hashedEthereumAddress: u,
     phase: k.BEFORE_DEPOSIT
   })).id ?? void 0;
-  if (T) {
-    const { serializedTransaction: o, blockhash: n, lastValidBlockHeight: w } = await G.generateMultiPaymentDepositLimitless(
-      I,
+  if (I) {
+    const { serializedTransaction: o, blockhash: n, lastValidBlockHeight: y } = await G.generateMultiPaymentDepositLimitless(
+      T,
       {
         amounts: K,
         payer: t.getSolanaPublicKey().toBase58(),
         ethereumAddress: await t.getEthereumAddress(),
         mint: r,
-        stealthAddressStructure: x
+        stealthAddressStructure: b
       }
     ), { wallet: m } = e.provider;
     if (!m)
       throw new Error("missing wallet");
-    a = await st(
+    i = await st(
       e.provider,
       o,
       n,
-      w
+      y
     );
   } else {
-    const o = it(e.programId, i, c), n = R === U ? null : c, w = R === U ? null : void 0;
-    a = await e.methods.multiPaymentDeposit(
+    const o = at(e.programId, a, c), n = x === U ? null : c, y = x === U ? null : void 0;
+    i = await e.methods.multiPaymentDeposit(
       K.map((V) => new Q(V)),
-      x
+      b
     ).accounts({
       mint: n,
       signer: v,
-      signerAta: w,
-      originalDeployer: i,
-      storageAccount: F,
-      storageVault: b,
-      merkleAccount: H,
+      signerAta: y,
+      originalDeployer: a,
+      storageAccount: H,
+      storageVault: R,
+      merkleAccount: F,
       tokenLimitStorage: o,
-      storageVaultAta: w,
+      storageVaultAta: y,
       accessTokenOwner: null
     }).rpc();
     const m = await e.provider.connection.getLatestBlockhash();
@@ -119,64 +118,64 @@ const ft = async (t, r, p, l, d, u) => {
       {
         blockhash: m.blockhash,
         lastValidBlockHeight: m.lastValidBlockHeight,
-        signature: a
+        signature: i
       },
       "confirmed"
     );
   }
-  const B = await e.provider.connection.getTransaction(a, {
+  const B = await e.provider.connection.getTransaction(i, {
     commitment: "confirmed",
     maxSupportedTransactionVersion: 0
   });
   if (!B)
     throw new Error("Transaction missing");
-  await N(I, {
+  await N(T, {
     id: P,
     hashedEthereumAddress: u,
     phase: k.AFTER_DEPOSIT,
-    depositTxHash: a
+    depositTxHash: i
   });
-  const L = lt(B, e, t.userKeys), O = [], C = [...L];
-  return l.forEach((o, n) => {
-    const w = g[n], m = C.find((X) => X.amount === w);
+  const L = dt(B, e, t.userKeys), O = [], C = [...L];
+  return d.forEach((o, n) => {
+    const y = g[n], m = C.find((X) => X.amount === y);
     if (!m)
-      throw new Error(`Could not find newly created UTXO with amount ${w} for recipient ${o}.`);
+      throw new Error(`Could not find newly created UTXO with amount ${y} for recipient ${o}.`);
     O.push({
       recipientAddress: o,
       utxo: m
     });
     const V = C.indexOf(m);
     C.splice(V, 1);
-  }), { userDepositedUtxos: O, signature: a, statusId: P };
-}, wt = async (t, r, p, l, d, u, g, h) => {
-  const y = t.getCurrentChainId();
+  }), { userDepositedUtxos: O, depositTxHash: i, statusId: P };
+}, wt = async (t, r, p, d, l, u, g, h) => {
+  const S = t.getCurrentChainId();
   if (p.length === 0)
     throw new Error("userDepositedUtxos must not be empty");
   const { hinkalIdl: s, originalDeployer: f } = $[t.getCurrentChainId()].contractData;
   if (!f || !s)
     throw new Error("missing data");
-  const E = t.getSolanaProgram(s), S = await t.getRandomRelay(!0);
-  if (!S)
+  const E = t.getSolanaProgram(s), w = await t.getRandomRelay(!0);
+  if (!w)
     throw new Error(Y.RELAYER_NOT_AVAILABLE);
-  const e = at().toString(), v = t.generateProofRemotely ? 5 : 1, i = [];
+  const e = it().toString(), v = t.generateProofRemotely ? 5 : 1, a = [];
   for (let c = 0; c < p.length; c += v) {
-    const R = p.slice(c, c + v), F = await Promise.all(
-      R.map(async ({ recipientAddress: b, utxo: H }) => {
-        const { compressedAddress: x } = q(U), I = new z({
+    const x = p.slice(c, c + v), H = await Promise.all(
+      x.map(async ({ recipientAddress: R, utxo: F }) => {
+        const { compressedAddress: b } = q(U), T = new z({
           amount: 0n,
           mintAddress: r,
-          erc20TokenAddress: x,
+          erc20TokenAddress: b,
           shieldedPrivateKey: t.userKeys.getShieldedPrivateKey(),
           timeStamp: e,
           tokenId: 0
-        }), D = [H, I], T = [I], K = z.findCorrectRandomization(
+        }), D = [F, T], I = [T], K = z.findCorrectRandomization(
           M(31),
           t.userKeys.getShieldedPrivateKey()
-        ), a = {
+        ), i = {
           tokenNumber: 1,
           nullifierAmount: D.length,
-          outputAmount: T.length
-        }, _ = mt([T])[0][0], P = Array.from(Z.utils.arrayify(_)), { proofAArr: B, proofBArr: L, proofCArr: O, publicInputsArr: C } = await dt(
+          outputAmount: I.length
+        }, _ = mt([I])[0][0], P = Array.from(Z.getBytes(_)), { proofAArr: B, proofBArr: L, proofCArr: O, publicInputsArr: C } = await lt(
           t.generateProofRemotely,
           f,
           t.merkleTreeHinkal,
@@ -185,13 +184,13 @@ const ft = async (t, r, p, l, d, u) => {
           E,
           [r],
           [D],
-          [T],
+          [I],
           K,
-          l.flatFee,
-          l.variableRate,
-          b,
-          S,
-          a,
+          d.flatFee,
+          d.variableRate,
+          R,
+          w,
+          i,
           [P],
           t.getCurrentChainId(),
           void 0,
@@ -201,11 +200,11 @@ const ft = async (t, r, p, l, d, u) => {
           void 0,
           !1
         ), n = {
-          recipient: b,
+          recipient: R,
           mint: r === U ? void 0 : r
         };
         return {
-          relayAddress: S,
+          relayAddress: w,
           functionName: "transact",
           args: {
             proofAArr: B,
@@ -213,39 +212,39 @@ const ft = async (t, r, p, l, d, u) => {
             proofCArr: O,
             publicInputsArr: C,
             encryptedOutputs: [P],
-            relayerFee: l.flatFee.toString(),
-            dimensions: a
+            relayerFee: d.flatFee.toString(),
+            dimensions: i
           },
           accounts: n
         };
       })
     );
-    i.push(...F);
+    a.push(...H);
   }
-  await N(y, {
+  await N(S, {
     id: u,
-    hashedEthereumAddress: d,
+    hashedEthereumAddress: l,
     phase: k.BEFORE_SCHEDULE_WITHDRAW
   });
   const A = await ut(
     t.getCurrentChainId(),
-    i,
-    d,
+    a,
+    l,
     g,
     h
   );
-  return await N(y, {
+  return await N(S, {
     id: u,
-    hashedEthereumAddress: d,
+    hashedEthereumAddress: l,
     phase: k.AFTER_SCHEDULE_WITHDRAW,
     scheduleId: A
   }), A;
-}, Po = async (t, r, p, l, d, u, g) => {
-  const h = j(await t.getEthereumAddress()), y = t.getCurrentChainId(), s = u ?? await gt(y, r, [r], J.Transact, [], 0n), { userDepositedUtxos: f, statusId: E } = await ft(
+}, Io = async (t, r, p, d, l, u, g) => {
+  const h = j(await t.getEthereumAddress()), S = t.getCurrentChainId(), s = u ?? await gt(S, r, [r], J.Transact, [], 0n), { userDepositedUtxos: f, statusId: E, depositTxHash: w } = await ft(
     t,
     r,
     p,
-    l,
+    d,
     s,
     h
   );
@@ -256,10 +255,10 @@ const ft = async (t, r, p, l, d, u) => {
     s,
     h,
     E,
-    d,
+    l,
     g
-  );
+  ), w;
 };
 export {
-  Po as hinkalSolanaDepositAndWithdraw
+  Io as hinkalSolanaDepositAndWithdraw
 };

package/data-structures/Hinkal/hinkalSolanaSwap.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../types/circom-data.types.cjs");const ne=require("../../types/external-action.types.cjs"),y=require("../../constants/protocol.constants.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const se=require("../../types/cache.types.cjs"),ce=require("../../functions/web3/events/getShieldedBalance.cjs"),ae=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),ie=require("../../functions/utils/time.utils.cjs"),ue=require("../../functions/pre-transaction/getFeeStructure.cjs"),le=require("../../functions/snarkjs/common.snarkjs.cjs"),de=require("../../constants/chains.constants.cjs"),c=require("@solana/web3.js"),m=require("../../functions/pre-transaction/solana.cjs"),pe=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),ge=require("../utxo/Utxo.cjs"),S=require("../../functions/web3/etherFunctions.cjs"),Ae=require("../../functions/pre-transaction/convert-okx-instructions.cjs"),ye=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),me=require("../../error-handling/error-codes.constants.cjs"),Se=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),we=require("ethers"),fe=async(t,o,r,w,K,x,E,R,v=!1)=>{if(v)throw new Error("onlyGasEstimate is not supported for Solana swap");const a=t.getCurrentChainId(),f=new c.PublicKey(y.solanaNativeAddress),{hinkalAddress:F,originalDeployer:i,hinkalIdl:P}=de.networkRegistry[a].contractData;if(!i||!P)throw new Error("No IDL configured for Solana program on this network");const u=new c.PublicKey(i),l=new c.PublicKey(F),n=o.map(e=>e.erc20TokenAddress),{userKeys:b,merkleTreeAccessToken:_,merkleTreeHinkal:N}=t,O=t.getSolanaProgram(P),s=R??await ue.getFeeStructure(a,E,n,ne.ExternalActionId.Transact),{patchAccessTokenMerkleTree:U,kycRequired:D,hasAccessToken:C}=await Se.shouldPatchAccessTokenMerkleTree(t,n,r);r[1]-=s.flatFee;const B=s.variableRate.toString(),L=Number(t.cacheDevice.get(se.StorageKeys.SLIPPAGE_PERCENTAGE)??0),d=o[1],M=S.getAmountInToken(d,r[1]),V=Number(M)*L/100;r[1]-=S.getAmountInWei(d,V.toFixed(d.decimals));const p=[...await ce.addPaddingToUtxos(t,n,r,6)],j=ie.getCurrentTimeInSeconds().toString(),G=t.userKeys.getShieldedPrivateKey(),g=[];for(let e=0;e<n.length;e+=1){const{outputUtxos:oe}=ae.outputUtxoProcessing(t.userKeys,p[e],r[e],j,void 0,!1);g.push([oe[0]])}const W=ge.Utxo.findCorrectRandomization(S.randomBigInt(31),G),q={tokenNumber:2,nullifierAmount:p[0].length,outputAmount:1},z=[!1,!0].slice(0,r.length),A=await t.getRandomRelay(!0);if(!A)throw Error(me.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const T=le.calcEncryptedOutputs(g).map(e=>[...we.ethers.utils.arrayify(e[0])]),k=m.getSwapperAccountPublicKeyFromSalt(l,u,w),{remainingAccounts:I,hinkalInstructions:h}=Ae.convertOKXToHinkalInstructions(K,k),{proofAArr:H,proofBArr:Z,proofCArr:X,publicInputsArr:Y}=await pe.constructSolanaZkProof(t.generateProofRemotely,i,N,_,b,O,n,p,g,W,s.flatFee,s.variableRate,f.toString(),A,q,T,a,U,z,w,h,I),J=m.getStorageAccountPublicKey(l,u),Q=m.getStorageVaultPublicKey(l,u),$=o[0].erc20TokenAddress!==y.solanaNativeAddress?new c.PublicKey(o[0].erc20TokenAddress):null,ee=o[1].erc20TokenAddress!==y.solanaNativeAddress?new c.PublicKey(o[1].erc20TokenAddress):null,te={recipient:f.toString(),storageAccount:J.toString(),storageVault:Q.toString(),swapperAccount:k.toString(),mintFrom:$?.toString()??null,mintTo:ee?.toString()??null,remainingAccounts:I.map(e=>({pubkey:e.pubkey.toString(),isSigner:e.isSigner,isWritable:e.isWritable})),addressLookupTableAccount:x},re={encryptedOutputs:T,proofAArr:H,proofBArr:Z,proofCArr:X,publicInputsArr:Y,relayerFee:s.flatFee.toString(),variableRate:B,dimensions:q,hinkalInstructions:h.map(e=>({accountIndexes:[...e.accountIndexes],data:[...e.data],programIndex:e.programIndex}))};return ye.solanaTransactCallRelayer(a,{relayAddress:A,functionName:"swap",args:re,accounts:te,solanaAccessTokenData:!C&&D?{ethereumAddress:await t.getEthereumAddress(),accessKey:b.getAccessKey()}:void 0})};exports.hinkalSolanaSwap=fe;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../types/circom-data.types.cjs");const ne=require("../../types/external-action.types.cjs"),y=require("../../constants/protocol.constants.cjs");require("../../types/activities.types.cjs");const se=require("../../types/cache.types.cjs"),ce=require("../../functions/web3/events/getShieldedBalance.cjs"),ae=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),ie=require("../../functions/utils/time.utils.cjs"),ue=require("../../functions/pre-transaction/getFeeStructure.cjs"),le=require("../../functions/snarkjs/common.snarkjs.cjs"),de=require("../../constants/chains.constants.cjs"),c=require("@solana/web3.js"),m=require("../../functions/pre-transaction/solana.cjs"),pe=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),ge=require("../utxo/Utxo.cjs"),S=require("../../functions/web3/etherFunctions.cjs"),Ae=require("../../functions/pre-transaction/convert-okx-instructions.cjs"),ye=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),me=require("../../error-handling/error-codes.constants.cjs"),Se=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),we=require("ethers"),Pe=async(t,o,r,w,K,x,E,R,v=!1)=>{if(v)throw new Error("onlyGasEstimate is not supported for Solana swap");const a=t.getCurrentChainId(),P=new c.PublicKey(y.solanaNativeAddress),{hinkalAddress:F,originalDeployer:i,hinkalIdl:f}=de.networkRegistry[a].contractData;if(!i||!f)throw new Error("No IDL configured for Solana program on this network");const u=new c.PublicKey(i),l=new c.PublicKey(F),n=o.map(e=>e.erc20TokenAddress),{userKeys:b,merkleTreeAccessToken:_,merkleTreeHinkal:N}=t,O=t.getSolanaProgram(f),s=R??await ue.getFeeStructure(a,E,n,ne.ExternalActionId.Transact),{patchAccessTokenMerkleTree:U,kycRequired:D,hasAccessToken:B}=await Se.shouldPatchAccessTokenMerkleTree(t,n,r);r[1]-=s.flatFee;const C=s.variableRate.toString(),L=Number(t.cacheDevice.get(se.StorageKeys.SLIPPAGE_PERCENTAGE)??0),d=o[1],M=S.getAmountInToken(d,r[1]),V=Number(M)*L/100;r[1]-=S.getAmountInWei(d,V.toFixed(d.decimals));const p=[...await ce.addPaddingToUtxos(t,n,r,6)],j=ie.getCurrentTimeInSeconds().toString(),G=t.userKeys.getShieldedPrivateKey(),g=[];for(let e=0;e<n.length;e+=1){const{outputUtxos:oe}=ae.outputUtxoProcessing(t.userKeys,p[e],r[e],j,void 0,!1);g.push([oe[0]])}const W=ge.Utxo.findCorrectRandomization(S.randomBigInt(31),G),T={tokenNumber:2,nullifierAmount:p[0].length,outputAmount:1},z=[!1,!0].slice(0,r.length),A=await t.getRandomRelay(!0);if(!A)throw Error(me.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const k=le.calcEncryptedOutputs(g).map(e=>[...we.ethers.getBytes(e[0])]),q=m.getSwapperAccountPublicKeyFromSalt(l,u,w),{remainingAccounts:I,hinkalInstructions:h}=Ae.convertOKXToHinkalInstructions(K,q),{proofAArr:H,proofBArr:Z,proofCArr:X,publicInputsArr:Y}=await pe.constructSolanaZkProof(t.generateProofRemotely,i,N,_,b,O,n,p,g,W,s.flatFee,s.variableRate,P.toString(),A,T,k,a,U,z,w,h,I),J=m.getStorageAccountPublicKey(l,u),Q=m.getStorageVaultPublicKey(l,u),$=o[0].erc20TokenAddress!==y.solanaNativeAddress?new c.PublicKey(o[0].erc20TokenAddress):null,ee=o[1].erc20TokenAddress!==y.solanaNativeAddress?new c.PublicKey(o[1].erc20TokenAddress):null,te={recipient:P.toString(),storageAccount:J.toString(),storageVault:Q.toString(),swapperAccount:q.toString(),mintFrom:$?.toString()??null,mintTo:ee?.toString()??null,remainingAccounts:I.map(e=>({pubkey:e.pubkey.toString(),isSigner:e.isSigner,isWritable:e.isWritable})),addressLookupTableAccount:x},re={encryptedOutputs:k,proofAArr:H,proofBArr:Z,proofCArr:X,publicInputsArr:Y,relayerFee:s.flatFee.toString(),variableRate:C,dimensions:T,hinkalInstructions:h.map(e=>({accountIndexes:[...e.accountIndexes],data:[...e.data],programIndex:e.programIndex}))};return ye.solanaTransactCallRelayer(a,{relayAddress:A,functionName:"swap",args:re,accounts:te,solanaAccessTokenData:!B&&D?{ethereumAddress:await t.getEthereumAddress(),accessKey:b.getAccessKey()}:void 0})};exports.hinkalSolanaSwap=Pe;

package/data-structures/Hinkal/hinkalSolanaSwap.mjs

@@ -1,9 +1,8 @@
 import "../../types/circom-data.types.mjs";
-import { ExternalActionId as rt } from "../../types/external-action.types.mjs";
+import { ExternalActionId as ot } from "../../types/external-action.types.mjs";
 import { solanaNativeAddress as A } from "../../constants/protocol.constants.mjs";
-import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
-import { StorageKeys as ot } from "../../types/cache.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";
@@ -20,26 +19,26 @@ import { solanaTransactCallRelayer as wt } from "../../functions/web3/functionCa
 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 qt = async (e, o, r, f, E, x, K, R, h = !1) => {
+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 = o.map((t) => t.erc20TokenAddress), { userKeys: w, merkleTreeAccessToken: F, merkleTreeHinkal: N } = e, D = e.getSolanaProgram(S), s = R ?? await it(i, K, n, rt.Transact), { patchAccessTokenMerkleTree: O, kycRequired: U, hasAccessToken: L } = await It(
+  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,
-    r
+    o
   );
-  r[1] -= s.flatFee;
-  const B = s.variableRate.toString(), C = Number(e.cacheDevice.get(ot.SLIPPAGE_PERCENTAGE) ?? 0), p = o[1], V = At(p, r[1]), G = Number(V) * C / 100;
-  r[1] -= ft(p, G.toFixed(p.decimals));
-  const l = [...await nt(e, n, r, 6)], W = at().toString(), _ = e.userKeys.getShieldedPrivateKey(), d = [];
+  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],
-      r[t],
+      o[t],
       W,
       void 0,
       !1
@@ -50,10 +49,10 @@ const qt = async (e, o, r, f, E, x, K, R, h = !1) => {
     tokenNumber: 2,
     nullifierAmount: l[0].length,
     outputAmount: 1
-  }, H = [!1, !0].slice(0, r.length), g = await e.getRandomRelay(!0);
+  }, 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.utils.arrayify(t[0])]), P = ut(u, m, f), { remainingAccounts: b, hinkalInstructions: k } = St(E, P), { proofAArr: M, proofBArr: q, proofCArr: X, publicInputsArr: Y } = await dt(
+  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,
@@ -76,7 +75,7 @@ const qt = async (e, o, r, f, E, x, K, R, h = !1) => {
     f,
     k,
     b
-  ), Z = pt(u, m), j = lt(u, m), J = o[0].erc20TokenAddress !== A ? new a(o[0].erc20TokenAddress) : null, Q = o[1].erc20TokenAddress !== A ? new a(o[1].erc20TokenAddress) : null, $ = {
+  ), 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(),
@@ -96,7 +95,7 @@ const qt = async (e, o, r, f, E, x, K, R, h = !1) => {
     proofCArr: X,
     publicInputsArr: Y,
     relayerFee: s.flatFee.toString(),
-    variableRate: B,
+    variableRate: L,
     dimensions: T,
     hinkalInstructions: k.map((t) => ({
       accountIndexes: [...t.accountIndexes],
@@ -109,12 +108,12 @@ const qt = async (e, o, r, f, E, x, K, R, h = !1) => {
     functionName: "swap",
     args: tt,
     accounts: $,
-    solanaAccessTokenData: !L && U ? {
+    solanaAccessTokenData: !B && U ? {
       ethereumAddress: await e.getEthereumAddress(),
       accessKey: w.getAccessKey()
     } : void 0
   });
 };
 export {
-  qt as hinkalSolanaSwap
+  Mt 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/transactions.types.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,t,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,r=R.map(i=>i.erc20TokenAddress);if(r.length>1)throw new Error("Solana Transfer: Only one mint address is supported");const N=q??await H.getFeeStructure(n,S,r,z.ExternalActionId.Transact),a=-t[0]*(10000n-c.HINKAL_PRIVATE_SEND_VARIABLE_RATE)/10000n;if(t[0]-=N.flatFee,a<=0n)throw Error(u.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);const m=-t[0]-a,o=(await D.addPaddingToUtxos(e,r,t,6))[0],y=j.getCurrentTimeInSeconds().toString(),{outputUtxos:P}=M.outputUtxoProcessing(e.userKeys,o,t[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:r.length,nullifierAmount:o.length,outputAmount:2},k=e.getSolanaProgram(A),T=Z.calcEncryptedOutputs([[f,g]])[0].map(i=>Array.from(X.ethers.utils.arrayify(i))),{proofAArr:v,proofBArr:B,proofCArr:F,publicInputsArr:K}=await Y.constructSolanaZkProof(e.generateProofRemotely,p,x,w,_,k,[r[0]],[o],[[f,g]],h,m,0n,c.solanaNativeAddress,s,E,T,n),L=r[0]===c.solanaNativeAddress,V={recipient:s,mint:L?void 0:r[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 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=$;