@agoric/builders 0.2.0-u20.0 → 0.2.0-u21.0

package/CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## 0.2.0-u20.0 (2025-04-16)
+## 0.2.0-u21.0 (2025-06-19)
 
 
 ### ⚠ BREAKING CHANGES
@@ -17,9 +17,11 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 *  smartWallet verstion 2 with watchedPromises ([5ed5107](https://github.com/Agoric/agoric-sdk/commit/5ed51078d39e643d91b572d9c50fad4a276d7ded))
 * `ForwardOpts` accepts `intermediateRecipient` ([eb975f1](https://github.com/Agoric/agoric-sdk/commit/eb975f1df1587bc9307b27c20b7b236cc7fe386e))
 * `ForwardOptsShape` ([50b1717](https://github.com/Agoric/agoric-sdk/commit/50b1717c1e40ed67a5e69810961ad8d0144c5f9e))
+* `IcaAccountKit` accepts `relativeTimeoutNs` opt for outgoing tx packets ([57b4bde](https://github.com/Agoric/agoric-sdk/commit/57b4bdea6b22202d4e58b82b1ca6f94de660682a))
 * `update-fee-config` proposal ([5d8775c](https://github.com/Agoric/agoric-sdk/commit/5d8775c409896369a931e6d78ae1d7958ad9d901))
 * a proposal to upgrade scaledPriceAuthorities ([e5ed0ff](https://github.com/Agoric/agoric-sdk/commit/e5ed0ff6abcb83f52b32d49125e21e6e41923ed0))
 * add `bech32Prefix?: string` to `CosmosChainInfo` ([cb9e1ee](https://github.com/Agoric/agoric-sdk/commit/cb9e1eeab9295b44ec009b82d73c457299e8d6f4))
+* add axelar gmp core-eval and bootstrap tests ([e0d7ef8](https://github.com/Agoric/agoric-sdk/commit/e0d7ef82f1fc4ea42c6fc8ae7faaf5c74de8e36e))
 * add priceFeed for StkAtom ([6a861df](https://github.com/Agoric/agoric-sdk/commit/6a861dfa14f42b4547a24ba31175a3b1a74c97c1))
 * Add terminate-governed-instance.js proposal ([c2cb517](https://github.com/Agoric/agoric-sdk/commit/c2cb51779039ef2a5921efcc35b3b365a7b6159f)), closes [#10725](https://github.com/Agoric/agoric-sdk/issues/10725) [#10861](https://github.com/Agoric/agoric-sdk/issues/10861)
 * add transfer method to CosmosOrchestrationAccount ([b1fdde1](https://github.com/Agoric/agoric-sdk/commit/b1fdde18b33237d1a2ea6f02938d998f55ce4d01))
@@ -39,6 +41,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * chain-capabilities.js constants ([52ff70a](https://github.com/Agoric/agoric-sdk/commit/52ff70a187df1fadc89ccc506228bc6d0ca48da6))
 * **chainHub:** register and retrieve non-cosmos chains ([bd11be2](https://github.com/Agoric/agoric-sdk/commit/bd11be25656ad0dd9ea4ad18c85f74a11ef2e520))
 * coreEval to update priceFeeds, auction, and vaultManager ([fd91f78](https://github.com/Agoric/agoric-sdk/commit/fd91f781ad721033d67485d1732272af0c689ae7))
+* **cosmos:** add Reserve withdrawal upgrade ([9e97cbd](https://github.com/Agoric/agoric-sdk/commit/9e97cbd7438e3df5aec96091d18ecdcde720978b))
 * **cosmos:** upgrade IBC vat for next release ([c994490](https://github.com/Agoric/agoric-sdk/commit/c99449081560480e7e2dd6fc069b12dbcc630370))
 * examples/auto-stake-it.contract.js ([b87ecba](https://github.com/Agoric/agoric-sdk/commit/b87ecba0ea41f1397dbd513d8e4c541f1299fd3f)), closes [#9042](https://github.com/Agoric/agoric-sdk/issues/9042)
 * export `DenomDetailShape` ([2dfddb3](https://github.com/Agoric/agoric-sdk/commit/2dfddb3fb2018d769b1acc1b32f4ff3b4c7f67b7))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/builders",
-  "version": "0.2.0-u20.0",
+  "version": "0.2.0-u21.0",
   "description": "Build scripts for proposals to an Agoric chain",
   "type": "module",
   "main": "./index.js",
@@ -10,26 +10,26 @@
     "build:add-STARS-proposal": "echo This command has been deprecated. Please run this instead: agoric run scripts/inter-protocol/add-STARS.js",
     "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",
+    "prepack": "yarn run -T tsc --build tsconfig.build.json",
     "postpack": "git clean -f '*.d.ts*' '*.tsbuildinfo'",
     "test": "ava",
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
-    "lint": "run-s --continue-on-error lint:*",
-    "lint:types": "tsc",
-    "lint:eslint": "eslint ."
+    "lint": "yarn run -T run-s --continue-on-error 'lint:*'",
+    "lint:types": "yarn run -T tsc",
+    "lint:eslint": "yarn run -T eslint ."
   },
   "keywords": [],
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/ertp": "^0.16.3-u20.0",
-    "@agoric/internal": "^0.4.0-u20.0",
-    "@agoric/notifier": "^0.7.0-u20.0",
-    "@agoric/smart-wallet": "^0.5.4-u20.0",
-    "@agoric/vat-data": "^0.5.3-u20.0",
-    "@agoric/vats": "^0.16.0-u20.0",
-    "@agoric/zoe": "^0.27.0-u20.0",
+    "@agoric/ertp": "workspace:*",
+    "@agoric/internal": "workspace:*",
+    "@agoric/notifier": "workspace:*",
+    "@agoric/smart-wallet": "workspace:*",
+    "@agoric/vat-data": "workspace:*",
+    "@agoric/vats": "workspace:*",
+    "@agoric/zoe": "workspace:*",
     "@endo/bundle-source": "^4.0.0",
     "@endo/captp": "^4.4.5",
     "@endo/eventual-send": "^1.3.1",
@@ -42,17 +42,17 @@
     "import-meta-resolve": "^4.1.0"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "^0.10.4-u20.0",
-    "@agoric/governance": "^0.10.4-u20.0",
-    "@agoric/inter-protocol": "^0.17.0-u20.0",
-    "@agoric/orchestration": "^0.2.0-u20.0",
-    "@agoric/store": "^0.9.3-u20.0",
-    "@agoric/swing-store": "^0.10.0-u20.0",
-    "@agoric/swingset-liveslots": "^0.10.3-u20.0",
-    "@agoric/time": "^0.3.3-u20.0",
+    "@agoric/deploy-script-support": "workspace:*",
+    "@agoric/governance": "workspace:*",
+    "@agoric/inter-protocol": "workspace:*",
+    "@agoric/orchestration": "workspace:*",
+    "@agoric/store": "workspace:*",
+    "@agoric/swing-store": "workspace:*",
+    "@agoric/swingset-liveslots": "workspace:*",
+    "@agoric/time": "workspace:*",
     "@endo/errors": "^1.2.10",
     "ava": "^5.3.0",
-    "c8": "^10.1.2"
+    "c8": "^10.1.3"
   },
   "files": [
     "CHANGELOG.md",
@@ -67,7 +67,7 @@
     "access": "public"
   },
   "engines": {
-    "node": "^18.12 || ^20.9"
+    "node": "^20.9 || ^22.11"
   },
   "ava": {
     "files": [
@@ -80,7 +80,7 @@
     "workerThreads": false
   },
   "typeCoverage": {
-    "atLeast": 91.55
+    "atLeast": 90.62
   },
-  "gitHead": "8e4207fa19dabf76c1f91f8779b5b5b93570ecea"
+  "gitHead": "e4dd46857133403d584bcf822a81817b355532f9"
 }

package/scripts/orchestration/axelar-gmp.build.js

@@ -0,0 +1,74 @@
+import { execFileSync } from 'node:child_process';
+import { makeHelpers } from '@agoric/deploy-script-support';
+import { parseArgs } from 'node:util';
+import {
+  getManifest,
+  startAxelarGmp,
+} from '@agoric/orchestration/src/proposals/start-axelar-gmp.js';
+import { assetInfo } from '@agoric/orchestration/src/utils/axelar-static-config.js';
+import { getChainConfig } from './get-chain-config.js';
+
+/** @typedef {{ net?: string, peer?: string[] }} PeerChainOpts */
+
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
+export const defaultProposalBuilder = async (
+  { publishRef, install },
+  options,
+) =>
+  harden({
+    sourceSpec: '@agoric/orchestration/src/proposals/start-axelar-gmp.js',
+    getManifestCall: [
+      getManifest.name,
+      {
+        installationRef: publishRef(
+          install('@agoric/orchestration/dist/axelar-gmp.contract.bundle.js'),
+        ),
+        options,
+      },
+    ],
+  });
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+export default async (homeP, endowments) => {
+  const { scriptArgs } = endowments;
+
+  /** @type {import('node:util').ParseArgsConfig['options']} */
+  const options = {
+    net: {
+      type: 'string',
+    },
+    peer: { type: 'string', multiple: true },
+  };
+
+  /** @type {{ values: PeerChainOpts }} */
+  const { values: flags } = parseArgs({ args: scriptArgs, options });
+
+  const parseAssetInfo = () => {
+    if (typeof assetInfo !== 'string') return undefined;
+    return JSON.parse(assetInfo);
+  };
+
+  if (!flags.net) throw Error('--net required');
+  if (!flags.peer) throw Error('--peer required');
+
+  const chainDetails = await getChainConfig({
+    net: flags.net,
+    peers: flags.peer,
+    execFileSync,
+  });
+
+  const opts = harden({
+    chainInfo: chainDetails,
+    assetInfo: parseAssetInfo(),
+  });
+
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+
+  await writeCoreEval(startAxelarGmp.name, utils =>
+    defaultProposalBuilder(utils, opts),
+  );
+};

package/scripts/orchestration/get-chain-config.js

@@ -0,0 +1,117 @@
+import { IBCConnectionInfoShape } from '@agoric/orchestration/src/typeGuards.js';
+import { mustMatch } from '@endo/patterns';
+import { makeAgd } from '@agoric/orchestration/src/utils/agd-lib.js';
+import { networkConfigs } from '@agoric/orchestration/src/utils/gmp.js';
+import * as childProcess from 'node:child_process';
+import fetchedChainInfo from '@agoric/orchestration/src/fetched-chain-info.js';
+
+/**
+ * @import {IBCChannelID, IBCConnectionID} from '@agoric/vats';
+ * @import {CosmosChainInfo, IBCConnectionInfo} from '@agoric/orchestration'
+ */
+
+/** @param {string[]} strs */
+const parsePeers = strs => {
+  /** @type {[name: string, conn: IBCConnectionID, chan: IBCChannelID, denom:string][]} */
+  // @ts-expect-error XXX ID syntax should be dynamically checked
+  const peerParts = strs.map(s => s.split(':'));
+  const badPeers = peerParts.filter(d => d.length !== 4);
+  if (badPeers.length) {
+    throw Error(
+      `peers must be name:connection-X:channel-Y:denom, not ${badPeers.join(', ')}`,
+    );
+  }
+  return peerParts;
+};
+
+/**
+ * Get the IBC chain configuration based on the provided network and peer inputs.
+ *
+ * @param {object} args - The arguments object.
+ * @param {string} args.net - The network name (e.g., 'emerynet').
+ * @param {string[]} args.peers - The peers to connect .
+ * @param {childProcess.execFileSync} [args.execFileSync] - Optional execFileSync function.
+ * @returns {Promise<Record<string, CosmosChainInfo>>} A promise that resolves to the chain configuration details keyed by chain name.
+ */
+
+export const getChainConfig = async ({
+  net,
+  peers,
+  execFileSync = childProcess.execFileSync,
+}) => {
+  await null;
+
+  if (net === 'bootstrap') {
+    return {
+      agoric: fetchedChainInfo.agoric,
+      axelar: fetchedChainInfo.axelar,
+    };
+  }
+
+  /** @type {Record<string, CosmosChainInfo>} */
+  const chainDetails = {};
+
+  /** @type {Record<string, IBCConnectionInfo>} */
+  const connections = {};
+  const portId = 'transfer';
+
+  const { chainId, rpc } = networkConfigs[net];
+  const agd = makeAgd({ execFileSync }).withOpts({ rpcAddrs: [rpc] });
+
+  for (const [peerName, myConn, myChan, denom] of parsePeers(peers)) {
+    console.debug(peerName, { denom });
+    const connInfo = await agd
+      .query(['ibc', 'connection', 'end', myConn])
+      .then(x => x.connection);
+    const { client_id: clientId } = connInfo;
+    const clientState = await agd
+      .query(['ibc', 'client', 'state', clientId])
+      .then(x => x.client_state);
+    const { chain_id: peerId } = clientState;
+    console.debug(peerName, { chainId: peerId, denom });
+    chainDetails[peerName] = {
+      namespace: 'cosmos',
+      reference: peerId,
+      chainId: peerId,
+      stakingTokens: [{ denom }],
+      bech32Prefix: peerName,
+    };
+
+    const chan = await agd
+      .query(['ibc', 'channel', 'end', portId, myChan])
+      .then(r => r.channel);
+
+    /** @type {IBCConnectionInfo} */
+    const info = harden({
+      client_id: clientId,
+      counterparty: {
+        client_id: connInfo.counterparty.client_id,
+        connection_id: connInfo.counterparty.connection_id,
+      },
+      id: myConn,
+      state: connInfo.state,
+      transferChannel: {
+        channelId: myChan,
+        counterPartyChannelId: chan.counterparty.channel_id,
+        counterPartyPortId: chan.counterparty.port_id,
+        ordering: chan.ordering,
+        portId,
+        state: chan.state,
+        version: chan.version,
+      },
+    });
+    mustMatch(info, IBCConnectionInfoShape);
+    connections[peerId] = info;
+  }
+
+  chainDetails.agoric = {
+    namespace: 'cosmos',
+    reference: chainId,
+    chainId,
+    stakingTokens: [{ denom: 'ubld' }],
+    connections,
+    bech32Prefix: 'agoric',
+  };
+
+  return chainDetails;
+};

package/scripts/orchestration/helpers.js

@@ -0,0 +1,46 @@
+/**
+ * @import {DeployScriptEndownments} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {CosmosChainInfo, Denom, DenomDetail} from '@agoric/orchestration';
+ * @import {ParseArgsConfig} from 'node:util'
+ */
+
+/**
+ * Parse `chainInfo` and `assetInfo` into builder opts
+ *
+ * NOTE: Ambient authority via `node:util`
+ *
+ * @param {DeployScriptEndownments['scriptArgs']} scriptArgs
+ * @returns {Promise<{
+ *      chainInfo: Record<string, CosmosChainInfo>;
+ *     assetInfo: [Denom, DenomDetail & { brandKey?: string }][];
+ * }>}
+ */
+export const parseChainHubOpts = async scriptArgs => {
+  // import dynamically so the modules can work in CoreEval environment
+  const { parseArgs } = await import('node:util');
+
+  /** @type {ParseArgsConfig['options']} */
+  const parserOpts = {
+    chainInfo: { type: 'string' },
+    assetInfo: { type: 'string' },
+  };
+  const {
+    values: { chainInfo, assetInfo },
+  } = parseArgs({
+    args: scriptArgs,
+    options: parserOpts,
+  });
+
+  const parseChainInfo = () => {
+    if (typeof chainInfo !== 'string') return undefined;
+    return JSON.parse(chainInfo);
+  };
+  const parseAssetInfo = () => {
+    if (typeof assetInfo !== 'string') return undefined;
+    return JSON.parse(assetInfo);
+  };
+  return harden({
+    chainInfo: parseChainInfo(),
+    assetInfo: parseAssetInfo(),
+  });
+};

package/scripts/orchestration/init-basic-flows.js

@@ -1,16 +1,6 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { startBasicFlows } from '@agoric/orchestration/src/proposals/start-basic-flows.js';
-import { parseArgs } from 'node:util';
-
-/**
- * @import {ParseArgsConfig} from 'node:util'
- */
-
-/** @type {ParseArgsConfig['options']} */
-const parserOpts = {
-  chainInfo: { type: 'string' },
-  assetInfo: { type: 'string' },
-};
+import { parseChainHubOpts } from './helpers.js';
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
 export const defaultProposalBuilder = async (
@@ -38,29 +28,8 @@ export const defaultProposalBuilder = async (
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { scriptArgs } = endowments;
-
-  const {
-    values: { chainInfo, assetInfo },
-  } = parseArgs({
-    args: scriptArgs,
-    options: parserOpts,
-  });
-
-  const parseChainInfo = () => {
-    if (typeof chainInfo !== 'string') return undefined;
-    return JSON.parse(chainInfo);
-  };
-  const parseAssetInfo = () => {
-    if (typeof assetInfo !== 'string') return undefined;
-    return JSON.parse(assetInfo);
-  };
-  const opts = harden({
-    chainInfo: parseChainInfo(),
-    assetInfo: parseAssetInfo(),
-  });
-
+  const opts = parseChainHubOpts(scriptArgs);
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
-
   await writeCoreEval(startBasicFlows.name, utils =>
     defaultProposalBuilder(utils, opts),
   );

package/scripts/orchestration/init-stakeAtom.js

@@ -1,7 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
+import { parseChainHubOpts } from './helpers.js';
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
-export const defaultProposalBuilder = async ({ publishRef, install }) => {
+export const defaultProposalBuilder = async (
+  { publishRef, install },
+  options,
+) => {
   return harden({
     sourceSpec: '@agoric/orchestration/src/proposals/start-stakeAtom.js',
     getManifestCall: [
@@ -12,6 +16,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
             install('@agoric/orchestration/src/examples/stake-ica.contract.js'),
           ),
         },
+        options,
       },
     ],
   });
@@ -19,6 +24,10 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
+  const { scriptArgs } = endowments;
+  const opts = parseChainHubOpts(scriptArgs);
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
-  await writeCoreEval('start-stakeAtom', defaultProposalBuilder);
+  await writeCoreEval('start-stakeAtom', utils =>
+    defaultProposalBuilder(utils, opts),
+  );
 };

package/scripts/orchestration/init-stakeOsmo.js

@@ -1,7 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
+import { parseChainHubOpts } from './helpers.js';
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
-export const defaultProposalBuilder = async ({ publishRef, install }) => {
+export const defaultProposalBuilder = async (
+  { publishRef, install },
+  options,
+) => {
   return harden({
     sourceSpec: '@agoric/orchestration/src/proposals/start-stakeOsmo.js',
     getManifestCall: [
@@ -12,6 +16,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
             install('@agoric/orchestration/src/examples/stake-ica.contract.js'),
           ),
         },
+        options,
       },
     ],
   });
@@ -19,6 +24,10 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
+  const { scriptArgs } = endowments;
+  const opts = parseChainHubOpts(scriptArgs);
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
-  await writeCoreEval('start-stakeOsmo', defaultProposalBuilder);
+  await writeCoreEval('start-stakeOsmo', utils =>
+    defaultProposalBuilder(utils, opts),
+  );
 };

package/scripts/testing/init-auto-stake-it.js

@@ -6,17 +6,7 @@
  */
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { startAutoStakeIt } from '@agoric/orchestration/src/proposals/start-auto-stake-it.js';
-import { parseArgs } from 'node:util';
-
-/**
- * @import {ParseArgsConfig} from 'node:util'
- */
-
-/** @type {ParseArgsConfig['options']} */
-const parserOpts = {
-  chainInfo: { type: 'string' },
-  assetInfo: { type: 'string' },
-};
+import { parseChainHubOpts } from '../orchestration/helpers.js';
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
 export const defaultProposalBuilder = async (
@@ -44,29 +34,8 @@ export const defaultProposalBuilder = async (
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { scriptArgs } = endowments;
-
-  const {
-    values: { chainInfo, assetInfo },
-  } = parseArgs({
-    args: scriptArgs,
-    options: parserOpts,
-  });
-
-  const parseChainInfo = () => {
-    if (typeof chainInfo !== 'string') return undefined;
-    return JSON.parse(chainInfo);
-  };
-  const parseAssetInfo = () => {
-    if (typeof assetInfo !== 'string') return undefined;
-    return JSON.parse(assetInfo);
-  };
-  const opts = harden({
-    chainInfo: parseChainInfo(),
-    assetInfo: parseAssetInfo(),
-  });
-
+  const opts = parseChainHubOpts(scriptArgs);
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
-
   await writeCoreEval(startAutoStakeIt.name, utils =>
     defaultProposalBuilder(utils, opts),
   );

package/scripts/testing/init-send-anywhere.js

@@ -3,17 +3,7 @@ import {
   getManifest,
   startSendAnywhere,
 } from '@agoric/orchestration/src/proposals/start-send-anywhere.js';
-import { parseArgs } from 'node:util';
-
-/**
- * @import {ParseArgsConfig} from 'node:util'
- */
-
-/** @type {ParseArgsConfig['options']} */
-const parserOpts = {
-  chainInfo: { type: 'string' },
-  assetInfo: { type: 'string' },
-};
+import { parseChainHubOpts } from '../orchestration/helpers.js';
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
 export const defaultProposalBuilder = async (
@@ -38,29 +28,8 @@ export const defaultProposalBuilder = async (
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { scriptArgs } = endowments;
-
-  const {
-    values: { chainInfo, assetInfo },
-  } = parseArgs({
-    args: scriptArgs,
-    options: parserOpts,
-  });
-
-  const parseChainInfo = () => {
-    if (typeof chainInfo !== 'string') return undefined;
-    return JSON.parse(chainInfo);
-  };
-  const parseAssetInfo = () => {
-    if (typeof assetInfo !== 'string') return undefined;
-    return JSON.parse(assetInfo);
-  };
-  const opts = harden({
-    chainInfo: parseChainInfo(),
-    assetInfo: parseAssetInfo(),
-  });
-
+  const opts = parseChainHubOpts(scriptArgs);
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
-
   await writeCoreEval(startSendAnywhere.name, utils =>
     defaultProposalBuilder(utils, opts),
   );

package/scripts/testing/init-swap-anything.js

@@ -0,0 +1,36 @@
+import { makeHelpers } from '@agoric/deploy-script-support';
+import {
+  getManifest,
+  startSwapAnything,
+} from '@agoric/orchestration/src/proposals/start-swap-anything.js';
+import { parseChainHubOpts } from '../orchestration/helpers.js';
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async (
+  { publishRef, install },
+  options,
+) =>
+  harden({
+    sourceSpec: '@agoric/orchestration/src/proposals/start-swap-anything.js',
+    getManifestCall: [
+      getManifest.name,
+      {
+        installationRef: publishRef(
+          install(
+            '@agoric/orchestration/src/examples/swap-anything.contract.js',
+          ),
+        ),
+        options,
+      },
+    ],
+  });
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+export default async (homeP, endowments) => {
+  const { scriptArgs } = endowments;
+  const opts = parseChainHubOpts(scriptArgs);
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval(startSwapAnything.name, utils =>
+    defaultProposalBuilder(utils, opts),
+  );
+};

package/scripts/testing/restart-axelar-gmp.js

@@ -0,0 +1,94 @@
+/**
+ * @file This is for use in tests in a3p-integration
+ * Unlike most builder scripts, this one includes the proposal exports as well.
+ */
+import {
+  deeplyFulfilledObject,
+  makeTracer,
+  NonNullish,
+} from '@agoric/internal';
+import { E } from '@endo/far';
+
+/// <reference types="@agoric/vats/src/core/types-ambient"/>
+
+const trace = makeTracer('StartAxelarGmp', true);
+
+/**
+ * @import {start as StartFn} from '@agoric/orchestration/src/examples/axelar-gmp.contract.js';
+ */
+
+/**
+ * @param {BootstrapPowers} powers
+ */
+export const restartAxelarGmp = async ({
+  consume: {
+    agoricNames,
+    board,
+    chainStorage,
+    chainTimerService,
+    cosmosInterchainService,
+    localchain,
+    contractKits,
+  },
+  instance: instances,
+}) => {
+  trace(restartAxelarGmp.name);
+
+  const marshaller = await E(board).getReadonlyMarshaller();
+  const privateArgs = await deeplyFulfilledObject(
+    harden({
+      agoricNames,
+      localchain,
+      marshaller,
+      orchestrationService: cosmosInterchainService,
+      storageNode: E(NonNullish(await chainStorage)).makeChildNode('axelarGmp'),
+      timerService: chainTimerService,
+    }),
+  );
+
+  // @ts-expect-error unknown instance
+  const instance = await instances.consume.axelarGmp;
+  trace('instance', instance);
+  /** @type {StartedInstanceKit<StartFn>} */
+  const kit = /** @type {any} */ (await E(contractKits).get(instance));
+
+  await E(kit.adminFacet).restartContract(privateArgs);
+  trace('done');
+};
+harden(restartAxelarGmp);
+
+export const getManifest = () => {
+  return {
+    manifest: {
+      [restartAxelarGmp.name]: {
+        consume: {
+          agoricNames: true,
+          board: true,
+          chainTimerService: true,
+          chainStorage: true,
+          cosmosInterchainService: true,
+          localchain: true,
+          contractKits: true,
+        },
+        instance: {
+          consume: { axelarGmp: true },
+        },
+      },
+    },
+  };
+};
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async () =>
+  harden({
+    sourceSpec: '@agoric/builders/scripts/testing/restart-axelar-gmp.js',
+    getManifestCall: [getManifest.name],
+  });
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+export default async (homeP, endowments) => {
+  const dspModule = await import('@agoric/deploy-script-support');
+  const { makeHelpers } = dspModule;
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval(restartAxelarGmp.name, defaultProposalBuilder);
+};

package/scripts/testing/start-query-flows.js

@@ -7,8 +7,10 @@
 import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
 import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
 import { E } from '@endo/far';
+import { parseChainHubOpts } from '../orchestration/helpers.js';
 
 /**
+ * @import {CosmosChainInfo, Denom, DenomDetail} from '@agoric/orchestration';
  * @import {QueryFlowsSF as StartFn} from '@agoric/orchestration/src/fixtures/query-flows.contract.js';
  */
 
@@ -28,25 +30,34 @@ const trace = makeTracer(contractName, true);
  *     };
  *   };
  * }} powers
+ * @param {{
+ *   options: {
+ *     chainInfo: Record<string, CosmosChainInfo>;
+ *     assetInfo: [Denom, DenomDetail & { brandKey?: string }][];
+ *   };
+ * }} config
  */
-export const startQueryFlows = async ({
-  consume: {
-    agoricNames,
-    board,
-    chainStorage,
-    chainTimerService,
-    cosmosInterchainService,
-    localchain,
-    startUpgradable,
-  },
-  installation: {
-    consume: { [contractName]: installation },
-  },
-  instance: {
-    // @ts-expect-error unknown instance
-    produce: { [contractName]: produceInstance },
+export const startQueryFlows = async (
+  {
+    consume: {
+      agoricNames,
+      board,
+      chainStorage,
+      chainTimerService,
+      cosmosInterchainService,
+      localchain,
+      startUpgradable,
+    },
+    installation: {
+      consume: { [contractName]: installation },
+    },
+    instance: {
+      // @ts-expect-error unknown instance
+      produce: { [contractName]: produceInstance },
+    },
   },
-}) => {
+  { options: { chainInfo, assetInfo } },
+) => {
   trace(`start ${contractName}`);
 
   const storageNode = await makeStorageNodeChild(chainStorage, contractName);
@@ -60,6 +71,8 @@ export const startQueryFlows = async ({
     privateArgs: await deeplyFulfilledObject(
       harden({
         agoricNames,
+        assetInfo,
+        chainInfo,
         orchestrationService: cosmosInterchainService,
         localchain,
         storageNode,
@@ -76,7 +89,7 @@ harden(startQueryFlows);
 
 export const getManifestForContract = (
   { restoreRef },
-  { installKeys, ...options },
+  { installKeys, options },
 ) => {
   return {
     manifest: {
@@ -106,7 +119,10 @@ export const getManifestForContract = (
 };
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
-export const defaultProposalBuilder = async ({ publishRef, install }) => {
+export const defaultProposalBuilder = async (
+  { publishRef, install },
+  options,
+) => {
   return harden({
     // Somewhat unorthodox, source the exports from this builder module
     sourceSpec: '@agoric/builders/scripts/testing/start-query-flows.js',
@@ -120,6 +136,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
             ),
           ),
         },
+        options,
       },
     ],
   });
@@ -127,9 +144,12 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
 
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
 export default async (homeP, endowments) => {
-  // import dynamically so the module can work in CoreEval environment
-  const dspModule = await import('@agoric/deploy-script-support');
-  const { makeHelpers } = dspModule;
+  // import dynamically so the modules can work in CoreEval environment
+  const { makeHelpers } = await import('@agoric/deploy-script-support');
+  const { scriptArgs } = endowments;
+  const opts = parseChainHubOpts(scriptArgs);
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
-  await writeCoreEval(startQueryFlows.name, defaultProposalBuilder);
+  await writeCoreEval(startQueryFlows.name, utils =>
+    defaultProposalBuilder(utils, opts),
+  );
 };

package/scripts/vats/upgrade-provisionPool-to-BLD.js

@@ -0,0 +1,25 @@
+import { makeHelpers } from '@agoric/deploy-script-support';
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async ({ publishRef, install }) =>
+  harden({
+    sourceSpec:
+      '@agoric/vats/src/proposals/upgrade-provisionPool-to-BLD-proposal.js',
+    getManifestCall: [
+      'getManifestForUpgradingProvisionPool',
+      {
+        provisionPoolRef: publishRef(
+          install('@agoric/inter-protocol/src/provisionPool.js'),
+        ),
+      },
+    ],
+  });
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+export default async (homeP, endowments) => {
+  const { writeCoreProposal } = await makeHelpers(homeP, endowments);
+  await writeCoreProposal(
+    'upgrade-provision-pool-to-BLD',
+    defaultProposalBuilder,
+  );
+};

package/scripts/vats/upgrade-vats.js

@@ -1,10 +1,10 @@
 /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
 export const upgradeVatsProposalBuilder = async (
   { publishRef, install },
-  bundleRecord,
+  vatNameToEntrypoint,
 ) => {
-  if (!bundleRecord) {
-    throw Error('Missing bundleRecord');
+  if (!vatNameToEntrypoint) {
+    throw Error('Missing vatNameToEntrypoint');
   }
   return harden({
     sourceSpec: '@agoric/vats/src/proposals/upgrade-vats-generic-proposal.js',
@@ -12,7 +12,7 @@ export const upgradeVatsProposalBuilder = async (
       'getManifestForUpgradingVats',
       {
         bundleRefs: Object.fromEntries(
-          Object.entries(bundleRecord).map(
+          Object.entries(vatNameToEntrypoint).map(
             ([name, entrypoint]) =>
               /** @type {const} */ ([name, publishRef(install(entrypoint))]),
           ),
@@ -21,3 +21,29 @@ export const upgradeVatsProposalBuilder = async (
     ],
   });
 };
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const upgradeZoeContractsProposalBuilder = async (
+  { publishRef, install },
+  contractKitSpecs,
+) => {
+  if (!contractKitSpecs) {
+    throw Error('Missing contractKitSpecs');
+  }
+  return harden({
+    sourceSpec: '@agoric/vats/src/proposals/upgrade-vats-generic-proposal.js',
+    getManifestCall: [
+      'getManifestForUpgradingZoeContractKits',
+      {
+        contractKitSpecs,
+        /** @type {{ [bundleName: string]: VatSourceRef }} */
+        installationBundleRefs: Object.fromEntries(
+          contractKitSpecs.map(({ bundleName, entrypoint }) => [
+            bundleName,
+            publishRef(install(entrypoint)),
+          ]),
+        ),
+      },
+    ],
+  });
+};