Breakup Utils Package (Breaking change)

dependency-graph.json

@@ -8,6 +8,7 @@
     "dependencies": [
       "@celo/contractkit",
       "@celo/keystores",
+      "@celo/phone-utils",
       "@celo/utils"
     ]
   },
@@ -66,6 +67,7 @@
     "dependencies": [
       "@celo/connect",
       "@celo/contractkit",
+      "@celo/phone-utils",
       "@celo/utils"
     ]
   },
@@ -197,6 +199,7 @@
       "@celo/contractkit",
       "@celo/dev-utils",
       "@celo/flake-tracker",
+      "@celo/phone-utils",
       "@celo/utils",
       "@celo/wallet-local"
     ]

package.json

@@ -29,7 +29,8 @@
     "celotool": "yarn --cwd packages/celotool run --silent cli",
     "celocli": "yarn --cwd packages/cli run --silent celocli",
     "update-dependency-graph": "ts-node ./scripts/update_dependency_graph.ts",
-    "deploy-sdks": "ts-node ./scripts/deploy-sdks.ts"
+    "deploy-sdks": "ts-node ./scripts/deploy-sdks.ts",
+    "deprecate-sdks": "ts-node ./scripts/unpublish-sdks.ts"
   },
   "husky": {
     "hooks": {

packages/attestation-service/package.json

@@ -29,9 +29,10 @@
     "test-send-sms-twilio": "TS_NODE_FILES=true CONFIG=config/.env.development ts-node scripts/test-send-sms-twilio.ts"
   },
   "dependencies": {
-    "@celo/contractkit": "1.3.3-dev",
-    "@celo/keystores": "1.3.3-dev",
-    "@celo/utils": "1.3.3-dev",
+    "@celo/contractkit": "1.5.1-dev",
+    "@celo/keystores": "1.5.1-dev",
+    "@celo/utils": "1.5.1-dev",
+    "@celo/phone-utils": "1.5.1-dev",
     "bignumber.js": "^9.0.0",
     "body-parser": "1.19.0",
     "bunyan": "1.8.12",

packages/attestation-service/src/index.ts

@@ -2,7 +2,7 @@ import {
   AttestationRequestType,
   AttestationServiceTestRequestType,
   GetAttestationRequestType,
-} from '@celo/utils/lib/io'
+} from '@celo/phone-utils/lib/io'
 import express from 'express'
 import rateLimit from 'express-rate-limit'
 import requestIdMiddleware from 'express-request-id'

packages/attestation-service/src/models/attestation.ts

@@ -1,4 +1,4 @@
-import { E164Number } from '@celo/utils/lib/io'
+import { E164Number } from '@celo/phone-utils/lib/io'
 import { BuildOptions, DataTypes, Model, Sequelize } from 'sequelize'
 
 // Split out SmsFields from the underlying data model;

packages/attestation-service/src/request.ts

@@ -1,4 +1,4 @@
-import { AttestationResponseType } from '@celo/utils/lib/io'
+import { AttestationResponseType } from '@celo/phone-utils/lib/io'
 import Logger from 'bunyan'
 import express from 'express'
 import { isLeft } from 'fp-ts/lib/Either'

packages/attestation-service/src/requestHandlers/attestation.ts

@@ -1,8 +1,9 @@
 import { AttestationState } from '@celo/contractkit/lib/wrappers/Attestations'
-import { AttestationUtils, PhoneNumberUtils } from '@celo/utils'
+import { PhoneNumberUtils } from '@celo/phone-utils'
+import { AttestationRequest } from '@celo/phone-utils/lib/io'
+import { AttestationUtils } from '@celo/utils'
 import { eqAddress } from '@celo/utils/lib/address'
 import { sleep } from '@celo/utils/lib/async'
-import { AttestationRequest } from '@celo/utils/lib/io'
 import Logger from 'bunyan'
 import { randomBytes } from 'crypto'
 import express from 'express'

packages/attestation-service/src/requestHandlers/get_attestation.ts

@@ -1,6 +1,6 @@
-import { PhoneNumberUtils } from '@celo/utils'
+import { PhoneNumberUtils } from '@celo/phone-utils'
+import { GetAttestationRequest } from '@celo/phone-utils/lib/io'
 import { isValidAddress, publicKeyToAddress } from '@celo/utils/lib/address'
-import { GetAttestationRequest } from '@celo/utils/lib/io'
 import { verifyEIP712TypedDataSigner } from '@celo/utils/lib/signatureUtils'
 import { attestationSecurityCode as buildSecurityCodeTypedData } from '@celo/utils/lib/typed-data-constructors'
 import Logger from 'bunyan'

packages/attestation-service/src/requestHandlers/status.ts

@@ -1,4 +1,5 @@
-import { AttestationServiceStatusResponseType, SignatureType } from '@celo/utils/lib/io'
+import { AttestationServiceStatusResponseType } from '@celo/phone-utils/lib/io'
+import { SignatureType } from '@celo/utils/lib/io'
 import express from 'express'
 import * as t from 'io-ts'
 import { getAgeOfLatestBlock, isNodeSyncing, useKit } from '../db'

packages/attestation-service/src/requestHandlers/test_attestation.ts

@@ -1,5 +1,5 @@
-import { PhoneNumberUtils } from '@celo/utils'
-import { AttestationServiceTestRequest } from '@celo/utils/lib/io'
+import { PhoneNumberUtils } from '@celo/phone-utils'
+import { AttestationServiceTestRequest } from '@celo/phone-utils/lib/io'
 import { verifySignature } from '@celo/utils/lib/signatureUtils'
 import { randomBytes } from 'crypto'
 import express from 'express'

packages/attestation-service/src/sms/base.ts

@@ -1,4 +1,4 @@
-import { E164Number } from '@celo/utils/lib/io'
+import { E164Number } from '@celo/phone-utils/lib/io'
 import Logger from 'bunyan'
 import express from 'express'
 import { fetchEnvOrDefault } from '../env'

packages/attestation-service/src/sms/index.ts

@@ -1,6 +1,6 @@
+import { E164Number } from '@celo/phone-utils/lib/io'
 import { sleep } from '@celo/utils/lib/async'
 import { intersection } from '@celo/utils/lib/collections'
-import { E164Number } from '@celo/utils/lib/io'
 import Logger from 'bunyan'
 import { PhoneNumberType, PhoneNumberUtil } from 'google-libphonenumber'
 import { shuffle } from 'lodash'

packages/celotool/package.json

@@ -6,16 +6,16 @@
   "author": "Celo",
   "license": "Apache-2.0",
   "dependencies": {
-    "@celo/base": "1.3.3-dev",
-    "@celo/connect": "1.3.3-dev",
-    "@celo/contractkit": "1.3.3-dev",
+    "@celo/base": "1.5.1-dev",
+    "@celo/connect": "1.5.1-dev",
+    "@celo/contractkit": "1.5.1-dev",
     "@celo/env-tests": "1.0.0",
     "@types/ethereumjs-util": "^5.2.0",
-    "@celo/explorer": "1.3.3-dev",
-    "@celo/governance": "1.3.3-dev",
-    "@celo/identity": "1.3.3-dev",
-    "@celo/network-utils": "1.3.3-dev",
-    "@celo/utils": "1.3.3-dev",
+    "@celo/explorer": "1.5.1-dev",
+    "@celo/governance": "1.5.1-dev",
+    "@celo/identity": "1.5.1-dev",
+    "@celo/network-utils": "1.5.1-dev",
+    "@celo/utils": "1.5.1-dev",
     "@google-cloud/monitoring": "0.7.1",
     "@google-cloud/pubsub": "^0.28.1",
     "@google-cloud/secret-manager": "3.0.0",

packages/celotool/src/cmds/account/lookup.ts

@@ -1,7 +1,7 @@
 /* tslint:disable no-console */
 
 import { newKitFromWeb3 } from '@celo/contractkit'
-import { PhoneNumberUtils } from '@celo/utils'
+import { PhoneNumberUtils } from '@celo/phone-utils'
 import { switchToClusterFromEnv } from 'src/lib/cluster'
 import { portForwardAnd } from 'src/lib/port_forward'
 import Web3 from 'web3'

packages/celotool/src/lib/attestation.ts

@@ -1,6 +1,6 @@
 import { AttestationsWrapper } from '@celo/contractkit/lib/wrappers/Attestations'
 import { RequestAttestationError } from '@celo/env-tests/lib/shared/attestation'
-import { PhoneNumberUtils } from '@celo/utils'
+import { PhoneNumberUtils } from '@celo/phone-utils'
 import { sample } from 'lodash'
 import { Twilio } from 'twilio'