Merge ccf1ce5 into 2235d46

privacy-scaling-explorations · May 17, 2023 · f448e9d · f448e9d
2 parents 2235d46 + ccf1ce5
commit f448e9d
Show file tree

Hide file tree

Showing 12 changed files with 85 additions and 175 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,15 +3,31 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.3.1](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.3.0...v0.3.1) (2023-05-16)
+## [0.3.5](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.3.0...v0.3.5) (2023-05-17)
 
 
 ### Bug Fixes
 
+* duplicate messages when waiting for contribution; remove wrong listener ([61fbd19](https://github.com/privacy-scaling-explorations/p0tion/commit/61fbd19eb13f35d34963fbd350441f54cd8e1c91))
+* missing updates for current contributor fields when coordinating ([88a730b](https://github.com/privacy-scaling-explorations/p0tion/commit/88a730b7ba44093127320197e888b3579255ba5b))
 * spinner does not stop correctly after contribution verification ([345bdcb](https://github.com/privacy-scaling-explorations/p0tion/commit/345bdcb8a09915aba29b37ac988b7109a67490e0))
 
 
 
+## [0.3.2](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.3.0...v0.3.2) (2023-05-17)
+
+### Bug Fixes
+
+-   duplicate messages when waiting for contribution; remove wrong listener ([61fbd19](https://github.com/privacy-scaling-explorations/p0tion/commit/61fbd19eb13f35d34963fbd350441f54cd8e1c91))
+-   missing updates for current contributor fields when coordinating ([88a730b](https://github.com/privacy-scaling-explorations/p0tion/commit/88a730b7ba44093127320197e888b3579255ba5b))
+-   spinner does not stop correctly after contribution verification ([345bdcb](https://github.com/privacy-scaling-explorations/p0tion/commit/345bdcb8a09915aba29b37ac988b7109a67490e0))
+
+## [0.3.1](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.3.0...v0.3.1) (2023-05-16)
+
+### Bug Fixes
+
+-   spinner does not stop correctly after contribution verification ([345bdcb](https://github.com/privacy-scaling-explorations/p0tion/commit/345bdcb8a09915aba29b37ac988b7109a67490e0))
+
 ## [0.3.0](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.2.0...v0.3.0) (2023-05-15)
 
 ### Features

diff --git a/lerna.json b/lerna.json
@@ -4,7 +4,7 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.3.1",
+  "version": "0.3.5",
   "changelogPreset": {
     "name": "conventionalcommits",
     "issuePrefixes": [

diff --git a/packages/actions/CHANGELOG.md b/packages/actions/CHANGELOG.md
@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.3.1](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.3.0...v0.3.1) (2023-05-16)
+## [0.3.5](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.3.0...v0.3.5) (2023-05-17)
 
 
 ### Bug Fixes
@@ -12,6 +12,18 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+## [0.3.2](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.3.0...v0.3.2) (2023-05-17)
+
+### Bug Fixes
+
+-   spinner does not stop correctly after contribution verification ([345bdcb](https://github.com/privacy-scaling-explorations/p0tion/commit/345bdcb8a09915aba29b37ac988b7109a67490e0))
+
+## [0.3.1](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.3.0...v0.3.1) (2023-05-16)
+
+### Bug Fixes
+
+-   spinner does not stop correctly after contribution verification ([345bdcb](https://github.com/privacy-scaling-explorations/p0tion/commit/345bdcb8a09915aba29b37ac988b7109a67490e0))
+
 ## [0.3.0](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.2.0...v0.3.0) (2023-05-15)
 
 ### Features

diff --git a/packages/actions/package.json b/packages/actions/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@p0tion/actions",
-    "version": "0.3.1",
+    "version": "0.3.5",
     "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",

diff --git a/packages/backend/.default.env b/packages/backend/.default.env
@@ -23,6 +23,8 @@ GITHUB_MINIMUM_FOLLOWERS="1"
 GITHUB_MINIMUM_FOLLOWING="5"
 ## Minimum amount of public repos for the GitHub account
 GITHUB_MINIMUM_PUBLIC_REPOS="2"
+## The access token used for rate limiting purposes
+AUTH_GITHUB_ACCESS_TOKEN="YOUR-GITHUB-ACCESS-TOKEN"
 
 # The email address of the user who is going to be the coordinator of all ceremonies.
 # nb. right now, only one user could be a coordinator for all ceremonies deployed within the same instance.

diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
@@ -3,15 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.3.1](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.3.0...v0.3.1) (2023-05-16)
+## [0.3.5](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.3.0...v0.3.5) (2023-05-17)
 
 
 ### Bug Fixes
 
+* missing updates for current contributor fields when coordinating ([88a730b](https://github.com/privacy-scaling-explorations/p0tion/commit/88a730b7ba44093127320197e888b3579255ba5b))
 * spinner does not stop correctly after contribution verification ([345bdcb](https://github.com/privacy-scaling-explorations/p0tion/commit/345bdcb8a09915aba29b37ac988b7109a67490e0))
 
 
 
+## [0.3.2](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.3.0...v0.3.2) (2023-05-17)
+
+### Bug Fixes
+
+-   missing updates for current contributor fields when coordinating ([88a730b](https://github.com/privacy-scaling-explorations/p0tion/commit/88a730b7ba44093127320197e888b3579255ba5b))
+-   spinner does not stop correctly after contribution verification ([345bdcb](https://github.com/privacy-scaling-explorations/p0tion/commit/345bdcb8a09915aba29b37ac988b7109a67490e0))
+
+## [0.3.1](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.3.0...v0.3.1) (2023-05-16)
+
+### Bug Fixes
+
+-   spinner does not stop correctly after contribution verification ([345bdcb](https://github.com/privacy-scaling-explorations/p0tion/commit/345bdcb8a09915aba29b37ac988b7109a67490e0))
+
 ## [0.3.0](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.2.0...v0.3.0) (2023-05-15)
 
 ### Features

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@p0tion/backend",
-    "version": "0.3.1",
+    "version": "0.3.5",
     "description": "MPC Phase 2 backend for Firebase services management",
     "repository": "git@github.com:privacy-scaling-explorations/p0tion.git",
     "homepage": "https://github.com/privacy-scaling-explorations/p0tion",
@@ -65,7 +65,7 @@
         "@aws-sdk/client-s3": "^3.329.0",
         "@aws-sdk/middleware-endpoint": "^3.329.0",
         "@aws-sdk/s3-request-presigner": "^3.329.0",
-        "@p0tion/actions": "^0.3.1",
+        "@p0tion/actions": "^0.3.5",
         "blakejs": "^1.2.1",
         "dotenv": "^16.0.3",
         "ethers": "5.7.2",

diff --git a/packages/backend/src/functions/circuit.ts b/packages/backend/src/functions/circuit.ts
@@ -124,6 +124,7 @@ const coordinate = async (
         else if (participantIsNotCurrentContributor) {
             printLog(`Coordinate - executing scenario B - single - participantIsNotCurrentContributor`, LogLevel.DEBUG)
 
+            newCurrentContributorId = currentContributor
             newParticipantStatus = ParticipantStatus.WAITING
             newContributors.push(participant.id)
         }
@@ -148,6 +149,9 @@ const coordinate = async (
             LogLevel.DEBUG
         )
 
+        newParticipantStatus = ParticipantStatus.CONTRIBUTING
+        newContributionStep = ParticipantContributionStep.DOWNLOADING
+
         // Remove from waiting queue of circuit X.
         newContributors.shift()
 
@@ -164,7 +168,9 @@ const coordinate = async (
 
             // Prepare update tx.
             batch.update(newCurrentContributorDocument.ref, {
-                status: ParticipantStatus.WAITING, // need to be refreshed.
+                status: newParticipantStatus,
+                contributionStep: newContributionStep,
+                contributionStartedAt: getCurrentServerTimestampInMillis(),
                 lastUpdated: getCurrentServerTimestampInMillis()
             })
 

diff --git a/packages/phase2cli/CHANGELOG.md b/packages/phase2cli/CHANGELOG.md
@@ -3,15 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.3.1](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.3.0...v0.3.1) (2023-05-16)
+## [0.3.5](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.3.0...v0.3.5) (2023-05-17)
 
 
 ### Bug Fixes
 
+* duplicate messages when waiting for contribution; remove wrong listener ([61fbd19](https://github.com/privacy-scaling-explorations/p0tion/commit/61fbd19eb13f35d34963fbd350441f54cd8e1c91))
 * spinner does not stop correctly after contribution verification ([345bdcb](https://github.com/privacy-scaling-explorations/p0tion/commit/345bdcb8a09915aba29b37ac988b7109a67490e0))
 
 
 
+## [0.3.2](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.3.0...v0.3.2) (2023-05-17)
+
+### Bug Fixes
+
+-   duplicate messages when waiting for contribution; remove wrong listener ([61fbd19](https://github.com/privacy-scaling-explorations/p0tion/commit/61fbd19eb13f35d34963fbd350441f54cd8e1c91))
+-   spinner does not stop correctly after contribution verification ([345bdcb](https://github.com/privacy-scaling-explorations/p0tion/commit/345bdcb8a09915aba29b37ac988b7109a67490e0))
+
+## [0.3.1](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.3.0...v0.3.1) (2023-05-16)
+
+### Bug Fixes
+
+-   spinner does not stop correctly after contribution verification ([345bdcb](https://github.com/privacy-scaling-explorations/p0tion/commit/345bdcb8a09915aba29b37ac988b7109a67490e0))
+
 ## [0.3.0](https://github.com/privacy-scaling-explorations/p0tion/compare/v0.2.0...v0.3.0) (2023-05-15)
 
 ### Features

diff --git a/packages/phase2cli/package.json b/packages/phase2cli/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@p0tion/phase2cli",
     "type": "module",
-    "version": "0.3.1",
+    "version": "0.3.5",
     "description": "All-in-one interactive command-line for interfacing with zkSNARK Phase 2 Trusted Setup ceremonies",
     "repository": "git@github.com:privacy-scaling-explorations/p0tion.git",
     "homepage": "https://github.com/privacy-scaling-explorations/p0tion",
@@ -65,7 +65,7 @@
         "@octokit/auth-oauth-app": "^5.0.5",
         "@octokit/auth-oauth-device": "^4.0.4",
         "@octokit/request": "^6.2.3",
-        "@p0tion/actions": "^0.3.1",
+        "@p0tion/actions": "^0.3.5",
         "blakejs": "^1.2.1",
         "boxen": "^7.1.0",
         "chalk": "^5.2.0",