fixup(liquidationVisibility): Rebase fixes

Refs: #35
Jorge-Lopes · Jul 15, 2024 · 95f8c8e · 95f8c8e
1 parent 3699de9
commit 95f8c8e
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 14 deletions.
diff --git a/packages/inter-protocol/src/vaultFactory/types-ambient.js b/packages/inter-protocol/src/vaultFactory/types-ambient.js
@@ -13,7 +13,38 @@
  * @import {Timestamp} from '@agoric/time'
  * @import {TimestampRecord} from '@agoric/time'
  * @import {RelativeTime} from '@agoric/time'
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
  * @typedef {import('./liquidation.js').VaultData} VaultData
+ *
  * @typedef {import('./proceeds.js').DistributionPlan} DistributionPlan
  */
 
@@ -142,6 +173,7 @@
  *   vaultsInPlan: Array | undefined;
  * }} PostAuctionParams
  *
+ *
  * @typedef {{
  *   plan: DistributionPlan | undefined;
  *   totalCollateral: Amount<'nat'>;
@@ -151,7 +183,6 @@
  */
 
 /**
- *
  * @typedef {object} LiquidationVisibilityWriters
  * @property {(vaultData: VaultData) => Promise<void>} writePreAuction
  * @property {(postAuctionParams: PostAuctionParams) => Promise<void>} writePostAuction

diff --git a/packages/inter-protocol/src/vaultFactory/vaultManager.js b/packages/inter-protocol/src/vaultFactory/vaultManager.js
@@ -65,7 +65,6 @@ import { calculateMinimumCollateralization, minimumPrice } from './math.js';
 import { makePrioritizedVaults } from './prioritizedVaults.js';
 import { Phase, prepareVault } from './vault.js';
 import { calculateDistributionPlan } from './proceeds.js';
-import { AuctionPFShape } from '../auction/auctioneer.js';
 
 /**
  * @import {Baggage} from '@agoric/vat-data';
@@ -175,13 +174,13 @@ export const watchQuoteNotifier = async (notifierP, watcher, ...args) => {
 
 /**
  * @typedef {{
- *   assetTopicKit: import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<AssetState>,
- *   debtBrand: Brand<'nat'>,
- *   liquidatingVaults: SetStore<Vault>,
- *   metricsTopicKit: import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<MetricsNotification>,
- *   poolIncrementSeat: ZCFSeat,
- *   retainedCollateralSeat: ZCFSeat,
- *   unsettledVaults: MapStore<string, Vault>,
+ *   assetTopicKit: import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<AssetState>;
+ *   debtBrand: Brand<'nat'>;
+ *   liquidatingVaults: SetStore<Vault>;
+ *   metricsTopicKit: import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<MetricsNotification>;
+ *   poolIncrementSeat: ZCFSeat;
+ *   retainedCollateralSeat: ZCFSeat;
+ *   unsettledVaults: MapStore<string, Vault>;
  * }} ImmutableState
  */
 
@@ -214,14 +213,15 @@ export const watchQuoteNotifier = async (notifierP, watcher, ...args) => {
 
 /**
  * @typedef {{
- *   error: string
+ *   error: string;
  * }} DistributionError
  *
  * @typedef {(
  *   | string
  *   | { collateralAmount: Amount<'nat'>; debtAmount: Amount<'nat'> }
  * )[][]} PreAuctionState
  *
+ *
  * @typedef {(string | { phase: string })[][]} PostAuctionState
  *
  * @typedef {{
@@ -236,10 +236,15 @@ export const watchQuoteNotifier = async (notifierP, watcher, ...args) => {
  *   startTime?: import('@agoric/time/src/types.js').TimestampRecord | null;
  * }} AuctionResultState
  *
+ *
  * @typedef {{
  *   preAuctionRecorderKit: import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<PreAuctionState>;
- *   postAuctionRecorderKit: import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<PostAuctionState | DistributionError>;
- *   auctionResultRecorderKit: import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<AuctionResultState | DistributionError>;
+ *   postAuctionRecorderKit: import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<
+ *     PostAuctionState | DistributionError
+ *   >;
+ *   auctionResultRecorderKit: import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<
+ *     AuctionResultState | DistributionError
+ *   >;
  * }} LiquidationRecorderKits
  */
 
@@ -430,7 +435,7 @@ export const prepareVaultManagerKit = (
         start() {
           const { state, facets } = this;
           trace(state.collateralBrand, 'helper.start()', state.vaultCounter);
-          const { collateralBrand, unsettledVaults } = state;
+          const { collateralBrand, unsettledVaults, storageNode } = state;
 
           const ephemera = collateralEphemera(collateralBrand);
           ephemera.prioritizedVaults = makePrioritizedVaults(unsettledVaults);
@@ -790,7 +795,6 @@ export const prepareVaultManagerKit = (
         },
 
         /**
-         *
          * @param {LiquidationVisibilityWriters} liquidationVisibilityWriters
          * @returns {boolean}
          */