@agoric/inter-protocol 0.16.2-dev-c42dff3.0 → 0.16.2-dev-3601b6c.0

package/package.json

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

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

@@ -1,10 +1,4 @@
-export function addAuction({ consume: { agoricNamesAdmin, auctioneerKit: legacyKitP, board, chainStorage, chainTimerService, economicCommitteeCreatorFacet: electorateCreatorFacet, econCharterKit, priceAuthority8400, zoe, }, produce: { auctioneerKit: produceAuctioneerKit, auctionUpgradeNewInstance }, instance: { consume: { reserve: reserveInstance }, produce: { auctioneer: auctionInstance }, }, 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 function addAuction({ consume: { agoricNamesAdmin, auctioneerKit: legacyKitP, board, chainStorage, chainTimerService, economicCommitteeCreatorFacet: electorateCreatorFacet, econCharterKit, priceAuthority8400, zoe, }, produce: { auctioneerKit: produceAuctioneerKit, auctionUpgradeNewInstance }, instance: { consume: { reserve: reserveInstance }, produce: { auctioneer: auctionInstance }, }, installation: { consume: { auctioneer: auctioneerInstallationP, contractGovernor: governorInstallationP, }, }, issuer: { consume: { [Stable.symbol]: stableIssuerP }, }, }: import("./econ-behaviors.js").EconomyBootstrapPowers & interlockPowers): Promise<void>;
 export const ADD_AUCTION_MANIFEST: {
     [x: string]: {
         consume: {
@@ -33,8 +27,6 @@ export const ADD_AUCTION_MANIFEST: {
         installation: {
             consume: {
                 contractGovernor: boolean;
-            };
-            produce: {
                 auctioneer: boolean;
             };
         };
@@ -45,7 +37,9 @@ export const ADD_AUCTION_MANIFEST: {
         };
     };
 };
-export function getManifestForAddAuction(_ign: object, addAuctionOptions: any): Promise<{
+export function getManifestForAddAuction({ restoreRef }: {
+    restoreRef: any;
+}, { auctioneerRef, contractGovernorRef }: any): Promise<{
     manifest: {
         [x: string]: {
             consume: {
@@ -74,8 +68,6 @@ export function getManifestForAddAuction(_ign: object, addAuctionOptions: any):
             installation: {
                 consume: {
                     contractGovernor: boolean;
-                };
-                produce: {
                     auctioneer: boolean;
                 };
             };
@@ -86,7 +78,14 @@ export function getManifestForAddAuction(_ign: object, addAuctionOptions: any):
             };
         };
     };
-    options: any;
+    options: {
+        auctioneerRef: any;
+        contractGovernorRef: any;
+    };
+    installations: {
+        auctioneer: any;
+        contractGovernor: any;
+    };
 }>;
 export type interlockPowers = PromiseSpaceOf<{
     auctionUpgradeNewInstance: Instance;

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,wkBAJI,OAAO,qBAAqB,EAAE,sBAAsB,GAC1D,eAAe,eACT;IAAE,OAAO,EAAE;QAAE,WAAW,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,iBA0K5D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+BG;AAQI,+CAHI,MAAM,qBACN,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAOb;8BAhOY,cAAc,CAAC;IACvB,yBAAyB,EAAE,QAAQ,CAAC;CACrC,CAAC;uBARkB,gCAAgC"}
+{"version":3,"file":"add-auction.d.ts","sourceRoot":"","sources":["add-auction.js"],"names":[],"mappings":"AAkBO,yjBAHI,OAAO,qBAAqB,EAAE,sBAAsB,GAC1D,eAAe,iBAqKnB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4BG;AASI,yDAHJ;IAAmB,UAAU,EAArB,GAAG;CACX,0CAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAcb;8BA/NY,cAAc,CAAC;IACvB,yBAAyB,EAAE,QAAQ,CAAC;CACrC,CAAC;uBARkB,gCAAgC"}

package/src/proposals/add-auction.js

@@ -15,61 +15,52 @@ const trace = makeTracer('NewAuction', true);
 /**
  * @param {import('./econ-behaviors.js').EconomyBootstrapPowers &
  *   interlockPowers} powers
- * @param {{ options: { auctionsRef: { bundleID: string } } }} options
  */
-export const addAuction = async (
-  {
+export const addAuction = async ({
+  consume: {
+    agoricNamesAdmin,
+    auctioneerKit: legacyKitP,
+    board,
+    chainStorage,
+    chainTimerService,
+    economicCommitteeCreatorFacet: electorateCreatorFacet,
+    econCharterKit,
+    priceAuthority8400,
+    zoe,
+  },
+  produce: { auctioneerKit: produceAuctioneerKit, auctionUpgradeNewInstance },
+  instance: {
+    consume: { reserve: reserveInstance },
+    produce: { auctioneer: auctionInstance },
+  },
+  installation: {
     consume: {
-      agoricNamesAdmin,
-      auctioneerKit: legacyKitP,
-      board,
-      chainStorage,
-      chainTimerService,
-      economicCommitteeCreatorFacet: electorateCreatorFacet,
-      econCharterKit,
-      priceAuthority8400,
-      zoe,
-    },
-    produce: { auctioneerKit: produceAuctioneerKit, auctionUpgradeNewInstance },
-    instance: {
-      consume: { reserve: reserveInstance },
-      produce: { auctioneer: auctionInstance },
-    },
-    installation: {
-      consume: { contractGovernor: contractGovernorInstallation },
-      produce: { auctioneer: produceInstallation },
-    },
-    issuer: {
-      consume: { [Stable.symbol]: stableIssuerP },
+      auctioneer: auctioneerInstallationP,
+      contractGovernor: governorInstallationP,
     },
   },
-  { options },
-) => {
-  trace('addAuction start', options);
+  issuer: {
+    consume: { [Stable.symbol]: stableIssuerP },
+  },
+}) => {
+  trace('addAuction start');
   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,
     electorateInvitationAmount,
     stableIssuer,
     legacyKit,
+    auctioneerInstallation,
+    governorInstallation,
   ] = await Promise.all([
     poserInvitationP,
     E(E(zoe).getInvitationIssuer()).getAmountOf(poserInvitationP),
     stableIssuerP,
     legacyKitP,
+    auctioneerInstallationP,
+    governorInstallationP,
   ]);
 
   // Each field has an extra layer of type +  value:
@@ -104,12 +95,10 @@ export const addAuction = async (
     },
   );
 
-  const installation = await installationP;
-
   const governorTerms = await deeplyFulfilledObject(
     harden({
       timer: chainTimerService,
-      governedContractInstallation: installation,
+      governedContractInstallation: auctioneerInstallation,
       governed: {
         terms: auctionTerms,
         issuerKeywordRecord: { Bid: stableIssuer },
@@ -120,9 +109,9 @@ export const addAuction = async (
     }),
   );
 
-  /** @type {GovernorStartedInstallationKit<typeof installationP>} */
+  /** @type {GovernorStartedInstallationKit<typeof auctioneerInstallationP>} */
   const governorStartResult = await E(zoe).startInstance(
-    contractGovernorInstallation,
+    governorInstallation,
     undefined,
     governorTerms,
     harden({
@@ -136,12 +125,17 @@ export const addAuction = async (
     'auctioneer.governor',
   );
 
-  const [governedInstance, governedCreatorFacet, governedPublicFacet] =
-    await Promise.all([
-      E(governorStartResult.creatorFacet).getInstance(),
-      E(governorStartResult.creatorFacet).getCreatorFacet(),
-      E(governorStartResult.creatorFacet).getPublicFacet(),
-    ]);
+  const [
+    governedInstance,
+    governedCreatorFacet,
+    governedPublicFacet,
+    governedAdminFacet,
+  ] = await Promise.all([
+    E(governorStartResult.creatorFacet).getInstance(),
+    E(governorStartResult.creatorFacet).getCreatorFacet(),
+    E(governorStartResult.creatorFacet).getPublicFacet(),
+    E(governorStartResult.creatorFacet).getAdminFacet(),
+  ]);
 
   const allIssuers = await E(zoe).getIssuers(legacyKit.instance);
   const { Bid: _istIssuer, ...auctionIssuers } = allIssuers;
@@ -157,7 +151,7 @@ export const addAuction = async (
   const kit = harden({
     label: 'auctioneer',
     creatorFacet: governedCreatorFacet,
-    adminFacet: governorStartResult.adminFacet,
+    adminFacet: governedAdminFacet,
     publicFacet: governedPublicFacet,
     instance: governedInstance,
 
@@ -209,10 +203,7 @@ export const ADD_AUCTION_MANIFEST = harden({
       produce: { auctioneer: true },
     },
     installation: {
-      consume: {
-        contractGovernor: true,
-      },
-      produce: { auctioneer: true },
+      consume: { contractGovernor: true, auctioneer: true },
     },
     issuer: {
       consume: { [Stable.symbol]: true },
@@ -223,12 +214,20 @@ export const ADD_AUCTION_MANIFEST = harden({
 /**
  * Add a new auction to a chain that already has one.
  *
- * @param {object} _ign
+ * @param {object} utils
+ * @param {any} utils.restoreRef
  * @param {any} addAuctionOptions
  */
-export const getManifestForAddAuction = async (_ign, addAuctionOptions) => {
+export const getManifestForAddAuction = async (
+  { restoreRef },
+  { auctioneerRef, contractGovernorRef },
+) => {
   return {
     manifest: ADD_AUCTION_MANIFEST,
-    options: addAuctionOptions,
+    options: { auctioneerRef, contractGovernorRef },
+    installations: {
+      auctioneer: restoreRef(auctioneerRef),
+      contractGovernor: restoreRef(contractGovernorRef),
+    },
   };
 };

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

@@ -1,11 +1,16 @@
-export function upgradeVaults({ consume: { auctionUpgradeNewInstance, chainTimerService, economicCommitteeCreatorFacet: electorateCreatorFacet, reserveKit, vaultFactoryKit, zoe, priceAuthority8400, }, produce: { auctionUpgradeNewInstance: auctionUpgradeNewInstanceProducer }, 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, priceAuthority8400, }, produce: { auctionUpgradeNewInstance: auctionUpgradeNewInstanceProducer }, instance: { consume: { auctioneer: auctioneerInstanceP }, }, }: import("../../src/proposals/econ-behaviors").EconomyBootstrapPowers & interlockPowers, { options: { VaultFactoryBundle: vaultBundleRef, contractGovernorBundle } }: {
     options: {
-        vaultsRef: {
+        VaultFactoryBundle: {
+            bundleID: string;
+        };
+        contractGovernorBundle: {
             bundleID: string;
         };
     };
 }): Promise<void>;
-export function getManifestForUpgradeVaults(_ign: object, vaultUpgradeOptions: any): Promise<{
+export function getManifestForUpgradeVaults({ restoreRef }: {
+    restoreRef: any;
+}, { VaultFactoryRef, contractGovernorRef }: any): Promise<{
     manifest: {
         [x: string]: {
             consume: {
@@ -20,19 +25,21 @@ export function getManifestForUpgradeVaults(_ign: object, vaultUpgradeOptions: a
             produce: {
                 auctionUpgradeNewInstance: string;
             };
-            installation: {
-                produce: {
-                    VaultFactory: boolean;
-                };
-            };
             instance: {
                 consume: {
-                    auctioneer: boolean;
+                    auctioneer: string;
                 };
             };
         };
     };
-    options: any;
+    installations: {
+        VaultFactory: any;
+        contractGovernor: any;
+    };
+    options: {
+        VaultFactoryBundle: any;
+        contractGovernorBundle: any;
+    };
 }>;
 export type interlockPowers = PromiseSpaceOf<{
     priceAuthority8400: Instance;

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

@@ -1 +1 @@
-{"version":3,"file":"upgrade-vaults.d.ts","sourceRoot":"","sources":["upgrade-vaults.js"],"names":[],"mappings":"AAoBO,4ZAJI,OAAO,oCAAoC,EAAE,sBAAsB,GACvE,eAAe,eACX;IAAE,OAAO,EAAE;QAAE,SAAS,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,iBA2J1D;AASM,kDAHI,MAAM,uBACN,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyBZ;8BApMW,cAAc,CAAC;IACvB,kBAAkB,EAAE,QAAQ,CAAC;IAC7B,yBAAyB,EAAE,QAAQ,CAAC;CACrC,CAAC"}
+{"version":3,"file":"upgrade-vaults.d.ts","sourceRoot":"","sources":["upgrade-vaults.js"],"names":[],"mappings":"AAyBO,oVATI,OAAO,oCAAoC,EAAE,sBAAsB,GACvE,eAAe,+EACX;IACN,OAAO,EAAE;QACP,kBAAkB,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC;QACzC,sBAAsB,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC;KAC9C,CAAC;CACH,iBA6IH;AAUM,4DAHJ;IAAmB,UAAU,EAArB,GAAG;CACX,4CAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+Bb;8BAlMY,cAAc,CAAC;IACvB,kBAAkB,EAAE,QAAQ,CAAC;IAC7B,yBAAyB,EAAE,QAAQ,CAAC;CACrC,CAAC"}

package/src/proposals/upgrade-vaults.js

@@ -16,7 +16,12 @@ const trace = makeTracer('upgrade Vaults proposal');
 /**
  * @param {import('../../src/proposals/econ-behaviors').EconomyBootstrapPowers &
  *     interlockPowers} powers
- * @param {{ options: { vaultsRef: { bundleID: string } } }} options
+ * @param {{
+ *   options: {
+ *     VaultFactoryBundle: { bundleID: string };
+ *     contractGovernorBundle: { bundleID: string };
+ *   };
+ * }} options
  */
 export const upgradeVaults = async (
   {
@@ -30,16 +35,12 @@ export const upgradeVaults = async (
       priceAuthority8400,
     },
     produce: { auctionUpgradeNewInstance: auctionUpgradeNewInstanceProducer },
-    installation: {
-      produce: { VaultFactory: produceVaultInstallation },
-    },
     instance: {
       consume: { auctioneer: auctioneerInstanceP },
     },
   },
-  { options },
+  { options: { VaultFactoryBundle: vaultBundleRef, contractGovernorBundle } },
 ) => {
-  const { vaultsRef } = options;
   const kit = await vaultFactoryKit;
   const { instance: directorInstance } = kit;
   const allBrands = await E(zoe).getBrands(directorInstance);
@@ -47,17 +48,6 @@ export const upgradeVaults = async (
 
   await priceAuthority8400;
 
-  const bundleID = vaultsRef.bundleID;
-  console.log(`upgradeVaults: bundleId`, bundleID);
-  /**
-   * @type {Promise<
-   *   Installation<import('../../src/vaultFactory/vaultFactory.js')['start']>
-   * >}
-   */
-  const installationP = E(zoe).installBundleID(bundleID);
-  produceVaultInstallation.reset();
-  produceVaultInstallation.resolve(installationP);
-
   const [auctionOldInstance, auctionNewInstance] = await Promise.all([
     auctioneerInstanceP,
     auctionUpgradeNewInstance,
@@ -149,7 +139,7 @@ export const upgradeVaults = async (
     });
 
     const upgradeResult = await E(kit.adminFacet).upgradeContract(
-      bundleID,
+      vaultBundleRef.bundleID,
       newPrivateArgs,
     );
 
@@ -162,8 +152,9 @@ export const upgradeVaults = async (
   trace('restarting governor');
 
   const ecf = await electorateCreatorFacet;
-  // restart vaultFactory governor
-  await E(kit.governorAdminFacet).restartContract(
+  // upgrade vaultFactory governor. Won't be needed next time: see #10063
+  await E(kit.governorAdminFacet).upgradeContract(
+    contractGovernorBundle.bundleID,
     harden({
       electorateCreatorFacet: ecf,
       governed: vaultFactoryPrivateArgs,
@@ -177,30 +168,37 @@ const uV = 'upgradeVaults';
 /**
  * Return the manifest, installations, and options for upgrading Vaults.
  *
- * @param {object} _ign
+ * @param {object} utils
+ * @param {any} utils.restoreRef
  * @param {any} vaultUpgradeOptions
  */
 export const getManifestForUpgradeVaults = async (
-  _ign,
-  vaultUpgradeOptions,
-) => ({
-  manifest: {
-    [upgradeVaults.name]: {
-      consume: {
-        priceAuthority8400: uV,
-        auctionUpgradeNewInstance: uV,
-        chainTimerService: uV,
-        economicCommitteeCreatorFacet: uV,
-        reserveKit: uV,
-        vaultFactoryKit: uV,
-        zoe: uV,
-      },
-      produce: { auctionUpgradeNewInstance: uV },
-      installation: {
-        produce: { VaultFactory: true },
+  { restoreRef },
+  { VaultFactoryRef, contractGovernorRef },
+) => {
+  return {
+    manifest: {
+      [upgradeVaults.name]: {
+        consume: {
+          priceAuthority8400: uV,
+          auctionUpgradeNewInstance: uV,
+          chainTimerService: uV,
+          economicCommitteeCreatorFacet: uV,
+          reserveKit: uV,
+          vaultFactoryKit: uV,
+          zoe: uV,
+        },
+        produce: { auctionUpgradeNewInstance: uV },
+        instance: { consume: { auctioneer: uV } },
       },
-      instance: { consume: { auctioneer: true } },
     },
-  },
-  options: { ...vaultUpgradeOptions },
-});
+    installations: {
+      VaultFactory: restoreRef(VaultFactoryRef),
+      contractGovernor: restoreRef(contractGovernorRef),
+    },
+    options: {
+      VaultFactoryBundle: VaultFactoryRef,
+      contractGovernorBundle: contractGovernorRef,
+    },
+  };
+};