@talismn/chaindata-provider 2.3.0 → 2.3.1

package/dist/index.mjs

@@ -8764,6 +8764,11 @@ var ChaindataProvider = class {
 		this.#dynamicTokensWriteQueue = result.catch(() => void 0);
 		return result;
 	}
+	/** ids of the tokens in the default (curated) chaindata */
+	async #getCuratedTokenIds() {
+		const defaultStorage = await firstValueFrom(this.#storage$);
+		return new Set(defaultStorage.tokens.map((t) => t.id));
+	}
 	/**
 	* Registers token dynamically a runtime. used for SPL and dTAO tokens.
 	* @param tokens
@@ -8772,9 +8777,12 @@ var ChaindataProvider = class {
 		if (!tokens.length) return;
 		await forEachWithYield(tokens, (t) => void TokenSchema.parse(t));
 		await this.#enqueueDynamicTokensWrite(async () => {
+			const curatedTokenIds = await this.#getCuratedTokenIds();
+			const newTokens = tokens.filter((t) => !isShadowingCuratedToken(t, curatedTokenIds));
+			if (!newTokens.length) return;
 			const currentStorage = await firstValueFrom(this.#dynamicTokens$);
 			const currentById = keyBy(currentStorage, (t) => t.id);
-			const newById = keyBy(tokens, (t) => t.id);
+			const newById = keyBy(newTokens, (t) => t.id);
 			const dynamicTokens = values({
 				...currentById,
 				...newById
@@ -8791,12 +8799,11 @@ var ChaindataProvider = class {
 		await this.#enqueueDynamicTokensWrite(async () => {
 			const dynamicTokens = await firstValueFrom(this.#dynamicTokens$);
 			if (!dynamicTokens.length) return;
-			const defaultStorage = await firstValueFrom(this.#storage$);
-			const defaultTokenIds = new Set(defaultStorage.tokens.map((t) => t.id));
+			const defaultTokenIds = await this.#getCuratedTokenIds();
 			const next = [];
 			let changed = false;
 			for (const token of dynamicTokens) {
-				if ((token.type === "sol-spl" || token.type === "sol-token2022") && defaultTokenIds.has(token.id)) {
+				if (isShadowingCuratedToken(token, defaultTokenIds)) {
 					changed = true;
 					continue;
 				}
@@ -8895,6 +8902,11 @@ const withErrorReason = async (reason, task) => {
 		throw new Error(reason, { cause });
 	}
 };
+/**
+* A dynamic Solana token whose id is also in the curated chaindata. Combined chaindata
+* keeps the last token per id, so such an entry would replace the curated one.
+*/
+const isShadowingCuratedToken = (token, curatedTokenIds) => (token.type === "sol-spl" || token.type === "sol-token2022") && curatedTokenIds.has(token.id);
 //#endregion
 //#region src/state/schema.ts
 const ChaindataFileSchema = z.object({