@sabaaa1/common 0.1.6 → 0.1.14

package/data-structures/ApprovalDBs/EventsPublicApprovalsDB.mjs

@@ -1,18 +1,18 @@
 import { ethers as k } from "ethers";
-import { get as C, update as I } from "idb-keyval";
+import { get as P, update as I } from "idb-keyval";
 import { Mutex as b } from "async-mutex";
 import { chainIds as f, ALCHEMY_API_KEY as T, networkRegistry as M } from "../../constants/chains.constants.mjs";
-import { Logger as B } from "../../error-handling/logger.mjs";
+import { Logger as C } from "../../error-handling/logger.mjs";
 import { getStateKey as L } from "../../functions/utils/string.utils.mjs";
 import { StorageKeys as S } from "../../types/cache.types.mjs";
-import { API as R } from "../../API/API.mjs";
+import { httpClient as R } from "../http/HttpClient.mjs";
+import { API as $ } from "../../API/API.mjs";
 import { RevokeType as w } from "../../types/approvals.types.mjs";
-import { isNFTToken as $ } from "../../functions/utils/erc20tokenFunctions.mjs";
-import { createTorRpcProvider as U } from "../../functions/utils/create-provider.mjs";
-import { EVENTS_INITIAL_BLOCKS as F } from "../../constants/events.constants.mjs";
+import { isNFTToken as U } from "../../functions/utils/erc20tokenFunctions.mjs";
+import { createCustomRpcProvider as F } from "../../functions/utils/create-provider.mjs";
+import { EVENTS_INITIAL_BLOCKS as O } from "../../constants/events.constants.mjs";
 import { caseInsensitiveEqual as y } from "../../functions/utils/caseInsensitive.utils.mjs";
-import { zeroAddress as P } from "../../constants/protocol.constants.mjs";
-import O from "axios";
+import { zeroAddress as B } from "../../constants/protocol.constants.mjs";
 class N {
   updateMutexes = {};
   approvalTopic = k.utils.id("Approval(address,address,uint256)");
@@ -39,11 +39,11 @@ class N {
   }
   async getApprovals(e, s) {
     const r = L(s, e);
-    return (await C(S.EVENTS_PUBLIC_APPROVALS))?.[r] || [];
+    return (await P(S.EVENTS_PUBLIC_APPROVALS))?.[r] || [];
   }
   async getLastProcessedBlock(e, s) {
-    const r = await C(S.PUBLIC_APPROVALS_LAST_PROCESSED_BLOCKS) || {}, d = L(s, e);
-    return r[d] || F[e];
+    const r = await P(S.PUBLIC_APPROVALS_LAST_PROCESSED_BLOCKS) || {}, d = L(s, e);
+    return r[d] || O[e];
   }
   async updateLastProcessedBlock(e, s, r) {
     await I(S.PUBLIC_APPROVALS_LAST_PROCESSED_BLOCKS, (d = {}) => {
@@ -59,57 +59,57 @@ class N {
       const { fetchRpcUrl: r } = M[s];
       if (!r)
         throw Error("No fetchRpcUrl in EventsPublicApprovalsDB");
-      const d = U(r), i = await this.getLastProcessedBlock(s, e) + 1, l = await d.getBlockNumber();
+      const d = F(r), i = await this.getLastProcessedBlock(s, e) + 1, l = await d.getBlockNumber();
       if (i > l)
         return { approvalEvents: [], latestBlock: l };
-      const E = k.utils.hexZeroPad(e.toLowerCase(), 32), c = {
+      const E = k.utils.hexZeroPad(e.toLowerCase(), 32), p = {
         topics: [[this.approvalTopic, this.approvalForAllTopic], E],
         fromBlock: i,
         toBlock: l
       };
-      return { approvalEvents: await d.getLogs(c), latestBlock: l };
+      return { approvalEvents: await d.getLogs(p), latestBlock: l };
     } catch (r) {
-      return B.error("Failed to fetch approval events", r), { approvalEvents: [], latestBlock: void 0 };
+      return C.error("Failed to fetch approval events", r), { approvalEvents: [], latestBlock: void 0 };
     }
   }
   async checkCurrentAllowances(e, s, r) {
-    const d = this.getAlchemyUrl(e), i = `0x${s.substring(2).padStart(64, "0")}`, l = [...new Set(r.map((t) => t.contractAddress))], E = (await R.tokensInfoCall(e, l)).filter((t) => !!t), c = new Map(E.map((t) => [t.erc20TokenAddress.toLowerCase(), t])), p = [], v = [];
+    const d = this.getAlchemyUrl(e), i = `0x${s.substring(2).padStart(64, "0")}`, l = [...new Set(r.map((t) => t.contractAddress))], E = (await $.tokensInfoCall(e, l)).filter((t) => !!t), p = new Map(E.map((t) => [t.erc20TokenAddress.toLowerCase(), t])), c = [], v = [];
     if (r.forEach((t, o) => {
-      const a = c.get(t.contractAddress.toLowerCase());
+      const a = p.get(t.contractAddress.toLowerCase());
       if (a)
-        if (!$(a))
-          p.push({
+        if (!U(a))
+          c.push({
             jsonrpc: "2.0",
-            id: p.length,
+            id: c.length,
             method: "alchemy_getTokenAllowance",
             params: [{ contract: t.contractAddress, owner: s, spender: t.spenderAddress }]
           }), v.push({ pairIndex: o, type: w.ERC20 });
         else {
           const m = `0x${t.spenderAddress.substring(2).padStart(64, "0")}`, g = `${this.isApprovedForAllSelector}${i.substring(2)}${m.substring(2)}`;
-          p.push({
+          c.push({
             jsonrpc: "2.0",
-            id: p.length,
+            id: c.length,
             method: "eth_call",
             params: [{ to: t.contractAddress, data: g }, "latest"]
           }), v.push({ pairIndex: o, type: w.approvedForAll }), t.tokenIds && t.tokenIds.size > 0 && t.tokenIds.forEach((h) => {
-            const x = k.BigNumber.from(h).toHexString().substring(2).padStart(64, "0"), _ = `${this.getApprovedSelector}${x}`;
-            p.push({
+            const _ = k.BigNumber.from(h).toHexString().substring(2).padStart(64, "0"), x = `${this.getApprovedSelector}${_}`;
+            c.push({
               jsonrpc: "2.0",
-              id: p.length,
+              id: c.length,
               method: "eth_call",
-              params: [{ to: t.contractAddress, data: _ }, "latest"]
+              params: [{ to: t.contractAddress, data: x }, "latest"]
             }), v.push({ pairIndex: o, type: w.tokenId, tokenId: h });
           });
         }
-    }), p.length === 0)
+    }), c.length === 0)
       return [];
-    const { data: n } = await O.post(d, p), u = [], A = /* @__PURE__ */ new Set();
+    const n = await R.post(d, c), u = [], A = /* @__PURE__ */ new Set();
     return n.forEach((t, o) => {
       const a = v[o];
       if (!a)
         return;
-      const m = r[a.pairIndex], g = c.get(m.contractAddress.toLowerCase());
-      if (!(!g || y(m.spenderAddress, P)) && !t?.error && t?.result && t.result !== "0x")
+      const m = r[a.pairIndex], g = p.get(m.contractAddress.toLowerCase());
+      if (!(!g || y(m.spenderAddress, B)) && !t?.error && t?.result && t.result !== "0x")
         try {
           if (a.type === w.ERC20 && BigInt(t.result) > 0n)
             u.push({ token: g, spenderAddress: m.spenderAddress, allowance: BigInt(t.result) });
@@ -117,7 +117,7 @@ class N {
             A.add(a.pairIndex), u.push({ token: g, spenderAddress: m.spenderAddress, allowance: 1n });
           else if (a.type === w.tokenId && !A.has(a.pairIndex)) {
             const h = `0x${t.result.substring(26)}`.toLowerCase();
-            !y(h, P) && y(h, m.spenderAddress) && u.push({
+            !y(h, B) && y(h, m.spenderAddress) && u.push({
               token: g,
               spenderAddress: m.spenderAddress,
               allowance: 1n,
@@ -125,7 +125,7 @@ class N {
             });
           }
         } catch (h) {
-          B.error("Error processing approval response", h);
+          C.error("Error processing approval response", h);
         }
     }), u;
   }
@@ -136,34 +136,34 @@ class N {
         const { approvalEvents: i, latestBlock: l } = await this.getApprovalEvents(e, s);
         if (!l)
           return;
-        const E = await this.getApprovals(s, e), c = /* @__PURE__ */ new Map();
+        const E = await this.getApprovals(s, e), p = /* @__PURE__ */ new Map();
         if (E.forEach((n) => {
           const u = n.token.erc20TokenAddress.toLowerCase(), A = n.spenderAddress.toLowerCase(), t = `${u}_${A}`;
-          let o = c.get(t);
-          o || (o = { contractAddress: u, spenderAddress: A, tokenIds: /* @__PURE__ */ new Set() }, c.set(t, o)), n.tokenId && o.tokenIds && o.tokenIds.add(n.tokenId);
+          let o = p.get(t);
+          o || (o = { contractAddress: u, spenderAddress: A, tokenIds: /* @__PURE__ */ new Set() }, p.set(t, o)), n.tokenId && o.tokenIds && o.tokenIds.add(n.tokenId);
         }), i.forEach((n) => {
           if (!n.topics[2])
             return;
           const u = n.address.toLowerCase(), A = `0x${n.topics[2].substring(26)}`.toLowerCase();
-          if (y(A, P))
+          if (y(A, B))
             return;
           const t = `${u}_${A}`;
-          let o = c.get(t);
-          if (o || (o = { contractAddress: u, spenderAddress: A, tokenIds: /* @__PURE__ */ new Set() }, c.set(t, o)), n.topics.length === 4 && o.tokenIds) {
+          let o = p.get(t);
+          if (o || (o = { contractAddress: u, spenderAddress: A, tokenIds: /* @__PURE__ */ new Set() }, p.set(t, o)), n.topics.length === 4 && o.tokenIds) {
             const a = BigInt(n.topics[3]).toString();
             o.tokenIds.add(a);
           }
-        }), c.size === 0) {
+        }), p.size === 0) {
           await this.updateLastProcessedBlock(s, e, l);
           return;
         }
-        const p = Array.from(c.values()), v = await this.checkCurrentAllowances(s, e, p);
+        const c = Array.from(p.values()), v = await this.checkCurrentAllowances(s, e, c);
         await I(S.EVENTS_PUBLIC_APPROVALS, (n = {}) => ({
           ...n,
           [r]: v
         })), await this.updateLastProcessedBlock(s, e, l);
       } catch (i) {
-        B.error("Failed to sync approvals", i);
+        C.error("Failed to sync approvals", i);
       }
     });
   }

package/data-structures/Hinkal/Hinkal.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const C=require("../../types/hinkal.types.cjs"),v=require("../../types/ethereum-network.types.cjs"),m=require("../../functions/web3/functionCalls/accessTokenCalls.cjs"),F=require("../../functions/web3/events/getShieldedBalance.cjs"),k=require("../crypto-keys/keys.cjs"),q=require("./hinkalDeposit.cjs"),E=require("./hinkalSwap.cjs"),M=require("./hinkalWithdraw.cjs"),R=require("./resetMerkleTrees.cjs"),P=require("../merkle-tree/MerkleTree.cjs");require("ethers");const f=require("../../error-handling/error-codes.constants.cjs"),S=require("../../crypto/poseidon.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const H=require("../../constants/chains.constants.cjs");require("../../API/getServerURL.cjs");require("axios");require("../../constants/coingecko.constants.cjs");require("../../constants/server.constants.cjs");const U=require("../../constants/vite.constants.cjs"),A=require("../../API/API.cjs");require("../../constants/token-data/index.cjs");require("../../constants/contracts.constants.cjs");const B=require("../../constants/kyc.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/mystery-boxes.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");require("../../API/tenderly.api.cjs");const b=require("../../functions/utils/reloadPage.cjs"),W=require("../MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.cjs"),D=require("./hinkalPrivateWallet.cjs"),K=require("../../functions/utils/cacheFunctions.cjs"),x=require("../../functions/utils/cacheDevice.utils.cjs"),N=require("../../functions/web3/getContractMetadata.cjs"),L=require("./hinkalGetRecipientInfo.cjs"),O=require("./hinkalApprove.cjs"),_=require("./hinkalInsideTransact.cjs"),u=require("../../functions/web3/events/getApprovedBalance.cjs"),y=require("../../functions/web3/functionCalls/inHinkalApprovalCalls.cjs"),j=require("./hinkalSignSubAccount.cjs"),G=require("./hinkalCheckTokenRegistry.cjs"),z=require("./hinkalActionReceive.cjs"),J=require("./hinkalActionFundApproveAndTransact.cjs"),Q=require("../TokenDBs/PrivateTokensDB.cjs");require("idb-keyval");const V=require("../../functions/utils/erc20tokenFunctions.cjs");require("multiformats");require("async-mutex");require("../../functions/utils/convertIntegrationProviderToExternalActionId.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("../../functions/utils/userAgent.cjs");require("../../functions/utils/mutexes.utils.cjs");require("node-forge");require("../../functions/web3/getTokenHolder.cjs");require("ethers-v6h");const X=require("./hinkalProoflessDeposit.cjs"),Y=require("./hinkalProxySwap.cjs"),Z=require("./hinkalMultiSend.cjs"),$=require("./hinkalTransfer.cjs");class ee{providerAdapter;userKeys;signingMessage="Login to Hinkal Protocol";merkleTreeHinkal;merkleTreeAccessToken;nullifiers;encryptedOutputs;approvals;commitmentsSnapshotService;nullifierSnapshotService;accessTokenSnapshotService;approvalsSnapshotService;utxoUtils;cacheDevice;generateProofRemotely;disableMerkleTreeUpdates;constructor(e){this.userKeys=new k.UserKeys(void 0),this.merkleTreeHinkal=P.MerkleTree.create(S.poseidonFunction,0n),this.merkleTreeAccessToken=P.MerkleTree.create(S.poseidonFunction,0n),this.nullifiers=new Set,this.encryptedOutputs=[],this.approvals=new Map,this.generateProofRemotely=e?.generateProofRemotely??!1,this.utxoUtils=new W.MultiThreadedUtxoUtils,this.cacheDevice=x.createCacheDevice(e),this.disableMerkleTreeUpdates=e?.disableMerkleTreeUpdates??!1}async initProviderAdapter(e,t){await this.updateProviderAdapter(t),this.providerAdapter?.initConnector(e);const r=await this.connectAndPatchProvider(e);await t.init(r),await this.setListeners()}async initUserKeys(){this.userKeys=new k.UserKeys(await this.getProviderAdapter().signMessage(this.signingMessage))}async initUserKeysWithPassword(e){this.userKeys=new k.UserKeys(e)}async resetMerkle(){this.disableMerkleTreeUpdates||this.isSelectedNetworkSupported()&&await R.resetMerkleTrees(this)}getProviderAdapter(){if(!this.providerAdapter)throw new Error("ProviderAdapter is not initialized");return this.providerAdapter}async waitForTransaction(e,t=1){return!!await this.providerAdapter?.waitForTransaction(e,t)}getContractMetadata(e,t){return this.getProviderAdapter().getContractMetadata(e,t)}getContract(e,t=void 0,r){return this.getProviderAdapter().getContract(e,t,r)}getContractWithFetcherByChainId(e,t,r=void 0){return N.getContractWithFetcherByChainId(e,t,r)}async signMessage(e){return await this.getProviderAdapter().signMessage(e)}async signTypedData(e,t,r){return await this.getProviderAdapter().signTypedData(e,t,r)}async signWithSubAccount(e,t,r){return j.hinkalSignSubAccount(this,e,t,r)}getContractWithSigner(e,t=""){return this.getProviderAdapter().getContractWithSigner(e,t)}getContractWithFetcher(e,t=""){return this.getProviderAdapter().getContractWithFetcher(e,t)}getContractWithFetcherForEthereum(e,t){return this.getProviderAdapter().getContractWithFetcherForEthereum(e,t)}isSelectedNetworkSupported(){return!!H.networkRegistry[this.getCurrentChainId()]}async switchNetwork(e){try{await this.getProviderAdapter().switchNetwork(e)}catch{throw new Error(f.transactionErrorCodes.FAILED_TO_SWITCH_NETWORKS)}}async switchAccount(e){await this.getProviderAdapter().switchAccount(e)}getCurrentChainId(){const{chainId:e}=this.getProviderAdapter();if(!e)throw new Error("Illegal State: no chainId");return e}getSelectedNetwork(){return this.providerAdapter?.getSelectedNetwork()}isPermitterAvailable(){return this.getProviderAdapter().isPermitterAvailable()}async connectAndPatchProvider(e){return await this.getProviderAdapter().connectAndPatchProvider(e)}async disconnectFromConnector(){await this.getProviderAdapter().disconnectFromConnector()}async updateProviderAdapter(e){try{this.providerAdapter&&this.providerAdapter.release(),this.providerAdapter=e}catch(t){throw console.error(t),Error("updateProviderAdapter failed, please try again.")}}async setListeners(){this.providerAdapter?.setChainEventListener({onAccountChanged:()=>{this.onAccountChanged()},onChainChanged:e=>{this.onChainChanged(e)}})}async onAccountChanged(){await this.getProviderAdapter().onAccountChanged();const e=C.EventType.AccountChanged;typeof document<"u"?document?.dispatchEvent(new Event(e)):process?.emit("message",e,void 0)}async onChainChanged(e){if(e){await this.getProviderAdapter().onChainChanged(e);const t=C.EventType.NetworkChange;typeof document<"u"?document.dispatchEvent(new Event(t)):process?.emit("message",t,void 0)}else await this.disconnectFromConnector(),b.reloadPage()}async monitorConnectedAddress(){await A.API.monitor(await this.getEthereumAddress(),this.getCurrentChainId())}async getBalances(e,t,r,n,i=!1,s){return F.getShieldedBalance(this,e,t,r,n,i,this.generateProofRemotely,s)}async getApprovedBalances(e=!1,t=!1){return u.getApprovedBalance(this,e,t)}async getTotalBalance(e,t,r,n=!1,i){const s=e??this.getCurrentChainId(),a=r??await this.getEthereumAddress(),o=t??this.userKeys,c=await this.getBalances(s,o.getShieldedPrivateKey(),o.getShieldedPublicKey(),a,n,i),h=await this.getApprovedBalances(n,i),d=U.isExtension?await Q.privateTokensDB.getPrivateTokens(s,a):V.getErc20TokensForChain(s),l=[];return d.forEach(p=>{const T=p.erc20TokenAddress.toLowerCase(),g=c.get(T),w=h.get(T),I={token:p,balance:(g?.balance??0n)+(w?.balance??0n),timestamp:g?.timestamp||w?.timestamp||"0",nfts:g?.nfts||[]};l.push(I)}),l}getSupportedPassportLinks(){return B.supportedPassportLinks}checkAccessToken(){return m.checkHinkalAccessToken(this)}async mintHinkalAccessToken(e,t){return m.mintAccessToken(this,e,t)}async getHinkalTreeRootHash(){return this.getContractWithFetcher(v.ContractType.HinkalContract).getRootHash()}async getAccessTokenTreeRootHash(){return this.getContractWithFetcher(v.ContractType.AccessTokenContract).getRootHash()}async resetMerkleTreesIfNecessary(){if(!this.isSelectedNetworkSupported())throw new Error(f.transactionErrorCodes.UNSUPPORTED_NETWORK);const[e,t]=await Promise.all([this.getHinkalTreeRootHash(),this.getAccessTokenTreeRootHash()]);(e.toBigInt()!==this.merkleTreeHinkal.getRootHash()||t.toBigInt()!==this.merkleTreeAccessToken.getRootHash())&&(console.log("resetting merkle tree in resetMerkleTreesIfNecessary"),await this.resetMerkle())}async getEventsFromHinkal(){await Promise.all([this.accessTokenSnapshotService?.retrieveEventsFromLatestBlock(),this.commitmentsSnapshotService?.retrieveEventsFromLatestBlock(),this.nullifierSnapshotService?.retrieveEventsFromLatestBlock(),this.approvalsSnapshotService?.retrieveEventsFromLatestBlock()])}getEthereumAddress(){return this.getProviderAdapter().getAddress()}async getRandomRelay(e=!1){return(await A.API.getIdleRelay(this.getCurrentChainId(),e)).relay}getGasPrice(){if(!this.providerAdapter?.chainId)throw new Error("Illegal State of providerAdapter in Hinkal: no chainId");return this.providerAdapter.getGasPrice()}getAPI(){return A.API}resetCache(){K.resetCache(this,this.getCurrentChainId(),this.userKeys.getShieldedPublicKey())}snapshotsClearInterval(){this.commitmentsSnapshotService?.intervalClear(),this.accessTokenSnapshotService?.intervalClear(),this.nullifierSnapshotService?.intervalClear(),this.approvalsSnapshotService?.intervalClear()}checkTokenRegistry(e,t){const r=this.getContractWithFetcher(v.ContractType.HinkalHelperContract);return G.hinkalCheckTokenRegistry(r,e,t)}getRecipientInfo(e=!1){return L.getRecipientInfo(this,e)}async getInteractionApprovals(e){return await y.getInteractionApprovals(this,e)}getApprovedUtxos(e=!1){return u.getApprovedUtxos(this,e)}getApprovedUtxosForToken(e,t=!1){return u.getApprovedUtxosForToken(this,e,t)}getMyApprovalAmountForInteraction(e,t){return u.getMyApprovalAmountForInteraction(this,e,t)}async checkExistingApprovalFromHinkal(e,t){return await y.checkExistingApprovalFromHinkal(this,e,t)}async getBufferEntry(e,t,r){return y.getBufferEntry(this,e,t,r)}async deposit(e,t){return q.hinkalDeposit(this,e,t)}async depositForOther(e,t,r){return q.hinkalDepositForOther(this,e,t,r)}async prooflessDeposit(e,t,r){return X.hinkalProoflessDeposit(this,e,t,r)}async transfer(e,t,r,n,i,s,a=!1){return $.hinkalTransfer(this,e,t,r,n,i,s,a)}async withdraw(e,t,r,n,i,s,a,o=!1){return M.hinkalWithdraw(this,e,t,r,n,i,s,a,o)}async swap(e,t,r,n,i,s,a,o=!1,c=!1){return E.hinkalSwap(this,e,t,r,n,i,s,a,o,c)}async actionReceive(e,t,r,n,i,s,a=!1){return z.hinkalActionReceive(this,e,t,r,n,i,s,a)}async actionFundApproveAndTransact(e,t,r,n,i,s,a,o,c=!1,h,d,l){return J.hinkalActionFundApproveAndTransact(this,e,t,r,n,i,s,a,o,c,h,d,l)}async actionPrivateWallet(e,t,r,n,i,s,a,o,c,h=!1,d,l,p=!1){return D.hinkalPrivateWallet(this,e,t,r,n,i,s,a,o,c,h,d,l,p)}async approve(e,t,r,n,i,s=!1){return O.hinkalApprove(this,e,t,r,n,i,s)}async hinkalInsideTransact(e,t,r,n,i,s,a,o,c,h=!1){return _.hinkalInsideTransact(this,e,t,r,n,i,s,a,o,c,h)}async proxySwap(e,t,r,n,i,s,a,o,c=!1,h,d,l=!1){return Y.hinkalProxySwap(this,e,t,r,n,i,s,a,o,c,h,d,l)}async multiSendPrivateRecipients(e,t,r){return Z.hinkalMultiSendPrivateRecipients(this,e,t,r)}areMerkleTreeUpdatesDisabled(){return this.disableMerkleTreeUpdates}updateMerkleTreeUpdates(e){this.disableMerkleTreeUpdates=e}}exports.Hinkal=ee;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("../../types/hinkal.types.cjs"),S=require("../../types/ethereum-network.types.cjs"),b=require("./hinkalCheckSolanaTokenRegistry.cjs"),T=require("../../functions/web3/functionCalls/accessTokenCalls.cjs"),x=require("../../functions/web3/events/getShieldedBalance.cjs"),A=require("../crypto-keys/keys.cjs"),m=require("./hinkalDeposit.cjs"),W=require("./hinkalDepositAndWithdraw.cjs"),w=require("./hinkalSolanaDeposit.cjs"),K=require("./hinkalSwap.cjs"),U=require("./hinkalWithdraw.cjs"),B=require("./resetMerkleTrees.cjs"),I=require("../merkle-tree/MerkleTree.cjs");require("ethers");const M=require("../../error-handling/error-codes.constants.cjs"),R=require("../../crypto/poseidon.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const h=require("../../constants/chains.constants.cjs");require("../../API/getServerURL.cjs");require("axios");require("../../constants/coingecko.constants.cjs");require("../../constants/server.constants.cjs");require("../http/HttpClient.cjs");const L=require("../../constants/vite.constants.cjs"),P=require("../../API/API.cjs");require("../../constants/token-data/index.cjs");require("../../constants/contracts.constants.cjs");const N=require("../../constants/kyc.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("../../API/tenderly.api.cjs");const _=require("../../functions/utils/reloadPage.cjs"),O=require("../MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.cjs"),j=require("./hinkalPrivateWallet.cjs"),z=require("../../functions/utils/cacheFunctions.cjs"),$=require("../../functions/utils/cacheDevice.utils.cjs"),J=require("../../functions/web3/getContractMetadata.cjs"),Q=require("./hinkalGetRecipientInfo.cjs"),V=require("./hinkalApprove.cjs"),X=require("./hinkalInsideTransact.cjs"),v=require("../../functions/web3/events/getApprovedBalance.cjs"),C=require("../../functions/web3/functionCalls/inHinkalApprovalCalls.cjs"),Y=require("./hinkalSignSubAccount.cjs"),Z=require("./hinkalCheckTokenRegistry.cjs"),G=require("./hinkalActionReceive.cjs"),ee=require("./hinkalActionFundApproveAndTransact.cjs"),te=require("../TokenDBs/PrivateTokensDB.cjs");require("idb-keyval");const re=require("../../functions/utils/erc20tokenFunctions.cjs");require("multiformats");const g=require("@solana/web3.js");require("@solana/spl-token");require("async-mutex");require("../../functions/utils/convertIntegrationProviderToExternalActionId.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const F=require("../../functions/pre-transaction/solana.cjs");require("@coral-xyz/anchor");require("../../functions/utils/userAgent.cjs");require("../../functions/utils/mutexes.utils.cjs");require("node-forge");require("../../functions/web3/getTokenHolder.cjs");const ie=require("../../functions/private-wallet/emporium.helpers.cjs"),ne=require("./hinkalProoflessDeposit.cjs"),ae=require("./hinkalProxySwap.cjs"),se=require("./hinkalMultiSend.cjs"),oe=require("./hinkalTransfer.cjs"),ce=require("./hinkalProxyToPrivate.cjs"),he=require("./hinkalSolanaDepositAndWithdraw.cjs"),le=require("./hinkalSolanaWithdraw.cjs"),de=require("./hinkalSolanaTransfer.cjs"),pe=require("./hinkalSolanaSwap.cjs"),ue=require("./hinkalSolanaProxySend.cjs"),ge=require("./hinkalSolanaProxySwap.cjs"),E=require("./hinkalSolanaProxyShield.cjs"),D=require("../../functions/web3/fetchSolanaMerkleTreeRootHash.cjs");class ke{providerAdapter;userKeys;signingMessage="Login to Hinkal Protocol";merkleTreeHinkal;merkleTreeAccessToken;nullifiers;encryptedOutputs;approvals;commitmentsSnapshotService;nullifierSnapshotService;accessTokenSnapshotService;approvalsSnapshotService;utxoUtils;cacheDevice;generateProofRemotely;disableMerkleTreeUpdates;constructor(e){this.userKeys=new A.UserKeys(void 0),this.merkleTreeHinkal=I.MerkleTree.create(R.poseidonFunction,0n),this.merkleTreeAccessToken=I.MerkleTree.create(R.poseidonFunction,0n),this.nullifiers=new Set,this.encryptedOutputs=[],this.approvals=new Map,this.generateProofRemotely=e?.generateProofRemotely??!1,this.utxoUtils=new O.MultiThreadedUtxoUtils,this.cacheDevice=$.createCacheDevice(e),this.disableMerkleTreeUpdates=e?.disableMerkleTreeUpdates??!1}async initProviderAdapter(e,t){await this.updateProviderAdapter(t),this.providerAdapter?.initConnector(e);const r=await this.connectAndPatchProvider(e);await t.init(r),await this.setListeners()}async initUserKeys(){this.userKeys=new A.UserKeys(await this.getProviderAdapter().signMessage(this.signingMessage))}async initUserKeysWithPassword(e){this.userKeys=new A.UserKeys(e)}async resetMerkle(){this.disableMerkleTreeUpdates||this.isSelectedNetworkSupported()&&await B.resetMerkleTrees(this)}getProviderAdapter(){if(!this.providerAdapter)throw new Error("ProviderAdapter is not initialized");return this.providerAdapter}async waitForTransaction(e,t=1){return!!await this.providerAdapter?.waitForTransaction(e,t)}getContractMetadata(e,t){return this.getProviderAdapter().getContractMetadata(e,t)}getContract(e,t=void 0,r){return this.getProviderAdapter().getContract(e,t,r)}getContractWithFetcherByChainId(e,t,r=void 0){return J.getContractWithFetcherByChainId(e,t,r)}async signMessage(e){return await this.getProviderAdapter().signMessage(e)}async signTypedData(e,t,r){return await this.getProviderAdapter().signTypedData(e,t,r)}async signWithSubAccount(e,t,r){return Y.hinkalSignSubAccount(this,e,t,r)}getContractWithSigner(e,t=""){return this.getProviderAdapter().getContractWithSigner(e,t)}getContractWithFetcher(e,t=""){return this.getProviderAdapter().getContractWithFetcher(e,t)}getContractWithFetcherForEthereum(e,t){return this.getProviderAdapter().getContractWithFetcherForEthereum(e,t)}isSelectedNetworkSupported(){return!!h.networkRegistry[this.getCurrentChainId()]}async switchNetwork(e){try{await this.getProviderAdapter().switchNetwork(e)}catch{throw new Error(M.transactionErrorCodes.FAILED_TO_SWITCH_NETWORKS)}}async switchAccount(e){await this.getProviderAdapter().switchAccount(e)}getCurrentChainId(){const{chainId:e}=this.getProviderAdapter();if(!e)throw new Error("Illegal State: no chainId");return e}getSelectedNetwork(){return this.providerAdapter?.getSelectedNetwork()}isPermitterAvailable(){return this.getProviderAdapter().isPermitterAvailable()}async connectAndPatchProvider(e){return await this.getProviderAdapter().connectAndPatchProvider(e)}async disconnectFromConnector(){await this.getProviderAdapter().disconnectFromConnector()}async updateProviderAdapter(e){try{this.providerAdapter&&this.providerAdapter.release(),this.providerAdapter=e}catch(t){throw console.error(t),Error("updateProviderAdapter failed, please try again.")}}async setListeners(){this.providerAdapter?.setChainEventListener({onAccountChanged:()=>{this.onAccountChanged()},onChainChanged:e=>{this.onChainChanged(e)}})}async onAccountChanged(){await this.getProviderAdapter().onAccountChanged();const e=f.EventType.AccountChanged;typeof document<"u"?document?.dispatchEvent(new Event(e)):process?.emit("message",e,void 0)}async onChainChanged(e){if(e){await this.getProviderAdapter().onChainChanged(e);const t=f.EventType.NetworkChange;typeof document<"u"?document.dispatchEvent(new Event(t)):process?.emit("message",t,void 0)}else await this.disconnectFromConnector(),_.reloadPage()}async monitorConnectedAddress(){const e=this.getCurrentChainId();h.isSolanaLike(e)||await P.API.monitor(await this.getEthereumAddress(),e)}async getBalances(e,t,r,i,n=!1,a){return x.getShieldedBalance(this,e,t,r,i,n,this.generateProofRemotely,a)}async getApprovedBalances(e=!1,t=!1){return v.getApprovedBalance(this,e,t)}async getTotalBalance(e,t,r,i=!1,n){const a=e??this.getCurrentChainId(),s=r??await this.getEthereumAddress(),o=t??this.userKeys,c=await this.getBalances(a,o.getShieldedPrivateKey(),o.getShieldedPublicKey(),s,i,n),d=h.isSolanaLike(a)?new Map:await this.getApprovedBalances(i,n),p=L.isExtension?await te.privateTokensDB.getPrivateTokens(a,s):re.getErc20TokensForChain(a),l=[];return p.forEach(u=>{const k=u.erc20TokenAddress.toLowerCase(),y=c.get(k),q=d.get(k),H={token:u,balance:(y?.balance??0n)+(q?.balance??0n),timestamp:y?.timestamp||q?.timestamp||"0",nfts:y?.nfts||[]};l.push(H)}),l}getSupportedPassportLinks(){return N.supportedPassportLinks}checkAccessToken(){return T.checkHinkalAccessToken(this)}async mintHinkalAccessToken(e,t){return T.mintAccessToken(this,e,t)}async getHinkalTreeRootHash(){const e=this.getCurrentChainId();if(h.isSolanaLike(e)){const{hinkalIdl:r,hinkalAddress:i,originalDeployer:n}=h.networkRegistry[e].contractData;if(!r||!i||!n)throw new Error(`Missing Solana configuration for chain ${e}`);const a=new g.PublicKey(n),s=new g.PublicKey(i),o=F.getMerkleAccountPublicKey(s,a),c=this.getSolanaProgram(r);return D.fetchSolanaMerkleTreeRootHash(c,o)}return this.getContractWithFetcher(S.ContractType.HinkalContract).getRootHash()}async getAccessTokenTreeRootHash(){const e=this.getCurrentChainId();if(h.isSolanaLike(e)){const{hinkalIdl:r,hinkalAddress:i,originalDeployer:n}=h.networkRegistry[e].contractData;if(!r||!i||!n)throw new Error(`Missing Solana configuration for chain ${e}`);const a=new g.PublicKey(n),s=new g.PublicKey(i),o=F.getAccessTokenMerkleAccountPublicKey(s,a),c=this.getSolanaProgram(r);return D.fetchSolanaMerkleTreeRootHash(c,o)}return this.getContractWithFetcher(S.ContractType.AccessTokenContract).getRootHash()}async resetMerkleTreesIfNecessary(){if(!this.isSelectedNetworkSupported())throw new Error(M.transactionErrorCodes.UNSUPPORTED_NETWORK);const[e,t]=await Promise.all([this.getHinkalTreeRootHash(),this.getAccessTokenTreeRootHash()]);(e.toBigInt()!==this.merkleTreeHinkal.getRootHash()||t.toBigInt()!==this.merkleTreeAccessToken.getRootHash())&&(console.log("resetting merkle tree in resetMerkleTreesIfNecessary"),await this.resetMerkle())}async getEventsFromHinkal(){await Promise.all([this.accessTokenSnapshotService?.retrieveEventsFromLatestBlock(),this.commitmentsSnapshotService?.retrieveEventsFromLatestBlock(),this.nullifierSnapshotService?.retrieveEventsFromLatestBlock(),this.approvalsSnapshotService?.retrieveEventsFromLatestBlock()])}getEthereumAddress(){return this.getProviderAdapter().getAddress()}async getRandomRelay(e=!1){const t=this.getCurrentChainId();return(await P.API.getIdleRelay(t,e)).relay}getGasPrice(){if(!this.providerAdapter?.chainId)throw new Error("Illegal State of providerAdapter in Hinkal: no chainId");return this.providerAdapter.getGasPrice()}getAPI(){return P.API}resetCache(){z.resetCache(this,this.getCurrentChainId(),this.userKeys.getShieldedPublicKey())}snapshotsClearInterval(){this.commitmentsSnapshotService?.intervalClear(),this.accessTokenSnapshotService?.intervalClear(),this.nullifierSnapshotService?.intervalClear(),this.approvalsSnapshotService?.intervalClear()}checkTokenRegistry(e,t){const r=this.getCurrentChainId();if(h.isSolanaLike(r)){const{hinkalIdl:n,hinkalAddress:a,originalDeployer:s}=h.networkRegistry[r].contractData;if(!n||!a||!s)throw new Error("missing solana data");const o=this.getSolanaProgram(n),c=new g.PublicKey(s);return b.hinkalCheckSolanaTokenRegistry(o,c,e,t)}const i=this.getContractWithFetcher(S.ContractType.HinkalHelperContract);return Z.hinkalCheckTokenRegistry(i,e,t)}getRecipientInfo(){return Q.getRecipientInfo(this)}async getInteractionApprovals(e){return await C.getInteractionApprovals(this,e)}getApprovedUtxos(e=!1){return v.getApprovedUtxos(this,e)}getApprovedUtxosForToken(e,t=!1){return v.getApprovedUtxosForToken(this,e,t)}getMyApprovalAmountForInteraction(e,t){return v.getMyApprovalAmountForInteraction(this,e,t)}async checkExistingApprovalFromHinkal(e,t){return await C.checkExistingApprovalFromHinkal(this,e,t)}async getBufferEntry(e,t,r){return C.getBufferEntry(this,e,t,r)}async deposit(e,t){return m.hinkalDeposit(this,e,t)}async depositForOther(e,t,r){return m.hinkalDepositForOther(this,e,t,r)}async depositAndWithdraw(e,t,r,i){return W.hinkalDepositAndWithdraw(this,e,t,r,i)}async prooflessDeposit(e,t,r){return ne.hinkalProoflessDeposit(this,e,t,r)}getSolanaProgram(e){if(!this.providerAdapter)throw new Error("No provider adapter initialized");if(!("getSolanaProgram"in this.providerAdapter))throw new Error("Current provider adapter is not a Solana provider adapter");return this.providerAdapter.getSolanaProgram(e)}getSolanaPublicKey(){if(!this.providerAdapter)throw new Error("No provider adapter initialized");if(!("getSolanaPublicKey"in this.providerAdapter))throw new Error("Current provider adapter is not a Solana provider adapter");return this.providerAdapter.getSolanaPublicKey()}async depositSolana(e,t){return w.hinkalSolanaDeposit(this,e,t)}async depositSolanaForOther(e,t,r){return w.hinkalSolanaDepositForOther(this,e,t,r)}async solanaMultiPaymentDeposit(e,t){return w.hinkalSolanaMultiPaymentDeposit(this,e,t)}async solanaDepositAndWithdraw(e,t,r,i){return he.hinkalSolanaDepositAndWithdraw(this,e,t,r,i)}async transfer(e,t,r,i,n,a,s=!1){return h.isSolanaLike(this.getCurrentChainId())?de.hinkalSolanaTransfer(this,e,t,r,i,n,s):oe.hinkalTransfer(this,e,t,r,i,n,a,s)}async withdraw(e,t,r,i,n,a,s,o=!1){return h.isSolanaLike(this.getCurrentChainId())?le.hinkalSolanaWithdraw(this,e.map(c=>c.erc20TokenAddress),t,r,n,a,o):U.hinkalWithdraw(this,e,t,r,i,n,a,s,o)}async swap(e,t,r,i,n,a,s,o=!1,c=!1){return h.isSolanaLike(this.getCurrentChainId())?this.swapSolana(e,t,i,n,a,o):K.hinkalSwap(this,e,t,r,i,n,a,s,o,c)}async swapSolana(e,t,r,i,n,a=!1){const s=JSON.parse(r),{instructionLists:o,addressLookupTableAccount:c}=s.data;return pe.hinkalSolanaSwap(this,e,t,o,c,i,n,a)}async actionReceive(e,t,r,i,n,a,s=!1){if(!n)throw new Error("subAccount is required");return h.isSolanaLike(this.getCurrentChainId())?E.hinkalSolanaProxyShield(this,e[0],t[0],n,void 0,s):G.hinkalActionReceive(this,e,t,r,i,n,a,s)}async actionFundApproveAndTransact(e,t,r,i,n,a,s,o,c=!1,d,p,l){return ee.hinkalActionFundApproveAndTransact(this,e,t,r,i,n,a,s,o,c,d,p,l)}async actionPrivateWallet(e,t,r,i,n,a,s,o,c,d=!1,p,l,u,k=!1){return j.hinkalPrivateWallet(this,e,t,r,i,n,a,s,o,c,d,p,l,u,k)}async approve(e,t,r,i,n,a=!1){return V.hinkalApprove(this,e,t,r,i,n,a)}async hinkalInsideTransact(e,t,r,i,n,a,s,o,c,d=!1){return X.hinkalInsideTransact(this,e,t,r,i,n,a,s,o,c,d)}async proxySwap(e,t,r,i,n,a,s,o,c=!1,d,p,l=!1){return h.isSolanaLike(this.getCurrentChainId())?ge.hinkalSolanaProxySwap(this,e,t,i,a,s,o,l):ae.hinkalProxySwap(this,e,t,r,i,n,a,s,o,c,d,p,l)}async proxyToPrivate(e,t,r,i,n,a,s,o=!1){return h.isSolanaLike(this.getCurrentChainId())?E.hinkalSolanaProxyShield(this,e[0],t[0],r,i,o):ce.hinkalProxyToPrivate(this,e,t,i,n,a,r,s,o)}async proxySend(e,t,r,i,n,a,s,o=!1){if(h.isSolanaLike(this.getCurrentChainId()))return ue.hinkalSolanaProxySend(this,e[0],t[0],r,i,o);const c=ie.createTransaferEmporiumOpsBatch(this,e.map(l=>l.erc20TokenAddress),t,i),d=e.map((l,u)=>({token:l,amount:-1n*t[u]}));return await this.actionPrivateWallet([],[],[],c,d,r,n,a,void 0,void 0,void 0,s,void 0,o)}async multiSendPrivateRecipients(e,t,r){return se.hinkalMultiSendPrivateRecipients(this,e,t,r)}areMerkleTreeUpdatesDisabled(){return this.disableMerkleTreeUpdates}updateMerkleTreeUpdates(e){this.disableMerkleTreeUpdates=e}}exports.Hinkal=ke;

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

@@ -6,12 +6,8 @@ import { ExternalActionId } from '../../types/external-action.types';
 import { type IMultiThreadedUtxoUtils } from '../../types/IMultiThreadedUtxoUtils';
 import { type RelayerTransaction } from '../../types/relayer.types';
 import { type SignatureData } from '../../types/crypto.types';
-import type { ERC20Token, TokenBalance, TokenChanges } from '../../types/token.types';
+import type { ERC20Token, PrivateRecipientInfo, TokenBalance, TokenChanges } from '../../types/token.types';
 import { UserKeys } from '../crypto-keys/keys';
-import { type ClientAccessTokenSnapshotService } from '../snapshot/ClientAccessTokenSnapshotService';
-import { type ClientCommitmentsSnapshotService } from '../snapshot/ClientCommitmentsSnapshotService';
-import { type ClientNullifierSnapshotService } from '../snapshot/ClientNullifierSnapshotService';
-import { type ClientApprovalsSnapshotService } from '../snapshot/ClientApprovalsSnapshotService';
 import { type IProviderAdapter } from '../provider-adapter/IProviderAdapter';
 import { type IHinkal } from './IHinkal';
 import { MerkleTree } from '../merkle-tree';
@@ -20,6 +16,9 @@ import { type ICacheDevice } from '../../types/ICacheDevice';
 import type { StealthAddressStructure, TypedData } from '../../types/circom-data.types';
 import { SubAccount } from '../../types/proxy.types';
 import { AdminTransactionType } from '../../types/admin.types';
+import { ClientAccessTokenSnapshotService, ClientApprovalsSnapshotService, ClientCommitmentsSnapshotService, ClientNullifierSnapshotService, ClientSolanaAccessTokenSnapshotService, ClientSolanaCommitmentsSnapshotService, ClientSolanaNullifierSnapshotService } from '../snapshot';
+import { Idl, Program } from '@coral-xyz/anchor';
+import { PublicKey } from '@solana/web3.js';
 export declare class Hinkal<ConnectorType> implements IHinkal {
     private providerAdapter?;
     userKeys: UserKeys;
@@ -29,9 +28,9 @@ export declare class Hinkal<ConnectorType> implements IHinkal {
     nullifiers: Set<string>;
     encryptedOutputs: EncryptedOutputWithSign[];
     approvals: Map<string, ApprovedUtxo[]>;
-    commitmentsSnapshotService?: ClientCommitmentsSnapshotService;
-    nullifierSnapshotService?: ClientNullifierSnapshotService;
-    accessTokenSnapshotService?: ClientAccessTokenSnapshotService;
+    commitmentsSnapshotService?: ClientCommitmentsSnapshotService | ClientSolanaCommitmentsSnapshotService;
+    nullifierSnapshotService?: ClientNullifierSnapshotService | ClientSolanaNullifierSnapshotService;
+    accessTokenSnapshotService?: ClientAccessTokenSnapshotService | ClientSolanaAccessTokenSnapshotService;
     approvalsSnapshotService?: ClientApprovalsSnapshotService;
     utxoUtils: IMultiThreadedUtxoUtils;
     cacheDevice: ICacheDevice;
@@ -83,7 +82,7 @@ export declare class Hinkal<ConnectorType> implements IHinkal {
     resetCache(): void;
     snapshotsClearInterval(): void;
     checkTokenRegistry(erc20Addresses: string[], amountChanges: bigint[]): Promise<boolean>;
-    getRecipientInfo(extendedInfo?: boolean): string;
+    getRecipientInfo(): string;
     getInteractionApprovals(interactionAddress: string): Promise<ApprovedUtxo[]>;
     getApprovedUtxos(resetCacheBefore?: boolean): ApprovedUtxoWithInteractionAddress[];
     getApprovedUtxosForToken(erc20Address: string, resetCacheBefore?: boolean): ApprovedUtxoWithInteractionAddress[];
@@ -92,16 +91,26 @@ export declare class Hinkal<ConnectorType> implements IHinkal {
     getBufferEntry(approveTo: string, tokenAddress: string, inHinkalAddress: bigint): Promise<bigint>;
     deposit(erc20Tokens: ERC20Token[], amountChanges: bigint[]): Promise<ethers.ContractTransaction>;
     depositForOther(erc20Tokens: ERC20Token[], amountChanges: bigint[], recipientInfo: string): Promise<ethers.ContractTransaction>;
+    depositAndWithdraw(erc20Token: ERC20Token, recipientAmounts: Record<string, bigint>, txCompletionTime?: number, feeStructureOverride?: FeeStructure): Promise<string>;
     prooflessDeposit(erc20Tokens: ERC20Token[], amountChanges: bigint[], stealthAddressStructures?: StealthAddressStructure[]): Promise<ethers.ContractTransaction>;
+    getSolanaProgram(idl: Idl): Program;
+    getSolanaPublicKey(): PublicKey;
+    depositSolana(amount: bigint, mintAddress: string): Promise<string>;
+    depositSolanaForOther(amount: bigint, mintAddress: string, recipientInfo: string): Promise<string>;
+    solanaMultiPaymentDeposit(amounts: bigint[], mintAddress: string): Promise<string>;
+    solanaDepositAndWithdraw(mintAddress: string, recipientAmounts: Record<string, bigint>, txCompletionTime?: number, feeStructureOverride?: FeeStructure): Promise<string>;
     transfer(erc20Tokens: ERC20Token[], amountChanges: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, onlyGasEstimate?: boolean): Promise<RelayerTransaction | bigint>;
     withdraw(erc20Tokens: ERC20Token[], deltaAmounts: bigint[], recipientAddress: string, isRelayerOff: boolean, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, onlyGasEstimate?: boolean): Promise<ethers.ContractTransaction | RelayerTransaction | bigint>;
     swap(erc20Tokens: ERC20Token[], deltaAmounts: bigint[], externalActionId: ExternalActionId, swapData: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, onlyGasEstimate?: boolean, withPrivateMempool?: boolean): Promise<RelayerTransaction | bigint>;
+    swapSolana(erc20Tokens: ERC20Token[], deltaAmounts: bigint[], swapData: string, feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean): Promise<RelayerTransaction>;
     actionReceive(erc20Tokens: ERC20Token[], deltaAmounts: bigint[], feeToken?: string, feeStructureOverride?: FeeStructure, subAccount?: SubAccount, action?: AdminTransactionType, onlyGasEstimate?: boolean): Promise<RelayerTransaction | bigint>;
     actionFundApproveAndTransact(tokenChanges: TokenChanges<bigint>[], subAccount: SubAccount, spenderAddress?: string, to?: string, callDataString?: string, value?: bigint, feeToken?: string, feeStructureOverride?: FeeStructure, autoDepositBack?: boolean, maxGasInDollar?: string, action?: AdminTransactionType, onlyGasEstimate?: boolean): Promise<RelayerTransaction | bigint>;
-    actionPrivateWallet(erc20Addresses: string[], deltaAmounts: bigint[], onChainCreation: boolean[], ops: string[], emporiumTokenChanges: TokenChanges<bigint>[], subAccount: SubAccount, feeToken?: string, feeStructureOverride?: FeeStructure, relayOverride?: string, autoDepositBack?: boolean, maxGasInDollar?: string, action?: AdminTransactionType, onlyGasEstimate?: boolean): Promise<RelayerTransaction | bigint>;
+    actionPrivateWallet(erc20Addresses: string[], deltaAmounts: bigint[], onChainCreation: boolean[], ops: string[], emporiumTokenChanges: TokenChanges<bigint>[], subAccount: SubAccount, feeToken?: string, feeStructureOverride?: FeeStructure, relayOverride?: string, autoDepositBack?: boolean, maxGasInDollar?: string, action?: AdminTransactionType, privateRecipientInfo?: PrivateRecipientInfo, onlyGasEstimate?: boolean): Promise<RelayerTransaction | bigint>;
     approve(erc20Addresses: string[], amount: bigint, approveTo: string, feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean): Promise<RelayerTransaction | bigint>;
     hinkalInsideTransact(erc20Addresses: string[], deltaChanges: bigint[], approvalChanges: bigint[], externalAddress: string, externalActionMetadata: string, parsedInLogicMetadata: ParsedInLogicMetadata, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, onlyGasEstimate?: boolean): Promise<RelayerTransaction | bigint>;
     proxySwap(erc20Tokens: ERC20Token[], deltaAmounts: bigint[], externalActionId: ExternalActionId, swapData: string, isTheSameChainSwap: boolean, subAccount: SubAccount, feeToken?: string, feeStructureOverride?: FeeStructure, autoDepositBack?: boolean, maxGasInDollar?: string, action?: AdminTransactionType, onlyGasEstimate?: boolean): Promise<RelayerTransaction | bigint>;
+    proxyToPrivate(erc20Tokens: ERC20Token[], deltaAmountsBase: bigint[], subAccount: SubAccount, recipientInfo: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, onlyGasEstimate?: boolean): Promise<RelayerTransaction | bigint>;
+    proxySend(erc20Tokens: ERC20Token[], amounts: bigint[], subAccount: SubAccount, recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, onlyGasEstimate?: boolean): Promise<RelayerTransaction | bigint>;
     multiSendPrivateRecipients(erc20Tokens: ERC20Token[], amounts: bigint[], extendedRecipientInfos?: string[]): Promise<ethers.ContractTransaction>;
     areMerkleTreeUpdatesDisabled(): boolean;
     updateMerkleTreeUpdates(value: boolean): void;