@gurge/sdk 0.3.150 → 0.3.151

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

@@ -1,78 +1,18 @@
-import { isSolanaLike as e } from "../../constants/chains.constants.mjs";
-import { poseidonHash as t } from "../../crypto/poseidon.mjs";
+import "../../constants/chains.constants.mjs";
+import "../../crypto/poseidon.mjs";
 import "./keys.mjs";
-import { Utxo as n } from "../utxo/Utxo.mjs";
-import { 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 "../utxo/Utxo.mjs";
+import { ethers as e } from "ethers";
+import "@solana/web3.js";
 //#region libs/shared/common/src/data-structures/crypto-keys/decodeUTXO.ts
-var s = "solana-on-chain-utxo:", c = 8, l = (e) => {
-	if (e.length !== c) throw Error(`Expected ${c} on-chain fields, received ${e.length}`);
-	let t = e.map((e, t) => {
+var t = "solana-on-chain-utxo:", n = 9, r = (e) => Array.isArray(e) ? e.some((e) => (e instanceof Uint8Array ? e : Uint8Array.from(e)).some((e) => e !== 0)) : !1, i = (r) => {
+	if (r.length !== n) throw Error(`Expected ${n} on-chain fields, received ${r.length}`);
+	let i = r.map((e, t) => {
 		let n = e instanceof Uint8Array ? e : Uint8Array.from(e);
 		if (n.length !== 32) throw Error(`Expected bytes32 length 32 at position ${t}, got ${n.length}`);
 		return `0x${Buffer.from(n).toString("hex")}`;
 	});
-	return `${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 {
-		amount: v,
-		erc20TokenAddress: t(BigInt(d), BigInt(f)),
-		mintAddress: O,
-		randomization: x,
-		stealthAddress: S,
-		H0: C,
-		H1: w,
-		timeStamp: T,
-		isNewStyle: b
-	};
-}, 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]);
-	return {
-		amount: n,
-		erc20TokenAddress: o,
-		randomization: l,
-		isNewStyle: c === 1n,
-		stealthAddress: u,
-		H0: d,
-		H1: f,
-		timeStamp: p,
-		tokenId: m
-	};
-}, p = (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);
-		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: u } = f(t);
-	return {
-		amount: i,
-		erc20TokenAddress: a,
-		timeStamp: o,
-		nullifyingKey: n,
-		stealthAddress: l,
-		isNewStyle: c,
-		...c ? { H0: [s, u] } : { randomization: s }
-	};
-}, m = (e, t, r) => new n(p(e, t, r));
+	return `${t}${e.AbiCoder.defaultAbiCoder().encode([`bytes32[${n}]`], [i])}`;
+}, a = (e) => e.startsWith(t);
 //#endregion
-export { f as decodeEvmUtxo, d as decodeSolanaUtxo, m as decodeUtxo, p as decodeUtxoConstructorArgs, l as encodeSolanaOnChainUtxo, u as isSolanaOnChainUtxo };
+export { i as encodeSolanaOnChainUtxo, r as hasSolanaOnChainData, a as isSolanaOnChainUtxo };

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`),require(`./keys.cjs`),require(`../utxo/Utxo.cjs`);const e=require(`../../crypto/ecdh-sealed-keys.cjs`);require(`../../crypto/ecdh.cjs`);let t=require(`ethers`),n=require(`@solana/web3.js`);var r=e=>e.startsWith(`0x`)?e:`0x${e}`,i=54912,a=e=>Uint8Array.from([Math.floor(e/256),e%256]),o=o=>{let s=[Buffer.from(t.ethers.toBeHex(o.amount)),Buffer.from(r(o.erc20TokenAddress)),Buffer.from(t.ethers.toBeHex(o.randomization??0n)),Buffer.from(r(o.getStealthAddress())),Buffer.from(t.ethers.toBeHex(BigInt(o.timeStamp))),Buffer.from(t.ethers.toBeHex(o.isNewStyle?1n:0n)),Buffer.from(t.ethers.toBeHex(o.H0?.[0]??0n)),Buffer.from(t.ethers.toBeHex(o.H0?.[1]??0n))];if(o.mintAddress){let e=new n.PublicKey(o.mintAddress),r=t.ethers.hexlify(e.toBytes());s.push(Buffer.from(r))}let c=e.encryptSealedKeys(Buffer.concat(s),[o.getEncryptionKey()]);return Buffer.concat([Buffer.from(a(i)),Buffer.from(c)])};exports.encryptUtxo=o;
+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,27 +1,43 @@
-import "./keys.mjs";
-import "../utxo/Utxo.mjs";
-import { encryptSealedKeys as e } from "../../crypto/ecdh-sealed-keys.mjs";
-import "../../crypto/ecdh.mjs";
-import { ethers as t } from "ethers";
-import { PublicKey as n } from "@solana/web3.js";
+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 r = (e) => e.startsWith("0x") ? e : `0x${e}`, i = 54912, a = (e) => Uint8Array.from([Math.floor(e / 256), e % 256]), o = (o) => {
-	let s = [
-		Buffer.from(t.toBeHex(o.amount)),
-		Buffer.from(r(o.erc20TokenAddress)),
-		Buffer.from(t.toBeHex(o.randomization ?? 0n)),
-		Buffer.from(r(o.getStealthAddress())),
-		Buffer.from(t.toBeHex(BigInt(o.timeStamp))),
-		Buffer.from(t.toBeHex(o.isNewStyle ? 1n : 0n)),
-		Buffer.from(t.toBeHex(o.H0?.[0] ?? 0n)),
-		Buffer.from(t.toBeHex(o.H0?.[1] ?? 0n))
+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(s(e.getStealthAddress())),
+		Buffer.from(a.toBeHex(BigInt(e.timeStamp))),
+		Buffer.from(a.toBeHex(e.H0?.[0] ?? 0n)),
+		Buffer.from(a.toBeHex(e.H0?.[1] ?? 0n)),
+		Buffer.from(s(e.getEncryptionKey()))
 	];
-	if (o.mintAddress) {
-		let e = new n(o.mintAddress), r = t.hexlify(e.toBytes());
-		s.push(Buffer.from(r));
+	if (e.mintAddress) {
+		let n = new o(e.mintAddress), r = a.hexlify(n.toBytes());
+		t.push(Buffer.from(r));
 	}
-	let c = e(Buffer.concat(s), [o.getEncryptionKey()]);
-	return Buffer.concat([Buffer.from(a(i)), Buffer.from(c)]);
-};
+	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: 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
+	};
+}, f = (e, t) => new n(d(e, t));
 //#endregion
-export { o 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}hasSignature(){return!!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,9 +13,9 @@ 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;
+    hasSignature(): boolean;
     setSignature(_signature: string): void;
     private requireSignature;
     private requireKeyMaterial;
@@ -31,6 +26,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 +65,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 +87,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,27 +1,29 @@
-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;
 	}
 	getSignature() {
 		return this.requireSignature(), this.signature;
 	}
+	hasSignature() {
+		return !!this.signature;
+	}
 	setSignature(e) {
 		this.signature = e;
 	}
@@ -32,21 +34,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 +63,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);
+	static getRandomizedStealthPair = m.attach((e, t) => {
+		let n = r(), i = n.mulPointEscalar(n.Base8, e), a = n.mulPointEscalar(i, BigInt(t));
 		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]))]
+			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 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]));
-		return {
-			h0: i,
-			h1: o
-		};
-	};
-	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 +136,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 };

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

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

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

@@ -7,8 +7,8 @@ export declare abstract class BlockchainEventEmitter {
     private readonly MAX_RETRIES;
     private readonly _chainId;
     readonly contract: ethers.Contract;
-    readonly depositOnChainUtxosContract?: ethers.Contract;
     private _latestBlockNumber;
+    private _blockedUtxosContract;
     private _initialBlockNumber;
     onEventsProcessed?: (acceptedEventCount: number) => void;
     private eventProcessors;
@@ -17,7 +17,7 @@ export declare abstract class BlockchainEventEmitter {
     protected isServer: boolean;
     private inProgress;
     protected eventsFetchingMutex: ChainBalanceFetchingLock;
-    constructor(chainId: number, contract: ethers.Contract, initialBlockNumber: number, isServer: boolean, eventsFetchingMutex: ChainBalanceFetchingLock, maxPageSize?: number, depositOnChainUtxosContract?: ethers.Contract);
+    constructor(chainId: number, contract: ethers.Contract, initialBlockNumber: number, isServer: boolean, eventsFetchingMutex: ChainBalanceFetchingLock, maxPageSize?: number);
     get latestBlockNumber(): number;
     get chainId(): number;
     get isReady(): boolean;
@@ -27,6 +27,7 @@ export declare abstract class BlockchainEventEmitter {
     init(): Promise<void>;
     private requireReady;
     private getEventsForSingleContract;
+    private get blockedUtxosContract();
     addEventProcessorFunction(eventProcessorFunction: EventProcessorFunction): void;
     getEventsInRange(fromBlockNumber: number, toBlockNumber: number): Promise<BlockchainEvent[]>;
     getLastBlockNumberForEventRequest(): Promise<number>;