@hinkal/common 0.2.22 → 0.2.23

package/data-structures/Hinkal/Hinkal.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const T=require("../../types/hinkal.types.cjs"),S=require("../../types/ethereum-network.types.cjs"),x=require("./hinkalCheckSolanaTokenRegistry.cjs"),m=require("../../functions/web3/functionCalls/accessTokenCalls.cjs"),W=require("../../functions/web3/events/getShieldedBalance.cjs"),A=require("../crypto-keys/keys.cjs"),I=require("./hinkalDeposit.cjs"),B=require("./hinkalDepositAndWithdraw.cjs"),w=require("./hinkalSolanaDeposit.cjs"),K=require("./hinkalSwap.cjs"),U=require("./hinkalWithdraw.cjs"),L=require("./hinkalWithdrawStuckUtxos.cjs"),N=require("./resetMerkleTrees.cjs"),M=require("../merkle-tree/MerkleTree.cjs");require("ethers");const R=require("../../error-handling/error-codes.constants.cjs"),F=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 _=require("../../constants/vite.constants.cjs"),P=require("../../API/API.cjs");require("../../constants/token-data/index.cjs");require("../../constants/contracts.constants.cjs");const O=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 j=require("../../functions/utils/reloadPage.cjs"),z=require("../MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.cjs"),$=require("./hinkalPrivateWallet.cjs"),J=require("../../functions/utils/cacheFunctions.cjs"),Q=require("../../functions/utils/cacheDevice.utils.cjs"),V=require("../../functions/web3/getContractMetadata.cjs"),X=require("./hinkalGetRecipientInfo.cjs"),Y=require("./hinkalApprove.cjs"),Z=require("./hinkalInsideTransact.cjs"),v=require("../../functions/web3/events/getApprovedBalance.cjs"),C=require("../../functions/web3/functionCalls/inHinkalApprovalCalls.cjs"),G=require("./hinkalSignSubAccount.cjs"),ee=require("./hinkalCheckTokenRegistry.cjs"),te=require("./hinkalActionReceive.cjs"),re=require("./hinkalActionFundApproveAndTransact.cjs"),ie=require("../TokenDBs/PrivateTokensDB.cjs");require("idb-keyval");const ae=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 E=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 ne=require("../../functions/private-wallet/emporium.helpers.cjs"),se=require("./hinkalProoflessDeposit.cjs"),oe=require("./hinkalProxySwap.cjs"),ce=require("./hinkalMultiSend.cjs"),he=require("./hinkalTransfer.cjs"),le=require("./hinkalProxyToPrivate.cjs"),de=require("./hinkalSolanaDepositAndWithdraw.cjs"),pe=require("./hinkalSolanaWithdraw.cjs"),ue=require("./hinkalSolanaTransfer.cjs"),ge=require("./hinkalSolanaSwap.cjs"),ke=require("./hinkalSolanaProxySend.cjs"),ve=require("./hinkalSolanaProxySwap.cjs"),D=require("./hinkalSolanaProxyShield.cjs"),H=require("../../functions/web3/fetchSolanaMerkleTreeRootHash.cjs"),ye=require("./hinkalDepostAndBridge.cjs");class Se{providerAdapter;userKeys;signingMessage="Login to Hinkal Protocol";privateTransferSigningMessage="Login to Hinkal's Private Transfer App";merkleTreeHinkal;merkleTreeAccessToken;nullifiers;encryptedOutputs;approvals;commitmentsSnapshotService;nullifierSnapshotService;accessTokenSnapshotService;approvalsSnapshotService;utxoUtils;cacheDevice;generateProofRemotely;disableMerkleTreeUpdates;constructor(e){this.userKeys=new A.UserKeys(void 0),this.merkleTreeHinkal=M.MerkleTree.create(F.poseidonFunction,0n),this.merkleTreeAccessToken=M.MerkleTree.create(F.poseidonFunction,0n),this.nullifiers=new Set,this.encryptedOutputs=[],this.approvals=new Map,this.generateProofRemotely=e?.generateProofRemotely??!1,this.utxoUtils=new z.MultiThreadedUtxoUtils,this.cacheDevice=Q.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(e=!1){const t=e?this.privateTransferSigningMessage:this.signingMessage;this.userKeys=new A.UserKeys(await this.getProviderAdapter().signMessage(t))}async initUserKeysWithPassword(e){this.userKeys=new A.UserKeys(e)}async resetMerkle(){this.disableMerkleTreeUpdates||this.isSelectedNetworkSupported()&&await N.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 V.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 G.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(R.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=T.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=T.EventType.NetworkChange;typeof document<"u"?document.dispatchEvent(new Event(t)):process?.emit("message",t,void 0)}else await this.disconnectFromConnector(),j.reloadPage()}async monitorConnectedAddress(){const e=this.getCurrentChainId();h.isSolanaLike(e)||await P.API.monitor(await this.getEthereumAddress(),e)}async getBalances(e,t,r,i,a=!1,n,s=!1){return W.getShieldedBalance(this,e,t,r,i,a,this.generateProofRemotely,n,s)}async getApprovedBalances(e=!1,t=!1){return v.getApprovedBalance(this,e,t)}async getTotalBalance(e,t,r,i=!1,a,n=!1){const s=e??this.getCurrentChainId(),o=r??await this.getEthereumAddress(),c=t??this.userKeys,l=await this.getBalances(s,c.getShieldedPrivateKey(),c.getShieldedPublicKey(),o,i,a,n),p=!h.isSolanaLike(s)&&!n?await this.getApprovedBalances(i,a):new Map,d=_.isExtension?await ie.privateTokensDB.getPrivateTokens(s,o):ae.getErc20TokensForChain(s),u=[];return d.forEach(k=>{const f=k.erc20TokenAddress.toLowerCase(),y=l.get(f),q=p.get(f),b={token:k,balance:(y?.balance??0n)+(q?.balance??0n),timestamp:y?.timestamp||q?.timestamp||"0",nfts:y?.nfts||[]};u.push(b)}),u}async getStuckShieldedBalances(e,t,r){return(await this.getTotalBalance(e,t,r,!1,!1,!0)).filter(a=>a.balance>0n)}getSupportedPassportLinks(){return O.supportedPassportLinks}checkAccessToken(){return m.checkHinkalAccessToken(this)}async mintHinkalAccessToken(e,t){return m.mintAccessToken(this,e,t)}async getHinkalTreeRootHash(){const e=this.getCurrentChainId();if(h.isSolanaLike(e)){const{hinkalIdl:r,hinkalAddress:i,originalDeployer:a}=h.networkRegistry[e].contractData;if(!r||!i||!a)throw new Error(`Missing Solana configuration for chain ${e}`);const n=new g.PublicKey(a),s=new g.PublicKey(i),o=E.getMerkleAccountPublicKey(s,n),c=this.getSolanaProgram(r);return H.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:a}=h.networkRegistry[e].contractData;if(!r||!i||!a)throw new Error(`Missing Solana configuration for chain ${e}`);const n=new g.PublicKey(a),s=new g.PublicKey(i),o=E.getAccessTokenMerkleAccountPublicKey(s,n),c=this.getSolanaProgram(r);return H.fetchSolanaMerkleTreeRootHash(c,o)}return this.getContractWithFetcher(S.ContractType.AccessTokenContract).getRootHash()}async resetMerkleTreesIfNecessary(){if(!this.isSelectedNetworkSupported())throw new Error(R.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(){J.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:a,hinkalAddress:n,originalDeployer:s}=h.networkRegistry[r].contractData;if(!a||!n||!s)throw new Error("missing solana data");const o=this.getSolanaProgram(a),c=new g.PublicKey(s);return x.hinkalCheckSolanaTokenRegistry(o,c,e,t)}const i=this.getContractWithFetcher(S.ContractType.HinkalHelperContract);return ee.hinkalCheckTokenRegistry(i,e,t)}getRecipientInfo(){return X.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 I.hinkalDeposit(this,e,t)}async depositForOther(e,t,r){return I.hinkalDepositForOther(this,e,t,r)}async depositAndWithdraw(e,t,r,i,a,n){return h.isSolanaLike(this.getCurrentChainId())?de.hinkalSolanaDepositAndWithdraw(this,e.erc20TokenAddress,t,r,i,a,n):B.hinkalDepositAndWithdraw(this,e,t,r,i,a,n)}async depositAndBridge(e,t,r,i,a){return ye.hinkalDepositAndBridge(this,e,t,r,i,a)}async prooflessDeposit(e,t,r){return se.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 transfer(e,t,r,i,a,n,s=!1){return h.isSolanaLike(this.getCurrentChainId())?ue.hinkalSolanaTransfer(this,e,t,r,i,a,s):he.hinkalTransfer(this,e,t,r,i,a,n,s)}async withdraw(e,t,r,i,a,n,s,o=!1){return h.isSolanaLike(this.getCurrentChainId())?pe.hinkalSolanaWithdraw(this,e.map(c=>c.erc20TokenAddress),t,r,a,n,o):U.hinkalWithdraw(this,e,t,r,i,a,n,s,o)}async withdrawStuckUtxos(e,t){return L.hinkalWithdrawStuckUtxos(this,e,t)}async swap(e,t,r,i,a,n,s,o=!1,c=!1){return h.isSolanaLike(this.getCurrentChainId())?this.swapSolana(e,t,i,a,n,o):K.hinkalSwap(this,e,t,r,i,a,n,s,o,c)}async swapSolana(e,t,r,i,a,n=!1){const s=JSON.parse(r),o=BigInt(s.swapperAccountSalt),{instructionLists:c,addressLookupTableAccount:l}=s.data;return ge.hinkalSolanaSwap(this,e,t,o,c,l,i,a,n)}async actionReceive(e,t,r,i,a,n,s=!1){if(!a)throw new Error("subAccount is required");return h.isSolanaLike(this.getCurrentChainId())?D.hinkalSolanaProxyShield(this,e[0],t[0],a,void 0,s):te.hinkalActionReceive(this,e,t,r,i,a,n,s)}async actionFundApproveAndTransact(e,t,r,i,a,n,s,o,c=!1,l,p,d){return re.hinkalActionFundApproveAndTransact(this,e,t,r,i,a,n,s,o,c,l,p,d)}async actionPrivateWallet(e,t,r,i,a,n,s,o,c,l=!1,p,d,u,k=!1){return $.hinkalPrivateWallet(this,e,t,r,i,a,n,s,o,c,l,p,d,u,k)}async approve(e,t,r,i,a,n=!1){return Y.hinkalApprove(this,e,t,r,i,a,n)}async hinkalInsideTransact(e,t,r,i,a,n,s,o,c,l=!1){return Z.hinkalInsideTransact(this,e,t,r,i,a,n,s,o,c,l)}async proxySwap(e,t,r,i,a,n,s,o,c=!1,l,p,d=!1){return h.isSolanaLike(this.getCurrentChainId())?ve.hinkalSolanaProxySwap(this,e,t,i,n,s,o,d):oe.hinkalProxySwap(this,e,t,r,i,a,n,s,o,c,l,p,d)}async proxyToPrivate(e,t,r,i,a,n,s,o=!1){return h.isSolanaLike(this.getCurrentChainId())?D.hinkalSolanaProxyShield(this,e[0],t[0],r,i,o):le.hinkalProxyToPrivate(this,e,t,i,a,n,r,s,o)}async proxySend(e,t,r,i,a,n,s,o=!1){if(h.isSolanaLike(this.getCurrentChainId()))return ke.hinkalSolanaProxySend(this,e[0],t[0],r,i,o);const c=ne.createTransaferEmporiumOpsBatch(this,e.map(d=>d.erc20TokenAddress),t,i),l=e.map((d,u)=>({token:d,amount:-1n*t[u]}));return await this.actionPrivateWallet([],[],[],c,l,r,a,n,void 0,void 0,void 0,s,void 0,o)}async multiSendPrivateRecipients(e,t,r){return ce.hinkalMultiSendPrivateRecipients(this,e,t,r)}areMerkleTreeUpdatesDisabled(){return this.disableMerkleTreeUpdates}updateMerkleTreeUpdates(e){this.disableMerkleTreeUpdates=e}}exports.Hinkal=Se;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const T=require("../../types/hinkal.types.cjs"),S=require("../../types/ethereum-network.types.cjs"),x=require("./hinkalCheckSolanaTokenRegistry.cjs"),m=require("../../functions/web3/functionCalls/accessTokenCalls.cjs"),W=require("../../functions/web3/events/getShieldedBalance.cjs"),A=require("../crypto-keys/keys.cjs"),I=require("./hinkalDeposit.cjs"),B=require("./hinkalDepositAndWithdraw.cjs"),w=require("./hinkalSolanaDeposit.cjs"),K=require("./hinkalSwap.cjs"),U=require("./hinkalWithdraw.cjs"),L=require("./hinkalWithdrawStuckUtxos.cjs"),N=require("./resetMerkleTrees.cjs"),M=require("../merkle-tree/MerkleTree.cjs");require("ethers");const R=require("../../error-handling/error-codes.constants.cjs"),F=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 _=require("../../constants/vite.constants.cjs"),P=require("../../API/API.cjs");require("../../constants/token-data/index.cjs");require("../../constants/contracts.constants.cjs");const O=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 j=require("../../functions/utils/reloadPage.cjs"),z=require("../MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.cjs"),$=require("./hinkalPrivateWallet.cjs"),J=require("../../functions/utils/cacheFunctions.cjs"),Q=require("../../functions/utils/cacheDevice.utils.cjs"),V=require("../../functions/web3/getContractMetadata.cjs"),X=require("./hinkalGetRecipientInfo.cjs"),Y=require("./hinkalApprove.cjs"),Z=require("./hinkalInsideTransact.cjs"),v=require("../../functions/web3/events/getApprovedBalance.cjs"),C=require("../../functions/web3/functionCalls/inHinkalApprovalCalls.cjs"),G=require("./hinkalSignSubAccount.cjs"),ee=require("./hinkalCheckTokenRegistry.cjs"),te=require("./hinkalActionReceive.cjs"),re=require("./hinkalActionFundApproveAndTransact.cjs"),ie=require("../TokenDBs/PrivateTokensDB.cjs");require("idb-keyval");const ne=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/activities.types.cjs");const E=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 ae=require("../../functions/private-wallet/emporium.helpers.cjs"),se=require("./hinkalProoflessDeposit.cjs"),oe=require("./hinkalProxySwap.cjs"),ce=require("./hinkalMultiSend.cjs"),he=require("./hinkalTransfer.cjs"),le=require("./hinkalProxyToPrivate.cjs"),de=require("./hinkalSolanaDepositAndWithdraw.cjs"),pe=require("./hinkalSolanaWithdraw.cjs"),ue=require("./hinkalSolanaTransfer.cjs"),ge=require("./hinkalSolanaSwap.cjs"),ke=require("./hinkalSolanaProxySend.cjs"),ve=require("./hinkalSolanaProxySwap.cjs"),D=require("./hinkalSolanaProxyShield.cjs"),H=require("../../functions/web3/fetchSolanaMerkleTreeRootHash.cjs"),ye=require("./hinkalDepostAndBridge.cjs");class Se{providerAdapter;userKeys;signingMessage="Login to Hinkal Protocol";privateTransferSigningMessage="Login to Hinkal's Private Transfer App";merkleTreeHinkal;merkleTreeAccessToken;nullifiers;encryptedOutputs;approvals;commitmentsSnapshotService;nullifierSnapshotService;accessTokenSnapshotService;approvalsSnapshotService;utxoUtils;cacheDevice;generateProofRemotely;disableMerkleTreeUpdates;constructor(e){this.userKeys=new A.UserKeys(void 0),this.merkleTreeHinkal=M.MerkleTree.create(F.poseidonFunction,0n),this.merkleTreeAccessToken=M.MerkleTree.create(F.poseidonFunction,0n),this.nullifiers=new Set,this.encryptedOutputs=[],this.approvals=new Map,this.generateProofRemotely=e?.generateProofRemotely??!0,this.utxoUtils=new z.MultiThreadedUtxoUtils,this.cacheDevice=Q.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(e=!1){const t=e?this.privateTransferSigningMessage:this.signingMessage;this.userKeys=new A.UserKeys(await this.getProviderAdapter().signMessage(t))}async initUserKeysWithPassword(e){this.userKeys=new A.UserKeys(e)}async resetMerkle(){this.disableMerkleTreeUpdates||this.isSelectedNetworkSupported()&&await N.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 V.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 G.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(R.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=T.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=T.EventType.NetworkChange;typeof document<"u"?document.dispatchEvent(new Event(t)):process?.emit("message",t,void 0)}else await this.disconnectFromConnector(),j.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,s=!1){return W.getShieldedBalance(this,e,t,r,i,n,this.generateProofRemotely,a,s)}async getApprovedBalances(e=!1,t=!1){return v.getApprovedBalance(this,e,t)}async getTotalBalance(e,t,r,i=!1,n,a=!1){const s=e??this.getCurrentChainId(),o=r??await this.getEthereumAddress(),c=t??this.userKeys,l=await this.getBalances(s,c.getShieldedPrivateKey(),c.getShieldedPublicKey(),o,i,n,a),p=!h.isSolanaLike(s)&&!a?await this.getApprovedBalances(i,n):new Map,d=_.isExtension?await ie.privateTokensDB.getPrivateTokens(s,o):ne.getErc20TokensForChain(s),u=[];return d.forEach(k=>{const f=k.erc20TokenAddress.toLowerCase(),y=l.get(f),q=p.get(f),b={token:k,balance:(y?.balance??0n)+(q?.balance??0n),timestamp:y?.timestamp||q?.timestamp||"0",nfts:y?.nfts||[]};u.push(b)}),u}async getStuckShieldedBalances(e,t,r){return(await this.getTotalBalance(e,t,r,!1,!1,!0)).filter(n=>n.balance>0n)}getSupportedPassportLinks(){return O.supportedPassportLinks}checkAccessToken(){return m.checkHinkalAccessToken(this)}async mintHinkalAccessToken(e,t){return m.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=E.getMerkleAccountPublicKey(s,a),c=this.getSolanaProgram(r);return H.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=E.getAccessTokenMerkleAccountPublicKey(s,a),c=this.getSolanaProgram(r);return H.fetchSolanaMerkleTreeRootHash(c,o)}return this.getContractWithFetcher(S.ContractType.AccessTokenContract).getRootHash()}async resetMerkleTreesIfNecessary(){if(!this.isSelectedNetworkSupported())throw new Error(R.transactionErrorCodes.UNSUPPORTED_NETWORK);const[e,t]=await Promise.all([this.getHinkalTreeRootHash(),this.getAccessTokenTreeRootHash()]);(BigInt(e)!==this.merkleTreeHinkal.getRootHash()||BigInt(t)!==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(){J.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 x.hinkalCheckSolanaTokenRegistry(o,c,e,t)}const i=this.getContractWithFetcher(S.ContractType.HinkalHelperContract);return ee.hinkalCheckTokenRegistry(i,e,t)}getRecipientInfo(){return X.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 I.hinkalDeposit(this,e,t)}async depositForOther(e,t,r){return I.hinkalDepositForOther(this,e,t,r)}async depositAndWithdraw(e,t,r,i,n,a){return h.isSolanaLike(this.getCurrentChainId())?de.hinkalSolanaDepositAndWithdraw(this,e.erc20TokenAddress,t,r,i,n,a):B.hinkalDepositAndWithdraw(this,e,t,r,i,n,a)}async depositAndBridge(e,t,r,i,n){return ye.hinkalDepositAndBridge(this,e,t,r,i,n)}async prooflessDeposit(e,t,r){return se.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 transfer(e,t,r,i,n,a,s=!1){return h.isSolanaLike(this.getCurrentChainId())?ue.hinkalSolanaTransfer(this,e,t,r,i,n,s):he.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())?pe.hinkalSolanaWithdraw(this,e.map(c=>c.erc20TokenAddress),t,r,n,a,o):U.hinkalWithdraw(this,e,t,r,i,n,a,s,o)}async withdrawStuckUtxos(e,t){return L.hinkalWithdrawStuckUtxos(this,e,t)}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),o=BigInt(s.swapperAccountSalt),{instructionLists:c,addressLookupTableAccount:l}=s.data;return ge.hinkalSolanaSwap(this,e,t,o,c,l,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())?D.hinkalSolanaProxyShield(this,e[0],t[0],n,void 0,s):te.hinkalActionReceive(this,e,t,r,i,n,a,s)}async actionFundApproveAndTransact(e,t,r,i,n,a,s,o,c=!1,l,p,d){return re.hinkalActionFundApproveAndTransact(this,e,t,r,i,n,a,s,o,c,l,p,d)}async actionPrivateWallet(e,t,r,i,n,a,s,o,c,l=!1,p,d,u,k=!1){return $.hinkalPrivateWallet(this,e,t,r,i,n,a,s,o,c,l,p,d,u,k)}async approve(e,t,r,i,n,a=!1){return Y.hinkalApprove(this,e,t,r,i,n,a)}async hinkalInsideTransact(e,t,r,i,n,a,s,o,c,l=!1){return Z.hinkalInsideTransact(this,e,t,r,i,n,a,s,o,c,l)}async proxySwap(e,t,r,i,n,a,s,o,c=!1,l,p,d=!1){return h.isSolanaLike(this.getCurrentChainId())?ve.hinkalSolanaProxySwap(this,e,t,i,a,s,o,d):oe.hinkalProxySwap(this,e,t,r,i,n,a,s,o,c,l,p,d)}async proxyToPrivate(e,t,r,i,n,a,s,o=!1){return h.isSolanaLike(this.getCurrentChainId())?D.hinkalSolanaProxyShield(this,e[0],t[0],r,i,o):le.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 ke.hinkalSolanaProxySend(this,e[0],t[0],r,i,o);const c=ae.createTransaferEmporiumOpsBatch(this,e.map(d=>d.erc20TokenAddress),t,i),l=e.map((d,u)=>({token:d,amount:-1n*t[u]}));return await this.actionPrivateWallet([],[],[],c,l,r,n,a,void 0,void 0,void 0,s,void 0,o)}async multiSendPrivateRecipients(e,t,r){return ce.hinkalMultiSendPrivateRecipients(this,e,t,r)}areMerkleTreeUpdatesDisabled(){return this.disableMerkleTreeUpdates}updateMerkleTreeUpdates(e){this.disableMerkleTreeUpdates=e}}exports.Hinkal=Se;

package/data-structures/Hinkal/Hinkal.mjs

@@ -62,7 +62,6 @@ import "@solana/spl-token";
 import "async-mutex";
 import "../../functions/utils/convertIntegrationProviderToExternalActionId.mjs";
 import "../../types/circom-data.types.mjs";
-import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
 import { getMerkleAccountPublicKey as ge, getAccessTokenMerkleAccountPublicKey as ue } from "../../functions/pre-transaction/solana.mjs";
 import "@coral-xyz/anchor";
@@ -85,7 +84,7 @@ import { hinkalSolanaProxySwap as Ee } from "./hinkalSolanaProxySwap.mjs";
 import { hinkalSolanaProxyShield as E } from "./hinkalSolanaProxyShield.mjs";
 import { fetchSolanaMerkleTreeRootHash as F } from "../../functions/web3/fetchSolanaMerkleTreeRootHash.mjs";
 import { hinkalDepositAndBridge as Fe } from "./hinkalDepostAndBridge.mjs";
-class hr {
+class cr {
   providerAdapter;
   userKeys;
   signingMessage = "Login to Hinkal Protocol";
@@ -104,7 +103,7 @@ class hr {
   generateProofRemotely;
   disableMerkleTreeUpdates;
   constructor(e) {
-    this.userKeys = new y(void 0), this.merkleTreeHinkal = P.create(I, 0n), this.merkleTreeAccessToken = P.create(I, 0n), this.nullifiers = /* @__PURE__ */ new Set(), this.encryptedOutputs = [], this.approvals = /* @__PURE__ */ new Map(), this.generateProofRemotely = e?.generateProofRemotely ?? !1, this.utxoUtils = new J(), this.cacheDevice = X(e), this.disableMerkleTreeUpdates = e?.disableMerkleTreeUpdates ?? !1;
+    this.userKeys = new y(void 0), this.merkleTreeHinkal = P.create(I, 0n), this.merkleTreeAccessToken = P.create(I, 0n), this.nullifiers = /* @__PURE__ */ new Set(), this.encryptedOutputs = [], this.approvals = /* @__PURE__ */ new Map(), this.generateProofRemotely = e?.generateProofRemotely ?? !0, this.utxoUtils = new J(), this.cacheDevice = X(e), this.disableMerkleTreeUpdates = e?.disableMerkleTreeUpdates ?? !1;
   }
   async initProviderAdapter(e, t) {
     await this.updateProviderAdapter(t), this.providerAdapter?.initConnector(e);
@@ -298,7 +297,7 @@ class hr {
       this.getHinkalTreeRootHash(),
       this.getAccessTokenTreeRootHash()
     ]);
-    (e.toBigInt() !== this.merkleTreeHinkal.getRootHash() || t.toBigInt() !== this.merkleTreeAccessToken.getRootHash()) && (console.log("resetting merkle tree in resetMerkleTreesIfNecessary"), await this.resetMerkle());
+    (BigInt(e) !== this.merkleTreeHinkal.getRootHash() || BigInt(t) !== this.merkleTreeAccessToken.getRootHash()) && (console.log("resetting merkle tree in resetMerkleTreesIfNecessary"), await this.resetMerkle());
   }
   async getEventsFromHinkal() {
     await Promise.all([
@@ -646,5 +645,5 @@ class hr {
   }
 }
 export {
-  hr as Hinkal
+  cr as Hinkal
 };

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

@@ -6,7 +6,7 @@ import { type IMultiThreadedUtxoUtils } from '../../types/IMultiThreadedUtxoUtil
 import { RelayerTransaction } from '../../types/relayer.types';
 import { SignatureData } from '../../types/crypto.types';
 import { ERC20Token, PrivateRecipientInfo, TokenBalance, TokenChanges } from '../../types/token.types';
-import { Bytes, ethers } from 'ethers';
+import { ethers } from 'ethers';
 import { type UserKeys } from '../crypto-keys/keys';
 import { IProviderAdapter } from '../provider-adapter/IProviderAdapter';
 import { ClientAccessTokenSnapshotService, ClientApprovalsSnapshotService, ClientCommitmentsSnapshotService, ClientNullifierSnapshotService, ClientSolanaAccessTokenSnapshotService, ClientSolanaCommitmentsSnapshotService, ClientSolanaNullifierSnapshotService } from '../snapshot';
@@ -96,7 +96,7 @@ export interface IHinkal<ConnectorType = unknown> {
     monitorConnectedAddress(): Promise<void>;
     getSelectedNetwork(): EthereumNetwork | undefined;
     isPermitterAvailable(): boolean;
-    signMessage(message: Bytes | string): Promise<string>;
+    signMessage(message: string): Promise<string>;
     signTypedData(domain: ethers.TypedDataDomain, types: Record<string, ethers.TypedDataField[]>, value: Record<string, unknown>): Promise<string>;
     signWithSubAccount(messageToSign: string | undefined, typedData: TypedData | undefined, subAccount: SubAccount): Promise<string>;
     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>;

package/data-structures/Hinkal/hinkalApprove.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const k=require("../../error-handling/error-codes.constants.cjs"),L=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),N=require("../../functions/web3/events/getShieldedBalance.cjs"),W=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),K=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),y=require("../../types/external-action.types.cjs"),V=require("../../externalABIs/index.cjs"),D=require("ethers"),T=require("../../types/hinkal.types.cjs"),B=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),q=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),b=require("../../functions/pre-transaction/getFeeStructure.cjs"),z=require("../../functions/pre-transaction/merge-with-fee-structure.cjs"),f=require("../../types/ethereum-network.types.cjs"),G=require("../../constants/conversion.constants.cjs"),X=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),Z=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),$=require("../../functions/utils/time.utils.cjs"),j=async(t,o,u,n,h,P,l=!1)=>{const p=D.ethers.utils.getAddress(n),g=new D.ethers.Contract(o[0],V.ERC20ABI),E=t.userKeys.getInHinkalAddress(p),r=[t.getMyApprovalAmountForInteraction(n,o[0])-u],I=t.getContractWithFetcher(f.ContractType.HinkalContract),A=P??await b.getFeeStructure(t.getCurrentChainId(),h,o,y.ExternalActionId.Wallet,[0n,1n].map(e=>({to:g.address,from:I.address,value:0n,calldata:g.interface.encodeFunctionData("approve",[n,e])})));z.mergeWithFeeStructure(t.getCurrentChainId(),o,r,A);const a=[...await N.addPaddingToUtxos(t,o,r)],R=`swapperMHA${r.length.toString()}x${a[0].length}x1`,S=r.map(()=>!1),d=[],s={doPreTxApproval:!0,hinkalLogicAction:T.HinkalLogicAction.APPROVE,executeApprovalChanges:o.map(()=>0n),inHinkalAddress:E,useApprovalUtxoData:[]},{patchAccessTokenMerkleTree:U,kycRequired:w,hasAccessToken:F}=await X.shouldPatchAccessTokenMerkleTree(t,o,r),_=await Z.getSignatureDataForTransact(t.getCurrentChainId(),await t.getEthereumAddress(),t.userKeys,w,F),O=$.getCurrentTimeInSeconds().toString();for(let e=0;e<o.length;e+=1){if(e===0){const{useApprovalUtxoData:i,deltaAmountOverride:M}=q.outputApprovalDataProcessingForHinkalApprove(t,a[e],n,u,r[e]);r[e]=M,s.useApprovalUtxoData.push(i)}else{const{useApprovalUtxoData:i}=q.outputApprovalDataProcessing(t,a[e],r[e]);s.useApprovalUtxoData.push(i??T.defaultUseApprovalUTXOData(G.APPROVED_UTXO_CONVERSION_COUNT,0n))}const{outputUtxos:H}=B.outputUtxoProcessing(t.userKeys,a[e],r[e],O,void 0,!1);d.push(H)}const x=await t.getRandomRelay(!l);if(!x)throw Error(k.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const c={externalActionId:y.ExternalActionId.Wallet,externalAddress:p,externalActionMetadata:"0x"},{zkCallData:C,circomData:m,dimData:v}=await L.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,a,d,t.userKeys,R,c.externalActionId,c.externalAddress,c.externalActionMetadata,t.generateProofRemotely,x,t.getCurrentChainId(),S,void 0,void 0,U,s,void 0,A,t.getContractWithFetcher(f.ContractType.HinkalHelperContract),_);return l?await W.estimateGasRelayer(t,C,v,m):await K.transactCallRelayer(t.getCurrentChainId(),C,v,m)};exports.hinkalApprove=j;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const L=require("../../error-handling/error-codes.constants.cjs"),N=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),W=require("../../functions/web3/events/getShieldedBalance.cjs"),K=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),V=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),y=require("../../types/external-action.types.cjs"),B=require("../../externalABIs/index.cjs"),D=require("ethers"),T=require("../../types/hinkal.types.cjs"),b=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),h=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),z=require("../../functions/pre-transaction/getFeeStructure.cjs"),G=require("../../functions/pre-transaction/merge-with-fee-structure.cjs"),q=require("../../types/ethereum-network.types.cjs"),X=require("../../constants/conversion.constants.cjs"),Z=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),$=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),j=require("../../functions/utils/time.utils.cjs"),Y=async(t,a,u,n,f,E,l=!1)=>{const p=D.ethers.getAddress(n),A=new D.ethers.Contract(a[0],B.ERC20ABI),P=t.userKeys.getInHinkalAddress(p),r=[t.getMyApprovalAmountForInteraction(n,a[0])-u],R=await t.getContractWithFetcher(q.ContractType.HinkalContract).getAddress(),w=await A.getAddress(),g=E??await z.getFeeStructure(t.getCurrentChainId(),f,a,y.ExternalActionId.Wallet,[0n,1n].map(e=>({to:w,from:R,value:0n,calldata:A.interface.encodeFunctionData("approve",[n,e])})));G.mergeWithFeeStructure(t.getCurrentChainId(),a,r,g);const o=[...await W.addPaddingToUtxos(t,a,r)],I=`swapperMHA${r.length.toString()}x${o[0].length}x1`,S=r.map(()=>!1),d=[],s={doPreTxApproval:!0,hinkalLogicAction:T.HinkalLogicAction.APPROVE,executeApprovalChanges:a.map(()=>0n),inHinkalAddress:P,useApprovalUtxoData:[]},{patchAccessTokenMerkleTree:U,kycRequired:F,hasAccessToken:_}=await Z.shouldPatchAccessTokenMerkleTree(t,a,r),O=await $.getSignatureDataForTransact(t.getCurrentChainId(),await t.getEthereumAddress(),t.userKeys,F,_),k=j.getCurrentTimeInSeconds().toString();for(let e=0;e<a.length;e+=1){if(e===0){const{useApprovalUtxoData:i,deltaAmountOverride:M}=h.outputApprovalDataProcessingForHinkalApprove(t,o[e],n,u,r[e]);r[e]=M,s.useApprovalUtxoData.push(i)}else{const{useApprovalUtxoData:i}=h.outputApprovalDataProcessing(t,o[e],r[e]);s.useApprovalUtxoData.push(i??T.defaultUseApprovalUTXOData(X.APPROVED_UTXO_CONVERSION_COUNT,0n))}const{outputUtxos:H}=b.outputUtxoProcessing(t.userKeys,o[e],r[e],k,void 0,!1);d.push(H)}const C=await t.getRandomRelay(!l);if(!C)throw Error(L.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const c={externalActionId:y.ExternalActionId.Wallet,externalAddress:p,externalActionMetadata:"0x"},{zkCallData:x,circomData:m,dimData:v}=await N.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,o,d,t.userKeys,I,c.externalActionId,c.externalAddress,c.externalActionMetadata,t.generateProofRemotely,C,t.getCurrentChainId(),S,void 0,void 0,U,s,void 0,g,t.getContractWithFetcher(q.ContractType.HinkalHelperContract),O);return l?await K.estimateGasRelayer(t,x,v,m):await V.transactCallRelayer(t.getCurrentChainId(),x,v,m)};exports.hinkalApprove=Y;

package/data-structures/Hinkal/hinkalApprove.mjs

@@ -1,114 +1,114 @@
-import { transactionErrorCodes as M } from "../../error-handling/error-codes.constants.mjs";
-import { constructZkProof as N } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { addPaddingToUtxos as W } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { estimateGasRelayer as _ } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
-import { transactCallRelayer as K } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { transactionErrorCodes as N } from "../../error-handling/error-codes.constants.mjs";
+import { constructZkProof as W } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { addPaddingToUtxos as _ } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { estimateGasRelayer as K } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
+import { transactCallRelayer as V } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
 import { ExternalActionId as v } from "../../types/external-action.types.mjs";
-import { ERC20ABI as V } from "../../externalABIs/index.mjs";
+import { ERC20ABI as k } from "../../externalABIs/index.mjs";
 import { ethers as D } from "ethers";
 import { HinkalLogicAction as z, defaultUseApprovalUTXOData as B } from "../../types/hinkal.types.mjs";
 import { outputUtxoProcessing as X } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { outputApprovalDataProcessingForHinkalApprove as $, outputApprovalDataProcessing as k } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
-import { getFeeStructure as q } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { mergeWithFeeStructure as Y } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { outputApprovalDataProcessingForHinkalApprove as $, outputApprovalDataProcessing as q } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { getFeeStructure as Y } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { mergeWithFeeStructure as Z } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 import { ContractType as E } from "../../types/ethereum-network.types.mjs";
-import { APPROVED_UTXO_CONVERSION_COUNT as Z } from "../../constants/conversion.constants.mjs";
-import { shouldPatchAccessTokenMerkleTree as b } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
-import { getSignatureDataForTransact as j } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
-import { getCurrentTimeInSeconds as G } from "../../functions/utils/time.utils.mjs";
-const vt = async (t, r, p, n, T, y, m = !1) => {
-  const u = D.utils.getAddress(n), l = new D.Contract(r[0], V), I = t.userKeys.getInHinkalAddress(u), e = [t.getMyApprovalAmountForInteraction(n, r[0]) - p], U = t.getContractWithFetcher(E.HinkalContract), A = y ?? await q(
+import { APPROVED_UTXO_CONVERSION_COUNT as b } from "../../constants/conversion.constants.mjs";
+import { shouldPatchAccessTokenMerkleTree as j } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { getSignatureDataForTransact as G } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { getCurrentTimeInSeconds as J } from "../../functions/utils/time.utils.mjs";
+const Et = async (t, r, p, n, T, w, m = !1) => {
+  const u = D.getAddress(n), l = new D.Contract(r[0], k), y = t.userKeys.getInHinkalAddress(u), e = [t.getMyApprovalAmountForInteraction(n, r[0]) - p], I = await t.getContractWithFetcher(E.HinkalContract).getAddress(), R = await l.getAddress(), A = w ?? await Y(
     t.getCurrentChainId(),
     T,
     r,
     v.Wallet,
     // we don't need exact amounts, just need to result in the same amount of gas
     [0n, 1n].map((o) => ({
-      to: l.address,
-      from: U.address,
+      to: R,
+      from: I,
       value: 0n,
       calldata: l.interface.encodeFunctionData("approve", [n, o])
     }))
   );
-  Y(t.getCurrentChainId(), r, e, A);
-  const a = [...await W(t, r, e)], R = `swapperMHA${e.length.toString()}x${a[0].length}x1`, w = e.map(() => !1), g = [], s = {
+  Z(t.getCurrentChainId(), r, e, A);
+  const a = [...await _(t, r, e)], U = `swapperMHA${e.length.toString()}x${a[0].length}x1`, P = e.map(() => !1), g = [], s = {
     doPreTxApproval: !0,
     hinkalLogicAction: z.APPROVE,
     executeApprovalChanges: r.map(() => 0n),
     // this should not matter
-    inHinkalAddress: I,
+    inHinkalAddress: y,
     // as well
     useApprovalUtxoData: []
-  }, { patchAccessTokenMerkleTree: P, kycRequired: H, hasAccessToken: O } = await b(
+  }, { patchAccessTokenMerkleTree: h, kycRequired: H, hasAccessToken: O } = await j(
     t,
     r,
     e
-  ), S = await j(
+  ), S = await G(
     t.getCurrentChainId(),
     await t.getEthereumAddress(),
     t.userKeys,
     H,
     O
-  ), h = G().toString();
+  ), F = J().toString();
   for (let o = 0; o < r.length; o += 1) {
     if (o === 0) {
-      const { useApprovalUtxoData: c, deltaAmountOverride: L } = $(
+      const { useApprovalUtxoData: c, deltaAmountOverride: M } = $(
         t,
         a[o],
         n,
         p,
         e[o]
       );
-      e[o] = L, s.useApprovalUtxoData.push(c);
+      e[o] = M, s.useApprovalUtxoData.push(c);
     } else {
-      const { useApprovalUtxoData: c } = k(t, a[o], e[o]);
+      const { useApprovalUtxoData: c } = q(t, a[o], e[o]);
       s.useApprovalUtxoData.push(
-        c ?? B(Z, 0n)
+        c ?? B(b, 0n)
       );
     }
-    const { outputUtxos: F } = X(
+    const { outputUtxos: L } = X(
       t.userKeys,
       a[o],
       e[o],
-      h,
+      F,
       void 0,
       !1
     );
-    g.push(F);
+    g.push(L);
   }
-  const f = await t.getRandomRelay(!m);
-  if (!f)
-    throw Error(M.RELAYER_NOT_AVAILABLE);
+  const d = await t.getRandomRelay(!m);
+  if (!d)
+    throw Error(N.RELAYER_NOT_AVAILABLE);
   const i = {
     externalActionId: v.Wallet,
     externalAddress: u,
     externalActionMetadata: "0x"
-  }, { zkCallData: d, circomData: x, dimData: C } = await N(
+  }, { zkCallData: f, circomData: C, dimData: x } = await W(
     "v1x1",
     t.merkleTreeHinkal,
     t.merkleTreeAccessToken,
     a,
     g,
     t.userKeys,
-    R,
+    U,
     i.externalActionId,
     i.externalAddress,
     i.externalActionMetadata,
     t.generateProofRemotely,
-    f,
+    d,
     t.getCurrentChainId(),
-    w,
+    P,
     void 0,
     void 0,
-    P,
+    h,
     s,
     void 0,
     A,
     t.getContractWithFetcher(E.HinkalHelperContract),
     S
   );
-  return m ? await _(t, d, C, x) : await K(t.getCurrentChainId(), d, C, x);
+  return m ? await K(t, f, x, C) : await V(t.getCurrentChainId(), f, x, C);
 };
 export {
-  vt as hinkalApprove
+  Et as hinkalApprove
 };

package/data-structures/Hinkal/hinkalCheckTokenRegistry.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("ethers");require("idb-keyval");const u=require("../../constants/chains.constants.cjs"),q=require("../../functions/utils/create-provider.cjs");require("../../constants/token-data/index.cjs");require("../../error-handling/error-codes.constants.cjs");require("../../functions/utils/convertIntegrationProviderToExternalActionId.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");require("../crypto-keys/keys.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");require("../../API/getServerURL.cjs");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../functions/utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("@solana/spl-token");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.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/userAgent.cjs");require("multiformats");require("../../API/tenderly.api.cjs");const o=async(r,e,i)=>await r.checkTokenRegistry(e,i),a=r=>{const e=u.networkRegistry[r].contractData,{fetchRpcUrl:i}=u.networkRegistry[r];if(!i)throw new Error("RPC URL not found for the specified chain ID");const t=q.createCustomRpcProvider(i);if(!e.hinkalHelperAddress||!e.hinkalHelperABI)throw Error("hinkal helpercontract data not found");return new n.ethers.Contract(e.hinkalHelperAddress,e.hinkalHelperABI,t)};exports.createHinkalHelperFromData=a;exports.hinkalCheckTokenRegistry=o;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("idb-keyval");const u=require("../../constants/chains.constants.cjs"),n=require("../../functions/utils/create-provider.cjs"),o=require("ethers");require("../../constants/token-data/index.cjs");require("../../error-handling/error-codes.constants.cjs");require("../../functions/utils/convertIntegrationProviderToExternalActionId.cjs");require("../../types/circom-data.types.cjs");require("../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");require("../crypto-keys/keys.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");require("../../API/getServerURL.cjs");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../functions/utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("@solana/spl-token");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.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/userAgent.cjs");require("multiformats");require("../../API/tenderly.api.cjs");const q=async(r,e,i)=>await r.checkTokenRegistry(e,i),a=r=>{const e=u.networkRegistry[r].contractData,{fetchRpcUrl:i}=u.networkRegistry[r];if(!i)throw new Error("RPC URL not found for the specified chain ID");const t=n.createCustomRpcProvider(i);if(!e.hinkalHelperAddress||!e.hinkalHelperABI)throw Error("hinkal helpercontract data not found");return new o.ethers.Contract(e.hinkalHelperAddress,e.hinkalHelperABI,t)};exports.createHinkalHelperFromData=a;exports.hinkalCheckTokenRegistry=q;

package/data-structures/Hinkal/hinkalCheckTokenRegistry.mjs

@@ -1,12 +1,11 @@
-import { ethers as m } from "ethers";
 import "idb-keyval";
 import { networkRegistry as p } from "../../constants/chains.constants.mjs";
-import { createCustomRpcProvider as e } from "../../functions/utils/create-provider.mjs";
+import { createCustomRpcProvider as m } from "../../functions/utils/create-provider.mjs";
+import { ethers as e } from "ethers";
 import "../../constants/token-data/index.mjs";
 import "../../error-handling/error-codes.constants.mjs";
 import "../../functions/utils/convertIntegrationProviderToExternalActionId.mjs";
 import "../../types/circom-data.types.mjs";
-import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
 import "circomlibjs-hinkal-fork";
 import "../crypto-keys/keys.mjs";
@@ -36,16 +35,16 @@ import "../../constants/events.constants.mjs";
 import "../../functions/utils/userAgent.mjs";
 import "multiformats";
 import "../../API/tenderly.api.mjs";
-const Q = async (t, r, o) => await t.checkTokenRegistry(r, o), S = (t) => {
+const O = async (t, r, o) => await t.checkTokenRegistry(r, o), Q = (t) => {
   const r = p[t].contractData, { fetchRpcUrl: o } = p[t];
   if (!o)
     throw new Error("RPC URL not found for the specified chain ID");
-  const i = e(o);
+  const i = m(o);
   if (!r.hinkalHelperAddress || !r.hinkalHelperABI)
     throw Error("hinkal helpercontract data not found");
-  return new m.Contract(r.hinkalHelperAddress, r.hinkalHelperABI, i);
+  return new e.Contract(r.hinkalHelperAddress, r.hinkalHelperABI, i);
 };
 export {
-  S as createHinkalHelperFromData,
-  Q as hinkalCheckTokenRegistry
+  Q as createHinkalHelperFromData,
+  O as hinkalCheckTokenRegistry
 };

package/data-structures/Hinkal/hinkalDeposit.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const P=require("../../constants/protocol.constants.cjs"),f=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),w=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),h=require("../../functions/web3/events/getShieldedBalance.cjs"),q=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),C=require("../utxo/Utxo.cjs"),F=require("../../error-handling/error-codes.constants.cjs");require("../../types/circom-data.types.cjs");const I=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");const M=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const R=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),_=require("../../functions/utils/addresses.cjs"),z=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),H=require("../../functions/utils/time.utils.cjs"),S=require("../../API/admin-calls.cjs"),U=require("../../functions/pre-transaction/constructAdminData.cjs"),K=async(t,s,e)=>{const{patchAccessTokenMerkleTree:o,kycRequired:r,hasAccessToken:A}=await z.shouldPatchAccessTokenMerkleTree(t,s,e),c=void 0,l=await t.getEthereumAddress(),i=await R.getSignatureDataForTransact(t.getCurrentChainId(),l,t.userKeys,r,A),n={externalActionId:0n,externalAddress:await t.getEthereumAddress(),externalActionMetadata:"0x00"};return{signatureData:i,externalActionData:n,contractTransaction:c,contractToApprove:c,patchAccessTokenMerkleTree:o}},O=async(t,s,e)=>{const o=s.map(a=>a.erc20TokenAddress),{externalActionData:r,contractTransaction:A,contractToApprove:c,patchAccessTokenMerkleTree:l,signatureData:i}=await K(t,o,e),n=[...await h.addPaddingToUtxos(t,o,e)],p=`swapperM${e.length.toString()}x${n[0].length}x1`,d=[],T=H.getCurrentTimeInSeconds().toString();for(let a=0;a<o.length;a+=1){const{outputUtxos:v}=f.outputUtxoProcessing(t.userKeys,n[a],e[a],T);d.push(v)}const{zkCallData:m,circomData:x,dimData:g}=await w.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,n,d,t.userKeys,p,r.externalActionId,r.externalAddress,r.externalActionMetadata,t.generateProofRemotely,P.zeroAddress,t.getCurrentChainId(),void 0,void 0,void 0,l,void 0,void 0,void 0,t.getContractWithFetcher(I.ContractType.HinkalHelperContract),i),y=await q.transactCallDirect(t,e,s,m,x,g,c,A),D=U.constructAdminData(M.AdminTransactionType.Onboarding,t.getCurrentChainId(),o,e,await t.getEthereumAddress());return S.emitTxPublicData(t.getCurrentChainId(),D),y},b=async(t,s,e,o)=>{const r=s.map(u=>u.erc20TokenAddress),[A,c,l]=o.split(",");if(!_.isValidPrivateAddress(o))throw Error(F.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const i=r.map(u=>[new C.Utxo({amount:0n,erc20TokenAddress:u,shieldedPrivateKey:t.userKeys.getShieldedPrivateKey()}),new C.Utxo({amount:0n,erc20TokenAddress:u,shieldedPrivateKey:t.userKeys.getShieldedPrivateKey()})]),n=`swapperM${e.length.toString()}x${i[0].length}x1`,p=r.map((u,E)=>[new C.Utxo({amount:e[E],erc20TokenAddress:u,randomization:BigInt(A),stealthAddress:c,encryptionKey:l})]),{externalActionData:d,contractTransaction:T,contractToApprove:m,patchAccessTokenMerkleTree:x}=await K(t,r,e),{zkCallData:g,circomData:y,dimData:D}=await w.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,i,p,t.userKeys,n,d.externalActionId,d.externalAddress,d.externalActionMetadata,t.generateProofRemotely,P.zeroAddress,t.getCurrentChainId(),void 0,void 0,void 0,x,void 0,void 0,void 0,t.getContractWithFetcher(I.ContractType.HinkalHelperContract)),a=await q.transactCallDirect(t,e,s,g,y,D,m,T),v=U.constructAdminData(M.AdminTransactionType.PaymentLink,t.getCurrentChainId(),r,e,await t.getEthereumAddress());return S.emitTxPublicData(t.getCurrentChainId(),v),a};exports.hinkalDeposit=O;exports.hinkalDepositForOther=b;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const P=require("../../constants/protocol.constants.cjs"),f=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),w=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),h=require("../../functions/web3/events/getShieldedBalance.cjs"),q=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),C=require("../utxo/Utxo.cjs"),F=require("../../error-handling/error-codes.constants.cjs");require("../../types/circom-data.types.cjs");const I=require("../../types/ethereum-network.types.cjs"),M=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const R=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),_=require("../../functions/utils/addresses.cjs"),z=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),H=require("../../functions/utils/time.utils.cjs"),S=require("../../API/admin-calls.cjs"),U=require("../../functions/pre-transaction/constructAdminData.cjs"),K=async(t,s,e)=>{const{patchAccessTokenMerkleTree:o,kycRequired:r,hasAccessToken:A}=await z.shouldPatchAccessTokenMerkleTree(t,s,e),c=void 0,l=await t.getEthereumAddress(),i=await R.getSignatureDataForTransact(t.getCurrentChainId(),l,t.userKeys,r,A),n={externalActionId:0n,externalAddress:await t.getEthereumAddress(),externalActionMetadata:"0x00"};return{signatureData:i,externalActionData:n,contractTransaction:c,contractToApprove:c,patchAccessTokenMerkleTree:o}},O=async(t,s,e)=>{const o=s.map(a=>a.erc20TokenAddress),{externalActionData:r,contractTransaction:A,contractToApprove:c,patchAccessTokenMerkleTree:l,signatureData:i}=await K(t,o,e),n=[...await h.addPaddingToUtxos(t,o,e)],p=`swapperM${e.length.toString()}x${n[0].length}x1`,d=[],T=H.getCurrentTimeInSeconds().toString();for(let a=0;a<o.length;a+=1){const{outputUtxos:v}=f.outputUtxoProcessing(t.userKeys,n[a],e[a],T);d.push(v)}const{zkCallData:m,circomData:x,dimData:g}=await w.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,n,d,t.userKeys,p,r.externalActionId,r.externalAddress,r.externalActionMetadata,t.generateProofRemotely,P.zeroAddress,t.getCurrentChainId(),void 0,void 0,void 0,l,void 0,void 0,void 0,t.getContractWithFetcher(I.ContractType.HinkalHelperContract),i),y=await q.transactCallDirect(t,e,s,m,x,g,c,A),D=U.constructAdminData(M.AdminTransactionType.Onboarding,t.getCurrentChainId(),o,e,await t.getEthereumAddress());return S.emitTxPublicData(t.getCurrentChainId(),D),y},b=async(t,s,e,o)=>{const r=s.map(u=>u.erc20TokenAddress),[A,c,l]=o.split(",");if(!_.isValidPrivateAddress(o))throw Error(F.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const i=r.map(u=>[new C.Utxo({amount:0n,erc20TokenAddress:u,shieldedPrivateKey:t.userKeys.getShieldedPrivateKey()}),new C.Utxo({amount:0n,erc20TokenAddress:u,shieldedPrivateKey:t.userKeys.getShieldedPrivateKey()})]),n=`swapperM${e.length.toString()}x${i[0].length}x1`,p=r.map((u,E)=>[new C.Utxo({amount:e[E],erc20TokenAddress:u,randomization:BigInt(A),stealthAddress:c,encryptionKey:l})]),{externalActionData:d,contractTransaction:T,contractToApprove:m,patchAccessTokenMerkleTree:x}=await K(t,r,e),{zkCallData:g,circomData:y,dimData:D}=await w.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,i,p,t.userKeys,n,d.externalActionId,d.externalAddress,d.externalActionMetadata,t.generateProofRemotely,P.zeroAddress,t.getCurrentChainId(),void 0,void 0,void 0,x,void 0,void 0,void 0,t.getContractWithFetcher(I.ContractType.HinkalHelperContract)),a=await q.transactCallDirect(t,e,s,g,y,D,m,T),v=U.constructAdminData(M.AdminTransactionType.PaymentLink,t.getCurrentChainId(),r,e,await t.getEthereumAddress());return S.emitTxPublicData(t.getCurrentChainId(),v),a};exports.hinkalDeposit=O;exports.hinkalDepositForOther=b;

package/data-structures/Hinkal/hinkalDeposit.mjs

@@ -7,7 +7,6 @@ import { Utxo as w } from "../utxo/Utxo.mjs";
 import { transactionErrorCodes as z } from "../../error-handling/error-codes.constants.mjs";
 import "../../types/circom-data.types.mjs";
 import { ContractType as I } from "../../types/ethereum-network.types.mjs";
-import "../../types/transactions.types.mjs";
 import { AdminTransactionType as K } from "../../types/admin.types.mjs";
 import "../../types/activities.types.mjs";
 import { getSignatureDataForTransact as F } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
@@ -39,7 +38,7 @@ const S = async (t, s, e) => {
     contractToApprove: c,
     patchAccessTokenMerkleTree: o
   };
-}, rt = async (t, s, e) => {
+}, et = async (t, s, e) => {
   const o = s.map((a) => a.erc20TokenAddress), { externalActionData: r, contractTransaction: p, contractToApprove: c, patchAccessTokenMerkleTree: A, signatureData: i } = await S(t, o, e), n = [...await H(t, o, e)], u = `swapperM${e.length.toString()}x${n[0].length}x1`, d = [], x = $().toString();
   for (let a = 0; a < o.length; a += 1) {
     const { outputUtxos: f } = R(t.userKeys, n[a], e[a], x);
@@ -86,7 +85,7 @@ const S = async (t, s, e) => {
     await t.getEthereumAddress()
   );
   return M(t.getCurrentChainId(), v), l;
-}, ot = async (t, s, e, o) => {
+}, rt = async (t, s, e, o) => {
   const r = s.map((m) => m.erc20TokenAddress), [p, c, A] = o.split(",");
   if (!N(o))
     throw Error(z.RECIPIENT_FORMAT_INCORRECT);
@@ -142,6 +141,6 @@ const S = async (t, s, e) => {
   return M(t.getCurrentChainId(), f), a;
 };
 export {
-  rt as hinkalDeposit,
-  ot as hinkalDepositForOther
+  et as hinkalDeposit,
+  rt as hinkalDepositForOther
 };

package/data-structures/Hinkal/hinkalDepositAndWithdraw.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const b=require("../../constants/protocol.constants.cjs"),F=require("../../error-handling/error-codes.constants.cjs"),O=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),K=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),L=require("../../types/external-action.types.cjs"),z=require("../utxo/Utxo.cjs");require("../../types/circom-data.types.cjs");const B=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");const N=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const q=require("../../types/scheduled-transactions.types.cjs"),Z=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),j=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),G=require("../../functions/utils/time.utils.cjs"),V=require("../../functions/pre-transaction/getFeeStructure.cjs"),Y=require("../../functions/utils/addresses.cjs"),$=require("./hinkalDepositOnChainUtxos.cjs"),J=require("../../functions/pre-transaction/constructAdminData.cjs"),D=require("../../API/deposit-and-withdraw-status-calls.cjs"),Q=async(e,t,r,h,s,c,A,i)=>{if(r.length===0)throw new Error("userDepositedUtxos must not be empty");const a=t.erc20TokenAddress,n=await e.getRandomRelay();if(!n)throw Error(F.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const o=await e.getEthereumAddress(),w=G.getCurrentTimeInSeconds().toString(),d=e.generateProofRemotely?5:1,p=[];for(let u=0;u<r.length;u+=d){const x=r.slice(u,u+d),S=await Promise.all(x.map(async({recipientAddress:I,utxo:l})=>{const E=[-l.amount],y=new z.Utxo({amount:0n,erc20TokenAddress:a,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:w,tokenId:0}),T=[[l,y]],R=[[y]],P=`swapperM1x${T[0].length}x1`,m={externalActionId:0n,externalAddress:I,externalActionMetadata:"0x00"},{patchAccessTokenMerkleTree:_,kycRequired:f,hasAccessToken:U}=await j.shouldPatchAccessTokenMerkleTree(e,[a],E),W=await Z.getSignatureDataForTransact(e.getCurrentChainId(),o,e.userKeys,f,U),k=J.constructAdminData(N.AdminTransactionType.WithdrawOnChainUtxos,e.getCurrentChainId(),[a],[-l.amount],o),{zkCallData:v,circomData:H,dimData:M}=await O.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,T,R,e.userKeys,P,m.externalActionId,m.externalAddress,m.externalActionMetadata,e.generateProofRemotely,n??b.zeroAddress,e.getCurrentChainId(),void 0,void 0,void 0,_,void 0,void 0,h,e.getContractWithFetcher(B.ContractType.HinkalHelperContract),W,void 0,!1);return{zkCallData:v,dimData:M,circomData:H,adminData:k}}));p.push(...S)}const C=e.getCurrentChainId();await D.safeUpdateDepositAndWithdrawStatus(C,{id:c,hashedEthereumAddress:s,phase:q.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});const g=await K.transactCallRelayerBatch(e.getCurrentChainId(),p,s,A,i);return await D.safeUpdateDepositAndWithdrawStatus(C,{id:c,hashedEthereumAddress:s,phase:q.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:g}),g},X=async(e,t,r,h,s,c,A)=>{const i=t.erc20TokenAddress,a=e.getCurrentChainId(),n=Y.hashEthereumAddress(await e.getEthereumAddress()),o=c??await V.getFeeStructure(a,i,[i],L.ExternalActionId.Transact),{userDepositedUtxos:w,statusId:d}=await $.hinkalDepositOnChainUtxos(e,t,r,h,o,n);return Q(e,t,w,o,n,d,s,A)};exports.hinkalDepositAndWithdraw=X;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const b=require("../../constants/protocol.constants.cjs"),F=require("../../error-handling/error-codes.constants.cjs"),O=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),K=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),L=require("../../types/external-action.types.cjs"),z=require("../utxo/Utxo.cjs");require("../../types/circom-data.types.cjs");const B=require("../../types/ethereum-network.types.cjs"),N=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const D=require("../../types/scheduled-transactions.types.cjs"),Z=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),j=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),G=require("../../functions/utils/time.utils.cjs"),V=require("../../functions/pre-transaction/getFeeStructure.cjs"),Y=require("../../functions/utils/addresses.cjs"),$=require("./hinkalDepositOnChainUtxos.cjs"),J=require("../../functions/pre-transaction/constructAdminData.cjs"),q=require("../../API/deposit-and-withdraw-status-calls.cjs"),Q=async(e,t,r,h,s,c,A,i)=>{if(r.length===0)throw new Error("userDepositedUtxos must not be empty");const a=t.erc20TokenAddress,n=await e.getRandomRelay();if(!n)throw Error(F.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const o=await e.getEthereumAddress(),w=G.getCurrentTimeInSeconds().toString(),d=e.generateProofRemotely?5:1,p=[];for(let u=0;u<r.length;u+=d){const x=r.slice(u,u+d),S=await Promise.all(x.map(async({recipientAddress:I,utxo:l})=>{const E=[-l.amount],y=new z.Utxo({amount:0n,erc20TokenAddress:a,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:w,tokenId:0}),T=[[l,y]],R=[[y]],P=`swapperM1x${T[0].length}x1`,m={externalActionId:0n,externalAddress:I,externalActionMetadata:"0x00"},{patchAccessTokenMerkleTree:_,kycRequired:f,hasAccessToken:U}=await j.shouldPatchAccessTokenMerkleTree(e,[a],E),W=await Z.getSignatureDataForTransact(e.getCurrentChainId(),o,e.userKeys,f,U),k=J.constructAdminData(N.AdminTransactionType.WithdrawOnChainUtxos,e.getCurrentChainId(),[a],[-l.amount],o),{zkCallData:v,circomData:H,dimData:M}=await O.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,T,R,e.userKeys,P,m.externalActionId,m.externalAddress,m.externalActionMetadata,e.generateProofRemotely,n??b.zeroAddress,e.getCurrentChainId(),void 0,void 0,void 0,_,void 0,void 0,h,e.getContractWithFetcher(B.ContractType.HinkalHelperContract),W,void 0,!1);return{zkCallData:v,dimData:M,circomData:H,adminData:k}}));p.push(...S)}const C=e.getCurrentChainId();await q.safeUpdateDepositAndWithdrawStatus(C,{id:c,hashedEthereumAddress:s,phase:D.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});const g=await K.transactCallRelayerBatch(e.getCurrentChainId(),p,s,A,i);return await q.safeUpdateDepositAndWithdrawStatus(C,{id:c,hashedEthereumAddress:s,phase:D.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:g}),g},X=async(e,t,r,h,s,c,A)=>{const i=t.erc20TokenAddress,a=e.getCurrentChainId(),n=Y.hashEthereumAddress(await e.getEthereumAddress()),o=c??await V.getFeeStructure(a,i,[i],L.ExternalActionId.Transact),{userDepositedUtxos:w,statusId:d}=await $.hinkalDepositOnChainUtxos(e,t,r,h,o,n);return Q(e,t,w,o,n,d,s,A)};exports.hinkalDepositAndWithdraw=X;

package/data-structures/Hinkal/hinkalDepositAndWithdraw.mjs

@@ -6,7 +6,6 @@ import { ExternalActionId as z } from "../../types/external-action.types.mjs";
 import { Utxo as B } from "../utxo/Utxo.mjs";
 import "../../types/circom-data.types.mjs";
 import { ContractType as q } from "../../types/ethereum-network.types.mjs";
-import "../../types/transactions.types.mjs";
 import { AdminTransactionType as N } from "../../types/admin.types.mjs";
 import "../../types/activities.types.mjs";
 import { DepositAndWithdrawPhase as y } from "../../types/scheduled-transactions.types.mjs";
@@ -109,7 +108,7 @@ const Q = async (t, e, r, p, o, i, u, c) => {
     phase: y.AFTER_SCHEDULE_WITHDRAW,
     scheduleId: g
   }), g;
-}, lt = async (t, e, r, p, o, i, u) => {
+}, gt = async (t, e, r, p, o, i, u) => {
   const c = e.erc20TokenAddress, a = t.getCurrentChainId(), s = j(await t.getEthereumAddress()), n = i ?? await $(a, c, [c], z.Transact), { userDepositedUtxos: w, statusId: d } = await G(
     t,
     e,
@@ -130,5 +129,5 @@ const Q = async (t, e, r, p, o, i, u, c) => {
   );
 };
 export {
-  lt as hinkalDepositAndWithdraw
+  gt as hinkalDepositAndWithdraw
 };

package/data-structures/Hinkal/hinkalDepositOnChainUtxos.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const z=require("ethers"),B=require("../../constants/protocol.constants.cjs"),j=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),G=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),N=require("../../functions/web3/events/getShieldedBalance.cjs"),X=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),J=require("../../types/external-action.types.cjs");require("../../types/circom-data.types.cjs");const u=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");const L=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const U=require("../../types/scheduled-transactions.types.cjs"),Q=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),V=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),Y=require("../../functions/utils/getUtxosFromReceipt.utils.cjs"),tt=require("../../functions/utils/fees.utils.cjs"),et=require("../../functions/pre-transaction/constructAdminData.cjs"),st=require("../../API/admin-calls.cjs"),y=require("../../API/deposit-and-withdraw-status-calls.cjs"),ot=async(t,p,f,P,O,l)=>{const h=p.erc20TokenAddress,x=await t.getEthereumAddress(),n=f.map(e=>e+tt.calculateTotalFee(e,O)),a=[h],i=[0n],S=[!0],{patchAccessTokenMerkleTree:W,kycRequired:v,hasAccessToken:E}=await V.shouldPatchAccessTokenMerkleTree(t,a,i),_=await Q.getSignatureDataForTransact(t.getCurrentChainId(),x,t.userKeys,v,E),o=[...await N.addPaddingToUtxos(t,a,i)],C=[];for(let e=0;e<o.length;e+=1){const{outputUtxos:s}=j.outputUtxoProcessing(t.userKeys,o[e],i[e]);C.push(s)}const D=n.reduce((e,s)=>e+s,0n),F=z.ethers.utils.defaultAbiCoder.encode(["uint256[]"],[n]),T=t.getContractWithSigner(u.ContractType.HinkalWrapper),A=t.getContractWithSigner(u.ContractType.DepositOnChainUtxos),{zkCallData:I,circomData:k,dimData:R}=await G.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,o,C,t.userKeys,`swapperM1x${o[0].length}x1`,J.ExternalActionId.DepositOnChainUtxos,A.address,F,t.generateProofRemotely,B.zeroAddress,t.getCurrentChainId(),S,void 0,void 0,W,void 0,void 0,void 0,t.getContractWithFetcher(u.ContractType.HinkalHelperContract),_,T.address,!1),r=t.getCurrentChainId(),g=(await y.updateDepositAndWithdrawStatus(r,{hashedEthereumAddress:l,phase:U.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,m=await X.transactCallDirect(t,D,p,I,k,R,A,T),b=await m.wait(),H=m.hash;await y.safeUpdateDepositAndWithdrawStatus(r,{id:g,hashedEthereumAddress:l,phase:U.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:H});const M=Y.getUtxosFromReceipt(b,t,h),q=[],c=[...M];P.forEach((e,s)=>{const w=n[s],d=c.find($=>$.amount===w);if(!d)throw new Error(`Could not find newly created UTXO with amount ${w} for recipient ${e}.`);q.push({recipientAddress:e,utxo:d});const Z=c.indexOf(d);c.splice(Z,1)});const K=et.constructAdminData(L.AdminTransactionType.DepositOnChainUtxos,r,a,[D],x);return st.emitTxPublicData(r,K),{userDepositedUtxos:q,statusId:g}};exports.hinkalDepositOnChainUtxos=ot;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const z=require("ethers"),B=require("../../constants/protocol.constants.cjs"),j=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),G=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),N=require("../../functions/web3/events/getShieldedBalance.cjs"),X=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),J=require("../../types/external-action.types.cjs");require("../../types/circom-data.types.cjs");const u=require("../../types/ethereum-network.types.cjs"),L=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const U=require("../../types/scheduled-transactions.types.cjs"),Q=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),V=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),Y=require("../../functions/utils/getUtxosFromReceipt.utils.cjs"),tt=require("../../functions/utils/fees.utils.cjs"),et=require("../../functions/pre-transaction/constructAdminData.cjs"),st=require("../../API/admin-calls.cjs"),y=require("../../API/deposit-and-withdraw-status-calls.cjs"),ot=async(t,p,f,P,O,l)=>{const h=p.erc20TokenAddress,x=await t.getEthereumAddress(),a=f.map(e=>e+tt.calculateTotalFee(e,O)),n=[h],i=[0n],S=[!0],{patchAccessTokenMerkleTree:W,kycRequired:v,hasAccessToken:E}=await V.shouldPatchAccessTokenMerkleTree(t,n,i),_=await Q.getSignatureDataForTransact(t.getCurrentChainId(),x,t.userKeys,v,E),o=[...await N.addPaddingToUtxos(t,n,i)],C=[];for(let e=0;e<o.length;e+=1){const{outputUtxos:s}=j.outputUtxoProcessing(t.userKeys,o[e],i[e]);C.push(s)}const A=a.reduce((e,s)=>e+s,0n),F=z.ethers.AbiCoder.defaultAbiCoder().encode(["uint256[]"],[a]),g=t.getContractWithSigner(u.ContractType.HinkalWrapper),D=t.getContractWithSigner(u.ContractType.DepositOnChainUtxos),{zkCallData:I,circomData:k,dimData:b}=await G.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,o,C,t.userKeys,`swapperM1x${o[0].length}x1`,J.ExternalActionId.DepositOnChainUtxos,await D.getAddress(),F,t.generateProofRemotely,B.zeroAddress,t.getCurrentChainId(),S,void 0,void 0,W,void 0,void 0,void 0,t.getContractWithFetcher(u.ContractType.HinkalHelperContract),_,await g.getAddress(),!1),r=t.getCurrentChainId(),T=(await y.updateDepositAndWithdrawStatus(r,{hashedEthereumAddress:l,phase:U.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,m=await X.transactCallDirect(t,A,p,I,k,b,D,g),R=await m.wait(),H=m.hash;await y.safeUpdateDepositAndWithdrawStatus(r,{id:T,hashedEthereumAddress:l,phase:U.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:H});const M=await Y.getUtxosFromReceipt(R,t,h),w=[],c=[...M];P.forEach((e,s)=>{const q=a[s],d=c.find($=>$.amount===q);if(!d)throw new Error(`Could not find newly created UTXO with amount ${q} for recipient ${e}.`);w.push({recipientAddress:e,utxo:d});const Z=c.indexOf(d);c.splice(Z,1)});const K=et.constructAdminData(L.AdminTransactionType.DepositOnChainUtxos,r,n,[A],x);return st.emitTxPublicData(r,K),{userDepositedUtxos:w,statusId:T}};exports.hinkalDepositOnChainUtxos=ot;

package/data-structures/Hinkal/hinkalDepositOnChainUtxos.mjs

@@ -7,7 +7,6 @@ import { transactCallDirect as G } from "../../functions/web3/functionCalls/tran
 import { ExternalActionId as J } from "../../types/external-action.types.mjs";
 import "../../types/circom-data.types.mjs";
 import { ContractType as p } from "../../types/ethereum-network.types.mjs";
-import "../../types/transactions.types.mjs";
 import { AdminTransactionType as L } from "../../types/admin.types.mjs";
 import "../../types/activities.types.mjs";
 import { DepositAndWithdrawPhase as U } from "../../types/scheduled-transactions.types.mjs";
@@ -18,7 +17,7 @@ import { calculateTotalFee as Y } from "../../functions/utils/fees.utils.mjs";
 import { constructAdminData as tt } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { emitTxPublicData as ot } from "../../API/admin-calls.mjs";
 import { updateDepositAndWithdrawStatus as et, safeUpdateDepositAndWithdrawStatus as rt } from "../../API/deposit-and-withdraw-status-calls.mjs";
-const Ot = async (t, m, y, O, E, u) => {
+const yt = async (t, m, y, O, E, u) => {
   const f = m.erc20TokenAddress, x = await t.getEthereumAddress(), a = y.map((o) => o + Y(o, E)), i = [f], n = [0n], P = [!0], { patchAccessTokenMerkleTree: v, kycRequired: I, hasAccessToken: W } = await Q(
     t,
     i,
@@ -34,7 +33,7 @@ const Ot = async (t, m, y, O, E, u) => {
     const { outputUtxos: e } = B(t.userKeys, r[o], n[o]);
     C.push(e);
   }
-  const D = a.reduce((o, e) => o + e, 0n), F = _.utils.defaultAbiCoder.encode(["uint256[]"], [a]), A = t.getContractWithSigner(p.HinkalWrapper), h = t.getContractWithSigner(p.DepositOnChainUtxos), {
+  const A = a.reduce((o, e) => o + e, 0n), F = _.AbiCoder.defaultAbiCoder().encode(["uint256[]"], [a]), D = t.getContractWithSigner(p.HinkalWrapper), g = t.getContractWithSigner(p.DepositOnChainUtxos), {
     zkCallData: H,
     circomData: R,
     dimData: b
@@ -47,7 +46,7 @@ const Ot = async (t, m, y, O, E, u) => {
     t.userKeys,
     `swapperM1x${r[0].length}x1`,
     J.DepositOnChainUtxos,
-    h.address,
+    await g.getAddress(),
     F,
     t.generateProofRemotely,
     q,
@@ -61,33 +60,33 @@ const Ot = async (t, m, y, O, E, u) => {
     void 0,
     t.getContractWithFetcher(p.HinkalHelperContract),
     S,
-    A.address,
+    await D.getAddress(),
     !1
-  ), s = t.getCurrentChainId(), T = (await et(s, {
+  ), s = t.getCurrentChainId(), h = (await et(s, {
     hashedEthereumAddress: u,
     phase: U.BEFORE_DEPOSIT
-  })).id ?? void 0, l = await G(
+  })).id ?? void 0, w = await G(
     t,
-    D,
+    A,
     m,
     H,
     R,
     b,
-    h,
-    A
-  ), K = await l.wait(), M = l.hash;
+    g,
+    D
+  ), K = await w.wait(), M = w.hash;
   await rt(s, {
-    id: T,
+    id: h,
     hashedEthereumAddress: u,
     phase: U.AFTER_DEPOSIT,
     depositTxHash: M
   });
-  const $ = V(K, t, f), g = [], c = [...$];
+  const $ = await V(K, t, f), T = [], c = [...$];
   O.forEach((o, e) => {
-    const w = a[e], d = c.find((Z) => Z.amount === w);
+    const l = a[e], d = c.find((Z) => Z.amount === l);
     if (!d)
-      throw new Error(`Could not find newly created UTXO with amount ${w} for recipient ${o}.`);
-    g.push({
+      throw new Error(`Could not find newly created UTXO with amount ${l} for recipient ${o}.`);
+    T.push({
       recipientAddress: o,
       utxo: d
     });
@@ -98,11 +97,11 @@ const Ot = async (t, m, y, O, E, u) => {
     L.DepositOnChainUtxos,
     s,
     i,
-    [D],
+    [A],
     x
   );
-  return ot(s, k), { userDepositedUtxos: g, statusId: T };
+  return ot(s, k), { userDepositedUtxos: T, statusId: h };
 };
 export {
-  Ot as hinkalDepositOnChainUtxos
+  yt as hinkalDepositOnChainUtxos
 };