@agoric/inter-protocol 0.16.2-dev-75cc4e2.0 → 0.16.2-dev-fc1eb01.0

package/package.json

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

package/src/proposals/replaceElectorate.d.ts

@@ -23,17 +23,21 @@ export function getManifestForReplaceAllElectorates({ economicCommitteeRef: _eco
                 startUpgradable: boolean;
             };
             produce: {
+                econCharterKit: boolean;
                 economicCommitteeKit: boolean;
-                economicCommitteeCreatorFacet: string;
+                economicCommitteeCreatorFacet: boolean;
             };
             installation: {
                 consume: {
-                    committee: string;
+                    committee: boolean;
+                    binaryVoteCounter: boolean;
+                    econCommitteeCharter: boolean;
                 };
             };
             instance: {
                 produce: {
-                    economicCommittee: string;
+                    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":"AAqPO,uDAlBI,sBAAsB,UAGtB;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,CA4DzB;AAIM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BL;4CA5TwC,qBAAqB"}
+{"version":3,"file":"replaceElectorate.d.ts","sourceRoot":"","sources":["replaceElectorate.js"],"names":[],"mappings":"AAgXO,uDAlBI,sBAAsB,UAGtB;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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCL;4CA1cwC,qBAAqB"}

package/src/proposals/replaceElectorate.js

@@ -18,6 +18,7 @@ import {
 import { reserveThenDeposit } from './utils.js';
 
 /** @import {EconomyBootstrapPowers} from './econ-behaviors.js' */
+/** @import {EconCharterStartResult} from './econ-behaviors.js' */
 /** @import {CommitteeElectorateCreatorFacet} from '@agoric/governance/src/committee.js'; */
 
 const trace = (...args) => console.log('GovReplaceCommiteeAndCharter', ...args);
@@ -137,6 +138,45 @@ const inviteECMembers = async (
   await distributeInvitations(zip(values(voterAddresses), invitations));
 };
 
+/**
+ * Invites members to the Economic Charter by creating and distributing charter
+ * member invitations to the specified voter addresses.
+ *
+ * @param {EconomyBootstrapPowers} powers - The bootstrap powers required for
+ *   economic operations, including `namesByAddressAdmin` used for managing
+ *   names and deposits.
+ * @param {{
+ *   options: {
+ *     voterAddresses: Record<string, string>;
+ *     econCharterKit: {
+ *       creatorFacet: {
+ *         makeCharterMemberInvitation: () => Promise<Invitation>;
+ *       };
+ *     };
+ *   };
+ * }} opts
+ *   - The configuration object containing voter addresses and the econ charter kit
+ *       for creating charter member invitations.
+ *
+ * @returns {Promise<void>} This function does not explicitly return a value. It
+ *   processes all charter member invitations asynchronously.
+ */
+const inviteToEconCharter = async (
+  { consume: { namesByAddressAdmin } },
+  { options: { voterAddresses, econCharterKit } },
+) => {
+  const { creatorFacet } = E.get(econCharterKit);
+
+  void Promise.all(
+    values(voterAddresses).map(async addr => {
+      const debugName = `econ charter member ${addr}`;
+      reserveThenDeposit(debugName, namesByAddressAdmin, addr, [
+        E(creatorFacet).makeCharterMemberInvitation(),
+      ]).catch(err => console.error(`failed deposit to ${debugName}`, err));
+    }),
+  );
+};
+
 /**
  * Starts a new Economic Committee (EC) by creating an instance with the
  * provided committee specifications.
@@ -206,7 +246,6 @@ const startNewEconomicCommittee = async (
   const { instance, creatorFacet } = startResult;
 
   trace('Started new EC Committee Instance Successfully');
-
   economicCommitteeKit.reset();
   economicCommitteeKit.resolve(
     harden({ ...startResult, label: 'economicCommittee' }),
@@ -221,6 +260,90 @@ const startNewEconomicCommittee = async (
   return creatorFacet;
 };
 
+/**
+ * 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.
+ * @returns {Promise<EconCharterStartResult>} A promise that resolves to the
+ *   charter kit result.
+ */
+const startNewEconCharter = async ({
+  consume: { startUpgradable },
+  produce: { econCharterKit },
+  installation: {
+    consume: { binaryVoteCounter: counterP, econCommitteeCharter: installP },
+  },
+  instance: {
+    produce: { econCommitteeCharter },
+  },
+}) => {
+  const [charterInstall, counterInstall] = await Promise.all([
+    installP,
+    counterP,
+  ]);
+  const terms = await harden({
+    binaryVoteCounterInstallation: counterInstall,
+  });
+
+  trace('Starting new EC Charter Instance');
+
+  const startResult = await E(startUpgradable)({
+    label: 'econCommitteeCharter',
+    installation: charterInstall,
+    terms,
+  });
+
+  trace('Started new EC Charter Instance Successfully');
+
+  econCommitteeCharter.reset();
+  econCommitteeCharter.resolve(E.get(startResult).instance);
+
+  econCharterKit.reset();
+  econCharterKit.resolve(startResult);
+  return startResult;
+};
+
+/**
+ * Adds governors to an existing Economic Committee Charter
+ *
+ * - @param {EconomyBootstrapPowers} powers - The resources and capabilities
+ *   required to start the committee.
+ *
+ * @param {{
+ *   options: {
+ *     econCharterKit: EconCharterStartResult;
+ *   };
+ * }} config
+ *   - Configuration object containing the name and size of the committee.
+ *
+ * @returns {Promise<void>} A promise that resolves once all the governors have
+ *   been successfully added to the economic charter
+ */
+const addGovernorsToEconCharter = async (
+  { consume: { psmKit, governedContractKits } },
+  { options: { econCharterKit } },
+) => {
+  const { creatorFacet: ecCreatorFacet } = E.get(econCharterKit);
+
+  const psmKitMap = await psmKit;
+
+  for (const { psm, psmGovernorCreatorFacet, label } of psmKitMap.values()) {
+    await E(ecCreatorFacet).addInstance(psm, psmGovernorCreatorFacet, label);
+  }
+
+  const governedContractKitMap = await governedContractKits;
+
+  for (const {
+    instance,
+    governorCreatorFacet,
+    label,
+  } of governedContractKitMap.values()) {
+    await E(ecCreatorFacet).addInstance(instance, governorCreatorFacet, label);
+  }
+};
+
 /**
  * Replaces the electorate for governance contracts by creating a new Economic
  * Committee and updating contracts with the new electorate's creator facet.
@@ -300,6 +423,17 @@ export const replaceAllElectorates = async (permittedPowers, config) => {
   });
 
   trace('Installed New Economic Committee');
+
+  const econCharterKit = await startNewEconCharter(permittedPowers);
+  await addGovernorsToEconCharter(permittedPowers, {
+    options: { econCharterKit },
+  });
+
+  await inviteToEconCharter(permittedPowers, {
+    options: { voterAddresses, econCharterKit },
+  });
+
+  trace('Installed New EC Charter');
 };
 
 harden(replaceAllElectorates);
@@ -321,14 +455,22 @@ export const getManifestForReplaceAllElectorates = async (
         startUpgradable: true,
       },
       produce: {
+        econCharterKit: true,
         economicCommitteeKit: true,
-        economicCommitteeCreatorFacet: 'economicCommittee',
+        economicCommitteeCreatorFacet: true,
       },
       installation: {
-        consume: { committee: 'zoe' },
+        consume: {
+          committee: true,
+          binaryVoteCounter: true,
+          econCommitteeCharter: true,
+        },
       },
       instance: {
-        produce: { economicCommittee: 'economicCommittee' },
+        produce: {
+          economicCommittee: true,
+          econCommitteeCharter: true,
+        },
       },
     },
   },