@agoric/casting 0.4.2 → 0.4.3-calypso-dev-84eb287.0

package/README.md

@@ -42,7 +42,7 @@ The `followerOpts` argument in `makeFollower(leader, key, followerOpts)` provide
 - the `decode` option is a function to translate `buf: Uint8Array` into `data: string`
   - (default) - interpret buf as a utf-8 string, then `JSON.parse` it
 - the `unserializer` option can be
-  - (default) - release unserialized objects using `@agoric/marshal`'s `makeMarshal()`
+  - (default) - release unserialized objects using [@endo/marshal](https://www.npmjs.com/package/@endo/marshal)'s `makeMarshal()`
   - `null` - don't additionally unserialize data before releasing it
   - any unserializer object supporting `E(unserializer).fromCapData(data)`
 - the `crasher` option can be
@@ -65,8 +65,8 @@ The `followerOpts` argument in `makeFollower(leader, key, followerOpts)` provide
 
 This package currently depends on:
 - Hardened Javascript
-- `@agoric/notify` async iterable adapters to implement `iterateLatest`
-- `@endo/marshal` for default object unserialization
+- [@agoric/notifier](../notifier) async iterable adapters to implement `iterateLatest`
+- [@endo/marshal](https://www.npmjs.com/package/@endo/marshal) for default object unserialization
 - [CosmJS](https://github.com/cosmos/cosmjs) for proof verification, although [it does not yet support light client tracking of the validator set](https://github.com/cosmos/cosmjs/issues/492)
 - a bespoke follower of [WebSocket Tendermint events](https://docs.tendermint.com/master/tendermint-core/subscription.html#legacy-streaming-api)
 

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@agoric/casting",
-  "version": "0.4.2",
+  "version": "0.4.3-calypso-dev-84eb287.0+84eb287",
   "description": "Agoric's OCap broadcasting system",
   "type": "module",
   "main": "src/main.js",
   "repository": "https://github.com/Agoric/agoric-sdk",
   "scripts": {
     "build": "exit 0",
-    "prepack": "tsc --build jsconfig.build.json",
+    "prepack": "tsc --build tsconfig.build.json",
     "postpack": "git clean -f '*.d.ts*'",
     "demo": "node -e 'import(\"./test/fake-rpc-server.js\").then(ns => ns.develop())'",
     "test": "ava",
@@ -15,33 +15,33 @@
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "run-s --continue-on-error lint:*",
-    "lint:types": "tsc -p jsconfig.json",
+    "lint:types": "tsc",
     "lint:eslint": "eslint --ext .js,.ts ."
   },
   "keywords": [],
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/internal": "^0.3.2",
-    "@agoric/notifier": "^0.6.2",
-    "@agoric/spawner": "^0.6.8",
-    "@agoric/store": "^0.9.2",
-    "@cosmjs/encoding": "^0.30.1",
-    "@cosmjs/proto-signing": "^0.30.1",
-    "@cosmjs/stargate": "^0.30.1",
-    "@cosmjs/tendermint-rpc": "^0.30.1",
-    "@endo/far": "^0.2.18",
-    "@endo/init": "^0.5.56",
-    "@endo/lockdown": "^0.1.28",
-    "@endo/marshal": "^0.8.5",
-    "@endo/promise-kit": "^0.2.56",
+    "@agoric/internal": "0.3.3-calypso-dev-84eb287.0+84eb287",
+    "@agoric/notifier": "0.6.3-calypso-dev-84eb287.0+84eb287",
+    "@agoric/store": "0.9.3-calypso-dev-84eb287.0+84eb287",
+    "@cosmjs/encoding": "^0.32.3",
+    "@cosmjs/proto-signing": "^0.32.3",
+    "@cosmjs/stargate": "^0.32.3",
+    "@cosmjs/tendermint-rpc": "^0.32.3",
+    "@endo/far": "^1.1.2",
+    "@endo/init": "^1.1.2",
+    "@endo/lockdown": "^1.0.7",
+    "@endo/marshal": "^1.5.0",
+    "@endo/promise-kit": "^1.1.2",
     "node-fetch": "^2.6.0"
   },
   "devDependencies": {
-    "@endo/ses-ava": "^0.2.40",
+    "@agoric/cosmic-proto": "0.4.1-calypso-dev-84eb287.0+84eb287",
+    "@endo/ses-ava": "^1.2.2",
     "@types/node-fetch": "^2.6.2",
-    "ava": "^5.2.0",
-    "c8": "^7.13.0",
+    "ava": "^5.3.0",
+    "c8": "^9.1.0",
     "express": "^4.17.1",
     "ws": "^7.2.0"
   },
@@ -49,14 +49,17 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=14.15.0"
+    "node": "^18.12 || ^20.9"
   },
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/*.test.*"
     ],
     "timeout": "20m",
     "workerThreads": false
   },
-  "gitHead": "b66bf7c881ae462fcb617cd6e8d41b5c40ec58ef"
+  "typeCoverage": {
+    "atLeast": 88.94
+  },
+  "gitHead": "84eb287915c8255d68e845a9b6e10c790f0d54cb"
 }

package/src/casting-spec.d.ts

@@ -2,15 +2,15 @@ export function vstorageKeySpecToPath({ storeName, storeSubkey }: VStorageKey):
 /**
  * @param {string} storagePath
  * @param {string} [storeName]
- * @returns {import('./types').CastingSpec}
+ * @returns {import('./types.js').CastingSpec}
  */
-export function DEFAULT_PATH_CONVERTER(storagePath: string, storeName?: string | undefined): import('./types').CastingSpec;
+export function DEFAULT_PATH_CONVERTER(storagePath: string, storeName?: string | undefined): import("./types.js").CastingSpec;
 /**
- * @type {Record<string, (path: string) => import('./types').CastingSpec>}
+ * @type {Record<string, (path: string) => import('./types.js').CastingSpec>}
  */
-export const pathPrefixToConverters: Record<string, (path: string) => import('./types').CastingSpec>;
-export function makeCastingSpecFromString(specString: string): import('./types').CastingSpec;
-export function makeCastingSpecFromObject(specObj: any): import('./types').CastingSpec;
-export function makeCastingSpecFromRef(specCap: ERef<any>): Promise<import('./types').CastingSpec>;
-export function makeCastingSpec(sourceP: ERef<unknown>): Promise<import('./types').CastingSpec>;
+export const pathPrefixToConverters: Record<string, (path: string) => import("./types.js").CastingSpec>;
+export function makeCastingSpecFromString(specString: string): import("./types.js").CastingSpec;
+export function makeCastingSpecFromObject(specObj: any): import("./types.js").CastingSpec;
+export function makeCastingSpecFromRef(specCap: ERef<any>): Promise<import("./types.js").CastingSpec>;
+export function makeCastingSpec(sourceP: ERef<unknown>): Promise<import("./types.js").CastingSpec>;
 //# sourceMappingURL=casting-spec.d.ts.map

package/src/casting-spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"casting-spec.d.ts","sourceRoot":"","sources":["casting-spec.js"],"names":[],"mappings":"AA+CO,kEAHI,WAAW,GACT,MAAM,CAYlB;AAlCD;;;;GAIG;AACH,oDAJW,MAAM,mCAEJ,OAAO,SAAS,EAAE,WAAW,CAazC;AAsBD;;GAEG;AACH,2DAFgC,MAAM,KAAK,OAAO,SAAS,EAAE,WAAW,EAMrE;AAMI,sDAHI,MAAM,GACJ,OAAO,SAAS,EAAE,WAAW,CAczC;AAQM,mDAHI,GAAG,GACD,OAAO,SAAS,EAAE,WAAW,CAmCzC;AAMM,gDAHI,KAAK,GAAG,CAAC,GACP,QAAQ,OAAO,SAAS,EAAE,WAAW,CAAC,CAKlD;AAQM,yCAHI,KAAK,OAAO,CAAC,GACX,QAAQ,OAAO,SAAS,EAAE,WAAW,CAAC,CAgBlD"}
+{"version":3,"file":"casting-spec.d.ts","sourceRoot":"","sources":["casting-spec.js"],"names":[],"mappings":"AA6CO,kEAHI,WAAW,GACT,MAAM,CAYlB;AAlCD;;;;GAIG;AACH,oDAJW,MAAM,mCAEJ,OAAO,YAAY,EAAE,WAAW,CAa5C;AAsBD;;GAEG;AACH,qCAFU,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,YAAY,EAAE,WAAW,CAAC,CAMzE;AAMI,sDAHI,MAAM,GACJ,OAAO,YAAY,EAAE,WAAW,CAc5C;AAQM,mDAHI,GAAG,GACD,OAAO,YAAY,EAAE,WAAW,CAmC5C;AAMM,gDAHI,IAAI,CAAC,GAAG,CAAC,GACP,OAAO,CAAC,OAAO,YAAY,EAAE,WAAW,CAAC,CAKrD;AAQM,yCAHI,IAAI,CAAC,OAAO,CAAC,GACX,OAAO,CAAC,OAAO,YAAY,EAAE,WAAW,CAAC,CAgBrD"}

package/src/casting-spec.js

@@ -1,13 +1,11 @@
 import * as encodingStar from '@cosmjs/encoding';
 import { E, getInterfaceOf } from '@endo/far';
 
-import './types.js';
-
 const { toAscii } = encodingStar;
 
 /**
  * @param {string} storagePath
- * @returns {import('./types').CastingSpec}
+ * @returns {import('./types.js').CastingSpec}
  */
 const swingsetPathToCastingSpec = storagePath =>
   harden({
@@ -24,7 +22,7 @@ const NO_DATA_VALUE = new Uint8Array([255]);
 /**
  * @param {string} storagePath
  * @param {string} [storeName]
- * @returns {import('./types').CastingSpec}
+ * @returns {import('./types.js').CastingSpec}
  */
 const vstoragePathToCastingSpec = (storagePath, storeName = 'vstorage') => {
   const elems = storagePath ? storagePath.split('.') : [];
@@ -60,7 +58,7 @@ export const vstorageKeySpecToPath = ({ storeName, storeSubkey }) => {
 export const DEFAULT_PATH_CONVERTER = vstoragePathToCastingSpec;
 
 /**
- * @type {Record<string, (path: string) => import('./types').CastingSpec>}
+ * @type {Record<string, (path: string) => import('./types.js').CastingSpec>}
  */
 export const pathPrefixToConverters = harden({
   'swingset:': swingsetPathToCastingSpec,
@@ -70,7 +68,7 @@ export const pathPrefixToConverters = harden({
 
 /**
  * @param {string} specString
- * @returns {import('./types').CastingSpec}
+ * @returns {import('./types.js').CastingSpec}
  */
 export const makeCastingSpecFromString = specString => {
   assert.typeof(specString, 'string');
@@ -90,7 +88,7 @@ const te = new TextEncoder();
 
 /**
  * @param {any} specObj
- * @returns {import('./types').CastingSpec}
+ * @returns {import('./types.js').CastingSpec}
  */
 export const makeCastingSpecFromObject = specObj => {
   const {
@@ -129,7 +127,7 @@ export const makeCastingSpecFromObject = specObj => {
 
 /**
  * @param {ERef<any>} specCap
- * @returns {Promise<import('./types').CastingSpec>}
+ * @returns {Promise<import('./types.js').CastingSpec>}
  */
 export const makeCastingSpecFromRef = async specCap => {
   const specObj = await E(specCap).getStoreKey();
@@ -140,7 +138,7 @@ export const makeCastingSpecFromRef = async specCap => {
  * Create an abstract type from a given source representation
  *
  * @param {ERef<unknown>} sourceP
- * @returns {Promise<import('./types').CastingSpec>}
+ * @returns {Promise<import('./types.js').CastingSpec>}
  */
 export const makeCastingSpec = async sourceP => {
   const spec = await sourceP;

package/src/change-follower.d.ts

@@ -1,2 +1,2 @@
-export function makePollingChangeFollower(leader: import('./types').Leader): Promise<import('./types.js').Follower<import('./types').CastingChange>>;
+export function makePollingChangeFollower(leader: import("./types.js").Leader): Promise<import("./types.js").Follower<import("./types.js").CastingChange>>;
 //# sourceMappingURL=change-follower.d.ts.map

package/src/change-follower.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"change-follower.d.ts","sourceRoot":"","sources":["change-follower.js"],"names":[],"mappings":"AASO,kDAHI,OAAO,SAAS,EAAE,MAAM,GACtB,QAAQ,OAAO,YAAY,EAAE,QAAQ,CAAC,OAAO,SAAS,EAAE,aAAa,CAAC,CAAC,CA6CnF"}
+{"version":3,"file":"change-follower.d.ts","sourceRoot":"","sources":["change-follower.js"],"names":[],"mappings":"AASO,kDAHI,OAAO,YAAY,EAAE,MAAM,GACzB,OAAO,CAAC,OAAO,YAAY,EAAE,QAAQ,CAAC,OAAO,YAAY,EAAE,aAAa,CAAC,CAAC,CA6CtF"}

package/src/change-follower.js

@@ -4,8 +4,8 @@ import { DEFAULT_KEEP_POLLING } from './defaults.js';
 /**
  * Just return an unspecified allegedValue every poll period.
  *
- * @param {import('./types').Leader} leader
- * @returns {Promise<import('./types.js').Follower<import('./types').CastingChange>>}
+ * @param {import('./types.js').Leader} leader
+ * @returns {Promise<import('./types.js').Follower<import('./types.js').CastingChange>>}
  */
 export const makePollingChangeFollower = async leader => {
   const { keepPolling = DEFAULT_KEEP_POLLING } = await E(leader).getOptions();

package/src/defaults.d.ts

@@ -15,7 +15,7 @@ export function MAKE_DEFAULT_DECODER(): (str: any) => any;
 /**
  * Unserialize the JSONable data.
  *
- * @type {() => import('./types').Unserializer}
+ * @type {() => import('./types.js').Unserializer}
  */
-export const MAKE_DEFAULT_UNSERIALIZER: () => import('./types').Unserializer;
+export const MAKE_DEFAULT_UNSERIALIZER: () => import("./types.js").Unserializer;
 //# sourceMappingURL=defaults.d.ts.map

package/src/defaults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["defaults.js"],"names":[],"mappings":"AAIA;;GAEG;AACH,yDAA0D;AAE1D,uCAAwC;AAExC,mDAAoD;AAEpD,6CAA8C;AAUvC,0BAHI,MAAM,GACJ,QAAQ,IAAI,CAAC,CAEgD;AAMnE,qCAHI,MAAM,oCAKhB;AAOM,8HAEN;AAQM,sCAHI,MAAM,GACJ,QAAQ,IAAI,CAAC,CAMzB;AAUM,8CALI,MAAM,OACN,GAAG,iCAED,QAAQ,IAAI,CAAC,CASzB;AAOM,wCAFM,QAAQ,OAAO,CAAC,CAGgD;AAEtE,0DAaN;AAED;;;;GAIG;AACH,wCAFU,MAAM,OAAO,SAAS,EAAE,YAAY,CA2B5C"}
+{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["defaults.js"],"names":[],"mappings":"AAIA;;GAEG;AACH,yDAA0D;AAE1D,uCAAwC;AAExC,mDAAoD;AAEpD,6CAA8C;AAUvC,0BAHI,MAAM,GACJ,OAAO,CAAC,IAAI,CAAC,CAEgD;AAMnE,qCAHI,MAAM,oCAKhB;AAOM,8HAEN;AAQM,sCAHI,MAAM,GACJ,OAAO,CAAC,IAAI,CAAC,CAMzB;AAUM,8CALI,MAAM,OACN,GAAG,iCAED,OAAO,CAAC,IAAI,CAAC,CASzB;AAOM,wCAFM,OAAO,CAAC,OAAO,CAAC,CAGgD;AAEtE,0DAaN;AAED;;;;GAIG;AACH,wCAFU,MAAM,OAAO,YAAY,EAAE,YAAY,CA2B/C"}

package/src/defaults.js

@@ -95,7 +95,7 @@ export const MAKE_DEFAULT_DECODER = () => {
 /**
  * Unserialize the JSONable data.
  *
- * @type {() => import('./types').Unserializer}
+ * @type {() => import('./types.js').Unserializer}
  */
 export const MAKE_DEFAULT_UNSERIALIZER = () => {
   const ifaceAllegedPrefix = 'Alleged: ';

package/src/follower-cosmjs.d.ts

@@ -1,5 +1,5 @@
 export function makeCosmjsFollower<T>(sourceP: any, leaderOrMaker?: import("./types.js").LeaderOrMaker | undefined, options?: import("./types.js").FollowerOptions | undefined): ValueFollower<T>;
-export type ValueFollower<T> = import('./types.js').Follower<import('./types.js').ValueFollowerElement<T>>;
+export type ValueFollower<T> = import("./types.js").Follower<import("./types.js").ValueFollowerElement<T>>;
 /**
  * The response of an ABCI query to Tendermint.
  * This is a subset of `tendermint34.AbciQueryResponse` in order

package/src/follower-cosmjs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"follower-cosmjs.d.ts","sourceRoot":"","sources":["follower-cosmjs.js"],"names":[],"mappings":"AAiGO,+CALI,GAAG,gJAyeb;+BAnjByB,OAAO,YAAY,EAAE,QAAQ,CAAC,OAAO,YAAY,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC;;;;;;iCAIxF;IACZ,QAAY,CAAC,KAAK,EAAE,UAAU,CAAC;IAC/B,QAAY,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB"}
+{"version":3,"file":"follower-cosmjs.d.ts","sourceRoot":"","sources":["follower-cosmjs.js"],"names":[],"mappings":"AAyGO,mCANM,CAAC,WACH,GAAG,+HAGD,aAAa,CAAC,CAAC,CAAC,CAsf5B;0BAnkBa,CAAC,IAAW,OAAO,YAAY,EAAE,QAAQ,CAAC,OAAO,YAAY,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC;;;;;;iCAIxF;IACZ,QAAY,CAAC,KAAK,EAAE,UAAU,CAAC;IAC/B,QAAY,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB"}

package/src/follower-cosmjs.js

@@ -1,5 +1,4 @@
-/// <reference types="ses"/>
-/* eslint-disable no-await-in-loop, @jessie.js/no-nested-await */
+/// <reference types="ses" />
 
 import { E, Far } from '@endo/far';
 import * as tendermint34 from '@cosmjs/tendermint-rpc';
@@ -11,6 +10,15 @@ import { MAKE_DEFAULT_DECODER, MAKE_DEFAULT_UNSERIALIZER } from './defaults.js';
 import { makeCastingSpec } from './casting-spec.js';
 import { makeLeader as defaultMakeLeader } from './leader-netconfig.js';
 
+// A lot of cosmjs classes end up hardened through instances shared by this
+// package so preemptively harden them all.
+// However we cannot directly harden a module namespace object (exotic behavior
+// for bindings) so spread the namespace instead
+harden({
+  tendermint34: { ...tendermint34 },
+  stargateStar: { ...stargateStar },
+});
+
 const { QueryClient } = stargateStar;
 const { Tendermint34Client } = tendermint34;
 const { details: X, quote: q, Fail } = assert;
@@ -91,8 +99,8 @@ const proofs = ['strict', 'none', 'optimistic'];
 /**
  * @template T
  * @param {any} sourceP
- * @param {import('./types').LeaderOrMaker} [leaderOrMaker]
- * @param {import('./types').FollowerOptions} [options]
+ * @param {import('./types.js').LeaderOrMaker} [leaderOrMaker]
+ * @param {import('./types.js').FollowerOptions} [options]
  * @returns {ValueFollower<T>}
  */
 export const makeCosmjsFollower = (
@@ -240,6 +248,7 @@ export const makeCosmjsFollower = (
    * @returns {Promise<QueryStoreResponse>}
    */
   const tryGetDataAtHeight = async blockHeight => {
+    await null;
     if (proof === 'strict') {
       // Crash hard if we can't prove.
       return getProvenDataAtHeight(blockHeight).catch(crash);
@@ -274,6 +283,7 @@ export const makeCosmjsFollower = (
    * @param {number} [blockHeight] desired height, or the latest height if not set
    */
   const getDataAtHeight = async blockHeight => {
+    await null;
     for (let attempt = 0; ; attempt += 1) {
       try {
         // AWAIT
@@ -330,11 +340,16 @@ export const makeCosmjsFollower = (
     blockHeight,
     currentBlockHeight,
   ) => {
-    // AWAIT
-    const value = await /** @type {T} */ (
-      unserializer ? E(unserializer).fromCapData(data) : data
-    );
-    return { value, blockHeight, currentBlockHeight };
+    await null;
+    try {
+      // AWAIT
+      const value = await /** @type {T} */ (
+        unserializer ? E(unserializer).fromCapData(data) : data
+      );
+      return { value, blockHeight, currentBlockHeight };
+    } catch (e) {
+      return { blockHeight, currentBlockHeight, error: e, value: undefined };
+    }
   };
 
   /**
@@ -351,6 +366,7 @@ export const makeCosmjsFollower = (
       );
     }
   }
+  harden(allValuesFromCell);
 
   /**
    * @param {import('./types.js').StreamCell<T>} streamCell
@@ -366,6 +382,7 @@ export const makeCosmjsFollower = (
       );
     }
   }
+  harden(reverseValuesFromCell);
 
   /**
    * @param {import('./types.js').StreamCell<T>} streamCell
@@ -383,6 +400,7 @@ export const makeCosmjsFollower = (
       );
     }
   }
+  harden(lastValueFromCell);
 
   /**
    * @yields {ValueFollowerElement<T>}
@@ -391,6 +409,7 @@ export const makeCosmjsFollower = (
     /** @type {number | undefined} the last known latest height */
     let lastHeight;
     let lastValue;
+    await null;
     for (;;) {
       const latest = await getDataAtHeight();
       if (lastHeight && latest.height <= lastHeight) {
@@ -427,6 +446,7 @@ export const makeCosmjsFollower = (
       lastValue = latest.value;
     }
   }
+  harden(getLatestIterable);
 
   /**
    * @param {number} [cursorBlockHeight]
@@ -441,11 +461,13 @@ export const makeCosmjsFollower = (
     // block.
     // If the block has no corresponding data, wait for the first block to
     // contain data.
+    await null;
     for (;;) {
-      ({ value: cursorData, height: cursorBlockHeight } = await getDataAtHeight(
-        cursorBlockHeight,
-      ));
+      let thisHeight;
+      ({ value: cursorData, height: thisHeight } =
+        await getDataAtHeight(cursorBlockHeight));
       if (cursorData.length !== 0) {
+        cursorBlockHeight = thisHeight;
         const cursorStreamCell = streamCellForData(
           cursorBlockHeight,
           cursorData,
@@ -543,6 +565,7 @@ export const makeCosmjsFollower = (
       cursorData = currentData;
     }
   }
+  harden(getEachIterableAtHeight);
 
   /**
    * @param {number} [cursorBlockHeight]
@@ -553,10 +576,10 @@ export const makeCosmjsFollower = (
     // cursorBlockHeight) so we know not to emit duplicates
     // of that cell.
     let cursorData;
+    await null;
     while (cursorBlockHeight === undefined || cursorBlockHeight > 0) {
-      ({ value: cursorData, height: cursorBlockHeight } = await getDataAtHeight(
-        cursorBlockHeight,
-      ));
+      ({ value: cursorData, height: cursorBlockHeight } =
+        await getDataAtHeight(cursorBlockHeight));
       if (cursorData.length === 0) {
         // No data at the cursor height, so signal beginning of stream.
         return;
@@ -566,6 +589,7 @@ export const makeCosmjsFollower = (
       cursorBlockHeight = cursorStreamCell.blockHeight - 1;
     }
   }
+  harden(getReverseIterableAtHeight);
 
   /** @type {ValueFollower<T>} */
   return Far('chain follower', {

package/src/follower.d.ts

@@ -1,2 +1,2 @@
-export function makeFollower<T>(specP: ERef<import('./types').CastingSpec> | string, leaderOrMaker?: import("./types").LeaderOrMaker | undefined, options?: import("./types").FollowerOptions | undefined): Promise<import("./follower-cosmjs.js").ValueFollower<T>>;
+export function makeFollower<T>(specP: ERef<import("./types.js").CastingSpec> | string, leaderOrMaker?: import("./types.js").LeaderOrMaker | undefined, options?: import("./types.js").FollowerOptions | undefined): Promise<import("./follower-cosmjs.js").ValueFollower<T>>;
 //# sourceMappingURL=follower.d.ts.map

package/src/follower.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"follower.d.ts","sourceRoot":"","sources":["follower.js"],"names":[],"mappings":"AA4DO,uCALI,KAAK,OAAO,SAAS,EAAE,WAAW,CAAC,GAAG,MAAM,kLAYtD"}
+{"version":3,"file":"follower.d.ts","sourceRoot":"","sources":["follower.js"],"names":[],"mappings":"AA4DO,6BANM,CAAC,SACH,IAAI,CAAC,OAAO,YAAY,EAAE,WAAW,CAAC,GAAG,MAAM,+HAG7C,OAAO,CAAC,OAAO,sBAAsB,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CASpE"}

package/src/follower.js

@@ -11,12 +11,12 @@ import { makeCastingSpec } from './casting-spec.js';
 
 /**
  * @template T
- * @param {ERef<import('./types').CastingSpec>} spec
+ * @param {ERef<import('./types.js').CastingSpec>} spec
  */
 const makeSubscriptionFollower = spec => {
   const transform = value =>
     harden({ value, blockHeight: NaN, currentBlockHeight: NaN });
-  /** @type {import('./types').Follower<import('./types.js').ValueFollowerElement<T>>} */
+  /** @type {import('./types.js').Follower<import('./types.js').ValueFollowerElement<T>>} */
   const follower = Far('subscription/notifier follower', {
     getLatestIterable: async () => {
       const { notifier, subscription } = await spec;
@@ -53,10 +53,10 @@ const makeSubscriptionFollower = spec => {
 
 /**
  * @template T
- * @param {ERef<import('./types').CastingSpec> | string} specP
- * @param {import('./types').LeaderOrMaker} [leaderOrMaker]
- * @param {import('./types').FollowerOptions} [options]
- * @returns {Promise<import('./follower-cosmjs').ValueFollower<T>>}
+ * @param {ERef<import('./types.js').CastingSpec> | string} specP
+ * @param {import('./types.js').LeaderOrMaker} [leaderOrMaker]
+ * @param {import('./types.js').FollowerOptions} [options]
+ * @returns {Promise<import('./follower-cosmjs.js').ValueFollower<T>>}
  */
 export const makeFollower = async (specP, leaderOrMaker, options) => {
   const spec = await makeCastingSpec(specP);

package/src/iterable.d.ts

@@ -1,24 +1,24 @@
 export function mapAsyncIterable<TIn, TOut>(iterable: AsyncIterable<TIn>, transform: (value: TIn) => TOut): AsyncIterable<TOut>;
-export function iterateLatest<T>(follower: ERef<import("./types").Follower<T>>): {
+export function iterateLatest<T>(follower: ERef<import("./types.js").Follower<T>>): {
     /** @returns {AsyncIterator<T>} */
-    [Symbol.asyncIterator]: () => AsyncIterator<T, any, undefined>;
-} & import("@endo/eventual-send").RemotableBrand<{}, {
+    [Symbol.asyncIterator]: () => AsyncIterator<T>;
+} & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
     /** @returns {AsyncIterator<T>} */
-    [Symbol.asyncIterator]: () => AsyncIterator<T, any, undefined>;
+    [Symbol.asyncIterator]: () => AsyncIterator<T>;
 }>;
-export function iterateEach<T>(follower: ERef<import("./types").Follower<T>>, options?: import("./types").IterateEachOptions | undefined): {
+export function iterateEach<T>(follower: ERef<import("./types.js").Follower<T>>, options?: import("./types.js").IterateEachOptions | undefined): {
     /** @returns {AsyncIterator<T>} */
-    [Symbol.asyncIterator]: () => AsyncIterator<T, any, undefined>;
-} & import("@endo/eventual-send").RemotableBrand<{}, {
+    [Symbol.asyncIterator]: () => AsyncIterator<T>;
+} & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
     /** @returns {AsyncIterator<T>} */
-    [Symbol.asyncIterator]: () => AsyncIterator<T, any, undefined>;
+    [Symbol.asyncIterator]: () => AsyncIterator<T>;
 }>;
-export function iterateReverse<T>(follower: ERef<import("./types").Follower<T>>, options?: import("./types").IterateEachOptions | undefined): {
+export function iterateReverse<T>(follower: ERef<import("./types.js").Follower<T>>, options?: import("./types.js").IterateEachOptions | undefined): {
     /** @returns {AsyncIterator<T>} */
-    [Symbol.asyncIterator]: () => AsyncIterator<T, any, undefined>;
-} & import("@endo/eventual-send").RemotableBrand<{}, {
+    [Symbol.asyncIterator]: () => AsyncIterator<T>;
+} & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
     /** @returns {AsyncIterator<T>} */
-    [Symbol.asyncIterator]: () => AsyncIterator<T, any, undefined>;
+    [Symbol.asyncIterator]: () => AsyncIterator<T>;
 }>;
 export { subscribeEach, subscribeLatest } from "@agoric/notifier/subscribe.js";
 //# sourceMappingURL=iterable.d.ts.map

package/src/iterable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"iterable.d.ts","sourceRoot":"","sources":["iterable.js"],"names":[],"mappings":"AAWO,gIAON;AAQM;IAGH,kCAAkC;;;IAAlC,kCAAkC;;GAQlC;AASG;IAGH,kCAAkC;;;IAAlC,kCAAkC;;GAQlC;AAOG;IAGH,kCAAkC;;;IAAlC,kCAAkC;;GAQlC"}
+{"version":3,"file":"iterable.d.ts","sourceRoot":"","sources":["iterable.js"],"names":[],"mappings":"AAWO,iCANM,GAAG,EACH,IAAI,YACN,aAAa,CAAC,GAAG,CAAC,aAClB,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,GAClB,aAAa,CAAC,IAAI,CAAC,CAU/B;AAQM,8BAHM,CAAC,YACH,IAAI,CAAC,OAAO,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IAK7C,kCAAkC;kCAApB,aAAa,CAAC,CAAC,CAAC;;IAA9B,kCAAkC;kCAApB,aAAa,CAAC,CAAC,CAAC;GAQ9B;AASG,4BAJM,CAAC,YACH,IAAI,CAAC,OAAO,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IAM7C,kCAAkC;kCAApB,aAAa,CAAC,CAAC,CAAC;;IAA9B,kCAAkC;kCAApB,aAAa,CAAC,CAAC,CAAC;GAQ9B;AAOG,+BAJM,CAAC,YACH,IAAI,CAAC,OAAO,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IAM7C,kCAAkC;kCAApB,aAAa,CAAC,CAAC,CAAC;;IAA9B,kCAAkC;kCAApB,aAAa,CAAC,CAAC,CAAC;GAQ9B"}

package/src/iterable.js

@@ -15,6 +15,7 @@ export const mapAsyncIterable = (iterable, transform) => {
       yield transform(value);
     }
   }
+  harden(transformGenerator);
   return transformGenerator();
 };
 
@@ -22,7 +23,7 @@ export const mapAsyncIterable = (iterable, transform) => {
  * TODO: Remove this function when we have an @endo/publish-kit that suppports pull topics
  *
  * @template T
- * @param {ERef<import('./types').Follower<T>>} follower
+ * @param {ERef<import('./types.js').Follower<T>>} follower
  */
 export const iterateLatest = follower =>
   // For now, just pass through the iterable.

package/src/leader-netconfig.d.ts

@@ -1,4 +1,4 @@
-export function makeLeaderFromRpcAddresses(rpcAddrs: string[], leaderOptions?: import("./types.js").LeaderOptions | undefined): import('./types.js').Leader;
+export function makeLeaderFromRpcAddresses(rpcAddrs: string[], leaderOptions?: import("./types.js").LeaderOptions | undefined): import("./types.js").Leader;
 export function makeLeaderFromNetworkConfig(netconfigURL: string, options?: import("./types.js").LeaderOptions | undefined): Promise<any>;
-export function makeLeader(bootstrap?: string | undefined, options?: import("./types.js").LeaderOptions | undefined): ERef<import('./types.js').Leader>;
+export function makeLeader(bootstrap?: string | undefined, options?: import("./types.js").LeaderOptions | undefined): ERef<import("./types.js").Leader>;
 //# sourceMappingURL=leader-netconfig.d.ts.map

package/src/leader-netconfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"leader-netconfig.d.ts","sourceRoot":"","sources":["leader-netconfig.js"],"names":[],"mappings":"AAgBO,qDAJI,MAAM,EAAE,mEAEN,OAAO,YAAY,EAAE,MAAM,CAevC;AAMM,0DAHI,MAAM,0EAoChB;AAOM,sHAFM,KAAK,OAAO,YAAY,EAAE,MAAM,CAAC,CAO7C"}
+{"version":3,"file":"leader-netconfig.d.ts","sourceRoot":"","sources":["leader-netconfig.js"],"names":[],"mappings":"AAgBO,qDAJI,MAAM,EAAE,mEAEN,OAAO,YAAY,EAAE,MAAM,CAevC;AAMM,0DAHI,MAAM,0EAoChB;AAOM,sHAFM,IAAI,CAAC,OAAO,YAAY,EAAE,MAAM,CAAC,CAO7C"}

package/src/leader.d.ts

@@ -1,2 +1,2 @@
-export function makeRoundRobinLeader(endpoints: string[], leaderOptions?: import('./types.js').LeaderOptions): import("./types.js").Leader;
+export function makeRoundRobinLeader(endpoints: string[], leaderOptions?: import("./types.js").LeaderOptions): import("./types.js").Leader;
 //# sourceMappingURL=leader.d.ts.map

package/src/main.js

@@ -1,5 +1,7 @@
 // @jessie-check
 
+/// <reference types="@agoric/internal/exported" />
+
 // eslint-disable-next-line import/export
 export * from './types.js'; // no named exports
 export * from './defaults.js';

package/src/makeHttpClient.d.ts

@@ -0,0 +1,2 @@
+export function makeHttpClient(url: string, fetch: typeof window.fetch): import("@cosmjs/tendermint-rpc").RpcClient;
+//# sourceMappingURL=makeHttpClient.d.ts.map

package/src/makeHttpClient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"makeHttpClient.d.ts","sourceRoot":"","sources":["makeHttpClient.js"],"names":[],"mappings":"AA2BO,oCAJI,MAAM,SACN,OAAO,MAAM,CAAC,KAAK,GACjB,OAAO,wBAAwB,EAAE,SAAS,CA8BtD"}

package/src/makeHttpClient.js

@@ -0,0 +1,56 @@
+// @ts-check
+
+const { freeze } = Object;
+
+const filterBadStatus = res => {
+  if (res.status >= 400) {
+    throw new Error(`Bad status on response: ${res.status}`);
+  }
+  return res;
+};
+
+/**
+ * Make an RpcClient using explicit access to the network.
+ *
+ * The RpcClient implementations included in cosmjs
+ * such as {@link https://cosmos.github.io/cosmjs/latest/tendermint-rpc/classes/HttpClient.html HttpClient}
+ * use ambient authority (fetch or axios) for network access.
+ *
+ * To facilitate cooperation without vulnerability,
+ * as well as unit testing, etc. this RpcClient maker takes
+ * network access as a parameter, following
+ * {@link https://github.com/Agoric/agoric-sdk/wiki/OCap-Discipline|OCap Discipline}.
+ *
+ * @param {string} url
+ * @param {typeof window.fetch} fetch
+ * @returns {import('@cosmjs/tendermint-rpc').RpcClient}
+ */
+export const makeHttpClient = (url, fetch) => {
+  const headers = {}; // XXX needed?
+
+  // based on cosmjs 0.30.1:
+  // https://github.com/cosmos/cosmjs/blob/33271bc51cdc865cadb647a1b7ab55d873637f39/packages/tendermint-rpc/src/rpcclients/http.ts#L37
+  // https://github.com/cosmos/cosmjs/blob/33271bc51cdc865cadb647a1b7ab55d873637f39/packages/tendermint-rpc/src/rpcclients/httpclient.ts#L25
+  return freeze({
+    disconnect: () => {
+      // nothing to be done
+    },
+
+    /**
+     * @param {import('@cosmjs/json-rpc').JsonRpcRequest} request
+     */
+    execute: async request => {
+      const settings = {
+        method: 'POST',
+        body: request ? JSON.stringify(request) : undefined,
+        headers: {
+          'Content-Type': 'application/json',
+          ...headers,
+        },
+      };
+      return fetch(url, settings)
+        .then(filterBadStatus)
+        .then(res => res.json());
+    },
+  });
+};

package/src/netconfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"netconfig.d.ts","sourceRoot":"","sources":["netconfig.js"],"names":[],"mappings":"AAKA;;;;;;;;;;;;GAYG;AACH,kEAWE;AAQK,8CAJI,OAAO,qCAKuB;;;;;;;;;;cA3B3B,MAAM,EAAE;;;;eACR,MAAM"}
+{"version":3,"file":"netconfig.d.ts","sourceRoot":"","sources":["netconfig.js"],"names":[],"mappings":"AAKA;;;;;;;;;;;;GAYG;AACH,kEAWE;AAQK,8CAJI,OAAO,GACL,QAAQ,QAAQ,IAAI,aAAa,CAIL;;;;;;;;;;cA3B3B,MAAM,EAAE;;;;eACR,MAAM"}

package/src/shuffle.d.ts

@@ -1,2 +1,2 @@
-export function shuffle<T>(a: T[]): void;
+export function shuffle<T>(a: Array<T>): void;
 //# sourceMappingURL=shuffle.d.ts.map

package/src/shuffle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shuffle.d.ts","sourceRoot":"","sources":["shuffle.js"],"names":[],"mappings":"AAMO,yCAON"}
+{"version":3,"file":"shuffle.d.ts","sourceRoot":"","sources":["shuffle.js"],"names":[],"mappings":"AAMO,wBAHM,CAAC,KACH,KAAK,CAAC,CAAC,CAAC,QASlB"}

package/src/types.d.ts

@@ -1,4 +1,3 @@
-export type ERef<T> = import('@endo/far').ERef<T>;
 export type LeaderOptions = {
     retryCallback?: ((where: string, err: any, attempt?: number) => Promise<void>) | null | undefined;
     jitter?: ((where: string) => Promise<void>) | undefined;
@@ -21,19 +20,24 @@ export type Follower<T> = {
     getEachIterable: (options?: IterateEachOptions) => Promise<AsyncIterable<T>>;
     getReverseIterable: (options?: IterateEachOptions) => Promise<AsyncIterable<T>>;
 };
-export type ValueFollowerElement<T> = {
-    value: T;
+export type ValueFollowerBase = {
     blockHeight: number;
     currentBlockHeight: number;
 };
-export type Unserializer = Pick<import('@endo/marshal').Marshal<unknown>, 'fromCapData' | 'unserialize'>;
+export type ValueFollowerElement<T> = ValueFollowerBase & ({
+    value: T;
+} | {
+    value: undefined;
+    error: any;
+});
+export type Unserializer = Pick<import("@endo/marshal").Marshal<unknown>, "fromCapData" | "unserialize">;
 export type Crasher = {
     crash: (...args: unknown[]) => void;
 };
 export type FollowerOptions = {
     unserializer?: import("@endo/far").FarRef<Unserializer, import("@endo/eventual-send").DataOnly<Unserializer>> | null | undefined;
     decode?: ((text: string) => any) | undefined;
-    proof?: "strict" | "optimistic" | "none" | undefined;
+    proof?: "none" | "strict" | "optimistic" | undefined;
     crasher?: import("@endo/far").FarRef<Crasher, import("@endo/eventual-send").DataOnly<Crasher>> | undefined;
 };
 export type CastingSpec = {
@@ -41,8 +45,8 @@ export type CastingSpec = {
     storeSubkey?: Uint8Array | undefined;
     dataPrefixBytes?: Uint8Array | undefined;
     noDataValue?: Uint8Array | undefined;
-    subscription?: ERef<Subscription<any>> | undefined;
-    notifier?: ERef<Notifier<any>> | undefined;
+    subscription?: globalThis.ERef<Subscription<any>> | undefined;
+    notifier?: globalThis.ERef<Notifier<any>> | undefined;
 };
 export type IterateEachOptions = {
     height?: number | undefined;
@@ -51,4 +55,6 @@ export type StreamCell<T> = {
     blockHeight: number;
     values: Array<T>;
 };
+import type { Subscription } from '@agoric/notifier';
+import type { Notifier } from '@agoric/notifier';
 //# sourceMappingURL=types.d.ts.map

package/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":"sBAO0B,OAAO,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;;6BAIvB,MAAM,OAAO,GAAG,YAAY,MAAM,KAAK,QAAQ,IAAI,CAAC;sBAC5D,MAAM,KAAK,QAAQ,IAAI,CAAC;2BACxB,MAAM,KAAK,QAAQ,OAAO,CAAC;;;;YAMnC,UAAU,EAAE;;;mBAKJ,MAAM,SAAS,GAAG,YAAY,MAAM,KAAK,QAAQ,IAAI,CAAC;oBACtD,MAAM,KAAK,QAAQ,IAAI,CAAC;gBAChC,MAAM,aAAa;6BACR,MAAM,uBAAuB,MAAM;yBACvC,KAAK,WAAW,CAAC,KAAK,QAAQ,SAAS,aAAa,CAAC,CAAC;;4BAG7D,KAAK,MAAM,CAAC,GAAG,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;;uBAKnC,MAAM,QAAQ,cAAc,CAAC,CAAC,CAAC;gCACpB,kBAAkB,KAAK,QAAQ,cAAc,CAAC,CAAC,CAAC;mCAChD,kBAAkB,KAAK,QAAQ,cAAc,CAAC,CAAC,CAAC;;;WAO3D,CAAC;iBACD,MAAM;wBACN,MAAM;;2BAIP,KAAK,OAAO,eAAe,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,aAAa,CAAC;;qBAKlE,OAAO,EAAE,KAAK,IAAI;;;;qBAMrB,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;iBAuBrB,MAAM;YACN,MAAM,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":";6BAW8B,MAAM,OAAO,GAAG,YAAY,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC;sBAC5D,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC;2BACxB,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC;;;;YAMnC,UAAU,EAAE;;;WAKZ,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC;YAC9D,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC;gBAChC,MAAM,aAAa;kBACnB,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC;kBAC9E,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;;4BAG7D,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC;qBAGpC,CAAC;uBAEA,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;qBAC/B,CAAC,OAAO,CAAC,EAAE,kBAAkB,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;wBAC3D,CAAC,OAAO,CAAC,EAAE,kBAAkB,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;;;iBAK3D,MAAM;wBACN,MAAM;;iCAKP,CAAC,IACD,iBAAiB,GAAG,CAAC;IAAE,KAAK,EAAE,CAAC,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,GAAG,CAAA;CAAE,CAAC;2BAIrE,IAAI,CAAC,OAAO,eAAe,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,aAAa,CAAC;;WAK5E,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI;;;;qBAMrB,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;uBAqBtB,CAAC;iBAEA,MAAM;YACN,KAAK,CAAC,CAAC,CAAC;;kCAnFmB,kBAAkB;8BAAlB,kBAAkB"}

package/src/types.js

@@ -1,11 +1,11 @@
 // @jessie-check
 
-// Make this a module.
-import '@agoric/notifier';
-
+// Ensure this is a module.
 export {};
 
-/** @template T @typedef {import('@endo/far').ERef<T>} ERef */
+/**
+ * @import {Notifier, Subscription} from '@agoric/notifier';
+ */
 
 /**
  * @typedef {object} LeaderOptions
@@ -40,14 +40,17 @@ export {};
  */
 
 /**
- * @see {ChangeFollower}
- * @template T
- * @typedef {object} ValueFollowerElement
- * @property {T} value
+ * @typedef {object} ValueFollowerBase
  * @property {number} blockHeight
  * @property {number} currentBlockHeight
  */
 
+/**
+ * @see {ChangeFollower}
+ * @template T
+ * @typedef {ValueFollowerBase & ({ value: T } | { value: undefined, error: any })} ValueFollowerElement
+ */
+
 /**
  * @typedef {Pick<import('@endo/marshal').Marshal<unknown>, 'fromCapData' | 'unserialize'>} Unserializer
  */

package/test/interpose-net-access.test.js

@@ -0,0 +1,118 @@
+// @ts-check
+/* global globalThis */
+import anyTest from 'ava';
+import {
+  createProtobufRpcClient,
+  QueryClient,
+  setupBankExtension,
+} from '@cosmjs/stargate';
+import { Tendermint34Client } from '@cosmjs/tendermint-rpc';
+import {
+  QueryChildrenRequest,
+  QueryChildrenResponse,
+} from '@agoric/cosmic-proto/vstorage/query.js';
+
+import { makeHttpClient } from '../src/makeHttpClient.js';
+import { captureIO, replayIO, web1, web2 } from './net-access-fixture.js';
+
+/** @type {import('ava').TestFn<Awaited<ReturnType<typeof makeTestContext>>>} */
+const test = /** @type {any} */ (anyTest);
+
+const RECORDING = false;
+
+const makeTestContext = async () => {
+  return { fetch: globalThis.fetch };
+};
+
+test.before(async t => {
+  t.context = await makeTestContext();
+});
+
+const scenario1 = {
+  endpoint: 'https://emerynet.rpc.agoric.net/',
+  request: {
+    id: 1,
+    method: 'no-such-method',
+    params: [],
+  },
+  gov2: {
+    addr: 'agoric140dmkrz2e42ergjj7gyvejhzmjzurvqeq82ang',
+    balance: { amount: '25050000', denom: 'uist' },
+  },
+};
+
+test('interpose net access', async t => {
+  const fetchMock = replayIO(web1);
+  const rpcClient = makeHttpClient(scenario1.endpoint, fetchMock);
+
+  t.log('raw JSON RPC');
+  const res = await rpcClient.execute({
+    ...scenario1.request,
+    jsonrpc: '2.0',
+  });
+  t.like(res, { error: { message: 'Method not found' } });
+
+  t.log('Cosmos SDK RPC: balance query');
+  const tmClient = await Tendermint34Client.create(rpcClient);
+  const qClient = new QueryClient(tmClient);
+  const ext = setupBankExtension(qClient);
+  const actual = await ext.bank.balance(
+    scenario1.gov2.addr,
+    scenario1.gov2.balance.denom,
+  );
+
+  t.deepEqual(actual, scenario1.gov2.balance);
+});
+
+const scenario2 = {
+  endpoint: 'https://emerynet.rpc.agoric.net/',
+  children: [
+    'activityhash',
+    'beansOwing',
+    'egress',
+    'highPrioritySenders',
+    'published',
+    'swingStore',
+  ],
+};
+
+// XXX open code until https://github.com/Agoric/agoric-sdk/issues/9200
+class QueryClientImpl {
+  rpc;
+
+  service;
+
+  constructor(rpc, opts) {
+    this.service = opts?.service || 'agoric.vstorage.Query';
+    this.rpc = rpc;
+  }
+
+  Children(request) {
+    const reqData = QueryChildrenRequest.encode(request).finish();
+    const promise = this.rpc.request(this.service, 'Children', reqData);
+    return promise.then(respData => QueryChildrenResponse.decode(respData));
+  }
+}
+
+test(`vstorage query: Children (RECORDING: ${RECORDING})`, async t => {
+  const { context: io } = t;
+
+  const { fetch: fetchMock, web } = io.recording
+    ? captureIO(io.fetch)
+    : { fetch: replayIO(web2), web: new Map() };
+  const rpcClient = makeHttpClient(scenario2.endpoint, fetchMock);
+
+  const tmClient = await Tendermint34Client.create(rpcClient);
+  const qClient = new QueryClient(tmClient);
+  const rpc = createProtobufRpcClient(qClient);
+  const queryService = new QueryClientImpl(rpc);
+
+  const children = await queryService.Children({ path: '' });
+  if (io.recording) {
+    t.snapshot(web);
+  }
+  t.deepEqual(children, {
+    children: scenario2.children,
+    pagination: undefined,
+  });
+});

package/test/{test-mvp.js → mvp.test.js}

@@ -1,5 +1,8 @@
 // @ts-nocheck
-// eslint-disable-next-line import/order
+
+import './lockdown.js';
+
+import { makeMarshal } from '@endo/marshal';
 import { test } from './prepare-test-env-ava.js';
 
 import {
@@ -167,6 +170,59 @@ test('unrecognized proof', async t => {
   );
 });
 
+test('yields error on bad capdata without terminating', async t => {
+  const marshal = makeMarshal();
+  const improperlyMarshalledData = { bad: 'data' };
+  const properlyMarshalledData = { foo: 'bar' };
+  const fakeValues = [
+    improperlyMarshalledData,
+    marshal.toCapData(harden(properlyMarshalledData)),
+  ];
+  t.plan(4);
+  const options = { batchSize: 1, marshaller: { toCapData: data => data } };
+  const { controller, PORT } = await t.context.startFakeServer(
+    t,
+    fakeValues,
+    options,
+  );
+  controller.advance(0);
+  /** @type {import('../src/types.js').LeaderOptions} */
+  const lo = {
+    retryCallback: null, // fail fast, no retries
+    keepPolling: () => delay(1000).then(() => true), // poll really quickly
+    jitter: null, // no jitter
+  };
+  /** @type {import('../src/types.js').FollowerOptions} */
+  const so = {
+    proof: 'none',
+  };
+
+  const leader = makeLeader(`http://localhost:${PORT}/network-config`, lo);
+  const castingSpec = makeCastingSpec(':mailbox.agoric1foobarbaz');
+  const follower = await makeFollower(castingSpec, leader, so);
+  let i = 0;
+
+  for await (const { value, error } of iterateEach(follower)) {
+    if (i === 0) {
+      t.log(`value from follower, should be undefined:`, value);
+      t.log(`error from follower, should be defined:`, error);
+
+      t.deepEqual(value, undefined);
+      t.assert(typeof error === 'object');
+
+      i += 1;
+      controller.advance(1);
+    } else if (i === 1) {
+      t.log(`value from follower, should be defined:`, value);
+      t.log(`error from follower, should be undefined:`, error);
+
+      t.deepEqual(value, properlyMarshalledData);
+      t.deepEqual(error, undefined);
+      break;
+    }
+  }
+});
+
 test.before(t => {
   t.context.cleanups = [];
   t.context.startFakeServer = startFakeServer;

package/test/net-access-fixture.js

@@ -0,0 +1,196 @@
+const { stringify: jq } = JSON;
+
+/**
+ * @file to regenerate
+ *   1. set RECORDING=true in interpose-net-access.test.js
+ *   2. run: yarn test test/interpose-net-access.test.js --update-snapshots
+ *   3. for each map in interpose-net-access.test.js.md, copy it and
+ *   4. replace all occurences of => with : and paste as args to Object.fromEntries()
+ *   5. change RECORDING back to false
+ */
+export const web1 = new Map([
+  [
+    jq([
+      'https://emerynet.rpc.agoric.net/',
+      {
+        method: 'POST',
+        body: jq({
+          id: 1208387614,
+          method: 'no-such-method',
+          params: [],
+          jsonrpc: '2.0',
+        }),
+        headers: { 'Content-Type': 'application/json' },
+      },
+    ]),
+    {
+      error: {
+        code: -32601,
+        message: 'Method not found',
+      },
+      id: 1208387614,
+      jsonrpc: '2.0',
+    },
+  ],
+  [
+    jq([
+      'https://emerynet.rpc.agoric.net/',
+      {
+        method: 'POST',
+        body: jq({
+          jsonrpc: '2.0',
+          id: 797030719,
+          method: 'abci_query',
+          params: {
+            path: '/cosmos.bank.v1beta1.Query/Balance',
+            data: '0a2d61676f726963313430646d6b727a326534326572676a6a37677976656a687a6d6a7a7572767165713832616e67120475697374',
+            prove: false,
+          },
+        }),
+        headers: { 'Content-Type': 'application/json' },
+      },
+    ]),
+    {
+      id: 797030719,
+      jsonrpc: '2.0',
+      result: {
+        response: {
+          code: 0,
+          codespace: '',
+          height: '123985',
+          index: '0',
+          info: '',
+          key: null,
+          log: '',
+          proofOps: null,
+          value: 'ChAKBHVpc3QSCDI1MDUwMDAw',
+        },
+      },
+    },
+  ],
+]);
+
+export const web2 = new Map([
+  [
+    jq([
+      'https://emerynet.rpc.agoric.net/',
+      {
+        method: 'POST',
+        body: jq({
+          jsonrpc: '2.0',
+          id: 1757612624,
+          method: 'abci_query',
+          params: {
+            path: '/agoric.vstorage.Query/Children',
+            data: '',
+            prove: false,
+          },
+        }),
+        headers: { 'Content-Type': 'application/json' },
+      },
+    ]),
+    {
+      id: 1757612624,
+      jsonrpc: '2.0',
+      result: {
+        response: {
+          code: 0,
+          codespace: '',
+          height: '123985',
+          index: '0',
+          info: '',
+          key: null,
+          log: '',
+          proofOps: null,
+          value:
+            'CgxhY3Rpdml0eWhhc2gKCmJlYW5zT3dpbmcKBmVncmVzcwoTaGlnaFByaW9yaXR5U2VuZGVycwoJcHVibGlzaGVkCgpzd2luZ1N0b3Jl',
+        },
+      },
+    },
+  ],
+]);
+
+/**
+ * @param {string} str
+ * ack: https://stackoverflow.com/a/7616484
+ */
+const hashCode = str => {
+  let hash = 0;
+  let i;
+  let chr;
+  if (str.length === 0) return hash;
+  for (i = 0; i < str.length; i += 1) {
+    chr = str.charCodeAt(i);
+    // eslint-disable-next-line no-bitwise
+    hash = (hash << 5) - hash + chr;
+    // eslint-disable-next-line no-bitwise
+    hash |= 0; // Convert to 32bit integer
+  }
+  return hash;
+};
+
+/**
+ * Normalize JSON RPC request ID
+ *
+ * tendermint-rpc generates ids using ambient access to Math.random()
+ * So we normalize them to a hash of the rest of the JSON.
+ *
+ * Earlier, we tried a sequence number, but it was non-deterministic
+ * with multiple interleaved requests.
+ *
+ * @param {string} argsKey
+ */
+const normalizeID = argsKey => {
+  // arbitrary string unlikely to occur in a request. from `pwgen 16 -1`
+  const placeholder = 'Ajaz1chei7ohnguv';
+
+  const noid = argsKey.replace(/\\"id\\":\d+/, `\\"id\\":${placeholder}`);
+  const id = Math.abs(hashCode(noid));
+  return noid.replace(placeholder, `${id}`);
+};
+
+/**
+ * Wrap `fetch` to capture JSON RPC IO traffic.
+ *
+ * @param {typeof window.fetch} fetch
+ * returns wraped fetch along with a .web map for use with {@link replayIO}
+ */
+export const captureIO = fetch => {
+  const web = new Map();
+  /** @type {typeof window.fetch} */
+  // @ts-expect-error mock
+  const f = async (...args) => {
+    const key = normalizeID(JSON.stringify(args));
+    const resp = await fetch(...args);
+    return {
+      json: async () => {
+        const data = await resp.json();
+        web.set(key, data);
+        return data;
+      },
+    };
+  };
+  return { fetch: f, web };
+};
+
+/**
+ * Replay captured JSON RPC IO.
+ *
+ * @param {Map<string, any>} web map from
+ *   JSON-stringified fetch args to fetched JSON data.
+ */
+export const replayIO = web => {
+  /** @type {typeof window.fetch} */
+  // @ts-expect-error mock
+  const f = async (...args) => {
+    const key = normalizeID(JSON.stringify(args));
+    const data = web.get(key);
+    if (!data) {
+      throw Error(`no data for ${key}`);
+    }
+    return {
+      json: async () => data,
+    };
+  };
+  return f;
+};

package/tsconfig.build.json

@@ -0,0 +1,6 @@
+{
+    "extends": [
+        "./tsconfig.json",
+        "../../tsconfig-build-options.json"
+    ]
+}

package/{jsconfig.json → tsconfig.json}

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

package/jsconfig.build.json

@@ -1,12 +0,0 @@
-{
-    "extends": "./jsconfig.json",
-    "compilerOptions": {
-        "noEmit": false,
-        "declaration": true,
-        "emitDeclarationOnly": true,
-        "declarationMap": true
-    },
-    "exclude": [
-        "test/"
-    ]
-}