@agoric/inter-protocol 0.16.2-dev-dfc7a48.0 → 0.16.2-dev-b6379da.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.16.2-dev-dfc7a48.0+dfc7a48",
+  "version": "0.16.2-dev-b6379da.0+b6379da",
   "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-dfc7a48.0+dfc7a48",
-    "@agoric/governance": "0.10.4-dev-dfc7a48.0+dfc7a48",
-    "@agoric/internal": "0.3.3-dev-dfc7a48.0+dfc7a48",
-    "@agoric/notifier": "0.6.3-dev-dfc7a48.0+dfc7a48",
-    "@agoric/store": "0.9.3-dev-dfc7a48.0+dfc7a48",
-    "@agoric/time": "0.3.3-dev-dfc7a48.0+dfc7a48",
-    "@agoric/vat-data": "0.5.3-dev-dfc7a48.0+dfc7a48",
-    "@agoric/vats": "0.15.2-dev-dfc7a48.0+dfc7a48",
-    "@agoric/zoe": "0.26.3-dev-dfc7a48.0+dfc7a48",
+    "@agoric/ertp": "0.16.3-dev-b6379da.0+b6379da",
+    "@agoric/governance": "0.10.4-dev-b6379da.0+b6379da",
+    "@agoric/internal": "0.3.3-dev-b6379da.0+b6379da",
+    "@agoric/notifier": "0.6.3-dev-b6379da.0+b6379da",
+    "@agoric/store": "0.9.3-dev-b6379da.0+b6379da",
+    "@agoric/time": "0.3.3-dev-b6379da.0+b6379da",
+    "@agoric/vat-data": "0.5.3-dev-b6379da.0+b6379da",
+    "@agoric/vats": "0.15.2-dev-b6379da.0+b6379da",
+    "@agoric/zoe": "0.26.3-dev-b6379da.0+b6379da",
     "@endo/captp": "^4.2.2",
     "@endo/errors": "^1.2.4",
     "@endo/eventual-send": "^1.2.4",
@@ -50,10 +50,10 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/smart-wallet": "0.5.4-dev-dfc7a48.0+dfc7a48",
-    "@agoric/swingset-liveslots": "0.10.3-dev-dfc7a48.0+dfc7a48",
-    "@agoric/swingset-vat": "0.32.3-dev-dfc7a48.0+dfc7a48",
-    "@agoric/zone": "0.2.3-dev-dfc7a48.0+dfc7a48",
+    "@agoric/smart-wallet": "0.5.4-dev-b6379da.0+b6379da",
+    "@agoric/swingset-liveslots": "0.10.3-dev-b6379da.0+b6379da",
+    "@agoric/swingset-vat": "0.32.3-dev-b6379da.0+b6379da",
+    "@agoric/zone": "0.2.3-dev-b6379da.0+b6379da",
     "@endo/bundle-source": "^3.3.0",
     "@endo/init": "^1.1.3",
     "@endo/promise-kit": "^1.1.4",
@@ -84,5 +84,5 @@
   "typeCoverage": {
     "atLeast": 95.81
   },
-  "gitHead": "dfc7a48cc490097b2bb01262435f4806266b9ee8"
+  "gitHead": "b6379daa03adab7bf71ce859d2fc5e40f81c481c"
 }

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

@@ -1,4 +1,10 @@
-export function addAuction({ consume: { zoe, board, chainTimerService, priceAuthority, chainStorage, economicCommitteeCreatorFacet: electorateCreatorFacet, auctioneerKit: legacyKitP, }, produce: { newAuctioneerKit, auctionsUpgradeComplete }, instance: { consume: { reserve: reserveInstance }, }, installation: { consume: { auctioneer: auctionInstallation, contractGovernor: contractGovernorInstallation, }, }, issuer: { consume: { [Stable.symbol]: stableIssuerP }, }, }: import("./econ-behaviors.js").EconomyBootstrapPowers & interlockPowers): Promise<void>;
+export function addAuction({ consume: { zoe, board, chainTimerService, priceAuthority, chainStorage, economicCommitteeCreatorFacet: electorateCreatorFacet, auctioneerKit: legacyKitP, }, produce: { auctioneerKit: produceAuctioneerKit, auctionsUpgradeComplete }, instance: { consume: { reserve: reserveInstance }, }, installation: { consume: { contractGovernor: contractGovernorInstallation }, produce: { auctioneer: produceInstallation }, }, issuer: { consume: { [Stable.symbol]: stableIssuerP }, }, }: import("./econ-behaviors.js").EconomyBootstrapPowers & interlockPowers, { options }: {
+    options: {
+        auctionsRef: {
+            bundleID: string;
+        };
+    };
+}): Promise<void>;
 export const ADD_AUCTION_MANIFEST: {
     [x: string]: {
         consume: {
@@ -11,7 +17,7 @@ export const ADD_AUCTION_MANIFEST: {
             auctioneerKit: boolean;
         };
         produce: {
-            newAuctioneerKit: boolean;
+            auctioneerKit: boolean;
             auctionsUpgradeComplete: boolean;
         };
         instance: {
@@ -21,9 +27,11 @@ export const ADD_AUCTION_MANIFEST: {
         };
         installation: {
             consume: {
-                auctioneer: boolean;
                 contractGovernor: boolean;
             };
+            produce: {
+                auctioneer: boolean;
+            };
         };
         issuer: {
             consume: {
@@ -32,7 +40,7 @@ export const ADD_AUCTION_MANIFEST: {
         };
     };
 };
-export function getManifestForAddAuction(): Promise<{
+export function getManifestForAddAuction(_ign: object, addAuctionOptions: any): Promise<{
     manifest: {
         [x: string]: {
             consume: {
@@ -45,7 +53,7 @@ export function getManifestForAddAuction(): Promise<{
                 auctioneerKit: boolean;
             };
             produce: {
-                newAuctioneerKit: boolean;
+                auctioneerKit: boolean;
                 auctionsUpgradeComplete: boolean;
             };
             instance: {
@@ -55,9 +63,11 @@ export function getManifestForAddAuction(): Promise<{
             };
             installation: {
                 consume: {
-                    auctioneer: boolean;
                     contractGovernor: boolean;
                 };
+                produce: {
+                    auctioneer: boolean;
+                };
             };
             issuer: {
                 consume: {
@@ -66,6 +76,7 @@ export function getManifestForAddAuction(): Promise<{
             };
         };
     };
+    options: any;
 }>;
 export type interlockPowers = PromiseSpaceOf<{
     auctionsUpgradeComplete: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"add-auction.d.ts","sourceRoot":"","sources":["add-auction.js"],"names":[],"mappings":"AAkBO,udAHI,OAAO,qBAAqB,EAAE,sBAAsB,GAC9D,eAAmB,iBA4InB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4BG;AAGI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAEN;8BAtLY,cAAc,CAAC;IAC3B,uBAA2B,EAAE,OAAO,CAAC;CAClC,CAAC;uBARkB,gCAAgC"}
+{"version":3,"file":"add-auction.d.ts","sourceRoot":"","sources":["add-auction.js"],"names":[],"mappings":"AAmBO,sfAJI,OAAO,qBAAqB,EAAE,sBAAsB,GAC9D,eAAmB,eACT;IAAE,OAAO,EAAE;QAAE,WAAW,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,iBA0J5D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4BG;AAQI,+CAHI,MAAM,qBACN,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAOb;8BA7MY,cAAc,CAAC;IAC3B,uBAA2B,EAAE,OAAO,CAAC;CAClC,CAAC;uBARkB,gCAAgC"}

package/src/proposals/add-auction.js

@@ -15,35 +15,47 @@ const trace = makeTracer('NewAuction', true);
 /**
  * @param {import('./econ-behaviors.js').EconomyBootstrapPowers &
  *   interlockPowers} powers
+ * @param {{ options: { auctionsRef: { bundleID: string } } }} options
  */
-export const addAuction = async ({
-  consume: {
-    zoe,
-    board,
-    chainTimerService,
-    priceAuthority,
-    chainStorage,
-    economicCommitteeCreatorFacet: electorateCreatorFacet,
-    auctioneerKit: legacyKitP,
-  },
-  produce: { newAuctioneerKit, auctionsUpgradeComplete },
-  instance: {
-    consume: { reserve: reserveInstance },
-  },
-  installation: {
+export const addAuction = async (
+  {
     consume: {
-      auctioneer: auctionInstallation,
-      contractGovernor: contractGovernorInstallation,
+      zoe,
+      board,
+      chainTimerService,
+      priceAuthority,
+      chainStorage,
+      economicCommitteeCreatorFacet: electorateCreatorFacet,
+      auctioneerKit: legacyKitP,
+    },
+    produce: { auctioneerKit: produceAuctioneerKit, auctionsUpgradeComplete },
+    instance: {
+      consume: { reserve: reserveInstance },
+    },
+    installation: {
+      consume: { contractGovernor: contractGovernorInstallation },
+      produce: { auctioneer: produceInstallation },
+    },
+    issuer: {
+      consume: { [Stable.symbol]: stableIssuerP },
     },
   },
-  issuer: {
-    consume: { [Stable.symbol]: stableIssuerP },
-  },
-}) => {
-  trace('addAuction start');
+  { options },
+) => {
+  trace('addAuction start', options);
   const STORAGE_PATH = 'auction';
+  const { auctionsRef } = options;
 
   const poserInvitationP = E(electorateCreatorFacet).getPoserInvitation();
+  const bundleID = auctionsRef.bundleID;
+  /**
+   * @type {Promise<
+   *   Installation<import('../../src/auction/auctioneer.js')['start']>
+   * >}
+   */
+  const installationP = E(zoe).installBundleID(bundleID);
+  produceInstallation.reset();
+  produceInstallation.resolve(installationP);
 
   const [
     initialPoserInvitation,
@@ -89,10 +101,12 @@ export const addAuction = async ({
     },
   );
 
+  const installation = await installationP;
+
   const governorTerms = await deeplyFulfilledObject(
     harden({
       timer: chainTimerService,
-      governedContractInstallation: auctionInstallation,
+      governedContractInstallation: installation,
       governed: {
         terms: auctionTerms,
         issuerKeywordRecord: { Bid: stableIssuer },
@@ -103,7 +117,7 @@ export const addAuction = async ({
     }),
   );
 
-  /** @type {GovernorStartedInstallationKit<typeof auctionInstallation>} */
+  /** @type {GovernorStartedInstallationKit<typeof installationP>} */
   const governorStartResult = await E(zoe).startInstance(
     contractGovernorInstallation,
     undefined,
@@ -137,7 +151,8 @@ export const addAuction = async ({
     ),
   );
 
-  newAuctioneerKit.resolve(
+  produceAuctioneerKit.reset();
+  produceAuctioneerKit.resolve(
     harden({
       label: 'auctioneer',
       creatorFacet: governedCreatorFacet,
@@ -168,7 +183,7 @@ export const ADD_AUCTION_MANIFEST = harden({
       auctioneerKit: true,
     },
     produce: {
-      newAuctioneerKit: true,
+      auctioneerKit: true,
       auctionsUpgradeComplete: true,
     },
     instance: {
@@ -176,9 +191,9 @@ export const ADD_AUCTION_MANIFEST = harden({
     },
     installation: {
       consume: {
-        auctioneer: true,
         contractGovernor: true,
       },
+      produce: { auctioneer: true },
     },
     issuer: {
       consume: { [Stable.symbol]: true },
@@ -186,7 +201,15 @@ export const ADD_AUCTION_MANIFEST = harden({
   },
 });
 
-/* Add a new auction to a chain that already has one. */
-export const getManifestForAddAuction = async () => {
-  return { manifest: ADD_AUCTION_MANIFEST };
+/**
+ * Add a new auction to a chain that already has one.
+ *
+ * @param {object} _ign
+ * @param {any} addAuctionOptions
+ */
+export const getManifestForAddAuction = async (_ign, addAuctionOptions) => {
+  return {
+    manifest: ADD_AUCTION_MANIFEST,
+    options: addAuctionOptions,
+  };
 };

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

@@ -1,4 +1,4 @@
-export function upgradeVaults(powers: import("../../src/proposals/econ-behaviors").EconomyBootstrapPowers & interlockPowers, { options }: {
+export function upgradeVaults({ consume: { vaultFactoryKit, zoe, economicCommitteeCreatorFacet: electorateCreatorFacet, reserveKit, auctionsUpgradeComplete, }, produce: { auctionsUpgradeComplete: auctionsUpgradeCompleteProducer }, installation: { produce: { VaultFactory: produceVaultInstallation }, }, instance: { consume: { auctioneer: auctioneerInstanceP }, }, }: import("../../src/proposals/econ-behaviors").EconomyBootstrapPowers & interlockPowers, { options }: {
     options: {
         vaultsRef: {
             bundleID: string;
@@ -9,25 +9,23 @@ export function getManifestForUpgradeVaults(_ign: object, vaultUpgradeOptions: a
     manifest: {
         [x: string]: {
             consume: {
-                agoricNamesAdmin: string;
-                newAuctioneerKit: string;
                 economicCommitteeCreatorFacet: string;
-                priceAuthority: string;
                 reserveKit: string;
                 vaultFactoryKit: string;
-                board: string;
                 zoe: string;
                 auctionsUpgradeComplete: string;
             };
             produce: {
-                auctioneerKit: string;
-                newAuctioneerKit: string;
                 auctionsUpgradeComplete: string;
             };
-            instance: {
+            installation: {
                 produce: {
+                    VaultFactory: boolean;
+                };
+            };
+            instance: {
+                consume: {
                     auctioneer: string;
-                    newAuctioneerKit: string;
                 };
             };
         };

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

@@ -1 +1 @@
-{"version":3,"file":"upgrade-vaults.d.ts","sourceRoot":"","sources":["upgrade-vaults.js"],"names":[],"mappings":"AA2CO,sCAJI,OAAO,oCAAoC,EAAE,sBAAsB,GAC7E,eAAqB,eACX;IAAE,OAAO,EAAE;QAAE,SAAS,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,iBAkN1D;AASM,kDAHI,MAAM,uBACN,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BZ;8BA7PW,cAAc,CAAC;IAC3B,uBAA2B,EAAE,OAAO,CAAC;CAClC,CAAC"}
+{"version":3,"file":"upgrade-vaults.d.ts","sourceRoot":"","sources":["upgrade-vaults.js"],"names":[],"mappings":"AAkBO,+WAJI,OAAO,oCAAoC,EAAE,sBAAsB,GAC7E,eAAqB,eACX;IAAE,OAAO,EAAE;QAAE,SAAS,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,iBA6I1D;AASM,kDAHI,MAAM,uBACN,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;GAuBZ;8BAnLW,cAAc,CAAC;IAC3B,uBAA2B,EAAE,OAAO,CAAC;CAClC,CAAC"}

package/src/proposals/upgrade-vaults.js

@@ -2,34 +2,9 @@ import { E } from '@endo/far';
 import { makeNotifierFromAsyncIterable } from '@agoric/notifier';
 import { AmountMath } from '@agoric/ertp/src/index.js';
 import { makeTracer } from '@agoric/internal/src/index.js';
-import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
 
 const trace = makeTracer('upgrade Vaults proposal');
 
-// stand-in for Promise.any() which isn't available at this point.
-/** @param {Promise<any>[]} promises */
-const any = promises =>
-  new Promise((resolve, reject) => {
-    for (const promise of promises) {
-      void promise.then(resolve, () => {});
-    }
-    void Promise.allSettled(promises).then(results => {
-      const rejects = /** @type {PromiseRejectedResult[]} */ (
-        results.filter(({ status }) => status === 'rejected')
-      );
-      if (rejects.length === results.length) {
-        const messages = rejects.map(
-          ({ reason: { message } }) => message || 'no error message',
-        );
-        const aggregate = new Error(messages.join(';'));
-        /** @type {any} */ (aggregate).errors = rejects.map(
-          ({ reason }) => reason,
-        );
-        reject(aggregate);
-      }
-    });
-  });
-
 /**
  * @typedef {PromiseSpaceOf<{
  *   auctionsUpgradeComplete: boolean;
@@ -41,33 +16,30 @@ const any = promises =>
  *     interlockPowers} powers
  * @param {{ options: { vaultsRef: { bundleID: string } } }} options
  */
-export const upgradeVaults = async (powers, { options }) => {
-  const {
+export const upgradeVaults = async (
+  {
     consume: {
-      agoricNamesAdmin,
-      newAuctioneerKit: auctioneerKitP,
-      priceAuthority,
       vaultFactoryKit,
       zoe,
       economicCommitteeCreatorFacet: electorateCreatorFacet,
       reserveKit,
       auctionsUpgradeComplete,
     },
-    produce: {
-      auctioneerKit: auctioneerKitProducer,
-      newAuctioneerKit: tempAuctioneerKit,
-      auctionsUpgradeComplete: auctionsUpgradeCompleteProducer,
+    produce: { auctionsUpgradeComplete: auctionsUpgradeCompleteProducer },
+    installation: {
+      produce: { VaultFactory: produceVaultInstallation },
     },
     instance: {
-      produce: { auctioneer: auctioneerProducer },
+      consume: { auctioneer: auctioneerInstanceP },
     },
-  } = powers;
+  },
+  { options },
+) => {
   const { vaultsRef } = options;
   const kit = await vaultFactoryKit;
-  const auctioneerKit = await auctioneerKitP;
   const { instance: directorInstance } = kit;
   const allBrands = await E(zoe).getBrands(directorInstance);
-  const { Minted: istBrand, ...vaultBrands } = allBrands;
+  const { Minted: _istBrand, ...vaultBrands } = allBrands;
 
   const bundleID = vaultsRef.bundleID;
   console.log(`upgradeVaults: bundleId`, bundleID);
@@ -76,27 +48,13 @@ export const upgradeVaults = async (powers, { options }) => {
    *   Installation<import('../../src/vaultFactory/vaultFactory.js')['start']>
    * >}
    */
-  let installationP;
+  const installationP = E(zoe).installBundleID(bundleID);
+  produceVaultInstallation.reset();
+  produceVaultInstallation.resolve(installationP);
 
   await auctionsUpgradeComplete;
   auctionsUpgradeCompleteProducer.reset();
 
-  if (vaultsRef) {
-    if (bundleID) {
-      installationP = E(zoe).installBundleID(bundleID);
-      await E.when(
-        installationP,
-        installation =>
-          E(E(agoricNamesAdmin).lookupAdmin('installation')).update(
-            'vaultFactory',
-            installation,
-          ),
-        err =>
-          console.error(`🚨 failed to update vaultFactory installation`, err),
-      );
-    }
-  }
-
   const readCurrentDirectorParams = async () => {
     const { publicFacet: directorPF } = kit;
 
@@ -173,14 +131,15 @@ export const upgradeVaults = async (powers, { options }) => {
       E.get(reserveKit).creatorFacet,
     ).makeShortfallReportingInvitation();
 
-    const poserInvitation = await E(
-      electorateCreatorFacet,
-    ).getPoserInvitation();
+    const [poserInvitation, auctioneerInstance] = await Promise.all([
+      E(electorateCreatorFacet).getPoserInvitation(),
+      auctioneerInstanceP,
+    ]);
+
     /** @type {import('../../src/vaultFactory/vaultFactory').VaultFactoryContract['privateArgs']} */
     const newPrivateArgs = harden({
       ...privateArgs,
-      // @ts-expect-error It has a value until reset after the upgrade
-      auctioneerInstance: auctioneerKit.instance,
+      auctioneerInstance,
       initialPoserInvitation: poserInvitation,
       initialShortfallInvitation: shortfallInvitation,
       managerParams: managerParamValues,
@@ -195,60 +154,7 @@ export const upgradeVaults = async (powers, { options }) => {
     trace('upgraded vaultFactory.', upgradeResult);
   };
 
-  // Wait for at least one new price feed to be ready before upgrading Vaults
-  void E.when(
-    any(
-      Object.values(vaultBrands).map(async brand => {
-        const getQuote = async lastRejectionReason => {
-          await null;
-          try {
-            return await E(priceAuthority).quoteGiven(
-              AmountMath.make(brand, 10n),
-              istBrand,
-            );
-          } catch (reason) {
-            if (
-              isUpgradeDisconnection(reason) &&
-              (!lastRejectionReason ||
-                reason.incarnationNumber >
-                  lastRejectionReason.incarnationNumber)
-            ) {
-              return getQuote(reason);
-            }
-            throw reason;
-          }
-        };
-        return getQuote(null);
-      }),
-    ),
-    async price => {
-      trace(`upgrading after delay`, price);
-      await upgradeVaultFactory();
-      auctioneerKitProducer.reset();
-      // @ts-expect-error auctioneerKit is non-null except between auctioneerKitProducer.reset() and auctioneerKitProducer.resolve()
-      auctioneerKitProducer.resolve(auctioneerKit);
-      auctioneerProducer.reset();
-      // @ts-expect-error auctioneerKit is non-null except between auctioneerKitProducer.reset() and auctioneerKitProducer.resolve()
-      auctioneerProducer.resolve(auctioneerKit.instance);
-      // We wanted it to be valid for only a short while.
-      tempAuctioneerKit.reset();
-      await E(E(agoricNamesAdmin).lookupAdmin('instance')).update(
-        'auctioneer',
-        // @ts-expect-error auctioneerKit is non-null except between auctioneerKitProducer.reset() and auctioneerKitProducer.resolve()
-        auctioneerKit.instance,
-      );
-      trace(`upgrading complete`, price);
-    },
-    error => {
-      console.error(
-        'Failed to upgrade vaultFactory',
-        error.message,
-        ...(error.errors || []),
-      );
-    },
-  );
-
-  console.log(`upgradeVaults scheduled; waiting for priceFeeds`);
+  await upgradeVaultFactory();
 };
 
 const uV = 'upgradeVaults';
@@ -265,22 +171,17 @@ export const getManifestForUpgradeVaults = async (
   manifest: {
     [upgradeVaults.name]: {
       consume: {
-        agoricNamesAdmin: uV,
-        newAuctioneerKit: uV,
         economicCommitteeCreatorFacet: uV,
-        priceAuthority: uV,
         reserveKit: uV,
         vaultFactoryKit: uV,
-        board: uV,
         zoe: uV,
         auctionsUpgradeComplete: uV,
       },
-      produce: {
-        auctioneerKit: uV,
-        newAuctioneerKit: uV,
-        auctionsUpgradeComplete: uV,
+      produce: { auctionsUpgradeComplete: uV },
+      installation: {
+        produce: { VaultFactory: true },
       },
-      instance: { produce: { auctioneer: uV, newAuctioneerKit: uV } },
+      instance: { consume: { auctioneer: uV } },
     },
   },
   options: { ...vaultUpgradeOptions },