@agoric/builders 0.1.1-dev-6504dc6.0 → 0.1.1-dev-acbb5da.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/builders",
-  "version": "0.1.1-dev-6504dc6.0+6504dc6",
+  "version": "0.1.1-dev-acbb5da.0+acbb5da",
   "description": "Build scripts for proposals to an Agoric chain",
   "type": "module",
   "main": "./index.js",
@@ -23,14 +23,14 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/ertp": "0.16.3-dev-6504dc6.0+6504dc6",
-    "@agoric/fast-usdc": "0.1.1-dev-6504dc6.0+6504dc6",
-    "@agoric/internal": "0.3.3-dev-6504dc6.0+6504dc6",
-    "@agoric/notifier": "0.6.3-dev-6504dc6.0+6504dc6",
-    "@agoric/smart-wallet": "0.5.4-dev-6504dc6.0+6504dc6",
-    "@agoric/vat-data": "0.5.3-dev-6504dc6.0+6504dc6",
-    "@agoric/vats": "0.15.2-dev-6504dc6.0+6504dc6",
-    "@agoric/zoe": "0.26.3-dev-6504dc6.0+6504dc6",
+    "@agoric/ertp": "0.16.3-dev-acbb5da.0+acbb5da",
+    "@agoric/fast-usdc": "0.1.1-dev-acbb5da.0+acbb5da",
+    "@agoric/internal": "0.3.3-dev-acbb5da.0+acbb5da",
+    "@agoric/notifier": "0.6.3-dev-acbb5da.0+acbb5da",
+    "@agoric/smart-wallet": "0.5.4-dev-acbb5da.0+acbb5da",
+    "@agoric/vat-data": "0.5.3-dev-acbb5da.0+acbb5da",
+    "@agoric/vats": "0.15.2-dev-acbb5da.0+acbb5da",
+    "@agoric/zoe": "0.26.3-dev-acbb5da.0+acbb5da",
     "@endo/bundle-source": "^3.5.1",
     "@endo/captp": "^4.4.4",
     "@endo/eventual-send": "^1.3.0",
@@ -43,14 +43,14 @@
     "import-meta-resolve": "^2.2.1"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.10.4-dev-6504dc6.0+6504dc6",
-    "@agoric/governance": "0.10.4-dev-6504dc6.0+6504dc6",
-    "@agoric/inter-protocol": "0.16.2-dev-6504dc6.0+6504dc6",
-    "@agoric/orchestration": "0.1.1-dev-6504dc6.0+6504dc6",
-    "@agoric/store": "0.9.3-dev-6504dc6.0+6504dc6",
-    "@agoric/swing-store": "0.9.2-dev-6504dc6.0+6504dc6",
-    "@agoric/swingset-liveslots": "0.10.3-dev-6504dc6.0+6504dc6",
-    "@agoric/time": "0.3.3-dev-6504dc6.0+6504dc6",
+    "@agoric/deploy-script-support": "0.10.4-dev-acbb5da.0+acbb5da",
+    "@agoric/governance": "0.10.4-dev-acbb5da.0+acbb5da",
+    "@agoric/inter-protocol": "0.16.2-dev-acbb5da.0+acbb5da",
+    "@agoric/orchestration": "0.1.1-dev-acbb5da.0+acbb5da",
+    "@agoric/store": "0.9.3-dev-acbb5da.0+acbb5da",
+    "@agoric/swing-store": "0.9.2-dev-acbb5da.0+acbb5da",
+    "@agoric/swingset-liveslots": "0.10.3-dev-acbb5da.0+acbb5da",
+    "@agoric/time": "0.3.3-dev-acbb5da.0+acbb5da",
     "@endo/errors": "^1.2.9",
     "ava": "^5.3.0",
     "c8": "^10.1.2"
@@ -83,5 +83,5 @@
   "typeCoverage": {
     "atLeast": 91.57
   },
-  "gitHead": "6504dc6288bb59b2d2390ce03b37a1f7b33deac4"
+  "gitHead": "acbb5da3c5a52bab8db319fd696aed70146f9a89"
 }

package/scripts/inter-protocol/replace-feeDistributor-combo.js

@@ -0,0 +1,74 @@
+import { parseScriptArgs, makeHelpers } from '@agoric/deploy-script-support';
+import { getManifestForReplaceFeeDistributor } from '@agoric/inter-protocol/src/proposals/replace-fee-distributor.js';
+import { SECONDS_PER_HOUR } from '@agoric/inter-protocol/src/proposals/econ-behaviors.js';
+
+const configurations = {
+  A3P_INTEGRATION: {
+    params: {
+      collectionInterval: 30n,
+      keywordShares: {
+        RewardDistributor: 0n,
+        Reserve: 1n,
+      },
+    },
+  },
+  MAINNET: {
+    params: {
+      collectionInterval: 1n * SECONDS_PER_HOUR,
+      keywordShares: {
+        RewardDistributor: 0n,
+        Reserve: 1n,
+      },
+    },
+  },
+  DEVNET: {
+    params: {
+      collectionInterval: 1n * SECONDS_PER_HOUR,
+      keywordShares: {
+        RewardDistributor: 0n,
+        Reserve: 1n,
+      },
+    },
+  },
+  EMERYNET: {
+    params: {
+      collectionInterval: 1n * SECONDS_PER_HOUR,
+      keywordShares: {
+        RewardDistributor: 0n,
+        Reserve: 1n,
+      },
+    },
+  },
+};
+
+const { keys } = Object;
+const knownVariants = keys(configurations);
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async (_, opts) => {
+  const config = opts.config || configurations[opts.variant];
+  console.log('feeDist OPTS', opts, config);
+  if (!config) {
+    const error = `Unknown variant "${opts.variant}". Expected one of ${knownVariants.join(', ')}`;
+    console.error(error);
+    throw Error(error);
+  }
+  const { params } = config;
+
+  return harden({
+    sourceSpec:
+      '@agoric/inter-protocol/src/proposals/replace-fee-distributor.js',
+    getManifestCall: [getManifestForReplaceFeeDistributor.name, { ...params }],
+  });
+};
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+export default async (homeP, endowments) => {
+  const name = 'replace-feeDistributor-combo';
+  const opts = parseScriptArgs(endowments, name, knownVariants);
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+
+  await writeCoreEval('replace-feeDistributor', utils =>
+    defaultProposalBuilder(utils, opts),
+  );
+};

package/scripts/vats/upgrade-bank.js

@@ -14,6 +14,6 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
-  const { writeCoreProposal } = await makeHelpers(homeP, endowments);
-  await writeCoreProposal('upgrade-bank', defaultProposalBuilder);
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval('upgrade-bank', defaultProposalBuilder);
 };

package/scripts/vats/upgrade-mintHolder.js

@@ -1,4 +1,4 @@
-import { makeHelpers } from '@agoric/deploy-script-support';
+import { makeHelpers, parseScriptArgs } from '@agoric/deploy-script-support';
 import { getManifestForUpgradingMintHolder } from '@agoric/vats/src/proposals/upgrade-mintHolder-proposal.js';
 
 const configurations = {
@@ -94,30 +94,9 @@ export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
   });
 };
 
-const Usage = `agoric run upgrade-mintHolder.js ${[...knownVariants, '<json-config>'].join(' | ')}`;
-
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
-  const { scriptArgs } = endowments;
-  const variantOrConfig = scriptArgs?.[0];
-  console.log('upgrade-mintHolder', 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 opts = parseScriptArgs(endowments, 'upgrade-mintHolder', knownVariants);
 
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval(`upgrade-mintHolder`, utils =>

package/scripts/vats/upgrade-psm.js

@@ -14,6 +14,6 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
-  const { writeCoreProposal } = await makeHelpers(homeP, endowments);
-  await writeCoreProposal('upgrade-psm', defaultProposalBuilder);
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval('upgrade-psm', defaultProposalBuilder);
 };