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

package/package.json

@@ -1,47 +1,49 @@
 {
   "name": "@agoric/smart-wallet",
-  "version": "0.5.4-other-dev-3eb1a1d.0+3eb1a1d",
+  "version": "0.5.4-other-dev-d15096d.0.d15096d",
   "description": "Wallet contract",
   "type": "module",
   "main": "src/index.js",
   "scripts": {
     "build": "yarn build:bundles",
     "build:bundles": "node ./scripts/build-bundles.js",
-    "prepack": "tsc --build tsconfig.build.json",
-    "postpack": "git clean -f '*.d.ts*' '*.tsbuildinfo'",
+    "prepack": "yarn run -T tsc --build tsconfig.build.json",
+    "postpack": "git clean -f '*.d.*ts*' '*.tsbuildinfo'",
     "test": "ava",
+    "test:c8": "c8 --all $C8_OPTIONS ava",
     "test:xs": "exit 0",
-    "lint": "run-s --continue-on-error lint:*",
+    "lint": "yarn run -T run-s --continue-on-error 'lint:*'",
     "lint-fix": "yarn lint:eslint --fix",
-    "lint:types": "tsc",
-    "lint:eslint": "eslint ."
+    "lint:types": "yarn run -T tsc",
+    "lint:eslint": "yarn run -T eslint ."
   },
   "devDependencies": {
-    "@agoric/casting": "0.4.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/cosmic-proto": "0.4.1-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/swingset-vat": "0.32.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@endo/bundle-source": "^3.5.0",
-    "@endo/captp": "^4.4.3",
-    "@endo/init": "^1.1.7",
+    "@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",
     "ava": "^5.3.0",
-    "import-meta-resolve": "^2.2.1"
+    "import-meta-resolve": "^4.1.0"
   },
   "dependencies": {
-    "@agoric/ertp": "0.16.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/internal": "0.3.3-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/vat-data": "0.5.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/errors": "^1.2.8",
-    "@endo/eventual-send": "^1.2.8",
-    "@endo/far": "^1.1.9",
-    "@endo/marshal": "^1.6.2",
-    "@endo/nat": "^5.0.13",
-    "@endo/promise-kit": "^1.1.8"
+    "@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",
+    "@endo/marshal": "^1.8.0",
+    "@endo/nat": "^5.1.3",
+    "@endo/patterns": "^1.7.0",
+    "@endo/promise-kit": "^1.1.13"
   },
   "files": [
     "src/"
@@ -70,7 +72,10 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 94.64
+    "atLeast": 93.68
   },
-  "gitHead": "3eb1a1d2d75b2b4a94807cd3bf759bc9fc531f05"
+  "engines": {
+    "node": "^20.9 || ^22.11"
+  },
+  "gitHead": "d15096dc4ff8b96e9b6cd11954c20d3a9efbb393"
 }

package/src/index.js

@@ -1,2 +1,6 @@
+/// <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", 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<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":"AAuEO,2CANI,IAAI,CAAC,UAAU,CAAC,eAChB,IAAI,CAAC,OAAO,cAAc,EAAE,OAAO,CAAC,mBACpC,KAAK,CAAC,KAAK,CAAC,oBACZ,KAAK,CAAC,KAAK,EAAE,iBAAiB,CAAC,6BAC/B,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,YAAY,EAAE,gBAAgB,UAoFrD,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,aAAa,EAAE,OAAO,CAAC;IAC7C,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC;CACxB;oCAMS,IAAI,CAAC,iBAAiB,EAAE,aAAa,GAAG,UAAU,CAAC"}
+{"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
@@ -64,10 +71,10 @@ const MAX_PIPE_LENGTH = 2;
 
 /**
  * @param {ERef<ZoeService>} zoe
- * @param {ERef<import('@agoric/vats').NameHub>} agoricNames
+ * @param {ERef<NameHub>} agoricNames
  * @param {Brand<'set'>} invitationBrand
  * @param {Purse<'set', InvitationDetails>} invitationsPurse
- * @param {(fromOfferId: string) => import('./types.js').InvitationMakers} getInvitationContinuation
+ * @param {(fromOfferId: string) => InvitationMakers} getInvitationContinuation
  */
 export const makeInvitationsHelper = (
   zoe,

package/src/marshal-contexts.d.ts

@@ -22,7 +22,7 @@ export function makeExportContext(): {
      */
     ensureBoardId: (id: BoardId, val: RemotableObject) => void;
 };
-export function makeImportContext(makePresence?: ((iface: string) => PassableCap) | undefined): {
+export function makeImportContext(makePresence?: (iface: string) => PassableCap): {
     /**
      * @param {BoardId} id
      * @param {PassableCap} val
@@ -88,4 +88,5 @@ import type { BoardId } from '@agoric/vats/src/lib-board.js';
 import type { RemotableObject } from '@endo/marshal';
 import type { PassableCap } from '@endo/marshal';
 import type { Key } from '@endo/patterns';
+import type { MapStore } from '@agoric/swingset-liveslots';
 //# sourceMappingURL=marshal-contexts.d.ts.map

package/src/marshal-contexts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marshal-contexts.d.ts","sourceRoot":"","sources":["marshal-contexts.js"],"names":[],"mappings":"AAuHO;;;;;;;IAoFH;;;OAGG;sBAFQ,MAAM,SACN,KAAK;;IAMhB;;;OAGG;sBAFQ,OAAO,OACP,eAAe;IAK1B;;;OAGG;wBAFQ,OAAO,OACP,eAAe;EAW7B;AAcM,0DAFY,MAAM,KAAK,WAAW;IA8FrC;;;OAGG;sBAFQ,OAAO,OACP,WAAW;IAKtB;;;OAGG;wBAFQ,OAAO,OACP,WAAW;;;;;;;;;;;;;;;;;;;;;;;EAYzB;AA4BM,2CAHI,MAAM,OACN,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,IAAI,OAapC;;;;uBAlXgD,CAAC,SAApC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAE,IACnC,GAAG,MAAM,GAAG,MAAM,CAAC,IAAI,MAAM,EAAE;;;;qBAGtB,CAAC,SAAV,MAAQ,IACR,GAAG,CAAC,IAAI,MAAM,EAAE;;;;;sBA0CoB,CAAC,SAApC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAE,IACnC,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO;;;;;qBAGvB,GAAG,GAAG,IAAI,GAAG,KAAK;;;;oBAKZ,IAAI,SAAV,GAAK,EACS,GAAG,SAAjB,WAAa,IACb;IACR,MAAM,EAAE,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC5B,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;CAC5B;4BAgJU,UAAU,CAAC,OAAO,iBAAiB,CAAC;4BA+HpC,UAAU,CAAC,OAAO,iBAAiB,CAAC;6BA5VxB,+BAA+B;qCAFV,eAAe;iCAAf,eAAe;yBACxC,gBAAgB"}
+{"version":3,"file":"marshal-contexts.d.ts","sourceRoot":"","sources":["marshal-contexts.js"],"names":[],"mappings":"AAwHO;;;;;;;IAoFH;;;OAGG;sBAFQ,MAAM,SACN,KAAK;;IAMhB;;;OAGG;sBAFQ,OAAO,OACP,eAAe;IAK1B;;;OAGG;wBAFQ,OAAO,OACP,eAAe;EAW7B;AAcM,iDAFI,CAAC,KAAK,EAAE,MAAM,KAAK,WAAW;IA8FrC;;;OAGG;sBAFQ,OAAO,OACP,WAAW;IAKtB;;;OAGG;wBAFQ,OAAO,OACP,WAAW;;;;;;;;;;;;;;;;;;;;;;;EAYzB;AA4BM,2CAHI,MAAM,OACN,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,IAAI,OAapC;;;;uBAlXgD,CAAC,SAApC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAE,IACnC,GAAG,MAAM,GAAG,MAAM,CAAC,IAAI,MAAM,EAAE;;;;qBAGtB,CAAC,SAAV,MAAQ,IACR,GAAG,CAAC,IAAI,MAAM,EAAE;;;;;sBA0CoB,CAAC,SAApC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAE,IACnC,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO;;;;;qBAGvB,GAAG,GAAG,IAAI,GAAG,KAAK;;;;oBAKZ,IAAI,SAAV,GAAK,EACS,GAAG,SAAjB,WAAa,IACb;IACR,MAAM,EAAE,SAAS,IAAI,EAAE,GAAG,CAAC,CAAC;IAC5B,KAAK,EAAE,SAAS,GAAG,EAAE,IAAI,CAAC,CAAC;CAC5B;4BAgJU,UAAU,CAAC,OAAO,iBAAiB,CAAC;4BA+HpC,UAAU,CAAC,OAAO,iBAAiB,CAAC;6BA5VxB,+BAA+B;qCAHV,eAAe;iCAAf,eAAe;yBACxC,gBAAgB;8BACX,4BAA4B"}

package/src/marshal-contexts.js

@@ -9,6 +9,7 @@ import { DEFAULT_PREFIX } from '@agoric/vats/src/lib-board.js';
 /**
  * @import {PassableCap, RemotableObject} from '@endo/marshal';
  * @import {Key} from '@endo/patterns';
+ * @import {MapStore} from '@agoric/swingset-liveslots';
  * @import {BoardId} from '@agoric/vats/src/lib-board.js';
  */
 

package/src/offerWatcher.d.ts

@@ -1,7 +1,7 @@
 export function makeWatchOfferOutcomes(vowTools: VowTools): (watchers: OutcomeWatchers, seat: UserSeat) => Promise<any[]>;
 export function prepareOfferWatcher(baggage: Baggage, vowTools: VowTools): (walletHelper: any, deposit: {
     receive: (payment: Payment) => Promise<Amount>;
-}, offerSpec: OfferSpec, address: string, invitationAmount: import("@agoric/ertp").SetAmount<import("@endo/patterns").Key>, seatRef: UserSeat<unknown>) => import("@endo/exo").GuardedKit<{
+}, offerSpec: OfferSpec, address: string, invitationAmount: import("@agoric/ertp").SetAmount<import("@endo/patterns").Key>, seatRef: UserSeat) => import("@endo/exo").GuardedKit<{
     helper: {
         /**
          * @param {Record<string, unknown>} offerStatusUpdates
@@ -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;
         /**
@@ -44,9 +44,13 @@ export type OutcomeWatchers = {
 export type MakeOfferWatcher = ReturnType<typeof prepareOfferWatcher>;
 export type OfferWatcher = ReturnType<MakeOfferWatcher>;
 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';
+import type { PaymentPKeywordRecord } from '@agoric/zoe';
 //# sourceMappingURL=offerWatcher.d.ts.map

package/src/offerWatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"offerWatcher.d.ts","sourceRoot":"","sources":["offerWatcher.js"],"names":[],"mappings":"AAwEO,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;IA0B3C,iDAAiD;qBAAtC,eAAe,CAAC,iBAAiB,CAAC;GA2BlD;;;;gCA5SkB,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;+BAsSU,UAAU,CAAC,OAAO,mBAAmB,CAAC;2BACtC,UAAU,CAAC,gBAAgB,CAAC;8BApTV,aAAa;6BADnB,kBAAkB;+BAJhB,aAAa;8BAEd,kBAAkB;2CADL,YAAY;oCAEnB,4BAA4B"}
+{"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

@@ -19,6 +19,10 @@ import { UNPUBLISHED_RESULT } from './offers.js';
  * @import {PromiseWatcher} from '@agoric/swingset-liveslots';
  * @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';
  */
 
 /**
@@ -164,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,
@@ -255,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) {
@@ -273,14 +276,26 @@ export const prepareOfferWatcher = (baggage, vowTools) => {
       resultWatcher: {
         onFulfilled(result) {
           const { facets } = this;
-          facets.helper.publishResult(result);
+          const { walletHelper } = this.state;
+          const { saveResult } = this.state.status;
+          if (saveResult) {
+            // Note: result is passable and storable since it was received from another vat
+            const name = walletHelper.saveEntry(saveResult, result);
+            facets.helper.updateStatus({
+              result: {
+                name,
+                passStyle: passStyleOf(result),
+              },
+            });
+          } else {
+            facets.helper.publishResult(result);
+          }
         },
         /**
          * 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) {
@@ -309,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,27 +1,83 @@
+/**
+ * @import {Proposal} from '@agoric/zoe';
+ * @import {Passable} from '@endo/pass-style';
+ * @import {InvitationSpec} from './invitations.js';
+ */
 /**
  * @typedef {number | string} OfferId
  */
+/**
+ * @typedef {object} ResultPlan
+ * @property {string} name by which to save the item
+ * @property {boolean} [overwrite=false] whether to overwrite an existing item.
+ *   If false and there is a conflict, the contract will autogen a similar
+ *   name.
+ */
+/**
+ * @typedef {{
+ *   targetName: string;
+ *   method: string;
+ *   args: Passable[];
+ *   saveResult?: ResultPlan;
+ *   id?: number | string;
+ * }} InvokeEntryMessage
+ */
 /**
  * @typedef {{
  *   id: OfferId;
- *   invitationSpec: import('./invitations.js').InvitationSpec;
+ *   invitationSpec: InvitationSpec;
  *   proposal: Proposal;
  *   offerArgs?: any;
+ *   saveResult?: ResultPlan;
  * }} OfferSpec
+ *   If `saveResult` is provided, the result of the invocation will be saved to
+ *   the specified location. Otherwise it will be published directly to vstorage
+ *   (or 'UNPUBLISHED' if it cannot be).
  */
 /** Value for "result" field when the result can't be published */
 export const UNPUBLISHED_RESULT: "UNPUBLISHED";
 export type OfferId = number | string;
+export type ResultPlan = {
+    /**
+     * by which to save the item
+     */
+    name: string;
+    /**
+     * whether to overwrite an existing item.
+     * If false and there is a conflict, the contract will autogen a similar
+     * name.
+     */
+    overwrite?: boolean | undefined;
+};
+export type InvokeEntryMessage = {
+    targetName: string;
+    method: string;
+    args: Passable[];
+    saveResult?: ResultPlan;
+    id?: number | string;
+};
+/**
+ * If `saveResult` is provided, the result of the invocation will be saved to
+ * the specified location. Otherwise it will be published directly to vstorage
+ * (or 'UNPUBLISHED' if it cannot be).
+ */
 export type OfferSpec = {
     id: OfferId;
-    invitationSpec: import("./invitations.js").InvitationSpec;
+    invitationSpec: InvitationSpec;
     proposal: Proposal;
     offerArgs?: any;
+    saveResult?: ResultPlan;
 };
 export type OfferStatus = OfferSpec & {
     error?: string;
     numWantsSatisfied?: number;
-    result?: unknown | typeof UNPUBLISHED_RESULT;
+    result?: unknown | typeof UNPUBLISHED_RESULT | {
+        name: string;
+        passStyle: string;
+    };
     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;;GAEG;AAEH;;;;;;;GAOG;AAEH,kEAAkE;AAClE,+CAAgD;sBAbnC,MAAM,GAAG,MAAM;wBAIf;IACR,EAAE,EAAE,OAAO,CAAC;IACZ,cAAc,EAAE,OAAO,kBAAkB,EAAE,cAAc,CAAC;IAC1D,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,CAAC,EAAE,GAAG,CAAC;CACjB;0BAOS,SAAS,GAAG;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,kBAAkB,CAAC;IAC7C,OAAO,CAAC,EAAE,mBAAmB,CAAC;CAC/B"}
+{"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,14 +1,42 @@
+/**
+ * @import {Proposal} from '@agoric/zoe';
+ * @import {Passable} from '@endo/pass-style';
+ * @import {InvitationSpec} from './invitations.js';
+ */
+
 /**
  * @typedef {number | string} OfferId
  */
 
+/**
+ * @typedef {object} ResultPlan
+ * @property {string} name by which to save the item
+ * @property {boolean} [overwrite=false] whether to overwrite an existing item.
+ *   If false and there is a conflict, the contract will autogen a similar
+ *   name.
+ */
+
+/**
+ * @typedef {{
+ *   targetName: string;
+ *   method: string;
+ *   args: Passable[];
+ *   saveResult?: ResultPlan;
+ *   id?: number | string;
+ * }} InvokeEntryMessage
+ */
+
 /**
  * @typedef {{
  *   id: OfferId;
- *   invitationSpec: import('./invitations.js').InvitationSpec;
+ *   invitationSpec: InvitationSpec;
  *   proposal: Proposal;
  *   offerArgs?: any;
+ *   saveResult?: ResultPlan;
  * }} OfferSpec
+ *   If `saveResult` is provided, the result of the invocation will be saved to
+ *   the specified location. Otherwise it will be published directly to vstorage
+ *   (or 'UNPUBLISHED' if it cannot be).
  */
 
 /** Value for "result" field when the result can't be published */
@@ -18,7 +46,10 @@ export const UNPUBLISHED_RESULT = 'UNPUBLISHED';
  * @typedef {OfferSpec & {
  *   error?: string;
  *   numWantsSatisfied?: number;
- *   result?: unknown | typeof UNPUBLISHED_RESULT;
+ *   result?:
+ *     | unknown
+ *     | typeof UNPUBLISHED_RESULT
+ *     | { name: string; passStyle: string };
  *   payouts?: AmountKeywordRecord;
  * }} OfferStatus
  */

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';
@@ -45,7 +45,7 @@ export const upgradeWalletFactory = async (
   console.log(`Successfully upgraded WalletFactory`);
 };
 
-export const getManifestForUpgradeWallet = (_powers, { walletRef }) => ({
+export const getManifestForUpgradeWallet = ({ restoreRef }, { walletRef }) => ({
   manifest: {
     [upgradeWalletFactory.name]: {
       consume: {
@@ -56,5 +56,6 @@ export const getManifestForUpgradeWallet = (_powers, { walletRef }) => ({
       },
     },
   },
+  installations: { walletFactory: restoreRef(walletRef) },
   options: { walletRef },
 });

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