Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the production-dependencies group with 26 updates #144

Merged
merged 11 commits into from
Nov 2, 2023
Merged

Bump the production-dependencies group with 26 updates #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0bc561f
Bump the production-dependencies group with 26 updates
dependabot[bot] Oct 31, 2023
e9c8c68
revert io-ts and fp-ts changes as they broke the build
aaronmgdr Oct 31, 2023
c04bbf0
try out copying packages
aaronmgdr Oct 31, 2023
18ef358
use local dependencies
aaronmgdr Oct 31, 2023
3b2ddf3
remove stale comment, update all celo deps together
aaronmgdr Oct 31, 2023
4e60413
try removing tests so we dont need to copy over signer too
aaronmgdr Oct 31, 2023
7ca01f9
try prod install so signer is not needed to be copied to the image ju…
aaronmgdr Oct 31, 2023
dd8d17c
why must i continue to do the wrong thing
aaronmgdr Oct 31, 2023
5999eb5
ok but what if we installed the root space first?
aaronmgdr Oct 31, 2023
568b821
Avoid needing to bring in signer
aaronmgdr Oct 31, 2023
d270179
there are lots of opentelemetry packages. group their updates
aaronmgdr Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .changeset/brave-hats-smoke.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
'@celo/encrypted-backup': patch
'@celo/identity': patch
'@celo/phone-number-privacy-common': patch
'@celo/phone-number-privacy-combiner': patch
'odis-example-scripts': patch
'@celo/phone-number-privacy-monitor': patch
'@celo/phone-number-privacy-signer': patch
---

Upgraded Dependencies https://github.com/celo-org/social-connect/pull/144
4 changes: 4 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ updates:
day: "monday"
interval: "weekly"
groups:
celo-dependencies:
patterns: ["^@celo/"]
open-telemetry:
patterns: ["@opentelemetry/"]
development-dependencies:
dependency-type: "development"
update-types:
Expand Down
40 changes: 20 additions & 20 deletions apps/combiner/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,31 @@
"test:e2e:mainnet": "CONTEXT_NAME=mainnet yarn test:e2e"
},
"dependencies": {
"@celo/base": "^5.0.4",
"@celo/contractkit": "^5.0.4",
"@celo/base": "^5.0.5",
"@celo/contractkit": "^5.1.0",
"@celo/encrypted-backup": "^5.0.4",
"@celo/identity": "^5.0.4",
"@celo/phone-number-privacy-common": "^3.1.0",
"@celo/poprf": "^0.1.9",
"@opentelemetry/api": "^1.4.1",
"@opentelemetry/api": "^1.6.0",
"@opentelemetry/auto-instrumentations-node": "^0.39.4",
"@opentelemetry/exporter-jaeger": "^1.15.2",
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/exporter-jaeger": "^1.17.1",
"@opentelemetry/instrumentation": "^0.44.0",
"@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-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",
"@opentelemetry/resources": "1.17.1",
"@opentelemetry/sdk-metrics": "^1.17.1",
"@opentelemetry/sdk-node": "^0.44.0",
"@opentelemetry/sdk-trace-base": "^1.17.1",
"@opentelemetry/sdk-trace-node": "1.17.1",
"@opentelemetry/sdk-trace-web": "^1.17.1",
"@opentelemetry/semantic-conventions": "^1.17.1",
"@types/bunyan": "^1.8.10",
"@types/express": "^4.17.20",
"@types/node": "18.15.13",
"@types/supertest": "^2.0.15",
"@types/uuid": "^7.0.3",
"blind-threshold-bls": "npm:@celo/[email protected]",
"bunyan": "1.8.12",
"bunyan": "1.8.15",
"dotenv": "^8.2.0",
"express": "^4.17.1",
"lru-cache": "^10.0.1",
Expand All @@ -55,12 +59,8 @@
},
"devDependencies": {
"@celo/phone-number-privacy-signer": "workspace:^",
"@celo/phone-utils": "^5.0.4",
"@celo/utils": "^5.0.4",
"@types/express": "^4.17.20",
"@types/node": "18.15.13",
"@types/supertest": "^2.0.15",
"@types/uuid": "^7.0.3",
"@celo/phone-utils": "^5.0.5",
"@celo/utils": "^5.0.5",
"jest": "^29.7.0",
"knex": "^2.1.0",
"typescript": "^5.2.2"
Expand Down
10 changes: 5 additions & 5 deletions apps/monitor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
"loadTest": "ts-node src/scripts/run-load-test.ts run"
},
"dependencies": {
"@celo/base": "^5.0.4",
"@celo/contractkit": "^5.0.4",
"@celo/cryptographic-utils": "^5.0.4",
"@celo/base": "^5.0.5",
"@celo/contractkit": "^5.1.0",
"@celo/cryptographic-utils": "^5.0.5",
"@celo/encrypted-backup": "^5.0.4",
"@celo/identity": "^5.0.4",
"@celo/phone-number-privacy-common": "^3.0.3",
"@celo/utils": "^5.0.4",
"@celo/wallet-local": "^5.0.4",
"@celo/utils": "^5.0.5",
"@celo/wallet-local": "^5.1.0",
"firebase-admin": "^9.12.0",
"firebase-functions": "^3.15.7",
"yargs": "^14.0.0"
Expand Down
36 changes: 18 additions & 18 deletions apps/signer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,30 +38,30 @@
"ssl:keygen": "./scripts/create-ssl-cert.sh"
},
"dependencies": {
"@celo/base": "^5.0.4",
"@celo/contractkit": "^5.0.4",
"@celo/base": "^5.0.5",
"@celo/contractkit": "^5.1.0",
"@celo/phone-number-privacy-common": "^3.1.0",
"@celo/poprf": "^0.1.9",
"@celo/utils": "^5.0.4",
"@celo/wallet-hsm-azure": "^5.0.4",
"@celo/utils": "^5.0.5",
"@celo/wallet-hsm-azure": "^5.1.0",
"@google-cloud/secret-manager": "3.0.0",
"@opentelemetry/api": "^1.4.1",
"@opentelemetry/api": "^1.6.0",
"@opentelemetry/auto-instrumentations-node": "^0.39.4",
"@opentelemetry/exporter-jaeger": "^1.15.2",
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/exporter-jaeger": "^1.17.1",
"@opentelemetry/instrumentation": "^0.44.0",
"@opentelemetry/propagator-ot-trace": "^0.27.0",
"@opentelemetry/resources": "1.17.0",
"@opentelemetry/sdk-metrics": "^1.15.1",
"@opentelemetry/sdk-node": "^0.41.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",
"@opentelemetry/resources": "1.17.1",
"@opentelemetry/sdk-metrics": "^1.17.1",
"@opentelemetry/sdk-node": "^0.44.0",
"@opentelemetry/sdk-trace-base": "^1.17.1",
"@opentelemetry/sdk-trace-node": "1.17.1",
"@opentelemetry/sdk-trace-web": "^1.17.1",
"@opentelemetry/semantic-conventions": "^1.17.1",
"@types/bunyan": "^1.8.10",
"aws-sdk": "^2.1484.0",
"bignumber.js": "^9.1.2",
"blind-threshold-bls": "npm:@celo/[email protected]",
"bunyan": "1.8.12",
"bunyan": "1.8.15",
"cron": "^2.4.1",
"dotenv": "^8.2.0",
"express": "^4.17.1",
Expand Down
16 changes: 10 additions & 6 deletions dockerfiles/Dockerfile-combiner
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,23 @@ COPY .yarn/releases/ .yarn/releases/
# Makes build fail if it doesn't copy git, will be removed after build
COPY .git .git

# 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
# published dependencies. Setting ONLY_PUBLISHED_DEPENDENCIES to "" will copy in all dependecies.
ARG ONLY_PUBLISHED_DEPENDENCIES=""
ARG PACKAGE_SELECTOR=${ONLY_PUBLISHED_DEPENDENCIES:+combiner}
ARG PACKAGE_SELECTOR=combiner
# COMMENT OUT THIS LINE TO USE PUBLISHED DEPENDENCIES
COPY --from=packages celo-phone-number-privacy/packages/ packages/
COPY --from=packages celo-phone-number-privacy/apps/${PACKAGE_SELECTOR} apps/${PACKAGE_SELECTOR}

# delete tests so they dont get built because signer is needed by them,
RUN rm -rf apps/combiner/test
# remove signer dep as its only used in tests and we dont want to build it
RUN yarn --cwd=apps/combiner remove @celo/phone-number-privacy-signer
# Install dependencies and build.

RUN yarn install --network-timeout 100000 --inline-builds && yarn cache clean
RUN yarn workspaces list
RUN yarn workspaces foreach -ipv --topological-dev -R --from @celo/phone-number-privacy-combiner run build

RUN yarn workspaces foreach -ipv --topological-dev -R --from @celo/phone-number-privacy-combiner run build
# once we are built trim down the dependencies
RUN yarn workspaces focus @celo/phone-number-privacy-combiner --production
RUN rm -r .git

# Setup and run the combiner application.
Expand Down
11 changes: 5 additions & 6 deletions dockerfiles/Dockerfile-loadtest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,14 @@ COPY .yarn/releases/ .yarn/releases/
# Makes build fail if it doesn't copy git, will be removed after build
COPY .git .git

# 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
# published dependencies. Setting ONLY_PUBLISHED_DEPENDENCIES to "" will copy in all dependecies.
ARG ONLY_PUBLISHED_DEPENDENCIES=""
ARG PACKAGE_SELECTOR=${ONLY_PUBLISHED_DEPENDENCIES:+apps/monitor}
ARG PACKAGE_SELECTOR=monitor
COPY --from=packages celo-phone-number-privacy/apps/${PACKAGE_SELECTOR} apps/${PACKAGE_SELECTOR}
# COMMENT OUT THIS LINE TO USE PUBLISHED DEPENDENCIES
COPY --from=packages celo-phone-number-privacy/packages packages
aaronmgdr marked this conversation as resolved.
Show resolved Hide resolved

# Install dependencies and build.
RUN yarn install --network-timeout 100000 --inline-builds && yarn cache clean

RUN yarn workspaces list
RUN yarn workspaces foreach -ipv --topological-dev -R --from @celo/phone-number-privacy-monitor run build
# clean up dev dependencies after build
RUN yarn workspaces focus @celo/phone-number-privacy-monitor --production
Expand Down
10 changes: 4 additions & 6 deletions dockerfiles/Dockerfile-signer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,13 @@ COPY .yarn/releases/ .yarn/releases/
# Makes build fail if it doesn't copy git, will be removed after build
COPY .git .git

# 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
# published dependencies. Setting ONLY_PUBLISHED_DEPENDENCIES to "" will copy in all dependecies.
ARG ONLY_PUBLISHED_DEPENDENCIES=""
ARG PACKAGE_SELECTOR=${ONLY_PUBLISHED_DEPENDENCIES:+apps/signer}
ARG PACKAGE_SELECTOR=signer
COPY --from=packages celo-phone-number-privacy/apps/${PACKAGE_SELECTOR} apps/${PACKAGE_SELECTOR}

# COMMENT OUT THIS LINE TO USE PUBLISHED DEPENDENCIES
COPY --from=packages celo-phone-number-privacy/packages packages
# Install dependencies and build. need dev deps too so we can build (tsc)
RUN yarn install --network-timeout 100000 --inline-builds && yarn cache clean
RUN yarn workspaces list
RUN yarn workspaces foreach -ipv --topological-dev -R --from @celo/phone-number-privacy-signer run build
# clean up dev dependencies after build
RUN yarn workspaces focus @celo/phone-number-privacy-signer --production
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"lint": "yarn run --top-level eslint ."
},
"dependencies": {
"@celo/base": "^5.0.4",
"@celo/base": "^5.0.5",
"@celo/identity": "^5.0.4",
"blind-threshold-bls": "https://github.com/celo-org/blind-threshold-bls-wasm#3d1013a",
"ethers": "^5.7.2",
Expand Down
28 changes: 14 additions & 14 deletions packages/common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@
"lib/**/*"
],
"dependencies": {
"@celo/base": "^5.0.4",
"@celo/contractkit": "^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",
"@celo/base": "^5.0.5",
"@celo/contractkit": "^5.1.0",
"@celo/phone-utils": "^5.0.5",
"@celo/utils": "^5.0.5",
"@opentelemetry/api": "^1.6.0",
"@opentelemetry/auto-instrumentations-node": "^0.39.4",
"@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",
"@opentelemetry/sdk-metrics": "^1.17.1",
"@opentelemetry/sdk-node": "^0.44.0",
"@opentelemetry/sdk-trace-web": "^1.17.1",
"@opentelemetry/semantic-conventions": "^1.17.1",
"@types/bunyan": "1.8.10",
"bignumber.js": "^9.1.2",
"bunyan": "1.8.15",
"bunyan-debug-stream": "2.0.0",
"bunyan-gke-stackdriver": "0.1.2",
"dotenv": "^8.2.0",
Expand All @@ -44,7 +44,7 @@
},
"devDependencies": {
"@celo/poprf": "^0.1.9",
"@celo/wallet-local": "^5.0.4",
"@celo/wallet-local": "^5.1.0",
"@types/elliptic": "^6.4.16",
"@types/express": "^4.17.20",
"@types/is-base64": "^1.1.2",
Expand Down
10 changes: 5 additions & 5 deletions packages/encrypted-backup/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
"prepublish": "yarn build"
},
"dependencies": {
"@celo/base": "^5.0.4",
"@celo/connect": "^5.0.4",
"@celo/base": "^5.0.5",
"@celo/connect": "^5.1.0",
"@celo/identity": "^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",
"@celo/utils": "^5.0.5",
"@celo/wallet-local": "^5.1.0",
"@types/debug": "^4.1.10",
"debug": "^4.1.1",
"fp-ts": "2.1.1",
"io-ts": "2.0.1"
Expand Down
12 changes: 6 additions & 6 deletions packages/identity/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"prepublish": "yarn build"
},
"dependencies": {
"@celo/base": "^5.0.4",
"@celo/contractkit": "^5.0.4",
"@celo/base": "^5.0.5",
"@celo/contractkit": "^5.1.0",
"@celo/odis-identifiers": "^1.0.0",
"@celo/phone-number-privacy-common": "^3.0.3",
"@celo/utils": "^5.0.4",
"@types/debug": "^4.1.5",
"bignumber.js": "^9.0.0",
"@celo/utils": "^5.0.5",
"@types/debug": "^4.1.10",
"bignumber.js": "^9.1.2",
"blind-threshold-bls": "npm:@celo/[email protected]",
"cross-fetch": "3.0.6",
"debug": "^4.1.1",
Expand All @@ -41,7 +41,7 @@
"devDependencies": {
"@celo/celo-devchain": "6.0.0",
"@celo/dev-utils": "0.0.1-beta.1",
"@celo/wallet-local": "^5.0.4",
"@celo/wallet-local": "^5.1.0",
"@types/elliptic": "^6.4.16",
"fetch-mock": "9.11.0",
"ganache": "npm:@celo/[email protected]",
Expand Down
Loading
Loading