@agoric/inter-protocol 0.17.0-u16.2 → 0.17.0-u17.1

package/src/proposals/upgrade-vaults.js

@@ -2,63 +2,47 @@ 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';
+import { Fail } from '@endo/errors';
+import { TimeMath } from '@agoric/time';
 
 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<{
+ *   auctionUpgradeNewInstance: Instance;
+ * }>} interlockPowers
+ */
 
 /**
- * @param {import('../../src/proposals/econ-behaviors').EconomyBootstrapPowers} powers
+ * @param {import('../../src/proposals/econ-behaviors').EconomyBootstrapPowers &
+ *     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,
+      auctionUpgradeNewInstance,
+      chainTimerService,
       economicCommitteeCreatorFacet: electorateCreatorFacet,
       reserveKit,
+      vaultFactoryKit,
+      zoe,
     },
-    produce: {
-      auctioneerKit: auctioneerKitProducer,
-      newAuctioneerKit: tempAuctioneerKit,
+    produce: { auctionUpgradeNewInstance: auctionUpgradeNewInstanceProducer },
+    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);
@@ -67,23 +51,50 @@ export const upgradeVaults = async (powers, { options }) => {
    *   Installation<import('../../src/vaultFactory/vaultFactory.js')['start']>
    * >}
    */
-  let installationP;
-  await null;
-  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 installationP = E(zoe).installBundleID(bundleID);
+  produceVaultInstallation.reset();
+  produceVaultInstallation.resolve(installationP);
+
+  const [auctionOldInstance, auctionNewInstance] = await Promise.all([
+    auctioneerInstanceP,
+    auctionUpgradeNewInstance,
+  ]);
+  auctionOldInstance !== auctionNewInstance ||
+    Fail`Auction instance didn't change`;
+  auctionUpgradeNewInstanceProducer.reset();
+  const publicFacet = E(zoe).getPublicFacet(auctionNewInstance);
+  /** @type {import('@agoric/inter-protocol/src/auction/scheduler.js').FullSchedule} */
+  const schedules = await E(publicFacet).getSchedules();
+  const now = await E(chainTimerService).getCurrentTimestamp();
+  (schedules.nextAuctionSchedule &&
+    TimeMath.compareAbs(schedules.nextAuctionSchedule.startTime, now) > 0) ||
+    Fail`Expected next start time in the future ${schedules.nextAuctionSchedule?.startTime}`;
+
+  const readCurrentDirectorParams = async () => {
+    const { publicFacet: directorPF } = kit;
+
+    await null;
+
+    const subscription = E(directorPF).getElectorateSubscription();
+    const notifier = makeNotifierFromAsyncIterable(subscription);
+    let { value, updateCount } = await notifier.getUpdateSince(0n);
+    // @ts-expect-error It's an amount.
+    while (AmountMath.isEmpty(value.current.MinInitialDebt.value)) {
+      ({ value, updateCount } = await notifier.getUpdateSince(updateCount));
+      trace(
+        `minInitialDebt was empty, retried`,
+        value.current.MinInitialDebt.value,
       );
     }
-  }
+
+    return harden({
+      MinInitialDebt: value.current.MinInitialDebt.value,
+      ReferencedUI: value.current.ReferencedUI.value,
+      RecordingPeriod: value.current.RecordingPeriod.value,
+      ChargingPeriod: value.current.ChargingPeriod.value,
+    });
+  };
+  const directorParamOverrides = await readCurrentDirectorParams();
 
   const readManagerParams = async () => {
     const { publicFacet: directorPF } = kit;
@@ -99,9 +110,17 @@ export const upgradeVaults = async (powers, { options }) => {
       const notifier = makeNotifierFromAsyncIterable(subscription);
       let { value, updateCount } = await notifier.getUpdateSince(0n);
       // @ts-expect-error It's an amount.
-      while (AmountMath.isEmpty(value.current.DebtLimit.value)) {
+      if (AmountMath.isEmpty(value.current.DebtLimit.value)) {
+        // The parameters might have been empty at start, and the notifier might
+        // give the first state before the current state.
+        trace(`debtLimit was empty, retrying`, value.current.DebtLimit.value);
         ({ value, updateCount } = await notifier.getUpdateSince(updateCount));
-        trace(`debtLimit was empty, retried`, value.current.DebtLimit.value);
+
+        // @ts-expect-error It's an amount.
+        if (AmountMath.isEmpty(value.current.DebtLimit.value)) {
+          trace('debtLimit was empty after retrying');
+          throw Error('🚨Governed parameters empty after retry, Giving up');
+        }
       }
       trace(kwd, 'params at', updateCount, 'are', value.current);
       params[kwd] = harden({
@@ -130,14 +149,15 @@ export const upgradeVaults = async (powers, { options }) => {
     const poserInvitation = await E(
       electorateCreatorFacet,
     ).getPoserInvitation();
+
     /** @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: auctionNewInstance,
       initialPoserInvitation: poserInvitation,
       initialShortfallInvitation: shortfallInvitation,
       managerParams: managerParamValues,
+      directorParamOverrides,
     });
 
     const upgradeResult = await E(kit.adminFacet).upgradeContract(
@@ -148,60 +168,22 @@ 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 || []),
-      );
-    },
+  await upgradeVaultFactory();
+
+  // @ts-expect-error It's saved in econ-behaviors.js:startVaultFactory()
+  const vaultFactoryPrivateArgs = kit.privateArgs;
+  console.log('UPGV upgraded vaults, restarting governor');
+
+  const ecf = await electorateCreatorFacet;
+  // restart vaultFactory governor
+  await E(kit.governorAdminFacet).restartContract(
+    harden({
+      electorateCreatorFacet: ecf,
+      governed: vaultFactoryPrivateArgs,
+    }),
   );
 
-  console.log(`upgradeVaults scheduled; waiting for priceFeeds`);
+  console.log('UPGV restarted governor');
 };
 
 const uV = 'upgradeVaults';
@@ -218,17 +200,18 @@ export const getManifestForUpgradeVaults = async (
   manifest: {
     [upgradeVaults.name]: {
       consume: {
-        agoricNamesAdmin: uV,
-        newAuctioneerKit: uV,
+        auctionUpgradeNewInstance: uV,
+        chainTimerService: uV,
         economicCommitteeCreatorFacet: uV,
-        priceAuthority: uV,
         reserveKit: uV,
         vaultFactoryKit: uV,
-        board: uV,
         zoe: uV,
       },
-      produce: { auctioneerKit: uV, newAuctioneerKit: uV },
-      instance: { produce: { auctioneer: uV, newAuctioneerKit: uV } },
+      produce: { auctionUpgradeNewInstance: uV },
+      installation: {
+        produce: { VaultFactory: true },
+      },
+      instance: { consume: { auctioneer: true } },
     },
   },
   options: { ...vaultUpgradeOptions },

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.js"],"names":[],"mappings":"AAYO,mDAHI,IAAI,CAAC,OAAO,cAAc,EAAE,SAAS,CAAC,SACtC,MAAM,EAAE,EAAE,kBA+BpB;AAMM,+CAHI,IAAI,CAAC,OAAO,cAAc,EAAE,SAAS,CAAC,SACtC,MAAM,EAAE,kBAMhB;AAQI,8CALI,MAAM,uBACN,IAAI,CAAC,OAAO,cAAc,EAAE,SAAS,CAAC,QACtC,MAAM,YACN,IAAI,CAAC,OAAO,CAAC,EAAE,iBAuBzB;AA6BM,wCAPI;IACV,OAAW,EAAE,IAAI,CAAC,OAAO,iCAAiC,EAAE,UAAU,CAAC,CAAC;CACrE,mCAED;IAAkE,UAAU,EAApE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC,eAAe;CAAC;;;GAoDxC;AAEM,iFACsC;AAEtC,6DAC+B"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.js"],"names":[],"mappings":"AAWO,mDAHI,IAAI,CAAC,OAAO,cAAc,EAAE,SAAS,CAAC,SACtC,MAAM,EAAE,EAAE,kBA+BpB;AAMM,+CAHI,IAAI,CAAC,OAAO,cAAc,EAAE,SAAS,CAAC,SACtC,MAAM,EAAE,kBAMhB;AAQI,8CALI,MAAM,uBACN,IAAI,CAAC,OAAO,cAAc,EAAE,SAAS,CAAC,QACtC,MAAM,YACN,IAAI,CAAC,OAAO,CAAC,EAAE,iBAuBzB;AA6BM,wCAPI;IACV,OAAW,EAAE,IAAI,CAAC,OAAO,iCAAiC,EAAE,UAAU,CAAC,CAAC;CACrE,mCAED;IAAkE,UAAU,EAApE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC,eAAe;CAAC;;;GAoDxC;AAEM,iFACsC;AAEtC,6DAC+B"}

package/src/proposals/utils.js

@@ -1,10 +1,9 @@
+import { Fail } from '@endo/errors';
+import { E } from '@endo/far';
 import { WalletName } from '@agoric/internal';
 import { getCopyMapEntries, makeCopyMap } from '@agoric/store';
-import { E } from '@endo/far';
-
-/** @import {CopyMap} from '@endo/patterns') */
 
-const { Fail } = assert;
+/** @import {CopyMap} from '@endo/patterns'; */
 
 /**
  * @param {ERef<import('@agoric/vats').NameAdmin>} nameAdmin

package/src/provisionPool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provisionPool.d.ts","sourceRoot":"","sources":["provisionPool.js"],"names":[],"mappings":"AAgBA,8CAA8C;AAE9C,2BAA2B;AAC3B,mBADW,YAAY,CAerB;AAqBK,2BAZI,GAAG,CAAC,cAAc,CAAC,eACnB;IACV,QAAY,EAAE,OAAO,WAAW,EAAE,IAAI,CACtC,OAAa,8BAA8B,EAAE,IAAI,CAC5C,CAAC;IACN,sBAA0B,EAAE,UAAU,CAAC;IACvC,WAAe,EAAE,WAAW,CAAC;IAC7B,UAAc,EAAE,QAAQ,GAAG,CAAC,CAAC;IAC7B,eAAmB,CAAC,EAAE,OAAO,uBAAuB,EAAE,mBAAmB,CAAC;CACvE,WACO,OAAO,kBAAkB,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;6DAsE67jC,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAA16vB,cAAc;kDAAuE,cAAc;;;;;;;;;GAHjrU;;;;6BAlFY,aAAa,GACzB,eAAmB,CAAC;IACpB,uBAA6B,EAAE,QAAQ,CAAC;CACnC,CAAC;6BAxBoB,eAAe"}
+{"version":3,"file":"provisionPool.d.ts","sourceRoot":"","sources":["provisionPool.js"],"names":[],"mappings":"AAgBA,8CAA8C;AAE9C,2BAA2B;AAC3B,mBADW,YAAY,CAerB;AAqBK,2BAZI,GAAG,CAAC,cAAc,CAAC,eACnB;IACV,QAAY,EAAE,OAAO,WAAW,EAAE,IAAI,CACtC,OAAa,8BAA8B,EAAE,IAAI,CAC5C,CAAC;IACN,sBAA0B,EAAE,UAAU,CAAC;IACvC,WAAe,EAAE,WAAW,CAAC;IAC7B,UAAc,EAAE,QAAQ,GAAG,CAAC,CAAC;IAC7B,eAAmB,CAAC,EAAE,OAAO,uBAAuB,EAAE,mBAAmB,CAAC;CACvE,WACO,OAAO,kBAAkB,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;6DAsE0tkC,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAAvswB,cAAc;kDAAuE,cAAc;;;;;;;;;GAHjrU;;;;6BAlFY,aAAa,GACzB,eAAmB,CAAC;IACpB,uBAA6B,EAAE,QAAQ,CAAC;CACnC,CAAC;6BAxBoB,eAAe"}

package/src/provisionPoolKit.d.ts

@@ -245,6 +245,12 @@ export function prepareProvisionPoolKit(baggage: import("@agoric/vat-data").Bagg
         onProvisioned(): void;
         /** @param {ERef<Bank>} destBank */
         sendInitialPayment(destBank: ERef<Bank>): Promise<void>;
+        /**
+         * @param {ERef<Purse>} exchangePurse
+         * @param {ERef<Brand>} brand
+         */
+        watchCurrentAmount(exchangePurse: ERef<Purse>, brand: ERef<Brand>): void;
+        watchAssetSubscription(): Promise<undefined>;
         /**
          * @param {object} [options]
          * @param {MetricsNotification} [options.metrics]

package/src/provisionPoolKit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provisionPoolKit.d.ts","sourceRoot":"","sources":["provisionPoolKit.js"],"names":[],"mappings":"AAgEO,4DAHI,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,iBAC1C,MAAM,IAAI,0DAGP,0BAA0B;;;;GA+BvC;AAWM,iDARI,OAAO,kBAAkB,EAAE,OAAO,8CAClC;IACV,eAAmB,EAAE,OAAO,6CAA6C,EAAE,eAAe,CAAC;IAC3F,MAAU,EAAE,GAAG,CAAC;IAChB,QAAY,EAAE,OAAO,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,GAAO,EAAE,GAAG,CAAC;CACV,gCAsVC;IAA2B,SAAS,EAA5B,KAAK,CAAC,KAAK,CAAC;IACY,WAAW,EAAnC,KAAK,WAAW,CAAC;CAC3B;;QAzQK,qCAAqC;4CAAzB,MAAM,EAAE;;YA+CpB,8BAA8B;kCAAlB,MAAM;yDAwOixsB,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAnNlzsB;;;eAGG;+BAFQ,MAAM,GACJ,OAAO;;QA9DpB,gDAAgD;6BAApC,0BAA0B;;;;;;QA6BtC;;;WAGG;uBAFQ,KAAK,YACL,WAAW;;;QAQtB,8BAA8B;8BAAlB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAqBlB;;;WAGG;2BAFQ,MAAM,GACJ,OAAO;;;;;;;QAgDpB,mCAAmC;qCAAvB,KAAK,IAAI,CAAC;QA0BtB;;;WAGG;;;;QA0EH;;;;WAIG;oBAHQ,KAAK,OAAO,CAAC,UACb,MAAM,YACN,WAAW;;;;;;;IAsD7B;0BA7aY,OAAO,qCAAqC,EAAE,QAAQ,CAClE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAiXS,cACP;kDAGQ,cAAc;;;;;;;;;;;;EArXiC,CACtD;;iBAKU,KAAK,WAAW,CAAC;yBACjB,KAAK,OAAO,cAAc,EAAE,SAAS,CAAC;mBACtC,KACb,OAAW,6CAA6C,EAAE,wBAAwB,CAAC,cAAc,CAAC,CAC/F;;;;;;;;;;wBAMU,MAAM;;;;;yBACN,OAAO,KAAK,CAAC;;;;;0BAEb,OAAO,KAAK,CAAC;;0BAxBS,8BAA8B;0BAF3C,WAAW;4BACT,2BAA2B;iCAChB,8BAA8B"}
+{"version":3,"file":"provisionPoolKit.d.ts","sourceRoot":"","sources":["provisionPoolKit.js"],"names":[],"mappings":"AAuEO,4DAHI,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,iBAC1C,MAAM,IAAI,0DAGP,0BAA0B;;;;GA+BvC;AAWM,iDARI,OAAO,kBAAkB,EAAE,OAAO,8CAClC;IACV,eAAmB,EAAE,OAAO,6CAA6C,EAAE,eAAe,CAAC;IAC3F,MAAU,EAAE,GAAG,CAAC;IAChB,QAAY,EAAE,OAAO,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,GAAO,EAAE,GAAG,CAAC;CACV,gCA0YC;IAA2B,SAAS,EAA5B,KAAK,CAAC,KAAK,CAAC;IACY,WAAW,EAAnC,KAAK,WAAW,CAAC;CAC3B;;QA7TK,qCAAqC;4CAAzB,MAAM,EAAE;;YA+CpB,8BAA8B;kCAAlB,MAAM;yDA4R2kpB,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAvQ5mpB;;;eAGG;+BAFQ,MAAM,GACJ,OAAO;;QA9DpB,gDAAgD;6BAApC,0BAA0B;;;;;;QA6BtC;;;WAGG;uBAFQ,KAAK,YACL,WAAW;;;QAQtB,8BAA8B;8BAAlB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAqBlB;;;WAGG;2BAFQ,MAAM,GACJ,OAAO;;;;;;;QAgDpB,mCAAmC;qCAAvB,KAAK,IAAI,CAAC;QA0BtB;;;WAGG;0CAFQ,KAAK,KAAK,CAAC,SACX,KAAK,KAAK,CAAC;;QA2FtB;;;WAGG;;;;QAiCH;;;;WAIG;oBAHQ,KAAK,OAAO,CAAC,UACb,MAAM,YACN,WAAW;;;;;;;IAsD7B;0BAjeY,OAAO,qCAAqC,EAAE,QAAQ,CAClE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CA6WsB,cAAc;kDAEnB,cAAF;;;;;;;;;;;;EA/W0C,CACtD;;iBAKU,KAAK,WAAW,CAAC;yBACjB,KAAK,OAAO,cAAc,EAAE,SAAS,CAAC;mBACtC,KACb,OAAW,6CAA6C,EAAE,wBAAwB,CAAC,cAAc,CAAC,CAC/F;;;;;;;;;;wBAMU,MAAM;;;;;yBACN,OAAO,KAAK,CAAC;;;;;0BAEb,OAAO,KAAK,CAAC;;0BAxBS,8BAA8B;0BAF3C,WAAW;4BACT,2BAA2B;iCAChB,8BAA8B"}

package/src/provisionPoolKit.js

@@ -1,6 +1,10 @@
 // @ts-check
+import { X, q, Fail } from '@endo/errors';
+import { E } from '@endo/far';
+import { Far } from '@endo/marshal';
+
 import { AmountMath, BrandShape } from '@agoric/ertp';
-import { deeplyFulfilledObject } from '@agoric/internal';
+import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
 import { UnguardedHelperI } from '@agoric/internal/src/typeGuards.js';
 import {
   observeIteration,
@@ -19,10 +23,13 @@ import {
   makeRecorderTopic,
 } from '@agoric/zoe/src/contractSupport/topics.js';
 import { InstanceHandleShape } from '@agoric/zoe/src/typeGuards.js';
-import { E } from '@endo/far';
-import { Far } from '@endo/marshal';
+import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
 
-const { details: X, quote: q, Fail } = assert;
+const trace = makeTracer('ProvPool');
+
+const FIRST_UPPER_KEYWORD = /^[A-Z][a-zA-Z0-9_$]*$/;
+// see https://github.com/Agoric/agoric-sdk/issues/8238
+const FIRST_LOWER_NEAR_KEYWORD = /^[a-z][a-zA-Z0-9_$]*$/;
 
 /**
  * @import {ERef} from '@endo/far'
@@ -73,7 +80,7 @@ export const makeBridgeProvisionTool = (sendInitialPayment, onProvisioned) => {
       fromBridge: async obj => {
         obj.type === 'PLEASE_PROVISION' ||
           Fail`Unrecognized request ${obj.type}`;
-        console.info('PLEASE_PROVISION', obj);
+        trace('PLEASE_PROVISION', obj);
         const { address, powerFlags } = obj;
         powerFlags.includes(PowerFlags.SMART_WALLET) ||
           Fail`missing SMART_WALLET in powerFlags`;
@@ -90,7 +97,7 @@ export const makeBridgeProvisionTool = (sendInitialPayment, onProvisioned) => {
         if (created) {
           onProvisioned();
         }
-        console.info(created ? 'provisioned' : 're-provisioned', address);
+        trace(created ? 'provisioned' : 're-provisioned', address);
       },
     });
   return makeBridgeHandler;
@@ -149,7 +156,7 @@ export const prepareProvisionPoolKit = (
       /** @type {import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<MetricsNotification>} */
       const metricsRecorderKit = makeRecorderKit(metricsNode);
 
-      /** @type {MapStore<Brand, PsmInstance>} */
+      /** @type {MapStore<ERef<Brand>, PsmInstance>} */
       const brandToPSM = makeScalarBigMapStore('brandToPSM', { durable: true });
       const revivableAddresses = makeScalarBigSetStore('revivableAddresses', {
         durable: true,
@@ -184,7 +191,7 @@ export const prepareProvisionPoolKit = (
       machine: {
         /** @param {string[]} oldAddresses */
         addRevivableAddresses(oldAddresses) {
-          console.log('revivableAddresses count', oldAddresses.length);
+          trace('revivableAddresses count', oldAddresses.length);
           this.state.revivableAddresses.addAll(oldAddresses);
         },
         getWalletReviver() {
@@ -318,7 +325,7 @@ export const prepareProvisionPoolKit = (
             .deposit(initialPmt)
             .then(amt => {
               helper.onSendFunds(perAccountInitialAmount);
-              console.log('provisionPool sent', amt);
+              trace('provisionPool sent', amt);
             })
             .catch(reason => {
               console.error(X`initial deposit failed: ${q(reason)}`);
@@ -327,62 +334,114 @@ export const prepareProvisionPoolKit = (
             });
         },
         /**
-         * @param {object} [options]
-         * @param {MetricsNotification} [options.metrics]
+         * @param {ERef<Purse>} exchangePurse
+         * @param {ERef<Brand>} brand
          */
-        start({ metrics } = {}) {
+        watchCurrentAmount(exchangePurse, brand) {
           const {
             state: { brandToPSM, poolBrand },
             facets: { helper },
           } = this;
 
-          // Must match. poolBrand is from durable state and the param is from
-          // the contract, so it technically can change between incarnations.
-          // That would be a severe bug.
-          AmountMath.coerce(poolBrand, params.getPerAccountInitialAmount());
+          void observeNotifier(E(exchangePurse).getCurrentAmountNotifier(), {
+            updateState: async amount => {
+              trace('provisionPool balance update', amount);
+              if (AmountMath.isEmpty(amount) || amount.brand === poolBrand) {
+                return;
+              }
+              if (!brandToPSM.has(brand)) {
+                console.error('funds arrived but no PSM instance', brand);
+                return;
+              }
+              const instance = brandToPSM.get(brand);
+              const payment = E(exchangePurse).withdraw(amount);
+              await helper
+                .swap(payment, amount, instance)
+                .catch(async reason => {
+                  console.error(X`swap failed: ${reason}`);
+                  const resolvedPayment = await payment;
+                  return E(exchangePurse).deposit(resolvedPayment);
+                });
+            },
+            fail: reason => {
+              if (isUpgradeDisconnection(reason)) {
+                void helper.watchCurrentAmount(exchangePurse, brand);
+              } else {
+                console.error(reason);
+              }
+            },
+          });
+        },
+        watchAssetSubscription() {
+          const { facets } = this;
+          const { helper } = facets;
 
-          void observeIteration(
+          /** @param {import('@agoric/vats/src/vat-bank.js').AssetDescriptor} desc */
+          const repairDesc = desc => {
+            if (desc.issuerName.match(FIRST_UPPER_KEYWORD)) {
+              trace(`Saving Issuer ${desc.issuerName}`);
+              return desc;
+            } else if (desc.issuerName.match(FIRST_LOWER_NEAR_KEYWORD)) {
+              const bad = desc.issuerName;
+              const goodName = bad.replace(bad[0], bad[0].toUpperCase());
+
+              trace(
+                `Saving Issuer ${desc.issuerName} with repaired keyword ${goodName}`,
+              );
+              return { ...desc, issuerName: goodName };
+            } else {
+              console.error(
+                `unable to save issuer with illegal keyword: ${desc.issuerName}`,
+              );
+              return undefined;
+            }
+          };
+
+          return observeIteration(
             subscribeEach(E(poolBank).getAssetSubscription()),
             {
               updateState: async desc => {
-                console.log('provisionPool notified of new asset', desc.brand);
-                await zcf.saveIssuer(desc.issuer, desc.issuerName);
+                await null;
+                const issuer = zcf.getTerms().issuers[desc.issuerName];
+                if (issuer === desc.issuer) {
+                  trace('provisionPool re-notified of known asset', desc.brand);
+                } else {
+                  const goodDesc = repairDesc(desc);
+                  if (goodDesc) {
+                    await zcf.saveIssuer(goodDesc.issuer, goodDesc.issuerName);
+                  } else {
+                    console.error(
+                      `unable to save issuer with illegal keyword: ${desc.issuerName}`,
+                    );
+                  }
+                }
+
                 /** @type {ERef<Purse>} */
                 const exchangePurse = E(poolBank).getPurse(desc.brand);
-                void observeNotifier(
-                  E(exchangePurse).getCurrentAmountNotifier(),
-                  {
-                    updateState: async amount => {
-                      console.log('provisionPool balance update', amount);
-                      if (
-                        AmountMath.isEmpty(amount) ||
-                        amount.brand === poolBrand
-                      ) {
-                        return;
-                      }
-                      if (!brandToPSM.has(desc.brand)) {
-                        console.error(
-                          'funds arrived but no PSM instance',
-                          desc.brand,
-                        );
-                        return;
-                      }
-                      const instance = brandToPSM.get(desc.brand);
-                      const payment = E(exchangePurse).withdraw(amount);
-                      await helper
-                        .swap(payment, amount, instance)
-                        .catch(async reason => {
-                          console.error(X`swap failed: ${reason}`);
-                          const resolvedPayment = await payment;
-                          return E(exchangePurse).deposit(resolvedPayment);
-                        });
-                    },
-                    fail: reason => console.error(reason),
-                  },
-                );
+                helper.watchCurrentAmount(exchangePurse, desc.brand);
+              },
+              fail: _reason => {
+                void helper.watchAssetSubscription();
               },
             },
           );
+        },
+        /**
+         * @param {object} [options]
+         * @param {MetricsNotification} [options.metrics]
+         */
+        start({ metrics } = {}) {
+          const {
+            state: { poolBrand },
+            facets: { helper },
+          } = this;
+
+          // Must match. poolBrand is from durable state and the param is from
+          // the contract, so it technically can change between incarnations.
+          // That would be a severe bug.
+          AmountMath.coerce(poolBrand, params.getPerAccountInitialAmount());
+
+          void helper.watchAssetSubscription();
 
           if (metrics) {
             // Restore state.

package/src/psm/psm.d.ts

@@ -19,7 +19,10 @@
  * @property {Amount<'nat'>} totalMintedProvided running sum of Minted ever
  *   given by this contract
  */
-/** @import {Baggage} from '@agoric/vat-data' */
+/**
+ * @import {TypedPattern} from '@agoric/internal';
+ * @import {Baggage} from '@agoric/vat-data'
+ */
 /** @type {ContractMeta} */
 export const meta: ContractMeta;
 export function start(zcf: ZCF<GovernanceTerms<{

package/src/psm/psm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"psm.d.ts","sourceRoot":"","sources":["psm.js"],"names":[],"mappings":"AAuCA;;;;;;GAMG;AAEH;;;;;;;;;;;;;GAaG;AAEH,gDAAgD;AAEhD,2BAA2B;AAC3B,mBADW,YAAY,CAkCrB;AAsBK,2BAlBI,GAAG,CACb,eAAmB,CAAC;IACpB,aAAmB,EAAE,OAAO,CAAC;IAC7B,aAAmB,EAAE,OAAO,CAAC;IAC7B,SAAe,EAAE,QAAQ,CAAC;CACrB,CAAC,GAAG;IACT,WAAiB,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAChC,eAAqB,EAAE,KAAK,CAAC;CACxB,CACF,eACO;IACV,aAAiB,EAAE,aAAa,CAAC;IACjC,sBAA0B,EAAE,UAAU,CAAC;IACvC,WAAe,EAAE,WAAW,CAAC;IAC7B,UAAc,EAAE,UAAU,CAAC;CACxB,WACO,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CA0U6C,cAAc;kDAAuE,cAAc;;;;;;;;;;;;GAJjK;;;;;;;;;;uBA1Ya,MAAM,CAAC,KAAK,CAAC;;;;;uBAEb,MAAM,CAAC,KAAK,CAAC;;;;;oBAEb,MAAM,CAAC,KAAK,CAAC;;;;;yBAEb,MAAM,CAAC,KAAK,CAAC;;;;;yBAEb,MAAM,CAAC,KAAK,CAAC;;6BAqYb,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC;6BAjYnC,kBAAkB"}
+{"version":3,"file":"psm.d.ts","sourceRoot":"","sources":["psm.js"],"names":[],"mappings":"AAsCA;;;;;;GAMG;AAEH;;;;;;;;;;;;;GAaG;AAEH;;;GAGG;AAEH,2BAA2B;AAC3B,mBADW,YAAY,CAkCrB;AAsBK,2BAlBI,GAAG,CACb,eAAmB,CAAC;IACpB,aAAmB,EAAE,OAAO,CAAC;IAC7B,aAAmB,EAAE,OAAO,CAAC;IAC7B,SAAe,EAAE,QAAQ,CAAC;CACrB,CAAC,GAAG;IACT,WAAiB,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAChC,eAAqB,EAAE,KAAK,CAAC;CACxB,CACF,eACO;IACV,aAAiB,EAAE,aAAa,CAAC;IACjC,sBAA0B,EAAE,UAAU,CAAC;IACvC,WAAe,EAAE,WAAW,CAAC;IAC7B,UAAc,EAAE,UAAU,CAAC;CACxB,WACO,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAwUyD,cAAc;kDAAuE,cAAc;;;;;;;;;;;;GAJ7K;;;;;;;;;;uBA3Ya,MAAM,CAAC,KAAK,CAAC;;;;;uBAEb,MAAM,CAAC,KAAK,CAAC;;;;;oBAEb,MAAM,CAAC,KAAK,CAAC;;;;;yBAEb,MAAM,CAAC,KAAK,CAAC;;;;;yBAEb,MAAM,CAAC,KAAK,CAAC;;6BAsYb,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC;6BAhYpC,kBAAkB"}

package/src/psm/psm.js

@@ -2,6 +2,8 @@
 /// <reference types="@agoric/governance/exported" />
 /// <reference types="@agoric/zoe/exported" />
 
+import { Fail } from '@endo/errors';
+import { E } from '@endo/eventual-send';
 import { AmountMath, AmountShape, BrandShape, RatioShape } from '@agoric/ertp';
 import {
   CONTRACT_ELECTORATE,
@@ -29,14 +31,11 @@ import {
   InstanceHandleShape,
   InvitationShape,
 } from '@agoric/zoe/src/typeGuards.js';
-import { E } from '@endo/eventual-send';
 
 import { mustMatch } from '@agoric/store';
 import { makeCollectFeesInvitation } from '../collectFees.js';
 import { makeNatAmountShape } from '../contractSupport.js';
 
-const { Fail } = assert;
-
 /**
  * @file The Parity Stability Module supports efficiently minting/burning a
  *   stable token at a specified fixed ratio to a reference stable token, which
@@ -60,7 +59,10 @@ const { Fail } = assert;
  *   given by this contract
  */
 
-/** @import {Baggage} from '@agoric/vat-data' */
+/**
+ * @import {TypedPattern} from '@agoric/internal';
+ * @import {Baggage} from '@agoric/vat-data'
+ */
 
 /** @type {ContractMeta} */
 export const meta = {
@@ -175,9 +177,7 @@ export const start = async (zcf, privateArgs, baggage) => {
       E.when(E(privateArgs.storageNode).makeChildNode('metrics'), node =>
         makeRecorderKit(
           node,
-          /** @type {import('@agoric/zoe/src/contractSupport/recorder.js').TypedMatcher<MetricsNotification>} */ (
-            M.any()
-          ),
+          /** @type {TypedPattern<MetricsNotification>} */ (M.any()),
         ),
       ),
   });

package/src/reserve/assetReserveKit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assetReserveKit.d.ts","sourceRoot":"","sources":["assetReserveKit.js"],"names":[],"mappings":"AAmCO,gDARI,OAAO,kBAAkB,EAAE,OAAO,kDAClC;IACV,OAAW,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAC5B,eAAmB,EAAE,OAAO,6CAA6C,EAAE,eAAe,CAAC;IAC3F,WAAe,EAAE,WAAW,CAAC;IAC7B,GAAO,EAAE,GAAG,CAAC;CACV;;QAsEI,2BAA2B;kCAAf,KAAK;QAUjB;;;WAGG;gCAFQ,KAAK,WACL,OAAO;;;;QAqBlB;;;WAGG;6CAFQ,MAAM,CAAC,KAAK,CAAC,GACX,IAAI;;;QA6BjB;;;WAGG;0BAFQ,MAAM,WACN,MAAM;QAmBjB,8DAA8D;;;YA2D9D,uCAAuC;oDAA3B,MAAM,CAAC,KAAK,CAAC;YAWzB,uCAAuC;kDAA3B,MAAM,CAAC,KAAK,CAAC;;;IArD3B;;;OAGG;;QAED,mDAAmD;;;;;;;QAqCnD,uCAAuC;gDAA3B,MAAM,CAAC,KAAK,CAAC;QAWzB,uCAAuC;8CAA3B,MAAM,CAAC,KAAK,CAAC;;KA8BhC;;iBA7Qa,mBAAmB;;;;;sBACnB,MAAM,CAAC,KAAK,CAAC;;;;oBAEb,MAAM,CAAC,KAAK,CAAC;;;;oBACb,MAAM,CAAC,KAAK,CAAC;;8BA2Qb,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"assetReserveKit.d.ts","sourceRoot":"","sources":["assetReserveKit.js"],"names":[],"mappings":"AAqCO,gDARI,OAAO,kBAAkB,EAAE,OAAO,kDAClC;IACV,OAAW,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAC5B,eAAmB,EAAE,OAAO,6CAA6C,EAAE,eAAe,CAAC;IAC3F,WAAe,EAAE,WAAW,CAAC;IAC7B,GAAO,EAAE,GAAG,CAAC;CACV;;QAoEI,2BAA2B;kCAAf,KAAK;QAUjB;;;WAGG;gCAFQ,KAAK,WACL,OAAO;;;;QAqBlB;;;WAGG;6CAFQ,MAAM,CAAC,KAAK,CAAC,GACX,IAAI;;;QA6BjB;;;WAGG;0BAFQ,MAAM,WACN,MAAM;QAmBjB,8DAA8D;;;YA2D9D,uCAAuC;oDAA3B,MAAM,CAAC,KAAK,CAAC;YAWzB,uCAAuC;kDAA3B,MAAM,CAAC,KAAK,CAAC;;;IArD3B;;;OAGG;;QAED,mDAAmD;;;;;;;QAqCnD,uCAAuC;gDAA3B,MAAM,CAAC,KAAK,CAAC;QAWzB,uCAAuC;8CAA3B,MAAM,CAAC,KAAK,CAAC;;KA8BhC;;iBA3Qa,mBAAmB;;;;;sBACnB,MAAM,CAAC,KAAK,CAAC;;;;oBAEb,MAAM,CAAC,KAAK,CAAC;;;;oBACb,MAAM,CAAC,KAAK,CAAC;;8BAyQb,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC"}