@agoric/inter-protocol 0.16.2-dev-6d97bc4.0 → 0.16.2-dev-b84a426.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.16.2-dev-6d97bc4.0+6d97bc4",
+  "version": "0.16.2-dev-b84a426.0+b84a426",
   "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-6d97bc4.0+6d97bc4",
-    "@agoric/governance": "0.10.4-dev-6d97bc4.0+6d97bc4",
-    "@agoric/internal": "0.3.3-dev-6d97bc4.0+6d97bc4",
-    "@agoric/notifier": "0.6.3-dev-6d97bc4.0+6d97bc4",
-    "@agoric/store": "0.9.3-dev-6d97bc4.0+6d97bc4",
-    "@agoric/time": "0.3.3-dev-6d97bc4.0+6d97bc4",
-    "@agoric/vat-data": "0.5.3-dev-6d97bc4.0+6d97bc4",
-    "@agoric/vats": "0.15.2-dev-6d97bc4.0+6d97bc4",
-    "@agoric/zoe": "0.26.3-dev-6d97bc4.0+6d97bc4",
+    "@agoric/ertp": "0.16.3-dev-b84a426.0+b84a426",
+    "@agoric/governance": "0.10.4-dev-b84a426.0+b84a426",
+    "@agoric/internal": "0.3.3-dev-b84a426.0+b84a426",
+    "@agoric/notifier": "0.6.3-dev-b84a426.0+b84a426",
+    "@agoric/store": "0.9.3-dev-b84a426.0+b84a426",
+    "@agoric/time": "0.3.3-dev-b84a426.0+b84a426",
+    "@agoric/vat-data": "0.5.3-dev-b84a426.0+b84a426",
+    "@agoric/vats": "0.15.2-dev-b84a426.0+b84a426",
+    "@agoric/zoe": "0.26.3-dev-b84a426.0+b84a426",
     "@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-6d97bc4.0+6d97bc4",
-    "@agoric/swingset-liveslots": "0.10.3-dev-6d97bc4.0+6d97bc4",
-    "@agoric/swingset-vat": "0.32.3-dev-6d97bc4.0+6d97bc4",
-    "@agoric/zone": "0.2.3-dev-6d97bc4.0+6d97bc4",
+    "@agoric/smart-wallet": "0.5.4-dev-b84a426.0+b84a426",
+    "@agoric/swingset-liveslots": "0.10.3-dev-b84a426.0+b84a426",
+    "@agoric/swingset-vat": "0.32.3-dev-b84a426.0+b84a426",
+    "@agoric/zone": "0.2.3-dev-b84a426.0+b84a426",
     "@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": "6d97bc432b27a140805d9cdadb3b357f168ff018"
+  "gitHead": "b84a42624937988b1bbfb587d4c6cb2f79c5ae9f"
 }

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

@@ -1,4 +1,4 @@
-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 }: {
+export function addAuction({ consume: { auctioneerKit: legacyKitP, board, chainStorage, chainTimerService, economicCommitteeCreatorFacet: electorateCreatorFacet, priceAuthority, zoe, }, produce: { auctioneerKit: produceAuctioneerKit, auctionUpgradeNewInstance }, 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;
@@ -8,17 +8,17 @@ export function addAuction({ consume: { zoe, board, chainTimerService, priceAuth
 export const ADD_AUCTION_MANIFEST: {
     [x: string]: {
         consume: {
-            zoe: boolean;
+            auctioneerKit: boolean;
             board: boolean;
-            chainTimerService: boolean;
-            priceAuthority: boolean;
             chainStorage: boolean;
+            chainTimerService: boolean;
             economicCommitteeCreatorFacet: boolean;
-            auctioneerKit: boolean;
+            priceAuthority: boolean;
+            zoe: boolean;
         };
         produce: {
             auctioneerKit: boolean;
-            auctionsUpgradeComplete: boolean;
+            auctionUpgradeNewInstance: boolean;
         };
         instance: {
             consume: {
@@ -44,17 +44,17 @@ export function getManifestForAddAuction(_ign: object, addAuctionOptions: any):
     manifest: {
         [x: string]: {
             consume: {
-                zoe: boolean;
+                auctioneerKit: boolean;
                 board: boolean;
-                chainTimerService: boolean;
-                priceAuthority: boolean;
                 chainStorage: boolean;
+                chainTimerService: boolean;
                 economicCommitteeCreatorFacet: boolean;
-                auctioneerKit: boolean;
+                priceAuthority: boolean;
+                zoe: boolean;
             };
             produce: {
                 auctioneerKit: boolean;
-                auctionsUpgradeComplete: boolean;
+                auctionUpgradeNewInstance: boolean;
             };
             instance: {
                 consume: {
@@ -79,7 +79,7 @@ export function getManifestForAddAuction(_ign: object, addAuctionOptions: any):
     options: any;
 }>;
 export type interlockPowers = PromiseSpaceOf<{
-    auctionsUpgradeComplete: boolean;
+    auctionUpgradeNewInstance: Instance;
 }>;
 import { Stable } from '@agoric/internal/src/tokens.js';
 //# sourceMappingURL=add-auction.d.ts.map

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"add-auction.d.ts","sourceRoot":"","sources":["add-auction.js"],"names":[],"mappings":"AAmBO,wfAJI,OAAO,qBAAqB,EAAE,sBAAsB,GAC9D,eAAmB,eACT;IAAE,OAAO,EAAE;QAAE,WAAW,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,iBAwJ5D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4BG;AAQI,+CAHI,MAAM,qBACN,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAOb;8BA3MY,cAAc,CAAC;IAC3B,yBAA6B,EAAE,QAAQ,CAAC;CACrC,CAAC;uBARkB,gCAAgC"}

package/src/proposals/add-auction.js

@@ -8,7 +8,7 @@ const trace = makeTracer('NewAuction', true);
 
 /**
  * @typedef {PromiseSpaceOf<{
- *   auctionsUpgradeComplete: boolean;
+ *   auctionUpgradeNewInstance: Instance;
  * }>} interlockPowers
  */
 
@@ -20,15 +20,15 @@ const trace = makeTracer('NewAuction', true);
 export const addAuction = async (
   {
     consume: {
-      zoe,
+      auctioneerKit: legacyKitP,
       board,
-      chainTimerService,
-      priceAuthority,
       chainStorage,
+      chainTimerService,
       economicCommitteeCreatorFacet: electorateCreatorFacet,
-      auctioneerKit: legacyKitP,
+      priceAuthority,
+      zoe,
     },
-    produce: { auctioneerKit: produceAuctioneerKit, auctionsUpgradeComplete },
+    produce: { auctioneerKit: produceAuctioneerKit, auctionUpgradeNewInstance },
     instance: {
       consume: { reserve: reserveInstance },
     },
@@ -165,26 +165,24 @@ export const addAuction = async (
       governorAdminFacet: governorStartResult.adminFacet,
     }),
   );
-  // don't overwrite auctioneerKit or auction instance yet. Wait until
-  // upgrade-vault.js
 
-  auctionsUpgradeComplete.resolve(true);
+  auctionUpgradeNewInstance.resolve(governedInstance);
 };
 
 export const ADD_AUCTION_MANIFEST = harden({
   [addAuction.name]: {
     consume: {
-      zoe: true,
+      auctioneerKit: true,
       board: true,
-      chainTimerService: true,
-      priceAuthority: true,
       chainStorage: true,
+      chainTimerService: true,
       economicCommitteeCreatorFacet: true,
-      auctioneerKit: true,
+      priceAuthority: true,
+      zoe: true,
     },
     produce: {
       auctioneerKit: true,
-      auctionsUpgradeComplete: true,
+      auctionUpgradeNewInstance: true,
     },
     instance: {
       consume: { reserve: true },

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

@@ -1,4 +1,4 @@
-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 }: {
+export function upgradeVaults({ consume: { auctionUpgradeNewInstance, chainTimerService, economicCommitteeCreatorFacet: electorateCreatorFacet, reserveKit, vaultFactoryKit, zoe, }, produce: { auctionUpgradeNewInstance: auctionUpgradeNewInstanceProducer }, installation: { produce: { VaultFactory: produceVaultInstallation }, }, instance: { consume: { auctioneer: auctioneerInstanceP }, }, }: import("../../src/proposals/econ-behaviors").EconomyBootstrapPowers & interlockPowers, { options }: {
     options: {
         vaultsRef: {
             bundleID: string;
@@ -9,14 +9,15 @@ export function getManifestForUpgradeVaults(_ign: object, vaultUpgradeOptions: a
     manifest: {
         [x: string]: {
             consume: {
+                auctionUpgradeNewInstance: string;
+                chainTimerService: string;
                 economicCommitteeCreatorFacet: string;
                 reserveKit: string;
                 vaultFactoryKit: string;
                 zoe: string;
-                auctionsUpgradeComplete: string;
             };
             produce: {
-                auctionsUpgradeComplete: string;
+                auctionUpgradeNewInstance: string;
             };
             installation: {
                 produce: {
@@ -25,7 +26,7 @@ export function getManifestForUpgradeVaults(_ign: object, vaultUpgradeOptions: a
             };
             instance: {
                 consume: {
-                    auctioneer: string;
+                    auctioneer: boolean;
                 };
             };
         };
@@ -33,6 +34,6 @@ export function getManifestForUpgradeVaults(_ign: object, vaultUpgradeOptions: a
     options: any;
 }>;
 export type interlockPowers = PromiseSpaceOf<{
-    auctionsUpgradeComplete: boolean;
+    auctionUpgradeNewInstance: Instance;
 }>;
 //# sourceMappingURL=upgrade-vaults.d.ts.map

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"upgrade-vaults.d.ts","sourceRoot":"","sources":["upgrade-vaults.js"],"names":[],"mappings":"AAoBO,wYAJI,OAAO,oCAAoC,EAAE,sBAAsB,GAC7E,eAAqB,eACX;IAAE,OAAO,EAAE;QAAE,SAAS,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,iBAyJ1D;AASM,kDAHI,MAAM,uBACN,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwBZ;8BAhMW,cAAc,CAAC;IAC3B,yBAA6B,EAAE,QAAQ,CAAC;CACrC,CAAC"}

package/src/proposals/upgrade-vaults.js

@@ -2,12 +2,14 @@ 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 { Fail } from '@endo/errors';
+import { TimeMath } from '@agoric/time';
 
 const trace = makeTracer('upgrade Vaults proposal');
 
 /**
  * @typedef {PromiseSpaceOf<{
- *   auctionsUpgradeComplete: boolean;
+ *   auctionUpgradeNewInstance: Instance;
  * }>} interlockPowers
  */
 
@@ -19,13 +21,14 @@ const trace = makeTracer('upgrade Vaults proposal');
 export const upgradeVaults = async (
   {
     consume: {
-      vaultFactoryKit,
-      zoe,
+      auctionUpgradeNewInstance,
+      chainTimerService,
       economicCommitteeCreatorFacet: electorateCreatorFacet,
       reserveKit,
-      auctionsUpgradeComplete,
+      vaultFactoryKit,
+      zoe,
     },
-    produce: { auctionsUpgradeComplete: auctionsUpgradeCompleteProducer },
+    produce: { auctionUpgradeNewInstance: auctionUpgradeNewInstanceProducer },
     installation: {
       produce: { VaultFactory: produceVaultInstallation },
     },
@@ -52,8 +55,20 @@ export const upgradeVaults = async (
   produceVaultInstallation.reset();
   produceVaultInstallation.resolve(installationP);
 
-  await auctionsUpgradeComplete;
-  auctionsUpgradeCompleteProducer.reset();
+  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;
@@ -131,15 +146,14 @@ export const upgradeVaults = async (
       E.get(reserveKit).creatorFacet,
     ).makeShortfallReportingInvitation();
 
-    const [poserInvitation, auctioneerInstance] = await Promise.all([
-      E(electorateCreatorFacet).getPoserInvitation(),
-      auctioneerInstanceP,
-    ]);
+    const poserInvitation = await E(
+      electorateCreatorFacet,
+    ).getPoserInvitation();
 
     /** @type {import('../../src/vaultFactory/vaultFactory').VaultFactoryContract['privateArgs']} */
     const newPrivateArgs = harden({
       ...privateArgs,
-      auctioneerInstance,
+      auctioneerInstance: auctionNewInstance,
       initialPoserInvitation: poserInvitation,
       initialShortfallInvitation: shortfallInvitation,
       managerParams: managerParamValues,
@@ -171,17 +185,18 @@ export const getManifestForUpgradeVaults = async (
   manifest: {
     [upgradeVaults.name]: {
       consume: {
+        auctionUpgradeNewInstance: uV,
+        chainTimerService: uV,
         economicCommitteeCreatorFacet: uV,
         reserveKit: uV,
         vaultFactoryKit: uV,
         zoe: uV,
-        auctionsUpgradeComplete: uV,
       },
-      produce: { auctionsUpgradeComplete: uV },
+      produce: { auctionUpgradeNewInstance: uV },
       installation: {
         produce: { VaultFactory: true },
       },
-      instance: { consume: { auctioneer: uV } },
+      instance: { consume: { auctioneer: true } },
     },
   },
   options: { ...vaultUpgradeOptions },