feat(vault): number of vaults per manager in EconState

Agoric · May 5, 2022 · 8761fe1 · 8761fe1
1 parent 17e0cc5
commit 8761fe1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/packages/run-protocol/src/vaultFactory/prioritizedVaults.js b/packages/run-protocol/src/vaultFactory/prioritizedVaults.js
@@ -174,6 +174,7 @@ export const makePrioritizedVaults = (reschedulePriceCheck = () => {}) => {
     addVault,
     entries: vaults.entries,
     entriesPrioritizedGTE,
+    getSize: vaults.getSize,
     highestRatio: firstDebtRatio,
     refreshVaultPriority,
     removeVault,

diff --git a/packages/run-protocol/src/vaultFactory/vaultManager.js b/packages/run-protocol/src/vaultFactory/vaultManager.js
@@ -34,13 +34,13 @@ const trace = makeTracer('VM', false);
  *  compoundedInterest: Ratio,
  *  interestRate: Ratio,
  *  latestInterestUpdate: bigint,
+ *  liquidatorInstance?: Instance,
  * }} AssetState
  *
  * @typedef {{
  *  numVaults: number,
  *  totalCollateral: Amount<'nat'>,
  *  totalDebt: Amount<'nat'>,
- *  liquidatorInstance?: Instance,
  * }} EconState
  *
  * @typedef {{
@@ -240,12 +240,13 @@ const helperBehavior = {
       updateTime,
     );
     Object.assign(state, stateUpdates);
-    facets.helper.notify();
+    facets.helper.assetNotify();
     trace('chargeAllVaults complete');
     facets.helper.reschedulePriceCheck();
   },
 
-  notify: ({ state }) => {
+  /** @param {MethodContext} context */
+  assetNotify: ({ state }) => {
     const interestRate = state.factoryPowers
       .getGovernedParams()
       .getInterestRate();
@@ -254,7 +255,7 @@ const helperBehavior = {
       compoundedInterest: state.compoundedInterest,
       interestRate,
       latestInterestUpdate: state.latestInterestUpdate,
-      totalDebt: state.totalDebt,
+      // XXX move to EconState and type as present with null
       liquidatorInstance: state.liquidatorInstance,
     });
     state.assetUpdater.updateState(payload);
@@ -521,7 +522,7 @@ const selfBehavior = {
    * @param {MethodContext} context
    * @param {ZCFSeat} seat
    */
-  makeVaultKit: async ({ state, facets: { manager } }, seat) => {
+  makeVaultKit: async ({ state, facets: { helper, manager } }, seat) => {
     const { prioritizedVaults, zcf } = state;
     assertProposalShape(seat, {
       give: { Collateral: null },
@@ -545,6 +546,7 @@ const selfBehavior = {
         vaultKit.vault.getCollateralAmount(),
       );
       seat.exit();
+      helper.econNotify();
       return vaultKit;
     } catch (err) {
       // remove it from prioritizedVaults
@@ -594,7 +596,7 @@ const selfBehavior = {
     });
     state.liquidatorInstance = instance;
     state.liquidator = creatorFacet;
-    facets.helper.notify();
+    facets.helper.assetNotify();
   },
 
   /** @param {MethodContext} context */