@agoric/inter-protocol 0.16.2-dev-8376991.0 → 0.16.2-dev-a3826e9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.16.2-dev-8376991.0+8376991",
+  "version": "0.16.2-dev-a3826e9.0+a3826e9",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -31,16 +31,16 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-8376991.0+8376991",
-    "@agoric/ertp": "0.16.3-dev-8376991.0+8376991",
-    "@agoric/governance": "0.10.4-dev-8376991.0+8376991",
-    "@agoric/internal": "0.3.3-dev-8376991.0+8376991",
-    "@agoric/notifier": "0.6.3-dev-8376991.0+8376991",
-    "@agoric/store": "0.9.3-dev-8376991.0+8376991",
-    "@agoric/time": "0.3.3-dev-8376991.0+8376991",
-    "@agoric/vat-data": "0.5.3-dev-8376991.0+8376991",
-    "@agoric/vats": "0.15.2-dev-8376991.0+8376991",
-    "@agoric/zoe": "0.26.3-dev-8376991.0+8376991",
+    "@agoric/assert": "0.6.1-dev-a3826e9.0+a3826e9",
+    "@agoric/ertp": "0.16.3-dev-a3826e9.0+a3826e9",
+    "@agoric/governance": "0.10.4-dev-a3826e9.0+a3826e9",
+    "@agoric/internal": "0.3.3-dev-a3826e9.0+a3826e9",
+    "@agoric/notifier": "0.6.3-dev-a3826e9.0+a3826e9",
+    "@agoric/store": "0.9.3-dev-a3826e9.0+a3826e9",
+    "@agoric/time": "0.3.3-dev-a3826e9.0+a3826e9",
+    "@agoric/vat-data": "0.5.3-dev-a3826e9.0+a3826e9",
+    "@agoric/vats": "0.15.2-dev-a3826e9.0+a3826e9",
+    "@agoric/zoe": "0.26.3-dev-a3826e9.0+a3826e9",
     "@endo/captp": "^4.2.0",
     "@endo/eventual-send": "^1.2.2",
     "@endo/far": "^1.1.2",
@@ -50,10 +50,10 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/smart-wallet": "0.5.4-dev-8376991.0+8376991",
-    "@agoric/swingset-liveslots": "0.10.3-dev-8376991.0+8376991",
-    "@agoric/swingset-vat": "0.32.3-dev-8376991.0+8376991",
-    "@agoric/zone": "0.2.3-dev-8376991.0+8376991",
+    "@agoric/smart-wallet": "0.5.4-dev-a3826e9.0+a3826e9",
+    "@agoric/swingset-liveslots": "0.10.3-dev-a3826e9.0+a3826e9",
+    "@agoric/swingset-vat": "0.32.3-dev-a3826e9.0+a3826e9",
+    "@agoric/zone": "0.2.3-dev-a3826e9.0+a3826e9",
     "@endo/bundle-source": "^3.2.3",
     "@endo/init": "^1.1.2",
     "@endo/promise-kit": "^1.1.2",
@@ -84,5 +84,5 @@
   "typeCoverage": {
     "atLeast": 95.81
   },
-  "gitHead": "8376991ec400d2b4295832078381691e76c36777"
+  "gitHead": "a3826e91d9c4f33dd4ce384e7b5de1447f93cf98"
 }

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

@@ -1 +1 @@
-{"version":3,"file":"upgrade-vaults.d.ts","sourceRoot":"","sources":["upgrade-vaults.js"],"names":[],"mappings":"AA8BO,sCAHI,OAAO,oCAAoC,EAAE,sBAAsB,eACnE;IAAE,OAAO,EAAE;QAAE,SAAS,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,iBA+I1D;AASM,kDAHI,MAAM,uBACN,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;GAuBZ"}
+{"version":3,"file":"upgrade-vaults.d.ts","sourceRoot":"","sources":["upgrade-vaults.js"],"names":[],"mappings":"AAoCO,sCAHI,OAAO,oCAAoC,EAAE,sBAAsB,eACnE;IAAE,OAAO,EAAE;QAAE,SAAS,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,iBA0K1D;AASM,kDAHI,MAAM,uBACN,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;GAuBZ"}

package/src/proposals/upgrade-vaults.js

@@ -2,23 +2,29 @@ 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) {
-      promise.then(resolve);
+      void promise.then(resolve, () => {});
     }
     void Promise.allSettled(promises).then(results => {
-      const rejects = results.filter(({ status }) => status === 'rejected');
+      const rejects = /** @type {PromiseRejectedResult[]} */ (
+        results.filter(({ status }) => status === 'rejected')
+      );
       if (rejects.length === results.length) {
-        // @ts-expect-error TypeScript doesn't know enough
-        const messages = rejects.map(({ message }) => message);
+        const messages = rejects.map(
+          ({ reason: { message } }) => message || 'no error message',
+        );
         const aggregate = new Error(messages.join(';'));
-        // @ts-expect-error TypeScript doesn't know enough
-        aggregate.errors = rejects.map(({ reason }) => reason);
+        /** @type {any} */ (aggregate).errors = rejects.map(
+          ({ reason }) => reason,
+        );
         reject(aggregate);
       }
     });
@@ -139,15 +145,34 @@ export const upgradeVaults = async (powers, { options }) => {
       newPrivateArgs,
     );
 
-    console.log('upgraded vaultFactory.', upgradeResult);
+    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(brand =>
-        E(priceAuthority).quoteGiven(AmountMath.make(brand, 10n), istBrand),
-      ),
+      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);
@@ -165,6 +190,14 @@ export const upgradeVaults = async (powers, { options }) => {
         // @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 || []),
+      );
     },
   );