@agoric/inter-protocol 0.14.1-dev-13c169c.0 → 0.14.1-dev-72b0aa9.0

package/src/vaultFactory/vaultDirector.js

@@ -15,9 +15,6 @@ import {
 import { assertKeywordName } from '@agoric/zoe/src/cleanProposal.js';
 import {
   atomicRearrange,
-  getAmountIn,
-  getAmountOut,
-  makeRatioFromAmounts,
   makeRecorderTopic,
   provideEmptySeat,
   SubscriberShape,
@@ -87,7 +84,7 @@ const shortfallInvitationKey = 'shortfallInvitation';
  * @param {import('@agoric/zoe/src/contractSupport/recorder.js').MakeRecorderKit} makeRecorderKit
  * @param {import('@agoric/zoe/src/contractSupport/recorder.js').MakeERecorderKit} makeERecorderKit
  */
-export const prepareVaultDirector = (
+const prepareVaultDirector = (
   baggage,
   zcf,
   directorParamManager,
@@ -299,9 +296,7 @@ export const prepareVaultDirector = (
       }),
       public: M.interface('public', {
         getCollateralManager: M.call(BrandShape).returns(M.remotable()),
-        getCollaterals: M.call().returns(M.promise()),
-        getMetrics: M.call().returns(SubscriberShape),
-        getRunIssuer: M.call().returns(IssuerShape),
+        getDebtIssuer: M.call().returns(IssuerShape),
         getSubscription: M.call({ collateralBrand: BrandShape }).returns(
           SubscriberShape,
         ),
@@ -454,44 +449,10 @@ export const prepareVaultDirector = (
           /** @type {VaultManager} */
           return managerForCollateral(brandIn).getPublicFacet();
         },
-        /**
-         * @deprecated get `collaterals` list from metrics
-         */
-        async getCollaterals() {
-          // should be collateralManagers.map((vm, brand) => ({
-          return harden(
-            Promise.all(
-              [...collateralManagers.entries()].map(
-                async ([brand, managerIndex]) => {
-                  const vm = vaultManagers.get(managerIndex).self;
-                  const priceQuote = await vm.getCollateralQuote();
-                  return {
-                    brand,
-                    interestRate: vm.getGovernedParams().getInterestRate(),
-                    liquidationMargin: vm
-                      .getGovernedParams()
-                      .getLiquidationMargin(),
-                    stabilityFee: vm.getGovernedParams().getMintFee(),
-                    marketPrice: makeRatioFromAmounts(
-                      getAmountOut(priceQuote),
-                      getAmountIn(priceQuote),
-                    ),
-                  };
-                },
-              ),
-            ),
-          );
-        },
-        /** @deprecated use getPublicTopics */
-        getMetrics() {
-          return metricsKit.subscriber;
-        },
-        getRunIssuer() {
+        getDebtIssuer() {
           return debtMint.getIssuerRecord().issuer;
         },
         /**
-         * @deprecated get from the CollateralManager directly
-         *
          * subscription for the paramManager for a particular vaultManager
          *
          * @param {{ collateralBrand: Brand }} selector

package/src/vaultFactory/vaultFactory.js

@@ -13,9 +13,9 @@ import '@agoric/zoe/src/contracts/exported.js';
 
 // This contract wants to be managed by a contractGovernor, but it isn't
 // compatible with contractGovernor, since it has a separate paramManager for
-// each Vault. This requires it to manually replicate the API of contractHelper
-// to satisfy contractGovernor. It needs to return a creatorFacet with
-// { getParamMgrRetriever, getInvitation, getLimitedCreatorFacet }.
+// each VaultManager. This requires it to manually replicate the API of
+// contractHelper to satisfy contractGovernor. It needs to return a creatorFacet
+// with { getParamMgrRetriever, getInvitation, getLimitedCreatorFacet }.
 
 import { CONTRACT_ELECTORATE } from '@agoric/governance';
 import { makeParamManagerFromTerms } from '@agoric/governance/src/contractGovernance/typedParamManager.js';

package/src/vaultFactory/vaultHolder.js

@@ -3,10 +3,7 @@
  */
 import { AmountShape } from '@agoric/ertp';
 import { M, prepareExoClassKit } from '@agoric/vat-data';
-import {
-  SubscriberShape,
-  TopicsRecordShape,
-} from '@agoric/zoe/src/contractSupport/index.js';
+import { TopicsRecordShape } from '@agoric/zoe/src/contractSupport/index.js';
 import { UnguardedHelperI } from '../typeGuards.js';
 
 const { Fail } = assert;
@@ -22,7 +19,6 @@ const HolderI = M.interface('holder', {
   getCollateralAmount: M.call().returns(AmountShape),
   getCurrentDebt: M.call().returns(AmountShape),
   getNormalizedDebt: M.call().returns(AmountShape),
-  getSubscriber: M.call().returns(SubscriberShape),
   getPublicTopics: M.call().returns(TopicsRecordShape),
   makeAdjustBalancesInvitation: M.call().returns(M.promise()),
   makeCloseInvitation: M.call().returns(M.promise()),
@@ -91,10 +87,6 @@ export const prepareVaultHolder = (baggage, makeRecorderKit) => {
         },
       },
       holder: {
-        /** @deprecated use getPublicTopics */
-        getSubscriber() {
-          return this.state.topicKit.subscriber;
-        },
         getPublicTopics() {
           const { topicKit } = this.state;
           return harden({