@hinkal/common 0.3.13 → 0.3.14

package/common/src/functions/utils/receive-vault-scan.utils.mjs

@@ -1,60 +1,55 @@
-import { FRONT_END_SUPPORTED_CHAINS as e, isTronLike as t } from "../../constants/chains.constants.mjs";
-import { caseInsensitiveEqual as n } from "./caseInsensitive.utils.mjs";
-import { Logger as r } from "../../error-handling/logger.mjs";
-import { addressToHexFormat as i } from "./tron.utils.mjs";
-import { ReceiveVaultBlockReason as a } from "../../types/receive-vault.types.mjs";
-import { isReceiveVaultExpired as o, isReceiveVaultSupported as s } from "./receive-vault.utils.mjs";
-import { getErc20TokenFromAPI as c, isArcNativeToken as l } from "./erc20tokenFunctions.mjs";
-import { getPublicBalanceByTokenAddress as u } from "./publicBalance.utils.mjs";
-import { getEvmWalletTokenAddresses as d, getTronWalletTokenAddresses as f } from "./wallet-token-discovery.utils.mjs";
+import { isSolanaLike as e } from "../../constants/chains.constants.mjs";
+import { Logger as t } from "../../error-handling/logger.mjs";
+import { addressEqual as n, normalizeAddress as r } from "./addresses.mjs";
+import { ReceiveVaultBlockReason as i } from "../../types/receive-vault.types.mjs";
+import { receiveVaultChainsForNetwork as a } from "./receive-vault.utils.mjs";
+import { getErc20TokenFromAPI as o, isArcNativeToken as s } from "./erc20tokenFunctions.mjs";
+import { getPublicBalanceByTokenAddress as c } from "./publicBalance.utils.mjs";
+import { getSolanaWalletTokenHoldings as l } from "./wallet-token-discovery.utils.mjs";
 //#region libs/shared/common/src/functions/utils/receive-vault-scan.utils.ts
-var p = async (e, t, n) => await u(t, i(e), i(n)) ?? 0n, m = (n) => e.filter((e) => s(e) && t(e) === t(n.chainId)), h = async (e, n) => {
+var u = async (e, t, n) => await c(t, r(t, e), r(t, n)) ?? 0n, d = async (e, n) => {
 	try {
-		return await (t(e) ? f(n, e) : d(e, n));
-	} catch (t) {
-		return r.error(`receive-vault scan: token discovery failed for chain ${e}`, t), [];
+		return await l(e, n);
+	} catch (n) {
+		return t.error(`receive-vault scan: token discovery failed for chain ${e}`, n), [];
 	}
-}, g = async (e, t) => {
-	let r = /* @__PURE__ */ new Map(), i = (e, t, n, i) => r.set(`${t}:${e.vaultAddress}:${n}`.toLowerCase(), {
-		record: e,
-		chainId: t,
-		token: n,
-		reason: i
-	});
-	return await Promise.all(e.map(async (e) => {
-		let t = o(e), r = t ? a.Expired : a.NotShieldable;
-		await Promise.all(m(e).map(async (o) => {
-			(await h(o, e.vaultAddress)).forEach((s) => {
-				if (o === e.chainId && n(s, e.token)) {
-					t && i(e, o, s, a.Expired);
-					return;
-				}
-				i(e, o, s, r);
-			});
+}, f = async (t, o) => {
+	let s = /* @__PURE__ */ new Map(), c = (e, t, n, i) => {
+		let a = `${t}:${r(t, e.vaultAddress)}:${r(t, n)}`;
+		s.set(a, {
+			record: e,
+			chainId: t,
+			token: n,
+			reason: i
+		});
+	};
+	return await Promise.all(t.map(async (t) => {
+		await Promise.all(a(t.network).filter(e).map(async (e) => {
+			(await d(e, t.vaultAddress)).filter(({ is2022Program: e }) => e).forEach(({ token: n }) => c(t, e, n, i.NotShieldable));
 		}));
-	})), t.forEach((t) => {
-		let r = e.find((e) => n(e.vaultAddress, t.vaultAddress));
-		r && i(r, t.chainId, t.token, a.RiskySender);
-	}), [...r.values()];
-}, _ = async (e, t) => {
+	})), o.forEach((e) => {
+		let r = t.find((t) => n(e.chainId, t.vaultAddress, e.vaultAddress));
+		r && c(r, e.chainId, e.token, i.RiskySender);
+	}), [...s.values()];
+}, p = async (e, n) => {
 	try {
-		return (await Promise.all((await g(e, t)).map(async (e) => {
+		return (await Promise.all((await f(e, n)).map(async (e) => {
 			try {
-				let [t, n] = await Promise.all([c(e.chainId, e.token), p(e.record.vaultAddress, e.chainId, e.token)]);
-				return t && !l(t) && n > 0n ? {
+				let [t, n] = await Promise.all([o(e.chainId, e.token), u(e.record.vaultAddress, e.chainId, e.token)]);
+				return t && !s(t) && n > 0n ? {
 					record: e.record,
 					token: t,
 					amount: n,
 					reason: e.reason
 				} : void 0;
-			} catch (t) {
-				r.error(`receive-vault scan: balance lookup failed for chain ${e.chainId} token ${e.token}`, t);
+			} catch (n) {
+				t.error(`receive-vault scan: balance lookup failed for chain ${e.chainId} token ${e.token}`, n);
 				return;
 			}
 		}))).filter((e) => !!e);
 	} catch (e) {
-		return r.log("Error fetching vault's blcoked balances", e), [];
+		return t.log("Error fetching vault's blocked balances", e), [];
 	}
 };
 //#endregion
-export { _ as getReceiveVaultBlockedFunds };
+export { p as getReceiveVaultBlockedFunds };

package/common/src/functions/utils/receive-vault-solana.utils.cjs

@@ -0,0 +1 @@
+const e=require(`../../../../_virtual/_rolldown/runtime.cjs`);let t=require(`ethers`),n=require(`@solana/web3.js`),r=require(`bs58`);r=e.__toESM(r);let i=require(`tweetnacl`);i=e.__toESM(i);var a=Buffer.from(`hinkal_receive_vault`),o=Buffer.from(`HINKAL_RECEIVE_OUTPUT`),s=Buffer.from(`HINKAL_RECEIVE_RECOVER`),c=Buffer.from(`hinkal_receive_recovery`),l=e=>t.ethers.getBytes(e),u=e=>{if(e<0n||e>255n)throw Error(`receive vault: version must fit in u8`);return Uint8Array.of(Number(e))},d=e=>t.ethers.getBytes(t.ethers.toBeHex(e,32)),f=e=>l(t.ethers.sha256(t.ethers.concat([d(e.recipient.H0x),d(e.recipient.H0y),d(e.recipient.H1x),d(e.recipient.H1y),d(e.recipient.stealthAddress),new n.PublicKey(e.owner).toBytes(),u(e.version)]))),p=(e,t,r)=>n.PublicKey.findProgramAddressSync([a,new n.PublicKey(r).toBytes(),Buffer.from(f(e))],new n.PublicKey(t))[0].toBase58(),m=(e,t,r)=>n.PublicKey.findProgramAddressSync([c,new n.PublicKey(t).toBytes(),Buffer.from(r)],new n.PublicKey(e))[0],h=(e,r,i,a)=>l(t.ethers.sha256(t.ethers.concat([o,new n.PublicKey(e).toBytes(),new n.PublicKey(r).toBytes(),new n.PublicKey(i).toBytes(),t.ethers.sha256(a)]))),g=(e,r,i,a,o,c)=>{if(c<0n||c>9223372036854775807n)throw Error(`receive vault: invalid deadline`);let u=new Uint8Array(8);return new DataView(u.buffer).setBigInt64(0,c,!0),l(t.ethers.sha256(t.ethers.concat([s,new n.PublicKey(e).toBytes(),new n.PublicKey(r).toBytes(),new n.PublicKey(i).toBytes(),new n.PublicKey(a).toBytes(),new n.PublicKey(o).toBytes(),u])))},_=(e,t)=>r.default.encode(i.default.sign.detached(t,e.secretKey));exports.computeSolanaReceiveVaultAddress=p,exports.computeSolanaRecoveryMarkerAddress=m,exports.getSolanaReceiveVaultOutputDigest=h,exports.getSolanaReceiveVaultParamsHash=f,exports.getSolanaReceiveVaultRecoveryDigest=g,exports.signSolanaReceiveVaultDigest=_;

package/common/src/functions/utils/receive-vault-solana.utils.d.ts

@@ -0,0 +1,8 @@
+import { Keypair, PublicKey } from '@solana/web3.js';
+import { ReceiveVaultParams } from '../../types/receive-vault.types';
+export declare const getSolanaReceiveVaultParamsHash: (params: ReceiveVaultParams) => Uint8Array;
+export declare const computeSolanaReceiveVaultAddress: (params: ReceiveVaultParams, programId: string, originalDeployer: string) => string;
+export declare const computeSolanaRecoveryMarkerAddress: (programId: string, originalDeployer: string, digest: Uint8Array) => PublicKey;
+export declare const getSolanaReceiveVaultOutputDigest: (programId: string, originalDeployer: string, vault: string, encryptedOutput: string) => Uint8Array;
+export declare const getSolanaReceiveVaultRecoveryDigest: (programId: string, originalDeployer: string, vault: string, mint: string, to: string, deadline: bigint) => Uint8Array;
+export declare const signSolanaReceiveVaultDigest: (owner: Keypair, digest: Uint8Array) => string;

package/common/src/functions/utils/receive-vault-solana.utils.mjs

@@ -0,0 +1,45 @@
+import { ethers as e } from "ethers";
+import { PublicKey as t } from "@solana/web3.js";
+import n from "bs58";
+import r from "tweetnacl";
+//#region libs/shared/common/src/functions/utils/receive-vault-solana.utils.ts
+var i = Buffer.from("hinkal_receive_vault"), a = Buffer.from("HINKAL_RECEIVE_OUTPUT"), o = Buffer.from("HINKAL_RECEIVE_RECOVER"), s = Buffer.from("hinkal_receive_recovery"), c = (t) => e.getBytes(t), l = (e) => {
+	if (e < 0n || e > 255n) throw Error("receive vault: version must fit in u8");
+	return Uint8Array.of(Number(e));
+}, u = (t) => e.getBytes(e.toBeHex(t, 32)), d = (n) => c(e.sha256(e.concat([
+	u(n.recipient.H0x),
+	u(n.recipient.H0y),
+	u(n.recipient.H1x),
+	u(n.recipient.H1y),
+	u(n.recipient.stealthAddress),
+	new t(n.owner).toBytes(),
+	l(n.version)
+]))), f = (e, n, r) => t.findProgramAddressSync([
+	i,
+	new t(r).toBytes(),
+	Buffer.from(d(e))
+], new t(n))[0].toBase58(), p = (e, n, r) => t.findProgramAddressSync([
+	s,
+	new t(n).toBytes(),
+	Buffer.from(r)
+], new t(e))[0], m = (n, r, i, o) => c(e.sha256(e.concat([
+	a,
+	new t(n).toBytes(),
+	new t(r).toBytes(),
+	new t(i).toBytes(),
+	e.sha256(o)
+]))), h = (n, r, i, a, s, l) => {
+	if (l < 0n || l > 9223372036854775807n) throw Error("receive vault: invalid deadline");
+	let u = new Uint8Array(8);
+	return new DataView(u.buffer).setBigInt64(0, l, !0), c(e.sha256(e.concat([
+		o,
+		new t(n).toBytes(),
+		new t(r).toBytes(),
+		new t(i).toBytes(),
+		new t(a).toBytes(),
+		new t(s).toBytes(),
+		u
+	])));
+}, g = (e, t) => n.encode(r.sign.detached(t, e.secretKey));
+//#endregion
+export { f as computeSolanaReceiveVaultAddress, p as computeSolanaRecoveryMarkerAddress, m as getSolanaReceiveVaultOutputDigest, d as getSolanaReceiveVaultParamsHash, h as getSolanaReceiveVaultRecoveryDigest, g as signSolanaReceiveVaultDigest };

package/common/src/functions/utils/receive-vault.utils.cjs

@@ -1,2 +1,2 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../data-structures/crypto-keys/keys.cjs`),r=require(`../../data-structures/utxo/Utxo.cjs`),i=require(`./tron.utils.cjs`);require(`../../data-structures/crypto-keys/index.cjs`);let a=require(`ethers`);var o=`HINKAL_RECEIVE_V1`,s=`HINKAL_RECEIVE_RECOVERY_V1`,c=`HINKAL_RECEIVE_RECOVER`,l=`HINKAL_RECEIVE_OUTPUT`,u=`HINKAL_RECEIVE_ACCOUNT_V1`,d=`HINKAL_RECEIVE_VAULT_ACCOUNT`,f=({chainId:e,token:t,index:n})=>`${e}:${i.addressToHexFormat(t).toLowerCase()}:${n}`,p=e=>e*t.RECEIVE_VAULT_FEE_CEILING_MULTIPLIER,m=()=>BigInt(Math.floor(Date.now()/1e3)+t.RECEIVE_VAULT_EXPIRY_SECONDS),h=(e,t)=>{let n=a.ethers.keccak256(a.ethers.toUtf8Bytes(`${s}:${e.getShieldedPrivateKey()}:${f(t)}`));return new a.ethers.Wallet(n)},g=e=>n.UserKeys.getEncryptionKeyPair(e.getShieldedPrivateKey()).publicKey,_=(e,s)=>{let c=e.getShieldedPrivateKey(),l=BigInt(a.ethers.keccak256(a.ethers.toUtf8Bytes(`${o}:${c}:${f(s)}`))),u=new r.Utxo({amount:0n,erc20TokenAddress:t.zeroAddress,nullifyingKey:c,randomization:n.UserKeys.findCorrectRandomization(l,c),spendingPublicKey:e.getSpendingKeyPair().pubSpendingBJJPoint}),{H0:d}=u;if(!d)throw Error(`receive vault: H0 is not set`);let p=n.UserKeys.getH1FromH0(d,c);return{recipient:{H0x:d[0],H0y:d[1],H1x:p[0],H1y:p[1],stealthAddress:BigInt(u.getStealthAddress())},owner:h(e,s).address,token:i.addressToHexFormat(s.token),maxFlatFee:BigInt(s.maxFlatFee),maxVariableRate:Number(t.RECEIVE_VAULT_VARIABLE_RATE),expiry:BigInt(s.expiry)}},v=e=>a.ethers.AbiCoder.defaultAbiCoder().encode([`tuple(tuple(uint256,uint256,uint256,uint256,uint256),address,address,uint256,uint16,uint64)`],[[[e.recipient.H0x,e.recipient.H0y,e.recipient.H1x,e.recipient.H1y,e.recipient.stealthAddress],e.owner,e.token,e.maxFlatFee,e.maxVariableRate,e.expiry]]),y=t=>e.isTronLike(t)?`0x41`:`0xff`,b=e=>[[e.recipient.H0x,e.recipient.H0y,e.recipient.H1x,e.recipient.H1y,e.recipient.stealthAddress],e.owner,e.token,e.maxFlatFee,e.maxVariableRate,e.expiry],x=(e,t,n,r)=>a.ethers.getAddress(a.ethers.dataSlice(a.ethers.solidityPackedKeccak256([`bytes1`,`address`,`bytes32`,`bytes32`],[y(r),i.addressToHexFormat(t),a.ethers.keccak256(v(e)),n]),12)),S=t=>e.networkRegistry[t]?.contractData?.receiveVaultFactoryAddress||void 0,C=`0xe5f823a7777291668021ab2734f77bc16b4854c16034051c86967a5eb2415e54`,w=`0xedef7fda070f3ae59616c754f3f10ec4dfe4cb5c531ae39141ab2d323b36e3ec`,T=t=>e.isTronLike(t)?w:C,E=e=>!!S(e),D=(t,n)=>{let r=S(n);if(!r)throw Error(`receive vault: no factory on chain ${n}`);let a=x(t,r,T(n),n);return e.isTronLike(n)?i.evmHexToTronBase58Address(a):a},O=(e,t)=>({...t,vaultAddress:D(_(e,t),t.chainId)}),k=({expiry:e})=>BigInt(e)<BigInt(Math.floor(Date.now()/1e3)),A=e=>({recipient:{H0x:e.recipient.H0x.toString(),H0y:e.recipient.H0y.toString(),H1x:e.recipient.H1x.toString(),H1y:e.recipient.H1y.toString(),stealthAddress:e.recipient.stealthAddress.toString()},owner:e.owner,token:e.token,maxFlatFee:e.maxFlatFee.toString(),maxVariableRate:e.maxVariableRate,expiry:e.expiry.toString()}),j=e=>new a.ethers.Wallet(a.ethers.keccak256(a.ethers.toUtf8Bytes(`${u}:${e.getShieldedPrivateKey()}`))),M=e=>j(e).address,N=(e,t)=>a.ethers.keccak256(a.ethers.solidityPacked([`string`,`address`,`uint256`],[d,e,t])),P=async(e,t)=>{let n=j(e),r=N(n.address,t);return{accountKey:n.address,deadline:t.toString(),signature:await n.signMessage(a.ethers.getBytes(r))}},F=(e,t,n,r)=>a.ethers.keccak256(a.ethers.solidityPacked([`string`,`uint256`,`address`,`address`,`bytes32`],[l,BigInt(e),i.addressToHexFormat(t),i.addressToHexFormat(n),a.ethers.keccak256(r)])),I=async(e,t,n)=>{let r=S(t.chainId);if(!r)throw Error(`receive vault: no factory on chain ${t.chainId}`);let i=F(t.chainId,r,t.vaultAddress,n);return h(e,t).signMessage(a.ethers.getBytes(i))},L=(t,n,r,o,s,l)=>{let u=a.ethers.keccak256(a.ethers.solidityPacked([`string`,`uint256`,`address`,`address`,`address`,`address`,`uint256`],[c,BigInt(t),i.addressToHexFormat(n),i.addressToHexFormat(r),i.addressToHexFormat(o),i.addressToHexFormat(s),l]));return e.isTronLike(t)?a.ethers.keccak256(a.ethers.concat([a.ethers.toUtf8Bytes(`TRON Signed Message:
-32`),u])):u},R=async(t,n,r,i,o,s)=>{let c=S(i);if(!c)throw Error(`receive vault: no factory on chain ${i}`);let l=L(i,c,n.vaultAddress,r,o,s),u=h(t,n);return e.isTronLike(i)?new a.ethers.SigningKey(u.privateKey).sign(l).serialized:u.signMessage(a.ethers.getBytes(l))};exports.buildReceiveVaultRecord=O,exports.computeReceiveVaultAddress=x,exports.encodeReceiveVaultParams=v,exports.getReceiveVaultAccountKey=M,exports.getReceiveVaultAddress=D,exports.getReceiveVaultEncryptionKey=g,exports.getReceiveVaultExpiry=m,exports.getReceiveVaultFactoryAddress=S,exports.getReceiveVaultFeeCeiling=p,exports.getReceiveVaultInitCodeHash=T,exports.getReceiveVaultOutputDigest=F,exports.getReceiveVaultParams=_,exports.getReceiveVaultRecoveryDigest=L,exports.getReceiveVaultRecoveryWallet=h,exports.isReceiveVaultExpired=k,exports.isReceiveVaultSupported=E,exports.receiveVaultParamsToTuple=b,exports.serializeReceiveVaultParams=A,exports.signReceiveVaultAccount=P,exports.signReceiveVaultOutput=I,exports.signReceiveVaultRecovery=R;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../data-structures/crypto-keys/keys.cjs`),r=require(`../../data-structures/utxo/Utxo.cjs`),i=require(`./tron.utils.cjs`),a=require(`../../types/ethereum-network.types.cjs`),o=require(`../../types/receive-vault.types.cjs`);require(`../../data-structures/crypto-keys/index.cjs`);const s=require(`../web3/getContractMetadata.cjs`),c=require(`./receive-vault-solana.utils.cjs`);let l=require(`ethers`),u=require(`@solana/web3.js`);var d=`HINKAL_RECEIVE_V1`,f=`HINKAL_RECEIVE_RECOVERY_V1`,p=`HINKAL_RECEIVE_SOLANA_OWNER_V1`,m=`HINKAL_RECEIVE_RECOVER`,h=`HINKAL_RECEIVE_OUTPUT`,g=`HINKAL_RECEIVE_ACCOUNT_V1`,_=`HINKAL_RECEIVE_VAULT_ACCOUNT`,v=e=>s.getContractWithFetcherByChainId(e,a.ContractType.ReceiveVaultFactoryContract),y=new Map,b=(e,t)=>{let n=l.ethers.keccak256(l.ethers.toUtf8Bytes(`${f}:${e.getShieldedPrivateKey()}:${t.index}`));return new l.ethers.Wallet(n)},x=(e,t)=>u.Keypair.fromSeed(l.ethers.getBytes(l.ethers.keccak256(l.ethers.toUtf8Bytes(`${p}:${e.getShieldedPrivateKey()}:${t.index}`)))),S=t=>{let n=e.networkRegistry[t]?.contractData?.originalDeployer;if(!n)throw Error(`receive vault: no original deployer on chain ${t}`);return n},C=e=>n.UserKeys.getEncryptionKeyPair(e.getShieldedPrivateKey()).publicKey,w=(e,i)=>{let a=e.getShieldedPrivateKey(),s=BigInt(l.ethers.keccak256(l.ethers.toUtf8Bytes(`${d}:${a}:${i.index}`))),c=new r.Utxo({amount:0n,erc20TokenAddress:t.zeroAddress,nullifyingKey:a,randomization:n.UserKeys.findCorrectRandomization(s,a),spendingPublicKey:e.getSpendingKeyPair().pubSpendingBJJPoint}),{H0:u}=c;if(!u)throw Error(`receive vault: H0 is not set`);let f=n.UserKeys.getH1FromH0(u,a),p=i.network===o.ReceiveVaultNetwork.Solana?x(e,i).publicKey.toBase58():b(e,i).address;return{recipient:{H0x:u[0],H0y:u[1],H1x:f[0],H1y:f[1],stealthAddress:BigInt(c.getStealthAddress())},owner:p,version:BigInt(i.version)}},T=e=>l.ethers.AbiCoder.defaultAbiCoder().encode([`tuple(tuple(uint256,uint256,uint256,uint256,uint256),address,uint256)`],[[[e.recipient.H0x,e.recipient.H0y,e.recipient.H1x,e.recipient.H1y,e.recipient.stealthAddress],e.owner,e.version]]),E=t=>e.isTronLike(t)?`0x41`:`0xff`,D=e=>[[e.recipient.H0x,e.recipient.H0y,e.recipient.H1x,e.recipient.H1y,e.recipient.stealthAddress],e.owner,e.version],O=(e,t,n,r)=>l.ethers.getAddress(l.ethers.dataSlice(l.ethers.solidityPackedKeccak256([`bytes1`,`address`,`bytes32`,`bytes32`],[E(r),i.addressToHexFormat(t),l.ethers.keccak256(T(e)),n]),12)),k=t=>(e.isSolanaLike(t)?e.networkRegistry[t]?.contractData?.hinkalAddress:e.networkRegistry[t]?.contractData?.receiveVaultFactoryAddress)||void 0,A=e=>!!k(e),j=t=>e.isSolanaLike(t)?o.ReceiveVaultNetwork.Solana:e.isTronLike(t)?o.ReceiveVaultNetwork.Tron:o.ReceiveVaultNetwork.Evm,M=t=>e.FRONT_END_SUPPORTED_CHAINS.filter(e=>A(e)&&j(e)===t),N=e=>{let[t]=M(e);if(t===void 0)throw Error(`receive vault: no supported chain for network ${e}`);return t},P=async(e,t)=>{let n=`${e}:${t}`,r=y.get(n);if(r)return r;let i=await v(e).vaultInitCodeHash(t);return y.set(n,i),i},F=async e=>e===o.ReceiveVaultNetwork.Solana?0n:await v(N(e)).vaultVersionCount()-1n,I=async(t,n)=>{let r=k(n);if(!r)throw Error(`receive vault: no factory on chain ${n}`);if(e.isSolanaLike(n))return c.computeSolanaReceiveVaultAddress(t,r,S(n));let a=O(t,r,await P(n,t.version),n);return e.isTronLike(n)?i.evmHexToTronBase58Address(a):a},L=async(e,t)=>({...t,vaultAddress:await I(w(e,t),N(t.network))}),R=e=>({recipient:{H0x:e.recipient.H0x.toString(),H0y:e.recipient.H0y.toString(),H1x:e.recipient.H1x.toString(),H1y:e.recipient.H1y.toString(),stealthAddress:e.recipient.stealthAddress.toString()},owner:e.owner,version:e.version.toString()}),z=e=>new l.ethers.Wallet(l.ethers.keccak256(l.ethers.toUtf8Bytes(`${g}:${e.getShieldedPrivateKey()}`))),B=e=>z(e).address,V=(e,t)=>l.ethers.keccak256(l.ethers.solidityPacked([`string`,`address`,`uint256`],[_,e,t])),H=async(e,t)=>{let n=z(e),r=V(n.address,t);return{accountKey:n.address,deadline:t.toString(),signature:await n.signMessage(l.ethers.getBytes(r))}},U=(e,t,n,r)=>l.ethers.keccak256(l.ethers.solidityPacked([`string`,`uint256`,`address`,`address`,`bytes32`],[h,BigInt(e),i.addressToHexFormat(t),i.addressToHexFormat(n),l.ethers.keccak256(r)])),W=async(t,n,r,i)=>{let a=k(i);if(!a)throw Error(`receive vault: no factory on chain ${i}`);if(e.isSolanaLike(i)){let e=c.getSolanaReceiveVaultOutputDigest(a,S(i),n.vaultAddress,r);return c.signSolanaReceiveVaultDigest(x(t,n),e)}let o=U(i,a,n.vaultAddress,r);return b(t,n).signMessage(l.ethers.getBytes(o))},G=(t,n,r,a,o,s)=>{let c=l.ethers.keccak256(l.ethers.solidityPacked([`string`,`uint256`,`address`,`address`,`address`,`address`,`uint256`],[m,BigInt(t),i.addressToHexFormat(n),i.addressToHexFormat(r),i.addressToHexFormat(a),i.addressToHexFormat(o),s]));return e.isTronLike(t)?l.ethers.keccak256(l.ethers.concat([l.ethers.toUtf8Bytes(`TRON Signed Message:
+32`),c])):c},K=async(t,n,r,i,a,o)=>{let s=k(i);if(!s)throw Error(`receive vault: no factory on chain ${i}`);if(e.isSolanaLike(i)){let e=c.getSolanaReceiveVaultRecoveryDigest(s,S(i),n.vaultAddress,r,a,o);return c.signSolanaReceiveVaultDigest(x(t,n),e)}let u=G(i,s,n.vaultAddress,r,a,o),d=b(t,n);return e.isTronLike(i)?new l.ethers.SigningKey(d.privateKey).sign(u).serialized:d.signMessage(l.ethers.getBytes(u))};exports.buildReceiveVaultRecord=L,exports.computeReceiveVaultAddress=O,exports.encodeReceiveVaultParams=T,exports.getReceiveVaultAccountKey=B,exports.getReceiveVaultAddress=I,exports.getReceiveVaultCanonicalChainId=N,exports.getReceiveVaultCurrentVersion=F,exports.getReceiveVaultEncryptionKey=C,exports.getReceiveVaultFactoryAddress=k,exports.getReceiveVaultInitCodeHash=P,exports.getReceiveVaultOutputDigest=U,exports.getReceiveVaultParams=w,exports.getReceiveVaultRecoveryDigest=G,exports.getReceiveVaultRecoveryWallet=b,exports.getReceiveVaultSolanaOwner=x,exports.getSolanaOriginalDeployer=S,exports.isReceiveVaultSupported=A,exports.receiveVaultChainsForNetwork=M,exports.receiveVaultNetworkOf=j,exports.receiveVaultParamsToTuple=D,exports.serializeReceiveVaultParams=R,exports.signReceiveVaultAccount=H,exports.signReceiveVaultOutput=W,exports.signReceiveVaultRecovery=K;

package/common/src/functions/utils/receive-vault.utils.d.ts

@@ -1,29 +1,31 @@
 import { ethers } from 'ethers';
+import { Keypair } from '@solana/web3.js';
 import { UserKeys } from '../../data-structures/crypto-keys';
-import { ReceiveVaultAccountProof, ReceiveVaultParams, ReceiveVaultRecord } from '../../types/receive-vault.types';
+import { ReceiveVaultAccountProof, ReceiveVaultNetwork, ReceiveVaultParams, ReceiveVaultRecord } from '../../types/receive-vault.types';
 export type ReceiveVaultTerms = Omit<ReceiveVaultRecord, 'vaultAddress'>;
-/** A ceiling, not a price: the relayer still charges what the settlement costs. It only has to stay
- *  above that while gas moves under an unspent address. */
-export declare const getReceiveVaultFeeCeiling: (quotedFlatFee: bigint) => bigint;
-export declare const getReceiveVaultExpiry: () => bigint;
 export declare const getReceiveVaultRecoveryWallet: (userKeys: UserKeys, terms: ReceiveVaultTerms) => ethers.Wallet;
+export declare const getReceiveVaultSolanaOwner: (userKeys: UserKeys, terms: ReceiveVaultTerms) => Keypair;
+export declare const getSolanaOriginalDeployer: (chainId: number) => string;
 export declare const getReceiveVaultEncryptionKey: (userKeys: UserKeys) => string;
 export declare const getReceiveVaultParams: (userKeys: UserKeys, terms: ReceiveVaultTerms) => ReceiveVaultParams;
 export declare const encodeReceiveVaultParams: (params: ReceiveVaultParams) => string;
-export declare const receiveVaultParamsToTuple: (params: ReceiveVaultParams) => (string | number | bigint | bigint[])[];
+export declare const receiveVaultParamsToTuple: (params: ReceiveVaultParams) => (string | bigint | bigint[])[];
 export declare const computeReceiveVaultAddress: (params: ReceiveVaultParams, factoryAddress: string, initCodeHash: string, chainId: number) => string;
 export declare const getReceiveVaultFactoryAddress: (chainId: number) => string | undefined;
-export declare const getReceiveVaultInitCodeHash: (chainId: number) => string;
 export declare const isReceiveVaultSupported: (chainId: number) => boolean;
-export declare const getReceiveVaultAddress: (params: ReceiveVaultParams, chainId: number) => string;
-export declare const buildReceiveVaultRecord: (userKeys: UserKeys, terms: ReceiveVaultTerms) => ReceiveVaultRecord;
-export declare const isReceiveVaultExpired: ({ expiry }: ReceiveVaultTerms) => boolean;
+export declare const receiveVaultNetworkOf: (chainId: number) => ReceiveVaultNetwork;
+export declare const receiveVaultChainsForNetwork: (network: ReceiveVaultNetwork) => number[];
+export declare const getReceiveVaultCanonicalChainId: (network: ReceiveVaultNetwork) => number;
+export declare const getReceiveVaultInitCodeHash: (chainId: number, version: bigint) => Promise<string>;
+export declare const getReceiveVaultCurrentVersion: (network: ReceiveVaultNetwork) => Promise<bigint>;
+export declare const getReceiveVaultAddress: (params: ReceiveVaultParams, chainId: number) => Promise<string>;
+export declare const buildReceiveVaultRecord: (userKeys: UserKeys, terms: ReceiveVaultTerms) => Promise<ReceiveVaultRecord>;
 export declare const serializeReceiveVaultParams: (params: ReceiveVaultParams) => ReceiveVaultParams<string>;
 export declare const deserializeReceiveVaultParams: (params: ReceiveVaultParams<string>) => ReceiveVaultParams;
 export declare const getReceiveVaultRecipientInfo: (params: ReceiveVaultParams, encryptionKey: string) => string;
 export declare const getReceiveVaultAccountKey: (userKeys: UserKeys) => string;
 export declare const signReceiveVaultAccount: (userKeys: UserKeys, deadline: bigint) => Promise<ReceiveVaultAccountProof>;
 export declare const getReceiveVaultOutputDigest: (chainId: number, factoryAddress: string, vault: string, encryptedOutput: string) => string;
-export declare const signReceiveVaultOutput: (userKeys: UserKeys, record: ReceiveVaultRecord, encryptedOutput: string) => Promise<string>;
+export declare const signReceiveVaultOutput: (userKeys: UserKeys, record: ReceiveVaultRecord, encryptedOutput: string, chainId: number) => Promise<string>;
 export declare const getReceiveVaultRecoveryDigest: (chainId: number, factoryAddress: string, vault: string, token: string, to: string, deadline: bigint) => string;
 export declare const signReceiveVaultRecovery: (userKeys: UserKeys, record: ReceiveVaultRecord, token: string, chainId: number, to: string, deadline: bigint) => Promise<string>;

package/common/src/functions/utils/receive-vault.utils.mjs

@@ -1,39 +1,45 @@
-import { isTronLike as e, networkRegistry as t } from "../../constants/chains.constants.mjs";
-import { RECEIVE_VAULT_EXPIRY_SECONDS as n, RECEIVE_VAULT_FEE_CEILING_MULTIPLIER as r, RECEIVE_VAULT_VARIABLE_RATE as i, zeroAddress as a } from "../../constants/protocol.constants.mjs";
-import { UserKeys as o } from "../../data-structures/crypto-keys/keys.mjs";
-import { Utxo as s } from "../../data-structures/utxo/Utxo.mjs";
-import { addressToHexFormat as c, evmHexToTronBase58Address as l } from "./tron.utils.mjs";
+import { FRONT_END_SUPPORTED_CHAINS as e, isSolanaLike as t, isTronLike as n, networkRegistry as r } from "../../constants/chains.constants.mjs";
+import { zeroAddress as i } from "../../constants/protocol.constants.mjs";
+import { UserKeys as a } from "../../data-structures/crypto-keys/keys.mjs";
+import { Utxo as o } from "../../data-structures/utxo/Utxo.mjs";
+import { addressToHexFormat as s, evmHexToTronBase58Address as c } from "./tron.utils.mjs";
+import { ContractType as l } from "../../types/ethereum-network.types.mjs";
+import { ReceiveVaultNetwork as u } from "../../types/receive-vault.types.mjs";
 import "../../data-structures/crypto-keys/index.mjs";
-import { ethers as u } from "ethers";
+import { getContractWithFetcherByChainId as d } from "../web3/getContractMetadata.mjs";
+import { computeSolanaReceiveVaultAddress as f, getSolanaReceiveVaultOutputDigest as p, getSolanaReceiveVaultRecoveryDigest as m, signSolanaReceiveVaultDigest as h } from "./receive-vault-solana.utils.mjs";
+import { ethers as g } from "ethers";
+import { Keypair as _ } from "@solana/web3.js";
 //#region libs/shared/common/src/functions/utils/receive-vault.utils.ts
-var d = "HINKAL_RECEIVE_V1", f = "HINKAL_RECEIVE_RECOVERY_V1", p = "HINKAL_RECEIVE_RECOVER", m = "HINKAL_RECEIVE_OUTPUT", h = "HINKAL_RECEIVE_ACCOUNT_V1", g = "HINKAL_RECEIVE_VAULT_ACCOUNT", _ = ({ chainId: e, token: t, index: n }) => `${e}:${c(t).toLowerCase()}:${n}`, v = (e) => e * r, y = () => BigInt(Math.floor(Date.now() / 1e3) + n), b = (e, t) => {
-	let n = u.keccak256(u.toUtf8Bytes(`${f}:${e.getShieldedPrivateKey()}:${_(t)}`));
-	return new u.Wallet(n);
-}, x = (e) => o.getEncryptionKeyPair(e.getShieldedPrivateKey()).publicKey, S = (e, t) => {
-	let n = e.getShieldedPrivateKey(), r = BigInt(u.keccak256(u.toUtf8Bytes(`${d}:${n}:${_(t)}`))), l = new s({
+var v = "HINKAL_RECEIVE_V1", y = "HINKAL_RECEIVE_RECOVERY_V1", b = "HINKAL_RECEIVE_SOLANA_OWNER_V1", x = "HINKAL_RECEIVE_RECOVER", S = "HINKAL_RECEIVE_OUTPUT", C = "HINKAL_RECEIVE_ACCOUNT_V1", w = "HINKAL_RECEIVE_VAULT_ACCOUNT", T = (e) => d(e, l.ReceiveVaultFactoryContract), E = /* @__PURE__ */ new Map(), D = (e, t) => {
+	let n = g.keccak256(g.toUtf8Bytes(`${y}:${e.getShieldedPrivateKey()}:${t.index}`));
+	return new g.Wallet(n);
+}, O = (e, t) => _.fromSeed(g.getBytes(g.keccak256(g.toUtf8Bytes(`${b}:${e.getShieldedPrivateKey()}:${t.index}`)))), k = (e) => {
+	let t = r[e]?.contractData?.originalDeployer;
+	if (!t) throw Error(`receive vault: no original deployer on chain ${e}`);
+	return t;
+}, A = (e) => a.getEncryptionKeyPair(e.getShieldedPrivateKey()).publicKey, j = (e, t) => {
+	let n = e.getShieldedPrivateKey(), r = BigInt(g.keccak256(g.toUtf8Bytes(`${v}:${n}:${t.index}`))), s = new o({
 		amount: 0n,
-		erc20TokenAddress: a,
+		erc20TokenAddress: i,
 		nullifyingKey: n,
-		randomization: o.findCorrectRandomization(r, n),
+		randomization: a.findCorrectRandomization(r, n),
 		spendingPublicKey: e.getSpendingKeyPair().pubSpendingBJJPoint
-	}), { H0: f } = l;
-	if (!f) throw Error("receive vault: H0 is not set");
-	let p = o.getH1FromH0(f, n);
+	}), { H0: c } = s;
+	if (!c) throw Error("receive vault: H0 is not set");
+	let l = a.getH1FromH0(c, n), d = t.network === u.Solana ? O(e, t).publicKey.toBase58() : D(e, t).address;
 	return {
 		recipient: {
-			H0x: f[0],
-			H0y: f[1],
-			H1x: p[0],
-			H1y: p[1],
-			stealthAddress: BigInt(l.getStealthAddress())
+			H0x: c[0],
+			H0y: c[1],
+			H1x: l[0],
+			H1y: l[1],
+			stealthAddress: BigInt(s.getStealthAddress())
 		},
-		owner: b(e, t).address,
-		token: c(t.token),
-		maxFlatFee: BigInt(t.maxFlatFee),
-		maxVariableRate: Number(i),
-		expiry: BigInt(t.expiry)
+		owner: d,
+		version: BigInt(t.version)
 	};
-}, C = (e) => u.AbiCoder.defaultAbiCoder().encode(["tuple(tuple(uint256,uint256,uint256,uint256,uint256),address,address,uint256,uint16,uint64)"], [[
+}, M = (e) => g.AbiCoder.defaultAbiCoder().encode(["tuple(tuple(uint256,uint256,uint256,uint256,uint256),address,uint256)"], [[
 	[
 		e.recipient.H0x,
 		e.recipient.H0y,
@@ -42,11 +48,8 @@ var d = "HINKAL_RECEIVE_V1", f = "HINKAL_RECEIVE_RECOVERY_V1", p = "HINKAL_RECEI
 		e.recipient.stealthAddress
 	],
 	e.owner,
-	e.token,
-	e.maxFlatFee,
-	e.maxVariableRate,
-	e.expiry
-]]), w = (t) => e(t) ? "0x41" : "0xff", T = (e) => [
+	e.version
+]]), N = (e) => n(e) ? "0x41" : "0xff", P = (e) => [
 	[
 		e.recipient.H0x,
 		e.recipient.H0y,
@@ -55,29 +58,36 @@ var d = "HINKAL_RECEIVE_V1", f = "HINKAL_RECEIVE_RECOVERY_V1", p = "HINKAL_RECEI
 		e.recipient.stealthAddress
 	],
 	e.owner,
-	e.token,
-	e.maxFlatFee,
-	e.maxVariableRate,
-	e.expiry
-], E = (e, t, n, r) => u.getAddress(u.dataSlice(u.solidityPackedKeccak256([
+	e.version
+], F = (e, t, n, r) => g.getAddress(g.dataSlice(g.solidityPackedKeccak256([
 	"bytes1",
 	"address",
 	"bytes32",
 	"bytes32"
 ], [
-	w(r),
-	c(t),
-	u.keccak256(C(e)),
+	N(r),
+	s(t),
+	g.keccak256(M(e)),
 	n
-]), 12)), D = (e) => t[e]?.contractData?.receiveVaultFactoryAddress || void 0, O = "0xe5f823a7777291668021ab2734f77bc16b4854c16034051c86967a5eb2415e54", k = "0xedef7fda070f3ae59616c754f3f10ec4dfe4cb5c531ae39141ab2d323b36e3ec", A = (t) => e(t) ? k : O, j = (e) => !!D(e), M = (t, n) => {
-	let r = D(n);
-	if (!r) throw Error(`receive vault: no factory on chain ${n}`);
-	let i = E(t, r, A(n), n);
-	return e(n) ? l(i) : i;
-}, N = (e, t) => ({
+]), 12)), I = (e) => (t(e) ? r[e]?.contractData?.hinkalAddress : r[e]?.contractData?.receiveVaultFactoryAddress) || void 0, L = (e) => !!I(e), R = (e) => t(e) ? u.Solana : n(e) ? u.Tron : u.Evm, z = (t) => e.filter((e) => L(e) && R(e) === t), B = (e) => {
+	let [t] = z(e);
+	if (t === void 0) throw Error(`receive vault: no supported chain for network ${e}`);
+	return t;
+}, V = async (e, t) => {
+	let n = `${e}:${t}`, r = E.get(n);
+	if (r) return r;
+	let i = await T(e).vaultInitCodeHash(t);
+	return E.set(n, i), i;
+}, H = async (e) => e === u.Solana ? 0n : await T(B(e)).vaultVersionCount() - 1n, U = async (e, r) => {
+	let i = I(r);
+	if (!i) throw Error(`receive vault: no factory on chain ${r}`);
+	if (t(r)) return f(e, i, k(r));
+	let a = F(e, i, await V(r, e.version), r);
+	return n(r) ? c(a) : a;
+}, W = async (e, t) => ({
 	...t,
-	vaultAddress: M(S(e, t), t.chainId)
-}), P = ({ expiry: e }) => BigInt(e) < BigInt(Math.floor(Date.now() / 1e3)), F = (e) => ({
+	vaultAddress: await U(j(e, t), B(t.network))
+}), G = (e) => ({
 	recipient: {
 		H0x: e.recipient.H0x.toString(),
 		H0y: e.recipient.H0y.toString(),
@@ -86,44 +96,45 @@ var d = "HINKAL_RECEIVE_V1", f = "HINKAL_RECEIVE_RECOVERY_V1", p = "HINKAL_RECEI
 		stealthAddress: e.recipient.stealthAddress.toString()
 	},
 	owner: e.owner,
-	token: e.token,
-	maxFlatFee: e.maxFlatFee.toString(),
-	maxVariableRate: e.maxVariableRate,
-	expiry: e.expiry.toString()
-}), I = (e) => new u.Wallet(u.keccak256(u.toUtf8Bytes(`${h}:${e.getShieldedPrivateKey()}`))), L = (e) => I(e).address, R = (e, t) => u.keccak256(u.solidityPacked([
+	version: e.version.toString()
+}), K = (e) => new g.Wallet(g.keccak256(g.toUtf8Bytes(`${C}:${e.getShieldedPrivateKey()}`))), q = (e) => K(e).address, J = (e, t) => g.keccak256(g.solidityPacked([
 	"string",
 	"address",
 	"uint256"
 ], [
-	g,
+	w,
 	e,
 	t
-])), z = async (e, t) => {
-	let n = I(e), r = R(n.address, t);
+])), Y = async (e, t) => {
+	let n = K(e), r = J(n.address, t);
 	return {
 		accountKey: n.address,
 		deadline: t.toString(),
-		signature: await n.signMessage(u.getBytes(r))
+		signature: await n.signMessage(g.getBytes(r))
 	};
-}, B = (e, t, n, r) => u.keccak256(u.solidityPacked([
+}, X = (e, t, n, r) => g.keccak256(g.solidityPacked([
 	"string",
 	"uint256",
 	"address",
 	"address",
 	"bytes32"
 ], [
-	m,
+	S,
 	BigInt(e),
-	c(t),
-	c(n),
-	u.keccak256(r)
-])), V = async (e, t, n) => {
-	let r = D(t.chainId);
-	if (!r) throw Error(`receive vault: no factory on chain ${t.chainId}`);
-	let i = B(t.chainId, r, t.vaultAddress, n);
-	return b(e, t).signMessage(u.getBytes(i));
-}, H = (t, n, r, i, a, o) => {
-	let s = u.keccak256(u.solidityPacked([
+	s(t),
+	s(n),
+	g.keccak256(r)
+])), Z = async (e, n, r, i) => {
+	let a = I(i);
+	if (!a) throw Error(`receive vault: no factory on chain ${i}`);
+	if (t(i)) {
+		let t = p(a, k(i), n.vaultAddress, r);
+		return h(O(e, n), t);
+	}
+	let o = X(i, a, n.vaultAddress, r);
+	return D(e, n).signMessage(g.getBytes(o));
+}, Q = (e, t, r, i, a, o) => {
+	let c = g.keccak256(g.solidityPacked([
 		"string",
 		"uint256",
 		"address",
@@ -132,20 +143,24 @@ var d = "HINKAL_RECEIVE_V1", f = "HINKAL_RECEIVE_RECOVERY_V1", p = "HINKAL_RECEI
 		"address",
 		"uint256"
 	], [
-		p,
-		BigInt(t),
-		c(n),
-		c(r),
-		c(i),
-		c(a),
+		x,
+		BigInt(e),
+		s(t),
+		s(r),
+		s(i),
+		s(a),
 		o
 	]));
-	return e(t) ? u.keccak256(u.concat([u.toUtf8Bytes("TRON Signed Message:\n32"), s])) : s;
-}, U = async (t, n, r, i, a, o) => {
-	let s = D(i);
-	if (!s) throw Error(`receive vault: no factory on chain ${i}`);
-	let c = H(i, s, n.vaultAddress, r, a, o), l = b(t, n);
-	return e(i) ? new u.SigningKey(l.privateKey).sign(c).serialized : l.signMessage(u.getBytes(c));
+	return n(e) ? g.keccak256(g.concat([g.toUtf8Bytes("TRON Signed Message:\n32"), c])) : c;
+}, $ = async (e, r, i, a, o, s) => {
+	let c = I(a);
+	if (!c) throw Error(`receive vault: no factory on chain ${a}`);
+	if (t(a)) {
+		let t = m(c, k(a), r.vaultAddress, i, o, s);
+		return h(O(e, r), t);
+	}
+	let l = Q(a, c, r.vaultAddress, i, o, s), u = D(e, r);
+	return n(a) ? new g.SigningKey(u.privateKey).sign(l).serialized : u.signMessage(g.getBytes(l));
 };
 //#endregion
-export { N as buildReceiveVaultRecord, E as computeReceiveVaultAddress, C as encodeReceiveVaultParams, L as getReceiveVaultAccountKey, M as getReceiveVaultAddress, x as getReceiveVaultEncryptionKey, y as getReceiveVaultExpiry, D as getReceiveVaultFactoryAddress, v as getReceiveVaultFeeCeiling, A as getReceiveVaultInitCodeHash, B as getReceiveVaultOutputDigest, S as getReceiveVaultParams, H as getReceiveVaultRecoveryDigest, b as getReceiveVaultRecoveryWallet, P as isReceiveVaultExpired, j as isReceiveVaultSupported, T as receiveVaultParamsToTuple, F as serializeReceiveVaultParams, z as signReceiveVaultAccount, V as signReceiveVaultOutput, U as signReceiveVaultRecovery };
+export { W as buildReceiveVaultRecord, F as computeReceiveVaultAddress, M as encodeReceiveVaultParams, q as getReceiveVaultAccountKey, U as getReceiveVaultAddress, B as getReceiveVaultCanonicalChainId, H as getReceiveVaultCurrentVersion, A as getReceiveVaultEncryptionKey, I as getReceiveVaultFactoryAddress, V as getReceiveVaultInitCodeHash, X as getReceiveVaultOutputDigest, j as getReceiveVaultParams, Q as getReceiveVaultRecoveryDigest, D as getReceiveVaultRecoveryWallet, O as getReceiveVaultSolanaOwner, k as getSolanaOriginalDeployer, L as isReceiveVaultSupported, z as receiveVaultChainsForNetwork, R as receiveVaultNetworkOf, P as receiveVaultParamsToTuple, G as serializeReceiveVaultParams, Y as signReceiveVaultAccount, Z as signReceiveVaultOutput, $ as signReceiveVaultRecovery };

package/common/src/functions/utils/token-check.utils.d.ts

@@ -2,3 +2,4 @@ import { ERC20Token } from '../../types/token.types';
 export declare const checkTokensForShielding: (chainId: number, erc20Addresses: string[]) => Promise<string[]>;
 export declare const validateAndGetChainId: (tokens: ERC20Token[]) => number;
 export declare const isSameERC20Token: (a?: ERC20Token, b?: ERC20Token) => boolean;
+export declare const getTokenKey: (token: ERC20Token) => string;

package/common/src/functions/utils/wallet-token-discovery.utils.cjs

@@ -1 +1 @@
-require(`../../constants/chains.constants.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../data-structures/http/HttpClient.cjs`);require(`../../data-structures/http/index.cjs`);const n=require(`./tron.utils.cjs`);require(`./create-provider.cjs`);const r=require(`./publicBalance.utils.cjs`),i=require(`../../API/evm-token-assets.cjs`);require(`@solana/web3.js`),require(`@solana/spl-token`);var a=async(t,n)=>{let[a,o]=await Promise.all([r.getPublicBalanceByTokenAddress(t,n,e.zeroAddress),i.getEvmTokenBalancesFromServer(t,n)]);a&&a>0n&&o.push({contractAddress:e.zeroAddress,tokenBalance:a.toString()});let s={};return o.forEach(e=>{(!s[e.contractAddress]||BigInt(e.tokenBalance)>0n)&&(s[e.contractAddress]=e)}),Object.keys(s)},o=200,s=async(e,r)=>{let i=`${n.getTronWalletRpcUrl(r)}/v1/accounts/${e}/transactions/trc20?only_to=true&limit=${o}`,a=((await t.httpClient.get(i))?.data??[]).map(e=>e.token_info?.address).filter(e=>!!e).map(n.addressToHexFormat);return Array.from(new Set(a))},c=async(r,i)=>{let a=n.toTronBase58IfHex(r),o=`${n.getTronWalletRpcUrl(i)}/v1/accounts/${a}`,c=(await t.httpClient.get(o))?.data?.[0];if(!c)return s(a,i);let l=[];return c.balance&&c.balance>0&&l.push(e.zeroAddress),(c.trc20??[]).forEach(e=>{Object.entries(e).forEach(([e,t])=>{BigInt(t)>0n&&l.push(n.addressToHexFormat(e))})}),Array.from(new Set(l))};exports.getEvmWalletTokenAddresses=a,exports.getTronWalletTokenAddresses=c;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`);require(`../../data-structures/http/index.cjs`),require(`./tron.utils.cjs`);const n=require(`./create-provider.cjs`);require(`./publicBalance.utils.cjs`),require(`../../API/evm-token-assets.cjs`);let r=require(`@solana/web3.js`),i=require(`@solana/spl-token`);var a=async(a,o)=>{let{rpcUrl:s}=e.networkRegistry[a],c=n.createCustomSolanaConnection(s),l=await c.getBalance(new r.PublicKey(o)),[u,d]=await Promise.all([c.getParsedTokenAccountsByOwner(new r.PublicKey(o),{programId:i.TOKEN_PROGRAM_ID}),c.getParsedTokenAccountsByOwner(new r.PublicKey(o),{programId:i.TOKEN_2022_PROGRAM_ID})]),f=[...u.value.map(e=>({account:e,is2022Program:!1})),...d.value.map(e=>({account:e,is2022Program:!0}))].filter(({account:e})=>BigInt(e.account.data.parsed.info.tokenAmount.amount)>0n).map(({account:e,is2022Program:t})=>({token:e.account.data.parsed.info.mint,is2022Program:t}));l>0&&f.unshift({token:t.solanaNativeAddress,is2022Program:!1});let p=new Set;return f.filter(({token:e})=>p.has(e)?!1:(p.add(e),!0))};exports.getSolanaWalletTokenHoldings=a;

package/common/src/functions/utils/wallet-token-discovery.utils.d.ts

@@ -1,4 +1,9 @@
 export declare const getEvmWalletTokenAddresses: (chainId: number, walletAddress: string) => Promise<string[]>;
+export type SolanaWalletTokenHolding = {
+    token: string;
+    is2022Program: boolean;
+};
+export declare const getSolanaWalletTokenHoldings: (chainId: number, walletAddress: string) => Promise<SolanaWalletTokenHolding[]>;
 export declare const getSolanaWalletTokenAddresses: (chainId: number, walletAddress: string) => Promise<string[]>;
 export declare const getWalletTokenAddresses: (chainId: number, walletAddress: string) => Promise<string[]>;
 export declare const getTronWalletTokenAddresses: (walletAddress: string, chainId: number) => Promise<string[]>;

package/common/src/functions/utils/wallet-token-discovery.utils.mjs

@@ -1,36 +1,30 @@
-import "../../constants/chains.constants.mjs";
-import { zeroAddress as e } from "../../constants/protocol.constants.mjs";
-import { httpClient as t } from "../../data-structures/http/HttpClient.mjs";
+import { networkRegistry as e } from "../../constants/chains.constants.mjs";
+import { solanaNativeAddress as t } from "../../constants/protocol.constants.mjs";
 import "../../data-structures/http/index.mjs";
-import { addressToHexFormat as n, getTronWalletRpcUrl as r, toTronBase58IfHex as i } from "./tron.utils.mjs";
-import "./create-provider.mjs";
-import { getPublicBalanceByTokenAddress as a } from "./publicBalance.utils.mjs";
-import { getEvmTokenBalancesFromServer as o } from "../../API/evm-token-assets.mjs";
-import "@solana/web3.js";
-import "@solana/spl-token";
+import "./tron.utils.mjs";
+import { createCustomSolanaConnection as n } from "./create-provider.mjs";
+import "./publicBalance.utils.mjs";
+import "../../API/evm-token-assets.mjs";
+import { PublicKey as r } from "@solana/web3.js";
+import { TOKEN_2022_PROGRAM_ID as i, TOKEN_PROGRAM_ID as a } from "@solana/spl-token";
 //#region libs/shared/common/src/functions/utils/wallet-token-discovery.utils.ts
-var s = async (t, n) => {
-	let [r, i] = await Promise.all([a(t, n, e), o(t, n)]);
-	r && r > 0n && i.push({
-		contractAddress: e,
-		tokenBalance: r.toString()
+var o = async (o, s) => {
+	let { rpcUrl: c } = e[o], l = n(c), u = await l.getBalance(new r(s)), [d, f] = await Promise.all([l.getParsedTokenAccountsByOwner(new r(s), { programId: a }), l.getParsedTokenAccountsByOwner(new r(s), { programId: i })]), p = [...d.value.map((e) => ({
+		account: e,
+		is2022Program: !1
+	})), ...f.value.map((e) => ({
+		account: e,
+		is2022Program: !0
+	}))].filter(({ account: e }) => BigInt(e.account.data.parsed.info.tokenAmount.amount) > 0n).map(({ account: e, is2022Program: t }) => ({
+		token: e.account.data.parsed.info.mint,
+		is2022Program: t
+	}));
+	u > 0 && p.unshift({
+		token: t,
+		is2022Program: !1
 	});
-	let s = {};
-	return i.forEach((e) => {
-		(!s[e.contractAddress] || BigInt(e.tokenBalance) > 0n) && (s[e.contractAddress] = e);
-	}), Object.keys(s);
-}, c = 200, l = async (e, i) => {
-	let a = `${r(i)}/v1/accounts/${e}/transactions/trc20?only_to=true&limit=${c}`, o = ((await t.get(a))?.data ?? []).map((e) => e.token_info?.address).filter((e) => !!e).map(n);
-	return Array.from(new Set(o));
-}, u = async (a, o) => {
-	let s = i(a), c = `${r(o)}/v1/accounts/${s}`, u = (await t.get(c))?.data?.[0];
-	if (!u) return l(s, o);
-	let d = [];
-	return u.balance && u.balance > 0 && d.push(e), (u.trc20 ?? []).forEach((e) => {
-		Object.entries(e).forEach(([e, t]) => {
-			BigInt(t) > 0n && d.push(n(e));
-		});
-	}), Array.from(new Set(d));
+	let m = /* @__PURE__ */ new Set();
+	return p.filter(({ token: e }) => m.has(e) ? !1 : (m.add(e), !0));
 };
 //#endregion
-export { s as getEvmWalletTokenAddresses, u as getTronWalletTokenAddresses };
+export { o as getSolanaWalletTokenHoldings };

package/common/src/functions/web3/getContractMetadata.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../utils/tron.utils.cjs`),r=require(`../utils/create-provider.cjs`),i=require(`../../constants/contracts.constants.cjs`);let a=require(`ethers`);var o=(n,r)=>{let a=e.networkRegistry[r];if(!a)throw Error(t.transactionErrorCodes.UNSUPPORTED_NETWORK);let o=i.contractMetadataMapping[n];if(!o)throw Error(`Unsupported contractType: ${n}`);return o(a.contractData)},s=(e,t,r,i)=>{let s=o(e,t);if(!s.abi)throw Error(`No ABI configured for contractType: ${e}`);if(s.address&&r)throw Error(`Overriding address is not supported for contractType: ${e}`);let c=s.address??r;if(!c)throw Error(`No contractAddress configured for contractType: ${e}`);return new a.ethers.Contract(n.addressToHexFormat(c),s.abi,i)},c=(e,t,n=void 0)=>s(t,e,n,r.createJsonRpcProvider(e));exports.getContract=s,exports.getContractMetadata=o,exports.getContractWithFetcherByChainId=c;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../utils/tron.utils.cjs`),r=require(`../../constants/contracts.constants.cjs`),i=require(`../utils/create-provider.cjs`);let a=require(`ethers`);var o=(n,i)=>{let a=e.networkRegistry[i];if(!a)throw Error(t.transactionErrorCodes.UNSUPPORTED_NETWORK);let o=r.contractMetadataMapping[n];if(!o)throw Error(`Unsupported contractType: ${n}`);return o(a.contractData)},s=(e,t,r,i)=>{let s=o(e,t);if(!s.abi)throw Error(`No ABI configured for contractType: ${e}`);if(s.address&&r)throw Error(`Overriding address is not supported for contractType: ${e}`);let c=s.address??r;if(!c)throw Error(`No contractAddress configured for contractType: ${e}`);return new a.ethers.Contract(n.addressToHexFormat(c),s.abi,i)},c=(e,t,n=void 0)=>s(t,e,n,i.createJsonRpcProvider(e));exports.getContract=s,exports.getContractMetadata=o,exports.getContractWithFetcherByChainId=c;