@agoric/inter-protocol 0.16.1-dev-13050c2.0 → 0.16.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.16.1-dev-13050c2.0+13050c2",
+  "version": "0.16.1",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -10,7 +10,6 @@
   "scripts": {
     "build": "yarn build:bundles",
     "build:bundles": "node ./scripts/build-bundles.js",
-    "build:add-STARS-proposal": "agoric run scripts/add-STARS.js",
     "test": "ava",
     "test:c8": "c8 $C8_OPTIONS ava --config=ava-nesm.config.js",
     "test:xs": "exit 0",
@@ -30,29 +29,29 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-13050c2.0+13050c2",
-    "@agoric/ertp": "0.16.3-dev-13050c2.0+13050c2",
-    "@agoric/governance": "0.10.3-dev-13050c2.0+13050c2",
-    "@agoric/internal": "0.3.3-dev-13050c2.0+13050c2",
-    "@agoric/notifier": "0.6.3-dev-13050c2.0+13050c2",
-    "@agoric/store": "0.9.3-dev-13050c2.0+13050c2",
-    "@agoric/time": "0.3.3-dev-13050c2.0+13050c2",
-    "@agoric/vat-data": "0.5.3-dev-13050c2.0+13050c2",
-    "@agoric/vats": "0.15.1-dev-13050c2.0+13050c2",
-    "@agoric/zoe": "0.26.3-dev-13050c2.0+13050c2",
+    "@agoric/assert": "^0.6.0",
+    "@agoric/ertp": "^0.16.2",
+    "@agoric/governance": "^0.10.3",
+    "@agoric/internal": "^0.3.2",
+    "@agoric/notifier": "^0.6.2",
+    "@agoric/store": "^0.9.2",
+    "@agoric/time": "^0.3.2",
+    "@agoric/vat-data": "^0.5.2",
+    "@agoric/vats": "^0.15.1",
+    "@agoric/zoe": "^0.26.2",
     "@endo/captp": "^3.1.1",
     "@endo/eventual-send": "^0.17.2",
     "@endo/far": "^0.2.18",
     "@endo/marshal": "^0.8.5",
     "@endo/nat": "^4.1.27",
-    "agoric": "0.21.1-dev-13050c2.0+13050c2",
+    "agoric": "^0.21.1",
     "jessie.js": "^0.3.2"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.10.3-dev-13050c2.0+13050c2",
-    "@agoric/smart-wallet": "0.5.3-dev-13050c2.0+13050c2",
-    "@agoric/swingset-liveslots": "0.10.3-dev-13050c2.0+13050c2",
-    "@agoric/swingset-vat": "0.32.3-dev-13050c2.0+13050c2",
+    "@agoric/deploy-script-support": "^0.10.3",
+    "@agoric/smart-wallet": "^0.5.3",
+    "@agoric/swingset-liveslots": "^0.10.2",
+    "@agoric/swingset-vat": "^0.32.2",
     "@endo/bundle-source": "^2.5.1",
     "@endo/init": "^0.5.56",
     "@endo/promise-kit": "^0.2.56",
@@ -80,5 +79,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "13050c28e9a154e188cff8f1d08c704a4c7ca26a"
+  "gitHead": "ba3b776444425bbcb275ce918794d9259f8e15da"
 }

package/src/auction/scheduler.js

@@ -149,7 +149,18 @@ export const makeScheduler = async (
       auctionState = AuctionState.WAITING;
       auctionDriver.finalize();
 
-      if (!nextSchedule) {
+      if (nextSchedule) {
+        // only recalculate the next schedule at this point if the lock time has
+        // not been reached.
+        const nextLock = nextSchedule.lockTime;
+        if (nextLock && TimeMath.compareAbs(now, nextLock) < 0) {
+          const afterNow = TimeMath.addAbsRel(
+            now,
+            TimeMath.coerceRelativeTimeRecord(1n, timerBrand),
+          );
+          nextSchedule = safelyComputeRoundTiming(params, afterNow);
+        }
+      } else {
         console.error(
           '🛠️ finishAuctionRound without scheduling the next; repair with new auctioneer params',
         );
@@ -322,7 +333,6 @@ export const makeScheduler = async (
       // NB: may be fired with the initial params as well
       async updateState(_newState) {
         trace('received param update', _newState);
-        await null;
         if (!nextSchedule) {
           trace('repairing nextSchedule and restarting');
           ({ nextSchedule } = await initializeNextSchedule());

package/src/price/fluxAggregatorContract.js

@@ -131,8 +131,10 @@ export const prepare = async (zcf, privateArgs, baggage) => {
       addr,
       [invitation],
     );
-    await (highPrioritySendersManager &&
-      E(highPrioritySendersManager).add(description, addr));
+    if (highPrioritySendersManager) {
+      // eslint-disable-next-line @jessie.js/no-nested-await -- after another await
+      await E(highPrioritySendersManager).add(description, addr);
+    }
     return `added ${addr}`;
   };
 
@@ -144,8 +146,10 @@ export const prepare = async (zcf, privateArgs, baggage) => {
   const removeOracle = async addr => {
     trace('removeOracle', addr);
     await E(faKit.creator).removeOracle(addr);
-    await (highPrioritySendersManager &&
-      E(highPrioritySendersManager).remove(description, addr));
+    if (highPrioritySendersManager) {
+      // eslint-disable-next-line @jessie.js/no-nested-await -- after another await
+      await E(highPrioritySendersManager).remove(description, addr);
+    }
     return `removed ${addr}`;
   };
 

package/src/proposals/addAssetToVault.js

@@ -1,12 +1,11 @@
 // @jessie-check
 
 import { AmountMath, AssetKind } from '@agoric/ertp';
+import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
 import { deeplyFulfilledObject } from '@agoric/internal';
 import { Stable } from '@agoric/vats/src/tokens.js';
-import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
-import { parseRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
 import { E } from '@endo/far';
-import { instanceNameFor } from './price-feed-proposal.js';
+import { parseRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
 import { reserveThenGetNames } from './utils.js';
 
 export * from './startPSM.js';
@@ -220,7 +219,6 @@ export const addAssetToVault = async (
     brand: {
       consume: { [Stable.symbol]: stableP },
     },
-    instance: { consume: consumeInstance },
   },
   {
     options: {
@@ -241,11 +239,6 @@ export const addAssetToVault = async (
     [keyword],
   );
 
-  const oracleInstanceName = instanceNameFor(oracleBrand, 'USD');
-  // 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[oracleInstanceName];
-
   const stable = await stableP;
   const vaultFactoryCreator = E.get(vaultFactoryKit).creatorFacet;
   await E(vaultFactoryCreator).addVaultType(interchainIssuer, oracleBrand, {
@@ -328,11 +321,6 @@ export const getManifestForAddAssetToVault = (
         brand: {
           consume: { [Stable.symbol]: true },
         },
-        instance: {
-          // allow any instance because the AGORIC_INSTANCE_NAME of
-          // priceFeedOptions cannot be known statically.
-          consume: true,
-        },
       },
     },
     installations: {

package/src/proposals/price-feed-proposal.js

@@ -1,10 +1,10 @@
 // @ts-nocheck -- lots of type errors. low prio b/c proposals are like scripts
-import { makeTracer } from '@agoric/internal';
+import { E } from '@endo/far';
 import {
-  assertPathSegment,
   makeStorageNodeChild,
+  assertPathSegment,
 } from '@agoric/internal/src/lib-chainStorage.js';
-import { E } from '@endo/far';
+import { makeTracer } from '@agoric/internal';
 
 import { unitAmount } from '@agoric/zoe/src/contractSupport/priceQuote.js';
 import { reserveThenDeposit, reserveThenGetNames } from './utils.js';
@@ -18,9 +18,6 @@ const sanitizePathSegment = name => {
   return candidate;
 };
 
-export const instanceNameFor = (inBrandName, outBrandName) =>
-  `${inBrandName}-${outBrandName} price feed`;
-
 /**
  * @typedef {{
  * brandIn?: ERef<Brand<'nat'> | undefined>,
@@ -65,6 +62,7 @@ export const ensureOracleBrands = async (
     let b = await brand;
     if (!b) {
       // not 1st await
+      // eslint-disable-next-line @jessie.js/no-nested-await
       b = await E(agoricNames).provideInertBrand(
         name,
         harden({ decimalPlaces: parseInt(decimals, 10) }),
@@ -98,7 +96,6 @@ export const createPriceFeed = async (
       priceAuthorityAdmin,
       startGovernedUpgradable,
     },
-    instance: { produce: produceInstance },
   },
   {
     options: {
@@ -164,27 +161,11 @@ export const createPriceFeed = async (
     installation: priceAggregator,
   });
 
-  // Publish price feed in home.priceAuthority.
-  const forceReplace = true;
-  // Make sure this PA is registered before sharing the instance in agoricNames,
-  // which allows contracts that depend on the registry value to wait for it and
-  // prevent a race.
-  await E(priceAuthorityAdmin).registerPriceAuthority(
-    E(faKit.publicFacet).getPriceAuthority(),
-    brandIn,
-    brandOut,
-    forceReplace,
-  );
-
-  await E(E(agoricNamesAdmin).lookupAdmin('instance'))
+  E(E(agoricNamesAdmin).lookupAdmin('instance'))
     .update(AGORIC_INSTANCE_NAME, faKit.instance)
     .catch(err =>
       console.error(`🚨 failed to update ${AGORIC_INSTANCE_NAME}`, err),
     );
-  // being after the above awaits means that when this resolves, the consumer
-  // gets notified that the authority is in the registry and its instance is in
-  // agoricNames.
-  produceInstance[AGORIC_INSTANCE_NAME].resolve(faKit.instance);
 
   E(E.get(econCharterKit).creatorFacet).addInstance(
     faKit.instance,
@@ -193,6 +174,15 @@ export const createPriceFeed = async (
   );
   trace('registered', AGORIC_INSTANCE_NAME, faKit.instance);
 
+  // Publish price feed in home.priceAuthority.
+  const forceReplace = true;
+  void E(priceAuthorityAdmin).registerPriceAuthority(
+    E(faKit.publicFacet).getPriceAuthority(),
+    brandIn,
+    brandOut,
+    forceReplace,
+  );
+
   /**
    * Initialize a new oracle and send an invitation to administer it.
    *
@@ -242,9 +232,6 @@ export const getManifestForPriceFeed = async (
         priceAuthorityAdmin: t,
         startGovernedUpgradable: t,
       },
-      instance: {
-        produce: t,
-      },
     },
     [ensureOracleBrands.name]: {
       namedVat: {
@@ -256,7 +243,6 @@ export const getManifestForPriceFeed = async (
     },
   },
   installations: {
-    // ??? will every eval of price-feed-proposal install priceAggregator ?
     priceAggregator: restoreRef(priceFeedOptions.priceAggregatorRef),
   },
   options: {
@@ -317,7 +303,7 @@ export const startPriceFeeds = async (
     {
       options: {
         priceFeedOptions: {
-          AGORIC_INSTANCE_NAME: instanceNameFor(inBrandName, outBrandName),
+          AGORIC_INSTANCE_NAME: `${inBrandName}-${outBrandName} price feed`,
           contractTerms: {
             minSubmissionCount: 2,
             minSubmissionValue: 1,

package/src/proposals/startPSM.js

@@ -363,25 +363,23 @@ export const makeAnchorAsset = async (
     slotToBoardRemote,
   );
   const metricsKey = `${stablePsmKey}.${keyword}.metrics`;
-  const maybeReviveMetrics = async () => {
-    if (!toSlotReviver.has(metricsKey)) {
-      return;
-    }
+  if (toSlotReviver.has(metricsKey)) {
     const metrics = toSlotReviver.getItem(metricsKey);
     produceAnchorBalancePayments.resolve(
       makeScalarBigMapStore('Anchor balance payments', { durable: true }),
     );
     // XXX this rule should only apply to the 1st await
+    // eslint-disable-next-line @jessie.js/no-nested-await
     const anchorPaymentMap = await anchorBalancePayments;
 
     // TODO: validate that `metrics.anchorPoolBalance.value` is
     // pass-by-copy PureData (e.g., contains no remotables).
+    // eslint-disable-next-line @jessie.js/no-nested-await
     const pmt = await E(mint).mintPayment(
       AmountMath.make(brand, metrics.anchorPoolBalance.value),
     );
     anchorPaymentMap.init(brand, pmt);
-  };
-  await maybeReviveMetrics();
+  }
 
   await Promise.all([
     E(E(agoricNamesAdmin).lookupAdmin('issuer')).update(keyword, kit.issuer),

package/src/reserve/assetReserve.js

@@ -66,11 +66,11 @@ export const prepare = async (zcf, privateArgs, baggage) => {
   };
   trace('awaiting takeFeeMint');
   const feeMint = await takeFeeMint();
-  const storageNode = await privateArgs.storageNode;
   const makeAssetReserveKit = await prepareAssetReserveKit(baggage, {
     feeMint,
     makeRecorderKit,
-    storageNode,
+    // eslint-disable-next-line @jessie.js/no-nested-await -- spurious
+    storageNode: await privateArgs.storageNode,
     zcf,
   });
 

package/src/vaultFactory/vaultDirector.js

@@ -250,7 +250,6 @@ const prepareVaultDirector = (
     metrics: makeRecorderTopic('Vault Factory metrics', metricsKit),
   });
 
-  /** @param {(vm: VaultManager) => void} fn */
   const allManagersDo = fn => {
     for (const managerIndex of collateralManagers.values()) {
       const vm = vaultManagers.get(managerIndex).self;
@@ -425,7 +424,6 @@ const prepareVaultDirector = (
 
         makeLiquidationWaker() {
           return makeWaker('liquidationWaker', _timestamp => {
-            // XXX floating promise
             allManagersDo(vm => vm.liquidateVaults(auctioneer));
           });
         },

package/src/vaultFactory/vaultManager.js

@@ -400,7 +400,7 @@ export const prepareVaultManagerKit = (
           // throw. See https://github.com/Agoric/agoric-sdk/issues/4317
           void observeNotifier(quoteNotifier, {
             updateState(value) {
-              trace('storing new quote', value.quoteAmount.value);
+              trace('vaultManager got new collateral quote', value);
               ephemera.storedCollateralQuote = value;
             },
             fail(reason) {
@@ -963,6 +963,7 @@ export const prepareVaultManagerKit = (
 
           try {
             // TODO `await` is allowed until the above ordering is fixed
+            // eslint-disable-next-line @jessie.js/no-nested-await
             const vaultKit = await vault.initVaultKit(seat, vaultStorageNode);
             // initVaultKit calls back to handleBalanceChange() which will add the
             // vault to prioritizedVaults
@@ -1036,7 +1037,7 @@ export const prepareVaultManagerKit = (
           if (!storedCollateralQuote)
             throw Fail`lockOraclePrices called before a collateral quote was available`;
           trace(
-            `lockOraclePrices`,
+            `lockPrice`,
             getAmountIn(storedCollateralQuote),
             getAmountOut(storedCollateralQuote),
           );
@@ -1046,7 +1047,7 @@ export const prepareVaultManagerKit = (
           return storedCollateralQuote;
         },
         /**
-         * @param {ERef<AuctioneerPublicFacet>} auctionPF
+         * @param {AuctioneerPublicFacet} auctionPF
          */
         async liquidateVaults(auctionPF) {
           const { state, facets } = this;
@@ -1060,19 +1061,11 @@ export const prepareVaultManagerKit = (
           } = state;
           trace(collateralBrand, 'considering liquidation');
 
-          if (!lockedQuote) {
-            // By design, the first cycle of auction may call this before a quote is locked
-            // because the schedule is global at the vaultDirector level, and if a manager
-            // starts after the price lock time there's nothing to be done.
-            // NB: this message should not log repeatedly.
-            console.error(
-              'Skipping liquidation because no quote is locked yet (may happen with new manager)',
-            );
-            return;
-          }
-
           const { prioritizedVaults } = collateralEphemera(collateralBrand);
-          prioritizedVaults || Fail`prioritizedVaults missing from ephemera`;
+          assert(factoryPowers && prioritizedVaults && zcf);
+          lockedQuote ||
+            Fail`Must have locked a quote before liquidating vaults.`;
+          assert(lockedQuote); // redundant with previous line
 
           const liqMargin = self.getGovernedParams().getLiquidationMargin();
 

package/scripts/add-STARS.js

@@ -1,43 +0,0 @@
-import { makeHelpers } from '@agoric/deploy-script-support';
-import { defaultProposalBuilder as vaultProposalBuilder } from './add-collateral-core.js';
-import { defaultProposalBuilder as oraclesProposalBuilder } from './price-feed-core.js';
-
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
-export const starsVaultProposalBuilder = async powers => {
-  return vaultProposalBuilder(powers, {
-    interchainAssetOptions: {
-      // Values for the Stargaze token on Osmosis
-      denom:
-        'ibc/987C17B11ABC2B20019178ACE62929FE9840202CE79498E29FE8E5CB02B7C0A4',
-      decimalPlaces: 6,
-      keyword: 'STARS',
-      oracleBrand: 'STARS',
-      proposedName: 'STARS',
-    },
-  });
-};
-
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
-export const starsOraclesProposalBuilder = async powers => {
-  return oraclesProposalBuilder(powers, {
-    AGORIC_INSTANCE_NAME: `STARS-USD price feed`,
-    IN_BRAND_LOOKUP: ['agoricNames', 'oracleBrand', 'STARS'],
-    IN_BRAND_DECIMALS: 6,
-    OUT_BRAND_LOOKUP: ['agoricNames', 'oracleBrand', 'USD'],
-    OUT_BRAND_DECIMALS: 4,
-    oracleAddresses: [
-      // copied from decentral-main-vaults-config.json
-      'agoric1krunjcqfrf7la48zrvdfeeqtls5r00ep68mzkr',
-      'agoric19uscwxdac6cf6z7d5e26e0jm0lgwstc47cpll8',
-      'agoric144rrhh4m09mh7aaffhm6xy223ym76gve2x7y78',
-      'agoric19d6gnr9fyp6hev4tlrg87zjrzsd5gzr5qlfq2p',
-      'agoric1n4fcxsnkxe4gj6e24naec99hzmc4pjfdccy5nj',
-    ],
-  });
-};
-
-export default async (homeP, endowments) => {
-  const { writeCoreProposal } = await makeHelpers(homeP, endowments);
-  await writeCoreProposal('add-STARS', starsVaultProposalBuilder);
-  await writeCoreProposal('add-STARS-oracles', starsOraclesProposalBuilder);
-};