@hinkal/common 0.3.5 → 0.3.7

package/common/src/data-structures/Hinkal/hinkalWithdrawStuckUtxos.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../functions/utils/amounts.utils.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/utils/encodeTokenWithId.cjs`),i=require(`../../functions/utils/addresses.cjs`),a=require(`../../functions/utils/tron.utils.cjs`),o=require(`../../functions/web3/events/getInputUtxoAndBalance.cjs`),s=require(`../../types/external-action.types.cjs`),c=require(`../../types/transact.types.cjs`),l=require(`../../types/solana-transact.types.cjs`),u=require(`../../error-handling/logger.cjs`),d=require(`../../functions/utils/token-check.utils.cjs`),f=require(`../../functions/snarkjs/constructTxEnclave.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`),m=require(`./hinkalTransact.cjs`),h=require(`../../functions/auto-deposit-back-helpers/update-hinkal.cjs`),g=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`),_=require(`./hinkalSolanaTransact.cjs`);var v=6,y=async(e,t,r,o)=>{let c=r.erc20TokenAddress,l=await e.getEthereumAddressByChain(t),[d,m]=await Promise.all([p.getFeeStructure(t,c,[c],s.ExternalActionId.Transact),e.getRandomRelay(t,!0)]);if(!m)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let h=await f.prepareStuckWithdrawEnclaveCall(e,{chainId:t,erc20Address:c,externalAddress:a.addressToHexFormat(o),relay:m,feeStructure:d,hashedEthereumAddress:i.hashEthereumAddress(l)}),g=[];for(let n=0;n<h.length;n+=1)try{let{jobId:r,signedMessageHash:i}=h[n],{R8:a,S:o}=e.userKeys.signEddsa(BigInt(i));g.push(await f.finalizeTxEnclaveCallRelay(r,{R8:a,S:o},t))}catch(e){if(!g.length)throw e;return u.Logger.error(`Stuck withdrawal partially submitted (${g.length}/${h.length})`,e),g}return g},b=async(e,t,n)=>{let r=await Promise.all(Array.from({length:v},async(r,i)=>{let a=i+1,o=await p.getFeeStructure(e,t,[t],s.ExternalActionId.Transact,void 0,void 0,{mintTo:t,recipient:n,nullifierCount:a});return[String(a),o]}));return Object.fromEntries(r)},x=async(e,t,r,a)=>{let o=r.erc20TokenAddress,[s,c,l]=await Promise.all([e.getEthereumAddressByChain(t),e.getRandomRelay(t,!0),b(t,o,a)]);if(!c)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let u=await f.prepareSolanaStuckWithdrawEnclaveCall(e,{chainId:t,mintAddress:o,recipient:a,relayAddress:c,accounts:{recipient:a,mint:o===`11111111111111111111111111111111`?void 0:o},feeStructures:l,hashedEthereumAddress:i.hashEthereumAddress(s)}),d=[];for(let n=0;n<u.length;n+=1){let{jobId:r,signedMessageHash:i}=u[n],{R8:a,S:o}=e.userKeys.signEddsa(BigInt(i));d.push(await f.finalizeSolanaTxEnclaveCallRelay(r,{R8:a,S:o},t))}return d},S=async(e,t,r,i,o)=>{let l=[r.erc20TokenAddress],u=r.erc20TokenAddress,[d,f]=await Promise.all([p.getFeeStructure(t,u,l,s.ExternalActionId.Transact),e.getRandomRelay(t,!0)]);if(!f)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let _=a.addressToHexFormat(o),v=i-d.flatFee;if(v<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${i}, Fee: ${d.flatFee}`);let y=[-v];return await g.mergeWithFeeStructure(t,l,y,d),{tx:await m.hinkalTransact(e,{chainId:t,erc20Addresses:l,amountChanges:y,externalAddress:_,feeStructure:d,relay:f,useBlockedUtxos:!0,onTxSubmitLocally:n=>{h.updateHinkal(t,e,n.inputNullifiers?.flat(),n.outCommitments?.flat(),n.encryptedOutputs?.flat())},submit:{mode:c.SubmitMode.Relayer}}),amountToRecipient:v}},C=async(t,r,i,a,o,c)=>{let u=[i.erc20TokenAddress],{originalDeployer:d}=e.networkRegistry[r].contractData;if(!d)throw Error(`missing data`);let f=i.erc20TokenAddress,[m,g]=await Promise.all([p.getFeeStructure(r,f,u,s.ExternalActionId.Transact,void 0,void 0,{mintTo:u[0],recipient:o,nullifierCount:c}),t.getRandomRelay(r,!0)]);if(!g)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let v=a-m.flatFee;if(v<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${a}, Fee: ${m.flatFee}`);let y=[-v];return y[0]-=m.flatFee,{tx:await _.hinkalSolanaTransact(t,{chainId:r,mintAddresses:u,amountChanges:y,relayAddress:g,recipient:o,signer:g,functionName:`transact`,accounts:{recipient:o,mint:u[0]===`11111111111111111111111111111111`?void 0:u[0]},relayerFee:m.flatFee,variableRate:m.variableRate,useBlockedUtxos:!0,onTxSubmitLocally:({inputNullifiers:e,outCommitments:n,encryptedOutputs:i})=>{h.updateHinkal(r,t,e,n,i)},submit:{mode:l.SolanaSubmitMode.Relayer}}),amountToRecipient:v}},w=async(t,n,r,i,a,o)=>e.isSolanaLike(n)?C(t,n,r,i,a,o):S(t,n,r,i,a),T=async(i,a,s)=>{let c=d.validateAndGetChainId([a]);if(i.generateProofRemotely){let t=e.isSolanaLike(c)?await x(i,c,a,s):await y(i,c,a,s);if(!t.length)throw Error(n.transactionErrorCodes.NO_STUCK_BALANCE_TO_WITHDRAW);return t}let l=[],f=r.normalizeTokenAddress(c,a.erc20TokenAddress);await i.resetMerkleTreesIfNecessary([c]);let p=((await o.getInputUtxoAndBalancePerToken({hinkal:i,sliceIfMore6:!1,useBlockedUtxos:!0,chainId:c}))?.get(f)??[]).filter(e=>e.amount>0n).sort((e,t)=>Number(t.amount-e.amount));if(!p.length)throw Error(n.transactionErrorCodes.NO_STUCK_BALANCE_TO_WITHDRAW);for(let e=0;e<p.length;e+=v){let n=p.slice(e,e+v),r=t.countTotalAmountInUtxos(n);try{let{tx:e}=await w(i,c,a,r,s,n.length);l.push(e)}catch(e){if(!l.length)throw e;return u.Logger.error(`Stuck withdrawal partially submitted (${l.length}/${Math.ceil(p.length/v)})`,e),l}}return l};exports.hinkalWithdrawStuckUtxos=T;
+const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../functions/utils/amounts.utils.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/utils/encodeTokenWithId.cjs`),i=require(`../../functions/utils/addresses.cjs`),a=require(`../../functions/utils/tron.utils.cjs`),o=require(`../../functions/web3/events/getInputUtxoAndBalance.cjs`),s=require(`../../types/external-action.types.cjs`),c=require(`../../types/transact.types.cjs`),l=require(`../../types/solana-transact.types.cjs`),u=require(`../../error-handling/logger.cjs`),d=require(`../../functions/utils/token-check.utils.cjs`),f=require(`../../functions/snarkjs/constructTxEnclave.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`),m=require(`./hinkalTransact.cjs`),h=require(`../../functions/auto-deposit-back-helpers/update-hinkal.cjs`),g=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`),_=require(`./hinkalSolanaTransact.cjs`);var v=6,y=async(t,r,o,c)=>{let l=o.erc20TokenAddress,d=await t.getEthereumAddressByChain(r),[m,h]=await Promise.all([p.getFeeStructure(r,l,[l],s.ExternalActionId.Transact),t.getRandomRelay(r,!0)]);if(!h)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let g=await f.prepareStuckWithdrawEnclaveCall(t,{chainId:r,hinkalAddress:e.networkRegistry[r].contractData.hinkalAddress,erc20Address:l,externalAddress:a.addressToHexFormat(c),relay:h,feeStructure:m,hashedEthereumAddress:i.hashEthereumAddress(d)}),_=[];for(let e=0;e<g.length;e+=1)try{let{jobId:n,signedMessageHash:i}=g[e],{R8:a,S:o}=t.userKeys.signEddsa(BigInt(i));_.push(await f.finalizeTxEnclaveCallRelay(n,{R8:a,S:o},r))}catch(e){if(!_.length)throw e;return u.Logger.error(`Stuck withdrawal partially submitted (${_.length}/${g.length})`,e),_}return _},b=async(e,t,n)=>{let r=await Promise.all(Array.from({length:v},async(r,i)=>{let a=i+1,o=await p.getFeeStructure(e,t,[t],s.ExternalActionId.Transact,void 0,void 0,{mintTo:t,recipient:n,nullifierCount:a});return[String(a),o]}));return Object.fromEntries(r)},x=async(e,t,r,a)=>{let o=r.erc20TokenAddress,[s,c,l]=await Promise.all([e.getEthereumAddressByChain(t),e.getRandomRelay(t,!0),b(t,o,a)]);if(!c)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let u=await f.prepareSolanaStuckWithdrawEnclaveCall(e,{chainId:t,mintAddress:o,recipient:a,relayAddress:c,accounts:{recipient:a,mint:o===`11111111111111111111111111111111`?void 0:o},feeStructures:l,hashedEthereumAddress:i.hashEthereumAddress(s)}),d=[];for(let n=0;n<u.length;n+=1){let{jobId:r,signedMessageHash:i}=u[n],{R8:a,S:o}=e.userKeys.signEddsa(BigInt(i));d.push(await f.finalizeSolanaTxEnclaveCallRelay(r,{R8:a,S:o},t))}return d},S=async(e,t,r,i,o)=>{let l=[r.erc20TokenAddress],u=r.erc20TokenAddress,[d,f]=await Promise.all([p.getFeeStructure(t,u,l,s.ExternalActionId.Transact),e.getRandomRelay(t,!0)]);if(!f)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let _=a.addressToHexFormat(o),v=i-d.flatFee;if(v<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${i}, Fee: ${d.flatFee}`);let y=[-v];return await g.mergeWithFeeStructure(t,l,y,d),{tx:await m.hinkalTransact(e,{chainId:t,erc20Addresses:l,amountChanges:y,externalAddress:_,feeStructure:d,relay:f,useBlockedUtxos:!0,onTxSubmitLocally:n=>{h.updateHinkal(t,e,n.inputNullifiers?.flat(),n.outCommitments?.flat(),n.encryptedOutputs?.flat())},submit:{mode:c.SubmitMode.Relayer}}),amountToRecipient:v}},C=async(t,r,i,a,o,c)=>{let u=[i.erc20TokenAddress],{originalDeployer:d}=e.networkRegistry[r].contractData;if(!d)throw Error(`missing data`);let f=i.erc20TokenAddress,[m,g]=await Promise.all([p.getFeeStructure(r,f,u,s.ExternalActionId.Transact,void 0,void 0,{mintTo:u[0],recipient:o,nullifierCount:c}),t.getRandomRelay(r,!0)]);if(!g)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let v=a-m.flatFee;if(v<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${a}, Fee: ${m.flatFee}`);let y=[-v];return y[0]-=m.flatFee,{tx:await _.hinkalSolanaTransact(t,{chainId:r,mintAddresses:u,amountChanges:y,relayAddress:g,recipient:o,signer:g,functionName:`transact`,accounts:{recipient:o,mint:u[0]===`11111111111111111111111111111111`?void 0:u[0]},relayerFee:m.flatFee,variableRate:m.variableRate,useBlockedUtxos:!0,onTxSubmitLocally:({inputNullifiers:e,outCommitments:n,encryptedOutputs:i})=>{h.updateHinkal(r,t,e,n,i)},submit:{mode:l.SolanaSubmitMode.Relayer}}),amountToRecipient:v}},w=async(t,n,r,i,a,o)=>e.isSolanaLike(n)?C(t,n,r,i,a,o):S(t,n,r,i,a),T=async(i,a,s)=>{let c=d.validateAndGetChainId([a]);if(i.generateProofRemotely){let t=e.isSolanaLike(c)?await x(i,c,a,s):await y(i,c,a,s);if(!t.length)throw Error(n.transactionErrorCodes.NO_STUCK_BALANCE_TO_WITHDRAW);return t}let l=[],f=r.normalizeTokenAddress(c,a.erc20TokenAddress);await i.resetMerkleTreesIfNecessary([c]);let p=((await o.getInputUtxoAndBalancePerToken({hinkal:i,sliceIfMore6:!1,useBlockedUtxos:!0,chainId:c}))?.get(f)??[]).filter(e=>e.amount>0n).sort((e,t)=>Number(t.amount-e.amount));if(!p.length)throw Error(n.transactionErrorCodes.NO_STUCK_BALANCE_TO_WITHDRAW);for(let e=0;e<p.length;e+=v){let n=p.slice(e,e+v),r=t.countTotalAmountInUtxos(n);try{let{tx:e}=await w(i,c,a,r,s,n.length);l.push(e)}catch(e){if(!l.length)throw e;return u.Logger.error(`Stuck withdrawal partially submitted (${l.length}/${Math.ceil(p.length/v)})`,e),l}}return l};exports.hinkalWithdrawStuckUtxos=T;

package/common/src/data-structures/Hinkal/hinkalWithdrawStuckUtxos.mjs

@@ -18,28 +18,29 @@ import { updateHinkal as y } from "../../functions/auto-deposit-back-helpers/upd
 import { mergeWithFeeStructure as b } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 import { hinkalSolanaTransact as x } from "./hinkalSolanaTransact.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalWithdrawStuckUtxos.ts
-var S = 6, C = async (e, t, n, i) => {
-	let s = n.erc20TokenAddress, l = await e.getEthereumAddressByChain(t), [u, f] = await Promise.all([_(t, s, [s], c.Transact), e.getRandomRelay(t, !0)]);
-	if (!f) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let p = await g(e, {
-		chainId: t,
-		erc20Address: s,
-		externalAddress: o(i),
-		relay: f,
-		feeStructure: u,
-		hashedEthereumAddress: a(l)
-	}), h = [];
-	for (let n = 0; n < p.length; n += 1) try {
-		let { jobId: r, signedMessageHash: i } = p[n], { R8: a, S: o } = e.userKeys.signEddsa(BigInt(i));
-		h.push(await m(r, {
+var S = 6, C = async (e, n, i, s) => {
+	let l = i.erc20TokenAddress, u = await e.getEthereumAddressByChain(n), [f, p] = await Promise.all([_(n, l, [l], c.Transact), e.getRandomRelay(n, !0)]);
+	if (!p) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let h = await g(e, {
+		chainId: n,
+		hinkalAddress: t[n].contractData.hinkalAddress,
+		erc20Address: l,
+		externalAddress: o(s),
+		relay: p,
+		feeStructure: f,
+		hashedEthereumAddress: a(u)
+	}), v = [];
+	for (let t = 0; t < h.length; t += 1) try {
+		let { jobId: r, signedMessageHash: i } = h[t], { R8: a, S: o } = e.userKeys.signEddsa(BigInt(i));
+		v.push(await m(r, {
 			R8: a,
 			S: o
-		}, t));
+		}, n));
 	} catch (e) {
-		if (!h.length) throw e;
-		return d.error(`Stuck withdrawal partially submitted (${h.length}/${p.length})`, e), h;
+		if (!v.length) throw e;
+		return d.error(`Stuck withdrawal partially submitted (${v.length}/${h.length})`, e), v;
 	}
-	return h;
+	return v;
 }, w = async (e, t, n) => {
 	let r = await Promise.all(Array.from({ length: S }, async (r, i) => {
 		let a = i + 1, o = await _(e, t, [t], c.Transact, void 0, void 0, {

package/common/src/data-structures/Hinkal/index.d.ts

@@ -22,3 +22,5 @@ export * from './hinkalPalTronDepositPrepare';
 export * from './hinkalSolanaDepositAndWithdraw';
 export * from './hinkalNearDepositAndBridge';
 export * from './hinkalBridgePrivateToPrivate';
+export * from './hinkalSolanaSponsoredShield';
+export * from './hinkalSolanaSponsoredProxySend';

package/common/src/data-structures/Hinkal/resetMerkleTrees.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../types/ethereum-network.types.cjs`),n=require(`../../types/balances.types.cjs`),r=require(`../../types/events.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../functions/utils/map.utils.cjs`),a=require(`../../functions/utils/mutexes.utils.cjs`),o=require(`../../functions/utils/create-provider.cjs`),s=require(`../../functions/utils/getContractAddress.cjs`),c=require(`../private-balances/BalanceChangedHandler.cjs`),l=require(`../event-service/evm/ClientBlockchainEventEmitter.cjs`),u=require(`../event-service/solana/ClientSolanaBlockchainEventEmitter.cjs`);require(`../event-service/index.cjs`);const d=require(`../snapshot/SnapshotFetcherService.cjs`),f=require(`../snapshot/solana-snapshots/ClientSolanaCommitmentsSnapshotService.cjs`),p=require(`../snapshot/solana-snapshots/ClientSolanaNullifierSnapshotService.cjs`),m=require(`../snapshot/evm-snapshots/ClientCommitmentsSnapshotService.cjs`),h=require(`../snapshot/evm-snapshots/ClientNullifierSnapshotService.cjs`);require(`../snapshot/index.cjs`);let g=require(`@solana/web3.js`),_=require(`async-mutex`);var v=new Map,y=e=>i.getOrCreateMapValue(v,e,()=>new _.Mutex),b=async(i,_)=>{let v=(_??i.getSupportedChains()).map(_=>y(_).runExclusive(async()=>{if(i.generateProofRemotely)return;i.commitmentsSnapshotServiceByChain[_]?.intervalClear(),i.nullifierSnapshotServiceByChain[_]?.intervalClear();let{maxPageSize:v,fetchRpcUrl:y,contractData:b}=e.networkRegistry[_],x;if(e.isSolanaLike(_)){let e=b.hinkalAddress;if(!y||!e)throw Error(`Fetch RPC URL or Solana program ID is not set`);x=new u.ClientSolanaBlockchainEventEmitter(_,o.createCustomSolanaConnection(y),new g.PublicKey(e),0,a.getChainBalanceFetchingMutex(_),v);let t=b.hinkalIdl;t&&x.setIdl(t);let n=new d.SnapshotFetcherService(_,e);i.commitmentsSnapshotServiceByChain[_]=new f.ClientSolanaCommitmentsSnapshotService(x,n),i.nullifierSnapshotServiceByChain[_]=new p.ClientSolanaNullifierSnapshotService(x,n)}else{let e=i.getContractWithFetcherByChainId(_,t.ContractType.HinkalContract),n=a.getChainBalanceFetchingMutex(_);x=new l.ClientBlockchainEventEmitter(r.EventCategory.MainContractEvents,_,e,0,n,v);let o=new d.SnapshotFetcherService(_,s.getContractAddress(e));i.commitmentsSnapshotServiceByChain[_]=new m.ClientCommitmentsSnapshotService(x,o),i.nullifierSnapshotServiceByChain[_]=new h.ClientNullifierSnapshotService(x,o)}let S=i.commitmentsSnapshotServiceByChain[_],C=i.nullifierSnapshotServiceByChain[_];if(!S||!C)throw Error(`Missing snapshot service for chain ${_}`);await Promise.all([S.init(),C.init()]),await x.init(),i.merkleTreeHinkalByChain[_]=S.merkleTree,i.nullifiersByChain[_]=C.nullifiers,i.encryptedOutputsByChain[_]=S.encryptedOutputs,x.onEventsProcessed=e=>{e>0&&c.balanceChangedHandler.dispatch({updateType:n.PrivateBalanceUpdateType.FreshWithoutLoader,updateTokensListBefore:!0,chainIdToUpdate:_})}}));await Promise.allSettled(v)};exports.resetMerkleTrees=b;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../types/ethereum-network.types.cjs`),n=require(`../../types/balances.types.cjs`),r=require(`../../types/events.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../functions/utils/map.utils.cjs`),a=require(`../../functions/utils/mutexes.utils.cjs`),o=require(`../../functions/utils/create-provider.cjs`),s=require(`../../functions/utils/getContractAddress.cjs`),c=require(`../private-balances/BalanceChangedHandler.cjs`),l=require(`../event-service/evm/ClientBlockchainEventEmitter.cjs`),u=require(`../event-service/solana/ClientSolanaBlockchainEventEmitter.cjs`);require(`../event-service/index.cjs`);const d=require(`../snapshot/SnapshotFetcherService.cjs`),f=require(`../snapshot/solana-snapshots/ClientSolanaCommitmentsSnapshotService.cjs`),p=require(`../snapshot/solana-snapshots/ClientSolanaNullifierSnapshotService.cjs`),m=require(`../snapshot/evm-snapshots/ClientCommitmentsSnapshotService.cjs`),h=require(`../snapshot/evm-snapshots/ClientNullifierSnapshotService.cjs`);require(`../snapshot/index.cjs`);let g=require(`@solana/web3.js`),_=require(`async-mutex`);var v=new Map,y=e=>i.getOrCreateMapValue(v,e,()=>new _.Mutex),b=async(i,_)=>{let v=(_??i.getSupportedChains()).map(_=>y(_).runExclusive(async()=>{if(i.generateProofRemotely)return;i.commitmentsSnapshotServiceByChain[_]?.intervalClear(),i.nullifierSnapshotServiceByChain[_]?.intervalClear();let{maxPageSize:v,rpcUrl:y,contractData:b}=e.networkRegistry[_],x;if(e.isSolanaLike(_)){let e=b.hinkalAddress;if(!e)throw Error(`Solana program ID is not set`);x=new u.ClientSolanaBlockchainEventEmitter(_,o.createCustomSolanaConnection(y),new g.PublicKey(e),0,a.getChainBalanceFetchingMutex(_),v);let t=b.hinkalIdl;t&&x.setIdl(t);let n=new d.SnapshotFetcherService(_,e);i.commitmentsSnapshotServiceByChain[_]=new f.ClientSolanaCommitmentsSnapshotService(x,n),i.nullifierSnapshotServiceByChain[_]=new p.ClientSolanaNullifierSnapshotService(x,n)}else{let e=i.getContractWithFetcherByChainId(_,t.ContractType.HinkalContract),n=a.getChainBalanceFetchingMutex(_);x=new l.ClientBlockchainEventEmitter(r.EventCategory.MainContractEvents,_,e,0,n,v);let o=new d.SnapshotFetcherService(_,s.getContractAddress(e));i.commitmentsSnapshotServiceByChain[_]=new m.ClientCommitmentsSnapshotService(x,o),i.nullifierSnapshotServiceByChain[_]=new h.ClientNullifierSnapshotService(x,o)}let S=i.commitmentsSnapshotServiceByChain[_],C=i.nullifierSnapshotServiceByChain[_];if(!S||!C)throw Error(`Missing snapshot service for chain ${_}`);await Promise.all([S.init(),C.init()]),await x.init(),i.merkleTreeHinkalByChain[_]=S.merkleTree,i.nullifiersByChain[_]=C.nullifiers,i.encryptedOutputsByChain[_]=S.encryptedOutputs,x.onEventsProcessed=e=>{e>0&&c.balanceChangedHandler.dispatch({updateType:n.PrivateBalanceUpdateType.FreshWithoutLoader,updateTokensListBefore:!0,chainIdToUpdate:_})}}));await Promise.allSettled(v)};exports.resetMerkleTrees=b;

package/common/src/data-structures/Hinkal/resetMerkleTrees.mjs

@@ -24,10 +24,10 @@ var y = /* @__PURE__ */ new Map(), b = (e) => a(y, e, () => new v()), x = async
 	let y = (v ?? a.getSupportedChains()).map((v) => b(v).runExclusive(async () => {
 		if (a.generateProofRemotely) return;
 		a.commitmentsSnapshotServiceByChain[v]?.intervalClear(), a.nullifierSnapshotServiceByChain[v]?.intervalClear();
-		let { maxPageSize: y, fetchRpcUrl: b, contractData: x } = t[v], S;
+		let { maxPageSize: y, rpcUrl: b, contractData: x } = t[v], S;
 		if (e(v)) {
 			let e = x.hinkalAddress;
-			if (!b || !e) throw Error("Fetch RPC URL or Solana program ID is not set");
+			if (!e) throw Error("Solana program ID is not set");
 			S = new d(v, s(b), new _(e), 0, o(v), y);
 			let t = x.hinkalIdl;
 			t && S.setIdl(t);

package/common/src/data-structures/TokenDBs/AlchemyPublicTokensDB.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../functions/utils/caseInsensitive.utils.cjs`),r=require(`../http/HttpClient.cjs`);require(`../http/index.cjs`);const i=require(`../../types/cache.types.cjs`),a=require(`../../API/API.cjs`),o=require(`../../error-handling/logger.cjs`),s=require(`../../functions/utils/string.utils.cjs`),c=require(`./token-visibility-db.cjs`),l=require(`../../functions/utils/erc20tokenFunctions.cjs`),u=require(`../../functions/utils/create-provider.cjs`),d=require(`../../functions/utils/publicBalance.utils.cjs`);let f=require(`@solana/web3.js`),p=require(`idb-keyval`),m=require(`@solana/spl-token`);var h=new class{fetchedTokens={};ALCHEMY_URLS={[e.chainIds.bnbMainnet]:`bnb-mainnet`,[e.chainIds.ethMainnet]:`eth-mainnet`,[e.chainIds.polygon]:`polygon-mainnet`,[e.chainIds.arbMainnet]:`arb-mainnet`,[e.chainIds.optimism]:`opt-mainnet`,[e.chainIds.optimismTest]:`opt-mainnet`,[e.chainIds.base]:`base-mainnet`,[e.chainIds.solanaMainnet]:`solana-mainnet`,[e.chainIds.sepoliaTestnet]:`eth-sepolia`};KNOWN_GOOD_NFTS={[e.chainIds.base]:[`0x20bc8d248fe9c18a947406cea50d716828ab821f`],[e.chainIds.optimism]:[`0x3c3e0e73b53a19bcaf4178b8f9c9428fd2a2775e`]};isWhitelistedNFT(e,t){return this.KNOWN_GOOD_NFTS[t]?this.KNOWN_GOOD_NFTS[t].some(t=>n.caseInsensitiveEqual(e,t)):!1}async getPublicTokens(e,t){let n=s.getStateKey(t,e);return l.overlayTokensWithRegistryData((await(0,p.get)(i.StorageKeys.ALCHEMY_PUBLIC_TOKENS))?.[n]||[],e)}async getFetchedTokens(e,t){let n=s.getStateKey(t,e);return l.overlayTokensWithRegistryData(this.fetchedTokens[n]||[],e)}fetchAndUpdatePublicTokens(t,n){return e.isSolanaLike(n)?this.fetchAndUpdateSolanaTokens(t,n):this.fetchAndUpdateEVMTokens(t,n)}async fetchAndUpdateSolanaTokens(e,t){let r=s.getStateKey(e,t),[o,l]=await Promise.all([this.getSolanaTokenAddresses(t,e),this.getNFTAddresses(t,e)]),u=Array.from(new Set([...o,...l]));if(!u.length)return;let d=(await a.API.tokensInfoCall(t,u)).filter(e=>!!e),f=await c.tokenVisibilityStorage.hideSpamsAndFetchHiddenTokensAddresses(t,d),m=d.filter(e=>!n.lowerCaseIncludes(f,e.erc20TokenAddress));await(0,p.update)(i.StorageKeys.ALCHEMY_PUBLIC_TOKENS,(e={})=>{let t={...e,[r]:m};return this.fetchedTokens=t,t})}async getWalletTokenAddresses(t,n){return e.isSolanaLike(t)?this.getSolanaTokenAddresses(t,n):this.getEVMTokenAddresses(t,n)}async fetchAndUpdateEVMTokens(e,r){let o=s.getStateKey(e,r),l=await this.getEVMTokenAddresses(r,e),u=await this.getNFTTokens(r,e),d=u.map(e=>e.contractAddress),f=[...l,...d];if(!f.length)return;let m=(await a.API.tokensInfoCall(r,f)).map((e,i)=>{if(e)return e;let a=f[i],o=u.find(e=>n.caseInsensitiveEqual(e.contractAddress,a));return o&&o.tokenIds&&o.tokenIds.length>0&&this.isWhitelistedNFT(a,r)?{chainId:r,name:`Unknown NFT`,symbol:`NFT`,erc20TokenAddress:a,decimals:0,nftTokenType:t.TokenType.ERC721,tokenIds:o.tokenIds}:null}).filter(e=>!!e),h=await c.tokenVisibilityStorage.hideSpamsAndFetchHiddenTokensAddresses(r,m),g=m.filter(e=>!n.lowerCaseIncludes(h,e.erc20TokenAddress)).map(e=>({...e,tokenIds:u.find(t=>n.caseInsensitiveEqual(t.contractAddress,e.erc20TokenAddress))?.tokenIds}));await(0,p.update)(i.StorageKeys.ALCHEMY_PUBLIC_TOKENS,(e={})=>{let t={...e,[o]:g};return this.fetchedTokens=t,t})}async getSolanaTokenAddresses(n,r){let{fetchRpcUrl:i}=e.networkRegistry[n];if(!i)throw Error(`RPC URL not found for the specified chain ID`);let a=u.createCustomSolanaConnection(i),o=await a.getBalance(new f.PublicKey(r)),[s,c]=await Promise.all([a.getParsedTokenAccountsByOwner(new f.PublicKey(r),{programId:m.TOKEN_PROGRAM_ID}),a.getParsedTokenAccountsByOwner(new f.PublicKey(r),{programId:m.TOKEN_2022_PROGRAM_ID})]),l=[...s.value,...c.value].filter(e=>{let{amount:t}=e.account.data.parsed.info.tokenAmount;return BigInt(t)>0n}).map(e=>e.account.data.parsed.info.mint);return o>0&&l.unshift(t.solanaNativeAddress),Array.from(new Set(l))}async getNFTAddresses(n,i){let{fetchRpcUrl:a}=e.networkRegistry[n];if(!a)throw Error(`RPC URL not found for the specified chain ID`);try{let e=[],n=1;do{let{items:o=[],page:s}=(await r.httpClient.post(a,{jsonrpc:`2.0`,id:1,method:`getAssetsByOwner`,params:{ownerAddress:i,page:n,limit:1e3,displayOptions:{showFungible:!1,showCollectionMetadata:!0}}})).result||{},c=o.filter(e=>e.interface&&t.SOLANA_NFT_INTERFACES.includes(e.interface)).map(e=>e.id);e.push(...c),n=s&&s>n?s:0}while(n>0);return e}catch(e){return o.Logger.error(`Failed to fetch NFTs from DAS API`,e),[]}}async getEVMTokenAddresses(n,i){let a=await d.getPublicBalanceByTokenAddress(n,i,t.zeroAddress),o=this.ALCHEMY_URLS[n];if(!o)throw Error(`Alchemy URL not found for the specified chain ID: ${n}`);let s=`https://${o}.g.alchemy.com/v2/${e.ALCHEMY_API_KEY}`,c=[],l;do{let e=[i,`erc20`];l&&e.push({pageKey:l});let{result:t}=await r.httpClient.post(s,{jsonrpc:`2.0`,id:1,method:`alchemy_getTokenBalances`,params:e});c.push(...t?.tokenBalances??[]),l=t?.pageKey}while(l);a&&a>0n&&c.push({contractAddress:t.zeroAddress,tokenBalance:a.toString()});let u={};return c.forEach(e=>{(!u[e.contractAddress]||BigInt(e.tokenBalance)>0n)&&(u[e.contractAddress]=e)}),Object.keys(u)}async getNFTTokens(t,n){let i=`https://${this.ALCHEMY_URLS[t]}.g.alchemy.com/nft/v3/${e.ALCHEMY_API_KEY}/getNFTsForOwner`,a=[],o;do{let e=new URLSearchParams({owner:n,withMetadata:`false`,pageSize:`100`});o&&e.append(`pageKey`,o);let{ownedNfts:t=[],pageKey:s}=await r.httpClient.get(`${i}?${e.toString()}`);a.push(...t),o=s}while(o);let s=a.filter(({contractAddress:e,tokenId:t})=>e&&t).reduce((e,{contractAddress:t,tokenId:n})=>{let r=t.toLowerCase();return e.has(r)||e.set(r,[]),e.get(r)?.push(n),e},new Map);return Array.from(s.entries()).map(([e,t])=>({contractAddress:e,tokenIds:t}))}};exports.alchemyPublicTokensDB=h;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../functions/utils/caseInsensitive.utils.cjs`),r=require(`../../types/cache.types.cjs`),i=require(`../../API/API.cjs`),a=require(`../../error-handling/logger.cjs`),o=require(`../../functions/utils/string.utils.cjs`),s=require(`./token-visibility-db.cjs`),c=require(`../../functions/utils/erc20tokenFunctions.cjs`),l=require(`../../functions/utils/create-provider.cjs`),u=require(`../../functions/utils/publicBalance.utils.cjs`),d=require(`../../API/solana-nft-assets.cjs`),f=require(`../../API/evm-token-assets.cjs`);let p=require(`@solana/web3.js`),m=require(`idb-keyval`),h=require(`@solana/spl-token`);var g=new class{fetchedTokens={};KNOWN_GOOD_NFTS={[e.chainIds.base]:[`0x20bc8d248fe9c18a947406cea50d716828ab821f`],[e.chainIds.optimism]:[`0x3c3e0e73b53a19bcaf4178b8f9c9428fd2a2775e`]};isWhitelistedNFT(e,t){return this.KNOWN_GOOD_NFTS[t]?this.KNOWN_GOOD_NFTS[t].some(t=>n.caseInsensitiveEqual(e,t)):!1}async getPublicTokens(e,t){let n=o.getStateKey(t,e);return c.overlayTokensWithRegistryData((await(0,m.get)(r.StorageKeys.ALCHEMY_PUBLIC_TOKENS))?.[n]||[],e)}async getFetchedTokens(e,t){let n=o.getStateKey(t,e);return c.overlayTokensWithRegistryData(this.fetchedTokens[n]||[],e)}fetchAndUpdatePublicTokens(t,n){return e.isSolanaLike(n)?this.fetchAndUpdateSolanaTokens(t,n):this.fetchAndUpdateEVMTokens(t,n)}async fetchAndUpdateSolanaTokens(e,t){let a=o.getStateKey(e,t),[c,l]=await Promise.all([this.getSolanaTokenAddresses(t,e),this.getNFTAddresses(e)]),u=Array.from(new Set([...c,...l]));if(!u.length)return;let d=(await i.API.tokensInfoCall(t,u)).filter(e=>!!e),f=await s.tokenVisibilityStorage.hideSpamsAndFetchHiddenTokensAddresses(t,d),p=d.filter(e=>!n.lowerCaseIncludes(f,e.erc20TokenAddress));await(0,m.update)(r.StorageKeys.ALCHEMY_PUBLIC_TOKENS,(e={})=>{let t={...e,[a]:p};return this.fetchedTokens=t,t})}async getWalletTokenAddresses(t,n){return e.isSolanaLike(t)?this.getSolanaTokenAddresses(t,n):this.getEVMTokenAddresses(t,n)}async fetchAndUpdateEVMTokens(e,a){let c=o.getStateKey(e,a),l=await this.getEVMTokenAddresses(a,e),u=await this.getNFTTokens(a,e),d=u.map(e=>e.contractAddress),f=[...l,...d];if(!f.length)return;let p=(await i.API.tokensInfoCall(a,f)).map((e,r)=>{if(e)return e;let i=f[r],o=u.find(e=>n.caseInsensitiveEqual(e.contractAddress,i));return o&&o.tokenIds&&o.tokenIds.length>0&&this.isWhitelistedNFT(i,a)?{chainId:a,name:`Unknown NFT`,symbol:`NFT`,erc20TokenAddress:i,decimals:0,nftTokenType:t.TokenType.ERC721,tokenIds:o.tokenIds}:null}).filter(e=>!!e),h=await s.tokenVisibilityStorage.hideSpamsAndFetchHiddenTokensAddresses(a,p),g=p.filter(e=>!n.lowerCaseIncludes(h,e.erc20TokenAddress)).map(e=>({...e,tokenIds:u.find(t=>n.caseInsensitiveEqual(t.contractAddress,e.erc20TokenAddress))?.tokenIds}));await(0,m.update)(r.StorageKeys.ALCHEMY_PUBLIC_TOKENS,(e={})=>{let t={...e,[c]:g};return this.fetchedTokens=t,t})}async getSolanaTokenAddresses(n,r){let{rpcUrl:i}=e.networkRegistry[n],a=l.createCustomSolanaConnection(i),o=await a.getBalance(new p.PublicKey(r)),[s,c]=await Promise.all([a.getParsedTokenAccountsByOwner(new p.PublicKey(r),{programId:h.TOKEN_PROGRAM_ID}),a.getParsedTokenAccountsByOwner(new p.PublicKey(r),{programId:h.TOKEN_2022_PROGRAM_ID})]),u=[...s.value,...c.value].filter(e=>{let{amount:t}=e.account.data.parsed.info.tokenAmount;return BigInt(t)>0n}).map(e=>e.account.data.parsed.info.mint);return o>0&&u.unshift(t.solanaNativeAddress),Array.from(new Set(u))}async getNFTAddresses(e){try{return await d.getSolanaNftAssetsFromServer(e)}catch(e){return a.Logger.error(`Failed to fetch NFTs from DAS API`,e),[]}}async getEVMTokenAddresses(e,n){let[r,i]=await Promise.all([u.getPublicBalanceByTokenAddress(e,n,t.zeroAddress),f.getEvmTokenBalancesFromServer(e,n)]);r&&r>0n&&i.push({contractAddress:t.zeroAddress,tokenBalance:r.toString()});let a={};return i.forEach(e=>{(!a[e.contractAddress]||BigInt(e.tokenBalance)>0n)&&(a[e.contractAddress]=e)}),Object.keys(a)}async getNFTTokens(e,t){return f.getEvmNftAssetsFromServer(e,t)}};exports.alchemyPublicTokensDB=g;

package/common/src/data-structures/TokenDBs/AlchemyPublicTokensDB.d.ts

@@ -2,7 +2,6 @@ import { ERC20Token } from '../../types/token.types';
 import { IPublicTokensDB } from './IPublicTokensDB';
 export declare class AlchemyPublicTokensDB implements IPublicTokensDB {
     private fetchedTokens;
-    private readonly ALCHEMY_URLS;
     private readonly KNOWN_GOOD_NFTS;
     private isWhitelistedNFT;
     getPublicTokens(chainId: number, walletAddress: string): Promise<ERC20Token[]>;

package/common/src/data-structures/TokenDBs/AlchemyPublicTokensDB.mjs

@@ -1,85 +1,74 @@
-import { ALCHEMY_API_KEY as e, chainIds as t, isSolanaLike as n, networkRegistry as r } from "../../constants/chains.constants.mjs";
-import { SOLANA_NFT_INTERFACES as i, TokenType as a, solanaNativeAddress as o, zeroAddress as s } from "../../constants/protocol.constants.mjs";
-import { caseInsensitiveEqual as c, lowerCaseIncludes as l } from "../../functions/utils/caseInsensitive.utils.mjs";
-import { httpClient as u } from "../http/HttpClient.mjs";
-import "../http/index.mjs";
-import { StorageKeys as d } from "../../types/cache.types.mjs";
-import { API as f } from "../../API/API.mjs";
-import { Logger as p } from "../../error-handling/logger.mjs";
-import { getStateKey as m } from "../../functions/utils/string.utils.mjs";
-import { tokenVisibilityStorage as h } from "./token-visibility-db.mjs";
-import { overlayTokensWithRegistryData as g } from "../../functions/utils/erc20tokenFunctions.mjs";
-import { createCustomSolanaConnection as _ } from "../../functions/utils/create-provider.mjs";
-import { getPublicBalanceByTokenAddress as v } from "../../functions/utils/publicBalance.utils.mjs";
+import { chainIds as e, isSolanaLike as t, networkRegistry as n } from "../../constants/chains.constants.mjs";
+import { TokenType as r, solanaNativeAddress as i, zeroAddress as a } from "../../constants/protocol.constants.mjs";
+import { caseInsensitiveEqual as o, lowerCaseIncludes as s } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { StorageKeys as c } from "../../types/cache.types.mjs";
+import { API as l } from "../../API/API.mjs";
+import { Logger as u } from "../../error-handling/logger.mjs";
+import { getStateKey as d } from "../../functions/utils/string.utils.mjs";
+import { tokenVisibilityStorage as f } from "./token-visibility-db.mjs";
+import { overlayTokensWithRegistryData as p } from "../../functions/utils/erc20tokenFunctions.mjs";
+import { createCustomSolanaConnection as m } from "../../functions/utils/create-provider.mjs";
+import { getPublicBalanceByTokenAddress as h } from "../../functions/utils/publicBalance.utils.mjs";
+import { getSolanaNftAssetsFromServer as g } from "../../API/solana-nft-assets.mjs";
+import { getEvmNftAssetsFromServer as _, getEvmTokenBalancesFromServer as v } from "../../API/evm-token-assets.mjs";
 import { PublicKey as y } from "@solana/web3.js";
 import { get as b, update as x } from "idb-keyval";
 import { TOKEN_2022_PROGRAM_ID as S, TOKEN_PROGRAM_ID as C } from "@solana/spl-token";
 var w = new class {
 	fetchedTokens = {};
-	ALCHEMY_URLS = {
-		[t.bnbMainnet]: "bnb-mainnet",
-		[t.ethMainnet]: "eth-mainnet",
-		[t.polygon]: "polygon-mainnet",
-		[t.arbMainnet]: "arb-mainnet",
-		[t.optimism]: "opt-mainnet",
-		[t.optimismTest]: "opt-mainnet",
-		[t.base]: "base-mainnet",
-		[t.solanaMainnet]: "solana-mainnet",
-		[t.sepoliaTestnet]: "eth-sepolia"
-	};
 	KNOWN_GOOD_NFTS = {
-		[t.base]: ["0x20bc8d248fe9c18a947406cea50d716828ab821f"],
-		[t.optimism]: ["0x3c3e0e73b53a19bcaf4178b8f9c9428fd2a2775e"]
+		[e.base]: ["0x20bc8d248fe9c18a947406cea50d716828ab821f"],
+		[e.optimism]: ["0x3c3e0e73b53a19bcaf4178b8f9c9428fd2a2775e"]
 	};
 	isWhitelistedNFT(e, t) {
-		return this.KNOWN_GOOD_NFTS[t] ? this.KNOWN_GOOD_NFTS[t].some((t) => c(e, t)) : !1;
+		return this.KNOWN_GOOD_NFTS[t] ? this.KNOWN_GOOD_NFTS[t].some((t) => o(e, t)) : !1;
 	}
 	async getPublicTokens(e, t) {
-		let n = m(t, e);
-		return g((await b(d.ALCHEMY_PUBLIC_TOKENS))?.[n] || [], e);
+		let n = d(t, e);
+		return p((await b(c.ALCHEMY_PUBLIC_TOKENS))?.[n] || [], e);
 	}
 	async getFetchedTokens(e, t) {
-		let n = m(t, e);
-		return g(this.fetchedTokens[n] || [], e);
+		let n = d(t, e);
+		return p(this.fetchedTokens[n] || [], e);
 	}
-	fetchAndUpdatePublicTokens(e, t) {
-		return n(t) ? this.fetchAndUpdateSolanaTokens(e, t) : this.fetchAndUpdateEVMTokens(e, t);
+	fetchAndUpdatePublicTokens(e, n) {
+		return t(n) ? this.fetchAndUpdateSolanaTokens(e, n) : this.fetchAndUpdateEVMTokens(e, n);
 	}
 	async fetchAndUpdateSolanaTokens(e, t) {
-		let n = m(e, t), [r, i] = await Promise.all([this.getSolanaTokenAddresses(t, e), this.getNFTAddresses(t, e)]), a = Array.from(new Set([...r, ...i]));
+		let n = d(e, t), [r, i] = await Promise.all([this.getSolanaTokenAddresses(t, e), this.getNFTAddresses(e)]), a = Array.from(new Set([...r, ...i]));
 		if (!a.length) return;
-		let o = (await f.tokensInfoCall(t, a)).filter((e) => !!e), s = await h.hideSpamsAndFetchHiddenTokensAddresses(t, o), c = o.filter((e) => !l(s, e.erc20TokenAddress));
-		await x(d.ALCHEMY_PUBLIC_TOKENS, (e = {}) => {
+		let o = (await l.tokensInfoCall(t, a)).filter((e) => !!e), u = await f.hideSpamsAndFetchHiddenTokensAddresses(t, o), p = o.filter((e) => !s(u, e.erc20TokenAddress));
+		await x(c.ALCHEMY_PUBLIC_TOKENS, (e = {}) => {
 			let t = {
 				...e,
-				[n]: c
+				[n]: p
 			};
 			return this.fetchedTokens = t, t;
 		});
 	}
-	async getWalletTokenAddresses(e, t) {
-		return n(e) ? this.getSolanaTokenAddresses(e, t) : this.getEVMTokenAddresses(e, t);
+	async getWalletTokenAddresses(e, n) {
+		return t(e) ? this.getSolanaTokenAddresses(e, n) : this.getEVMTokenAddresses(e, n);
 	}
 	async fetchAndUpdateEVMTokens(e, t) {
-		let n = m(e, t), r = await this.getEVMTokenAddresses(t, e), i = await this.getNFTTokens(t, e), o = i.map((e) => e.contractAddress), s = [...r, ...o];
-		if (!s.length) return;
-		let u = (await f.tokensInfoCall(t, s)).map((e, n) => {
+		let n = d(e, t), i = await this.getEVMTokenAddresses(t, e), a = await this.getNFTTokens(t, e), u = a.map((e) => e.contractAddress), p = [...i, ...u];
+		if (!p.length) return;
+		let m = (await l.tokensInfoCall(t, p)).map((e, n) => {
 			if (e) return e;
-			let r = s[n], o = i.find((e) => c(e.contractAddress, r));
-			return o && o.tokenIds && o.tokenIds.length > 0 && this.isWhitelistedNFT(r, t) ? {
+			let i = p[n], s = a.find((e) => o(e.contractAddress, i));
+			return s && s.tokenIds && s.tokenIds.length > 0 && this.isWhitelistedNFT(i, t) ? {
 				chainId: t,
 				name: "Unknown NFT",
 				symbol: "NFT",
-				erc20TokenAddress: r,
+				erc20TokenAddress: i,
 				decimals: 0,
-				nftTokenType: a.ERC721,
-				tokenIds: o.tokenIds
+				nftTokenType: r.ERC721,
+				tokenIds: s.tokenIds
 			} : null;
-		}).filter((e) => !!e), p = await h.hideSpamsAndFetchHiddenTokensAddresses(t, u), g = u.filter((e) => !l(p, e.erc20TokenAddress)).map((e) => ({
+		}).filter((e) => !!e), h = await f.hideSpamsAndFetchHiddenTokensAddresses(t, m), g = m.filter((e) => !s(h, e.erc20TokenAddress)).map((e) => ({
 			...e,
-			tokenIds: i.find((t) => c(t.contractAddress, e.erc20TokenAddress))?.tokenIds
+			tokenIds: a.find((t) => o(t.contractAddress, e.erc20TokenAddress))?.tokenIds
 		}));
-		await x(d.ALCHEMY_PUBLIC_TOKENS, (e = {}) => {
+		await x(c.ALCHEMY_PUBLIC_TOKENS, (e = {}) => {
 			let t = {
 				...e,
 				[n]: g
@@ -88,85 +77,32 @@ var w = new class {
 		});
 	}
 	async getSolanaTokenAddresses(e, t) {
-		let { fetchRpcUrl: n } = r[e];
-		if (!n) throw Error("RPC URL not found for the specified chain ID");
-		let i = _(n), a = await i.getBalance(new y(t)), [s, c] = await Promise.all([i.getParsedTokenAccountsByOwner(new y(t), { programId: C }), i.getParsedTokenAccountsByOwner(new y(t), { programId: S })]), l = [...s.value, ...c.value].filter((e) => {
+		let { rpcUrl: r } = n[e], a = m(r), o = await a.getBalance(new y(t)), [s, c] = await Promise.all([a.getParsedTokenAccountsByOwner(new y(t), { programId: C }), a.getParsedTokenAccountsByOwner(new y(t), { programId: S })]), l = [...s.value, ...c.value].filter((e) => {
 			let { amount: t } = e.account.data.parsed.info.tokenAmount;
 			return BigInt(t) > 0n;
 		}).map((e) => e.account.data.parsed.info.mint);
-		return a > 0 && l.unshift(o), Array.from(new Set(l));
+		return o > 0 && l.unshift(i), Array.from(new Set(l));
 	}
-	async getNFTAddresses(e, t) {
-		let { fetchRpcUrl: n } = r[e];
-		if (!n) throw Error("RPC URL not found for the specified chain ID");
+	async getNFTAddresses(e) {
 		try {
-			let e = [], r = 1;
-			do {
-				let { items: a = [], page: o } = (await u.post(n, {
-					jsonrpc: "2.0",
-					id: 1,
-					method: "getAssetsByOwner",
-					params: {
-						ownerAddress: t,
-						page: r,
-						limit: 1e3,
-						displayOptions: {
-							showFungible: !1,
-							showCollectionMetadata: !0
-						}
-					}
-				})).result || {}, s = a.filter((e) => e.interface && i.includes(e.interface)).map((e) => e.id);
-				e.push(...s), r = o && o > r ? o : 0;
-			} while (r > 0);
-			return e;
+			return await g(e);
 		} catch (e) {
-			return p.error("Failed to fetch NFTs from DAS API", e), [];
+			return u.error("Failed to fetch NFTs from DAS API", e), [];
 		}
 	}
-	async getEVMTokenAddresses(t, n) {
-		let r = await v(t, n, s), i = this.ALCHEMY_URLS[t];
-		if (!i) throw Error(`Alchemy URL not found for the specified chain ID: ${t}`);
-		let a = `https://${i}.g.alchemy.com/v2/${e}`, o = [], c;
-		do {
-			let e = [n, "erc20"];
-			c && e.push({ pageKey: c });
-			let { result: t } = await u.post(a, {
-				jsonrpc: "2.0",
-				id: 1,
-				method: "alchemy_getTokenBalances",
-				params: e
-			});
-			o.push(...t?.tokenBalances ?? []), c = t?.pageKey;
-		} while (c);
-		r && r > 0n && o.push({
-			contractAddress: s,
-			tokenBalance: r.toString()
+	async getEVMTokenAddresses(e, t) {
+		let [n, r] = await Promise.all([h(e, t, a), v(e, t)]);
+		n && n > 0n && r.push({
+			contractAddress: a,
+			tokenBalance: n.toString()
 		});
-		let l = {};
-		return o.forEach((e) => {
-			(!l[e.contractAddress] || BigInt(e.tokenBalance) > 0n) && (l[e.contractAddress] = e);
-		}), Object.keys(l);
+		let i = {};
+		return r.forEach((e) => {
+			(!i[e.contractAddress] || BigInt(e.tokenBalance) > 0n) && (i[e.contractAddress] = e);
+		}), Object.keys(i);
 	}
-	async getNFTTokens(t, n) {
-		let r = `https://${this.ALCHEMY_URLS[t]}.g.alchemy.com/nft/v3/${e}/getNFTsForOwner`, i = [], a;
-		do {
-			let e = new URLSearchParams({
-				owner: n,
-				withMetadata: "false",
-				pageSize: "100"
-			});
-			a && e.append("pageKey", a);
-			let { ownedNfts: t = [], pageKey: o } = await u.get(`${r}?${e.toString()}`);
-			i.push(...t), a = o;
-		} while (a);
-		let o = i.filter(({ contractAddress: e, tokenId: t }) => e && t).reduce((e, { contractAddress: t, tokenId: n }) => {
-			let r = t.toLowerCase();
-			return e.has(r) || e.set(r, []), e.get(r)?.push(n), e;
-		}, /* @__PURE__ */ new Map());
-		return Array.from(o.entries()).map(([e, t]) => ({
-			contractAddress: e,
-			tokenIds: t
-		}));
+	async getNFTTokens(e, t) {
+		return _(e, t);
 	}
 }();
 //#endregion

package/common/src/data-structures/crypto-keys/decodeUTXO.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../crypto/poseidon.cjs`);require(`./keys.cjs`);const n=require(`../utxo/Utxo.cjs`);let r=require(`ethers`),i=require(`@solana/web3.js`);var a=`solana-on-chain-utxo:`,o=9,s=e=>Array.isArray(e)?e.some(e=>(e instanceof Uint8Array?e:Uint8Array.from(e)).some(e=>e!==0)):!1,c=e=>{if(e.length!==o)throw Error(`Expected ${o} on-chain fields, received ${e.length}`);let t=e.map((e,t)=>{let n=e instanceof Uint8Array?e:Uint8Array.from(e);if(n.length!==32)throw Error(`Expected bytes32 length 32 at position ${t}, got ${n.length}`);return`0x${Buffer.from(n).toString(`hex`)}`});return`${a}${r.ethers.AbiCoder.defaultAbiCoder().encode([`bytes32[${o}]`],[t])}`},l=e=>e.startsWith(a),u=e=>{if(!l(e))throw Error(`Invalid encoded Solana UTXO payload`);let[n]=r.ethers.AbiCoder.defaultAbiCoder().decode([`bytes32[${o}]`],e.slice(21)),a=n;if(!Array.isArray(a)||a.length!==o)throw Error(`Malformed encoded Solana UTXO payload`);let[s,c,u,d,f,p,m,h,g]=a,_=BigInt(s),v=BigInt(d),y=BigInt(f),b=BigInt(p),x=BigInt(m),S=r.ethers.toBeHex(BigInt(h)),C=BigInt(g).toString(),w=Array.from(r.ethers.getBytes(c)),T=Array.from(r.ethers.getBytes(u)),E=new i.PublicKey(Uint8Array.from([...w.slice(16),...T.slice(16)])).toBase58();return{amount:_,erc20TokenAddress:t.poseidonHash(BigInt(c),BigInt(u)),mintAddress:E,h0x:v,h0y:y,h1x:b,h1y:x,stealthAddress:S,timeStamp:C}},d=e=>{let[t]=r.ethers.AbiCoder.defaultAbiCoder().decode([`tuple(uint256, address, tuple(uint256, uint256, uint256, uint256, uint256), uint256)`,`bytes`],e);return{amount:BigInt(t[0]),erc20TokenAddress:t[1],h0x:BigInt(t[2][0]),h0y:BigInt(t[2][1]),h1x:BigInt(t[2][2]),h1y:BigInt(t[2][3]),stealthAddress:r.ethers.toBeHex(BigInt(t[2][4])),timeStamp:BigInt(t[3]).toString()}},f=(t,n,r)=>{if(e.isSolanaLike(r)){let{amount:e,erc20TokenAddress:r,mintAddress:i,h0x:a,h0y:o,stealthAddress:s,timeStamp:c}=u(t);return{amount:e,erc20TokenAddress:r,mintAddress:i,timeStamp:c,nullifyingKey:n,stealthAddress:s,H0:[a,o]}}let{amount:i,erc20TokenAddress:a,timeStamp:o,h0x:s,h0y:c,stealthAddress:l}=d(t);return{amount:i,erc20TokenAddress:a,timeStamp:o,nullifyingKey:n,stealthAddress:l,H0:[s,c]}},p=(e,t,r)=>new n.Utxo(f(e,t,r));exports.decodeEvmUtxo=d,exports.decodeSolanaUtxo=u,exports.decodeUtxo=p,exports.decodeUtxoConstructorArgs=f,exports.encodeSolanaOnChainUtxo=c,exports.hasSolanaOnChainData=s,exports.isSolanaOnChainUtxo=l;
+require(`../../../../_virtual/_rolldown/runtime.cjs`),require(`../../constants/chains.constants.cjs`),require(`../../crypto/poseidon.cjs`),require(`./keys.cjs`),require(`../utxo/Utxo.cjs`);let e=require(`ethers`);require(`@solana/web3.js`);var t=`solana-on-chain-utxo:`,n=9,r=e=>Array.isArray(e)?e.some(e=>(e instanceof Uint8Array?e:Uint8Array.from(e)).some(e=>e!==0)):!1,i=r=>{if(r.length!==n)throw Error(`Expected ${n} on-chain fields, received ${r.length}`);let i=r.map((e,t)=>{let n=e instanceof Uint8Array?e:Uint8Array.from(e);if(n.length!==32)throw Error(`Expected bytes32 length 32 at position ${t}, got ${n.length}`);return`0x${Buffer.from(n).toString(`hex`)}`});return`${t}${e.ethers.AbiCoder.defaultAbiCoder().encode([`bytes32[${n}]`],[i])}`},a=e=>e.startsWith(t);exports.encodeSolanaOnChainUtxo=i,exports.hasSolanaOnChainData=r,exports.isSolanaOnChainUtxo=a;

package/common/src/data-structures/crypto-keys/decodeUTXO.mjs

@@ -1,68 +1,18 @@
-import { isSolanaLike as e } from "../../constants/chains.constants.mjs";
-import { poseidonHash as t } from "../../crypto/poseidon.mjs";
+import "../../constants/chains.constants.mjs";
+import "../../crypto/poseidon.mjs";
 import "./keys.mjs";
-import { Utxo as n } from "../utxo/Utxo.mjs";
-import { ethers as r } from "ethers";
-import { PublicKey as i } from "@solana/web3.js";
+import "../utxo/Utxo.mjs";
+import { ethers as e } from "ethers";
+import "@solana/web3.js";
 //#region libs/shared/common/src/data-structures/crypto-keys/decodeUTXO.ts
-var a = "solana-on-chain-utxo:", o = 9, s = (e) => Array.isArray(e) ? e.some((e) => (e instanceof Uint8Array ? e : Uint8Array.from(e)).some((e) => e !== 0)) : !1, c = (e) => {
-	if (e.length !== o) throw Error(`Expected ${o} on-chain fields, received ${e.length}`);
-	let t = e.map((e, t) => {
+var t = "solana-on-chain-utxo:", n = 9, r = (e) => Array.isArray(e) ? e.some((e) => (e instanceof Uint8Array ? e : Uint8Array.from(e)).some((e) => e !== 0)) : !1, i = (r) => {
+	if (r.length !== n) throw Error(`Expected ${n} on-chain fields, received ${r.length}`);
+	let i = r.map((e, t) => {
 		let n = e instanceof Uint8Array ? e : Uint8Array.from(e);
 		if (n.length !== 32) throw Error(`Expected bytes32 length 32 at position ${t}, got ${n.length}`);
 		return `0x${Buffer.from(n).toString("hex")}`;
 	});
-	return `${a}${r.AbiCoder.defaultAbiCoder().encode([`bytes32[${o}]`], [t])}`;
-}, l = (e) => e.startsWith(a), u = (e) => {
-	if (!l(e)) throw Error("Invalid encoded Solana UTXO payload");
-	let [n] = r.AbiCoder.defaultAbiCoder().decode([`bytes32[${o}]`], e.slice(21)), a = n;
-	if (!Array.isArray(a) || a.length !== o) throw Error("Malformed encoded Solana UTXO payload");
-	let [s, c, u, d, f, p, m, h, g] = a, _ = BigInt(s), v = BigInt(d), y = BigInt(f), b = BigInt(p), x = BigInt(m), S = r.toBeHex(BigInt(h)), C = BigInt(g).toString(), w = Array.from(r.getBytes(c)), T = Array.from(r.getBytes(u)), E = new i(Uint8Array.from([...w.slice(16), ...T.slice(16)])).toBase58();
-	return {
-		amount: _,
-		erc20TokenAddress: t(BigInt(c), BigInt(u)),
-		mintAddress: E,
-		h0x: v,
-		h0y: y,
-		h1x: b,
-		h1y: x,
-		stealthAddress: S,
-		timeStamp: C
-	};
-}, d = (e) => {
-	let [t] = r.AbiCoder.defaultAbiCoder().decode(["tuple(uint256, address, tuple(uint256, uint256, uint256, uint256, uint256), uint256)", "bytes"], e);
-	return {
-		amount: BigInt(t[0]),
-		erc20TokenAddress: t[1],
-		h0x: BigInt(t[2][0]),
-		h0y: BigInt(t[2][1]),
-		h1x: BigInt(t[2][2]),
-		h1y: BigInt(t[2][3]),
-		stealthAddress: r.toBeHex(BigInt(t[2][4])),
-		timeStamp: BigInt(t[3]).toString()
-	};
-}, f = (t, n, r) => {
-	if (e(r)) {
-		let { amount: e, erc20TokenAddress: r, mintAddress: i, h0x: a, h0y: o, stealthAddress: s, timeStamp: c } = u(t);
-		return {
-			amount: e,
-			erc20TokenAddress: r,
-			mintAddress: i,
-			timeStamp: c,
-			nullifyingKey: n,
-			stealthAddress: s,
-			H0: [a, o]
-		};
-	}
-	let { amount: i, erc20TokenAddress: a, timeStamp: o, h0x: s, h0y: c, stealthAddress: l } = d(t);
-	return {
-		amount: i,
-		erc20TokenAddress: a,
-		timeStamp: o,
-		nullifyingKey: n,
-		stealthAddress: l,
-		H0: [s, c]
-	};
-}, p = (e, t, r) => new n(f(e, t, r));
+	return `${t}${e.AbiCoder.defaultAbiCoder().encode([`bytes32[${n}]`], [i])}`;
+}, a = (e) => e.startsWith(t);
 //#endregion
-export { d as decodeEvmUtxo, u as decodeSolanaUtxo, p as decodeUtxo, f as decodeUtxoConstructorArgs, c as encodeSolanaOnChainUtxo, s as hasSolanaOnChainData, l as isSolanaOnChainUtxo };
+export { i as encodeSolanaOnChainUtxo, r as hasSolanaOnChainData, a as isSolanaOnChainUtxo };

package/common/src/data-structures/event-service/evm/BlockchainEventEmitter.cjs

@@ -1 +1 @@
-require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../error-handling/logger.cjs`),t=require(`../../../functions/utils/getSignerFromContract.cjs`),n=require(`../../../constants/reorg-depths.constants.cjs`),r=require(`../../../functions/utils/resolve-sync.utils.cjs`),i=require(`../../BlockchainEvent/BlockchainEvent.cjs`);let a=require(`ethers`);var o=class{RETRY_MIN_PAGE_SIZE=100;MAX_RETRIES=20;_chainId;contract;_latestBlockNumber;_initialBlockNumber;onEventsProcessed;eventProcessors=new Set;maxPageSize;_isReady=!1;isServer;inProgress;eventsFetchingMutex;constructor(e,t,n,r,i,a){this.contract=t,this._chainId=e,this._initialBlockNumber=n,this.maxPageSize=a,this.isServer=r,this.inProgress=!1,this.eventsFetchingMutex=i}get latestBlockNumber(){return this._latestBlockNumber??this._initialBlockNumber}get chainId(){return this._chainId}get isReady(){return this._isReady}syncFromAtMost(e){(this._latestBlockNumber===void 0||e<this._latestBlockNumber)&&(this._latestBlockNumber=e)}advanceLatestBlockNumber(e){e>(this._latestBlockNumber??this._initialBlockNumber)&&(this._latestBlockNumber=e)}intervalClear(){this._isReady=!1,this.eventProcessors=new Set,this.clear()}async init(){if(this._isReady)throw Error(`Already initialized`);this._isReady=!0,await this.retrieveEvents(this.latestBlockNumber+1),this.startUpdateListener()}requireReady(){if(!this._isReady)throw Error(`Not ready`)}async getEventsForSingleContract(e,t,n,r=0){try{return(await e.queryFilter(`*`,t,n)).filter(e=>e instanceof a.ethers.EventLog)}catch(i){if(r<this.MAX_RETRIES&&n-t>this.RETRY_MIN_PAGE_SIZE){let i=Math.floor((t+n)/2),a=await this.getEventsForSingleContract(e,t,i,r+1),o=await this.getEventsForSingleContract(e,i+1,n,r+1);return[...a,...o]}throw i}}addEventProcessorFunction(e){if(this._isReady)throw Error(`Can't add event processor after event emitter initialized`);this.eventProcessors.add(e)}async getEventsInRange(e,t){let n=[];return await r.resolveSync(r.getSequence(e,t,this.maxPageSize).map(({from:e,to:t})=>async()=>{let r=await this.getEventsForSingleContract(this.contract,e,t);n.push(...r)})),n.map(e=>i.BlockchainEvent.fromEthers(e))}async getLastBlockNumberForEventRequest(){let e=await t.getProviderFromContract(this.contract).getBlockNumber();if(!this.isServer)return e;let{chainId:r}=await t.getProviderFromContract(this.contract).getNetwork();return Math.max(this.latestBlockNumber,e-n.blockReorgDepth[Number(r)]+1)}async retrieveEvents(t,n=!1){return this.requireReady(),await this.eventsFetchingMutex.runExclusive(async()=>{try{if(this.inProgress&&!n)return!1;this.inProgress=!0;let e=await this.getLastBlockNumberForEventRequest();if(e<t)return this.inProgress=!1,!1;let r=await this.getEventsInRange(t,e);return await this.processEvents(r,e),this._latestBlockNumber=e,this.inProgress=!1,!0}catch(t){return e.Logger.error(`retrieveEvents error`,t),this.inProgress=!1,!1}})}async processEvents(e,t){let n=(await Promise.all([...this.eventProcessors].map(n=>n(e,t)))).reduce((e,t)=>e+t,0);this.onEventsProcessed?.(n)}};exports.BlockchainEventEmitter=o;
+require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../../types/ethereum-network.types.cjs`),n=require(`../../../error-handling/logger.cjs`),r=require(`../../../constants/contracts.constants.cjs`),i=require(`../../../functions/web3/getContractMetadata.cjs`),a=require(`../../../functions/utils/getSignerFromContract.cjs`),o=require(`../../../functions/utils/resolve-sync.utils.cjs`),s=require(`../../../constants/reorg-depths.constants.cjs`),c=require(`../../BlockchainEvent/BlockchainEvent.cjs`);let l=require(`ethers`);var u=class{RETRY_MIN_PAGE_SIZE=100;MAX_RETRIES=20;_chainId;contract;_latestBlockNumber;_blockedUtxosContract;_initialBlockNumber;onEventsProcessed;eventProcessors=new Set;maxPageSize;_isReady=!1;isServer;inProgress;eventsFetchingMutex;constructor(e,t,n,r,i,a){this.contract=t,this._chainId=e,this._initialBlockNumber=n,this.maxPageSize=a,this.isServer=r,this.inProgress=!1,this.eventsFetchingMutex=i}get latestBlockNumber(){return this._latestBlockNumber??this._initialBlockNumber}get chainId(){return this._chainId}get isReady(){return this._isReady}syncFromAtMost(e){(this._latestBlockNumber===void 0||e<this._latestBlockNumber)&&(this._latestBlockNumber=e)}advanceLatestBlockNumber(e){e>(this._latestBlockNumber??this._initialBlockNumber)&&(this._latestBlockNumber=e)}intervalClear(){this._isReady=!1,this.eventProcessors=new Set,this.clear()}async init(){if(this._isReady)throw Error(`Already initialized`);this._isReady=!0,await this.retrieveEvents(this.latestBlockNumber+1),this.startUpdateListener()}requireReady(){if(!this._isReady)throw Error(`Not ready`)}async getEventsForSingleContract(e,t,n,r=0,i=`*`){try{return(await e.queryFilter(i,t,n)).filter(e=>e instanceof l.ethers.EventLog)}catch(a){if(r<this.MAX_RETRIES&&n-t>this.RETRY_MIN_PAGE_SIZE){let a=Math.floor((t+n)/2),o=await this.getEventsForSingleContract(e,t,a,r+1,i),s=await this.getEventsForSingleContract(e,a+1,n,r+1,i);return[...o,...s]}throw a}}get blockedUtxosContract(){if(this._blockedUtxosContract===void 0){let n=e.getNonLocalhostChainId(this._chainId);this._blockedUtxosContract=r.getDepositOnChainUtxosAddress(n)?i.getContractWithFetcherByChainId(n,t.ContractType.DepositOnChainUtxosContract):null}return this._blockedUtxosContract??void 0}addEventProcessorFunction(e){if(this._isReady)throw Error(`Can't add event processor after event emitter initialized`);this.eventProcessors.add(e)}async getEventsInRange(e,t){let n=[];return await o.resolveSync(o.getSequence(e,t,this.maxPageSize).map(({from:e,to:t})=>async()=>{let r=await this.getEventsForSingleContract(this.contract,e,t);n.push(...r);let i=this.blockedUtxosContract;i&&n.push(...await this.getEventsForSingleContract(i,e,t,0,`BlockedUtxosCreated`))})),n.map(e=>c.BlockchainEvent.fromEthers(e))}async getLastBlockNumberForEventRequest(){let e=await a.getProviderFromContract(this.contract).getBlockNumber();if(!this.isServer)return e;let{chainId:t}=await a.getProviderFromContract(this.contract).getNetwork();return Math.max(this.latestBlockNumber,e-s.blockReorgDepth[Number(t)]+1)}async retrieveEvents(e,t=!1){return this.requireReady(),await this.eventsFetchingMutex.runExclusive(async()=>{try{if(this.inProgress&&!t)return!1;this.inProgress=!0;let n=await this.getLastBlockNumberForEventRequest();if(n<e)return this.inProgress=!1,!1;let r=await this.getEventsInRange(e,n);return await this.processEvents(r,n),this._latestBlockNumber=n,this.inProgress=!1,!0}catch(e){return n.Logger.error(`retrieveEvents error`,e),this.inProgress=!1,!1}})}async processEvents(e,t){let n=(await Promise.all([...this.eventProcessors].map(n=>n(e,t)))).reduce((e,t)=>e+t,0);this.onEventsProcessed?.(n)}};exports.BlockchainEventEmitter=u;

package/common/src/data-structures/event-service/evm/BlockchainEventEmitter.d.ts

@@ -8,6 +8,7 @@ export declare abstract class BlockchainEventEmitter {
     private readonly _chainId;
     readonly contract: ethers.Contract;
     private _latestBlockNumber;
+    private _blockedUtxosContract;
     private _initialBlockNumber;
     onEventsProcessed?: (acceptedEventCount: number) => void;
     private eventProcessors;
@@ -26,6 +27,7 @@ export declare abstract class BlockchainEventEmitter {
     init(): Promise<void>;
     private requireReady;
     private getEventsForSingleContract;
+    private get blockedUtxosContract();
     addEventProcessorFunction(eventProcessorFunction: EventProcessorFunction): void;
     getEventsInRange(fromBlockNumber: number, toBlockNumber: number): Promise<BlockchainEvent[]>;
     getLastBlockNumberForEventRequest(): Promise<number>;