@agoric/wallet-backend 0.13.4-dev-00b01e2.0 → 0.13.4-dev-968b7a3.0

package/deploy.js

@@ -3,7 +3,7 @@
 // FIXME: This is just hacked together for the legacy wallet.
 
 import { E } from '@endo/eventual-send';
-import { assert, details as X } from '@agoric/assert';
+import { Fail } from '@agoric/assert';
 import path from 'path';
 
 const filename = new URL(import.meta.url).pathname;
@@ -63,7 +63,7 @@ export default async function deployWallet(
       issuers.map(async ([issuerPetname, issuer]) => {
         const brand = await E(issuer).getBrand();
         const brandMatches = E(brand).isMyIssuer(issuer);
-        assert(brandMatches, X`issuer was using a brand which was not its own`);
+        brandMatches || Fail`issuer was using a brand which was not its own`;
         brandToIssuer.set(brand, { issuerPetname, issuer });
       }),
     ]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/wallet-backend",
-  "version": "0.13.4-dev-00b01e2.0+00b01e2",
+  "version": "0.13.4-dev-968b7a3.0+968b7a3",
   "description": "Wallet backend",
   "type": "module",
   "scripts": {
@@ -14,23 +14,23 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.9.5-dev-00b01e2.0+00b01e2",
-    "@agoric/vats": "0.13.1-dev-00b01e2.0+00b01e2",
+    "@agoric/deploy-script-support": "0.9.5-dev-968b7a3.0+968b7a3",
+    "@agoric/vats": "0.13.1-dev-968b7a3.0+968b7a3",
     "@endo/bundle-source": "^2.4.2",
     "@endo/init": "^0.5.52",
     "ava": "^5.0.1"
   },
   "dependencies": {
-    "@agoric/assert": "0.5.2-dev-00b01e2.0+00b01e2",
-    "@agoric/cache": "0.2.4-dev-00b01e2.0+00b01e2",
-    "@agoric/ertp": "0.15.4-dev-00b01e2.0+00b01e2",
-    "@agoric/inter-protocol": "0.13.2-dev-00b01e2.0+00b01e2",
-    "@agoric/internal": "0.2.2-dev-00b01e2.0+00b01e2",
+    "@agoric/assert": "0.5.2-dev-968b7a3.0+968b7a3",
+    "@agoric/cache": "0.2.4-dev-968b7a3.0+968b7a3",
+    "@agoric/ertp": "0.15.4-dev-968b7a3.0+968b7a3",
+    "@agoric/inter-protocol": "0.13.2-dev-968b7a3.0+968b7a3",
+    "@agoric/internal": "0.2.2-dev-968b7a3.0+968b7a3",
     "@agoric/nat": "^4.1.0",
-    "@agoric/notifier": "0.5.2-dev-00b01e2.0+00b01e2",
-    "@agoric/store": "0.8.4-dev-00b01e2.0+00b01e2",
-    "@agoric/vat-data": "0.4.4-dev-00b01e2.0+00b01e2",
-    "@agoric/zoe": "0.25.4-dev-00b01e2.0+00b01e2",
+    "@agoric/notifier": "0.5.2-dev-968b7a3.0+968b7a3",
+    "@agoric/store": "0.8.4-dev-968b7a3.0+968b7a3",
+    "@agoric/vat-data": "0.4.4-dev-968b7a3.0+968b7a3",
+    "@agoric/zoe": "0.25.4-dev-968b7a3.0+968b7a3",
     "@endo/eventual-send": "^0.16.8",
     "@endo/marshal": "^0.8.1",
     "@endo/promise-kit": "^0.2.52",
@@ -57,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "00b01e21e95b868e2b28e16a55490f1ddfa33964"
+  "gitHead": "968b7a3fb5d54284ce9beef937624d751cb2f8d3"
 }

package/src/findOrMakeInvitation.js

@@ -1,4 +1,4 @@
-import { assert, details as X, q } from '@agoric/assert';
+import { assert, Fail, q } from '@agoric/assert';
 import { E } from '@endo/eventual-send';
 import { passStyleOf } from '@endo/marshal';
 import { AmountMath } from '@agoric/ertp';
@@ -8,14 +8,12 @@ export const makeId = (dappOrigin, rawId) => `${dappOrigin}#${rawId}`;
 const assertFirstCapASCII = str => {
   assert.typeof(str, 'string');
   const firstCapASCII = /^[A-Z][a-zA-Z0-9_$]*$/;
-  assert(
-    firstCapASCII.test(str),
-    X`The string ${q(
+  firstCapASCII.test(str) ||
+    Fail`The string ${q(
       str,
-    )} must be an ascii identifier starting with upper case.`,
-  );
+    )} must be an ascii identifier starting with upper case.`;
   (str !== 'NaN' && str !== 'Infinity') ||
-    assert.fail(X`keyword ${q(str)} must not be a number's name`);
+    Fail`keyword ${q(str)} must not be a number's name`;
 };
 
 /**
@@ -31,8 +29,7 @@ const findByBoardId = async (invitationPurseBalance, { board, boardId }) => {
   const invitationHandle = await E(board).getValue(boardId);
   const match = element => element.handle === invitationHandle;
   const matchingValue = invitationPurseBalance.value.find(match);
-  matchingValue ||
-    assert.fail(X`Cannot find invitation corresponding to ${q(boardId)}`);
+  matchingValue || Fail`Cannot find invitation corresponding to ${q(boardId)}`;
 
   return harden([matchingValue]);
 };
@@ -53,7 +50,7 @@ const findByKeyValuePairs = async (invitationPurseBalance, kvs) => {
     );
 
   const matchingValue = invitationPurseBalance.value.find(matches);
-  assert(matchingValue, X`Cannot find invitation corresponding to ${q(kvs)}`);
+  matchingValue || Fail`Cannot find invitation corresponding to ${q(kvs)}`;
   return harden([matchingValue]);
 };
 
@@ -169,5 +166,5 @@ export const findOrMakeInvitation = async (
     );
   }
 
-  assert.fail(X`no invitation was found or made for this offer ${offer.id}`);
+  throw Fail`no invitation was found or made for this offer ${offer.id}`;
 };

package/src/lib-dehydrate.js

@@ -2,7 +2,7 @@
 
 import { makeMarshal, mapIterable } from '@endo/marshal';
 import { makeLegacyMap, makeScalarMap } from '@agoric/store';
-import { assert, details as X, q } from '@agoric/assert';
+import { assert, Fail, q } from '@agoric/assert';
 
 /**
  * @typedef {string[]} Path
@@ -14,7 +14,7 @@ export const isPath = x => {
   if (!Array.isArray(x)) {
     return false;
   }
-  assert(x.length > 0, X`Path ${q(x)} must not be empty`);
+  x.length > 0 || Fail`Path ${q(x)} must not be empty`;
   for (const name of x) {
     if (typeof name !== 'string') {
       return false;
@@ -49,9 +49,7 @@ export const makeDehydrator = (initialUnnamedCount = 0) => {
    */
   const explode = data => {
     data.startsWith(IMPLODE_PREFIX) ||
-      assert.fail(
-        X`exploded string ${data} must start with ${q(IMPLODE_PREFIX)}`,
-      );
+      Fail`exploded string ${data} must start with ${q(IMPLODE_PREFIX)}`;
     const strongname = JSON.parse(data.slice(IMPLODE_PREFIX.length));
     if (!isPath(strongname)) {
       return strongname;
@@ -79,7 +77,7 @@ export const makeDehydrator = (initialUnnamedCount = 0) => {
     const { petnameToVal: petnameToRoot } = edgeMapping;
     if (!petnameToRoot.has(path[0])) {
       // Avoid asserting, which fills up the logs.
-      assert.fail(X`Edgename for ${q(path[0])} petname not found`);
+      Fail`Edgename for ${q(path[0])} petname not found`;
     }
     const root = petnameToRoot.get(path[0]);
     path[0] = root;
@@ -94,7 +92,7 @@ export const makeDehydrator = (initialUnnamedCount = 0) => {
    * @returns {Mapping<T>}
    */
   const makeMapping = (kind, { useLegacyMap = false } = {}) => {
-    assert.typeof(kind, 'string', X`kind ${kind} must be a string`);
+    typeof kind === 'string' || `kind ${kind} must be a string`;
     const makeMap = useLegacyMap ? makeLegacyMap : makeScalarMap;
     // These are actually either a LegacyMap or a MapStore depending on
     // useLegacyMap. Fortunately, the LegacyMap type is approximately the
@@ -164,7 +162,7 @@ export const makeDehydrator = (initialUnnamedCount = 0) => {
      * @param {any} val
      */
     const addPath = (path, val) => {
-      assert(isPath(path), X`path ${q(path)} must be an array of strings`);
+      isPath(path) || Fail`path ${q(path)} must be an array of strings`;
 
       if (
         !valToPetname.has(val) &&
@@ -206,9 +204,8 @@ export const makeDehydrator = (initialUnnamedCount = 0) => {
       if (petnameToVal.has(petname) && petnameToVal.get(petname) === val) {
         return;
       }
-      !petnameToVal.has(petname) ||
-        assert.fail(X`petname ${petname} is already in use`);
-      assert(!valToPetname.has(val), X`val ${val} already has a petname`);
+      !petnameToVal.has(petname) || Fail`petname ${petname} is already in use`;
+      !valToPetname.has(val) || Fail`val ${val} already has a petname`;
       petnameToVal.init(petname, val);
       valToPetname.init(val, petname);
 
@@ -219,11 +216,8 @@ export const makeDehydrator = (initialUnnamedCount = 0) => {
 
     const renamePetname = (petname, val) => {
       valToPetname.has(val) ||
-        assert.fail(
-          X`val ${val} has not been previously named, would you like to add it instead?`,
-        );
-      !petnameToVal.has(petname) ||
-        assert.fail(X`petname ${petname} is already in use`);
+        Fail`val ${val} has not been previously named, would you like to add it instead?`;
+      !petnameToVal.has(petname) || Fail`petname ${petname} is already in use`;
       // Delete the old mappings.
       const oldPetname = valToPetname.get(val);
       petnameToVal.delete(oldPetname);
@@ -266,12 +260,10 @@ export const makeDehydrator = (initialUnnamedCount = 0) => {
     };
 
     const deletePetname = petname => {
-      assert(
-        petnameToVal.has(petname),
-        X`petname ${q(
+      petnameToVal.has(petname) ||
+        Fail`petname ${q(
           petname,
-        )} has not been previously named, would you like to add it instead?`,
-      );
+        )} has not been previously named, would you like to add it instead?`;
 
       // Delete the mappings.
       const val = petnameToVal.get(petname);

package/src/lib-wallet.js

@@ -11,7 +11,7 @@
  * and dapps.
  */
 
-import { assert, details as X, q } from '@agoric/assert';
+import { assert, q, Fail } from '@agoric/assert';
 import { makeScalarStoreCoordinator } from '@agoric/cache';
 import { objectMap } from '@agoric/internal';
 import { makeLegacyMap, makeScalarMap, makeScalarWeakMap } from '@agoric/store';
@@ -670,7 +670,7 @@ export function makeWalletRoot({
       async ([keyword, { type, ...amount }]) => {
         const purse = purseKeywordRecord[keyword];
         purse !== undefined ||
-          assert.fail(X`purse was not found for keyword ${q(keyword)}`);
+          Fail`purse was not found for keyword ${q(keyword)}`;
 
         if (type === 'Attestation') {
           const payment = await E(attMakerPK.promise).makeAttestation(amount);
@@ -886,13 +886,10 @@ export function makeWalletRoot({
     const found = [...contactMapping.petnameToVal.entries()].find(
       ([_pn, { depositBoardId: dbid }]) => depositBoardId === dbid,
     );
-
-    assert(
-      !found,
-      X`${q(found && found[0])} is already the petname for board ID ${q(
+    !found ||
+      Fail`${q(found && found[0])} is already the petname for board ID ${q(
         depositBoardId,
-      )}`,
-    );
+      )}`;
 
     const contact = harden(
       addMeta({
@@ -1650,10 +1647,8 @@ export function makeWalletRoot({
   /** @type {IssuerManager} */
   const issuerManager = Far('IssuerManager', {
     rename: async (petname, issuer) => {
-      assert(
-        brandTable.hasByIssuer(issuer),
-        `issuer has not been previously added`,
-      );
+      brandTable.hasByIssuer(issuer) ||
+        Fail`issuer has not been previously added`;
       const brandRecord = brandTable.getByIssuer(issuer);
       brandMapping.renamePetname(petname, brandRecord.brand);
       await updateAllState();
@@ -1712,7 +1707,7 @@ export function makeWalletRoot({
       passStyleOf(offerResult) === 'copyRecord',
       `offerResult must be a record to have a uiNotifier`,
     );
-    assert(offerResult.uiNotifier, X`offerResult does not have a uiNotifier`);
+    offerResult.uiNotifier || Fail`offerResult does not have a uiNotifier`;
     return offerResult.uiNotifier;
   }
 
@@ -1735,11 +1730,9 @@ export function makeWalletRoot({
 
     const { publicSubscribers } = offerResult;
     publicSubscribers ||
-      assert.fail(
-        X`offerResult ${offerResult} does not have publicSubscribers`,
-      );
+      Fail`offerResult ${offerResult} does not have publicSubscribers`;
     passStyleOf(publicSubscribers) === 'copyRecord' ||
-      assert.fail(X`publicSubscribers ${publicSubscribers} must be a record`);
+      Fail`publicSubscribers ${publicSubscribers} must be a record`;
 
     return publicSubscribers;
   }
@@ -1805,13 +1798,10 @@ export function makeWalletRoot({
     const idOnly =
       (kind, lookup) =>
       (...path) => {
-        assert.equal(
-          path.length,
-          1,
-          X`${assert.quote(
+        path.length === 1 ||
+          Fail`${assert.quote(
             kind,
-          )} lookup must be called with a single offer ID, not ${path}`,
-        );
+          )} lookup must be called with a single offer ID, not ${path}`;
         return lookup(path[0]);
       };
     makeLookup('offer', idOnly('offer', idToOffer.get));
@@ -1969,14 +1959,16 @@ export function makeWalletRoot({
       return board;
     },
     getAgoricNames(...path) {
-      assert(agoricNames, X`agoricNames was not supplied to the wallet maker`);
+      if (!agoricNames) {
+        throw Fail`agoricNames was not supplied to the wallet maker`;
+      }
       return E(agoricNames).lookup(...path);
     },
     getNamesByAddress(...path) {
       if (namesByAddress === undefined) {
         // TypeScript confused about `||` control flow so use `if` instead
         // https://github.com/microsoft/TypeScript/issues/50739
-        assert.fail(X`namesByAddress was not supplied to the wallet maker`);
+        throw Fail`namesByAddress was not supplied to the wallet maker`;
       }
       return E(namesByAddress).lookup(...path);
     },

package/src/marshal-contexts.js

@@ -3,7 +3,7 @@ import { makeScalarMap } from '@agoric/store';
 import { Far, makeMarshal, Remotable } from '@endo/marshal';
 import { HandledPromise } from '@endo/eventual-send'; // TODO: convince tsc this isn't needed
 
-const { details: X, quote: q } = assert;
+const { Fail, quote: q } = assert;
 
 /**
  * For a value with a known id in the board, we can use
@@ -155,7 +155,7 @@ export const makeExportContext = () => {
       return boardObjects.bySlot.get(slot);
     }
     const { kind, id } = parseWalletSlot(walletObjects, slot);
-    assert(kind, X`bad slot kind: ${slot}`);
+    kind || Fail`bad slot kind: ${slot}`;
     const val = walletObjects[kind].bySlot.get(id); // or throw
     return val;
   };
@@ -287,7 +287,7 @@ export const makeImportContext = (makePresence = defaultMakePresence) => {
      * @param {string} iface
      */
     fromBoard: (slot, iface) => {
-      assert(isBoardId(slot), X`bad board slot ${q(slot)}`);
+      isBoardId(slot) || Fail`bad board slot ${q(slot)}`;
       return provideVal(boardObjects, slot, iface);
     },
 
@@ -312,7 +312,9 @@ export const makeImportContext = (makePresence = defaultMakePresence) => {
     /** @param {unknown} val */
     fromMyWallet: val => {
       const kind = findKey(walletObjects, k => walletObjects[k].byVal.has(val));
-      assert(kind, X`cannot serialize unregistered ${val}`);
+      if (kind === undefined) {
+        throw Fail`cannot serialize unregistered ${val}`;
+      }
 
       const id = walletObjects[kind].byVal.get(val);
       return makeWalletSlot(walletObjects, kind, id);