@agoric/zoe 0.26.3-dev-16f149c.0 → 0.26.3-dev-7e4a2e1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/zoe",
-  "version": "0.26.3-dev-16f149c.0+16f149c",
+  "version": "0.26.3-dev-7e4a2e1.0+7e4a2e1",
   "description": "Zoe: the Smart Contract Framework for Offer Enforcement",
   "type": "module",
   "main": "./src/zoeService/zoe.js",
@@ -43,21 +43,22 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-16f149c.0+16f149c",
-    "@agoric/base-zone": "0.1.1-dev-16f149c.0+16f149c",
-    "@agoric/ertp": "0.16.3-dev-16f149c.0+16f149c",
-    "@agoric/internal": "0.3.3-dev-16f149c.0+16f149c",
-    "@agoric/notifier": "0.6.3-dev-16f149c.0+16f149c",
-    "@agoric/store": "0.9.3-dev-16f149c.0+16f149c",
-    "@agoric/swingset-liveslots": "0.10.3-dev-16f149c.0+16f149c",
-    "@agoric/swingset-vat": "0.32.3-dev-16f149c.0+16f149c",
-    "@agoric/time": "0.3.3-dev-16f149c.0+16f149c",
-    "@agoric/vat-data": "0.5.3-dev-16f149c.0+16f149c",
-    "@agoric/zone": "0.2.3-dev-16f149c.0+16f149c",
+    "@agoric/assert": "0.6.1-dev-7e4a2e1.0+7e4a2e1",
+    "@agoric/base-zone": "0.1.1-dev-7e4a2e1.0+7e4a2e1",
+    "@agoric/ertp": "0.16.3-dev-7e4a2e1.0+7e4a2e1",
+    "@agoric/internal": "0.3.3-dev-7e4a2e1.0+7e4a2e1",
+    "@agoric/notifier": "0.6.3-dev-7e4a2e1.0+7e4a2e1",
+    "@agoric/store": "0.9.3-dev-7e4a2e1.0+7e4a2e1",
+    "@agoric/swingset-liveslots": "0.10.3-dev-7e4a2e1.0+7e4a2e1",
+    "@agoric/swingset-vat": "0.32.3-dev-7e4a2e1.0+7e4a2e1",
+    "@agoric/time": "0.3.3-dev-7e4a2e1.0+7e4a2e1",
+    "@agoric/vat-data": "0.5.3-dev-7e4a2e1.0+7e4a2e1",
+    "@agoric/zone": "0.2.3-dev-7e4a2e1.0+7e4a2e1",
     "@endo/bundle-source": "^3.1.0",
     "@endo/captp": "^4.0.4",
     "@endo/common": "^1.1.0",
     "@endo/eventual-send": "^1.1.2",
+    "@endo/exo": "^1.2.1",
     "@endo/far": "^1.0.4",
     "@endo/import-bundle": "^1.0.4",
     "@endo/marshal": "^1.3.0",
@@ -67,7 +68,7 @@
     "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-dev-16f149c.0+16f149c",
+    "@agoric/kmarshal": "0.1.1-dev-7e4a2e1.0+7e4a2e1",
     "@endo/init": "^1.0.4",
     "ava": "^5.3.0",
     "c8": "^9.1.0",
@@ -140,5 +141,5 @@
   "typeCoverage": {
     "atLeast": 84.73
   },
-  "gitHead": "16f149cd82c4972a420bccd4feae735b49190175"
+  "gitHead": "7e4a2e141e00cd3a47185591b57188c8d98c2310"
 }

package/src/contractSupport/prepare-ownable.js

@@ -18,7 +18,7 @@ const TransferProposalShape = M.splitRecord({
  */
 
 /**
- * @template {any} [U=any]
+ * @template {(string | symbol)[]} MN Method names
  * @param {import('@agoric/base-zone').Zone} zone
  * @param {MakeInvitation} makeInvitation
  *   A function with the same behavior as `zcf.makeInvitation`.
@@ -30,11 +30,11 @@ const TransferProposalShape = M.splitRecord({
  *   See ownable-counter.js for the canonical example.
  * @param {string} uKindName
  *   The `kindName` of the underlying exo class
- * @param {(string|symbol)[]} uMethodNames
+ * @param {MN} uMethodNames
  *   The method names of the underlying exo class that should be represented
  *   by transparently-forwarding methods of the wrapping ownable object.
  * @param {OwnableOptions} [options]
- * @returns {(underlying: U) => U}
+ * @returns {<U>(underlying: U) => Pick<U, MN[number]> & {makeTransferInvitation: () => Invitation}}
  */
 export const prepareOwnable = (
   zone,

package/src/zoeService/invitationQueries.js

@@ -1,6 +1,6 @@
 // @jessie-check
 
-import { assert, details as X } from '@agoric/assert';
+import { assert, details as X, Fail, quote as q } from '@agoric/assert';
 import { E } from '@endo/eventual-send';
 
 export const makeInvitationQueryFns = invitationIssuer => {
@@ -13,10 +13,12 @@ export const makeInvitationQueryFns = invitationIssuer => {
       assert.note(err, X`Due to ${reason}`);
       throw err;
     };
-    return E.get(
-      E.get(E(invitationIssuer).getAmountOf(invitationP).catch(onRejected))
-        .value,
-    )[0];
+    const invAmount = await E(invitationIssuer)
+      .getAmountOf(invitationP)
+      .catch(onRejected);
+    (Array.isArray(invAmount.value) && invAmount.value.length === 1) ||
+      Fail`Expected exactly 1 invitation, not ${q(invAmount.value.length)}`;
+    return invAmount.value[0];
   };
 
   /** @type {GetInstance} */