@agoric/pegasus 0.7.13-other-dev-1f26562.0 → 0.7.13-other-dev-3eb1a1d.0

package/package.json

@@ -1,22 +1,21 @@
 {
   "name": "@agoric/pegasus",
-  "version": "0.7.13-other-dev-1f26562.0+1f26562",
+  "version": "0.7.13-other-dev-3eb1a1d.0+3eb1a1d",
   "description": "Peg-as-us contract",
   "type": "module",
   "main": "./src/pegasus.js",
   "engines": {
-    "node": ">=14.15.0"
+    "node": "^18.12 || ^20.9"
   },
   "scripts": {
-    "build": "yarn build:bundles",
-    "build:bundles": "node scripts/build-bundles.js",
+    "build": "exit 0",
     "test": "ava",
-    "test:c8": "c8 $C8_OPTIONS ava --config=ava-nesm.config.js",
+    "test:c8": "c8 --all $C8_OPTIONS ava",
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "run-s --continue-on-error lint:*",
     "lint:eslint": "eslint .",
-    "lint:types": "tsc -p jsconfig.json"
+    "lint:types": "tsc"
   },
   "repository": {
     "type": "git",
@@ -29,41 +28,49 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-other-dev-1f26562.0+1f26562",
-    "@agoric/ertp": "0.16.3-other-dev-1f26562.0+1f26562",
-    "@agoric/internal": "0.3.3-other-dev-1f26562.0+1f26562",
-    "@agoric/notifier": "0.6.3-other-dev-1f26562.0+1f26562",
-    "@agoric/store": "0.9.3-other-dev-1f26562.0+1f26562",
-    "@agoric/swingset-vat": "0.32.3-other-dev-1f26562.0+1f26562",
-    "@agoric/vats": "0.15.2-other-dev-1f26562.0+1f26562",
-    "@agoric/zoe": "0.26.3-other-dev-1f26562.0+1f26562",
-    "@endo/bundle-source": "2.5.2-upstream-rollup",
-    "@endo/captp": "3.1.1",
-    "@endo/far": "0.2.18",
-    "@endo/init": "0.5.56",
-    "@endo/nat": "4.1.27",
-    "@endo/promise-kit": "0.2.56"
+    "@agoric/ertp": "0.16.3-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/internal": "0.3.3-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/network": "0.1.1-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/notifier": "0.6.3-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/store": "0.9.3-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/swingset-vat": "0.32.3-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/vats": "0.15.2-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/vow": "0.1.1-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/zoe": "0.26.3-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/zone": "0.2.3-other-dev-3eb1a1d.0+3eb1a1d",
+    "@endo/bundle-source": "^3.5.0",
+    "@endo/captp": "^4.4.3",
+    "@endo/errors": "^1.2.8",
+    "@endo/far": "^1.1.9",
+    "@endo/init": "^1.1.7",
+    "@endo/nat": "^5.0.13",
+    "@endo/promise-kit": "^1.1.8"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.10.4-other-dev-1f26562.0+1f26562",
-    "ava": "^5.2.0",
-    "c8": "^7.13.0",
+    "@agoric/vat-data": "0.5.3-other-dev-3eb1a1d.0+3eb1a1d",
+    "ava": "^5.3.0",
+    "c8": "^10.1.2",
     "import-meta-resolve": "^2.2.1"
   },
   "files": [
     "scripts/",
     "src/",
-    "exported.js",
     "NEWS.md"
   ],
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/*.test.*"
+    ],
+    "require": [
+      "@endo/init/debug.js"
     ],
     "timeout": "10m"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1f265627270d514ab48943f86c668eb58a280552"
+  "typeCoverage": {
+    "atLeast": 91.21
+  },
+  "gitHead": "3eb1a1d2d75b2b4a94807cd3bf759bc9fc531f05"
 }

package/src/contract.js

@@ -0,0 +1,37 @@
+// @ts-check
+import { prepareVowTools } from '@agoric/vow/vat.js';
+import { makeDurableZone } from '@agoric/zone/durable.js';
+import { makePegasus } from './pegasus.js';
+
+/**
+ * @import {Remote} from '@agoric/vow';
+ */
+
+/**
+ * @type {ContractStartFn<import('./pegasus.js').Pegasus, never, {}, {
+ *   board: Remote<BoardDepositFacet>,
+ *   namesByAddress: Remote<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.
+  // @ts-expect-error makePegasus returns a remotable object
+  const publicFacet = zone.exo('PublicFacet', undefined, {
+    ...makePegasus({ zcf, board, namesByAddress, when }),
+  });
+
+  // @ts-expect-error XXX durable wrapping non-durable
+  return harden({
+    publicFacet,
+  });
+};
+harden(start);

package/src/courier.js

@@ -1,11 +1,17 @@
 // @ts-check
-import { details as X } from '@agoric/assert';
+import { X } from '@endo/errors';
 
 import { AmountMath } from '@agoric/ertp';
 import { WalletName } from '@agoric/internal';
 import { E, Far } from '@endo/far';
 import { makeOncePromiseKit } from './once-promise-kit.js';
 
+/**
+ * @import {DepositFacet} from '@agoric/ertp/src/types.js'
+ * @import {Connection} from '@agoric/network';
+ * @import {Remote} from '@agoric/vow';
+ */
+
 /**
  * Create or return an existing courier promise kit.
  *
@@ -29,18 +35,19 @@ export const getCourierPK = (key, keyToCourierPK) => {
 /**
  * Create the [send, receive] pair.
  *
- * @typedef {import('@agoric/vats').NameHub} NameHub
+ * @import {NameHub} from '@agoric/vats'
  *
  * @typedef {object} CourierArgs
  * @property {ZCF} zcf
- * @property {ERef<BoardDepositFacet>} board
- * @property {ERef<NameHub>} namesByAddress
+ * @property {Remote<BoardDepositFacet>} board
+ * @property {Remote<NameHub>} namesByAddress
  * @property {Denom} sendDenom
  * @property {Brand} localBrand
  * @property {(zcfSeat: ZCFSeat, amounts: AmountKeywordRecord) => void} retain
  * @property {(zcfSeat: ZCFSeat, amounts: AmountKeywordRecord) => void} redeem
- * @property {ERef<TransferProtocol>} transferProtocol
- * @param {ERef<Connection>} connection
+ * @property {Remote<TransferProtocol>} transferProtocol
+ * @property {ReturnType<import('@agoric/vow').prepareVowTools>['when']} when
+ * @param {Remote<Connection>} connection
  * @returns {(args: CourierArgs) => Courier}
  */
 export const makeCourierMaker =
@@ -54,23 +61,25 @@ export const makeCourierMaker =
     retain,
     redeem,
     transferProtocol,
+    when,
   }) => {
     /** @type {Sender} */
-    const send = async (zcfSeat, depositAddress) => {
+    const send = async (zcfSeat, depositAddress, memo, opts) => {
       const tryToSend = async () => {
         const amount = zcfSeat.getAmountAllocated('Transfer', localBrand);
         const transferPacket = await E(transferProtocol).makeTransferPacket({
           value: amount.value,
           remoteDenom: sendDenom,
           depositAddress,
+          memo,
+          opts,
         });
 
         // Retain the payment.  We must not proceed on failure.
         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/ibc-trace.js

@@ -1,8 +1,8 @@
 // @ts-check
+import { Fail } from '@endo/errors';
 import { Far } from '@endo/far';
-import { Fail } from '@agoric/assert';
 
-import { parse } from '@agoric/swingset-vat/src/vats/network/multiaddr.js';
+import { parse } from '@agoric/network';
 
 /**
  * Return a source-prefixed version of the denomination, as specified in

package/src/ics20.js

@@ -1,7 +1,7 @@
 // @ts-check
+import { assert, X, Fail, annotateError } from '@endo/errors';
 import { Nat } from '@endo/nat';
 import { Far } from '@endo/far';
-import { assert, details as X, Fail } from '@agoric/assert';
 
 /**
  * @typedef {object} ICS20TransferPacket Packet shape defined at:
@@ -10,15 +10,15 @@ import { assert, details as X, Fail } from '@agoric/assert';
  * @property {Denom} denom The denomination of the amount
  * @property {string} sender The sender address
  * @property {DepositAddress} receiver The receiver deposit address
+ * @property {string} memo The packet memo
  */
 
 // As specified in ICS20, the success result is a base64-encoded '\0x1' byte.
 const ICS20_TRANSFER_SUCCESS_RESULT = 'AQ==';
 
 // ibc-go as late as v3 requires the `sender` to be nonempty, but doesn't
-// actually use it on the receiving side.  We don't need it on the sending side,
-// either, so we can just omit it.
-export const DUMMY_SENDER_ADDRESS = 'pegasus';
+// actually use it on the receiving side.
+export const DEFAULT_SENDER_ADDRESS = 'pegasus';
 
 /**
  * @param {string} s
@@ -30,7 +30,7 @@ const safeJSONParseObject = s => {
   try {
     obj = JSON.parse(s);
   } catch (e) {
-    assert.note(e, X`${s} is not valid JSON`);
+    annotateError(e, X`${s} is not valid JSON`);
     throw e;
   }
   if (typeof obj !== 'object') {
@@ -50,10 +50,16 @@ const safeJSONParseObject = s => {
  */
 export const parseICS20TransferPacket = async packet => {
   const ics20Packet = safeJSONParseObject(packet);
-  const { amount, denom, receiver } = ics20Packet;
+  const { amount, denom, receiver, memo, opts } = ics20Packet;
 
   assert.typeof(denom, 'string', X`Denom ${denom} must be a string`);
   assert.typeof(receiver, 'string', X`Receiver ${receiver} must be a string`);
+  memo === undefined ||
+    assert.typeof(
+      memo,
+      'string',
+      X`Memo ${memo} must be a string or 'undefined'`,
+    );
 
   // amount is a string in JSON.
   assert.typeof(amount, 'string', X`Amount ${amount} must be a string`);
@@ -66,6 +72,8 @@ export const parseICS20TransferPacket = async packet => {
     depositAddress: receiver,
     remoteDenom: denom,
     value,
+    memo,
+    opts,
   });
 };
 
@@ -80,6 +88,8 @@ export const makeICS20TransferPacket = async ({
   value,
   remoteDenom,
   depositAddress,
+  memo,
+  opts: { sender = DEFAULT_SENDER_ADDRESS },
 }) => {
   // We're using Nat as a dynamic check for overflow.
   const stringValue = String(Nat(value));
@@ -90,7 +100,8 @@ export const makeICS20TransferPacket = async ({
     amount: stringValue,
     denom: remoteDenom,
     receiver: depositAddress,
-    sender: DUMMY_SENDER_ADDRESS,
+    sender,
+    memo,
   };
 
   return JSON.stringify(ics20);

package/src/once-promise-kit.js

@@ -1,7 +1,17 @@
 // @ts-check
-import { assert } from '@agoric/assert';
+import { assert } from '@endo/errors';
 import { makePromiseKit } from '@endo/promise-kit';
 
+/**
+ * Should be
+ * at-import {DetailsToken} from '@endo/errors'
+ * but somehow @endo/errors is not exporting that type.
+ * See https://github.com/endojs/endo/issues/2339
+ * In the meantime...
+ *
+ * @typedef {{}} DetailsToken
+ */
+
 /**
  * Create a promise kit that will throw an exception if it is resolved or
  * rejected more than once.

package/src/pegasus.js

@@ -1,6 +1,6 @@
 // @ts-check
 
-import { assert, details as X, Fail } from '@agoric/assert';
+import { assert, X, Fail, makeError } from '@endo/errors';
 import { makeLegacyWeakMap, makeLegacyMap } from '@agoric/store';
 import { E, Far } from '@endo/far';
 import {
@@ -9,15 +9,15 @@ import {
 } from '@agoric/zoe/src/contractSupport/index.js';
 import { makeSubscriptionKit } from '@agoric/notifier';
 
-import '@agoric/vats/exported.js';
-import '@agoric/swingset-vat/src/vats/network/types.js';
-import '@agoric/zoe/exported.js';
-
-import '../exported.js';
 import { IBCSourceTraceDenomTransformer } from './ibc-trace.js';
 import { ICS20TransferProtocol } from './ics20.js';
 import { makeCourierMaker, getCourierPK } from './courier.js';
 
+/**
+ * @import {CloseReason, Connection} from '@agoric/network';
+ * @import {Remote} from '@agoric/vow';
+ */
+
 const DEFAULT_DENOM_TRANSFORMER = IBCSourceTraceDenomTransformer;
 const DEFAULT_TRANSFER_PROTOCOL = ICS20TransferProtocol;
 
@@ -30,13 +30,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 {Remote<BoardDepositFacet>} powers.board where to find depositFacets by boardID
+ * @param {Remote<NameHub>} powers.namesByAddress where to find depositFacets by bech32
+ * @param {ReturnType<import('@agoric/vow').prepareVowTools>['when']} powers.when
  *
- * @typedef {import('@agoric/vats').NameHub} NameHub
+ * @import {NameHub} from '@agoric/vats'
  */
-const makePegasus = (zcf, board, namesByAddress) => {
+export const makePegasus = ({ zcf, board, namesByAddress, when }) => {
   /**
    * @typedef {object} LocalDenomState
    * @property {string} localAddr
@@ -61,7 +63,7 @@ const makePegasus = (zcf, board, namesByAddress) => {
   };
 
   /**
-   * @type {LegacyWeakMap<Peg, LocalDenomState>}
+   * @type {LegacyWeakMap<Remote<Peg>, LocalDenomState>}
    */
   // Legacy because Mappings mix functions and data
   const pegToDenomState = makeLegacyWeakMap('Peg');
@@ -104,8 +106,8 @@ const makePegasus = (zcf, board, namesByAddress) => {
    * @param {object} param0
    * @param {ReturnType<typeof makeCourierMaker>} param0.makeCourier
    * @param {LocalDenomState} param0.localDenomState
-   * @param {ERef<TransferProtocol>} param0.transferProtocol
-   * @param {ERef<DenomTransformer>} param0.denomTransformer
+   * @param {Remote<TransferProtocol>} param0.transferProtocol
+   * @param {Remote<DenomTransformer>} param0.denomTransformer
    * @returns {PegasusConnectionActions}
    */
   const makePegasusConnectionActions = ({
@@ -145,7 +147,7 @@ const makePegasus = (zcf, board, namesByAddress) => {
         // handled it correctly and that flow doesn't need to trigger an
         // additional UnhandledRejectionWarning in our vat.
         promise.catch(() => {});
-        reject(assert.error(X`${receiveDenom} is temporarily unavailable`));
+        reject(makeError(X`${receiveDenom} is temporarily unavailable`));
 
         // Allow new transfers to be initiated after this rejection.
         receiveDenomToCourierPK.delete(receiveDenom);
@@ -191,6 +193,7 @@ const makePegasus = (zcf, board, namesByAddress) => {
             zcfMint.mintGains(harden(amounts), zcfSeat);
           },
           transferProtocol,
+          when,
         });
 
         const courierPK = getCourierPK(receiveDenom, receiveDenomToCourierPK);
@@ -283,6 +286,7 @@ const makePegasus = (zcf, board, namesByAddress) => {
               transferSeat,
             ),
           transferProtocol,
+          when,
         });
 
         const { receiveDenomToCourierPK } = localDenomState;
@@ -304,9 +308,9 @@ const makePegasus = (zcf, board, namesByAddress) => {
         checkAbort = () => {
           throw reason;
         };
-        pegs.forEach(peg => {
+        for (const peg of pegs) {
           pegToDenomState.delete(peg);
-        });
+        }
       },
     });
     return pegasusConnectionActions;
@@ -316,8 +320,8 @@ const makePegasus = (zcf, board, namesByAddress) => {
     /**
      * Return a handler that can be used with the Network API.
      *
-     * @param {ERef<TransferProtocol>} [transferProtocol=DEFAULT_TRANSFER_PROTOCOL]
-     * @param {ERef<DenomTransformer>} [denomTransformer=DEFAULT_DENOM_TRANSFORMER]
+     * @param {Remote<TransferProtocol>} [transferProtocol]
+     * @param {Remote<DenomTransformer>} [denomTransformer]
      * @returns {PegasusConnectionKit}
      */
     makePegasusConnectionKit(
@@ -325,7 +329,7 @@ const makePegasus = (zcf, board, namesByAddress) => {
       denomTransformer = DEFAULT_DENOM_TRANSFORMER,
     ) {
       /**
-       * @type {LegacyWeakMap<Connection, LocalDenomState>}
+       * @type {LegacyWeakMap<Remote<Connection>, LocalDenomState>}
        */
       // Legacy because the value contains a JS Set
       const connectionToLocalDenomState = makeLegacyWeakMap('Connection');
@@ -357,7 +361,6 @@ const makePegasus = (zcf, board, namesByAddress) => {
             receiveDenomPublication,
             remoteDenomSubscription,
             abort: reason => {
-              // eslint-disable-next-line no-use-before-define
               actions.abort(reason);
             },
           };
@@ -385,9 +388,8 @@ const makePegasus = (zcf, board, namesByAddress) => {
         async onReceive(c, packetBytes) {
           const doReceive = async () => {
             // Dispatch the packet to the appropriate Peg for this connection.
-            const parts = await E(transferProtocol).parseTransferPacket(
-              packetBytes,
-            );
+            const parts =
+              await E(transferProtocol).parseTransferPacket(packetBytes);
 
             const { remoteDenom: receiveDenom } = parts;
             assert.typeof(receiveDenom, 'string');
@@ -424,7 +426,7 @@ const makePegasus = (zcf, board, namesByAddress) => {
             abort,
           } = connectionToLocalDenomState.get(c);
           connectionToLocalDenomState.delete(c);
-          const err = assert.error(X`pegasusConnectionHandler closed`);
+          const err = makeError(X`pegasusConnectionHandler closed`);
           receiveDenomPublication.fail(err);
           /** @type {PegasusConnection} */
           const state = harden({
@@ -456,11 +458,13 @@ const makePegasus = (zcf, board, namesByAddress) => {
     /**
      * Create a Zoe invitation to transfer assets over network to a deposit address.
      *
-     * @param {ERef<Peg>} pegP the peg over which to transfer
+     * @param {Remote<Peg>} pegP the peg over which to transfer
      * @param {DepositAddress} depositAddress the remote receiver's address
+     * @param {string} [memo] the memo to attach to ics transfer packet
+     * @param {SenderOptions} [opts] additional sender options
      * @returns {Promise<Invitation>} to transfer, make an offer of { give: { Transfer: pegAmount } } to this invitation
      */
-    async makeInvitationToTransfer(pegP, depositAddress) {
+    async makeInvitationToTransfer(pegP, depositAddress, memo = '', opts = {}) {
       // Verify the peg.
       const peg = await pegP;
       const denomState = pegToDenomState.get(peg);
@@ -482,29 +486,15 @@ const makePegasus = (zcf, board, namesByAddress) => {
        */
       const offerHandler = zcfSeat => {
         assertProposalShape(zcfSeat, TRANSFER_PROPOSAL_SHAPE);
-        send(zcfSeat, depositAddress);
+        send(zcfSeat, depositAddress, memo, opts);
       };
 
       return zcf.makeInvitation(offerHandler, `pegasus ${sendDenom} transfer`);
     },
   });
 };
+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

@@ -3,6 +3,10 @@ import { E, Far } from '@endo/far';
 import { makeNameHubKit } from '@agoric/vats/src/nameHub.js';
 import { observeIteration, subscribeEach } from '@agoric/notifier';
 
+/**
+ * @import {Connection, Port, PortAllocator} from '@agoric/network';
+ */
+
 export const CONTRACT_NAME = 'Pegasus';
 
 const t = 'pegasus';
@@ -19,7 +23,7 @@ export const getManifestForPegasus = ({ restoreRef }, { pegasusRef }) => ({
       },
     },
     listenPegasus: {
-      consume: { networkVat: t, pegasusConnectionsAdmin: t, zoe: t },
+      consume: { portAllocator: t, pegasusConnectionsAdmin: t, zoe: t },
       produce: { pegasusConnections: t, pegasusConnectionsAdmin: t },
       instance: {
         consume: { [CONTRACT_NAME]: t },
@@ -41,12 +45,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);
@@ -69,13 +74,15 @@ export const addPegasusTransferPort = async (
       const { localAddr, actions } = connectionState;
       if (actions) {
         // We're open and ready for business.
-        pegasusConnectionsAdmin.update(localAddr, connectionState);
+        void E(pegasusConnectionsAdmin).update(localAddr, connectionState);
       } else {
         // We're closed.
-        pegasusConnectionsAdmin.delete(localAddr);
+        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) {
@@ -90,7 +97,7 @@ export const addPegasusTransferPort = async (
 harden(addPegasusTransferPort);
 
 export const listenPegasus = async ({
-  consume: { networkVat, pegasusConnectionsAdmin: pegasusNameAdmin, zoe },
+  consume: { portAllocator, pegasusConnectionsAdmin: pegasusNameAdmin, zoe },
   produce: { pegasusConnections, pegasusConnectionsAdmin },
   instance: {
     consume: { [CONTRACT_NAME]: pegasusInstance },
@@ -101,7 +108,7 @@ export const listenPegasus = async ({
   pegasusConnectionsAdmin.resolve(nameAdmin);
 
   const pegasus = await E(zoe).getPublicFacet(pegasusInstance);
-  const port = await E(networkVat).bind('/ibc-port/pegasus');
+  const port = await E(portAllocator).allocateCustomIBCPort('pegasus');
   return addPegasusTransferPort(port, pegasus, pegasusNameAdmin);
 };
 harden(listenPegasus);

package/src/types.js

@@ -1,6 +1,9 @@
 // @ts-check
-// eslint-disable-next-line spaced-comment
-/// <reference types="ses"/>
+
+/// <reference types="ses" />
+/**
+ * @import {Bytes, ConnectionHandler} from '@agoric/network';
+ */
 
 /**
  * @typedef {string} Denom
@@ -9,9 +12,11 @@
 
 /**
  * @typedef {object} PacketParts
- * @property {AmountValue} value
+ * @property {import('@agoric/ertp/src/types.js').AmountValue} value
  * @property {Denom} remoteDenom
  * @property {DepositAddress} depositAddress
+ * @property {string} memo
+ * @property {SenderOptions} opts
  */
 
 /**
@@ -46,7 +51,7 @@
  */
 
 /**
- * @typedef {(zcfSeat: ZCFSeat, depositAddress: DepositAddress) => Promise<void>} Sender
+ * @typedef {(zcfSeat: ZCFSeat, depositAddress: DepositAddress, memo: string, opt: SenderOptions) => Promise<void>} Sender
  * Successive transfers are not guaranteed to be processed in the order in which they were sent.
  * @typedef {(parts: PacketParts) => Promise<Bytes>} Receiver
  * @typedef {object} Courier
@@ -110,3 +115,8 @@
  * @property {ConnectionHandler} handler
  * @property {Subscription<PegasusConnection>} subscription
  */
+
+/**
+ * @typedef {object} SenderOptions
+ * @property {string} [sender] the sender address attached to the packet to receive any refund
+ */

package/CHANGELOG.md

@@ -1,450 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-### [0.7.13-u11.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.7.12...@agoric/pegasus@0.7.13-u11.0) (2023-08-24)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.7.12](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.7.11...@agoric/pegasus@0.7.12) (2023-06-09)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.7.11](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.7.10...@agoric/pegasus@0.7.11) (2023-06-02)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.7.10](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.7.9...@agoric/pegasus@0.7.10) (2023-05-24)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.7.9](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.7.6...@agoric/pegasus@0.7.9) (2023-05-19)
-
-
-### Bug Fixes
-
-* use `subscribeEach` to get reconnect benefits ([fb24132](https://github.com/Agoric/agoric-sdk/commit/fb24132f9b4e117e56bae2803994e57c188344f3))
-* use atomicTransfers rather than stagings. ([#6577](https://github.com/Agoric/agoric-sdk/issues/6577)) ([65d3f14](https://github.com/Agoric/agoric-sdk/commit/65d3f14c8102993168d2568eed5e6acbcba0c48a))
-
-
-
-### [0.7.8](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.7.7...@agoric/pegasus@0.7.8) (2023-02-17)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.7.7](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.7.6...@agoric/pegasus@0.7.7) (2022-12-14)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.7.6](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.7.5...@agoric/pegasus@0.7.6) (2022-10-18)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.7.5](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.7.4...@agoric/pegasus@0.7.5) (2022-10-08)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.7.4](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.7.3...@agoric/pegasus@0.7.4) (2022-10-05)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.7.3](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.7.2...@agoric/pegasus@0.7.3) (2022-09-20)
-
-
-### Bug Fixes
-
-* show more stacks ([#5980](https://github.com/Agoric/agoric-sdk/issues/5980)) ([7e22057](https://github.com/Agoric/agoric-sdk/commit/7e220575af0e5b0607d821675c57a3714f48fd65))
-
-
-
-### [0.7.2](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.7.1...@agoric/pegasus@0.7.2) (2022-05-28)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.7.1](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.7.0...@agoric/pegasus@0.7.1) (2022-05-09)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-## [0.7.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.6.1...@agoric/pegasus@0.7.0) (2022-04-18)
-
-
-### ⚠ BREAKING CHANGES
-
-* consistent Node engine requirement (>=14.15.0)
-
-### Features
-
-* **pegasus:** prepare for governance ([4c921b5](https://github.com/Agoric/agoric-sdk/commit/4c921b501e425e861479c9197bc24d1d09f4a2ac))
-* **vats:** remove pegasus from bootstrap ([c384a41](https://github.com/Agoric/agoric-sdk/commit/c384a41c6e494059beb28c09a94e5625faa5f87e))
-* implement the durable kind API ([56bad98](https://github.com/Agoric/agoric-sdk/commit/56bad985275787d18c34ac14b377a4d0348d699b)), closes [#4495](https://github.com/Agoric/agoric-sdk/issues/4495)
-
-
-### Miscellaneous Chores
-
-* consistent Node engine requirement (>=14.15.0) ([ddc40fa](https://github.com/Agoric/agoric-sdk/commit/ddc40fa525f845ed900512c38b99f01458a3d131))
-
-
-
-### [0.6.1](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.6.0...@agoric/pegasus@0.6.1) (2022-02-24)
-
-
-### Features
-
-* overhaul the virtual object API ([e40674b](https://github.com/Agoric/agoric-sdk/commit/e40674b0b19f29adde2f5e6a460bafb7340d42b6)), closes [#4606](https://github.com/Agoric/agoric-sdk/issues/4606)
-
-
-
-## [0.6.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.5.1...@agoric/pegasus@0.6.0) (2022-02-21)
-
-
-### ⚠ BREAKING CHANGES
-
-* **pegasus:** make more robust and remove public state
-
-### Features
-
-* **pegasus:** implement correct result and denom trace handling ([aacf1c3](https://github.com/Agoric/agoric-sdk/commit/aacf1c39f840beb31702f3fcd3565771ccaf7817))
-* **pegasus:** make more robust and remove public state ([a5413f7](https://github.com/Agoric/agoric-sdk/commit/a5413f781fc694e3e11804b5288740e9319928ee))
-* **pegasus:** properly abort on connection close ([1b17f7a](https://github.com/Agoric/agoric-sdk/commit/1b17f7aa4de11ccd5a1ec26fc7b6fff017d70ac1))
-* **pegasus:** rejectStuckTransfers, getRemoteDenomSubscription ([54bf0bc](https://github.com/Agoric/agoric-sdk/commit/54bf0bc4e83172396962295ba76b8af3a8846df9))
-* implement persistent stores ([e1050b0](https://github.com/Agoric/agoric-sdk/commit/e1050b010e095b23547a38d48a12e5c8841a7466))
-
-
-### Bug Fixes
-
-* **pegasus:** more POLA and less global state ([e7ea320](https://github.com/Agoric/agoric-sdk/commit/e7ea32047f5a87a18c5ed4722d4d6e2163f7f2aa))
-* **pegasus:** more robust ics20 JSON parsing ([208109f](https://github.com/Agoric/agoric-sdk/commit/208109f2e4df9e4df5c2371c6a299a42349d5c69))
-* **pegasus:** only reject transfers waiting for pegRemote ([f1801f6](https://github.com/Agoric/agoric-sdk/commit/f1801f63ad81ec06fc3b86c3a44e98130b310351))
-* **pegasus:** use bigints for nonces ([9065d6e](https://github.com/Agoric/agoric-sdk/commit/9065d6ee205082efd2253e6bd06ee08676535b50))
-* **pegasus:** use dummy ICS20-1 transfer `sender` ([c4056bc](https://github.com/Agoric/agoric-sdk/commit/c4056bcd48800b6bfadb4de5eaccb66af6446ef4))
-* `rejectStuckTransfers` sends a TransferProtocol-level error ([8374f94](https://github.com/Agoric/agoric-sdk/commit/8374f941597e22ac20f40b959381218f03563f65))
-* Enhance TypeScript node_modules traversal depth ([000f738](https://github.com/Agoric/agoric-sdk/commit/000f73850d46dc7272b2399c06ad774dd3b8fe6e))
-
-
-
-### [0.5.1](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.5.0...@agoric/pegasus@0.5.1) (2021-12-22)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-## [0.5.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.4.5...@agoric/pegasus@0.5.0) (2021-12-02)
-
-
-### ⚠ BREAKING CHANGES
-
-* **zoe:** must harden `amountKeywordRecord` before passing to ZCF objects
-
-* chore: fix treasury errors, etc.
-
-Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
-
-### Bug Fixes
-
-* **zoe:** assert that amountKeywordRecord is a copyRecord ([#4069](https://github.com/Agoric/agoric-sdk/issues/4069)) ([fe9a9ff](https://github.com/Agoric/agoric-sdk/commit/fe9a9ff3de86608a0b1f8f9547059f89d45b948d))
-
-
-
-### [0.4.5](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.4.4...@agoric/pegasus@0.4.5) (2021-10-13)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.4.4](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.4.3...@agoric/pegasus@0.4.4) (2021-09-23)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.4.3](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.4.2...@agoric/pegasus@0.4.3) (2021-09-15)
-
-
-### Bug Fixes
-
-* more missing Fars. kill "this" ([#3746](https://github.com/Agoric/agoric-sdk/issues/3746)) ([7bd027a](https://github.com/Agoric/agoric-sdk/commit/7bd027a879f98a9a3f30429ee1b54e6057efec42))
-
-
-
-### [0.4.2](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.4.1...@agoric/pegasus@0.4.2) (2021-08-21)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.4.1](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.4.0...@agoric/pegasus@0.4.1) (2021-08-18)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-## [0.4.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.3.12...@agoric/pegasus@0.4.0) (2021-08-17)
-
-
-### ⚠ BREAKING CHANGES
-
-* make the run mint within Zoe, and give only the treasury the ability to create a ZCFMint with it
-
-* chore: change 'makeZoe' to 'makeZoeKit'
-
-* chore: add "shutdownZoeVat" argument to Zoe, and pass it to `makeIssuerKit` for invitation issuerKit and fee issuerKit
-
-* chore: manually lint-fix install-on-chain.js
-
-See https://github.com/Agoric/agoric-sdk/issues/3672 for the issue to fix the root problem
-
-* BREAKING CHANGE: create the RUN Mint within Zoe (#3647) ([48762aa](https://github.com/Agoric/agoric-sdk/commit/48762aa83a30eaa0a14b2fd87777456758594262)), closes [#3647](https://github.com/Agoric/agoric-sdk/issues/3647)
-
-
-
-### [0.3.12](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.3.11...@agoric/pegasus@0.3.12) (2021-08-16)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.3.11](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.3.8...@agoric/pegasus@0.3.11) (2021-08-15)
-
-### 0.26.10 (2021-07-28)
-
-
-### Bug Fixes
-
-* zoe/spawner/pegasus: use unlimited Meter, not metered: true ([04d4fd9](https://github.com/Agoric/agoric-sdk/commit/04d4fd96982ecd02de50f09fa38c6e2800cca527)), closes [#3308](https://github.com/Agoric/agoric-sdk/issues/3308)
-
-
-
-### [0.3.10](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.3.8...@agoric/pegasus@0.3.10) (2021-08-14)
-
-### 0.26.10 (2021-07-28)
-
-
-### Bug Fixes
-
-* zoe/spawner/pegasus: use unlimited Meter, not metered: true ([04d4fd9](https://github.com/Agoric/agoric-sdk/commit/04d4fd96982ecd02de50f09fa38c6e2800cca527)), closes [#3308](https://github.com/Agoric/agoric-sdk/issues/3308)
-
-
-
-### [0.3.9](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.3.8...@agoric/pegasus@0.3.9) (2021-07-28)
-
-
-### Bug Fixes
-
-* zoe/spawner/pegasus: use unlimited Meter, not metered: true ([04d4fd9](https://github.com/Agoric/agoric-sdk/commit/04d4fd96982ecd02de50f09fa38c6e2800cca527)), closes [#3308](https://github.com/Agoric/agoric-sdk/issues/3308)
-
-
-
-### [0.3.8](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.3.7...@agoric/pegasus@0.3.8) (2021-07-01)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.3.7](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.3.6...@agoric/pegasus@0.3.7) (2021-07-01)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.3.6](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.3.5...@agoric/pegasus@0.3.6) (2021-06-28)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.3.5](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.3.4...@agoric/pegasus@0.3.5) (2021-06-25)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.3.4](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.3.3...@agoric/pegasus@0.3.4) (2021-06-24)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.3.3](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.3.2...@agoric/pegasus@0.3.3) (2021-06-24)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.3.2](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.3.1...@agoric/pegasus@0.3.2) (2021-06-23)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-### [0.3.1](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.3.0...@agoric/pegasus@0.3.1) (2021-06-16)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-## [0.3.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.2.7...@agoric/pegasus@0.3.0) (2021-06-15)
-
-
-### ⚠ BREAKING CHANGES
-
-* **zoe:** new reallocate API to assist with reviewing conservation of rights (#3184)
-
-### Bug Fixes
-
-* Pin ESM to forked version ([54dbb55](https://github.com/Agoric/agoric-sdk/commit/54dbb55d64d7ff7adb395bc4bd9d1461dd2d3c17))
-
-
-### Code Refactoring
-
-* **zoe:** new reallocate API to assist with reviewing conservation of rights ([#3184](https://github.com/Agoric/agoric-sdk/issues/3184)) ([f34e5ea](https://github.com/Agoric/agoric-sdk/commit/f34e5eae0812a9823d40d2d05ba98522c7846f2a))
-
-
-
-## [0.2.7](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.2.6...@agoric/pegasus@0.2.7) (2021-05-10)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-## [0.2.6](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.2.5...@agoric/pegasus@0.2.6) (2021-05-05)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-## [0.2.5](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.2.4...@agoric/pegasus@0.2.5) (2021-05-05)
-
-
-### Bug Fixes
-
-* **pegasus:** update to new solo package ([cf91a04](https://github.com/Agoric/agoric-sdk/commit/cf91a04fa6ce53dc06de0ccb8c8173050134575a))
-
-
-
-
-
-## [0.2.4](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.2.3...@agoric/pegasus@0.2.4) (2021-04-22)
-
-
-### Bug Fixes
-
-* rename cosmos-level tokens uagstake/uag to ubld/urun ([0557983](https://github.com/Agoric/agoric-sdk/commit/0557983210571c9c2ba801d68644d71641a3f790))
-
-
-
-
-
-## [0.2.3](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.2.2...@agoric/pegasus@0.2.3) (2021-04-18)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-## [0.2.2](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.2.1...@agoric/pegasus@0.2.2) (2021-04-16)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-## [0.2.1](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.2.0...@agoric/pegasus@0.2.1) (2021-04-14)
-
-**Note:** Version bump only for package @agoric/pegasus
-
-
-
-
-
-# 0.2.0 (2021-04-13)
-
-
-### Bug Fixes
-
-* adjust Pegasus to actually work correctly with pegRemote ([8cd8c72](https://github.com/Agoric/agoric-sdk/commit/8cd8c72bc5fa207471ac2fdd9ac750dbdda7c39f))
-
-
-### Features
-
-* install Pegasus on chain bootstrap ([7615292](https://github.com/Agoric/agoric-sdk/commit/76152926942f9c0610ab3d08a45c464856779643))
-* integrate pegasus in chain bootstrap ([5c7ecba](https://github.com/Agoric/agoric-sdk/commit/5c7ecba05d0e6ec7ef9fe127ee89e0c79d3e6511))
-* move Pegasus contract to SDK ([d0ca2cc](https://github.com/Agoric/agoric-sdk/commit/d0ca2cc155953c63eef5f56f236fa9280984730a))

package/exported.js

@@ -1,5 +0,0 @@
-import './src/types.js';
-import '@agoric/notifier/exported.js';
-import '@agoric/ertp/exported.js';
-import '@agoric/store/exported.js';
-import '@agoric/swingset-vat/exported.js';

package/scripts/build-bundles.js

@@ -1,9 +0,0 @@
-#! /usr/bin/env node
-import '@endo/init';
-import { extractProposalBundles } from '@agoric/deploy-script-support';
-import url from 'url';
-
-import { defaultProposalBuilder } from './init-core.js';
-
-const dirname = url.fileURLToPath(new URL('.', import.meta.url));
-extractProposalBundles([['.', defaultProposalBuilder]], dirname);

package/scripts/init-core.js

@@ -1,20 +0,0 @@
-import { makeHelpers } from '@agoric/deploy-script-support';
-
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
-export const defaultProposalBuilder = async ({ publishRef, install }) =>
-  harden({
-    sourceSpec: '../src/proposals/core-proposal.js',
-    getManifestCall: [
-      'getManifestForPegasus',
-      {
-        pegasusRef: publishRef(
-          install('../src/pegasus.js', '../bundles/bundle-pegasus.js'),
-        ),
-      },
-    ],
-  });
-
-export default async (homeP, endowments) => {
-  const { writeCoreProposal } = await makeHelpers(homeP, endowments);
-  await writeCoreProposal('gov-pegasus', defaultProposalBuilder);
-};