@agoric/smart-wallet 0.5.4-dev-1145be3.0.1145be3 → 0.5.4-dev-b084a06.0.b084a06

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/smart-wallet",
-  "version": "0.5.4-dev-1145be3.0.1145be3",
+  "version": "0.5.4-dev-b084a06.0.b084a06",
   "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-dev-1145be3.0.1145be3",
-    "@agoric/cosmic-proto": "0.4.1-dev-1145be3.0.1145be3",
-    "@agoric/swingset-vat": "0.32.3-dev-1145be3.0.1145be3",
+    "@agoric/casting": "0.4.3-dev-b084a06.0.b084a06",
+    "@agoric/cosmic-proto": "0.4.1-dev-b084a06.0.b084a06",
+    "@agoric/swingset-vat": "0.32.3-dev-b084a06.0.b084a06",
     "@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-dev-1145be3.0.1145be3",
-    "@agoric/internal": "0.3.3-dev-1145be3.0.1145be3",
-    "@agoric/notifier": "0.6.3-dev-1145be3.0.1145be3",
-    "@agoric/store": "0.9.3-dev-1145be3.0.1145be3",
-    "@agoric/vat-data": "0.5.3-dev-1145be3.0.1145be3",
-    "@agoric/vats": "0.15.2-dev-1145be3.0.1145be3",
-    "@agoric/vow": "0.1.1-dev-1145be3.0.1145be3",
-    "@agoric/zoe": "0.26.3-dev-1145be3.0.1145be3",
-    "@agoric/zone": "0.2.3-dev-1145be3.0.1145be3",
+    "@agoric/ertp": "0.16.3-dev-b084a06.0.b084a06",
+    "@agoric/internal": "0.3.3-dev-b084a06.0.b084a06",
+    "@agoric/notifier": "0.6.3-dev-b084a06.0.b084a06",
+    "@agoric/store": "0.9.3-dev-b084a06.0.b084a06",
+    "@agoric/vat-data": "0.5.3-dev-b084a06.0.b084a06",
+    "@agoric/vats": "0.15.2-dev-b084a06.0.b084a06",
+    "@agoric/vow": "0.1.1-dev-b084a06.0.b084a06",
+    "@agoric/zoe": "0.26.3-dev-b084a06.0.b084a06",
+    "@agoric/zone": "0.2.3-dev-b084a06.0.b084a06",
     "@endo/errors": "^1.2.13",
     "@endo/eventual-send": "^1.3.4",
     "@endo/far": "^1.1.14",
@@ -72,10 +72,10 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 93.87
+    "atLeast": 93.84
   },
   "engines": {
     "node": "^20.9 || ^22.11"
   },
-  "gitHead": "1145be333a0554d3bae3c35a227347441ddf5b5e"
+  "gitHead": "b084a067b866127f7d05c66e6865750132c4a7d8"
 }

package/src/index.js

@@ -1,6 +1,2 @@
-/// <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

@@ -20,7 +20,7 @@ export type AgoricContractInvitationSpec = {
  */
 export type ContractInvitationSpec = {
     source: "contract";
-    instance: Instance;
+    instance: Instance<any>;
     publicInvitationMaker: string;
     invitationArgs?: any[];
 };
@@ -32,7 +32,7 @@ export type ContractInvitationSpec = {
  */
 export type PurseInvitationSpec = {
     source: "purse";
-    instance: Instance;
+    instance: Instance<any>;
     description: string;
 };
 /**
@@ -46,8 +46,14 @@ export type ContinuingInvitationSpec = {
     invitationArgs?: any[];
 };
 export type InvitationsPurseQuery = Pick<InvitationDetails, "description" | "instance">;
+import type { ZoeService } from '@agoric/zoe';
+import type { ERef } from '@agoric/vow';
 import type { NameHub } from '@agoric/vats';
+import type { Brand } from '@agoric/ertp';
 import type { InvitationDetails } from '@agoric/zoe';
+import type { Purse } from '@agoric/ertp';
 import type { InvitationMakers } from './types.js';
+import type { Invitation } from '@agoric/zoe';
+import type { Instance } from '@agoric/zoe/src/zoeService/utils.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":"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"}
+{"version":3,"file":"invitations.d.ts","sourceRoot":"","sources":["invitations.js"],"names":[],"mappings":"AAkFO,2CANI,KAAK,UAAU,CAAC,eAChB,KAAK,OAAO,CAAC,mBACb,MAAM,KAAK,CAAC,oBACZ,MAAM,KAAK,EAAE,iBAAiB,CAAC,6BAC/B,CAAC,WAAW,EAAE,MAAM,KAAK,gBAAgB,UAoFhC,cAAc,KAAK,KAAK,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,SAAS,GAAG,CAAC,CAAC;IACxB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC;CACxB;;;;;;;kCAGS;IACR,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,SAAS,GAAG,CAAC,CAAC;IACxB,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;gCA/DJ,aAAa;0BAIlD,aAAa;6BAHV,cAAc;2BAIhB,cAAc;uCALsB,aAAa;2BAMjD,cAAc;sCAJH,YAAY;gCAFa,aAAa;8BAG9C,qCAAqC;6BAJtC,aAAa"}

package/src/invitations.js

@@ -7,9 +7,13 @@ import { shape } from './typeGuards.js';
 
 /**
  * @import {OfferId} from './offers.js';
- * @import {InvitationDetails} from '@agoric/zoe';
+ * @import {Invitation, InvitationDetails, ZoeService} from '@agoric/zoe';
  * @import {NameHub} from '@agoric/vats';
  * @import {InvitationMakers} from './types.js';
+ * @import {Instance} from '@agoric/zoe/src/zoeService/utils.js';
+ * @import {ERef} from '@agoric/vow';
+ * @import {Brand} from '@agoric/ertp';
+ * @import {Purse} from '@agoric/ertp';
  */
 
 // A safety limit
@@ -38,7 +42,7 @@ const MAX_PIPE_LENGTH = 2;
  *
  * @typedef {{
  *   source: 'contract';
- *   instance: Instance;
+ *   instance: Instance<any>;
  *   publicInvitationMaker: string;
  *   invitationArgs?: any[];
  * }} ContractInvitationSpec
@@ -46,7 +50,7 @@ const MAX_PIPE_LENGTH = 2;
  *
  * @typedef {{
  *   source: 'purse';
- *   instance: Instance;
+ *   instance: Instance<any>;
  *   description: string;
  * }} PurseInvitationSpec
  *   the invitation is already in your Zoe "invitation" purse so we need to query

package/src/marshal-contexts.d.ts

@@ -3,14 +3,14 @@ export function makeExportContext(): {
     fromCapData: import("@endo/marshal").FromCapData<string>;
     serialize: import("@endo/marshal").ToCapData<string>;
     unserialize: import("@endo/marshal").FromCapData<string>;
-    savePurseActions: (val: globalThis.Purse) => void;
-    savePaymentActions: (val: globalThis.Payment) => void;
+    savePurseActions: (val: Purse) => void;
+    savePaymentActions: (val: Payment) => void;
     /**
      * @param {number} id
      * @param {Purse} purse
      */
     initPurseId: (id: number, purse: Purse) => void;
-    purseEntries: (keyPatt?: import("@endo/patterns").Pattern, valuePatt?: import("@endo/patterns").Pattern) => Iterable<[number, globalThis.Purse]>;
+    purseEntries: (keyPatt?: import("@endo/patterns").Pattern, valuePatt?: import("@endo/patterns").Pattern) => Iterable<[number, Purse]>;
     /**
      * @param {BoardId} id
      * @param {RemotableObject} val
@@ -84,6 +84,8 @@ export type IdTable<Slot extends Key, Val extends PassableCap> = {
 };
 export type ExportContext = ReturnType<typeof makeExportContext>;
 export type ImportContext = ReturnType<typeof makeImportContext>;
+import type { Purse } from '@agoric/ertp';
+import type { Payment } from '@agoric/ertp';
 import type { BoardId } from '@agoric/vats/src/lib-board.js';
 import type { RemotableObject } from '@endo/marshal';
 import type { PassableCap } from '@endo/marshal';

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"marshal-contexts.d.ts","sourceRoot":"","sources":["marshal-contexts.js"],"names":[],"mappings":"AA0HO;;;;;;;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;2BA7V1B,cAAc;6BACZ,cAAc;6BAFd,+BAA+B;qCAHV,eAAe;iCAAf,eAAe;yBACxC,gBAAgB;8BACX,4BAA4B"}

package/src/marshal-contexts.js

@@ -11,6 +11,8 @@ import { DEFAULT_PREFIX } from '@agoric/vats/src/lib-board.js';
  * @import {Key} from '@endo/patterns';
  * @import {MapStore} from '@agoric/swingset-liveslots';
  * @import {BoardId} from '@agoric/vats/src/lib-board.js';
+ * @import {Purse} from '@agoric/ertp';
+ * @import {Payment} from '@agoric/ertp';
  */
 
 /**

package/src/offerWatcher.d.ts

@@ -48,6 +48,8 @@ import type { UserSeat } from '@agoric/zoe';
 import type { PaymentPKeywordRecord } from '@agoric/zoe';
 import type { Baggage } from '@agoric/vat-data';
 import type { Zone } from '@agoric/base-zone';
+import type { Payment } from '@agoric/ertp';
+import type { Amount } from '@agoric/ertp';
 import type { OfferSpec } from './offers.js';
 import type { InvitationMakers } from './types.js';
 import type { PublicSubscribers } from './types.js';

package/src/offerWatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"offerWatcher.d.ts","sourceRoot":"","sources":["offerWatcher.js"],"names":[],"mappings":"AAsGO,iDADK,QAAQ,cAKP,eAAe,QACf,QAAQ,uDAiBpB;AAoCM,6CAJI,OAAO,YACP,QAAQ,QACR,IAAI;aAkDW,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;GA6BlD;;;;gCAvXkB,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;+BAiXU,UAAU,CAAC,OAAO,mBAAmB,CAAC;2BACtC,UAAU,CAAC,gBAAgB,CAAC;8BApYV,aAAa;8BAE2B,aAAa;2CAAb,aAAa;6BAH3D,kBAAkB;0BAErB,mBAAmB;+BANd,aAAa;sCAQN,YAAY;uCACX,YAAY;8BAPrB,kBAAkB;2CADL,YAAY;oCAEnB,4BAA4B"}
+{"version":3,"file":"offerWatcher.d.ts","sourceRoot":"","sources":["offerWatcher.js"],"names":[],"mappings":"AAwGO,iDADK,QAAQ,cAKP,eAAe,QACf,QAAQ,uDAiBpB;AAoCM,6CAJI,OAAO,YACP,QAAQ,QACR,IAAI;aAkDW,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC;;;QAgBvD;;WAEG;yCADQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;QAQlC;;;;;WAKG;sCAJQ,MAAM,oBACN,OAAO,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;GA6BlD;;;;gCAvXkB,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;+BAiXU,UAAU,CAAC,OAAO,mBAAmB,CAAC;2BACtC,UAAU,CAAC,gBAAgB,CAAC;8BAtYV,aAAa;8BAE2B,aAAa;2CAAb,aAAa;6BAH3D,kBAAkB;0BAErB,mBAAmB;6BAKhB,cAAc;4BACf,cAAc;+BAZX,aAAa;sCAQN,YAAY;uCACX,YAAY;8BAPrB,kBAAkB;2CADL,YAAY;oCAEnB,4BAA4B"}

package/src/offerWatcher.js

@@ -27,6 +27,8 @@ import { UNPUBLISHED_RESULT } from './offers.js';
  * @import {InvitationMakers} from './types.js';
  * @import {PublicSubscribers} from './types.js';
  * @import {UpgradeDisconnection} from '@agoric/internal/src/upgrade-api.js';
+ * @import {Payment} from '@agoric/ertp';
+ * @import {Amount} from '@agoric/ertp';
  */
 
 /**

package/src/offers.d.ts

@@ -1,5 +1,5 @@
 /**
- * @import {Proposal} from '@agoric/zoe';
+ * @import {AmountKeywordRecord, Proposal} from '@agoric/zoe';
  * @import {Passable} from '@endo/pass-style';
  * @import {InvitationSpec} from './invitations.js';
  */
@@ -80,4 +80,5 @@ export type OfferStatus = OfferSpec & {
 import type { Passable } from '@endo/pass-style';
 import type { InvitationSpec } from './invitations.js';
 import type { Proposal } from '@agoric/zoe';
+import type { AmountKeywordRecord } 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;;;;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"}
+{"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;8BAFH,aAAa;yCAAb,aAAa"}

package/src/offers.js

@@ -1,5 +1,5 @@
 /**
- * @import {Proposal} from '@agoric/zoe';
+ * @import {AmountKeywordRecord, Proposal} from '@agoric/zoe';
  * @import {Passable} from '@endo/pass-style';
  * @import {InvitationSpec} from './invitations.js';
  */

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

@@ -1,9 +1,14 @@
 // @ts-check
-/// <reference types="@agoric/vats/src/core/types-ambient.js" />
 
 import { E } from '@endo/far';
 import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
 
+/**
+ * @import {BootstrapPowers} from '@agoric/vats/src/core/types.js';
+ * @import {ChainBootstrapSpace} from '@agoric/vats/src/core/types.js';
+ * @import {VatSourceRef} from '@agoric/vats/src/core/types.js';
+ */
+
 /**
  * @param {BootstrapPowers & ChainBootstrapSpace} powers
  * @param {object} options

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

@@ -7,6 +7,9 @@ import { allValues } from '@agoric/internal';
 /**
  * @import {NameHub} from '@agoric/vats';
  * @import {BootstrapManifest} from '@agoric/vats/src/core/lib-boot.js';
+ * @import {ERef} from '@agoric/vow';
+ * @import {BootstrapPowers} from '@agoric/vats/src/core/types.js';
+ * @import {VatSourceRef} from '@agoric/vats/src/core/types.js';
  */
 
 console.warn('upgrade-walletFactory-proposal.js module evaluating');

package/src/smartWallet.d.ts

@@ -53,18 +53,18 @@ export function prepareSmartWallet(baggage: Baggage, shared: SharedParams, setTe
         tryExitOffer(offerId: OfferId): Promise<void>;
     }>;
     /** @deprecated use getPublicTopics */
-    getCurrentSubscriber(): globalThis.Subscriber<CurrentWalletRecord>;
+    getCurrentSubscriber(): import("@agoric/notifier").Subscriber<CurrentWalletRecord>;
     /** @deprecated use getPublicTopics */
-    getUpdatesSubscriber(): globalThis.Subscriber<UpdateRecord>;
+    getUpdatesSubscriber(): import("@agoric/notifier").Subscriber<UpdateRecord>;
     getPublicTopics(): {
         current: {
             description: string;
-            subscriber: globalThis.Subscriber<CurrentWalletRecord>;
+            subscriber: import("@agoric/notifier").Subscriber<CurrentWalletRecord>;
             storagePath: Promise<string>;
         };
         updates: {
             description: string;
-            subscriber: globalThis.Subscriber<UpdateRecord>;
+            subscriber: import("@agoric/notifier").Subscriber<UpdateRecord>;
             storagePath: Promise<string>;
         };
     };
@@ -223,6 +223,7 @@ export type SmartWalletTestJig = {
 export type SmartWallet = EReturn<EReturn<typeof prepareSmartWallet>>;
 import type { Baggage } from '@agoric/vat-data';
 import type { SetTestJig } from '@agoric/zoe';
+import type { StorageNode } from '@agoric/internal/src/lib-chainStorage.js';
 import type { ERemote } from '@agoric/internal';
 import type { CapData } from '@endo/marshal';
 import type { Payment } from '@agoric/ertp';
@@ -231,8 +232,11 @@ 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 { Invitation } from '@agoric/zoe';
+import type { ERef } from '@agoric/vow';
 import type { Brand } from '@agoric/ertp';
 import type { OfferStatus } from './offers.js';
+import type { DisplayInfo } from '@agoric/ertp';
 import type { Issuer } from '@agoric/ertp';
 import type { Petname } from './types.js';
 import type { Bank } from '@agoric/vats/src/vat-bank.js';
@@ -242,6 +246,7 @@ 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 { ZoeService } from '@agoric/zoe';
 import type { InvitationMakers } from './types.js';
 import type { RecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
 import type { UserSeat } from '@agoric/zoe';

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

@@ -51,7 +51,8 @@ import { prepareOfferWatcher, makeWatchOfferOutcomes } from './offerWatcher.js';
  * @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 {InvitationAmount, InvitationDetails, PaymentPKeywordRecord, Proposal, UserSeat, SetTestJig} from '@agoric/zoe';
+ * @import {Notifier} from '@agoric/notifier';
+ * @import {InvitationAmount, InvitationDetails, PaymentPKeywordRecord, Proposal, UserSeat, SetTestJig, Invitation, AmountKeywordRecord, ZoeService} from '@agoric/zoe';
  * @import {CopyRecord} from '@endo/pass-style';
  * @import {EReturn} from '@endo/far';
  * @import {OfferId, OfferStatus, OfferSpec, InvokeEntryMessage, ResultPlan} from './offers.js';
@@ -64,6 +65,9 @@ import { prepareOfferWatcher, makeWatchOfferOutcomes } from './offerWatcher.js';
  * @import {Baggage} from '@agoric/vat-data';
  * @import {PublicSubscribers} from './types.js';
  * @import {CapData} from '@endo/marshal';
+ * @import {DisplayInfo} from '@agoric/ertp';
+ * @import {StorageNode} from '@agoric/internal/src/lib-chainStorage.js';
+ * @import {ERef} from '@agoric/vow';
  */
 
 const trace = makeTracer('SmrtWlt');

package/src/utils.d.ts

@@ -2,8 +2,13 @@
  * @import {OfferId, OfferStatus} from './offers.js';
  * @import {UpdateRecord} from './smartWallet.js';
  * @import {Follower} from '@agoric/casting';
+ * @import {Subscriber} from '@agoric/notifier';
  * @import {PublicSubscribers} from './types.js';
  * @import {TopicsRecord} from '@agoric/zoe/src/contractSupport/index.js';
+ * @import {Instance} from '@agoric/zoe';
+ * @import {Brand} from '@agoric/ertp';
+ * @import {Amount} from '@agoric/ertp';
+ * @import {ERef} from '@agoric/vow';
  */
 export const NO_SMART_WALLET_ERROR: "no smart wallet";
 export function makeWalletStateCoalescer(invitationBrand?: Brand<"set">): {
@@ -14,7 +19,7 @@ export function makeWalletStateCoalescer(invitationBrand?: Brand<"set">): {
             instance: Instance;
         }>;
         offerStatuses: Map<OfferId, OfferStatus>;
-        balances: Map<globalThis.Brand, globalThis.Amount>;
+        balances: Map<Brand, Amount>;
     };
     update: (updateRecord: UpdateRecord | {}) => void;
 };
@@ -25,14 +30,19 @@ export function coalesceUpdates(updates: ERef<Subscriber<UpdateRecord>>, invitat
         instance: Instance;
     }>;
     offerStatuses: Map<OfferId, OfferStatus>;
-    balances: Map<globalThis.Brand, globalThis.Amount>;
+    balances: Map<Brand, Amount>;
 };
 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 { Brand } from '@agoric/ertp';
 import type { OfferId } from './offers.js';
+import type { Instance } from '@agoric/zoe';
 import type { OfferStatus } from './offers.js';
+import type { Amount } from '@agoric/ertp';
 import type { UpdateRecord } from './smartWallet.js';
+import type { Subscriber } from '@agoric/notifier';
+import type { ERef } from '@agoric/vow';
 import type { Follower } from '@agoric/casting';
 import type { PublicSubscribers } from './types.js';
 import type { TopicsRecord } from '@agoric/zoe/src/contractSupport/index.js';

package/src/utils.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.js"],"names":[],"mappings":"AAIA;;;;;;;;;;;GAWG;AAEH,oCAAqC,iBAAiB,CAAC;AAKhD,2DADK,MAAM,KAAK,CAAC;;;wBAaH,OAAO;yBACN,MAAM;sBACT,QAAQ;;;;;2BAOd,YAAY,GAAG,EAAE;EA+D7B;AAaM,yCAHI,KAAK,WAAW,YAAY,CAAC,CAAC,oBAC9B,MAAM,KAAK,CAAC;;oBAnFF,OAAO;qBACN,MAAM;kBACT,QAAQ;;;;EA4F1B;AAMM,wCAHI,SAAS,GAAG,CAAC,iBAYvB;AAQM,mDAHI,iBAAiB,GAAG,YAAY,GAC9B,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,IAAI,CAY/C;mCAtDa,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC,OAAO,CAAC;2BA/F1C,cAAc;6BAPC,aAAa;8BAMzB,aAAa;iCAND,aAAa;4BAQ3B,cAAc;kCAPR,kBAAkB;gCAEpB,kBAAkB;0BAMxB,aAAa;8BAPT,iBAAiB;uCAER,YAAY;kCACjB,0CAA0C"}

package/src/utils.js

@@ -6,8 +6,13 @@ import { E } from '@endo/far';
  * @import {OfferId, OfferStatus} from './offers.js';
  * @import {UpdateRecord} from './smartWallet.js';
  * @import {Follower} from '@agoric/casting';
+ * @import {Subscriber} from '@agoric/notifier';
  * @import {PublicSubscribers} from './types.js';
  * @import {TopicsRecord} from '@agoric/zoe/src/contractSupport/index.js';
+ * @import {Instance} from '@agoric/zoe';
+ * @import {Brand} from '@agoric/ertp';
+ * @import {Amount} from '@agoric/ertp';
+ * @import {ERef} from '@agoric/vow';
  */
 
 export const NO_SMART_WALLET_ERROR = 'no smart wallet';

package/src/walletFactory.d.ts

@@ -55,7 +55,12 @@ export type WalletReviver = {
 export type start = typeof prepare;
 import type { SmartWallet } from './smartWallet.js';
 import type { NameAdmin } from '@agoric/vats';
+import type { ERef } from '@agoric/vow';
+import type { Brand } from '@agoric/ertp';
+import type { DisplayInfo } from '@agoric/ertp';
+import type { Issuer } from '@agoric/ertp';
 import type { Petname } from './types.js';
+import type { ZCF } from '@agoric/zoe';
 import type { StorageNode } from '@agoric/internal/src/lib-chainStorage.js';
 import type { ERemote } from '@agoric/internal';
 import type { ScopedBridgeManager } from '@agoric/vats';
@@ -64,4 +69,5 @@ 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';
+import type { IterableEachTopic } from '@agoric/notifier';
 //# 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":";;;;;AA8CA,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;;QAyHZ;;;;;;;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;;GAyDhE;uCApNY;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;oBAwMU,OAAO,OAAO;iCAvUsB,kBAAkB;+BACxC,cAAc;6BAChB,YAAY;iCALR,0CAA0C;6BAD9C,kBAAkB;yCASN,cAAc;6BAC1B,kBAAkB;0BAErB,8BAA8B;6BAT3B,cAAc;2BAIhB,cAAc;qCACJ,8BAA8B"}
+{"version":3,"file":"walletFactory.d.ts","sourceRoot":"","sources":["walletFactory.js"],"names":[],"mappings":";;;;;AAoDA,gEAKE;AAYK,6CAJI,MAAM,UACN,WAAW,uBACX,KAAK,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,IAAI,wBAAwB,CAAC,eAC7B;IACN,WAAW,EAAE,QAAQ,WAAW,CAAC,CAAC;IAClC,mBAAmB,CAAC,EAAE,KAAK,oBAAoB,QAAQ,CAAC,CAAC,CAAC;IAC1D,aAAa,CAAC,EAAE,KAAK,aAAa,CAAC,CAAC;CACrC,WACO,OAAO;;QAyHZ;;;;;;;WAOG;oCANQ,MAAM,QACN,KAAK,IAAI,CAAC,uBACV,KAAK,SAAS,CAAC,GACb,OAAO,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;;GAyDhE;uCApNY;IACR,WAAW,EAAE,KAAK,OAAO,CAAC,CAAC;IAC3B,KAAK,EAAE,KAAK,KAAK,CAAC,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;CAChC;6BAGS;IACR,oBAAoB,EAAE,MAAM,KAAK,kBAAkB,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;oBAwMU,OAAO,OAAO;iCA5UsB,kBAAkB;+BACxC,cAAc;0BAUnB,aAAa;2BACZ,cAAc;iCACR,cAAc;4BACnB,cAAc;6BAZb,YAAY;yBAQhB,aAAa;iCAdL,0CAA0C;6BAD9C,kBAAkB;yCAUN,cAAc;6BAC1B,kBAAkB;0BAErB,8BAA8B;6BAV3B,cAAc;2BAKhB,cAAc;qCACJ,8BAA8B;uCAL5B,kBAAkB"}

package/src/walletFactory.js

@@ -24,6 +24,7 @@ import { shape } from './typeGuards.js';
  * @import {StorageNode} from '@agoric/internal/src/lib-chainStorage.js';
  * @import {MapStore} from '@agoric/swingset-liveslots';
  * @import {NameHub} from '@agoric/vats';
+ * @import {IterableEachTopic} from '@agoric/notifier';
  * @import {SmartWallet, SmartWalletTestJig} from './smartWallet.js';
  * @import {NameAdmin} from '@agoric/vats';
  * @import {Petname} from './types.js';
@@ -34,6 +35,11 @@ import { shape } from './typeGuards.js';
  * @import {WalletBridgeMsg} from './types.js';
  * @import {Bank} from '@agoric/vats/src/vat-bank.js';
  * @import {TestJigKit} from '@agoric/zoe/src/contractSupport/testJigHelpers.js';
+ * @import {ZCF} from '@agoric/zoe';
+ * @import {ERef} from '@agoric/vow';
+ * @import {Brand} from '@agoric/ertp';
+ * @import {DisplayInfo} from '@agoric/ertp';
+ * @import {Issuer} from '@agoric/ertp';
  */
 
 const trace = makeTracer('WltFct');