@agoric/cosmic-swingset 0.41.4-dev-9d6cff1.0 → 0.41.4-dev-0105e1a.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.41.4-dev-9d6cff1.0+9d6cff1",
+  "version": "0.41.4-dev-0105e1a.0+0105e1a",
   "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-9d6cff1.0+9d6cff1",
-    "@agoric/cosmos": "0.34.2-dev-9d6cff1.0+9d6cff1",
-    "@agoric/deploy-script-support": "0.10.4-dev-9d6cff1.0+9d6cff1",
-    "@agoric/internal": "0.3.3-dev-9d6cff1.0+9d6cff1",
-    "@agoric/store": "0.9.3-dev-9d6cff1.0+9d6cff1",
-    "@agoric/swing-store": "0.9.2-dev-9d6cff1.0+9d6cff1",
-    "@agoric/swingset-vat": "0.32.3-dev-9d6cff1.0+9d6cff1",
-    "@agoric/telemetry": "0.6.3-dev-9d6cff1.0+9d6cff1",
-    "@agoric/vm-config": "0.1.1-dev-9d6cff1.0+9d6cff1",
+    "@agoric/builders": "0.1.1-dev-0105e1a.0+0105e1a",
+    "@agoric/cosmos": "0.34.2-dev-0105e1a.0+0105e1a",
+    "@agoric/deploy-script-support": "0.10.4-dev-0105e1a.0+0105e1a",
+    "@agoric/internal": "0.3.3-dev-0105e1a.0+0105e1a",
+    "@agoric/store": "0.9.3-dev-0105e1a.0+0105e1a",
+    "@agoric/swing-store": "0.9.2-dev-0105e1a.0+0105e1a",
+    "@agoric/swingset-vat": "0.32.3-dev-0105e1a.0+0105e1a",
+    "@agoric/telemetry": "0.6.3-dev-0105e1a.0+0105e1a",
+    "@agoric/vm-config": "0.1.1-dev-0105e1a.0+0105e1a",
     "@endo/bundle-source": "^3.5.0",
     "@endo/env-options": "^1.1.8",
     "@endo/errors": "^1.2.8",
@@ -71,5 +71,5 @@
   "typeCoverage": {
     "atLeast": 82.83
   },
-  "gitHead": "9d6cff17bb95ce5557758da242ca4646a87ac5b0"
+  "gitHead": "0105e1ac69b66895872c2e3243f8162069491208"
 }

package/src/anylogger-agoric.js

@@ -32,8 +32,8 @@ const selectedCode = anylogger.levels[selectedLevel];
 const globalCode = selectedCode === undefined ? -Infinity : selectedCode;
 
 const oldExt = anylogger.ext;
-anylogger.ext = (l, o) => {
-  l = oldExt(l, o);
+anylogger.ext = logger => {
+  const l = oldExt(logger);
   l.enabledFor = lvl => globalCode >= anylogger.levels[lvl];
 
   const prefix = l.name.replace(/:/g, ': ');

package/src/chain-main.js

@@ -1,6 +1,6 @@
 // @ts-check
 
-import path from 'node:path';
+import nativePath from 'node:path';
 import v8 from 'node:v8';
 import process from 'node:process';
 import fs from 'node:fs';
@@ -167,7 +167,11 @@ const makePrefixedBridgeStorage = (
   });
 };
 
-export default async function main(progname, args, { env, homedir, agcc }) {
+export default async function main(
+  progname,
+  args,
+  { env, homedir, path = nativePath, agcc },
+) {
   const portNums = {};
 
   // TODO: use the 'basedir' pattern

package/src/entrypoint.js

@@ -18,9 +18,9 @@ import main from './chain-main.js';
 const log = anylogger('ag-chain-cosmos');
 
 main(process.argv[1], process.argv.splice(2), {
-  path,
-  homedir: os.homedir(),
   env: process.env,
+  homedir: os.homedir(),
+  path,
   agcc,
 }).then(
   _res => 0,

package/src/helpers/bufferedStorage.js

@@ -5,7 +5,7 @@ import { assert, Fail } from '@endo/errors';
 // XXX Do these "StorageAPI" functions belong in their own package?
 
 /**
- * @template {unknown} [T=unknown]
+ * @template [T=unknown]
  * @typedef {{
  *   has: (key: string) => boolean,
  *   get: (key: string) => T | undefined,
@@ -16,7 +16,7 @@ import { assert, Fail } from '@endo/errors';
  */
 
 /**
- * @template {unknown} [T=unknown]
+ * @template [T=unknown]
  * @typedef {KVStore<T> & {commit: () => void, abort: () => void}} BufferedKVStore
  */
 
@@ -210,15 +210,13 @@ export function provideEnhancedKVStore(mapOrKvStore = new Map()) {
  * until told to commit (or abort) them.
  *
  * @template [T=unknown]
- * @param {KVStore<T>} kvStore  The StorageAPI object to wrap
- * @param {{
- *   onGet?: (key: string, value: T | undefined) => void, // a callback invoked after getting a value from kvStore
- *   onPendingSet?: (key: string, value: T) => void, // a callback invoked after a new uncommitted value is set
- *   onPendingDelete?: (key: string) => void, // a callback invoked after a new uncommitted delete
- *   onCommit?: () => void, // a callback invoked after pending operations have been committed
- *   onAbort?: () => void, // a callback invoked after pending operations have been aborted
- * }} listeners  Optional callbacks to be invoked when respective events occur
- *
+ * @param {KVStore<T>} kvStore the StorageAPI object to wrap
+ * @param {object} [listeners] optional callbacks to be invoked when respective events occur
+ * @param {(key: string, value: T | undefined) => void} [listeners.onGet] a callback invoked after getting a value from kvStore
+ * @param {(key: string, value: T) => void} [listeners.onPendingSet] a callback invoked after a new uncommitted value is set
+ * @param {(key: string) => void} [listeners.onPendingDelete] a callback invoked after a new uncommitted delete
+ * @param {() => void} [listeners.onCommit] a callback invoked after pending operations have been committed
+ * @param {() => void} [listeners.onAbort] a callback invoked after pending operations have been aborted
  * @returns {{kvStore: KVStore<T>} & Pick<BufferedKVStore<T>, 'commit' | 'abort'>}
  */
 export function makeBufferedStorage(kvStore, listeners = {}) {

package/src/sim-chain.js

@@ -19,8 +19,11 @@ import { launch } from './launch-chain.js';
 import { getTelemetryProviders } from './kernel-stats.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' */
+
 const console = anylogger('fake-chain');
 
 const TELEMETRY_SERVICE_NAME = 'sim-cosmos';
@@ -28,10 +31,11 @@ const TELEMETRY_SERVICE_NAME = 'sim-cosmos';
 const PRETEND_BLOCK_DELAY = 5;
 const scaleBlockTime = ms => Math.floor(ms / 1000);
 
-async function makeMapStorage(file) {
-  let content;
+async function makeMailboxStorageFromFile(file) {
+  /** @type {Map<string, Mailbox>} */
   const map = new Map();
-  map.commit = async () => {
+  const kvStore = makeKVStoreFromMap(map);
+  const commit = async () => {
     const obj = {};
     for (const [k, v] of map.entries()) {
       obj[k] = exportMailbox(v);
@@ -39,20 +43,24 @@ async function makeMapStorage(file) {
     const json = stringify(obj);
     await fs.promises.writeFile(file, json);
   };
-
-  await (async () => {
-    content = await fs.promises.readFile(file);
+  const read = async () => {
+    const content = await fs.promises.readFile(file, 'utf8');
     return JSON.parse(content);
-  })().then(
-    obj => {
-      for (const [k, v] of Object.entries(obj)) {
-        map.set(k, importMailbox(v));
-      }
-    },
-    () => {},
-  );
+  };
+  const load = async obj => {
+    map.clear();
+    for (const [k, v] of Object.entries(obj)) {
+      map.set(k, importMailbox(v));
+    }
+  };
+  const reset = async () => {
+    const obj = await read();
+    await load(obj);
+  };
 
-  return map;
+  await read().then(load, () => {});
+
+  return { ...kvStore, commit, abort: reset };
 }
 
 export async function connectToFakeChain(basedir, GCI, delay, inbound) {
@@ -61,7 +69,7 @@ export async function connectToFakeChain(basedir, GCI, delay, inbound) {
   const mailboxFile = path.join(basedir, `fake-chain-${GCI}-mailbox.json`);
   const bootAddress = `${GCI}-client`;
 
-  const mailboxStorage = await makeMapStorage(mailboxFile);
+  const mailboxStorage = await makeMailboxStorageFromFile(mailboxFile);
 
   const argv = {
     giveMeAllTheAgoricPowers: true,
@@ -109,6 +117,7 @@ export async function connectToFakeChain(basedir, GCI, delay, inbound) {
   const actionQueue = makeQueue(actionQueueStorage);
 
   const s = await launch({
+    bridgeOutbound: /** @type {any} */ (undefined),
     actionQueueStorage,
     highPriorityQueueStorage,
     kernelStateDBDir: stateDBdir,
@@ -120,13 +129,20 @@ export async function connectToFakeChain(basedir, GCI, delay, inbound) {
     debugName: GCI,
     metricsProvider,
     slogSender,
+    swingsetConfig: {},
   });
 
   const { blockingSend, savedHeight } = s;
 
   let blockHeight = savedHeight;
   const intoChain = [];
-  let nextBlockTimeout = 0;
+  /** @type {undefined | ReturnType<typeof setTimeout>} */
+  let nextBlockTimeout;
+  const resetNextBlockTimeout = () => {
+    if (nextBlockTimeout === undefined) return;
+    clearTimeout(nextBlockTimeout);
+    nextBlockTimeout = undefined;
+  };
 
   const maximumDelay = (delay || PRETEND_BLOCK_DELAY) * 1000;
 
@@ -172,7 +188,7 @@ export async function connectToFakeChain(basedir, GCI, delay, inbound) {
       // Done processing, "commit the block".
       await blockingSend({ type: 'COMMIT_BLOCK', blockHeight, blockTime });
 
-      clearTimeout(nextBlockTimeout);
+      resetNextBlockTimeout();
       nextBlockTimeout = setTimeout(simulateBlock, maximumDelay);
 
       // TODO: maybe add latency to the inbound messages.
@@ -197,7 +213,7 @@ export async function connectToFakeChain(basedir, GCI, delay, inbound) {
     // Only actually simulate a block if we're not in bootstrap.
     let p;
     if (blockHeight && !delay) {
-      clearTimeout(nextBlockTimeout);
+      resetNextBlockTimeout();
       p = simulateBlock();
     }
     await p;

package/tools/test-kit.js

@@ -35,6 +35,7 @@ const stripUndefined = obj =>
     Object.entries(obj).filter(([_key, value]) => value !== undefined),
   );
 
+/** @type {InitMsg} */
 export const defaultInitMessage = harden(
   makeInitMsg({
     type: SwingsetMessageType.AG_COSMOS_INIT,
@@ -59,6 +60,7 @@ export const defaultInitMessage = harden(
     ),
   }),
 );
+/** @type {InitMsg} */
 export const defaultBootstrapMessage = harden({
   ...deepCopyJsonable(defaultInitMessage),
   blockHeight: 1,

package/tsconfig.json

@@ -1,9 +1,6 @@
 // This file can contain .js-specific Typescript compiler config.
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "checkJs": false,
-  },
   "include": [
     "calc-*.js",
     "src/**/*.js",