Changed default PNP timeout to a variable set by env

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

@@ -42,7 +42,11 @@ export abstract class IO<R extends OdisRequest> {
     response: Response<OdisResponse<R>>
   ): Promise<Session<R> | null>
 
-  abstract authenticate(request: Request<{}, {}, R>, logger?: Logger): Promise<boolean>
+  abstract authenticate(
+    request: Request<{}, {}, R>,
+    logger?: Logger,
+    timeoutMs?: number
+  ): Promise<boolean>
 
   abstract sendFailure(
     error: ErrorType,

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

@@ -1,4 +1,10 @@
-import { BlockchainConfig, rootLogger, TestUtils, toBool } from '@celo/phone-number-privacy-common'
+import {
+  BlockchainConfig,
+  FULL_NODE_TIMEOUT_IN_MS,
+  rootLogger,
+  TestUtils,
+  toBool,
+} from '@celo/phone-number-privacy-common'
 import * as functions from 'firebase-functions'
 export function getCombinerVersion(): string {
   return process.env.npm_package_version ?? require('../package.json').version ?? '0.0.0'
@@ -23,12 +29,13 @@ export interface OdisConfig {
   shouldFailOpen: boolean // TODO (https://github.com/celo-org/celo-monorepo/issues/9862) consider refactoring config, this isn't relevant to domains endpoints
   odisServices: {
     signers: string
-    timeoutMilliSeconds: number
+    timeoutMilliSeconds: number // XXX (soloseng): what is this timeout used for? could it also be used to replace FULL_NODE_TIMEOUT_IN_MS?
   }
   keys: {
     currentVersion: number
     versions: string // parse as KeyVersionInfo[]
   }
+  timeoutMs: number
 }
 
 export interface CombinerConfig {
@@ -94,6 +101,7 @@ if (DEV_MODE) {
           },
         ]),
       },
+      timeoutMs: Number(process.env.TIMEOUT_MS ?? FULL_NODE_TIMEOUT_IN_MS),
     },
     domains: {
       serviceName: defaultServiceName,
@@ -126,6 +134,7 @@ if (DEV_MODE) {
           },
         ]),
       },
+      timeoutMs: Number(process.env.TIMEOUT_MS ?? FULL_NODE_TIMEOUT_IN_MS),
     },
   }
 } else {
@@ -150,6 +159,7 @@ if (DEV_MODE) {
         currentVersion: Number(functionConfig.pnp_keys.current_version),
         versions: functionConfig.pnp_keys.versions,
       },
+      timeoutMs: Number(process.env.TIMEOUT_MS ?? FULL_NODE_TIMEOUT_IN_MS),
     },
     domains: {
       serviceName: functionConfig.domains.service_name ?? defaultServiceName,
@@ -165,6 +175,7 @@ if (DEV_MODE) {
         currentVersion: Number(functionConfig.domains_keys.current_version),
         versions: functionConfig.domains_keys.versions,
       },
+      timeoutMs: Number(process.env.TIMEOUT_MS ?? FULL_NODE_TIMEOUT_IN_MS),
     },
   }
 }

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

@@ -66,7 +66,13 @@ export class PnpQuotaIO extends IO<PnpQuotaRequest> {
   }
 
   async authenticate(request: Request<{}, {}, PnpQuotaRequest>, logger: Logger): Promise<boolean> {
-    return authenticateUser(request, this.kit, logger, this.config.shouldFailOpen)
+    return authenticateUser(
+      request,
+      this.kit,
+      logger,
+      this.config.timeoutMs,
+      this.config.shouldFailOpen
+    )
   }
 
   sendSuccess(

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

@@ -85,7 +85,13 @@ export class LegacyPnpSignIO extends IO<LegacySignMessageRequest> {
     request: Request<{}, {}, LegacySignMessageRequest>,
     logger: Logger
   ): Promise<boolean> {
-    return authenticateUser(request, this.kit, logger, this.config.shouldFailOpen)
+    return authenticateUser(
+      request,
+      this.kit,
+      logger,
+      this.config.timeoutMs,
+      this.config.shouldFailOpen
+    )
   }
 
   sendSuccess(

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

@@ -84,7 +84,13 @@ export class PnpSignIO extends IO<SignMessageRequest> {
     request: Request<{}, {}, SignMessageRequest>,
     logger: Logger
   ): Promise<boolean> {
-    return authenticateUser(request, this.kit, logger, this.config.shouldFailOpen)
+    return authenticateUser(
+      request,
+      this.kit,
+      logger,
+      this.config.timeoutMs,
+      this.config.shouldFailOpen
+    )
   }
 
   sendSuccess(

packages/phone-number-privacy/common/src/utils/authentication.ts

@@ -24,6 +24,7 @@ export async function authenticateUser<R extends PhoneNumberPrivacyRequest>(
   request: Request<{}, {}, R>,
   contractKit: ContractKit,
   logger: Logger,
+  timeoutMs: number,
   shouldFailOpen: boolean = false,
   warnings: ErrorType[] = []
 ): Promise<boolean> {
@@ -42,7 +43,7 @@ export async function authenticateUser<R extends PhoneNumberPrivacyRequest>(
   if (authMethod && authMethod === AuthenticationMethod.ENCRYPTION_KEY) {
     let registeredEncryptionKey
     try {
-      registeredEncryptionKey = await getDataEncryptionKey(signer, contractKit, logger)
+      registeredEncryptionKey = await getDataEncryptionKey(signer, contractKit, logger, timeoutMs)
     } catch (err) {
       // getDataEncryptionKey should only throw if there is a full-node connection issue.
       // That is, it does not throw if the DEK is undefined or invalid
@@ -127,7 +128,8 @@ export function verifyDEKSignature(
 export async function getDataEncryptionKey(
   address: string,
   contractKit: ContractKit,
-  logger: Logger
+  logger: Logger,
+  timeoutMs: number
 ): Promise<string> {
   try {
     const res = await retryAsyncWithBackOffAndTimeout(
@@ -139,7 +141,7 @@ export async function getDataEncryptionKey(
       [],
       RETRY_DELAY_IN_MS,
       1.5,
-      FULL_NODE_TIMEOUT_IN_MS
+      timeoutMs
     )
     return res
   } catch (error) {

packages/phone-number-privacy/common/test/utils/authentication.test.ts

@@ -2,7 +2,7 @@ import { hexToBuffer } from '@celo/base'
 import { ContractKit } from '@celo/contractkit'
 import Logger from 'bunyan'
 import { Request } from 'express'
-import { ErrorMessage, ErrorType } from '../../lib'
+import { ErrorMessage, ErrorType, FULL_NODE_TIMEOUT_IN_MS } from '../../lib'
 import { AuthenticationMethod } from '../../src/interfaces/requests'
 import * as auth from '../../src/utils/authentication'
 
@@ -28,6 +28,7 @@ describe('Authentication test suite', () => {
         sampleRequest,
         mockContractKit,
         logger,
+        FULL_NODE_TIMEOUT_IN_MS,
         true,
         warnings
       )
@@ -49,6 +50,7 @@ describe('Authentication test suite', () => {
         sampleRequest,
         mockContractKit,
         logger,
+        FULL_NODE_TIMEOUT_IN_MS,
         true,
         warnings
       )
@@ -73,6 +75,7 @@ describe('Authentication test suite', () => {
         sampleRequest,
         mockContractKit,
         logger,
+        FULL_NODE_TIMEOUT_IN_MS,
         true,
         warnings
       )
@@ -97,6 +100,7 @@ describe('Authentication test suite', () => {
         sampleRequest,
         mockContractKit,
         logger,
+        FULL_NODE_TIMEOUT_IN_MS,
         false,
         warnings
       )
@@ -131,6 +135,7 @@ describe('Authentication test suite', () => {
         sampleRequest,
         mockContractKit,
         logger,
+        FULL_NODE_TIMEOUT_IN_MS,
         true,
         warnings
       )
@@ -161,7 +166,12 @@ describe('Authentication test suite', () => {
 
       const warnings: ErrorType[] = []
 
-      const success = await auth.authenticateUser(sampleRequest, mockContractKit, logger)
+      const success = await auth.authenticateUser(
+        sampleRequest,
+        mockContractKit,
+        logger,
+        FULL_NODE_TIMEOUT_IN_MS
+      )
 
       expect(success).toBe(false)
       expect(warnings).toEqual([])
@@ -202,6 +212,7 @@ describe('Authentication test suite', () => {
         sampleRequest,
         mockContractKit,
         logger,
+        FULL_NODE_TIMEOUT_IN_MS,
         true,
         warnings
       )
@@ -253,6 +264,7 @@ describe('Authentication test suite', () => {
           sampleRequest,
           mockContractKit,
           logger,
+          FULL_NODE_TIMEOUT_IN_MS,
           true,
           warnings
         )
@@ -299,6 +311,7 @@ describe('Authentication test suite', () => {
         sampleRequest,
         mockContractKit,
         logger,
+        FULL_NODE_TIMEOUT_IN_MS,
         true,
         warnings
       )
@@ -346,6 +359,7 @@ describe('Authentication test suite', () => {
         sampleRequest,
         mockContractKit,
         logger,
+        FULL_NODE_TIMEOUT_IN_MS,
         true,
         warnings
       )
@@ -390,6 +404,7 @@ describe('Authentication test suite', () => {
         sampleRequest,
         mockContractKit,
         logger,
+        FULL_NODE_TIMEOUT_IN_MS,
         true,
         warnings
       )

packages/phone-number-privacy/signer/src/common/io.ts

@@ -26,7 +26,8 @@ export abstract class IO<R extends OdisRequest> {
   abstract authenticate(
     request: Request<{}, {}, R>,
     warnings?: string[],
-    logger?: Logger
+    logger?: Logger,
+    timeoutMs?: number
   ): Promise<boolean>
 
   abstract sendFailure(

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

@@ -28,7 +28,8 @@ export class LegacyPnpQuotaIO extends IO<LegacyPnpQuotaRequest> {
   constructor(
     readonly enabled: boolean,
     readonly shouldFailOpen: boolean,
-    readonly kit: ContractKit
+    readonly kit: ContractKit,
+    readonly timeoutMs: number
   ) {
     super(enabled)
   }
@@ -64,7 +65,14 @@ export class LegacyPnpQuotaIO extends IO<LegacyPnpQuotaRequest> {
     warnings: ErrorType[],
     logger: Logger
   ): Promise<boolean> {
-    return authenticateUser(request, this.kit, logger, this.shouldFailOpen, warnings)
+    return authenticateUser(
+      request,
+      this.kit,
+      logger,
+      this.timeoutMs,
+      this.shouldFailOpen,
+      warnings
+    )
   }
 
   sendSuccess(

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

@@ -27,7 +27,8 @@ export class PnpQuotaIO extends IO<PnpQuotaRequest> {
   constructor(
     readonly enabled: boolean,
     readonly shouldFailOpen: boolean,
-    readonly kit: ContractKit
+    readonly kit: ContractKit,
+    readonly timeoutMs: number
   ) {
     super(enabled)
   }
@@ -62,7 +63,14 @@ export class PnpQuotaIO extends IO<PnpQuotaRequest> {
     warnings: ErrorType[],
     logger: Logger
   ): Promise<boolean> {
-    return authenticateUser(request, this.kit, logger, this.shouldFailOpen, warnings)
+    return authenticateUser(
+      request,
+      this.kit,
+      logger,
+      this.timeoutMs,
+      this.shouldFailOpen,
+      warnings
+    )
   }
 
   sendSuccess(

packages/phone-number-privacy/signer/src/pnp/endpoints/sign/io.legacy.ts

@@ -32,7 +32,8 @@ export class LegacyPnpSignIO extends IO<LegacySignMessageRequest> {
   constructor(
     readonly enabled: boolean,
     readonly shouldFailOpen: boolean,
-    readonly kit: ContractKit
+    readonly kit: ContractKit,
+    readonly timeoutMs: number
   ) {
     super(enabled)
   }
@@ -76,7 +77,14 @@ export class LegacyPnpSignIO extends IO<LegacySignMessageRequest> {
     warnings: ErrorType[],
     logger: Logger
   ): Promise<boolean> {
-    return authenticateUser(request, this.kit, logger, this.shouldFailOpen, warnings)
+    return authenticateUser(
+      request,
+      this.kit,
+      logger,
+      this.timeoutMs,
+      this.shouldFailOpen,
+      warnings
+    )
   }
 
   sendSuccess(

packages/phone-number-privacy/signer/src/pnp/endpoints/sign/io.ts

@@ -31,7 +31,8 @@ export class PnpSignIO extends IO<SignMessageRequest> {
   constructor(
     readonly enabled: boolean,
     readonly shouldFailOpen: boolean,
-    readonly kit: ContractKit
+    readonly kit: ContractKit,
+    readonly timeoutMs: number
   ) {
     super(enabled)
   }
@@ -72,7 +73,14 @@ export class PnpSignIO extends IO<SignMessageRequest> {
     warnings: ErrorType[],
     logger: Logger
   ): Promise<boolean> {
-    return authenticateUser(request, this.kit, logger, this.shouldFailOpen, warnings)
+    return authenticateUser(
+      request,
+      this.kit,
+      logger,
+      this.timeoutMs,
+      this.shouldFailOpen,
+      warnings
+    )
   }
 
   sendSuccess(