@agoric/inter-protocol 0.16.2-dev-c4520c5.0 → 0.16.2-dev-aaa0def.0

package/package.json

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

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: { newAuctioneerKit }, instance: { consume: { reserve: reserveInstance }, }, installation: { consume: { auctioneer: auctionInstallation, contractGovernor: contractGovernorInstallation, }, }, issuer: { consume: { [Stable.symbol]: stableIssuerP }, }, }: import("./econ-behaviors.js").EconomyBootstrapPowers): Promise<void>;
+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 const ADD_AUCTION_MANIFEST: {
     [x: string]: {
         consume: {
@@ -12,6 +12,7 @@ export const ADD_AUCTION_MANIFEST: {
         };
         produce: {
             newAuctioneerKit: boolean;
+            auctionsUpgradeComplete: boolean;
         };
         instance: {
             consume: {
@@ -45,6 +46,7 @@ export function getManifestForAddAuction(): Promise<{
             };
             produce: {
                 newAuctioneerKit: boolean;
+                auctionsUpgradeComplete: boolean;
             };
             instance: {
                 consume: {
@@ -65,5 +67,8 @@ export function getManifestForAddAuction(): Promise<{
         };
     };
 }>;
+export type interlockPowers = PromiseSpaceOf<{
+    auctionsUpgradeComplete: boolean;
+}>;
 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":"AASO,8bADK,OAAO,qBAAqB,EAAE,sBAAsB,iBAyI/D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2BG;AAGI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAEN;uBAhLsB,gCAAgC"}
+{"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"}

package/src/proposals/add-auction.js

@@ -6,7 +6,16 @@ import { makeGovernedTerms as makeGovernedATerms } from '../auction/params.js';
 
 const trace = makeTracer('NewAuction', true);
 
-/** @param {import('./econ-behaviors.js').EconomyBootstrapPowers} powers */
+/**
+ * @typedef {PromiseSpaceOf<{
+ *   auctionsUpgradeComplete: boolean;
+ * }>} interlockPowers
+ */
+
+/**
+ * @param {import('./econ-behaviors.js').EconomyBootstrapPowers &
+ *   interlockPowers} powers
+ */
 export const addAuction = async ({
   consume: {
     zoe,
@@ -17,7 +26,7 @@ export const addAuction = async ({
     economicCommitteeCreatorFacet: electorateCreatorFacet,
     auctioneerKit: legacyKitP,
   },
-  produce: { newAuctioneerKit },
+  produce: { newAuctioneerKit, auctionsUpgradeComplete },
   instance: {
     consume: { reserve: reserveInstance },
   },
@@ -143,6 +152,8 @@ export const addAuction = async ({
   );
   // don't overwrite auctioneerKit or auction instance yet. Wait until
   // upgrade-vault.js
+
+  auctionsUpgradeComplete.resolve(true);
 };
 
 export const ADD_AUCTION_MANIFEST = harden({
@@ -158,6 +169,7 @@ export const ADD_AUCTION_MANIFEST = harden({
     },
     produce: {
       newAuctioneerKit: true,
+      auctionsUpgradeComplete: true,
     },
     instance: {
       consume: { reserve: true },

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

@@ -1,4 +1,4 @@
-export function upgradeVaults(powers: import("../../src/proposals/econ-behaviors").EconomyBootstrapPowers, { options }: {
+export function upgradeVaults(powers: import("../../src/proposals/econ-behaviors").EconomyBootstrapPowers & interlockPowers, { options }: {
     options: {
         vaultsRef: {
             bundleID: string;
@@ -17,10 +17,12 @@ export function getManifestForUpgradeVaults(_ign: object, vaultUpgradeOptions: a
                 vaultFactoryKit: string;
                 board: string;
                 zoe: string;
+                auctionsUpgradeComplete: string;
             };
             produce: {
                 auctioneerKit: string;
                 newAuctioneerKit: string;
+                auctionsUpgradeComplete: string;
             };
             instance: {
                 produce: {
@@ -32,4 +34,7 @@ export function getManifestForUpgradeVaults(_ign: object, vaultUpgradeOptions: a
     };
     options: any;
 }>;
+export type interlockPowers = PromiseSpaceOf<{
+    auctionsUpgradeComplete: boolean;
+}>;
 //# 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":"AAoCO,sCAHI,OAAO,oCAAoC,EAAE,sBAAsB,eACnE;IAAE,OAAO,EAAE;QAAE,SAAS,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,iBA6M1D;AASM,kDAHI,MAAM,uBACN,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;GAuBZ"}
+{"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"}

package/src/proposals/upgrade-vaults.js

@@ -31,7 +31,14 @@ const any = promises =>
   });
 
 /**
- * @param {import('../../src/proposals/econ-behaviors').EconomyBootstrapPowers} powers
+ * @typedef {PromiseSpaceOf<{
+ *   auctionsUpgradeComplete: boolean;
+ * }>} interlockPowers
+ */
+
+/**
+ * @param {import('../../src/proposals/econ-behaviors').EconomyBootstrapPowers &
+ *     interlockPowers} powers
  * @param {{ options: { vaultsRef: { bundleID: string } } }} options
  */
 export const upgradeVaults = async (powers, { options }) => {
@@ -44,10 +51,12 @@ export const upgradeVaults = async (powers, { options }) => {
       zoe,
       economicCommitteeCreatorFacet: electorateCreatorFacet,
       reserveKit,
+      auctionsUpgradeComplete,
     },
     produce: {
       auctioneerKit: auctioneerKitProducer,
       newAuctioneerKit: tempAuctioneerKit,
+      auctionsUpgradeComplete: auctionsUpgradeCompleteProducer,
     },
     instance: {
       produce: { auctioneer: auctioneerProducer },
@@ -68,7 +77,10 @@ export const upgradeVaults = async (powers, { options }) => {
    * >}
    */
   let installationP;
-  await null;
+
+  await auctionsUpgradeComplete;
+  auctionsUpgradeCompleteProducer.reset();
+
   if (vaultsRef) {
     if (bundleID) {
       installationP = E(zoe).installBundleID(bundleID);
@@ -261,8 +273,13 @@ export const getManifestForUpgradeVaults = async (
         vaultFactoryKit: uV,
         board: uV,
         zoe: uV,
+        auctionsUpgradeComplete: uV,
+      },
+      produce: {
+        auctioneerKit: uV,
+        newAuctioneerKit: uV,
+        auctionsUpgradeComplete: uV,
       },
-      produce: { auctioneerKit: uV, newAuctioneerKit: uV },
       instance: { produce: { auctioneer: uV, newAuctioneerKit: uV } },
     },
   },