Merge branch 'master' into mfig-zones

Agoric · Mar 6, 2023 · 2effb18 · 2effb18
2 parents 685e64c + 398b70f
commit 2effb18
Show file tree

Hide file tree

Showing 157 changed files with 5,333 additions and 1,197 deletions.
diff --git a/packages/ERTP/jsconfig.json b/packages/ERTP/jsconfig.json
@@ -1,16 +1,6 @@
+// This file can contain .js-specific Typescript compiler config.
 {
-  "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-    "checkJs": true,
-    "noEmit": true,
-    "strictNullChecks": true,
-    "noImplicitThis": true,
-    "moduleResolution": "node",
-    "types": [
-      "node"
-    ]
-  },
+  "extends": "../../tsconfig.json",
   "include": [
     "src/**/*.js",
     "src/**/*.ts",

diff --git a/packages/ERTP/src/paymentLedger.js b/packages/ERTP/src/paymentLedger.js
@@ -313,11 +313,11 @@ export const preparePaymentLedger = (
     srcPayment,
     optAmountShape = undefined,
   ) => {
-    assert(
-      !isPromise(srcPayment),
-      `deposit does not accept promises as first argument. Instead of passing the promise (deposit(paymentPromise)), consider unwrapping the promise first: E.when(paymentPromise, (actualPayment => deposit(actualPayment))`,
-      TypeError,
-    );
+    !isPromise(srcPayment) ||
+      assert.fail(
+        `deposit does not accept promises as first argument. Instead of passing the promise (deposit(paymentPromise)), consider unwrapping the promise first: E.when(paymentPromise, (actualPayment => deposit(actualPayment))`,
+        TypeError,
+      );
     assertLivePayment(srcPayment);
     const srcPaymentBalance = paymentLedger.get(srcPayment);
     assertAmountConsistent(srcPaymentBalance, optAmountShape);

diff --git a/packages/SwingSet/jsconfig.json b/packages/SwingSet/jsconfig.json
@@ -1,14 +1,6 @@
 // This file can contain .js-specific Typescript compiler config.
 {
-  "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-    "checkJs": true,
-    "noEmit": true,
-    "strictNullChecks": true,
-    "noImplicitThis": true,
-    "moduleResolution": "node",
-  },
+  "extends": "../../tsconfig.json",
   "include": [
     "lib/**/*.js",
     "src/**/*.js",

diff --git a/packages/SwingSet/package.json b/packages/SwingSet/package.json
@@ -21,16 +21,15 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@types/microtime": "^2.1.0",
-    "better-sqlite3": "^7.5.0",
     "@types/better-sqlite3": "^7.5.0",
+    "@types/microtime": "^2.1.0",
     "@types/tmp": "^0.2.0",
+    "better-sqlite3": "^7.5.0",
     "tmp": "^0.2.1"
   },
   "dependencies": {
     "@agoric/assert": "^0.5.1",
     "@agoric/internal": "^0.2.1",
-    "@endo/nat": "^4.1.0",
     "@agoric/notifier": "^0.5.1",
     "@agoric/store": "^0.8.3",
     "@agoric/swing-store": "^0.8.1",
@@ -51,6 +50,7 @@
     "@endo/nat": "^4.1.23",
     "@endo/promise-kit": "^0.2.52",
     "@endo/zip": "^0.2.28",
+    "ansi-styles": "^6.2.1",
     "anylogger": "^0.21.0",
     "import-meta-resolve": "^2.2.1",
     "microtime": "^3.1.0",

diff --git a/packages/SwingSet/src/types-external.js b/packages/SwingSet/src/types-external.js
@@ -325,7 +325,7 @@ export {};
  * @typedef { { enableDisavow?: boolean } } HasEnableDisavow
  * @typedef { DynamicVatOptions & HasEnableDisavow } StaticVatOptions
  *
- * @typedef { { vatParameters?: object, upgradeMessage: string } } VatUpgradeOptions
+ * @typedef { { vatParameters?: object, upgradeMessage?: string } } VatUpgradeOptions
  * @typedef { { incarnationNumber: number } } VatUpgradeResults
  *
  * @callback ShutdownWithFailure

diff --git a/packages/SwingSet/test/metering/vat-load-dynamic.js b/packages/SwingSet/test/metering/vat-load-dynamic.js
@@ -5,6 +5,7 @@ export function buildRootObject(vatPowers) {
   const { testLog: log } = vatPowers;
   let service;
   let control;
+  const notifierToUpdateCount = new WeakMap();
 
   return Far('root', {
     async bootstrap(vats, devices) {
@@ -33,8 +34,11 @@ export function buildRootObject(vatPowers) {
 
     async whenMeterNotifiesNext(meter) {
       const notifier = await E(meter).getNotifier();
-      const initial = await E(notifier).getUpdateSince();
-      return E(notifier).getUpdateSince(initial);
+      const update = await E(notifier).getUpdateSince(
+        notifierToUpdateCount.get(notifier),
+      );
+      notifierToUpdateCount.set(notifier, update.updateCount);
+      return update;
     },
 
     async createVat(name, dynamicOptions) {

diff --git a/packages/SwingSet/tools/bundleTool.js b/packages/SwingSet/tools/bundleTool.js
@@ -2,6 +2,7 @@
 import bundleSource from '@endo/bundle-source';
 import { makeReadPowers } from '@endo/compartment-mapper/node-powers.js';
 import { makePromiseKit } from '@endo/promise-kit';
+import styles from 'ansi-styles'; // less authority than 'chalk'
 
 const { details: X, quote: q, Fail } = assert;
 
@@ -166,15 +167,22 @@ export const makeBundleCache = (wr, bundleOptions, cwd, readPowers) => {
         meta = await validate(targetName, rootPath);
         const { bundleTime, contents } = meta;
         log(
+          styles.dim.open,
           `${wr}`,
           toBundleName(targetName),
           'valid:',
           contents.length,
           'files bundled at',
           bundleTime,
+          styles.dim.close,
         );
       } catch (invalid) {
-        console.error('ERROR in bundleTool:', invalid.message);
+        console.error(
+          styles.red.open,
+          'ERROR in bundleTool:',
+          invalid.message,
+          styles.red.close,
+        );
       }
     }
     if (!meta) {

diff --git a/packages/SwingSet/tools/manual-timer.js b/packages/SwingSet/tools/manual-timer.js
@@ -58,7 +58,7 @@ const setup = () => {
  * kernel. You can make time pass by calling `advanceTo(when)`.
  *
  * @param {{ startTime?: Timestamp }} [options]
- * @returns {TimerService & { advanceTo: (when: Timestamp) => void; }}
+ * @returns {TimerService & { advanceTo: (when: Timestamp) => bigint; }}
  */
 export const buildManualTimer = (options = {}) => {
   const { startTime = 0n, ...other } = options;
@@ -79,6 +79,7 @@ export const buildManualTimer = (options = {}) => {
     assert(when > state.now, `advanceTo(${when}) < current ${state.now}`);
     state.now = when;
     wake();
+    return when;
   };
 
   return Far('ManualTimer', { ...bindAllMethods(timerService), advanceTo });

diff --git a/packages/access-token/jsconfig.json b/packages/access-token/jsconfig.json
@@ -1,13 +1,6 @@
 // This file can contain .js-specific Typescript compiler config.
 {
-  "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-    "noEmit": true,
-    "strictNullChecks": true,
-    "noImplicitThis": true,
-    "moduleResolution": "node",
-  },
+  "extends": "../../tsconfig.json",
   "include": [
     "src/**/*.js",
     "test/**/*.js"

diff --git a/packages/agoric-cli/jsconfig.json b/packages/agoric-cli/jsconfig.json
@@ -1,12 +1,8 @@
 // This file can contain .js-specific Typescript compiler config.
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-    "noEmit": true,
-    "strictNullChecks": true,
-    "noImplicitThis": true,
-    "moduleResolution": "node",
+    "checkJs": false,
   },
   "include": [
     "*.js",

diff --git a/packages/agoric-cli/package.json b/packages/agoric-cli/package.json
@@ -57,7 +57,7 @@
     "@endo/promise-kit": "^0.2.52",
     "@iarna/toml": "^2.2.3",
     "anylogger": "^0.21.0",
-    "chalk": "^2.4.2",
+    "chalk": "^5.2.0",
     "commander": "^10.0.0",
     "dd-trace": "^3.3.0",
     "deterministic-json": "^1.0.5",

diff --git a/packages/assert/jsconfig.json b/packages/assert/jsconfig.json
@@ -1,13 +1,6 @@
 // This file can contain .js-specific Typescript compiler config.
 {
-  "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-    "noEmit": true,
-    "strictNullChecks": true,
-    "noImplicitThis": true,
-    "moduleResolution": "node",
-  },
+  "extends": "../../tsconfig.json",
   "include": [
     "src/**/*.js",
   ],

diff --git a/packages/assert/src/assert.js b/packages/assert/src/assert.js
@@ -33,7 +33,7 @@ if (globalAssert === undefined) {
   );
 }
 
-const missing = [
+const missing = /** @type {const} */ ([
   'fail',
   'equal',
   'typeof',
@@ -43,7 +43,7 @@ const missing = [
   'Fail',
   'quote',
   'makeAssert',
-].filter(name => globalAssert[name] === undefined);
+]).filter(name => globalAssert[name] === undefined);
 if (missing.length > 0) {
   throw new Error(
     `Cannot initialize @agoric/assert, missing globalThis.assert methods ${missing.join(

diff --git a/packages/cache/jsconfig.json b/packages/cache/jsconfig.json
@@ -1,14 +1,6 @@
 // This file can contain .js-specific Typescript compiler config.
 {
-  "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-    "checkJs": true,
-    "noEmit": true,
-    "strictNullChecks": true,
-    "noImplicitThis": true,
-    "moduleResolution": "node",
-  },
+  "extends": "../../tsconfig.json",
   "include": [
     "*.js",
     "public/**/*.js",

diff --git a/packages/casting/jsconfig.json b/packages/casting/jsconfig.json
@@ -1,14 +1,6 @@
 // This file can contain .js-specific Typescript compiler config.
 {
-  "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-    "checkJs": true,
-    "noEmit": true,
-    "strictNullChecks": true,
-    "noImplicitThis": true,
-    "moduleResolution": "node",
-  },
+  "extends": "../../tsconfig.json",
   "include": [
     "*.js",
     "public/**/*.js",

diff --git a/packages/casting/src/follower.js b/packages/casting/src/follower.js
@@ -1,8 +1,8 @@
 import { Far } from '@endo/far';
 import {
   mapAsyncIterable,
-  makeNotifierIterable,
-  makeSubscriptionIterable,
+  subscribeEach,
+  subscribeLatest,
 } from './iterable.js';
 import { makeCosmjsFollower } from './follower-cosmjs.js';
 import { makeCastingSpec } from './casting-spec.js';
@@ -20,10 +20,10 @@ const makeSubscriptionFollower = spec => {
       const { notifier, subscription } = await spec;
       let ai;
       if (notifier) {
-        ai = makeNotifierIterable(notifier);
+        ai = subscribeLatest(notifier);
       } else {
         assert(subscription);
-        ai = makeSubscriptionIterable(subscription);
+        ai = subscribeEach(subscription);
       }
       return mapAsyncIterable(ai, transform);
     },
@@ -32,10 +32,10 @@ const makeSubscriptionFollower = spec => {
       const { notifier, subscription } = await spec;
       let ai;
       if (subscription) {
-        ai = makeSubscriptionIterable(subscription);
+        ai = subscribeEach(subscription);
       } else {
         assert(notifier);
-        ai = makeNotifierIterable(notifier);
+        ai = subscribeLatest(notifier);
       }
       return mapAsyncIterable(ai, transform);
     },

diff --git a/packages/casting/src/iterable.js b/packages/casting/src/iterable.js
@@ -1,47 +1,6 @@
 import { E, Far } from '@endo/far';
-import { makeNotifier } from '@agoric/notifier';
 
-/**
- * @template T
- * @param {ERef<Notifier<T>>} notifier
- * @returns {ConsistentAsyncIterable<T>}
- */
-export const makeNotifierIterable = notifier =>
-  makeNotifier(E(notifier).getSharableNotifierInternals());
-
-/**
- * TODO: Remove this function when we have an @endo/publish-kit that suppports pull topics
- *
- * @template T
- * @param {ERef<PublicationRecord<T>>} tailP
- * @returns {AsyncIterator<T>}
- */
-const makeSubscriptionIterator = tailP => {
-  // To understand the implementation, start with
-  // https://web.archive.org/web/20160404122250/http://wiki.ecmascript.org/doku.php?id=strawman:concurrency#infinite_queue
-  return Far('SubscriptionIterator', {
-    next: async () => {
-      const resultP = E.get(tailP).head;
-      tailP = E.get(tailP).tail;
-      return resultP;
-    },
-  });
-};
-
-/**
- * TODO: Remove this function when we have an @endo/publish-kit that suppports pull topics
- *
- * @template T
- * @param {ERef<Subscription<T>>} subscription
- * @returns {ConsistentAsyncIterable<T>}
- */
-export const makeSubscriptionIterable = subscription =>
-  harden({
-    [Symbol.asyncIterator]: () =>
-      makeSubscriptionIterator(
-        E(subscription).getSharableSubscriptionInternals(),
-      ),
-  });
+export { subscribeEach, subscribeLatest } from '@agoric/notifier/subscribe.js';
 
 /**
  * @template TIn

diff --git a/packages/cosmic-proto/tsconfig.json b/packages/cosmic-proto/tsconfig.json
@@ -1,13 +1,9 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "noEmit": false,
     "declaration": true,
-    "target": "esnext",
-    "module": "esnext",
     "allowSyntheticDefaultImports": true,
-    "strictNullChecks": true,
-    "noImplicitThis": true,
-    "moduleResolution": "node",
     "outDir": "dist"
   },
   "include": [

diff --git a/packages/cosmic-swingset/jsconfig.json b/packages/cosmic-swingset/jsconfig.json
@@ -1,12 +1,8 @@
 // This file can contain .js-specific Typescript compiler config.
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-    "noEmit": true,
-    "strictNullChecks": true,
-    "noImplicitThis": true,
-    "moduleResolution": "node",
+    "checkJs": false,
   },
   "include": [
     "calc-*.js",

diff --git a/packages/deploy-script-support/jsconfig.json b/packages/deploy-script-support/jsconfig.json
@@ -1,13 +1,6 @@
 // This file can contain .js-specific Typescript compiler config.
 {
-  "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-    "noEmit": true,
-    "strictNullChecks": true,
-    "noImplicitThis": true,
-    "moduleResolution": "node",
-  },
+  "extends": "../../tsconfig.json",
   "include": [
     "*.js",
     "src/**/*.js",