@agoric/governance 0.10.4-dev-8e94b2a.0 → 0.10.4-dev-24f7f32.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/governance",
-  "version": "0.10.4-dev-8e94b2a.0+8e94b2a",
+  "version": "0.10.4-dev-24f7f32.0+24f7f32",
   "description": "Core governance support",
   "type": "module",
   "main": "src/index.js",
@@ -31,15 +31,15 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-8e94b2a.0+8e94b2a",
-    "@agoric/ertp": "0.16.3-dev-8e94b2a.0+8e94b2a",
-    "@agoric/internal": "0.3.3-dev-8e94b2a.0+8e94b2a",
-    "@agoric/network": "0.1.1-dev-8e94b2a.0+8e94b2a",
-    "@agoric/notifier": "0.6.3-dev-8e94b2a.0+8e94b2a",
-    "@agoric/store": "0.9.3-dev-8e94b2a.0+8e94b2a",
-    "@agoric/time": "0.3.3-dev-8e94b2a.0+8e94b2a",
-    "@agoric/vat-data": "0.5.3-dev-8e94b2a.0+8e94b2a",
-    "@agoric/zoe": "0.26.3-dev-8e94b2a.0+8e94b2a",
+    "@agoric/assert": "0.6.1-dev-24f7f32.0+24f7f32",
+    "@agoric/ertp": "0.16.3-dev-24f7f32.0+24f7f32",
+    "@agoric/internal": "0.3.3-dev-24f7f32.0+24f7f32",
+    "@agoric/network": "0.1.1-dev-24f7f32.0+24f7f32",
+    "@agoric/notifier": "0.6.3-dev-24f7f32.0+24f7f32",
+    "@agoric/store": "0.9.3-dev-24f7f32.0+24f7f32",
+    "@agoric/time": "0.3.3-dev-24f7f32.0+24f7f32",
+    "@agoric/vat-data": "0.5.3-dev-24f7f32.0+24f7f32",
+    "@agoric/zoe": "0.26.3-dev-24f7f32.0+24f7f32",
     "@endo/bundle-source": "^3.2.2",
     "@endo/captp": "^4.1.1",
     "@endo/eventual-send": "^1.2.1",
@@ -50,7 +50,7 @@
     "import-meta-resolve": "^2.2.1"
   },
   "devDependencies": {
-    "@agoric/swingset-vat": "0.32.3-dev-8e94b2a.0+8e94b2a",
+    "@agoric/swingset-vat": "0.32.3-dev-24f7f32.0+24f7f32",
     "@endo/bundle-source": "^3.2.2",
     "@endo/init": "^1.1.1",
     "ava": "^5.3.0",
@@ -79,5 +79,5 @@
   "typeCoverage": {
     "atLeast": 89.25
   },
-  "gitHead": "8e94b2af44d002fbf1c6cd316ec309d24e82042e"
+  "gitHead": "24f7f32495a6eda13fd75d18620ab9f7989b5d2e"
 }

package/src/contractGovernance/paramManager.js

@@ -224,10 +224,10 @@ const makeParamManagerBuilder = (publisherKit, zoe) => {
     if (!zoe) {
       throw Fail`zoe must be provided for governed Invitations ${zoe}`;
     }
-    const { instance, installation } = await E(zoe).getInvitationDetails(i);
 
-    // @ts-expect-error typedefs say they're guaranteed truthy but just to be safe
-    assert(instance && installation, 'must be an invitation');
+    // local check on isLive() gives better report than .getInvitationDetails()
+    const isLive = await E(E(zoe).getInvitationIssuer()).isLive(i);
+    isLive || Fail`Invitation passed to paramManager is not live ${i}`;
   };
 
   /**

package/src/contractHelper.d.ts

@@ -1,5 +1,5 @@
 export const GOVERNANCE_STORAGE_KEY: "governance";
-export function validateElectorate(zcf: ZCF<GovernanceTerms<{}>>, paramManager: import("./contractGovernance/typedParamManager.js").TypedParamManager<any>): Promise<void>;
+export function validateElectorate(zcf: ZCF<GovernanceTerms<{}>>, paramManager: import("./contractGovernance/typedParamManager.js").TypedParamManager<any>): Promise<true>;
 import type { GovernanceTerms } from './types.js';
 /**
  * Helper for the 90% of contracts that will have only a single set of

package/src/contractHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contractHelper.d.ts","sourceRoot":"","sources":["contractHelper.js"],"names":[],"mappings":"AAkBA,kDAAmD;AAsB5C,gFAFI,OAAO,2CAA2C,EAAE,iBAAiB,CAAC,GAAG,CAAC,iBAepF;qCAxCqO,YAAY;AAkOlP;;;;;;;;;;;;;;;;;;;GAmBG;AACH,sCAJW,CAAC,kIADD,UAAU,iBACV,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wHAxI4B,OAAO;;yCAuCI,OAAO,WAAW,OAAO,EAAE,KAAK,OAAO;;;;;8CA+B7E,OAAO,kBAAkB,EAAE,OAAO,8EAEP,OAAO;;;;;;;;;;;;;YAkBvC,iCAAiC;;;;;;;;;;EAuExC;;;;;;;;;;;;;;;;iDA3QqO,YAAY;yCAAZ,YAAY;0CAAZ,YAAY;kCAAZ,YAAY"}
+{"version":3,"file":"contractHelper.d.ts","sourceRoot":"","sources":["contractHelper.js"],"names":[],"mappings":"AAkBA,kDAAmD;AAwB5C,gFAFI,OAAO,2CAA2C,EAAE,iBAAiB,CAAC,GAAG,CAAC,iBAQpF;qCAnCqO,YAAY;AA6NlP;;;;;;;;;;;;;;;;;;;GAmBG;AACH,sCAJW,CAAC,kIADD,UAAU,iBACV,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wHAxI4B,OAAO;;yCAuCI,OAAO,WAAW,OAAO,EAAE,KAAK,OAAO;;;;;8CA+B7E,OAAO,kBAAkB,EAAE,OAAO,8EAEP,OAAO;;;;;;;;;;;;;YAkBvC,iCAAiC;;;;;;;;;;EAuExC;;;;;;;;;;;;;;;;iDAtQqO,YAAY;yCAAZ,YAAY;0CAAZ,YAAY;kCAAZ,YAAY"}

package/src/contractHelper.js

@@ -2,19 +2,19 @@ import { Far } from '@endo/marshal';
 import { makeStoredPublisherKit } from '@agoric/notifier';
 import { getMethodNames, objectMap } from '@agoric/internal';
 import { ignoreContext, prepareExo } from '@agoric/vat-data';
-import { keyEQ, M } from '@agoric/store';
+import { M } from '@agoric/store';
 import { AmountShape, BrandShape } from '@agoric/ertp';
 import { RelativeTimeRecordShape, TimestampRecordShape } from '@agoric/time';
 import { E } from '@endo/eventual-send';
-import { assertElectorateMatches } from './contractGovernance/paramManager.js';
 import { makeParamManagerFromTerms } from './contractGovernance/typedParamManager.js';
 import { GovernorFacetShape } from './typeGuards.js';
+import { CONTRACT_ELECTORATE } from './contractGovernance/governParam.js';
 
 /**
  * @import {VoteCounterCreatorFacet, VoteCounterPublicFacet, QuestionSpec, OutcomeRecord, AddQuestion, AddQuestionReturn, GovernanceSubscriptionState, GovernanceTerms, GovernedApis, GovernedCreatorFacet, GovernedPublicFacet} from './types.js';
  */
 
-const { Fail, quote: q } = assert;
+const { Fail } = assert;
 
 export const GOVERNANCE_STORAGE_KEY = 'governance';
 
@@ -35,22 +35,17 @@ const publicMixinAPI = harden({
 });
 
 /**
+ * Verify that the electorate is represented by a live invitation.
+ *
  * @param {ZCF<GovernanceTerms<{}> & {}>} zcf
  * @param {import('./contractGovernance/typedParamManager.js').TypedParamManager<any>} paramManager
  */
 export const validateElectorate = (zcf, paramManager) => {
-  const { governedParams } = zcf.getTerms();
-  return E.when(paramManager.getParams(), finishedParams => {
-    try {
-      keyEQ(governedParams, finishedParams) ||
-        Fail`The 'governedParams' term must be an object like ${q(
-          finishedParams,
-        )}, but was ${q(governedParams)}`;
-      assertElectorateMatches(paramManager, governedParams);
-    } catch (err) {
-      zcf.shutdownWithFailure(err);
-    }
-  });
+  const invitation = paramManager.getInternalParamValue(CONTRACT_ELECTORATE);
+  return E.when(
+    E(zcf.getInvitationIssuer()).isLive(invitation),
+    isLive => isLive || Fail`Electorate invitation is not live.`,
+  );
 };
 harden(validateElectorate);