From acf271cff328397d7b5f6f54035a3127ece2d1b1 Mon Sep 17 00:00:00 2001
From: 0xPatrick <patrick@0xpatrick.dev>
Date: Mon, 25 Nov 2024 18:10:56 -0500
Subject: [PATCH] feat: support builderOpts

---
 multichain-testing/test/support.ts |  3 ++-
 multichain-testing/tools/deploy.ts | 13 ++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/multichain-testing/test/support.ts b/multichain-testing/test/support.ts
index 9c2a297296ed..f98b5a13f086 100644
--- a/multichain-testing/test/support.ts
+++ b/multichain-testing/test/support.ts
@@ -89,6 +89,7 @@ export const commonSetup = async (t: ExecutionContext) => {
   const startContract = async (
     contractName: string,
     contractBuilder: string,
+    builderOpts?: Record<string, string>,
   ) => {
     const { vstorageClient } = tools;
     const instances = Object.fromEntries(
@@ -98,7 +99,7 @@ export const commonSetup = async (t: ExecutionContext) => {
       return t.log('Contract found. Skipping installation...');
     }
     t.log('bundle and install contract', contractName);
-    await deployBuilder(contractBuilder);
+    await deployBuilder(contractBuilder, builderOpts);
     await retryUntilCondition(
       () => vstorageClient.queryData(`published.agoricNames.instance`),
       res => contractName in Object.fromEntries(res),
diff --git a/multichain-testing/tools/deploy.ts b/multichain-testing/tools/deploy.ts
index 17b70cf5bb40..52a460f60942 100755
--- a/multichain-testing/tools/deploy.ts
+++ b/multichain-testing/tools/deploy.ts
@@ -2,6 +2,7 @@
 import { createRequire } from 'module';
 import type { AgdTools } from './agd-tools.js';
 import type { CoreEvalPlan } from '@agoric/deploy-script-support/src/writeCoreEvalParts.js';
+import { flags } from './agd-lib.js';
 
 const nodeRequire = createRequire(import.meta.url);
 
@@ -10,10 +11,16 @@ export const makeDeployBuilder = (
   readJSON: typeof import('fs-extra').readJSON,
   execa: typeof import('execa').execa,
 ) =>
-  async function deployBuilder(builder: string) {
+  async function deployBuilder(
+    builder: string,
+    builderOpts?: Record<string, string>,
+  ) {
     console.log(`building plan: ${builder}`);
-    // build the plan
-    const { stdout } = await execa`agoric run ${builder}`;
+    const args = ['run', builder];
+    if (builderOpts) {
+      args.push(...flags(builderOpts));
+    }
+    const { stdout } = await execa('agoric', args);
     const match = stdout.match(/ (?<name>[-\w]+)-permit.json/);
     if (!(match && match.groups)) {
       throw Error('no permit found');