@agoric/smart-wallet 0.5.4-other-dev-fbe72e7.0.fbe72e7 → 0.5.4-other-dev-d15096d.0.d15096d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/smart-wallet",
-  "version": "0.5.4-other-dev-fbe72e7.0.fbe72e7",
+  "version": "0.5.4-other-dev-d15096d.0.d15096d",
   "description": "Wallet contract",
   "type": "module",
   "main": "src/index.js",
@@ -18,9 +18,9 @@
     "lint:eslint": "yarn run -T eslint ."
   },
   "devDependencies": {
-    "@agoric/casting": "0.4.3-other-dev-fbe72e7.0.fbe72e7",
-    "@agoric/cosmic-proto": "0.4.1-other-dev-fbe72e7.0.fbe72e7",
-    "@agoric/swingset-vat": "0.32.3-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/casting": "0.4.3-other-dev-d15096d.0.d15096d",
+    "@agoric/cosmic-proto": "0.4.1-other-dev-d15096d.0.d15096d",
+    "@agoric/swingset-vat": "0.32.3-other-dev-d15096d.0.d15096d",
     "@endo/bundle-source": "^4.1.2",
     "@endo/captp": "^4.4.8",
     "@endo/init": "^1.1.12",
@@ -28,15 +28,15 @@
     "import-meta-resolve": "^4.1.0"
   },
   "dependencies": {
-    "@agoric/ertp": "0.16.3-other-dev-fbe72e7.0.fbe72e7",
-    "@agoric/internal": "0.3.3-other-dev-fbe72e7.0.fbe72e7",
-    "@agoric/notifier": "0.6.3-other-dev-fbe72e7.0.fbe72e7",
-    "@agoric/store": "0.9.3-other-dev-fbe72e7.0.fbe72e7",
-    "@agoric/vat-data": "0.5.3-other-dev-fbe72e7.0.fbe72e7",
-    "@agoric/vats": "0.15.2-other-dev-fbe72e7.0.fbe72e7",
-    "@agoric/vow": "0.1.1-other-dev-fbe72e7.0.fbe72e7",
-    "@agoric/zoe": "0.26.3-other-dev-fbe72e7.0.fbe72e7",
-    "@agoric/zone": "0.2.3-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/ertp": "0.16.3-other-dev-d15096d.0.d15096d",
+    "@agoric/internal": "0.3.3-other-dev-d15096d.0.d15096d",
+    "@agoric/notifier": "0.6.3-other-dev-d15096d.0.d15096d",
+    "@agoric/store": "0.9.3-other-dev-d15096d.0.d15096d",
+    "@agoric/vat-data": "0.5.3-other-dev-d15096d.0.d15096d",
+    "@agoric/vats": "0.15.2-other-dev-d15096d.0.d15096d",
+    "@agoric/vow": "0.1.1-other-dev-d15096d.0.d15096d",
+    "@agoric/zoe": "0.26.3-other-dev-d15096d.0.d15096d",
+    "@agoric/zone": "0.2.3-other-dev-d15096d.0.d15096d",
     "@endo/errors": "^1.2.13",
     "@endo/eventual-send": "^1.3.4",
     "@endo/far": "^1.1.14",
@@ -72,10 +72,10 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 94.51
+    "atLeast": 93.68
   },
   "engines": {
     "node": "^20.9 || ^22.11"
   },
-  "gitHead": "fbe72e72107f9997f788674e668c660d92ec4492"
+  "gitHead": "d15096dc4ff8b96e9b6cd11954c20d3a9efbb393"
 }

package/src/index.js

@@ -1,6 +1,6 @@
-/// <reference types="@agoric/internal/exported" />
-/// <reference types="@agoric/ertp/exported" />
-/// <reference types="@agoric/zoe/exported" />
+/// <reference types="@agoric/internal/exported.js" />
+/// <reference types="@agoric/ertp/exported.js" />
+/// <reference types="@agoric/zoe/exported.js" />
 
 // eslint-disable-next-line import/export
 export * from './types-index.js'; // no named exports

package/src/invitations.d.ts

@@ -1,4 +1,4 @@
-export function makeInvitationsHelper(zoe: ERef<ZoeService>, agoricNames: ERef<import("@agoric/vats").NameHub>, invitationBrand: Brand<"set">, invitationsPurse: Purse<"set", import("@agoric/zoe").InvitationDetails>, getInvitationContinuation: (fromOfferId: string) => import("./types.js").InvitationMakers): (spec: InvitationSpec) => ERef<Invitation>;
+export function makeInvitationsHelper(zoe: ERef<ZoeService>, agoricNames: ERef<NameHub>, invitationBrand: Brand<"set">, invitationsPurse: Purse<"set", InvitationDetails>, getInvitationContinuation: (fromOfferId: string) => InvitationMakers): (spec: InvitationSpec) => ERef<Invitation>;
 /**
  * Specify how to produce an invitation. See each type in the union for details.
  */
@@ -41,9 +41,13 @@ export type PurseInvitationSpec = {
  */
 export type ContinuingInvitationSpec = {
     source: "continuing";
-    previousOffer: import("./offers.js").OfferId;
+    previousOffer: OfferId;
     invitationMakerName: string;
     invitationArgs?: any[];
 };
-export type InvitationsPurseQuery = Pick<import("@agoric/zoe").InvitationDetails, "description" | "instance">;
+export type InvitationsPurseQuery = Pick<InvitationDetails, "description" | "instance">;
+import type { NameHub } from '@agoric/vats';
+import type { InvitationDetails } from '@agoric/zoe';
+import type { InvitationMakers } from './types.js';
+import type { OfferId } from './offers.js';
 //# sourceMappingURL=invitations.d.ts.map

package/src/invitations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invitations.d.ts","sourceRoot":"","sources":["invitations.js"],"names":[],"mappings":"AA0EO,2CANI,IAAI,CAAC,UAAU,CAAC,eAChB,IAAI,CAAC,OAAO,cAAc,EAAE,OAAO,CAAC,mBACpC,KAAK,CAAC,KAAK,CAAC,oBACZ,KAAK,CAAC,KAAK,EAAE,OAAO,aAAa,EAAE,iBAAiB,CAAC,6BACrD,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,YAAY,EAAE,gBAAgB,UAoFrD,cAAc,KAAK,IAAI,CAAC,UAAU,CAAC,CAgBtD;;;;6BAjKY,4BAA4B,GAClC,sBAAsB,GACtB,mBAAmB,GACnB,wBAAwB;;;;;;;;2CAKlB;IACR,MAAM,EAAE,gBAAgB,CAAC;IACzB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;CACtD;;;;qCAQS;IACR,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IACnB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC;CACxB;;;;;;;kCAGS;IACR,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;;;;;uCAOS;IACR,MAAM,EAAE,YAAY,CAAC;IACrB,aAAa,EAAE,OAAO,aAAa,EAAE,OAAO,CAAC;IAC7C,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC;CACxB;oCAMS,IAAI,CAChB,OAAW,aAAa,EAAE,iBAAiB,EAC3C,aAAiB,GAAG,UAAU,CAC3B"}
+{"version":3,"file":"invitations.d.ts","sourceRoot":"","sources":["invitations.js"],"names":[],"mappings":"AA8EO,2CANI,IAAI,CAAC,UAAU,CAAC,eAChB,IAAI,CAAC,OAAO,CAAC,mBACb,KAAK,CAAC,KAAK,CAAC,oBACZ,KAAK,CAAC,KAAK,EAAE,iBAAiB,CAAC,6BAC/B,CAAC,WAAW,EAAE,MAAM,KAAK,gBAAgB,UAoFhC,cAAc,KAAK,IAAI,CAAC,UAAU,CAAC,CAgBtD;;;;6BA9JY,4BAA4B,GAClC,sBAAsB,GACtB,mBAAmB,GACnB,wBAAwB;;;;;;;;2CAKlB;IACR,MAAM,EAAE,gBAAgB,CAAC;IACzB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;CACtD;;;;qCAQS;IACR,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IACnB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC;CACxB;;;;;;;kCAGS;IACR,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;;;;;uCAOS;IACR,MAAM,EAAE,YAAY,CAAC;IACrB,aAAa,EAAE,OAAO,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC;CACxB;oCAMS,IAAI,CAAC,iBAAiB,EAAE,aAAa,GAAG,UAAU,CAAC;6BA1DtC,cAAc;uCADJ,aAAa;sCAEd,YAAY;6BAHrB,aAAa"}

package/src/invitations.js

@@ -5,6 +5,13 @@ import { Fail } from '@endo/errors';
 import { E } from '@endo/far';
 import { shape } from './typeGuards.js';
 
+/**
+ * @import {OfferId} from './offers.js';
+ * @import {InvitationDetails} from '@agoric/zoe';
+ * @import {NameHub} from '@agoric/vats';
+ * @import {InvitationMakers} from './types.js';
+ */
+
 // A safety limit
 const MAX_PIPE_LENGTH = 2;
 
@@ -50,7 +57,7 @@ const MAX_PIPE_LENGTH = 2;
  *
  * @typedef {{
  *   source: 'continuing';
- *   previousOffer: import('./offers.js').OfferId;
+ *   previousOffer: OfferId;
  *   invitationMakerName: string;
  *   invitationArgs?: any[];
  * }} ContinuingInvitationSpec
@@ -59,18 +66,15 @@ const MAX_PIPE_LENGTH = 2;
  */
 
 /**
- * @typedef {Pick<
- *   import('@agoric/zoe').InvitationDetails,
- *   'description' | 'instance'
- * >} InvitationsPurseQuery
+ * @typedef {Pick<InvitationDetails, 'description' | 'instance'>} InvitationsPurseQuery
  */
 
 /**
  * @param {ERef<ZoeService>} zoe
- * @param {ERef<import('@agoric/vats').NameHub>} agoricNames
+ * @param {ERef<NameHub>} agoricNames
  * @param {Brand<'set'>} invitationBrand
- * @param {Purse<'set', import('@agoric/zoe').InvitationDetails>} invitationsPurse
- * @param {(fromOfferId: string) => import('./types.js').InvitationMakers} getInvitationContinuation
+ * @param {Purse<'set', InvitationDetails>} invitationsPurse
+ * @param {(fromOfferId: string) => InvitationMakers} getInvitationContinuation
  */
 export const makeInvitationsHelper = (
   zoe,

package/src/offerWatcher.d.ts

@@ -10,10 +10,10 @@ export function prepareOfferWatcher(baggage: Baggage, vowTools: VowTools): (wall
         /**
          * @param {string} offerId
          * @param {Amount<'set'>} invitationAmount
-         * @param {import('./types.js').InvitationMakers} invitationMakers
-         * @param {import('./types.js').PublicSubscribers} publicSubscribers
+         * @param {InvitationMakers} invitationMakers
+         * @param {PublicSubscribers} publicSubscribers
          */
-        onNewContinuingOffer(offerId: string, invitationAmount: Amount<"set">, invitationMakers: import("./types.js").InvitationMakers, publicSubscribers: import("./types.js").PublicSubscribers): void;
+        onNewContinuingOffer(offerId: string, invitationAmount: Amount<"set">, invitationMakers: InvitationMakers, publicSubscribers: PublicSubscribers): void;
         /** @param {Passable | ContinuingOfferResult} result */
         publishResult(result: Passable | ContinuingOfferResult): void;
         /**
@@ -47,6 +47,8 @@ import type { VowTools } from '@agoric/vow';
 import type { UserSeat } from '@agoric/zoe';
 import type { Baggage } from '@agoric/vat-data';
 import type { OfferSpec } from './offers.js';
+import type { InvitationMakers } from './types.js';
+import type { PublicSubscribers } from './types.js';
 import type { Passable } from '@endo/pass-style';
 import type { ContinuingOfferResult } from './types.js';
 import type { PromiseWatcher } from '@agoric/swingset-liveslots';

package/src/offerWatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"offerWatcher.d.ts","sourceRoot":"","sources":["offerWatcher.js"],"names":[],"mappings":"AAyEO,iDADK,QAAQ,cAKP,eAAe,QACf,QAAQ,oBAiBpB;AAmCM,6CAHI,OAAO,YACP,QAAQ;aAWO,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC;;;QAgBvD;;WAEG;yCADQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;QAQlC;;;;;WAKG;sCAJQ,MAAM,oBACN,MAAM,CAAC,KAAK,CAAC,oBACb,OAAO,YAAY,EAAE,gBAAgB,qBACrC,OAAO,YAAY,EAAE,iBAAiB;QAkBjD,uDAAuD;8BAA3C,QAAQ,GAAG,qBAAqB;QAoC5C;;;;;;WAMG;yBADQ,KAAK;;IAclB,gDAAgD;oBAArC,eAAe,CAAC,gBAAgB,CAAC;IA+B5C,+CAA+C;mBAApC,eAAe,CAAC,eAAe,CAAC;IAuC3C,iDAAiD;qBAAtC,eAAe,CAAC,iBAAiB,CAAC;GA2BlD;;;;gCAzTkB,CAAC,oBACP,eAAe,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;8BAI7B;IACR,aAAa,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAC7C,eAAe,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC7C,cAAc,EAAE,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;CAC5D;+BAmTU,UAAU,CAAC,OAAO,mBAAmB,CAAC;2BACtC,UAAU,CAAC,gBAAgB,CAAC;8BAlUV,aAAa;8BAC2B,aAAa;6BAF3D,kBAAkB;+BAJhB,aAAa;8BAEd,kBAAkB;2CADL,YAAY;oCAEnB,4BAA4B;2CAGW,aAAa"}
+{"version":3,"file":"offerWatcher.d.ts","sourceRoot":"","sources":["offerWatcher.js"],"names":[],"mappings":"AA4EO,iDADK,QAAQ,cAKP,eAAe,QACf,QAAQ,oBAiBpB;AAmCM,6CAHI,OAAO,YACP,QAAQ;aAWO,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC;;;QAgBvD;;WAEG;yCADQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;QAQlC;;;;;WAKG;sCAJQ,MAAM,oBACN,MAAM,CAAC,KAAK,CAAC,oBACb,gBAAgB,qBAChB,iBAAiB;QAkB5B,uDAAuD;8BAA3C,QAAQ,GAAG,qBAAqB;QAoC5C;;;;;;WAMG;yBADQ,KAAK;;IAclB,gDAAgD;oBAArC,eAAe,CAAC,gBAAgB,CAAC;IA8B5C,+CAA+C;mBAApC,eAAe,CAAC,eAAe,CAAC;IAsC3C,iDAAiD;qBAAtC,eAAe,CAAC,iBAAiB,CAAC;GA0BlD;;;;gCAtTkB,CAAC,oBACP,eAAe,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;8BAI7B;IACR,aAAa,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAC7C,eAAe,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC7C,cAAc,EAAE,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;CAC5D;+BAgTU,UAAU,CAAC,OAAO,mBAAmB,CAAC;2BACtC,UAAU,CAAC,gBAAgB,CAAC;8BAlUV,aAAa;8BAC2B,aAAa;6BAF3D,kBAAkB;+BAJhB,aAAa;sCAON,YAAY;uCACX,YAAY;8BANrB,kBAAkB;2CADL,YAAY;oCAEnB,4BAA4B;2CAGW,aAAa"}

package/src/offerWatcher.js

@@ -20,6 +20,9 @@ import { UNPUBLISHED_RESULT } from './offers.js';
  * @import {Baggage} from '@agoric/vat-data';
  * @import {Vow, VowTools} from '@agoric/vow';
  * @import {PaymentPKeywordRecord, Proposal, UserSeat, ZoeService} from '@agoric/zoe';
+ * @import {InvitationMakers} from './types.js';
+ * @import {PublicSubscribers} from './types.js';
+ * @import {UpgradeDisconnection} from '@agoric/internal/src/upgrade-api.js';
  */
 
 /**
@@ -165,8 +168,8 @@ export const prepareOfferWatcher = (baggage, vowTools) => {
         /**
          * @param {string} offerId
          * @param {Amount<'set'>} invitationAmount
-         * @param {import('./types.js').InvitationMakers} invitationMakers
-         * @param {import('./types.js').PublicSubscribers} publicSubscribers
+         * @param {InvitationMakers} invitationMakers
+         * @param {PublicSubscribers} publicSubscribers
          */
         onNewContinuingOffer(
           offerId,
@@ -256,8 +259,7 @@ export const prepareOfferWatcher = (baggage, vowTools) => {
          * If promise disconnected, watch again. Or if there's an Error, handle
          * it.
          *
-         * @param {Error
-         *   | import('@agoric/internal/src/upgrade-api.js').UpgradeDisconnection} reason
+         * @param {Error | UpgradeDisconnection} reason
          * @param {UserSeat} seat
          */
         onRejected(reason, seat) {
@@ -293,8 +295,7 @@ export const prepareOfferWatcher = (baggage, vowTools) => {
          * If promise disconnected, watch again. Or if there's an Error, handle
          * it.
          *
-         * @param {Error
-         *   | import('@agoric/internal/src/upgrade-api.js').UpgradeDisconnection} reason
+         * @param {Error | UpgradeDisconnection} reason
          * @param {UserSeat} seat
          */
         onRejected(reason, seat) {
@@ -323,8 +324,7 @@ export const prepareOfferWatcher = (baggage, vowTools) => {
          * and getPayouts() settle the same (they await the same promise and
          * then synchronously return a local value).
          *
-         * @param {Error
-         *   | import('@agoric/internal/src/upgrade-api.js').UpgradeDisconnection} reason
+         * @param {Error | UpgradeDisconnection} reason
          * @param {UserSeat} seat
          */
         onRejected(reason, seat) {

package/src/offers.d.ts

@@ -1,6 +1,7 @@
 /**
  * @import {Proposal} from '@agoric/zoe';
  * @import {Passable} from '@endo/pass-style';
+ * @import {InvitationSpec} from './invitations.js';
  */
 /**
  * @typedef {number | string} OfferId
@@ -24,7 +25,7 @@
 /**
  * @typedef {{
  *   id: OfferId;
- *   invitationSpec: import('./invitations.js').InvitationSpec;
+ *   invitationSpec: InvitationSpec;
  *   proposal: Proposal;
  *   offerArgs?: any;
  *   saveResult?: ResultPlan;
@@ -62,7 +63,7 @@ export type InvokeEntryMessage = {
  */
 export type OfferSpec = {
     id: OfferId;
-    invitationSpec: import("./invitations.js").InvitationSpec;
+    invitationSpec: InvitationSpec;
     proposal: Proposal;
     offerArgs?: any;
     saveResult?: ResultPlan;
@@ -77,5 +78,6 @@ export type OfferStatus = OfferSpec & {
     payouts?: AmountKeywordRecord;
 };
 import type { Passable } from '@endo/pass-style';
+import type { InvitationSpec } from './invitations.js';
 import type { Proposal } from '@agoric/zoe';
 //# sourceMappingURL=offers.d.ts.map

package/src/offers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"offers.d.ts","sourceRoot":"","sources":["offers.js"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;GAEG;AAEH;;;;;;GAMG;AAEH;;;;;;;;GAQG;AAEH;;;;;;;;;;;GAWG;AAEH,kEAAkE;AAClE,iCAAkC,aAAa,CAAC;sBAnCnC,MAAM,GAAG,MAAM;;;;;UAKd,MAAM;;;;;;;;iCAOP;IACR,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACtB;;;;;;wBAIS;IACR,EAAE,EAAE,OAAO,CAAC;IACZ,cAAc,EAAE,OAAO,kBAAkB,EAAE,cAAc,CAAC;IAC1D,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;0BAUS,SAAS,GAAG;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,CAAC,EACH,OAAO,GACP,OAAO,kBAAkB,GACzB;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IACxC,OAAO,CAAC,EAAE,mBAAmB,CAAC;CAC/B;8BAlDuB,kBAAkB;8BADlB,aAAa"}
+{"version":3,"file":"offers.d.ts","sourceRoot":"","sources":["offers.js"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AAEH;;;;;;GAMG;AAEH;;;;;;;;GAQG;AAEH;;;;;;;;;;;GAWG;AAEH,kEAAkE;AAClE,iCAAkC,aAAa,CAAC;sBAnCnC,MAAM,GAAG,MAAM;;;;;UAKd,MAAM;;;;;;;;iCAOP;IACR,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACtB;;;;;;wBAIS;IACR,EAAE,EAAE,OAAO,CAAC;IACZ,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;0BAUS,SAAS,GAAG;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,CAAC,EACH,OAAO,GACP,OAAO,kBAAkB,GACzB;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IACxC,OAAO,CAAC,EAAE,mBAAmB,CAAC;CAC/B;8BAnDuB,kBAAkB;oCACZ,kBAAkB;8BAFxB,aAAa"}

package/src/offers.js

@@ -1,6 +1,7 @@
 /**
  * @import {Proposal} from '@agoric/zoe';
  * @import {Passable} from '@endo/pass-style';
+ * @import {InvitationSpec} from './invitations.js';
  */
 
 /**
@@ -28,7 +29,7 @@
 /**
  * @typedef {{
  *   id: OfferId;
- *   invitationSpec: import('./invitations.js').InvitationSpec;
+ *   invitationSpec: InvitationSpec;
  *   proposal: Proposal;
  *   offerArgs?: any;
  *   saveResult?: ResultPlan;

package/src/proposals/upgrade-wallet-factory2-proposal.js

@@ -1,5 +1,5 @@
 // @ts-check
-/// <reference types="@agoric/vats/src/core/types-ambient" />
+/// <reference types="@agoric/vats/src/core/types-ambient.js" />
 
 import { E } from '@endo/far';
 import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';

package/src/proposals/upgrade-walletFactory-proposal.js

@@ -4,6 +4,11 @@ import { E } from '@endo/far';
 import { makeMarshal } from '@endo/marshal';
 import { allValues } from '@agoric/internal';
 
+/**
+ * @import {NameHub} from '@agoric/vats';
+ * @import {BootstrapManifest} from '@agoric/vats/src/core/lib-boot.js';
+ */
+
 console.warn('upgrade-walletFactory-proposal.js module evaluating');
 
 // vstorage paths under published.*
@@ -88,7 +93,7 @@ export const publishAgoricBrandsDisplayInfo = async ({
     await E(node).setValue(JSON.stringify(aux));
   };
 
-  /** @type {ERef<import('@agoric/vats').NameHub>} */
+  /** @type {ERef<NameHub>} */
   const brandHub = E(agoricNames).lookup('brand');
   const brands = await E(brandHub).values();
   // tolerate failure; in particular, for the timer brand
@@ -96,7 +101,7 @@ export const publishAgoricBrandsDisplayInfo = async ({
 };
 harden(publishAgoricBrandsDisplayInfo);
 
-/** @type {import('@agoric/vats/src/core/lib-boot').BootstrapManifest} */
+/** @type {BootstrapManifest} */
 const manifest = {
   [upgradeWalletFactory.name]: {
     // include rationale for closely-held, high authority capabilities

package/src/smartWallet.d.ts

@@ -1,17 +1,16 @@
 export const BRAND_TO_PURSES_KEY: "brandToPurses";
-export function prepareSmartWallet(baggage: import("@agoric/vat-data").Baggage, shared: SharedParams): (uniqueWithoutChildNodes: Omit<UniqueParams, "currentStorageNode" | "walletStorageNode"> & {
-    walletStorageNode: ERef<StorageNode>;
+export function prepareSmartWallet(baggage: Baggage, shared: SharedParams): (uniqueWithoutChildNodes: Omit<UniqueParams, "currentStorageNode" | "walletStorageNode"> & {
+    walletStorageNode: ERemote<StorageNode>;
 }) => Promise<import("@endo/exo").Guarded<{
     /**
      * Umarshals the actionCapData and delegates to the appropriate action
      * handler.
      *
-     * @param {import('@endo/marshal').CapData<string | null>} actionCapData
-     *   of type BridgeAction
+     * @param {CapData<string | null>} actionCapData of type BridgeAction
      * @param {boolean} [canSpend]
      * @returns {Promise<void>}
      */
-    handleBridgeAction(actionCapData: import("@endo/marshal").CapData<string | null>, canSpend?: boolean): Promise<void>;
+    handleBridgeAction(actionCapData: CapData<string | null>, canSpend?: boolean): Promise<void>;
     getDepositFacet(): import("@endo/exo").Guarded<{
         /**
          * Put the assets from the payment into the appropriate purse.
@@ -74,7 +73,7 @@ export type ExecutorPowers = {
         info: (...args: any[]) => void;
         error: (...args: any[]) => void;
     };
-    makeOfferWatcher: import("./offerWatcher.js").MakeOfferWatcher;
+    makeOfferWatcher: MakeOfferWatcher;
     invitationFromSpec: ERef<Invitation>;
 };
 export type ExecuteOfferAction = {
@@ -171,23 +170,23 @@ export type BrandDescriptor = {
     brand: Brand;
     displayInfo: DisplayInfo;
     issuer: Issuer;
-    petname: import("./types.js").Petname;
+    petname: Petname;
 };
 export type UniqueParams = {
     address: string;
-    bank: ERef<import("@agoric/vats/src/vat-bank.js").Bank>;
-    currentStorageNode: StorageNode;
+    bank: ERef<Bank>;
+    currentStorageNode: Remote<StorageNode>;
     invitationPurse: Purse<"set", InvitationDetails>;
-    walletStorageNode: StorageNode;
+    walletStorageNode: Remote<StorageNode>;
 };
 export type BrandDescriptorRegistry = Pick<MapStore<Brand, BrandDescriptor>, "has" | "get" | "values">;
 export type SharedParams = {
-    agoricNames: ERef<import("@agoric/vats").NameHub>;
+    agoricNames: ERef<NameHub>;
     registry: BrandDescriptorRegistry;
     invitationIssuer: Issuer<"set">;
     invitationBrand: Brand<"set">;
     invitationDisplayInfo: DisplayInfo;
-    publicMarshaller: Marshaller;
+    publicMarshaller: ERemote<EMarshaller>;
     zoe: ERef<ZoeService>;
 };
 /**
@@ -202,12 +201,12 @@ export type SharedParams = {
 export type State = ImmutableState & MutableState;
 export type ImmutableState = Readonly<UniqueParams & {
     paymentQueues: MapStore<Brand, Payment[]>;
-    offerToInvitationMakers: MapStore<string, import("./types.js").InvitationMakers>;
+    offerToInvitationMakers: MapStore<string, InvitationMakers>;
     offerToPublicSubscriberPaths: MapStore<string, Record<string, string>>;
     offerToUsedInvitation: MapStore<string, Amount<"set">>;
     purseBalances: MapStore<Purse, Amount>;
-    updateRecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").RecorderKit<UpdateRecord>;
-    currentRecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").RecorderKit<CurrentWalletRecord>;
+    updateRecorderKit: RecorderKit<UpdateRecord>;
+    currentRecorderKit: RecorderKit<CurrentWalletRecord>;
     liveOffers: MapStore<OfferId, OfferStatus>;
     liveOfferSeats: MapStore<OfferId, UserSeat<unknown>>;
     liveOfferPayments: MapStore<OfferId, MapStore<Brand, Payment>>;
@@ -218,17 +217,28 @@ export type PurseRecord = BrandDescriptor & {
 };
 export type MutableState = {};
 export type SmartWallet = EReturn<EReturn<typeof prepareSmartWallet>>;
+import type { Baggage } from '@agoric/vat-data';
+import type { ERemote } from '@agoric/internal';
+import type { CapData } from '@endo/marshal';
 import type { Payment } from '@agoric/ertp';
 import type { Amount } from '@agoric/ertp';
 import type { InvokeEntryMessage } from './offers.js';
 import type { OfferSpec } from './offers.js';
 import type { OfferId } from './offers.js';
+import type { MakeOfferWatcher } from './offerWatcher.js';
 import type { Brand } from '@agoric/ertp';
 import type { OfferStatus } from './offers.js';
 import type { Issuer } from '@agoric/ertp';
+import type { Petname } from './types.js';
+import type { Bank } from '@agoric/vats/src/vat-bank.js';
+import type { Remote } from '@agoric/internal';
 import type { InvitationDetails } from '@agoric/zoe';
 import type { Purse } from '@agoric/ertp';
 import type { MapStore } from '@agoric/store';
+import type { NameHub } from '@agoric/vats';
+import type { EMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
+import type { InvitationMakers } from './types.js';
+import type { RecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
 import type { UserSeat } from '@agoric/zoe';
 import type { EReturn } from '@endo/far';
 //# sourceMappingURL=smartWallet.d.ts.map

package/src/smartWallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"smartWallet.d.ts","sourceRoot":"","sources":["smartWallet.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"smartWallet.d.ts","sourceRoot":"","sources":["smartWallet.js"],"names":[],"mappings":"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"}

package/src/smartWallet.js

@@ -15,7 +15,7 @@ import {
   StorageNodeShape,
 } from '@agoric/internal';
 import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
-import { M, mustMatch } from '@agoric/store';
+import { M, matches, mustMatch } from '@agoric/store';
 import {
   appendToStoredArray,
   provideLazy,
@@ -36,6 +36,7 @@ import {
 import {
   AmountKeywordRecordShape,
   PaymentPKeywordRecordShape,
+  InvitationElementShape,
 } from '@agoric/zoe/src/typeGuards.js';
 import { prepareVowTools } from '@agoric/vow';
 import { makeDurableZone } from '@agoric/zone/durable.js';
@@ -46,12 +47,23 @@ import { objectMapStoragePath } from './utils.js';
 import { prepareOfferWatcher, makeWatchOfferOutcomes } from './offerWatcher.js';
 
 /**
+ * @import {ERemote, Remote} from '@agoric/internal';
+ * @import {EMarshaller} from '@agoric/internal/src/marshal/wrap-marshaller.js';
  * @import {Amount, Brand, Issuer, Payment, Purse} from '@agoric/ertp';
  * @import {WeakMapStore, MapStore} from '@agoric/store'
- * @import {InvitationDetails, PaymentPKeywordRecord, Proposal, UserSeat} from '@agoric/zoe';
+ * @import {InvitationAmount, InvitationDetails, PaymentPKeywordRecord, Proposal, UserSeat} from '@agoric/zoe';
  * @import {CopyRecord} from '@endo/pass-style';
  * @import {EReturn} from '@endo/far';
  * @import {OfferId, OfferStatus, OfferSpec, InvokeEntryMessage, ResultPlan} from './offers.js';
+ * @import {MakeOfferWatcher} from './offerWatcher.js';
+ * @import {Petname} from './types.js';
+ * @import {Bank} from '@agoric/vats/src/vat-bank.js';
+ * @import {NameHub} from '@agoric/vats';
+ * @import {InvitationMakers} from './types.js';
+ * @import {RecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
+ * @import {Baggage} from '@agoric/vat-data';
+ * @import {PublicSubscribers} from './types.js';
+ * @import {CapData} from '@endo/marshal';
  */
 
 const trace = makeTracer('SmrtWlt');
@@ -67,7 +79,7 @@ const trace = makeTracer('SmrtWlt');
  *     info: (...args: any[]) => void;
  *     error: (...args: any[]) => void;
  *   };
- *   makeOfferWatcher: import('./offerWatcher.js').MakeOfferWatcher;
+ *   makeOfferWatcher: MakeOfferWatcher;
  *   invitationFromSpec: ERef<Invitation>;
  * }} ExecutorPowers
  */
@@ -159,7 +171,7 @@ const trace = makeTracer('SmrtWlt');
  *   brand: Brand;
  *   displayInfo: DisplayInfo;
  *   issuer: Issuer;
- *   petname: import('./types.js').Petname;
+ *   petname: Petname;
  * }} BrandDescriptor
  *   For use by clients to describe brands to users. Includes `displayInfo` to
  *   save a remote call.
@@ -168,10 +180,10 @@ const trace = makeTracer('SmrtWlt');
 /**
  * @typedef {{
  *   address: string;
- *   bank: ERef<import('@agoric/vats/src/vat-bank.js').Bank>;
- *   currentStorageNode: StorageNode;
+ *   bank: ERef<Bank>;
+ *   currentStorageNode: Remote<StorageNode>;
  *   invitationPurse: Purse<'set', InvitationDetails>;
- *   walletStorageNode: StorageNode;
+ *   walletStorageNode: Remote<StorageNode>;
  * }} UniqueParams
  *
  *
@@ -179,12 +191,12 @@ const trace = makeTracer('SmrtWlt');
  *
  *
  * @typedef {{
- *   agoricNames: ERef<import('@agoric/vats').NameHub>;
+ *   agoricNames: ERef<NameHub>;
  *   registry: BrandDescriptorRegistry;
  *   invitationIssuer: Issuer<'set'>;
  *   invitationBrand: Brand<'set'>;
  *   invitationDisplayInfo: DisplayInfo;
- *   publicMarshaller: Marshaller;
+ *   publicMarshaller: ERemote<EMarshaller>;
  *   zoe: ERef<ZoeService>;
  * }} SharedParams
  *
@@ -201,15 +213,12 @@ const trace = makeTracer('SmrtWlt');
  * @typedef {Readonly<
  *   UniqueParams & {
  *     paymentQueues: MapStore<Brand, Payment[]>;
- *     offerToInvitationMakers: MapStore<
- *       string,
- *       import('./types.js').InvitationMakers
- *     >;
+ *     offerToInvitationMakers: MapStore<string, InvitationMakers>;
  *     offerToPublicSubscriberPaths: MapStore<string, Record<string, string>>;
  *     offerToUsedInvitation: MapStore<string, Amount<'set'>>;
  *     purseBalances: MapStore<Purse, Amount>;
- *     updateRecorderKit: import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<UpdateRecord>;
- *     currentRecorderKit: import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<CurrentWalletRecord>;
+ *     updateRecorderKit: RecorderKit<UpdateRecord>;
+ *     currentRecorderKit: RecorderKit<CurrentWalletRecord>;
  *     liveOffers: MapStore<OfferId, OfferStatus>;
  *     liveOfferSeats: MapStore<OfferId, UserSeat<unknown>>;
  *     liveOfferPayments: MapStore<OfferId, MapStore<Brand, Payment>>;
@@ -229,17 +238,17 @@ const trace = makeTracer('SmrtWlt');
  * TODO: consider moving to nameHub.js?
  *
  * @param {unknown} target - passable Key
- * @param {ERef<import('@agoric/vats').NameHub>} nameHub
+ * @param {ERef<NameHub>} nameHub
  */
 const namesOf = async (target, nameHub) => {
   const entries = await E(nameHub).entries();
-  const matches = [];
+  const results = [];
   for (const [name, candidate] of entries) {
     if (candidate === target) {
-      matches.push(name);
+      results.push(name);
     }
   }
-  return harden(matches);
+  return harden(results);
 };
 
 /**
@@ -273,7 +282,7 @@ const getBrandToPurses = (walletPurses, key) => {
 };
 
 /**
- * @param {import('@agoric/vat-data').Baggage} baggage
+ * @param {Baggage} baggage
  * @param {SharedParams} shared
  */
 export const prepareSmartWallet = (baggage, shared) => {
@@ -324,7 +333,9 @@ export const prepareSmartWallet = (baggage, shared) => {
       amountWatcherGuard,
       /**
        * @param {Purse} purse
-       * @param {ReturnType<makeWalletWithResolvedStorageNodes>['helper']} helper
+       * @param {ReturnType<
+       *   typeof makeWalletWithResolvedStorageNodes
+       * >['helper']} helper
        */
       (purse, helper) => ({ purse, helper }),
       {
@@ -359,6 +370,31 @@ export const prepareSmartWallet = (baggage, shared) => {
 
   const makeAmountWatcher = prepareAmountWatcher();
 
+  /**
+   * @param {Amount} amount
+   * @returns {Amount}
+   */
+  const cleanAmountForPublish = amount => {
+    mustMatch(amount, AmountShape);
+    if (
+      !matches(amount.brand, shared.invitationBrand) ||
+      !matches(amount.value, M.arrayOf(InvitationElementShape))
+    ) {
+      return amount;
+    }
+
+    const invitationAmount = /** @type {InvitationAmount} */ (amount);
+    const filteredInvitationValue = invitationAmount.value.map(
+      ({ handle: _, ...filteredInvitationDetails }) =>
+        filteredInvitationDetails,
+    );
+
+    return harden({
+      brand: shared.invitationBrand,
+      value: filteredInvitationValue,
+    });
+  };
+
   /**
    * @param {UniqueParams} unique
    * @returns {State}
@@ -371,6 +407,7 @@ export const prepareSmartWallet = (baggage, shared) => {
         address: M.string(),
         bank: M.eref(M.remotable()),
         invitationPurse: PurseShape,
+        // Should not be M.eref, makeRecordedKit assumes resolved
         currentStorageNode: M.eref(StorageNodeShape),
         walletStorageNode: M.eref(StorageNodeShape),
       }),
@@ -408,12 +445,12 @@ export const prepareSmartWallet = (baggage, shared) => {
       myStore: zone.detached().mapStore('my items'),
     };
 
-    /** @type {import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<UpdateRecord>} */
+    /** @type {RecorderKit<UpdateRecord>} */
     const updateRecorderKit = makeRecorderKit(unique.walletStorageNode);
     // NB: state size must not grow monotonically
     // This is the node that UIs subscribe to for everything they need.
     // e.g. agoric follow :published.wallet.agoric1nqxg4pye30n3trct0hf7dclcwfxz8au84hr3ht
-    /** @type {import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<CurrentWalletRecord>} */
+    /** @type {RecorderKit<CurrentWalletRecord>} */
     const currentRecorderKit = makeRecorderKit(unique.currentStorageNode);
 
     const nonpreciousState = {
@@ -556,7 +593,7 @@ export const prepareSmartWallet = (baggage, shared) => {
           }
           void updateRecorderKit.recorder.write({
             updated: 'balance',
-            currentAmount: balance,
+            currentAmount: cleanAmountForPublish(balance),
           });
           const { helper } = this.facets;
           helper.publishCurrentState();
@@ -573,9 +610,11 @@ export const prepareSmartWallet = (baggage, shared) => {
           void currentRecorderKit.recorder.write({
             purses: [...purseBalances.values()].map(a => ({
               brand: a.brand,
-              balance: a,
+              balance: cleanAmountForPublish(a),
             })),
-            offerToUsedInvitation: [...offerToUsedInvitation.entries()],
+            offerToUsedInvitation: [...offerToUsedInvitation.entries()].map(
+              ([offerId, a]) => [offerId, cleanAmountForPublish(a)],
+            ),
             offerToPublicSubscriberPaths: [
               ...offerToPublicSubscriberPaths.entries(),
             ],
@@ -613,8 +652,7 @@ export const prepareSmartWallet = (baggage, shared) => {
          * transition to decentralized introductions.
          *
          * @param {Brand} brand
-         * @param {ERef<import('@agoric/vats').NameHub>} known - namehub with
-         *   brand, issuer branches
+         * @param {ERef<NameHub>} known - namehub with brand, issuer branches
          * @returns {Promise<Purse | undefined>} undefined if brand is not known
          */
         async getPurseIfKnownBrand(brand, known) {
@@ -693,8 +731,8 @@ export const prepareSmartWallet = (baggage, shared) => {
         /**
          * @param {string} offerId
          * @param {Amount<'set'>} invitationAmount
-         * @param {import('./types.js').InvitationMakers} invitationMakers
-         * @param {import('./types.js').PublicSubscribers} publicSubscribers
+         * @param {InvitationMakers} invitationMakers
+         * @param {PublicSubscribers} publicSubscribers
          */
         async addContinuingOffer(
           offerId,
@@ -1146,8 +1184,7 @@ export const prepareSmartWallet = (baggage, shared) => {
          * Umarshals the actionCapData and delegates to the appropriate action
          * handler.
          *
-         * @param {import('@endo/marshal').CapData<string | null>} actionCapData
-         *   of type BridgeAction
+         * @param {CapData<string | null>} actionCapData of type BridgeAction
          * @param {boolean} [canSpend]
          * @returns {Promise<void>}
          */
@@ -1260,7 +1297,7 @@ export const prepareSmartWallet = (baggage, shared) => {
    *   UniqueParams,
    *   'currentStorageNode' | 'walletStorageNode'
    * > & {
-   *   walletStorageNode: ERef<StorageNode>;
+   *   walletStorageNode: ERemote<StorageNode>;
    * }} uniqueWithoutChildNodes
    */
   const makeSmartWallet = async uniqueWithoutChildNodes => {

package/src/typeGuards.js

@@ -6,7 +6,7 @@ import {
 
 /**
  * @import {TypedPattern} from '@agoric/internal';
- * @import {InvokeEntryMessage, ResultPlan} from './offers';
+ * @import {InvokeEntryMessage, ResultPlan} from './offers.js';
  */
 
 /** @type {TypedPattern<ResultPlan>} */

package/src/utils.d.ts

@@ -1,8 +1,14 @@
-/** @import {OfferId, OfferStatus} from './offers.js'; */
+/**
+ * @import {OfferId, OfferStatus} from './offers.js';
+ * @import {UpdateRecord} from './smartWallet.js';
+ * @import {Follower} from '@agoric/casting';
+ * @import {PublicSubscribers} from './types.js';
+ * @import {TopicsRecord} from '@agoric/zoe/src/contractSupport/index.js';
+ */
 export const NO_SMART_WALLET_ERROR: "no smart wallet";
 export function makeWalletStateCoalescer(invitationBrand?: Brand<"set">): {
     state: {
-        invitationsReceived: Map<OfferId, {
+        invitationsReceived: Map<string, {
             acceptedIn: OfferId;
             description: string;
             instance: Instance;
@@ -10,10 +16,10 @@ export function makeWalletStateCoalescer(invitationBrand?: Brand<"set">): {
         offerStatuses: Map<OfferId, OfferStatus>;
         balances: Map<globalThis.Brand, globalThis.Amount>;
     };
-    update: (updateRecord: import("./smartWallet.js").UpdateRecord | {}) => void;
+    update: (updateRecord: UpdateRecord | {}) => void;
 };
-export function coalesceUpdates(updates: ERef<Subscriber<import("./smartWallet.js").UpdateRecord>>, invitationBrand?: Brand<"set">): {
-    invitationsReceived: Map<OfferId, {
+export function coalesceUpdates(updates: ERef<Subscriber<UpdateRecord>>, invitationBrand?: Brand<"set">): {
+    invitationsReceived: Map<string, {
         acceptedIn: OfferId;
         description: string;
         instance: Instance;
@@ -21,9 +27,13 @@ export function coalesceUpdates(updates: ERef<Subscriber<import("./smartWallet.j
     offerStatuses: Map<OfferId, OfferStatus>;
     balances: Map<globalThis.Brand, globalThis.Amount>;
 };
-export function assertHasData(follower: import("@agoric/casting").Follower<any>): Promise<void>;
-export function objectMapStoragePath(subscribers?: import("./types.js").PublicSubscribers | import("@agoric/zoe/src/contractSupport/index.js").TopicsRecord): ERef<Record<string, string>> | null;
+export function assertHasData(follower: Follower<any>): Promise<void>;
+export function objectMapStoragePath(subscribers?: PublicSubscribers | TopicsRecord): ERef<Record<string, string>> | null;
 export type CoalescedWalletState = ReturnType<typeof makeWalletStateCoalescer>["state"];
 import type { OfferId } from './offers.js';
 import type { OfferStatus } from './offers.js';
+import type { UpdateRecord } from './smartWallet.js';
+import type { Follower } from '@agoric/casting';
+import type { PublicSubscribers } from './types.js';
+import type { TopicsRecord } from '@agoric/zoe/src/contractSupport/index.js';
 //# sourceMappingURL=utils.d.ts.map

package/src/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.js"],"names":[],"mappings":"AAIA,yDAAyD;AAEzD,oCAAqC,iBAAiB,CAAC;AAKhD,2DADK,KAAK,CAAC,KAAK,CAAC;;;wBAaH,OAAO;yBACN,MAAM;sBACT,QAAQ;;;;;2BAOd,OAAO,kBAAkB,EAAE,YAAY,GAAG,EAAE;EAgExD;AAaM,yCAHI,IAAI,CAAC,UAAU,CAAC,OAAO,kBAAkB,EAAE,YAAY,CAAC,CAAC,oBACzD,KAAK,CAAC,KAAK,CAAC;;oBApFF,OAAO;qBACN,MAAM;kBACT,QAAQ;;;;EA6F1B;AAMM,wCAHI,OAAO,iBAAiB,EAAE,QAAQ,CAAC,GAAG,CAAC,iBAYjD;AASM,mDAJI,OAAO,YAAY,EAAE,iBAAiB,GAC1C,OAAO,0CAA0C,EAAE,YAAY,GACzD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,IAAI,CAY/C;mCAvDa,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC,OAAO,CAAC;6BA7F1B,aAAa;iCAAb,aAAa"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.js"],"names":[],"mappings":"AAIA;;;;;;GAMG;AAEH,oCAAqC,iBAAiB,CAAC;AAKhD,2DADK,KAAK,CAAC,KAAK,CAAC;;;wBAaH,OAAO;yBACN,MAAM;sBACT,QAAQ;;;;;2BAOd,YAAY,GAAG,EAAE;EA+D7B;AAaM,yCAHI,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,oBAC9B,KAAK,CAAC,KAAK,CAAC;;oBAnFF,OAAO;qBACN,MAAM;kBACT,QAAQ;;;;EA4F1B;AAMM,wCAHI,SAAS,GAAG,CAAC,iBAYvB;AAQM,mDAHI,iBAAiB,GAAG,YAAY,GAC9B,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,IAAI,CAY/C;mCAtDa,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC,OAAO,CAAC;6BAjG3B,aAAa;iCAAb,aAAa;kCACrB,kBAAkB;8BACtB,iBAAiB;uCACR,YAAY;kCACjB,0CAA0C"}

package/src/utils.js

@@ -2,7 +2,13 @@ import { deeplyFulfilledObject, objectMap, makeTracer } from '@agoric/internal';
 import { observeIteration, subscribeEach } from '@agoric/notifier';
 import { E } from '@endo/far';
 
-/** @import {OfferId, OfferStatus} from './offers.js'; */
+/**
+ * @import {OfferId, OfferStatus} from './offers.js';
+ * @import {UpdateRecord} from './smartWallet.js';
+ * @import {Follower} from '@agoric/casting';
+ * @import {PublicSubscribers} from './types.js';
+ * @import {TopicsRecord} from '@agoric/zoe/src/contractSupport/index.js';
+ */
 
 export const NO_SMART_WALLET_ERROR = 'no smart wallet';
 
@@ -19,7 +25,7 @@ export const makeWalletStateCoalescer = (invitationBrand = undefined) => {
    * keyed by description; xxx assumes unique
    *
    * @type {Map<
-   *   OfferId,
+   *   string,
    *   {
    *     acceptedIn: OfferId;
    *     description: string;
@@ -30,8 +36,7 @@ export const makeWalletStateCoalescer = (invitationBrand = undefined) => {
   const invitationsReceived = new Map();
 
   /**
-   * @param {import('./smartWallet.js').UpdateRecord | {}} updateRecord newer
-   *   than previous
+   * @param {UpdateRecord | {}} updateRecord newer than previous
    */
   const update = updateRecord => {
     if (!('updated' in updateRecord)) {
@@ -104,7 +109,7 @@ export const makeWalletStateCoalescer = (invitationBrand = undefined) => {
  * If this proves to be a problem we can add an option to this or a related
  * utility to reset state from RPC.
  *
- * @param {ERef<Subscriber<import('./smartWallet.js').UpdateRecord>>} updates
+ * @param {ERef<Subscriber<UpdateRecord>>} updates
  * @param {Brand<'set'>} [invitationBrand]
  */
 export const coalesceUpdates = (updates, invitationBrand) => {
@@ -119,7 +124,7 @@ export const coalesceUpdates = (updates, invitationBrand) => {
 };
 
 /**
- * @param {import('@agoric/casting').Follower<any>} follower
+ * @param {Follower<any>} follower
  * @throws if there is no first height
  */
 export const assertHasData = async follower => {
@@ -136,8 +141,7 @@ export const assertHasData = async follower => {
 /**
  * Handles the case of falsy argument so the caller can consistently await.
  *
- * @param {import('./types.js').PublicSubscribers
- *   | import('@agoric/zoe/src/contractSupport/index.js').TopicsRecord} [subscribers]
+ * @param {PublicSubscribers | TopicsRecord} [subscribers]
  * @returns {ERef<Record<string, string>> | null}
  */
 export const objectMapStoragePath = subscribers => {

package/src/walletFactory.d.ts

@@ -4,7 +4,7 @@ export namespace customTermsShape {
     let assetPublisher: Pattern;
 }
 export const privateArgsShape: import("@endo/patterns").Matcher;
-export function publishDepositFacet(address: string, wallet: import("./smartWallet.js").SmartWallet, namesByAddressAdmin: ERef<import("@agoric/vats").NameAdmin>): Promise<unknown>;
+export function publishDepositFacet(address: string, wallet: SmartWallet, namesByAddressAdmin: ERef<NameAdmin>): Promise<unknown>;
 export function makeAssetRegistry(assetPublisher: AssetPublisher): {
     /** @param {Brand} brand */
     has: (brand: Brand) => boolean;
@@ -13,47 +13,55 @@ export function makeAssetRegistry(assetPublisher: AssetPublisher): {
         brand: Brand;
         displayInfo: DisplayInfo;
         issuer: Issuer;
-        petname: import("./types.js").Petname;
+        petname: Petname;
     };
     values: () => Iterable<{
         brand: Brand;
         displayInfo: DisplayInfo;
         issuer: Issuer;
-        petname: import("./types.js").Petname;
+        petname: Petname;
     }>;
 };
 export function prepare(zcf: ZCF<SmartWalletContractTerms>, privateArgs: {
-    storageNode: ERef<StorageNode>;
-    walletBridgeManager?: ERef<import("@agoric/vats").ScopedBridgeManager<"wallet">>;
+    storageNode: ERemote<StorageNode>;
+    walletBridgeManager?: ERef<ScopedBridgeManager<"wallet">>;
     walletReviver?: ERef<WalletReviver>;
-}, baggage: import("@agoric/vat-data").Baggage): Promise<{
+}, baggage: Baggage): Promise<{
     creatorFacet: import("@endo/exo").Guarded<{
         /**
          * @param {string} address
-         * @param {ERef<import('@agoric/vats/src/vat-bank.js').Bank>} bank
-         * @param {ERef<import('@agoric/vats/src/types.js').NameAdmin>} namesByAddressAdmin
-         * @returns {Promise<
-         *   [wallet: import('./smartWallet.js').SmartWallet, isNew: boolean]
-         * >}
-         *   wallet along with a flag to distinguish between looking up an existing
-         *   wallet and creating a new one.
+         * @param {ERef<Bank>} bank
+         * @param {ERef<NameAdmin>} namesByAddressAdmin
+         * @returns {Promise<[wallet: SmartWallet, isNew: boolean]>} wallet along
+         *   with a flag to distinguish between looking up an existing wallet and
+         *   creating a new one.
          */
-        provideSmartWallet(address: string, bank: ERef<import("@agoric/vats/src/vat-bank.js").Bank>, namesByAddressAdmin: ERef<import("@agoric/vats/src/types.js").NameAdmin>): Promise<[wallet: import("./smartWallet.js").SmartWallet, isNew: boolean]>;
+        provideSmartWallet(address: string, bank: ERef<Bank>, namesByAddressAdmin: ERef<NameAdmin>): Promise<[wallet: SmartWallet, isNew: boolean]>;
     }>;
 }>;
 export type SmartWalletContractTerms = {
     agoricNames: ERef<NameHub>;
-    board: ERef<import("@agoric/vats").Board>;
+    board: ERef<Board>;
     assetPublisher: AssetPublisher;
 };
 export type AssetPublisher = {
-    getAssetSubscription: () => ERef<IterableEachTopic<import("@agoric/vats/src/vat-bank.js").AssetDescriptor>>;
+    getAssetSubscription: () => ERef<IterableEachTopic<AssetDescriptor>>;
 };
 export type IsRevive = boolean;
 export type WalletReviver = {
-    reviveWallet: (address: string) => Promise<import("./smartWallet.js").SmartWallet>;
+    reviveWallet: (address: string) => Promise<SmartWallet>;
     ackWallet: (address: string) => IsRevive;
 };
 export type start = typeof prepare;
+import type { SmartWallet } from './smartWallet.js';
+import type { NameAdmin } from '@agoric/vats';
+import type { Petname } from './types.js';
+import type { StorageNode } from '@agoric/internal/src/lib-chainStorage.js';
+import type { ERemote } from '@agoric/internal';
+import type { ScopedBridgeManager } from '@agoric/vats';
+import type { Baggage } from '@agoric/vat-data';
+import type { Bank } from '@agoric/vats/src/vat-bank.js';
 import type { NameHub } from '@agoric/vats';
+import type { Board } from '@agoric/vats';
+import type { AssetDescriptor } from '@agoric/vats/src/vat-bank.js';
 //# sourceMappingURL=walletFactory.d.ts.map

package/src/walletFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"walletFactory.d.ts","sourceRoot":"","sources":["walletFactory.js"],"names":[],"mappings":";;;;;AAgCA,gEAKE;AAYK,6CAJI,MAAM,UACN,OAAO,kBAAkB,EAAE,WAAW,uBACtC,IAAI,CAAC,OAAO,cAAc,EAAE,SAAS,CAAC,oBAehD;AAWM,kDAFI,cAAc;IAyCrB,2BAA2B;iBAAf,KAAK;IAEjB,2BAA2B;iBAAf,KAAK;eArCP,KAAK;qBACC,WAAW;gBAChB,MAAM;iBACL,OAAO,YAAY,EAAE,OAAO;;;eAH9B,KAAK;qBACC,WAAW;gBAChB,MAAM;iBACL,OAAO,YAAY,EAAE,OAAO;;EAuC3C;AAyCM,6BAVI,GAAG,CAAC,wBAAwB,CAAC,eAC7B;IACN,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAC/B,mBAAmB,CAAC,EAAE,IAAI,CAC9B,OAAa,cAAc,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CACrD,CAAC;IACF,aAAa,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;CACrC,WACO,OAAO,kBAAkB,EAAE,OAAO;;QAiHvC;;;;;;;;;WASG;oCARQ,MAAM,QACN,IAAI,CAAC,OAAO,8BAA8B,EAAE,IAAI,CAAC,uBACjD,IAAI,CAAC,OAAO,2BAA2B,EAAE,SAAS,CAAC,GACjD,OAAO,CACnB,CAAK,MAAM,EAAE,OAAO,kBAAkB,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,CAAC,CACjE;;GAuDT;uCAlNY;IACR,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3B,KAAK,EAAE,IAAI,CAAC,OAAO,cAAc,EAAE,KAAK,CAAC,CAAC;IAC1C,cAAc,EAAE,cAAc,CAAC;CAChC;6BAGS;IACR,oBAAoB,EAAE,MAAM,IAAI,CAC9B,iBAAiB,CAAC,OAAO,8BAA8B,EAAE,eAAe,CAAC,CAC1E,CAAC;CACH;uBAGS,OAAO;4BAEP;IACR,YAAY,EAAE,CACZ,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,OAAO,kBAAkB,EAAE,WAAW,CAAC,CAAC;IACrD,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,QAAQ,CAAC;CAC1C;oBAkMU,OAAO,OAAO;6BA5TF,cAAc"}
+{"version":3,"file":"walletFactory.d.ts","sourceRoot":"","sources":["walletFactory.js"],"names":[],"mappings":";;;;;AA4CA,gEAKE;AAYK,6CAJI,MAAM,UACN,WAAW,uBACX,IAAI,CAAC,SAAS,CAAC,oBAezB;AAWM,kDAFI,cAAc;IAyCrB,2BAA2B;iBAAf,KAAK;IAEjB,2BAA2B;iBAAf,KAAK;eArCP,KAAK;qBACC,WAAW;gBAChB,MAAM;iBACL,OAAO;;;eAHT,KAAK;qBACC,WAAW;gBAChB,MAAM;iBACL,OAAO;;EAuCtB;AAmCM,6BARI,GAAG,CAAC,wBAAwB,CAAC,eAC7B;IACN,WAAW,EAAE,QAAQ,WAAW,CAAC,CAAC;IAClC,mBAAmB,CAAC,EAAE,IAAI,CAAC,oBAAoB,QAAQ,CAAC,CAAC,CAAC;IAC1D,aAAa,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;CACrC,WACO,OAAO;;QAkHZ;;;;;;;WAOG;oCANQ,MAAM,QACN,IAAI,CAAC,IAAI,CAAC,uBACV,IAAI,CAAC,SAAS,CAAC,GACb,OAAO,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;;GAqDhE;uCAzMY;IACR,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3B,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;CAChC;6BAGS;IACR,oBAAoB,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC,CAAC;CACtE;uBAGS,OAAO;4BAEP;IACR,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IACxD,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,QAAQ,CAAC;CAC1C;oBA6LU,OAAO,OAAO;iCA3TE,kBAAkB;+BACpB,cAAc;6BAChB,YAAY;iCALR,0CAA0C;6BAD9C,kBAAkB;yCASN,cAAc;6BAC1B,kBAAkB;0BAErB,8BAA8B;6BAT3B,cAAc;2BAIhB,cAAc;qCACJ,8BAA8B"}

package/src/walletFactory.js

@@ -8,6 +8,7 @@
  */
 
 import { makeTracer, WalletName } from '@agoric/internal';
+import { wrapRemoteMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
 import { observeIteration, subscribeEach } from '@agoric/notifier';
 import { M, makeExo, makeScalarMapStore, mustMatch } from '@agoric/store';
 import { makeAtomicProvider } from '@agoric/store/src/stores/store-utils.js';
@@ -18,8 +19,19 @@ import { prepareSmartWallet } from './smartWallet.js';
 import { shape } from './typeGuards.js';
 
 /**
+ * @import {ERemote} from '@agoric/internal';
+ * @import {StorageNode} from '@agoric/internal/src/lib-chainStorage.js';
  * @import {MapStore} from '@agoric/swingset-liveslots';
  * @import {NameHub} from '@agoric/vats';
+ * @import {SmartWallet} from './smartWallet.js';
+ * @import {NameAdmin} from '@agoric/vats';
+ * @import {Petname} from './types.js';
+ * @import {Board} from '@agoric/vats';
+ * @import {AssetDescriptor} from '@agoric/vats/src/vat-bank.js';
+ * @import {ScopedBridgeManager} from '@agoric/vats';
+ * @import {Baggage} from '@agoric/vat-data';
+ * @import {WalletBridgeMsg} from './types.js';
+ * @import {Bank} from '@agoric/vats/src/vat-bank.js';
  */
 
 const trace = makeTracer('WltFct');
@@ -44,8 +56,8 @@ const WALLETS_BY_ADDRESS = 'walletsByAddress';
  * already done.
  *
  * @param {string} address
- * @param {import('./smartWallet.js').SmartWallet} wallet
- * @param {ERef<import('@agoric/vats').NameAdmin>} namesByAddressAdmin
+ * @param {SmartWallet} wallet
+ * @param {ERef<NameAdmin>} namesByAddressAdmin
  */
 export const publishDepositFacet = async (
   address,
@@ -78,7 +90,7 @@ export const makeAssetRegistry = assetPublisher => {
    *   brand: Brand;
    *   displayInfo: DisplayInfo;
    *   issuer: Issuer;
-   *   petname: import('./types.js').Petname;
+   *   petname: Petname;
    * }} BrandDescriptor
    *   For use by clients to describe brands to users. Includes `displayInfo` to
    *   save a remote call.
@@ -122,24 +134,20 @@ export const makeAssetRegistry = assetPublisher => {
 /**
  * @typedef {{
  *   agoricNames: ERef<NameHub>;
- *   board: ERef<import('@agoric/vats').Board>;
+ *   board: ERef<Board>;
  *   assetPublisher: AssetPublisher;
  * }} SmartWalletContractTerms
  *
  *
  * @typedef {{
- *   getAssetSubscription: () => ERef<
- *     IterableEachTopic<import('@agoric/vats/src/vat-bank.js').AssetDescriptor>
- *   >;
+ *   getAssetSubscription: () => ERef<IterableEachTopic<AssetDescriptor>>;
  * }} AssetPublisher
  *
  *
  * @typedef {boolean} IsRevive
  *
  * @typedef {{
- *   reviveWallet: (
- *     address: string,
- *   ) => Promise<import('./smartWallet.js').SmartWallet>;
+ *   reviveWallet: (address: string) => Promise<SmartWallet>;
  *   ackWallet: (address: string) => IsRevive;
  * }} WalletReviver
  */
@@ -150,13 +158,11 @@ export const makeAssetRegistry = assetPublisher => {
 /**
  * @param {ZCF<SmartWalletContractTerms>} zcf
  * @param {{
- *   storageNode: ERef<StorageNode>;
- *   walletBridgeManager?: ERef<
- *     import('@agoric/vats').ScopedBridgeManager<'wallet'>
- *   >;
+ *   storageNode: ERemote<StorageNode>;
+ *   walletBridgeManager?: ERef<ScopedBridgeManager<'wallet'>>;
  *   walletReviver?: ERef<WalletReviver>;
  * }} privateArgs
- * @param {import('@agoric/vat-data').Baggage} baggage
+ * @param {Baggage} baggage
  */
 export const prepare = async (zcf, privateArgs, baggage) => {
   const upgrading = baggage.has(WALLETS_BY_ADDRESS);
@@ -165,7 +171,7 @@ export const prepare = async (zcf, privateArgs, baggage) => {
   const zoe = zcf.getZoeService();
   const { storageNode, walletBridgeManager, walletReviver } = privateArgs;
 
-  /** @type {MapStore<string, import('./smartWallet.js').SmartWallet>} */
+  /** @type {MapStore<string, SmartWallet>} */
   const walletsByAddress = provideDurableMapStore(baggage, WALLETS_BY_ADDRESS);
   const provider = makeAtomicProvider(walletsByAddress);
 
@@ -190,8 +196,7 @@ export const prepare = async (zcf, privateArgs, baggage) => {
        * Once the owner is known, this calls handleBridgeAction which ensures
        * that all errors are published in the owner wallet's vstorage path.
        *
-       * @param {import('./types.js').WalletBridgeMsg} obj validated by
-       *   shape.WalletBridgeMsg
+       * @param {WalletBridgeMsg} obj validated by shape.WalletBridgeMsg
        * @returns {Promise<void>}
        */
       fromBridge: async obj => {
@@ -229,7 +234,7 @@ export const prepare = async (zcf, privateArgs, baggage) => {
     invitationIssuer,
     invitationBrand,
     invitationDisplayInfo,
-    publicMarshaller,
+    publicMarshaller: remotePublicMarshaller,
   } = await provideAll(baggage, {
     invitationIssuer: () => invitationIssuerP,
     invitationBrand: () => E(invitationIssuerP).getBrand(),
@@ -240,12 +245,14 @@ export const prepare = async (zcf, privateArgs, baggage) => {
 
   const registry = makeAssetRegistry(assetPublisher);
 
+  const publicCachingMarshaller = wrapRemoteMarshaller(remotePublicMarshaller);
+
   const shared = harden({
     agoricNames,
     invitationBrand,
     invitationDisplayInfo,
     invitationIssuer,
-    publicMarshaller,
+    publicMarshaller: publicCachingMarshaller,
     registry,
     zoe,
   });
@@ -271,21 +278,17 @@ export const prepare = async (zcf, privateArgs, baggage) => {
     {
       /**
        * @param {string} address
-       * @param {ERef<import('@agoric/vats/src/vat-bank.js').Bank>} bank
-       * @param {ERef<import('@agoric/vats/src/types.js').NameAdmin>} namesByAddressAdmin
-       * @returns {Promise<
-       *   [wallet: import('./smartWallet.js').SmartWallet, isNew: boolean]
-       * >}
-       *   wallet along with a flag to distinguish between looking up an existing
-       *   wallet and creating a new one.
+       * @param {ERef<Bank>} bank
+       * @param {ERef<NameAdmin>} namesByAddressAdmin
+       * @returns {Promise<[wallet: SmartWallet, isNew: boolean]>} wallet along
+       *   with a flag to distinguish between looking up an existing wallet and
+       *   creating a new one.
        */
       provideSmartWallet(address, bank, namesByAddressAdmin) {
         let isNew = false;
 
         /**
-         * @type {(
-         *   address: string,
-         * ) => Promise<import('./smartWallet.js').SmartWallet>}
+         * @type {(address: string) => Promise<SmartWallet>}
          */
         const maker = async _address => {
           const invitationPurse = await E(invitationIssuer).makeEmptyPurse();