@agoric/builders 0.1.1-upgrade-18-dev-d7c994b.0 → 0.1.1-upgrade-18-dev-ef001c0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/builders",
-  "version": "0.1.1-upgrade-18-dev-d7c994b.0+d7c994b",
+  "version": "0.1.1-upgrade-18-dev-ef001c0.0+ef001c0",
   "description": "Build scripts for proposals to an Agoric chain",
   "type": "module",
   "main": "./index.js",
@@ -23,13 +23,13 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/ertp": "0.16.3-upgrade-18-dev-d7c994b.0+d7c994b",
-    "@agoric/internal": "0.3.3-upgrade-18-dev-d7c994b.0+d7c994b",
-    "@agoric/notifier": "0.6.3-upgrade-18-dev-d7c994b.0+d7c994b",
-    "@agoric/smart-wallet": "0.5.4-upgrade-18-dev-d7c994b.0+d7c994b",
-    "@agoric/vat-data": "0.5.3-upgrade-18-dev-d7c994b.0+d7c994b",
-    "@agoric/vats": "0.15.2-upgrade-18-dev-d7c994b.0+d7c994b",
-    "@agoric/zoe": "0.26.3-upgrade-18-dev-d7c994b.0+d7c994b",
+    "@agoric/ertp": "0.16.3-upgrade-18-dev-ef001c0.0+ef001c0",
+    "@agoric/internal": "0.3.3-upgrade-18-dev-ef001c0.0+ef001c0",
+    "@agoric/notifier": "0.6.3-upgrade-18-dev-ef001c0.0+ef001c0",
+    "@agoric/smart-wallet": "0.5.4-upgrade-18-dev-ef001c0.0+ef001c0",
+    "@agoric/vat-data": "0.5.3-upgrade-18-dev-ef001c0.0+ef001c0",
+    "@agoric/vats": "0.15.2-upgrade-18-dev-ef001c0.0+ef001c0",
+    "@agoric/zoe": "0.26.3-upgrade-18-dev-ef001c0.0+ef001c0",
     "@endo/bundle-source": "^3.4.2",
     "@endo/captp": "^4.4.2",
     "@endo/eventual-send": "^1.2.7",
@@ -41,14 +41,14 @@
     "import-meta-resolve": "^2.2.1"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.10.4-upgrade-18-dev-d7c994b.0+d7c994b",
-    "@agoric/governance": "0.10.4-upgrade-18-dev-d7c994b.0+d7c994b",
-    "@agoric/inter-protocol": "0.16.2-upgrade-18-dev-d7c994b.0+d7c994b",
-    "@agoric/orchestration": "0.1.1-upgrade-18-dev-d7c994b.0+d7c994b",
-    "@agoric/store": "0.9.3-upgrade-18-dev-d7c994b.0+d7c994b",
-    "@agoric/swing-store": "0.9.2-upgrade-18-dev-d7c994b.0+d7c994b",
-    "@agoric/swingset-liveslots": "0.10.3-upgrade-18-dev-d7c994b.0+d7c994b",
-    "@agoric/time": "0.3.3-upgrade-18-dev-d7c994b.0+d7c994b",
+    "@agoric/deploy-script-support": "0.10.4-upgrade-18-dev-ef001c0.0+ef001c0",
+    "@agoric/governance": "0.10.4-upgrade-18-dev-ef001c0.0+ef001c0",
+    "@agoric/inter-protocol": "0.16.2-upgrade-18-dev-ef001c0.0+ef001c0",
+    "@agoric/orchestration": "0.1.1-upgrade-18-dev-ef001c0.0+ef001c0",
+    "@agoric/store": "0.9.3-upgrade-18-dev-ef001c0.0+ef001c0",
+    "@agoric/swing-store": "0.9.2-upgrade-18-dev-ef001c0.0+ef001c0",
+    "@agoric/swingset-liveslots": "0.10.3-upgrade-18-dev-ef001c0.0+ef001c0",
+    "@agoric/time": "0.3.3-upgrade-18-dev-ef001c0.0+ef001c0",
     "@endo/errors": "^1.2.7",
     "ava": "^5.3.0",
     "c8": "^9.1.0"
@@ -81,5 +81,5 @@
   "typeCoverage": {
     "atLeast": 82.43
   },
-  "gitHead": "d7c994b8d33c0cd22b257f3e33b579588ab6c6d8"
+  "gitHead": "ef001c015ac66ff65840bee1f7fd3847e999154d"
 }

package/scripts/inter-protocol/replace-electorate-core.js

@@ -12,10 +12,12 @@
  *   Example:
  *     agoric run replace-electorate-core.js MAINNET
  */
-/* global process */
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { getManifestForReplaceAllElectorates } from '@agoric/inter-protocol/src/proposals/replaceElectorate.js';
 
+/** @typedef {Parameters<typeof import('@agoric/inter-protocol/src/proposals/replaceElectorate.js').replaceAllElectorates>[1]['options']} ReplaceElectorateOptions */
+
+/** @type {Record<string, ReplaceElectorateOptions>} */
 const configurations = {
   MAINNET: {
     committeeName: 'Economic Committee',
@@ -76,20 +78,33 @@ const configurations = {
 };
 
 const { keys } = Object;
-const Usage = `agoric run replace-electorate-core.js ${keys(configurations).join(' | ')}`;
+const knownVariants = keys(configurations);
+
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
-  const config = configurations[opts.variant];
+  const config = opts.config || configurations[opts.variant];
   if (!config) {
-    console.error(Usage);
-    process.exit(1);
+    const error = `Unknown variant "${opts.variant}". Expected one of ${knownVariants.join(', ')}`;
+    console.error(error);
+    throw Error(error);
   }
+  const { committeeName, voterAddresses, highPrioritySendersConfig } = config;
+  console.log(
+    'Generating replace committee proposal with config',
+    JSON.stringify({
+      committeeName,
+      voterAddresses,
+      highPrioritySendersConfig,
+    }),
+  );
   return harden({
     sourceSpec: '@agoric/inter-protocol/src/proposals/replaceElectorate.js',
     getManifestCall: [
       getManifestForReplaceAllElectorates.name,
       {
-        ...config,
+        committeeName,
+        voterAddresses,
+        highPrioritySendersConfig,
         economicCommitteeRef: publishRef(
           install(
             '@agoric/governance/src/committee.js',
@@ -101,15 +116,35 @@ export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
   });
 };
 
+const Usage = `agoric run replace-electorate-core.js ${[...knownVariants, '<json-config>'].join(' | ')}`;
+
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { scriptArgs } = endowments;
-  const variant = scriptArgs?.[0];
-  console.log('replace-committee', scriptArgs, variant);
+  const variantOrConfig = scriptArgs?.[0];
+  console.log('replace-electorate-core.js', variantOrConfig);
+
+  const opts = {};
+
+  if (typeof variantOrConfig === 'string') {
+    if (variantOrConfig[0] === '{') {
+      try {
+        opts.config = JSON.parse(variantOrConfig);
+      } catch (err) {
+        throw Error(`Failed to parse config argument ${variantOrConfig}`);
+      }
+    } else {
+      opts.variant = variantOrConfig;
+    }
+  } else {
+    console.error(Usage);
+    throw Error(Usage);
+  }
 
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
 
-  await writeCoreEval(`replace-committee-${variant}`, (utils, opts) =>
-    defaultProposalBuilder(utils, { ...opts, variant }),
+  await writeCoreEval(
+    `replace-committee-${opts.variant || 'from-config'}`,
+    utils => defaultProposalBuilder(utils, opts),
   );
 };

package/scripts/inter-protocol/updatePriceFeeds.js

@@ -13,7 +13,7 @@ const configurations = {
     ],
     inBrandNames: ['ATOM', 'stATOM'],
   },
-  main: {
+  MAINNET: {
     oracleAddresses: [
       'agoric144rrhh4m09mh7aaffhm6xy223ym76gve2x7y78', // DSRV
       'agoric19d6gnr9fyp6hev4tlrg87zjrzsd5gzr5qlfq2p', // Stakin
@@ -24,7 +24,7 @@ const configurations = {
     inBrandNames: ['ATOM', 'stATOM', 'stOSMO', 'stTIA', 'stkATOM'],
     contractTerms: { minSubmissionCount: 3 },
   },
-  devnet: {
+  DEVNET: {
     oracleAddresses: [
       'agoric1lw4e4aas9q84tq0q92j85rwjjjapf8dmnllnft', // DSRV
       'agoric1zj6vrrrjq4gsyr9lw7dplv4vyejg3p8j2urm82', // Stakin
@@ -37,20 +37,29 @@ const configurations = {
 };
 
 const { keys } = Object;
-const Usage = `agoric run updatePriceFeed.js ${keys(configurations).join(' | ')}`;
+const knownVariants = keys(configurations);
+
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
-  const config = configurations[opts.variant];
+  const config = opts.config || configurations[opts.variant];
   if (!config) {
-    console.error(Usage);
-    throw Error(Usage);
+    const error = `Unknown variant "${opts.variant}". Expected one of ${knownVariants.join(', ')}`;
+    console.error(error);
+    throw Error(error);
   }
+  const { oracleAddresses, inBrandNames, contractTerms } = config;
+  console.log(
+    'Generating price feeds update proposal with config',
+    JSON.stringify({ oracleAddresses, inBrandNames, contractTerms }),
+  );
   return harden({
     sourceSpec: '@agoric/inter-protocol/src/proposals/deploy-price-feeds.js',
     getManifestCall: [
       getManifestForPriceFeeds.name,
       {
-        ...config,
+        oracleAddresses,
+        inBrandNames,
+        contractTerms,
         priceAggregatorRef: publishRef(
           install(
             '@agoric/inter-protocol/src/price/fluxAggregatorContract.js',
@@ -68,15 +77,35 @@ export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
   });
 };
 
+const Usage = `agoric run updatePriceFeeds.js ${[...knownVariants, '<json-config>'].join(' | ')}`;
+
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { scriptArgs } = endowments;
-  const variant = scriptArgs?.[0];
-  console.log('updatePriceFeeds', scriptArgs, variant);
+  const variantOrConfig = scriptArgs?.[0];
+  console.log('updatePriceFeeds.js', variantOrConfig);
+
+  const opts = {};
+
+  if (typeof variantOrConfig === 'string') {
+    if (variantOrConfig[0] === '{') {
+      try {
+        opts.config = JSON.parse(variantOrConfig);
+      } catch (err) {
+        throw Error(`Failed to parse config argument ${variantOrConfig}`);
+      }
+    } else {
+      opts.variant = variantOrConfig;
+    }
+  } else {
+    console.error(Usage);
+    throw Error(Usage);
+  }
 
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
 
-  await writeCoreEval(`gov-price-feeds-${variant}`, (utils, opts) =>
-    defaultProposalBuilder(utils, { ...opts, variant }),
+  await writeCoreEval(
+    `gov-price-feeds-${opts.variant || 'from-config'}`,
+    utils => defaultProposalBuilder(utils, opts),
   );
 };