From a10b0b5c75ed7929f8581cfad5a8faba33dfa4de Mon Sep 17 00:00:00 2001
From: Chris Hibbert <Chris-Hibbert@users.noreply.github.com>
Date: Fri, 13 Dec 2024 18:35:11 -0800
Subject: [PATCH] Save the contractKit for the auctioneer before overwriting it
 (#10694)

refs: #10680

## Description

We misplaced the adminFacets that would allow us to manage Auctions after they've been replaced and were about to do it again. The auctions were [last upgraded](https://github.com/Agoric/agoric-sdk/blob/43345a561fbdf7621c369abb15e6839f7c696565/packages/inter-protocol/src/proposals/add-auction.js#L157) in `agoric-upgrade-16av`. That code fails to save the instance's adminFacet, and only stores the contractKit in bootstrap promise space under the name `auctioneerKit`, where it will be overwritten on upgrade. Our other contracts now save a copy of the `contractKit` in either `contractKits` or `governedContractKits`, indexed by the instance, so the facets will hang around. This saves the old auctioneer during upgrade so we can manage it later (upgrade, terminate, change parameters).

### Security Considerations

Losing our last handle for vats is a problem.

### Scaling Considerations

We're upgrading vats to deal with scaling.

### Documentation Considerations

None.

### Testing Considerations

there was a test in #10680 which looked for this kit in `governedContractKits`, but I commented it out when it didn't succeed. It succeeds now.

### Upgrade Considerations

Yes.
---
 .../scripts/testing/recorded-retired-instances.js |  7 +++----
 .../inter-protocol/src/proposals/add-auction.js   | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/builders/scripts/testing/recorded-retired-instances.js b/packages/builders/scripts/testing/recorded-retired-instances.js
index 58bc79c969e..2dae21fd4af 100644
--- a/packages/builders/scripts/testing/recorded-retired-instances.js
+++ b/packages/builders/scripts/testing/recorded-retired-instances.js
@@ -12,7 +12,7 @@ const trace = makeTracer('RecordedRetired', true);
 export const testRecordedRetiredInstances = async ({
   consume: {
     contractKits,
-    // governedContractKits,
+    governedContractKits,
     retiredContractInstances: retiredContractInstancesP,
   },
 }) => {
@@ -26,8 +26,7 @@ export const testRecordedRetiredInstances = async ({
   assert(auctionIDs.length === 1);
   const auctionInstance = retiredContractInstances.get(auctionIDs[0]);
   trace({ auctionInstance });
-  // I don't know why it's neither in governedContractKits nor contractKits
-  // assert(await E(governedContractKits).get(auctionInstance));
+  assert(await E(governedContractKits).get(auctionInstance));
 
   const committeeIDs = Array.from(retiredContractInstances.keys()).filter(k =>
     k.startsWith('economicCommittee'),
@@ -47,7 +46,7 @@ export const getManifestForRecordedRetiredInstances = () => {
       [testRecordedRetiredInstances.name]: {
         consume: {
           contractKits: true,
-          // governedContractKits: true,
+          governedContractKits: true,
           retiredContractInstances: true,
         },
       },
diff --git a/packages/inter-protocol/src/proposals/add-auction.js b/packages/inter-protocol/src/proposals/add-auction.js
index 76dd57a0c6b..2a55972a658 100644
--- a/packages/inter-protocol/src/proposals/add-auction.js
+++ b/packages/inter-protocol/src/proposals/add-auction.js
@@ -88,6 +88,20 @@ export const addAuction = async (
     produceRetiredInstances,
   );
 
+  const governedContractKits = await governedContractKitsP;
+  trace('has', governedContractKits.has(legacyKit.instance));
+  if (governedContractKits.has(legacyKit.instance)) {
+    // bootstrap tests start having already run this upgrade. Actual upgrades on
+    // mainNet or testnets should start with the promiseSpace post upgrade-17,
+    // which doesn't have this entry in the map.
+    trace(
+      '⚠️ WARNING: not expected during chain upgrade.  It IS normal during bootstrap tests',
+    );
+  } else {
+    // @ts-expect-error The original auctioneerKit had everything it needs
+    governedContractKits.init(legacyKit.instance, legacyKit);
+  }
+
   // save the auctioneer instance so we can manage it later
   const boardID = await E(board).getId(legacyKit.instance);
   const identifier = `auctioneer-${boardID}`;
@@ -205,7 +219,6 @@ export const addAuction = async (
     governedInstance,
   );
 
-  const governedContractKits = await governedContractKitsP;
   governedContractKits.init(kit.instance, kit);
   auctionUpgradeNewInstance.resolve(governedInstance);
   auctionUpgradeNewGovCreator.resolve(kit.governorCreatorFacet);