fixes to Economic Governance abilities

packages/agoric-cli/src/lib/rpc.js

@@ -33,7 +33,7 @@ const fromAgoricNet = str => {
 export const networkConfig =
   'AGORIC_NET' in process.env && process.env.AGORIC_NET !== 'local'
     ? await fromAgoricNet(NonNullish(process.env.AGORIC_NET))
-    : { rpcAddrs: ['http://0.0.0.0:26657'], chainName: 'agoric' };
+    : { rpcAddrs: ['http://0.0.0.0:26657'], chainName: 'agoriclocal' };
 // console.warn('networkConfig', networkConfig);
 
 /**

packages/governance/docs/contractGovernance.puml

@@ -15,7 +15,7 @@ package "GovernedContract Vat" <<Rectangle>>  {
         +terms: { electionManager, governedParams }
         +getState()
         +getContractGovernor()
-        -getParamManagerRetriever()
+        -getParamMgrRetriever()
     }
     note  left : calls buildParamManager(paramDesc);\nmakes paramMgr state public\nreturns paramMgr in creatorFacet
 }

packages/governance/package.json

@@ -47,7 +47,6 @@
   },
   "devDependencies": {
     "@agoric/deploy-script-support": "^0.9.2",
-    "@agoric/swingset-vat": "^0.28.0",
     "@endo/bundle-source": "^2.3.1",
     "@endo/init": "^0.5.49",
     "ava": "^4.3.1",

packages/governance/src/contractGovernor.js

@@ -218,6 +218,23 @@ const start = async (zcf, privateArgs) => {
     governedCF,
   );
 
+  /**
+   * @param {Invitation} poserInvitation
+   * @returns {Promise<void>}
+   */
+  const replaceElectorate = poserInvitation => {
+    /** @type {Promise<import('./contractGovernance/typedParamManager.js').TypedParamManager<{'Electorate': 'invitation'}>>} */
+    // @ts-expect-error cast
+    const paramMgr = E(E(governedCF).getParamMgrRetriever()).get({
+      key: 'governedParams',
+    });
+
+    // TODO use updateElectorate
+    return E(paramMgr).updateParams({
+      Electorate: poserInvitation,
+    });
+  };
+
   // this conditional was extracted so both sides are equally asynchronous
   /** @type {() => Promise<ApiGovernor>} */
   const initApiGovernance = async () => {
@@ -278,6 +295,7 @@ const start = async (zcf, privateArgs) => {
   };
 
   const creatorFacet = Far('governor creatorFacet', {
+    replaceElectorate,
     voteOnParamChanges,
     voteOnApiInvocation,
     voteOnOfferFilter: voteOnFilter,

packages/governance/src/types.js

@@ -45,7 +45,7 @@
  * T extends 'brand' ? Brand :
  * T extends 'installation' ? Installation:
  * T extends 'instance' ? Instance :
- * T extends 'invitation' ? Amount :
+ * T extends 'invitation' ? Amount : // XXX this is the getter value but not the setter
  * T extends 'nat' ? bigint :
  * T extends 'ratio' ? Ratio :
  * T extends 'string' ? string :
@@ -392,7 +392,7 @@
  * @property {(name: string) => Brand} getBrand
  * @property {(name: string) => Instance} getInstance
  * @property {(name: string) => Installation} getInstallation
- * @property {(name: string) => Amount} getInvitationAmount
+ * @property {(name: string) => Amount<'set'>} getInvitationAmount
  * @property {(name: string) => bigint} getNat
  * @property {(name: string) => Ratio} getRatio
  * @property {(name: string) => string} getString
@@ -540,6 +540,8 @@
  * @property {() => Promise<LimitedCreatorFacet<CF>>} getCreatorFacet - creator
  *   facet of the governed contract, without the tightly held ability to change
  *   param values.
+ * @property {(poserInvitation: Invitation) => Promise<void>} replaceElectorate
+ * @property {() => Promise<AdminFacet>} getAdminFacet
  * @property {() => GovernedPublicFacet<PF>} getPublicFacet - public facet of the governed contract
  * @property {() => Instance} getInstance - instance of the governed
  *   contract

packages/inter-protocol/Makefile

@@ -1,14 +1,30 @@
-TITLE = Inter Protocol Preview: Interchain Asset Vaults
-
 EVAL_DEPOSIT = 1000000ubld
 GAS_ADJUSTMENT = 1.2
 
+# USAGE
+# set KEY= on command to your key or modify this file
+# edit the EVALS paths to your script
+# see what open questions there are
+#
+# submit proposal
+#   make submit-proposal
+# see what its question number is
+#   make gov-q
+# go over to cosmic-swingset and vote for that number
+#   make scenario2-vote VOTE_PROPOSAL=2
+# poll until the vote concludes to see how it turned out
+#   make gov-q
+
+
 # stage
-AG_SOLO_BASEDIR = /tmp/agoricdev10
-NETWORK_CONFIG = https://devnet.agoric.net/network-config
-CHAIN_ID = $(shell curl -Ss "$(NETWORK_CONFIG)" | jq -r .chainName)
-RPC_IP = $(shell curl -Ss "$(NETWORK_CONFIG)" | jq -r .rpcAddrs[0] | cut -d":" -f1)
-CHAIN_OPTS = --node=http://$(RPC_IP):26657 --chain-id=$(CHAIN_ID)
+# NETWORK_CONFIG = https://ollinet.agoric.net/network-config
+# CHAIN_ID = $(shell curl -Ss "$(NETWORK_CONFIG)" | jq -r .chainName)
+#RPC_IP = $(shell curl -Ss "$(NETWORK_CONFIG)" | jq -r .rpcAddrs[0] | cut -d":" -f1)
+NODE = $(shell curl -Ss "$(NETWORK_CONFIG)" | jq -r .rpcAddrs[0])
+
+# running local
+CHAIN_ID = agoriclocal
+CHAIN_OPTS = --chain-id=$(CHAIN_ID)
 
 # local-chain
 # AG_SOLO_BASEDIR=../cosmic-swingset/t1/8000
@@ -20,29 +36,28 @@ CHAIN_OPTS = --node=http://$(RPC_IP):26657 --chain-id=$(CHAIN_ID)
 #   gov-amm-vaults-etc-permit.json gov-amm-vaults-etc.js \
 #   ./scripts/gov-startPSM-permit.json ./scripts/gov-startPSM.js
 
-EVALS = gov-add-collateral-permit.json gov-add-collateral.js \
-	gov-invite-committee-permit.json gov-invite-committee.js \
-	gov-price-feed-permit.json gov-price-feed.js
+# TODO parameterize
+EVALS = test/psm/wildcard-permit.json test/psm/gov-replace-committee.js
+DESCRIPTION = test/psm/gov-replace-committee.md
+TITLE = $$(head -1 $(DESCRIPTION))
 
-submit-proposal: $(EVALS)
-	git describe --tags --always
-	git diff --stat
-	cat $(AG_SOLO_BASEDIR)/ag-cosmos-helper-address
+KEY=k1
+# ADDR=agoric1z8vavxgfjztlhay5kftgp4kp5l4znkh4gf8lg4
+ADDR=$$(agd keys show $(KEY) --output json |jq --raw-output .address)
+
+submit-proposal: $(EVALS) $(DESCRIPTION)
+	agd keys show $(KEY)
 	agd $(CHAIN_OPTS) \
-	  --home=$(AG_SOLO_BASEDIR)/ag-cosmos-helper-statedir --keyring-backend=test \
 	  tx gov submit-proposal swingset-core-eval \
 	  $(EVALS) \
-	  --title="$(TITLE) on $(CHAIN_ID)" --description="$$(cat ./docs/run-preview-vault-asset.md)" \
+	  --title="$(TITLE) on $(CHAIN_ID)" --description="$$(cat $(DESCRIPTION))" \
 	  --deposit=$(EVAL_DEPOSIT) \
 	  --gas=auto --gas-adjustment=$(GAS_ADJUSTMENT) \
-	  --yes --from=ag-solo -b block
-
+	  --yes --from=$(KEY) -b sync
 
 gov-q:
 	agd $(CHAIN_OPTS) query gov proposals --output json | \
 		jq -c '.proposals[] | [.proposal_id,.voting_end_time,.status]';
 
-ADDR=agoric1z8vavxgfjztlhay5kftgp4kp5l4znkh4gf8lg4
-
 bank-q:
 	agd $(CHAIN_OPTS) query bank balances $(ADDR)