fix(vm): bug fix

Author: ctrlc03

packages/actions/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@p0tion/actions",
-    "version": "0.4.2",
+    "version": "0.4.4",
     "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",

packages/actions/src/helpers/ec2.ts

@@ -94,8 +94,8 @@ export const generateVMCommand = (zKeyPath: string, ptauPath: string): string[]
         "sudo yum update -y",
         "sudo yum install -y nodejs",
         "npm install -g snarkjs",
-        `aws s3 cp s3://${zKeyPath} ./var/tmp/genesisZkey.zkey`,
-        `aws s3 cp s3://${ptauPath} ./var/tmp/pot.ptau`
+        `aws s3 cp s3://${zKeyPath} /var/tmp/genesisZkey.zkey`,
+        `aws s3 cp s3://${ptauPath} /var/tmp/pot.ptau`
     ]
 
     return command

packages/actions/test/data/samples.ts

@@ -285,7 +285,7 @@ const fakeCircuitSmallNoContributors = generateFakeCircuit({
     data: {
         name: "Circuit Small",
         description: "Short description of Circuit Small",
-        prefix: "circuit-small",
+        prefix: "circuit_small",
         sequencePosition: 1,
         fixedTimeWindow: 10,
         zKeySizeInBytes: 45020,

packages/actions/test/unit/ec2.test.ts

@@ -44,7 +44,7 @@ describe("VMs", () => {
     //         instance = await createEC2Instance(ec2, [
     //             "echo 'hello world' > hello.txt",
     //             "aws s3 cp hello.txt s3://p0tion-test-bucket/hello.txt"
-    //         ], "t2.micro", amiId, keyName, roleArn)
+    //         ], "t2.micro", amiId, keyName, roleArn, 8)
     //         expect(instance).to.not.be.undefined
     //         // give it time to actually spin up 
     //         await sleep(250000)
@@ -96,7 +96,7 @@ describe("VMs", () => {
     //                 "aws s3 cp s3://p0tion-test-bucket/script_test.sh script_test.sh",
     //                 "chmod +x script_test.sh && bash script_test.sh"
     //         ]
-    //         ssmTestInstance = await createEC2Instance(ec2, userData, "t2.small", amiId, keyName, roleArn)
+    //         ssmTestInstance = await createEC2Instance(ec2, userData, "t2.small", amiId, keyName, roleArn, 8)
     //         await sleep(250000)
     //     })
     //     it("should run my commands", async () => {
@@ -191,7 +191,6 @@ describe("VMs", () => {
 
             // 1 create a bucket for the ceremony
             await signInWithEmailAndPassword(userAuth, users[1].data.email, passwords[1])
-            console.log("LOGGED IN")
             await createS3Bucket(userFunctions, ceremonyBucket)
 
             // zkey upload
@@ -201,20 +200,22 @@ describe("VMs", () => {
         })
 
         afterAll(async () => {
-            for (const instanceId of instancesToTerminate) {
-                await terminateEC2Instance(ec2, instanceId)
-            }
+            // for (const instanceId of instancesToTerminate) {
+            //     await terminateEC2Instance(ec2, instanceId)
+            // }
 
-            for (const objectToDelete of objectsToDelete) {
-                await deleteObjectFromS3(ceremonyBucket, objectToDelete)
-            }
-            await deleteBucket(ceremonyBucket)
+            // for (const objectToDelete of objectsToDelete) {
+            //     await deleteObjectFromS3(ceremonyBucket, objectToDelete)
+            // }
+            // await deleteBucket(ceremonyBucket)
 
             await cleanUpMockUsers(adminAuth, adminFirestore, users)
-            // await cleanUpRecursively(adminFirestore, ceremonyId)
+            await cleanUpRecursively(adminFirestore, ceremonyId)
+
+            fs.rmdirSync(`${outputDirectory}`, { recursive: true })
         })
 
-        it("should create a ceremony and two VMs should spin up", async () => {
+        it.only("should create a ceremony and two VMs should spin up", async () => {
             // 1. setup ceremony
             ceremonyId = await setupCeremony(userFunctions, ceremony.data, ceremony.data.prefix!, [circuit.data])
 
@@ -229,16 +230,14 @@ describe("VMs", () => {
 
             for (const circuit of circuits) {
                 const { vmInstanceId } = circuit.data
-                // instancesToTerminate.push(vmInstanceId)
-                // check VM status
-                const status = await checkEC2Status(ec2, vmInstanceId)
-                expect(status).to.be.eq(true)
+                expect(vmInstanceId).to.not.be.null
+                instancesToTerminate.push(vmInstanceId)
             }
         })
 
-        it.skip("should verify a contribution", async () => {
-            // 1. login as user 2
-            await signInWithEmailAndPassword(userAuth, users[2].data.email, passwords[2])
+        it("should verify a contribution", async () => {
+            // 1. login
+            await signInWithEmailAndPassword(userAuth, users[0].data.email, passwords[0])
             await sleep(500)
             // 2. get circuits for ceremony
             const circuits = await getCeremonyCircuits(userFirestore, ceremonyId)

packages/backend/src/functions/ceremony.ts

@@ -27,13 +27,9 @@ import {
     htmlEncodeCircuitData,
     createEC2Client,
     getAWSVariables,
-    sleep,
-    uploadFileToBucket,
-    createTemporaryLocalPath,
     uploadFileToBucketNoFile
 } from "../lib/utils"
 import { LogLevel } from "../types/enums"
-import { writeFileSync, unlinkSync } from "fs"
 import { determineVMSpecs } from "@p0tion/actions"
 
 dotenv.config()
@@ -149,8 +145,8 @@ export const setupCeremony = functions
             const ec2Client = await createEC2Client()
             // generate the commands for startup
             const vmCommands = generateVMCommand(
-                circuit.files?.initialZkeyStoragePath!,
-                circuit.files?.potStoragePath!
+                `${bucketName}/${circuit.files?.initialZkeyStoragePath!}`,
+                `${bucketName}/circuit.files?.potStoragePath!`
             )
 
             // upload the instructions file the bucket and clean up
@@ -163,7 +159,7 @@ export const setupCeremony = functions
             const instance = await createEC2Instance(
                 ec2Client,
                 userData,
-                "t3.xlarge",
+                vmSpecs.vm,
                 amiId,
                 keyName,
                 roleArn,

packages/backend/src/functions/circuit.ts

@@ -436,6 +436,12 @@ export const verifycontribution = functionsV2.https.onCall(
             // get ec2 client
             const ec2Client = await createEC2Client()
 
+           
+
+            // Prepare timer. (@todo check where to move this)
+            const verificationTaskTimer = new Timer({ label: `${ceremonyId}-${circuitId}-${participantDoc.id}` })
+            verificationTaskTimer.start()
+
             // start vm and give it time to start
             await startEC2Instance(ec2Client, instanceId)
             await sleep(200000)
@@ -446,16 +452,6 @@ export const verifycontribution = functionsV2.https.onCall(
                 console.log("DEBUG Not running yet")
             }
 
-            // Prepare timer. (@todo check where to move this)
-            const verificationTaskTimer = new Timer({ label: `${ceremonyId}-${circuitId}-${participantDoc.id}` })
-            verificationTaskTimer.start()
-
-            // Step (1.A.3).
-            verificationTaskTimer.stop()
-            verifyCloudFunctionExecutionTime = verificationTaskTimer.ms()
-
-            printLog(`The contribution has been verified - Result ${isContributionValid}`, LogLevel.DEBUG)
-
             const commands = [
                 `aws s3 cp s3://${bucketName}/${lastZkeyStoragePath} /var/tmp/lastZKey.zkey`,
                 `snarkjs zkvi /var/tmp/genesisZkey.zkey /var/tmp/pot.ptau /var/tmp/lastZKey.zkey | tee /var/tmp/verification_transcript.log`,
@@ -470,10 +466,15 @@ export const verifycontribution = functionsV2.https.onCall(
             const commandOutput = await retrieveCommandOutput(ssmClient, commandId, instanceId)
             if (commandOutput.includes("ZKey Ok!")) isContributionValid = true 
             console.log("dEBUG output", commandOutput)
-            
+            printLog(`The contribution has been verified - Result ${isContributionValid}`, LogLevel.DEBUG)
+
             // stop the VM
             await stopEC2Instance(ec2Client, instanceId)
 
+            // Step (1.A.3).
+            verificationTaskTimer.stop()
+            verifyCloudFunctionExecutionTime = verificationTaskTimer.ms()
+
             // Step (1.A.2).
 
             // Compute contribution hash. (@todo compute on VM api)