@hinkal/common 0.3.1 → 0.3.3

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 };

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

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

@@ -7,7 +7,6 @@ export declare abstract class BlockchainEventEmitter {
     private readonly MAX_RETRIES;
     private readonly _chainId;
     readonly contract: ethers.Contract;
-    readonly depositOnChainUtxosContract?: ethers.Contract;
     private _latestBlockNumber;
     private _initialBlockNumber;
     onEventsProcessed?: (acceptedEventCount: number) => void;
@@ -17,7 +16,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;

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

@@ -1,7 +1,7 @@
 import { Logger as e } from "../../../error-handling/logger.mjs";
-import { getSequence as t, resolveSync as n } from "../../../functions/utils/resolve-sync.utils.mjs";
-import { blockReorgDepth as r } from "../../../constants/reorg-depths.constants.mjs";
-import { getProviderFromContract as i } from "../../../functions/utils/getSignerFromContract.mjs";
+import { getProviderFromContract as t } from "../../../functions/utils/getSignerFromContract.mjs";
+import { blockReorgDepth as n } from "../../../constants/reorg-depths.constants.mjs";
+import { getSequence as r, resolveSync as i } from "../../../functions/utils/resolve-sync.utils.mjs";
 import { BlockchainEvent as a } from "../../BlockchainEvent/BlockchainEvent.mjs";
 import { ethers as o } from "ethers";
 //#region libs/shared/common/src/data-structures/event-service/evm/BlockchainEventEmitter.ts
@@ -10,7 +10,6 @@ var s = class {
 	MAX_RETRIES = 20;
 	_chainId;
 	contract;
-	depositOnChainUtxosContract;
 	_latestBlockNumber;
 	_initialBlockNumber;
 	onEventsProcessed;
@@ -20,8 +19,8 @@ var s = class {
 	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;
+	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;
@@ -63,23 +62,18 @@ var s = class {
 		if (this._isReady) throw Error("Can't add event processor after event emitter initialized");
 		this.eventProcessors.add(e);
 	}
-	async getEventsInRange(e, r) {
-		let i = [], o = t(e, r, this.maxPageSize);
-		await n(o.map(({ from: e, to: t }) => async () => {
-			let n = await this.getEventsForSingleContract(this.contract, e, t);
-			i.push(...n);
-		}));
-		let s = this.depositOnChainUtxosContract;
-		return s && await n(o.map(({ from: e, to: t }) => async () => {
-			let n = await this.getEventsForSingleContract(s, e, t);
-			i.push(...n);
-		})), i.map((e) => a.fromEthers(e));
+	async getEventsInRange(e, t) {
+		let n = [];
+		return await i(r(e, t, this.maxPageSize).map(({ from: e, to: t }) => async () => {
+			let r = await this.getEventsForSingleContract(this.contract, e, t);
+			n.push(...r);
+		})), n.map((e) => a.fromEthers(e));
 	}
 	async getLastBlockNumberForEventRequest() {
-		let e = await i(this.contract).getBlockNumber();
+		let e = await t(this.contract).getBlockNumber();
 		if (!this.isServer) return e;
-		let { chainId: t } = await i(this.contract).getNetwork();
-		return Math.max(this.latestBlockNumber, e - r[Number(t)] + 1);
+		let { chainId: r } = await t(this.contract).getNetwork();
+		return Math.max(this.latestBlockNumber, e - n[Number(r)] + 1);
 	}
 	async retrieveEvents(t, n = !1) {
 		return this.requireReady(), await this.eventsFetchingMutex.runExclusive(async () => {

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

@@ -1 +1 @@
-const e=require(`./BlockchainEventEmitter.cjs`),t=require(`../helpers/ClientEventHelper.cjs`);var n=class extends e.BlockchainEventEmitter{clientEventHelper;constructor(e,n,r,i,a,o,s){super(n,r,i,!1,a,o,s),this.clientEventHelper=new t.ClientEventHelper(n,e)}clear(){this.clientEventHelper.clear()}startUpdateListener(){this.clientEventHelper.startUpdateListener(async e=>{await this.eventsFetchingMutex.runExclusive(async()=>{await this.processEvents(e)})},this.latestBlockNumber+1,e=>this.advanceLatestBlockNumber(e))}};exports.ClientBlockchainEventEmitter=n;
+const e=require(`./BlockchainEventEmitter.cjs`),t=require(`../helpers/ClientEventHelper.cjs`);var n=class extends e.BlockchainEventEmitter{clientEventHelper;constructor(e,n,r,i,a,o){super(n,r,i,!1,a,o),this.clientEventHelper=new t.ClientEventHelper(n,e)}clear(){this.clientEventHelper.clear()}startUpdateListener(){this.clientEventHelper.startUpdateListener(async e=>{await this.eventsFetchingMutex.runExclusive(async()=>{await this.processEvents(e)})},this.latestBlockNumber+1,e=>this.advanceLatestBlockNumber(e))}};exports.ClientBlockchainEventEmitter=n;

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

@@ -5,7 +5,7 @@ import { ChainBalanceFetchingLock } from '../../../mutexes/chainBalanceRwLock';
 import { ClientEventHelper } from '../helpers/ClientEventHelper';
 export declare class ClientBlockchainEventEmitter extends BlockchainEventEmitter {
     clientEventHelper: ClientEventHelper;
-    constructor(eventCategory: EventCategory, chainId: number, contract: ethers.Contract, initialBlockNumber: number, eventsFetchingMutex: ChainBalanceFetchingLock, maxPageSize?: number, depositOnChainUtxosContract?: ethers.Contract);
+    constructor(eventCategory: EventCategory, chainId: number, contract: ethers.Contract, initialBlockNumber: number, eventsFetchingMutex: ChainBalanceFetchingLock, maxPageSize?: number);
     protected clear(): void;
     protected startUpdateListener(): void;
 }

package/common/src/data-structures/event-service/evm/ClientBlockchainEventEmitter.mjs

@@ -3,8 +3,8 @@ import { ClientEventHelper as t } from "../helpers/ClientEventHelper.mjs";
 //#region libs/shared/common/src/data-structures/event-service/evm/ClientBlockchainEventEmitter.ts
 var n = class extends e {
 	clientEventHelper;
-	constructor(e, n, r, i, a, o, s) {
-		super(n, r, i, !1, a, o, s), this.clientEventHelper = new t(n, e);
+	constructor(e, n, r, i, a, o) {
+		super(n, r, i, !1, a, o), this.clientEventHelper = new t(n, e);
 	}
 	clear() {
 		this.clientEventHelper.clear();

package/common/src/data-structures/event-service/helpers/ClientEventHelper.cjs

@@ -1 +1 @@
-const e=require(`../../../error-handling/logger.cjs`),t=require(`../../../API/API.cjs`),n=require(`../../BlockchainEvent/BlockchainEvent.cjs`);var r=5e3,i=class{chainId;eventCategory;pollIntervalId;constructor(e,t){this.chainId=e,this.eventCategory=t}clear(){this.pollIntervalId!=null&&(clearInterval(this.pollIntervalId),this.pollIntervalId=void 0)}startUpdateListener(i,a,o){let s=a,c=async()=>{try{let{events:e,latestBlockNumber:r}=await t.API.getSnapshotServerEvents(this.chainId,this.eventCategory,s);e.length>0&&await i(e.map(e=>n.BlockchainEvent.fromSerialized(e))),r>=s&&(s=r+1,o(s))}catch(t){e.Logger.error(`Snapshot events poll error`,t)}};this.pollIntervalId=setInterval(c,r)}};exports.ClientEventHelper=i;
+const e=require(`../../../API/API.cjs`),t=require(`../../../error-handling/logger.cjs`),n=require(`../../BlockchainEvent/BlockchainEvent.cjs`);var r=5e3,i=class{chainId;eventCategory;pollIntervalId;constructor(e,t){this.chainId=e,this.eventCategory=t}clear(){this.pollIntervalId!=null&&(clearInterval(this.pollIntervalId),this.pollIntervalId=void 0)}startUpdateListener(i,a,o){let s=a,c=async()=>{try{let{events:t,latestBlockNumber:r}=await e.API.getSnapshotServerEvents(this.chainId,this.eventCategory,s);t.length>0&&await i(t.map(e=>n.BlockchainEvent.fromSerialized(e))),r>=s&&(s=r+1,o(s))}catch(e){t.Logger.error(`Snapshot events poll error`,e)}};this.pollIntervalId=setInterval(c,r)}};exports.ClientEventHelper=i;

package/common/src/data-structures/event-service/helpers/ClientEventHelper.mjs

@@ -1,5 +1,5 @@
-import { Logger as e } from "../../../error-handling/logger.mjs";
-import { API as t } from "../../../API/API.mjs";
+import { API as e } from "../../../API/API.mjs";
+import { Logger as t } from "../../../error-handling/logger.mjs";
 import { BlockchainEvent as n } from "../../BlockchainEvent/BlockchainEvent.mjs";
 //#region libs/shared/common/src/data-structures/event-service/helpers/ClientEventHelper.ts
 var r = 5e3, i = class {
@@ -15,10 +15,10 @@ var r = 5e3, i = class {
 	startUpdateListener(i, a, o) {
 		let s = a, c = async () => {
 			try {
-				let { events: e, latestBlockNumber: r } = await t.getSnapshotServerEvents(this.chainId, this.eventCategory, s);
-				e.length > 0 && await i(e.map((e) => n.fromSerialized(e))), r >= s && (s = r + 1, o(s));
-			} catch (t) {
-				e.error("Snapshot events poll error", t);
+				let { events: t, latestBlockNumber: r } = await e.getSnapshotServerEvents(this.chainId, this.eventCategory, s);
+				t.length > 0 && await i(t.map((e) => n.fromSerialized(e))), r >= s && (s = r + 1, o(s));
+			} catch (e) {
+				t.error("Snapshot events poll error", e);
 			}
 		};
 		this.pollIntervalId = setInterval(c, r);

package/common/src/data-structures/event-service/solana/AbstractSolanaCommitmentsSnapshotService.cjs

@@ -1 +1 @@
-const e=require(`../../../functions/utils/amounts.utils.cjs`),t=require(`../../../crypto/poseidon.cjs`),n=require(`../../crypto-keys/decodeUTXO.cjs`);require(`../../../crypto/index.cjs`);const r=require(`../../merkle-tree/MerkleTree.cjs`);require(`../../merkle-tree/index.cjs`);const i=require(`../../../functions/utils/merkleTree.utils.cjs`),a=require(`./AbstractSolanaSnapshotService.cjs`);var o=class extends a.AbstractSolanaSnapshotService{constructor(e){super(e,`NewCommitment`)}_merkleTree;_encryptedOutputs;_encryptedOutputsByCommitment=new Map;get merkleTree(){return this._merkleTree}get encryptedOutputs(){return this._encryptedOutputs}serializeSnapshot(e){return{merkleTree:e.payload.merkleTree.toJSON(),latestBlockNumber:e.latestBlockNumber,encryptedOutputs:e.payload.encryptedOutputs.map(e=>({value:e.value,isPositive:String(e.isPositive),isBlocked:e.isBlocked??!1})),encryptedOutputsByCommitment:Array.from(e.payload.encryptedOutputsByCommitment.entries()).map(([e,t])=>({commitment:e.toString(),encryptedOutput:t}))}}deserializeSnapshot(e){let n;n=e.latestBlockNumber&&e.merkleTree?i.contructMerkleTreeFromSerialized(e.merkleTree):r.MerkleTree.create(t.poseidonFunction,0n);let a=e.encryptedOutputs?.map(e=>({value:e.value,isPositive:JSON.parse(e.isPositive),isBlocked:e.isBlocked??!1})),o=new Map;return e.encryptedOutputsByCommitment?.forEach(({commitment:e,encryptedOutput:t})=>{o.set(BigInt(e),t)}),{latestBlockNumber:e.latestBlockNumber??0,payload:{merkleTree:n,encryptedOutputs:a||[],encryptedOutputsByCommitment:o}}}getSnapshotPayload(){return{merkleTree:this._merkleTree,encryptedOutputs:this._encryptedOutputs,encryptedOutputsByCommitment:this._encryptedOutputsByCommitment}}populateSnapshot({payload:{merkleTree:e,encryptedOutputs:t,encryptedOutputsByCommitment:n}}){this._merkleTree=e,this._encryptedOutputs=t,this._encryptedOutputsByCommitment=n}async mapEvent(t){let r=t.getArg(`commitment`),i=t.getArg(`index`),a=t.getArg(`encrypted_output`),o=t.getArg(`on_chain_data`),s=e.advancedToBigInt(r),c=e.advancedToBigInt(i);return a.length===0?{commitment:s,index:c,encryptedOutput:n.encodeSolanaOnChainUtxo(o)}:{commitment:s,index:c,encryptedOutput:`0x${Buffer.from(a).toString(`hex`)}`}}acceptEvent(e,t,r,i){let a=e.index>=0n?e.index:-1n*e.index,o=this._merkleTree.getValue(a);if(o===e.commitment)return!1;this._merkleTree.insert(e.commitment,a);let s=o===void 0?void 0:this._encryptedOutputsByCommitment.get(o);if(o!==void 0&&s!==void 0){let e=this.encryptedOutputs.findIndex(e=>e.value===s);e!==-1&&this.encryptedOutputs.splice(e,1),this._encryptedOutputsByCommitment.delete(o)}if(this._encryptedOutputsByCommitment.set(e.commitment,e.encryptedOutput),this.encryptedOutputs.map(e=>e.value).includes(e.encryptedOutput))return!0;let c={value:e.encryptedOutput,isPositive:!n.isSolanaOnChainUtxo(e.encryptedOutput),isBlocked:i??!1};return this._encryptedOutputs.push(c),!0}};exports.AbstractSolanaCommitmentsSnapshotService=o;
+const e=require(`../../../functions/utils/amounts.utils.cjs`),t=require(`../../../crypto/poseidon.cjs`),n=require(`../../crypto-keys/decodeUTXO.cjs`);require(`../../../crypto/index.cjs`);const r=require(`../../merkle-tree/MerkleTree.cjs`);require(`../../merkle-tree/index.cjs`);const i=require(`../../../functions/utils/merkleTree.utils.cjs`),a=require(`./AbstractSolanaSnapshotService.cjs`);var o=class extends a.AbstractSolanaSnapshotService{constructor(e){super(e,`NewCommitment`)}_merkleTree;_encryptedOutputs;_encryptedOutputsByCommitment=new Map;get merkleTree(){return this._merkleTree}get encryptedOutputs(){return this._encryptedOutputs}serializeSnapshot(e){return{merkleTree:e.payload.merkleTree.toJSON(),latestBlockNumber:e.latestBlockNumber,encryptedOutputs:e.payload.encryptedOutputs.map(e=>({value:e.value,isPositive:String(e.isPositive),isBlocked:e.isBlocked??!1,encryptedBlob:e.encryptedBlob})),encryptedOutputsByCommitment:Array.from(e.payload.encryptedOutputsByCommitment.entries()).map(([e,t])=>({commitment:e.toString(),encryptedOutput:t}))}}deserializeSnapshot(e){let n;n=e.latestBlockNumber&&e.merkleTree?i.contructMerkleTreeFromSerialized(e.merkleTree):r.MerkleTree.create(t.poseidonFunction,0n);let a=e.encryptedOutputs?.map(e=>({value:e.value,isPositive:JSON.parse(e.isPositive),isBlocked:e.isBlocked??!1,encryptedBlob:e.encryptedBlob})),o=new Map;return e.encryptedOutputsByCommitment?.forEach(({commitment:e,encryptedOutput:t})=>{o.set(BigInt(e),t)}),{latestBlockNumber:e.latestBlockNumber??0,payload:{merkleTree:n,encryptedOutputs:a||[],encryptedOutputsByCommitment:o}}}getSnapshotPayload(){return{merkleTree:this._merkleTree,encryptedOutputs:this._encryptedOutputs,encryptedOutputsByCommitment:this._encryptedOutputsByCommitment}}populateSnapshot({payload:{merkleTree:e,encryptedOutputs:t,encryptedOutputsByCommitment:n}}){this._merkleTree=e,this._encryptedOutputs=t,this._encryptedOutputsByCommitment=n}async mapEvent(t){let r=t.getArg(`commitment`),i=t.getArg(`index`),a=t.getArg(`encrypted_output`),o=t.getArg(`on_chain_data`),s=e.advancedToBigInt(r),c=e.advancedToBigInt(i),l=`0x${Buffer.from(a).toString(`hex`)}`;return n.hasSolanaOnChainData(o)?{commitment:s,index:c,encryptedOutput:n.encodeSolanaOnChainUtxo(o),encryptedBlob:a.length>0?l:void 0}:{commitment:s,index:c,encryptedOutput:l}}acceptEvent(e,t,r,i){let a=e.index>=0n?e.index:-1n*e.index,o=this._merkleTree.getValue(a);if(o===e.commitment)return!1;this._merkleTree.insert(e.commitment,a);let s=o===void 0?void 0:this._encryptedOutputsByCommitment.get(o);if(o!==void 0&&s!==void 0){let e=this.encryptedOutputs.findIndex(e=>e.value===s);e!==-1&&this.encryptedOutputs.splice(e,1),this._encryptedOutputsByCommitment.delete(o)}if(this._encryptedOutputsByCommitment.set(e.commitment,e.encryptedOutput),this.encryptedOutputs.map(e=>e.value).includes(e.encryptedOutput))return!0;let c={value:e.encryptedOutput,isPositive:!n.isSolanaOnChainUtxo(e.encryptedOutput),isBlocked:i??!1,encryptedBlob:e.encryptedBlob};return this._encryptedOutputs.push(c),!0}};exports.AbstractSolanaCommitmentsSnapshotService=o;

package/common/src/data-structures/event-service/solana/AbstractSolanaCommitmentsSnapshotService.mjs

@@ -1,13 +1,13 @@
 import { advancedToBigInt as e } from "../../../functions/utils/amounts.utils.mjs";
 import { poseidonFunction as t } from "../../../crypto/poseidon.mjs";
-import { encodeSolanaOnChainUtxo as n, isSolanaOnChainUtxo as r } from "../../crypto-keys/decodeUTXO.mjs";
+import { encodeSolanaOnChainUtxo as n, hasSolanaOnChainData as r, isSolanaOnChainUtxo as i } from "../../crypto-keys/decodeUTXO.mjs";
 import "../../../crypto/index.mjs";
-import { MerkleTree as i } from "../../merkle-tree/MerkleTree.mjs";
+import { MerkleTree as a } from "../../merkle-tree/MerkleTree.mjs";
 import "../../merkle-tree/index.mjs";
-import { contructMerkleTreeFromSerialized as a } from "../../../functions/utils/merkleTree.utils.mjs";
-import { AbstractSolanaSnapshotService as o } from "./AbstractSolanaSnapshotService.mjs";
+import { contructMerkleTreeFromSerialized as o } from "../../../functions/utils/merkleTree.utils.mjs";
+import { AbstractSolanaSnapshotService as s } from "./AbstractSolanaSnapshotService.mjs";
 //#region libs/shared/common/src/data-structures/event-service/solana/AbstractSolanaCommitmentsSnapshotService.ts
-var s = class extends o {
+var c = class extends s {
 	constructor(e) {
 		super(e, "NewCommitment");
 	}
@@ -27,7 +27,8 @@ var s = class extends o {
 			encryptedOutputs: e.payload.encryptedOutputs.map((e) => ({
 				value: e.value,
 				isPositive: String(e.isPositive),
-				isBlocked: e.isBlocked ?? !1
+				isBlocked: e.isBlocked ?? !1,
+				encryptedBlob: e.encryptedBlob
 			})),
 			encryptedOutputsByCommitment: Array.from(e.payload.encryptedOutputsByCommitment.entries()).map(([e, t]) => ({
 				commitment: e.toString(),
@@ -37,20 +38,21 @@ var s = class extends o {
 	}
 	deserializeSnapshot(e) {
 		let n;
-		n = e.latestBlockNumber && e.merkleTree ? a(e.merkleTree) : i.create(t, 0n);
+		n = e.latestBlockNumber && e.merkleTree ? o(e.merkleTree) : a.create(t, 0n);
 		let r = e.encryptedOutputs?.map((e) => ({
 			value: e.value,
 			isPositive: JSON.parse(e.isPositive),
-			isBlocked: e.isBlocked ?? !1
-		})), o = /* @__PURE__ */ new Map();
+			isBlocked: e.isBlocked ?? !1,
+			encryptedBlob: e.encryptedBlob
+		})), i = /* @__PURE__ */ new Map();
 		return e.encryptedOutputsByCommitment?.forEach(({ commitment: e, encryptedOutput: t }) => {
-			o.set(BigInt(e), t);
+			i.set(BigInt(e), t);
 		}), {
 			latestBlockNumber: e.latestBlockNumber ?? 0,
 			payload: {
 				merkleTree: n,
 				encryptedOutputs: r || [],
-				encryptedOutputsByCommitment: o
+				encryptedOutputsByCommitment: i
 			}
 		};
 	}
@@ -65,18 +67,19 @@ var s = class extends o {
 		this._merkleTree = e, this._encryptedOutputs = t, this._encryptedOutputsByCommitment = n;
 	}
 	async mapEvent(t) {
-		let r = t.getArg("commitment"), i = t.getArg("index"), a = t.getArg("encrypted_output"), o = t.getArg("on_chain_data"), s = e(r), c = e(i);
-		return a.length === 0 ? {
-			commitment: s,
-			index: c,
-			encryptedOutput: n(o)
+		let i = t.getArg("commitment"), a = t.getArg("index"), o = t.getArg("encrypted_output"), s = t.getArg("on_chain_data"), c = e(i), l = e(a), u = `0x${Buffer.from(o).toString("hex")}`;
+		return r(s) ? {
+			commitment: c,
+			index: l,
+			encryptedOutput: n(s),
+			encryptedBlob: o.length > 0 ? u : void 0
 		} : {
-			commitment: s,
-			index: c,
-			encryptedOutput: `0x${Buffer.from(a).toString("hex")}`
+			commitment: c,
+			index: l,
+			encryptedOutput: u
 		};
 	}
-	acceptEvent(e, t, n, i) {
+	acceptEvent(e, t, n, r) {
 		let a = e.index >= 0n ? e.index : -1n * e.index, o = this._merkleTree.getValue(a);
 		if (o === e.commitment) return !1;
 		this._merkleTree.insert(e.commitment, a);
@@ -88,11 +91,12 @@ var s = class extends o {
 		if (this._encryptedOutputsByCommitment.set(e.commitment, e.encryptedOutput), this.encryptedOutputs.map((e) => e.value).includes(e.encryptedOutput)) return !0;
 		let c = {
 			value: e.encryptedOutput,
-			isPositive: !r(e.encryptedOutput),
-			isBlocked: i ?? !1
+			isPositive: !i(e.encryptedOutput),
+			isBlocked: r ?? !1,
+			encryptedBlob: e.encryptedBlob
 		};
 		return this._encryptedOutputs.push(c), !0;
 	}
 };
 //#endregion
-export { s as AbstractSolanaCommitmentsSnapshotService };
+export { c as AbstractSolanaCommitmentsSnapshotService };

package/common/src/data-structures/merkle-tree/MerkleTree.cjs

@@ -1 +1 @@
-const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../error-handling/logError.cjs`),n=require(`./MerkleTreeIncompleteError.cjs`);var r=class r{tree;count;index;reverseTree;static createWithData(e,t,n,i,a,o,s){return new r(a,o,s,e,t,n,i)}static create(t,n,i=e.MERKLE_LEVELS){return new r(t,i,n)}createReverseTree(){let e=new Map;for(let t=this.getStartIndex();t<this.getStartIndex()+this.count;t+=1n){let n=this.tree.get(t);n!==void 0&&e.set(n,t)}return e}constructor(e,t,n,r,i,a,o){this.hashFunction=e,this.levels=t,this.defaultNodeValue=n,this.tree=r??new Map,this.count=o??0n,this.index=a??2n**(t-1n),i?this.reverseTree=i:this.reverseTree=this.createReverseTree()}getStartIndex(){return 2n**(this.levels-1n)}logarithm2(e){let t=0n;for(;2n**t<e;)t+=1n;return t}bigIntMax(e,t){return e>t?e:t}forceInsert(e,t){if(t<this.getStartIndex())throw RangeError();this.tree.set(t,e),this.reverseTree.set(e,t);let n=this.index-this.getStartIndex(),r=this.logarithm2(n),i=t;for(let e=1n;e<=r;e+=1n){i/=2n;let e=this.hashFunction(this.tree.get(i*2n)||this.defaultNodeValue,this.tree.get(i*2n+1n)||this.defaultNodeValue);this.tree.set(i,e)}}insert(e,n){let r=!1;this.tree.has(n)&&(r=!0,t.logError(`Editing commitment index: ${n} `)),r||(this.count+=1n),this.index=this.bigIntMax(this.index,n+1n),this.forceInsert(e,n)}remove(e){this.forceInsert(this.defaultNodeValue,e)}completenessCheck(){if(this.count!==this.index-this.getStartIndex())throw new n.MerkleTreeIncompleteError}getRootHash(){this.completenessCheck();for(let e=1n;e<2n**this.levels;e*=2n)if(this.tree.get(e))return this.tree.get(e);return this.defaultNodeValue}getMerkleData(){return this.completenessCheck(),new Map(this.tree)}getValue(e){return this.tree.get(e)}getSiblingIndex(e){return e===1n?1n:e%2n==1n?e-1n:e+1n}getSiblingHashesForVerification(e){this.completenessCheck();let t=this.reverseTree.get(e);if(t===void 0)return Array(25).fill(0n);let n=[];for(;t!==0n;)n.push(this.tree.get(this.getSiblingIndex(t))||this.defaultNodeValue),t/=2n;return n.slice(0,25)}getSiblingSides(e){this.completenessCheck();let t=this.reverseTree.get(e);if(t===void 0)return Array(25).fill(0n);let n=[];for(;t!==0n;){let e=t%2n==0n?0n:1n;n.push(e),t/=2n}return n.slice(0,25)}toJSON(){let{tree:e,reverseTree:t,count:n,index:r}=this;return{tree:Object.fromEntries(e),reverseTree:Object.fromEntries(t),count:n.toString(),index:r.toString()}}toJSONLite(){let{tree:e,count:t,index:n}=this;return{tree:Object.fromEntries(e),count:t.toString(),index:n.toString()}}clone(){return r.createWithData(new Map(this.tree),new Map(this.reverseTree),this.index,this.count,this.hashFunction,this.levels,this.defaultNodeValue)}getIndex(){return this.index}};exports.MerkleTree=r;
+const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../error-handling/logError.cjs`),n=require(`./MerkleTreeIncompleteError.cjs`);var r=class r{tree;count;index;reverseTree;static createWithData(e,t,n,i,a,o,s){return new r(a,o,s,e,t,n,i)}static create(t,n,i=e.MERKLE_LEVELS){return new r(t,i,n)}createReverseTree(){let e=new Map;for(let t=this.getStartIndex();t<this.getStartIndex()+this.count;t+=1n){let n=this.tree.get(t);n!==void 0&&e.set(n,t)}return e}constructor(e,t,n,r,i,a,o){this.hashFunction=e,this.levels=t,this.defaultNodeValue=n,this.tree=r??new Map,this.count=o??0n,this.index=a??2n**(t-1n),i?this.reverseTree=i:this.reverseTree=this.createReverseTree()}getStartIndex(){return 2n**(this.levels-1n)}logarithm2(e){let t=0n;for(;2n**t<e;)t+=1n;return t}bigIntMax(e,t){return e>t?e:t}forceInsert(e,t){if(t<this.getStartIndex())throw RangeError();this.tree.set(t,e),this.reverseTree.set(e,t);let n=this.index-this.getStartIndex(),r=this.logarithm2(n),i=t;for(let e=1n;e<=r;e+=1n){i/=2n;let e=this.hashFunction(this.tree.get(i*2n)||this.defaultNodeValue,this.tree.get(i*2n+1n)||this.defaultNodeValue);this.tree.set(i,e)}}insert(e,n){let r=!1;this.tree.has(n)&&(r=!0,t.logError(`Editing commitment index: ${n} `)),r||(this.count+=1n),this.index=this.bigIntMax(this.index,n+1n),this.forceInsert(e,n)}remove(e){this.forceInsert(this.defaultNodeValue,e)}completenessCheck(){if(this.count!==this.index-this.getStartIndex())throw new n.MerkleTreeIncompleteError}getRootHash(){this.completenessCheck();for(let e=1n;e<2n**this.levels;e*=2n)if(this.tree.get(e))return this.tree.get(e);return this.defaultNodeValue}getMerkleData(){return this.completenessCheck(),new Map(this.tree)}getValue(e){return this.tree.get(e)}getSiblingIndex(e){return e===1n?1n:e%2n==1n?e-1n:e+1n}getSiblingHashesForVerification(e){this.completenessCheck();let t=this.reverseTree.get(e);if(t===void 0)return Array(25).fill(0n);let n=[];for(;t!==0n;)n.push(this.tree.get(this.getSiblingIndex(t))??this.defaultNodeValue),t/=2n;return n.slice(0,25)}getSiblingSides(e){this.completenessCheck();let t=this.reverseTree.get(e);if(t===void 0)return Array(25).fill(0n);let n=[];for(;t!==0n;){let e=t%2n==0n?0n:1n;n.push(e),t/=2n}return n.slice(0,25)}toJSON(){let{tree:e,reverseTree:t,count:n,index:r}=this;return{tree:Object.fromEntries(e),reverseTree:Object.fromEntries(t),count:n.toString(),index:r.toString()}}toJSONLite(){let{tree:e,count:t,index:n}=this;return{tree:Object.fromEntries(e),count:t.toString(),index:n.toString()}}clone(){return r.createWithData(new Map(this.tree),new Map(this.reverseTree),this.index,this.count,this.hashFunction,this.levels,this.defaultNodeValue)}getIndex(){return this.index}getInsertionSiblingData(e){let t=[],n=[],r=e;for(;r!==0n;)t.push(this.tree.get(this.getSiblingIndex(r))??this.defaultNodeValue),n.push(r%2n==0n?0n:1n),r/=2n;return{siblings:t.slice(0,25),sides:n.slice(0,25)}}};exports.MerkleTree=r;

package/common/src/data-structures/merkle-tree/MerkleTree.d.ts

@@ -79,4 +79,14 @@ export declare class MerkleTree<T> {
     toJSONLite(): MerkleTreeJson;
     clone(): MerkleTree<T>;
     getIndex(): bigint;
+    /**
+     * Compute sibling hashes and sides needed to prove insertion at a given leaf index.
+     * Used by the Tron circuit to compute newRootHash off-chain.
+     * The caller is responsible for passing the correct nodeIndex (e.g. tree.getIndex()
+     * for the first insertion, or tree.getIndex() + 1n after simulating the first).
+     */
+    getInsertionSiblingData(nodeIndex: bigint): {
+        siblings: T[];
+        sides: bigint[];
+    };
 }

package/common/src/data-structures/merkle-tree/MerkleTree.mjs

@@ -74,7 +74,7 @@ var r = class r {
 		let t = this.reverseTree.get(e);
 		if (t === void 0) return Array(25).fill(0n);
 		let n = [];
-		for (; t !== 0n;) n.push(this.tree.get(this.getSiblingIndex(t)) || this.defaultNodeValue), t /= 2n;
+		for (; t !== 0n;) n.push(this.tree.get(this.getSiblingIndex(t)) ?? this.defaultNodeValue), t /= 2n;
 		return n.slice(0, 25);
 	}
 	getSiblingSides(e) {
@@ -111,6 +111,14 @@ var r = class r {
 	getIndex() {
 		return this.index;
 	}
+	getInsertionSiblingData(e) {
+		let t = [], n = [], r = e;
+		for (; r !== 0n;) t.push(this.tree.get(this.getSiblingIndex(r)) ?? this.defaultNodeValue), n.push(r % 2n == 0n ? 0n : 1n), r /= 2n;
+		return {
+			siblings: t.slice(0, 25),
+			sides: n.slice(0, 25)
+		};
+	}
 };
 //#endregion
 export { r as MerkleTree };

package/common/src/data-structures/private-balances/HinkalPrivateBalanceController.cjs

@@ -1 +1 @@
-const e=require(`../../functions/web3/etherFunctions.cjs`),t=require(`../../functions/utils/upToDateState.cjs`),n=require(`../../types/balances.types.cjs`),r=require(`../../error-handling/logger.cjs`),i=require(`../../functions/utils/string.utils.cjs`),a=require(`./BalanceChangedHandler.cjs`),o=require(`../IndexedDB/private-balances-db.cjs`),s=require(`../IndexedDB/prices-db.cjs`),c=require(`./privateBalancesReducer.cjs`);var l=class{privateBalancesState={};privateBalancesListeners=new Set;hinkal;unsubscribeBalanceChange;constructor(e){this.hinkal=e,this.unsubscribeBalanceChange=a.balanceChangedHandler.subscribe(e=>{this.applyRefreshFromBalanceChangeEvent(e).catch(e=>{r.Logger.error(`Private balance refresh from balance change failed:`,e)})})}getSnapshot(){return this.privateBalancesState}onPrivateBalancesWithUSDChange(e){return this.privateBalancesListeners.add(e),()=>this.privateBalancesListeners.delete(e)}dispose(){this.unsubscribeBalanceChange(),this.privateBalancesListeners.clear()}async applyRefreshFromBalanceChangeEvent(e){if(!e){await this.refreshInternal(n.PrivateBalanceUpdateType.FreshWithoutLoader);return}let{updateType:t,balanceChangeState:r,chainIdToUpdate:i,resetCacheBefore:a,updateTokensListBefore:o}=e;await this.refreshInternal(t,r,a,o,i)}dispatch(e){this.privateBalancesState=c.privateBalancesReducer(this.privateBalancesState,e);let t=this.privateBalancesState;this.privateBalancesListeners.forEach(e=>e(t))}async getAddressAndChain(e){try{return{ethAdd:e?.ethereumAddress??await this.hinkal.getEthereumAddress(),userKeys:e?.userKeys??this.hinkal.userKeys}}catch{return{ethAdd:void 0,userKeys:void 0}}}async hasCache(e,t){return await o.privateBalancesStorage.getBalancesByWallet(e,t)!==void 0}async getBalancesWithUsdValues(t,n){try{if(!n)return[];let r=t.map(e=>e.token.erc20TokenAddress);if(!r.length)return[];let i=await s.pricesStorage.getAndUpdatePrices(n,r),a=new Map(r.map((e,t)=>[e,i[t]]));return[...t.map(t=>{try{let n=t.token.erc20TokenAddress,r=a.get(n)??0,i=t.balance,o=Number(e.getAmountInToken(t.token,i))*r;return{...t,usdValue:o}}catch{return{...t,usdValue:0}}})]}catch{return r.Logger.log(`Error fetching private token balances`),[]}}handleCached=async(n,a)=>{try{await t.checkAddressNotUpdated(this.hinkal,n),this.dispatch({type:`SET_BALANCES`,chainId:a,balances:void 0});let r=await o.privateBalancesStorage.getBalancesByWallet(n,a),c=await s.pricesStorage.getPrices();if(await t.checkAddressNotUpdated(this.hinkal,n),!r||(this.dispatch({type:`SET_BALANCES`,chainId:a,balances:r}),!c))return;let l=r.map(t=>{let n=i.getTokenStateKey(t.token.erc20TokenAddress,a);return{...t,usdValue:c[n]?Number(e.getAmountInToken(t.token,t.balance))*c[n]:0}});this.dispatch({type:`SET_USD_BALANCES`,chainId:a,balances:l})}catch(e){r.Logger.error(`Error refreshing cached private balance:`,e)}};handleFresh=async(e,n,i,a,s,c)=>{let l=s;try{await t.checkAddressNotUpdated(this.hinkal,e);let r=await this.hasCache(e,n);await t.checkAddressNotUpdated(this.hinkal,e),l=s||!r,l&&this.dispatch({type:`SET_LOADING`,chainId:n,newValue:!0}),await t.checkAddressNotUpdated(this.hinkal,e),a&&await this.hinkal.resetMerkle([n]);let u=await this.hinkal.getTotalBalance(n,i,e,a,c);await t.checkAddressNotUpdated(this.hinkal,e);let d=u.filter(e=>e.balance>0n);this.dispatch({type:`SET_BALANCES`,chainId:n,balances:d}),await o.privateBalancesStorage.setBalances(e,n,d),await t.checkAddressNotUpdated(this.hinkal,e),l&&(this.dispatch({type:`SET_USD_LOADING`,chainId:n,newValue:!0}),this.dispatch({type:`SET_LOADING`,chainId:n,newValue:!1})),await t.checkAddressNotUpdated(this.hinkal,e);let f=await this.getBalancesWithUsdValues(d,n);await t.checkAddressNotUpdated(this.hinkal,e),f.length>0&&this.dispatch({type:`SET_USD_BALANCES`,chainId:n,balances:f})}catch(e){r.Logger.error(`Error refreshing private balance:`,e)}finally{l&&(this.dispatch({type:`SET_LOADING`,chainId:n,newValue:!1}),this.dispatch({type:`SET_USD_LOADING`,chainId:n,newValue:!1}))}};getSupportedChainsToUpdate(e){let t=this.hinkal.getSupportedChains();return e?t.includes(e)?[e]:[]:t}async refreshInternal(e=n.PrivateBalanceUpdateType.FreshWithoutLoader,t,r=!1,i=!1,a){let{ethAdd:o,userKeys:s}=await this.getAddressAndChain(t);!o||!s?.getShieldedPublicKey()||await Promise.all(this.getSupportedChainsToUpdate(a).map(async t=>{switch(e){case n.PrivateBalanceUpdateType.OnlyCache:await this.handleCached(o,t);break;case n.PrivateBalanceUpdateType.Fresh:await this.handleFresh(o,t,s,r,!0,i);break;case n.PrivateBalanceUpdateType.FreshWithoutLoader:await this.handleFresh(o,t,s,r,!1,i);break;default:break}}))}};exports.HinkalPrivateBalanceController=l;
+const e=require(`../../functions/web3/etherFunctions.cjs`),t=require(`../../functions/utils/upToDateState.cjs`),n=require(`../../types/balances.types.cjs`),r=require(`../../error-handling/logger.cjs`),i=require(`../../functions/utils/string.utils.cjs`),a=require(`../../constants/balance.constants.cjs`),o=require(`./BalanceChangedHandler.cjs`),s=require(`../IndexedDB/private-balances-db.cjs`),c=require(`../IndexedDB/prices-db.cjs`),l=require(`./privateBalancesReducer.cjs`);var u=class{privateBalancesState={};privateBalancesListeners=new Set;hinkal;unsubscribeBalanceChange;pollIntervalId;pollInFlight=!1;constructor(e){this.hinkal=e,this.unsubscribeBalanceChange=o.balanceChangedHandler.subscribe(e=>{this.applyRefreshFromBalanceChangeEvent(e).catch(e=>{r.Logger.error(`Private balance refresh from balance change failed:`,e)})}),this.pollIntervalId=setInterval(()=>this.pollRemoteBalances(),a.REMOTE_BALANCE_POLL_INTERVAL_MS)}getSnapshot(){return this.privateBalancesState}onPrivateBalancesWithUSDChange(e){return this.privateBalancesListeners.add(e),()=>this.privateBalancesListeners.delete(e)}dispose(){clearInterval(this.pollIntervalId),this.unsubscribeBalanceChange(),this.privateBalancesListeners.clear()}pollRemoteBalances(){this.privateBalancesListeners.size!==0&&(!this.hinkal.generateProofRemotely||this.pollInFlight||(this.pollInFlight=!0,this.refreshInternal(n.PrivateBalanceUpdateType.FreshWithoutLoader,void 0,!1,!0).catch(e=>{r.Logger.error(`Remote private balance poll failed:`,e)}).finally(()=>{this.pollInFlight=!1})))}async applyRefreshFromBalanceChangeEvent(e){if(!e){await this.refreshInternal(n.PrivateBalanceUpdateType.FreshWithoutLoader);return}let{updateType:t,balanceChangeState:r,chainIdToUpdate:i,resetCacheBefore:a,updateTokensListBefore:o}=e;await this.refreshInternal(t,r,a,o,i)}dispatch(e){this.privateBalancesState=l.privateBalancesReducer(this.privateBalancesState,e);let t=this.privateBalancesState;this.privateBalancesListeners.forEach(e=>e(t))}async getAddressAndChain(e){try{return{ethAdd:e?.ethereumAddress??await this.hinkal.getEthereumAddress(),userKeys:e?.userKeys??this.hinkal.userKeys}}catch{return{ethAdd:void 0,userKeys:void 0}}}async hasCache(e,t){return await s.privateBalancesStorage.getBalancesByWallet(e,t)!==void 0}async getBalancesWithUsdValues(t,n){try{if(!n)return[];let r=t.map(e=>e.token.erc20TokenAddress);if(!r.length)return[];let i=await c.pricesStorage.getAndUpdatePrices(n,r),a=new Map(r.map((e,t)=>[e,i[t]]));return[...t.map(t=>{try{let n=t.token.erc20TokenAddress,r=a.get(n)??0,i=t.balance,o=Number(e.getAmountInToken(t.token,i))*r;return{...t,usdValue:o}}catch{return{...t,usdValue:0}}})]}catch{return r.Logger.log(`Error fetching private token balances`),[]}}handleCached=async(n,a)=>{try{await t.checkAddressNotUpdated(this.hinkal,n),this.dispatch({type:`SET_BALANCES`,chainId:a,balances:void 0});let r=await s.privateBalancesStorage.getBalancesByWallet(n,a),o=await c.pricesStorage.getPrices();if(await t.checkAddressNotUpdated(this.hinkal,n),!r||(this.dispatch({type:`SET_BALANCES`,chainId:a,balances:r}),!o))return;let l=r.map(t=>{let n=i.getTokenStateKey(t.token.erc20TokenAddress,a);return{...t,usdValue:o[n]?Number(e.getAmountInToken(t.token,t.balance))*o[n]:0}});this.dispatch({type:`SET_USD_BALANCES`,chainId:a,balances:l})}catch(e){r.Logger.error(`Error refreshing cached private balance:`,e)}};handleFresh=async(e,n,i,a,o,c)=>{let l=o;try{await t.checkAddressNotUpdated(this.hinkal,e);let r=await this.hasCache(e,n);await t.checkAddressNotUpdated(this.hinkal,e),l=o||!r,l&&this.dispatch({type:`SET_LOADING`,chainId:n,newValue:!0}),await t.checkAddressNotUpdated(this.hinkal,e),a&&await this.hinkal.resetMerkle([n]);let u=await this.hinkal.getTotalBalance(n,i,e,a,c);await t.checkAddressNotUpdated(this.hinkal,e);let d=u.filter(e=>e.balance>0n);this.dispatch({type:`SET_BALANCES`,chainId:n,balances:d}),await s.privateBalancesStorage.setBalances(e,n,d),await t.checkAddressNotUpdated(this.hinkal,e),l&&(this.dispatch({type:`SET_USD_LOADING`,chainId:n,newValue:!0}),this.dispatch({type:`SET_LOADING`,chainId:n,newValue:!1})),await t.checkAddressNotUpdated(this.hinkal,e);let f=await this.getBalancesWithUsdValues(d,n);await t.checkAddressNotUpdated(this.hinkal,e),f.length>0&&this.dispatch({type:`SET_USD_BALANCES`,chainId:n,balances:f})}catch(e){r.Logger.error(`Error refreshing private balance:`,e)}finally{l&&(this.dispatch({type:`SET_LOADING`,chainId:n,newValue:!1}),this.dispatch({type:`SET_USD_LOADING`,chainId:n,newValue:!1}))}};getSupportedChainsToUpdate(e){let t=this.hinkal.getSupportedChains();return e?t.includes(e)?[e]:[]:t}async refreshInternal(e=n.PrivateBalanceUpdateType.FreshWithoutLoader,t,r=!1,i=!1,a){let{ethAdd:o,userKeys:s}=await this.getAddressAndChain(t);!o||!s?.getShieldedPublicKey()||await Promise.all(this.getSupportedChainsToUpdate(a).map(async t=>{switch(e){case n.PrivateBalanceUpdateType.OnlyCache:await this.handleCached(o,t);break;case n.PrivateBalanceUpdateType.Fresh:await this.handleFresh(o,t,s,r,!0,i);break;case n.PrivateBalanceUpdateType.FreshWithoutLoader:await this.handleFresh(o,t,s,r,!1,i);break;default:break}}))}};exports.HinkalPrivateBalanceController=u;

package/common/src/data-structures/private-balances/HinkalPrivateBalanceController.d.ts

@@ -5,10 +5,13 @@ export declare class HinkalPrivateBalanceController {
     private readonly privateBalancesListeners;
     private readonly hinkal;
     private readonly unsubscribeBalanceChange;
+    private readonly pollIntervalId;
+    private pollInFlight;
     constructor(hinkal: IHinkal);
     getSnapshot(): PrivateBalancesState;
     onPrivateBalancesWithUSDChange(callback: (state: PrivateBalancesState) => void): () => void;
     dispose(): void;
+    private pollRemoteBalances;
     private applyRefreshFromBalanceChangeEvent;
     private dispatch;
     private getAddressAndChain;