map blind to celo blind to avoid a conflict (and maybe fix all the er…

…rors :)
celo-org · Sep 19, 2023 · 37942ba · 37942ba
1 parent 4e0ed0b
commit 37942ba
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/packages/phone-number-privacy/combiner/package.json b/packages/phone-number-privacy/combiner/package.json
@@ -44,7 +44,7 @@
     "@opentelemetry/sdk-trace-web": "^1.15.2",
     "@opentelemetry/sdk-trace-base": "^1.17.0",
     "@opentelemetry/semantic-conventions": "^1.15.2",
-    "@celo/blind-threshold-bls": "1.0.0-beta",
+    "blind-threshold-bls": "npm:@celo/blind-threshold-bls@1.0.0-beta",
     "dotenv": "^8.2.0",
     "express": "^4.17.1",
     "firebase-admin": "^11.10.1",

diff --git a/packages/phone-number-privacy/combiner/src/common/crypto-clients/bls-crypto-client.ts b/packages/phone-number-privacy/combiner/src/common/crypto-clients/bls-crypto-client.ts
@@ -1,5 +1,5 @@
-import threshold_bls from '@celo/blind-threshold-bls'
 import { ErrorMessage } from '@celo/phone-number-privacy-common'
+import threshold_bls from 'blind-threshold-bls'
 import Logger from 'bunyan'
 import { CryptoClient, ServicePartialSignature } from './crypto-client'
 

diff --git a/packages/phone-number-privacy/combiner/test/end-to-end/pnp.test.ts b/packages/phone-number-privacy/combiner/test/end-to-end/pnp.test.ts
@@ -1,5 +1,4 @@
 import { sleep } from '@celo/base'
-import threshold_bls from '@celo/blind-threshold-bls'
 import { StableToken } from '@celo/contractkit'
 import { OdisUtils } from '@celo/identity'
 import { ErrorMessages, getServiceContext, OdisAPI } from '@celo/identity/lib/odis/query'
@@ -12,6 +11,7 @@ import {
   SignMessageResponseSchema,
 } from '@celo/phone-number-privacy-common'
 import { normalizeAddressWith0x } from '@celo/utils/lib/address'
+import threshold_bls from 'blind-threshold-bls'
 import { randomBytes } from 'crypto'
 import 'isomorphic-fetch'
 import { config as signerConfig } from '../../../signer/src/config'

diff --git a/packages/phone-number-privacy/combiner/test/integration/pnp.test.ts b/packages/phone-number-privacy/combiner/test/integration/pnp.test.ts
@@ -1,4 +1,3 @@
-import threshold_bls from '@celo/blind-threshold-bls'
 import { newKit } from '@celo/contractkit'
 import {
   AuthenticationMethod,
@@ -33,6 +32,7 @@ import {
 } from '@celo/phone-number-privacy-signer/dist/config'
 import { startSigner } from '@celo/phone-number-privacy-signer/dist/server'
 import BigNumber from 'bignumber.js'
+import threshold_bls from 'blind-threshold-bls'
 import { Server } from 'http'
 import { Server as HttpsServer } from 'https'
 import { Knex } from 'knex'

diff --git a/packages/phone-number-privacy/combiner/test/unit/bls-signature.test.ts b/packages/phone-number-privacy/combiner/test/unit/bls-signature.test.ts
@@ -1,5 +1,5 @@
-import threshold_bls from '@celo/blind-threshold-bls'
 import { KeyVersionInfo, rootLogger } from '@celo/phone-number-privacy-common'
+import threshold_bls from 'blind-threshold-bls'
 import { BLSCryptographyClient } from '../../src/common/crypto-clients/bls-crypto-client'
 import { ServicePartialSignature } from '../../src/common/crypto-clients/crypto-client'
 import config from '../../src/config'

diff --git a/packages/phone-number-privacy/combiner/test/utils.ts b/packages/phone-number-privacy/combiner/test/utils.ts
@@ -1,4 +1,4 @@
-import threshold_bls from '@celo/blind-threshold-bls'
+import threshold_bls from 'blind-threshold-bls'
 import { Server } from 'http'
 import { Server as HttpsServer } from 'https'
 

diff --git a/packages/phone-number-privacy/signer/package.json b/packages/phone-number-privacy/signer/package.json
@@ -38,6 +38,7 @@
   },
   "dependencies": {
     "@celo/base": "^5.0.3-dev",
+    "blind-threshold-bls": "npm:@celo/[email protected]",
     "@celo/contractkit": "^5.0.3-dev",
     "@celo/phone-number-privacy-common": "^3.0.4-dev",
     "@celo/poprf": "^0.1.9",
@@ -53,7 +54,6 @@
     "@opentelemetry/sdk-trace-web": "^1.15.1",
     "@types/bunyan": "^1.8.8",
     "aws-sdk": "^2.705.0",
-    "@celo/blind-threshold-bls": "1.0.0-beta",
     "dotenv": "^8.2.0",
     "express": "^4.17.1",
     "knex": "^2.1.0",

diff --git a/packages/phone-number-privacy/signer/scripts/threshold-bls-keygen.ts b/packages/phone-number-privacy/signer/scripts/threshold-bls-keygen.ts
@@ -1,5 +1,5 @@
 // tslint:disable: no-console
-import threshold_bls from '@celo/blind-threshold-bls'
+import threshold_bls from 'blind-threshold-bls'
 import crypto from 'crypto'
 
 const t = 2

diff --git a/packages/phone-number-privacy/signer/src/common/bls/bls-cryptography-client.ts b/packages/phone-number-privacy/signer/src/common/bls/bls-cryptography-client.ts
@@ -1,5 +1,5 @@
-import threshold_bls from '@celo/blind-threshold-bls'
 import { ErrorMessage } from '@celo/phone-number-privacy-common'
+import threshold_bls from 'blind-threshold-bls'
 import Logger from 'bunyan'
 import { OdisError } from '../error'
 import { Counters } from '../metrics'

diff --git a/packages/phone-number-privacy/signer/test/end-to-end/pnp.test.ts b/packages/phone-number-privacy/signer/test/end-to-end/pnp.test.ts
@@ -1,5 +1,4 @@
 import { sleep } from '@celo/base'
-import threshold_bls from '@celo/blind-threshold-bls'
 import { newKit, StableToken } from '@celo/contractkit'
 import {
   AuthenticationMethod,
@@ -14,6 +13,7 @@ import {
   TestUtils,
   WarningMessage,
 } from '@celo/phone-number-privacy-common'
+import threshold_bls from 'blind-threshold-bls'
 import { randomBytes } from 'crypto'
 import 'isomorphic-fetch'
 import { config } from '../../src/config'

diff --git a/packages/phone-number-privacy/signer/test/end-to-end/utils.ts b/packages/phone-number-privacy/signer/test/end-to-end/utils.ts
@@ -1,4 +1,4 @@
-import threshold_bls from '@celo/blind-threshold-bls'
+import threshold_bls from 'blind-threshold-bls'
 
 require('dotenv').config()
 

diff --git a/packages/sdk/identity/package.json b/packages/sdk/identity/package.json
@@ -31,7 +31,7 @@
     "@celo/phone-number-privacy-common": "^3.0.4-dev",
     "@types/debug": "^4.1.5",
     "bignumber.js": "^9.0.0",
-    "@celo/blind-threshold-bls": "1.0.0-beta",
+    "blind-threshold-bls": "npm:@celo/blind-threshold-bls@1.0.0-beta",
     "cross-fetch": "3.0.6",
     "debug": "^4.1.1",
     "elliptic": "^6.5.4",

diff --git a/packages/sdk/identity/src/odis/bls-blinding-client.ts b/packages/sdk/identity/src/odis/bls-blinding-client.ts
@@ -34,7 +34,7 @@ export class WasmBlsBlindingClient implements BlsBlindingClient {
     } else if (this.isBrowserEnvironment()) {
       throw new Error('Cannot use WasmBlsBlindingClient in a browser environment')
     } else {
-      this.thresholdBls = require('@celo/blind-threshold-bls')
+      this.thresholdBls = require('blind-threshold-bls')
     }
   }