Merge branch 'master' into martinvol-patch-4

.github/workflows/container-all-monorepo.yml

@@ -25,6 +25,7 @@ jobs:
       tag: ${{ github.sha }}
       context: .
       file: dockerfiles/all-monorepo/Dockerfile
+      trivy: true
 
   celomonorepo-build:
     uses: celo-org/reusable-workflows/.github/workflows/[email protected]
@@ -38,3 +39,4 @@ jobs:
       tag: ${{ github.sha }}
       context: .
       file: dockerfiles/all-monorepo/Dockerfile
+      trivy: true

.github/workflows/container-celotool.yml

@@ -25,6 +25,7 @@ jobs:
       tag: ${{ github.sha }}
       context: .
       file: dockerfiles/celotool/Dockerfile
+      trivy: true
 
   celotool-build:
     uses: celo-org/reusable-workflows/.github/workflows/[email protected]
@@ -38,3 +39,4 @@ jobs:
       tag: ${{ github.sha }}
       context: .
       file: dockerfiles/celotool/Dockerfile
+      trivy: true

.github/workflows/container-circleci.yml

@@ -47,6 +47,7 @@ jobs:
       artifact-registry: us-west1-docker.pkg.dev/devopsre/dev-images/circleci-geth
       tag: testing
       context: dockerfiles/circleci
+      trivy: true
 
   geth-build:
     uses: celo-org/reusable-workflows/.github/workflows/[email protected]
@@ -61,6 +62,7 @@ jobs:
       artifact-registry: us-west1-docker.pkg.dev/devopsre/celo-monorepo/circleci-geth
       tag: latest
       context: dockerfiles/circleci
+      trivy: true
 
   node12-build-dev:
     uses: celo-org/reusable-workflows/.github/workflows/[email protected]
@@ -75,6 +77,7 @@ jobs:
       artifact-registry: us-west1-docker.pkg.dev/devopsre/dev-images/circleci-node12
       tag: testing
       context: dockerfiles/circleci
+      trivy: true
 
   node12-build:
     uses: celo-org/reusable-workflows/.github/workflows/[email protected]
@@ -89,4 +92,5 @@ jobs:
       artifact-registry: us-west1-docker.pkg.dev/devopsre/celo-monorepo/circleci-node12
       tag: latest
       context: dockerfiles/circleci
+      trivy: true
 

.github/workflows/container-cli.yml

@@ -25,6 +25,7 @@ jobs:
       tag: testing
       context: .
       file: dockerfiles/cli-standalone/Dockerfile
+      trivy: true
 
   celocli-build:
     uses: celo-org/reusable-workflows/.github/workflows/[email protected]
@@ -38,3 +39,4 @@ jobs:
       tag: latest
       context: .
       file: dockerfiles/cli-standalone/Dockerfile
+      trivy: true

.vscode/settings.json

@@ -43,5 +43,6 @@
   "javascript.format.enable": false,
   "editor.tabSize": 2,
   "editor.detectIndentation": false,
-  "tslint.jsEnable": true
+  "tslint.jsEnable": true,
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

dependency-graph.json

@@ -78,7 +78,6 @@
       "@celo/encrypted-backup",
       "@celo/identity",
       "@celo/phone-number-privacy-common",
-      "@celo/phone-number-privacy-signer",
       "@celo/phone-utils",
       "@celo/utils"
     ]

packages/celotool/package.json

@@ -6,18 +6,18 @@
   "author": "Celo",
   "license": "Apache-2.0",
   "dependencies": {
-    "@celo/base": "4.1.1-dev",
-    "@celo/connect": "4.1.1-dev",
-    "@celo/cryptographic-utils": "4.1.1-dev",
-    "@celo/contractkit": "4.1.1-dev",
+    "@celo/base": "4.1.2-dev",
+    "@celo/connect": "4.1.2-dev",
+    "@celo/cryptographic-utils": "4.1.2-dev",
+    "@celo/contractkit": "4.1.2-dev",
     "@celo/env-tests": "1.0.0",
-    "@celo/explorer": "4.1.1-dev",
-    "@celo/governance": "4.1.1-dev",
-    "@celo/identity": "4.1.1-dev",
-    "@celo/network-utils": "4.1.1-dev",
-    "@celo/utils": "4.1.1-dev",
+    "@celo/explorer": "4.1.2-dev",
+    "@celo/governance": "4.1.2-dev",
+    "@celo/identity": "4.1.2-dev",
+    "@celo/network-utils": "4.1.2-dev",
+    "@celo/utils": "4.1.2-dev",
     "@ethereumjs/util": "8.0.5",
-    "@ethereumjs/rlp":"4.0.1",
+    "@ethereumjs/rlp": "4.0.1",
     "@google-cloud/monitoring": "0.7.1",
     "@google-cloud/pubsub": "^0.28.1",
     "@google-cloud/secret-manager": "3.0.0",
@@ -66,4 +66,4 @@
     "build": "tsc -b ."
   },
   "private": true
-}
+}

packages/cli/package.json

@@ -35,16 +35,16 @@
   },
   "dependencies": {
     "@celo/bls12377js": "0.1.1",
-    "@celo/contractkit": "^4.1.1-dev",
-    "@celo/explorer": "^4.1.1-dev",
-    "@celo/governance": "^4.1.1-dev",
-    "@celo/identity": "^4.1.1-dev",
-    "@celo/phone-utils": "^4.1.1-dev",
-    "@celo/utils": "^4.1.1-dev",
-    "@celo/cryptographic-utils": "^4.1.1-dev",
-    "@celo/wallet-hsm-azure": "^4.1.1-dev",
-    "@celo/wallet-ledger": "^4.1.1-dev",
-    "@celo/wallet-local": "^4.1.1-dev",
+    "@celo/contractkit": "^4.1.2-dev",
+    "@celo/explorer": "^4.1.2-dev",
+    "@celo/governance": "^4.1.2-dev",
+    "@celo/identity": "^4.1.2-dev",
+    "@celo/phone-utils": "^4.1.2-dev",
+    "@celo/utils": "^4.1.2-dev",
+    "@celo/cryptographic-utils": "^4.1.2-dev",
+    "@celo/wallet-hsm-azure": "^4.1.2-dev",
+    "@celo/wallet-ledger": "^4.1.2-dev",
+    "@celo/wallet-local": "^4.1.2-dev",
     "@ledgerhq/hw-transport-node-hid": "^6.27.4",
     "@oclif/command": "^1.6.0",
     "@oclif/config": "^1.6.0",

packages/env-tests/package.json

@@ -5,13 +5,13 @@
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@celo/contractkit": "4.1.1-dev",
-    "@celo/utils": "4.1.1-dev",
-    "@celo/base": "4.1.1-dev",
-    "@celo/connect": "4.1.1-dev",
-    "@celo/identity": "4.1.1-dev",
-    "@celo/phone-utils": "4.1.1-dev",
-    "@celo/cryptographic-utils": "4.1.1-dev",
+    "@celo/contractkit": "4.1.2-dev",
+    "@celo/utils": "4.1.2-dev",
+    "@celo/base": "4.1.2-dev",
+    "@celo/connect": "4.1.2-dev",
+    "@celo/identity": "4.1.2-dev",
+    "@celo/phone-utils": "4.1.2-dev",
+    "@celo/cryptographic-utils": "4.1.2-dev",
     "bunyan": "1.8.12",
     "bunyan-gke-stackdriver": "0.1.2",
     "bunyan-debug-stream": "2.0.0",

packages/metadata-crawler/package.json

@@ -9,9 +9,9 @@
   "homepage": "https://github.com/celo-org/celo-monorepo/tree/master/packages/metadata-crawler",
   "repository": "https://github.com/celo-org/celo-monorepo/tree/master/packages/metadata-crawler",
   "dependencies": {
-    "@celo/connect": "4.1.1-dev",
-    "@celo/contractkit": "4.1.1-dev",
-    "@celo/utils": "4.1.1-dev",
+    "@celo/connect": "4.1.2-dev",
+    "@celo/contractkit": "4.1.2-dev",
+    "@celo/utils": "4.1.2-dev",
     "@types/pg": "^7.14.3",
     "bunyan": "1.8.12",
     "bunyan-gke-stackdriver": "0.1.2",
@@ -34,4 +34,4 @@
     "clean:all": "yarn clean && rm -rf lib"
   },
   "private": true
-}
+}

packages/phone-number-privacy/TODO.md

@@ -0,0 +1,9 @@
+# TODO
+
+- Add caching to Combiner 
+- Fix Combiner e2e tests
+- Fix types in errorResult and sendFailure so we don't have to use ANY in Signer
+- Refactor domain sign handler to use db transactions properly
+- refactor authorization function with the new account model
+- Make caching config parameters configurable by environment
+- TODO comments

packages/phone-number-privacy/combiner/.env

@@ -6,3 +6,7 @@ SERVICE_NAME='odis-combiner'
 # For e2e Tests
 ODIS_BLOCKCHAIN_PROVIDER=https://alfajores-forno.celo-testnet.org
 CONTEXT_NAME='alfajores'
+# TODO investigate why these are defined here 
+NODE_OPTIONS='--require ./dist/tracing.js'
+TRACER_ENDPOINT='https://grafana-agent.staging-odis2-centralus.celo-networks-dev.org/api/traces'
+TRACING_SERVICE_NAME='odis-combiner-staging'

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

@@ -1,6 +1,6 @@
 {
   "name": "@celo/phone-number-privacy-combiner",
-  "version": "3.0.0-dev",
+  "version": "3.0.0-beta.8-dev",
   "description": "Orchestrates and combines threshold signatures for use in ODIS",
   "author": "Celo",
   "license": "Apache-2.0",
@@ -28,12 +28,20 @@
     "test:e2e:alfajores": "CONTEXT_NAME=alfajores yarn test:e2e"
   },
   "dependencies": {
-    "@celo/contractkit": "^4.1.1-dev",
-    "@celo/phone-number-privacy-common": "^3.0.0-dev",
-    "@celo/identity": "^4.1.1-dev",
-    "@celo/encrypted-backup": "^4.1.1-dev",
+    "@celo/contractkit": "^4.1.2-dev",
+    "@celo/phone-number-privacy-common": "^3.0.1-dev",
+    "@celo/identity": "^4.1.2-dev",
+    "@celo/encrypted-backup": "^4.1.2-dev",
     "@celo/poprf": "^0.1.9",
     "@types/bunyan": "^1.8.8",
+    "@opentelemetry/api": "^1.4.1",
+    "@opentelemetry/auto-instrumentations-node": "^0.38.0",
+    "@opentelemetry/exporter-jaeger": "^1.15.2",
+    "@opentelemetry/propagator-ot-trace": "^0.27.0",
+    "@opentelemetry/sdk-metrics": "^1.15.2",
+    "@opentelemetry/sdk-node": "^0.41.2",
+    "@opentelemetry/sdk-trace-web": "^1.15.2",
+    "@opentelemetry/semantic-conventions": "^1.15.2",
     "blind-threshold-bls": "https://github.com/celo-org/blind-threshold-bls-wasm#e1e2f8a",
     "dotenv": "^8.2.0",
     "express": "^4.17.1",
@@ -45,18 +53,16 @@
     "uuid": "^7.0.3"
   },
   "devDependencies": {
-    "@celo/utils": "^4.1.1-dev",
-    "@celo/phone-utils": "^4.1.1-dev",
+    "@types/node": "18.15.13",
+    "@celo/utils": "^4.1.2-dev",
+    "@celo/phone-utils": "^4.1.2-dev",
     "@types/express": "^4.17.6",
     "@types/supertest": "^2.0.12",
     "@types/uuid": "^7.0.3",
     "firebase-functions-test": "^3.1.0",
     "firebase-tools": "12.4.7"
   },
-  "peerDependencies": {
-    "@celo/phone-number-privacy-signer": "^3.0.0-dev"
-  },
   "engines": {
-    "node": ">=18"
+    "node": "18"
   }
-}
+}