test

.github/scripts/createVault.mjs

@@ -1,35 +1,42 @@
 import { execa } from 'execa';
+import fs from 'fs';
 
 const agops = '/usr/src/agoric-sdk/packages/agoric-cli/bin/agops';
 
-const createVault = async (containerName, agoricNet, commandTimeout, userKey, wantMinted, giveCollateral) => {
+const createVault = async (containerName, agoricNet, userKey, wantMinted, giveCollateral) => {
   console.log('Starting the vault creation process...');
 
-  if (!containerName || !agoricNet || !commandTimeout || !userKey || !wantMinted || !giveCollateral) {
-    console.error('Error: Missing one or more required parameters:', {
-      containerName,
-      agoricNet,
-      commandTimeout,
-      userKey,
-      wantMinted,
-      giveCollateral,
-    });
-    process.exit(1);
-  }
-
-  const createVaultCommand = `${agops} vaults open --wantMinted \"${wantMinted}\" --giveCollateral \"${giveCollateral}\" > /tmp/want-ist.json`;
-  const executeCreateVaultCommand = `docker exec ${containerName} /bin/bash -c "env AGORIC_NET=${agoricNet} timeout ${commandTimeout} ${createVaultCommand}"`;
-
   try {
-    console.log(`Executing: ${executeCreateVaultCommand}`);
-    const { stdout: createVaultOutput } = await execa(executeCreateVaultCommand);
-    console.log('Vault creation output:', createVaultOutput);
-
-    console.log('Executing broadcast command...');
-    const broadcastCommand = `timeout ${commandTimeout} ${agops} perf satisfaction --executeOffer /tmp/want-ist.json --from ${userKey} --keyring-backend=test`;
-    const executeBroadcastCommand = `docker exec ${containerName} bash -c "env AGORIC_NET=${agoricNet} ${broadcastCommand}"`;
+    const env = {
+      AGORIC_NET: agoricNet,
+    };
+
+    const { stdout } = await execa(
+      'docker',
+      ['exec', containerName, agops, 'vaults', 'open', '--wantMinted', wantMinted, '--giveCollateral', giveCollateral],
+      { env },
+    );
+
+    fs.writeFileSync('/tmp/want-ist.json', stdout);
+    console.log('Vault creation output:', stdout);
+
+    const { stdout: broadcastOutput } = await execa(
+      'docker',
+      [
+        'exec',
+        containerName,
+        agops,
+        'perf',
+        'satisfaction',
+        '--executeOffer',
+        '/tmp/want-ist.json',
+        '--from',
+        userKey,
+        '--keyring-backend=test',
+      ],
+      { env, shell: true },
+    );
 
-    const { stdout: broadcastOutput } = await execa(executeBroadcastCommand);
     console.log('Broadcast output:', broadcastOutput);
   } catch (error) {
     console.error('Error during vault creation:', error);
@@ -39,9 +46,8 @@ const createVault = async (containerName, agoricNet, commandTimeout, userKey, wa
 
 const containerName = process.env.containerName;
 const agoricNet = process.env.agoricNet;
-const commandTimeout = process.env.commandTimeout;
 const userKey = process.env.userKey;
 const wantMinted = process.env.wantMinted;
 const giveCollateral = process.env.giveCollateral;
 
-createVault(containerName, agoricNet, commandTimeout, userKey, wantMinted, giveCollateral);
+createVault(containerName, agoricNet, userKey, wantMinted, giveCollateral);