@agoric/inter-protocol 0.16.2-dev-1ac26b7.0 → 0.16.2-dev-4a33acc.0

package/package.json

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

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

@@ -1,4 +1,11 @@
-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 function addAuction({ consume: { agoricNamesAdmin, auctioneerKit: legacyKitP, board, chainStorage, chainTimerService, economicCommitteeCreatorFacet: electorateCreatorFacet, econCharterKit, priceAuthority8400, zoe, }, produce: { auctioneerKit: produceAuctioneerKit, auctionUpgradeNewInstance, newContractGovBundleId, }, instance: { consume: { reserve: reserveInstance }, produce: { auctioneer: auctionInstance }, }, installation: { consume: { auctioneer: auctioneerInstallationP }, }, issuer: { consume: { [Stable.symbol]: stableIssuerP }, }, }: import("./econ-behaviors.js").EconomyBootstrapPowers & interlockPowers, { options: { contractGovernorRef: contractGovernorBundle, contractGovernorInstallation, }, }: {
+    options: {
+        contractGovernorRef: {
+            bundleID: string;
+        };
+        contractGovernorInstallation: Installation;
+    };
+}): Promise<void>;
 export const ADD_AUCTION_MANIFEST: {
     [x: string]: {
         consume: {
@@ -15,6 +22,7 @@ export const ADD_AUCTION_MANIFEST: {
         produce: {
             auctioneerKit: boolean;
             auctionUpgradeNewInstance: boolean;
+            newContractGovBundleId: boolean;
         };
         instance: {
             consume: {
@@ -56,6 +64,7 @@ export function getManifestForAddAuction({ restoreRef }: {
             produce: {
                 auctioneerKit: boolean;
                 auctionUpgradeNewInstance: boolean;
+                newContractGovBundleId: boolean;
             };
             instance: {
                 consume: {
@@ -79,8 +88,8 @@ export function getManifestForAddAuction({ restoreRef }: {
         };
     };
     options: {
-        auctioneerRef: any;
         contractGovernorRef: any;
+        contractGovernorInstallation: any;
     };
     installations: {
         auctioneer: any;
@@ -89,6 +98,7 @@ export function getManifestForAddAuction({ restoreRef }: {
 }>;
 export type interlockPowers = PromiseSpaceOf<{
     auctionUpgradeNewInstance: Instance;
+    newContractGovBundleId: string;
 }>;
 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":"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"}
+{"version":3,"file":"add-auction.d.ts","sourceRoot":"","sources":["add-auction.js"],"names":[],"mappings":"AAyBO,wiBATI,OAAO,qBAAqB,EAAE,sBAAsB,GAC1D,eAAe,gGACT;IACN,OAAO,EAAE;QACP,mBAAmB,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC;QAC1C,4BAA4B,EAAE,YAAY,CAAC;KAC5C,CAAC;CACH,iBAkLH;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6BG;AASI,yDAHJ;IAAmB,UAAU,EAArB,GAAG;CACX,0CAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiBb;8BAvPY,cAAc,CAAC;IACvB,yBAAyB,EAAE,QAAQ,CAAC;IACpC,sBAAsB,EAAE,MAAM,CAAC;CAChC,CAAC;uBATkB,gCAAgC"}

package/src/proposals/add-auction.js

@@ -9,40 +9,56 @@ const trace = makeTracer('NewAuction', true);
 /**
  * @typedef {PromiseSpaceOf<{
  *   auctionUpgradeNewInstance: Instance;
+ *   newContractGovBundleId: string;
  * }>} interlockPowers
  */
 
 /**
  * @param {import('./econ-behaviors.js').EconomyBootstrapPowers &
  *   interlockPowers} powers
+ * @param {{
+ *   options: {
+ *     contractGovernorRef: { bundleID: string };
+ *     contractGovernorInstallation: Installation;
+ *   };
+ * }} options
  */
-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: {
+export const addAuction = async (
+  {
     consume: {
-      auctioneer: auctioneerInstallationP,
-      contractGovernor: governorInstallationP,
+      agoricNamesAdmin,
+      auctioneerKit: legacyKitP,
+      board,
+      chainStorage,
+      chainTimerService,
+      economicCommitteeCreatorFacet: electorateCreatorFacet,
+      econCharterKit,
+      priceAuthority8400,
+      zoe,
+    },
+    produce: {
+      auctioneerKit: produceAuctioneerKit,
+      auctionUpgradeNewInstance,
+      newContractGovBundleId,
+    },
+    instance: {
+      consume: { reserve: reserveInstance },
+      produce: { auctioneer: auctionInstance },
+    },
+    installation: {
+      consume: { auctioneer: auctioneerInstallationP },
+    },
+    issuer: {
+      consume: { [Stable.symbol]: stableIssuerP },
     },
   },
-  issuer: {
-    consume: { [Stable.symbol]: stableIssuerP },
+  {
+    options: {
+      contractGovernorRef: contractGovernorBundle,
+      contractGovernorInstallation,
+    },
   },
-}) => {
+) => {
   trace('addAuction start');
   const STORAGE_PATH = 'auction';
 
@@ -53,14 +69,12 @@ export const addAuction = async ({
     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:
@@ -109,9 +123,14 @@ export const addAuction = async ({
     }),
   );
 
+  const bundleIdFromZoe = await E(zoe).getBundleIDFromInstallation(
+    contractGovernorInstallation,
+  );
+  trace('governor bundle ID', bundleIdFromZoe, contractGovernorBundle.bundleID);
+
   /** @type {GovernorStartedInstallationKit<typeof auctioneerInstallationP>} */
   const governorStartResult = await E(zoe).startInstance(
-    governorInstallation,
+    contractGovernorInstallation,
     undefined,
     governorTerms,
     harden({
@@ -179,6 +198,7 @@ export const addAuction = async ({
   );
 
   auctionUpgradeNewInstance.resolve(governedInstance);
+  newContractGovBundleId.resolve(contractGovernorBundle.bundleID);
 };
 
 export const ADD_AUCTION_MANIFEST = harden({
@@ -197,6 +217,7 @@ export const ADD_AUCTION_MANIFEST = harden({
     produce: {
       auctioneerKit: true,
       auctionUpgradeNewInstance: true,
+      newContractGovBundleId: true,
     },
     instance: {
       consume: { reserve: true },
@@ -222,9 +243,12 @@ export const getManifestForAddAuction = async (
   { restoreRef },
   { auctioneerRef, contractGovernorRef },
 ) => {
+  const contractGovernorInstallation = restoreRef(contractGovernorRef);
   return {
     manifest: ADD_AUCTION_MANIFEST,
-    options: { auctioneerRef, contractGovernorRef },
+    // XXX we should be able to receive contractGovernorInstallation via
+    // installations.consume, but the received installation isn't right.
+    options: { contractGovernorRef, contractGovernorInstallation },
     installations: {
       auctioneer: restoreRef(auctioneerRef),
       contractGovernor: restoreRef(contractGovernorRef),

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

@@ -1,16 +1,13 @@
-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 } }: {
+export function upgradeVaults({ consume: { auctionUpgradeNewInstance, chainTimerService, economicCommitteeCreatorFacet: electorateCreatorFacet, reserveKit, vaultFactoryKit, zoe, priceAuthority8400, newContractGovBundleId: newContractGovBundleIdP, }, produce: { auctionUpgradeNewInstance: auctionUpgradeNewInstanceProducer, newContractGovBundleId: newContractGovBundleIdErasor, }, instance: { consume: { auctioneer: auctioneerInstanceP }, }, }: import("../../src/proposals/econ-behaviors").EconomyBootstrapPowers & interlockPowers, { options: { VaultFactoryBundle: vaultBundleRef } }: {
     options: {
         VaultFactoryBundle: {
             bundleID: string;
         };
-        contractGovernorBundle: {
-            bundleID: string;
-        };
     };
 }): Promise<void>;
 export function getManifestForUpgradeVaults({ restoreRef }: {
     restoreRef: any;
-}, { VaultFactoryRef, contractGovernorRef }: any): Promise<{
+}, { VaultFactoryRef }: any): Promise<{
     manifest: {
         [x: string]: {
             consume: {
@@ -21,9 +18,11 @@ export function getManifestForUpgradeVaults({ restoreRef }: {
                 reserveKit: string;
                 vaultFactoryKit: string;
                 zoe: string;
+                newContractGovBundleId: string;
             };
             produce: {
                 auctionUpgradeNewInstance: string;
+                newContractGovBundleId: string;
             };
             instance: {
                 consume: {
@@ -34,15 +33,14 @@ export function getManifestForUpgradeVaults({ restoreRef }: {
     };
     installations: {
         VaultFactory: any;
-        contractGovernor: any;
     };
     options: {
         VaultFactoryBundle: any;
-        contractGovernorBundle: any;
     };
 }>;
 export type interlockPowers = PromiseSpaceOf<{
     priceAuthority8400: Instance;
     auctionUpgradeNewInstance: Instance;
+    newContractGovBundleId: string;
 }>;
 //# 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":"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"}
+{"version":3,"file":"upgrade-vaults.d.ts","sourceRoot":"","sources":["upgrade-vaults.js"],"names":[],"mappings":"AAyBO,4bARI,OAAO,oCAAoC,EAAE,sBAAsB,GACvE,eAAe,uDACX;IACN,OAAO,EAAE;QACP,kBAAkB,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC;KAC1C,CAAC;CACH,iBAsJH;AAUM,4DAHJ;IAAmB,UAAU,EAArB,GAAG;CACX,uBAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6Bb;8BAzMY,cAAc,CAAC;IACvB,kBAAkB,EAAE,QAAQ,CAAC;IAC7B,yBAAyB,EAAE,QAAQ,CAAC;IACpC,sBAAsB,EAAE,MAAM,CAAC;CAChC,CAAC"}

package/src/proposals/upgrade-vaults.js

@@ -10,6 +10,7 @@ const trace = makeTracer('upgrade Vaults proposal');
  * @typedef {PromiseSpaceOf<{
  *   priceAuthority8400: Instance;
  *   auctionUpgradeNewInstance: Instance;
+ *   newContractGovBundleId: string;
  * }>} interlockPowers
  */
 
@@ -19,7 +20,6 @@ const trace = makeTracer('upgrade Vaults proposal');
  * @param {{
  *   options: {
  *     VaultFactoryBundle: { bundleID: string };
- *     contractGovernorBundle: { bundleID: string };
  *   };
  * }} options
  */
@@ -33,13 +33,17 @@ export const upgradeVaults = async (
       vaultFactoryKit,
       zoe,
       priceAuthority8400,
+      newContractGovBundleId: newContractGovBundleIdP,
+    },
+    produce: {
+      auctionUpgradeNewInstance: auctionUpgradeNewInstanceProducer,
+      newContractGovBundleId: newContractGovBundleIdErasor,
     },
-    produce: { auctionUpgradeNewInstance: auctionUpgradeNewInstanceProducer },
     instance: {
       consume: { auctioneer: auctioneerInstanceP },
     },
   },
-  { options: { VaultFactoryBundle: vaultBundleRef, contractGovernorBundle } },
+  { options: { VaultFactoryBundle: vaultBundleRef } },
 ) => {
   const kit = await vaultFactoryKit;
   const { instance: directorInstance } = kit;
@@ -151,10 +155,15 @@ export const upgradeVaults = async (
   const vaultFactoryPrivateArgs = kit.privateArgs;
   trace('restarting governor');
 
-  const ecf = await electorateCreatorFacet;
+  const [ecf, newContractGovBundleId] = await Promise.all([
+    electorateCreatorFacet,
+    newContractGovBundleIdP,
+  ]);
+  newContractGovBundleIdErasor.reset();
+
   // upgrade vaultFactory governor. Won't be needed next time: see #10063
   await E(kit.governorAdminFacet).upgradeContract(
-    contractGovernorBundle.bundleID,
+    newContractGovBundleId,
     harden({
       electorateCreatorFacet: ecf,
       governed: vaultFactoryPrivateArgs,
@@ -174,7 +183,7 @@ const uV = 'upgradeVaults';
  */
 export const getManifestForUpgradeVaults = async (
   { restoreRef },
-  { VaultFactoryRef, contractGovernorRef },
+  { VaultFactoryRef },
 ) => {
   return {
     manifest: {
@@ -187,18 +196,16 @@ export const getManifestForUpgradeVaults = async (
           reserveKit: uV,
           vaultFactoryKit: uV,
           zoe: uV,
+          newContractGovBundleId: uV,
+        },
+        produce: {
+          auctionUpgradeNewInstance: uV,
+          newContractGovBundleId: uV,
         },
-        produce: { auctionUpgradeNewInstance: uV },
         instance: { consume: { auctioneer: uV } },
       },
     },
-    installations: {
-      VaultFactory: restoreRef(VaultFactoryRef),
-      contractGovernor: restoreRef(contractGovernorRef),
-    },
-    options: {
-      VaultFactoryBundle: VaultFactoryRef,
-      contractGovernorBundle: contractGovernorRef,
-    },
+    installations: { VaultFactory: restoreRef(VaultFactoryRef) },
+    options: { VaultFactoryBundle: VaultFactoryRef },
   };
 };