upgrade to yarn3

.gitignore

@@ -50,6 +50,15 @@ dist/
 npm-debug.log
 yarn-error.log
 
+# yarn3 files https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
 # BUCK
 buck-out/
 \.buckd/

.yarnrc.yml

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-3.6.4.cjs

dockerfiles/phone-number-privacy/Dockerfile

@@ -34,8 +34,8 @@ COPY scripts/ scripts/
 COPY patches/ patches/
 
 # Makes build fail if it doesn't copy git, will be removed after build
-COPY .git .git 
-COPY .gitmodules .gitmodules 
+COPY .git .git
+COPY .gitmodules .gitmodules
 
 # Setting ONLY_PUBLISHED_DEPENDENCIES to true or any non-empty string results in only the
 # phone-number-privacy package being copied into the image, and therefore it will only build using
@@ -45,7 +45,7 @@ ARG PACKAGE_SELECTOR=${ONLY_PUBLISHED_DEPENDENCIES:+phone-number-privacy/signer}
 COPY --from=packages celo-phone-number-privacy/packages/${PACKAGE_SELECTOR} packages/${PACKAGE_SELECTOR}
 
 # Install dependencies and build.
-RUN yarn install --network-timeout 100000 --frozen-lockfile && yarn cache clean
+RUN yarn install --network-timeout 100000 --immutable && yarn cache clean
 RUN yarn build
 
 RUN rm -r .git

package.json

@@ -78,5 +78,6 @@
     "ganache": "npm:@celo/[email protected]",
     "@types/bn.js": "4.11.6",
     "bignumber.js": "9.0.0"
-  }
+  },
+  "packageManager": "[email protected]"
 }

packages/phone-number-privacy/combiner/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@celo/phone-number-privacy-combiner",
   "version": "3.0.1",
-  "private": "true",
+  "private": true,
   "description": "Orchestrates and combines threshold signatures for use in ODIS",
   "author": "Celo",
   "license": "Apache-2.0",
@@ -31,40 +31,40 @@
   },
   "dependencies": {
     "@celo/contractkit": "^5.0.4",
-    "@celo/phone-number-privacy-common": "^3.0.3",
-    "@celo/identity": "^5.0.4",
     "@celo/encrypted-backup": "^5.0.4",
+    "@celo/identity": "^5.0.4",
+    "@celo/phone-number-privacy-common": "^3.0.3",
     "@celo/poprf": "^0.1.9",
-    "@types/bunyan": "^1.8.8",
     "@opentelemetry/api": "^1.4.1",
-    "@opentelemetry/resources": "1.17.0",
-    "@opentelemetry/instrumentation": "^0.41.2",
     "@opentelemetry/auto-instrumentations-node": "^0.38.0",
     "@opentelemetry/exporter-jaeger": "^1.15.2",
+    "@opentelemetry/instrumentation": "^0.41.2",
     "@opentelemetry/propagator-ot-trace": "^0.27.0",
+    "@opentelemetry/resources": "1.17.0",
     "@opentelemetry/sdk-metrics": "^1.15.2",
     "@opentelemetry/sdk-node": "^0.41.2",
-    "@opentelemetry/sdk-trace-web": "^1.15.2",
-    "@opentelemetry/sdk-trace-node": "1.15.2",
     "@opentelemetry/sdk-trace-base": "^1.17.0",
+    "@opentelemetry/sdk-trace-node": "1.15.2",
+    "@opentelemetry/sdk-trace-web": "^1.15.2",
     "@opentelemetry/semantic-conventions": "^1.15.2",
+    "@types/bunyan": "^1.8.8",
     "blind-threshold-bls": "npm:@celo/[email protected]",
-    "dotenv": "^8.2.0",
-    "io-ts": "2.0.1",
     "bunyan": "1.8.12",
+    "dotenv": "^8.2.0",
     "express": "^4.17.1",
     "firebase-admin": "^11.10.1",
     "firebase-functions": "^4.4.1",
+    "io-ts": "2.0.1",
     "knex": "^2.1.0",
     "node-fetch": "^2.6.9",
     "pg": "^8.2.1",
     "uuid": "^7.0.3"
   },
   "devDependencies": {
-    "@types/node": "18.15.13",
-    "@celo/utils": "^5.0.4",
     "@celo/phone-utils": "^5.0.4",
+    "@celo/utils": "^5.0.4",
     "@types/express": "^4.17.6",
+    "@types/node": "18.15.13",
     "@types/supertest": "^2.0.12",
     "@types/uuid": "^7.0.3",
     "firebase-functions-test": "^3.1.0",
@@ -73,4 +73,4 @@
   "engines": {
     "node": "18"
   }
-}
+}

packages/phone-number-privacy/common/package.json

@@ -7,7 +7,7 @@
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "scripts": {
-    "prepublishOnly": "yarn build",
+    "prepublish": "yarn build",
     "build": "tsc -b .",
     "clean": "tsc -b . --clean",
     "test": "jest --testPathIgnorePatterns test/end-to-end",
@@ -20,27 +20,27 @@
   "dependencies": {
     "@celo/base": "^5.0.4",
     "@celo/contractkit": "^5.0.4",
-    "@celo/utils": "^5.0.4",
     "@celo/phone-utils": "^5.0.4",
+    "@celo/utils": "^5.0.4",
+    "@opentelemetry/api": "^1.4.1",
+    "@opentelemetry/auto-instrumentations-node": "^0.38.0",
+    "@opentelemetry/propagator-ot-trace": "^0.27.0",
+    "@opentelemetry/sdk-metrics": "^1.15.1",
+    "@opentelemetry/sdk-node": "^0.41.1",
+    "@opentelemetry/sdk-trace-web": "^1.15.1",
+    "@opentelemetry/semantic-conventions": "^1.15.1",
     "@types/bunyan": "1.8.8",
     "bignumber.js": "^9.0.0",
     "bunyan": "1.8.12",
     "bunyan-debug-stream": "2.0.0",
     "bunyan-gke-stackdriver": "0.1.2",
     "dotenv": "^8.2.0",
     "elliptic": "^6.5.4",
-    "io-ts": "2.0.1",
-    "fp-ts": "2.1.1",
     "express": "^4.17.6",
-    "node-fetch": "^2.6.9",
+    "fp-ts": "2.1.1",
+    "io-ts": "2.0.1",
     "is-base64": "^1.1.0",
-    "@opentelemetry/api": "^1.4.1",
-    "@opentelemetry/auto-instrumentations-node": "^0.38.0",
-    "@opentelemetry/propagator-ot-trace": "^0.27.0",
-    "@opentelemetry/sdk-metrics": "^1.15.1",
-    "@opentelemetry/sdk-node": "^0.41.1",
-    "@opentelemetry/semantic-conventions": "^1.15.1",
-    "@opentelemetry/sdk-trace-web": "^1.15.1"
+    "node-fetch": "^2.6.9"
   },
   "devDependencies": {
     "@celo/poprf": "^0.1.9",
@@ -53,4 +53,4 @@
   "engines": {
     "node": ">=12"
   }
-}
+}

packages/phone-number-privacy/monitor/package.json

@@ -27,12 +27,12 @@
     "@celo/cryptographic-utils": "^5.0.4",
     "@celo/encrypted-backup": "^5.0.4",
     "@celo/identity": "^5.0.4",
-    "@celo/wallet-local": "^5.0.4",
     "@celo/phone-number-privacy-common": "^3.0.3",
     "@celo/utils": "^5.0.4",
-    "yargs": "^14.0.0",
+    "@celo/wallet-local": "^5.0.4",
     "firebase-admin": "^9.12.0",
-    "firebase-functions": "^3.15.7"
+    "firebase-functions": "^3.15.7",
+    "yargs": "^14.0.0"
   },
   "devDependencies": {
     "firebase-functions-test": "^0.3.3",
@@ -41,4 +41,4 @@
   "engines": {
     "node": ">=14"
   }
-}
+}

packages/phone-number-privacy/signer/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@celo/phone-number-privacy-signer",
   "version": "3.0.2",
-  "private": "true",
+  "private": true,
   "description": "Signing participator of ODIS",
   "author": "Celo",
   "license": "Apache-2.0",
@@ -39,9 +39,6 @@
   },
   "dependencies": {
     "@celo/base": "^5.0.4",
-    "bunyan": "1.8.12",
-    "bignumber.js": "^9.0.0",
-    "blind-threshold-bls": "npm:@celo/[email protected]",
     "@celo/contractkit": "^5.0.4",
     "@celo/phone-number-privacy-common": "^3.0.3",
     "@celo/poprf": "^0.1.9",
@@ -50,32 +47,35 @@
     "@google-cloud/secret-manager": "3.0.0",
     "@opentelemetry/api": "^1.4.1",
     "@opentelemetry/auto-instrumentations-node": "^0.38.0",
+    "@opentelemetry/exporter-jaeger": "^1.15.2",
+    "@opentelemetry/instrumentation": "^0.41.2",
     "@opentelemetry/propagator-ot-trace": "^0.27.0",
     "@opentelemetry/resources": "1.17.0",
-    "@opentelemetry/instrumentation": "^0.41.2",
-    "@opentelemetry/exporter-jaeger": "^1.15.2",
     "@opentelemetry/sdk-metrics": "^1.15.1",
     "@opentelemetry/sdk-node": "^0.41.1",
-    "@opentelemetry/semantic-conventions": "^1.15.1",
     "@opentelemetry/sdk-trace-base": "^1.17.0",
     "@opentelemetry/sdk-trace-node": "1.15.2",
     "@opentelemetry/sdk-trace-web": "^1.15.1",
+    "@opentelemetry/semantic-conventions": "^1.15.1",
     "@types/bunyan": "^1.8.8",
     "aws-sdk": "^2.705.0",
+    "bignumber.js": "^9.0.0",
+    "blind-threshold-bls": "npm:@celo/[email protected]",
+    "bunyan": "1.8.12",
+    "cron": "^2.4.1",
     "dotenv": "^8.2.0",
     "express": "^4.17.1",
     "knex": "^2.1.0",
+    "lru-cache": "^10.0.1",
     "mssql": "^6.3.1",
     "mysql2": "^2.1.0",
-    "cron": "^2.4.1",
     "pg": "^8.2.1",
     "prom-client": "12.0.0",
-    "promise.allsettled": "^1.0.2",
-    "lru-cache": "^10.0.1"
+    "promise.allsettled": "^1.0.2"
   },
   "devDependencies": {
-    "@types/node": "18.15.13",
     "@types/express": "^4.17.6",
+    "@types/node": "18.15.13",
     "@types/supertest": "^2.0.12",
     "sqlite3": "^5.0.8",
     "supertest": "^6.2.3",
@@ -86,4 +86,4 @@
   "engines": {
     "node": ">=10"
   }
-}
+}

packages/sdk/encrypted-backup/package.json

@@ -22,16 +22,16 @@
     "docs": "typedoc",
     "test": "jest --runInBand",
     "lint": "eslint .",
-    "prepublishOnly": "yarn build"
+    "prepublish": "yarn build"
   },
   "dependencies": {
-    "@celo/connect": "^5.0.4",
     "@celo/base": "^5.0.4",
+    "@celo/connect": "^5.0.4",
     "@celo/identity": "^5.0.4",
-    "@celo/wallet-local": "^5.0.4",
     "@celo/phone-number-privacy-common": "^3.0.3",
     "@celo/poprf": "^0.1.9",
     "@celo/utils": "^5.0.4",
+    "@celo/wallet-local": "^5.0.4",
     "@types/debug": "^4.1.5",
     "debug": "^4.1.1",
     "fp-ts": "2.1.1",
@@ -44,4 +44,4 @@
   "engines": {
     "node": ">=16"
   }
-}
+}

packages/sdk/identity/package.json

@@ -20,13 +20,13 @@
     "docs": "typedoc",
     "test": "jest --runInBand --testPathIgnorePatterns src/odis/identifier-backwards-compatibility.test.ts",
     "lint": "eslint .",
-    "prepublishOnly": "yarn build"
+    "prepublish": "yarn build"
   },
   "dependencies": {
     "@celo/base": "^5.0.4",
-    "@celo/utils": "^5.0.4",
     "@celo/contractkit": "^5.0.4",
     "@celo/phone-number-privacy-common": "^3.0.3",
+    "@celo/utils": "^5.0.4",
     "@types/debug": "^4.1.5",
     "bignumber.js": "^9.0.0",
     "blind-threshold-bls": "npm:@celo/[email protected]",
@@ -49,4 +49,4 @@
   "engines": {
     "node": ">=16"
   }
-}
+}