From a85af6a2144cbee6ab50b09f0d1a7562a6287f50 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 6 Mar 2024 15:12:48 -0500 Subject: [PATCH 01/14] enter beta mode --- .changeset/pre.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .changeset/pre.json diff --git a/.changeset/pre.json b/.changeset/pre.json new file mode 100644 index 000000000..a4849f7d6 --- /dev/null +++ b/.changeset/pre.json @@ -0,0 +1,15 @@ +{ + "mode": "pre", + "tag": "beta", + "initialVersions": { + "@celo/phone-number-privacy-combiner": "3.3.2", + "@celo/phone-number-privacy-monitor": "3.0.2", + "@celo/phone-number-privacy-signer": "3.1.1", + "odis-example-scripts": "1.0.1", + "@celo/phone-number-privacy-common": "3.1.1", + "@celo/encrypted-backup": "5.0.5", + "@celo/identity": "5.1.1", + "@celo/odis-identifiers": "1.0.0" + }, + "changesets": [] +} From e50e957762fae31a60d488ac0f86dfa01daf5fa3 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 6 Mar 2024 15:24:48 -0500 Subject: [PATCH 02/14] fixed beta-exit --- scripts/beta-mode.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/beta-mode.sh b/scripts/beta-mode.sh index 84be97252..db7d664ea 100644 --- a/scripts/beta-mode.sh +++ b/scripts/beta-mode.sh @@ -22,7 +22,7 @@ echo "Merge the Version Packages (beta) PR to publish a beta" # a. if you do merge/publish you will need to add more changesets to initiate a new beta being published # 8. repeat 7 if wanted # 9. when ready to exit pre mode. `yarn beta-exit` -echo "when complete with beta mode, run `yarn beta-exit`" +echo "when complete with beta mode, run 'yarn beta-exit'" echo "IMPORTANT: once you exit pre mode you should open a PR to merge your branch into main." echo "DONT MERGE the Version Packages PR which is not Beta into prerelease/$branch_name branch" # 11. open PR for prerelease into main From f05a9ac12d8ff1280b9d967431c06644f005ee53 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 6 Mar 2024 15:25:38 -0500 Subject: [PATCH 03/14] no post-resolution check or immutability req in CI --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 901fbdef5..a70d0e615 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "cs": "yarn changeset", "bump": "yarn changeset version", "release": "yarn build && yarn cs publish", - "version_and_reinstall": "yarn changeset version && yarn", + "version_and_reinstall": "yarn changeset version && yarn install --no-immutable --no-check-resolutions", "beta-enter": "bash scripts/beta-mode.sh", "beta-exit": "yarn cs pre exit && git commit -am 'Complete beta releasing'", "postinstall": "yarn husky install && yarn workspaces foreach --all -piv run postinstall" From b11e3dfa481b3c336957f41b98c4f4f7f1e8a97e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 6 Mar 2024 20:36:48 +0000 Subject: [PATCH 04/14] Version Packages (beta) --- .changeset/pre.json | 32 ++++++++++- apps/combiner/CHANGELOG.md | 14 +++++ apps/combiner/package.json | 8 +-- apps/monitor/CHANGELOG.md | 19 +++++++ apps/monitor/package.json | 8 +-- apps/signer/CHANGELOG.md | 12 +++++ apps/signer/package.json | 4 +- docs/examples/CHANGELOG.md | 10 ++++ docs/examples/package.json | 4 +- packages/common/CHANGELOG.md | 8 +++ packages/common/package.json | 2 +- packages/encrypted-backup/CHANGELOG.md | 13 +++++ packages/encrypted-backup/package.json | 6 +-- packages/identity/CHANGELOG.md | 13 +++++ packages/identity/package.json | 6 +-- packages/odis-identifiers/CHANGELOG.md | 6 +++ packages/odis-identifiers/package.json | 2 +- yarn.lock | 75 +++++++++++++++++++------- 18 files changed, 202 insertions(+), 40 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index a4849f7d6..cdc8a3073 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -11,5 +11,35 @@ "@celo/identity": "5.1.1", "@celo/odis-identifiers": "1.0.0" }, - "changesets": [] + "changesets": [ + "big-lies-protect", + "cold-ducks-visit", + "eighty-glasses-sip", + "empty-dodos-impress", + "fair-bottles-wonder", + "fifty-buses-taste", + "four-zoos-tie", + "khaki-walls-drum", + "light-keys-prove", + "lucky-birds-end", + "many-goats-teach", + "nasty-elephants-juggle", + "neat-bananas-allow", + "nice-laws-accept", + "nice-peaches-talk", + "perfect-deers-shake", + "real-bottles-swim", + "red-ravens-search", + "rude-hounds-jam", + "smooth-moons-battle", + "spotty-cameras-design", + "spotty-starfishes-move", + "tall-cycles-care", + "ten-beers-build", + "tender-frogs-thank", + "tender-tomatoes-protect", + "tricky-actors-wait", + "yellow-spoons-change", + "young-houses-explode" + ] } diff --git a/apps/combiner/CHANGELOG.md b/apps/combiner/CHANGELOG.md index 09aa2d047..5494d9fd2 100644 --- a/apps/combiner/CHANGELOG.md +++ b/apps/combiner/CHANGELOG.md @@ -1,5 +1,19 @@ # @celo/phone-number-privacy-combiner +## 3.3.3-beta.0 + +### Patch Changes + +- 8804b67: Upgrade @celo/\*\* dependencies to latest release +- 3d18f26: Update package dependencies to reduce CVEs +- Updated dependencies [8804b67] +- Updated dependencies [687607a] +- Updated dependencies [56164f9] +- Updated dependencies [3d18f26] + - @celo/encrypted-backup@5.0.6-beta.0 + - @celo/identity@5.1.2-beta.0 + - @celo/phone-number-privacy-common@3.1.2-beta.0 + ## 3.3.2 ### Patch Changes diff --git a/apps/combiner/package.json b/apps/combiner/package.json index 19a339480..327d480cc 100644 --- a/apps/combiner/package.json +++ b/apps/combiner/package.json @@ -1,6 +1,6 @@ { "name": "@celo/phone-number-privacy-combiner", - "version": "3.3.2", + "version": "3.3.3-beta.0", "private": true, "description": "Orchestrates and combines threshold signatures for use in ODIS", "author": "Celo", @@ -26,9 +26,9 @@ "dependencies": { "@celo/base": "^6.0.0", "@celo/contractkit": "^7.1.0", - "@celo/encrypted-backup": "^5.0.5", - "@celo/identity": "^5.1.1", - "@celo/phone-number-privacy-common": "^3.1.1", + "@celo/encrypted-backup": "^5.0.6-beta.0", + "@celo/identity": "^5.1.2-beta.0", + "@celo/phone-number-privacy-common": "^3.1.2-beta.0", "@celo/poprf": "^0.1.9", "@opentelemetry/api": "^1.6.0", "@opentelemetry/auto-instrumentations-node": "^0.39.4", diff --git a/apps/monitor/CHANGELOG.md b/apps/monitor/CHANGELOG.md index bc004e049..0f16e6b1b 100644 --- a/apps/monitor/CHANGELOG.md +++ b/apps/monitor/CHANGELOG.md @@ -1,5 +1,24 @@ # @celo/phone-number-privacy-monitor +## 3.1.0-beta.0 + +### Minor Changes + +- 89dc2a9: Updated to run on cloud function gen2 using node18. Updated test script to point to latest Clabs Signer deployments. + +### Patch Changes + +- 8804b67: Upgrade @celo/\*\* dependencies to latest release +- 14269eb: Added `ts-node` to monitor package +- 3d18f26: Update package dependencies to reduce CVEs +- Updated dependencies [8804b67] +- Updated dependencies [687607a] +- Updated dependencies [56164f9] +- Updated dependencies [3d18f26] + - @celo/encrypted-backup@5.0.6-beta.0 + - @celo/identity@5.1.2-beta.0 + - @celo/phone-number-privacy-common@3.1.2-beta.0 + ## 3.0.2 ### Patch Changes diff --git a/apps/monitor/package.json b/apps/monitor/package.json index e3d02cc89..4497d4bd1 100644 --- a/apps/monitor/package.json +++ b/apps/monitor/package.json @@ -1,6 +1,6 @@ { "name": "@celo/phone-number-privacy-monitor", - "version": "3.0.2", + "version": "3.1.0-beta.0", "private": true, "description": "Regularly queries ODIS to ensure the system is functioning properly", "author": "Celo", @@ -26,9 +26,9 @@ "@celo/base": "^6.0.0", "@celo/contractkit": "^7.1.0", "@celo/cryptographic-utils": "^5.0.7", - "@celo/encrypted-backup": "^5.0.5", - "@celo/identity": "^5.1.1", - "@celo/phone-number-privacy-common": "^3.1.1", + "@celo/encrypted-backup": "^5.0.6-beta.0", + "@celo/identity": "^5.1.2-beta.0", + "@celo/phone-number-privacy-common": "^3.1.2-beta.0", "@celo/utils": "^6.0.0", "@celo/wallet-local": "^5.1.2", "firebase-admin": "^11.11.0", diff --git a/apps/signer/CHANGELOG.md b/apps/signer/CHANGELOG.md index 7adef69bb..9eac19587 100644 --- a/apps/signer/CHANGELOG.md +++ b/apps/signer/CHANGELOG.md @@ -1,5 +1,17 @@ # @celo/phone-number-privacy-signer +## 3.1.2-beta.0 + +### Patch Changes + +- 14269eb: Updated the e2e test script. +- 8804b67: Upgrade @celo/\*\* dependencies to latest release +- 3d18f26: Update package dependencies to reduce CVEs +- Updated dependencies [8804b67] +- Updated dependencies [687607a] +- Updated dependencies [3d18f26] + - @celo/phone-number-privacy-common@3.1.2-beta.0 + ## 3.1.1 ### Patch Changes diff --git a/apps/signer/package.json b/apps/signer/package.json index 5e670f628..fb91c303d 100644 --- a/apps/signer/package.json +++ b/apps/signer/package.json @@ -1,6 +1,6 @@ { "name": "@celo/phone-number-privacy-signer", - "version": "3.1.1", + "version": "3.1.2-beta.0", "private": true, "description": "Signing participator of ODIS", "author": "Celo", @@ -40,7 +40,7 @@ "dependencies": { "@celo/base": "^6.0.0", "@celo/contractkit": "^7.1.0", - "@celo/phone-number-privacy-common": "^3.1.1", + "@celo/phone-number-privacy-common": "^3.1.2-beta.0", "@celo/poprf": "^0.1.9", "@celo/utils": "^6.0.0", "@celo/wallet-hsm-azure": "^5.1.2", diff --git a/docs/examples/CHANGELOG.md b/docs/examples/CHANGELOG.md index afdad0690..95583d7c7 100644 --- a/docs/examples/CHANGELOG.md +++ b/docs/examples/CHANGELOG.md @@ -1,5 +1,15 @@ # odis-example-scripts +## 1.0.2-beta.0 + +### Patch Changes + +- 8804b67: Upgrade @celo/\*\* dependencies to latest release +- Updated dependencies [8804b67] +- Updated dependencies [56164f9] +- Updated dependencies [3d18f26] + - @celo/identity@5.1.2-beta.0 + ## 1.0.1 ### Patch Changes diff --git a/docs/examples/package.json b/docs/examples/package.json index 6a391cc9b..2d6927d06 100644 --- a/docs/examples/package.json +++ b/docs/examples/package.json @@ -1,6 +1,6 @@ { "name": "odis-example-scripts", - "version": "1.0.1", + "version": "1.0.2-beta.0", "main": "index.js", "private": true, "license": "MIT", @@ -10,7 +10,7 @@ }, "dependencies": { "@celo/base": "^6.0.0", - "@celo/identity": "^5.1.1", + "@celo/identity": "^5.1.2-beta.0", "blind-threshold-bls": "https://github.com/celo-org/blind-threshold-bls-wasm#3d1013a", "ethers": "^5.7.2", "react": "^16.8.1", diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md index 26691d3f2..7e290b2d8 100644 --- a/packages/common/CHANGELOG.md +++ b/packages/common/CHANGELOG.md @@ -1,5 +1,13 @@ # @celo/phone-number-privacy-common +## 3.1.2-beta.0 + +### Patch Changes + +- 8804b67: Upgrade @celo/\*\* dependencies to latest release +- 687607a: Remove opentelemetry dependencies +- 3d18f26: Update package dependencies to reduce CVEs + ## 3.1.1 ### Patch Changes diff --git a/packages/common/package.json b/packages/common/package.json index 763dc7f57..4c483138f 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@celo/phone-number-privacy-common", - "version": "3.1.1", + "version": "3.1.2-beta.0", "description": "Common library for the combiner and signer libraries", "author": "Celo", "license": "Apache-2.0", diff --git a/packages/encrypted-backup/CHANGELOG.md b/packages/encrypted-backup/CHANGELOG.md index cca2096af..1aeceed7b 100644 --- a/packages/encrypted-backup/CHANGELOG.md +++ b/packages/encrypted-backup/CHANGELOG.md @@ -1,5 +1,18 @@ # @celo/encrypted-backup +## 5.0.6-beta.0 + +### Patch Changes + +- 8804b67: Upgrade @celo/\*\* dependencies to latest release +- 3d18f26: Update package dependencies to reduce CVEs +- Updated dependencies [8804b67] +- Updated dependencies [687607a] +- Updated dependencies [56164f9] +- Updated dependencies [3d18f26] + - @celo/identity@5.1.2-beta.0 + - @celo/phone-number-privacy-common@3.1.2-beta.0 + ## 5.0.5 ### Patch Changes diff --git a/packages/encrypted-backup/package.json b/packages/encrypted-backup/package.json index deedb09c1..71d2abe84 100644 --- a/packages/encrypted-backup/package.json +++ b/packages/encrypted-backup/package.json @@ -1,6 +1,6 @@ { "name": "@celo/encrypted-backup", - "version": "5.0.5", + "version": "5.0.6-beta.0", "description": "Libraries for implemented password encrypted account backups", "main": "./lib/index.js", "types": "./lib/index.d.ts", @@ -27,8 +27,8 @@ "dependencies": { "@celo/base": "^6.0.0", "@celo/connect": "^5.1.2", - "@celo/identity": "^5.1.1", - "@celo/phone-number-privacy-common": "^3.1.1", + "@celo/identity": "^5.1.2-beta.0", + "@celo/phone-number-privacy-common": "^3.1.2-beta.0", "@celo/poprf": "^0.1.9", "@celo/utils": "^6.0.0", "@celo/wallet-local": "^5.1.2", diff --git a/packages/identity/CHANGELOG.md b/packages/identity/CHANGELOG.md index d734a7799..cbba3ea08 100644 --- a/packages/identity/CHANGELOG.md +++ b/packages/identity/CHANGELOG.md @@ -1,5 +1,18 @@ # @celo/identity +## 5.1.2-beta.0 + +### Patch Changes + +- 8804b67: Upgrade @celo/\*\* dependencies to latest release +- 56164f9: Updated devchain to support CELO CR11 +- 3d18f26: Update package dependencies to reduce CVEs +- Updated dependencies [8804b67] +- Updated dependencies [687607a] +- Updated dependencies [3d18f26] + - @celo/phone-number-privacy-common@3.1.2-beta.0 + - @celo/odis-identifiers@1.0.1-beta.0 + ## 5.1.1 ### Patch Changes diff --git a/packages/identity/package.json b/packages/identity/package.json index d8158a230..3d70a0af8 100644 --- a/packages/identity/package.json +++ b/packages/identity/package.json @@ -1,6 +1,6 @@ { "name": "@celo/identity", - "version": "5.1.1", + "version": "5.1.2-beta.0", "description": "Utilities for interacting with Celo's identity protocol", "main": "./lib/index.js", "types": "./lib/index.d.ts", @@ -26,8 +26,8 @@ "dependencies": { "@celo/base": "^6.0.0", "@celo/contractkit": "^7.1.0", - "@celo/odis-identifiers": "^1.0.0", - "@celo/phone-number-privacy-common": "^3.1.1", + "@celo/odis-identifiers": "^1.0.1-beta.0", + "@celo/phone-number-privacy-common": "^3.1.2-beta.0", "@celo/utils": "^6.0.0", "@types/debug": "^4.1.10", "bignumber.js": "^9.1.2", diff --git a/packages/odis-identifiers/CHANGELOG.md b/packages/odis-identifiers/CHANGELOG.md index 9163913f7..2c35e46be 100644 --- a/packages/odis-identifiers/CHANGELOG.md +++ b/packages/odis-identifiers/CHANGELOG.md @@ -1,5 +1,11 @@ # @celo/odis-identifiers +## 1.0.1-beta.0 + +### Patch Changes + +- 3d18f26: Update package dependencies to reduce CVEs + ## 1.0.0 ### Major Changes diff --git a/packages/odis-identifiers/package.json b/packages/odis-identifiers/package.json index 0785b1e99..eb7bc11b6 100644 --- a/packages/odis-identifiers/package.json +++ b/packages/odis-identifiers/package.json @@ -2,7 +2,7 @@ "name": "@celo/odis-identifiers", "author": "cLabs", "license": "Apache-2.0", - "version": "1.0.0", + "version": "1.0.1-beta.0", "description": "ODIS Identifier Prefixes and functions to hash identifiers", "repository": "https://github.com/celo-org/social-connect", "main": "./lib/index.js", diff --git a/yarn.lock b/yarn.lock index 1130cfc49..3d91b9740 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1298,7 +1298,7 @@ __metadata: languageName: node linkType: hard -"@celo/base@npm:^5.0.4": +"@celo/base@npm:^5.0.4, @celo/base@npm:^5.0.5": version: 5.0.5 resolution: "@celo/base@npm:5.0.5" checksum: 10/bf8725909ac67e138b3d5d7252bfb51a2f7c5bb0dda883c94bc4d9e1075f7e9f08b26467099a2896b89c1a370ca2755856e995d1d013428b50d3ac094fd2c1a6 @@ -1358,7 +1358,7 @@ __metadata: languageName: node linkType: hard -"@celo/contractkit@npm:^5.0.4": +"@celo/contractkit@npm:^5.0.4, @celo/contractkit@npm:^5.1.0": version: 5.2.1 resolution: "@celo/contractkit@npm:5.2.1" dependencies: @@ -1442,15 +1442,15 @@ __metadata: languageName: node linkType: hard -"@celo/encrypted-backup@npm:^5.0.5, @celo/encrypted-backup@workspace:packages/encrypted-backup": +"@celo/encrypted-backup@npm:^5.0.6-beta.0, @celo/encrypted-backup@workspace:packages/encrypted-backup": version: 0.0.0-use.local resolution: "@celo/encrypted-backup@workspace:packages/encrypted-backup" dependencies: "@celo/base": "npm:^6.0.0" "@celo/connect": "npm:^5.1.2" "@celo/dev-utils": "npm:0.0.1-beta.1" - "@celo/identity": "npm:^5.1.1" - "@celo/phone-number-privacy-common": "npm:^3.1.1" + "@celo/identity": "npm:^5.1.2-beta.0" + "@celo/phone-number-privacy-common": "npm:^3.1.2-beta.0" "@celo/poprf": "npm:^0.1.9" "@celo/utils": "npm:^6.0.0" "@celo/wallet-local": "npm:^5.1.2" @@ -1463,7 +1463,7 @@ __metadata: languageName: unknown linkType: soft -"@celo/identity@npm:^5.1.1, @celo/identity@workspace:packages/identity": +"@celo/identity@npm:^5.1.2-beta.0, @celo/identity@workspace:packages/identity": version: 0.0.0-use.local resolution: "@celo/identity@workspace:packages/identity" dependencies: @@ -1471,8 +1471,8 @@ __metadata: "@celo/celo-devchain": "npm:7.0.0" "@celo/contractkit": "npm:^7.1.0" "@celo/dev-utils": "npm:0.0.1-beta.1" - "@celo/odis-identifiers": "npm:^1.0.0" - "@celo/phone-number-privacy-common": "npm:^3.1.1" + "@celo/odis-identifiers": "npm:^1.0.1-beta.0" + "@celo/phone-number-privacy-common": "npm:^3.1.2-beta.0" "@celo/utils": "npm:^6.0.0" "@celo/wallet-local": "npm:^5.1.2" "@types/debug": "npm:^4.1.10" @@ -1493,7 +1493,14 @@ __metadata: languageName: unknown linkType: soft -"@celo/odis-identifiers@npm:^1.0.0, @celo/odis-identifiers@workspace:packages/odis-identifiers": +"@celo/odis-identifiers@npm:^1.0.0": + version: 1.0.0 + resolution: "@celo/odis-identifiers@npm:1.0.0" + checksum: 10/e00b54199288257c0b7b4dc2c6b1edb82bf01175269e38862ba400bbf5d1a39e506e1faa6a6b55828450a959d2ca2bc18c6a51ab886e971e881f9b09c660a74e + languageName: node + linkType: hard + +"@celo/odis-identifiers@npm:^1.0.1-beta.0, @celo/odis-identifiers@workspace:packages/odis-identifiers": version: 0.0.0-use.local resolution: "@celo/odis-identifiers@workspace:packages/odis-identifiers" dependencies: @@ -1507,9 +1514,9 @@ __metadata: dependencies: "@celo/base": "npm:^6.0.0" "@celo/contractkit": "npm:^7.1.0" - "@celo/encrypted-backup": "npm:^5.0.5" - "@celo/identity": "npm:^5.1.1" - "@celo/phone-number-privacy-common": "npm:^3.1.1" + "@celo/encrypted-backup": "npm:^5.0.6-beta.0" + "@celo/identity": "npm:^5.1.2-beta.0" + "@celo/phone-number-privacy-common": "npm:^3.1.2-beta.0" "@celo/phone-number-privacy-signer": "workspace:^" "@celo/poprf": "npm:^0.1.9" "@celo/utils": "npm:^6.0.0" @@ -1545,7 +1552,37 @@ __metadata: languageName: unknown linkType: soft -"@celo/phone-number-privacy-common@npm:^3.0.3, @celo/phone-number-privacy-common@npm:^3.1.1, @celo/phone-number-privacy-common@workspace:packages/common": +"@celo/phone-number-privacy-common@npm:^3.0.3": + version: 3.1.1 + resolution: "@celo/phone-number-privacy-common@npm:3.1.1" + dependencies: + "@celo/base": "npm:^5.0.5" + "@celo/contractkit": "npm:^5.1.0" + "@celo/utils": "npm:^5.0.5" + "@opentelemetry/api": "npm:^1.6.0" + "@opentelemetry/auto-instrumentations-node": "npm:^0.39.4" + "@opentelemetry/propagator-ot-trace": "npm:^0.27.0" + "@opentelemetry/sdk-metrics": "npm:^1.17.1" + "@opentelemetry/sdk-node": "npm:^0.44.0" + "@opentelemetry/sdk-trace-web": "npm:^1.17.1" + "@opentelemetry/semantic-conventions": "npm:^1.17.1" + "@types/bunyan": "npm:1.8.10" + bignumber.js: "npm:^9.1.2" + bunyan: "npm:1.8.15" + bunyan-debug-stream: "npm:2.0.0" + bunyan-gke-stackdriver: "npm:0.1.2" + dotenv: "npm:^8.2.0" + elliptic: "npm:^6.5.4" + express: "npm:^4.17.6" + fp-ts: "npm:2.1.1" + io-ts: "npm:2.0.1" + is-base64: "npm:^1.1.0" + node-fetch: "npm:^2.6.9" + checksum: 10/6c36f52d2fb37cf7f2e23c399763a97f8fff9e99209a73fb297f07385c9b652dec36f56d36b8b092d3174398be5873f9eb3689a7300ced6e7fdfc4d9b1be0ba7 + languageName: node + linkType: hard + +"@celo/phone-number-privacy-common@npm:^3.1.2-beta.0, @celo/phone-number-privacy-common@workspace:packages/common": version: 0.0.0-use.local resolution: "@celo/phone-number-privacy-common@workspace:packages/common" dependencies: @@ -1581,9 +1618,9 @@ __metadata: "@celo/base": "npm:^6.0.0" "@celo/contractkit": "npm:^7.1.0" "@celo/cryptographic-utils": "npm:^5.0.7" - "@celo/encrypted-backup": "npm:^5.0.5" - "@celo/identity": "npm:^5.1.1" - "@celo/phone-number-privacy-common": "npm:^3.1.1" + "@celo/encrypted-backup": "npm:^5.0.6-beta.0" + "@celo/identity": "npm:^5.1.2-beta.0" + "@celo/phone-number-privacy-common": "npm:^3.1.2-beta.0" "@celo/utils": "npm:^6.0.0" "@celo/wallet-local": "npm:^5.1.2" firebase-admin: "npm:^11.11.0" @@ -1602,7 +1639,7 @@ __metadata: dependencies: "@celo/base": "npm:^6.0.0" "@celo/contractkit": "npm:^7.1.0" - "@celo/phone-number-privacy-common": "npm:^3.1.1" + "@celo/phone-number-privacy-common": "npm:^3.1.2-beta.0" "@celo/poprf": "npm:^0.1.9" "@celo/utils": "npm:^6.0.0" "@celo/wallet-hsm-azure": "npm:^5.1.2" @@ -1653,7 +1690,7 @@ __metadata: languageName: node linkType: hard -"@celo/utils@npm:^5.0.4, @celo/utils@npm:^5.0.6": +"@celo/utils@npm:^5.0.4, @celo/utils@npm:^5.0.5, @celo/utils@npm:^5.0.6": version: 5.0.6 resolution: "@celo/utils@npm:5.0.6" dependencies: @@ -15744,7 +15781,7 @@ __metadata: resolution: "odis-example-scripts@workspace:docs/examples" dependencies: "@celo/base": "npm:^6.0.0" - "@celo/identity": "npm:^5.1.1" + "@celo/identity": "npm:^5.1.2-beta.0" blind-threshold-bls: "https://github.com/celo-org/blind-threshold-bls-wasm#3d1013a" ethers: "npm:^5.7.2" prettier: "npm:2.7.1" From 9a682bee5b0c28fa778cfe413fc27d4ae4b5a34d Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 12 Mar 2024 11:11:15 -0400 Subject: [PATCH 05/14] add NPM static secret path --- .github/workflows/release.yml | 1 + .vscode/settings.json | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 196398369..1e14f833b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,6 +31,7 @@ jobs: with: api-url: https://api.gateway.akeyless.celo-networks-dev.org access-id: p-kf9vjzruht6l + static-secrets: '{"/static-secrets/NPM/npm-publish-token":"NPM_TOKEN"}' - name: Checkout Repo uses: actions/checkout@v4 diff --git a/.vscode/settings.json b/.vscode/settings.json index ed8cd1865..c461df645 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -25,19 +25,19 @@ "[javascriptreact]": { "editor.formatOnSave": true, "editor.codeActionsOnSave": { - "source.organizeImports": true + "source.organizeImports": "explicit" } }, "[typescript]": { "editor.formatOnSave": true, "editor.codeActionsOnSave": { - "source.organizeImports": true + "source.organizeImports": "explicit" } }, "[typescriptreact]": { "editor.formatOnSave": true, "editor.codeActionsOnSave": { - "source.organizeImports": true + "source.organizeImports": "explicit" } }, "javascript.format.enable": false, From 409475bde364b3ee9095f9da022830aed94f3b0d Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 12 Mar 2024 11:27:20 -0400 Subject: [PATCH 06/14] ++ repository url --- packages/common/package.json | 1 + packages/odis-identifiers/package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/common/package.json b/packages/common/package.json index 4c483138f..421796431 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -6,6 +6,7 @@ "license": "Apache-2.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", + "repository": "https://github.com/celo-org/social-connect/tree/main/packages/common", "scripts": { "prepublish": "yarn build", "build": "yarn run --top-level tsc ", diff --git a/packages/odis-identifiers/package.json b/packages/odis-identifiers/package.json index eb7bc11b6..fae182097 100644 --- a/packages/odis-identifiers/package.json +++ b/packages/odis-identifiers/package.json @@ -4,7 +4,7 @@ "license": "Apache-2.0", "version": "1.0.1-beta.0", "description": "ODIS Identifier Prefixes and functions to hash identifiers", - "repository": "https://github.com/celo-org/social-connect", + "repository": "https://github.com/celo-org/social-connect/tree/main/packages/odis-identifiers", "main": "./lib/index.js", "types": "./lib/index.d.ts", "scripts": { From b3a5beca98d4e561c0ab73366bb383e6798eca9b Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 13 Mar 2024 10:28:44 -0400 Subject: [PATCH 07/14] updated tag to point to PR head SHA --- .github/workflows/odis-combiner-container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/odis-combiner-container.yml b/.github/workflows/odis-combiner-container.yml index d6fdaf2eb..3c2b1059d 100644 --- a/.github/workflows/odis-combiner-container.yml +++ b/.github/workflows/odis-combiner-container.yml @@ -28,7 +28,7 @@ jobs: workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-social-connect/providers/github-by-repos service-account: 'social-connect-dev@devopsre.iam.gserviceaccount.com' artifact-registry: us-west1-docker.pkg.dev/devopsre/dev-images/odis-combiner - tags: ${{ github.sha }} + tags: ${{ github.event.pull_request.head.sha }} context: . file: dockerfiles/Dockerfile-combiner trivy: true From b2372c51f83427b42fb04e4c5b494b3cfe24ad13 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 13 Mar 2024 10:52:32 -0400 Subject: [PATCH 08/14] run workflow on push to prerelease branches --- .github/workflows/odis-combiner-container.yml | 1 + .github/workflows/odis-loadtest-container.yml | 1 + .github/workflows/odis-signer-container.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/odis-combiner-container.yml b/.github/workflows/odis-combiner-container.yml index 3c2b1059d..3f06f45ac 100644 --- a/.github/workflows/odis-combiner-container.yml +++ b/.github/workflows/odis-combiner-container.yml @@ -9,6 +9,7 @@ on: - 'yarn.lock' branches: - main + - 'prerelease/*' tags: - odis-combiner-.* pull_request: diff --git a/.github/workflows/odis-loadtest-container.yml b/.github/workflows/odis-loadtest-container.yml index 22ef07acd..470545dc6 100644 --- a/.github/workflows/odis-loadtest-container.yml +++ b/.github/workflows/odis-loadtest-container.yml @@ -9,6 +9,7 @@ on: - 'yarn.lock' branches: - main + - 'prerelease/*' tags: - odis-loadtest-.* pull_request: diff --git a/.github/workflows/odis-signer-container.yml b/.github/workflows/odis-signer-container.yml index 99dd7005b..3af041e28 100644 --- a/.github/workflows/odis-signer-container.yml +++ b/.github/workflows/odis-signer-container.yml @@ -9,6 +9,7 @@ on: - 'yarn.lock' branches: - main + - 'prerelease/*' tags: - odis-signer-.* pull_request: From 42eb8fd2c8a3a9396574eacb19f9fb62d3bb2cf5 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 13 Mar 2024 11:06:53 -0400 Subject: [PATCH 09/14] undo tags change --- .github/workflows/odis-combiner-container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/odis-combiner-container.yml b/.github/workflows/odis-combiner-container.yml index 3f06f45ac..1695d33c7 100644 --- a/.github/workflows/odis-combiner-container.yml +++ b/.github/workflows/odis-combiner-container.yml @@ -29,7 +29,7 @@ jobs: workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-social-connect/providers/github-by-repos service-account: 'social-connect-dev@devopsre.iam.gserviceaccount.com' artifact-registry: us-west1-docker.pkg.dev/devopsre/dev-images/odis-combiner - tags: ${{ github.event.pull_request.head.sha }} + tags: ${{ github.sha }} context: . file: dockerfiles/Dockerfile-combiner trivy: true From 4079d52d4d911fe7e37a828d28d6a00c0f7b288f Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 13 Mar 2024 11:07:16 -0400 Subject: [PATCH 10/14] force workflow run --- apps/combiner/package.json | 2 +- apps/monitor/package.json | 2 +- apps/signer/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/combiner/package.json b/apps/combiner/package.json index 327d480cc..de1b0758e 100644 --- a/apps/combiner/package.json +++ b/apps/combiner/package.json @@ -67,4 +67,4 @@ "engines": { "node": "18" } -} +} \ No newline at end of file diff --git a/apps/monitor/package.json b/apps/monitor/package.json index 4497d4bd1..d18f8fb9e 100644 --- a/apps/monitor/package.json +++ b/apps/monitor/package.json @@ -44,4 +44,4 @@ "engines": { "node": "18" } -} +} \ No newline at end of file diff --git a/apps/signer/package.json b/apps/signer/package.json index fb91c303d..54ff05a3c 100644 --- a/apps/signer/package.json +++ b/apps/signer/package.json @@ -87,4 +87,4 @@ "engines": { "node": ">=10" } -} +} \ No newline at end of file From 04938cbdbd195b91c7e75a0c70091390fab9211d Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 13 Mar 2024 11:12:52 -0400 Subject: [PATCH 11/14] test push triggered workflow --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a70d0e615..5b8330179 100644 --- a/package.json +++ b/package.json @@ -79,4 +79,4 @@ "browserify-sign": "4.2.2" }, "packageManager": "yarn@4.1.0" -} +} \ No newline at end of file From 5b9d997623d487b887879bb50dd1041de0379d9e Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 13 Mar 2024 15:04:23 -0400 Subject: [PATCH 12/14] Complete beta releasing --- .changeset/pre.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index cdc8a3073..76759eb15 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -1,5 +1,5 @@ { - "mode": "pre", + "mode": "exit", "tag": "beta", "initialVersions": { "@celo/phone-number-privacy-combiner": "3.3.2", From 0c4e403c9de4dd601303ea538b033e2a34cd8e5c Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 13 Mar 2024 15:18:10 -0400 Subject: [PATCH 13/14] ++ CS --- .changeset/wise-insects-hear.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .changeset/wise-insects-hear.md diff --git a/.changeset/wise-insects-hear.md b/.changeset/wise-insects-hear.md new file mode 100644 index 000000000..a845151cc --- /dev/null +++ b/.changeset/wise-insects-hear.md @@ -0,0 +1,2 @@ +--- +--- From dc622d73749c036a342c7f2d18f226dadb3904d8 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Thu, 14 Mar 2024 10:55:08 -0400 Subject: [PATCH 14/14] skip resolution on ci install --- .github/workflows/social-connect.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/social-connect.yml b/.github/workflows/social-connect.yml index ef73c3488..2284338a5 100644 --- a/.github/workflows/social-connect.yml +++ b/.github/workflows/social-connect.yml @@ -114,7 +114,8 @@ jobs: - name: "enable corepack" run : sudo corepack enable yarn - name: Install yarn dependencies - run: git config --global url."https://".insteadOf ssh:// && yarn install + # skip check due to YN0078: │ Invalid resolution @celo/odis-identifiers@npm:^1.0.0 → npm:1.0.0 + run: git config --global url."https://".insteadOf ssh:// && yarn install --no-check-resolutions - name: Fail if any file changed on git run: | # This fails if there is any change