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

package/src/proposals/addAssetToVault.js

@@ -1,17 +1,11 @@
-// @jessie-check
 // @ts-check
 
-import { q } from '@endo/errors';
-import { ToFarFunction } from '@endo/captp';
-import { Far } from '@endo/marshal';
 import { AmountMath, AssetKind } from '@agoric/ertp';
+import { parseRatio } from '@agoric/ertp/src/ratio.js';
 import { deeplyFulfilledObject } from '@agoric/internal';
+import { Stable } from '@agoric/internal/src/tokens.js';
 import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
-import { parseRatio } from '@agoric/ertp/src/ratio.js';
 import { E } from '@endo/far';
-import { Stable } from '@agoric/internal/src/tokens.js';
-import { TimeMath } from '@agoric/time/src/timeMath.js';
-import { makePromiseKit } from '@endo/promise-kit';
 
 import {
   oracleBrandFeedName,
@@ -34,7 +28,14 @@ export * from './startPSM.js';
  * @property {number} [initialPrice]
  */
 
-/** @import {EconomyBootstrapPowers} from './econ-behaviors.js' */
+/**
+ * @import {EconomyBootstrapPowers} from './econ-behaviors.js'
+ * @import {TimerService} from '@agoric/time';
+ * @import {Issuer, IssuerKit} from '@agoric/ertp';
+ * @import {prepare} from '@agoric/zoe/src/contracts/scaledPriceAuthority.js';
+ * @import {BootstrapPowers} from '@agoric/vats/src/core/types.js';
+ * @import {StartedInstanceKit} from '@agoric/zoe/src/zoeService/utils.js';
+ */
 
 /**
  * @param {BootstrapPowers} powers
@@ -124,7 +125,7 @@ export const publishInterchainAssetFromBank = async (
 };
 
 /**
- * @param {BootstrapPowers} powers
+ * @param {EconomyBootstrapPowers} powers
  * @param {object} config
  * @param {object} config.options
  * @param {InterchainAssetOptions} config.options.interchainAssetOptions
@@ -216,6 +217,7 @@ export const startScaledPriceAuthority = async (
 
   const label = scaledPriceFeedName(issuerName);
 
+  /** @type {StartedInstanceKit<prepare>} */
   const spaKit = await E(startUpgradable)({
     installation: scaledPriceAuthority,
     label,
@@ -223,7 +225,6 @@ export const startScaledPriceAuthority = async (
   });
 
   await E(priceAuthorityAdmin).registerPriceAuthority(
-    // @ts-expect-error The public facet should have getPriceAuthority
     E(spaKit.publicFacet).getPriceAuthority(),
     interchainBrand,
     stableBrand,
@@ -234,7 +235,7 @@ export const startScaledPriceAuthority = async (
 };
 
 /**
- * @param {BootstrapPowers} powers
+ * @param {EconomyBootstrapPowers} powers
  * @param {object} config
  * @param {object} config.options
  */
@@ -251,77 +252,8 @@ export const registerScaledPriceAuthority = async (powers, { options }) => {
 
   // publish into agoricNames so that others can await its presence.
   // This must stay after registerPriceAuthority above so it's evidence of registration.
-  // eslint-disable-next-line no-restricted-syntax -- computed property
-  produceInstance[label].resolve(spaKit.instance);
-};
-
-// wait a short while after end to allow things to settle
-const BUFFER = 5n * 60n;
-// let's insist on 20 minutes leeway for running the scripts
-const COMPLETION = 20n * 60n;
 
-/**
- * This function works around an issue identified in #8307 and #8296, and fixed
- * in #8301. The fix is needed until #8301 makes it into production.
- *
- * If there is a liveSchedule, 1) run now if start is far enough away,
- * otherwise, 2) run after endTime. If neither liveSchedule nor nextSchedule is
- * 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 {() => void} thunk
- */
-const whenQuiescent = async (schedules, timer, thunk) => {
-  const { nextAuctionSchedule, liveAuctionSchedule } = schedules;
-  const now = await E(timer).getCurrentTimestamp();
-
-  const waker = Far('addAssetWaker', { wake: () => thunk() });
-
-  if (liveAuctionSchedule) {
-    const safeStart = TimeMath.subtractAbsRel(
-      liveAuctionSchedule.startTime,
-      COMPLETION,
-    );
-
-    if (TimeMath.compareAbs(safeStart, now) < 0) {
-      // case 2
-      console.warn(
-        `Add Asset after live schedule's endtime: ${q(
-          liveAuctionSchedule.endTime,
-        )}`,
-      );
-
-      return E(timer).setWakeup(
-        TimeMath.addAbsRel(liveAuctionSchedule.endTime, BUFFER),
-        waker,
-      );
-    }
-  }
-
-  if (!liveAuctionSchedule && nextAuctionSchedule) {
-    const safeStart = TimeMath.subtractAbsRel(
-      nextAuctionSchedule.startTime,
-      COMPLETION,
-    );
-    if (TimeMath.compareAbs(safeStart, now) < 0) {
-      // case 5
-      console.warn(
-        `Add Asset after next schedule's endtime: ${q(
-          nextAuctionSchedule.endTime,
-        )}`,
-      );
-      return E(timer).setWakeup(
-        TimeMath.addAbsRel(nextAuctionSchedule.endTime, BUFFER),
-        waker,
-      );
-    }
-  }
-
-  // cases 1, 3, and 4 fall through to here.
-  console.warn(`Add Asset immediately`, thunk);
-  return thunk();
+  produceInstance[label].resolve(spaKit.instance);
 };
 
 /**
@@ -334,12 +266,7 @@ const whenQuiescent = async (schedules, timer, thunk) => {
  */
 export const addAssetToVault = async (
   {
-    consume: {
-      vaultFactoryKit,
-      agoricNamesAdmin,
-      auctioneerKit,
-      chainTimerService,
-    },
+    consume: { vaultFactoryKit, agoricNamesAdmin },
     brand: {
       consume: { [Stable.symbol]: stableP },
     },
@@ -370,25 +297,11 @@ export const addAssetToVault = async (
   );
 
   // don't add the collateral offering to vaultFactory until its price feed is available
-  // eslint-disable-next-line no-restricted-syntax -- allow this computed property
+
   await consumeInstance[oracleBrandFeedName(oracleBrand, 'USD')];
   // await also the negotiable brand
-  // eslint-disable-next-line no-restricted-syntax -- allow this computed property
-  await consumeInstance[scaledPriceFeedName(issuerName)];
-
-  const auctioneerCreator = E.get(auctioneerKit).creatorFacet;
-  const schedules = await E(auctioneerCreator).getSchedule();
 
-  const finishPromiseKit = makePromiseKit();
-  const addBrandThenResolve = ToFarFunction('addBrandThenResolve', async () => {
-    await E(auctioneerCreator).addBrand(interchainIssuer, keyword);
-    finishPromiseKit.resolve(undefined);
-  });
-
-  // schedules actions on a timer (or does it immediately).
-  // finishPromiseKit signals completion.
-  void whenQuiescent(schedules, chainTimerService, addBrandThenResolve);
-  await finishPromiseKit.promise;
+  await consumeInstance[scaledPriceFeedName(issuerName)];
 
   const stable = await stableP;
   const vaultFactoryCreator = E.get(vaultFactoryKit).creatorFacet;
@@ -460,7 +373,6 @@ export const getManifestForAddAssetToVault = (
       },
       [addAssetToVault.name]: {
         consume: {
-          auctioneerKit: 'auctioneer',
           vaultFactoryKit: 'vaultFactory',
           agoricNamesAdmin: true,
           chainTimerService: true,

package/src/proposals/committee-proposal.js

@@ -2,6 +2,12 @@ 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';
+ * @import {Invitation} from '@agoric/zoe';
+ */
+
 const { values } = Object;
 
 /** @type {<X, Y>(xs: X[], ys: Y[]) => [X, Y][]} */
@@ -10,7 +16,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 +57,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 +78,7 @@ export const startEconCharter = async ({
     }),
   );
 
-  /** @type {Promise<import('./econ-behaviors.js').EconCharterStartResult>} */
+  /** @type {Promise<EconCharterStartResult>} */
   const startResult = E(zoe).startInstance(
     charterInstall,
     undefined,
@@ -88,12 +94,12 @@ 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 },
+  consume: { reserveKit, vaultFactoryKit, econCharterKit },
   instance: {
-    consume: { reserve, VaultFactory, auctioneer },
+    consume: { reserve, VaultFactory },
   },
 }) => {
   const { creatorFacet } = E.get(econCharterKit);
@@ -110,11 +116,6 @@ export const addGovernorsToEconCharter = async ({
         instanceP: VaultFactory,
         facetP: E.get(vaultFactoryKit).governorCreatorFacet,
       },
-      {
-        label: 'auctioneer',
-        instanceP: auctioneer,
-        facetP: E.get(auctioneerKit).governorCreatorFacet,
-      },
     ].map(async ({ label, instanceP, facetP }) => {
       const [instance, govFacet] = await Promise.all([instanceP, facetP]);
 
@@ -126,7 +127,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 (
@@ -175,7 +176,6 @@ export const getManifestForInviteCommittee = async (
       },
       [addGovernorsToEconCharter.name]: {
         consume: {
-          auctioneerKit: t,
           econCharterKit: t,
           zoe: t,
           agoricNames: t,
@@ -188,7 +188,7 @@ export const getManifestForInviteCommittee = async (
           consume: { binaryVoteCounter: t },
         },
         instance: {
-          consume: { auctioneer: t, reserve: t, VaultFactory: t },
+          consume: { reserve: t, VaultFactory: t },
         },
       },
       [inviteToEconCharter.name]: {

package/src/proposals/core-proposal.js

@@ -1,9 +1,15 @@
-// @jessie-check
-
 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';
+ * @import {Instance} from '@agoric/zoe';
+ * @import {MapStore} from '@agoric/store';
+ */
+
 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,
@@ -21,7 +27,6 @@ export const storeInterContractStartKits = async ({
     econCharterKit,
     economicCommitteeKit,
     feeDistributorKit,
-    auctioneerKit,
     reserveKit,
     vaultFactoryKit,
   },
@@ -43,16 +48,12 @@ export const storeInterContractStartKits = async ({
     econCharterKit,
     feeDistributorKit,
   ]);
-  await storeAll(governedContractKits, [
-    auctioneerKit,
-    reserveKit,
-    vaultFactoryKit,
-  ]);
+  await storeAll(governedContractKits, [reserveKit, vaultFactoryKit]);
 };
 
-/** @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',
@@ -64,7 +65,6 @@ const SHARED_MAIN_MANIFEST = harden({
       priceAuthority: 'priceAuthority',
       economicCommitteeCreatorFacet: 'economicCommittee',
       reserveKit: 'reserve',
-      auctioneerKit: 'auction',
     },
     produce: { vaultFactoryKit: 'VaultFactory' },
     brand: { consume: { [Stable.symbol]: 'zoe' } },
@@ -78,7 +78,6 @@ const SHARED_MAIN_MANIFEST = harden({
     instance: {
       consume: {
         reserve: 'reserve',
-        auctioneer: 'auction',
       },
       produce: {
         VaultFactory: 'VaultFactory',
@@ -118,28 +117,6 @@ const SHARED_MAIN_MANIFEST = harden({
     },
   },
 
-  [econBehaviors.startAuctioneer.name]: {
-    consume: {
-      zoe: 'zoe',
-      board: 'board',
-      chainTimerService: 'timer',
-      priceAuthority: 'priceAuthority',
-      chainStorage: true,
-      economicCommitteeCreatorFacet: 'economicCommittee',
-    },
-    produce: { auctioneerKit: 'auction' },
-    instance: {
-      produce: { auctioneer: 'auction' },
-      consume: { reserve: 'auction' },
-    },
-    installation: {
-      consume: { contractGovernor: 'zoe', auctioneer: 'zoe' },
-    },
-    issuer: {
-      consume: { [Stable.symbol]: 'zoe' },
-    },
-  },
-
   [storeInterContractStartKits.name]: {
     consume: {
       contractKits: true,
@@ -147,7 +124,6 @@ const SHARED_MAIN_MANIFEST = harden({
       econCharterKit: true,
       economicCommitteeKit: true,
       feeDistributorKit: true,
-      auctioneerKit: true,
       reserveKit: true,
       vaultFactoryKit: true,
     },
@@ -205,7 +181,6 @@ export const getManifestForMain = (
     manifest: SHARED_MAIN_MANIFEST,
     installations: {
       VaultFactory: restoreRef(installKeys.vaultFactory),
-      auctioneer: restoreRef(installKeys.auctioneer),
       feeDistributor: restoreRef(installKeys.feeDistributor),
       reserve: restoreRef(installKeys.reserve),
     },

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

@@ -23,8 +23,16 @@ 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 {Installation, Instance} from '@agoric/zoe';
+ * @import {Brand} from '@agoric/ertp';
+ * @import {MapStore} from '@agoric/store';
+ * @import {NamedVatPowers} from '@agoric/vats/src/core/types.js';
+ * @import {PromiseSpaceOf} from '@agoric/vats/src/core/types.js';
+ */
 /** @import {FluxStartFn} from '@agoric/inter-protocol/src/price/fluxAggregatorContract.js'; */
 
 const trace = makeTracer('DeployPriceFeed', true);
@@ -89,7 +97,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 +184,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;
 
@@ -284,7 +292,6 @@ export const deployPriceFeeds = async (powers, config) => {
     );
   }
 
-  // @ts-expect-error replaceScaledPriceAuthorities uses a subset of the powers.
   await replaceScaledPriceAuthorities(powers, {
     options: { scaledPARef },
   });