@agoric/inter-protocol 0.16.2-dev-1f25ee2.0 → 0.16.2-dev-e5813b9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.16.2-dev-1f25ee2.0+1f25ee2",
+  "version": "0.16.2-dev-e5813b9.0+e5813b9",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -31,16 +31,16 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/ertp": "0.16.3-dev-1f25ee2.0+1f25ee2",
-    "@agoric/governance": "0.10.4-dev-1f25ee2.0+1f25ee2",
-    "@agoric/internal": "0.3.3-dev-1f25ee2.0+1f25ee2",
-    "@agoric/notifier": "0.6.3-dev-1f25ee2.0+1f25ee2",
-    "@agoric/store": "0.9.3-dev-1f25ee2.0+1f25ee2",
-    "@agoric/time": "0.3.3-dev-1f25ee2.0+1f25ee2",
-    "@agoric/vat-data": "0.5.3-dev-1f25ee2.0+1f25ee2",
-    "@agoric/vats": "0.15.2-dev-1f25ee2.0+1f25ee2",
-    "@agoric/zoe": "0.26.3-dev-1f25ee2.0+1f25ee2",
-    "@agoric/zone": "0.2.3-dev-1f25ee2.0+1f25ee2",
+    "@agoric/ertp": "0.16.3-dev-e5813b9.0+e5813b9",
+    "@agoric/governance": "0.10.4-dev-e5813b9.0+e5813b9",
+    "@agoric/internal": "0.3.3-dev-e5813b9.0+e5813b9",
+    "@agoric/notifier": "0.6.3-dev-e5813b9.0+e5813b9",
+    "@agoric/store": "0.9.3-dev-e5813b9.0+e5813b9",
+    "@agoric/time": "0.3.3-dev-e5813b9.0+e5813b9",
+    "@agoric/vat-data": "0.5.3-dev-e5813b9.0+e5813b9",
+    "@agoric/vats": "0.15.2-dev-e5813b9.0+e5813b9",
+    "@agoric/zoe": "0.26.3-dev-e5813b9.0+e5813b9",
+    "@agoric/zone": "0.2.3-dev-e5813b9.0+e5813b9",
     "@endo/captp": "^4.4.3",
     "@endo/errors": "^1.2.8",
     "@endo/eventual-send": "^1.2.8",
@@ -51,9 +51,9 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/smart-wallet": "0.5.4-dev-1f25ee2.0+1f25ee2",
-    "@agoric/swingset-liveslots": "0.10.3-dev-1f25ee2.0+1f25ee2",
-    "@agoric/swingset-vat": "0.32.3-dev-1f25ee2.0+1f25ee2",
+    "@agoric/smart-wallet": "0.5.4-dev-e5813b9.0+e5813b9",
+    "@agoric/swingset-liveslots": "0.10.3-dev-e5813b9.0+e5813b9",
+    "@agoric/swingset-vat": "0.32.3-dev-e5813b9.0+e5813b9",
     "@endo/bundle-source": "^3.5.0",
     "@endo/init": "^1.1.7",
     "@endo/promise-kit": "^1.1.8",
@@ -84,5 +84,5 @@
   "typeCoverage": {
     "atLeast": 95.58
   },
-  "gitHead": "1f25ee2ec66788523594e25f020ccf3b6103d259"
+  "gitHead": "e5813b9a1b7aff07f84e2b185351b3283e29e141"
 }

package/src/proposals/replaceElectorate.d.ts

@@ -18,6 +18,8 @@ export function getManifestForReplaceAllElectorates({ economicCommitteeRef: _eco
                 auctionUpgradeNewGovCreator: boolean;
                 auctionUpgradeNewInstance: boolean;
                 psmKit: boolean;
+                contractKits: boolean;
+                econCharterKit: boolean;
                 governedContractKits: boolean;
                 chainStorage: boolean;
                 highPrioritySendersManager: boolean;
@@ -47,6 +49,7 @@ export function getManifestForReplaceAllElectorates({ economicCommitteeRef: _eco
                 };
                 consume: {
                     economicCommittee: boolean;
+                    econCommitteeCharter: boolean;
                 };
             };
         };

package/src/proposals/replaceElectorate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replaceElectorate.d.ts","sourceRoot":"","sources":["replaceElectorate.js"],"names":[],"mappings":"AAkbO,uDAlBI,sBAAsB,GAAG,eAAe,UAGxC;IACN,OAAO,EAAE;QACP,aAAa,EAAE,MAAM,CAAC;QACtB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACvC,yBAAyB,EAAE;YACzB,cAAc,EAAE,MAAM,EAAE,CAAC;YACzB,iBAAiB,EAAE,MAAM,EAAE,CAAC;SAC7B,CAAC;KACH,CAAC;CACH,GAGS,OAAO,CAAC,IAAI,CAAC,CAuEzB;AAIM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CL;8BAzNW,cAAc,CAAC;IACvB,yBAAyB,EAAE,QAAQ,CAAC;IACpC,2BAA2B,EAAE,GAAG,CAAC;IACjC,wBAAwB,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;CACtD,CAAC;4CA9TqC,qBAAqB"}
+{"version":3,"file":"replaceElectorate.d.ts","sourceRoot":"","sources":["replaceElectorate.js"],"names":[],"mappings":"AAweO,uDAlBI,sBAAsB,GAAG,eAAe,UAGxC;IACN,OAAO,EAAE;QACP,aAAa,EAAE,MAAM,CAAC;QACtB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACvC,yBAAyB,EAAE;YACzB,cAAc,EAAE,MAAM,EAAE,CAAC;YACzB,iBAAiB,EAAE,MAAM,EAAE,CAAC;SAC7B,CAAC;KACH,CAAC;CACH,GAGS,OAAO,CAAC,IAAI,CAAC,CAuEzB;AAIM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDL;8BA9NW,cAAc,CAAC;IACvB,yBAAyB,EAAE,QAAQ,CAAC;IACpC,2BAA2B,EAAE,GAAG,CAAC;IACjC,wBAAwB,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;CACtD,CAAC;4CApXqC,qBAAqB"}

package/src/proposals/replaceElectorate.js

@@ -289,33 +289,87 @@ const startNewEconomicCommittee = async (
  * Starts a new Economic Committee Charter by creating an instance with the
  * provided committee specifications.
  *
- * @param {EconomyBootstrapPowers} powers - The resources and capabilities
- *   required to start the committee.
+ * @param {EconomyBootstrapPowers &
+ *   PromiseSpaceOf<{ retiredContractInstances: MapStore<string, Instance> }>} powers
+ *   - The resources and capabilities required to start the committee.
+ *
  * @returns {Promise<EconCharterStartResult>} A promise that resolves to the
  *   charter kit result.
  */
 const startNewEconCharter = async ({
-  consume: { startUpgradable },
-  produce: { econCharterKit },
+  consume: {
+    board,
+    startUpgradable,
+    contractKits: contractKitsP,
+    econCharterKit: econCharterKitP,
+    retiredContractInstances: retiredContractInstancesP,
+  },
+  produce: {
+    econCharterKit: produceEconCharterKit,
+    retiredContractInstances: produceRetiredInstances,
+  },
   installation: {
     consume: { binaryVoteCounter: counterP, econCommitteeCharter: installP },
   },
   instance: {
     produce: { econCommitteeCharter },
+    consume: { econCommitteeCharter: previousInstanceP },
   },
 }) => {
-  const [charterInstall, counterInstall] = await Promise.all([
+  const [
+    charterInstall,
+    counterInstall,
+    previousInstance,
+    contractKits,
+    econCharterKit,
+    retiredInstances,
+  ] = await Promise.all([
     installP,
     counterP,
+    previousInstanceP,
+    contractKitsP,
+    econCharterKitP,
+    provideRetiredInstances(retiredContractInstancesP, produceRetiredInstances),
   ]);
-  const terms = await harden({
-    binaryVoteCounterInstallation: counterInstall,
-  });
+
+  const label = 'econCommitteeCharter';
+  const previousCharterKit = { ...econCharterKit, label };
+
+  const boardID = await E(board).getId(previousCharterKit.instance);
+  const identifier = `${label}-${boardID}`;
+  trace('Saving previous EC Charter Instance', label);
+
+  // save the old charter instance kit so we can manage it later
+  if (retiredInstances.has(identifier)) {
+    // bootstrap tests start having already run this upgrade. Actual upgrades on
+    // mainNet or testnets should start with the promiseSpace post upgrade-17,
+    // which doesn't have this entry in the map.
+    trace(
+      '⚠️ WARNING: collision on storing Charter in retireInstances not' +
+        ' expected during chain upgrade.   It IS normal during bootstrap tests',
+    );
+  } else {
+    retiredInstances.init(identifier, previousCharterKit.instance);
+  }
+  if (contractKits.has(previousInstance)) {
+    // bootstrap tests start having already run this upgrade. Actual upgrades on
+    // mainNet or testnets should start with the promiseSpace post upgrade-17,
+    // which doesn't have this entry in the map.
+    trace(
+      '⚠️ WARNING: collision on storing Charter in contractKits not' +
+        ' expected during chain upgrade.   It IS normal during bootstrap tests',
+    );
+  } else {
+    contractKits.init(previousInstance, previousCharterKit);
+  }
 
   trace('Starting new EC Charter Instance');
 
+  const terms = harden({
+    binaryVoteCounterInstallation: counterInstall,
+  });
   const startResult = await E(startUpgradable)({
-    label: 'econCommitteeCharter',
+    label,
     installation: charterInstall,
     terms,
   });
@@ -325,8 +379,8 @@ const startNewEconCharter = async ({
   econCommitteeCharter.reset();
   econCommitteeCharter.resolve(E.get(startResult).instance);
 
-  econCharterKit.reset();
-  econCharterKit.resolve(startResult);
+  produceEconCharterKit.reset();
+  produceEconCharterKit.resolve(startResult);
   return startResult;
 };
 
@@ -515,6 +569,8 @@ export const getManifestForReplaceAllElectorates = async (
         auctionUpgradeNewGovCreator: true,
         auctionUpgradeNewInstance: true,
         psmKit: true,
+        contractKits: true,
+        econCharterKit: true,
         governedContractKits: true,
         chainStorage: true,
         highPrioritySendersManager: true,
@@ -543,7 +599,10 @@ export const getManifestForReplaceAllElectorates = async (
           economicCommittee: true,
           econCommitteeCharter: true,
         },
-        consume: { economicCommittee: true },
+        consume: {
+          economicCommittee: true,
+          econCommitteeCharter: true,
+        },
       },
     },
   },