@agoric/inter-protocol 0.17.0 → 0.17.1-upgrade-23-dev-bd79330.0.bd79330

package/src/price/fluxAggregatorContract.d.ts

@@ -1,39 +1,51 @@
 /**
  * @import {Baggage} from '@agoric/vat-data'
  * @import {TimerService} from '@agoric/time'
+ * @import {Remote} from '@agoric/internal';
+ * @import {ChainlinkConfig} from './fluxAggregatorKit.js';
+ * @import {PrioritySendersManager} from '@agoric/internal/src/priority-senders.js';
+ * @import {NameAdmin} from '@agoric/vats';
+ * @import {QuoteKit} from './roundsManager.js';
+ * @import {Invitation} from '@agoric/zoe';
+ * @import {ContractMeta, ZCF} from '@agoric/zoe';
+ * @import {Brand} from '@agoric/ertp';
+ * @import {Amount} from '@agoric/ertp';
+ * @import {Marshaller} from '@agoric/internal/src/lib-chainStorage.js';
+ * @import {StorageNode} from '@agoric/internal/src/lib-chainStorage.js';
+ * @import {ERef} from '@agoric/vow';
  */
-/** @type {ContractMeta} */
-export const meta: ContractMeta;
-export function start(zcf: ZCF<import("./fluxAggregatorKit.js").ChainlinkConfig & {
+/** @type {ContractMeta<typeof start>} */
+export const meta: ContractMeta<typeof start>;
+export function start(zcf: ZCF<ChainlinkConfig & {
     timer: TimerService;
     brandIn: Brand<"nat">;
     brandOut: Brand<"nat">;
     description: string;
     unitAmountIn?: Amount<"nat">;
 }>, privateArgs: {
-    highPrioritySendersManager?: import("@agoric/internal/src/priority-senders.js").PrioritySendersManager;
+    highPrioritySendersManager?: PrioritySendersManager;
     initialPoserInvitation: Invitation;
-    marshaller: ERef<Marshaller>;
-    namesByAddressAdmin: ERef<import("@agoric/vats").NameAdmin>;
-    storageNode: StorageNode;
+    marshaller: Remote<Marshaller>;
+    namesByAddressAdmin: ERef<NameAdmin>;
+    storageNode: Remote<StorageNode>;
 }, baggage: Baggage): Promise<{
     creatorFacet: import("@endo/exo").Guarded<{
         getParamMgrRetriever: () => {
             get: () => import("@agoric/governance/src/contractGovernance/typedParamManager.js").TypedParamManager<{
                 Electorate: "invitation";
             }>;
-        } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+        } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
             get: () => import("@agoric/governance/src/contractGovernance/typedParamManager.js").TypedParamManager<{
                 Electorate: "invitation";
             }>;
         }>;
-        getInvitation: (name: any) => Promise<globalThis.Invitation>;
+        getInvitation: (name: any) => Promise<Invitation>;
         getLimitedCreatorFacet: () => import("@endo/exo").Guarded<{
-            makeOracleInvitation(oracleId: string): Promise<globalThis.Invitation<{
+            makeOracleInvitation(oracleId: string): Promise<Invitation<{
                 invitationMakers: {
-                    PushPrice(result: import("./roundsManager.js").PriceRound): Promise<globalThis.Invitation<void, undefined>>;
-                } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
-                    PushPrice(result: import("./roundsManager.js").PriceRound): Promise<globalThis.Invitation<void, undefined>>;
+                    PushPrice(result: import("./roundsManager.js").PriceRound): Promise<Invitation<void, undefined>>;
+                } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+                    PushPrice(result: import("./roundsManager.js").PriceRound): Promise<Invitation<void, undefined>>;
                 }>;
                 oracle: import("@endo/exo").Guarded<{
                     pushPrice({ roundId: roundIdRaw, unitPrice: valueRaw, }: PriceDatum): Promise<void>;
@@ -53,7 +65,7 @@ export function start(zcf: ZCF<import("./fluxAggregatorKit.js").ChainlinkConfig
             }>>;
             oracleRoundState(oracleId: string, queriedRoundId: bigint): Promise<RoundState>;
         }>;
-        getGovernedApis: () => GovernedApis;
+        getGovernedApis: () => import("@agoric/governance").GovernedApis;
         getGovernedApiNames: () => string[];
         setOfferFilter: (strings: any) => Promise<void>;
     }>;
@@ -66,6 +78,18 @@ export function start(zcf: ZCF<import("./fluxAggregatorKit.js").ChainlinkConfig
     }>;
 }>;
 export type FluxStartFn = typeof start;
+import type { ContractMeta } from '@agoric/zoe';
+import type { ChainlinkConfig } from './fluxAggregatorKit.js';
 import type { TimerService } from '@agoric/time';
+import type { Brand } from '@agoric/ertp';
+import type { Amount } from '@agoric/ertp';
+import type { ZCF } from '@agoric/zoe';
+import type { PrioritySendersManager } from '@agoric/internal/src/priority-senders.js';
+import type { Invitation } from '@agoric/zoe';
+import type { Marshaller } from '@agoric/internal/src/lib-chainStorage.js';
+import type { Remote } from '@agoric/internal';
+import type { NameAdmin } from '@agoric/vats';
+import type { ERef } from '@agoric/vow';
+import type { StorageNode } from '@agoric/internal/src/lib-chainStorage.js';
 import type { Baggage } from '@agoric/vat-data';
 //# sourceMappingURL=fluxAggregatorContract.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"fluxAggregatorContract.d.ts","sourceRoot":"","sources":["fluxAggregatorContract.js"],"names":[],"mappings":"AAcA;;;GAGG;AAEH,2BAA2B;AAC3B,mBADW,YAAY,CAmBrB;AA0BK,2BAlBI,GAAG,CACb,OAAW,wBAAwB,EAAE,eAAe,GAAG;IACjD,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACtB,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CAC9B,CACF,eACO;IACN,0BAA0B,CAAC,EAAE,OAAO,0CAA0C,EAAE,sBAAsB,CAAC;IACvG,sBAAsB,EAAE,UAAU,CAAC;IACnC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7B,mBAAmB,EAAE,IAAI,CAAC,OAAO,cAAc,EAAE,SAAS,CAAC,CAAC;IAC5D,WAAW,EAAE,WAAW,CAAC;CAC1B,WACO,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqIjB;0BAGa,OAAO,KAAK;kCAtLK,cAAc;6BADnB,kBAAkB"}
+{"version":3,"file":"fluxAggregatorContract.d.ts","sourceRoot":"","sources":["fluxAggregatorContract.js"],"names":[],"mappings":"AAaA;;;;;;;;;;;;;;;GAeG;AAEH,yCAAyC;AACzC,mBADW,aAAa,OAAO,KAAK,CAAC,CAoBnC;AA0BK,2BAlBI,IACV,eAAmB,GAAG;IAChB,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,EAAE,MAAM,KAAK,CAAC,CAAC;IACtB,QAAQ,EAAE,MAAM,KAAK,CAAC,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,KAAK,CAAC,CAAC;CAC9B,CACF,eACO;IACN,0BAA0B,CAAC,EAAE,sBAAsB,CAAC;IACpD,sBAAsB,EAAE,UAAU,CAAC;IACnC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,mBAAmB,EAAE,KAAK,SAAS,CAAC,CAAC;IACrC,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;CAClC,WACO,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuIjB;0BAGa,OAAO,KAAK;kCA9LU,aAAa;qCALf,wBAAwB;kCAF3B,cAAc;2BAQrB,cAAc;4BACb,cAAc;yBAFH,aAAa;4CAJR,0CAA0C;gCAGtD,aAAa;gCAIb,0CAA0C;4BAT9C,kBAAkB;+BAGf,cAAc;0BAQnB,aAAa;iCADN,0CAA0C;6BAZ9C,kBAAkB"}

package/src/price/fluxAggregatorContract.js

@@ -1,8 +1,7 @@
-// @jessie-check
-
 import { prepareIssuerKit } from '@agoric/ertp';
 import { handleParamGovernance } from '@agoric/governance';
 import { makeTracer, StorageNodeShape } from '@agoric/internal';
+import { wrapRemoteMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
 import { prepareDurablePublishKit } from '@agoric/notifier';
 import { M } from '@agoric/store';
 import { provideAll } from '@agoric/zoe/src/contractSupport/durability.js';
@@ -15,10 +14,23 @@ const trace = makeTracer('FluxAgg', false);
 /**
  * @import {Baggage} from '@agoric/vat-data'
  * @import {TimerService} from '@agoric/time'
+ * @import {Remote} from '@agoric/internal';
+ * @import {ChainlinkConfig} from './fluxAggregatorKit.js';
+ * @import {PrioritySendersManager} from '@agoric/internal/src/priority-senders.js';
+ * @import {NameAdmin} from '@agoric/vats';
+ * @import {QuoteKit} from './roundsManager.js';
+ * @import {Invitation} from '@agoric/zoe';
+ * @import {ContractMeta, ZCF} from '@agoric/zoe';
+ * @import {Brand} from '@agoric/ertp';
+ * @import {Amount} from '@agoric/ertp';
+ * @import {Marshaller} from '@agoric/internal/src/lib-chainStorage.js';
+ * @import {StorageNode} from '@agoric/internal/src/lib-chainStorage.js';
+ * @import {ERef} from '@agoric/vow';
  */
 
-/** @type {ContractMeta} */
+/** @type {ContractMeta<typeof start>} */
 export const meta = {
+  // @ts-expect-error splitRecord loses the property keys
   privateArgsShape: M.splitRecord(
     {
       storageNode: StorageNodeShape,
@@ -45,7 +57,7 @@ harden(meta);
  * feeds](https://blog.chain.link/levels-of-data-aggregation-in-chainlink-price-feeds/).
  *
  * @param {ZCF<
- *   import('./fluxAggregatorKit.js').ChainlinkConfig & {
+ *   ChainlinkConfig & {
  *     timer: TimerService;
  *     brandIn: Brand<'nat'>;
  *     brandOut: Brand<'nat'>;
@@ -54,11 +66,11 @@ harden(meta);
  *   }
  * >} zcf
  * @param {{
- *   highPrioritySendersManager?: import('@agoric/internal/src/priority-senders.js').PrioritySendersManager;
+ *   highPrioritySendersManager?: PrioritySendersManager;
  *   initialPoserInvitation: Invitation;
- *   marshaller: ERef<Marshaller>;
- *   namesByAddressAdmin: ERef<import('@agoric/vats').NameAdmin>;
- *   storageNode: StorageNode;
+ *   marshaller: Remote<Marshaller>;
+ *   namesByAddressAdmin: ERef<NameAdmin>;
+ *   storageNode: Remote<StorageNode>;
  * }} privateArgs
  * @param {Baggage} baggage
  */
@@ -66,7 +78,7 @@ 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} */
+  /** @type {QuoteKit} */
   // @ts-expect-error cast
   const quoteIssuerKit = prepareIssuerKit(
     baggage,
@@ -80,7 +92,7 @@ export const start = async (zcf, privateArgs, baggage) => {
   const {
     highPrioritySendersManager,
     initialPoserInvitation,
-    marshaller,
+    marshaller: remoteMarshaller,
     namesByAddressAdmin,
     storageNode,
   } = privateArgs;
@@ -89,11 +101,13 @@ export const start = async (zcf, privateArgs, baggage) => {
 
   trace('awaited args');
 
+  const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
+
   const makeDurablePublishKit = prepareDurablePublishKit(
     baggage,
     'Price Aggregator publish kit',
   );
-  const makeRecorder = prepareRecorder(baggage, marshaller);
+  const makeRecorder = prepareRecorder(baggage, cachingMarshaller);
 
   const makeFluxAggregatorKit = await prepareFluxAggregatorKit(
     baggage,
@@ -120,7 +134,7 @@ export const start = async (zcf, privateArgs, baggage) => {
       // No governed parameters. Governance just for API methods.
     },
     storageNode,
-    marshaller,
+    cachingMarshaller,
   );
 
   trace('got makeDurableGovernorFacet', makeDurableGovernorFacet);

package/src/price/fluxAggregatorKit.d.ts

@@ -4,7 +4,7 @@ export function prepareFluxAggregatorKit(baggage: Baggage, zcf: ZCF<ChainlinkCon
     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<{
+}>, timerPresence: TimerService, quoteKit: QuoteKit, storageNode: Remote<StorageNode>, makeDurablePublishKit: () => PublishKit<any>, makeRecorder: MakeRecorder): Promise<() => import("@endo/exo").GuardedKit<{
     creator: {
         /**
          * An "oracle invitation" is an invitation to be able to submit data to
@@ -16,13 +16,13 @@ export function prepareFluxAggregatorKit(baggage: Baggage, zcf: ZCF<ChainlinkCon
          *
          * @param {string} oracleId unique per contract instance
          */
-        makeOracleInvitation(oracleId: string): Promise<globalThis.Invitation<{
+        makeOracleInvitation(oracleId: string): Promise<import("@agoric/zoe").Invitation<{
             invitationMakers: {
-                /** @param {import('./roundsManager.js').PriceRound} result */
-                PushPrice(result: import("./roundsManager.js").PriceRound): Promise<globalThis.Invitation<void, undefined>>;
-            } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
-                /** @param {import('./roundsManager.js').PriceRound} result */
-                PushPrice(result: import("./roundsManager.js").PriceRound): Promise<globalThis.Invitation<void, undefined>>;
+                /** @param {PriceRound} result */
+                PushPrice(result: PriceRound): Promise<import("@agoric/zoe").Invitation<void, undefined>>;
+            } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+                /** @param {PriceRound} result */
+                PushPrice(result: PriceRound): Promise<import("@agoric/zoe").Invitation<void, undefined>>;
             }>;
             oracle: import("@endo/exo").Guarded<{
                 pushPrice({ roundId: roundIdRaw, unitPrice: valueRaw, }: PriceDatum): Promise<void>;
@@ -57,7 +57,7 @@ export function prepareFluxAggregatorKit(baggage: Baggage, zcf: ZCF<ChainlinkCon
         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>;
+            latestRound: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<LatestRound>;
         };
     };
 }>>;
@@ -97,8 +97,18 @@ export type ChainlinkConfig = {
 export type FluxAggregatorKit = EReturn<EReturn<typeof prepareFluxAggregatorKit>>;
 import type { Baggage } from '@agoric/vat-data';
 import type { TimerService } from '@agoric/time';
+import type { Brand } from '@agoric/ertp';
+import type { Amount } from '@agoric/ertp';
+import type { ZCF } from '@agoric/zoe';
+import type { QuoteKit } from './roundsManager.js';
+import type { StorageNode } from '@agoric/internal/src/lib-chainStorage.js';
+import type { Remote } from '@agoric/internal';
+import type { PublishKit } from '@agoric/notifier';
+import type { MakeRecorder } from '@agoric/zoe/src/contractSupport/recorder.js';
+import type { PriceRound } from './roundsManager.js';
 import type { PriceAuthority } from '@agoric/zoe/tools/types.js';
 import type { PriceDescription } from '@agoric/zoe/tools/types.js';
+import type { LatestRound } from './roundsManager.js';
 import type { Timestamp } from '@agoric/time';
 import type { EReturn } from '@endo/far';
 //# sourceMappingURL=fluxAggregatorKit.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"fluxAggregatorKit.d.ts","sourceRoot":"","sources":["fluxAggregatorKit.js"],"names":[],"mappings":"AA6BA,qCAAsC,mBAAmB,CAAC;AAgEnD,kDAfI,OAAO,OACP,GAAG,CACT,eAAe,GAAG;IAChB,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACtB,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CAC9B,CACF,iBACO,YAAY,YACZ,OAAO,oBAAoB,EAAE,QAAQ,eACrC,WAAW,yBACX,MAAM,UAAU,CAAC,GAAG,CAAC,gBACrB,OAAO,6CAA6C,EAAE,YAAY;;QA8IrE;;;;;;;;;WASG;uCADQ,MAAM;;gBAiBX,8DAA8D;kCAAlD,OAAO,oBAAoB,EAAE,UAAU;;gBAAnD,8DAA8D;kCAAlD,OAAO,oBAAoB,EAAE,UAAU;;;;;;;QAqBzD,+BAA+B;+BAAnB,MAAM;;QAalB,+BAA+B;6BAAnB,MAAM;;;;;;;;;QAoBlB;;;;;;;;WAQG;mCAHQ,MAAM,kBACN,MAAM,GACJ,OAAO,CAAC,UAAU,CAAC;;;;;;;;;IAqDvC;;8BAvUa,OAAO;oBACP,MAAM;sBACN,MAAM;eACN,SAAS;kBACT,MAAM;iBACN,MAAM;;;wBAMN,MAAM;wBACN,MAAM;;;;;kBACN,MAAM;;;;;wBAEN,MAAM;;;;;wBAEN,MAAM;;;;;;aAEN,MAAM;;gCAsTN,QAAQ,QAAQ,OAAO,wBAAwB,CAAC,CAAC;6BAtVrC,kBAAkB;kCAKb,cAAc;oCAdgD,4BAA4B;sCAA5B,4BAA4B;+BAU7F,cAAc;6BAZhB,WAAW"}
+{"version":3,"file":"fluxAggregatorKit.d.ts","sourceRoot":"","sources":["fluxAggregatorKit.js"],"names":[],"mappings":"AAuCA,qCAAsC,mBAAmB,CAAC;AAgEnD,kDAfI,OAAO,OACP,IACN,eAAe,GAAG;IAChB,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,EAAE,MAAM,KAAK,CAAC,CAAC;IACtB,QAAQ,EAAE,MAAM,KAAK,CAAC,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,KAAK,CAAC,CAAC;CAC9B,CACF,iBACO,YAAY,YACZ,QAAQ,eACR,OAAO,WAAW,CAAC,yBACnB,MAAM,WAAW,GAAG,CAAC,gBACrB,YAAY;;QAkJf;;;;;;;;;WASG;uCADQ,MAAM;;gBAiBX,iCAAiC;kCAArB,UAAU;;gBAAtB,iCAAiC;kCAArB,UAAU;;;;;;;QAqB5B,+BAA+B;+BAAnB,MAAM;;QAalB,+BAA+B;6BAAnB,MAAM;;;;;;;;;QAoBlB;;;;;;;;WAQG;mCAHQ,MAAM,kBACN,MAAM,GACJ,OAAO,CAAC,UAAU,CAAC;;;;;;;;;IAqDvC;;8BA3Ua,OAAO;oBACP,MAAM;sBACN,MAAM;eACN,SAAS;kBACT,MAAM;iBACN,MAAM;;;wBAMN,MAAM;wBACN,MAAM;;;;;kBACN,MAAM;;;;;wBAEN,MAAM;;;;;wBAEN,MAAM;;;;;;aAEN,MAAM;;gCA0TN,QAAQ,QAAQ,OAAO,wBAAwB,CAAC,CAAC;6BA1VrC,kBAAkB;kCAKb,cAAc;2BAfrB,cAAc;4BACb,cAAc;yBAPR,aAAa;8BACjB,oBAAoB;iCAOjB,0CAA0C;4BAZjC,kBAAkB;gCAE5B,kBAAkB;kCAIhB,6CAA6C;gCAG/C,oBAAoB;oCAR4C,4BAA4B;sCAA5B,4BAA4B;iCAM3F,oBAAoB;+BActB,cAAc;6BAtBhB,WAAW"}

package/src/price/fluxAggregatorKit.js

@@ -20,9 +20,19 @@ import { prepareRoundsManagerKit } from './roundsManager.js';
 
 /**
  * @import {EReturn} from '@endo/far';
- * @import {TypedPattern} from '@agoric/internal';
+ * @import {TypedPattern, Remote} from '@agoric/internal';
  * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
+ * @import {PublishKit} from '@agoric/notifier';
  * @import {MapStore, SetStore} from '@agoric/store';
+ * @import {ZCF, ZCFSeat} from '@agoric/zoe';
+ * @import {QuoteKit} from './roundsManager.js';
+ * @import {MakeRecorder} from '@agoric/zoe/src/contractSupport/recorder.js';
+ * @import {LatestRound} from './roundsManager.js';
+ * @import {OracleKit} from './priceOracleKit.js';
+ * @import {PriceRound} from './roundsManager.js';
+ * @import {Brand} from '@agoric/ertp';
+ * @import {Amount} from '@agoric/ertp';
+ * @import {StorageNode} from '@agoric/internal/src/lib-chainStorage.js';
  */
 
 const trace = makeTracer('FlxAgg', true);
@@ -86,10 +96,10 @@ const priceDescriptionFromQuote = quote => quote.quoteAmount.value[0];
  *   }
  * >} zcf
  * @param {TimerService} timerPresence
- * @param {import('./roundsManager.js').QuoteKit} quoteKit
- * @param {StorageNode} storageNode
+ * @param {QuoteKit} quoteKit
+ * @param {Remote<StorageNode>} storageNode
  * @param {() => PublishKit<any>} makeDurablePublishKit
- * @param {import('@agoric/zoe/src/contractSupport/recorder.js').MakeRecorder} makeRecorder
+ * @param {MakeRecorder} makeRecorder
  */
 export const prepareFluxAggregatorKit = async (
   baggage,
@@ -155,7 +165,7 @@ export const prepareFluxAggregatorKit = async (
         makeRecorderKit(
           node,
           /**
-           * @type {TypedPattern<import('./roundsManager.js').LatestRound>}
+           * @type {TypedPattern<LatestRound>}
            */ (M.any()),
         ),
       ),
@@ -213,7 +223,11 @@ export const prepareFluxAggregatorKit = async (
     baggage,
     'fluxAggregator',
     {
-      creator: M.interface('fluxAggregator creatorFacet', {}, { sloppy: true }),
+      creator: M.interface(
+        'fluxAggregator creatorFacet',
+        {},
+        { defaultGuards: 'passable' },
+      ),
       public: M.interface('fluxAggregator publicFacet', {
         getPriceAuthority: M.call().returns(M.any()),
         getPublicTopics: M.call().returns({
@@ -223,7 +237,7 @@ export const prepareFluxAggregatorKit = async (
       }),
     },
     () => {
-      /** @type {MapStore<string, import('./priceOracleKit.js').OracleKit>} */
+      /** @type {MapStore<string, OracleKit>} */
       const oracles = makeScalarBigMapStore('oracles', {
         durable: true,
       });
@@ -256,7 +270,7 @@ export const prepareFluxAggregatorKit = async (
             seat.exit();
             const { oracle } = await facets.creator.initOracle(oracleId);
             const invitationMakers = Far('invitation makers', {
-              /** @param {import('./roundsManager.js').PriceRound} result */
+              /** @param {PriceRound} result */
               PushPrice(result) {
                 return zcf.makeInvitation(
                   /** @param {ZCFSeat} cSeat */

package/src/price/priceOracleKit.d.ts

@@ -17,7 +17,7 @@ export function prepareOracleAdminKit(baggage: any): (args_0: HeldParams) => imp
 export type HeldParams = {
     oracleId: string;
     roundPowers: {
-        handlePush: (status: OracleStatus, result: import("./roundsManager.js").PriceRound) => Promise<OracleStatus>;
+        handlePush: (status: OracleStatus, result: PriceRound) => Promise<OracleStatus>;
     };
 };
 export type PriceDatum = {
@@ -35,5 +35,7 @@ export type ImmutableState = Readonly<HeldParams & {}>;
 export type MutableState = OracleStatus & {};
 export type State = ImmutableState & MutableState;
 export type OracleKit = EReturn<EReturn<typeof prepareOracleAdminKit>>;
+import type { PriceRound } from './roundsManager.js';
+import type { NatValue } from '@agoric/ertp';
 import type { EReturn } from '@endo/far';
 //# sourceMappingURL=priceOracleKit.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"priceOracleKit.d.ts","sourceRoot":"","sources":["priceOracleKit.js"],"names":[],"mappings":"AAMA,qCAAsC,mBAAmB,CAAC;AAgEnD;;;;;QAcC;;;;WAIG;iEADQ,UAAU;QA0BrB,8BAA8B;qBAAhB,YAAY;;GAa/B;yBAjHU;IACR,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE;QACX,UAAU,EAAE,CACV,MAAM,EAAE,YAAY,EACpB,MAAM,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,QAAQ,QAAQ,OAAO,qBAAqB,CAAC,CAAC;6BAvHlC,WAAW"}
+{"version":3,"file":"priceOracleKit.d.ts","sourceRoot":"","sources":["priceOracleKit.js"],"names":[],"mappings":"AAMA,qCAAsC,mBAAmB,CAAC;AAkEnD;;;;;QAcC;;;;WAIG;iEADQ,UAAU;QA0BrB,8BAA8B;qBAAhB,YAAY;;GAa/B;yBAjHU;IACR,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE;QACX,UAAU,EAAE,CACV,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,UAAU,KACf,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,QAAQ,QAAQ,OAAO,qBAAqB,CAAC,CAAC;gCAxH/B,oBAAoB;8BACtB,cAAc;6BAFf,WAAW"}

package/src/price/priceOracleKit.js

@@ -8,6 +8,8 @@ export const INVITATION_MAKERS_DESC = 'oracle invitation';
 
 /**
  * @import {EReturn} from '@endo/far';
+ * @import {PriceRound} from './roundsManager.js';
+ * @import {NatValue} from '@agoric/ertp';
  */
 
 /**
@@ -16,7 +18,7 @@ export const INVITATION_MAKERS_DESC = 'oracle invitation';
  *   roundPowers: {
  *     handlePush: (
  *       status: OracleStatus,
- *       result: import('./roundsManager.js').PriceRound,
+ *       result: PriceRound,
  *     ) => Promise<OracleStatus>;
  *   };
  * }} HeldParams

package/src/price/roundsManager.d.ts

@@ -1,11 +1,11 @@
 /** @type {bigint} */
 export const ROUND_MAX: bigint;
-export function prepareRoundsManagerKit(baggage: any): (args_0: Readonly<import("./fluxAggregatorKit.js").ChainlinkConfig & {
+export function prepareRoundsManagerKit(baggage: any): (args_0: Readonly<ChainlinkConfig & {
     quoteKit: QuoteKit;
     answerPublisher: Publisher<void>;
     brandIn: Brand<"nat">;
     brandOut: Brand<"nat">;
-    latestRoundPublisher: import("@agoric/zoe/src/contractSupport/recorder.js").Recorder<LatestRound>;
+    latestRoundPublisher: Recorder<LatestRound>;
     timerPresence: TimerService;
 }> & {
     unitAmountIn: Amount<"nat">;
@@ -79,7 +79,7 @@ export function prepareRoundsManagerKit(baggage: any): (args_0: Readonly<import(
         /** @param {PriceQuoteValue} quote */
         authenticateQuote(quote: PriceQuoteValue): Promise<{
             quoteAmount: import("@agoric/ertp").SetAmount<PriceDescription>;
-            quotePayment: globalThis.Payment<"set", PriceDescription>;
+            quotePayment: import("@agoric/ertp").Payment<"set", PriceDescription>;
         }>;
         /**
          * @param {object} param0
@@ -91,10 +91,10 @@ export function prepareRoundsManagerKit(baggage: any): (args_0: Readonly<import(
             timestamp?: Timestamp | undefined;
         }): ((priceQuery: any) => Promise<{
             quoteAmount: import("@agoric/ertp").SetAmount<PriceDescription>;
-            quotePayment: globalThis.Payment<"set", PriceDescription>;
-        }> | undefined) & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, (priceQuery: any) => Promise<{
+            quotePayment: import("@agoric/ertp").Payment<"set", PriceDescription>;
+        }> | undefined) & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, (priceQuery: any) => Promise<{
             quoteAmount: import("@agoric/ertp").SetAmount<PriceDescription>;
-            quotePayment: globalThis.Payment<"set", PriceDescription>;
+            quotePayment: import("@agoric/ertp").Payment<"set", PriceDescription>;
         }> | undefined>;
         /**
          * @param {OracleStatus} status
@@ -177,12 +177,12 @@ export type RoundDetails = {
     roundTimeout: number;
 };
 export type QuoteKit = IssuerKit<"set", PriceDescription>;
-export type HeldParams = Readonly<import("./fluxAggregatorKit.js").ChainlinkConfig & {
+export type HeldParams = Readonly<ChainlinkConfig & {
     quoteKit: QuoteKit;
     answerPublisher: Publisher<void>;
     brandIn: Brand<"nat">;
     brandOut: Brand<"nat">;
-    latestRoundPublisher: import("@agoric/zoe/src/contractSupport/recorder.js").Recorder<LatestRound>;
+    latestRoundPublisher: Recorder<LatestRound>;
     timerPresence: TimerService;
 }>;
 export type ImmutableState = Readonly<HeldParams & {
@@ -195,10 +195,17 @@ export type MutableState = {
     reportingRoundId: bigint;
 };
 export type State = ImmutableState & MutableState;
+import type { ChainlinkConfig } from './fluxAggregatorKit.js';
+import type { Publisher } from '@agoric/notifier';
+import type { Brand } from '@agoric/ertp';
+import type { Recorder } from '@agoric/zoe/src/contractSupport/recorder.js';
 import type { TimerService } from '@agoric/time';
+import type { Amount } from '@agoric/ertp';
 import type { OracleStatus } from './priceOracleKit.js';
 import type { Timestamp } from '@agoric/time';
 import type { PriceQuoteValue } from '@agoric/zoe/tools/types.js';
 import type { PriceDescription } from '@agoric/zoe/tools/types.js';
+import type { NatValue } from '@agoric/ertp';
+import type { IssuerKit } from '@agoric/ertp';
 import type { MapStore } from '@agoric/store';
 //# sourceMappingURL=roundsManager.d.ts.map

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

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

package/src/price/roundsManager.js

@@ -17,8 +17,15 @@ const { add, subtract, multiply, floorDivide, ceilDivide, isGTE } = natSafeMath;
 /**
  * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
  * @import {Timestamp, TimerService} from '@agoric/time'
+ * @import {Publisher} from '@agoric/notifier';
  * @import {MapStore, SetStore} from '@agoric/store';
  * @import {OracleStatus} from './priceOracleKit.js'
+ * @import {ChainlinkConfig} from './fluxAggregatorKit.js';
+ * @import {Recorder} from '@agoric/zoe/src/contractSupport/recorder.js';
+ * @import {NatValue} from '@agoric/ertp';
+ * @import {IssuerKit} from '@agoric/ertp';
+ * @import {Amount} from '@agoric/ertp';
+ * @import {Brand} from '@agoric/ertp';
  */
 
 /** @type {string} */
@@ -67,12 +74,12 @@ const validRoundId = roundId => {
 
 /**
  * @typedef {Readonly<
- *   import('./fluxAggregatorKit.js').ChainlinkConfig & {
+ *   ChainlinkConfig & {
  *     quoteKit: QuoteKit;
  *     answerPublisher: Publisher<void>;
  *     brandIn: Brand<'nat'>;
  *     brandOut: Brand<'nat'>;
- *     latestRoundPublisher: import('@agoric/zoe/src/contractSupport/recorder.js').Recorder<LatestRound>;
+ *     latestRoundPublisher: Recorder<LatestRound>;
  *     timerPresence: TimerService;
  *   }
  * >} HeldParams