support changes to governed APIs

packages/boot/package.json

@@ -27,6 +27,7 @@
     "@agoric/cosmic-swingset": "^0.41.3",
     "@agoric/ertp": "^0.16.2",
     "@agoric/fast-usdc": "0.1.0",
+    "@agoric/governance": "^0.10.3",
     "@agoric/inter-protocol": "^0.16.1",
     "@agoric/internal": "^0.3.2",
     "@agoric/kmarshal": "^0.1.0",

packages/boot/test/bootstrapTests/governedContract.js

@@ -0,0 +1,85 @@
+import {
+  CONTRACT_ELECTORATE,
+  ParamTypes,
+  handleParamGovernance,
+} from '@agoric/governance';
+import { prepareExoClassKit, provide } from '@agoric/vat-data';
+
+/**
+ * @import {GovernanceTerms} from '@agoric/governance/src/types.js';
+ * @import {Baggage} from '@agoric/vat-data';
+ */
+
+const MALLEABLE_NUMBER = 'MalleableNumber';
+
+const makeTerms = (number, invitationAmount) => {
+  return harden({
+    governedParams: {
+      [MALLEABLE_NUMBER]: { type: ParamTypes.NAT, value: number },
+      [CONTRACT_ELECTORATE]: {
+        type: ParamTypes.INVITATION,
+        value: invitationAmount,
+      },
+    },
+  });
+};
+
+/**
+ *
+ * @param {ZCF<
+ * GovernanceTerms<{
+ *   MalleableNumber: 'nat',
+ * }>>} zcf
+ * @param {{initialPoserInvitation: Invitation}} privateArgs
+ * @param {Baggage} baggage
+ */
+const start = async (zcf, privateArgs, baggage) => {
+  const { makeDurableGovernorFacet, params } = await handleParamGovernance(
+    zcf,
+    privateArgs.initialPoserInvitation,
+    {
+      [MALLEABLE_NUMBER]: ParamTypes.NAT,
+    },
+  );
+
+  const makeGoverned = prepareExoClassKit(
+    baggage,
+    'governed Public',
+    undefined,
+    () =>
+      harden({
+        governanceAPICalled: 0,
+      }),
+    {
+      public: {
+        getNum() {
+          return params.getMalleableNumber();
+        },
+        getApiCalled() {
+          const { governanceAPICalled } = this.state;
+          return governanceAPICalled;
+        },
+      },
+      creator: {},
+      governed: {
+        add1() {
+          const { state } = this;
+          state.governanceAPICalled += 1;
+        },
+      },
+    },
+  );
+  const facets = provide(baggage, 'theContract', () => makeGoverned());
+
+  const { governorFacet } = makeDurableGovernorFacet(baggage, facets.creator, {
+    add1: () => facets.governed.add1(),
+  });
+
+  return { publicFacet: facets.public, creatorFacet: governorFacet };
+};
+
+harden(start);
+harden(MALLEABLE_NUMBER);
+harden(makeTerms);
+
+export { start, MALLEABLE_NUMBER, makeTerms };

packages/boot/test/bootstrapTests/governedContract2.js

@@ -0,0 +1,90 @@
+import {
+  CONTRACT_ELECTORATE,
+  ParamTypes,
+  handleParamGovernance,
+} from '@agoric/governance';
+import { prepareExoClassKit, provide } from '@agoric/vat-data';
+
+/**
+ * @import {GovernanceTerms} from '@agoric/governance/src/types.js';
+ * @import {Baggage} from '@agoric/vat-data';
+ */
+
+const MALLEABLE_NUMBER = 'MalleableNumber';
+
+const makeTerms = (number, invitationAmount) => {
+  return harden({
+    governedParams: {
+      [MALLEABLE_NUMBER]: { type: ParamTypes.NAT, value: number },
+      [CONTRACT_ELECTORATE]: {
+        type: ParamTypes.INVITATION,
+        value: invitationAmount,
+      },
+    },
+  });
+};
+
+/**
+ *
+ * @param {ZCF<
+ * GovernanceTerms<{
+ *   MalleableNumber: 'nat',
+ * }>>} zcf
+ * @param {{initialPoserInvitation: Invitation}} privateArgs
+ * @param {Baggage} baggage
+ */
+const start = async (zcf, privateArgs, baggage) => {
+  const { makeDurableGovernorFacet, params } = await handleParamGovernance(
+    zcf,
+    privateArgs.initialPoserInvitation,
+    {
+      [MALLEABLE_NUMBER]: ParamTypes.NAT,
+    },
+  );
+
+  const makeGoverned = prepareExoClassKit(
+    baggage,
+    'governed Public',
+    undefined,
+    () =>
+      harden({
+        governanceAPICalled: 0,
+      }),
+    {
+      public: {
+        getNum() {
+          return params.getMalleableNumber();
+        },
+        getApiCalled() {
+          const { governanceAPICalled } = this.state;
+          return governanceAPICalled;
+        },
+      },
+      creator: {},
+      governed: {
+        add1() {
+          const { state } = this;
+          state.governanceAPICalled += 1;
+        },
+        add2() {
+          const { state } = this;
+          state.governanceAPICalled += 2;
+        },
+      },
+    },
+  );
+  const facets = provide(baggage, 'theContract', () => makeGoverned());
+
+  const { governorFacet } = makeDurableGovernorFacet(baggage, facets.creator, {
+    add1: () => facets.governed.add1(),
+    add2: () => facets.governed.add2(),
+  });
+
+  return { publicFacet: facets.public, creatorFacet: governorFacet };
+};
+
+harden(start);
+harden(MALLEABLE_NUMBER);
+harden(makeTerms);
+
+export { start, MALLEABLE_NUMBER, makeTerms };

packages/boot/test/bootstrapTests/updateUpgradedVaultParams.test.ts

@@ -3,7 +3,7 @@
  * We change a parameter so that provideParamGovernance() is called once, and
  * paramGoverance has been set. Then upgrade vaultFactory, so any ephemeral
  * objects from the contract held by the governor are gone, then try to change
- * param again, to show that the bug is fixedd.
+ * param again, to show that the bug is fixed.
  */
 import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';