@agoric/builders 0.1.1-orchestration-dev-096c4e8.0 → 0.1.1-other-dev-3eb1a1d.0

package/index.js

@@ -1,2 +0,0 @@
-// Ambient types
-import '@agoric/network/exported.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/builders",
-  "version": "0.1.1-orchestration-dev-096c4e8.0+096c4e8",
+  "version": "0.1.1-other-dev-3eb1a1d.0+3eb1a1d",
   "description": "Build scripts for proposals to an Agoric chain",
   "type": "module",
   "main": "./index.js",
@@ -11,7 +11,7 @@
     "build:restart-vats-proposal": "echo This command has been deprecated. Please run this instead: agoric run scripts/vats/restart-vats.js",
     "build:zcf-proposal": "echo This command has been deprecated. Please run this instead: agoric run scripts/vats/replace-zoe.js",
     "prepack": "tsc --build tsconfig.build.json",
-    "postpack": "git clean -f '*.d.ts*'",
+    "postpack": "git clean -f '*.d.ts*' '*.tsbuildinfo'",
     "test": "ava",
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
@@ -23,35 +23,37 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/ertp": "0.16.3-orchestration-dev-096c4e8.0+096c4e8",
-    "@agoric/internal": "0.3.3-orchestration-dev-096c4e8.0+096c4e8",
-    "@agoric/network": "0.1.1-orchestration-dev-096c4e8.0+096c4e8",
-    "@agoric/notifier": "0.6.3-orchestration-dev-096c4e8.0+096c4e8",
-    "@agoric/smart-wallet": "0.5.4-orchestration-dev-096c4e8.0+096c4e8",
-    "@agoric/vat-data": "0.5.3-orchestration-dev-096c4e8.0+096c4e8",
-    "@agoric/vats": "0.15.2-orchestration-dev-096c4e8.0+096c4e8",
-    "@agoric/zoe": "0.26.3-orchestration-dev-096c4e8.0+096c4e8",
-    "@endo/bundle-source": "^3.1.0",
-    "@endo/captp": "^4.0.4",
-    "@endo/eventual-send": "^1.1.2",
-    "@endo/far": "^1.0.4",
-    "@endo/init": "^1.0.4",
-    "@endo/marshal": "^1.3.0",
-    "@endo/promise-kit": "^1.0.4",
-    "@endo/stream": "^1.1.0",
+    "@agoric/ertp": "0.16.3-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/fast-usdc": "0.1.1-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/internal": "0.3.3-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/notifier": "0.6.3-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/smart-wallet": "0.5.4-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/vat-data": "0.5.3-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/vats": "0.15.2-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/zoe": "0.26.3-other-dev-3eb1a1d.0+3eb1a1d",
+    "@endo/bundle-source": "^3.5.0",
+    "@endo/captp": "^4.4.3",
+    "@endo/eventual-send": "^1.2.8",
+    "@endo/far": "^1.1.9",
+    "@endo/init": "^1.1.7",
+    "@endo/marshal": "^1.6.2",
+    "@endo/patterns": "^1.4.7",
+    "@endo/promise-kit": "^1.1.8",
+    "@endo/stream": "^1.2.8",
     "import-meta-resolve": "^2.2.1"
   },
   "devDependencies": {
-    "@agoric/assert": "0.6.1-orchestration-dev-096c4e8.0+096c4e8",
-    "@agoric/deploy-script-support": "0.10.4-orchestration-dev-096c4e8.0+096c4e8",
-    "@agoric/governance": "0.10.4-orchestration-dev-096c4e8.0+096c4e8",
-    "@agoric/inter-protocol": "0.16.2-orchestration-dev-096c4e8.0+096c4e8",
-    "@agoric/store": "0.9.3-orchestration-dev-096c4e8.0+096c4e8",
-    "@agoric/swing-store": "0.9.2-orchestration-dev-096c4e8.0+096c4e8",
-    "@agoric/swingset-liveslots": "0.10.3-orchestration-dev-096c4e8.0+096c4e8",
-    "@agoric/time": "0.3.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/deploy-script-support": "0.10.4-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/governance": "0.10.4-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/inter-protocol": "0.16.2-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/orchestration": "0.1.1-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/store": "0.9.3-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/swing-store": "0.9.2-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/swingset-liveslots": "0.10.3-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/time": "0.3.3-other-dev-3eb1a1d.0+3eb1a1d",
+    "@endo/errors": "^1.2.8",
     "ava": "^5.3.0",
-    "c8": "^7.13.0"
+    "c8": "^10.1.2"
   },
   "files": [
     "CHANGELOG.md",
@@ -66,11 +68,11 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=14.15.0"
+    "node": "^18.12 || ^20.9"
   },
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/*.test.*"
     ],
     "require": [
       "@endo/init/debug.js"
@@ -79,7 +81,7 @@
     "workerThreads": false
   },
   "typeCoverage": {
-    "atLeast": 73.62
+    "atLeast": 89.69
   },
-  "gitHead": "096c4e8fce80e9a509b0e1a30fda11736c4570e1"
+  "gitHead": "3eb1a1d2d75b2b4a94807cd3bf759bc9fc531f05"
 }

package/scripts/fast-usdc/init-fast-usdc.js

@@ -0,0 +1,242 @@
+// @ts-check
+import { makeHelpers } from '@agoric/deploy-script-support';
+import { AmountMath } from '@agoric/ertp';
+import {
+  FastUSDCConfigShape,
+  getManifestForFastUSDC,
+} from '@agoric/fast-usdc/src/fast-usdc.start.js';
+import { toExternalConfig } from '@agoric/fast-usdc/src/utils/config-marshal.js';
+import {
+  multiplyBy,
+  parseRatio,
+} from '@agoric/zoe/src/contractSupport/ratio.js';
+import { Far } from '@endo/far';
+import { parseArgs } from 'node:util';
+
+/**
+ * @import {CoreEvalBuilder, DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js'
+ * @import {ParseArgsConfig} from 'node:util'
+ * @import {FastUSDCConfig} from '@agoric/fast-usdc/src/fast-usdc.start.js'
+ */
+
+const { keys } = Object;
+
+/**
+ * @type {Record<string, Pick<FastUSDCConfig, 'oracles' | 'feedPolicy'>>}
+ *
+ * TODO: determine OCW operator addresses
+ * meanwhile, use price oracle addresses (from updatePriceFeeds.js).
+ */
+const configurations = {
+  A3P_INTEGRATION: {
+    oracles: {
+      gov1: 'agoric1ee9hr0jyrxhy999y755mp862ljgycmwyp4pl7q',
+      gov2: 'agoric1wrfh296eu2z34p6pah7q04jjuyj3mxu9v98277',
+      gov3: 'agoric1ydzxwh6f893jvpaslmaz6l8j2ulup9a7x8qvvq',
+    },
+    feedPolicy: {
+      nobleAgoricChannelId: 'TODO',
+      nobleDomainId: 4,
+      chainPolicies: {
+        Arbitrum: {
+          cctpTokenMessengerAddress:
+            '0x19330d10D9Cc8751218eaf51E8885D058642E08A',
+          chainId: 42161,
+          confirmations: 2,
+          nobleContractAddress: '0x19330d10D9Cc8751218eaf51E8885D058642E08A',
+        },
+      },
+    },
+  },
+  MAINNET: {
+    oracles: {
+      DSRV: 'agoric144rrhh4m09mh7aaffhm6xy223ym76gve2x7y78',
+      Stakin: 'agoric19d6gnr9fyp6hev4tlrg87zjrzsd5gzr5qlfq2p',
+      '01node': 'agoric19uscwxdac6cf6z7d5e26e0jm0lgwstc47cpll8',
+      'Simply Staking': 'agoric1krunjcqfrf7la48zrvdfeeqtls5r00ep68mzkr',
+      P2P: 'agoric1n4fcxsnkxe4gj6e24naec99hzmc4pjfdccy5nj',
+    },
+    feedPolicy: {
+      nobleAgoricChannelId: 'channel-21',
+      nobleDomainId: 4,
+      chainPolicies: {
+        Arbitrum: {
+          cctpTokenMessengerAddress:
+            '0x19330d10D9Cc8751218eaf51E8885D058642E08A',
+          chainId: 42161,
+          confirmations: 2,
+          nobleContractAddress: '0x19330d10D9Cc8751218eaf51E8885D058642E08A',
+        },
+      },
+    },
+  },
+  DEVNET: {
+    oracles: {
+      DSRV: 'agoric1lw4e4aas9q84tq0q92j85rwjjjapf8dmnllnft',
+      Stakin: 'agoric1zj6vrrrjq4gsyr9lw7dplv4vyejg3p8j2urm82',
+      '01node': 'agoric1ra0g6crtsy6r3qnpu7ruvm7qd4wjnznyzg5nu4',
+      'Simply Staking': 'agoric1qj07c7vfk3knqdral0sej7fa6eavkdn8vd8etf',
+      P2P: 'agoric10vjkvkmpp9e356xeh6qqlhrny2htyzp8hf88fk',
+    },
+    feedPolicy: {
+      nobleAgoricChannelId: 'TODO',
+      nobleDomainId: 4,
+      chainPolicies: {
+        Arbitrum: {
+          cctpTokenMessengerAddress: '0xTODO',
+          chainId: 421614,
+          confirmations: 2,
+          nobleContractAddress: '0xTODO',
+        },
+      },
+    },
+  },
+  EMERYNET: {
+    oracles: {
+      gov1: 'agoric1ldmtatp24qlllgxmrsjzcpe20fvlkp448zcuce',
+      gov2: 'agoric140dmkrz2e42ergjj7gyvejhzmjzurvqeq82ang',
+    },
+    feedPolicy: {
+      nobleAgoricChannelId: 'TODO',
+      nobleDomainId: 4,
+      chainPolicies: {
+        Arbitrum: {
+          cctpTokenMessengerAddress: '0xTODO',
+          chainId: 421614,
+          confirmations: 2,
+          nobleContractAddress: '0xTODO',
+        },
+      },
+    },
+  },
+};
+
+/** @type {ParseArgsConfig['options']} */
+const options = {
+  flatFee: { type: 'string', default: '0.01' },
+  variableRate: { type: 'string', default: '0.01' },
+  maxVariableFee: { type: 'string', default: '5' },
+  contractRate: { type: 'string', default: '0.2' },
+  net: { type: 'string' },
+  oracle: { type: 'string', multiple: true },
+  usdcDenom: {
+    type: 'string',
+    default:
+      'ibc/FE98AAD68F02F03565E9FA39A5E627946699B2B07115889ED812D8BA639576A9',
+  },
+};
+const oraclesUsage = 'use --oracle name:address ...';
+
+const feedPolicyUsage = 'use --feedPolicy <policy> ...';
+
+/**
+ * @typedef {{
+ *   flatFee: string;
+ *   variableRate: string;
+ *   maxVariableFee: string;
+ *   contractRate: string;
+ *   net?: string;
+ *   oracle?: string[];
+ *   usdcDenom: string;
+ *   feedPolicy?: string;
+ * }} FastUSDCOpts
+ */
+
+const crossVatContext = /** @type {const} */ ({
+  /** @type {Brand<'nat'>} */
+  USDC: Far('USDC Brand'),
+});
+const { USDC } = crossVatContext;
+const USDC_DECIMALS = 6;
+const unit = AmountMath.make(USDC, 10n ** BigInt(USDC_DECIMALS));
+
+/** @type {CoreEvalBuilder} */
+export const defaultProposalBuilder = async (
+  { publishRef, install },
+  /** @type {FastUSDCConfig} */ config,
+) => {
+  return harden({
+    sourceSpec: '@agoric/fast-usdc/src/fast-usdc.start.js',
+    /** @type {[string, Parameters<typeof getManifestForFastUSDC>[1]]} */
+    getManifestCall: [
+      getManifestForFastUSDC.name,
+      {
+        options: toExternalConfig(config, crossVatContext, FastUSDCConfigShape),
+        installKeys: {
+          fastUsdc: publishRef(
+            install('@agoric/fast-usdc/src/fast-usdc.contract.js'),
+          ),
+        },
+      },
+    ],
+  });
+};
+
+/** @type {DeployScriptFunction} */
+export default async (homeP, endowments) => {
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  const { scriptArgs } = endowments;
+
+  /** @type {{ values: FastUSDCOpts }} */
+  // @ts-expect-error ensured by options
+  const {
+    values: { oracle: oracleArgs, net, usdcDenom, feedPolicy, ...fees },
+  } = parseArgs({ args: scriptArgs, options });
+
+  const parseFeedPolicy = () => {
+    if (net) {
+      if (!(net in configurations)) {
+        throw Error(`${net} not in ${keys(configurations)}`);
+      }
+      return configurations[net].feedPolicy;
+    }
+    if (!feedPolicy) throw Error(feedPolicyUsage);
+    return JSON.parse(feedPolicy);
+  };
+
+  const parseOracleArgs = () => {
+    if (net) {
+      if (!(net in configurations)) {
+        throw Error(`${net} not in ${keys(configurations)}`);
+      }
+      return configurations[net].oracles;
+    }
+    if (!oracleArgs) throw Error(oraclesUsage);
+    return Object.fromEntries(
+      oracleArgs.map(arg => {
+        const result = arg.match(/(?<name>[^:]+):(?<address>.+)/);
+        if (!(result && result.groups)) throw Error(oraclesUsage);
+        const { name, address } = result.groups;
+        return [name, address];
+      }),
+    );
+  };
+
+  /** @param {string} numeral */
+  const toAmount = numeral => multiplyBy(unit, parseRatio(numeral, USDC));
+  /** @param {string} numeral */
+  const toRatio = numeral => parseRatio(numeral, USDC);
+  const parseFeeConfigArgs = () => {
+    const { flatFee, variableRate, maxVariableFee, contractRate } = fees;
+    return {
+      flat: toAmount(flatFee),
+      variableRate: toRatio(variableRate),
+      maxVariable: toAmount(maxVariableFee),
+      contractRate: toRatio(contractRate),
+    };
+  };
+
+  /** @type {FastUSDCConfig} */
+  const config = harden({
+    oracles: parseOracleArgs(),
+    terms: {
+      usdcDenom,
+    },
+    feeConfig: parseFeeConfigArgs(),
+    feedPolicy: parseFeedPolicy(),
+  });
+
+  await writeCoreEval('start-fast-usdc', utils =>
+    defaultProposalBuilder(utils, config),
+  );
+};

package/scripts/inter-protocol/add-STARS.js

@@ -2,8 +2,8 @@ import { makeHelpers } from '@agoric/deploy-script-support';
 import { defaultProposalBuilder as vaultProposalBuilder } from './add-collateral-core.js';
 import { defaultProposalBuilder as oraclesProposalBuilder } from './price-feed-core.js';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
-export const starsVaultProposalBuilder = async powers => {
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+const starsVaultProposalBuilder = async powers => {
   return vaultProposalBuilder(powers, {
     interchainAssetOptions: {
       // Values for the Stargaze token on Osmosis
@@ -17,8 +17,8 @@ export const starsVaultProposalBuilder = async powers => {
   });
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
-export const starsOraclesProposalBuilder = async powers => {
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+const starsOraclesProposalBuilder = async powers => {
   return oraclesProposalBuilder(powers, {
     AGORIC_INSTANCE_NAME: `STARS-USD price feed`,
     IN_BRAND_LOOKUP: ['agoricNames', 'oracleBrand', 'STARS'],
@@ -36,8 +36,9 @@ export const starsOraclesProposalBuilder = async powers => {
   });
 };
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
-  const { writeCoreProposal } = await makeHelpers(homeP, endowments);
-  await writeCoreProposal('add-STARS', starsVaultProposalBuilder);
-  await writeCoreProposal('add-STARS-oracles', starsOraclesProposalBuilder);
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval('add-STARS', starsVaultProposalBuilder);
+  await writeCoreEval('add-STARS-oracles', starsOraclesProposalBuilder);
 };

package/scripts/inter-protocol/add-collateral-core.js

@@ -1,11 +1,11 @@
-/* global process */
+/* eslint-env node */
 import { makeHelpers } from '@agoric/deploy-script-support';
 
 import { getManifestForAddAssetToVault } from '@agoric/inter-protocol/src/proposals/addAssetToVault.js';
 import { getManifestForPsm } from '@agoric/inter-protocol/src/proposals/startPSM.js';
 import { makeInstallCache } from '@agoric/inter-protocol/src/proposals/utils.js';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
 export const defaultProposalBuilder = async (
   { publishRef, install: install0, wrapInstall },
   {
@@ -62,7 +62,7 @@ export const defaultProposalBuilder = async (
   });
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
 export const psmProposalBuilder = async (
   { publishRef, install: install0, wrapInstall },
   { anchorOptions = /** @type {object} */ ({}) } = {},
@@ -103,16 +103,20 @@ export const psmProposalBuilder = async (
   });
 };
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
-  const { writeCoreProposal } = await makeHelpers(homeP, endowments);
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
 
   const tool = await makeInstallCache(homeP, {
     loadBundle: spec => import(spec),
   });
 
-  await writeCoreProposal('gov-add-collateral', defaultProposalBuilder);
-  await writeCoreProposal('gov-start-psm', opts =>
-    // @ts-expect-error XXX makeInstallCache types
-    psmProposalBuilder({ ...opts, wrapInstall: tool.wrapInstall }),
+  await writeCoreEval('gov-add-collateral', defaultProposalBuilder);
+  await writeCoreEval('gov-start-psm', opts =>
+    psmProposalBuilder({
+      ...opts,
+      // @ts-expect-error XXX makeInstallCache types
+      wrapInstall: tool.wrapInstall,
+    }),
   );
 };

package/scripts/inter-protocol/init-core.js

@@ -1,4 +1,4 @@
-/* global process */
+/* eslint-env node */
 /**
  * @file can be run with `agoric deploy` after a chain is running (depends on
  *   chain state) Only works with "local" chain and not sim-chain b/c it needs
@@ -125,7 +125,7 @@ export const mainProposalBuilder = async ({
 };
 
 // Build proposal for sim-chain etc.
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
 export const defaultProposalBuilder = async (
   { publishRef, install },
   options = {},
@@ -184,18 +184,19 @@ export const defaultProposalBuilder = async (
   });
 };
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
-  const { writeCoreProposal } = await makeHelpers(homeP, endowments);
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
 
   const tool = await makeInstallCache(homeP, {
     loadBundle: spec => import(spec),
   });
   await Promise.all([
-    writeCoreProposal('gov-econ-committee', opts =>
+    writeCoreEval('gov-econ-committee', opts =>
       // @ts-expect-error XXX makeInstallCache types
       committeeProposalBuilder({ ...opts, wrapInstall: tool.wrapInstall }),
     ),
-    writeCoreProposal('gov-amm-vaults-etc', opts =>
+    writeCoreEval('gov-amm-vaults-etc', opts =>
       // @ts-expect-error XXX makeInstallCache types
       mainProposalBuilder({ ...opts, wrapInstall: tool.wrapInstall }),
     ),

package/scripts/inter-protocol/invite-committee-core.js

@@ -1,10 +1,10 @@
-/* global process */
+/* eslint-env node */
 import { makeHelpers } from '@agoric/deploy-script-support';
 
 import { getManifestForInviteCommittee } from '@agoric/inter-protocol/src/proposals/committee-proposal.js';
 
 // Build proposal for sim-chain etc.
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
 export const defaultProposalBuilder = async (
   { publishRef, install },
   options = {},
@@ -36,7 +36,8 @@ export const defaultProposalBuilder = async (
   });
 };
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
-  const { writeCoreProposal } = await makeHelpers(homeP, endowments);
-  await writeCoreProposal('gov-invite-committee', defaultProposalBuilder);
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval('gov-invite-committee', defaultProposalBuilder);
 };

package/scripts/inter-protocol/manual-price-feed.js

@@ -48,6 +48,7 @@ export default async function priceAuthorityFromNotifier(
 
   if (!aggregatorInstance) {
     console.log('Autodetecting aggregator instance...');
+    // @ts-expect-error inspecific Home type
     const purse = E(home.wallet).getPurse('Default Zoe invite purse');
     const { value } = await E(purse).getCurrentAmount();
     const invitations = value.filter(
@@ -81,6 +82,7 @@ export default async function priceAuthorityFromNotifier(
   };
 
   console.log('Getting wallet bridge...');
+  // @ts-expect-error inspecific Home type
   const bridge = await E(home.wallet).getBridge();
 
   // Consume an aggregator invitation for this instance.
@@ -94,6 +96,7 @@ export default async function priceAuthorityFromNotifier(
       () => {},
     );
 
+  // @ts-expect-error inspecific Home type
   const walletAdmin = E(home.wallet).getAdminFacet();
 
   console.log('=====================================================');
@@ -111,6 +114,7 @@ export default async function priceAuthorityFromNotifier(
         const orKey = `offerResult ${id}`;
         await E(home.scratch).set(
           orKey,
+          // @ts-expect-error inspecific Home type
           E(home.wallet).lookup('offerResult', id),
         );
         console.log(

package/scripts/inter-protocol/price-feed-core.js

@@ -1,7 +1,7 @@
-/* global process */
+/* eslint-env node */
 import { makeHelpers } from '@agoric/deploy-script-support';
 
-const DEFAULT_CONTRACT_TERMS = {
+export const DEFAULT_CONTRACT_TERMS = {
   POLL_INTERVAL: 30n,
   maxSubmissionCount: 1000,
   minSubmissionCount: 2,
@@ -11,7 +11,7 @@ const DEFAULT_CONTRACT_TERMS = {
   maxSubmissionValue: 2n ** 256n,
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
 export const defaultProposalBuilder = async (
   { publishRef, install },
   options = {},
@@ -84,7 +84,7 @@ export const createGov = async (homeP, endowments) => {
 
   const oracleAddresses = ORACLE_ADDRESSES.split(',');
 
-  const { writeCoreProposal } = await makeHelpers(homeP, endowments);
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
 
   const inLookup = JSON.parse(IN_BRAND_LOOKUP);
   const outLookup = JSON.parse(OUT_BRAND_LOOKUP);
@@ -98,7 +98,7 @@ export const createGov = async (homeP, endowments) => {
       brandIn: lookup(inLookup).catch(() => undefined),
       brandOut: lookup(outLookup).catch(() => undefined),
     });
-  await writeCoreProposal('gov-price-feed', proposalBuilder); // gov-price-feed.js gov-price-feed-permit.json
+  await writeCoreEval('gov-price-feed', proposalBuilder); // gov-price-feed.js gov-price-feed-permit.json
 };
 
 export default createGov;