Skip to content

fix(FileStore): deduplicate merkle leaves in readMerkleFile to preven… #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
es-kt wants to merge 3 commits into from
Closed

fix(FileStore): deduplicate merkle leaves in readMerkleFile to preven… #12

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b997f61
fix(FileStore): deduplicate merkle leaves in readMerkleFile to preven…
es-kt Apr 9, 2026
6f4be16
fix(FileStore): distinguish ENOENT from transient errors in getMerkle…
es-kt Apr 9, 2026
a1b1263
Merge branch 'fix/filestore-merkle-leaf-duplicate-cid' of https://git…
es-kt Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions src/store/fileStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,21 @@ export class FileStore implements StorageAdapter {
}
}
out.sort((a, b) => a.cid - b.cid);
return out.length ? out : undefined;
// Deduplicate: the JSONL file may contain duplicate cid entries after a process
// restart re-syncs an overlapping range. Since getMerkleLeaf uses cid as an array
// index, duplicates shift all subsequent lookups and cause wrong leaf retrieval.
if (out.length > 0) {
const deduped: typeof out = [out[0]!];
for (let i = 1; i < out.length; i++) {
if (out[i]!.cid === deduped[deduped.length - 1]!.cid) {
deduped[deduped.length - 1] = out[i]!;
} else {
deduped.push(out[i]!);
}
}
return deduped;
}
return undefined;
Comment on lines +125 to +136

@gemini-code-assist gemini-code-assist Bot Apr 9, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The deduplication logic is correct, but it can be implemented more concisely using the reduce method. This would make the code more idiomatic and potentially easier to read for developers familiar with functional programming patterns.

Suggested change
if (out.length > 0) {
const deduped: typeof out = [out[0]!];
for (let i = 1; i < out.length; i++) {
if (out[i]!.cid === deduped[deduped.length - 1]!.cid) {
deduped[deduped.length - 1] = out[i]!;
} else {
deduped.push(out[i]!);
}
}
return deduped;
}
return undefined;
if (out.length === 0) {
return undefined;
}
return out.reduce((acc, current) => {
const last = acc[acc.length - 1];
if (last?.cid === current.cid) {
acc[acc.length - 1] = current;
} else {
acc.push(current);
}
return acc;
}, [] as typeof out);

} catch {
return undefined;
}
Expand All @@ -143,9 +157,12 @@ export class FileStore implements StorageAdapter {
const next = Number.isFinite(cid) ? Math.max(0, Math.floor(cid) + 1) : 0;
this.merkleNextCid.set(chainId, next);
return next;
} catch {
this.merkleNextCid.set(chainId, 0);
return 0;
} catch (err: unknown) {
if (err && typeof err === 'object' && 'code' in err && (err as { code: string }).code === 'ENOENT') {
this.merkleNextCid.set(chainId, 0);
return 0;
}
throw err;
}
}

Expand Down
Loading