@optimystic/db-core 0.5.2 → 0.6.0

package/dist/src/utility/batch-coordinator.js

@@ -1,4 +1,6 @@
 import { Pending } from "./pending.js";
+import { createLogger } from "../logger.js";
+const log = createLogger('batch-coordinator');
 /**
  * Creates batches for a given payload, grouped by the coordinating peer for each block id
  */
@@ -93,6 +95,7 @@ export async function processBatches(batches, process, getBlockIds, getBlockPayl
                 .catch(async (e) => {
                 if (expiration > Date.now()) {
                     const excludedPeers = [batch.peerId, ...(batch.excludedPeers ?? [])];
+                    log('retry peer=%s excluded=%d', batch.peerId.toString(), excludedPeers.length);
                     const retries = await createBatchesForPayload(getBlockIds(batch), batch.payload, getBlockPayload, excludedPeers, findCoordinator);
                     if (retries.length > 0 && expiration > Date.now()) {
                         const root = rootOf.get(batch) ?? batch;
@@ -121,6 +124,8 @@ export async function createBatchesForPayload(blockIds, payload, getBlockPayload
     // Find coordinator for each key
     const blockIdPeerId = await Promise.all(Array.from(distinctBlockIds).map(async (bid) => [bid, await findCoordinator(bid, { excludedPeers })]));
     // Group blocks around their coordinating peers
-    return makeBatchesByPeer(blockIdPeerId, payload, getBlockPayload, excludedPeers);
+    const batches = makeBatchesByPeer(blockIdPeerId, payload, getBlockPayload, excludedPeers);
+    log('createBatches blockIds=%d batches=%d excluded=%d', distinctBlockIds.size, batches.length, excludedPeers.length);
+    return batches;
 }
 //# sourceMappingURL=batch-coordinator.js.map

package/dist/src/utility/batch-coordinator.js.map

@@ -1 +1 @@
-{"version":3,"file":"batch-coordinator.js","sourceRoot":"","sources":["../../../src/utility/batch-coordinator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAgBvC;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAChC,UAA0C,EAC1C,OAAiB,EACjB,eAA0G,EAC1G,aAAwB;IAExB,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,EAAE;QAC3D,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrC,MAAM,WAAW,GAAG,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAoD,CAAC;QAChI,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,WAAW,EAAE,OAAO,EAAE,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,EAA2C,CAAC,CAAC;QAClJ,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,IAAI,GAAG,EAAiD,CAAC,CAAC;IAC7D,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AACpC,CAAC;AAED;;GAEG;AACH,MAAM,SAAS,CAAC,CAAC,iBAAiB,CAAsB,OAAgD;IACpG,MAAM,KAAK,GAA4C,CAAC,GAAG,OAAO,CAAC,CAAC;IACpE,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;QAC3B,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YAC9C,MAAM,KAAK,CAAC;QAChB,CAAC;QACD,IAAI,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YAC9C,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;QACpC,CAAC;IACL,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU,CAAsB,OAAgD,EAAE,SAAoE;IAClK,wFAAwF;IACxF,uEAAuE;IACvE,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QACzB,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,MAAM,KAAK,GAA4C,CAAC,IAAI,CAAC,CAAC;QAC9D,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;YAC1B,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;gBAAC,KAAK,GAAG,IAAI,CAAC;gBAAC,MAAM;YAAC,CAAC;YAC7C,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;gBAC5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE;oBAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAE,CAAC,CAAC;YACrF,CAAC;QACL,CAAC;QACD,IAAI,CAAC,KAAK;YAAE,OAAO,KAAK,CAAC;IAC7B,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,MAAM,SAAS,CAAC,CAAC,UAAU,CAAsB,OAAgD,EAAE,SAAqE;IACpK,MAAM,KAAK,GAA4C,CAAC,GAAG,OAAO,CAAC,CAAC;IACpE,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;QAC3B,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACjC,MAAM,KAAK,CAAC;QAChB,CAAC;QACD,IAAI,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YAC9C,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;QACpC,CAAC;IACL,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW,CAAC,OAAkB,EAAE,OAAgB,EAAE,gBAAuC;IACxG,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;AAC/C,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CACnC,OAAgD,EAChD,OAA6E,EAC7E,WAAwE,EACxE,eAA0G,EAC1G,UAAkB,EAClB,eAA4F;IAEzF,kFAAkF;IAClF,MAAM,MAAM,GAAG,IAAI,OAAO,EAAgF,CAAC;IAC3G,KAAK,MAAM,CAAC,IAAI,OAAO;QAAE,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAE1C,mGAAmG;IACnG,MAAM,UAAU,GAAG,KAAK,EAAE,GAA4C,EAAE,EAAE;QACtE,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACtC,KAAK,CAAC,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;iBACrC,KAAK,CAAC,KAAK,EAAC,CAAC,EAAC,EAAE;gBACb,IAAI,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;oBAC1B,MAAM,aAAa,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,CAAC;oBACrE,MAAM,OAAO,GAAG,MAAM,uBAAuB,CACzC,WAAW,CAAC,KAAK,CAAC,EAClB,KAAK,CAAC,OAAO,EACb,eAAe,EACf,aAAa,EACb,eAAe,CAClB,CAAC;oBACF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;wBAChD,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC;wBACxC,IAAI,CAAC,UAAU,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC;wBAC3D,KAAK,MAAM,CAAC,IAAI,OAAO;4BAAE,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;wBAC7C,4EAA4E;wBAC5E,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC;oBAC9B,CAAC;gBACL,CAAC;gBACD,MAAM,CAAC,CAAC;YACZ,CAAC,CAAC,CAAC,CAAC;QACZ,CAAC,CAAC,CAAC,CAAC;QAEJ,qCAAqC;QACrC,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;IACvF,CAAC,CAAC;IAEF,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC;AAC9B,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC5C,QAAmB,EACnB,OAAiB,EACjB,eAA0G,EAC1G,aAAuB,EACvB,eAA4F;IAE5F,oBAAoB;IACpB,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IAE3C,gCAAgC;IAChC,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CACtC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAC9C,CAAC,GAAG,EAAE,MAAM,eAAe,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,CAAC,CAAU,CAC7D,CACD,CAAC;IAEF,+CAA+C;IAC/C,OAAO,iBAAiB,CAAsB,aAAa,EAAE,OAAO,EAAE,eAAe,EAAE,aAAa,CAAC,CAAC;AACvG,CAAC"}
+{"version":3,"file":"batch-coordinator.js","sourceRoot":"","sources":["../../../src/utility/batch-coordinator.ts"],"names":[],"mappings":"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"}

package/dist/src/utility/hash-string.d.ts

@@ -1,11 +1,8 @@
 /**
- * Simple djb2 string hash function.
- *
- * This is a non-cryptographic hash suitable for generating short identifiers.
- * For security-critical hashing, use SHA-256 from multiformats/hashes/sha2.
+ * SHA-256 string hash function.
  *
  * @param str - The string to hash
- * @returns A base-36 encoded hash string
+ * @returns A base64url-encoded SHA-256 hash string
  */
-export declare function hashString(str: string): string;
+export declare function hashString(str: string): Promise<string>;
 //# sourceMappingURL=hash-string.d.ts.map

package/dist/src/utility/hash-string.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hash-string.d.ts","sourceRoot":"","sources":["../../../src/utility/hash-string.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAM9C"}
+{"version":3,"file":"hash-string.d.ts","sourceRoot":"","sources":["../../../src/utility/hash-string.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAI7D"}

package/dist/src/utility/hash-string.js

@@ -1,17 +1,14 @@
+import { sha256 } from 'multiformats/hashes/sha2';
+import { toString } from 'uint8arrays/to-string';
 /**
- * Simple djb2 string hash function.
- *
- * This is a non-cryptographic hash suitable for generating short identifiers.
- * For security-critical hashing, use SHA-256 from multiformats/hashes/sha2.
+ * SHA-256 string hash function.
  *
  * @param str - The string to hash
- * @returns A base-36 encoded hash string
+ * @returns A base64url-encoded SHA-256 hash string
  */
-export function hashString(str) {
-    let hash = 5381;
-    for (let i = 0; i < str.length; i++) {
-        hash = ((hash << 5) + hash + str.charCodeAt(i)) | 0;
-    }
-    return Math.abs(hash).toString(36);
+export async function hashString(str) {
+    const input = new TextEncoder().encode(str);
+    const mh = await sha256.digest(input);
+    return toString(mh.digest, 'base64url');
 }
 //# sourceMappingURL=hash-string.js.map

package/dist/src/utility/hash-string.js.map

@@ -1 +1 @@
-{"version":3,"file":"hash-string.js","sourceRoot":"","sources":["../../../src/utility/hash-string.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,MAAM,UAAU,UAAU,CAAC,GAAW;IACrC,IAAI,IAAI,GAAG,IAAI,CAAC;IAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACrD,CAAC;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"hash-string.js","sourceRoot":"","sources":["../../../src/utility/hash-string.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,GAAW;IAC3C,MAAM,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACtC,OAAO,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AACzC,CAAC"}

package/dist/src/utility/lru-map.d.ts

@@ -0,0 +1,18 @@
+/**
+ * A simple LRU (Least Recently Used) map backed by JavaScript's Map insertion order.
+ * Accessing or setting an entry refreshes it to the most-recently-used position.
+ * When the map exceeds maxSize, the least-recently-used entry is evicted.
+ */
+export declare class LruMap<K, V> {
+    private readonly maxSize;
+    private readonly map;
+    constructor(maxSize: number);
+    get(key: K): V | undefined;
+    set(key: K, value: V): this;
+    has(key: K): boolean;
+    delete(key: K): boolean;
+    clear(): void;
+    get size(): number;
+    [Symbol.iterator](): IterableIterator<[K, V]>;
+}
+//# sourceMappingURL=lru-map.d.ts.map

package/dist/src/utility/lru-map.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lru-map.d.ts","sourceRoot":"","sources":["../../../src/utility/lru-map.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,qBAAa,MAAM,CAAC,CAAC,EAAE,CAAC;IAGX,OAAO,CAAC,QAAQ,CAAC,OAAO;IAFpC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAmB;gBAEV,OAAO,EAAE,MAAM;IAI5C,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,SAAS;IAU1B,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI;IAa3B,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,OAAO;IAIpB,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,OAAO;IAIvB,KAAK,IAAI,IAAI;IAIb,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAG7C"}

package/dist/src/utility/lru-map.js

@@ -0,0 +1,52 @@
+/**
+ * A simple LRU (Least Recently Used) map backed by JavaScript's Map insertion order.
+ * Accessing or setting an entry refreshes it to the most-recently-used position.
+ * When the map exceeds maxSize, the least-recently-used entry is evicted.
+ */
+export class LruMap {
+    maxSize;
+    map = new Map();
+    constructor(maxSize) {
+        this.maxSize = maxSize;
+        if (maxSize < 1)
+            throw new Error('LruMap maxSize must be >= 1');
+    }
+    get(key) {
+        const value = this.map.get(key);
+        if (value !== undefined) {
+            // Refresh: delete and re-insert to move to end (most recent)
+            this.map.delete(key);
+            this.map.set(key, value);
+        }
+        return value;
+    }
+    set(key, value) {
+        // If already present, delete first to refresh position
+        if (this.map.has(key)) {
+            this.map.delete(key);
+        }
+        else if (this.map.size >= this.maxSize) {
+            // Evict the oldest (first) entry
+            const oldest = this.map.keys().next().value;
+            this.map.delete(oldest);
+        }
+        this.map.set(key, value);
+        return this;
+    }
+    has(key) {
+        return this.map.has(key);
+    }
+    delete(key) {
+        return this.map.delete(key);
+    }
+    clear() {
+        this.map.clear();
+    }
+    get size() {
+        return this.map.size;
+    }
+    [Symbol.iterator]() {
+        return this.map[Symbol.iterator]();
+    }
+}
+//# sourceMappingURL=lru-map.js.map

package/dist/src/utility/lru-map.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lru-map.js","sourceRoot":"","sources":["../../../src/utility/lru-map.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,OAAO,MAAM;IAGW;IAFZ,GAAG,GAAG,IAAI,GAAG,EAAQ,CAAC;IAEvC,YAA6B,OAAe;QAAf,YAAO,GAAP,OAAO,CAAQ;QAC3C,IAAI,OAAO,GAAG,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjE,CAAC;IAED,GAAG,CAAC,GAAM;QACT,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACzB,6DAA6D;YAC7D,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACrB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC1B,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,GAAG,CAAC,GAAM,EAAE,KAAQ;QACnB,uDAAuD;QACvD,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;aAAM,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAC1C,iCAAiC;YACjC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAM,CAAC;YAC7C,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACzB,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACzB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,GAAG,CAAC,GAAM;QACT,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,GAAM;QACZ,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK;QACJ,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IAClB,CAAC;IAED,IAAI,IAAI;QACP,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;IACtB,CAAC;IAED,CAAC,MAAM,CAAC,QAAQ,CAAC;QAChB,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;IACpC,CAAC;CACD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimystic/db-core",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "type": "module",
   "description": "Core database functionality for Optimystic",
   "main": "dist/src/index.js",
@@ -15,6 +15,10 @@
     ".": {
       "types": "./dist/src/index.d.ts",
       "import": "./dist/src/index.js"
+    },
+    "./test": {
+      "types": "./dist/test/test-transactor.d.ts",
+      "import": "./dist/test/test-transactor.js"
     }
   },
   "repository": {
@@ -36,12 +40,9 @@
     "acid"
   ],
   "scripts": {
-    "clean": "aegir clean",
-    "build": "aegir build --env node",
-    "lint": "aegir lint",
-    "test": "aegir test",
-    "test:node": "aegir test -t node",
-    "dep-check": "aegir dep-check"
+    "clean": "rimraf dist",
+    "build": "tsc",
+    "test": "node --import ./register.mjs node_modules/mocha/bin/mocha.js \"test/**/*.spec.ts\" --colors --reporter min"
   },
   "devDependencies": {
     "@libp2p/crypto": "^5.1.13",
@@ -49,9 +50,15 @@
     "@libp2p/peer-id": "^6.0.4",
     "@libp2p/peer-id-factory": "^4.2.4",
     "@multiformats/multiaddr": "^13.0.1",
+    "@types/chai-as-promised": "^8.0.2",
+    "@types/debug": "^4.1.12",
     "@types/mocha": "^10.0.10",
     "@types/node": "^25.1.0",
-    "aegir": "^47.0.26",
+    "chai": "^6.2.2",
+    "chai-as-promised": "^8.0.2",
+    "mocha": "^11.7.5",
+    "rimraf": "^6.1.2",
+    "ts-node": "^10.9.2",
     "typescript": "^5.9.3"
   },
   "dependencies": {

package/src/btree/btree.ts

@@ -4,6 +4,7 @@ import { apply, get } from "../blocks/index.js";
 import { TreeLeafBlockType, TreeBranchBlockType, entries$, nodes$, partitions$ } from "./nodes.js";
 import type { BranchNode, ITreeNode, LeafNode } from "./nodes.js";
 import type { TreeBlock } from "./tree-block.js";
+import { AtomicProxy } from "../transform/atomic-proxy.js";
 
 export const NodeCapacity = 64;
 
@@ -15,6 +16,7 @@ export const NodeCapacity = 64;
  */
 export class BTree<TKey, TEntry> {
 	protected _version = 0;	// only for path invalidation
+	private _proxy?: AtomicProxy<ITreeNode>;
 
 	/**
 	 * @param [compare=(a: TKey, b: TKey) => a < b ? -1 : a > b ? 1 : 0] a comparison function for keys.  The default uses < and > operators.
@@ -28,6 +30,10 @@ export class BTree<TKey, TEntry> {
 	) {
 	}
 
+	private atomic<T>(fn: () => Promise<T>): Promise<T> {
+		return this._proxy ? this._proxy.atomic(fn) : fn();
+	}
+
 	static createRoot(
 		store: BlockStore<ITreeNode>
 	) {
@@ -41,10 +47,13 @@ export class BTree<TKey, TEntry> {
 		compare = (a: TKey, b: TKey) => a < b ? -1 : a > b ? 1 : 0,
 		newId?: BlockId,
 	) {
-		const root = BTree.createRoot(store as BlockStore<TreeBlock>);
-		store.insert(root);
-		const trunk = createTrunk(store as BlockStore<TreeBlock>, root.header.id, newId);
-		return new BTree(store, trunk, keyFromEntry, compare);
+		const proxy = new AtomicProxy(store);
+		const root = BTree.createRoot(proxy as BlockStore<TreeBlock>);
+		proxy.insert(root);
+		const trunk = createTrunk(proxy as BlockStore<TreeBlock>, root.header.id, newId);
+		const tree = new BTree(proxy, trunk, keyFromEntry, compare);
+		tree._proxy = proxy;
+		return tree;
 	}
 
 	/** @returns a path to the first entry (on = false if no entries) */
@@ -118,12 +127,14 @@ export class BTree<TKey, TEntry> {
 	 * Added entries are frozen to ensure immutability
 	 * @returns path to the new (on = true) or conflicting (on = false) row. */
 	async insert(entry: TEntry): Promise<Path<TKey, TEntry>> {
-		Object.freeze(entry);	// Ensure immutability
-		const path = await this.internalInsert(entry);
-		if (path.on) {
-			path.version = ++this._version;
-		}
-		return path;
+		return this.atomic(async () => {
+			Object.freeze(entry);	// Ensure immutability
+			const path = await this.internalInsert(entry);
+			if (path.on) {
+				path.version = ++this._version;
+			}
+			return path;
+		});
 	}
 
 	/** Updates the entry at the given path to the given value.  Deletes and inserts if the key changes.
@@ -135,30 +146,34 @@ export class BTree<TKey, TEntry> {
 	 * 		* wasUpdate = true, given path is not on an entry
 	 * 		* else newEntry's new key already present; returned path is "near" existing entry */
 	async updateAt(path: Path<TKey, TEntry>, newEntry: TEntry): Promise<[path: Path<TKey, TEntry>, wasUpdate: boolean]> {
-		this.validatePath(path);
-		if (path.on) {
-			Object.freeze(newEntry);
-		}
-		const result = await this.internalUpdate(path, newEntry);
-		if (result[0].on) {
-			result[0].version = ++this._version;
-		}
-		return result;
+		return this.atomic(async () => {
+			this.validatePath(path);
+			if (path.on) {
+				Object.freeze(newEntry);
+			}
+			const result = await this.internalUpdate(path, newEntry);
+			if (result[0].on) {
+				result[0].version = ++this._version;
+			}
+			return result;
+		});
 	}
 
 	/** Inserts the entry if it doesn't exist, or updates it if it does.
 	 * The entry is frozen to ensure immutability.
 	 * @returns path to the new entry.  on = true if existing; on = false if new. */
 	async upsert(entry: TEntry): Promise<Path<TKey, TEntry>> {
-		const path = await this.find(this.keyFromEntry(entry));
-		Object.freeze(entry);
-		if (path.on) {
-			this.updateEntry(path, entry);
-		} else {
-			await this.internalInsertAt(path, entry);
-		}
-		path.version = ++this._version;
-		return path;
+		return this.atomic(async () => {
+			const path = await this.find(this.keyFromEntry(entry));
+			Object.freeze(entry);
+			if (path.on) {
+				this.updateEntry(path, entry);
+			} else {
+				await this.internalInsertAt(path, entry);
+			}
+			path.version = ++this._version;
+			return path;
+		});
 	}
 
 	/** Inserts or updates depending on the existence of the given key, using callbacks to generate the new value.
@@ -167,18 +182,20 @@ export class BTree<TKey, TEntry> {
 	 * @returns path to new entry and whether an update or insert attempted.
 	 * If getUpdated callback returns a row that is already present, the resulting path will not be on. */
 	async merge(newEntry: TEntry, getUpdated: (existing: TEntry) => TEntry): Promise<[path: Path<TKey, TEntry>, wasUpdate: boolean]> {
-		const newKey = await this.keyFromEntry(newEntry);
-		const path = await this.find(newKey);
-		if (path.on) {
-			const result = await this.updateAt(path, getUpdated(this.getEntry(path)));	// Don't use internalUpdate - need to freeze and check for mutation
-			// Note: updateAt already increments version, so don't double-increment here
-			return result;
-		} else {
-			await this.internalInsertAt(path, Object.freeze(newEntry));
-			path.on = true;
-			path.version = ++this._version;
-			return [path, false];
-		}
+		return this.atomic(async () => {
+			const newKey = await this.keyFromEntry(newEntry);
+			const path = await this.find(newKey);
+			if (path.on) {
+				const result = await this.updateAt(path, getUpdated(this.getEntry(path)));	// Don't use internalUpdate - need to freeze and check for mutation
+				// Note: updateAt already increments version, so don't double-increment here
+				return result;
+			} else {
+				await this.internalInsertAt(path, Object.freeze(newEntry));
+				path.on = true;
+				path.version = ++this._version;
+				return [path, false];
+			}
+		});
 	}
 
 	/** Deletes the entry at the given path.
@@ -186,19 +203,23 @@ export class BTree<TKey, TEntry> {
 	 * @returns true if the delete succeeded (the key was found); false otherwise.
 	*/
 	async deleteAt(path: Path<TKey, TEntry>): Promise<boolean> {
-		this.validatePath(path);
-		const result = await this.internalDelete(path);
-		if (result) {
-			++this._version;
-		}
-		return result;
+		return this.atomic(async () => {
+			this.validatePath(path);
+			const result = await this.internalDelete(path);
+			if (result) {
+				++this._version;
+			}
+			return result;
+		});
 	}
 
 	async drop() {	// Node: only when a root treeBlock
-		const root = await this.trunk.get();
-		for await (const id of this.nodeIds(root)) {
-			this.store.delete(id);
-		}
+		return this.atomic(async () => {
+			const root = await this.trunk.get();
+			for await (const id of this.nodeIds(root)) {
+				this.store.delete(id);
+			}
+		});
 	}
 
 	/** Iterates forward starting from the path location (inclusive) to the end.

package/src/cluster/structs.ts

@@ -27,6 +27,13 @@ export type ClusterRecord = {
 	networkSizeHint?: number;
 	/** Confidence in the network size estimate (0-1) */
 	networkSizeConfidence?: number;
+	/** Transaction proceeded despite minority rejections */
+	disputed?: boolean;
+	/** Evidence of the dispute: which peers rejected and why */
+	disputeEvidence?: {
+		rejectingPeers: string[];
+		rejectReasons: { [peerId: string]: string };
+	};
 }
 
 export interface ClusterConsensusConfig {
@@ -42,4 +49,8 @@ export interface ClusterConsensusConfig {
 	clusterSizeTolerance: number;
 	/** Window for detecting partition in milliseconds (default 60000 = 1 min) */
 	partitionDetectionWindow: number;
+	/** Enable dispute escalation protocol (default false) */
+	disputeEnabled?: boolean;
+	/** Timeout for dispute arbitration in milliseconds (default 60000) */
+	disputeArbitrationTimeoutMs?: number;
 }

package/src/collection/collection.ts

@@ -1,6 +1,7 @@
 import type { IBlock, Action, ActionType, ActionHandler, BlockId, ITransactor, BlockStore } from "../index.js";
 import { Log, Atomic, Tracker, copyTransforms, CacheSource, isTransformsEmpty, TransactorSource } from "../index.js";
 import type { CollectionHeaderBlock, CollectionId, ICollection } from "./index.js";
+import type { ReadDependency } from "../transaction/transaction.js";
 import { randomBytes } from '@noble/hashes/utils.js';
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string';
 import { Latches } from "../utility/latches.js";
@@ -207,6 +208,14 @@ export class Collection<TAction> implements ICollection<TAction> {
 		}
 	}
 
+	getReadDependencies(): ReadDependency[] {
+		return this.source.getReadDependencies();
+	}
+
+	clearReadDependencies(): void {
+		this.source.clearReadDependencies();
+	}
+
 	/** Called for each local action that may be in conflict with a remote action (always called under latch).
 	 * @param action - The local action to check
 	 * @param potential - The remote action that is potentially in conflict

package/src/index.ts

@@ -16,3 +16,4 @@ export * from "./utility/nameof.js";
 export * from "./utility/ensured.js";
 export * from "./utility/pending.js";
 export * from "./utility/block-id-to-bytes.js";
+export * from "./utility/lru-map.js";

package/src/log/log.ts

@@ -56,7 +56,7 @@ export class Log<TAction> {
 	/** Gets the action context of the log. */
 	async getActionContext(): Promise<ActionContext | undefined> {
 		const tailPath = await this.chain.getTail();
-		if (!tailPath) {
+		if (!tailPath || tailPath.block.entries.length === 0) {
 			return undefined;
 		}
 		const checkpoint = await this.findCheckpoint(tailPath);

package/src/logger.ts

@@ -0,0 +1,10 @@
+import debug from 'debug'
+
+const BASE_NAMESPACE = 'optimystic:db-core'
+
+export function createLogger(subNamespace: string): debug.Debugger {
+	return debug(`${BASE_NAMESPACE}:${subNamespace}`)
+}
+
+export const verbose = typeof process !== 'undefined'
+	&& (process.env.OPTIMYSTIC_VERBOSE === '1' || process.env.OPTIMYSTIC_VERBOSE === 'true');