Merge branch 'master' into aaronmgdr/cip64

celo-org · Sep 22, 2023 · 159793f · 159793f
2 parents 528fe77 + 5e21031
commit 159793f
Show file tree

Hide file tree

Showing 32 changed files with 133 additions and 20 deletions.
diff --git a/dependency-graph.json b/dependency-graph.json
@@ -19,6 +19,8 @@
   "@celo/celocli": {
     "location": "packages/cli",
     "dependencies": [
+      "@celo/base",
+      "@celo/connect",
       "@celo/contractkit",
       "@celo/cryptographic-utils",
       "@celo/dev-utils",
@@ -96,6 +98,7 @@
   "@celo/phone-number-privacy-monitor": {
     "location": "packages/phone-number-privacy/monitor",
     "dependencies": [
+      "@celo/base",
       "@celo/contractkit",
       "@celo/cryptographic-utils",
       "@celo/encrypted-backup",
@@ -152,10 +155,12 @@
     "location": "packages/sdk/encrypted-backup",
     "dependencies": [
       "@celo/base",
+      "@celo/connect",
       "@celo/dev-utils",
       "@celo/identity",
       "@celo/phone-number-privacy-common",
-      "@celo/utils"
+      "@celo/utils",
+      "@celo/wallet-local"
     ]
   },
   "@celo/explorer": {
@@ -246,6 +251,7 @@
   "@celo/wallet-hsm-azure": {
     "location": "packages/sdk/wallets/wallet-hsm-azure",
     "dependencies": [
+      "@celo/base",
       "@celo/connect",
       "@celo/utils",
       "@celo/wallet-base",
@@ -272,6 +278,7 @@
   "@celo/wallet-ledger": {
     "location": "packages/sdk/wallets/wallet-ledger",
     "dependencies": [
+      "@celo/base",
       "@celo/connect",
       "@celo/utils",
       "@celo/wallet-base",
@@ -297,6 +304,7 @@
   "@celo/wallet-rpc": {
     "location": "packages/sdk/wallets/wallet-rpc",
     "dependencies": [
+      "@celo/base",
       "@celo/connect",
       "@celo/contractkit",
       "@celo/dev-utils",

diff --git a/packages/celotool/tslint.json b/packages/celotool/tslint.json
@@ -4,6 +4,12 @@
     "exclude": ["**/__mocks__/**", "**/lcov-report/**"]
   },
   "rules": {
+    "no-implicit-dependencies": [
+      false,
+      [
+        "src"
+      ]
+    ],
     "no-relative-imports": false,
     "max-classes-per-file": [true, 2],
     "no-global-arrow-functions": false,

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -32,6 +32,8 @@
     "test": "TZ=UTC jest --runInBand"
   },
   "dependencies": {
+    "@celo/base": "^5.0.4",
+    "@celo/connect": "^5.0.4",
     "@celo/contractkit": "^5.0.4",
     "@celo/explorer": "^5.0.4",
     "@celo/governance": "^5.0.4",
@@ -43,6 +45,8 @@
     "@celo/wallet-ledger": "^5.0.4",
     "@celo/wallet-local": "^5.0.4",
     "@ledgerhq/hw-transport-node-hid": "^6.27.4",
+    "@oclif/parser": "^3.8.16",
+    "@oclif/errors": "^1.3.6",
     "@oclif/command": "^1.6.0",
     "@oclif/config": "^1.6.0",
     "@oclif/plugin-autocomplete": "^0.1.5",

diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
@@ -16,6 +16,7 @@
     "lint": "tslint -c tslint.json --project ."
   },
   "dependencies": {
+    "ganache": "npm:@celo/[email protected]",
     "bignumber.js": "^9.0.0",
     "web3": "1.10.0",
     "web3-core-helpers": "1.10.0",

diff --git a/packages/env-tests/package.json b/packages/env-tests/package.json
@@ -12,9 +12,11 @@
     "@celo/identity": "5.0.4",
     "@celo/phone-utils": "5.0.4",
     "@celo/cryptographic-utils": "5.0.4",
+    "bignumber.js": "^9.0.0",
     "bunyan": "1.8.12",
     "bunyan-gke-stackdriver": "0.1.2",
     "bunyan-debug-stream": "2.0.0",
+
     "dotenv": "8.2.0",
     "jest": "^29.0.2",
     "moment": "^2.29.0",
@@ -31,6 +33,7 @@
     "staging-test": "CELO_ENV=staging CELO_PROVIDER=https://staging-forno.celo-networks-dev.org jest --runInBand"
   },
   "devDependencies": {
+    "@jest/globals": "^29.5.0",
     "typescript": "4.4.3"
   }
 }
diff --git a/packages/phone-number-privacy/combiner/package.json b/packages/phone-number-privacy/combiner/package.json
@@ -36,16 +36,21 @@
     "@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/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/sdk-trace-node": "1.15.2",
     "@opentelemetry/sdk-trace-base": "^1.17.0",
     "@opentelemetry/semantic-conventions": "^1.15.2",
     "blind-threshold-bls": "npm:@celo/[email protected]",
     "dotenv": "^8.2.0",
+    "io-ts": "2.0.1",
+    "bunyan": "1.8.12",
     "express": "^4.17.1",
     "firebase-admin": "^11.10.1",
     "firebase-functions": "^4.4.1",

diff --git a/packages/phone-number-privacy/combiner/tslint.json b/packages/phone-number-privacy/combiner/tslint.json
@@ -1,7 +1,13 @@
 {
   "extends": ["@celo/typescript/tslint.json"],
   "rules": {
+    "no-implicit-dependencies": [
+      true,
+      [
+        "node:assert"
+      ]
+    ],
     "no-global-arrow-functions": false,
-    "no-console": true 
+    "no-console": true
   }
 }
diff --git a/packages/phone-number-privacy/common/package.json b/packages/phone-number-privacy/common/package.json
@@ -30,6 +30,9 @@
     "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",
     "is-base64": "^1.1.0",
     "@opentelemetry/api": "^1.4.1",
     "@opentelemetry/auto-instrumentations-node": "^0.38.0",

diff --git a/packages/phone-number-privacy/monitor/package.json b/packages/phone-number-privacy/monitor/package.json
@@ -22,13 +22,15 @@
     "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/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",
     "firebase-admin": "^9.12.0",
     "firebase-functions": "^3.15.7"
   },

diff --git a/packages/phone-number-privacy/signer/package.json b/packages/phone-number-privacy/signer/package.json
@@ -38,6 +38,8 @@
   },
   "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",
@@ -48,9 +50,14 @@
     "@opentelemetry/api": "^1.4.1",
     "@opentelemetry/auto-instrumentations-node": "^0.38.0",
     "@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",
     "@types/bunyan": "^1.8.8",
     "aws-sdk": "^2.705.0",

diff --git a/packages/phone-number-privacy/signer/src/tracing.ts b/packages/phone-number-privacy/signer/src/tracing.ts
@@ -9,8 +9,7 @@ import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentation
 import { JaegerExporter } from '@opentelemetry/exporter-jaeger'
 import { registerInstrumentations } from '@opentelemetry/instrumentation'
 import { Resource } from '@opentelemetry/resources'
-import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base'
-import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'
+import { BatchSpanProcessor, NodeTracerProvider } from '@opentelemetry/sdk-trace-node'
 /*
   Some instrumentations included in auto-instrumentations-node:
   - https://www.npmjs.com/package/@opentelemetry/sdk-trace-web
@@ -67,7 +66,7 @@ const resource = Resource.default().merge(
   new Resource({
     [SemanticResourceAttributes.SERVICE_NAME]: process.env.TRACING_SERVICE_NAME,
     // 'testing-signer-tracing',
-    [SemanticResourceAttributes.SERVICE_VERSION]: '0.1.0',
+    [SemanticResourceAttributes.SERVICE_VERSION]: '0.1.0', // should be the same as package.json version?
   })
 )
 

diff --git a/packages/phone-number-privacy/signer/tslint.json b/packages/phone-number-privacy/signer/tslint.json
@@ -1,7 +1,8 @@
 {
   "extends": ["@celo/typescript/tslint.json"],
   "rules": {
+    "no-implicit-dependencies": [true, ["node:http"]],
     "no-global-arrow-functions": false,
-    "no-console": true 
+    "no-console": true
   }
 }
diff --git a/packages/protocol/tslint.json b/packages/protocol/tslint.json
@@ -5,6 +5,7 @@
     "exclude": ["types/contracts/*", "lib/**"]
   },
   "rules": {
+    "no-implicit-dependencies": false,
     "no-global-arrow-functions": false,
     "no-floating-promises": true,
     "no-string-literal": false,

diff --git a/packages/sdk/connect/package.json b/packages/sdk/connect/package.json
@@ -22,21 +22,22 @@
     "prepublishOnly": "yarn build"
   },
   "dependencies": {
+    "@ethereumjs/util": "8.0.5",
     "@types/debug": "^4.1.5",
     "@types/utf8": "^2.1.6",
     "@celo/base": "5.0.4",
     "@celo/utils": "5.0.4",
     "bignumber.js": "^9.0.0",
     "debug": "^4.1.1",
-    "utf8": "3.0.0"
-  },
-  "devDependencies": {
-    "web3": "1.10.0",
+    "utf8": "3.0.0",
     "web3-core": "1.10.0",
     "web3-eth": "1.10.0",
-    "web3-eth-abi": "1.10.0",
     "web3-eth-contract": "1.10.0"
   },
+  "devDependencies": {
+    "web3": "1.10.0",
+    "web3-eth-abi": "1.10.0"
+  },
   "peerDependencies": {
     "web3": "1.10.0"
   },

diff --git a/packages/sdk/contractkit/package.json b/packages/sdk/contractkit/package.json
@@ -52,6 +52,7 @@
     "fetch-mock": "9.10.4",
     "ganache": "npm:@celo/[email protected]",
     "jest": "^29.0.2",
+    "bn.js": "^5.1.0",
     "ts-node": "8.3.0",
     "typedoc": "^0.19.2",
     "typedoc-plugin-markdown": "^2.2.16",

diff --git a/packages/sdk/contractkit/src/wrappers/Accounts.ts b/packages/sdk/contractkit/src/wrappers/Accounts.ts
@@ -8,7 +8,7 @@ import {
 } from '@celo/utils/lib/signatureUtils'
 import { soliditySha3 } from '@celo/utils/lib/solidity'
 import { authorizeSigner as buildAuthorizeSignerTypedData } from '@celo/utils/lib/typed-data-constructors'
-import BN from 'bn.js' // just the types
+import type BN from 'bn.js' // just the types
 import { Accounts } from '../generated/Accounts'
 import { newContractVersion } from '../versions'
 import {

diff --git a/packages/sdk/encrypted-backup/package.json b/packages/sdk/encrypted-backup/package.json
@@ -25,8 +25,10 @@
     "prepublishOnly": "yarn build"
   },
   "dependencies": {
+    "@celo/connect": "5.0.4",
     "@celo/base": "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",

diff --git a/packages/sdk/explorer/package.json b/packages/sdk/explorer/package.json
@@ -28,6 +28,7 @@
     "@celo/utils": "5.0.4",
     "@types/debug": "^4.1.5",
     "cross-fetch": "3.0.6",
+    "bignumber.js": "9.0.0",
     "debug": "^4.1.1"
   },
   "devDependencies": {

diff --git a/packages/sdk/governance/package.json b/packages/sdk/governance/package.json
@@ -30,6 +30,7 @@
     "@types/debug": "^4.1.5",
     "@types/inquirer": "^6.5.0",
     "debug": "^4.1.1",
+    "bignumber.js": "^9.0.0",
     "ethereum-cryptography": "1.2.0",
     "inquirer": "^7.0.5"
   },

diff --git a/packages/sdk/phone-utils/package.json b/packages/sdk/phone-utils/package.json
@@ -30,7 +30,8 @@
     "country-data": "^0.0.31",
     "fp-ts": "2.1.1",
     "google-libphonenumber": "^3.2.27",
-    "io-ts": "2.0.1"
+    "io-ts": "2.0.1",
+    "web3-utils": "^1.10.0"
   },
   "devDependencies": {
     "@celo/typescript": "0.0.1"

diff --git a/packages/sdk/utils/package.json b/packages/sdk/utils/package.json
@@ -24,13 +24,16 @@
   "dependencies": {
     "@celo/base": "5.0.4",
     "@ethereumjs/util": "8.0.5",
+    "rlp": "^2.2.4",
     "@types/bn.js": "^5.1.0",
     "@types/elliptic": "^6.4.9",
     "@types/node": "^18.7.16",
     "bignumber.js": "^9.0.0",
     "elliptic": "^6.5.4",
     "ethereum-cryptography": "1.2.0",
+    "bn.js": "4.11.9",
     "io-ts": "2.0.1",
+    "fp-ts": "2.1.1",
     "web3-eth-abi": "1.10.0",
     "web3-utils": "1.10.0"
   },

diff --git a/packages/sdk/wallets/wallet-base/package.json b/packages/sdk/wallets/wallet-base/package.json
@@ -29,12 +29,14 @@
     "@celo/base": "5.0.4",
     "@celo/utils": "5.0.4",
     "@ethereumjs/util": "8.0.5",
+    "@ethereumjs/rlp": "^5.0.0",
     "ethereum-cryptography": "^2.1.2",
     "@types/debug": "^4.1.5",
     "bignumber.js": "^9.0.0",
     "web3-eth-accounts": "1.10.0",
     "debug": "^4.1.1",
-    "eth-lib": "^0.2.8"
+    "eth-lib": "^0.2.8",
+    "web3": "1.10.0"
   },
   "engines": {
     "node": ">=8.14.2"

diff --git a/packages/sdk/wallets/wallet-hsm-aws/package.json b/packages/sdk/wallets/wallet-hsm-aws/package.json
@@ -38,6 +38,7 @@
   "devDependencies": {
     "@celo/connect": "5.0.4",
     "elliptic": "^6.5.4",
+    "dotenv": "^8.2.0",
     "web3": "1.10.0"
   },
   "engines": {

diff --git a/packages/sdk/wallets/wallet-hsm-azure/package.json b/packages/sdk/wallets/wallet-hsm-azure/package.json
@@ -25,6 +25,7 @@
     "@azure/identity": "^1.1.0",
     "@azure/keyvault-keys": "^4.1.0",
     "@azure/keyvault-secrets": "^4.1.0",
+    "@celo/base": "5.0.4",
     "@celo/utils": "5.0.4",
     "@celo/wallet-base": "5.0.4",
     "@celo/wallet-remote": "5.0.4",

diff --git a/packages/sdk/wallets/wallet-hsm-gcp/package.json b/packages/sdk/wallets/wallet-hsm-gcp/package.json
@@ -36,6 +36,7 @@
   "devDependencies": {
     "@celo/connect": "5.0.4",
     "elliptic": "^6.5.4",
+    "dotenv": "^8.2.0",
     "web3": "1.10.0"
   },
   "engines": {

diff --git a/packages/sdk/wallets/wallet-hsm/package.json b/packages/sdk/wallets/wallet-hsm/package.json
@@ -29,9 +29,13 @@
     "eth-lib": "^0.2.8",
     "@ethereumjs/util": "8.0.5",
     "asn1js": "^2.0.26",
+    "bignumber.js": "^9.0.0",
     "elliptic": "^6.5.4",
     "secp256k1": "^4.0.0"
   },
+  "devDependencies": {
+    "dotenv": "^8.2.0"
+  },
   "engines": {
     "node": ">=8.14.2"
   }