@agoric/wallet-backend 0.13.5 → 0.13.6-dev-d32a66a.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/jsconfig.json

@@ -1,20 +1,6 @@
 // This file can contain .js-specific Typescript compiler config.
 {
-  "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-
-    "noEmit": true,
-/*
-    // The following flags are for creating .d.ts files:
-    "noEmit": false,
-    "declaration": true,
-    "emitDeclarationOnly": true,
-*/
-    "downlevelIteration": true,
-    "strictNullChecks": true,
-    "moduleResolution": "node",
-  },
+  "extends": "../../../tsconfig.json",
   "include": [
     "*.js",
     "scripts/**/*.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/wallet-backend",
-  "version": "0.13.5",
+  "version": "0.13.6-dev-d32a66a.0+d32a66a",
   "description": "Wallet backend",
   "type": "module",
   "scripts": {
@@ -10,31 +10,31 @@
     "test:xs": "exit 0",
     "lint": "run-s --continue-on-error lint:*",
     "lint-fix": "yarn lint:eslint --fix",
-    "lint:types": "tsc --maxNodeModuleJsDepth 3 -p jsconfig.json",
+    "lint:types": "tsc -p jsconfig.json",
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "^0.9.6",
-    "@agoric/vats": "^0.13.2",
-    "@endo/bundle-source": "^2.3.1",
-    "@endo/init": "^0.5.49",
-    "ava": "^4.3.1"
+    "@agoric/vats": "0.13.3-dev-d32a66a.0+d32a66a",
+    "@endo/bundle-source": "^2.5.1",
+    "@endo/init": "^0.5.56",
+    "ava": "^5.2.0"
   },
   "dependencies": {
-    "@agoric/assert": "^0.5.1",
-    "@agoric/cache": "^0.2.4",
-    "@agoric/ertp": "^0.15.5",
-    "@agoric/inter-protocol": "^0.13.3",
-    "@agoric/internal": "^0.2.1",
-    "@agoric/nat": "^4.1.0",
-    "@agoric/notifier": "^0.5.1",
-    "@agoric/store": "^0.8.5",
-    "@agoric/vat-data": "^0.4.5",
-    "@agoric/zoe": "^0.25.5",
-    "@endo/eventual-send": "^0.16.5",
-    "@endo/marshal": "^0.7.5",
-    "@endo/promise-kit": "^0.2.49",
-    "import-meta-resolve": "^1.1.1"
+    "@agoric/assert": "0.5.2-dev-d32a66a.0+d32a66a",
+    "@agoric/cache": "0.2.5-dev-d32a66a.0+d32a66a",
+    "@agoric/ertp": "0.15.6-dev-d32a66a.0+d32a66a",
+    "@agoric/internal": "0.2.2-dev-d32a66a.0+d32a66a",
+    "@agoric/notifier": "0.5.2-dev-d32a66a.0+d32a66a",
+    "@agoric/smart-wallet": "0.4.5-dev-d32a66a.0+d32a66a",
+    "@agoric/store": "0.8.6-dev-d32a66a.0+d32a66a",
+    "@agoric/time": "0.2.2-dev-d32a66a.0+d32a66a",
+    "@agoric/vat-data": "0.4.6-dev-d32a66a.0+d32a66a",
+    "@agoric/zoe": "0.25.6-dev-d32a66a.0+d32a66a",
+    "@endo/eventual-send": "^0.17.2",
+    "@endo/marshal": "^0.8.5",
+    "@endo/nat": "^4.1.27",
+    "@endo/promise-kit": "^0.2.56",
+    "import-meta-resolve": "^2.2.1"
   },
   "keywords": [],
   "repository": {
@@ -57,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "636c850161d29c0368b4dec03c90e2674e8d6479"
+  "gitHead": "d32a66afa6bc92169b51ad73adf2432f4e2ef848"
 }

package/scripts/build-bundles.js

@@ -1,6 +1,6 @@
 #! /usr/bin/env node
 import '@endo/init';
-import { createBundles } from '@agoric/deploy-script-support';
+import { createBundles } from '@agoric/internal/src/node/createBundles.js';
 import url from 'url';
 
 const dirname = url.fileURLToPath(new URL('.', import.meta.url));

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,20 +8,18 @@ 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`;
 };
 
 /**
  * @param {Amount<'set'>} invitationPurseBalance
  * @param {object} query
- * @param {Board} query.board
+ * @param {import('@agoric/vats').Board} query.board
  * @param {string} query.boardId
  * @returns {Promise<Array>}
  * @deprecated
@@ -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]);
 };
 
@@ -94,7 +91,7 @@ const makeContinuingInvitation = async (
 /**
  * @param {InvitationMaker} invitationMaker
  * @param {string} instanceHandleBoardId
- * @param {Board} board
+ * @param {import('@agoric/vats').Board} board
  * @param {ZoeService} zoe
  * @returns {Promise<Invitation>}
  */
@@ -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/internal-types.js

@@ -7,6 +7,8 @@
  * @property {PurseActions} actions
  */
 
+/** @typedef {import('@agoric/deploy-script-support/src/externalTypes').Petname} Petname */
+
 /**
  * @typedef {PursesJSONState & PursesAddedState} PursesFullState
  */
@@ -27,12 +29,12 @@
 
 /**
  * @typedef {object} Contact
- * @property {string=} depositBoardId
+ * @property {string} [depositBoardId]
  */
 
 /**
  * @typedef {object} DappRecord
- * @property {Promise<void>=} approvalP
+ * @property {Promise<void>} [approvalP]
  * @property {Petname} suggestedPetname
  * @property {Petname} petname
  * @property {boolean} enable
@@ -54,11 +56,11 @@
  * @property {(petname: Petname) => string} implode
  * @property {(str: string) => Petname} explode
  * @property {LegacyWeakMap<T, Petname>} valToPetname
- * @property {WeakStore<T, string[][]>} valToPaths
+ * @property {WeakMapStore<T, string[][]>} valToPaths
  *   TODO What about when useLegacyMap is true because contact have
  *   identity? `T` would be `Contact`. Shouldn't `valToPaths` be
  *   a `LegacyWeakMap`?
- * @property {Store<Petname, T>} petnameToVal
+ * @property {MapStore<Petname, T>} petnameToVal
  * @property {(petname: Petname, val: T) => void} addPetname
  * @property {(path: string[], val: T) => void} addPath
  * @property {(petname: Petname, val: T) => void} renamePetname

package/src/issuerTable.js

@@ -3,7 +3,7 @@
 import { assert } from '@agoric/assert';
 import { E } from '@endo/eventual-send';
 
-import { makeWeakStore } from '@agoric/store';
+import { makeScalarWeakMapStore } from '@agoric/store';
 
 import '../exported.js';
 import './internal-types.js';
@@ -21,10 +21,10 @@ import './internal-types.js';
  * remote calls to get the brand and AmountMath and save them.
  */
 const makeIssuerTable = () => {
-  /** @type {WeakStore<Brand,IssuerRecord>} */
-  const brandToIssuerRecord = makeWeakStore('brand');
-  /** @type {WeakStore<Issuer,IssuerRecord>} */
-  const issuerToIssuerRecord = makeWeakStore('issuer');
+  /** @type {WeakMapStore<Brand,IssuerRecord>} */
+  const brandToIssuerRecord = makeScalarWeakMapStore('brand');
+  /** @type {WeakMapStore<Issuer,IssuerRecord>} */
+  const issuerToIssuerRecord = makeScalarWeakMapStore('issuer');
 
   /** @type {IssuerTable} */
   const issuerTable = {

package/src/lib-dehydrate.js

@@ -1,8 +1,8 @@
 // @ts-check
 
 import { makeMarshal, mapIterable } from '@endo/marshal';
-import { makeLegacyMap, makeScalarMap } from '@agoric/store';
-import { assert, details as X, q } from '@agoric/assert';
+import { makeLegacyMap, makeScalarMapStore } from '@agoric/store';
+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;
@@ -40,8 +40,8 @@ export const makeDehydrator = (initialUnnamedCount = 0) => {
   // Paths are kept across all kinds.
   // TODO What about when useLegacyMap is true because contact have
   // identity?
-  /** @type {Store<any, Path[]>} */
-  const valToPaths = makeScalarMap('value');
+  /** @type {MapStore<any, Path[]>} */
+  const valToPaths = makeScalarMapStore('value');
 
   /**
    * @param {string} data
@@ -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;
@@ -90,12 +88,12 @@ export const makeDehydrator = (initialUnnamedCount = 0) => {
   /**
    * @template T
    * @param {string} kind
-   * @param {{useLegacyMap?: boolean}=} legacyOptions
+   * @param {{ useLegacyMap?: boolean }} [legacyOptions]
    * @returns {Mapping<T>}
    */
   const makeMapping = (kind, { useLegacyMap = false } = {}) => {
-    assert.typeof(kind, 'string', X`kind ${kind} must be a string`);
-    const makeMap = useLegacyMap ? makeLegacyMap : makeScalarMap;
+    typeof kind === 'string' || `kind ${kind} must be a string`;
+    const makeMap = useLegacyMap ? makeLegacyMap : makeScalarMapStore;
     // These are actually either a LegacyMap or a MapStore depending on
     // useLegacyMap. Fortunately, the LegacyMap type is approximately the
     // intersection of these, so we can just use it.
@@ -123,9 +121,9 @@ export const makeDehydrator = (initialUnnamedCount = 0) => {
         return mapIterable(rawValToPetname.values(), val => explode(val));
       },
     };
-    /** @type {Store<string, T>} */
-    const rawPetnameToVal = makeScalarMap('petname');
-    /** @type {Store<Path | string, T>} */
+    /** @type {MapStore<string, T>} */
+    const rawPetnameToVal = makeScalarMapStore('petname');
+    /** @type {MapStore<Path | string, T>} */
     const petnameToVal = {
       ...rawPetnameToVal,
       init(key, val) {
@@ -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);
@@ -341,7 +333,7 @@ export const makeDehydrator = (initialUnnamedCount = 0) => {
     return petnameToVal.get(petname);
   };
 
-  const { serialize: dehydrate, unserialize: hydrate } = makeMarshal(
+  const { toCapData: dehydrate, fromCapData: hydrate } = makeMarshal(
     convertValToName,
     convertNameToVal,
     {
@@ -349,6 +341,7 @@ export const makeDehydrator = (initialUnnamedCount = 0) => {
       // TODO Temporary hack.
       // See https://github.com/Agoric/agoric-sdk/issues/2780
       errorIdNum: 30000,
+      serializeBodyFormat: 'smallcaps',
     },
   );
   return harden({
@@ -358,7 +351,7 @@ export const makeDehydrator = (initialUnnamedCount = 0) => {
     /**
      * @template T
      * @param {string} kind
-     * @param {{useLegacyMap?: boolean}=} legacyOptions
+     * @param {{ useLegacyMap?: boolean }} [legacyOptions]
      * @returns {Mapping<T>}
      */
     makeMapping: (kind, legacyOptions = undefined) => {