@agoric/zoe 0.26.3-upgrade-14-dev-c8f9e7b.0 → 0.26.3-upgrade-16-fi-dev-8879538.0

package/tools/fakePriceAuthority.js

@@ -10,7 +10,9 @@ import { TimeMath } from '@agoric/time';
 
 import { natSafeMath } from '../src/contractSupport/index.js';
 
-import './types-ambient.js';
+/**
+ * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
+ */
 
 const { Fail } = assert;
 const { coerceRelativeTimeRecord } = TimeMath;
@@ -26,8 +28,8 @@ const timestampLTE = (a, b) => TimeMath.compareAbs(a, b) <= 0;
  * @property {Brand<'nat'>} actualBrandOut
  * @property {Array<number>} [priceList]
  * @property {Array<[number, number]>} [tradeList]
- * @property {ERef<import('@agoric/time/src/types').TimerService>} timer
- * @property {import('@agoric/time/src/types').RelativeTime} [quoteInterval]
+ * @property {import('@agoric/time').TimerService} timer
+ * @property {import('@agoric/time').RelativeTime} [quoteInterval]
  * @property {ERef<Mint<'set'>>} [quoteMint]
  * @property {Amount<'nat'>} [unitAmountIn]
  */
@@ -84,7 +86,7 @@ export async function makeFakePriceAuthority(options) {
   const quoteBrand = await E(quoteIssuer).getBrand();
 
   /**
-   * @type {NotifierRecord<import('@agoric/time/src/types').Timestamp>}
+   * @type {NotifierRecord<import('@agoric/time').Timestamp>}
    * We need to have a notifier driven by the
    * TimerService because if the timer pushes updates to individual
    * QuoteNotifiers, we have a dependency inversion and the timer can never know
@@ -104,7 +106,7 @@ export async function makeFakePriceAuthority(options) {
    *
    * @param {Amount<'nat'>} amountIn
    * @param {Brand} brandOut
-   * @param {import('@agoric/time/src/types').Timestamp} quoteTime
+   * @param {import('@agoric/time').Timestamp} quoteTime
    * @returns {PriceQuote}
    */
   function priceInQuote(amountIn, brandOut, quoteTime) {
@@ -115,16 +117,19 @@ export async function makeFakePriceAuthority(options) {
       natSafeMath.multiply(amountIn.value, tradeValueOut),
       tradeValueIn,
     );
+    /** @type {Amount<'set', PriceDescription>} */
     const quoteAmount = AmountMath.make(
       quoteBrand,
-      harden([
-        {
-          amountIn,
-          amountOut: AmountMath.make(actualBrandOut, valueOut),
-          timer,
-          timestamp: quoteTime,
-        },
-      ]),
+      /** @type {[PriceDescription]} */ (
+        harden([
+          {
+            amountIn,
+            amountOut: AmountMath.make(actualBrandOut, valueOut),
+            timer,
+            timestamp: quoteTime,
+          },
+        ])
+      ),
     );
     const quote = harden({
       quotePayment: E(quoteMint).mintPayment(quoteAmount),
@@ -136,7 +141,7 @@ export async function makeFakePriceAuthority(options) {
   /**
    * @param {Brand<'nat'>} brandIn
    * @param {Amount<'nat'>} amountOut
-   * @param {import('@agoric/time/src/types').Timestamp} quoteTime
+   * @param {import('@agoric/time').Timestamp} quoteTime
    * @returns {PriceQuote}
    */
   function priceOutQuote(brandIn, amountOut, quoteTime) {
@@ -158,7 +163,7 @@ export async function makeFakePriceAuthority(options) {
   let latestTick;
 
   // clients who are waiting for a specific timestamp
-  /** @type { [when: import('@agoric/time/src/types').Timestamp, resolve: (quote: PriceQuote) => void][] } */
+  /** @type { [when: import('@agoric/time').Timestamp, resolve: (quote: PriceQuote) => void][] } */
   let timeClients = [];
 
   // Check if a comparison request has been satisfied.
@@ -254,13 +259,12 @@ export async function makeFakePriceAuthority(options) {
   async function* generateQuotes(amountIn, brandOut) {
     let record = await ticker.getUpdateSince();
     while (record.updateCount !== undefined) {
-      // eslint-disable-next-line no-await-in-loop
       const { value: timestamp } = record; // = await E(timer).getCurrentTimestamp();
       yield priceInQuote(amountIn, brandOut, timestamp);
-      // eslint-disable-next-line no-await-in-loop
       record = await ticker.getUpdateSince(record.updateCount);
     }
   }
+  harden(generateQuotes);
 
   /** @type {PriceAuthority} */
   const priceAuthority = Far('fake price authority', {

package/tools/fakeVatAdmin.d.ts

@@ -1,8 +1,8 @@
 export const zcfBundleCap: any;
 export default fakeVatAdmin;
-export type BundleID = import('@agoric/swingset-vat').BundleID;
-export type EndoZipBase64Bundle = import('@agoric/swingset-vat').EndoZipBase64Bundle;
-export type BundleCap = import('@agoric/swingset-vat').BundleCap;
+export type BundleID = import("@agoric/swingset-vat").BundleID;
+export type EndoZipBase64Bundle = import("@agoric/swingset-vat").EndoZipBase64Bundle;
+export type BundleCap = import("@agoric/swingset-vat").BundleCap;
 declare const fakeVatAdmin: {
     getBundleCap: (bundleID: any) => Promise<any>;
     waitForBundleCap: (bundleID: any) => Promise<any>;
@@ -16,13 +16,13 @@ declare const fakeVatAdmin: {
             done: () => Promise<any>;
             terminateWithFailure: () => void;
             upgrade: (_bundleCap: any, _options: any) => never;
-        } & import("@endo/eventual-send").RemotableBrand<{}, {
+        } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
             done: () => Promise<any>;
             terminateWithFailure: () => void;
             upgrade: (_bundleCap: any, _options: any) => never;
         }>;
     }>;
-} & import("@endo/eventual-send").RemotableBrand<{}, {
+} & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
     getBundleCap: (bundleID: any) => Promise<any>;
     waitForBundleCap: (bundleID: any) => Promise<any>;
     getNamedBundleCap: (name: any) => Promise<any>;
@@ -35,7 +35,7 @@ declare const fakeVatAdmin: {
             done: () => Promise<any>;
             terminateWithFailure: () => void;
             upgrade: (_bundleCap: any, _options: any) => never;
-        } & import("@endo/eventual-send").RemotableBrand<{}, {
+        } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
             done: () => Promise<any>;
             terminateWithFailure: () => void;
             upgrade: (_bundleCap: any, _options: any) => never;
@@ -60,13 +60,13 @@ export function makeFakeVatAdmin(testContextSetter?: ((...args: any[]) => unknow
                 done: () => Promise<any>;
                 terminateWithFailure: () => void;
                 upgrade: (_bundleCap: any, _options: any) => never;
-            } & import("@endo/eventual-send").RemotableBrand<{}, {
+            } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
                 done: () => Promise<any>;
                 terminateWithFailure: () => void;
                 upgrade: (_bundleCap: any, _options: any) => never;
             }>;
         }>;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         getBundleCap: (bundleID: any) => Promise<any>;
         waitForBundleCap: (bundleID: any) => Promise<any>;
         getNamedBundleCap: (name: any) => Promise<any>;
@@ -79,7 +79,7 @@ export function makeFakeVatAdmin(testContextSetter?: ((...args: any[]) => unknow
                 done: () => Promise<any>;
                 terminateWithFailure: () => void;
                 upgrade: (_bundleCap: any, _options: any) => never;
-            } & import("@endo/eventual-send").RemotableBrand<{}, {
+            } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
                 done: () => Promise<any>;
                 terminateWithFailure: () => void;
                 upgrade: (_bundleCap: any, _options: any) => never;
@@ -95,7 +95,7 @@ export function makeFakeVatAdmin(testContextSetter?: ((...args: any[]) => unknow
         getCriticalVatKey: () => {};
         getVatPowers: () => {
             D: (bcap: any) => {
-                getBundle: () => import("@agoric/swingset-vat").EndoZipBase64Bundle;
+                getBundle: () => globalThis.EndoZipBase64Bundle;
             };
         };
     };

package/tools/manualPriceAuthority.d.ts

@@ -1,20 +1,25 @@
+/**
+ * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
+ */
 /**
  * @param {object} options
  * @param {Brand<'nat'>} options.actualBrandIn
  * @param {Brand<'nat'>} options.actualBrandOut
  * @param {Ratio} options.initialPrice
- * @param {import('@agoric/time/src/types').TimerService} options.timer
+ * @param {import('@agoric/time').TimerService} options.timer
  * @param {IssuerKit<'set'>} [options.quoteIssuerKit]
- * @returns {PriceAuthority & { setPrice: (Ratio) => void }}
+ * @returns {PriceAuthority & { setPrice: (Ratio) => void; disable: () => void }}
  */
 export function makeManualPriceAuthority(options: {
-    actualBrandIn: Brand<'nat'>;
-    actualBrandOut: Brand<'nat'>;
+    actualBrandIn: Brand<"nat">;
+    actualBrandOut: Brand<"nat">;
     initialPrice: Ratio;
-    timer: import('@agoric/time/src/types').TimerService;
-    quoteIssuerKit?: IssuerKit<"set"> | undefined;
+    timer: import("@agoric/time").TimerService;
+    quoteIssuerKit?: globalThis.IssuerKit<"set"> | undefined;
 }): PriceAuthority & {
     setPrice: (Ratio: any) => void;
+    disable: () => void;
 };
 export type ManualPriceAuthority = ReturnType<typeof makeManualPriceAuthority>;
+import type { PriceAuthority } from '@agoric/zoe/tools/types.js';
 //# sourceMappingURL=manualPriceAuthority.d.ts.map

package/tools/manualPriceAuthority.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manualPriceAuthority.d.ts","sourceRoot":"","sources":["manualPriceAuthority.js"],"names":[],"mappings":"AAYA;;;;;;;;GAQG;AACH;IAPiC,aAAa,EAAnC,MAAM,KAAK,CAAC;IACU,cAAc,EAApC,MAAM,KAAK,CAAC;IACG,YAAY,EAA3B,KAAK;IACkD,KAAK,EAA5D,OAAO,wBAAwB,EAAE,YAAY;IAClB,cAAc;;8BACC,IAAI;EAsExD;mCACa,WAAW,+BAA+B,CAAC"}
+{"version":3,"file":"manualPriceAuthority.d.ts","sourceRoot":"","sources":["manualPriceAuthority.js"],"names":[],"mappings":"AAaA;;GAEG;AAEH;;;;;;;;GAQG;AACH;IAPiC,aAAa,EAAnC,KAAK,CAAC,KAAK,CAAC;IACU,cAAc,EAApC,KAAK,CAAC,KAAK,CAAC;IACG,YAAY,EAA3B,KAAK;IACwC,KAAK,EAAlD,OAAO,cAAc,EAAE,YAAY;IACR,cAAc;;cACV,CAAC,KAAK,KAAA,KAAK,IAAI;aAAW,MAAM,IAAI;EA8E7E;mCACa,UAAU,CAAC,OAAO,wBAAwB,CAAC;oCAzFoC,4BAA4B"}

package/tools/manualPriceAuthority.js

@@ -1,4 +1,5 @@
 // @jessie-check
+/* eslint @typescript-eslint/no-floating-promises: "warn" */
 
 import { AmountMath, makeIssuerKit, AssetKind } from '@agoric/ertp';
 import { E } from '@endo/eventual-send';
@@ -10,14 +11,18 @@ import {
   floorDivideBy,
 } from '../src/contractSupport/index.js';
 
+/**
+ * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
+ */
+
 /**
  * @param {object} options
  * @param {Brand<'nat'>} options.actualBrandIn
  * @param {Brand<'nat'>} options.actualBrandOut
  * @param {Ratio} options.initialPrice
- * @param {import('@agoric/time/src/types').TimerService} options.timer
+ * @param {import('@agoric/time').TimerService} options.timer
  * @param {IssuerKit<'set'>} [options.quoteIssuerKit]
- * @returns {PriceAuthority & { setPrice: (Ratio) => void }}
+ * @returns {PriceAuthority & { setPrice: (Ratio) => void; disable: () => void }}
  */
 export function makeManualPriceAuthority(options) {
   const {
@@ -31,6 +36,7 @@ export function makeManualPriceAuthority(options) {
 
   /** @type {Ratio} */
   let currentPrice = initialPrice;
+  let disabled = false;
 
   const { notifier, updater } = makeNotifierKit();
   updater.updateState(currentPrice);
@@ -51,6 +57,9 @@ export function makeManualPriceAuthority(options) {
   };
 
   function createQuote(priceQuery) {
+    if (disabled) {
+      throw Error('disabled');
+    }
     const quote = priceQuery(calcAmountOut, calcAmountIn);
     if (!quote) {
       return undefined;
@@ -85,6 +94,10 @@ export function makeManualPriceAuthority(options) {
       updater.updateState(currentPrice);
       fireTriggers(createQuote);
     },
+    disable: () => {
+      disabled = true;
+      updater.updateState(false);
+    },
     ...priceAuthority,
   });
 }

package/tools/manualTimer.d.ts

@@ -1,44 +1,25 @@
-export default buildManualTimer;
+export function buildZoeManualTimer(log?: ((...args: any[]) => void) | undefined, startValue?: import("@agoric/time").Timestamp | undefined, options?: ZoeManualTimerOptions | undefined): ZoeManualTimer;
+export default buildZoeManualTimer;
 export type ZoeManualTimerOptions = {
-    timeStep?: import('@agoric/time/src/types').RelativeTime | bigint;
+    timeStep?: import("@agoric/time").RelativeTime | bigint;
     eventLoopIteration?: () => Promise<void>;
 };
-/**
- * A fake TimerService, for unit tests that do not use a real
- * kernel. You can make time pass by calling `advanceTo(when)`, or one
- * `timeStep` at a time by calling `tick()`.
- *
- * `advanceTo()` merely schedules a wakeup: the actual
- * handlers (in the code under test) are invoked several turns
- * later. Some zoe/etc tests want to poll for the consequences of
- * those invocations. The best approach is to get an appropriate
- * Promise from your code-under-test, wait for it to fire, and then
- * poll. But some libraries do not offer this convenience, especially
- * when they use internal "fire and forget" actions.
- *
- * To support those tests, the manual timer accepts a
- * `eventLoopIteration` option. If provided, each call to `tick()`
- * will wait for all triggered activity to complete before
- * returning. That doesn't mean the `wake()` handler's result promise
- * has fired; it just means there are no settled Promises still trying
- * to execute their callbacks.
- *
- * The following will wait for all such Promise activity to finish
- * before returning from `tick()`:
- *
- *  eventLoopIteration = () => new Promise(setImmediate);
- *  mt = buildManualTimer(log, startTime, { eventLoopIteration })
- *
- * `tickN(count)` calls `tick()` multiple times, awaiting each one
- *
- * The first argument is called to log 'tick' events, which might help
- * with "golden transcript" -style tests to distinguish tick
- * boundaries
- *
- * @param {(...args: any[]) => void} [log]
- * @param {import('@agoric/time/src/types').Timestamp | bigint} [startValue=0n]
- * @param {ZoeManualTimerOptions} [options]
- * @returns {ManualTimer}
- */
-declare function buildManualTimer(log?: ((...args: any[]) => void) | undefined, startValue?: import("@agoric/time/src/types").Timestamp | undefined, options?: ZoeManualTimerOptions | undefined): ManualTimer;
+export type ManualTimerAdmin = {
+    /**
+     * Advance the timer by one tick.
+     * DEPRECATED: use `await tickN(1)` instead.  `tick` function errors might be
+     * thrown synchronously, even though success is signaled by returning anything
+     * other than a rejected promise.
+     */
+    tick: (msg?: string) => void | Promise<void>;
+    tickN: (nTimes: number, msg?: string) => Promise<void>;
+};
+export type ZoeManualTimer = TimerServiceI & RemotableObject<"TimerService"> & RemotableBrand<{}, TimerServiceI> & {
+    advanceTo: (when: import("@agoric/time").Timestamp, msg?: string) => bigint;
+    advanceBy: (rel: import("@agoric/time").RelativeTime, msg?: string) => bigint;
+} & RemotableBrand<ManualTimerAdmin, TimerServiceI & ManualTimerAdmin> & ManualTimerAdmin;
+import { buildManualTimer } from '@agoric/swingset-vat/tools/manual-timer.js';
+import type { TimerServiceI } from '@agoric/time';
+import type { RemotableObject } from '@endo/pass-style';
+import type { RemotableBrand } from '@endo/eventual-send';
 //# sourceMappingURL=manualTimer.d.ts.map

package/tools/manualTimer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manualTimer.d.ts","sourceRoot":"","sources":["manualTimer.js"],"names":[],"mappings":";oCAca;IACZ,QAAW,CAAC,EAAE,OAAO,wBAAwB,EAAE,YAAY,GAAG,MAAM,CAAC;IACrE,kBAAqB,CAAC,EAAE,MAAM,QAAQ,IAAI,CAAC,CAAC;CACzC;AAKJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAEH,mDANqB,GAAG,EAAE,KAAK,IAAI,kIAGtB,WAAW,CAuDvB"}
+{"version":3,"file":"manualTimer.d.ts","sourceRoot":"","sources":["manualTimer.js"],"names":[],"mappings":"AA0EO,qDANc,GAAG,EAAE,KAAK,IAAI,wHAGtB,cAAc,CAsD1B;;oCA5GY;IACZ,QAAW,CAAC,EAAE,OAAO,cAAc,EAAE,YAAY,GAAG,MAAM,CAAC;IAC3D,kBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACzC;;;;;;;;UAOU,CAAC,GAAG,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;WAItC,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC;;;;qBAsCF,OAAQ,cACxD,EAAE,YAAY;;iCApEQ,4CAA4C;mCAI7C,cAAc;qCACZ,kBAAkB;oCACnB,qBAAqB"}

package/tools/manualTimer.js

@@ -1,10 +1,13 @@
 import { Far } from '@endo/marshal';
 import { bindAllMethods } from '@agoric/internal';
-import { buildManualTimer as build } from '@agoric/swingset-vat/tools/manual-timer.js';
+import { buildManualTimer } from '@agoric/swingset-vat/tools/manual-timer.js';
 import { TimeMath } from '@agoric/time';
 
-import './types-ambient.js';
-import './internal-types.js';
+/**
+ * @import {TimerServiceI} from '@agoric/time';
+ * @import {RemotableObject} from '@endo/pass-style';
+ * @import {RemotableBrand} from '@endo/eventual-send';
+ */
 
 const { Fail } = assert;
 
@@ -13,13 +16,24 @@ const { Fail } = assert;
 
 /**
  * @typedef {{
- *  timeStep?: import('@agoric/time/src/types').RelativeTime | bigint,
+ *  timeStep?: import('@agoric/time').RelativeTime | bigint,
  *  eventLoopIteration?: () => Promise<void>,
  * }} ZoeManualTimerOptions
  */
 
 const nolog = (..._args) => {};
 
+/**
+ * @typedef {object} ManualTimerAdmin
+ * @property {(msg?: string) => void | Promise<void>} tick Advance the timer by one tick.
+ * DEPRECATED: use `await tickN(1)` instead.  `tick` function errors might be
+ * thrown synchronously, even though success is signaled by returning anything
+ * other than a rejected promise.
+ * @property {(nTimes: number, msg?: string) => Promise<void>} tickN
+ */
+
+/** @typedef {ReturnType<typeof buildManualTimer> & RemotableBrand<ManualTimerAdmin, TimerServiceI & ManualTimerAdmin> & ManualTimerAdmin} ZoeManualTimer */
+
 /**
  * A fake TimerService, for unit tests that do not use a real
  * kernel. You can make time pass by calling `advanceTo(when)`, or one
@@ -53,12 +67,16 @@ const nolog = (..._args) => {};
  * boundaries
  *
  * @param {(...args: any[]) => void} [log]
- * @param {import('@agoric/time/src/types').Timestamp | bigint} [startValue=0n]
+ * @param {import('@agoric/time').Timestamp | bigint} [startValue=0n]
  * @param {ZoeManualTimerOptions} [options]
- * @returns {ManualTimer}
+ * @returns {ZoeManualTimer}
  */
 
-const buildManualTimer = (log = nolog, startValue = 0n, options = {}) => {
+export const buildZoeManualTimer = (
+  log = nolog,
+  startValue = 0n,
+  options = {},
+) => {
   const { timeStep = 1n, eventLoopIteration, ...buildOptions } = options;
   const optSuffix = msg => (msg ? `: ${msg}` : '');
   const callbacks = {
@@ -76,7 +94,7 @@ const buildManualTimer = (log = nolog, startValue = 0n, options = {}) => {
   assert.typeof(startValue, 'bigint');
   assert.typeof(timeStepValue, 'bigint');
 
-  const timerService = build({
+  const timerService = buildManualTimer({
     startTime: startValue,
     ...buildOptions,
     callbacks,
@@ -94,23 +112,19 @@ const buildManualTimer = (log = nolog, startValue = 0n, options = {}) => {
 
   const tickN = async (nTimes, msg) => {
     nTimes >= 1 || Fail`invariant nTimes >= 1`;
+    await null;
     for (let i = 0; i < nTimes; i += 1) {
-      // eslint-disable-next-line no-await-in-loop
       await tick(msg);
     }
   };
 
-  const setWakeup = (when, handler, cancelToken) => {
-    return timerService.setWakeup(when, handler, cancelToken);
-  };
-
   return Far('ManualTimer', {
     ...bindAllMethods(timerService),
     tick,
     tickN,
-    setWakeup,
   });
 };
-harden(buildManualTimer);
+harden(buildZoeManualTimer);
 
-export default buildManualTimer;
+// Default export is for backwards compatibility
+export default buildZoeManualTimer;

package/tools/prepare-test-env.js

@@ -7,4 +7,4 @@
  * the same as the SwingSet vat environment.
  */
 
-import '@agoric/swingset-vat/tools/prepare-test-env.js';
+import '@agoric/swingset-liveslots/tools/prepare-test-env.js';

package/tools/scriptedOracle.d.ts

@@ -10,15 +10,15 @@
  *
  * @param {Record<string, any>} script
  * @param {Installation<import('../src/contracts/oracle.js').OracleStart>} oracleInstallation
- * @param {import('@agoric/time/src/types').TimerService} timer
+ * @param {import('@agoric/time').TimerService} timer
  * @param {ZoeService} zoe
  * @param {Issuer} feeIssuer
  */
-export function makeScriptedOracle(script: Record<string, any>, oracleInstallation: Installation<import('../src/contracts/oracle.js').OracleStart>, timer: import('@agoric/time/src/types').TimerService, zoe: ZoeService, feeIssuer: Issuer): Promise<{
+export function makeScriptedOracle(script: Record<string, any>, oracleInstallation: Installation<import("../src/contracts/oracle.js").OracleStart>, timer: import("@agoric/time").TimerService, zoe: ZoeService, feeIssuer: Issuer): Promise<{
     publicFacet: {
         query(query: OracleQuery): Promise<unknown>;
         makeQueryInvitation(query: OracleQuery): Promise<Invitation<unknown, never>>;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         query(query: OracleQuery): Promise<unknown>;
         makeQueryInvitation(query: OracleQuery): Promise<Invitation<unknown, never>>;
     }>;

package/tools/scriptedOracle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scriptedOracle.d.ts","sourceRoot":"","sources":["scriptedOracle.js"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;GAeG;AACH,2CANW,OAAO,MAAM,EAAE,GAAG,CAAC,sBACnB,aAAa,OAAO,4BAA4B,EAAE,WAAW,CAAC,SAC9D,OAAO,wBAAwB,EAAE,YAAY,OAC7C,UAAU,aACV,MAAM;;;;;;;;;GAqChB"}
+{"version":3,"file":"scriptedOracle.d.ts","sourceRoot":"","sources":["scriptedOracle.js"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;GAeG;AACH,2CANW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,sBACnB,YAAY,CAAC,OAAO,4BAA4B,EAAE,WAAW,CAAC,SAC9D,OAAO,cAAc,EAAE,YAAY,OACnC,UAAU,aACV,MAAM;;qBAiCH,WACP;mCAIib,WAAW;;;;;;GADlc"}

package/tools/scriptedOracle.js

@@ -14,7 +14,7 @@ import { Far } from '@endo/marshal';
  *
  * @param {Record<string, any>} script
  * @param {Installation<import('../src/contracts/oracle.js').OracleStart>} oracleInstallation
- * @param {import('@agoric/time/src/types').TimerService} timer
+ * @param {import('@agoric/time').TimerService} timer
  * @param {ZoeService} zoe
  * @param {Issuer} feeIssuer
  */

package/tools/scriptedPriceAuthority.d.ts

@@ -1,2 +1,6 @@
+/**
+ * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
+ */
 export function makeScriptedPriceAuthority(options: any): PriceAuthority;
+import type { PriceAuthority } from '@agoric/zoe/tools/types.js';
 //# sourceMappingURL=scriptedPriceAuthority.d.ts.map

package/tools/scriptedPriceAuthority.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scriptedPriceAuthority.d.ts","sourceRoot":"","sources":["scriptedPriceAuthority.js"],"names":[],"mappings":"AAUA,yEAoFC"}
+{"version":3,"file":"scriptedPriceAuthority.d.ts","sourceRoot":"","sources":["scriptedPriceAuthority.js"],"names":[],"mappings":"AAWA;;GAEG;AAEH,yEAoFC;oCAvF4F,4BAA4B"}

package/tools/scriptedPriceAuthority.js

@@ -1,3 +1,4 @@
+/* eslint @typescript-eslint/no-floating-promises: "warn" */
 import { AmountMath, makeIssuerKit, AssetKind } from '@agoric/ertp';
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';
@@ -8,6 +9,10 @@ import {
   makeOnewayPriceAuthorityKit,
 } from '../src/contractSupport/index.js';
 
+/**
+ * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
+ */
+
 export function makeScriptedPriceAuthority(options) {
   const {
     actualBrandIn,
@@ -64,7 +69,7 @@ export function makeScriptedPriceAuthority(options) {
       );
   }
 
-  /** @type {ERef<Notifier<import('@agoric/time/src/types').Timestamp>>} */
+  /** @type {ERef<Notifier<import('@agoric/time').Timestamp>>} */
   const notifier = E(timer).makeNotifier(0n, quoteInterval);
   const priceAuthorityOptions = harden({
     timer,

package/tools/setup-zoe.d.ts

@@ -1,23 +1,22 @@
-export function makeZoeKitForTest(vatAdminSvc?: import("@agoric/swingset-vat").VatAdminSvc | undefined): {
+export function makeZoeKitForTest(vatAdminSvc?: VatAdminSvc | undefined): {
     zoeService: ZoeService;
-    zoeConfigFacet: {
-        updateZcfBundleId(bundleId: any): void;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
+    zoeConfigFacet: import("@endo/exo").Guarded<{
         updateZcfBundleId(bundleId: any): void;
     }>;
     feeMintAccess: FeeMintAccess;
-    setVatAdminService: ((lateVatAdminSvc: any) => void) & import("@endo/eventual-send").RemotableBrand<{}, (lateVatAdminSvc: any) => void>;
+    setVatAdminService: ((lateVatAdminSvc: any) => void) & import("@endo/captp").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, (lateVatAdminSvc: any) => void>;
 };
-export function makeZoeForTest(vatAdminSvc?: import("@agoric/swingset-vat").VatAdminSvc | undefined): ZoeService;
+export function makeZoeForTest(vatAdminSvc?: VatAdminSvc | undefined): ZoeService;
 export function setUpZoeForTest<T extends unknown = unknown>({ setJig, feeIssuerConfig, vatAdminSvc, useNearRemote, }?: {
     setJig?: ((jig: T) => void) | undefined;
     feeIssuerConfig?: FeeIssuerConfig | undefined;
-    vatAdminSvc?: import("@agoric/swingset-vat").VatAdminSvc | undefined;
+    vatAdminSvc?: VatAdminSvc | undefined;
     useNearRemote?: boolean | undefined;
 }): Promise<{
     zoe: ZoeService;
     feeMintAccessP: FeeMintAccess;
-    vatAdminSvc: import("@agoric/swingset-vat").VatAdminSvc;
+    bundleAndInstall: (path: string) => Promise<Installation>;
+    vatAdminSvc: VatAdminSvc;
     vatAdminState: {
         getExitMessage: () => any;
         getHasExited: () => boolean;
@@ -27,7 +26,7 @@ export function setUpZoeForTest<T extends unknown = unknown>({ setJig, feeIssuer
         getCriticalVatKey: () => {};
         getVatPowers: () => {
             D: (bcap: any) => {
-                getBundle: () => import("@agoric/swingset-vat").EndoZipBase64Bundle;
+                getBundle: () => EndoZipBase64Bundle;
             };
         };
     } | undefined;

package/tools/setup-zoe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-zoe.d.ts","sourceRoot":"","sources":["setup-zoe.js"],"names":[],"mappings":"AASO;;;;;;;;;EAKN;AAKM,iHACoC;AAYpC;IAL+B,MAAM,gBAArB,IAAI;IACU,eAAe;IACnB,WAAW;IACf,aAAa;;;;;;;;;;;;;;;;;;GA+BzC"}
+{"version":3,"file":"setup-zoe.d.ts","sourceRoot":"","sources":["setup-zoe.js"],"names":[],"mappings":"AAUO;;;;;;;EAKN;AAKM,kFACoC;AAYpC,gCALU,CAAC;IAAoB,MAAM,UAA3B,CAAC,KAAK,IAAI;IACU,eAAe;IACnB,WAAW;IACf,aAAa;;;;6BA2B7B,MAAM,KACJ,OAAO,CAAC,YAAY,CAAC;;;;;;;;;;;;;;;GAiBnC"}

package/tools/setup-zoe.js

@@ -1,6 +1,7 @@
-import { makeLoopback } from '@endo/captp';
+import { E, makeLoopback } from '@endo/captp';
 
 import { makeScalarBigMapStore } from '@agoric/vat-data';
+import bundleSource from '@endo/bundle-source';
 import { makeDurableZoeKit } from '../src/zoeService/zoe.js';
 import fakeVatAdmin, { makeFakeVatAdmin } from './fakeVatAdmin.js';
 
@@ -53,9 +54,23 @@ export const setUpZoeForTest = async ({
       zoeBaggage: makeScalarBigMapStore('zoe baggage', { durable: true }),
     }),
   );
+
+  /**
+   * @param {string} path
+   * @returns {Promise<Installation>}
+   */
+  const bundleAndInstall = async path => {
+    const bundle = await bundleSource(path);
+    const id = `b1-${path}`;
+    assert(vatAdminState, 'installBundle called before vatAdminState defined');
+    vatAdminState.installBundle(id, bundle);
+    return E(zoeService).installBundleID(id);
+  };
+
   return {
     zoe: zoeService,
     feeMintAccessP: feeMintAccess,
+    bundleAndInstall,
     vatAdminSvc,
     vatAdminState,
   };

package/tools/test-utils.d.ts

@@ -0,0 +1,20 @@
+export function withAmountUtils(kit: Pick<IssuerKit<"nat">, "brand" | "issuer" | "mint">): {
+    /** @param {NatValue} v */
+    make: (v: NatValue) => import("@agoric/ertp/src/types.js").NatAmount;
+    makeEmpty: () => import("@agoric/ertp/src/types.js").NatAmount;
+    /**
+     * @param {NatValue} n
+     * @param {NatValue} [d]
+     */
+    makeRatio: (n: NatValue, d?: bigint | undefined) => Ratio;
+    /** @param {number} n */
+    units: (n: number) => import("@agoric/ertp/src/types.js").NatAmount;
+    /** The intact Exo remotable */
+    issuerKit: Pick<globalThis.IssuerKit<"nat">, "brand" | "issuer" | "mint">;
+    brand: globalThis.Brand<"nat">;
+    issuer: globalThis.Issuer<"nat", import("@endo/patterns").Key>;
+    mint: globalThis.Mint<"nat", import("@endo/patterns").Key>;
+};
+export { makeFakeStorageKit } from "@agoric/internal/src/storage-test-utils.js";
+export type AmountUtils = ReturnType<typeof withAmountUtils>;
+//# sourceMappingURL=test-utils.d.ts.map

package/tools/test-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["test-utils.js"],"names":[],"mappings":"AAIO,qCADK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC;IAK3D,0BAA0B;cAAd,QAAQ;;IAGpB;;;OAGG;mBAFQ,QAAQ;IAInB,wBAAwB;eAAZ,MAAM;IAGlB,+BAA+B;;;;;EAGlC;;0BACa,UAAU,CAAC,OAAO,eAAe,CAAC"}