Anil/back comp

packages/inter-protocol/package.json

@@ -10,6 +10,7 @@
   "scripts": {
     "build": "yarn build:bundles",
     "build:bundles": "node ./scripts/build-bundles.js",
+    "build:upgrade-vaults-proposal": "agoric run scripts/liquidation-visibility-upgrade.js",
     "test": "ava",
     "test:c8": "c8 $C8_OPTIONS ava --config=ava-nesm.config.js",
     "test:xs": "exit 0",

packages/inter-protocol/scripts/liquidation-visibility-upgrade.js

@@ -0,0 +1,40 @@
+import { makeHelpers } from '@agoric/deploy-script-support';
+import { makeInstallCache } from '../src/proposals/utils.js';
+import { getManifestVaultsUpgrade } from '../src/proposals/vaultsLiquidationVisibility.js';
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
+export const vaultsUpgradeProposalBuilder = async ({
+  publishRef,
+  install: install0,
+  wrapInstall,
+}) => {
+  const install = wrapInstall ? wrapInstall(install0) : install0;
+
+  return harden({
+    sourceSpec: '../src/proposals/vaultsLiquidationVisibility.js',
+    getManifestCall: [
+      getManifestVaultsUpgrade.name,
+      {
+        vaultFactoryRef: publishRef(
+          install(
+            '../src/vaultFactory/vaultFactory.js',
+            '../bundles/bundle-vaultFactory.js',
+          ),
+        ),
+      },
+    ],
+  });
+};
+
+export default async (homeP, endowments) => {
+  const { writeCoreProposal } = await makeHelpers(homeP, endowments);
+
+  const tool = await makeInstallCache(homeP, {
+    loadBundle: spec => import(spec),
+  });
+
+  await writeCoreProposal('upgrade-vaults-liq-visibility', opts =>
+    // @ts-expect-error XXX makeInstallCache types
+    vaultsUpgradeProposalBuilder({ ...opts, wrapInstall: tool.wrapInstall }),
+  );
+};

packages/inter-protocol/src/proposals/vaultsLiquidationVisibility.js

@@ -0,0 +1,36 @@
+import { E } from '@endo/far';
+
+export const upgradeVaultsLiquidationVisibility = async (
+  powers,
+  { options: { vaultFactoryRef } },
+) => {
+  const {
+    consume: { vaultFactoryKit: vaultFactoryKitP },
+  } = powers;
+
+  const { adminFacet, privateArgs } = await vaultFactoryKitP;
+  const result = await E(adminFacet).upgradeContract(
+    vaultFactoryRef.bundleID,
+    privateArgs,
+  );
+
+  console.log('Upgrade Resulted With: ', result);
+};
+
+/** @type { import("@agoric/vats/src/core/lib-boot").BootstrapManifest } */
+const manifest = {
+  [upgradeVaultsLiquidationVisibility.name]: {
+    // include rationale for closely-held, high authority capabilities
+    consume: {
+      vaultFactoryKit: `to upgrade vaultFactory using its adminFacet`,
+    },
+  },
+};
+harden(manifest);
+
+export const getManifestVaultsUpgrade = (_powers, { vaultFactoryRef }) => {
+  return harden({
+    manifest,
+    options: { vaultFactoryRef },
+  });
+};

packages/inter-protocol/src/vaultFactory/liquidation.js

@@ -18,6 +18,13 @@ const trace = makeTracer('LIQ');
 /** @typedef {import('@agoric/time/src/types').CancelToken} CancelToken */
 /** @typedef {import('@agoric/time/src/types').RelativeTimeRecord} RelativeTimeRecord */
 
+/**
+ * @typedef {MapStore<
+ *   Vault,
+ *   { collateralAmount: Amount<'nat'>; debtAmount: Amount<'nat'> }
+ * >} VaultData
+ */
+
 const makeCancelToken = makeCancelTokenMaker('liq');
 
 /**
@@ -261,7 +268,7 @@ export const getLiquidatableVaults = (
   const vaultsToLiquidate = prioritizedVaults.removeVaultsBelow(
     collateralizationDetails,
   );
-  /** @type {MapStore<Vault, { collateralAmount: Amount<'nat'>, debtAmount:  Amount<'nat'>}>} */
+  /** @type {VaultData} */
   const vaultData = makeScalarMapStore();
 
   const { zcfSeat: liqSeat } = zcf.makeEmptySeatKit();

packages/inter-protocol/src/vaultFactory/types.js

@@ -11,8 +11,11 @@
  * @typedef {import('../auction/auctioneer.js').AuctioneerPublicFacet} AuctioneerPublicFacet
  * @typedef {import('./vaultFactory.js').VaultFactoryContract['publicFacet']} VaultFactoryPublicFacet
  *
- * @typedef {import('@agoric/time/src/types').Timestamp} Timestamp
- * @typedef {import('@agoric/time/src/types').RelativeTime} RelativeTime
+ * @typedef {import('@agoric/time').Timestamp} Timestamp
+ *
+ * @typedef {import('@agoric/time/src/types.js').TimestampRecord} TimestampRecord
+ *
+ * @typedef {import('@agoric/time').RelativeTime} RelativeTime
  */
 
 /**
@@ -132,3 +135,26 @@
  */
 
 /** @typedef {{key: 'governedParams' | {collateralBrand: Brand}}} VaultFactoryParamPath */
+
+/**
+ * @typedef {{
+ *   plan: import('./proceeds.js').DistributionPlan;
+ *   vaultsInPlan: Array;
+ * }} PostAuctionParams
+ *
+ * @typedef {{
+ *   plan: import('./proceeds.js').DistributionPlan;
+ *   totalCollateral: Amount<'nat'>;
+ *   totalDebt: Amount<'nat'>;
+ *   auctionSchedule: import('../auction/scheduler.js').FullSchedule;
+ * }} AuctionResultsParams
+ */
+
+/**
+ * @typedef {import('./liquidation.js').VaultData} VaultData
+ *
+ * @typedef {object} LiquidationVisibilityWriters
+ * @property {(vaultData: VaultData) => Promise<void>} writePreAuction
+ * @property {(postAuctionParams: PostAuctionParams) => Promise<void>} writePostAuction
+ * @property {(auctionResultParams: AuctionResultsParams) => Promise<void>} writeAuctionResults
+ */

packages/inter-protocol/src/vaultFactory/vault.js

@@ -116,6 +116,9 @@ export const VaultI = M.interface('Vault', {
   getCurrentDebt: M.call().returns(AmountShape),
   getNormalizedDebt: M.call().returns(AmountShape),
   getVaultSeat: M.call().returns(SeatShape),
+  getVaultState: M.call().returns(
+    harden({ idInManager: M.string(), phase: M.string() }),
+  ),
   initVaultKit: M.call(SeatShape, StorageNodeShape).returns(M.promise()),
   liquidated: M.call().returns(undefined),
   liquidating: M.call().returns(undefined),
@@ -592,6 +595,13 @@ export const prepareVault = (baggage, makeRecorderKit, zcf) => {
           return this.state.vaultSeat;
         },
 
+        getVaultState() {
+          return {
+            idInManager: this.state.idInManager,
+            phase: this.state.phase,
+          };
+        },
+
         /**
          * @param {ZCFSeat} seat
          * @param {StorageNode} storageNode

packages/inter-protocol/src/vaultFactory/vaultDirector.js

@@ -424,7 +424,8 @@ const prepareVaultDirector = (
 
         makeLiquidationWaker() {
           return makeWaker('liquidationWaker', _timestamp => {
-            allManagersDo(vm => vm.liquidateVaults(auctioneer));
+            // XXX floating promise
+            allManagersDo(vm => vm.liquidateVaults(auctioneer, _timestamp));
           });
         },
         makeReschedulerWaker() {