@agoric/zoe 0.26.3-dev-82cced2.0 → 0.26.3-dev-354c092.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/zoe",
-  "version": "0.26.3-dev-82cced2.0+82cced2",
+  "version": "0.26.3-dev-354c092.0+354c092",
   "description": "Zoe: the Smart Contract Framework for Offer Enforcement",
   "type": "module",
   "main": "./src/zoeService/zoe.js",
@@ -43,15 +43,15 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-82cced2.0+82cced2",
-    "@agoric/ertp": "0.16.3-dev-82cced2.0+82cced2",
-    "@agoric/internal": "0.3.3-dev-82cced2.0+82cced2",
-    "@agoric/notifier": "0.6.3-dev-82cced2.0+82cced2",
-    "@agoric/store": "0.9.3-dev-82cced2.0+82cced2",
-    "@agoric/swingset-liveslots": "0.10.3-dev-82cced2.0+82cced2",
-    "@agoric/swingset-vat": "0.32.3-dev-82cced2.0+82cced2",
-    "@agoric/time": "0.3.3-dev-82cced2.0+82cced2",
-    "@agoric/vat-data": "0.5.3-dev-82cced2.0+82cced2",
+    "@agoric/assert": "0.6.1-dev-354c092.0+354c092",
+    "@agoric/ertp": "0.16.3-dev-354c092.0+354c092",
+    "@agoric/internal": "0.3.3-dev-354c092.0+354c092",
+    "@agoric/notifier": "0.6.3-dev-354c092.0+354c092",
+    "@agoric/store": "0.9.3-dev-354c092.0+354c092",
+    "@agoric/swingset-liveslots": "0.10.3-dev-354c092.0+354c092",
+    "@agoric/swingset-vat": "0.32.3-dev-354c092.0+354c092",
+    "@agoric/time": "0.3.3-dev-354c092.0+354c092",
+    "@agoric/vat-data": "0.5.3-dev-354c092.0+354c092",
     "@endo/bundle-source": "^2.7.0",
     "@endo/captp": "^3.1.4",
     "@endo/eventual-send": "^0.17.5",
@@ -64,7 +64,7 @@
     "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-dev-82cced2.0+82cced2",
+    "@agoric/kmarshal": "0.1.1-dev-354c092.0+354c092",
     "@endo/init": "^0.5.59",
     "ava": "^5.3.0",
     "c8": "^7.13.0",
@@ -137,5 +137,5 @@
   "typeCoverage": {
     "atLeast": 81.5
   },
-  "gitHead": "82cced2187816b38afb7f21b474de1517b4f7422"
+  "gitHead": "354c09254ac91e9dc97ca97f6bef291b2cafabb6"
 }

package/src/contractSupport/priceAuthority.js

@@ -1,6 +1,4 @@
 /* eslint @typescript-eslint/no-floating-promises: "warn" */
-/// <reference types="@agoric/time/src/types.d.ts" />
-
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';
 import { assert, q, Fail } from '@agoric/assert';
@@ -64,7 +62,7 @@ export const PriceAuthorityI = M.interface('PriceAuthority', {
  * @param {object} opts
  * @param {Issuer<'set'>} opts.quoteIssuer
  * @param {ERef<Notifier<unknown>>} opts.notifier
- * @param {ERef<import('@agoric/time/src/types').TimerService>} opts.timer
+ * @param {ERef<import('@agoric/time').TimerService>} opts.timer
  * @param {PriceQuoteCreate} opts.createQuote
  * @param {Brand<'nat'>} opts.actualBrandIn
  * @param {Brand<'nat'>} opts.actualBrandOut

package/src/contractSupport/priceAuthorityTransform.js

@@ -10,7 +10,7 @@ import { makeNotifier } from '@agoric/notifier';
  * @param {Brand<'set'>} quoteBrand
  * @param {Amount<'nat'>} amountIn
  * @param {Amount<'nat'>} amountOut
- * @param {ERef<import('@agoric/time/src/types').TimerService>} timer
+ * @param {ERef<import('@agoric/time').TimerService>} timer
  * @param {import('@agoric/time').Timestamp} timestamp
  * @param {ERef<Mint<'set'>>} quoteMint
  * @returns {Promise<PriceQuote>}

package/src/contractSupport/priceQuote.js

@@ -25,7 +25,7 @@ export const getPriceDescription = quote => {
 export const getAmountIn = quote => getPriceDescription(quote).amountIn;
 /** @param {PriceQuote} quote */
 export const getAmountOut = quote => getPriceDescription(quote).amountOut;
-/** @type {(quote: PriceQuote) => import('@agoric/time/src/types').Timestamp} */
+/** @type {(quote: PriceQuote) => import('@agoric/time').Timestamp} */
 export const getTimestamp = quote => getPriceDescription(quote).timestamp;
 
 /** @param {Brand<'nat'>} brand */

package/src/contracts/auction/index.js

@@ -37,7 +37,7 @@ const SECOND_PRICE = 'second-price';
  * null } want: { Asset: null } }.
  *
  * @param {ZCF<{
- * timeAuthority: import('@agoric/time/src/types').TimerService,
+ * timeAuthority: import('@agoric/time').TimerService,
  * winnerPriceOption?: FIRST_PRICE | SECOND_PRICE,
  * bidDuration: bigint,
  * }>} zcf

package/src/contracts/loan/types.js

@@ -1,5 +1,5 @@
 /**
- * @typedef {Notifier<import('@agoric/time/src/types').TimestampRecord>} PeriodNotifier
+ * @typedef {Notifier<import('@agoric/time').TimestampRecord>} PeriodNotifier
  *
  *  The Notifier that provides notifications that periods have passed.
  *  Since notifiers can't be relied on to produce an output every time
@@ -35,7 +35,7 @@
  *   The rate in basis points that will be multiplied with the debt on
  *   every period to compound interest.
  *
- * @property {import('@agoric/time/src/types').RelativeTime} interestPeriod
+ * @property {import('@agoric/time').RelativeTime} interestPeriod
  *
  * @property {Brand} loanBrand
  * @property {Brand} collateralBrand
@@ -162,14 +162,14 @@
  *   The AsyncIterable to notify when a period has occurred
  *
  * @property {Ratio} interestRate
- * @property {import('@agoric/time/src/types').RelativeTime} interestPeriod
+ * @property {import('@agoric/time').RelativeTime} interestPeriod
  *
  *  the period at which the outstanding debt increases by the interestRate
  *
  * @property {ZCF} zcf
  *
  * @property {LoanConfigWithBorrowerMinusDebt} configMinusGetDebt
- * @property {import('@agoric/time/src/types').Timestamp} basetime The starting point from which to calculate
+ * @property {import('@agoric/time').Timestamp} basetime The starting point from which to calculate
  * interest.
  */
 
@@ -182,7 +182,7 @@
  * @property {PriceAuthority} priceAuthority
  * @property {PeriodNotifier} periodNotifier
  * @property {bigint} interestRate
- * @property {import('@agoric/time/src/types').RelativeTime} interestPeriod
+ * @property {import('@agoric/time').RelativeTime} interestPeriod
  * @property {ZCFSeat} lenderSeat
  */
 
@@ -205,7 +205,7 @@
  * triggered the liquidation. This may be lower than expected if the
  * price is moving quickly.
  *
- * @property {() => import('@agoric/time/src/types').Timestamp} getLastCalculationTimestamp
+ * @property {() => import('@agoric/time').Timestamp} getLastCalculationTimestamp
  *
  * Get the timestamp at which the debt was most recently recalculated.
  *

package/src/contracts/loan/updateDebt.js

@@ -45,7 +45,7 @@ export const makeDebtCalculator = debtCalculatorConfig => {
   const config = { ...configMinusGetDebt, getDebt };
 
   const periodObserver = Far('periodObserver', {
-    /** @type {(timestamp: import('@agoric/time/src/types.js').TimestampRecord) => void} */
+    /** @type {(timestamp: import('@agoric/time').TimestampRecord) => void} */
     updateState: timestamp => {
       let updatedLoan = false;
       // we could calculate the number of required updates and multiply by a power

package/src/contracts/otcDesk.js

@@ -58,7 +58,7 @@ const start = zcf => {
    *
    * @param {AmountKeywordRecord} price
    * @param {AmountKeywordRecord} assets
-   * @param {Timer} timeAuthority
+   * @param {import('@agoric/time').TimerService} timeAuthority
    * @param {any} deadline
    * @returns {Promise<Payment>}
    */

package/src/contracts/priceAggregator.js

@@ -1,6 +1,4 @@
 /* eslint @typescript-eslint/no-floating-promises: "warn" */
-/// <reference types="@agoric/time/src/types.d.ts" />
-
 import { Fail, q } from '@agoric/assert';
 import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
 import { assertAllDefined } from '@agoric/internal';
@@ -53,7 +51,7 @@ const priceDescriptionFromQuote = quote => quote.quoteAmount.value[0];
  * is a stub until we complete what is now in `fluxAggregatorKit.js`.
  *
  * @param {ZCF<{
- * timer: import('@agoric/time/src/types').TimerService,
+ * timer: import('@agoric/time').TimerService,
  * POLL_INTERVAL: bigint,
  * brandIn: Brand<'nat'>,
  * brandOut: Brand<'nat'>,
@@ -127,7 +125,7 @@ const start = async (zcf, privateArgs) => {
 
   /**
    * @typedef {object} OracleRecord
-   * @property {(timestamp: import('@agoric/time/src/types').Timestamp) => Promise<void>} [querier]
+   * @property {(timestamp: import('@agoric/time').Timestamp) => Promise<void>} [querier]
    * @property {Ratio} lastSample
    * @property {OracleKey} oracleKey
    */
@@ -144,7 +142,7 @@ const start = async (zcf, privateArgs) => {
 
   // Wake every POLL_INTERVAL and run the queriers.
   const repeaterP = E(timer).makeRepeater(0n, POLL_INTERVAL);
-  /** @type {import('@agoric/time/src/types').TimerWaker} */
+  /** @type {import('@agoric/time').TimerWaker} */
   const waker = Far('waker', {
     async wake(timestamp) {
       // Run all the queriers.
@@ -167,7 +165,7 @@ const start = async (zcf, privateArgs) => {
   /**
    * @param {object} param0
    * @param {Ratio} [param0.overridePrice]
-   * @param {import('@agoric/time/src/types').TimestampRecord} [param0.timestamp]
+   * @param {import('@agoric/time').TimestampRecord} [param0.timestamp]
    */
   const makeCreateQuote = ({ overridePrice, timestamp } = {}) =>
     /**
@@ -259,7 +257,7 @@ const start = async (zcf, privateArgs) => {
     );
 
   /**
-   * @param {import('@agoric/time/src/types').Timestamp} timestamp
+   * @param {import('@agoric/time').Timestamp} timestamp
    */
   const updateQuote = async timestamp => {
     timestamp = TimeMath.coerceTimestampRecord(timestamp, timerBrand);
@@ -593,11 +591,11 @@ const start = async (zcf, privateArgs) => {
       const oracle = await E(zoe).getPublicFacet(oracleInstance);
       assert(records.has(record), 'Oracle record is already deleted');
 
-      /** @type {import('@agoric/time/src/types').Timestamp} */
+      /** @type {import('@agoric/time').Timestamp} */
       let lastWakeTimestamp = 0n;
 
       /**
-       * @param {import('@agoric/time/src/types').Timestamp} timestamp
+       * @param {import('@agoric/time').Timestamp} timestamp
        */
       record.querier = async timestamp => {
         // Submit the query.

package/src/zoeService/types.js

@@ -244,15 +244,6 @@
  * @property {() => void} wake
  */
 
-/**
- * @typedef {import('@agoric/time/src/types').Timestamp} Deadline
- */
-
-/**
- * @typedef {object} Timer
- * @property {(deadline: Deadline, wakerP: ERef<Waker>) => void} setWakeup
- */
-
 /**
  * @typedef {object} OnDemandExitRule
  * @property {null} onDemand
@@ -265,7 +256,7 @@
 
 /**
  * @typedef {object} AfterDeadlineExitRule
- * @property {{timer:Timer, deadline:Deadline}} afterDeadline
+ * @property {{timer: import('@agoric/time').TimerService, deadline: import('@agoric/time').Timestamp}} afterDeadline
  */
 
 /**

package/tools/fakePriceAuthority.js

@@ -26,8 +26,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 {ERef<import('@agoric/time').TimerService>} timer
+ * @property {import('@agoric/time').RelativeTime} [quoteInterval]
  * @property {ERef<Mint<'set'>>} [quoteMint]
  * @property {Amount<'nat'>} [unitAmountIn]
  */
@@ -84,7 +84,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 +104,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) {
@@ -136,7 +136,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 +158,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.

package/tools/internal-types.js

@@ -10,5 +10,5 @@
  */
 
 /**
- * @typedef {import('@agoric/time/src/types').TimerService & ManualTimerAdmin} ManualTimer
+ * @typedef {import('@agoric/time').TimerService & ManualTimerAdmin} ManualTimer
  */

package/tools/manualPriceAuthority.js

@@ -16,7 +16,7 @@ import {
  * @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 }}
  */

package/tools/manualTimer.js

@@ -13,7 +13,7 @@ const { Fail } = assert;
 
 /**
  * @typedef {{
- *  timeStep?: import('@agoric/time/src/types').RelativeTime | bigint,
+ *  timeStep?: import('@agoric/time').RelativeTime | bigint,
  *  eventLoopIteration?: () => Promise<void>,
  * }} ZoeManualTimerOptions
  */
@@ -53,7 +53,7 @@ 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}
  */

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.js

@@ -65,7 +65,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/types-ambient.js

@@ -21,9 +21,9 @@
  * The amount supplied to a trade
  * @property {Amount<'nat'>} amountOut
  * The quoted result of trading `amountIn`
- * @property {import('@agoric/time/src/types').TimerService} timer
+ * @property {import('@agoric/time').TimerService} timer
  * The service that gave the `timestamp`
- * @property {import('@agoric/time/src/types').TimestampRecord} timestamp
+ * @property {import('@agoric/time').TimestampRecord} timestamp
  * A timestamp according to `timer` for the quote
  * @property {any} [conditions]
  * Additional conditions for the quote
@@ -68,7 +68,7 @@
  *
  * @property {(brandIn: Brand,
  *             brandOut: Brand
- * ) => ERef<import('@agoric/time/src/types').TimerService>} getTimerService
+ * ) => ERef<import('@agoric/time').TimerService>} getTimerService
  * Get the timer used in PriceQuotes for a given brandIn/brandOut pair
  *
  * @property {(amountIn: Amount<'nat'>,
@@ -78,7 +78,7 @@
  * `amountIn`.  The rate at which these are issued may be very different between
  * `priceAuthorities`.
  *
- * @property {(deadline: import('@agoric/time/src/types').Timestamp,
+ * @property {(deadline: import('@agoric/time').Timestamp,
  *             amountIn: Amount<'nat'>,
  *             brandOut: Brand<'nat'>
  * ) => Promise<PriceQuote>} quoteAtTime
@@ -146,7 +146,7 @@
  * @callback PriceQuery
  * @param {PriceCalculator} calcAmountIn
  * @param {PriceCalculator} calcAmountOut
- * @returns {{ amountIn: Amount<'nat'>, amountOut: Amount<'nat'>, timestamp?: import('@agoric/time/src/types').TimestampRecord } | undefined}
+ * @returns {{ amountIn: Amount<'nat'>, amountOut: Amount<'nat'>, timestamp?: import('@agoric/time').TimestampRecord } | undefined}
  */
 
 /**

package/tools/types.js

@@ -22,9 +22,9 @@ export {};
  * The amount supplied to a trade
  * @property {Amount<'nat'>} amountOut
  * The quoted result of trading `amountIn`
- * @property {import('@agoric/time/src/types').TimerService} timer
+ * @property {import('@agoric/time').TimerService} timer
  * The service that gave the `timestamp`
- * @property {import('@agoric/time/src/types').TimestampRecord} timestamp
+ * @property {import('@agoric/time').TimestampRecord} timestamp
  * A timestamp according to `timer` for the quote
  * @property {any} [conditions]
  * Additional conditions for the quote
@@ -69,7 +69,7 @@ export {};
  *
  * @property {(brandIn: Brand,
  *             brandOut: Brand
- * ) => ERef<import('@agoric/time/src/types').TimerService>} getTimerService
+ * ) => ERef<import('@agoric/time').TimerService>} getTimerService
  * Get the timer used in PriceQuotes for a given brandIn/brandOut pair
  *
  * @property {(amountIn: Amount<'nat'>,
@@ -79,7 +79,7 @@ export {};
  * `amountIn`.  The rate at which these are issued may be very different between
  * `priceAuthorities`.
  *
- * @property {(deadline: import('@agoric/time/src/types').Timestamp,
+ * @property {(deadline: import('@agoric/time').Timestamp,
  *             amountIn: Amount<'nat'>,
  *             brandOut: Brand<'nat'>
  * ) => Promise<PriceQuote>} quoteAtTime
@@ -147,7 +147,7 @@ export {};
  * @callback PriceQuery
  * @param {PriceCalculator} calcAmountIn
  * @param {PriceCalculator} calcAmountOut
- * @returns {{ amountIn: Amount<'nat'>, amountOut: Amount<'nat'>, timestamp?: import('@agoric/time/src/types').TimestampRecord } | undefined}
+ * @returns {{ amountIn: Amount<'nat'>, amountOut: Amount<'nat'>, timestamp?: import('@agoric/time').TimestampRecord } | undefined}
  */
 
 /**