h_test_1 0.0.2 → 0.0.4

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const O=require("@solana/web3.js"),E=require("../../crypto/poseidon.cjs"),B=require("../../constants/chains.constants.cjs"),z=require("../utxo/Utxo.cjs"),_=require("./keys.cjs"),a=require("ethers"),y="solana-on-chain-utxo:",x=8,P=e=>{if(e.length!==x)throw new Error(`Expected ${x} on-chain fields, received ${e.length}`);const t=e.map((n,r)=>{const o=n instanceof Uint8Array?n:Uint8Array.from(n);if(o.length!==32)throw new Error(`Expected bytes32 length 32 at position ${r}, got ${o.length}`);return`0x${Buffer.from(o).toString("hex")}`});return`${y}${a.ethers.AbiCoder.defaultAbiCoder().encode(["bytes32[8]"],[t])}`},I=e=>e.startsWith(y),S=e=>{if(!I(e))throw new Error("Invalid encoded Solana UTXO payload");const[t]=a.ethers.AbiCoder.defaultAbiCoder().decode(["bytes32[8]"],e.slice(y.length)),n=t;if(!Array.isArray(n)||n.length!==x)throw new Error("Malformed encoded Solana UTXO payload");const[r,o,s,i,d,c,h,l]=n,m=BigInt(r),u=BigInt(i),A=a.ethers.toBeHex(BigInt(d)),g=BigInt(c),f=BigInt(h),H=BigInt(l).toString(),k=Array.from(a.ethers.getBytes(o)),w=Array.from(a.ethers.getBytes(s)),C=Uint8Array.from([...k.slice(16),...w.slice(16)]),p=new O.PublicKey(C).toBase58(),T=E.poseidonHash(BigInt(o),BigInt(s));return{amount:m,erc20TokenAddress:T,mintAddress:p,randomization:u,stealthAddress:A,H0:g,H1:f,timeStamp:H}},U=e=>{const t=a.ethers.AbiCoder.defaultAbiCoder().decode(["uint256","address","tuple(uint256, uint256, uint256, uint256)","uint256","uint256"],e),n=BigInt(t[0]),r=t[1],o=BigInt(t[2][0]),s=a.ethers.toBeHex(BigInt(t[2][1]).toString(16)),i=BigInt(t[2][2]),d=BigInt(t[2][3]),c=BigInt(t[3]).toString(),h=Number(t[4]);return{amount:n,erc20TokenAddress:r,randomization:o,stealthAddress:s,H0:i,H1:d,timeStamp:c,tokenId:h}},b=(e,t,n)=>{if(B.isSolanaLike(n)){const{amount:h,erc20TokenAddress:l,mintAddress:m,randomization:u,stealthAddress:A,timeStamp:g}=S(e);return{amount:h,erc20TokenAddress:l,mintAddress:m,timeStamp:g,tokenId:0,randomization:u,shieldedPrivateKey:t,stealthAddress:A}}const{amount:r,erc20TokenAddress:o,timeStamp:s,tokenId:i,randomization:d,stealthAddress:c}=U(e);return{amount:r,erc20TokenAddress:o,timeStamp:s,tokenId:i,randomization:d,shieldedPrivateKey:t,stealthAddress:c}},$=(e,t,n)=>new z.Utxo(b(e,t,n)),q=(e,t,n)=>{const{randomization:r,H0:o,H1:s}=B.isSolanaLike(n)?S(e):U(e),i=_.UserKeys.checkSignature(r,o,s,t);if(!i)throw new Error("UTXO doesn't belong to user");return i};exports.abiDecodeUtxo=U;exports.checkUtxoSignature=q;exports.decodeSolanaOnChainUtxo=S;exports.decodeUtxo=$;exports.decodeUtxoConstructorArgs=b;exports.encodeSolanaOnChainUtxo=P;exports.isSolanaOnChainUtxo=I;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const O=require("@solana/web3.js"),E=require("../../crypto/poseidon.cjs"),B=require("../../constants/chains.constants.cjs"),z=require("../utxo/Utxo.cjs"),_=require("./keys.cjs"),a=require("ethers"),y="solana-on-chain-utxo:",x=8,P=e=>{if(e.length!==x)throw new Error(`Expected ${x} on-chain fields, received ${e.length}`);const t=e.map((n,r)=>{const o=n instanceof Uint8Array?n:Uint8Array.from(n);if(o.length!==32)throw new Error(`Expected bytes32 length 32 at position ${r}, got ${o.length}`);return`0x${Buffer.from(o).toString("hex")}`});return`${y}${a.ethers.AbiCoder.defaultAbiCoder().encode(["bytes32[8]"],[t])}`},I=e=>e.startsWith(y),S=e=>{if(!I(e))throw new Error("Invalid encoded Solana UTXO payload");const[t]=a.ethers.AbiCoder.defaultAbiCoder().decode(["bytes32[8]"],e.slice(y.length)),n=t;if(!Array.isArray(n)||n.length!==x)throw new Error("Malformed encoded Solana UTXO payload");const[r,o,s,i,d,c,h,l]=n,m=BigInt(r),u=BigInt(i),A=a.ethers.toBeHex(BigInt(d)),g=BigInt(c),f=BigInt(h),H=BigInt(l).toString(),k=Array.from(a.ethers.getBytes(o)),w=Array.from(a.ethers.getBytes(s)),C=Uint8Array.from([...k.slice(16),...w.slice(16)]),p=new O.PublicKey(C).toBase58(),T=E.poseidonHash(BigInt(o),BigInt(s));return{amount:m,erc20TokenAddress:T,mintAddress:p,randomization:u,stealthAddress:A,H0:g,H1:f,timeStamp:H}},U=e=>{const t=a.ethers.AbiCoder.defaultAbiCoder().decode(["uint256","address","tuple(uint256, uint256, uint256, uint256)","uint256","uint256"],e),n=BigInt(t[0]),r=t[1],o=BigInt(t[2][0]),s=a.ethers.toBeHex(BigInt(t[2][1])),i=BigInt(t[2][2]),d=BigInt(t[2][3]),c=BigInt(t[3]).toString(),h=Number(t[4]);return{amount:n,erc20TokenAddress:r,randomization:o,stealthAddress:s,H0:i,H1:d,timeStamp:c,tokenId:h}},b=(e,t,n)=>{if(B.isSolanaLike(n)){const{amount:h,erc20TokenAddress:l,mintAddress:m,randomization:u,stealthAddress:A,timeStamp:g}=S(e);return{amount:h,erc20TokenAddress:l,mintAddress:m,timeStamp:g,tokenId:0,randomization:u,shieldedPrivateKey:t,stealthAddress:A}}const{amount:r,erc20TokenAddress:o,timeStamp:s,tokenId:i,randomization:d,stealthAddress:c}=U(e);return{amount:r,erc20TokenAddress:o,timeStamp:s,tokenId:i,randomization:d,shieldedPrivateKey:t,stealthAddress:c}},$=(e,t,n)=>new z.Utxo(b(e,t,n)),q=(e,t,n)=>{const{randomization:r,H0:o,H1:s}=B.isSolanaLike(n)?S(e):U(e),i=_.UserKeys.checkSignature(r,o,s,t);if(!i)throw new Error("UTXO doesn't belong to user");return i};exports.abiDecodeUtxo=U;exports.checkUtxoSignature=q;exports.decodeSolanaOnChainUtxo=S;exports.decodeUtxo=$;exports.decodeUtxoConstructorArgs=b;exports.encodeSolanaOnChainUtxo=P;exports.isSolanaOnChainUtxo=I;

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

@@ -32,7 +32,7 @@ const f = "solana-on-chain-utxo:", x = 8, F = (e) => {
     c,
     m,
     A
-  ] = o, l = BigInt(r), g = BigInt(i), h = d.toBeHex(BigInt(a)), u = BigInt(c), S = BigInt(m), H = BigInt(A).toString(), p = Array.from(d.getBytes(n)), U = Array.from(d.getBytes(s)), b = Uint8Array.from([...p.slice(16), ...U.slice(16)]), w = new T(b).toBase58(), k = C(BigInt(n), BigInt(s));
+  ] = o, l = BigInt(r), g = BigInt(i), h = d.toBeHex(BigInt(a)), u = BigInt(c), H = BigInt(m), S = BigInt(A).toString(), p = Array.from(d.getBytes(n)), U = Array.from(d.getBytes(s)), b = Uint8Array.from([...p.slice(16), ...U.slice(16)]), w = new T(b).toBase58(), k = C(BigInt(n), BigInt(s));
   return {
     amount: l,
     erc20TokenAddress: k,
@@ -40,14 +40,14 @@ const f = "solana-on-chain-utxo:", x = 8, F = (e) => {
     randomization: g,
     stealthAddress: h,
     H0: u,
-    H1: S,
-    timeStamp: H
+    H1: H,
+    timeStamp: S
   };
 }, I = (e) => {
   const t = d.AbiCoder.defaultAbiCoder().decode(
     ["uint256", "address", "tuple(uint256, uint256, uint256, uint256)", "uint256", "uint256"],
     e
-  ), o = BigInt(t[0]), r = t[1], n = BigInt(t[2][0]), s = d.toBeHex(BigInt(t[2][1]).toString(16)), i = BigInt(t[2][2]), a = BigInt(t[2][3]), c = BigInt(t[3]).toString(), m = Number(t[4]);
+  ), o = BigInt(t[0]), r = t[1], n = BigInt(t[2][0]), s = d.toBeHex(BigInt(t[2][1])), i = BigInt(t[2][2]), a = BigInt(t[2][3]), c = BigInt(t[3]).toString(), m = Number(t[4]);
   return {
     amount: o,
     erc20TokenAddress: r,

package/data-structures/crypto-keys/encryptDecryptUtxo.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("ethers"),a=require("libsodium-wrappers"),l=require("../utxo/Utxo.cjs"),m=require("@solana/web3.js"),B=require("./keys.cjs"),g=e=>{const o=[Buffer.from(r.ethers.toBeHex(e.amount)),Buffer.from(r.ethers.toBeHex(e.erc20TokenAddress)),Buffer.from(r.ethers.toBeHex(e.randomization)),Buffer.from(e.getStealthAddress()),Buffer.from(r.ethers.toBeHex(BigInt(e.timeStamp))),Buffer.from(r.ethers.toBeHex(e.tokenId??0))];if(e.mintAddress){const i=new m.PublicKey(e.mintAddress),t=r.ethers.hexlify(i.toBytes());o.push(Buffer.from(t))}const n=Buffer.concat(o);return a.crypto_box_seal(n,r.ethers.getBytes(e.getEncryptionKey()))},u=(e,o)=>{const{publicKey:n,privateKey:f}=B.UserKeys.getEncryptionKeyPair(o.getShieldedPrivateKey()),i=a.crypto_box_seal_open(e,r.ethers.getBytes(n),r.ethers.getBytes(f)),t=Buffer.from(i).toString("utf-8").split("0x").filter(s=>s.length!==0).map((s,y)=>{let c;return[0,2,4,5].includes(y)?c=BigInt(`0x${s}`):[1,3,6].includes(y)&&(c=`0x${s}`),c}),d=typeof t[6]=="string"?t[6]:void 0,p=d?new m.PublicKey(Buffer.from(d.slice(2),"hex")).toString():void 0;return{amount:t[0],erc20TokenAddress:t[1],randomization:t[2],stealthAddress:t[3],shieldedPrivateKey:o.getShieldedPrivateKey(),timeStamp:t[4].toString(),tokenId:t[5]?Number(t[5]):0,mintAddress:p}},h=(e,o)=>new l.Utxo(u(e,o));exports.decryptUtxo=h;exports.decryptUtxoConstructorArgs=u;exports.encryptUtxo=g;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("ethers"),a=require("libsodium-wrappers"),l=require("../utxo/Utxo.cjs"),m=require("@solana/web3.js"),B=require("./keys.cjs"),g=e=>{const r=[Buffer.from(o.ethers.toBeHex(e.amount)),Buffer.from(e.erc20TokenAddress),Buffer.from(o.ethers.toBeHex(e.randomization)),Buffer.from(e.getStealthAddress()),Buffer.from(o.ethers.toBeHex(BigInt(e.timeStamp))),Buffer.from(o.ethers.toBeHex(e.tokenId??0))];if(e.mintAddress){const t=new m.PublicKey(e.mintAddress).toBytes();r.push(Buffer.from(t))}const n=Buffer.concat(r);return a.crypto_box_seal(n,o.ethers.getBytes(e.getEncryptionKey()))},p=(e,r)=>{const{publicKey:n,privateKey:c}=B.UserKeys.getEncryptionKeyPair(r.getShieldedPrivateKey()),d=a.crypto_box_seal_open(e,o.ethers.getBytes(n),o.ethers.getBytes(c)),t=Buffer.from(d).toString("utf-8").split("0x").filter(s=>s.length!==0).map((s,y)=>{let i;return[0,2,4,5].includes(y)?i=BigInt(`0x${s}`):[1,3,6].includes(y)&&(i=`0x${s}`),i}),f=typeof t[6]=="string"?t[6]:void 0,u=f?new m.PublicKey(Buffer.from(f.slice(2),"hex")).toString():void 0;return{amount:t[0],erc20TokenAddress:t[1],randomization:t[2],stealthAddress:t[3],shieldedPrivateKey:r.getShieldedPrivateKey(),timeStamp:t[4].toString(),tokenId:t[5]?Number(t[5]):0,mintAddress:u}},h=(e,r)=>new l.Utxo(p(e,r));exports.decryptUtxo=h;exports.decryptUtxoConstructorArgs=p;exports.encryptUtxo=g;

package/data-structures/crypto-keys/encryptDecryptUtxo.mjs

@@ -1,44 +1,44 @@
-import { ethers as r } from "ethers";
+import { ethers as o } from "ethers";
 import a from "libsodium-wrappers";
 import { Utxo as B } from "../utxo/Utxo.mjs";
-import { PublicKey as y } from "@solana/web3.js";
+import { PublicKey as p } from "@solana/web3.js";
 import { UserKeys as l } from "./keys.mjs";
 const K = (e) => {
-  const o = [
-    Buffer.from(r.toBeHex(e.amount)),
-    Buffer.from(r.toBeHex(e.erc20TokenAddress)),
-    Buffer.from(r.toBeHex(e.randomization)),
+  const r = [
+    Buffer.from(o.toBeHex(e.amount)),
+    Buffer.from(e.erc20TokenAddress),
+    Buffer.from(o.toBeHex(e.randomization)),
     Buffer.from(e.getStealthAddress()),
-    Buffer.from(r.toBeHex(BigInt(e.timeStamp))),
-    Buffer.from(r.toBeHex(e.tokenId ?? 0))
+    Buffer.from(o.toBeHex(BigInt(e.timeStamp))),
+    Buffer.from(o.toBeHex(e.tokenId ?? 0))
   ];
   if (e.mintAddress) {
-    const i = new y(e.mintAddress), t = r.hexlify(i.toBytes());
-    o.push(Buffer.from(t));
+    const t = new p(e.mintAddress).toBytes();
+    r.push(Buffer.from(t));
   }
-  const s = Buffer.concat(o);
-  return a.crypto_box_seal(s, r.getBytes(e.getEncryptionKey()));
-}, g = (e, o) => {
-  const { publicKey: s, privateKey: d } = l.getEncryptionKeyPair(o.getShieldedPrivateKey()), i = a.crypto_box_seal_open(
+  const s = Buffer.concat(r);
+  return a.crypto_box_seal(s, o.getBytes(e.getEncryptionKey()));
+}, g = (e, r) => {
+  const { publicKey: s, privateKey: f } = l.getEncryptionKeyPair(r.getShieldedPrivateKey()), d = a.crypto_box_seal_open(
     e,
-    r.getBytes(s),
-    r.getBytes(d)
-  ), t = Buffer.from(i).toString("utf-8").split("0x").filter((n) => n.length !== 0).map((n, c) => {
-    let f;
-    return [0, 2, 4, 5].includes(c) ? f = BigInt(`0x${n}`) : [1, 3, 6].includes(c) && (f = `0x${n}`), f;
-  }), m = typeof t[6] == "string" ? t[6] : void 0, p = m ? new y(Buffer.from(m.slice(2), "hex")).toString() : void 0;
+    o.getBytes(s),
+    o.getBytes(f)
+  ), t = Buffer.from(d).toString("utf-8").split("0x").filter((n) => n.length !== 0).map((n, c) => {
+    let i;
+    return [0, 2, 4, 5].includes(c) ? i = BigInt(`0x${n}`) : [1, 3, 6].includes(c) && (i = `0x${n}`), i;
+  }), m = typeof t[6] == "string" ? t[6] : void 0, y = m ? new p(Buffer.from(m.slice(2), "hex")).toString() : void 0;
   return {
     amount: t[0],
     erc20TokenAddress: t[1],
     randomization: t[2],
     stealthAddress: t[3],
-    shieldedPrivateKey: o.getShieldedPrivateKey(),
+    shieldedPrivateKey: r.getShieldedPrivateKey(),
     timeStamp: t[4].toString(),
     tokenId: t[5] ? Number(t[5]) : 0,
     // tokenId
-    mintAddress: p
+    mintAddress: y
   };
-}, S = (e, o) => new B(g(e, o));
+}, S = (e, r) => new B(g(e, r));
 export {
   S as decryptUtxo,
   g as decryptUtxoConstructorArgs,

package/functions/utils/publicBalance.utils.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const B=require("ethers"),p=require("../../constants/chains.constants.cjs"),g=require("../../constants/protocol.constants.cjs"),d=require("./erc20tokenFunctions.cjs"),P=require("../../externalABIs/swapAbi.cjs"),m=require("../../error-handling/logger.cjs"),w=require("../../externalABIs/index.cjs"),y=require("./ipfs.cjs"),C=require("./create-provider.cjs"),k=require("../../data-structures/http/HttpClient.cjs");require("axios");const f=require("@solana/web3.js"),b=require("@solana/spl-token"),T=n=>{const{fetchRpcUrl:e}=p.networkRegistry[n];if(!e)throw new Error(`No RPC URL configured for chain ${n}`);return C.createCustomRpcProvider(e)},R=async(n,e,t)=>{try{const s=t.erc20TokenAddress;let c;const o=new B.ethers.Contract(t.erc20TokenAddress,P.ERC20ABI,n);s!==g.zeroAddress?c=await o?.balanceOf(e):c=await n.getBalance(e);const r=c.toBigInt();return r<=0n?null:{token:t,balance:r}}catch{return null}},q=async(n,e)=>{const t=e.nftTokenType===g.TokenType.ERC721,s=new B.ethers.Contract(e.erc20TokenAddress,t?w.ERC721ABI:w.ERC1155ABI,n),{tokenIds:c}=e;if(!c?.length)return null;const o=await Promise.all(c.map(async r=>{try{const a=await s[t?"tokenURI":"uri"](r),l=a.startsWith("ipfs://")?y.getFormattedIpfsUrl(a,!1):a,u=t?l:l.replace("{id}",r);if(u){const i=await k.httpClient.get(u);return i?.image?.startsWith("ipfs://")&&(i.image=y.getFormattedIpfsUrl(i.image,!1)),{image:i.image,tokenId:Number(r),name:i.name}}return{tokenId:Number(r)}}catch{return{tokenId:Number(r)}}}));return{token:e,balance:c?.length?BigInt(c.length):0n,nfts:o}},E=async(n,e,t)=>{const s=t??d.getErc20TokensForChain(n),c=T(n);return(await Promise.all(s.map(async r=>d.isNFTToken(r)?q(c,r):R(c,e,r)))).filter(r=>r!==null)},N=async(n,e,t)=>{try{const s=T(n),c=new B.ethers.Contract(t,P.ERC20ABI,s);let o;return t!==g.zeroAddress?o=await c?.balanceOf(e):o=await s.getBalance(e),o.toBigInt()}catch{return m.Logger.error(`Failed to fetch public balance for address ${e}`),null}},U=async(n,e)=>{try{return await T(n).getTransactionCount(e)}catch(t){return m.Logger.error(`Failed to fetch transaction count for address ${e} on chain ${n}`,t),null}},v=async(n,e,t)=>{const c=p.networkRegistry[n].fetchRpcUrl??"",o=C.createCustomSolanaConnection(c);return(await Promise.all(t.map(async a=>{if(d.isNFTToken(a))return{token:a,balance:1n,nfts:[{image:a.logoURI,tokenId:0,name:a.symbol}]};if(a.erc20TokenAddress===g.solanaNativeAddress){const I=BigInt(await o.getBalance(new f.PublicKey(e)));return{token:a,balance:I}}const l=new f.PublicKey(a.erc20TokenAddress),u=new f.PublicKey(e),i=await b.getAssociatedTokenAddress(l,u,!0,a.is2022Program?b.TOKEN_2022_PROGRAM_ID:b.TOKEN_PROGRAM_ID);if(!await o.getAccountInfo(i))return{token:a,balance:0n};const h=await o.getTokenAccountBalance(i),A=BigInt(h.value.amount);return{token:a,balance:A}}))).filter(a=>a.balance>0n)};exports.getPublicBalance=R;exports.getPublicBalanceByTokenAddress=N;exports.getPublicBalancesOfTokens=E;exports.getPublicTransactionCount=U;exports.getSolanaPublicBalances=v;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const T=require("ethers"),p=require("../../constants/chains.constants.cjs"),g=require("../../constants/protocol.constants.cjs"),d=require("./erc20tokenFunctions.cjs"),P=require("../../externalABIs/swapAbi.cjs"),m=require("../../error-handling/logger.cjs"),w=require("../../externalABIs/index.cjs"),y=require("./ipfs.cjs"),C=require("./create-provider.cjs"),k=require("../../data-structures/http/HttpClient.cjs");require("axios");const f=require("@solana/web3.js"),b=require("@solana/spl-token"),B=n=>{const{fetchRpcUrl:e}=p.networkRegistry[n];if(!e)throw new Error(`No RPC URL configured for chain ${n}`);return C.createCustomRpcProvider(e)},R=async(n,e,t)=>{try{const s=t.erc20TokenAddress;let c;const o=new T.ethers.Contract(t.erc20TokenAddress,P.ERC20ABI,n);s!==g.zeroAddress?c=await o?.balanceOf(e):c=await n.getBalance(e);const r=c;return r<=0n?null:{token:t,balance:r}}catch{return null}},q=async(n,e)=>{const t=e.nftTokenType===g.TokenType.ERC721,s=new T.ethers.Contract(e.erc20TokenAddress,t?w.ERC721ABI:w.ERC1155ABI,n),{tokenIds:c}=e;if(!c?.length)return null;const o=await Promise.all(c.map(async r=>{try{const a=await s[t?"tokenURI":"uri"](r),l=a.startsWith("ipfs://")?y.getFormattedIpfsUrl(a,!1):a,u=t?l:l.replace("{id}",r);if(u){const i=await k.httpClient.get(u);return i?.image?.startsWith("ipfs://")&&(i.image=y.getFormattedIpfsUrl(i.image,!1)),{image:i.image,tokenId:Number(r),name:i.name}}return{tokenId:Number(r)}}catch{return{tokenId:Number(r)}}}));return{token:e,balance:c?.length?BigInt(c.length):0n,nfts:o}},E=async(n,e,t)=>{const s=t??d.getErc20TokensForChain(n),c=B(n);return(await Promise.all(s.map(async r=>d.isNFTToken(r)?q(c,r):R(c,e,r)))).filter(r=>r!==null)},N=async(n,e,t)=>{try{const s=B(n),c=new T.ethers.Contract(t,P.ERC20ABI,s);let o;return t!==g.zeroAddress?o=await c?.balanceOf(e):o=await s.getBalance(e),o}catch{return m.Logger.error(`Failed to fetch public balance for address ${e}`),null}},U=async(n,e)=>{try{return await B(n).getTransactionCount(e)}catch(t){return m.Logger.error(`Failed to fetch transaction count for address ${e} on chain ${n}`,t),null}},v=async(n,e,t)=>{const c=p.networkRegistry[n].fetchRpcUrl??"",o=C.createCustomSolanaConnection(c);return(await Promise.all(t.map(async a=>{if(d.isNFTToken(a))return{token:a,balance:1n,nfts:[{image:a.logoURI,tokenId:0,name:a.symbol}]};if(a.erc20TokenAddress===g.solanaNativeAddress){const I=BigInt(await o.getBalance(new f.PublicKey(e)));return{token:a,balance:I}}const l=new f.PublicKey(a.erc20TokenAddress),u=new f.PublicKey(e),i=await b.getAssociatedTokenAddress(l,u,!0,a.is2022Program?b.TOKEN_2022_PROGRAM_ID:b.TOKEN_PROGRAM_ID);if(!await o.getAccountInfo(i))return{token:a,balance:0n};const h=await o.getTokenAccountBalance(i),A=BigInt(h.value.amount);return{token:a,balance:A}}))).filter(a=>a.balance>0n)};exports.getPublicBalance=R;exports.getPublicBalanceByTokenAddress=N;exports.getPublicBalancesOfTokens=E;exports.getPublicTransactionCount=U;exports.getSolanaPublicBalances=v;

package/functions/utils/publicBalance.utils.mjs

@@ -1,10 +1,10 @@
 import { ethers as m } from "ethers";
 import { networkRegistry as d } from "../../constants/chains.constants.mjs";
-import { zeroAddress as b, solanaNativeAddress as P, TokenType as I } from "../../constants/protocol.constants.mjs";
-import { getErc20TokensForChain as h, isNFTToken as w } from "./erc20tokenFunctions.mjs";
+import { zeroAddress as b, solanaNativeAddress as P, TokenType as h } from "../../constants/protocol.constants.mjs";
+import { getErc20TokensForChain as A, isNFTToken as w } from "./erc20tokenFunctions.mjs";
 import { ERC20ABI as B } from "../../externalABIs/swapAbi.mjs";
 import { Logger as T } from "../../error-handling/logger.mjs";
-import { ERC721ABI as A, ERC1155ABI as E } from "../../externalABIs/index.mjs";
+import { ERC721ABI as I, ERC1155ABI as E } from "../../externalABIs/index.mjs";
 import { getFormattedIpfsUrl as p } from "./ipfs.mjs";
 import { createCustomSolanaConnection as N, createCustomRpcProvider as U } from "./create-provider.mjs";
 import { httpClient as k } from "../../data-structures/http/HttpClient.mjs";
@@ -22,13 +22,13 @@ const g = (n) => {
     let r;
     const o = new m.Contract(a.erc20TokenAddress, B, n);
     s !== b ? r = await o?.balanceOf(t) : r = await n.getBalance(t);
-    const c = r.toBigInt();
+    const c = r;
     return c <= 0n ? null : { token: a, balance: c };
   } catch {
     return null;
   }
 }, $ = async (n, t) => {
-  const a = t.nftTokenType === I.ERC721, s = new m.Contract(t.erc20TokenAddress, a ? A : E, n), { tokenIds: r } = t;
+  const a = t.nftTokenType === h.ERC721, s = new m.Contract(t.erc20TokenAddress, a ? I : E, n), { tokenIds: r } = t;
   if (!r?.length)
     return null;
   const o = await Promise.all(
@@ -51,7 +51,7 @@ const g = (n) => {
     nfts: o
   };
 }, V = async (n, t, a) => {
-  const s = a ?? h(n), r = g(n);
+  const s = a ?? A(n), r = g(n);
   return (await Promise.all(
     s.map(async (c) => w(c) ? $(r, c) : _(r, t, c))
   )).filter((c) => c !== null);
@@ -59,7 +59,7 @@ const g = (n) => {
   try {
     const s = g(n), r = new m.Contract(a, B, s);
     let o;
-    return a !== b ? o = await r?.balanceOf(t) : o = await s.getBalance(t), o.toBigInt();
+    return a !== b ? o = await r?.balanceOf(t) : o = await s.getBalance(t), o;
   } catch {
     return T.error(`Failed to fetch public balance for address ${t}`), null;
   }

package/functions/web3/uniswapAPI.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const g=require("ethers");require("../../constants/token-data/index.cjs");const u=require("../../constants/chains.constants.cjs"),C=require("../../constants/protocol.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");const p=require("../../error-handling/error-codes.constants.cjs"),P=require("./etherFunctions.cjs");require("../../types/circom-data.types.cjs");const d=require("../../types/ethereum-network.types.cjs");require("../../types/activities.types.cjs");require("../../API/getServerURL.cjs");require("../../data-structures/http/HttpClient.cjs");require("axios");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const h=require("../../error-handling/logError.cjs");require("../../constants/save-depths.cjs");require("../utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("../../data-structures/crypto-keys/keys.cjs");const l=async(s,t,c,r)=>{const o=(await Promise.all([100,500,3e3,1e4].map(async e=>({poolAddress:await t.getPool(c,r,e),fee:e})))).filter(({poolAddress:e})=>e!==C.zeroAddress),n=await Promise.all(o.map(async e=>({poolAddress:e.poolAddress,fee:e.fee,token1Balance:(await s.balanceOf(e.poolAddress)).toBigInt()}))),a=n.map(e=>e.token1Balance).reduce((e,q)=>q>=e?q:e,0n);if(a===0n)throw new Error(p.transactionErrorCodes.UNISWAP_NOT_ENOUGH_LIQUIDITY);return n.find(e=>e.token1Balance===a)},w=async(s,t,c,r,o,n)=>{try{if(!u.networkRegistry[t].quoterV2Address)throw Error("No Quoter Contract Provided");return(await s.getContractWithFetcherByChainId(t,d.ContractType.UniswapV3QuoterContract,u.networkRegistry[t].quoterV2Address).quoteExactInputSingle.staticCall({tokenIn:c.wrappedErc20TokenAddress??c.erc20TokenAddress,tokenOut:r.wrappedErc20TokenAddress??r.erc20TokenAddress,fee:o,amountIn:n,sqrtPriceLimitX96:0})).amountOut.toBigInt()}catch(i){throw h.logError(i),i}},A=async(s,t,c,r)=>{try{const o=s.getContractWithFetcherByChainId(t,d.ContractType.UniswapV3FactoryContract,u.networkRegistry[t].uniswapV3FactoryAddress),n=s.getContractWithFetcherByChainId(t,d.ContractType.ERC20Contract,r.wrappedErc20TokenAddress??r.erc20TokenAddress),{fee:i}=await l(n,o,c.wrappedErc20TokenAddress??c.erc20TokenAddress,r.wrappedErc20TokenAddress??r.erc20TokenAddress);return i}catch(o){throw console.log("Error in getUniswapFee",o),o}},E=async(s,t,c,r,o)=>{try{const n=await A(s,t,r,o),i=g.ethers.AbiCoder.defaultAbiCoder().encode(["uint24"],[n]),a=P.getAmountInWei(r,c);return{tokenPrice:await w(s,t,r,o,n,a),poolFee:i}}catch{throw Error(p.transactionErrorCodes.NO_UNISWAP_PRICE)}};exports.getUniswapFee=A;exports.getUniswapPrice=E;exports.getUniswapPriceHelper=w;exports.searchPoolAndFee=l;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const C=require("ethers");require("../../constants/token-data/index.cjs");const u=require("../../constants/chains.constants.cjs"),g=require("../../constants/protocol.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");const p=require("../../error-handling/error-codes.constants.cjs"),P=require("./etherFunctions.cjs");require("../../types/circom-data.types.cjs");const d=require("../../types/ethereum-network.types.cjs");require("../../types/activities.types.cjs");require("../../API/getServerURL.cjs");require("../../data-structures/http/HttpClient.cjs");require("axios");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const h=require("../../error-handling/logError.cjs");require("../../constants/save-depths.cjs");require("../utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("../../data-structures/crypto-keys/keys.cjs");const l=async(n,t,c,r)=>{const o=(await Promise.all([100,500,3e3,1e4].map(async e=>({poolAddress:await t.getPool(c,r,e),fee:e})))).filter(({poolAddress:e})=>e!==g.zeroAddress),s=await Promise.all(o.map(async e=>({poolAddress:e.poolAddress,fee:e.fee,token1Balance:await n.balanceOf(e.poolAddress)}))),a=s.map(e=>e.token1Balance).reduce((e,q)=>q>=e?q:e,0n);if(a===0n)throw new Error(p.transactionErrorCodes.UNISWAP_NOT_ENOUGH_LIQUIDITY);return s.find(e=>e.token1Balance===a)},w=async(n,t,c,r,o,s)=>{try{if(!u.networkRegistry[t].quoterV2Address)throw Error("No Quoter Contract Provided");return(await n.getContractWithFetcherByChainId(t,d.ContractType.UniswapV3QuoterContract,u.networkRegistry[t].quoterV2Address).quoteExactInputSingle.staticCall({tokenIn:c.wrappedErc20TokenAddress??c.erc20TokenAddress,tokenOut:r.wrappedErc20TokenAddress??r.erc20TokenAddress,fee:o,amountIn:s,sqrtPriceLimitX96:0})).amountOut}catch(i){throw h.logError(i),i}},A=async(n,t,c,r)=>{try{const o=n.getContractWithFetcherByChainId(t,d.ContractType.UniswapV3FactoryContract,u.networkRegistry[t].uniswapV3FactoryAddress),s=n.getContractWithFetcherByChainId(t,d.ContractType.ERC20Contract,r.wrappedErc20TokenAddress??r.erc20TokenAddress),{fee:i}=await l(s,o,c.wrappedErc20TokenAddress??c.erc20TokenAddress,r.wrappedErc20TokenAddress??r.erc20TokenAddress);return i}catch(o){throw console.log("Error in getUniswapFee",o),o}},E=async(n,t,c,r,o)=>{try{const s=await A(n,t,r,o),i=C.ethers.AbiCoder.defaultAbiCoder().encode(["uint24"],[s]),a=P.getAmountInWei(r,c);return{tokenPrice:await w(n,t,r,o,s,a),poolFee:i}}catch{throw Error(p.transactionErrorCodes.NO_UNISWAP_PRICE)}};exports.getUniswapFee=A;exports.getUniswapPrice=E;exports.getUniswapPriceHelper=w;exports.searchPoolAndFee=l;

package/functions/web3/uniswapAPI.mjs

@@ -32,27 +32,27 @@ import "../utils/mutexes.utils.mjs";
 import "@coral-xyz/anchor";
 import "@solana/web3.js";
 import "../../data-structures/crypto-keys/keys.mjs";
-const C = async (s, o, i, t) => {
+const C = async (n, o, i, t) => {
   const e = (await Promise.all(
     [100, 500, 3e3, 1e4].map(async (r) => ({
       poolAddress: await o.getPool(i, t, r),
       fee: r
     }))
-  )).filter(({ poolAddress: r }) => r !== u), n = await Promise.all(
+  )).filter(({ poolAddress: r }) => r !== u), s = await Promise.all(
     e.map(async (r) => ({
       poolAddress: r.poolAddress,
       fee: r.fee,
-      token1Balance: (await s.balanceOf(r.poolAddress)).toBigInt()
+      token1Balance: await n.balanceOf(r.poolAddress)
     }))
-  ), c = n.map((r) => r.token1Balance).reduce((r, d) => d >= r ? d : r, 0n);
+  ), c = s.map((r) => r.token1Balance).reduce((r, d) => d >= r ? d : r, 0n);
   if (c === 0n)
     throw new Error(l.UNISWAP_NOT_ENOUGH_LIQUIDITY);
-  return n.find((r) => r.token1Balance === c);
-}, g = async (s, o, i, t, e, n) => {
+  return s.find((r) => r.token1Balance === c);
+}, E = async (n, o, i, t, e, s) => {
   try {
     if (!p[o].quoterV2Address)
       throw Error("No Quoter Contract Provided");
-    return (await s.getContractWithFetcherByChainId(
+    return (await n.getContractWithFetcherByChainId(
       o,
       m.UniswapV3QuoterContract,
       p[o].quoterV2Address
@@ -60,24 +60,24 @@ const C = async (s, o, i, t) => {
       tokenIn: i.wrappedErc20TokenAddress ?? i.erc20TokenAddress,
       tokenOut: t.wrappedErc20TokenAddress ?? t.erc20TokenAddress,
       fee: e,
-      amountIn: n,
+      amountIn: s,
       sqrtPriceLimitX96: 0
-    })).amountOut.toBigInt();
+    })).amountOut;
   } catch (a) {
     throw y(a), a;
   }
-}, E = async (s, o, i, t) => {
+}, P = async (n, o, i, t) => {
   try {
-    const e = s.getContractWithFetcherByChainId(
+    const e = n.getContractWithFetcherByChainId(
       o,
       m.UniswapV3FactoryContract,
       p[o].uniswapV3FactoryAddress
-    ), n = s.getContractWithFetcherByChainId(
+    ), s = n.getContractWithFetcherByChainId(
       o,
       m.ERC20Contract,
       t.wrappedErc20TokenAddress ?? t.erc20TokenAddress
     ), { fee: a } = await C(
-      n,
+      s,
       e,
       i.wrappedErc20TokenAddress ?? i.erc20TokenAddress,
       t.wrappedErc20TokenAddress ?? t.erc20TokenAddress
@@ -86,15 +86,15 @@ const C = async (s, o, i, t) => {
   } catch (e) {
     throw console.log("Error in getUniswapFee", e), e;
   }
-}, tr = async (s, o, i, t, e) => {
+}, tr = async (n, o, i, t, e) => {
   try {
-    const n = await E(s, o, t, e), a = w.AbiCoder.defaultAbiCoder().encode(["uint24"], [n]), c = f(t, i);
-    return { tokenPrice: await g(
-      s,
+    const s = await P(n, o, t, e), a = w.AbiCoder.defaultAbiCoder().encode(["uint24"], [s]), c = f(t, i);
+    return { tokenPrice: await E(
+      n,
       o,
       t,
       e,
-      n,
+      s,
       c
     ), poolFee: a };
   } catch {
@@ -102,8 +102,8 @@ const C = async (s, o, i, t) => {
   }
 };
 export {
-  E as getUniswapFee,
+  P as getUniswapFee,
   tr as getUniswapPrice,
-  g as getUniswapPriceHelper,
+  E as getUniswapPriceHelper,
   C as searchPoolAndFee
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h_test_1",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "homepage": "hinkal.io",
   "author": {
     "name": "Hinkal Protocol"

package/webworker/utxoWorker/utxoWorkerLauncher.cjs

@@ -1 +1 @@
-"use strict";const e=""+(typeof document>"u"?require("url").pathToFileURL(__dirname+"/../../assets/utxoWorkerLauncher-DIxTEqwm.js").href:new URL("../../assets/utxoWorkerLauncher-DIxTEqwm.js",document.currentScript&&document.currentScript.src||document.baseURI).href);module.exports=e;
+"use strict";const e=""+(typeof document>"u"?require("url").pathToFileURL(__dirname+"/../../assets/utxoWorkerLauncher-RoJ0StvR.js").href:new URL("../../assets/utxoWorkerLauncher-RoJ0StvR.js",document.currentScript&&document.currentScript.src||document.baseURI).href);module.exports=e;

package/webworker/utxoWorker/utxoWorkerLauncher.mjs

@@ -1,4 +1,4 @@
-const e = "" + new URL("../../assets/utxoWorkerLauncher-DIxTEqwm.js", import.meta.url).href;
+const e = "" + new URL("../../assets/utxoWorkerLauncher-RoJ0StvR.js", import.meta.url).href;
 export {
   e as default
 };