@agoric/inter-protocol 0.16.2-dev-3007c00.0 → 0.16.2-dev-5c932ce.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.16.2-dev-3007c00.0+3007c00",
+  "version": "0.16.2-dev-5c932ce.0+5c932ce",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -31,15 +31,15 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/ertp": "0.16.3-dev-3007c00.0+3007c00",
-    "@agoric/governance": "0.10.4-dev-3007c00.0+3007c00",
-    "@agoric/internal": "0.3.3-dev-3007c00.0+3007c00",
-    "@agoric/notifier": "0.6.3-dev-3007c00.0+3007c00",
-    "@agoric/store": "0.9.3-dev-3007c00.0+3007c00",
-    "@agoric/time": "0.3.3-dev-3007c00.0+3007c00",
-    "@agoric/vat-data": "0.5.3-dev-3007c00.0+3007c00",
-    "@agoric/vats": "0.15.2-dev-3007c00.0+3007c00",
-    "@agoric/zoe": "0.26.3-dev-3007c00.0+3007c00",
+    "@agoric/ertp": "0.16.3-dev-5c932ce.0+5c932ce",
+    "@agoric/governance": "0.10.4-dev-5c932ce.0+5c932ce",
+    "@agoric/internal": "0.3.3-dev-5c932ce.0+5c932ce",
+    "@agoric/notifier": "0.6.3-dev-5c932ce.0+5c932ce",
+    "@agoric/store": "0.9.3-dev-5c932ce.0+5c932ce",
+    "@agoric/time": "0.3.3-dev-5c932ce.0+5c932ce",
+    "@agoric/vat-data": "0.5.3-dev-5c932ce.0+5c932ce",
+    "@agoric/vats": "0.15.2-dev-5c932ce.0+5c932ce",
+    "@agoric/zoe": "0.26.3-dev-5c932ce.0+5c932ce",
     "@endo/captp": "^4.4.2",
     "@endo/errors": "^1.2.7",
     "@endo/eventual-send": "^1.2.7",
@@ -50,10 +50,10 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/smart-wallet": "0.5.4-dev-3007c00.0+3007c00",
-    "@agoric/swingset-liveslots": "0.10.3-dev-3007c00.0+3007c00",
-    "@agoric/swingset-vat": "0.32.3-dev-3007c00.0+3007c00",
-    "@agoric/zone": "0.2.3-dev-3007c00.0+3007c00",
+    "@agoric/smart-wallet": "0.5.4-dev-5c932ce.0+5c932ce",
+    "@agoric/swingset-liveslots": "0.10.3-dev-5c932ce.0+5c932ce",
+    "@agoric/swingset-vat": "0.32.3-dev-5c932ce.0+5c932ce",
+    "@agoric/zone": "0.2.3-dev-5c932ce.0+5c932ce",
     "@endo/bundle-source": "^3.4.2",
     "@endo/init": "^1.1.6",
     "@endo/promise-kit": "^1.1.7",
@@ -84,5 +84,5 @@
   "typeCoverage": {
     "atLeast": 95.8
   },
-  "gitHead": "3007c001ee490c847987bc61d22acf9689611340"
+  "gitHead": "5c932ce0135a574d0fd8cac810ba677c92769525"
 }

package/src/proposals/add-auction.d.ts

@@ -1,4 +1,4 @@
-export function addAuction({ consume: { agoricNamesAdmin, auctioneerKit: legacyKitP, board, chainStorage, chainTimerService, economicCommitteeCreatorFacet: electorateCreatorFacet, econCharterKit, priceAuthority8400, zoe, }, produce: { auctioneerKit: produceAuctioneerKit, auctionUpgradeNewInstance, newContractGovBundleId, }, instance: { consume: { reserve: reserveInstance }, produce: { auctioneer: auctionInstance }, }, installation: { consume: { auctioneer: auctioneerInstallationP }, }, issuer: { consume: { [Stable.symbol]: stableIssuerP }, }, }: import("./econ-behaviors.js").EconomyBootstrapPowers & interlockPowers, { options: { contractGovernorRef: contractGovernorBundle, contractGovernorInstallation, }, }: {
+export function addAuction({ consume: { agoricNamesAdmin, auctioneerKit: legacyKitP, board, chainStorage, chainTimerService, economicCommitteeCreatorFacet: electorateCreatorFacet, econCharterKit, governedContractKits: governedContractKitsP, priceAuthority8400, zoe, }, produce: { auctioneerKit: produceAuctioneerKit, auctionUpgradeNewInstance, auctionUpgradeNewGovCreator, newContractGovBundleId, }, instance: { consume: { reserve: reserveInstance }, produce: { auctioneer: auctionInstance }, }, installation: { consume: { auctioneer: auctioneerInstallationP }, }, issuer: { consume: { [Stable.symbol]: stableIssuerP }, }, }: import("./econ-behaviors.js").EconomyBootstrapPowers & interlockPowers, { options: { contractGovernorRef: contractGovernorBundle, contractGovernorInstallation, }, }: {
     options: {
         contractGovernorRef: {
             bundleID: string;
@@ -16,12 +16,14 @@ export const ADD_AUCTION_MANIFEST: {
             chainTimerService: boolean;
             econCharterKit: boolean;
             economicCommitteeCreatorFacet: boolean;
+            governedContractKits: boolean;
             priceAuthority8400: boolean;
             zoe: boolean;
         };
         produce: {
             auctioneerKit: boolean;
             auctionUpgradeNewInstance: boolean;
+            auctionUpgradeNewGovCreator: boolean;
             newContractGovBundleId: boolean;
         };
         instance: {
@@ -58,12 +60,14 @@ export function getManifestForAddAuction({ restoreRef }: {
                 chainTimerService: boolean;
                 econCharterKit: boolean;
                 economicCommitteeCreatorFacet: boolean;
+                governedContractKits: boolean;
                 priceAuthority8400: boolean;
                 zoe: boolean;
             };
             produce: {
                 auctioneerKit: boolean;
                 auctionUpgradeNewInstance: boolean;
+                auctionUpgradeNewGovCreator: boolean;
                 newContractGovBundleId: boolean;
             };
             instance: {
@@ -98,6 +102,7 @@ export function getManifestForAddAuction({ restoreRef }: {
 }>;
 export type interlockPowers = PromiseSpaceOf<{
     auctionUpgradeNewInstance: Instance;
+    auctionUpgradeNewGovCreator: any;
     newContractGovBundleId: string;
 }>;
 import { Stable } from '@agoric/internal/src/tokens.js';

package/src/proposals/add-auction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-auction.d.ts","sourceRoot":"","sources":["add-auction.js"],"names":[],"mappings":"AAyBO,wiBATI,OAAO,qBAAqB,EAAE,sBAAsB,GAC1D,eAAe,gGACT;IACN,OAAO,EAAE;QACP,mBAAmB,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC;QAC1C,4BAA4B,EAAE,YAAY,CAAC;KAC5C,CAAC;CACH,iBAkLH;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6BG;AASI,yDAHJ;IAAmB,UAAU,EAArB,GAAG;CACX,0CAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiBb;8BAvPY,cAAc,CAAC;IACvB,yBAAyB,EAAE,QAAQ,CAAC;IACpC,sBAAsB,EAAE,MAAM,CAAC;CAChC,CAAC;uBATkB,gCAAgC"}
+{"version":3,"file":"add-auction.d.ts","sourceRoot":"","sources":["add-auction.js"],"names":[],"mappings":"AA0BO,knBATI,OAAO,qBAAqB,EAAE,sBAAsB,GAC1D,eAAe,gGACT;IACN,OAAO,EAAE;QACP,mBAAmB,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC;QAC1C,4BAA4B,EAAE,YAAY,CAAC;KAC5C,CAAC;CACH,iBAuLH;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+BG;AASI,yDAHJ;IAAmB,UAAU,EAArB,GAAG;CACX,0CAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiBb;8BA/PY,cAAc,CAAC;IACvB,yBAAyB,EAAE,QAAQ,CAAC;IACpC,2BAA2B,EAAE,GAAG,CAAC;IACjC,sBAAsB,EAAE,MAAM,CAAC;CAChC,CAAC;uBAVkB,gCAAgC"}

package/src/proposals/add-auction.js

@@ -9,6 +9,7 @@ const trace = makeTracer('NewAuction', true);
 /**
  * @typedef {PromiseSpaceOf<{
  *   auctionUpgradeNewInstance: Instance;
+ *   auctionUpgradeNewGovCreator: any;
  *   newContractGovBundleId: string;
  * }>} interlockPowers
  */
@@ -33,12 +34,14 @@ export const addAuction = async (
       chainTimerService,
       economicCommitteeCreatorFacet: electorateCreatorFacet,
       econCharterKit,
+      governedContractKits: governedContractKitsP,
       priceAuthority8400,
       zoe,
     },
     produce: {
       auctioneerKit: produceAuctioneerKit,
       auctionUpgradeNewInstance,
+      auctionUpgradeNewGovCreator,
       newContractGovBundleId,
     },
     instance: {
@@ -197,7 +200,10 @@ export const addAuction = async (
     governedInstance,
   );
 
+  const governedContractKits = await governedContractKitsP;
+  governedContractKits.init(kit.instance, kit);
   auctionUpgradeNewInstance.resolve(governedInstance);
+  auctionUpgradeNewGovCreator.resolve(kit.governorCreatorFacet);
   newContractGovBundleId.resolve(contractGovernorBundle.bundleID);
 };
 
@@ -211,12 +217,14 @@ export const ADD_AUCTION_MANIFEST = harden({
       chainTimerService: true,
       econCharterKit: true,
       economicCommitteeCreatorFacet: true,
+      governedContractKits: true,
       priceAuthority8400: true,
       zoe: true,
     },
     produce: {
       auctioneerKit: true,
       auctionUpgradeNewInstance: true,
+      auctionUpgradeNewGovCreator: true,
       newContractGovBundleId: true,
     },
     instance: {

package/src/proposals/deploy-price-feeds.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy-price-feeds.d.ts","sourceRoot":"","sources":["deploy-price-feeds.js"],"names":[],"mappings":"AAcA,8BAA8B;AAC9B,qCADW,eAAe,CAQxB;AA4CK,8HAJI,sBAAsB,GAAG,cAAc,2BACvC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,GACrC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAmBjC;AA0HM,yCAZI,sBAAsB,GAAG,cAAc,UACvC;IACN,OAAO,EAAE,eAAe,GAAG;QACzB,kBAAkB,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC;QACzC,WAAW,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC;QAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,aAAa,CAAC,EAAE,eAAe,CAAC;QAChC,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B,CAAC;CACH,iBAgEH;AAWM,sEAHJ;IAAmB,UAAU,EAArB,GAAG;CACX,oBAAQ,eAAe,GAAG;IAAE,kBAAkB,EAAE,GAAG,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBApPlC,MAAM,EAAE;sBACX,MAAM,EAAE;wBACN,OAAO,CAAC,eAAe,CAAC;4BAkPM,GAAG;;GAmCpD;8BAxRW;IACR,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;CAC1C;qCAV+B,uDAAuD;4CADhD,qBAAqB"}
+{"version":3,"file":"deploy-price-feeds.d.ts","sourceRoot":"","sources":["deploy-price-feeds.js"],"names":[],"mappings":"AAcA,8BAA8B;AAC9B,qCADW,eAAe,CAQxB;AA4CK,8HAJI,sBAAsB,GAAG,cAAc,2BACvC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,GACrC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAmBjC;AA0HM,yCAZI,sBAAsB,GAAG,cAAc,UACvC;IACN,OAAO,EAAE,eAAe,GAAG;QACzB,kBAAkB,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC;QACzC,WAAW,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC;QAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,aAAa,CAAC,EAAE,eAAe,CAAC;QAChC,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B,CAAC;CACH,iBAoEH;AAWM,sEAHJ;IAAmB,UAAU,EAArB,GAAG;CACX,oBAAQ,eAAe,GAAG;IAAE,kBAAkB,EAAE,GAAG,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBAxPlC,MAAM,EAAE;sBACX,MAAM,EAAE;wBACN,OAAO,CAAC,eAAe,CAAC;4BAsPM,GAAG;;GAmCpD;8BA5RW;IACR,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;CAC1C;qCAV+B,uDAAuD;4CADhD,qBAAqB"}

package/src/proposals/deploy-price-feeds.js

@@ -222,6 +222,9 @@ export const deployPriceFeeds = async (powers, config) => {
   );
 
   const { priceAuthorityAdmin, priceAuthority } = powers.consume;
+
+  trace({ oracleAddresses });
+  trace({ inBrandNames });
   for (const inBrandName of inBrandNames) {
     const AGORIC_INSTANCE_NAME = oracleBrandFeedName(inBrandName, outBrandName);
     const brandIn = await ensureOracleBrand(powers, {
@@ -263,6 +266,7 @@ export const deployPriceFeeds = async (powers, config) => {
     options: { scaledPARef },
   });
 
+  trace('resolving priceAuthority8400');
   // cf. #8400 QuotePayments storage leak
   powers.produce.priceAuthority8400.resolve(priceAuthority);
 };

package/src/proposals/replaceElectorate.d.ts

@@ -1,4 +1,4 @@
-export function replaceAllElectorates(permittedPowers: EconomyBootstrapPowers, config: {
+export function replaceAllElectorates(permittedPowers: EconomyBootstrapPowers & interlockPowers, config: {
     options: {
         committeeName: string;
         voterAddresses: Record<string, string>;
@@ -14,10 +14,11 @@ export function getManifestForReplaceAllElectorates({ economicCommitteeRef: _eco
     manifest: {
         [x: string]: {
             consume: {
+                auctionUpgradeNewGovCreator: boolean;
+                auctionUpgradeNewInstance: boolean;
                 psmKit: boolean;
                 governedContractKits: boolean;
                 chainStorage: boolean;
-                auctioneerKit: boolean;
                 highPrioritySendersManager: boolean;
                 namesByAddressAdmin: boolean;
                 board: boolean;
@@ -27,6 +28,7 @@ export function getManifestForReplaceAllElectorates({ economicCommitteeRef: _eco
                 econCharterKit: boolean;
                 economicCommitteeKit: boolean;
                 economicCommitteeCreatorFacet: boolean;
+                auctionUpgradeNewGovCreator: boolean;
             };
             installation: {
                 consume: {
@@ -45,5 +47,9 @@ export function getManifestForReplaceAllElectorates({ economicCommitteeRef: _eco
     };
     options: any;
 }>;
+export type interlockPowers = PromiseSpaceOf<{
+    auctionUpgradeNewInstance: Instance;
+    auctionUpgradeNewGovCreator: any;
+}>;
 import type { EconomyBootstrapPowers } from './econ-behaviors.js';
 //# sourceMappingURL=replaceElectorate.d.ts.map

package/src/proposals/replaceElectorate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replaceElectorate.d.ts","sourceRoot":"","sources":["replaceElectorate.js"],"names":[],"mappings":"AA8XO,uDAlBI,sBAAsB,UAGtB;IACN,OAAO,EAAE;QACP,aAAa,EAAE,MAAM,CAAC;QACtB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACvC,yBAAyB,EAAE;YACzB,cAAc,EAAE,MAAM,EAAE,CAAC;YACzB,iBAAiB,EAAE,MAAM,EAAE,CAAC;SAC7B,CAAC;KACH,CAAC;CACH,GAGS,OAAO,CAAC,IAAI,CAAC,CAuEzB;AAIM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCL;4CAzdwC,qBAAqB"}
+{"version":3,"file":"replaceElectorate.d.ts","sourceRoot":"","sources":["replaceElectorate.js"],"names":[],"mappings":"AAwZO,uDAlBI,sBAAsB,GAAG,eAAe,UAGxC;IACN,OAAO,EAAE;QACP,aAAa,EAAE,MAAM,CAAC;QACtB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACvC,yBAAyB,EAAE;YACzB,cAAc,EAAE,MAAM,EAAE,CAAC;YACzB,iBAAiB,EAAE,MAAM,EAAE,CAAC;SAC7B,CAAC;KACH,CAAC;CACH,GAGS,OAAO,CAAC,IAAI,CAAC,CAuEzB;AAIM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCL;8BApNW,cAAc,CAAC;IACvB,yBAAyB,EAAE,QAAQ,CAAC;IACpC,2BAA2B,EAAE,GAAG,CAAC;CAClC,CAAC;4CApSqC,qBAAqB"}

package/src/proposals/replaceElectorate.js

@@ -305,24 +305,42 @@ const startNewEconCharter = async ({
   return startResult;
 };
 
+/**
+ * @typedef {PromiseSpaceOf<{
+ *   auctionUpgradeNewInstance: Instance;
+ *   auctionUpgradeNewGovCreator: any;
+ * }>} interlockPowers
+ */
+
 /**
  * Adds governors to an existing Economic Committee Charter
  *
- * - @param {EconomyBootstrapPowers} powers - The resources and capabilities
- *   required to start the committee.
+ * @param {EconomyBootstrapPowers & interlockPowers} powers
+ *
+ *   - The resources and capabilities required to start the committee.
  *
  * @param {{
  *   options: {
  *     econCharterKit: EconCharterStartResult;
  *   };
- * }} config
+ * }} options
  *   - Configuration object containing the name and size of the committee.
  *
  * @returns {Promise<void>} A promise that resolves once all the governors have
  *   been successfully added to the economic charter
  */
 const addGovernorsToEconCharter = async (
-  { consume: { psmKit, governedContractKits, auctioneerKit } },
+  {
+    consume: {
+      auctionUpgradeNewInstance: auctionUpgradeNewInstanceP,
+      auctionUpgradeNewGovCreator: auctionUpgradeNewGovCreatorP,
+      psmKit,
+      governedContractKits,
+    },
+    produce: {
+      auctionUpgradeNewGovCreator: auctionUpgradeNewGovCreatorProduce,
+    },
+  },
   { options: { econCharterKit } },
 ) => {
   const { creatorFacet: ecCreatorFacet } = E.get(econCharterKit);
@@ -334,21 +352,15 @@ const addGovernorsToEconCharter = async (
   }
 
   const governedContractKitMap = await governedContractKits;
-  const auctioneerKitObject = await auctioneerKit;
   for (const {
     instance,
     governorCreatorFacet,
     label,
   } of governedContractKitMap.values()) {
-    // `governedContractKitMap` has an old version of the auctioneer kit
-    // so using `auctioneerKit` instead
-    if (label === 'auctioneer') {
-      await E(ecCreatorFacet).addInstance(
-        auctioneerKitObject.instance,
-        auctioneerKitObject.governorCreatorFacet,
-        label,
-      );
-    } else {
+    // The auctioneer was updated in this same release, getting values directly
+    // (there might be more than one auctioneer instance, but the others don't
+    // need to be registered.)
+    if (label !== 'auctioneer') {
       await E(ecCreatorFacet).addInstance(
         instance,
         governorCreatorFacet,
@@ -356,15 +368,29 @@ const addGovernorsToEconCharter = async (
       );
     }
   }
+
+  const [auctionUpgradeNewInstance, auctionUpgradeNewGovCreator] =
+    await Promise.all([
+      auctionUpgradeNewInstanceP,
+      auctionUpgradeNewGovCreatorP,
+    ]);
+  // reset after use. auctionUpgradeNewInstance is reset by upgrade-vault.js
+  auctionUpgradeNewGovCreatorProduce.reset();
+
+  await E(ecCreatorFacet).addInstance(
+    auctionUpgradeNewInstance,
+    auctionUpgradeNewGovCreator,
+    'auctioneer',
+  );
 };
 
 /**
  * Replaces the electorate for governance contracts by creating a new Economic
  * Committee and updating contracts with the new electorate's creator facet.
  *
- * @param {EconomyBootstrapPowers} permittedPowers - The resources and
- *   capabilities needed for operations, including access to governance
- *   contracts and the PSM kit.
+ * @param {EconomyBootstrapPowers & interlockPowers} permittedPowers - The
+ *   resources and capabilities needed for operations, including access to
+ *   governance contracts and the PSM kit.
  * @param {{
  *   options: {
  *     committeeName: string;
@@ -459,10 +485,11 @@ export const getManifestForReplaceAllElectorates = async (
   manifest: {
     [replaceAllElectorates.name]: {
       consume: {
+        auctionUpgradeNewGovCreator: true,
+        auctionUpgradeNewInstance: true,
         psmKit: true,
         governedContractKits: true,
         chainStorage: true,
-        auctioneerKit: true,
         highPrioritySendersManager: true,
         namesByAddressAdmin: true,
         // Rest of these are designed to be widely shared
@@ -473,6 +500,7 @@ export const getManifestForReplaceAllElectorates = async (
         econCharterKit: true,
         economicCommitteeKit: true,
         economicCommitteeCreatorFacet: true,
+        auctionUpgradeNewGovCreator: true,
       },
       installation: {
         consume: {

package/src/proposals/upgrade-vaults.d.ts

@@ -1,4 +1,4 @@
-export function upgradeVaults({ consume: { auctionUpgradeNewInstance, chainTimerService, economicCommitteeCreatorFacet: electorateCreatorFacet, reserveKit, vaultFactoryKit, zoe, priceAuthority8400, newContractGovBundleId: newContractGovBundleIdP, }, produce: { auctionUpgradeNewInstance: auctionUpgradeNewInstanceProducer, newContractGovBundleId: newContractGovBundleIdErasor, }, instance: { consume: { auctioneer: auctioneerInstanceP }, }, }: import("../../src/proposals/econ-behaviors").EconomyBootstrapPowers & interlockPowers, { options: { VaultFactoryBundle: vaultBundleRef } }: {
+export function upgradeVaults({ consume: { auctionUpgradeNewInstance, chainTimerService, economicCommitteeCreatorFacet: electorateCreatorFacet, reserveKit, vaultFactoryKit, zoe, priceAuthority8400, newContractGovBundleId: newContractGovBundleIdP, }, produce: { auctionUpgradeNewInstance: auctionUpgradeNewInstanceProducer, newContractGovBundleId: newContractGovBundleIdErasor, }, }: import("../../src/proposals/econ-behaviors").EconomyBootstrapPowers & interlockPowers, { options: { VaultFactoryBundle: vaultBundleRef } }: {
     options: {
         VaultFactoryBundle: {
             bundleID: string;
@@ -24,11 +24,6 @@ export function getManifestForUpgradeVaults({ restoreRef }: {
                 auctionUpgradeNewInstance: string;
                 newContractGovBundleId: string;
             };
-            instance: {
-                consume: {
-                    auctioneer: string;
-                };
-            };
         };
     };
     installations: {

package/src/proposals/upgrade-vaults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade-vaults.d.ts","sourceRoot":"","sources":["upgrade-vaults.js"],"names":[],"mappings":"AAyBO,4bARI,OAAO,oCAAoC,EAAE,sBAAsB,GACvE,eAAe,uDACX;IACN,OAAO,EAAE;QACP,kBAAkB,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC;KAC1C,CAAC;CACH,iBAsJH;AAUM,4DAHJ;IAAmB,UAAU,EAArB,GAAG;CACX,uBAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6Bb;8BAzMY,cAAc,CAAC;IACvB,kBAAkB,EAAE,QAAQ,CAAC;IAC7B,yBAAyB,EAAE,QAAQ,CAAC;IACpC,sBAAsB,EAAE,MAAM,CAAC;CAChC,CAAC"}
+{"version":3,"file":"upgrade-vaults.d.ts","sourceRoot":"","sources":["upgrade-vaults.js"],"names":[],"mappings":"AAyBO,+XARI,OAAO,oCAAoC,EAAE,sBAAsB,GACvE,eAAe,uDACX;IACN,OAAO,EAAE;QACP,kBAAkB,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC;KAC1C,CAAC;CACH,iBA8IH;AAUM,4DAHJ;IAAmB,UAAU,EAArB,GAAG;CACX,uBAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;GA4Bb;8BAhMY,cAAc,CAAC;IACvB,kBAAkB,EAAE,QAAQ,CAAC;IAC7B,yBAAyB,EAAE,QAAQ,CAAC;IACpC,sBAAsB,EAAE,MAAM,CAAC;CAChC,CAAC"}

package/src/proposals/upgrade-vaults.js

@@ -39,9 +39,6 @@ export const upgradeVaults = async (
       auctionUpgradeNewInstance: auctionUpgradeNewInstanceProducer,
       newContractGovBundleId: newContractGovBundleIdErasor,
     },
-    instance: {
-      consume: { auctioneer: auctioneerInstanceP },
-    },
   },
   { options: { VaultFactoryBundle: vaultBundleRef } },
 ) => {
@@ -52,12 +49,7 @@ export const upgradeVaults = async (
 
   await priceAuthority8400;
 
-  const [auctionOldInstance, auctionNewInstance] = await Promise.all([
-    auctioneerInstanceP,
-    auctionUpgradeNewInstance,
-  ]);
-  auctionOldInstance !== auctionNewInstance ||
-    Fail`Auction instance didn't change`;
+  const auctionNewInstance = await auctionUpgradeNewInstance;
   auctionUpgradeNewInstanceProducer.reset();
   const publicFacet = E(zoe).getPublicFacet(auctionNewInstance);
   /** @type {import('@agoric/inter-protocol/src/auction/scheduler.js').FullSchedule} */
@@ -202,7 +194,6 @@ export const getManifestForUpgradeVaults = async (
           auctionUpgradeNewInstance: uV,
           newContractGovBundleId: uV,
         },
-        instance: { consume: { auctioneer: uV } },
       },
     },
     installations: { VaultFactory: restoreRef(VaultFactoryRef) },