Merge branch 'master' into ta/fix-proto-symlink

packages/SwingSet/src/lib/storageAPI.js

@@ -163,7 +163,8 @@ export function makeBufferedStorage(kvStore, listeners = {}) {
       if (additions.has(key)) return additions.get(key);
       if (deletions.has(key)) return undefined;
       const value = kvStore.get(key);
-      // @ts-expect-error value may be undefined
+      // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error -- https://github.com/Agoric/agoric-sdk/issues/4620
+      // @ts-ignore value may be undefined
       if (onGet !== undefined) onGet(key, value);
       return value;
     },

packages/casting/jsconfig.json

@@ -3,14 +3,8 @@
   "compilerOptions": {
     "target": "esnext",
     "module": "esnext",
-
+    "checkJs": true,
     "noEmit": true,
-/*
-    // The following flags are for creating .d.ts files:
-    "noEmit": false,
-    "declaration": true,
-    "emitDeclarationOnly": true,
-*/
     "downlevelIteration": true,
     "strictNullChecks": true,
     "moduleResolution": "node",

packages/casting/node-fetch-shim.js

@@ -1,4 +1,5 @@
 /* global globalThis */
 import fetch from 'node-fetch';
 
+// @ts-expect-error node-fetch does not exactly match W3C Fetch
 globalThis.fetch = fetch;

packages/casting/package.json

@@ -36,6 +36,7 @@
   },
   "devDependencies": {
     "@endo/ses-ava": "^0.2.35",
+    "@types/node-fetch": "^2.6.2",
     "ava": "^5.0.1",
     "c8": "^7.7.2",
     "express": "^4.17.1",

packages/casting/src/casting-spec.js

@@ -123,4 +123,3 @@ export const makeCastingSpec = async sourceP => {
   }
   assert.fail(`CastingSpec ${spec} is not a string, object, or ref`);
 };
-/** @typedef {ReturnType<typeof makeCastingSpec>} CastingSpec */

packages/casting/src/follower-cosmjs.js

@@ -15,9 +15,7 @@ const { Tendermint34Client } = tendermintRpcStar;
 const { details: X, quote: q } = assert;
 const textDecoder = new TextDecoder();
 
-/** @template T @typedef {import('./types.js').StreamCell<T>} StreamCell */
-/** @template T @typedef {import('./types.js').ValueFollowerElement<T>} ValueFollowerElement */
-/** @template T @typedef {import('./types.js').Follower<ValueFollowerElement<T>>} ValueFollower */
+/** @template T @typedef {import('./types.js').Follower<import('./types.js').ValueFollowerElement<T>>} ValueFollower */
 
 /**
  * This is an imperfect heuristic to navigate the migration from value cells to
@@ -341,7 +339,7 @@ export const makeCosmjsFollower = (
    * @param {any} data
    * @param {number} blockHeight
    * @param {number} currentBlockHeight
-   * @returns {Promise<ValueFollowerElement<T>>}
+   * @returns {Promise<import('./types.js').ValueFollowerElement<T>>}
    */
   const followerElementFromStreamCellValue = async (
     data,
@@ -356,7 +354,7 @@ export const makeCosmjsFollower = (
   };
 
   /**
-   * @param {StreamCell<T>} streamCell
+   * @param {import('./types.js').StreamCell<T>} streamCell
    * @param {number} currentBlockHeight
    * @yields {ValueFollowerElement<T>}
    */
@@ -371,7 +369,7 @@ export const makeCosmjsFollower = (
   }
 
   /**
-   * @param {StreamCell<T>} streamCell
+   * @param {import('./types.js').StreamCell<T>} streamCell
    * @param {number} currentBlockHeight
    * @yields {ValueFollowerElement<T>}
    */
@@ -386,7 +384,7 @@ export const makeCosmjsFollower = (
   }
 
   /**
-   * @param {StreamCell<T>} streamCell
+   * @param {import('./types.js').StreamCell<T>} streamCell
    * @param {number} currentBlockHeight
    * @yields {ValueFollowerElement<T>}
    */

packages/casting/src/leader-netconfig.js

@@ -80,4 +80,3 @@ export const makeLeader = (bootstrap = DEFAULT_BOOTSTRAP, options) => {
   }
   return makeLeaderFromRpcAddresses([bootstrap], options);
 };
-/** @typedef {ReturnType<typeof makeLeader>} Leader */

packages/deploy-script-support/jsconfig.json

@@ -3,14 +3,8 @@
   "compilerOptions": {
     "target": "esnext",
     "module": "esnext",
-
+    "checkJs": true,
     "noEmit": true,
-/*
-    // The following flags are for creating .d.ts files:
-    "noEmit": false,
-    "declaration": true,
-    "emitDeclarationOnly": true,
-*/
     "downlevelIteration": true,
     "strictNullChecks": true,
     "moduleResolution": "node",

packages/deploy-script-support/src/assertOfferResult.js

@@ -1,4 +1,3 @@
-// @ts-check
 import { assert, details as X } from '@agoric/assert';
 import { E } from '@endo/far';
 

packages/deploy-script-support/src/code-gen.js

@@ -1,4 +1,3 @@
-// @ts-check
 import { makeMarshal } from '@endo/marshal';
 import { decodeToJustin } from '@endo/marshal/src/marshal-justin.js';
 

packages/deploy-script-support/src/coreProposalBehavior.js

@@ -47,7 +47,7 @@ export const makeCoreProposalBehavior = ({
     return fromEntries(ents);
   };
 
-  /** @param {ChainBootstrapSpace} allPowers */
+  /** @param {ChainBootstrapSpace & BootstrapPowers & { evaluateInstallation: any }} allPowers */
   const behavior = async allPowers => {
     const {
       consume: { board, agoricNamesAdmin },

packages/deploy-script-support/src/depositInvitation.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { E } from '@endo/far';
 
 /**

packages/deploy-script-support/src/endo-pieces-contract.js

@@ -1,4 +1,3 @@
-// @ts-check
 import { E, Far } from '@endo/far';
 import { encodeBase64, decodeBase64 } from '@endo/base64';
 import { ZipWriter } from '@endo/zip';

packages/deploy-script-support/src/extract-proposal.js

@@ -1,4 +1,3 @@
-// @ts-check
 import fs from 'fs';
 import { createRequire } from 'module';
 import path from 'path';

packages/deploy-script-support/src/getBundlerMaker.js

@@ -1,4 +1,3 @@
-// @ts-check
 /**
  * This helper mainly exists to bridge the gaps that would be filled by
  * bundlecap support.  It will probably go away after bundlecap support is

packages/deploy-script-support/src/helpers.js

@@ -1,4 +1,3 @@
-// @ts-check
 import '@agoric/zoe/exported.js';
 import { E } from '@endo/far';
 

packages/deploy-script-support/src/install.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import './externalTypes.js';
 
 import { E } from '@endo/far';

packages/deploy-script-support/src/installInPieces.js

@@ -1,4 +1,3 @@
-// @ts-check
 import { E } from '@endo/far';
 import { ZipReader } from '@endo/zip';
 import { encodeBase64, decodeBase64 } from '@endo/base64';

packages/deploy-script-support/src/offer.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { E } from '@endo/far';
 import { assert } from '@agoric/assert';
 import { AmountMath } from '@agoric/ertp';

packages/deploy-script-support/src/saveIssuer.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { E } from '@endo/far';
 
 /**

packages/deploy-script-support/src/startInstance.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { assert } from '@agoric/assert';
 import { E, passStyleOf } from '@endo/far';
 

packages/deploy-script-support/src/writeCoreProposal.js

@@ -1,4 +1,3 @@
-// @ts-check
 import fs from 'fs';
 import { E } from '@endo/far';
 

packages/deploy-script-support/test/unitTests/test-assertOfferResult.js

@@ -1,4 +1,3 @@
-// @ts-check
 import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
 
 import { assertOfferResult } from '../../src/assertOfferResult.js';

packages/deploy-script-support/test/unitTests/test-coreProposalBehavior.js

@@ -10,6 +10,7 @@ import { makeCoreProposalBehavior } from '../../src/coreProposalBehavior.js';
 
 test('coreProposalBehavior', async t => {
   const manifestInstallRef = 'manifestInstallRef';
+  /** @type {[string, ...unknown[]]} */
   const getManifestCall = ['getManifestForTest', 'arg1', 'arg2'];
   const behavior = makeCoreProposalBehavior({
     E,

packages/deploy-script-support/test/unitTests/test-depositInvitation.js

@@ -1,4 +1,3 @@
-// @ts-check
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
 import { makeIssuerKit, AssetKind, AmountMath } from '@agoric/ertp';

packages/deploy-script-support/test/unitTests/test-getBundlerMaker.js

@@ -10,6 +10,7 @@ test('getBundlerMaker - already made', async t => {
     t.deepEqual(path, ['scratch', 'bundlerMaker']);
     return 'BUNDLER_MAKER_FOUND';
   };
+  // @ts-expect-error omitting args for test
   const getBundlerMaker = makeGetBundlerMaker({}, { lookup });
 
   const bundler = await getBundlerMaker({ log: t.log });

packages/deploy-script-support/test/unitTests/test-install.js

@@ -1,4 +1,3 @@
-// @ts-check
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
 import { makeZoeKit } from '@agoric/zoe';

packages/deploy-script-support/test/unitTests/test-offer.js

@@ -1,4 +1,3 @@
-// @ts-check
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
 import { makeZoeKit } from '@agoric/zoe';

packages/deploy-script-support/test/unitTests/test-startInstance.js

@@ -1,4 +1,3 @@
-// @ts-check
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
 import { makeZoeKit } from '@agoric/zoe';

packages/governance/jsconfig.json

@@ -2,6 +2,7 @@
   "compilerOptions": {
     "target": "esnext",
     "module": "esnext",
+    "checkJs": true,
     "noEmit": true,
     "downlevelIteration": true,
     "strictNullChecks": true,

packages/governance/src/binaryVoteCounter.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { Far } from '@endo/marshal';
 import { makePromiseKit } from '@endo/promise-kit';
 import { makeHeapFarInstance, keyEQ, makeStore } from '@agoric/store';

packages/governance/src/closingRule.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 // Standard closing rule is a deadline and Timer. An alternative might allow for
 // emergency votes that can close as soon as a quorum or other threshold is
 // reached.

packages/governance/src/committee.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { makeStoredPublishKit } from '@agoric/notifier';
 import { makeStore, makeHeapFarInstance, M } from '@agoric/store';
 import { natSafeMath } from '@agoric/zoe/src/contractSupport/index.js';

packages/governance/src/contractGovernance/assertions.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { isRemotable } from '@endo/marshal';
 import { assertIsRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
 

packages/governance/src/contractGovernance/governApi.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';
 import { keyEQ } from '@agoric/store';

packages/governance/src/contractGovernance/governFilter.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';
 import { fit, keyEQ } from '@agoric/store';

packages/governance/src/contractGovernance/governParam.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { E } from '@endo/eventual-send';
 import { deeplyFulfilled, Far } from '@endo/marshal';
 import { fit, keyEQ } from '@agoric/store';

packages/governance/src/contractGovernance/paramManager.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { Far, passStyleOf } from '@endo/marshal';
 import { AmountMath } from '@agoric/ertp';
 import { assertKeywordName } from '@agoric/zoe/src/cleanProposal.js';

packages/governance/src/contractGovernance/typedParamManager.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { ParamTypes } from '../constants.js';
 import { CONTRACT_ELECTORATE } from './governParam.js';
 import { makeParamManagerBuilder } from './paramManager.js';

packages/governance/src/contractGovernor.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';
 import { fit } from '@agoric/store';

packages/governance/src/contractHelper.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { Far } from '@endo/marshal';
 import { makeStoredPublisherKit } from '@agoric/notifier';
 import { getMethodNames, objectMap } from '@agoric/internal';

packages/governance/src/electorateTools.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { E } from '@endo/eventual-send';
 import { deeplyFulfilled, Far } from '@endo/marshal';
 

packages/governance/src/index.js

@@ -1,6 +1,5 @@
-// @ts-check
-
 import './types.js';
+import '@agoric/vats/src/core/types.js';
 
 export {
   ChoiceMethod,

packages/governance/src/noActionElectorate.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { makePublishKit } from '@agoric/notifier';
 import { makePromiseKit } from '@endo/promise-kit';
 import { makeHeapFarInstance } from '@agoric/store';

packages/governance/src/question.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { makeHeapFarInstance, fit, keyEQ, M } from '@agoric/store';
 import { makeHandle } from '@agoric/zoe/src/makeHandle.js';
 

packages/governance/src/typeGuards.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { M } from '@agoric/store';
 import { TimestampShape } from '@agoric/swingset-vat/src/vats/timer/typeGuards.js';
 import {

packages/governance/src/types.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 /**
  * @typedef { 'unranked' | 'order' } ChoiceMethod
  * * UNRANKED: "unranked voting" means that the voter specifies some number of

packages/governance/src/validators.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { E } from '@endo/eventual-send';
 
 const { details: X, quote: q } = assert;

packages/governance/test/swingsetTests/committeeBinary/bootstrap.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';
 import { makeBoard } from '@agoric/vats/src/lib-board.js';

packages/governance/test/swingsetTests/committeeBinary/test-committee.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 // eslint-disable-next-line import/no-extraneous-dependencies
 import '@endo/init/debug.js';
 import test from 'ava';

packages/governance/test/swingsetTests/committeeBinary/vat-voter.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { makeNotifierFromSubscriber, observeNotifier } from '@agoric/notifier';
 import { keyEQ } from '@agoric/store';
 import { E } from '@endo/eventual-send';

packages/governance/test/swingsetTests/committeeBinary/vat-zoe.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { Far } from '@endo/marshal';
 
 import { makeZoeKit } from '@agoric/zoe';

packages/governance/test/swingsetTests/contractGovernor/bootstrap.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';
 import buildManualTimer from '@agoric/zoe/tools/manualTimer.js';

packages/governance/test/swingsetTests/contractGovernor/governedContract.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { handleParamGovernance } from '../../../src/contractHelper.js';
 import { ParamTypes } from '../../../src/index.js';
 import { CONTRACT_ELECTORATE } from '../../../src/contractGovernance/governParam.js';

packages/governance/test/swingsetTests/contractGovernor/test-governor.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import '@endo/init/debug.js';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';

packages/governance/test/swingsetTests/contractGovernor/vat-voter.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';