@agoric/inter-protocol 0.16.2-other-dev-fbe72e7.0.fbe72e7 → 0.16.2-other-dev-d15096d.0.d15096d

package/src/feeDistributor.js

@@ -9,6 +9,8 @@ import { KeywordShape } from '@agoric/zoe/src/typeGuards.js';
 
 /**
  * @import {MapStore, SetStore} from '@agoric/store';
+ * @import {EOnly} from '@endo/far';
+ * @import {DepositFacet} from '@agoric/ertp/src/types.js';
  */
 
 const KeywordSharesShape = M.recordOf(KeywordShape, M.nat());
@@ -272,9 +274,7 @@ export const makeFeeDistributor = (feeIssuer, terms) => {
     },
 
     /**
-     * @param {import('@endo/far').EOnly<
-     *   import('@agoric/ertp/src/types.js').DepositFacet
-     * >} depositFacet
+     * @param {EOnly<DepositFacet>} depositFacet
      */
     makeDepositFacetDestination: depositFacet => {
       return Far(`DepositFacetDestination`, {

package/src/index.js

@@ -1,4 +1,4 @@
 // @jessie-check
-/// <reference types="@agoric/vats/src/core/types-ambient" />
+/// <reference types="@agoric/vats/src/core/types-ambient.js" />
 
 export { calculateCurrentDebt } from './interest-math.js';

package/src/price/fluxAggregatorContract.d.ts

@@ -1,21 +1,26 @@
 /**
  * @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';
  */
 /** @type {ContractMeta} */
 export const meta: ContractMeta;
-export function start(zcf: ZCF<import("./fluxAggregatorKit.js").ChainlinkConfig & {
+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: () => {
@@ -66,6 +71,10 @@ export function start(zcf: ZCF<import("./fluxAggregatorKit.js").ChainlinkConfig
     }>;
 }>;
 export type FluxStartFn = typeof start;
+import type { ChainlinkConfig } from './fluxAggregatorKit.js';
 import type { TimerService } from '@agoric/time';
+import type { PrioritySendersManager } from '@agoric/internal/src/priority-senders.js';
+import type { Remote } from '@agoric/internal';
+import type { NameAdmin } from '@agoric/vats';
 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":"AAeA;;;;;;;;GAQG;AAEH,2BAA2B;AAC3B,mBADW,YAAY,CAmBrB;AA0BK,2BAlBI,GAAG,CACb,eAAmB,GAAG;IAChB,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,sBAAsB,CAAC;IACpD,sBAAsB,EAAE,UAAU,CAAC;IACnC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACrC,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;CAClC,WACO,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuIjB;0BAGa,OAAO,KAAK;qCA3LQ,wBAAwB;kCAF3B,cAAc;4CAGJ,0CAA0C;4BAF1D,kBAAkB;+BAGf,cAAc;6BALhB,kBAAkB"}

package/src/price/fluxAggregatorContract.js

@@ -3,6 +3,7 @@
 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,6 +16,11 @@ 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';
  */
 
 /** @type {ContractMeta} */
@@ -45,7 +51,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 +60,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 +72,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 +86,7 @@ export const start = async (zcf, privateArgs, baggage) => {
   const {
     highPrioritySendersManager,
     initialPoserInvitation,
-    marshaller,
+    marshaller: remoteMarshaller,
     namesByAddressAdmin,
     storageNode,
   } = privateArgs;
@@ -89,11 +95,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 +128,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
@@ -18,11 +18,11 @@ export function prepareFluxAggregatorKit(baggage: Baggage, zcf: ZCF<ChainlinkCon
          */
         makeOracleInvitation(oracleId: string): Promise<globalThis.Invitation<{
             invitationMakers: {
-                /** @param {import('./roundsManager.js').PriceRound} result */
-                PushPrice(result: import("./roundsManager.js").PriceRound): Promise<globalThis.Invitation<void, undefined>>;
+                /** @param {PriceRound} result */
+                PushPrice(result: 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<globalThis.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,13 @@ 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 { QuoteKit } from './roundsManager.js';
+import type { Remote } from '@agoric/internal';
+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":"AAkCA,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,QAAQ,eACR,OAAO,WAAW,CAAC,yBACnB,MAAM,UAAU,CAAC,GAAG,CAAC,gBACrB,YAAY;;QA8If;;;;;;;;;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;;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;8BAjBlB,oBAAoB;4BAHR,kBAAkB;kCAI1B,6CAA6C;gCAG/C,oBAAoB;oCAN4C,4BAA4B;sCAA5B,4BAA4B;iCAI3F,oBAAoB;+BAWtB,cAAc;6BAjBhB,WAAW"}

package/src/price/fluxAggregatorKit.js

@@ -20,9 +20,14 @@ 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 {MapStore, SetStore} from '@agoric/store';
+ * @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';
  */
 
 const trace = makeTracer('FlxAgg', true);
@@ -86,10 +91,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 +160,7 @@ export const prepareFluxAggregatorKit = async (
         makeRecorderKit(
           node,
           /**
-           * @type {TypedPattern<import('./roundsManager.js').LatestRound>}
+           * @type {TypedPattern<LatestRound>}
            */ (M.any()),
         ),
       ),
@@ -223,7 +228,7 @@ export const prepareFluxAggregatorKit = async (
       }),
     },
     () => {
-      /** @type {MapStore<string, import('./priceOracleKit.js').OracleKit>} */
+      /** @type {MapStore<string, OracleKit>} */
       const oracles = makeScalarBigMapStore('oracles', {
         durable: true,
       });
@@ -256,7 +261,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,6 @@ 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 { 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;AAiEnD;;;;;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;gCAvH/B,oBAAoB;6BADvB,WAAW"}

package/src/price/priceOracleKit.js

@@ -8,6 +8,7 @@ export const INVITATION_MAKERS_DESC = 'oracle invitation';
 
 /**
  * @import {EReturn} from '@endo/far';
+ * @import {PriceRound} from './roundsManager.js';
  */
 
 /**
@@ -16,7 +17,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">;
@@ -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,6 +195,8 @@ export type MutableState = {
     reportingRoundId: bigint;
 };
 export type State = ImmutableState & MutableState;
+import type { ChainlinkConfig } from './fluxAggregatorKit.js';
+import type { Recorder } from '@agoric/zoe/src/contractSupport/recorder.js';
 import type { TimerService } from '@agoric/time';
 import type { OracleStatus } from './priceOracleKit.js';
 import type { Timestamp } from '@agoric/time';

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

@@ -1 +1 @@
-{"version":3,"file":"roundsManager.d.ts","sourceRoot":"","sources":["roundsManager.js"],"names":[],"mappings":"AA0BA,qBAAqB;AACrB,wBADW,MAAM,CAC4B;AAqEtC;cA1BU,QAAQ;qBACD,SAAS,CAAC,IAAI,CAAC;aACvB,KAAK,CAAC,KAAK,CAAC;cACX,KAAK,CAAC,KAAK,CAAC;0BACA,OAAO,6CAA6C,EAAE,QAAQ,CAAC,WAAW,CAAC;mBAClF,YAAY;;kBAoDU,MAAM,CAAC,KAAK,CAAC;;;QA2DjD,8BAA8B;sCAAlB,MAAM;QAQlB;;;WAGG;wBAFQ,YAAY,WACZ,MAAM;QAQjB,8BAA8B;oCAAlB,MAAM;QASlB,8BAA8B;6BAAlB,MAAM;QAMlB;;;;WAIG;oCAHQ,MAAM,kBACN,SAAS,YACT,MAAM;QA4CjB;;;WAGG;8CAFQ,MAAM,QACN,MAAM;QAOjB;;;;;WAKG;iCAJQ,MAAM,UACN,YAAY,kBACZ,SAAS,GACP,YAAY,GAAG,SAAS;QAiBrC;;;;;WAKG;qCAJQ,MAAM,WACN,MAAM,UACN,YAAY,GACV,YAAY;QAwBzB;;;WAGG;8BAFQ,MAAM,kBACN,SAAS;QAWpB;;;WAGG;0BAFQ,MAAM,kBACN,SAAS;QAyBpB;;;WAGG;mCAFQ,MAAM,kBACN,SAAS;QAgCpB;;;WAGG;yCAFQ,MAAM,kBACN,SAAS;QA2BpB;;;;;WAKG;oCAJQ,YAAY,WACZ,MAAM,kBACN,SAAS,GACP,MAAM,GAAG,IAAI;;;QA8B1B,qCAAqC;iCAAzB,eAAe;;;;QAQ3B;;;;WAIG;0DAFA;YAAwB,gBAAgB;YACb,SAAS;SAAC;;;;;;;QAwExC;;;;WAIG;yCAHQ,YAAY,kBACZ,MAAM,kBACN,SAAS;QAmBpB;;;;;;WAMG;iCAFQ,MAAM,GAAG,MAAM,GACb,OAAO,CAAC,SAAS,CAAC;gCAwBV,MAAM,GAAK,QAAQ,CAAC,YAAY,GAAG,KAAK,CAAC;QAS9D;;;;;;;WAOG;6CAFQ,YAAY,kBACZ,SAAS;;;;;;;;;QAyDpB;;;;;WAKG;2BAFQ,YAAY,gDACZ,UAAU;;GA6G1B;yBAvuBU;IAAE,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,SAAS,EAAE,QAAQ,CAAA;CAAE;0BAEpD,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,WAAW,CAAC,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE;wBAG/D,KAAK,GAAG;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE;;;;;YAI3B,MAAM;;;;;eACN,SAAS;;;;;eAET,SAAS;;;;;;;qBAET,MAAM;;;iBAQN,MAAM,EAAE;oBACR,MAAM;oBACN,MAAM;kBACN,MAAM;;uBAGN,SAAS,CAAC,KAAK,EAAE,gBAAgB,CAAC;yBAGnC,QAAQ,CACpB,OAAW,wBAAwB,EAAE,eAAe,GAAG;IACjD,QAAQ,EAAE,QAAQ,CAAC;IACnB,eAAe,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;IACjC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACtB,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACvB,oBAAoB,EAAE,OAAO,6CAA6C,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;IAClG,aAAa,EAAE,YAAY,CAAC;CAC7B,CACF;6BAGS,QAAQ,CAChB,UAAU,GAAG;IACX,OAAO,EAAE,SAAS,MAAM,EAAE,YAAY,CAAC,CAAC;IACxC,MAAM,EAAE,SAAS,MAAM,EAAE,KAAK,CAAC,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;CAChB,CACF;2BAGS;IACR,qBAAqB,EAAE,MAAM,OAAC,CAAC;IAC/B,gBAAgB,EAAE,MAAM,CAAC;CAC1B;oBAEU,cAAc,GAAG,YAAY;kCA5ED,cAAc;kCAEzB,qBAAqB;+BAFV,cAAc;qCADqC,4BAA4B;sCAA5B,4BAA4B;8BAEpF,eAAe"}
+{"version":3,"file":"roundsManager.d.ts","sourceRoot":"","sources":["roundsManager.js"],"names":[],"mappings":"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"}

package/src/price/roundsManager.js

@@ -19,6 +19,8 @@ const { add, subtract, multiply, floorDivide, ceilDivide, isGTE } = natSafeMath;
  * @import {Timestamp, TimerService} from '@agoric/time'
  * @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';
  */
 
 /** @type {string} */
@@ -67,12 +69,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

package/src/proposals/add-auction.js

@@ -7,6 +7,11 @@ import { provideRetiredInstances } from './utils.js';
 
 const trace = makeTracer('NewAuction', true);
 
+/**
+ * @import {Remote} from '@agoric/internal';
+ * @import {EconomyBootstrapPowers} from './econ-behaviors.js';
+ */
+
 /**
  * @typedef {PromiseSpaceOf<{
  *   auctionUpgradeNewInstance: Instance;
@@ -17,8 +22,7 @@ const trace = makeTracer('NewAuction', true);
  */
 
 /**
- * @param {import('./econ-behaviors.js').EconomyBootstrapPowers &
- *   interlockPowers} powers
+ * @param {EconomyBootstrapPowers & interlockPowers} powers
  * @param {{
  *   options: {
  *     contractGovernorRef: { bundleID: string };
@@ -123,6 +127,7 @@ export const addAuction = async (
   const timerBrand = await E(chainTimerService).getTimerBrand();
 
   const storageNode = await makeStorageNodeChild(chainStorage, STORAGE_PATH);
+  /** @type {Remote<Marshaller>} */
   const marshaller = await E(board).getReadonlyMarshaller();
 
   const reservePublicFacet = await E(zoe).getPublicFacet(reserveInstance);

package/src/proposals/addAssetToVault.js

@@ -34,7 +34,11 @@ export * from './startPSM.js';
  * @property {number} [initialPrice]
  */
 
-/** @import {EconomyBootstrapPowers} from './econ-behaviors.js' */
+/**
+ * @import {EconomyBootstrapPowers} from './econ-behaviors.js'
+ * @import {FullSchedule} from '../auction/scheduler.js';
+ * @import {TimerService} from '@agoric/time';
+ */
 
 /**
  * @param {BootstrapPowers} powers
@@ -269,8 +273,8 @@ const COMPLETION = 20n * 60n;
  * defined, 3) run now. If there is only a nextSchedule, 4) run now if startTime
  * is far enough away, else 5) run after endTime
  *
- * @param {import('../auction/scheduler.js').FullSchedule} schedules
- * @param {ERef<import('@agoric/time').TimerService>} timer
+ * @param {FullSchedule} schedules
+ * @param {ERef<TimerService>} timer
  * @param {() => void} thunk
  */
 const whenQuiescent = async (schedules, timer, thunk) => {

package/src/proposals/committee-proposal.js

@@ -2,6 +2,11 @@ import { deeplyFulfilledObject } from '@agoric/internal';
 import { E } from '@endo/far';
 import { reserveThenDeposit } from './utils.js';
 
+/**
+ * @import {EconomyBootstrapPowers} from './econ-behaviors.js';
+ * @import {EconCharterStartResult} from './econ-behaviors.js';
+ */
+
 const { values } = Object;
 
 /** @type {<X, Y>(xs: X[], ys: Y[]) => [X, Y][]} */
@@ -10,7 +15,7 @@ const zip = (xs, ys) => xs.map((x, i) => [x, ys[i]]);
 const EC_HIGH_PRIORITY_SENDERS_NAMESPACE = 'economicCommittee';
 
 /**
- * @param {import('./econ-behaviors.js').EconomyBootstrapPowers} powers
+ * @param {EconomyBootstrapPowers} powers
  * @param {{ options: { voterAddresses: Record<string, string> } }} param1
  */
 export const inviteCommitteeMembers = async (
@@ -51,7 +56,7 @@ export const inviteCommitteeMembers = async (
 
 harden(inviteCommitteeMembers);
 
-/** @param {import('./econ-behaviors.js').EconomyBootstrapPowers} powers */
+/** @param {EconomyBootstrapPowers} powers */
 export const startEconCharter = async ({
   consume: { zoe },
   produce: { econCharterKit },
@@ -72,7 +77,7 @@ export const startEconCharter = async ({
     }),
   );
 
-  /** @type {Promise<import('./econ-behaviors.js').EconCharterStartResult>} */
+  /** @type {Promise<EconCharterStartResult>} */
   const startResult = E(zoe).startInstance(
     charterInstall,
     undefined,
@@ -88,7 +93,7 @@ harden(startEconCharter);
 /**
  * Introduce charter to governed creator facets.
  *
- * @param {import('./econ-behaviors.js').EconomyBootstrapPowers} powers
+ * @param {EconomyBootstrapPowers} powers
  */
 export const addGovernorsToEconCharter = async ({
   consume: { reserveKit, vaultFactoryKit, econCharterKit, auctioneerKit },
@@ -126,7 +131,7 @@ export const addGovernorsToEconCharter = async ({
 harden(addGovernorsToEconCharter);
 
 /**
- * @param {import('./econ-behaviors.js').EconomyBootstrapPowers} powers
+ * @param {EconomyBootstrapPowers} powers
  * @param {{ options: { voterAddresses: Record<string, string> } }} param1
  */
 export const inviteToEconCharter = async (

package/src/proposals/core-proposal.js

@@ -4,6 +4,12 @@ import { Stable } from '@agoric/internal/src/tokens.js';
 import * as econBehaviors from './econ-behaviors.js';
 import { ECON_COMMITTEE_MANIFEST } from './startEconCommittee.js';
 
+/**
+ * @import {EconomyBootstrapPowers} from './econ-behaviors.js';
+ * @import {BootstrapManifest} from '@agoric/vats/src/core/lib-boot.js';
+ * @import {BootstrapManifestPermit} from '@agoric/vats/src/core/lib-boot.js';
+ */
+
 export * from './econ-behaviors.js';
 export * from './startPSM.js';
 export * from './startEconCommittee.js';
@@ -13,7 +19,7 @@ export * from './startEconCommittee.js';
 // require updating a lot of tests. So for now, we just
 // grab the kits afterward and store them.
 
-/** @param {import('./econ-behaviors.js').EconomyBootstrapPowers} powers */
+/** @param {EconomyBootstrapPowers} powers */
 export const storeInterContractStartKits = async ({
   consume: {
     contractKits,
@@ -50,9 +56,9 @@ export const storeInterContractStartKits = async ({
   ]);
 };
 
-/** @type {import('@agoric/vats/src/core/lib-boot.js').BootstrapManifest} */
+/** @type {BootstrapManifest} */
 const SHARED_MAIN_MANIFEST = harden({
-  /** @type {import('@agoric/vats/src/core/lib-boot.js').BootstrapManifestPermit} */
+  /** @type {BootstrapManifestPermit} */
   [econBehaviors.startVaultFactory.name]: {
     consume: {
       board: 'board',

package/src/proposals/deploy-price-feeds.js

@@ -23,8 +23,11 @@ export const DEFAULT_CONTRACT_TERMS = {
   maxSubmissionValue: 2 ** 256,
 };
 
-/** @import {EconomyBootstrapPowers} from './econ-behaviors.js'; */
-/** @import {ChainlinkConfig} from '@agoric/inter-protocol/src/price/fluxAggregatorKit.js'; */
+/**
+ * @import {EconomyBootstrapPowers} from './econ-behaviors.js';
+ * @import {ChainlinkConfig} from '@agoric/inter-protocol/src/price/fluxAggregatorKit.js';
+ * @import {StartedInstanceKit} from '@agoric/zoe/src/zoeService/utils.js';
+ */
 /** @import {FluxStartFn} from '@agoric/inter-protocol/src/price/fluxAggregatorContract.js'; */
 
 const trace = makeTracer('DeployPriceFeed', true);
@@ -89,7 +92,7 @@ export const ensureOracleBrand = async (
  *   PromiseSpaceOf<{ retiredContractInstances: MapStore<string, Instance> }>} powers
  * @param {{
  *   AGORIC_INSTANCE_NAME: string;
- *   contractTerms: import('@agoric/inter-protocol/src/price/fluxAggregatorKit.js').ChainlinkConfig;
+ *   contractTerms: ChainlinkConfig;
  *   brandIn: Brand<'nat'>;
  *   brandOut: Brand<'nat'>;
  * }} config
@@ -176,7 +179,7 @@ const startPriceAggregatorInstance = async (
   );
   trace('added', label, 'instance to econCharter');
 
-  /** @type {import('@agoric/zoe/src/zoeService/utils.js').StartedInstanceKit<FluxStartFn>} */
+  /** @type {StartedInstanceKit<FluxStartFn>} */
   // @ts-expect-error
   const { instance, publicFacet, creatorFacet } = governedKit;
 

package/src/proposals/econ-behaviors.js

@@ -38,22 +38,28 @@ export const SECONDS_PER_WEEK = 7n * SECONDS_PER_DAY;
 /**
  * @typedef {object} PSMKit
  * @property {string} label
- * @property {Instance<import('../psm/psm.js').start>} psm
+ * @property {Instance<typeof import('../psm/psm.js').start>} psm
  * @property {Instance<
- *   import('../../../governance/src/contractGovernor.js').start
+ *   typeof import('../../../governance/src/contractGovernor.js').start
  * >} psmGovernor
  * @property {Awaited<
  *   ReturnType<
  *     Awaited<
- *       ReturnType<import('../psm/psm.js')['start']>
+ *       ReturnType<typeof import('../psm/psm.js').start>
  *     >['creatorFacet']['getLimitedCreatorFacet']
  *   >
  * >} psmCreatorFacet
- * @property {GovernorCreatorFacet<import('../../src/psm/psm.js')['start']>} psmGovernorCreatorFacet
+ * @property {GovernorCreatorFacet<
+ *   typeof import('../../src/psm/psm.js').start
+ * >} psmGovernorCreatorFacet
  * @property {AdminFacet} psmAdminFacet
  */
 
-/** @typedef {GovernanceFacetKit<import('../auction/auctioneer.js').start>} AuctioneerKit */
+/**
+ * @typedef {GovernanceFacetKit<
+ *   typeof import('../auction/auctioneer.js').start
+ * >} AuctioneerKit
+ */
 
 /**
  * @typedef {WellKnownSpaces & ChainBootstrapSpace & EconomyBootstrapSpace} EconomyBootstrapPowers
@@ -73,7 +79,7 @@ export const SECONDS_PER_WEEK = 7n * SECONDS_PER_DAY;
  *   anchorBalancePayments: MapStore<Brand, Payment<'nat'>>;
  *   econCharterKit: EconCharterStartResult;
  *   reserveKit: GovernanceFacetKit<
- *     import('../reserve/assetReserve.js')['start']
+ *     typeof import('../reserve/assetReserve.js').start
  *   >;
  *   vaultFactoryKit: GovernanceFacetKit<VFStart>;
  *   auctioneerKit: AuctioneerKit;
@@ -84,12 +90,12 @@ export const SECONDS_PER_WEEK = 7n * SECONDS_PER_DAY;
 
 /**
  * @typedef {StartedInstanceKit<
- *   import('../econCommitteeCharter.js')['start']
+ *   typeof import('../econCommitteeCharter.js').start
  * >} EconCharterStartResult
  */
 /**
  * @typedef {StartedInstanceKit<
- *   import('@agoric/governance/src/committee.js')['start']
+ *   typeof import('@agoric/governance/src/committee.js').start
  * >} CommitteeStartResult
  */
 
@@ -479,7 +485,6 @@ export const startRewardDistributor = async ({
   const instanceKit = await E(zoe).startInstance(
     feeDistributor,
     { Fee: centralIssuer },
-    // @ts-expect-error XXX
     feeDistributorTerms,
     undefined,
     'feeDistributor',