@devtion/actions 0.0.0-7140596 → 0.0.0-92056fa

package/dist/index.mjs

@@ -1,6 +1,6 @@
 /**
- * @module @p0tion/actions
- * @version 1.0.5
+ * @module @devtion/actions
+ * @version 1.0.6
  * @file A set of actions and helpers for CLI commands
  * @copyright Ethereum Foundation 2022
  * @license MIT
@@ -17,7 +17,7 @@ import crypto from 'crypto';
 import blake from 'blakejs';
 import { utils } from 'ffjavascript';
 import winston from 'winston';
-import { S3Client, HeadObjectCommand, GetObjectCommand } from '@aws-sdk/client-s3';
+import { S3Client, GetObjectCommand } from '@aws-sdk/client-s3';
 import { pipeline, Readable } from 'stream';
 import { promisify } from 'util';
 import { initializeApp } from 'firebase/app';
@@ -1091,42 +1091,34 @@ const parseCeremonyFile = async (path, cleanup = false) => {
             circuitArtifacts.push({
                 artifacts: artifacts
             });
-            const r1csPath = artifacts.r1csStoragePath;
-            const wasmPath = artifacts.wasmStoragePath;
             // where we storing the r1cs downloaded
             const localR1csPath = `./${circuitData.name}.r1cs`;
+            // where we storing the wasm downloaded
+            const localWasmPath = `./${circuitData.name}.wasm`;
             // check that the artifacts exist in S3
             // we don't need any privileges to download this
             // just the correct region
-            const s3 = new S3Client({ region: artifacts.region });
-            try {
-                await s3.send(new HeadObjectCommand({
-                    Bucket: artifacts.bucket,
-                    Key: r1csPath
-                }));
-            }
-            catch (error) {
-                throw new Error(`The r1cs file (${r1csPath}) seems to not exist. Please ensure this is correct and that the object is publicly available.`);
-            }
-            try {
-                await s3.send(new HeadObjectCommand({
-                    Bucket: artifacts.bucket,
-                    Key: wasmPath
-                }));
-            }
-            catch (error) {
-                throw new Error(`The wasm file (${wasmPath}) seems to not exist. Please ensure this is correct and that the object is publicly available.`);
-            }
+            const s3 = new S3Client({
+                region: artifacts.region,
+                credentials: undefined
+            });
             // download the r1cs to extract the metadata
             const command = new GetObjectCommand({ Bucket: artifacts.bucket, Key: artifacts.r1csStoragePath });
             const response = await s3.send(command);
             const streamPipeline = promisify(pipeline);
             if (response.$metadata.httpStatusCode !== 200)
-                throw new Error("There was an error while trying to download the r1cs file. Please check that the file has the correct permissions (public) set.");
+                throw new Error(`There was an error while trying to download the r1cs file for circuit ${circuitData.name}. Please check that the file has the correct permissions (public) set.`);
             if (response.Body instanceof Readable)
                 await streamPipeline(response.Body, fs.createWriteStream(localR1csPath));
             // extract the metadata from the r1cs
             const metadata = getR1CSInfo(localR1csPath);
+            // download wasm too to ensure it's available
+            const wasmCommand = new GetObjectCommand({ Bucket: artifacts.bucket, Key: artifacts.wasmStoragePath });
+            const wasmResponse = await s3.send(wasmCommand);
+            if (wasmResponse.$metadata.httpStatusCode !== 200)
+                throw new Error(`There was an error while trying to download the wasm file for circuit ${circuitData.name}. Please check that the file has the correct permissions (public) set.`);
+            if (wasmResponse.Body instanceof Readable)
+                await streamPipeline(wasmResponse.Body, fs.createWriteStream(localWasmPath));
             // validate that the circuit hash and template links are valid
             const template = circuitData.template;
             const URLMatch = template.source.match(urlPattern);

package/dist/index.node.js

@@ -1,6 +1,6 @@
 /**
- * @module @p0tion/actions
- * @version 1.0.5
+ * @module @devtion/actions
+ * @version 1.0.6
  * @file A set of actions and helpers for CLI commands
  * @copyright Ethereum Foundation 2022
  * @license MIT
@@ -1093,42 +1093,34 @@ const parseCeremonyFile = async (path, cleanup = false) => {
             circuitArtifacts.push({
                 artifacts: artifacts
             });
-            const r1csPath = artifacts.r1csStoragePath;
-            const wasmPath = artifacts.wasmStoragePath;
             // where we storing the r1cs downloaded
             const localR1csPath = `./${circuitData.name}.r1cs`;
+            // where we storing the wasm downloaded
+            const localWasmPath = `./${circuitData.name}.wasm`;
             // check that the artifacts exist in S3
             // we don't need any privileges to download this
             // just the correct region
-            const s3 = new clientS3.S3Client({ region: artifacts.region });
-            try {
-                await s3.send(new clientS3.HeadObjectCommand({
-                    Bucket: artifacts.bucket,
-                    Key: r1csPath
-                }));
-            }
-            catch (error) {
-                throw new Error(`The r1cs file (${r1csPath}) seems to not exist. Please ensure this is correct and that the object is publicly available.`);
-            }
-            try {
-                await s3.send(new clientS3.HeadObjectCommand({
-                    Bucket: artifacts.bucket,
-                    Key: wasmPath
-                }));
-            }
-            catch (error) {
-                throw new Error(`The wasm file (${wasmPath}) seems to not exist. Please ensure this is correct and that the object is publicly available.`);
-            }
+            const s3 = new clientS3.S3Client({
+                region: artifacts.region,
+                credentials: undefined
+            });
             // download the r1cs to extract the metadata
             const command = new clientS3.GetObjectCommand({ Bucket: artifacts.bucket, Key: artifacts.r1csStoragePath });
             const response = await s3.send(command);
             const streamPipeline = util.promisify(stream.pipeline);
             if (response.$metadata.httpStatusCode !== 200)
-                throw new Error("There was an error while trying to download the r1cs file. Please check that the file has the correct permissions (public) set.");
+                throw new Error(`There was an error while trying to download the r1cs file for circuit ${circuitData.name}. Please check that the file has the correct permissions (public) set.`);
             if (response.Body instanceof stream.Readable)
                 await streamPipeline(response.Body, fs.createWriteStream(localR1csPath));
             // extract the metadata from the r1cs
             const metadata = getR1CSInfo(localR1csPath);
+            // download wasm too to ensure it's available
+            const wasmCommand = new clientS3.GetObjectCommand({ Bucket: artifacts.bucket, Key: artifacts.wasmStoragePath });
+            const wasmResponse = await s3.send(wasmCommand);
+            if (wasmResponse.$metadata.httpStatusCode !== 200)
+                throw new Error(`There was an error while trying to download the wasm file for circuit ${circuitData.name}. Please check that the file has the correct permissions (public) set.`);
+            if (wasmResponse.Body instanceof stream.Readable)
+                await streamPipeline(wasmResponse.Body, fs.createWriteStream(localWasmPath));
             // validate that the circuit hash and template links are valid
             const template = circuitData.template;
             const URLMatch = template.source.match(urlPattern);

package/dist/types/src/helpers/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/helpers/utils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAW,EAAE,YAAY,EAAE,MAAM,IAAI,CAAA;AAErC,OAAO,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAEzC,OAAO,EACH,eAAe,EACf,YAAY,EAGZ,oBAAoB,EACpB,oBAAoB,EACpB,iBAAiB,EAGpB,MAAM,gBAAgB,CAAA;AAmBvB;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,SAAgB,MAAM,YAAW,OAAO,KAAW,QAAQ,iBAAiB,CAoOzG,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,+BAA+B,iBAAkB,MAAM,UAAU,MAAM,KAAG,MAgBtF,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,oCAAoC,gBAAiB,MAAM,WAAW,MAAM,WAUxF,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,aAAc,MAAM,KAAG,MASlD,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,wBAAyB,MAAM,KAAG,MACH,CAAA;AAElE;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,QAAS,MAAM,KAAG,MAEsC,CAAA;AAElF;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,cAAsE,CAAA;AAEtG;;;;;;;GAOG;AACH,eAAO,MAAM,4BAA4B,aAC3B,MAAM,oBAAoB,CAAC,oBACnB,MAAM,KACzB,oBAYF,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,cAAe,MAAM,WAAW,OAAO,KAAG,MAC1B,CAAA;AAEjD;;;;;;;;GAQG;AACH,eAAO,MAAM,sCAAsC,sBAC5B,SAAS,YAClB,MAAM,oBAAoB,CAAC,cACzB,MAAM,iBACH,MAAM,gBACP,OAAO,KACtB,QAAQ,MAAM,oBAAoB,CAAC,CAmCrC,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,0CAA0C,0BAC5B,MAAM,gBACf,MAAM,gBACN,OAAO,WAImF,CAAA;AAE5G;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,qCAAqC,sBAC3B,SAAS,YAClB,MAAM,oBAAoB,CAAC,cACzB,MAAM,iBACH,MAAM,4BACK,MAAM,YAAY,CAAC,yBACtB,MAAM,gBACf,MAAM,gBACN,OAAO,KACtB,QAAQ,MAAM,CA2DhB,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,aAAc,MAAM,UAAS,QAAQ,aAAa,CAAC,OAAO,CAAC,KAAY,MAQvG,CAAA;AAEN;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,kBACX,MAAM,UACb,MAAM,UACN,MAAM,YACJ,YAAY,KACvB,MAYF,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,WAAW,sBAAuB,MAAM,KAAG,eA0IvD,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,WAAY,MAAM,KAAG,MAA0D,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/helpers/utils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAW,EAAE,YAAY,EAAE,MAAM,IAAI,CAAA;AAErC,OAAO,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAEzC,OAAO,EACH,eAAe,EACf,YAAY,EAGZ,oBAAoB,EACpB,oBAAoB,EACpB,iBAAiB,EAGpB,MAAM,gBAAgB,CAAA;AAmBvB;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,SAAgB,MAAM,YAAW,OAAO,KAAW,QAAQ,iBAAiB,CA+NzG,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,+BAA+B,iBAAkB,MAAM,UAAU,MAAM,KAAG,MAgBtF,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,oCAAoC,gBAAiB,MAAM,WAAW,MAAM,WAUxF,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,aAAc,MAAM,KAAG,MASlD,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,wBAAyB,MAAM,KAAG,MACH,CAAA;AAElE;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,QAAS,MAAM,KAAG,MAEsC,CAAA;AAElF;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,cAAsE,CAAA;AAEtG;;;;;;;GAOG;AACH,eAAO,MAAM,4BAA4B,aAC3B,MAAM,oBAAoB,CAAC,oBACnB,MAAM,KACzB,oBAYF,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,cAAe,MAAM,WAAW,OAAO,KAAG,MAC1B,CAAA;AAEjD;;;;;;;;GAQG;AACH,eAAO,MAAM,sCAAsC,sBAC5B,SAAS,YAClB,MAAM,oBAAoB,CAAC,cACzB,MAAM,iBACH,MAAM,gBACP,OAAO,KACtB,QAAQ,MAAM,oBAAoB,CAAC,CAmCrC,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,0CAA0C,0BAC5B,MAAM,gBACf,MAAM,gBACN,OAAO,WAImF,CAAA;AAE5G;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,qCAAqC,sBAC3B,SAAS,YAClB,MAAM,oBAAoB,CAAC,cACzB,MAAM,iBACH,MAAM,4BACK,MAAM,YAAY,CAAC,yBACtB,MAAM,gBACf,MAAM,gBACN,OAAO,KACtB,QAAQ,MAAM,CA2DhB,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,aAAc,MAAM,UAAS,QAAQ,aAAa,CAAC,OAAO,CAAC,KAAY,MAQvG,CAAA;AAEN;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,kBACX,MAAM,UACb,MAAM,UACN,MAAM,YACJ,YAAY,KACvB,MAYF,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,WAAW,sBAAuB,MAAM,KAAG,eA0IvD,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,WAAY,MAAM,KAAG,MAA0D,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devtion/actions",
-  "version": "0.0.0-7140596",
+  "version": "0.0.0-92056fa",
   "description": "A set of actions and helpers for CLI commands",
   "repository": "git@github.com:privacy-scaling-explorations/p0tion.git",
   "homepage": "https://github.com/privacy-scaling-explorations/p0tion",
@@ -83,5 +83,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5f4dde47fdee59378296f3581ce9c7ce01676083"
+  "gitHead": "9ecb8d55d49edf248244fdd83e06deb20036c340"
 }

package/src/helpers/utils.ts

@@ -87,34 +87,19 @@ export const parseCeremonyFile = async (path: string, cleanup: boolean = false):
             circuitArtifacts.push({
                 artifacts: artifacts
             })
-            const r1csPath = artifacts.r1csStoragePath
-            const wasmPath = artifacts.wasmStoragePath
 
             // where we storing the r1cs downloaded
             const localR1csPath = `./${circuitData.name}.r1cs`
+            // where we storing the wasm downloaded
+            const localWasmPath = `./${circuitData.name}.wasm`
 
             // check that the artifacts exist in S3
             // we don't need any privileges to download this
             // just the correct region
-            const s3 = new S3Client({region: artifacts.region})
-
-            try {
-                await s3.send(new HeadObjectCommand({
-                    Bucket: artifacts.bucket,
-                    Key: r1csPath 
-                }))
-            } catch (error: any) {
-                throw new Error(`The r1cs file (${r1csPath}) seems to not exist. Please ensure this is correct and that the object is publicly available.`)
-            }
-            
-            try {
-                await s3.send(new HeadObjectCommand({
-                    Bucket: artifacts.bucket,
-                    Key: wasmPath 
-                }))
-            } catch (error: any) {
-                throw new Error(`The wasm file (${wasmPath}) seems to not exist. Please ensure this is correct and that the object is publicly available.`)
-            }
+            const s3 = new S3Client({
+                region: artifacts.region,
+                credentials: undefined
+            })
 
             // download the r1cs to extract the metadata
             const command = new GetObjectCommand({ Bucket: artifacts.bucket, Key: artifacts.r1csStoragePath })
@@ -122,7 +107,7 @@ export const parseCeremonyFile = async (path: string, cleanup: boolean = false):
             const streamPipeline = promisify(pipeline)
 
             if (response.$metadata.httpStatusCode !== 200) 
-                throw new Error("There was an error while trying to download the r1cs file. Please check that the file has the correct permissions (public) set.")
+                throw new Error(`There was an error while trying to download the r1cs file for circuit ${circuitData.name}. Please check that the file has the correct permissions (public) set.`)
 
             if (response.Body instanceof Readable) 
                 await streamPipeline(response.Body, fs.createWriteStream(localR1csPath))
@@ -130,6 +115,16 @@ export const parseCeremonyFile = async (path: string, cleanup: boolean = false):
             // extract the metadata from the r1cs
             const metadata = getR1CSInfo(localR1csPath)
 
+            // download wasm too to ensure it's available
+            const wasmCommand = new GetObjectCommand({ Bucket: artifacts.bucket, Key: artifacts.wasmStoragePath })
+            const wasmResponse = await s3.send(wasmCommand)
+
+            if (wasmResponse.$metadata.httpStatusCode !== 200)
+                throw new Error(`There was an error while trying to download the wasm file for circuit ${circuitData.name}. Please check that the file has the correct permissions (public) set.`)
+            
+            if (wasmResponse.Body instanceof Readable)
+                await streamPipeline(wasmResponse.Body, fs.createWriteStream(localWasmPath))
+
             // validate that the circuit hash and template links are valid
             const template = circuitData.template