@agoric/casting 0.4.3-u12.0 → 0.4.3-u13.0

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [0.4.3-u13.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/casting@0.4.3-u12.0...@agoric/casting@0.4.3-u13.0) (2023-12-07)
+
+
+### Bug Fixes
+
+* **casting:** dont crash on bad capdata ([3f01369](https://github.com/Agoric/agoric-sdk/commit/3f0136994c0b4033c872f9593cabb19bab05f01c))
+* **casting:** properly follow an unpopulated state entry ([48296f7](https://github.com/Agoric/agoric-sdk/commit/48296f78f783e8e5ae1e5fbe92ae10e5e7880837))
+
+
+
 ### [0.4.3-u12.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/casting@0.4.3-u11wf.0...@agoric/casting@0.4.3-u12.0) (2023-11-10)
 
 **Note:** Version bump only for package @agoric/casting

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/casting",
-  "version": "0.4.3-u12.0",
+  "version": "0.4.3-u13.0",
   "description": "Agoric's OCap broadcasting system",
   "type": "module",
   "main": "src/main.js",
@@ -22,10 +22,10 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/internal": "^0.4.0-u12.0",
-    "@agoric/notifier": "^0.6.3-u12.0",
-    "@agoric/spawner": "^0.6.9-u12.0",
-    "@agoric/store": "^0.9.3-u12.0",
+    "@agoric/internal": "^0.4.0-u13.0",
+    "@agoric/notifier": "^0.6.3-u13.0",
+    "@agoric/spawner": "^0.6.9-u13.0",
+    "@agoric/store": "^0.9.3-u13.0",
     "@cosmjs/encoding": "^0.30.1",
     "@cosmjs/proto-signing": "^0.30.1",
     "@cosmjs/stargate": "^0.30.1",
@@ -58,5 +58,5 @@
     "timeout": "20m",
     "workerThreads": false
   },
-  "gitHead": "ee5a5fdad9187a6b1b7b26b772b6564c0db3062e"
+  "gitHead": "5a6cdeb0c18ae9700d706445acf402f8d1e873c3"
 }

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":"AAiGO,+CALI,GAAG,gJAgfb;+BA1jByB,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

@@ -330,11 +330,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 };
+    }
   };
 
   /**
@@ -442,10 +447,12 @@ export const makeCosmjsFollower = (
     // If the block has no corresponding data, wait for the first block to
     // contain data.
     for (;;) {
-      ({ value: cursorData, height: cursorBlockHeight } = await getDataAtHeight(
+      let thisHeight;
+      ({ value: cursorData, height: thisHeight } = await getDataAtHeight(
         cursorBlockHeight,
       ));
       if (cursorData.length !== 0) {
+        cursorBlockHeight = thisHeight;
         const cursorStreamCell = streamCellForData(
           cursorBlockHeight,
           cursorData,

package/src/types.d.ts

@@ -21,11 +21,16 @@ 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 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;

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":"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;;;iBAK3D,MAAM;wBACN,MAAM;;sCAMP,iBAAiB,GAAG,CAAC;IAAE,KAAK,EAAE,CAAC,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,GAAG,CAAA;CAAE,CAAC;2BAIrE,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"}

package/src/types.js

@@ -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/test-mvp.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;
+  // eslint-disable-next-line no-unreachable-loop
+  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;