fix(upload-contract): make deterministic

Author: michaelfig

lib/ag-solo/upload-contract.js

@@ -51,9 +51,7 @@ export default async function upload(basedir, args) {
     }
   }
 
-  const originurl = new URL('/', wsurl);
-  originurl.protocol = 'https:';
-  const ws = new WebSocket(wsurl, { origin: originurl.href });
+  const ws = new WebSocket(wsurl, { origin: 'http://127.0.0.1' });
   const exit = makePromise();
   ws.on('open', async () => {
     try {
@@ -74,44 +72,46 @@ export default async function upload(basedir, args) {
         }
       });
 
-      let bootC;
-      for (;;) {
-        bootC = E.C(bootstrap());
-        if (!(await bootC.G.LOADING.P)) {
-          break;
+      // Wait for the chain to become ready.
+      let bootC = E.C(bootstrap());
+      console.log('Chain loaded:', await bootC.G.LOADING.P);
+      // Take a new copy, since the contract targets should exist.
+      bootC = E.C(bootstrap());
+
+      const contractAP = [];
+      const names = [];
+      for (const namePath of namePaths) {
+        const match = namePath.match(/^(([^\W-]+)-[^=]+)=(.+)$/);
+        if (!match) {
+          throw Error(`${namePath} isn't TARGET-NAME=PATH`);
         }
-        console.log(`waiting for chain to become ready`);
-        await new Promise(resolve => setTimeout(resolve, 3000));
-      }
+        const name = match[1];
+        const target = match[2];
+        const filepath = match[3];
+        const { source, moduleFormat } = await buildSourceBundle(filepath);
+        // console.log(`Uploading ${source}`);
 
-      await Promise.all(
-        namePaths.map(async namePath => {
-          const match = namePath.match(/^(([^\W-]+)-[^=]+)=(.+)$/);
-          if (!match) {
-            throw Error(`${namePath} isn't TARGET-NAME=PATH`);
-          }
-          const name = match[1];
-          const target = match[2];
-          const filepath = match[3];
-          const { source, moduleFormat } = await buildSourceBundle(filepath);
-          // console.log(`Uploading ${source}`);
+        const targetObj = await bootC.G[target].P;
+        if (!targetObj) {
+          console.error(
+            `Contract installation target object ${target} is not available for ${name}; skipping...`,
+          );
+        } else {
+          // Install the contract, then save it in home.uploads.
+          contractAP.push(E(targetObj).install(source, moduleFormat));
+          names.push(name);
+        }
+      }
 
-          const targetObj = await bootC.G[target].P;
-          if (!targetObj) {
-            console.error(
-              `Contract installation target object ${target} is not available for ${name}; skipping...`,
-            );
-            return null;
-          }
+      const contracts = await Promise.all(contractAP);
 
-          // Install the contract, then save it in home.uploads.
-          return bootC.G.uploads.M.set(
-            name,
-            E(targetObj).install(source, moduleFormat),
-          ).P;
-        }),
-      );
+      const uploadsC = bootC.G.uploads;
+      const uploadAP = [];
+      for (let i = 0; i < contractAP.length; i += 1) {
+        uploadAP.push(uploadsC.M.set(names[i], contracts[i]).P);
+      }
 
+      await Promise.all(uploadAP);
       console.log('Success!  See home.uploads~.list()');
       ws.close();
       exit.res(0);