@agoric/zoe 0.27.0-upgrade-20-dev-ef71cfd.0 → 0.27.0-upgrade-21-dev-16519b2.0

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@agoric/zoe",
-  "version": "0.27.0-upgrade-20-dev-ef71cfd.0+ef71cfd",
+  "version": "0.27.0-upgrade-21-dev-16519b2.0+16519b2",
   "description": "Zoe: the Smart Contract Framework for Offer Enforcement",
   "type": "module",
   "main": "./src/zoeService/zoe.js",
   "engines": {
-    "node": "^18.12 || ^20.9"
+    "node": "^20.9 || ^22.11"
   },
   "scripts": {
     "build": "yarn build:bundles",
     "build:bundles": "node scripts/build-bundles.js",
-    "prepack": "tsc --build tsconfig.build.json",
+    "prepack": "yarn run -T tsc --build tsconfig.build.json",
     "postpack": "git clean -f '*.d.ts*' '*.tsbuildinfo'",
     "test": "ava --verbose",
     "test:c8": "c8 --all $C8_OPTIONS ava",
@@ -21,9 +21,9 @@
     "test:xs-worker": "SWINGSET_WORKER_TYPE=xs-worker ava -c 2 'test/swingsetTests'",
     "build-zcfBundle": "yarn build:bundles",
     "lint-fix": "yarn lint:eslint --fix",
-    "lint": "run-s --continue-on-error lint:*",
-    "lint:eslint": "eslint .",
-    "lint:types": "tsc"
+    "lint": "yarn run -T run-s --continue-on-error 'lint:*'",
+    "lint:eslint": "yarn run -T eslint .",
+    "lint:types": "yarn run -T tsc"
   },
   "repository": {
     "type": "git",
@@ -43,17 +43,17 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/ertp": "0.16.3-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/internal": "0.4.0-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/notifier": "0.7.0-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/store": "0.9.3-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/swingset-liveslots": "0.10.3-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/swingset-vat": "0.33.0-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/time": "0.3.3-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/vat-data": "0.5.3-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/vow": "0.2.0-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/zone": "0.3.0-upgrade-20-dev-ef71cfd.0+ef71cfd",
+    "@agoric/base-zone": "workspace:*",
+    "@agoric/ertp": "workspace:*",
+    "@agoric/internal": "workspace:*",
+    "@agoric/notifier": "workspace:*",
+    "@agoric/store": "workspace:*",
+    "@agoric/swingset-liveslots": "workspace:*",
+    "@agoric/swingset-vat": "workspace:*",
+    "@agoric/time": "workspace:*",
+    "@agoric/vat-data": "workspace:*",
+    "@agoric/vow": "workspace:*",
+    "@agoric/zone": "workspace:*",
     "@endo/bundle-source": "^4.0.0",
     "@endo/captp": "^4.4.5",
     "@endo/common": "^1.2.10",
@@ -70,10 +70,11 @@
     "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-upgrade-20-dev-ef71cfd.0+ef71cfd",
+    "@agoric/kmarshal": "workspace:*",
+    "@agoric/xsnap": "workspace:*",
     "@endo/init": "^1.1.9",
     "ava": "^5.3.0",
-    "c8": "^10.1.2",
+    "c8": "^10.1.3",
     "import-meta-resolve": "^4.1.0",
     "tsd": "^0.31.1"
   },
@@ -98,7 +99,7 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 85.15
+    "atLeast": 84.69
   },
-  "gitHead": "ef71cfdc9e62572cab9a3d2821dc446ce0d700c3"
+  "gitHead": "16519b2de1eb2afda2b4ec866f55eadd4bb18223"
 }

package/src/contractFacet/vatRoot.d.ts

@@ -15,6 +15,6 @@ export function buildRootObject(powers: VatPowers & {
     zoeService: ZoeService;
     invitationIssuer: Issuer<"set">;
     privateArgs?: any;
-}, baggage: import("@agoric/vat-data").Baggage): Promise<import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {}>>;
+}, baggage: import("@agoric/vat-data").Baggage): Promise<RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {}>>;
 import type { ZoeService } from '@agoric/zoe';
 //# sourceMappingURL=vatRoot.d.ts.map

package/src/contractFacet/vatRoot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vatRoot.d.ts","sourceRoot":"","sources":["vatRoot.js"],"names":[],"mappings":"AAeA;;GAEG;AAEH;;;;GAIG;AACH,wCAJW,SAAS,GAAG;IAAE,aAAa,EAAE,CAAE,EAAC,GAAG,EAAC,EAAE;QAAC,GAAG,EAAE,GAAG,CAAA;KAAC,KAAM,IAAI,CAAA;CAAE,iBAC5D;IAAC,iBAAiB,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,UAAU,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAAC,WAAW,CAAC,EAAE,GAAG,CAAA;CAAC,WAC1G,OAAO,kBAAkB,EAAE,OAAO,oIA8D5C;gCApE4B,aAAa"}
+{"version":3,"file":"vatRoot.d.ts","sourceRoot":"","sources":["vatRoot.js"],"names":[],"mappings":"AAeA;;GAEG;AAEH;;;;GAIG;AACH,wCAJW,SAAS,GAAG;IAAE,aAAa,EAAE,CAAE,EAAC,GAAG,EAAC,EAAE;QAAC,GAAG,EAAE,GAAG,CAAA;KAAC,KAAM,IAAI,CAAA;CAAE,iBAC5D;IAAC,iBAAiB,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,UAAU,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAAC,WAAW,CAAC,EAAE,GAAG,CAAA;CAAC,WAC1G,OAAO,kBAAkB,EAAE,OAAO,yGA8D5C;gCApE4B,aAAa"}

package/src/contractFacet/zcfSeat.d.ts

@@ -1,5 +1,7 @@
-export function createSeatManager(zoeInstanceAdmin: ERef<ZoeInstanceAdmin>, getAssetKindByBrand: GetAssetKindByBrand, shutdownWithFailure: import("@agoric/swingset-vat").ShutdownWithFailure, zcfBaggage: import("@agoric/vat-data").Baggage): {
+export function createSeatManager(zoeInstanceAdmin: ERef<ZoeInstanceAdmin>, getAssetKindByBrand: GetAssetKindByBrand, shutdownWithFailure: ShutdownWithFailure, zcfBaggage: Baggage): {
     seatManager: ZcfSeatManager;
     zcfMintReallocator: ZcfMintReallocator;
 };
+import type { ShutdownWithFailure } from '@agoric/swingset-vat';
+import type { Baggage } from '@agoric/vat-data';
 //# sourceMappingURL=zcfSeat.d.ts.map

package/src/contractFacet/zcfSeat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zcfSeat.d.ts","sourceRoot":"","sources":["zcfSeat.js"],"names":[],"mappings":"AAqCO,oDANI,IAAI,CAAC,gBAAgB,CAAC,uBACtB,mBAAmB,uBACnB,OAAO,sBAAsB,EAAE,mBAAmB,cAClD,OAAO,kBAAkB,EAAE,OAAO,GAChC;IAAE,WAAW,EAAE,cAAc,CAAC;IAAC,kBAAkB,EAAE,kBAAkB,CAAA;CAAE,CAuTnF"}
+{"version":3,"file":"zcfSeat.d.ts","sourceRoot":"","sources":["zcfSeat.js"],"names":[],"mappings":"AAuCO,oDANI,IAAI,CAAC,gBAAgB,CAAC,uBACtB,mBAAmB,uBACnB,mBAAmB,cACnB,OAAO,GACL;IAAE,WAAW,EAAE,cAAc,CAAC;IAAC,kBAAkB,EAAE,kBAAkB,CAAA;CAAE,CAuTnF;yCApUqC,sBAAsB;6BAClC,kBAAkB"}

package/src/contractFacet/zcfSeat.js

@@ -22,7 +22,9 @@ import { TransferPartShape } from '../contractSupport/atomicTransfer.js';
 
 /**
  * @import {WeakMapStore} from '@agoric/store';
- * @import {TransferPart, ZCFSeat} from '@agoric/zoe';
+ * @import {ShutdownWithFailure} from '@agoric/swingset-vat';
+ * @import {Baggage} from '@agoric/vat-data';
+ * @import {Allocation} from './types.js';
  */
 
 /**
@@ -31,8 +33,8 @@ import { TransferPartShape } from '../contractSupport/atomicTransfer.js';
  *
  * @param {ERef<ZoeInstanceAdmin>} zoeInstanceAdmin
  * @param {GetAssetKindByBrand} getAssetKindByBrand
- * @param {import('@agoric/swingset-vat').ShutdownWithFailure} shutdownWithFailure
- * @param {import('@agoric/vat-data').Baggage} zcfBaggage
+ * @param {ShutdownWithFailure} shutdownWithFailure
+ * @param {Baggage} zcfBaggage
  * @returns {{ seatManager: ZcfSeatManager, zcfMintReallocator: ZcfMintReallocator }}
  */
 export const createSeatManager = (

package/src/contractFacet/zcfZygote.d.ts

@@ -1,10 +1,9 @@
 export function makeZCFZygote(powers: VatPowers, zoeService: ERef<ZoeService>, invitationIssuer: Issuer<"set">, testJigSetter: ({ zcf }: {
     zcf: ZCF;
-}) => void, contractBundleCap: BundleCap, zcfBaggage?: import("@agoric/vat-data").Baggage): Promise<ZCFZygote>;
+}) => void, contractBundleCap: BundleCap, zcfBaggage?: Baggage): Promise<ZCFZygote>;
 export type ZCFZygote = {
     startContract: (instanceAdminFromZoe: ERef<ZoeInstanceAdmin>, instanceRecordFromZoe: InstanceRecord, issuerStorageFromZoe: IssuerRecords, privateArgs?: object) => Promise<ExecuteContractResult>;
     restartContract: (privateArgs?: object) => void;
 };
-import type { ZoeService } from '@agoric/zoe';
-import type { ZCF } from '@agoric/zoe';
+import type { Baggage } from '@agoric/vat-data';
 //# sourceMappingURL=zcfZygote.d.ts.map

package/src/contractFacet/zcfZygote.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zcfZygote.d.ts","sourceRoot":"","sources":["zcfZygote.js"],"names":[],"mappings":"AA6DO,sCARI,SAAS,cACT,IAAI,CAAC,UAAU,CAAC,oBAChB,MAAM,CAAC,KAAK,CAAC,iBACb,CAAE,EAAC,GAAG,EAAC,EAAE;IAAC,GAAG,EAAE,GAAG,CAAA;CAAC,KAAM,IAAI,qBAC7B,SAAS,eACT,OAAO,kBAAkB,EAAE,OAAO,GAChC,OAAO,CAAC,SAAS,CAAC,CAod9B;;mBAvea,CAAC,oBAAoB,EAAE,IAAI,CAAC,gBAAgB,CAAC,EACpD,qBAAqB,EAAE,cAAc,EACrC,oBAAoB,EAAE,aAAa,EACnC,WAAW,CAAC,EAAE,MAAM,KACnB,OAAO,CAAC,qBAAqB,CAAC;qBACxB,CAAC,WAAW,CAAC,EAAE,MAAM,KAAK,IAAI;;gCAV8D,aAAa;yBAAb,aAAa"}
+{"version":3,"file":"zcfZygote.d.ts","sourceRoot":"","sources":["zcfZygote.js"],"names":[],"mappings":"AA6DO,sCARI,SAAS,cACT,IAAI,CAAC,UAAU,CAAC,oBAChB,MAAM,CAAC,KAAK,CAAC,iBACb,CAAE,EAAC,GAAG,EAAC,EAAE;IAAC,GAAG,EAAE,GAAG,CAAA;CAAC,KAAM,IAAI,qBAC7B,SAAS,eACT,OAAO,GACL,OAAO,CAAC,SAAS,CAAC,CAod9B;;mBAvea,CAAC,oBAAoB,EAAE,IAAI,CAAC,gBAAgB,CAAC,EACpD,qBAAqB,EAAE,cAAc,EACrC,oBAAoB,EAAE,aAAa,EACnC,WAAW,CAAC,EAAE,MAAM,KACnB,OAAO,CAAC,qBAAqB,CAAC;qBACxB,CAAC,WAAW,CAAC,EAAE,MAAM,KAAK,IAAI;;6BAZlB,kBAAkB"}

package/src/contractFacet/zcfZygote.js

@@ -29,11 +29,11 @@ import { HandleOfferI, InvitationHandleShape } from '../typeGuards.js';
 import { prepareZcMint } from './zcfMint.js';
 import { ZcfI } from './typeGuards.js';
 
-/// <reference path="../internal-types.js" />
-
 /**
+ * @import {ShutdownWithFailure} from '@agoric/swingset-vat';
+ * @import {Baggage} from '@agoric/vat-data';
  * @import {IssuerOptionsRecord} from '@agoric/ertp';
- * @import {ContractMeta, ContractStartFn, SetTestJig, ZCF, ZCFMint, ZCFRegisterFeeMint, ZoeService} from '@agoric/zoe';
+ * @import {ZoeIssuerRecord, ZCFRegisterFeeMint, ContractStartFn, SetTestJig} from './types.js';
  */
 
 /**
@@ -56,7 +56,7 @@ import { ZcfI } from './typeGuards.js';
  * @param {Issuer<'set'>} invitationIssuer
  * @param {( {zcf}: {zcf: ZCF} ) => void} testJigSetter
  * @param {BundleCap} contractBundleCap
- * @param {import('@agoric/vat-data').Baggage} zcfBaggage
+ * @param {Baggage} zcfBaggage
  * @returns {Promise<ZCFZygote>}
  */
 export const makeZCFZygote = async (
@@ -88,7 +88,7 @@ export const makeZCFZygote = async (
     instantiate: instantiateIssuerStorage,
   } = provideIssuerStorage(zcfBaggage);
 
-  /** @type {import('@agoric/swingset-vat').ShutdownWithFailure} */
+  /** @type {ShutdownWithFailure} */
   const shutdownWithFailure = reason => {
     void E(zoeInstanceAdmin).failAllSeats(reason);
     seatManager.dropAllReferences();

package/src/contractSupport/prepare-ownable.d.ts

@@ -1,4 +1,4 @@
-export function prepareOwnable<MN extends (string | symbol)[]>(zone: import("@agoric/base-zone").Zone, makeInvitation: ZCF["makeInvitation"], uKindName: string, uMethodNames: MN, options?: OwnableOptions): <U>(underlying: U) => Pick<U, MN[number]> & {
+export function prepareOwnable<MN extends (string | symbol)[]>(zone: import("@agoric/base-zone").Zone, makeInvitation: ZCF["makeInvitation"], uKindName: string, uMethodNames: MN, options?: OwnableOptions): <U>(underlying: U) => Partial<U> & {
     makeTransferInvitation: () => Invitation<U>;
 };
 export type OwnableOptions = {

package/src/contractSupport/prepare-ownable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepare-ownable.d.ts","sourceRoot":"","sources":["prepare-ownable.js"],"names":[],"mappings":"AA0CO,+BAlB4B,EAAE,SAAvB,CAAC,MAAM,GAAG,MAAM,CAAC,EAAG,QACvB,OAAO,mBAAmB,EAAE,IAAI,kBAChC,GAAG,CAAC,gBAAgB,CAAC,aAQrB,MAAM,gBAEN,EAAE,YAGF,cAAc,GACZ,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,KAAK,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,GAAG;IAAC,sBAAsB,EAAE,MAAM,UAAU,CAAC,CAAC,CAAC,CAAA;CAAC,CAyDrG"}
+{"version":3,"file":"prepare-ownable.d.ts","sourceRoot":"","sources":["prepare-ownable.js"],"names":[],"mappings":"AA0CO,+BAlB4B,EAAE,SAAvB,CAAC,MAAM,GAAG,MAAM,CAAC,EAAG,QACvB,OAAO,mBAAmB,EAAE,IAAI,kBAChC,GAAG,CAAC,gBAAgB,CAAC,aAQrB,MAAM,gBAEN,EAAE,YAGF,cAAc,GACZ,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG;IAAC,sBAAsB,EAAE,MAAM,UAAU,CAAC,CAAC,CAAC,CAAA;CAAC,CA6D5F"}

package/src/contractSupport/prepare-ownable.js

@@ -38,7 +38,7 @@ const TransferProposalShape = M.splitRecord({
  *   The method names of the underlying exo class that should be represented
  *   by transparently-forwarding methods of the wrapping ownable object.
  * @param {OwnableOptions} [options]
- * @returns {<U>(underlying: U) => Pick<U, MN[number]> & {makeTransferInvitation: () => Invitation<U>}}
+ * @returns {<U>(underlying: U) => Partial<U> & {makeTransferInvitation: () => Invitation<U>}}
  */
 export const prepareOwnable = (
   zone,
@@ -94,6 +94,10 @@ export const prepareOwnable = (
   );
 
   const makeOwnable = underlying => makeRevocable(underlying);
+  // Using at-ts-ignore rather than at-ts-expect-error because the vscode
+  // ts server says it is an error but `yarn lint` says it is not.
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore Return type is more precise than revocable supports
   return harden(makeOwnable);
 };
 harden(prepareOwnable);

package/src/contracts/auction/index.d.ts

@@ -37,7 +37,7 @@ export function start(zcf: ZCF<{
             timeAuthority: import("@agoric/time").TimerService;
             bids: string | any[];
         };
-    } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         makeBidInvitation: () => Promise<globalThis.Invitation<unknown, never>>;
         getSessionDetails: () => {
             auctionedAssets: any;
@@ -60,7 +60,7 @@ export function start(zcf: ZCF<{
             timeAuthority: import("@agoric/time").TimerService;
             bids: string | any[];
         };
-    } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         getCurrentBids: () => any[] | "Bids are hidden for \"second price\" auctions";
         getSessionDetails: () => {
             auctionedAssets: any;

package/src/contracts/automaticRefund.d.ts

@@ -17,7 +17,7 @@ export function start(zcf: ZCF<{}>): {
     publicFacet: {
         getOffersCount: () => bigint;
         makeInvitation: () => Promise<globalThis.Invitation<unknown, never>>;
-    } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         getOffersCount: () => bigint;
         makeInvitation: () => Promise<globalThis.Invitation<unknown, never>>;
     }>;

package/src/contracts/barterExchange.d.ts

@@ -15,7 +15,7 @@
 export function start(zcf: ZCF): {
     publicFacet: {
         makeInvitation: () => Promise<globalThis.Invitation<unknown, never>>;
-    } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         makeInvitation: () => Promise<globalThis.Invitation<unknown, never>>;
     }>;
 };

package/src/contracts/callSpread/pricedCallSpread.d.ts

@@ -56,7 +56,7 @@ export function start(zcf: ZCF<{
             longInvitation: Promise<globalThis.Invitation<unknown, never>>;
             shortInvitation: Promise<globalThis.Invitation<unknown, never>>;
         };
-    } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         makeInvitationPair: (longCollateralShare: any) => {
             longInvitation: Promise<globalThis.Invitation<unknown, never>>;
             shortInvitation: Promise<globalThis.Invitation<unknown, never>>;

package/src/contracts/loan/liquidate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"liquidate.d.ts","sourceRoot":"","sources":["liquidate.js"],"names":[],"mappings":"AAKO,wIA6CN;AAeM,+BAJI,GAAG,UACH,sBAAsB,GACpB,OAAO,CAAC,IAAI,CAAC,CAiBzB"}
+{"version":3,"file":"liquidate.d.ts","sourceRoot":"","sources":["liquidate.js"],"names":[],"mappings":"AASO,wIA6CN;AAeM,+BAJI,GAAG,UACH,sBAAsB,GACpB,OAAO,CAAC,IAAI,CAAC,CAiBzB"}

package/src/contracts/loan/liquidate.js

@@ -3,6 +3,10 @@ import { AmountMath } from '@agoric/ertp';
 
 import { offerTo } from '../../contractSupport/zoeHelpers.js';
 
+/**
+ * @import {ShutdownWithFailure} from '@agoric/swingset-vat';
+ */
+
 export const doLiquidation = async (
   zcf,
   collateralSeat,
@@ -37,7 +41,7 @@ export const doLiquidation = async (
     zcf.shutdown('your loan had to be liquidated');
   };
 
-  /** @type {import('@agoric/swingset-vat').ShutdownWithFailure} */
+  /** @type {ShutdownWithFailure} */
   const closeWithFailure = err => {
     lenderSeat.fail(err);
     collateralSeat.fail(err);

package/src/contracts/mintPayments.d.ts

@@ -17,13 +17,13 @@ export function start(zcf: ZCF): Promise<{
     creatorFacet: {
         makeInvitation: (value?: bigint) => Promise<globalThis.Invitation<string, undefined>>;
         getTokenIssuer: () => globalThis.Issuer<"nat", import("@endo/patterns").Key>;
-    } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         makeInvitation: (value?: bigint) => Promise<globalThis.Invitation<string, undefined>>;
         getTokenIssuer: () => globalThis.Issuer<"nat", import("@endo/patterns").Key>;
     }>;
     publicFacet: {
         getTokenIssuer: () => globalThis.Issuer<"nat", import("@endo/patterns").Key>;
-    } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         getTokenIssuer: () => globalThis.Issuer<"nat", import("@endo/patterns").Key>;
     }>;
 }>;

package/src/contracts/oracle.d.ts

@@ -12,7 +12,7 @@ export type OracleStart = typeof start;
 export function start(zcf: ZCF): Promise<{
     creatorFacet: {
         initialize(privateParams: any): OracleCreatorFacet;
-    } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         initialize(privateParams: any): OracleCreatorFacet;
     }>;
     publicFacet: {
@@ -20,7 +20,7 @@ export function start(zcf: ZCF): Promise<{
         query(query: OracleQuery): Promise<unknown>;
         /** @param {OracleQuery} query */
         makeQueryInvitation(query: OracleQuery): Promise<Invitation<unknown, never>>;
-    } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         /** @param {OracleQuery} query */
         query(query: OracleQuery): Promise<unknown>;
         /** @param {OracleQuery} query */

package/src/contracts/otcDesk.d.ts

@@ -56,7 +56,7 @@ export function start(zcf: ZCF<Record<string, any>>): {
          */
         makeRemoveInventoryInvitation: () => Promise<Payment>;
         makeQuote: (price: AmountKeywordRecord, assets: AmountKeywordRecord, timeAuthority: import("@agoric/time").TimerService, deadline: any) => Promise<Payment>;
-    } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         /**
          * The inventory can be added in bulk before any quotes are made
          * or can be added immediately before a quote.

package/src/contracts/priceAggregator.d.ts

@@ -63,7 +63,7 @@ export function start(zcf: ZCF<{
          * @returns {Promise<OracleAdmin<Price>>}
          */
         initOracle: (oracleInstance?: Instance | string, query?: OracleQuery) => Promise<OracleAdmin<Price>>;
-    } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         /**
          * An "oracle invitation" is an invitation to be able to submit data to
          * include in the priceAggregator's results.
@@ -97,7 +97,7 @@ export function start(zcf: ZCF<{
         getSubscriber: () => globalThis.StoredSubscriber<unknown>;
         /** Diagnostic tool */
         getRoundCompleteNotifier(): Promise<globalThis.Notifier<any>>;
-    } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         getPriceAuthority(): import("@agoric/zoe/tools/types.js").PriceAuthority;
         getSubscriber: () => globalThis.StoredSubscriber<unknown>;
         /** Diagnostic tool */

package/src/contracts/simpleExchange.d.ts

@@ -29,7 +29,7 @@ export function start(zcf: ZCF): {
             buys: any;
             sells: any;
         }>;
-    } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         makeInvitation: () => Promise<Invitation<unknown, never>>;
         getNotifier: () => globalThis.Notifier<{
             buys: any;

package/src/instanceRecordStorage.d.ts

@@ -1,2 +1,4 @@
-export function makeInstanceRecordStorage(baggage: import("@agoric/vat-data").Baggage): (ir: InstanceRecord) => InstanceState;
+export function makeInstanceRecordStorage(baggage: Baggage): (ir: InstanceRecord) => InstanceState;
+import type { Baggage } from '@agoric/vat-data';
+import type { InstanceRecord } from './zoeService/utils.js';
 //# sourceMappingURL=instanceRecordStorage.d.ts.map

package/src/instanceRecordStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instanceRecordStorage.d.ts","sourceRoot":"","sources":["instanceRecordStorage.js"],"names":[],"mappings":"AA6BO,mDAHI,OAAO,kBAAkB,EAAE,OAAO,GAChC,CAAC,EAAE,EAAE,cAAc,KAAK,aAAa,CAqFjD"}
+{"version":3,"file":"instanceRecordStorage.d.ts","sourceRoot":"","sources":["instanceRecordStorage.js"],"names":[],"mappings":"AAkCO,mDAHI,OAAO,GACL,CAAC,EAAE,EAAE,cAAc,KAAK,aAAa,CAqFjD;6BAvGyB,kBAAkB;oCACX,uBAAuB"}

package/src/instanceRecordStorage.js

@@ -11,6 +11,11 @@ import {
   TermsShape,
 } from './typeGuards.js';
 
+/**
+ * @import {Baggage} from '@agoric/vat-data';
+ * @import {InstanceRecord} from './zoeService/utils.js';
+ */
+
 const { ownKeys } = Reflect;
 
 /**
@@ -24,7 +29,7 @@ const { ownKeys } = Reflect;
  */
 
 /**
- * @param {import('@agoric/vat-data').Baggage} baggage
+ * @param {Baggage} baggage
  * @returns {(ir: InstanceRecord) => InstanceState}
  */
 export const makeInstanceRecordStorage = baggage => {

package/src/internal-types.d.ts

@@ -22,7 +22,7 @@ type ZoeSeatAdminKit = {
 /**
  * Make the Zoe seat admin, user seat and a notifier
  */
-type MakeZoeSeatAdminKit = (initialAllocation: Allocation, instanceAdminHelper: InstanceAdminHelper, proposal: ProposalRecord, withdrawFacet: WithdrawFacet, exitObj: ERef<ExitObj>, offerResult?: ERef<unknown>, baggage: import("@agoric/vat-data").Baggage) => ZoeSeatAdminKit;
+type MakeZoeSeatAdminKit = (initialAllocation: Allocation, instanceAdminHelper: InstanceAdminHelper, proposal: ProposalRecord, withdrawFacet: WithdrawFacet, exitObj: ERef<ExitObj>, offerResult?: ERef<unknown>, baggage: Baggage) => ZoeSeatAdminKit;
 type ZoeSeatAdminExit = (completion?: Completion) => void;
 type ZoeSeatAdminMethods = {
     replaceAllocation: (allocation: Allocation) => void;
@@ -31,12 +31,12 @@ type ZoeSeatAdminMethods = {
      * called with the reason
      * for calling fail on this seat, where reason is normally an instanceof Error.
      */
-    fail: import("@agoric/swingset-vat").ShutdownWithFailure;
+    fail: ShutdownWithFailure;
     getExitSubscriber: () => Subscriber<AmountKeywordRecord>;
 };
-type ZoeSeatAdmin = import("@endo/marshal").RemotableObject & ZoeSeatAdminMethods;
+type ZoeSeatAdmin = RemotableObject & ZoeSeatAdminMethods;
 type HandleOfferResult = {
-    offerResultPromise: Promise<import("@endo/marshal").Passable>;
+    offerResultPromise: Promise<Passable>;
     exitObj: ExitObj;
 };
 /**
@@ -56,7 +56,7 @@ type InstanceAdmin = {
     getOfferFilter: () => string[];
     getInstallation: () => Installation;
     exitAllSeats: (completion: Completion) => void;
-    failAllSeats: import("@agoric/swingset-vat").ShutdownWithFailure;
+    failAllSeats: ShutdownWithFailure;
     stopAcceptingOffers: () => void;
     isBlocked: (string: string) => boolean;
     initDelayedState: (handleOfferObj: HandleOfferObj, publicFacet: unknown) => void;
@@ -79,7 +79,7 @@ type ZoeInstanceAdmin = {
     makeNoEscrowSeat: MakeNoEscrowSeat;
     replaceAllocations: ReplaceAllocations;
     exitAllSeats: (completion: Completion) => void;
-    failAllSeats: import("@agoric/swingset-vat").ShutdownWithFailure;
+    failAllSeats: ShutdownWithFailure;
     exitSeat: (seatHandle: SeatHandle, completion: Completion) => void;
     failSeat: (seatHandle: SeatHandle, reason: Error) => void;
     stopAcceptingOffers: () => void;
@@ -101,7 +101,7 @@ type SeatHandleAllocation = {
     allocation: Allocation;
 };
 type ZoeMint<K extends AssetKind = globalThis.AssetKind> = {
-    getIssuerRecord: () => import("@agoric/ertp").IssuerRecord<K>;
+    getIssuerRecord: () => IssuerRecord<K>;
     mintAndEscrow: (totalToMint: Amount<K>) => void;
     /**
      * Note that the burning is asynchronous, and so may not have happened by
@@ -162,14 +162,19 @@ type InstanceState = {
     getBrands: () => BrandKeywordRecord;
     assertUniqueKeyword: (keyword: Keyword) => void;
 };
-import type { Allocation } from '@agoric/zoe';
-import type { AnyTerms } from '@agoric/zoe';
-import type { BrandKeywordRecord } from '@agoric/zoe';
-import type { Completion } from '@agoric/zoe';
-import type { ContractStartFn } from '@agoric/zoe';
-import type { InvitationHandle } from '@agoric/zoe';
-import type { PaymentPKeywordRecord } from '@agoric/zoe';
-import type { UserSeat } from '@agoric/zoe';
-import type { ZoeIssuerRecord } from '@agoric/zoe';
+import type { RemotableObject } from '@endo/pass-style';
+import type { Passable } from '@endo/pass-style';
 import type { Pattern } from '@endo/patterns';
+import type { ShutdownWithFailure } from '@agoric/swingset-vat';
+import type { Baggage } from '@agoric/vat-data';
+import type { IssuerOptionsRecord } from '@agoric/ertp';
+import type { IssuerRecord } from '@agoric/ertp';
+import type { Allocation } from './types-index.js';
+import type { PaymentPKeywordRecord } from './types-index.js';
+import type { UserSeat } from './types-index.js';
+import type { Completion } from './types-index.js';
+import type { ZoeIssuerRecord } from './types-index.js';
+import type { InvitationHandle } from './types.js';
+import type { BrandKeywordRecord } from './types.js';
+import type { AnyTerms } from './types.js';
 //# sourceMappingURL=internal-types.d.ts.map

package/src/internal-types.d.ts.map

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

package/src/internal-types.js

@@ -2,8 +2,13 @@
 /// <reference types="@agoric/ertp/exported" />
 
 /**
- * @import {Allocation, AnyTerms, BrandKeywordRecord, Completion, ContractStartFn, InvitationHandle, PaymentPKeywordRecord, UserSeat, ZoeIssuerRecord} from '@agoric/zoe';
+ * @import {RemotableObject, Passable} from '@endo/pass-style';
  * @import {Pattern} from '@endo/patterns';
+ * @import {ShutdownWithFailure} from '@agoric/swingset-vat';
+ * @import {Baggage} from '@agoric/vat-data';
+ * @import {IssuerOptionsRecord, IssuerRecord} from '@agoric/ertp';
+ * @import {Allocation, PaymentPKeywordRecord, UserSeat, Completion, ZoeIssuerRecord} from './types-index.js';
+ * @import {InvitationHandle, BrandKeywordRecord, AnyTerms} from './types.js';
  */
 
 /**
@@ -24,7 +29,7 @@
 
 /**
  * @typedef WithdrawFacet
- * @property {(allocation:Allocation) => PaymentPKeywordRecord} withdrawPayments
+ * @property {(allocation: Allocation) => PaymentPKeywordRecord} withdrawPayments
  */
 
 /**
@@ -48,7 +53,7 @@
  * @param {WithdrawFacet} withdrawFacet
  * @param {ERef<ExitObj>} exitObj
  * @param {ERef<unknown>} [offerResult]
- * @param {import('@agoric/vat-data').Baggage} baggage
+ * @param {Baggage} baggage
  * @returns {ZoeSeatAdminKit}
  */
 
@@ -62,12 +67,12 @@
  * @typedef ZoeSeatAdminMethods
  * @property {(allocation: Allocation) => void} replaceAllocation
  * @property {ZoeSeatAdminExit} exit
- * @property {import('@agoric/swingset-vat').ShutdownWithFailure} fail called with the reason
+ * @property {ShutdownWithFailure} fail called with the reason
  * for calling fail on this seat, where reason is normally an instanceof Error.
  * @property {() => Subscriber<AmountKeywordRecord>} getExitSubscriber
  */
 /**
- * @typedef {import('@endo/marshal').RemotableObject & ZoeSeatAdminMethods} ZoeSeatAdmin
+ * @typedef {RemotableObject & ZoeSeatAdminMethods} ZoeSeatAdmin
  */
 
 /**
@@ -76,7 +81,7 @@
 
 /**
  * @typedef {object} HandleOfferResult
- * @property {Promise<import('@endo/marshal').Passable>} offerResultPromise
+ * @property {Promise<Passable>} offerResultPromise
  * @property {ExitObj} exitObj
  */
 
@@ -101,7 +106,7 @@
  * @property {() => string[]} getOfferFilter
  * @property {() => Installation} getInstallation
  * @property {(completion: Completion) => void} exitAllSeats
- * @property {import('@agoric/swingset-vat').ShutdownWithFailure} failAllSeats
+ * @property {ShutdownWithFailure} failAllSeats
  * @property {() => void} stopAcceptingOffers
  * @property {(string: string) => boolean} isBlocked
  * @property {(handleOfferObj: HandleOfferObj, publicFacet: unknown) => void} initDelayedState
@@ -139,7 +144,7 @@
  * @property {MakeNoEscrowSeat} makeNoEscrowSeat
  * @property {ReplaceAllocations} replaceAllocations
  * @property {(completion: Completion) => void} exitAllSeats
- * @property {import('@agoric/swingset-vat').ShutdownWithFailure} failAllSeats
+ * @property {ShutdownWithFailure} failAllSeats
  * @property {(seatHandle: SeatHandle, completion: Completion) => void} exitSeat
  * @property {(seatHandle: SeatHandle, reason: Error) => void} failSeat
  * @property {() => void} stopAcceptingOffers
@@ -169,7 +174,7 @@
  * @param {Keyword} keyword
  * @param {AssetKind} [assetKind]
  * @param {AdditionalDisplayInfo} [displayInfo]
- * @param {import('@agoric/ertp').IssuerOptionsRecord} [options]
+ * @param {IssuerOptionsRecord} [options]
  * @returns {ZoeMint}
  */
 
@@ -196,7 +201,7 @@
 /**
  * @template {AssetKind} [K=AssetKind]
  * @typedef {object} ZoeMint
- * @property {() => import('@agoric/ertp').IssuerRecord<K>} getIssuerRecord
+ * @property {() => IssuerRecord<K>} getIssuerRecord
  * @property {(totalToMint: Amount<K>) => void} mintAndEscrow
  * @property {(totalToBurn: Amount<K>) => void} withdrawAndBurn
  * Note that the burning is asynchronous, and so may not have happened by

package/src/types.d.ts

@@ -1,4 +1,4 @@
-import type { Issuer, Brand } from '@agoric/ertp';
+import type { Brand, Issuer } from '@agoric/ertp';
 import type { RemotableObject } from '@endo/pass-style';
 /**
  * Alias for RemotableObject

package/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,KAAK,EAIN,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGxD;;GAEG;AACH,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,MAAM,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC;AAK1D,wCAAwC;AACxC,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC;AAE7B;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AACpD,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/D,MAAM,MAAM,oBAAoB,GAAG,MAAM,CACvC,OAAO,EACP,OAAO,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CACtC,CAAC;AACF,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;AAC7D,MAAM,MAAM,aAAa,GAAG;IAC1B;;;OAGG;IACH,OAAO,EAAE,mBAAmB,CAAC;IAC7B;;;OAGG;IACH,MAAM,EAAE,kBAAkB,CAAC;CAC5B,CAAC;AACF,MAAM,MAAM,QAAQ,GAAG,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD;;GAEG;AACH,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,MAAM,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC;AAK1D,wCAAwC;AACxC,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC;AAE7B;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AACpD,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/D,MAAM,MAAM,oBAAoB,GAAG,MAAM,CACvC,OAAO,EACP,OAAO,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CACtC,CAAC;AACF,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;AAC7D,MAAM,MAAM,aAAa,GAAG;IAC1B;;;OAGG;IACH,OAAO,EAAE,mBAAmB,CAAC;IAC7B;;;OAGG;IACH,MAAM,EAAE,kBAAkB,CAAC;CAC5B,CAAC;AACF,MAAM,MAAM,QAAQ,GAAG,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC"}