@agoric/cosmic-swingset 0.41.4-dev-aa5ce6f.0.aa5ce6f → 0.41.4-dev-70fb93a.0.70fb93a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.41.4-dev-aa5ce6f.0.aa5ce6f",
+  "version": "0.41.4-dev-70fb93a.0.70fb93a",
   "description": "Agoric's Cosmos blockchain integration",
   "type": "module",
   "bin": {
@@ -22,15 +22,15 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/builders": "0.1.1-dev-aa5ce6f.0.aa5ce6f",
+    "@agoric/builders": "0.1.1-dev-70fb93a.0.70fb93a",
     "@agoric/cosmos": "",
-    "@agoric/deploy-script-support": "0.10.4-dev-aa5ce6f.0.aa5ce6f",
-    "@agoric/internal": "0.3.3-dev-aa5ce6f.0.aa5ce6f",
-    "@agoric/store": "0.9.3-dev-aa5ce6f.0.aa5ce6f",
-    "@agoric/swing-store": "0.9.2-dev-aa5ce6f.0.aa5ce6f",
-    "@agoric/swingset-vat": "0.32.3-dev-aa5ce6f.0.aa5ce6f",
-    "@agoric/telemetry": "0.6.3-dev-aa5ce6f.0.aa5ce6f",
-    "@agoric/vm-config": "0.1.1-dev-aa5ce6f.0.aa5ce6f",
+    "@agoric/deploy-script-support": "0.10.4-dev-70fb93a.0.70fb93a",
+    "@agoric/internal": "0.3.3-dev-70fb93a.0.70fb93a",
+    "@agoric/store": "0.9.3-dev-70fb93a.0.70fb93a",
+    "@agoric/swing-store": "0.9.2-dev-70fb93a.0.70fb93a",
+    "@agoric/swingset-vat": "0.32.3-dev-70fb93a.0.70fb93a",
+    "@agoric/telemetry": "0.6.3-dev-70fb93a.0.70fb93a",
+    "@agoric/vm-config": "0.1.1-dev-70fb93a.0.70fb93a",
     "@endo/bundle-source": "^4.1.2",
     "@endo/env-options": "^1.1.11",
     "@endo/errors": "^1.2.13",
@@ -52,7 +52,7 @@
     "tmp": "^0.2.1"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-dev-aa5ce6f.0.aa5ce6f",
+    "@agoric/kmarshal": "0.1.1-dev-70fb93a.0.70fb93a",
     "ava": "^5.3.0",
     "better-sqlite3": "^10.1.0",
     "c8": "^10.1.3",
@@ -84,5 +84,5 @@
   "typeCoverage": {
     "atLeast": 86.47
   },
-  "gitHead": "aa5ce6f32f2313febcf394018e5de46b81d7dbbc"
+  "gitHead": "70fb93afcb746d40510dcbe3a20370786fb627db"
 }

package/src/chain-main.js

@@ -61,7 +61,7 @@ import {
 
 /**
  * @import {EReturn} from '@endo/far';
- * @import {KVStore} from './helpers/bufferedStorage.js';
+ * @import {KVStore} from '@agoric/internal/src/kv-store.js';
  * @import {SwingStore} from '@agoric/swing-store';
  * @import {StateSyncExporter} from './export-kernel-db.js';
  */

package/src/helpers/bufferedStorage.js

@@ -1,18 +1,13 @@
 import { assert, Fail } from '@endo/errors';
+import {
+  makeKVStoreFromMap,
+  compareByCodePoints,
+} from '@agoric/internal/src/kv-store.js';
 
 // XXX Do these "StorageAPI" functions belong in their own package?
-
 /**
- * @template [T=unknown]
- * @typedef {{
- *   has: (key: string) => boolean,
- *   get: (key: string) => T | undefined,
- *   getNextKey: (previousKey: string) => string | undefined,
- *   set: (key: string, value: T ) => void,
- *   delete: (key: string) => void,
- * }} KVStore
+ * @import {KVStore} from '@agoric/internal/src/kv-store.js'
  */
-
 /**
  * @template [T=unknown]
  * @typedef {KVStore<T> & {commit: () => void, abort: () => void}} BufferedKVStore
@@ -36,100 +31,6 @@ export function insistStorageAPI(kvStore) {
   }
 }
 
-// TODO: Replace compareByCodePoints and makeKVStoreFromMap and
-// provideEnhancedKVStore with imports when
-// available.
-// https://github.com/Agoric/agoric-sdk/pull/10299
-
-const compareByCodePoints = (left, right) => {
-  const leftIter = left[Symbol.iterator]();
-  const rightIter = right[Symbol.iterator]();
-  for (;;) {
-    const { value: leftChar } = leftIter.next();
-    const { value: rightChar } = rightIter.next();
-    if (leftChar === undefined && rightChar === undefined) {
-      return 0;
-    } else if (leftChar === undefined) {
-      // left is a prefix of right.
-      return -1;
-    } else if (rightChar === undefined) {
-      // right is a prefix of left.
-      return 1;
-    }
-    const leftCodepoint = /** @type {number} */ (leftChar.codePointAt(0));
-    const rightCodepoint = /** @type {number} */ (rightChar.codePointAt(0));
-    if (leftCodepoint < rightCodepoint) return -1;
-    if (leftCodepoint > rightCodepoint) return 1;
-  }
-};
-
-/**
- * @template [T=unknown]
- * @param {Map<string, T>} map
- * @returns {KVStore<T>}
- */
-export const makeKVStoreFromMap = map => {
-  let sortedKeys;
-  let priorKeyReturned;
-  let priorKeyIndex;
-
-  const ensureSorted = () => {
-    if (sortedKeys) return;
-    sortedKeys = [...map.keys()].sort(compareByCodePoints);
-  };
-
-  const clearGetNextKeyCache = () => {
-    priorKeyReturned = undefined;
-    priorKeyIndex = -1;
-  };
-  clearGetNextKeyCache();
-
-  const clearSorted = () => {
-    sortedKeys = undefined;
-    clearGetNextKeyCache();
-  };
-
-  /** @type {KVStore<T>} */
-  const fakeStore = harden({
-    has: key => map.has(key),
-    get: key => map.get(key),
-    getNextKey: priorKey => {
-      assert.typeof(priorKey, 'string');
-      ensureSorted();
-      const start =
-        priorKeyReturned === undefined
-          ? 0
-          : // If priorKeyReturned <= priorKey, start just after it.
-            (compareByCodePoints(priorKeyReturned, priorKey) <= 0 &&
-              priorKeyIndex + 1) ||
-            // Else if priorKeyReturned immediately follows priorKey, start at
-            // its index (and expect to return it again).
-            (sortedKeys.at(priorKeyIndex - 1) === priorKey && priorKeyIndex) ||
-            // Otherwise, start at the beginning.
-            0;
-      for (let i = start; i < sortedKeys.length; i += 1) {
-        const key = sortedKeys[i];
-        if (compareByCodePoints(key, priorKey) <= 0) continue;
-        priorKeyReturned = key;
-        priorKeyIndex = i;
-        return key;
-      }
-      // reached end without finding the key, so clear our cache
-      clearGetNextKeyCache();
-      return undefined;
-    },
-    set: (key, value) => {
-      if (!map.has(key)) clearSorted();
-      map.set(key, value);
-    },
-    delete: key => {
-      if (map.has(key)) clearSorted();
-      map.delete(key);
-    },
-  });
-  return fakeStore;
-};
-
 /**
  * Return an object representing KVStore contents as both a KVStore and a Map.
  *
@@ -334,7 +235,11 @@ export const makeReadCachingStorage = kvStore => {
 
       // Fetch the value and cache it until the next commit or abort.
       value = kvStore.get(key);
-      cache.set(key, value === undefined ? undef : value);
+      cache.set(
+        key,
+        // eslint-disable-next-line no-nested-ternary
+        value === undefined ? (kvStore.has(key) ? undef : deleted) : value,
+      );
       return value;
     },
     set(key, value) {
@@ -364,7 +269,7 @@ export const makeReadCachingStorage = kvStore => {
     // Enqueue a write of any retrieved value, to handle callers like mailbox.js
     // that expect local mutations to be automatically written back.
     onGet(key, value) {
-      buffered.set(key, value);
+      if (value !== undefined) buffered.set(key, value);
     },
 
     // Reset the read cache upon commit or abort.

package/src/launch-chain.js

@@ -55,7 +55,8 @@ import { computronCounter } from './computron-counter.js';
  * @import {BlockInfo} from '@agoric/internal/src/chain-utils.js';
  * @import {SwingStoreKernelStorage} from '@agoric/swing-store';
  * @import {Mailbox, RunPolicy, SwingSetConfig} from '@agoric/swingset-vat';
- * @import {KVStore, BufferedKVStore} from './helpers/bufferedStorage.js';
+ * @import {BufferedKVStore} from './helpers/bufferedStorage.js';
+ * @import {KVStore} from '@agoric/internal/src/kv-store.js';
  * @import {ConfigProposal} from '@agoric/deploy-script-support/src/extract-proposal.js';
  * @import {ERef} from '@endo/far';
  * @import {QueueStorage} from './helpers/make-queue.js';

package/src/sim-chain.js

@@ -14,11 +14,11 @@ import { getTelemetryProviders, makeSlogSender } from '@agoric/telemetry';
 import { resolve as importMetaResolve } from 'import-meta-resolve';
 import { makeWithQueue } from '@agoric/internal/src/queue.js';
 import { makeBatchedDeliver } from '@agoric/internal/src/batched-deliver.js';
+import { makeKVStoreFromMap } from '@agoric/internal/src/kv-store.js';
 import stringify from './helpers/json-stable-stringify.js';
 import { launch } from './launch-chain.js';
 import { DEFAULT_SIM_SWINGSET_PARAMS, QueueInbound } from './sim-params.js';
 import { parseQueueSizes } from './params.js';
-import { makeKVStoreFromMap } from './helpers/bufferedStorage.js';
 import { makeQueue, makeQueueStorageMock } from './helpers/make-queue.js';
 
 /** @import { Mailbox } from '@agoric/swingset-vat' */