@agoric/pegasus 0.7.13-dev-7ffae88.0 → 0.7.13-dev-c5284e4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/pegasus",
-  "version": "0.7.13-dev-7ffae88.0+7ffae88",
+  "version": "0.7.13-dev-c5284e4.0+c5284e4",
   "description": "Peg-as-us contract",
   "type": "module",
   "main": "./src/pegasus.js",
@@ -28,21 +28,23 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-7ffae88.0+7ffae88",
-    "@agoric/ertp": "0.16.3-dev-7ffae88.0+7ffae88",
-    "@agoric/internal": "0.3.3-dev-7ffae88.0+7ffae88",
-    "@agoric/network": "0.1.1-dev-7ffae88.0+7ffae88",
-    "@agoric/notifier": "0.6.3-dev-7ffae88.0+7ffae88",
-    "@agoric/store": "0.9.3-dev-7ffae88.0+7ffae88",
-    "@agoric/swingset-vat": "0.32.3-dev-7ffae88.0+7ffae88",
-    "@agoric/vats": "0.15.2-dev-7ffae88.0+7ffae88",
-    "@agoric/zoe": "0.26.3-dev-7ffae88.0+7ffae88",
-    "@endo/bundle-source": "^3.0.2",
-    "@endo/captp": "^4.0.2",
-    "@endo/far": "^1.0.2",
-    "@endo/init": "^1.0.2",
-    "@endo/nat": "^5.0.2",
-    "@endo/promise-kit": "^1.0.2"
+    "@agoric/assert": "0.6.1-dev-c5284e4.0+c5284e4",
+    "@agoric/ertp": "0.16.3-dev-c5284e4.0+c5284e4",
+    "@agoric/internal": "0.3.3-dev-c5284e4.0+c5284e4",
+    "@agoric/network": "0.1.1-dev-c5284e4.0+c5284e4",
+    "@agoric/notifier": "0.6.3-dev-c5284e4.0+c5284e4",
+    "@agoric/store": "0.9.3-dev-c5284e4.0+c5284e4",
+    "@agoric/swingset-vat": "0.32.3-dev-c5284e4.0+c5284e4",
+    "@agoric/vat-data": "0.5.3-dev-c5284e4.0+c5284e4",
+    "@agoric/vats": "0.15.2-dev-c5284e4.0+c5284e4",
+    "@agoric/zoe": "0.26.3-dev-c5284e4.0+c5284e4",
+    "@agoric/zone": "0.2.3-dev-c5284e4.0+c5284e4",
+    "@endo/bundle-source": "^3.1.0",
+    "@endo/captp": "^4.0.4",
+    "@endo/far": "^1.0.4",
+    "@endo/init": "^1.0.4",
+    "@endo/nat": "^5.0.4",
+    "@endo/promise-kit": "^1.0.4"
   },
   "devDependencies": {
     "ava": "^5.3.0",
@@ -70,5 +72,5 @@
   "typeCoverage": {
     "atLeast": 89.97
   },
-  "gitHead": "7ffae88ae37df782d5ffe3cf92261a498b0f636c"
+  "gitHead": "c5284e4721ad2702c4551f216bb8eed7abe4d7cf"
 }

package/src/contract.js

@@ -0,0 +1,34 @@
+import { prepareVowTools } from '@agoric/vat-data/vow.js';
+import { makeDurableZone } from '@agoric/zone/durable.js';
+import { makePegasus } from './pegasus.js';
+
+import '@agoric/zoe/exported.js';
+
+import '../exported.js';
+
+/**
+ * @type {ContractStartFn<Pegasus, never, {}, {
+ *   board: ERef<BoardDepositFacet>,
+ *   namesByAddress: ERef<import('@agoric/vats').NameHub>
+ * }}
+ */
+export const start = (zcf, privateArgs, baggage) => {
+  const zone = makeDurableZone(baggage);
+
+  const whenZone = zone.subZone('when');
+  const { when } = prepareVowTools(whenZone);
+
+  const { board, namesByAddress } = privateArgs;
+
+  // start requires that the object passed in must be durable. Given that we
+  // haven't made pegasus durable yet, we'll wrap its non-durable methods within
+  // an exo object to workaround this requirement.
+  const publicFacet = zone.exo('PublicFacet', undefined, {
+    ...makePegasus({ zcf, board, namesByAddress, when }),
+  });
+
+  return harden({
+    publicFacet,
+  });
+};
+harden(start);

package/src/courier.js

@@ -40,6 +40,7 @@ export const getCourierPK = (key, keyToCourierPK) => {
  * @property {(zcfSeat: ZCFSeat, amounts: AmountKeywordRecord) => void} retain
  * @property {(zcfSeat: ZCFSeat, amounts: AmountKeywordRecord) => void} redeem
  * @property {ERef<TransferProtocol>} transferProtocol
+ * @property {ReturnType<import('@agoric/vow').prepareVowTools>['when']} when
  * @param {ERef<Connection>} connection
  * @returns {(args: CourierArgs) => Courier}
  */
@@ -54,6 +55,7 @@ export const makeCourierMaker =
     retain,
     redeem,
     transferProtocol,
+    when,
   }) => {
     /** @type {Sender} */
     const send = async (zcfSeat, depositAddress, memo, opts) => {
@@ -71,8 +73,7 @@ export const makeCourierMaker =
         retain(zcfSeat, { Transfer: amount });
 
         // The payment is already escrowed, and proposed to retain, so try sending.
-        return E(connection)
-          .send(transferPacket)
+        return when(E(connection).send(transferPacket))
           .then(ack => E(transferProtocol).assertTransferPacketAck(ack))
           .then(
             _ => zcfSeat.exit(),

package/src/pegasus.js

@@ -29,13 +29,15 @@ const TRANSFER_PROPOSAL_SHAPE = {
 /**
  * Make a Pegasus public API.
  *
- * @param {ZCF} zcf the Zoe Contract Facet
- * @param {ERef<BoardDepositFacet>} board where to find depositFacets by boardID
- * @param {ERef<NameHub>} namesByAddress where to find depositFacets by bech32
+ * @param {object} powers
+ * @param {ZCF} powers.zcf the Zoe Contract Facet
+ * @param {ERef<BoardDepositFacet>} powers.board where to find depositFacets by boardID
+ * @param {ERef<NameHub>} powers.namesByAddress where to find depositFacets by bech32
+ * @param {ReturnType<import('@agoric/vow').prepareVowTools>['when']} powers.when
  *
  * @typedef {import('@agoric/vats').NameHub} NameHub
  */
-const makePegasus = (zcf, board, namesByAddress) => {
+export const makePegasus = ({ zcf, board, namesByAddress, when }) => {
   /**
    * @typedef {object} LocalDenomState
    * @property {string} localAddr
@@ -190,6 +192,7 @@ const makePegasus = (zcf, board, namesByAddress) => {
             zcfMint.mintGains(harden(amounts), zcfSeat);
           },
           transferProtocol,
+          when,
         });
 
         const courierPK = getCourierPK(receiveDenom, receiveDenomToCourierPK);
@@ -282,6 +285,7 @@ const makePegasus = (zcf, board, namesByAddress) => {
               transferSeat,
             ),
           transferProtocol,
+          when,
         });
 
         const { receiveDenomToCourierPK } = localDenomState;
@@ -489,22 +493,8 @@ const makePegasus = (zcf, board, namesByAddress) => {
     },
   });
 };
+harden(makePegasus);
 
 /**
  * @typedef {ReturnType<typeof makePegasus>} Pegasus
  */
-
-/**
- * @param {ZCF<{board: ERef<BoardDepositFacet>, namesByAddress: ERef<import('@agoric/vats').NameHub>}>} zcf
- */
-const start = zcf => {
-  const { board, namesByAddress } = zcf.getTerms();
-
-  return {
-    publicFacet: makePegasus(zcf, board, namesByAddress),
-  };
-};
-
-harden(start);
-harden(makePegasus);
-export { start, makePegasus };

package/src/proposals/core-proposal.js

@@ -1,5 +1,4 @@
 // @ts-check
-/* eslint @typescript-eslint/no-floating-promises: "warn" */
 import { E, Far } from '@endo/far';
 import { makeNameHubKit } from '@agoric/vats/src/nameHub.js';
 import { observeIteration, subscribeEach } from '@agoric/notifier';
@@ -42,12 +41,13 @@ export const startPegasus = async ({
   },
 }) => {
   const [board, namesByAddress] = await Promise.all([boardP, namesByAddressP]);
-  const terms = { board, namesByAddress };
+  const privates = { board, namesByAddress };
 
   const { instance } = await E(zoe).startInstance(
     pegasusInstall,
     undefined,
-    terms,
+    undefined,
+    privates,
   );
 
   produceInstance.resolve(instance);
@@ -76,7 +76,9 @@ export const addPegasusTransferPort = async (
         void E(pegasusConnectionsAdmin).delete(localAddr);
       }
     },
-  });
+  }).catch(err =>
+    console.error('Error observing Pegasus connection kit:', err),
+  );
   return E(port).addListener(
     Far('listener', {
       async onAccept(_port, _localAddr, _remoteAddr, _listenHandler) {