@agoric/inter-protocol 0.16.2-upgrade-14-dev-c8f9e7b.0 → 0.16.2-upgrade-16-fi-dev-8879538.0

package/src/price/fluxAggregatorContract.js

@@ -1,10 +1,6 @@
 // @jessie-check
 
-import {
-  hasIssuer,
-  makeDurableIssuerKit,
-  prepareIssuerKit,
-} from '@agoric/ertp';
+import { prepareIssuerKit } from '@agoric/ertp';
 import { handleParamGovernance } from '@agoric/governance';
 import { makeTracer, StorageNodeShape } from '@agoric/internal';
 import { prepareDurablePublishKit } from '@agoric/notifier';
@@ -17,56 +13,69 @@ import { prepareFluxAggregatorKit } from './fluxAggregatorKit.js';
 
 const trace = makeTracer('FluxAgg', false);
 /**
- * @typedef {import('@agoric/vat-data').Baggage} Baggage
- * @typedef {import('@agoric/time/src/types').TimerService} TimerService
+ * @import {Baggage} from '@agoric/vat-data'
+ * @import {TimerService} from '@agoric/time'
  */
 
-export const privateArgsShape = M.splitRecord(
-  harden({
-    storageNode: StorageNodeShape,
-    marshaller: M.eref(M.remotable('marshaller')),
-    namesByAddressAdmin: M.any(),
-  }),
-  harden({
-    // always optional. XXX some code is including the key, set to null
-    highPrioritySendersManager: M.or(
-      M.remotable('prioritySenders manager'),
-      M.null(),
-    ),
-    // only necessary on first invocation, not subsequent
-    initialPoserInvitation: M.remotable('Invitation'),
-  }),
-);
+/** @type {ContractMeta} */
+export const meta = {
+  privateArgsShape: M.splitRecord(
+    {
+      storageNode: StorageNodeShape,
+      marshaller: M.eref(M.remotable('marshaller')),
+      namesByAddressAdmin: M.any(),
+    },
+    {
+      // always optional. XXX some code is including the key, set to null
+      highPrioritySendersManager: M.or(
+        M.remotable('prioritySenders manager'),
+        M.null(),
+      ),
+      // only necessary on first invocation, not subsequent
+      initialPoserInvitation: M.remotable('Invitation'),
+    },
+  ),
+  upgradability: 'canUpgrade',
+};
+harden(meta);
 
 /**
- * PriceAuthority for their median. Unlike the simpler `priceAggregator.js`, this approximates
- * the *Node Operator Aggregation* logic of [Chainlink price
+ * PriceAuthority for their median. Unlike the simpler `priceAggregator.js`,
+ * this approximates the _Node Operator Aggregation_ logic of [Chainlink price
  * feeds](https://blog.chain.link/levels-of-data-aggregation-in-chainlink-price-feeds/).
  *
- * @param {ZCF<import('./fluxAggregatorKit.js').ChainlinkConfig & {
- * timer: TimerService,
- * brandIn: Brand<'nat'>,
- * brandOut: Brand<'nat'>,
- * description: string,
- * unitAmountIn?: Amount<'nat'>,
- * }>} zcf
+ * @param {ZCF<
+ *   import('./fluxAggregatorKit.js').ChainlinkConfig & {
+ *     timer: TimerService;
+ *     brandIn: Brand<'nat'>;
+ *     brandOut: Brand<'nat'>;
+ *     description: string;
+ *     unitAmountIn?: Amount<'nat'>;
+ *   }
+ * >} zcf
  * @param {{
- * highPrioritySendersManager?: import('@agoric/internal/src/priority-senders.js').PrioritySendersManager,
- * initialPoserInvitation: Invitation,
- * marshaller: ERef<Marshaller>,
- * namesByAddressAdmin: ERef<import('@agoric/vats').NameAdmin>,
- * storageNode: StorageNode,
+ *   highPrioritySendersManager?: import('@agoric/internal/src/priority-senders.js').PrioritySendersManager;
+ *   initialPoserInvitation: Invitation;
+ *   marshaller: ERef<Marshaller>;
+ *   namesByAddressAdmin: ERef<import('@agoric/vats').NameAdmin>;
+ *   storageNode: StorageNode;
  * }} privateArgs
  * @param {Baggage} baggage
  */
-export const prepare = async (zcf, privateArgs, baggage) => {
+export const start = async (zcf, privateArgs, baggage) => {
   trace('prepare with baggage keys', [...baggage.keys()]);
 
   // xxx uses contract baggage as issuerBagage, assumes one issuer in this contract
   /** @type {import('./roundsManager.js').QuoteKit} */
-  const quoteIssuerKit = hasIssuer(baggage)
-    ? prepareIssuerKit(baggage)
-    : makeDurableIssuerKit(baggage, 'quote', 'set');
+  // @ts-expect-error cast
+  const quoteIssuerKit = prepareIssuerKit(
+    baggage,
+    'quote',
+    'set',
+    undefined,
+    undefined,
+    { recoverySetsOption: 'noRecoverySets' },
+  );
 
   const {
     highPrioritySendersManager,
@@ -131,10 +140,8 @@ export const prepare = async (zcf, privateArgs, baggage) => {
       addr,
       [invitation],
     );
-    if (highPrioritySendersManager) {
-      // eslint-disable-next-line @jessie.js/no-nested-await -- after another await
-      await E(highPrioritySendersManager).add(description, addr);
-    }
+    await (highPrioritySendersManager &&
+      E(highPrioritySendersManager).add(description, addr));
     return `added ${addr}`;
   };
 
@@ -146,29 +153,29 @@ export const prepare = async (zcf, privateArgs, baggage) => {
   const removeOracle = async addr => {
     trace('removeOracle', addr);
     await E(faKit.creator).removeOracle(addr);
-    if (highPrioritySendersManager) {
-      // eslint-disable-next-line @jessie.js/no-nested-await -- after another await
-      await E(highPrioritySendersManager).remove(description, addr);
-    }
+    await (highPrioritySendersManager &&
+      E(highPrioritySendersManager).remove(description, addr));
     return `removed ${addr}`;
   };
 
   const governedApis = {
     /**
-     * Add the specified oracles. May partially fail, such that some oracles are added and others aren't.
+     * Add the specified oracles. May partially fail, such that some oracles are
+     * added and others aren't.
      *
      * @param {string[]} addrs
-     * @returns {Promise<Array<PromiseSettledResult<string>>>}
+     * @returns {Promise<PromiseSettledResult<string>[]>}
      */
     addOracles: addrs => {
       return Promise.allSettled(addrs.map(addOracle));
     },
     /**
-     * Remove the specified oracles. May partially fail, such that some oracles are removed and others aren't.
-     * If the oracle was never part of the set that's a PromiseRejectedResult
+     * Remove the specified oracles. May partially fail, such that some oracles
+     * are removed and others aren't. If the oracle was never part of the set
+     * that's a PromiseRejectedResult
      *
      * @param {string[]} addrs
-     * @returns {Promise<Array<PromiseSettledResult<string>>>}
+     * @returns {Promise<PromiseSettledResult<string>[]>}
      */
     removeOracles: addrs => {
       return Promise.allSettled(addrs.map(removeOracle));
@@ -187,4 +194,4 @@ export const prepare = async (zcf, privateArgs, baggage) => {
     publicFacet: faKit.public,
   });
 };
-harden(prepare);
+harden(start);

package/src/price/fluxAggregatorKit.d.ts

@@ -0,0 +1,103 @@
+export const INVITATION_MAKERS_DESC: "oracle invitation";
+export function prepareFluxAggregatorKit(baggage: Baggage, zcf: ZCF<ChainlinkConfig & {
+    timer: TimerService;
+    brandIn: Brand<"nat">;
+    brandOut: Brand<"nat">;
+    unitAmountIn?: Amount<"nat">;
+}>, timerPresence: TimerService, quoteKit: import("./roundsManager.js").QuoteKit, storageNode: StorageNode, makeDurablePublishKit: () => PublishKit<any>, makeRecorder: import("@agoric/zoe/src/contractSupport/recorder.js").MakeRecorder): Promise<() => import("@endo/exo").GuardedKit<{
+    creator: {
+        /**
+         * An "oracle invitation" is an invitation to be able to submit data to
+         * include in the priceAggregator's results.
+         *
+         * The offer result from this invitation is a OracleAdmin, which can be
+         * used directly to manage the price submissions as well as to terminate
+         * the relationship.
+         *
+         * @param {string} oracleId unique per contract instance
+         */
+        makeOracleInvitation(oracleId: string): Promise<Invitation<{
+            invitationMakers: {
+                /** @param {import('./roundsManager.js').PriceRound} result */
+                PushPrice(result: import("./roundsManager.js").PriceRound): Promise<Invitation<void, undefined>>;
+            } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+                /** @param {import('./roundsManager.js').PriceRound} result */
+                PushPrice(result: import("./roundsManager.js").PriceRound): Promise<Invitation<void, undefined>>;
+            }>;
+            oracle: import("@endo/exo").Guarded<{
+                pushPrice({ roundId: roundIdRaw, unitPrice: valueRaw, }: PriceDatum): Promise<void>;
+                getStatus(): import("./priceOracleKit.js").OracleStatus;
+            }>;
+        }, undefined>>;
+        /** @param {string} oracleId */
+        removeOracle(oracleId: string): Promise<void>;
+        getRoundData: (roundIdRaw: any) => Promise<import("./roundsManager.js").RoundData>;
+        /** @param {string} oracleId */
+        initOracle(oracleId: string): Promise<import("@endo/exo").GuardedKit<{
+            admin: {
+                disable(): void;
+            };
+            oracle: {
+                pushPrice({ roundId: roundIdRaw, unitPrice: valueRaw, }: PriceDatum): Promise<void>;
+                getStatus(): import("./priceOracleKit.js").OracleStatus;
+            };
+        }>>;
+        /**
+         * a method to provide all current info oracleStatuses need. Intended
+         * only only to be callable by oracleStatuses. Not for use by contracts
+         * to read state.
+         *
+         * @param {string} oracleId
+         * @param {bigint} queriedRoundId
+         * @returns {Promise<RoundState>}
+         */
+        oracleRoundState(oracleId: string, queriedRoundId: bigint): Promise<RoundState>;
+    };
+    public: {
+        getPriceAuthority(): PriceAuthority;
+        getPublicTopics(): {
+            quotes: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<PriceDescription>;
+            latestRound: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./roundsManager.js").LatestRound>;
+        };
+    };
+}>>;
+export type RoundState = {
+    eligibleForSpecificRound: boolean;
+    queriedRoundId: bigint;
+    latestSubmission: bigint;
+    startedAt: Timestamp;
+    roundTimeout: number;
+    oracleCount: number;
+};
+export type ChainlinkConfig = {
+    maxSubmissionCount: number;
+    minSubmissionCount: number;
+    /**
+     * the number of rounds an Oracle has to wait
+     * before they can initiate a round
+     */
+    restartDelay: bigint;
+    /**
+     * an immutable check for a lower bound of
+     * what submission values are accepted from an oracle
+     */
+    minSubmissionValue: number;
+    /**
+     * an immutable check for an upper bound
+     * of what submission values are accepted from an oracle
+     */
+    maxSubmissionValue: number;
+    /**
+     * the number of seconds after the previous round
+     * that allowed to lapse before allowing an oracle to skip an unfinished
+     * round
+     */
+    timeout: number;
+};
+export type FluxAggregatorKit = ReturnType<Awaited<ReturnType<typeof prepareFluxAggregatorKit>>>;
+import type { Baggage } from '@agoric/vat-data';
+import type { TimerService } from '@agoric/time';
+import type { PriceAuthority } from '@agoric/zoe/tools/types.js';
+import type { PriceDescription } from '@agoric/zoe/tools/types.js';
+import type { Timestamp } from '@agoric/time';
+//# sourceMappingURL=fluxAggregatorKit.d.ts.map

package/src/price/fluxAggregatorKit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fluxAggregatorKit.d.ts","sourceRoot":"","sources":["fluxAggregatorKit.js"],"names":[],"mappings":"AAwBA,yDAA0D;AAgEnD;;aAXS,KAAK,CAAC,KAAK,CAAC;cACX,KAAK,CAAC,KAAK,CAAC;mBACP,MAAM,CAAC,KAAK,CAAC;2CAIxB,OAAO,oBAAoB,EAAE,QAAQ,eACrC,WAAW,yBACX,MAAM,UAAU,CAAC,GAAG,CAAC,gBACrB,OAAO,6CAA6C,EAAE,YAAY;;QAmJrE;;;;;;;;;WASG;uCADQ,MAAM;;gBAiBX,8DAA8D;kCAAlD,OAAO,oBAAoB,EAAE,UAAU;;gBAAnD,8DAA8D;kCAAlD,OAAO,oBAAoB,EAAE,UAAU;;;yEA9MhE,UAAU;;;;QAmOH,+BAA+B;+BAAnB,MAAM;;QAalB,+BAA+B;6BAAnB,MAAM;;;;;;;;;QAoBlB;;;;;;;;WAQG;mCAHQ,MAAM,kBACN,MAAM,GACJ,OAAO,CAAC,UAAU,CAAC;;;;;;;;;IAqDvC;;8BA5Ua,OAAO;oBACP,MAAM;sBACN,MAAM;;kBAEN,MAAM;iBACN,MAAM;;;wBAMN,MAAM;wBACN,MAAM;;;;;kBACN,MAAM;;;;;wBAEN,MAAM;;;;;wBAEN,MAAM;;;;;;aAEN,MAAM;;gCA2TN,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC,CAAC;6BA3VpD,kBAAkB;kCAKb,cAAc;oCAZiD,4BAA4B;sCAA5B,4BAA4B;+BAQ9F,cAAc"}

package/src/price/fluxAggregatorKit.js

@@ -1,7 +1,7 @@
 /**
- * @file
- * Adaptation of Chainlink algorithm to the Agoric platform.
- * Modeled on https://github.com/smartcontractkit/chainlink/blob/master/contracts/src/v0.6/FluxAggregator.sol (version?)
+ * @file Adaptation of Chainlink algorithm to the Agoric platform. Modeled on
+ *   https://github.com/smartcontractkit/chainlink/blob/master/contracts/src/v0.6/FluxAggregator.sol
+ *   (version?)
  */
 import { AmountMath } from '@agoric/ertp';
 import { assertAllDefined, makeTracer } from '@agoric/internal';
@@ -18,17 +18,19 @@ import { Far } from '@endo/marshal';
 import { prepareOracleAdminKit } from './priceOracleKit.js';
 import { prepareRoundsManagerKit } from './roundsManager.js';
 
+/** @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js'; */
+
 const trace = makeTracer('FlxAgg', true);
 
 export const INVITATION_MAKERS_DESC = 'oracle invitation';
 
 /**
- * @typedef {import('@agoric/vat-data').Baggage} Baggage
- * @typedef {import('@agoric/time/src/types').Timestamp} Timestamp
- * @typedef {import('@agoric/time/src/types').RelativeTime} RelativeTime
- * // TODO: use RelativeTime, not RelativeTimeValue
- * @typedef {import('@agoric/time/src/types').RelativeTimeValue} RelativeTimeValue
- * @typedef {import('@agoric/time/src/types').TimerService} TimerService
+ * @import {Baggage} from '@agoric/vat-data'
+ * @import {Timestamp} from '@agoric/time'
+ * @import {RelativeTime} from '@agoric/time'
+ *   RelativeTime, not RelativeTimeValue
+ * @import {RelativeTimeValue} from '@agoric/time'
+ * @import {TimerService} from '@agoric/time'
  */
 
 /** @type {(quote: PriceQuote) => PriceDescription} */
@@ -49,30 +51,35 @@ const priceDescriptionFromQuote = quote => quote.quoteAmount.value[0];
  * @typedef {object} ChainlinkConfig
  * @property {number} maxSubmissionCount
  * @property {number} minSubmissionCount
- * @property {bigint} restartDelay the number of rounds an Oracle has to wait before they can initiate a round
- * @property {number} minSubmissionValue an immutable check for a lower bound of what
- * submission values are accepted from an oracle
- * @property {number} maxSubmissionValue an immutable check for an upper bound of what
- * submission values are accepted from an oracle
- * @property {number} timeout the number of seconds after the previous round that
- * allowed to lapse before allowing an oracle to skip an unfinished round
+ * @property {bigint} restartDelay the number of rounds an Oracle has to wait
+ *   before they can initiate a round
+ * @property {number} minSubmissionValue an immutable check for a lower bound of
+ *   what submission values are accepted from an oracle
+ * @property {number} maxSubmissionValue an immutable check for an upper bound
+ *   of what submission values are accepted from an oracle
+ * @property {number} timeout the number of seconds after the previous round
+ *   that allowed to lapse before allowing an oracle to skip an unfinished
+ *   round
  */
 
 /**
- * Returns a maker for a single durable FluxAggregatorKit, closed over the prepare() arguments.
+ * Returns a maker for a single durable FluxAggregatorKit, closed over the
+ * prepare() arguments.
  *
  * The kit aggregates price inputs to produce a PriceAuthority. Unlike the
- * simpler `priceAggregator.js`, this approximates the *Node Operator
- * Aggregation* logic of [Chainlink price
+ * simpler `priceAggregator.js`, this approximates the _Node Operator
+ * Aggregation_ logic of [Chainlink price
  * feeds](https://blog.chain.link/levels-of-data-aggregation-in-chainlink-price-feeds/).
  *
  * @param {Baggage} baggage
- * @param {ZCF<ChainlinkConfig & {
- * timer: TimerService,
- * brandIn: Brand<'nat'>,
- * brandOut: Brand<'nat'>,
- * unitAmountIn?: Amount<'nat'>,
- * }>} zcf
+ * @param {ZCF<
+ *   ChainlinkConfig & {
+ *     timer: TimerService;
+ *     brandIn: Brand<'nat'>;
+ *     brandOut: Brand<'nat'>;
+ *     unitAmountIn?: Amount<'nat'>;
+ *   }
+ * >} zcf
  * @param {TimerService} timerPresence
  * @param {import('./roundsManager.js').QuoteKit} quoteKit
  * @param {StorageNode} storageNode
@@ -128,7 +135,10 @@ export const prepareFluxAggregatorKit = async (
   // end of maker definitions /////////////////////////////////
 
   const { answerKit, latestRoundKit, priceKit } = await provideAll(baggage, {
-    /** This is just a signal that there's a new answer, which is read from `lastValueOutForUnitIn` */
+    /**
+     * This is just a signal that there's a new answer, which is read from
+     * `lastValueOutForUnitIn`
+     */
     answerKit: () => makeDurablePublishKit(),
     /** For publishing priceAuthority values to off-chain storage */
     priceKit: () =>
@@ -142,9 +152,11 @@ export const prepareFluxAggregatorKit = async (
       E.when(E(storageNode).makeChildNode('latestRound'), node =>
         makeRecorderKit(
           node,
-          /** @type {import('@agoric/zoe/src/contractSupport/recorder.js').TypedMatcher<import('./roundsManager.js').LatestRound>} */ (
-            M.any()
-          ),
+          /**
+           * @type {import('@agoric/zoe/src/contractSupport/recorder.js').TypedMatcher<
+           *     import('./roundsManager.js').LatestRound
+           *   >}
+           */ (M.any()),
         ),
       ),
   });
@@ -223,9 +235,9 @@ export const prepareFluxAggregatorKit = async (
          * An "oracle invitation" is an invitation to be able to submit data to
          * include in the priceAggregator's results.
          *
-         * The offer result from this invitation is a OracleAdmin, which can be used
-         * directly to manage the price submissions as well as to terminate the
-         * relationship.
+         * The offer result from this invitation is a OracleAdmin, which can be
+         * used directly to manage the price submissions as well as to terminate
+         * the relationship.
          *
          * @param {string} oracleId unique per contract instance
          */
@@ -235,12 +247,13 @@ export const prepareFluxAggregatorKit = async (
           /**
            * If custom arguments are supplied to the `zoe.offer` call, they can
            * indicate an OraclePriceSubmission notifier and a corresponding
-           * `shiftValueOut` that should be adapted as part of the priceAuthority's
-           * reported data.
+           * `shiftValueOut` that should be adapted as part of the
+           * priceAuthority's reported data.
            *
            * @param {ZCFSeat} seat
            */
           const offerHandler = async seat => {
+            seat.exit();
             const { oracle } = await facets.creator.initOracle(oracleId);
             const invitationMakers = Far('invitation makers', {
               /** @param {import('./roundsManager.js').PriceRound} result */
@@ -255,7 +268,6 @@ export const prepareFluxAggregatorKit = async (
                 );
               },
             });
-            seat.exit();
 
             return harden({
               invitationMakers,
@@ -299,8 +311,9 @@ export const prepareFluxAggregatorKit = async (
         },
 
         /**
-         * a method to provide all current info oracleStatuses need. Intended only
-         * only to be callable by oracleStatuses. Not for use by contracts to read state.
+         * a method to provide all current info oracleStatuses need. Intended
+         * only only to be callable by oracleStatuses. Not for use by contracts
+         * to read state.
          *
          * @param {string} oracleId
          * @param {bigint} queriedRoundId

package/src/price/priceOracleKit.d.ts

@@ -0,0 +1,38 @@
+export const INVITATION_MAKERS_DESC: "oracle invitation";
+export function prepareOracleAdminKit(baggage: any): (args_0: HeldParams) => import("@endo/exo").GuardedKit<{
+    admin: {
+        disable(): void;
+    };
+    oracle: {
+        /**
+         * push a unitPrice result from this oracle
+         *
+         * @param {PriceDatum} datum
+         */
+        pushPrice({ roundId: roundIdRaw, unitPrice: valueRaw, }: PriceDatum): Promise<void>;
+        /** @returns {OracleStatus} */
+        getStatus(): OracleStatus;
+    };
+}>;
+export type HeldParams = {
+    oracleId: string;
+    roundPowers: {
+        handlePush: (status: OracleStatus, result: import("./roundsManager.js").PriceRound) => Promise<OracleStatus>;
+    };
+};
+export type PriceDatum = {
+    roundId: number | undefined;
+    unitPrice: NatValue;
+};
+export type OracleStatus = {
+    disabled?: boolean | undefined;
+    lastReportedRound: bigint;
+    lastStartedRound: bigint;
+    latestSubmission: bigint;
+    oracleId: string;
+};
+export type ImmutableState = Readonly<HeldParams & {}>;
+export type MutableState = OracleStatus & {};
+export type State = ImmutableState & MutableState;
+export type OracleKit = ReturnType<ReturnType<typeof prepareOracleAdminKit>>;
+//# sourceMappingURL=priceOracleKit.d.ts.map

package/src/price/priceOracleKit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"priceOracleKit.d.ts","sourceRoot":"","sources":["priceOracleKit.js"],"names":[],"mappings":"AAMA,yDAA0D;AA4DnD;;;;;QAcC;;;;WAIG;iEADQ,UAAU;QA0BrB,8BAA8B;qBAAhB,YAAY;;GAa/B;yBAjHU;IACZ,QAAY,EAAE,MAAM,CAAC;IACrB,WAAe,EAAE;QACjB,UAAgB,EAAE,CAClB,MAAc,EAAE,YAAY,EAC5B,MAAc,EAAE,OAAO,oBAAoB,EAAE,UAAU,KAC5C,OAAO,CAAC,YAAY,CAAC,CAAC;KAC5B,CAAC;CACH;yBAGU;IAAE,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,SAAS,EAAE,QAAQ,CAAA;CAAE;;;uBAKpD,MAAM;sBACN,MAAM;sBACN,MAAM;cACN,MAAM;;6BAGP,QAAQ,CAAC,UAAU,GAAG,EAAE,CAAC;2BAEzB,YAAY,GAAG,EAAE;oBAEhB,cAAc,GAAG,YAAY;wBAyF7B,UAAU,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC"}

package/src/price/priceOracleKit.js

@@ -8,14 +8,17 @@ export const INVITATION_MAKERS_DESC = 'oracle invitation';
 
 /**
  * @typedef {{
- *   oracleId: string,
- *   roundPowers: { handlePush: (status: OracleStatus, result: import('./roundsManager.js').PriceRound) => Promise<OracleStatus> }
+ *   oracleId: string;
+ *   roundPowers: {
+ *     handlePush: (
+ *       status: OracleStatus,
+ *       result: import('./roundsManager.js').PriceRound,
+ *     ) => Promise<OracleStatus>;
+ *   };
  * }} HeldParams
  */
 
-/**
- * @typedef {{ roundId: number | undefined, unitPrice: NatValue }} PriceDatum
- */
+/** @typedef {{ roundId: number | undefined; unitPrice: NatValue }} PriceDatum */
 
 /**
  * @typedef {object} OracleStatus
@@ -26,11 +29,9 @@ export const INVITATION_MAKERS_DESC = 'oracle invitation';
  * @property {string} oracleId
  */
 /**
- * @typedef {Readonly<HeldParams & {
- * }>} ImmutableState
+ * @typedef {Readonly<HeldParams & {}>} ImmutableState
  *
- * @typedef {OracleStatus & {
- * }} MutableState
+ * @typedef {OracleStatus & {}} MutableState
  */
 /** @typedef {ImmutableState & MutableState} State */
 
@@ -106,10 +107,7 @@ export const prepareOracleAdminKit = baggage =>
           state.lastStartedRound = result.lastStartedRound;
           state.latestSubmission = result.latestSubmission;
         },
-        /**
-         *
-         * @returns {OracleStatus}
-         */
+        /** @returns {OracleStatus} */
         getStatus() {
           const { state } = this;
           return {