@hinkal/common 0.3.1 → 0.3.2

package/common/src/data-structures/cacheDevices/FileCacheDevice.mjs

@@ -25,11 +25,20 @@ var a = class extends r {
 	get(e) {
 		return this.getInMemory(e);
 	}
-	set(t, r) {
-		if (this.readFileFromDevice(), this.setInMemory(t, r), this.useFileCache && this.filePath) try {
+	set(e, t) {
+		this.readFileFromDevice(), this.setInMemory(e, t), this.flushToFile("FileCacheDevice set function");
+	}
+	del(e) {
+		this.readFileFromDevice(), this.deleteInMemory(e), this.flushToFile("FileCacheDevice del function");
+	}
+	clear() {
+		this.inMemoryCache.clear(), this.flushToFile("FileCacheDevice clear function");
+	}
+	flushToFile(t) {
+		if (this.useFileCache && this.filePath) try {
 			e("fs").writeFileSync(this.filePath, n(Object.fromEntries(this.inMemoryCache)));
 		} catch (e) {
-			i("FileCacheDevice set function", { err: e });
+			i(t, { err: e });
 		}
 	}
 	serialize() {

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`),r=require(`../../functions/utils/bit.operations.cjs`);let i=require(`ethers`),a=require(`@solana/web3.js`);var o=`solana-on-chain-utxo:`,s=8,c=e=>{if(e.length!==s)throw Error(`Expected ${s} 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`${o}${i.ethers.AbiCoder.defaultAbiCoder().encode([`bytes32[8]`],[t])}`},l=e=>e.startsWith(o),u=e=>{if(!l(e))throw Error(`Invalid encoded Solana UTXO payload`);let[n]=i.ethers.AbiCoder.defaultAbiCoder().decode([`bytes32[8]`],e.slice(21)),o=n;if(!Array.isArray(o)||o.length!==s)throw Error(`Malformed encoded Solana UTXO payload`);let[c,u,d,f,p,m,h,g]=o,_=BigInt(c),v=BigInt(f),y=r.extractHighestBit(v)===1n,b=r.takeOffHighestBit(v),x=i.ethers.toBeHex(BigInt(p)),S=BigInt(m),C=BigInt(h),w=BigInt(g).toString(),T=Array.from(i.ethers.getBytes(u)),E=Array.from(i.ethers.getBytes(d)),D=new a.PublicKey(Uint8Array.from([...T.slice(16),...E.slice(16)])).toBase58();return{amount:_,erc20TokenAddress:t.poseidonHash(BigInt(u),BigInt(d)),mintAddress:D,randomization:b,stealthAddress:x,H0:S,H1:C,timeStamp:w,isNewStyle:y}},d=e=>{let t=i.ethers.AbiCoder.defaultAbiCoder().decode([`uint256`,`address`,`tuple(uint256, uint256, uint256, uint256)`,`uint256`,`uint256`],e),n=BigInt(t[0]),a=t[1],o=BigInt(t[2][0]),s=r.extractHighestBit(o),c=r.takeOffHighestBit(o),l=i.ethers.toBeHex(BigInt(t[2][1])),u=BigInt(t[2][2]),d=BigInt(t[2][3]),f=BigInt(t[3]).toString(),p=Number(t[4]);return{amount:n,erc20TokenAddress:a,randomization:c,isNewStyle:s===1n,stealthAddress:l,H0:u,H1:d,timeStamp:f,tokenId:p}},f=(t,n,r)=>{if(e.isSolanaLike(r)){let{amount:e,erc20TokenAddress:r,mintAddress:i,randomization:a,stealthAddress:o,timeStamp:s,isNewStyle:c,H0:l}=u(t);return{amount:e,erc20TokenAddress:r,mintAddress:i,timeStamp:s,nullifyingKey:n,stealthAddress:o,isNewStyle:c,...c?{H0:[a,l]}:{randomization:a}}}let{amount:i,erc20TokenAddress:a,timeStamp:o,randomization:s,isNewStyle:c,stealthAddress:l,H0:f}=d(t);return{amount:i,erc20TokenAddress:a,timeStamp:o,nullifyingKey:n,stealthAddress:l,isNewStyle:c,...c?{H0:[s,f]}:{randomization:s}}},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.isSolanaOnChainUtxo=l;
+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=>{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])}`},c=e=>e.startsWith(a),l=e=>{if(!c(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,l,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(l)),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(l),BigInt(u)),mintAddress:E,h0x:v,h0y:y,h1x:b,h1y:x,stealthAddress:S,timeStamp:C}},u=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()}},d=(t,n,r)=>{if(e.isSolanaLike(r)){let{amount:e,erc20TokenAddress:r,mintAddress:i,h0x:a,h0y:o,stealthAddress:s,timeStamp:c}=l(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:d}=u(t);return{amount:i,erc20TokenAddress:a,timeStamp:o,nullifyingKey:n,stealthAddress:d,H0:[s,c]}},f=(e,t,r)=>new n.Utxo(d(e,t,r));exports.decodeEvmUtxo=u,exports.decodeSolanaUtxo=l,exports.decodeUtxo=f,exports.decodeUtxoConstructorArgs=d,exports.encodeSolanaOnChainUtxo=s,exports.isSolanaOnChainUtxo=c;

package/common/src/data-structures/crypto-keys/decodeUTXO.d.ts

@@ -5,23 +5,22 @@ export declare const decodeSolanaUtxo: (encodedOutput: string) => {
     amount: bigint;
     erc20TokenAddress: string;
     mintAddress: string;
-    randomization: bigint;
+    h0x: bigint;
+    h0y: bigint;
+    h1x: bigint;
+    h1y: bigint;
     stealthAddress: string;
-    H0: bigint;
-    H1: bigint;
     timeStamp: string;
-    isNewStyle: boolean;
 };
 export declare const decodeEvmUtxo: (encryptedOutput: string) => {
     amount: bigint;
     erc20TokenAddress: string;
-    randomization: bigint;
-    isNewStyle: boolean;
+    h0x: bigint;
+    h0y: bigint;
+    h1x: bigint;
+    h1y: bigint;
     stealthAddress: string;
-    H0: bigint;
-    H1: bigint;
     timeStamp: string;
-    tokenId: number;
 };
 export declare const checkUtxoSignature: (encryptedOutput: string, privateKey: string, chainId: number) => boolean;
 export declare const decodeUtxoConstructorArgs: (encryptedOutput: string, privateKey: string, chainId: number) => IUtxoConstructor;

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

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

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`./keys.cjs`),t=require(`../utxo/Utxo.cjs`),n=require(`../../crypto/ecdh-sealed-keys.cjs`),r=require(`../../crypto/ecdh.cjs`);let i=require(`ethers`),a=require(`@solana/web3.js`);var o=e=>e.startsWith(`0x`)?e:`0x${e}`,s=54912,c=2,l=e=>Uint8Array.from([Math.floor(e/256),e%256]),u=e=>e[0]*256+e[1],d=e=>{let t=[Buffer.from(i.ethers.toBeHex(e.amount)),Buffer.from(o(e.erc20TokenAddress)),Buffer.from(i.ethers.toBeHex(e.randomization??0n)),Buffer.from(o(e.getStealthAddress())),Buffer.from(i.ethers.toBeHex(BigInt(e.timeStamp))),Buffer.from(i.ethers.toBeHex(e.isNewStyle?1n:0n)),Buffer.from(i.ethers.toBeHex(e.H0?.[0]??0n)),Buffer.from(i.ethers.toBeHex(e.H0?.[1]??0n))];if(e.mintAddress){let n=new a.PublicKey(e.mintAddress),r=i.ethers.hexlify(n.toBytes());t.push(Buffer.from(r))}let r=n.encryptSealedKeys(Buffer.concat(t),[e.getEncryptionKey()]);return Buffer.concat([Buffer.from(l(s)),Buffer.from(r)])},f=(t,i)=>{let{privateKey:o,publicKey:l}=e.UserKeys.getEncryptionKeyPair(i.getShieldedPrivateKey()),d=u(t)===s?n.decryptSealedKeys(t.slice(c),o,l,0):r.decryptBoxSeal(t,o,l),f=Buffer.from(d).toString(`utf-8`).split(`0x`).filter(e=>e.length!==0),p=e=>BigInt(`0x${e}`),m=e=>`0x${e}`,h=f.length>=8,g=h&&p(f[5])===1n,_=h?8:6,v=f[_]?m(f[_]):void 0,y=v?new a.PublicKey(Buffer.from(v.slice(2),`hex`)).toString():void 0;return{amount:p(f[0]),erc20TokenAddress:m(f[1]),stealthAddress:m(f[3]),nullifyingKey:i.getShieldedPrivateKey(),timeStamp:p(f[4]).toString(),isNewStyle:g,...g?{H0:[p(f[6]),p(f[7])]}:{randomization:p(f[2])},mintAddress:y}},p=(e,n)=>new t.Utxo(f(e,n));exports.decryptUtxo=p,exports.decryptUtxoConstructorArgs=f,exports.encryptUtxo=d;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`./keys.cjs`),n=require(`../utxo/Utxo.cjs`),r=require(`../../crypto/ecdh-sealed-keys.cjs`);let i=require(`ethers`),a=require(`@solana/web3.js`);var o=e=>e.startsWith(`0x`)?e:`0x${e}`,s=t=>{let n=[t];return n.push(e.ENCLAVE_PUBKEY),n},c=e=>{let t=[Buffer.from(i.ethers.toBeHex(e.amount)),Buffer.from(o(e.erc20TokenAddress)),Buffer.from(o(e.getStealthAddress())),Buffer.from(i.ethers.toBeHex(BigInt(e.timeStamp))),Buffer.from(i.ethers.toBeHex(e.H0?.[0]??0n)),Buffer.from(i.ethers.toBeHex(e.H0?.[1]??0n)),Buffer.from(o(e.getEncryptionKey()))];if(e.mintAddress){let n=new a.PublicKey(e.mintAddress),r=i.ethers.hexlify(n.toBytes());t.push(Buffer.from(r))}let n=Buffer.concat(t);return Buffer.from(r.encryptSealedKeys(n,s(e.getEncryptionKey())))},l=(e,t)=>{let n=[Buffer.from(o(e)),Buffer.from(i.ethers.toBeHex(t))],a=Buffer.concat(n);return Buffer.from(r.encryptSealedKeys(a,s(e)))},u=(e,n)=>{let{privateKey:i,publicKey:o}=t.UserKeys.getEncryptionKeyPair(n.getShieldedPrivateKey()),s=r.decryptSealedKeys(e,i,o,0),c=Buffer.from(s).toString(`utf-8`).split(`0x`).filter(e=>e.length!==0),l=e=>BigInt(`0x${e}`),u=e=>`0x${e}`,d=c[7]?u(c[7]):void 0,f=d?new a.PublicKey(Buffer.from(d.slice(2),`hex`)).toString():void 0;return{amount:l(c[0]),erc20TokenAddress:u(c[1]),stealthAddress:u(c[2]),nullifyingKey:n.getShieldedPrivateKey(),timeStamp:l(c[3]).toString(),H0:[l(c[4]),l(c[5])],mintAddress:f}},d=(e,t)=>new n.Utxo(u(e,t));exports.decryptUtxo=d,exports.decryptUtxoConstructorArgs=u,exports.encryptEncryptionKeyAndStealthAddress=l,exports.encryptUtxo=c;

package/common/src/data-structures/crypto-keys/encryptDecryptUtxo.d.ts

@@ -2,12 +2,11 @@ import { IUtxoConstructor, Utxo } from '../utxo/Utxo';
 import { UserKeys } from './keys';
 /**
  * encrypt data for the UTXO
- * @param amount UTXO amount
- * @param blinding UTXO blinding
- * @param publicKey sender's encryption public key
+ * @param utxo UTXO to encrypt
  * @returns returns encrypted data {Uint8Array}
  */
 export declare const encryptUtxo: (utxo: Utxo) => Uint8Array;
+export declare const encryptEncryptionKeyAndStealthAddress: (encryptionKey: string, stealthAddress: bigint) => Uint8Array;
 export declare const decryptUtxoConstructorArgs: (encryptedData: Uint8Array, userKeys: UserKeys) => IUtxoConstructor;
 /**
  * decrypt UTXO data from events

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

@@ -1,39 +1,43 @@
-import { UserKeys as e } from "./keys.mjs";
-import { Utxo as t } from "../utxo/Utxo.mjs";
-import { decryptSealedKeys as n, encryptSealedKeys as r } from "../../crypto/ecdh-sealed-keys.mjs";
-import { decryptBoxSeal as i } from "../../crypto/ecdh.mjs";
+import { ENCLAVE_PUBKEY as e } from "../../constants/protocol.constants.mjs";
+import { UserKeys as t } from "./keys.mjs";
+import { Utxo as n } from "../utxo/Utxo.mjs";
+import { decryptSealedKeys as r, encryptSealedKeys as i } from "../../crypto/ecdh-sealed-keys.mjs";
 import { ethers as a } from "ethers";
 import { PublicKey as o } from "@solana/web3.js";
 //#region libs/shared/common/src/data-structures/crypto-keys/encryptDecryptUtxo.ts
-var s = (e) => e.startsWith("0x") ? e : `0x${e}`, c = 54912, l = 2, u = (e) => Uint8Array.from([Math.floor(e / 256), e % 256]), d = (e) => e[0] * 256 + e[1], f = (e) => {
+var s = (e) => e.startsWith("0x") ? e : `0x${e}`, c = (t) => {
+	let n = [t];
+	return n.push(e), n;
+}, l = (e) => {
 	let t = [
 		Buffer.from(a.toBeHex(e.amount)),
 		Buffer.from(s(e.erc20TokenAddress)),
-		Buffer.from(a.toBeHex(e.randomization ?? 0n)),
 		Buffer.from(s(e.getStealthAddress())),
 		Buffer.from(a.toBeHex(BigInt(e.timeStamp))),
-		Buffer.from(a.toBeHex(e.isNewStyle ? 1n : 0n)),
 		Buffer.from(a.toBeHex(e.H0?.[0] ?? 0n)),
-		Buffer.from(a.toBeHex(e.H0?.[1] ?? 0n))
+		Buffer.from(a.toBeHex(e.H0?.[1] ?? 0n)),
+		Buffer.from(s(e.getEncryptionKey()))
 	];
 	if (e.mintAddress) {
 		let n = new o(e.mintAddress), r = a.hexlify(n.toBytes());
 		t.push(Buffer.from(r));
 	}
-	let n = r(Buffer.concat(t), [e.getEncryptionKey()]);
-	return Buffer.concat([Buffer.from(u(c)), Buffer.from(n)]);
-}, p = (t, r) => {
-	let { privateKey: a, publicKey: s } = e.getEncryptionKeyPair(r.getShieldedPrivateKey()), u = d(t) === c ? n(t.slice(l), a, s, 0) : i(t, a, s), f = Buffer.from(u).toString("utf-8").split("0x").filter((e) => e.length !== 0), p = (e) => BigInt(`0x${e}`), m = (e) => `0x${e}`, h = f.length >= 8, g = h && p(f[5]) === 1n, _ = h ? 8 : 6, v = f[_] ? m(f[_]) : void 0, y = v ? new o(Buffer.from(v.slice(2), "hex")).toString() : void 0;
+	let n = Buffer.concat(t);
+	return Buffer.from(i(n, c(e.getEncryptionKey())));
+}, u = (e, t) => {
+	let n = [Buffer.from(s(e)), Buffer.from(a.toBeHex(t))], r = Buffer.concat(n);
+	return Buffer.from(i(r, c(e)));
+}, d = (e, n) => {
+	let { privateKey: i, publicKey: a } = t.getEncryptionKeyPair(n.getShieldedPrivateKey()), s = r(e, i, a, 0), c = Buffer.from(s).toString("utf-8").split("0x").filter((e) => e.length !== 0), l = (e) => BigInt(`0x${e}`), u = (e) => `0x${e}`, d = c[7] ? u(c[7]) : void 0, f = d ? new o(Buffer.from(d.slice(2), "hex")).toString() : void 0;
 	return {
-		amount: p(f[0]),
-		erc20TokenAddress: m(f[1]),
-		stealthAddress: m(f[3]),
-		nullifyingKey: r.getShieldedPrivateKey(),
-		timeStamp: p(f[4]).toString(),
-		isNewStyle: g,
-		...g ? { H0: [p(f[6]), p(f[7])] } : { randomization: p(f[2]) },
-		mintAddress: y
+		amount: l(c[0]),
+		erc20TokenAddress: u(c[1]),
+		stealthAddress: u(c[2]),
+		nullifyingKey: n.getShieldedPrivateKey(),
+		timeStamp: l(c[3]).toString(),
+		H0: [l(c[4]), l(c[5])],
+		mintAddress: f
 	};
-}, m = (e, n) => new t(p(e, n));
+}, f = (e, t) => new n(d(e, t));
 //#endregion
-export { m as decryptUtxo, p as decryptUtxoConstructorArgs, f as encryptUtxo };
+export { f as decryptUtxo, d as decryptUtxoConstructorArgs, u as encryptEncryptionKeyAndStealthAddress, l as encryptUtxo };

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

@@ -1 +1 @@
-const e=require(`../../../../_virtual/_rolldown/runtime.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../crypto/poseidon.cjs`),r=require(`../../crypto/babyJub.cjs`),i=require(`../../crypto/eddsa.cjs`),a=require(`../cacheDevices/AttachableMemoryCacheDevice.cjs`),o=require(`./keyUtils.cjs`);let s=require(`ethers`),c=require(`@solana/web3.js`),l=require(`bs58`);l=e.__toESM(l);let u=require(`libsodium-wrappers`);u=e.__toESM(u);let d=require(`tweetnacl`);d=e.__toESM(d);let f=require(`tronweb`);var p=new a.AttachableMemoryCacheDevice,m=new a.AttachableMemoryCacheDevice,h=new a.AttachableMemoryCacheDevice,g=class{signature;nullifyingKey;PREFIX_FOR_SPENDING_PAIR=`1`;PREFIX_FOR_NULLIFYING_PAIR=`2`;constructor(e,t){this.signature=e,this.nullifyingKey=t}getSignature(){return this.requireSignature(),this.signature}setSignature(e){this.signature=e}requireSignature(){if(!this.signature)throw Error(`No signature provided`)}requireKeyMaterial(){if(!this.signature&&!this.nullifyingKey)throw Error(`No signature or private key provided`)}verifyTronMessage(e,t){return this.requireSignature(),t===f.Trx.verifyMessageV2(e,this.signature)}getShieldedPrivateKey=()=>(this.requireKeyMaterial(),this.nullifyingKey||=s.ethers.keccak256(this.signature),this.nullifyingKey);getShieldedPublicKey=()=>(this.requireKeyMaterial(),n.poseidonHash(this.getShieldedPrivateKey()));getSpendingKeyPair=()=>{this.requireSignature();let e=i.eddsaInstance(),t=r.babyJubInstance(),a=n.poseidonHash(this.PREFIX_FOR_SPENDING_PAIR,this.getSignature()),o=Buffer.from(s.ethers.getBytes(a)),c=e.prv2pub(o);return{privSpendingKey:a,pubSpendingBJJPoint:[BigInt(t.F.toString(c[0])),BigInt(t.F.toString(c[1]))]}};signEddsa=e=>{this.requireSignature();let t=r.babyJubInstance(),n=i.eddsaInstance(),a=Buffer.from(s.ethers.getBytes(this.getSpendingKeyPair().privSpendingKey)),o=t.F.e(e),c=n.signPoseidon(a,o);return{R8:[BigInt(t.F.toString(c.R8[0])),BigInt(t.F.toString(c.R8[1]))],S:BigInt(c.S)}};getShieldedPrivateKeyFromNonce=e=>{this.requireKeyMaterial();let t=n.poseidonHash(e,this.getShieldedPrivateKey(),this.getShieldedPublicKey());return s.ethers.keccak256(s.ethers.toUtf8Bytes(`hinkal-offchain-shielded-key:${t}`))};getClaimableSignatureFromNonce=e=>{this.requireKeyMaterial();let t=n.poseidonHash(e,this.getShieldedPrivateKey(),this.getShieldedPublicKey());return s.ethers.keccak256(s.ethers.toUtf8Bytes(`hinkal-claimable-utxo-signature:${t}`))};getDerivedEthereumAddress=()=>(this.requireKeyMaterial(),new s.ethers.Wallet(this.getShieldedPrivateKey()).address);getDerivedSolanaPublicKey=()=>(this.requireKeyMaterial(),c.Keypair.fromSeed(s.ethers.getBytes(this.getShieldedPrivateKey())).publicKey.toBase58());getNearIntentsAccountId=()=>{this.requireKeyMaterial();let e=c.Keypair.fromSeed(s.ethers.getBytes(this.getShieldedPrivateKey()));return s.ethers.hexlify(e.publicKey.toBytes()).slice(2)};getNearIntentsKeyPairString=()=>{this.requireKeyMaterial();let e=c.Keypair.fromSeed(s.ethers.getBytes(this.getShieldedPrivateKey()));return`ed25519:${l.default.encode(e.secretKey)}`};getSignerPrivateKeyFromNonce=e=>{this.requireKeyMaterial();let t=n.poseidonHash(e,this.getShieldedPrivateKey(),this.getShieldedPublicKey());return s.ethers.keccak256(s.ethers.toUtf8Bytes(t))};getSignerSolanaPrivateKeyFromNonce=e=>{let t=this.getSignerPrivateKeyFromNonce(e),n=s.ethers.getBytes(t),r=c.Keypair.fromSeed(n);return l.default.encode(r.secretKey)};verifyMessage(e){return this.requireSignature(),s.ethers.verifyMessage(e,this.signature)}verifySolanaMessage(e,t){this.requireSignature();let n=new TextEncoder().encode(e),r=s.ethers.getBytes(this.signature),i=new c.PublicKey(t).toBytes();return d.default.sign.detached.verify(n,r,i)}static getRandomizedStealthPairOld=m.attach((e,n)=>{let i=r.babyJubInstance(),a=e*(BigInt(n)%t.CIRCOM_P)%t.CIRCOM_P,o=i.mulPointEscalar(i.Base8,e),s=i.mulPointEscalar(i.Base8,a);return{H0:[BigInt(i.F.toString(o[0])),BigInt(i.F.toString(o[1]))],H1:[BigInt(i.F.toString(s[0])),BigInt(i.F.toString(s[1]))]}});static getRandomizedStealthPair=p.attach((e,n)=>{let i=r.babyJubInstance(),a=BigInt(n)%t.CIRCOM_P,o=i.mulPointEscalar(i.Base8,e),s=i.mulPointEscalar(o,a);return{H0:[BigInt(i.F.toString(o[0])),BigInt(i.F.toString(o[1]))],H1:[BigInt(i.F.toString(s[0])),BigInt(i.F.toString(s[1]))]}});static getStealthAddressCompressedPoints=(e,t)=>{let{H0:n,H1:r}=this.getRandomizedStealthPairOld(e,t),[i,a]=[n,r].map(e=>BigInt(e[1])+2n**255n*o.getCircomSign(e[0]));return{h0:i,h1:a}};static checkSignature=(e,t,n,r)=>{let{h0:i,h1:a}=this.getStealthAddressCompressedPoints(e,r);return t===i&&n===a};static getStealthAddress=h.attach((e,t)=>{let{H0:r,H1:i}=this.getRandomizedStealthPairOld(e,t);return n.poseidonHash(2n*o.getCircomSign(r[0])+o.getCircomSign(i[0]),r[1],i[1])});static getH1FromH0=(e,n)=>{let i=r.babyJubInstance(),a=BigInt(n)%t.CIRCOM_P,o=[i.F.e(e[0]),i.F.e(e[1])],s=i.mulPointEscalar(o,a);return[BigInt(i.F.toString(s[0])),BigInt(i.F.toString(s[1]))]};static verifyStealthPair=(e,t,n,r=!0)=>{let i=this.getH1FromH0(e,n);return r?i[1]===t[1]:i===t};static getStealthAddressNewStyle=(e,t,r)=>{if(r?.length!==2)throw Error(`Spending public key must be an array of 2 elements`);let i=this.getH1FromH0(e,t);return n.poseidonHash(2n*o.getCircomSign(e[0])+o.getCircomSign(i[0]),e[1],i[1],r[0],r[1],t)};static findCorrectRandomization(e,n){if(!n)throw Error(`No Private Shielded Key Provided`);let r=BigInt(n)%t.CIRCOM_P,i,a,o=0n;do i=e*10n**o%t.CIRCOM_P,a=i*r%t.CIRCOM_P,o+=1n;while(a>=2n**253n||i>=2n**253n);return i}static getH0FromRandomization=e=>{let t=r.babyJubInstance(),n=t.mulPointEscalar(t.Base8,e);return[BigInt(t.F.toString(n[0])),BigInt(t.F.toString(n[1]))]};static findH0(e,t){if(!t)return;let{H0:n}=this.getRandomizedStealthPair(e,t);return n}static getEncryptionKeyPair=e=>{let t=u.default.crypto_box_seed_keypair(s.ethers.getBytes(e));return{privateKey:s.ethers.hexlify(t.privateKey),publicKey:s.ethers.hexlify(t.publicKey)}};getAccessKey=()=>(this.requireKeyMaterial(),n.poseidonHash(this.getShieldedPrivateKey(),this.getShieldedPublicKey()));getBackendToken=()=>(this.requireKeyMaterial(),n.poseidonHash(this.getAccessKey(),this.getShieldedPublicKey()))};exports.UserKeys=g,exports.stealthAddressCacheDevice=h,exports.stealthPairCacheDevice=p,exports.stealthPairOldCacheDevice=m;
+const e=require(`../../../../_virtual/_rolldown/runtime.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../crypto/poseidon.cjs`),r=require(`../../crypto/babyJub.cjs`),i=require(`../../crypto/eddsa.cjs`),a=require(`../cacheDevices/AttachableMemoryCacheDevice.cjs`),o=require(`./keyUtils.cjs`);let s=require(`ethers`),c=require(`@solana/web3.js`),l=require(`bs58`);l=e.__toESM(l);let u=require(`libsodium-wrappers`);u=e.__toESM(u);let d=require(`tweetnacl`);d=e.__toESM(d);let f=require(`tronweb`);var p=new a.AttachableMemoryCacheDevice,m=class{signature;nullifyingKey;PREFIX_FOR_SPENDING_PAIR=`1`;constructor(e,t){this.signature=e,this.nullifyingKey=t}getSignature(){return this.requireSignature(),this.signature}setSignature(e){this.signature=e}requireSignature(){if(!this.signature)throw Error(`No signature provided`)}requireKeyMaterial(){if(!this.signature&&!this.nullifyingKey)throw Error(`No signature or private key provided`)}verifyTronMessage(e,t){return this.requireSignature(),t===f.Trx.verifyMessageV2(e,this.signature)}getShieldedPrivateKey=()=>{if(this.requireKeyMaterial(),!this.nullifyingKey){let e=BigInt(n.poseidonHash(this.signature));this.nullifyingKey=s.ethers.toBeHex(e%t.NULLIFYING_PRIVATE_KEY_MOD)}return this.nullifyingKey};getShieldedPrivateKeySeed=()=>s.ethers.keccak256(this.getShieldedPrivateKey());getShieldedPublicKey=()=>(this.requireKeyMaterial(),n.poseidonHash(this.getShieldedPrivateKey()));getSpendingKeyPair=()=>{this.requireSignature();let e=i.eddsaInstance(),t=r.babyJubInstance(),a=n.poseidonHash(this.PREFIX_FOR_SPENDING_PAIR,this.getSignature()),o=Buffer.from(s.ethers.getBytes(a)),c=e.prv2pub(o);return{privSpendingKey:a,pubSpendingBJJPoint:[BigInt(t.F.toString(c[0])),BigInt(t.F.toString(c[1]))]}};signEddsa=e=>{this.requireSignature();let t=r.babyJubInstance(),n=i.eddsaInstance(),a=Buffer.from(s.ethers.getBytes(this.getSpendingKeyPair().privSpendingKey)),o=t.F.e(e),c=n.signPoseidon(a,o);return{R8:[BigInt(t.F.toString(c.R8[0])),BigInt(t.F.toString(c.R8[1]))],S:BigInt(c.S)}};getShieldedPrivateKeyFromNonce=e=>{this.requireKeyMaterial();let t=n.poseidonHash(e,this.getShieldedPrivateKey(),this.getShieldedPublicKey());return s.ethers.keccak256(s.ethers.toUtf8Bytes(`hinkal-offchain-shielded-key:${t}`))};getClaimableSignatureFromNonce=e=>{this.requireKeyMaterial();let t=n.poseidonHash(e,this.getShieldedPrivateKey(),this.getShieldedPublicKey());return s.ethers.keccak256(s.ethers.toUtf8Bytes(`hinkal-claimable-utxo-signature:${t}`))};getNearIntentsAccountId=()=>{this.requireKeyMaterial();let e=c.Keypair.fromSeed(s.ethers.getBytes(this.getShieldedPrivateKeySeed()));return s.ethers.hexlify(e.publicKey.toBytes()).slice(2)};getNearIntentsKeyPairString=()=>{this.requireKeyMaterial();let e=c.Keypair.fromSeed(s.ethers.getBytes(this.getShieldedPrivateKeySeed()));return`ed25519:${l.default.encode(e.secretKey)}`};getSignerPrivateKeyFromNonce=e=>{this.requireKeyMaterial();let t=n.poseidonHash(e,this.getShieldedPrivateKey(),this.getShieldedPublicKey());return s.ethers.keccak256(s.ethers.toUtf8Bytes(t))};getSignerSolanaPrivateKeyFromNonce=e=>{let t=this.getSignerPrivateKeyFromNonce(e),n=s.ethers.getBytes(t),r=c.Keypair.fromSeed(n);return l.default.encode(r.secretKey)};verifyMessage(e){return this.requireSignature(),s.ethers.verifyMessage(e,this.signature)}verifySolanaMessage(e,t){this.requireSignature();let n=new TextEncoder().encode(e),r=s.ethers.getBytes(this.signature),i=new c.PublicKey(t).toBytes();return d.default.sign.detached.verify(n,r,i)}static getRandomizedStealthPair=p.attach((e,t)=>{let n=r.babyJubInstance(),i=n.mulPointEscalar(n.Base8,e),a=n.mulPointEscalar(i,BigInt(t));return{H0:[BigInt(n.F.toString(i[0])),BigInt(n.F.toString(i[1]))],H1:[BigInt(n.F.toString(a[0])),BigInt(n.F.toString(a[1]))]}});static getH1FromH0=(e,t)=>{let n=r.babyJubInstance(),i=[n.F.e(e[0]),n.F.e(e[1])],a=n.mulPointEscalar(i,BigInt(t));return[BigInt(n.F.toString(a[0])),BigInt(n.F.toString(a[1]))]};static verifyStealthPair=(e,t,n,r=!0)=>{let i=this.getH1FromH0(e,n);return r?i[1]===t[1]:i===t};static getStealthAddress=(e,t,r)=>{if(r?.length!==2)throw Error(`Spending public key must be an array of 2 elements`);let i=this.getH1FromH0(e,t);return n.poseidonHash(2n*o.getCircomSign(e[0])+o.getCircomSign(i[0]),e[1],i[1],r[0],r[1],t)};static findCorrectRandomization(e,n){if(!n)throw Error(`No Private Shielded Key Provided`);let r=BigInt(n),i,a,o=0n;do i=e*10n**o%t.CIRCOM_P,a=i*r%t.CIRCOM_P,o+=1n;while(a>=2n**250n||i>=2n**250n);return i}static getH0FromRandomization=e=>{let t=r.babyJubInstance(),n=t.mulPointEscalar(t.Base8,e);return[BigInt(t.F.toString(n[0])),BigInt(t.F.toString(n[1]))]};static findH0(e,t){if(!t)return;let{H0:n}=this.getRandomizedStealthPair(e,t);return n}static getEncryptionKeyPair=e=>{let t=u.default.crypto_box_seed_keypair(s.ethers.getBytes(s.ethers.keccak256(e)));return{privateKey:s.ethers.hexlify(t.privateKey),publicKey:s.ethers.hexlify(t.publicKey)}};getAccessKey=()=>(this.requireKeyMaterial(),n.poseidonHash(this.getShieldedPrivateKey(),this.getShieldedPublicKey()));getBackendToken=()=>(this.requireKeyMaterial(),n.poseidonHash(this.getAccessKey(),this.getShieldedPublicKey()))};exports.UserKeys=m,exports.stealthPairCacheDevice=p;

package/common/src/data-structures/crypto-keys/keys.d.ts

@@ -4,11 +4,6 @@ export declare const stealthPairCacheDevice: AttachableMemoryCacheDevice<{
     H0: [bigint, bigint];
     H1: [bigint, bigint];
 }>;
-export declare const stealthPairOldCacheDevice: AttachableMemoryCacheDevice<{
-    H0: [bigint, bigint];
-    H1: [bigint, bigint];
-}>;
-export declare const stealthAddressCacheDevice: AttachableMemoryCacheDevice<string>;
 export interface EncryptionKeyPair {
     privateKey: string;
     publicKey: string;
@@ -18,7 +13,6 @@ export declare class UserKeys {
     private signature;
     private nullifyingKey;
     private readonly PREFIX_FOR_SPENDING_PAIR;
-    private readonly PREFIX_FOR_NULLIFYING_PAIR;
     constructor(_signature?: string, _nullifyingKey?: string);
     getSignature(): string;
     setSignature(_signature: string): void;
@@ -31,6 +25,14 @@ export declare class UserKeys {
      * @retuns 0x-prefixed shielded private key
      */
     getShieldedPrivateKey: () => string;
+    /**
+     * getShieldedPrivateKey() is constrained to < 2^250 to match the circuit's nullifyingPrivateKey
+     * range check, so it's no longer 32 bytes and can't be used directly as raw key material for
+     * libraries that require a full-length seed.
+     * This re-expands it back to a full 32-byte seed via keccak256 for those use sites.
+     * @returns 32-byte 0x-prefixed seed
+     */
+    private getShieldedPrivateKeySeed;
     /**
      * generate shielded public key from private key
      * @param privateKey the key used to generate the shielded public key, this should be the signature
@@ -62,14 +64,6 @@ export declare class UserKeys {
      */
     getShieldedPrivateKeyFromNonce: (nonce: bigint) => string;
     getClaimableSignatureFromNonce: (nonce: bigint) => string;
-    /**
-     * deterministically derive an EVM address from the shielded private key
-     */
-    getDerivedEthereumAddress: () => string;
-    /**
-     * deterministically derive a Solana public key from the shielded private key
-     */
-    getDerivedSolanaPublicKey: () => string;
     /**
      * deterministically derive the user's NEAR Intents account id from the shielded private key.
      * The account id is the NEAR implicit account (lowercase hex of the ed25519 public key) of the
@@ -92,30 +86,21 @@ export declare class UserKeys {
     getSignerSolanaPrivateKeyFromNonce: (walletNonce: bigint) => string;
     verifyMessage(signingMessage: string): string;
     verifySolanaMessage(signingMessage: string, signerPublicKey: string): boolean;
-    static getRandomizedStealthPairOld: (s: bigint, privateKey: string) => {
-        H0: [bigint, bigint];
-        H1: [bigint, bigint];
-    };
     static getRandomizedStealthPair: (s: bigint, privateKey: string) => {
         H0: [bigint, bigint];
         H1: [bigint, bigint];
     };
-    static getStealthAddressCompressedPoints: (s: bigint, privateKey: string) => {
-        h0: bigint;
-        h1: bigint;
-    };
-    static checkSignature: (s: bigint, stealthAddressH0: bigint, stealthAddressH1: bigint, privateKey: string) => boolean;
-    static getStealthAddress: (s: bigint, privateKey: string) => string;
     static getH1FromH0: (H0: JubPoint, privateKey: string) => JubPoint;
     static verifyStealthPair: (H0: JubPoint, H1: JubPoint, privateKey: string, onlyYCheck?: boolean) => boolean;
-    static getStealthAddressNewStyle: (H0: JubPoint, nullifyingPrivateKey: string, spendingPublicKey?: bigint[]) => string;
+    static getStealthAddress: (H0: JubPoint, nullifyingPrivateKey: string, spendingPublicKey?: bigint[]) => string;
     static findCorrectRandomization(initialRandomization: bigint, privateKey?: string): bigint;
     static getH0FromRandomization: (randomization: bigint) => JubPoint;
     static findH0(randomization: bigint, privateKey: string | undefined): JubPoint | undefined;
     /**
      * generate private and public keypair
-     * @param seed seed to use to deterministically generate key, must be in DataHexString format
-     * and must correspond to 32 bytes
+     * @param privateKey seed to use to deterministically generate key, any DataHexString;
+     * since nullifyingKey/shieldedPrivateKey are now constrained to < 2^250 (not 32 bytes),
+     * this re-expands the input via keccak256 to get a full 32-byte seed for sodium
      */
     static getEncryptionKeyPair: (privateKey: string) => EncryptionKeyPair;
     /**

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

@@ -1,21 +1,20 @@
-import { CIRCOM_P as e } from "../../constants/protocol.constants.mjs";
-import { poseidonHash as t } from "../../crypto/poseidon.mjs";
-import { babyJubInstance as n } from "../../crypto/babyJub.mjs";
-import { eddsaInstance as r } from "../../crypto/eddsa.mjs";
-import { AttachableMemoryCacheDevice as i } from "../cacheDevices/AttachableMemoryCacheDevice.mjs";
-import { getCircomSign as a } from "./keyUtils.mjs";
-import { ethers as o } from "ethers";
-import { Keypair as s, PublicKey as c } from "@solana/web3.js";
-import l from "bs58";
-import u from "libsodium-wrappers";
-import d from "tweetnacl";
-import { Trx as f } from "tronweb";
+import { CIRCOM_P as e, NULLIFYING_PRIVATE_KEY_MOD as t } from "../../constants/protocol.constants.mjs";
+import { poseidonHash as n } from "../../crypto/poseidon.mjs";
+import { babyJubInstance as r } from "../../crypto/babyJub.mjs";
+import { eddsaInstance as i } from "../../crypto/eddsa.mjs";
+import { AttachableMemoryCacheDevice as a } from "../cacheDevices/AttachableMemoryCacheDevice.mjs";
+import { getCircomSign as o } from "./keyUtils.mjs";
+import { ethers as s } from "ethers";
+import { Keypair as c, PublicKey as l } from "@solana/web3.js";
+import u from "bs58";
+import d from "libsodium-wrappers";
+import f from "tweetnacl";
+import { Trx as p } from "tronweb";
 //#region libs/shared/common/src/data-structures/crypto-keys/keys.ts
-var p = new i(), m = new i(), h = new i(), g = class {
+var m = new a(), h = class {
 	signature;
 	nullifyingKey;
 	PREFIX_FOR_SPENDING_PAIR = "1";
-	PREFIX_FOR_NULLIFYING_PAIR = "2";
 	constructor(e, t) {
 		this.signature = e, this.nullifyingKey = t;
 	}
@@ -32,21 +31,28 @@ var p = new i(), m = new i(), h = new i(), g = class {
 		if (!this.signature && !this.nullifyingKey) throw Error("No signature or private key provided");
 	}
 	verifyTronMessage(e, t) {
-		return this.requireSignature(), t === f.verifyMessageV2(e, this.signature);
+		return this.requireSignature(), t === p.verifyMessageV2(e, this.signature);
 	}
-	getShieldedPrivateKey = () => (this.requireKeyMaterial(), this.nullifyingKey ||= o.keccak256(this.signature), this.nullifyingKey);
-	getShieldedPublicKey = () => (this.requireKeyMaterial(), t(this.getShieldedPrivateKey()));
+	getShieldedPrivateKey = () => {
+		if (this.requireKeyMaterial(), !this.nullifyingKey) {
+			let e = BigInt(n(this.signature));
+			this.nullifyingKey = s.toBeHex(e % t);
+		}
+		return this.nullifyingKey;
+	};
+	getShieldedPrivateKeySeed = () => s.keccak256(this.getShieldedPrivateKey());
+	getShieldedPublicKey = () => (this.requireKeyMaterial(), n(this.getShieldedPrivateKey()));
 	getSpendingKeyPair = () => {
 		this.requireSignature();
-		let e = r(), i = n(), a = t(this.PREFIX_FOR_SPENDING_PAIR, this.getSignature()), s = Buffer.from(o.getBytes(a)), c = e.prv2pub(s);
+		let e = i(), t = r(), a = n(this.PREFIX_FOR_SPENDING_PAIR, this.getSignature()), o = Buffer.from(s.getBytes(a)), c = e.prv2pub(o);
 		return {
 			privSpendingKey: a,
-			pubSpendingBJJPoint: [BigInt(i.F.toString(c[0])), BigInt(i.F.toString(c[1]))]
+			pubSpendingBJJPoint: [BigInt(t.F.toString(c[0])), BigInt(t.F.toString(c[1]))]
 		};
 	};
 	signEddsa = (e) => {
 		this.requireSignature();
-		let t = n(), i = r(), a = Buffer.from(o.getBytes(this.getSpendingKeyPair().privSpendingKey)), s = t.F.e(e), c = i.signPoseidon(a, s);
+		let t = r(), n = i(), a = Buffer.from(s.getBytes(this.getSpendingKeyPair().privSpendingKey)), o = t.F.e(e), c = n.signPoseidon(a, o);
 		return {
 			R8: [BigInt(t.F.toString(c.R8[0])), BigInt(t.F.toString(c.R8[1]))],
 			S: BigInt(c.S)
@@ -54,96 +60,72 @@ var p = new i(), m = new i(), h = new i(), g = class {
 	};
 	getShieldedPrivateKeyFromNonce = (e) => {
 		this.requireKeyMaterial();
-		let n = t(e, this.getShieldedPrivateKey(), this.getShieldedPublicKey());
-		return o.keccak256(o.toUtf8Bytes(`hinkal-offchain-shielded-key:${n}`));
+		let t = n(e, this.getShieldedPrivateKey(), this.getShieldedPublicKey());
+		return s.keccak256(s.toUtf8Bytes(`hinkal-offchain-shielded-key:${t}`));
 	};
 	getClaimableSignatureFromNonce = (e) => {
 		this.requireKeyMaterial();
-		let n = t(e, this.getShieldedPrivateKey(), this.getShieldedPublicKey());
-		return o.keccak256(o.toUtf8Bytes(`hinkal-claimable-utxo-signature:${n}`));
+		let t = n(e, this.getShieldedPrivateKey(), this.getShieldedPublicKey());
+		return s.keccak256(s.toUtf8Bytes(`hinkal-claimable-utxo-signature:${t}`));
 	};
-	getDerivedEthereumAddress = () => (this.requireKeyMaterial(), new o.Wallet(this.getShieldedPrivateKey()).address);
-	getDerivedSolanaPublicKey = () => (this.requireKeyMaterial(), s.fromSeed(o.getBytes(this.getShieldedPrivateKey())).publicKey.toBase58());
 	getNearIntentsAccountId = () => {
 		this.requireKeyMaterial();
-		let e = s.fromSeed(o.getBytes(this.getShieldedPrivateKey()));
-		return o.hexlify(e.publicKey.toBytes()).slice(2);
+		let e = c.fromSeed(s.getBytes(this.getShieldedPrivateKeySeed()));
+		return s.hexlify(e.publicKey.toBytes()).slice(2);
 	};
 	getNearIntentsKeyPairString = () => {
 		this.requireKeyMaterial();
-		let e = s.fromSeed(o.getBytes(this.getShieldedPrivateKey()));
-		return `ed25519:${l.encode(e.secretKey)}`;
+		let e = c.fromSeed(s.getBytes(this.getShieldedPrivateKeySeed()));
+		return `ed25519:${u.encode(e.secretKey)}`;
 	};
 	getSignerPrivateKeyFromNonce = (e) => {
 		this.requireKeyMaterial();
-		let n = t(e, this.getShieldedPrivateKey(), this.getShieldedPublicKey());
-		return o.keccak256(o.toUtf8Bytes(n));
+		let t = n(e, this.getShieldedPrivateKey(), this.getShieldedPublicKey());
+		return s.keccak256(s.toUtf8Bytes(t));
 	};
 	getSignerSolanaPrivateKeyFromNonce = (e) => {
-		let t = this.getSignerPrivateKeyFromNonce(e), n = o.getBytes(t), r = s.fromSeed(n);
-		return l.encode(r.secretKey);
+		let t = this.getSignerPrivateKeyFromNonce(e), n = s.getBytes(t), r = c.fromSeed(n);
+		return u.encode(r.secretKey);
 	};
 	verifyMessage(e) {
-		return this.requireSignature(), o.verifyMessage(e, this.signature);
+		return this.requireSignature(), s.verifyMessage(e, this.signature);
 	}
 	verifySolanaMessage(e, t) {
 		this.requireSignature();
-		let n = new TextEncoder().encode(e), r = o.getBytes(this.signature), i = new c(t).toBytes();
-		return d.sign.detached.verify(n, r, i);
+		let n = new TextEncoder().encode(e), r = s.getBytes(this.signature), i = new l(t).toBytes();
+		return f.sign.detached.verify(n, r, i);
 	}
-	static getRandomizedStealthPairOld = m.attach((t, r) => {
-		let i = n(), a = t * (BigInt(r) % e) % e, o = i.mulPointEscalar(i.Base8, t), s = i.mulPointEscalar(i.Base8, a);
-		return {
-			H0: [BigInt(i.F.toString(o[0])), BigInt(i.F.toString(o[1]))],
-			H1: [BigInt(i.F.toString(s[0])), BigInt(i.F.toString(s[1]))]
-		};
-	});
-	static getRandomizedStealthPair = p.attach((t, r) => {
-		let i = n(), a = BigInt(r) % e, o = i.mulPointEscalar(i.Base8, t), s = i.mulPointEscalar(o, a);
-		return {
-			H0: [BigInt(i.F.toString(o[0])), BigInt(i.F.toString(o[1]))],
-			H1: [BigInt(i.F.toString(s[0])), BigInt(i.F.toString(s[1]))]
-		};
-	});
-	static getStealthAddressCompressedPoints = (e, t) => {
-		let { H0: n, H1: r } = this.getRandomizedStealthPairOld(e, t), [i, o] = [n, r].map((e) => BigInt(e[1]) + 2n ** 255n * a(e[0]));
+	static getRandomizedStealthPair = m.attach((e, t) => {
+		let n = r(), i = n.mulPointEscalar(n.Base8, e), a = n.mulPointEscalar(i, BigInt(t));
 		return {
-			h0: i,
-			h1: o
+			H0: [BigInt(n.F.toString(i[0])), BigInt(n.F.toString(i[1]))],
+			H1: [BigInt(n.F.toString(a[0])), BigInt(n.F.toString(a[1]))]
 		};
-	};
-	static checkSignature = (e, t, n, r) => {
-		let { h0: i, h1: a } = this.getStealthAddressCompressedPoints(e, r);
-		return t === i && n === a;
-	};
-	static getStealthAddress = h.attach((e, n) => {
-		let { H0: r, H1: i } = this.getRandomizedStealthPairOld(e, n);
-		return t(2n * a(r[0]) + a(i[0]), r[1], i[1]);
 	});
-	static getH1FromH0 = (t, r) => {
-		let i = n(), a = BigInt(r) % e, o = [i.F.e(t[0]), i.F.e(t[1])], s = i.mulPointEscalar(o, a);
-		return [BigInt(i.F.toString(s[0])), BigInt(i.F.toString(s[1]))];
+	static getH1FromH0 = (e, t) => {
+		let n = r(), i = [n.F.e(e[0]), n.F.e(e[1])], a = n.mulPointEscalar(i, BigInt(t));
+		return [BigInt(n.F.toString(a[0])), BigInt(n.F.toString(a[1]))];
 	};
 	static verifyStealthPair = (e, t, n, r = !0) => {
 		let i = this.getH1FromH0(e, n);
 		return r ? i[1] === t[1] : i === t;
 	};
-	static getStealthAddressNewStyle = (e, n, r) => {
+	static getStealthAddress = (e, t, r) => {
 		if (r?.length !== 2) throw Error("Spending public key must be an array of 2 elements");
-		let i = this.getH1FromH0(e, n);
-		return t(2n * a(e[0]) + a(i[0]), e[1], i[1], r[0], r[1], n);
+		let i = this.getH1FromH0(e, t);
+		return n(2n * o(e[0]) + o(i[0]), e[1], i[1], r[0], r[1], t);
 	};
 	static findCorrectRandomization(t, n) {
 		if (!n) throw Error("No Private Shielded Key Provided");
-		let r = BigInt(n) % e, i, a, o = 0n;
+		let r = BigInt(n), i, a, o = 0n;
 		do
 			i = t * 10n ** o % e, a = i * r % e, o += 1n;
-		while (a >= 2n ** 253n || i >= 2n ** 253n);
+		while (a >= 2n ** 250n || i >= 2n ** 250n);
 		return i;
 	}
 	static getH0FromRandomization = (e) => {
-		let t = n(), r = t.mulPointEscalar(t.Base8, e);
-		return [BigInt(t.F.toString(r[0])), BigInt(t.F.toString(r[1]))];
+		let t = r(), n = t.mulPointEscalar(t.Base8, e);
+		return [BigInt(t.F.toString(n[0])), BigInt(t.F.toString(n[1]))];
 	};
 	static findH0(e, t) {
 		if (!t) return;
@@ -151,14 +133,14 @@ var p = new i(), m = new i(), h = new i(), g = class {
 		return n;
 	}
 	static getEncryptionKeyPair = (e) => {
-		let t = u.crypto_box_seed_keypair(o.getBytes(e));
+		let t = d.crypto_box_seed_keypair(s.getBytes(s.keccak256(e)));
 		return {
-			privateKey: o.hexlify(t.privateKey),
-			publicKey: o.hexlify(t.publicKey)
+			privateKey: s.hexlify(t.privateKey),
+			publicKey: s.hexlify(t.publicKey)
 		};
 	};
-	getAccessKey = () => (this.requireKeyMaterial(), t(this.getShieldedPrivateKey(), this.getShieldedPublicKey()));
-	getBackendToken = () => (this.requireKeyMaterial(), t(this.getAccessKey(), this.getShieldedPublicKey()));
+	getAccessKey = () => (this.requireKeyMaterial(), n(this.getShieldedPrivateKey(), this.getShieldedPublicKey()));
+	getBackendToken = () => (this.requireKeyMaterial(), n(this.getAccessKey(), this.getShieldedPublicKey()));
 };
 //#endregion
-export { g as UserKeys, h as stealthAddressCacheDevice, p as stealthPairCacheDevice, m as stealthPairOldCacheDevice };
+export { h as UserKeys, m as stealthPairCacheDevice };