@agoric/inter-protocol 0.16.2-dev-d6fae11.0.d6fae11 → 0.16.2-dev-64cee5a.0.64cee5a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.16.2-dev-d6fae11.0.d6fae11",
+  "version": "0.16.2-dev-64cee5a.0.64cee5a",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -31,17 +31,17 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-dev-d6fae11.0.d6fae11",
-    "@agoric/ertp": "0.16.3-dev-d6fae11.0.d6fae11",
-    "@agoric/governance": "0.10.4-dev-d6fae11.0.d6fae11",
-    "@agoric/internal": "0.3.3-dev-d6fae11.0.d6fae11",
-    "@agoric/notifier": "0.6.3-dev-d6fae11.0.d6fae11",
-    "@agoric/store": "0.9.3-dev-d6fae11.0.d6fae11",
-    "@agoric/time": "0.3.3-dev-d6fae11.0.d6fae11",
-    "@agoric/vat-data": "0.5.3-dev-d6fae11.0.d6fae11",
-    "@agoric/vats": "0.15.2-dev-d6fae11.0.d6fae11",
-    "@agoric/zoe": "0.26.3-dev-d6fae11.0.d6fae11",
-    "@agoric/zone": "0.2.3-dev-d6fae11.0.d6fae11",
+    "@agoric/base-zone": "0.1.1-dev-64cee5a.0.64cee5a",
+    "@agoric/ertp": "0.16.3-dev-64cee5a.0.64cee5a",
+    "@agoric/governance": "0.10.4-dev-64cee5a.0.64cee5a",
+    "@agoric/internal": "0.3.3-dev-64cee5a.0.64cee5a",
+    "@agoric/notifier": "0.6.3-dev-64cee5a.0.64cee5a",
+    "@agoric/store": "0.9.3-dev-64cee5a.0.64cee5a",
+    "@agoric/time": "0.3.3-dev-64cee5a.0.64cee5a",
+    "@agoric/vat-data": "0.5.3-dev-64cee5a.0.64cee5a",
+    "@agoric/vats": "0.15.2-dev-64cee5a.0.64cee5a",
+    "@agoric/zoe": "0.26.3-dev-64cee5a.0.64cee5a",
+    "@agoric/zone": "0.2.3-dev-64cee5a.0.64cee5a",
     "@endo/captp": "^4.4.8",
     "@endo/errors": "^1.2.13",
     "@endo/eventual-send": "^1.3.4",
@@ -52,9 +52,9 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/smart-wallet": "0.5.4-dev-d6fae11.0.d6fae11",
-    "@agoric/swingset-liveslots": "0.10.3-dev-d6fae11.0.d6fae11",
-    "@agoric/swingset-vat": "0.32.3-dev-d6fae11.0.d6fae11",
+    "@agoric/smart-wallet": "0.5.4-dev-64cee5a.0.64cee5a",
+    "@agoric/swingset-liveslots": "0.10.3-dev-64cee5a.0.64cee5a",
+    "@agoric/swingset-vat": "0.32.3-dev-64cee5a.0.64cee5a",
     "@endo/bundle-source": "^4.1.2",
     "@endo/init": "^1.1.12",
     "@endo/promise-kit": "^1.1.13",
@@ -85,5 +85,5 @@
   "typeCoverage": {
     "atLeast": 95.65
   },
-  "gitHead": "d6fae11a6db28b1122089468183eccd4d47b83c9"
+  "gitHead": "64cee5ae5d1a3488a30ce042d6f3f561ac2a6e82"
 }

package/src/auction/auctionBook.d.ts

@@ -1,5 +1,5 @@
 export function makeOfferSpecShape(bidBrand: Brand<"nat">, collateralBrand: Brand<"nat">): import("@endo/patterns").Matcher;
-export function prepareAuctionBook(baggage: Baggage, zcf: ZCF, makeRecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeRecorderKit): (bidBrand: globalThis.Brand<"nat">, collateralBrand: globalThis.Brand<"nat">, pAuthority: PriceAuthority, node: Remote<globalThis.StorageNode>) => ReturnType<(bidBrand: globalThis.Brand<"nat">, collateralBrand: globalThis.Brand<"nat">, pAuthority: PriceAuthority, node: Remote<globalThis.StorageNode>) => import("@endo/exo").GuardedKit<{
+export function prepareAuctionBook(baggage: Baggage, zcf: ZCF, makeRecorderKit: MakeRecorderKit): (bidBrand: globalThis.Brand<"nat">, collateralBrand: globalThis.Brand<"nat">, pAuthority: PriceAuthority, node: Remote<globalThis.StorageNode>) => ReturnType<(bidBrand: globalThis.Brand<"nat">, collateralBrand: globalThis.Brand<"nat">, pAuthority: PriceAuthority, node: Remote<globalThis.StorageNode>) => import("@endo/exo").GuardedKit<{
     helper: {
         /**
          * remove the key from the appropriate book, indicated by whether the
@@ -142,6 +142,7 @@ export type BookDataNotification = {
 };
 export type AuctionBook = EReturn<EReturn<typeof prepareAuctionBook>>;
 import type { Baggage } from '@agoric/vat-data';
+import type { MakeRecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
 import type { PriceAuthority } from '@agoric/zoe/tools/types.js';
 import type { Remote } from '@agoric/internal';
 import type { EReturn } from '@endo/far';

package/src/auction/auctionBook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auctionBook.d.ts","sourceRoot":"","sources":["auctionBook.js"],"names":[],"mappings":"AA+EO,6CAHI,KAAK,CAAC,KAAK,CAAC,mBACZ,KAAK,CAAC,KAAK,CAAC,oCAiBtB;AAwBM,4CAJI,OAAO,OACP,GAAG,mBACH,OAAO,6CAA6C,EAAE,eAAe,sJA8pBtE,UAAU;;QAriBZ;;;;;;WAMG;+BAFQ,MAAM,SACN,KAAK,GAAG,SAAS;QAW5B;;;;;;;WAOG;2BAHQ,MAAM,kBACN,MAAM,SACN,KAAK,GAAG,SAAS;QAW5B;;;;;;WAMG;qBAFQ,OAAO,oBACP,MAAM,CAAC,KAAK,CAAC;QA+DxB;;;;;;;;;;;WAWG;+BANQ,OAAO,SACP,KAAK,UACL,MAAM,CAAC,KAAK,CAAC,+BAErB;YAAsB,SAAS,EAAvB,OAAO;YACQ,YAAY;SAAC;QAsCvC;;;;;;;;;;;WAWG;mCANQ,OAAO,cACP,KAAK,UACL,MAAM,CAAC,KAAK,CAAC,+BAErB;YAAsB,SAAS,EAAvB,OAAO;YACQ,YAAY;SAAC;;;;;QAyHvC;;;;;;;;WAQG;+BAPQ,MAAM,CAAC,KAAK,CAAC,cACb,OAAO,iBACP,MAAM,CAAC,KAAK,CAAC;mCA2ED,KAAK,GAAK,IAAI;;;;;QAuGrC;;;;WAIG;4BAHQ,SAAS,QACT,OAAO,aACP,OAAO;;;;;;;;;;;;GAqFqB,CAAC,MAAM,CAAC,CAItD;wBAxtBY;IACR,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CACvB,GAAG;IACF,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,GAAG,CACE;IACE,UAAU,EAAE,KAAK,CAAC;CACnB,GACD;IACE,eAAe,EAAE,KAAK,CAAC;CACxB,CACJ;;;;;gBAyBQ,KAAK,GAAG,IAAI;;;;;uBACZ,KAAK,GAAG,IAAI;;;;;uBAEZ,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI;;;;;2BAEpB,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI;;;;;oBAEpB,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS;;;;;qBAEzB,MAAM,CAAC,KAAK,CAAC;;;;;yBAEb,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI;;0BA4qBpB,QAAQ,QAAQ,OAAO,kBAAkB,CAAC,CAAC;6BA1vB/B,kBAAkB;oCACX,4BAA4B;4BACtB,kBAAkB;6BAH/B,WAAW"}
+{"version":3,"file":"auctionBook.d.ts","sourceRoot":"","sources":["auctionBook.js"],"names":[],"mappings":"AAgFO,6CAHI,KAAK,CAAC,KAAK,CAAC,mBACZ,KAAK,CAAC,KAAK,CAAC,oCAiBtB;AAwBM,4CAJI,OAAO,OACP,GAAG,mBACH,eAAe,sJA8pBhB,UAAU;;QAriBZ;;;;;;WAMG;+BAFQ,MAAM,SACN,KAAK,GAAG,SAAS;QAW5B;;;;;;;WAOG;2BAHQ,MAAM,kBACN,MAAM,SACN,KAAK,GAAG,SAAS;QAW5B;;;;;;WAMG;qBAFQ,OAAO,oBACP,MAAM,CAAC,KAAK,CAAC;QA+DxB;;;;;;;;;;;WAWG;+BANQ,OAAO,SACP,KAAK,UACL,MAAM,CAAC,KAAK,CAAC,+BAErB;YAAsB,SAAS,EAAvB,OAAO;YACQ,YAAY;SAAC;QAsCvC;;;;;;;;;;;WAWG;mCANQ,OAAO,cACP,KAAK,UACL,MAAM,CAAC,KAAK,CAAC,+BAErB;YAAsB,SAAS,EAAvB,OAAO;YACQ,YAAY;SAAC;;;;;QAyHvC;;;;;;;;WAQG;+BAPQ,MAAM,CAAC,KAAK,CAAC,cACb,OAAO,iBACP,MAAM,CAAC,KAAK,CAAC;mCA2ED,KAAK,GAAK,IAAI;;;;;QAuGrC;;;;WAIG;4BAHQ,SAAS,QACT,OAAO,aACP,OAAO;;;;;;;;;;;;GAqFqB,CAAC,MAAM,CAAC,CAItD;wBAxtBY;IACR,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CACvB,GAAG;IACF,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,GAAG,CACE;IACE,UAAU,EAAE,KAAK,CAAC;CACnB,GACD;IACE,eAAe,EAAE,KAAK,CAAC;CACxB,CACJ;;;;;gBAyBQ,KAAK,GAAG,IAAI;;;;;uBACZ,KAAK,GAAG,IAAI;;;;;uBAEZ,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI;;;;;2BAEpB,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI;;;;;oBAEpB,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS;;;;;qBAEzB,MAAM,CAAC,KAAK,CAAC;;;;;yBAEb,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI;;0BA4qBpB,QAAQ,QAAQ,OAAO,kBAAkB,CAAC,CAAC;6BA3vB/B,kBAAkB;qCAGV,6CAA6C;oCAF9C,4BAA4B;4BACtB,kBAAkB;6BAH/B,WAAW"}

package/src/auction/auctionBook.js

@@ -32,6 +32,7 @@ import {
  * @import {Baggage} from '@agoric/vat-data';
  * @import {PriceAuthority} from '@agoric/zoe/tools/types.js';
  * @import {TypedPattern, Remote} from '@agoric/internal';
+ * @import {MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
  */
 
 const { makeEmpty } = AmountMath;
@@ -114,7 +115,7 @@ export const makeOfferSpecShape = (bidBrand, collateralBrand) => {
 /**
  * @param {Baggage} baggage
  * @param {ZCF} zcf
- * @param {import('@agoric/zoe/src/contractSupport/recorder.js').MakeRecorderKit} makeRecorderKit
+ * @param {MakeRecorderKit} makeRecorderKit
  */
 export const prepareAuctionBook = (baggage, zcf, makeRecorderKit) => {
   const makeScaledBidBook = prepareScaledBidBook(baggage);

package/src/auction/auctioneer.d.ts

@@ -4,7 +4,7 @@ export function distributeProportionalSharesWithLimits(unsoldCollateral: Amount<
     goal: Amount<"nat">;
 }[], collateralSeat: ZCFSeat, bidHoldingSeat: ZCFSeat, collateralKeyword: string, reserveSeat: ZCFSeat, brand: Brand): globalThis.TransferPart[];
 export function start(zcf: ZCF<GovernanceTerms<typeof auctioneerParamTypes> & {
-    timerService: import("@agoric/time").TimerService;
+    timerService: TimerService;
     reservePublicFacet: AssetReservePublicFacet;
     priceAuthority: PriceAuthority;
 }>, privateArgs: {
@@ -22,17 +22,17 @@ export function start(zcf: ZCF<GovernanceTerms<typeof auctioneerParamTypes> & {
         getAuctionStartDelay: () => RelativeTime;
         getPriceLockPeriod: () => RelativeTime;
         /** @param {Brand<'nat'>} collateralBrand */
-        makeBidInvitation(collateralBrand: Brand<"nat">): Promise<globalThis.Invitation<string, import("./auctionBook.js").OfferSpec>>;
+        makeBidInvitation(collateralBrand: Brand<"nat">): Promise<globalThis.Invitation<string, OfferSpec>>;
         getSchedules(): {
             liveAuctionSchedule: import("./scheduler.js").Schedule | null;
             nextAuctionSchedule: import("./scheduler.js").Schedule | null;
         };
-        getScheduleUpdates(): globalThis.Subscriber<import("./scheduler.js").ScheduleNotification>;
+        getScheduleUpdates(): globalThis.Subscriber<ScheduleNotification>;
         getBookDataUpdates(brand: any): globalThis.Subscriber<import("./auctionBook.js").BookDataNotification>;
         getPublicTopics(brand: any): {
             bookData: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./auctionBook.js").BookDataNotification>;
         } | {
-            schedule: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./scheduler.js").ScheduleNotification>;
+            schedule: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<ScheduleNotification>;
         };
         makeDepositInvitation: () => Promise<globalThis.Invitation<string, {
             goal: Amount<"nat">;
@@ -44,16 +44,16 @@ export function start(zcf: ZCF<GovernanceTerms<typeof auctioneerParamTypes> & {
          * @param {Keyword} kwd
          */
         addBrand(issuer: Issuer<"nat">, kwd: Keyword): Promise<void>;
-        /** @returns {Promise<import('./scheduler.js').FullSchedule>} */
-        getSchedule(): Promise<import("./scheduler.js").FullSchedule>;
+        /** @returns {Promise<FullSchedule>} */
+        getSchedule(): Promise<FullSchedule>;
     } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         /**
          * @param {Issuer<'nat'>} issuer
          * @param {Keyword} kwd
          */
         addBrand(issuer: Issuer<"nat">, kwd: Keyword): Promise<void>;
-        /** @returns {Promise<import('./scheduler.js').FullSchedule>} */
-        getSchedule(): Promise<import("./scheduler.js").FullSchedule>;
+        /** @returns {Promise<FullSchedule>} */
+        getSchedule(): Promise<FullSchedule>;
     }>>;
 }>;
 /** @typedef {ContractOf<typeof start>} AuctioneerContract */
@@ -64,8 +64,12 @@ export type AuctioneerContract = ContractOf<typeof start>;
 export type AuctioneerPublicFacet = AuctioneerContract["publicFacet"];
 export type AuctioneerCreatorFacet = AuctioneerContract["creatorFacet"];
 import { auctioneerParamTypes } from './params.js';
+import type { TimerService } from '@agoric/time';
 import type { PriceAuthority } from '@agoric/zoe/tools/types.js';
 import type { Remote } from '@agoric/internal';
 import type { Baggage } from '@agoric/vat-data';
+import type { OfferSpec } from './auctionBook.js';
+import type { ScheduleNotification } from './scheduler.js';
+import type { FullSchedule } from './scheduler.js';
 import type { ContractOf } from '@agoric/zoe/src/zoeService/utils.js';
 //# sourceMappingURL=auctioneer.d.ts.map

package/src/auction/auctioneer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auctioneer.d.ts","sourceRoot":"","sources":["auctioneer.js"],"names":[],"mappings":"AAqLO,yEAXI,MAAM,CAAC,KAAK,CAAC,YACb,MAAM,CAAC,KAAK,CAAC,YACb;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;CAAE,EAAE,kBAC/D,OAAO,kBACP,OAAO,qBAEP,MAAM,eAEN,OAAO,SACP,KAAK,6BAgNf;AAiBM,2BAdI,GAAG,CACT,eAAe,CAAC,OAAO,oBAAoB,CAAC,GAAG;IAC7C,YAAY,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;IAClD,kBAAkB,EAAE,uBAAuB,CAAC;IAC5C,cAAc,EAAE,cAAc,CAAC;CAChC,CACF,eACO;IACN,sBAAsB,EAAE,UAAU,CAAC;IACnC,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;CAChC,WACO,OAAO;;;;;;;;;;QAyOZ,4CAA4C;2CAAhC,KAAK,CAAC,KAAK,CAAC;;;;;;;;;;;;;kBApCT,MAAM,CAAC,KAAK,CAAC;;;;QAkG5B;;;WAGG;yBAFQ,MAAM,CAAC,KAAK,CAAC,OACb,OAAO;QAyBlB,gEAAgE;uBAAlD,OAAO,CAAC,OAAO,gBAAgB,EAAE,YAAY,CAAC;;QA3B5D;;;WAGG;yBAFQ,MAAM,CAAC,KAAK,CAAC,OACb,OAAO;QAyBlB,gEAAgE;uBAAlD,OAAO,CAAC,OAAO,gBAAgB,EAAE,YAAY,CAAC;;GAQjE;AAED,6DAA6D;AAC7D,yEAAyE;AACzE,2EAA2E;AAE3E,8DAAkE;iCAJpD,WAAW,OAAO,KAAK,CAAC;oCACxB,kBAAkB,CAAC,aAAa,CAAC;qCACjC,kBAAkB,CAAC,cAAc,CAAC;qCA/rBX,aAAa;oCAS2C,4BAA4B;4BAJlF,kBAAkB;6BAE/B,kBAAkB;gCACf,qCAAqC"}
+{"version":3,"file":"auctioneer.d.ts","sourceRoot":"","sources":["auctioneer.js"],"names":[],"mappings":"AA0LO,yEAXI,MAAM,CAAC,KAAK,CAAC,YACb,MAAM,CAAC,KAAK,CAAC,YACb;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;CAAE,EAAE,kBAC/D,OAAO,kBACP,OAAO,qBAEP,MAAM,eAEN,OAAO,SACP,KAAK,6BAgNf;AAiBM,2BAdI,GAAG,CACT,eAAe,CAAC,OAAO,oBAAoB,CAAC,GAAG;IAC7C,YAAY,EAAE,YAAY,CAAC;IAC3B,kBAAkB,EAAE,uBAAuB,CAAC;IAC5C,cAAc,EAAE,cAAc,CAAC;CAChC,CACF,eACO;IACN,sBAAsB,EAAE,UAAU,CAAC;IACnC,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;CAChC,WACO,OAAO;;;;;;;;;;QAyOZ,4CAA4C;2CAAhC,KAAK,CAAC,KAAK,CAAC;;;;;;;;;;;;;kBApCT,MAAM,CAAC,KAAK,CAAC;;;;QAkG5B;;;WAGG;yBAFQ,MAAM,CAAC,KAAK,CAAC,OACb,OAAO;QAyBlB,uCAAuC;uBAAzB,OAAO,CAAC,YAAY,CAAC;;QA3BnC;;;WAGG;yBAFQ,MAAM,CAAC,KAAK,CAAC,OACb,OAAO;QAyBlB,uCAAuC;uBAAzB,OAAO,CAAC,YAAY,CAAC;;GAQxC;AAED,6DAA6D;AAC7D,yEAAyE;AACzE,2EAA2E;AAE3E,8DAAkE;iCAJpD,WAAW,OAAO,KAAK,CAAC;oCACxB,kBAAkB,CAAC,aAAa,CAAC;qCACjC,kBAAkB,CAAC,cAAc,CAAC;qCApsBX,aAAa;kCAUnB,cAAc;oCADgD,4BAA4B;4BAJlF,kBAAkB;6BAE/B,kBAAkB;+BAMhB,kBAAkB;0CADP,gBAAgB;kCAExB,gBAAgB;gCANlB,qCAAqC"}

package/src/auction/auctioneer.js

@@ -41,6 +41,11 @@ import { AuctionState } from './util.js';
  * @import {Baggage} from '@agoric/vat-data';
  * @import {ContractOf} from '@agoric/zoe/src/zoeService/utils.js';
  * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
+ * @import {TimerService} from '@agoric/time';
+ * @import {AuctionBook} from './auctionBook.js';
+ * @import {ScheduleNotification} from './scheduler.js';
+ * @import {OfferSpec} from './auctionBook.js';
+ * @import {FullSchedule} from './scheduler.js';
  */
 
 const BASIS_POINTS = 10_000n;
@@ -390,7 +395,7 @@ export const distributeProportionalSharesWithLimits = (
 /**
  * @param {ZCF<
  *   GovernanceTerms<typeof auctioneerParamTypes> & {
- *     timerService: import('@agoric/time').TimerService;
+ *     timerService: TimerService;
  *     reservePublicFacet: AssetReservePublicFacet;
  *     priceAuthority: PriceAuthority;
  *   }
@@ -409,7 +414,7 @@ export const start = async (zcf, privateArgs, baggage) => {
 
   const bidAmountShape = { brand: brands.Bid, value: M.nat() };
 
-  /** @type {MapStore<Brand, import('./auctionBook.js').AuctionBook>} */
+  /** @type {MapStore<Brand, AuctionBook>} */
   const books = provideDurableMapStore(baggage, 'auctionBooks');
   /**
    * @type {MapStore<
@@ -449,7 +454,7 @@ export const start = async (zcf, privateArgs, baggage) => {
   const scheduleKit = makeERecorderKit(
     E(privateArgs.storageNode).makeChildNode('schedule'),
     /**
-     * @type {TypedPattern<import('./scheduler.js').ScheduleNotification>}
+     * @type {TypedPattern<ScheduleNotification>}
      */ (M.any()),
   );
 
@@ -641,7 +646,7 @@ export const start = async (zcf, privateArgs, baggage) => {
         const offerSpecShape = makeOfferSpecShape(brands.Bid, collateralBrand);
         /**
          * @param {ZCFSeat} zcfSeat
-         * @param {import('./auctionBook.js').OfferSpec} offerSpec
+         * @param {OfferSpec} offerSpec
          */
         const newBidHandler = (zcfSeat, offerSpec) => {
           // xxx consider having Zoe guard the offerArgs with a provided shape
@@ -722,7 +727,7 @@ export const start = async (zcf, privateArgs, baggage) => {
         books.init(brand, newBook);
         brandToKeyword.init(brand, kwd);
       },
-      /** @returns {Promise<import('./scheduler.js').FullSchedule>} */
+      /** @returns {Promise<FullSchedule>} */
       getSchedule() {
         return E(scheduler).getSchedule();
       },

package/src/auction/params.d.ts

@@ -3,6 +3,9 @@
  * @import {SyncSpecTuple} from '@agoric/governance/src/contractGovernance/typedParamManager.js';
  * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
  * @import {Remote} from '@agoric/internal';
+ * @import {TimerBrand} from '@agoric/time';
+ * @import {StoredPublisherKit} from '@agoric/notifier';
+ * @import {TimerService} from '@agoric/time';
  */
 export const InvitationShape: import("@endo/patterns").Matcher;
 /**
@@ -72,7 +75,7 @@ export function makeAuctioneerParams({ ElectorateInvitationAmount, StartFrequenc
         value: bigint;
     };
 };
-export function makeAuctioneerParamManager(publisherKit: import("@agoric/notifier").StoredPublisherKit<GovernanceSubscriptionState>, zcf: ZCF, initial: AuctionParams): import("@agoric/governance/src/contractGovernance/typedParamManager.js").TypedParamManager<{
+export function makeAuctioneerParamManager(publisherKit: StoredPublisherKit<GovernanceSubscriptionState>, zcf: ZCF, initial: AuctionParams): import("@agoric/governance/src/contractGovernance/typedParamManager.js").TypedParamManager<{
     Electorate: "invitation";
     StartFrequency: "relativeTime";
     ClockStep: "relativeTime";
@@ -85,7 +88,7 @@ export function makeAuctioneerParamManager(publisherKit: import("@agoric/notifie
 export function makeGovernedTerms({ storageNode: _storageNode, marshaller: _marshaller }: {
     storageNode: Remote<StorageNode>;
     marshaller: Remote<Marshaller>;
-}, timer: ERef<import("@agoric/time").TimerService>, priceAuthority: ERef<PriceAuthority>, reservePublicFacet: ERef<AssetReservePublicFacet>, params: AuctionParams): {
+}, timer: ERef<TimerService>, priceAuthority: ERef<PriceAuthority>, reservePublicFacet: ERef<AssetReservePublicFacet>, params: AuctionParams): {
     priceAuthority: globalThis.ERef<PriceAuthority>;
     reservePublicFacet: globalThis.ERef<globalThis.GovernedPublicFacet<import("@endo/exo").Guarded<{
         makeAddCollateralInvitation(): Promise<globalThis.Invitation<string, never>>;
@@ -93,7 +96,7 @@ export function makeGovernedTerms({ storageNode: _storageNode, marshaller: _mars
             metrics: import("@agoric/zoe/src/contractSupport").PublicTopic<import("../reserve/assetReserveKit").MetricsNotification>;
         };
     }>>>;
-    timerService: globalThis.ERef<import("@agoric/time").TimerService>;
+    timerService: globalThis.ERef<TimerService>;
     governedParams: {
         Electorate: {
             type: "invitation";
@@ -138,10 +141,13 @@ export type AuctionParams = {
     DiscountStep: bigint;
     AuctionStartDelay: RelativeTime;
     PriceLockPeriod: RelativeTime;
-    TimerBrand: import("@agoric/time").TimerBrand;
+    TimerBrand: TimerBrand;
 };
 export type AuctionParamRecord = ReturnType<typeof makeAuctioneerParams>;
 export type AuctionParamManager = ReturnType<typeof makeAuctioneerParamManager>;
+import type { StoredPublisherKit } from '@agoric/notifier';
 import type { Remote } from '@agoric/internal';
+import type { TimerService } from '@agoric/time';
 import type { PriceAuthority } from '@agoric/zoe/tools/types.js';
+import type { TimerBrand } from '@agoric/time';
 //# sourceMappingURL=params.d.ts.map

package/src/auction/params.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["params.js"],"names":[],"mappings":"AAQA;;;;;GAKG;AAGH,+DAAyD;AAEzD;;;;;;GAMG;AACH,8BAA+B,gBAAgB,CAAC;AAChD,gDAAgD;AAChD,yBAA0B,WAAW,CAAC;AACtC,iFAAiF;AACjF,+BAAgC,cAAc,CAAC;AAC/C,4DAA4D;AAC5D,6BAA8B,YAAY,CAAC;AAC3C,4EAA4E;AAC5E,+BAAgC,cAAc,CAAC;AAC/C;;;GAGG;AACH,kCAAmC,mBAAmB,CAAC;AAIvD,gCAAiC,iBAAiB,CAAC;AAEnD,sEASG;;;;;;;;;;;AA2BI,yLADK,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqCxB;AAQM,yDAJI,OAAO,kBAAkB,EAAE,kBAAkB,CAAC,2BAA2B,CAAC,OAC1E,GAAG,WACH,aAAa;;;;;;;;;GA0BvB;AAcM,0FATI;IACN,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;CAChC,SACO,IAAI,CAAC,OAAO,cAAc,EAAE,YAAY,CAAC,kBACzC,IAAI,CAAC,cAAc,CAAC,sBACpB,IAAI,CAAC,uBAAuB,CAAC,UAC7B,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgBvB;;gCA5Ga,MAAM,CAAC,KAAK,CAAC;oBACb,YAAY;eACZ,YAAY;kBACZ,MAAM;gBACN,MAAM;kBACN,MAAM;uBACN,YAAY;qBACZ,YAAY;gBACZ,OAAO,cAAc,EAAE,UAAU;;iCA0EjC,UAAU,CAAC,OAAO,oBAAoB,CAAC;kCA6BvC,UAAU,CAAC,OAAO,0BAA0B,CAAC;4BAvKlC,kBAAkB;oCADkD,4BAA4B"}
+{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["params.js"],"names":[],"mappings":"AAQA;;;;;;;;GAQG;AAGH,+DAAyD;AAEzD;;;;;;GAMG;AACH,8BAA+B,gBAAgB,CAAC;AAChD,gDAAgD;AAChD,yBAA0B,WAAW,CAAC;AACtC,iFAAiF;AACjF,+BAAgC,cAAc,CAAC;AAC/C,4DAA4D;AAC5D,6BAA8B,YAAY,CAAC;AAC3C,4EAA4E;AAC5E,+BAAgC,cAAc,CAAC;AAC/C;;;GAGG;AACH,kCAAmC,mBAAmB,CAAC;AAIvD,gCAAiC,iBAAiB,CAAC;AAEnD,sEASG;;;;;;;;;;;AA2BI,yLADK,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqCxB;AAQM,yDAJI,mBAAmB,2BAA2B,CAAC,OAC/C,GAAG,WACH,aAAa;;;;;;;;;GA0BvB;AAcM,0FATI;IACN,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;CAChC,SACO,IAAI,CAAC,YAAY,CAAC,kBAClB,IAAI,CAAC,cAAc,CAAC,sBACpB,IAAI,CAAC,uBAAuB,CAAC,UAC7B,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgBvB;;gCA5Ga,MAAM,CAAC,KAAK,CAAC;oBACb,YAAY;eACZ,YAAY;kBACZ,MAAM;gBACN,MAAM;kBACN,MAAM;uBACN,YAAY;qBACZ,YAAY;gBACZ,UAAU;;iCA0EV,UAAU,CAAC,OAAO,oBAAoB,CAAC;kCA6BvC,UAAU,CAAC,OAAO,0BAA0B,CAAC;wCAxKtB,kBAAkB;4BAF9B,kBAAkB;kCAGZ,cAAc;oCAJgD,4BAA4B;gCAE5F,cAAc"}

package/src/auction/params.js

@@ -11,6 +11,9 @@ import { M } from '@agoric/store';
  * @import {SyncSpecTuple} from '@agoric/governance/src/contractGovernance/typedParamManager.js';
  * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
  * @import {Remote} from '@agoric/internal';
+ * @import {TimerBrand} from '@agoric/time';
+ * @import {StoredPublisherKit} from '@agoric/notifier';
+ * @import {TimerService} from '@agoric/time';
  */
 
 // TODO duplicated with zoe/src/TypeGuards.js
@@ -74,7 +77,7 @@ export const auctioneerParamTypes = harden({
  * @property {bigint} DiscountStep
  * @property {RelativeTime} AuctionStartDelay
  * @property {RelativeTime} PriceLockPeriod
- * @property {import('@agoric/time').TimerBrand} TimerBrand
+ * @property {TimerBrand} TimerBrand
  */
 
 /** @param {AuctionParams} initial */
@@ -118,7 +121,7 @@ export const makeAuctioneerParams = ({
 harden(makeAuctioneerParams);
 
 /**
- * @param {import('@agoric/notifier').StoredPublisherKit<GovernanceSubscriptionState>} publisherKit
+ * @param {StoredPublisherKit<GovernanceSubscriptionState>} publisherKit
  * @param {ZCF} zcf
  * @param {AuctionParams} initial
  */
@@ -155,7 +158,7 @@ harden(makeAuctioneerParamManager);
  *   storageNode: Remote<StorageNode>;
  *   marshaller: Remote<Marshaller>;
  * }} caps
- * @param {ERef<import('@agoric/time').TimerService>} timer
+ * @param {ERef<TimerService>} timer
  * @param {ERef<PriceAuthority>} priceAuthority
  * @param {ERef<AssetReservePublicFacet>} reservePublicFacet
  * @param {AuctionParams} params

package/src/auction/scheduleMath.d.ts

@@ -1,5 +1,7 @@
-export function computeRoundTiming(params: Awaited<import("./params.js").AuctionParamManager>, baseTime: TimestampRecord): import("./scheduler.js").Schedule;
-export function nextDescendingStepTime(liveSchedule: import("./scheduler.js").Schedule | null, nextSchedule: import("./scheduler.js").Schedule | null, now: Timestamp): Timestamp | null;
-export function timeVsSchedule(time: Timestamp, schedule: import("./scheduler.js").Schedule): "before" | "during" | "endExactly" | "after";
+export function computeRoundTiming(params: Awaited<AuctionParamManager>, baseTime: TimestampRecord): Schedule;
+export function nextDescendingStepTime(liveSchedule: Schedule | null, nextSchedule: Schedule | null, now: Timestamp): Timestamp | null;
+export function timeVsSchedule(time: Timestamp, schedule: Schedule): "before" | "during" | "endExactly" | "after";
+import type { AuctionParamManager } from './params.js';
 import type { TimestampRecord } from '@agoric/time';
+import type { Schedule } from './scheduler.js';
 //# sourceMappingURL=scheduleMath.d.ts.map

package/src/auction/scheduleMath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduleMath.d.ts","sourceRoot":"","sources":["scheduleMath.js"],"names":[],"mappings":"AA0CO,2CAJI,OAAO,CAAC,OAAO,aAAa,EAAE,mBAAmB,CAAC,YAClD,eAAe,GACb,OAAO,gBAAgB,EAAE,QAAQ,CAqE7C;AAcM,qDALI,OAAO,gBAAgB,EAAE,QAAQ,GAAG,IAAI,gBACxC,OAAO,gBAAgB,EAAE,QAAQ,GAAG,IAAI,OACxC,SAAS,GACP,SAAS,GAAG,IAAI,CAuB5B;AAQM,qCAJI,SAAS,YACT,OAAO,gBAAgB,EAAE,QAAQ,GAC/B,QAAQ,GAAG,QAAQ,GAAG,YAAY,GAAG,OAAO,CAiBxD;qCAhKkC,cAAc"}
+{"version":3,"file":"scheduleMath.d.ts","sourceRoot":"","sources":["scheduleMath.js"],"names":[],"mappings":"AA8CO,2CAJI,OAAO,CAAC,mBAAmB,CAAC,YAC5B,eAAe,GACb,QAAQ,CAqEpB;AAcM,qDALI,QAAQ,GAAG,IAAI,gBACf,QAAQ,GAAG,IAAI,OACf,SAAS,GACP,SAAS,GAAG,IAAI,CAuB5B;AAQM,qCAJI,SAAS,YACT,QAAQ,GACN,QAAQ,GAAG,QAAQ,GAAG,YAAY,GAAG,OAAO,CAiBxD;yCAlKqC,aAAa;qCADjB,cAAc;8BAErB,gBAAgB"}

package/src/auction/scheduleMath.js

@@ -5,7 +5,11 @@ import { TimeMath } from '@agoric/time';
 import { natSafeMath } from '@agoric/zoe/src/contractSupport/index.js';
 import { assertAllDefined, makeTracer } from '@agoric/internal';
 
-/** @import {TimestampRecord} from '@agoric/time'; */
+/**
+ * @import {TimestampRecord} from '@agoric/time';
+ * @import {AuctionParamManager} from './params.js';
+ * @import {Schedule} from './scheduler.js';
+ */
 
 const { subtract, multiply, floorDivide } = natSafeMath;
 
@@ -36,9 +40,9 @@ const subtract1 = relTime =>
  * selling early (e.g. reaching their target debt to raise or selling all of
  * their collateral).
  *
- * @param {Awaited<import('./params.js').AuctionParamManager>} params
+ * @param {Awaited<AuctionParamManager>} params
  * @param {TimestampRecord} baseTime
- * @returns {import('./scheduler.js').Schedule}
+ * @returns {Schedule}
  */
 export const computeRoundTiming = (params, baseTime) => {
   const freq = params.getStartFrequency();
@@ -96,7 +100,7 @@ export const computeRoundTiming = (params, baseTime) => {
   const endTime = TimeMath.addAbsRel(startTime, actualDuration);
   const lockTime = TimeMath.subtractAbsRel(startTime, lockPeriod);
 
-  /** @type {import('./scheduler.js').Schedule} */
+  /** @type {Schedule} */
   const next = {
     startTime,
     endTime,
@@ -116,8 +120,8 @@ harden(computeRoundTiming);
  * started, then it'll be nextSchedule.startTime. Otherwise, it's the start of
  * the step following the current step.
  *
- * @param {import('./scheduler.js').Schedule | null} liveSchedule
- * @param {import('./scheduler.js').Schedule | null} nextSchedule
+ * @param {Schedule | null} liveSchedule
+ * @param {Schedule | null} nextSchedule
  * @param {Timestamp} now
  * @returns {Timestamp | null}
  */
@@ -147,7 +151,7 @@ harden(nextDescendingStepTime);
 
 /**
  * @param {Timestamp} time
- * @param {import('./scheduler.js').Schedule} schedule
+ * @param {Schedule} schedule
  * @returns {'before' | 'during' | 'endExactly' | 'after'}
  */
 export const timeVsSchedule = (time, schedule) => {

package/src/auction/scheduler.d.ts

@@ -1,4 +1,4 @@
-export function makeScheduler(auctionDriver: AuctionDriver, timer: import("@agoric/time").TimerService, params: Awaited<import("./params.js").AuctionParamManager>, timerBrand: import("@agoric/time").TimerBrand, scheduleRecorder: import("@agoric/zoe/src/contractSupport/recorder.js").Recorder<ScheduleNotification>, paramUpdateSubscription: StoredSubscription<GovernanceSubscriptionState>): Promise<{
+export function makeScheduler(auctionDriver: AuctionDriver, timer: TimerService, params: Awaited<AuctionParamManager>, timerBrand: TimerBrand, scheduleRecorder: Recorder<ScheduleNotification>, paramUpdateSubscription: StoredSubscription<GovernanceSubscriptionState>): Promise<{
     getSchedule: () => {
         liveAuctionSchedule: Schedule | null;
         nextAuctionSchedule: Schedule | null;
@@ -34,8 +34,8 @@ export type ScheduleNotification = {
     nextDescendingStepTime: Timestamp | null;
 };
 export type Schedule = {
-    startTime: import("@agoric/time").TimestampRecord;
-    endTime: import("@agoric/time").TimestampRecord;
+    startTime: TimestampRecord;
+    endTime: TimestampRecord;
     steps: NatValue;
     endRate: NatValue;
     startDelay: RelativeTime;
@@ -46,5 +46,10 @@ export type FullSchedule = {
     nextAuctionSchedule: Schedule | null;
     liveAuctionSchedule: Schedule | null;
 };
+import type { TimerService } from '@agoric/time';
+import type { AuctionParamManager } from './params.js';
+import type { TimerBrand } from '@agoric/time';
+import type { Recorder } from '@agoric/zoe/src/contractSupport/recorder.js';
 import { AuctionState } from './util.js';
+import type { TimestampRecord } from '@agoric/time';
 //# sourceMappingURL=scheduler.d.ts.map

package/src/auction/scheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["scheduler.js"],"names":[],"mappings":"AA8EO,6CAPI,aAAa,SACb,OAAO,cAAc,EAAE,YAAY,UACnC,OAAO,CAAC,OAAO,aAAa,EAAE,mBAAmB,CAAC,cAClD,OAAO,cAAc,EAAE,UAAU,oBACjC,OAAO,6CAA6C,EAAE,QAAQ,CAAC,oBAAoB,CAAC,2BACpF,kBAAkB,CAAC,2BAA2B,CAAC;;;;;;;;;;;;IA0RzD;;yBA3Ta,MAAM,IAAI;cACV,MAAM,IAAI;gBACV,MAAM,IAAI;mBACV,MAAM,IAAI;;;;;;;qBAKV,SAAS,GAAG,IAAI;;;;mBAEhB,SAAS,GAAG,IAAI;;;;;4BAChB,SAAS,GAAG,IAAI;;;eAoThB,OAAO,cAAc,EAAE,eAAe;aACtC,OAAO,cAAc,EAAE,eAAe;WACtC,QAAQ;aACR,QAAQ;gBACR,YAAY;eACZ,YAAY;;;;yBAMZ,QAAQ,GAAG,IAAI;yBACf,QAAQ,GAAG,IAAI;;6BA/WsB,WAAW"}
+{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["scheduler.js"],"names":[],"mappings":"AAsFO,6CAPI,aAAa,SACb,YAAY,UACZ,OAAO,CAAC,mBAAmB,CAAC,cAC5B,UAAU,oBACV,SAAS,oBAAoB,CAAC,2BAC9B,kBAAkB,CAAC,2BAA2B,CAAC;;;;;;;;;;;;IA0RzD;;yBA3Ta,MAAM,IAAI;cACV,MAAM,IAAI;gBACV,MAAM,IAAI;mBACV,MAAM,IAAI;;;;;;;qBAKV,SAAS,GAAG,IAAI;;;;mBAEhB,SAAS,GAAG,IAAI;;;;;4BAChB,SAAS,GAAG,IAAI;;;eAoThB,eAAe;aACf,eAAe;WACf,QAAQ;aACR,QAAQ;gBACR,YAAY;eACZ,YAAY;;;;yBAMZ,QAAQ,GAAG,IAAI;yBACf,QAAQ,GAAG,IAAI;;kCA/WE,cAAc;yCACP,aAAa;gCACtB,cAAc;8BAChB,6CAA6C;6BAXrB,WAAW;qCAY5B,cAAc"}

package/src/auction/scheduler.js

@@ -12,6 +12,14 @@ import {
   timeVsSchedule,
 } from './scheduleMath.js';
 
+/**
+ * @import {TimerService} from '@agoric/time';
+ * @import {AuctionParamManager} from './params.js';
+ * @import {TimerBrand} from '@agoric/time';
+ * @import {Recorder} from '@agoric/zoe/src/contractSupport/recorder.js';
+ * @import {TimestampRecord} from '@agoric/time';
+ */
+
 const trace = makeTracer('SCHED', true);
 
 // If the startAuction wakeup is no more than 5 minutes late, go ahead with it.
@@ -70,10 +78,10 @@ const nominalStartTime = nextSchedule =>
 
 /**
  * @param {AuctionDriver} auctionDriver
- * @param {import('@agoric/time').TimerService} timer
- * @param {Awaited<import('./params.js').AuctionParamManager>} params
- * @param {import('@agoric/time').TimerBrand} timerBrand
- * @param {import('@agoric/zoe/src/contractSupport/recorder.js').Recorder<ScheduleNotification>} scheduleRecorder
+ * @param {TimerService} timer
+ * @param {Awaited<AuctionParamManager>} params
+ * @param {TimerBrand} timerBrand
+ * @param {Recorder<ScheduleNotification>} scheduleRecorder
  * @param {StoredSubscription<GovernanceSubscriptionState>} paramUpdateSubscription
  */
 export const makeScheduler = async (
@@ -360,8 +368,8 @@ export const makeScheduler = async (
 
 /**
  * @typedef {object} Schedule
- * @property {import('@agoric/time').TimestampRecord} startTime
- * @property {import('@agoric/time').TimestampRecord} endTime
+ * @property {TimestampRecord} startTime
+ * @property {TimestampRecord} endTime
  * @property {NatValue} steps
  * @property {NatValue} endRate
  * @property {RelativeTime} startDelay

package/src/clientSupport.d.ts

@@ -36,14 +36,14 @@ declare function makePushPriceOffer(_agoricNames: unknown, opts: {
 }, previousOffer: string): OfferSpec;
 /**
  * @param {Pick<AgoricNamesRemotes, 'brand'>} agoricNames
- * @param {Instance} instance
+ * @param {Instance<unknown>} instance
  * @param {{ offerId: string; feePct?: number; pair: [string, string] } & (
  *   | { wantMinted: number }
  *   | { giveMinted: number }
  * )} opts
  * @returns {OfferSpec}
  */
-declare function makePsmSwapOffer({ brand }: Pick<AgoricNamesRemotes, "brand">, instance: Instance, opts: {
+declare function makePsmSwapOffer({ brand }: Pick<AgoricNamesRemotes, "brand">, instance: Instance<unknown>, opts: {
     offerId: string;
     feePct?: number;
     pair: [string, string];

package/src/clientSupport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clientSupport.d.ts","sourceRoot":"","sources":["clientSupport.js"],"names":[],"mappings":"AAgKO,+CAJI,MAAM,YACN,OAAO,CAAC,mBAAmB,CAAC,GAC1B,OAAO,CAAC,MAAM,CAAC,CAW3B;AA0EM,6CAJI,IAAI,CAAC,kBAAkB,EAAE,OAAO,GAAG,YAAY,CAAC,cAChD,CAAC,GAAG,EAAE,MAAM,KAAK,KAAK,GACpB,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,KAAK,CAAC,CAmCtC;;;;;;;;;;;;;;;;;yCA1QmC,yCAAyC;wCAF1C,mCAAmC;4BAFxB,cAAc;AAgT9D;;;;;;;;;GASG;AACH,kDATW,OAAO,QACP;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,iBACO,MAAM,GACJ,SAAS,CAerB;AApID;;;;;;;;GAQG;AACH,6CARW,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,YACjC,QAAQ,QACR;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,CACnE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,GACtB;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CACzB,GACS,SAAS,CA4BrB;AAxKD;;;;;;;;;GASG;AACH,0CATW,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,QACjC;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;CAC5B,GACS,SAAS,CAuBrB;AAED;;;;;;;;;;;;GAYG;AACH,4CAZW,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,QACjC;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,iBACO,MAAM,GACJ,SAAS,CAiBrB;AAED;;;;;;;;;GASG;AACH,2CATW,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,QACjC;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;CACpB,iBACO,MAAM,GACJ,SAAS,CAcrB;AA6HD;;;;;;;;GAQG;AACH,mDARW,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,QACjC;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,EAAE,MAAM,CAAC;CAC5B,GACS,SAAS,CAuBrB;+BA3S2B,oCAAoC"}
+{"version":3,"file":"clientSupport.d.ts","sourceRoot":"","sources":["clientSupport.js"],"names":[],"mappings":"AAgKO,+CAJI,MAAM,YACN,OAAO,CAAC,mBAAmB,CAAC,GAC1B,OAAO,CAAC,MAAM,CAAC,CAW3B;AA0EM,6CAJI,IAAI,CAAC,kBAAkB,EAAE,OAAO,GAAG,YAAY,CAAC,cAChD,CAAC,GAAG,EAAE,MAAM,KAAK,KAAK,GACpB,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,KAAK,CAAC,CAmCtC;;;;;;;;;;;;;;;;;yCA1QmC,yCAAyC;wCAF1C,mCAAmC;4BAFxB,cAAc;AAgT9D;;;;;;;;;GASG;AACH,kDATW,OAAO,QACP;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,iBACO,MAAM,GACJ,SAAS,CAerB;AApID;;;;;;;;GAQG;AACH,6CARW,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,YACjC,QAAQ,CAAC,OAAO,CAAC,QACjB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,CACnE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,GACtB;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CACzB,GACS,SAAS,CA4BrB;AAxKD;;;;;;;;;GASG;AACH,0CATW,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,QACjC;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;CAC5B,GACS,SAAS,CAuBrB;AAED;;;;;;;;;;;;GAYG;AACH,4CAZW,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,QACjC;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,iBACO,MAAM,GACJ,SAAS,CAiBrB;AAED;;;;;;;;;GASG;AACH,2CATW,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,QACjC;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;CACpB,iBACO,MAAM,GACJ,SAAS,CAcrB;AA6HD;;;;;;;;GAQG;AACH,mDARW,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,QACjC;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,EAAE,MAAM,CAAC;CAC5B,GACS,SAAS,CAuBrB;+BA3S2B,oCAAoC"}

package/src/clientSupport.js

@@ -201,7 +201,7 @@ const makePsmProposal = (brands, opts, fee = 0, anchor = 'AUSD') => {
 
 /**
  * @param {Pick<AgoricNamesRemotes, 'brand'>} agoricNames
- * @param {Instance} instance
+ * @param {Instance<unknown>} instance
  * @param {{ offerId: string; feePct?: number; pair: [string, string] } & (
  *   | { wantMinted: number }
  *   | { giveMinted: number }

package/src/econCommitteeCharter.d.ts

@@ -1,5 +1,7 @@
 /**
  * @import {MapStore, SetStore} from '@agoric/store';
+ * @import {Baggage} from '@agoric/vat-data';
+ * @import {TimestampValue} from '@agoric/time';
  */
 /**
  * @file This contract makes it possible for those who govern contracts to call
@@ -12,26 +14,26 @@ export const INVITATION_MAKERS_DESC: "charter member invitation";
 export const meta: ContractMeta<typeof start>;
 export function start(zcf: ZCF<{
     binaryVoteCounterInstallation: Installation;
-}>, privateArgs: undefined, baggage: import("@agoric/vat-data").Baggage): Promise<{
+}>, privateArgs: undefined, baggage: Baggage): Promise<{
     creatorFacet: import("@endo/exo").Guarded<{
         /**
-         * @param {Instance} governedInstance
+         * @param {Instance<unknown>} governedInstance
          * @param {GovernorCreatorFacet<any>} governorFacet
          * @param {string} [label] for diagnostic use only
          */
-        addInstance: (governedInstance: Instance, governorFacet: GovernorCreatorFacet<any>, label?: string) => void;
+        addInstance: (governedInstance: Instance<unknown>, governorFacet: GovernorCreatorFacet<any>, label?: string) => void;
         makeCharterMemberInvitation: () => Promise<globalThis.Invitation<{
             invitationMakers: import("@endo/exo").Guarded<{
                 VoteOnParamChange: () => Promise<globalThis.Invitation<import("@agoric/governance/src/types").ContractGovernanceVoteResult, ParamChangesOfferArgs>>;
                 VoteOnPauseOffers: (instance: any, strings: any, deadline: any) => Promise<globalThis.Invitation<import("@agoric/governance/src/types").ContractGovernanceVoteResult, undefined>>;
-                VoteOnApiCall: (instance: Instance, methodName: string, methodArgs: string[], deadline: import("@agoric/time").TimestampValue) => Promise<globalThis.Invitation<import("@agoric/governance/src/types").ContractGovernanceVoteResult, undefined>>;
+                VoteOnApiCall: (instance: Instance<unknown>, methodName: string, methodArgs: string[], deadline: TimestampValue) => Promise<globalThis.Invitation<import("@agoric/governance/src/types").ContractGovernanceVoteResult, undefined>>;
             }>;
         }, undefined>>;
     }>;
 }>;
 export type ParamChangesOfferArgs = {
     deadline: bigint;
-    instance: Instance;
+    instance: Instance<unknown>;
     params: Record<string, unknown>;
     /**
      * paramPath is determined by contract
@@ -40,4 +42,6 @@ export type ParamChangesOfferArgs = {
         paramPath: unknown;
     } | undefined;
 };
+import type { Baggage } from '@agoric/vat-data';
+import type { TimestampValue } from '@agoric/time';
 //# sourceMappingURL=econCommitteeCharter.d.ts.map

package/src/econCommitteeCharter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"econCommitteeCharter.d.ts","sourceRoot":"","sources":["econCommitteeCharter.js"],"names":[],"mappings":"AAaA;;GAEG;AAEH;;;;;GAKG;AAEH,qCAAsC,2BAA2B,CAAC;AAoBlE,yCAAyC;AACzC,mBADW,YAAY,CAAC,OAAO,KAAK,CAAC,CAMnC;AAQK,2BAJI,GAAG,CAAC;IAAE,6BAA6B,EAAE,YAAY,CAAA;CAAE,CAAC,eACpD,SAAS,WACT,OAAO,kBAAkB,EAAE,OAAO;;QAsHvC;;;;WAIG;wCAHQ,QAAQ,iBACR,oBAAoB,CAAC,GAAG,CAAC,UACzB,MAAM;;;;;0CAzEV,QAAQ,cACR,MAAM,cACN,MAAM,EAAE,YACR,OAAO,cAAc,EAAE,cAAc;;;;GAkFjD;;cAjKa,MAAM;cACN,QAAQ;YACR,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;;;mBACV,OAAO"}
+{"version":3,"file":"econCommitteeCharter.d.ts","sourceRoot":"","sources":["econCommitteeCharter.js"],"names":[],"mappings":"AAaA;;;;GAIG;AAEH;;;;;GAKG;AAEH,qCAAsC,2BAA2B,CAAC;AAoBlE,yCAAyC;AACzC,mBADW,YAAY,CAAC,OAAO,KAAK,CAAC,CAMnC;AAQK,2BAJI,GAAG,CAAC;IAAE,6BAA6B,EAAE,YAAY,CAAA;CAAE,CAAC,eACpD,SAAS,WACT,OAAO;;QAsHZ;;;;WAIG;wCAHQ,QAAQ,CAAC,OAAO,CAAC,iBACjB,oBAAoB,CAAC,GAAG,CAAC,UACzB,MAAM;;;;;0CAzEV,QAAQ,CAAC,OAAO,CAAC,cACjB,MAAM,cACN,MAAM,EAAE,YACR,cAAc;;;;GAkF1B;;cAjKa,MAAM;cACN,QAAQ,CAAC,OAAO,CAAC;YACjB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;;;mBACV,OAAO;;;6BAlBR,kBAAkB;oCACX,cAAc"}

package/src/econCommitteeCharter.js

@@ -13,6 +13,8 @@ import { E } from '@endo/far';
 
 /**
  * @import {MapStore, SetStore} from '@agoric/store';
+ * @import {Baggage} from '@agoric/vat-data';
+ * @import {TimestampValue} from '@agoric/time';
  */
 
 /**
@@ -27,7 +29,7 @@ export const INVITATION_MAKERS_DESC = 'charter member invitation';
 /**
  * @typedef {object} ParamChangesOfferArgs
  * @property {bigint} deadline
- * @property {Instance} instance
+ * @property {Instance<unknown>} instance
  * @property {Record<string, unknown>} params
  * @property {{ paramPath: unknown }} [path] paramPath is determined by contract
  */
@@ -54,11 +56,11 @@ harden(meta);
 /**
  * @param {ZCF<{ binaryVoteCounterInstallation: Installation }>} zcf
  * @param {undefined} privateArgs
- * @param {import('@agoric/vat-data').Baggage} baggage
+ * @param {Baggage} baggage
  */
 export const start = async (zcf, privateArgs, baggage) => {
   const { binaryVoteCounterInstallation: counter } = zcf.getTerms();
-  /** @type {MapStore<Instance, GovernorCreatorFacet<any>>} */
+  /** @type {MapStore<Instance<unknown>, GovernorCreatorFacet<any>>} */
   const instanceToGovernor = provideDurableMapStore(
     baggage,
     'instanceToGovernor',
@@ -102,10 +104,10 @@ export const start = async (zcf, privateArgs, baggage) => {
   };
 
   /**
-   * @param {Instance} instance
+   * @param {Instance<unknown>} instance
    * @param {string} methodName
    * @param {string[]} methodArgs
-   * @param {import('@agoric/time').TimestampValue} deadline
+   * @param {TimestampValue} deadline
    */
   const makeApiInvocationInvitation = (
     instance,
@@ -173,7 +175,7 @@ export const start = async (zcf, privateArgs, baggage) => {
     CharterCreatorI,
     {
       /**
-       * @param {Instance} governedInstance
+       * @param {Instance<unknown>} governedInstance
        * @param {GovernorCreatorFacet<any>} governorFacet
        * @param {string} [label] for diagnostic use only
        */