fix(warp): protect against invalid evaluation options

ar-io · Feb 26, 2024 · f8eec88 · f8eec88
1 parent ea8d580
commit f8eec88
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/api/warp.ts b/src/api/warp.ts
@@ -207,9 +207,16 @@ async function readThroughToContractState(
  }
 
  // use the combined evaluation options
- const contract = warp
- .contract(contractTxId)
- .setEvaluationOptions(evaluationOptions);
+ const contract = warp.contract(contractTxId).setEvaluationOptions({
+ ...evaluationOptions,
+ // Temporary fix: protect against setting a maxInteractionEvaluationTimeSeconds that is too large, warp should do this on all evaluation options
+ // Reference: https://github.com/warp-contracts/warp/issues/509
+ maxInteractionEvaluationTimeSeconds: Math.min(
+ Number.MAX_SAFE_INTEGER,
+ evaluationOptions.maxInteractionEvaluationTimeSeconds ||
+ DEFAULT_EVALUATION_OPTIONS.maxInteractionEvaluationTimeSeconds,
+ ),
+ });
 
  // only use batch read if no block height provided (it does not currently support block heights)
  const doBatchRead = providedSortKey || providedBlockHeight === undefined;

diff --git a/src/constants.ts b/src/constants.ts
@@ -34,6 +34,7 @@ export const DEFAULT_STATE_EVALUATION_TIMEOUT_MS = process.env
  : DEFAULT_REQUEST_TIMEOUT_MS; // 3 min state timeout (should be <= koa request timeout)
 export const allowedContractTypes = ['ant'] as const;
 export const DEFAULT_PAGES_PER_BATCH = 50; // loads 5k interactions at a time
-export const DEFAULT_EVALUATION_OPTIONS: Partial<EvaluationOptions> = {
+export const DEFAULT_EVALUATION_OPTIONS: Partial<EvaluationOptions> &
+ Required<Pick<EvaluationOptions, 'maxInteractionEvaluationTimeSeconds'>> = {
  maxInteractionEvaluationTimeSeconds: 3600, // one hour
 };