@devtion/actions 0.0.0-101d43f → 0.0.0-36caea1

package/dist/index.mjs

@@ -1,5 +1,5 @@
 /**
- * @module @p0tion/actions
+ * @module @devtion/actions
  * @version 1.0.6
  * @file A set of actions and helpers for CLI commands
  * @copyright Ethereum Foundation 2022
@@ -17,8 +17,7 @@ import crypto from 'crypto';
 import blake from 'blakejs';
 import { utils } from 'ffjavascript';
 import winston from 'winston';
-import { S3Client, GetObjectCommand } from '@aws-sdk/client-s3';
-import { pipeline, Readable } from 'stream';
+import { pipeline } from 'stream';
 import { promisify } from 'util';
 import { initializeApp } from 'firebase/app';
 import { signInWithCredential, initializeAuth, getAuth } from 'firebase/auth';
@@ -1095,30 +1094,22 @@ const parseCeremonyFile = async (path, cleanup = false) => {
             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,
-                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)
+            // Make the call.
+            const responseR1CS = await fetch(artifacts.r1csStoragePath);
+            // Handle errors.
+            if (!responseR1CS.ok && responseR1CS.status !== 200)
                 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));
+            await streamPipeline(responseR1CS.body, createWriteStream(localR1csPath));
+            // Write the file locally
             // 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));
+            const responseWASM = await fetch(artifacts.wasmStoragePath);
+            if (!responseWASM.ok && responseWASM.status !== 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.`);
+            await streamPipeline(responseWASM.body, createWriteStream(localWasmPath));
             // validate that the circuit hash and template links are valid
             const template = circuitData.template;
             const URLMatch = template.source.match(urlPattern);
@@ -1214,9 +1205,10 @@ const parseCeremonyFile = async (path, cleanup = false) => {
                 };
             }
             circuits.push(circuit);
-            // remove the local r1cs download (if used for verifying the config only vs setup)
+            // remove the local r1cs and wasm downloads (if used for verifying the config only vs setup)
             if (cleanup)
                 fs.unlinkSync(localR1csPath);
+            fs.unlinkSync(localWasmPath);
         }
         const setupData = {
             ceremonyInputData: {

package/dist/index.node.js

@@ -1,5 +1,5 @@
 /**
- * @module @p0tion/actions
+ * @module @devtion/actions
  * @version 1.0.6
  * @file A set of actions and helpers for CLI commands
  * @copyright Ethereum Foundation 2022
@@ -19,7 +19,6 @@ var crypto = require('crypto');
 var blake = require('blakejs');
 var ffjavascript = require('ffjavascript');
 var winston = require('winston');
-var clientS3 = require('@aws-sdk/client-s3');
 var stream = require('stream');
 var util = require('util');
 var app = require('firebase/app');
@@ -1097,30 +1096,22 @@ const parseCeremonyFile = async (path, cleanup = false) => {
             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,
-                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)
+            // Make the call.
+            const responseR1CS = await fetch(artifacts.r1csStoragePath);
+            // Handle errors.
+            if (!responseR1CS.ok && responseR1CS.status !== 200)
                 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));
+            await streamPipeline(responseR1CS.body, fs.createWriteStream(localR1csPath));
+            // Write the file locally
             // 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));
+            const responseWASM = await fetch(artifacts.wasmStoragePath);
+            if (!responseWASM.ok && responseWASM.status !== 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.`);
+            await streamPipeline(responseWASM.body, fs.createWriteStream(localWasmPath));
             // validate that the circuit hash and template links are valid
             const template = circuitData.template;
             const URLMatch = template.source.match(urlPattern);
@@ -1216,9 +1207,10 @@ const parseCeremonyFile = async (path, cleanup = false) => {
                 };
             }
             circuits.push(circuit);
-            // remove the local r1cs download (if used for verifying the config only vs setup)
+            // remove the local r1cs and wasm downloads (if used for verifying the config only vs setup)
             if (cleanup)
                 fs.unlinkSync(localR1csPath);
+            fs.unlinkSync(localWasmPath);
         }
         const setupData = {
             ceremonyInputData: {

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,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"}
+{"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,EAAqB,MAAM,IAAI,CAAA;AAExD,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,CAuNzG,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-101d43f",
+  "version": "0.0.0-36caea1",
   "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": "2e6569587be6eeb1bbc2e65563eb247c100e9d66"
+  "gitHead": "2390beae56f741cf791760fbc5e84775e7bc7474"
 }

package/src/helpers/utils.ts

@@ -1,8 +1,8 @@
 import { Firestore } from "firebase/firestore"
-import fs, { ReadPosition } from "fs"
+import fs, { ReadPosition, createWriteStream } from "fs"
 import { utils as ffUtils } from "ffjavascript"
 import winston, { Logger } from "winston"
-import { S3Client, GetObjectCommand, HeadObjectCommand } from "@aws-sdk/client-s3"
+import fetch from "@adobe/node-fetch-retry"
 import { 
     CircuitMetadata, 
     Contribution, 
@@ -29,7 +29,7 @@ import {
     getZkeyStorageFilePath
 } from "./storage"
 import { blake512FromPath } from "./crypto"
-import { Readable, pipeline } from "stream"
+import { pipeline } from "stream"
 import { promisify } from "util"
 
 /**
@@ -93,37 +93,27 @@ export const parseCeremonyFile = async (path: string, cleanup: boolean = false):
             // 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,
-                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) 
+            // Make the call.
+            const responseR1CS = await fetch(artifacts.r1csStoragePath)
+
+            // Handle errors.
+            if (!responseR1CS.ok && responseR1CS.status !== 200) 
                 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))
-            
+            await streamPipeline(responseR1CS.body!, createWriteStream(localR1csPath))
+            // Write the file locally
+           
             // 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))
+            const responseWASM = await fetch(artifacts.wasmStoragePath)
+            if (!responseWASM.ok && responseWASM.status !== 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.`)
+            await streamPipeline(responseWASM.body!, createWriteStream(localWasmPath))
 
             // validate that the circuit hash and template links are valid
             const template = circuitData.template
@@ -239,8 +229,10 @@ export const parseCeremonyFile = async (path: string, cleanup: boolean = false):
 
             circuits.push(circuit)
 
-            // remove the local r1cs download (if used for verifying the config only vs setup)
-            if (cleanup) fs.unlinkSync(localR1csPath)
+            // remove the local r1cs and wasm downloads (if used for verifying the config only vs setup)
+            if (cleanup) 
+                fs.unlinkSync(localR1csPath)
+                fs.unlinkSync(localWasmPath)
         }
 
         const setupData: SetupCeremonyData = {