@agoric/governance 0.10.4-dev-d6fae11.0.d6fae11 → 0.10.4-dev-64cee5a.0.64cee5a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/governance",
-  "version": "0.10.4-dev-d6fae11.0.d6fae11",
+  "version": "0.10.4-dev-64cee5a.0.64cee5a",
   "description": "Core governance support",
   "type": "module",
   "main": "src/index.js",
@@ -31,13 +31,13 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/ertp": "0.16.3-dev-d6fae11.0.d6fae11",
-    "@agoric/internal": "0.3.3-dev-d6fae11.0.d6fae11",
-    "@agoric/notifier": "0.6.3-dev-d6fae11.0.d6fae11",
-    "@agoric/store": "0.9.3-dev-d6fae11.0.d6fae11",
-    "@agoric/time": "0.3.3-dev-d6fae11.0.d6fae11",
-    "@agoric/vat-data": "0.5.3-dev-d6fae11.0.d6fae11",
-    "@agoric/zoe": "0.26.3-dev-d6fae11.0.d6fae11",
+    "@agoric/ertp": "0.16.3-dev-64cee5a.0.64cee5a",
+    "@agoric/internal": "0.3.3-dev-64cee5a.0.64cee5a",
+    "@agoric/notifier": "0.6.3-dev-64cee5a.0.64cee5a",
+    "@agoric/store": "0.9.3-dev-64cee5a.0.64cee5a",
+    "@agoric/time": "0.3.3-dev-64cee5a.0.64cee5a",
+    "@agoric/vat-data": "0.5.3-dev-64cee5a.0.64cee5a",
+    "@agoric/zoe": "0.26.3-dev-64cee5a.0.64cee5a",
     "@endo/bundle-source": "^4.1.2",
     "@endo/captp": "^4.4.8",
     "@endo/errors": "^1.2.13",
@@ -49,7 +49,7 @@
     "import-meta-resolve": "^4.1.0"
   },
   "devDependencies": {
-    "@agoric/swingset-vat": "0.32.3-dev-d6fae11.0.d6fae11",
+    "@agoric/swingset-vat": "0.32.3-dev-64cee5a.0.64cee5a",
     "@endo/bundle-source": "^4.1.2",
     "@endo/init": "^1.1.12",
     "ava": "^5.3.0",
@@ -78,5 +78,5 @@
   "typeCoverage": {
     "atLeast": 89.48
   },
-  "gitHead": "d6fae11a6db28b1122089468183eccd4d47b83c9"
+  "gitHead": "64cee5ae5d1a3488a30ce042d6f3f561ac2a6e82"
 }

package/src/committee.d.ts

@@ -3,6 +3,8 @@
  * @import {MapStore} from '@agoric/swingset-liveslots';
  * @import {ContractMeta, Invitation, ZCF} from '@agoric/zoe';
  * @import {ElectorateCreatorFacet, CommitteeElectoratePublic, QuestionDetails, OutcomeRecord, AddQuestion} from './types.js';
+ * @import {Baggage} from '@agoric/vat-data';
+ * @import {QuestionRecord} from './electorateTools.js';
  */
 /**
  * @typedef { ElectorateCreatorFacet & {
@@ -17,7 +19,7 @@ export function start(zcf: ZCF<{
 }>, privateArgs: {
     storageNode: Remote<StorageNode>;
     marshaller: Remote<Marshaller>;
-}, baggage: import("@agoric/vat-data").Baggage): {
+}, baggage: Baggage): {
     creatorFacet: CommitteeElectorateCreatorFacet;
     publicFacet: CommitteeElectoratePublic;
 };
@@ -31,6 +33,7 @@ export type CommitteeElectorateCreatorFacet = ElectorateCreatorFacet & {
 import type { ContractMeta } from '@agoric/zoe';
 import type { ZCF } from '@agoric/zoe';
 import type { Remote } from '@agoric/internal';
+import type { Baggage } from '@agoric/vat-data';
 import type { CommitteeElectoratePublic } from './types.js';
 import type { ElectorateCreatorFacet } from './types.js';
 import type { Invitation } from '@agoric/zoe';

package/src/committee.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"committee.d.ts","sourceRoot":"","sources":["committee.js"],"names":[],"mappings":"AAkBA;;;;;GAKG;AAEH;;;;GAIG;AAEH,yCAAyC;AACzC,mBADW,aAAa,OAAO,KAAK,CAAC,CAOnC;AAoBK,2BARI,IAAI;IACV,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,eACM;IAAE,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IAAC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAA;CAAC,WACnE,OAAO,kBAAkB,EAAE,OAAO,GAChC;IAAC,YAAY,EAAE,+BAA+B,CAAC;IAAC,WAAW,EAAE,yBAAyB,CAAA;CAAC,CAuInG;8CArKa,sBAAsB,GAAG;IAClC,mBAAmB,EAAE,MAAM,OAAO,CAAC,WAAW;QAAE,KAAK,EAAE;YAAE,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,GAAG,GAAK,IAAI,CAAA;SAAC,CAAA;KAAC,CAAC,CAAC,EAAE,CAAA;CAChH;kCAP4C,aAAa;yBAAb,aAAa;4BAFpC,kBAAkB;+CAGsE,YAAY;4CAAZ,YAAY;gCAD7E,aAAa"}
+{"version":3,"file":"committee.d.ts","sourceRoot":"","sources":["committee.js"],"names":[],"mappings":"AAkBA;;;;;;;GAOG;AAEH;;;;GAIG;AAEH,yCAAyC;AACzC,mBADW,aAAa,OAAO,KAAK,CAAC,CAOnC;AAoBK,2BARI,IAAI;IACV,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,eACM;IAAE,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IAAC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAA;CAAC,WACnE,OAAO,GACL;IAAC,YAAY,EAAE,+BAA+B,CAAC;IAAC,WAAW,EAAE,yBAAyB,CAAA;CAAC,CAuInG;8CArKa,sBAAsB,GAAG;IAClC,mBAAmB,EAAE,MAAM,OAAO,CAAC,WAAW;QAAE,KAAK,EAAE;YAAE,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,GAAG,GAAK,IAAI,CAAA;SAAC,CAAA;KAAC,CAAC,CAAC,EAAE,CAAA;CAChH;kCAT4C,aAAa;yBAAb,aAAa;4BAFpC,kBAAkB;6BAIjB,kBAAkB;+CADqE,YAAY;4CAAZ,YAAY;gCAD7E,aAAa"}

package/src/committee.js

@@ -21,6 +21,8 @@ import { prepareVoterKit } from './voterKit.js';
  * @import {MapStore} from '@agoric/swingset-liveslots';
  * @import {ContractMeta, Invitation, ZCF} from '@agoric/zoe';
  * @import {ElectorateCreatorFacet, CommitteeElectoratePublic, QuestionDetails, OutcomeRecord, AddQuestion} from './types.js';
+ * @import {Baggage} from '@agoric/vat-data';
+ * @import {QuestionRecord} from './electorateTools.js';
  */
 
 /**
@@ -53,11 +55,11 @@ harden(meta);
  *   committeeSize: number,
  * }>} zcf
  * @param {{ storageNode: Remote<StorageNode>, marshaller: Remote<Marshaller>}} privateArgs
- * @param {import('@agoric/vat-data').Baggage} baggage
+ * @param {Baggage} baggage
  * @returns {{creatorFacet: CommitteeElectorateCreatorFacet, publicFacet: CommitteeElectoratePublic}}
  */
 export const start = (zcf, privateArgs, baggage) => {
-  /** @type {MapStore<Handle<'Question'>, import('./electorateTools.js').QuestionRecord>} */
+  /** @type {MapStore<Handle<'Question'>, QuestionRecord>} */
   const allQuestions = provideDurableMapStore(baggage, 'Question');
 
   // CRUCIAL: voteCap carries the ability to cast votes for any voter at

package/src/contractGovernance/governApi.d.ts

@@ -3,15 +3,16 @@
  *
  * @param {() => ERef<GovernedApis>} getGovernedApis
  * @param {() => Promise<Array<string | symbol>>} getGovernedNames names of the governed API methods
- * @param {ERef<import('@agoric/time').TimerService>} timer
+ * @param {ERef<TimerService>} timer
  * @param {() => Promise<PoserFacet>} getUpdatedPoserFacet
  * @returns {ApiGovernor}
  */
-export function setupApiGovernance(getGovernedApis: () => ERef<GovernedApis>, getGovernedNames: () => Promise<Array<string | symbol>>, timer: ERef<import("@agoric/time").TimerService>, getUpdatedPoserFacet: () => Promise<PoserFacet>): ApiGovernor;
+export function setupApiGovernance(getGovernedApis: () => ERef<GovernedApis>, getGovernedNames: () => Promise<Array<string | symbol>>, timer: ERef<TimerService>, getUpdatedPoserFacet: () => Promise<PoserFacet>): ApiGovernor;
 /**
  * @import {ContractMeta, Installation, Instance, Invitation, ZCF} from '@agoric/zoe';
  * @import {Passable, RemotableObject} from '@endo/pass-style';
  * @import {Position, ApiGovernor, ApiInvocationIssue, PoserFacet, VoteOnApiInvocation, GovernedApis} from '../types.js';
+ * @import {TimerService} from '@agoric/time';
  */
 /**
  * Make a pair of positions for a question about whether to invoke an API. If
@@ -31,6 +32,7 @@ export function makeApiInvocationPositions(apiMethodName: string, methodArgs: Pa
     };
 };
 import type { GovernedApis } from '../types.js';
+import type { TimerService } from '@agoric/time';
 import type { PoserFacet } from '../types.js';
 import type { ApiGovernor } from '../types.js';
 import type { Passable } from '@endo/pass-style';

package/src/contractGovernance/governApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"governApi.d.ts","sourceRoot":"","sources":["governApi.js"],"names":[],"mappings":"AAgCA;;;;;;;;GAQG;AACH,oDANW,MAAM,IAAI,CAAC,YAAY,CAAC,oBACxB,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,SACrC,IAAI,CAAC,OAAO,cAAc,EAAE,YAAY,CAAC,wBACzC,MAAM,OAAO,CAAC,UAAU,CAAC,GACvB,WAAW,CA4FvB;AAvHD;;;;GAIG;AAEH;;;;;;;GAOG;AACH,0DAHW,MAAM,cACN,QAAQ,EAAE;;;;;;;;EAMpB;kCAf0G,aAAa;gCAAb,aAAa;iCAAb,aAAa;8BAD5E,kBAAkB"}
+{"version":3,"file":"governApi.d.ts","sourceRoot":"","sources":["governApi.js"],"names":[],"mappings":"AAiCA;;;;;;;;GAQG;AACH,oDANW,MAAM,IAAI,CAAC,YAAY,CAAC,oBACxB,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,SACrC,IAAI,CAAC,YAAY,CAAC,wBAClB,MAAM,OAAO,CAAC,UAAU,CAAC,GACvB,WAAW,CA4FvB;AAxHD;;;;;GAKG;AAEH;;;;;;;GAOG;AACH,0DAHW,MAAM,cACN,QAAQ,EAAE;;;;;;;;EAMpB;kCAhB0G,aAAa;kCACzF,cAAc;gCAD8D,aAAa;iCAAb,aAAa;8BAD5E,kBAAkB"}

package/src/contractGovernance/governApi.js

@@ -14,6 +14,7 @@ import {
  * @import {ContractMeta, Installation, Instance, Invitation, ZCF} from '@agoric/zoe';
  * @import {Passable, RemotableObject} from '@endo/pass-style';
  * @import {Position, ApiGovernor, ApiInvocationIssue, PoserFacet, VoteOnApiInvocation, GovernedApis} from '../types.js';
+ * @import {TimerService} from '@agoric/time';
  */
 
 /**
@@ -35,7 +36,7 @@ const makeApiInvocationPositions = (apiMethodName, methodArgs) => {
  *
  * @param {() => ERef<GovernedApis>} getGovernedApis
  * @param {() => Promise<Array<string | symbol>>} getGovernedNames names of the governed API methods
- * @param {ERef<import('@agoric/time').TimerService>} timer
+ * @param {ERef<TimerService>} timer
  * @param {() => Promise<PoserFacet>} getUpdatedPoserFacet
  * @returns {ApiGovernor}
  */

package/src/contractGovernance/governFilter.d.ts

@@ -1,15 +1,16 @@
 /**
  * Setup to allow governance to block some invitations.
  *
- * @param {ERef<import('@agoric/time').TimerService>} timer
+ * @param {ERef<TimerService>} timer
  * @param {() => Promise<PoserFacet>} getUpdatedPoserFacet
  * @param {GovernedCreatorFacet<{}>} governedCF
  * @returns {FilterGovernor}
  */
-export function setupFilterGovernance(timer: ERef<import("@agoric/time").TimerService>, getUpdatedPoserFacet: () => Promise<PoserFacet>, governedCF: GovernedCreatorFacet<{}>): FilterGovernor;
+export function setupFilterGovernance(timer: ERef<TimerService>, getUpdatedPoserFacet: () => Promise<PoserFacet>, governedCF: GovernedCreatorFacet<{}>): FilterGovernor;
 /**
  * @import {ContractMeta, Installation, Instance, Invitation, ZCF} from '@agoric/zoe';
  * @import {Position, ApiGovernor, ApiInvocationIssue, PoserFacet, VoteOnApiInvocation, FilterGovernor, GovernedCreatorFacet, OfferFilterIssue, VoteOnOfferFilter} from '../types.js';
+ * @import {TimerService} from '@agoric/time';
  */
 /**
  * Make a pair of positions for a question about whether to update the offer
@@ -26,6 +27,7 @@ export function makeOfferFilterPositions(strings: string[]): {
         dontUpdate: string[];
     };
 };
+import type { TimerService } from '@agoric/time';
 import type { PoserFacet } from '../types.js';
 import type { GovernedCreatorFacet } from '../types.js';
 import type { FilterGovernor } from '../types.js';

package/src/contractGovernance/governFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"governFilter.d.ts","sourceRoot":"","sources":["governFilter.js"],"names":[],"mappings":"AA8BA;;;;;;;GAOG;AACH,6CALW,IAAI,CAAC,OAAO,cAAc,EAAE,YAAY,CAAC,wBACzC,MAAM,OAAO,CAAC,UAAU,CAAC,cACzB,qBAAqB,EAAE,CAAC,GACtB,cAAc,CAqE1B;AA7FD;;;GAGG;AAEH;;;;;;GAMG;AACH,kDAFW,MAAM,EAAE;;;;;;;EAMlB;gCAduK,aAAa;0CAAb,aAAa;oCAAb,aAAa"}
+{"version":3,"file":"governFilter.d.ts","sourceRoot":"","sources":["governFilter.js"],"names":[],"mappings":"AA+BA;;;;;;;GAOG;AACH,6CALW,IAAI,CAAC,YAAY,CAAC,wBAClB,MAAM,OAAO,CAAC,UAAU,CAAC,cACzB,qBAAqB,EAAE,CAAC,GACtB,cAAc,CAqE1B;AA9FD;;;;GAIG;AAEH;;;;;;GAMG;AACH,kDAFW,MAAM,EAAE;;;;;;;EAMlB;kCAd8B,cAAc;gCAD2H,aAAa;0CAAb,aAAa;oCAAb,aAAa"}

package/src/contractGovernance/governFilter.js

@@ -13,6 +13,7 @@ import {
 /**
  * @import {ContractMeta, Installation, Instance, Invitation, ZCF} from '@agoric/zoe';
  * @import {Position, ApiGovernor, ApiInvocationIssue, PoserFacet, VoteOnApiInvocation, FilterGovernor, GovernedCreatorFacet, OfferFilterIssue, VoteOnOfferFilter} from '../types.js';
+ * @import {TimerService} from '@agoric/time';
  */
 
 /**
@@ -31,7 +32,7 @@ const makeOfferFilterPositions = strings => {
 /**
  * Setup to allow governance to block some invitations.
  *
- * @param {ERef<import('@agoric/time').TimerService>} timer
+ * @param {ERef<TimerService>} timer
  * @param {() => Promise<PoserFacet>} getUpdatedPoserFacet
  * @param {GovernedCreatorFacet<{}>} governedCF
  * @returns {FilterGovernor}

package/src/contractGovernance/governParam.d.ts

@@ -1,11 +1,11 @@
 /**
  * @param {() => ERef<ParamManagerRetriever>} paramManagerRetrieverAccessor
  * @param {Instance} contractInstance
- * @param {import('@agoric/time').TimerService} timer
+ * @param {TimerService} timer
  * @param {() => Promise<PoserFacet>} getUpdatedPoserFacet
  * @returns {ParamGovernor}
  */
-export function setupParamGovernance(paramManagerRetrieverAccessor: () => ERef<ParamManagerRetriever>, contractInstance: Instance, timer: import("@agoric/time").TimerService, getUpdatedPoserFacet: () => Promise<PoserFacet>): ParamGovernor;
+export function setupParamGovernance(paramManagerRetrieverAccessor: () => ERef<ParamManagerRetriever>, contractInstance: Instance, timer: TimerService, getUpdatedPoserFacet: () => Promise<PoserFacet>): ParamGovernor;
 /**
  * Return a record containing the positive and negative positions for a
  * question on changing the param to the proposedValue.
@@ -28,6 +28,8 @@ export function assertBallotConcernsParam(paramSpec: {
 /**
  * @import {ContractMeta, Installation, Instance, Invitation, ZCF} from '@agoric/zoe';
  * @import {ParamValue, ParamChangePositions, QuestionSpec, ChangeParamsPosition, ParamChangeIssue, ParamGovernor, ParamManagerRetriever, PoserFacet, VoteOnParamChanges} from '../types.js';
+ * @import {TimerService} from '@agoric/time';
+ * @import {Passable} from '@endo/marshal';
  */
 /**
  * The electorate that governs changes to the contract's parameters. It must be
@@ -36,6 +38,7 @@ export function assertBallotConcernsParam(paramSpec: {
 export const CONTRACT_ELECTORATE: "Electorate";
 import type { ParamManagerRetriever } from '../types.js';
 import type { Instance } from '@agoric/zoe';
+import type { TimerService } from '@agoric/time';
 import type { PoserFacet } from '../types.js';
 import type { ParamGovernor } from '../types.js';
 import type { ParamValue } from '../types.js';

package/src/contractGovernance/governParam.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"governParam.d.ts","sourceRoot":"","sources":["governParam.js"],"names":[],"mappings":"AAyDA;;;;;;GAMG;AACH,oEANW,MAAM,IAAI,CAAC,qBAAqB,CAAC,oBACjC,QAAQ,SACR,OAAO,cAAc,EAAE,YAAY,wBACnC,MAAM,OAAO,CAAC,UAAU,CAAC,GACvB,aAAa,CA0FzB;AAhID;;;;;;GAMG;AACH,kDAHW,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GACxB,oBAAoB,CAQhC;AAED;;;;;;GAMG;AACH,qDAHW;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAC,gBAC5C,aAAa,iBAAiB,OAAO,CAAC,CAAC,QAWjD;AA1CD;;;GAGG;AAEH;;;GAGG;AACH,kCAA4B,YAAY,CAAC;2CAPsI,aAAa;8BADpH,aAAa;gCAC0F,aAAa;mCAAb,aAAa;gCAAb,aAAa;0CAAb,aAAa;sCAAb,aAAa;kCAAb,aAAa"}
+{"version":3,"file":"governParam.d.ts","sourceRoot":"","sources":["governParam.js"],"names":[],"mappings":"AA2DA;;;;;;GAMG;AACH,oEANW,MAAM,IAAI,CAAC,qBAAqB,CAAC,oBACjC,QAAQ,SACR,YAAY,wBACZ,MAAM,OAAO,CAAC,UAAU,CAAC,GACvB,aAAa,CA0FzB;AAhID;;;;;;GAMG;AACH,kDAHW,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GACxB,oBAAoB,CAQhC;AAED;;;;;;GAMG;AACH,qDAHW;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAC,gBAC5C,aAAa,iBAAiB,OAAO,CAAC,CAAC,QAWjD;AA5CD;;;;;GAKG;AAEH;;;GAGG;AACH,kCAA4B,YAAY,CAAC;2CATsI,aAAa;8BADpH,aAAa;kCAEtD,cAAc;gCADkI,aAAa;mCAAb,aAAa;gCAAb,aAAa;0CAAb,aAAa;sCAAb,aAAa;kCAAb,aAAa"}

package/src/contractGovernance/governParam.js

@@ -14,6 +14,8 @@ import { ParamChangesQuestionDetailsShape } from '../typeGuards.js';
 /**
  * @import {ContractMeta, Installation, Instance, Invitation, ZCF} from '@agoric/zoe';
  * @import {ParamValue, ParamChangePositions, QuestionSpec, ChangeParamsPosition, ParamChangeIssue, ParamGovernor, ParamManagerRetriever, PoserFacet, VoteOnParamChanges} from '../types.js';
+ * @import {TimerService} from '@agoric/time';
+ * @import {Passable} from '@endo/marshal';
  */
 
 /**
@@ -58,7 +60,7 @@ const assertBallotConcernsParam = (paramSpec, questionSpec) => {
 /**
  * @param {() => ERef<ParamManagerRetriever>} paramManagerRetrieverAccessor
  * @param {Instance} contractInstance
- * @param {import('@agoric/time').TimerService} timer
+ * @param {TimerService} timer
  * @param {() => Promise<PoserFacet>} getUpdatedPoserFacet
  * @returns {ParamGovernor}
  */
@@ -79,7 +81,7 @@ const setupParamGovernance = (
   ) => {
     const paramManagerRetriever = paramManagerRetrieverAccessor();
     const paramMgr = await E(paramManagerRetriever).get(paramSpec.paramPath);
-    /** @type {import('@endo/marshal').Passable} */
+    /** @type {Passable} */
     const changePs = {};
     for (const name of Object.keys(paramSpec.changes)) {
       const proposedValue = E(paramMgr).getVisibleValue(

package/src/contractGovernance/paramManager.d.ts

@@ -6,10 +6,10 @@ export type ParamManagerBuilder = {
     addInvitation: (name: string, value: Invitation) => ParamManagerBuilder;
     addNat: (name: string, value: bigint) => ParamManagerBuilder;
     addRatio: (name: string, value: Ratio) => ParamManagerBuilder;
-    addRecord: (name: string, value: import("@endo/marshal").CopyRecord<any>) => ParamManagerBuilder;
+    addRecord: (name: string, value: CopyRecord<any>) => ParamManagerBuilder;
     addString: (name: string, value: string) => ParamManagerBuilder;
-    addTimestamp: (name: string, value: import("@agoric/time").Timestamp) => ParamManagerBuilder;
-    addRelativeTime: (name: string, value: import("@agoric/time").RelativeTime) => ParamManagerBuilder;
+    addTimestamp: (name: string, value: Timestamp) => ParamManagerBuilder;
+    addRelativeTime: (name: string, value: RelativeTime) => ParamManagerBuilder;
     addUnknown: (name: string, value: any) => ParamManagerBuilder;
     build: () => AnyParamManager;
 };
@@ -17,6 +17,11 @@ export type ParamManagerBuilder = {
  * @import {MapStore} from '@agoric/swingset-liveslots';
  * @import {ContractMeta, Installation, Instance, Invitation, ZCF} from '@agoric/zoe';
  * @import {AnyParamManager, GovernanceSubscriptionState, ParamManagerBase, ParamStateRecord, ParamValueTyped, UpdateParams} from '../types.js';
+ * @import {CopyRecord} from '@endo/marshal';
+ * @import {Timestamp} from '@agoric/time';
+ * @import {RelativeTime} from '@agoric/time';
+ * @import {StoredPublisherKit} from '@agoric/notifier';
+ * @import {ParamType} from '../constants.js';
  */
 /**
  * @param {ParamManagerBase} paramManager
@@ -34,24 +39,28 @@ export function assertElectorateMatches(paramManager: ParamManagerBase, governed
  * @property {(name: string, value: Invitation) => ParamManagerBuilder} addInvitation
  * @property {(name: string, value: bigint) => ParamManagerBuilder} addNat
  * @property {(name: string, value: Ratio) => ParamManagerBuilder} addRatio
- * @property {(name: string, value: import('@endo/marshal').CopyRecord<any>) => ParamManagerBuilder} addRecord
+ * @property {(name: string, value: CopyRecord<any>) => ParamManagerBuilder} addRecord
  * @property {(name: string, value: string) => ParamManagerBuilder} addString
- * @property {(name: string, value: import('@agoric/time').Timestamp) => ParamManagerBuilder} addTimestamp
- * @property {(name: string, value: import('@agoric/time').RelativeTime) => ParamManagerBuilder} addRelativeTime
+ * @property {(name: string, value: Timestamp) => ParamManagerBuilder} addTimestamp
+ * @property {(name: string, value: RelativeTime) => ParamManagerBuilder} addRelativeTime
  * @property {(name: string, value: any) => ParamManagerBuilder} addUnknown
  * @property {() => AnyParamManager} build
  */
 /**
- * @param {import('@agoric/notifier').StoredPublisherKit<GovernanceSubscriptionState>} publisherKit
+ * @param {StoredPublisherKit<GovernanceSubscriptionState>} publisherKit
  * @param {ERef<ZoeService>} [zoe]
  */
-export function makeParamManagerBuilder(publisherKit: import("@agoric/notifier").StoredPublisherKit<GovernanceSubscriptionState>, zoe?: ERef<ZoeService>): ParamManagerBuilder;
+export function makeParamManagerBuilder(publisherKit: StoredPublisherKit<GovernanceSubscriptionState>, zoe?: ERef<ZoeService>): ParamManagerBuilder;
 import type { Installation } from '@agoric/zoe';
 import type { Instance } from '@agoric/zoe';
 import type { Invitation } from '@agoric/zoe';
+import type { CopyRecord } from '@endo/marshal';
+import type { Timestamp } from '@agoric/time';
+import type { RelativeTime } from '@agoric/time';
 import type { AnyParamManager } from '../types.js';
 import type { ParamManagerBase } from '../types.js';
 import { CONTRACT_ELECTORATE } from './governParam.js';
 import type { ParamValueTyped } from '../types.js';
 import type { GovernanceSubscriptionState } from '../types.js';
+import type { StoredPublisherKit } from '@agoric/notifier';
 //# sourceMappingURL=paramManager.d.ts.map

package/src/contractGovernance/paramManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paramManager.d.ts","sourceRoot":"","sources":["paramManager.js"],"names":[],"mappings":";eA4Cc,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,mBAAmB;cACpD,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,mBAAmB;qBACnD,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,KAAK,mBAAmB;iBAC1D,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,KAAK,mBAAmB;mBACtD,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,KAAK,mBAAmB;YACxD,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,mBAAmB;cACpD,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,mBAAmB;eACnD,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,eAAe,EAAE,UAAU,CAAC,GAAG,CAAC,KAAK,mBAAmB;eACrF,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,mBAAmB;kBACpD,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,cAAc,EAAE,SAAS,KAAK,mBAAmB;qBAC9E,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,cAAc,EAAE,YAAY,KAAK,mBAAmB;gBACjF,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,mBAAmB;WACjD,MAAM,eAAe;;AApCnC;;;;GAIG;AAEH;;;GAGG;AACH,sDAHW,gBAAgB,kBAChB;IAAC,CAAC,mBAAmB,CAAC,EAAE,gBAAgB,YAAY,CAAC,CAAA;CAAC,QAYhE;AAED;;;;;;;;;;;;;;;GAeG;AAEH;;;GAGG;AACH,sDAHW,OAAO,kBAAkB,EAAE,kBAAkB,CAAC,2BAA2B,CAAC,QAC1E,IAAI,CAAC,UAAU,CAAC,uBAgX1B;kCAvZuE,aAAa;8BAAb,aAAa;gCAAb,aAAa;qCAC6C,aAAa;sCAAb,aAAa;oCAL3G,kBAAkB;qCAK4E,aAAa;iDAAb,aAAa"}
+{"version":3,"file":"paramManager.d.ts","sourceRoot":"","sources":["paramManager.js"],"names":[],"mappings":";eAiDc,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,mBAAmB;cACpD,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,mBAAmB;qBACnD,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,KAAK,mBAAmB;iBAC1D,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,KAAK,mBAAmB;mBACtD,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,KAAK,mBAAmB;YACxD,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,mBAAmB;cACpD,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,mBAAmB;eACnD,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,CAAC,KAAK,mBAAmB;eAC7D,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,mBAAmB;kBACpD,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,KAAK,mBAAmB;qBACvD,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,KAAK,mBAAmB;gBAC1D,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,mBAAmB;WACjD,MAAM,eAAe;;AAzCnC;;;;;;;;;GASG;AAEH;;;GAGG;AACH,sDAHW,gBAAgB,kBAChB;IAAC,CAAC,mBAAmB,CAAC,EAAE,gBAAgB,YAAY,CAAC,CAAA;CAAC,QAYhE;AAED;;;;;;;;;;;;;;;GAeG;AAEH;;;GAGG;AACH,sDAHW,mBAAmB,2BAA2B,CAAC,QAC/C,IAAI,CAAC,UAAU,CAAC,uBAgX1B;kCA5ZuE,aAAa;8BAAb,aAAa;gCAAb,aAAa;gCAExD,eAAe;+BAChB,cAAc;kCACX,cAAc;qCAHqF,aAAa;sCAAb,aAAa;oCAL3G,kBAAkB;qCAK4E,aAAa;iDAAb,aAAa;wCAI1G,kBAAkB"}

package/src/contractGovernance/paramManager.js

@@ -22,6 +22,11 @@ import { CONTRACT_ELECTORATE } from './governParam.js';
  * @import {MapStore} from '@agoric/swingset-liveslots';
  * @import {ContractMeta, Installation, Instance, Invitation, ZCF} from '@agoric/zoe';
  * @import {AnyParamManager, GovernanceSubscriptionState, ParamManagerBase, ParamStateRecord, ParamValueTyped, UpdateParams} from '../types.js';
+ * @import {CopyRecord} from '@endo/marshal';
+ * @import {Timestamp} from '@agoric/time';
+ * @import {RelativeTime} from '@agoric/time';
+ * @import {StoredPublisherKit} from '@agoric/notifier';
+ * @import {ParamType} from '../constants.js';
  */
 
 /**
@@ -49,16 +54,16 @@ const assertElectorateMatches = (paramManager, governedParams) => {
  * @property {(name: string, value: Invitation) => ParamManagerBuilder} addInvitation
  * @property {(name: string, value: bigint) => ParamManagerBuilder} addNat
  * @property {(name: string, value: Ratio) => ParamManagerBuilder} addRatio
- * @property {(name: string, value: import('@endo/marshal').CopyRecord<any>) => ParamManagerBuilder} addRecord
+ * @property {(name: string, value: CopyRecord<any>) => ParamManagerBuilder} addRecord
  * @property {(name: string, value: string) => ParamManagerBuilder} addString
- * @property {(name: string, value: import('@agoric/time').Timestamp) => ParamManagerBuilder} addTimestamp
- * @property {(name: string, value: import('@agoric/time').RelativeTime) => ParamManagerBuilder} addRelativeTime
+ * @property {(name: string, value: Timestamp) => ParamManagerBuilder} addTimestamp
+ * @property {(name: string, value: RelativeTime) => ParamManagerBuilder} addRelativeTime
  * @property {(name: string, value: any) => ParamManagerBuilder} addUnknown
  * @property {() => AnyParamManager} build
  */
 
 /**
- * @param {import('@agoric/notifier').StoredPublisherKit<GovernanceSubscriptionState>} publisherKit
+ * @param {StoredPublisherKit<GovernanceSubscriptionState>} publisherKit
  * @param {ERef<ZoeService>} [zoe]
  */
 const makeParamManagerBuilder = (publisherKit, zoe) => {
@@ -94,7 +99,7 @@ const makeParamManagerBuilder = (publisherKit, zoe) => {
    * @param {Keyword} name
    * @param {unknown} value
    * @param {(val) => void} assertion
-   * @param {import('../constants.js').ParamType} type
+   * @param {ParamType} type
    */
   const buildCopyParam = (name, value, assertion, type) => {
     let current;
@@ -183,7 +188,7 @@ const makeParamManagerBuilder = (publisherKit, zoe) => {
     return builder;
   };
 
-  /** @type {(name: string, value: import('@endo/marshal').CopyRecord, builder: ParamManagerBuilder) => ParamManagerBuilder} */
+  /** @type {(name: string, value: CopyRecord, builder: ParamManagerBuilder) => ParamManagerBuilder} */
   const addRecord = (name, value, builder) => {
     const assertRecord = v => {
       passStyleOf(v);
@@ -200,13 +205,13 @@ const makeParamManagerBuilder = (publisherKit, zoe) => {
     return builder;
   };
 
-  /** @type {(name: string, value: import('@agoric/time').Timestamp, builder: ParamManagerBuilder) => ParamManagerBuilder} */
+  /** @type {(name: string, value: Timestamp, builder: ParamManagerBuilder) => ParamManagerBuilder} */
   const addTimestamp = (name, value, builder) => {
     buildCopyParam(name, value, assertTimestamp, ParamTypes.TIMESTAMP);
     return builder;
   };
 
-  /** @type {(name: string, value: import('@agoric/time').RelativeTime, builder: ParamManagerBuilder) => ParamManagerBuilder} */
+  /** @type {(name: string, value: RelativeTime, builder: ParamManagerBuilder) => ParamManagerBuilder} */
   const addRelativeTime = (name, value, builder) => {
     buildCopyParam(name, value, assertRelativeTime, ParamTypes.RELATIVE_TIME);
     return builder;

package/src/contractGovernance/typedParamManager.d.ts

@@ -1,8 +1,8 @@
-export function makeParamManager<T extends Record<Keyword, AsyncSpecTuple | SyncSpecTuple>>(publisherKit: import("@agoric/notifier").StoredPublisherKit<GovernanceSubscriptionState>, spec: T, zcf: ZCF): TypedParamManager<{ [K in keyof T]: T[K][0]; }>;
-export function makeParamManagerSync<T extends Record<Keyword, SyncSpecTuple>>(publisherKit: import("@agoric/notifier").StoredPublisherKit<GovernanceSubscriptionState>, spec: T): TypedParamManager<{ [K in keyof T]: T[K][0]; }>;
+export function makeParamManager<T extends Record<Keyword, AsyncSpecTuple | SyncSpecTuple>>(publisherKit: StoredPublisherKit<GovernanceSubscriptionState>, spec: T, zcf: ZCF): TypedParamManager<{ [K in keyof T]: T[K][0]; }>;
+export function makeParamManagerSync<T extends Record<Keyword, SyncSpecTuple>>(publisherKit: StoredPublisherKit<GovernanceSubscriptionState>, spec: T): TypedParamManager<{ [K in keyof T]: T[K][0]; }>;
 export function makeParamManagerFromTerms<I extends Record<string, Invitation> & {
     Electorate: Invitation;
-}, M extends ParamTypesMap>(publisherKit: import("@agoric/notifier").StoredPublisherKit<GovernanceSubscriptionState>, zcf: ZCF<GovernanceTerms<M>>, invitations: I, paramTypesMap: M, overrides?: object): TypedParamManager<M & { [K in keyof I]: "invitation"; }>;
+}, M extends ParamTypesMap>(publisherKit: StoredPublisherKit<GovernanceSubscriptionState>, zcf: ZCF<GovernanceTerms<M>>, invitations: I, paramTypesMap: M, overrides?: object): TypedParamManager<M & { [K in keyof I]: "invitation"; }>;
 export type ParamTypesMap = Record<Keyword, ParamType>;
 export type ParamTypesMapFromRecord<M extends ParamStateRecord> = { [R in keyof M]: M[R]["type"]; };
 export type ParamRecordsFromTypes<M extends ParamTypesMap> = { [T in keyof M]: {
@@ -27,6 +27,7 @@ export type InvitationParam = {
 export type SyncSpecTuple = ST<"amount"> | ST<"brand"> | ST<"installation"> | ST<"instance"> | ST<"nat"> | ST<"ratio"> | ST<"string"> | ST<"timestamp"> | ST<"relativeTime"> | ST<"unknown">;
 export type AsyncSpecTuple = ["invitation", Invitation];
 import type { GovernanceSubscriptionState } from '../types.js';
+import type { StoredPublisherKit } from '@agoric/notifier';
 import type { ZCF } from '@agoric/zoe';
 import type { Invitation } from '@agoric/zoe';
 import type { GovernanceTerms } from '../types.js';

package/src/contractGovernance/typedParamManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typedParamManager.d.ts","sourceRoot":"","sources":["typedParamManager.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"typedParamManager.d.ts","sourceRoot":"","sources":["typedParamManager.js"],"names":[],"mappings":"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"}

package/src/contractGovernance/typedParamManager.js

@@ -8,6 +8,7 @@ import { makeParamManagerBuilder } from './paramManager.js';
  * @import {ContractMeta, Installation, Instance, Invitation, ZCF} from '@agoric/zoe';
  * @import {VoteCounterCreatorFacet, VoteCounterPublicFacet, QuestionSpec, OutcomeRecord, AddQuestion, AddQuestionReturn, GovernanceSubscriptionState, GovernanceTerms, ParamManagerBase, ParamStateRecord, ParamValueForType, UpdateParams} from '../types.js';
  * @import {ParamType} from '../constants.js';
+ * @import {StoredPublisherKit} from '@agoric/notifier';
  */
 
 /**
@@ -82,7 +83,7 @@ const isAsync = {
 /**
  * @see makeParamManagerSync
  * @template {Record<Keyword, AsyncSpecTuple | SyncSpecTuple>} T
- * @param {import('@agoric/notifier').StoredPublisherKit<GovernanceSubscriptionState>} publisherKit
+ * @param {StoredPublisherKit<GovernanceSubscriptionState>} publisherKit
  * @param {T} spec
  * @param {ZCF} zcf
  * @returns {TypedParamManager<{[K in keyof T]: T[K][0]}>}
@@ -117,7 +118,7 @@ harden(makeParamManager);
  *
  * @see makeParamManager
  * @template {Record<Keyword, SyncSpecTuple>} T
- * @param {import('@agoric/notifier').StoredPublisherKit<GovernanceSubscriptionState>} publisherKit
+ * @param {StoredPublisherKit<GovernanceSubscriptionState>} publisherKit
  * @param {T} spec
  * @returns {TypedParamManager<{[K in keyof T]: T[K][0]}>}
  */
@@ -138,7 +139,7 @@ harden(makeParamManagerSync);
 /**
  * @template {Record<string, Invitation> & {Electorate: Invitation}} I Private invitation values
  * @template {ParamTypesMap} M Map of types of custom governed terms
- * @param {import('@agoric/notifier').StoredPublisherKit<GovernanceSubscriptionState>} publisherKit
+ * @param {StoredPublisherKit<GovernanceSubscriptionState>} publisherKit
  * @param {ZCF<GovernanceTerms<M>>} zcf
  * @param {I} invitations invitation objects, which must come from privateArgs
  * @param {M} paramTypesMap

package/src/contractGovernor.d.ts

@@ -3,20 +3,20 @@ export const meta: ContractMeta<typeof start>;
 export function validateQuestionDetails(zoe: ERef<ZoeService>, electorate: Instance, details: ParamChangeIssueDetails): Promise<[void, void, void]>;
 export function validateQuestionFromCounter(zoe: ERef<ZoeService>, electorate: Instance, voteCounter: Instance): Promise<[void, void, void]>;
 export function start<SF extends GovernableStartFn>(zcf: ZCF<{
-    timer: import("@agoric/time").TimerService;
+    timer: TimerService;
     governedContractInstallation: Installation<SF>;
     governed: {
         issuerKeywordRecord: IssuerKeywordRecord;
         terms: {
             governedParams: {
-                [CONTRACT_ELECTORATE]: import("./contractGovernance/typedParamManager.js").InvitationParam;
+                [CONTRACT_ELECTORATE]: InvitationParam;
             };
         };
         label?: string;
     };
 }>, privateArgs: {
     governed: Record<string, unknown>;
-}, baggage: import("@agoric/vat-data").Baggage): Promise<{
+}, baggage: Baggage): Promise<{
     creatorFacet: GovernorCreatorFacet<SF>;
     publicFacet: GovernorPublic;
 }>;
@@ -25,9 +25,12 @@ import type { ContractMeta } from '@agoric/zoe';
 import type { Instance } from '@agoric/zoe';
 import type { ParamChangeIssueDetails } from './types.js';
 import type { GovernableStartFn } from './types.js';
+import type { TimerService } from '@agoric/time';
 import type { Installation } from '@agoric/zoe';
 import { CONTRACT_ELECTORATE } from './contractGovernance/governParam.js';
+import type { InvitationParam } from './contractGovernance/typedParamManager.js';
 import type { ZCF } from '@agoric/zoe';
+import type { Baggage } from '@agoric/vat-data';
 import type { GovernorCreatorFacet } from './types.js';
 import type { GovernorPublic } from './types.js';
 import type { StandardTerms } from '@agoric/zoe';

package/src/contractGovernor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contractGovernor.d.ts","sourceRoot":"","sources":["contractGovernor.js"],"names":[],"mappings":"AAiBA,yCAAyC;AACzC,mBADW,aAAa,OAAO,KAAK,CAAC,CAGnC;AAYK,6CAJI,IAAI,CAAC,UAAU,CAAC,cAChB,QAAQ,WACR,uBAAuB,+BAkBjC;AAYM,iDAJI,IAAI,CAAC,UAAU,CAAC,cAChB,QAAQ,eACR,QAAQ,+BAYlB;AA0FM,sBAnB0B,EAAE,SAAtB,iBAAmB,OACrB,IAAI;IACV,KAAK,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;IAC3C,4BAA4B,EAAE,aAAa,EAAE,CAAC,CAAC;IAC/C,QAAQ,EAAE;QACR,mBAAmB,EAAE,mBAAmB,CAAC;QACzC,KAAK,EAAE;YAAC,cAAc,EAAE;gBAAC,CAAC,mBAAmB,CAAC,EAAE,OAAO,2CAA2C,EAAE,eAAe,CAAA;aAAC,CAAA;SAAC,CAAC;QACtH,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAA;CACF,CAAC,eACM;IACN,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAClC,WAKO,OAAO,kBAAkB,EAAE,OAAO,GAJhC,OAAO,CAAC;IAChB,YAAY,EAAE,qBAAqB,EAAE,CAAC,CAAC;IACvC,WAAW,EAAE,cAAc,CAAC;CAC7B,CAAC,CA8DJ;oCAjJY,aAAa;kCA/D6D,aAAa;8BAAb,aAAa;6CACD,YAAY;uCAAZ,YAAY;kCADxB,aAAa;oCALhE,qCAAqC;yBAKc,aAAa;0CACD,YAAY;oCAAZ,YAAY;mCADxB,aAAa"}
+{"version":3,"file":"contractGovernor.d.ts","sourceRoot":"","sources":["contractGovernor.js"],"names":[],"mappings":"AAoBA,yCAAyC;AACzC,mBADW,aAAa,OAAO,KAAK,CAAC,CAGnC;AAYK,6CAJI,IAAI,CAAC,UAAU,CAAC,cAChB,QAAQ,WACR,uBAAuB,+BAkBjC;AAYM,iDAJI,IAAI,CAAC,UAAU,CAAC,cAChB,QAAQ,eACR,QAAQ,+BAYlB;AA0FM,sBAnB0B,EAAE,SAAtB,iBAAmB,OACrB,IAAI;IACV,KAAK,EAAE,YAAY,CAAC;IACpB,4BAA4B,EAAE,aAAa,EAAE,CAAC,CAAC;IAC/C,QAAQ,EAAE;QACR,mBAAmB,EAAE,mBAAmB,CAAC;QACzC,KAAK,EAAE;YAAC,cAAc,EAAE;gBAAC,CAAC,mBAAmB,CAAC,EAAE,eAAe,CAAA;aAAC,CAAA;SAAC,CAAC;QAClE,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAA;CACF,CAAC,eACM;IACN,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAClC,WAKO,OAAO,GAJL,OAAO,CAAC;IAChB,YAAY,EAAE,qBAAqB,EAAE,CAAC,CAAC;IACvC,WAAW,EAAE,cAAc,CAAC;CAC7B,CAAC,CA8DJ;oCAjJY,aAAa;kCAlE6D,aAAa;8BAAb,aAAa;6CACD,YAAY;uCAAZ,YAAY;kCAChF,cAAc;kCAF0C,aAAa;oCALhE,qCAAqC;qCAQvC,2CAA2C;yBAHU,aAAa;6BAI1E,kBAAkB;0CAHuD,YAAY;oCAAZ,YAAY;mCADxB,aAAa"}

package/src/contractGovernor.js

@@ -11,6 +11,9 @@ import { ParamChangesQuestionDetailsShape } from './typeGuards.js';
 /**
  * @import {ContractMeta, Installation, Instance, Invitation, StandardTerms, ZCF} from '@agoric/zoe';
  * @import {GovernableStartFn, GovernorCreatorFacet, GovernorPublic, ParamChangeIssueDetails} from './types.js';
+ * @import {TimerService} from '@agoric/time';
+ * @import {InvitationParam} from './contractGovernance/typedParamManager.js';
+ * @import {Baggage} from '@agoric/vat-data';
  */
 
 const trace = makeTracer('CGov', false);
@@ -73,7 +76,7 @@ harden(validateQuestionFromCounter);
 
 /**
  * @typedef {StandardTerms} ContractGovernorTerms
- * @property {import('@agoric/time').TimerService} timer
+ * @property {TimerService} timer
  * @property {Installation} governedContractInstallation
  */
 
@@ -127,7 +130,7 @@ harden(validateQuestionFromCounter);
  * GovernorPublic,
  * GovernorCreatorFacet<PF,CF>,
  * {
- *   timer: import('@agoric/time').TimerService,
+ *   timer: TimerService,
  *   governedContractInstallation: Installation<CF>,
  *   governed: {
  *     issuerKeywordRecord: IssuerKeywordRecord,
@@ -141,11 +144,11 @@ harden(validateQuestionFromCounter);
  *
  * @template {GovernableStartFn} SF Start function of governed contract
  * @param {ZCF<{
- *   timer: import('@agoric/time').TimerService,
+ *   timer: TimerService,
  *   governedContractInstallation: Installation<SF>,
  *   governed: {
  *     issuerKeywordRecord: IssuerKeywordRecord,
- *     terms: {governedParams: {[CONTRACT_ELECTORATE]: import('./contractGovernance/typedParamManager.js').InvitationParam}},
+ *     terms: {governedParams: {[CONTRACT_ELECTORATE]: InvitationParam}},
  *     label?: string,
  *   }
  * }>} zcf
@@ -156,7 +159,7 @@ harden(validateQuestionFromCounter);
  *   creatorFacet: GovernorCreatorFacet<SF>,
  *   publicFacet: GovernorPublic,
  * }>}
- * @param {import('@agoric/vat-data').Baggage} baggage
+ * @param {Baggage} baggage
  */
 export const start = async (zcf, privateArgs, baggage) => {
   trace('start');

package/src/contractGovernorKit.d.ts

@@ -1,7 +1,7 @@
-export function prepareContractGovernorKit(baggage: import("@agoric/vat-data").Baggage, powers: {
-    timer: import("@agoric/time").TimerService;
+export function prepareContractGovernorKit(baggage: Baggage, powers: {
+    timer: TimerService;
     zoe: ERef<ZoeService>;
-}): (startedInstanceKit: import("@agoric/zoe/src/zoeService/utils.js").StartedInstanceKit<GovernableStartFn>, limitedCreatorFacet: any) => import("@endo/exo").GuardedKit<{
+}): (startedInstanceKit: StartedInstanceKit<GovernableStartFn>, limitedCreatorFacet: any) => import("@endo/exo").GuardedKit<{
     helper: {
         getElectorateInstance(): Promise<Instance>;
         getUpdatedPoserFacet(): Promise<PoserFacet>;
@@ -35,7 +35,10 @@ export function prepareContractGovernorKit(baggage: import("@agoric/vat-data").B
     };
 }>;
 export type ContractGovernorKit = EReturn<EReturn<typeof prepareContractGovernorKit>>;
+import type { Baggage } from '@agoric/vat-data';
+import type { TimerService } from '@agoric/time';
 import type { GovernableStartFn } from './types.js';
+import type { StartedInstanceKit } from '@agoric/zoe/src/zoeService/utils.js';
 import type { Instance } from '@agoric/zoe';
 import type { PoserFacet } from './types.js';
 import type { Invitation } from '@agoric/zoe';

package/src/contractGovernorKit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contractGovernorKit.d.ts","sourceRoot":"","sources":["contractGovernorKit.js"],"names":[],"mappings":"AAoEO,oDANI,OAAO,kBAAkB,EAAE,OAAO,UAClC;IACN,KAAK,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;IAC3C,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;CACvB;;iCAiCqB,OAAO,CAAC,QAAQ,CAAC;gCAOjB,OAAO,CAAC,UAAU,CAAC;;;;;;QAmEpC;;;WAGG;2CAFQ,UAAU,GACR,OAAO,CAAC,IAAI,CAAC;;;;;;;;;;;;QAkE1B,gCAAgC;qCAApB,QAAQ;QAepB,6BAA6B;iCAAjB,QAAQ;QAWpB,uCAAuC;mCAA3B,WAAW;;GAY9B;kCAEa,QAAQ,QAAQ,OAAO,0BAA0B,CAAC,CAAC;uCApQmE,YAAY;8BADxE,aAAa;gCAC+C,YAAY;gCADxE,aAAa;kCAAb,aAAa;iCAC+C,YAAY;6BAFtH,WAAW"}
+{"version":3,"file":"contractGovernorKit.d.ts","sourceRoot":"","sources":["contractGovernorKit.js"],"names":[],"mappings":"AAwEO,oDANI,OAAO,UACP;IACN,KAAK,EAAE,YAAY,CAAC;IACpB,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;CACvB;;iCAiCqB,OAAO,CAAC,QAAQ,CAAC;gCAOjB,OAAO,CAAC,UAAU,CAAC;;;;;;QAmEpC;;;WAGG;2CAFQ,UAAU,GACR,OAAO,CAAC,IAAI,CAAC;;;;;;;;;;;;QAkE1B,gCAAgC;qCAApB,QAAQ;QAepB,6BAA6B;iCAAjB,QAAQ;QAWpB,uCAAuC;mCAA3B,WAAW;;GAY9B;kCAEa,QAAQ,QAAQ,OAAO,0BAA0B,CAAC,CAAC;6BAvQvC,kBAAkB;kCACb,cAAc;uCAFuF,YAAY;wCAG3G,qCAAqC;8BAJF,aAAa;gCAC+C,YAAY;gCADxE,aAAa;kCAAb,aAAa;iCAC+C,YAAY;6BAFtH,WAAW"}

package/src/contractGovernorKit.js

@@ -20,6 +20,10 @@ import { ClosingRuleShape, ParamChangesSpecShape } from './typeGuards.js';
  * @import {EReturn} from '@endo/far';
  * @import {ContractMeta, Installation, Instance, Invitation, ZCF} from '@agoric/zoe';
  * @import {ClosingRule, GovernableStartFn, LimitedCF, PoserFacet, VoteOnApiInvocation, VoteOnOfferFilter, VoteOnParamChanges} from './types.js';
+ * @import {Baggage} from '@agoric/vat-data';
+ * @import {TimerService} from '@agoric/time';
+ * @import {StartedInstanceKit} from '@agoric/zoe/src/zoeService/utils.js';
+ * @import {TypedParamManager} from './contractGovernance/typedParamManager.js';
  */
 
 const trace = makeTracer('CGK', false);
@@ -60,9 +64,9 @@ const ContractGovernorKitI = {
 
 /**
  *
- * @param {import('@agoric/vat-data').Baggage} baggage
+ * @param {Baggage} baggage
  * @param {{
- *   timer: import('@agoric/time').TimerService,
+ *   timer: TimerService,
  *   zoe: ERef<ZoeService>,
  * }} powers
  */
@@ -85,7 +89,7 @@ export const prepareContractGovernorKit = (baggage, powers) => {
     'ContractGovernorKit',
     ContractGovernorKitI,
     /**
-     * @param {import('@agoric/zoe/src/zoeService/utils.js').StartedInstanceKit<GovernableStartFn>} startedInstanceKit
+     * @param {StartedInstanceKit<GovernableStartFn>} startedInstanceKit
      * @param {LimitedCF<unknown>} limitedCreatorFacet
      */
     (startedInstanceKit, limitedCreatorFacet) => {
@@ -177,7 +181,7 @@ export const prepareContractGovernorKit = (baggage, powers) => {
          */
         replaceElectorate(poserInvitation) {
           const { creatorFacet } = this.state;
-          /** @type {Promise<import('./contractGovernance/typedParamManager.js').TypedParamManager<{'Electorate': 'invitation'}>>} */
+          /** @type {Promise<TypedParamManager<{'Electorate': 'invitation'}>>} */
 
           // @ts-expect-error cast
           const paramMgr = E(E(creatorFacet).getParamMgrRetriever()).get({

package/src/contractHelper.d.ts

@@ -4,11 +4,16 @@
  * @import {ContractMeta, Installation, Instance, Invitation, ZCF} from '@agoric/zoe';
  * @import {VoteCounterCreatorFacet, VoteCounterPublicFacet, QuestionSpec, OutcomeRecord, AddQuestion, AddQuestionReturn, GovernanceSubscriptionState, GovernanceTerms, GovernedApis, GovernedCreatorFacet, GovernedPublicFacet} from './types.js';
  * @import {Baggage} from '@agoric/vat-data';
+ * @import {TypedParamManager} from './contractGovernance/typedParamManager.js';
+ * @import {ParamTypesMap} from './contractGovernance/typedParamManager.js';
+ * @import {FunctionsPlusContext} from '@agoric/swingset-liveslots';
+ * @import {StoredPublisherKit} from '@agoric/notifier';
  */
 export const GOVERNANCE_STORAGE_KEY: "governance";
-export function validateElectorate(zcf: ZCF<GovernanceTerms<{}> & {}>, paramManager: import("./contractGovernance/typedParamManager.js").TypedParamManager<any>): Promise<true>;
+export function validateElectorate(zcf: ZCF<GovernanceTerms<{}> & {}>, paramManager: TypedParamManager<any>): Promise<true>;
 import type { GovernanceTerms } from './types.js';
 import type { ZCF } from '@agoric/zoe';
+import type { TypedParamManager } from './contractGovernance/typedParamManager.js';
 /**
  * Helper for the 90% of contracts that will have only a single set of
  * parameters. Using this for managed parameters, a contract only has to
@@ -21,7 +26,7 @@ import type { ZCF } from '@agoric/zoe';
  * parameter values, and the governance guarantees only hold if they're not used
  * directly by the governed contract.
  *
- * @template {import('./contractGovernance/typedParamManager.js').ParamTypesMap} M
+ * @template {ParamTypesMap} M
  *   Map of types of custom governed terms
  * @param {ZCF<GovernanceTerms<M>>} zcf
  * @param {Invitation} initialPoserInvitation
@@ -30,7 +35,7 @@ import type { ZCF } from '@agoric/zoe';
  * @param {ERemote<EMarshaller>} [marshaller]
  * @param {object} [overrides]
  */
-export function handleParamGovernance<M extends import("./contractGovernance/typedParamManager.js").ParamTypesMap>(zcf: ZCF<GovernanceTerms<M>>, initialPoserInvitation: Invitation, paramTypesMap: M, storageNode?: ERemote<StorageNode>, marshaller?: ERemote<EMarshaller>, overrides?: object): {
+export function handleParamGovernance<M extends ParamTypesMap>(zcf: ZCF<GovernanceTerms<M>>, initialPoserInvitation: Invitation, paramTypesMap: M, storageNode?: ERemote<StorageNode>, marshaller?: ERemote<EMarshaller>, overrides?: object): {
     publicMixin: {
         getAmount: (name: string) => Amount;
         getBrand: (name: string) => Brand;
@@ -81,17 +86,17 @@ export function handleParamGovernance<M extends import("./contractGovernance/typ
     makeVirtualGovernorFacet: <LCF extends {
         [methodName: string]: (context?: unknown, ...rest: unknown[]) => unknown;
     }>(limitedCreatorFacet: LCF) => {
-        governorFacet: import("@agoric/swingset-liveslots").FunctionsPlusContext<unknown, GovernedCreatorFacet<LCF>>;
+        governorFacet: FunctionsPlusContext<unknown, GovernedCreatorFacet<LCF>>;
         limitedCreatorFacet: LCF;
     };
     makeDurableGovernorFacet: <CF>(baggage: Baggage, limitedCreatorFacet: CF, governedApis?: Record<string, (...any: any[]) => unknown> | undefined) => {
         governorFacet: import("@endo/exo").Guarded<{
             getParamMgrRetriever: () => {
-                get: () => import("./contractGovernance/typedParamManager.js").TypedParamManager<M & {
+                get: () => TypedParamManager<M & {
                     Electorate: "invitation";
                 }>;
             } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
-                get: () => import("./contractGovernance/typedParamManager.js").TypedParamManager<M & {
+                get: () => TypedParamManager<M & {
                     Electorate: "invitation";
                 }>;
             }>;
@@ -123,6 +128,7 @@ export namespace publicMixinAPI {
     let getRelativeTime: import("@endo/patterns").MethodGuard;
     let getUnknown: import("@endo/patterns").MethodGuard;
 }
+import type { ParamTypesMap } from './contractGovernance/typedParamManager.js';
 import type { Invitation } from '@agoric/zoe';
 import type { ERemote } from '@agoric/internal';
 import type { EMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
@@ -131,6 +137,7 @@ import type { Installation } from '@agoric/zoe';
 import type { GovernanceSubscriptionState } from './types.js';
 import type { GovernedPublicFacet } from './types.js';
 import type { GovernedCreatorFacet } from './types.js';
+import type { FunctionsPlusContext } from '@agoric/swingset-liveslots';
 import type { Baggage } from '@agoric/vat-data';
 import type { GovernedApis } from './types.js';
 //# sourceMappingURL=contractHelper.d.ts.map

package/src/contractHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contractHelper.d.ts","sourceRoot":"","sources":["contractHelper.js"],"names":[],"mappings":"AAcA;;;;;;GAMG;AAEH,qCAAsC,YAAY,CAAC;AAwB5C,wCAHI,IAAI,gBAAgB,EAAE,CAAC,GAAG,EAAE,CAAC,gBAC7B,OAAO,2CAA2C,EAAE,iBAAiB,CAAC,GAAG,CAAC,iBAQpF;qCAlCqO,YAAY;yBAD1K,aAAa;AA8NrF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,sCATiF,CAAC,SAArE,OAAQ,2CAA2C,EAAE,aAAc,OAErE,IAAI,gBAAgB,CAAC,CAAC,CAAC,0BACvB,UAAU,iBACV,CAAC,gBACD,QAAQ,WAAW,CAAC,eACpB,QAAQ,WAAW,CAAC,cACpB,MAAM;;;;;;;;;;;;;;;;yBAzKG,EAAE,SAAP,EAAI;gCAgBC,GAAG,SAAR,EAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBAsCC,EAAE,SAAP,EAAI,2CAEN,EAAE;2BA7BK,EAAE,SAAP,EAAI,4EAEqB,OAAO;+BAuC8C,GAAG;yCAA7C,OAAO,WAAW,OAAO,EAAE,KAAK,OAAO;;;;;+BA8B3E,EAAE,WACJ,OAAO,4EAEoB,OAAO;;;;;;;;;;;;;YAmBvC,iCAAiC;mCAAhB,YAAY;;;;;;;;;EA0EpC;;;;;;;;;;;;;;;;gCA1QuE,aAAa;6BAF3D,kBAAkB;iCACd,iDAAiD;8BACP,aAAa;kCAAb,aAAa;iDACiJ,YAAY;yCAAZ,YAAY;0CAAZ,YAAY;6BACxN,kBAAkB;kCAD0L,YAAY"}
+{"version":3,"file":"contractHelper.d.ts","sourceRoot":"","sources":["contractHelper.js"],"names":[],"mappings":"AAcA;;;;;;;;;;GAUG;AAEH,qCAAsC,YAAY,CAAC;AAwB5C,wCAHI,IAAI,gBAAgB,EAAE,CAAC,GAAG,EAAE,CAAC,gBAC7B,kBAAkB,GAAG,CAAC,iBAQhC;qCAtCqO,YAAY;yBAD1K,aAAa;uCAGjD,2CAA2C;AA+N/E;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,sCAT6B,CAAC,SAAjB,aAAe,OAEjB,IAAI,gBAAgB,CAAC,CAAC,CAAC,0BACvB,UAAU,iBACV,CAAC,gBACD,QAAQ,WAAW,CAAC,eACpB,QAAQ,WAAW,CAAC,cACpB,MAAM;;;;;;;;;;;;;;;;yBAzKG,EAAE,SAAP,EAAI;gCAgBC,GAAG,SAAR,EAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBAsCC,EAAE,SAAP,EAAI,2CAEN,EAAE;2BA7BK,EAAE,SAAP,EAAI,4EAEqB,OAAO;+BAuC8C,GAAG;yCAA7C,OAAO,WAAW,OAAO,EAAE,KAAK,OAAO;;;;;+BA8B3E,EAAE,WACJ,OAAO,4EAEoB,OAAO;;;;;;;;;;;;;YAmBvC,iCAAiC;mCAAhB,YAAY;;;;;;;;;EA0EpC;;;;;;;;;;;;;;;;mCA1Q+B,2CAA2C;gCAJH,aAAa;6BAF3D,kBAAkB;iCACd,iDAAiD;8BACP,aAAa;kCAAb,aAAa;iDACiJ,YAAY;yCAAZ,YAAY;0CAAZ,YAAY;0CAI3M,4BAA4B;6BAHzC,kBAAkB;kCAD0L,YAAY"}

package/src/contractHelper.js

@@ -18,6 +18,10 @@ import { CONTRACT_ELECTORATE } from './contractGovernance/governParam.js';
  * @import {ContractMeta, Installation, Instance, Invitation, ZCF} from '@agoric/zoe';
  * @import {VoteCounterCreatorFacet, VoteCounterPublicFacet, QuestionSpec, OutcomeRecord, AddQuestion, AddQuestionReturn, GovernanceSubscriptionState, GovernanceTerms, GovernedApis, GovernedCreatorFacet, GovernedPublicFacet} from './types.js';
  * @import {Baggage} from '@agoric/vat-data';
+ * @import {TypedParamManager} from './contractGovernance/typedParamManager.js';
+ * @import {ParamTypesMap} from './contractGovernance/typedParamManager.js';
+ * @import {FunctionsPlusContext} from '@agoric/swingset-liveslots';
+ * @import {StoredPublisherKit} from '@agoric/notifier';
  */
 
 export const GOVERNANCE_STORAGE_KEY = 'governance';
@@ -42,7 +46,7 @@ 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
+ * @param {TypedParamManager<any>} paramManager
  */
 export const validateElectorate = (zcf, paramManager) => {
   const invitation = paramManager.getInternalParamValue(CONTRACT_ELECTORATE);
@@ -56,9 +60,9 @@ harden(validateElectorate);
 /**
  * Utility function for `makeParamGovernance`.
  *
- * @template {import('./contractGovernance/typedParamManager.js').ParamTypesMap} T
+ * @template {ParamTypesMap} T
  * @param {ZCF<GovernanceTerms<{}> & {}>} zcf
- * @param {import('./contractGovernance/typedParamManager.js').TypedParamManager<T>} paramManager
+ * @param {TypedParamManager<T>} paramManager
  */
 const facetHelpers = (zcf, paramManager) => {
   // validate async to wait for params to be finished
@@ -159,7 +163,7 @@ const facetHelpers = (zcf, paramManager) => {
    * @param {LCF} limitedCreatorFacet
    */
   const makeVirtualGovernorFacet = limitedCreatorFacet => {
-    /** @type {import('@agoric/swingset-liveslots').FunctionsPlusContext<unknown, GovernedCreatorFacet<limitedCreatorFacet>>} */
+    /** @type {FunctionsPlusContext<unknown, GovernedCreatorFacet<typeof limitedCreatorFacet>>} */
     const governorFacet = harden({
       getParamMgrRetriever: () =>
         Far('paramRetriever', { get: () => paramManager }),
@@ -249,7 +253,7 @@ const facetHelpers = (zcf, paramManager) => {
  * parameter values, and the governance guarantees only hold if they're not used
  * directly by the governed contract.
  *
- * @template {import('./contractGovernance/typedParamManager.js').ParamTypesMap} M
+ * @template {ParamTypesMap} M
  *   Map of types of custom governed terms
  * @param {ZCF<GovernanceTerms<M>>} zcf
  * @param {Invitation} initialPoserInvitation
@@ -266,7 +270,7 @@ const handleParamGovernance = (
   marshaller,
   overrides,
 ) => {
-  /** @type {import('@agoric/notifier').StoredPublisherKit<GovernanceSubscriptionState>} */
+  /** @type {StoredPublisherKit<GovernanceSubscriptionState>} */
   const publisherKit = makeStoredPublisherKit(
     storageNode,
     marshaller,

package/src/electorateTools.d.ts

@@ -1,18 +1,19 @@
 export type QuestionRecord = {
     voteCap: ERef<VoteCounterCreatorFacet>;
     publicFacet: VoteCounterPublicFacet;
-    deadline: import("@agoric/time").Timestamp;
+    deadline: Timestamp;
 };
 /**
  * @import {MapStore} from '@agoric/swingset-liveslots';
  * @import {ContractMeta, Installation, Instance, Invitation, ZCF} from '@agoric/zoe';
  * @import {VoteCounterCreatorFacet, VoteCounterPublicFacet, QuestionSpec, OutcomeRecord, AddQuestion, AddQuestionReturn} from './types.js';
+ * @import {Timestamp} from '@agoric/time';
  */
 /**
  * @typedef {object} QuestionRecord
  * @property {ERef<VoteCounterCreatorFacet>} voteCap
  * @property {VoteCounterPublicFacet} publicFacet
- * @property {import('@agoric/time').Timestamp} deadline
+ * @property {Timestamp} deadline
  */
 /**
  * Start up a new Counter for a question
@@ -45,6 +46,7 @@ export function getPoserInvitation(zcf: ZCF, addQuestion: AddQuestion): Promise<
 }>, undefined>>;
 import type { VoteCounterCreatorFacet } from './types.js';
 import type { VoteCounterPublicFacet } from './types.js';
+import type { Timestamp } from '@agoric/time';
 import type { ZCF } from '@agoric/zoe';
 import type { QuestionSpec } from './types.js';
 import type { Installation } from '@agoric/zoe';

package/src/electorateTools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"electorateTools.d.ts","sourceRoot":"","sources":["electorateTools.js"],"names":[],"mappings":";aAYc,IAAI,CAAC,uBAAuB,CAAC;iBAC7B,sBAAsB;cACtB,OAAO,cAAc,EAAE,SAAS;;AAV9C;;;;GAIG;AAEH;;;;;GAKG;AAEH;;;;;;;;;;;GAWG;AACH,kCATW,GAAG,gBACH,YAAY,mBACZ,OAAO,eACP,IAAI,CAAC,YAAY,CAAC,iBAClB,SAAS,MAAM,CAAC,UAAU,CAAC,EAAE,cAAc,CAAC,sBAC5C,SAAS,CAAC,OAAO,CAAC,oBAClB,SAAS,CAAC,aAAa,CAAC,GACtB,OAAO,CAAC,iBAAiB,CAAC,CAsCtC;AAED,0EAA0E;AAC1E,gDADY,SAAS,MAAM,CAAC,UAAU,CAAC,EAAE,cAAc,CAAC,4CAcvD;AAED;;;GAGG;AACH,6CAHW,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,iBACxB,SAAS,MAAM,CAAC,UAAU,CAAC,EAAE,cAAc,CAAC,0CAKpD;AAEH;;;GAGG;AACH,wCAHW,GAAG,eACH,WAAW;;;;gBAarB;6CApG8H,YAAY;4CAAZ,YAAY;yBADnE,aAAa;kCAC0C,YAAY;kCADnE,aAAa;8BAD1D,4BAA4B;mCAEwE,YAAY;uCAAZ,YAAY;iCAAZ,YAAY;gCADnE,aAAa"}
+{"version":3,"file":"electorateTools.d.ts","sourceRoot":"","sources":["electorateTools.js"],"names":[],"mappings":";aAac,IAAI,CAAC,uBAAuB,CAAC;iBAC7B,sBAAsB;cACtB,SAAS;;AAXvB;;;;;GAKG;AAEH;;;;;GAKG;AAEH;;;;;;;;;;;GAWG;AACH,kCATW,GAAG,gBACH,YAAY,mBACZ,OAAO,eACP,IAAI,CAAC,YAAY,CAAC,iBAClB,SAAS,MAAM,CAAC,UAAU,CAAC,EAAE,cAAc,CAAC,sBAC5C,SAAS,CAAC,OAAO,CAAC,oBAClB,SAAS,CAAC,aAAa,CAAC,GACtB,OAAO,CAAC,iBAAiB,CAAC,CAsCtC;AAED,0EAA0E;AAC1E,gDADY,SAAS,MAAM,CAAC,UAAU,CAAC,EAAE,cAAc,CAAC,4CAcvD;AAED;;;GAGG;AACH,6CAHW,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,iBACxB,SAAS,MAAM,CAAC,UAAU,CAAC,EAAE,cAAc,CAAC,0CAKpD;AAEH;;;GAGG;AACH,wCAHW,GAAG,eACH,WAAW;;;;gBAarB;6CArG8H,YAAY;4CAAZ,YAAY;+BAC/G,cAAc;yBAF8B,aAAa;kCAC0C,YAAY;kCADnE,aAAa;8BAD1D,4BAA4B;mCAEwE,YAAY;uCAAZ,YAAY;iCAAZ,YAAY;gCADnE,aAAa"}

package/src/electorateTools.js

@@ -6,13 +6,14 @@ import { deeplyFulfilled, Far } from '@endo/marshal';
  * @import {MapStore} from '@agoric/swingset-liveslots';
  * @import {ContractMeta, Installation, Instance, Invitation, ZCF} from '@agoric/zoe';
  * @import {VoteCounterCreatorFacet, VoteCounterPublicFacet, QuestionSpec, OutcomeRecord, AddQuestion, AddQuestionReturn} from './types.js';
+ * @import {Timestamp} from '@agoric/time';
  */
 
 /**
  * @typedef {object} QuestionRecord
  * @property {ERef<VoteCounterCreatorFacet>} voteCap
  * @property {VoteCounterPublicFacet} publicFacet
- * @property {import('@agoric/time').Timestamp} deadline
+ * @property {Timestamp} deadline
  */
 
 /**

package/src/types.d.ts

@@ -29,7 +29,7 @@ export type ParamValueTyped<T extends ParamType = ParamType> = {
  * Terms a contract must provide in order to be governed.
  */
 export type GovernanceTerms<T extends import("./contractGovernance/typedParamManager.js").ParamTypesMap> = {
-    electionManager: import("@agoric/zoe/src/zoeService/utils.js").Instance<typeof import("./contractGovernor.js")["start"]>;
+    electionManager: import("@agoric/zoe/src/zoeService/utils.js").Instance<typeof import("./contractGovernor.js").start>;
     governedParams: import("./contractGovernance/typedParamManager.js").ParamRecordsFromTypes<T & {
         Electorate: "invitation";
     }>;
@@ -495,24 +495,7 @@ export type GovernedContractTerms = {
 };
 export type AssertContractGovernance = (zoe: ERef<ZoeService>, allegedGoverned: import("@agoric/zoe/src/zoeService/utils.js").Instance<(zcf: ZCF<GovernanceTerms<{}>>) => {}>, allegedGovernor: Instance<(zcf: any) => {
     publicFacet: GovernorPublic;
-}>, contractGovernorInstallation: Installation<(<SF extends GovernableStartFn>(zcf: ZCF<{
-    timer: import("@agoric/time").TimerService;
-    governedContractInstallation: Installation<SF>;
-    governed: {
-        issuerKeywordRecord: IssuerKeywordRecord;
-        terms: {
-            governedParams: {
-                Electorate: import("./contractGovernance/typedParamManager.js").InvitationParam;
-            };
-        };
-        label?: string;
-    };
-}>, privateArgs: {
-    governed: Record<string, unknown>;
-}, baggage: import("@agoric/vat-data").Baggage) => Promise<{
-    creatorFacet: GovernorCreatorFacet<SF>;
-    publicFacet: GovernorPublic;
-}>)>) => Promise<GovernancePair>;
+}>, contractGovernorInstallation: Installation<typeof import("@agoric/governance/src/contractGovernor.js").start>) => Promise<GovernancePair>;
 /**
  * - assert that the contract uses the
  *   electorate
@@ -524,7 +507,7 @@ export type GovernableStartFn = ContractStartFunction & ((zcf?: any, pa?: any, b
     creatorFacet: GovernedCreatorFacet<{}>;
     publicFacet: GovernedPublicFacet<{}>;
 }>);
-export type GovernorSF = typeof import("./contractGovernor.js")["start"];
+export type GovernorSF = typeof import("./contractGovernor.js").start;
 /**
  * Same result as StartedInstanceKit but:
  * - typed for contractGovernor installation being started by Zoe. (It in turn starts the governed contract.)

package/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":"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"}

package/src/types.js

@@ -76,7 +76,7 @@ export {};
  *
  * @template {import('./contractGovernance/typedParamManager.js').ParamTypesMap} T Governed parameters of contract
  * @typedef {{
- *   electionManager: import('@agoric/zoe/src/zoeService/utils.js').Instance<import('./contractGovernor.js')['start']>,
+ *   electionManager: import('@agoric/zoe/src/zoeService/utils.js').Instance<typeof import('./contractGovernor.js').start>,
  *   governedParams: import('./contractGovernance/typedParamManager.js').ParamRecordsFromTypes<T & {
  *     Electorate: 'invitation'
  *   }>
@@ -691,7 +691,7 @@ export {};
  * @param {ERef<ZoeService>} zoe
  * @param {import('@agoric/zoe/src/zoeService/utils.js').Instance<(zcf: ZCF<GovernanceTerms<{}>>) => {}>} allegedGoverned
  * @param {Instance<(zcf) => {publicFacet: GovernorPublic}>} allegedGovernor
- * @param {Installation<import('@agoric/governance/src/contractGovernor.js').start>} contractGovernorInstallation
+ * @param {Installation<typeof import('@agoric/governance/src/contractGovernor.js').start>} contractGovernorInstallation
  * @returns {Promise<GovernancePair>}
  */
 
@@ -711,7 +711,7 @@ export {};
  */
 
 /**
- * @typedef {import('./contractGovernor.js')['start']} GovernorSF
+ * @typedef {typeof import('./contractGovernor.js').start} GovernorSF
  */
 
 // TODO find a way to parameterize the startInstance so the governed contract types flow

package/src/voterKit.d.ts

@@ -1,4 +1,4 @@
-export function prepareVoterKit(baggage: import("@agoric/vat-data").Baggage, { submitVote, zcf }: {
+export function prepareVoterKit(baggage: Baggage, { submitVote, zcf }: {
     zcf: ZCF;
     submitVote: (questionHandle: Handle<"Question">, voterHandle: Handle<"Voter">, chosenPositions: Position[], weight: bigint) => ERef<CompletedBallet>;
 }): (id: any) => import("@endo/exo").GuardedKit<{
@@ -9,6 +9,7 @@ export function prepareVoterKit(baggage: import("@agoric/vat-data").Baggage, { s
         makeVoteInvitation(positions: any, questionHandle: any): Promise<Invitation<CompletedBallet, undefined>>;
     };
 }>;
+import type { Baggage } from '@agoric/vat-data';
 import type { ZCF } from '@agoric/zoe';
 import type { Position } from './types.js';
 import type { CompletedBallet } from './types.js';

package/src/voterKit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"voterKit.d.ts","sourceRoot":"","sources":["voterKit.js"],"names":[],"mappings":"AA+BO,yCALI,OAAO,kBAAkB,EAAE,OAAO,uBAE1C;IAAoB,GAAG,EAAf,GAAG;IAC8I,UAAU,EAA3J,CAAC,cAAc,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC,eAAe,CAAC;CAClJ;;;;;;;GAgCA;yBAxDuE,aAAa;8BACqE,YAAY;qCAAZ,YAAY;gCAD9F,aAAa"}
+{"version":3,"file":"voterKit.d.ts","sourceRoot":"","sources":["voterKit.js"],"names":[],"mappings":"AAgCO,yCALI,OAAO,uBAEf;IAAoB,GAAG,EAAf,GAAG;IAC8I,UAAU,EAA3J,CAAC,cAAc,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC,eAAe,CAAC;CAClJ;;;;;;;GAgCA;6BAvDyB,kBAAkB;yBAF4B,aAAa;8BACqE,YAAY;qCAAZ,YAAY;gCAD9F,aAAa"}

package/src/voterKit.js

@@ -6,6 +6,7 @@ import { PositionShape, QuestionHandleShape } from './typeGuards.js';
 /**
  * @import {ContractMeta, Installation, Instance, Invitation, ZCF} from '@agoric/zoe';
  * @import {VoteCounterCreatorFacet, VoteCounterPublicFacet, QuestionSpec, OutcomeRecord, AddQuestion, AddQuestionReturn, CompletedBallet, Position} from './types.js';
+ * @import {Baggage} from '@agoric/vat-data';
  */
 
 const VoterI = M.interface('voter', {
@@ -24,7 +25,7 @@ const InvitationMakerI = M.interface('invitationMaker', {
 /**
  * Make a kit suitable for returning to a voter invited to a committee.
  *
- * @param {import('@agoric/vat-data').Baggage} baggage
+ * @param {Baggage} baggage
  * @param {object} powers
  * @param {ZCF} powers.zcf
  * @param {(questionHandle: Handle<'Question'>, voterHandle: Handle<'Voter'>, chosenPositions: Position[], weight: bigint) => ERef<CompletedBallet>} powers.submitVote

package/tools/puppetContractGovernor.d.ts

@@ -1,11 +1,11 @@
 export function start<SF extends GovernableStartFn>(zcf: ZCF<{
-    timer: import("@agoric/time").TimerService;
+    timer: TimerService;
     governedContractInstallation: Installation<SF>;
     governed: {
         issuerKeywordRecord?: IssuerKeywordRecord;
         terms: {
             governedParams: {
-                [CONTRACT_ELECTORATE]: import("../src/contractGovernance/typedParamManager.js").InvitationParam;
+                [CONTRACT_ELECTORATE]: InvitationParam;
             };
         };
     };
@@ -48,8 +48,10 @@ export function start<SF extends GovernableStartFn>(zcf: ZCF<{
  */
 export type PuppetContractGovernorKit<SF extends GovernableStartFn> = Awaited<ReturnType<typeof start<SF>>>;
 import type { GovernableStartFn } from '../src/types.js';
+import type { TimerService } from '@agoric/time';
 import type { Installation } from '@agoric/zoe';
 import { CONTRACT_ELECTORATE } from '../src/contractGovernance/governParam.js';
+import type { InvitationParam } from '../src/contractGovernance/typedParamManager.js';
 import type { ZCF } from '@agoric/zoe';
 import type { ParamChangesSpec } from '../src/types.js';
 import type { Passable } from '@endo/pass-style';

package/tools/puppetContractGovernor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"puppetContractGovernor.d.ts","sourceRoot":"","sources":["puppetContractGovernor.js"],"names":[],"mappings":"AAiCO,sBAb0B,EAAE,SAAtB,iBAAmB,OACrB,IAAI;IACV,KAAK,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;IAC3C,4BAA4B,EAAE,aAAa,EAAE,CAAC,CAAC;IAC/C,QAAQ,EAAE;QACR,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C,KAAK,EAAE;YAAC,cAAc,EAAE;gBAAC,CAAC,mBAAmB,CAAC,EAAE,OAAO,gDAAgD,EAAE,eAAe,CAAA;aAAE,CAAA;SAAC,CAAC;KAC7H,CAAA;CACF,CAAC,eACM;IACN,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAClC;;kCAkCU,iBAAiB,GAAG,CAAC;mCAUtB,MAAM,cACN,QAAQ,EAAE;;;;8BALT,KAAK,CAAC,MAAM,CAAC;;;;QA2BvB,wDAAwD;8BAA1C,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;;kCAjC1C,iBAAiB,GAAG,CAAC;mCAUtB,MAAM,cACN,QAAQ,EAAE;;;;8BALT,KAAK,CAAC,MAAM,CAAC;;;;QA2BvB,wDAAwD;8BAA1C,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;;;;;;;GASvD;;;;sCAGgC,EAAE,SAAtB,iBAAmB,IACnB,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;uCApGI,iBAAiB;kCADC,aAAa;oCALjD,0CAA0C;yBAKN,aAAa;sCAC/B,iBAAiB;8BAF3B,kBAAkB;8BACU,aAAa;qCADzC,kBAAkB"}
+{"version":3,"file":"puppetContractGovernor.d.ts","sourceRoot":"","sources":["puppetContractGovernor.js"],"names":[],"mappings":"AAmCO,sBAb0B,EAAE,SAAtB,iBAAmB,OACrB,IAAI;IACV,KAAK,EAAE,YAAY,CAAC;IACpB,4BAA4B,EAAE,aAAa,EAAE,CAAC,CAAC;IAC/C,QAAQ,EAAE;QACR,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C,KAAK,EAAE;YAAC,cAAc,EAAE;gBAAC,CAAC,mBAAmB,CAAC,EAAE,eAAe,CAAA;aAAE,CAAA;SAAC,CAAC;KACpE,CAAA;CACF,CAAC,eACM;IACN,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAClC;;kCAkCU,iBAAiB,GAAG,CAAC;mCAUtB,MAAM,cACN,QAAQ,EAAE;;;;8BALT,KAAK,CAAC,MAAM,CAAC;;;;QA2BvB,wDAAwD;8BAA1C,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;;kCAjC1C,iBAAiB,GAAG,CAAC;mCAUtB,MAAM,cACN,QAAQ,EAAE;;;;8BALT,KAAK,CAAC,MAAM,CAAC;;;;QA2BvB,wDAAwD;8BAA1C,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;;;;;;;GASvD;;;;sCAGgC,EAAE,SAAtB,iBAAmB,IACnB,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;uCAtGI,iBAAiB;kCACxC,cAAc;kCAF2B,aAAa;oCALjD,0CAA0C;qCAQ5C,gDAAgD;yBAHV,aAAa;sCAC/B,iBAAiB;8BAF3B,kBAAkB;8BACU,aAAa;qCADzC,kBAAkB"}

package/tools/puppetContractGovernor.js

@@ -10,6 +10,8 @@ import { makeApiInvocationPositions } from '../src/contractGovernance/governApi.
  * @import {Passable, RemotableObject} from '@endo/pass-style';
  * @import {ContractMeta, Installation, Instance, Invitation, ZCF} from '@agoric/zoe';
  * @import {GovernableStartFn, ParamChangesSpec} from '../src/types.js';
+ * @import {TimerService} from '@agoric/time';
+ * @import {InvitationParam} from '../src/contractGovernance/typedParamManager.js';
  */
 
 // @file a version of the contractGovernor.js contract simplified for testing.
@@ -20,11 +22,11 @@ import { makeApiInvocationPositions } from '../src/contractGovernance/governApi.
 /**
  * @template {GovernableStartFn} SF Start function of governed contract
  * @param {ZCF<{
- *   timer: import('@agoric/time').TimerService,
+ *   timer: TimerService,
  *   governedContractInstallation: Installation<SF>,
  *   governed: {
  *     issuerKeywordRecord?: IssuerKeywordRecord,
- *     terms: {governedParams: {[CONTRACT_ELECTORATE]: import('../src/contractGovernance/typedParamManager.js').InvitationParam }},
+ *     terms: {governedParams: {[CONTRACT_ELECTORATE]: InvitationParam }},
  *   }
  * }>} zcf
  * @param {{

package/tools/puppetGovernance.d.ts

@@ -1,4 +1,4 @@
-export function setUpGovernedContract<T extends GovernableStartFn>(zoe: ERef<ZoeService>, governedP: ERef<Installation<T>>, timer: import("@agoric/time").TimerService, termsOfGoverned?: {
+export function setUpGovernedContract<T extends GovernableStartFn>(zoe: ERef<ZoeService>, governedP: ERef<Installation<T>>, timer: TimerService, termsOfGoverned?: {
     [k: string]: any;
     governedParams?: Record<string, unknown>;
     governedApis?: string[];
@@ -8,7 +8,7 @@ export function setUpGovernedContract<T extends GovernableStartFn>(zoe: ERef<Zoe
         fakeInvitationAmount: import("@agoric/ertp").SetAmount<import("@agoric/zoe").InvitationDetails>;
     }>;
     governorFacets: import("@agoric/zoe/src/zoeService/utils.js").StartedInstanceKit<(<SF extends GovernableStartFn>(zcf: ZCF<{
-        timer: import("@agoric/time").TimerService;
+        timer: TimerService;
         governedContractInstallation: Installation<SF>;
         governed: {
             issuerKeywordRecord?: IssuerKeywordRecord;
@@ -52,7 +52,7 @@ export function setUpGovernedContract<T extends GovernableStartFn>(zoe: ERef<Zoe
     }>)>;
     installs: {
         governor: Installation<(<SF extends GovernableStartFn>(zcf: ZCF<{
-            timer: import("@agoric/time").TimerService;
+            timer: TimerService;
             governedContractInstallation: Installation<SF>;
             governed: {
                 issuerKeywordRecord?: IssuerKeywordRecord;
@@ -100,6 +100,7 @@ export function setUpGovernedContract<T extends GovernableStartFn>(zoe: ERef<Zoe
 }>;
 import type { GovernableStartFn } from '../src/types.js';
 import type { Installation } from '@agoric/zoe';
+import type { TimerService } from '@agoric/time';
 import { CONTRACT_ELECTORATE } from '../src/index.js';
 import type { ZCF } from '@agoric/zoe';
 import type { Instance } from '@agoric/zoe';

package/tools/puppetGovernance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"puppetGovernance.d.ts","sourceRoot":"","sources":["puppetGovernance.js"],"names":[],"mappings":"AAmCO,sCAR0B,CAAC,SAArB,iBAAmB,OACrB,IAAI,CAAC,UAAU,CAAC,aAChB,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,SACrB,OAAO,cAAc,EAAE,YAAY,oBACnC;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,0BACvF,EAAE,wBACF,mBAAmB;;;;;;;;;+BAHsB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mCAAD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiFpD;uCAxGmC,iBAAiB;kCADmB,aAAa;oCAHrC,iBAAiB;yBAGO,aAAa;8BAAb,aAAa"}
+{"version":3,"file":"puppetGovernance.d.ts","sourceRoot":"","sources":["puppetGovernance.js"],"names":[],"mappings":"AAqCO,sCAR0B,CAAC,SAArB,iBAAmB,OACrB,IAAI,CAAC,UAAU,CAAC,aAChB,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,SACrB,YAAY,oBACZ;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,0BACvF,EAAE,wBACF,mBAAmB;;;;;;;;;+BAFH,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mCAAD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgF3B;uCA1GmC,iBAAiB;kCADmB,aAAa;kCAEtD,cAAc;oCALG,iBAAiB;yBAGO,aAAa;8BAAb,aAAa"}

package/tools/puppetGovernance.js

@@ -6,6 +6,8 @@ import { CONTRACT_ELECTORATE, ParamTypes } from '../src/index.js';
 /**
  * @import {ContractMeta, Installation, Instance, Invitation, ZCF} from '@agoric/zoe';
  * @import {GovernableStartFn} from '../src/types.js';
+ * @import {TimerService} from '@agoric/time';
+ * @import {start} from './puppetContractGovernor.js';
  */
 
 const makeBundle = async sourceRoot => {
@@ -28,7 +30,7 @@ const autoRefundBundleP = makeBundle(
  * @template {GovernableStartFn} T governed contract startfn
  * @param {ERef<ZoeService>} zoe
  * @param {ERef<Installation<T>>} governedP
- * @param {import('@agoric/time').TimerService} timer
+ * @param {TimerService} timer
  * @param {{ [k: string]: any, governedParams?: Record<string, unknown>, governedApis?: string[] }} termsOfGoverned
  * @param {{}} privateArgsOfGoverned
  * @param {IssuerKeywordRecord} [issuerKeywordRecord]
@@ -48,7 +50,7 @@ export const setUpGovernedContract = async (
 
   /**
    * @type {[
-   * Installation<import('./puppetContractGovernor.js').start>,
+   * Installation<typeof start>,
    * Installation<any>,
    * Installation<T>,
    * ]}