ODIS V1 Sunset

packages/phone-number-privacy/combiner/src/common/sign.ts

@@ -2,7 +2,6 @@ import {
   DomainRestrictedSignatureRequest,
   ErrorMessage,
   ErrorType,
-  LegacySignMessageRequest,
   OdisResponse,
   responseHasExpectedKeyVersion,
   SignMessageRequest,
@@ -18,8 +17,8 @@ import { IO } from './io'
 // prettier-ignore
 export type OdisSignatureRequest =
   | SignMessageRequest
-  | LegacySignMessageRequest
   | DomainRestrictedSignatureRequest
+
 export type ThresholdStateService<R extends OdisSignatureRequest> = R extends SignMessageRequest
   ? PnpThresholdStateService<R>
   : never | R extends DomainRestrictedSignatureRequest

packages/phone-number-privacy/combiner/src/pnp/endpoints/quota/io.ts

@@ -5,7 +5,6 @@ import {
   ErrorType,
   getSignerEndpoint,
   hasValidAccountParam,
-  identifierIsValidIfExists,
   isBodyReasonablySized,
   PnpQuotaRequest,
   PnpQuotaRequestSchema,
@@ -60,7 +59,6 @@ export class PnpQuotaIO extends IO<PnpQuotaRequest> {
     return (
       super.validateClientRequest(request) &&
       hasValidAccountParam(request.body) &&
-      identifierIsValidIfExists(request.body) &&
       isBodyReasonablySized(request.body)
     )
   }

packages/phone-number-privacy/combiner/src/pnp/endpoints/sign/action.ts

@@ -1,7 +1,6 @@
 import {
   ErrorMessage,
   ErrorType,
-  LegacySignMessageRequest,
   SignMessageRequest,
   WarningMessage,
 } from '@celo/phone-number-privacy-common'
@@ -12,7 +11,7 @@ import { PnpSignerResponseLogger } from '../../services/log-responses'
 export class PnpSignAction extends SignAction<SignMessageRequest> {
   readonly responseLogger: PnpSignerResponseLogger = new PnpSignerResponseLogger()
 
-  combine(session: CryptoSession<SignMessageRequest | LegacySignMessageRequest>): void {
+  combine(session: CryptoSession<SignMessageRequest>): void {
     this.responseLogger.logResponseDiscrepancies(session)
     this.responseLogger.logFailOpenResponses(session)
 
@@ -41,7 +40,7 @@ export class PnpSignAction extends SignAction<SignMessageRequest> {
     this.handleMissingSignatures(session)
   }
 
-  protected parseBlindedMessage(req: SignMessageRequest | LegacySignMessageRequest): string {
+  protected parseBlindedMessage(req: SignMessageRequest): string {
     return req.blindedQueryPhoneNumber
   }
 

packages/phone-number-privacy/combiner/src/server.ts

@@ -23,7 +23,6 @@ import { PnpQuotaAction } from './pnp/endpoints/quota/action'
 import { PnpQuotaIO } from './pnp/endpoints/quota/io'
 import { PnpSignAction } from './pnp/endpoints/sign/action'
 import { PnpSignIO } from './pnp/endpoints/sign/io'
-import { LegacyPnpSignIO } from './pnp/endpoints/sign/io.legacy'
 import { PnpThresholdStateService } from './pnp/services/threshold-state'
 
 require('events').EventEmitter.defaultMaxListeners = 15
@@ -60,23 +59,6 @@ export function startCombiner(config: CombinerConfig, kit: ContractKit) {
 
   const pnpThresholdStateService = new PnpThresholdStateService()
 
-  const legacyPnpSign = new Controller(
-    new PnpSignAction(
-      config.phoneNumberPrivacy,
-      pnpThresholdStateService,
-      new LegacyPnpSignIO(config.phoneNumberPrivacy, kit)
-    )
-  )
-  app.post(CombinerEndpoint.LEGACY_PNP_SIGN, (req, res) =>
-    meterResponse(
-      legacyPnpSign.handle.bind(legacyPnpSign),
-      req,
-      res,
-      CombinerEndpoint.LEGACY_PNP_SIGN,
-      config
-    )
-  )
-
   const pnpQuota = new Controller(
     new PnpQuotaAction(
       config.phoneNumberPrivacy,