diff --git a/src/core/modules/impl/RedstoneGatewayInteractionsLoader.ts b/src/core/modules/impl/RedstoneGatewayInteractionsLoader.ts index 89eaeb3..b26efa4 100644 --- a/src/core/modules/impl/RedstoneGatewayInteractionsLoader.ts +++ b/src/core/modules/impl/RedstoneGatewayInteractionsLoader.ts @@ -95,8 +95,14 @@ export class RedstoneGatewayInteractionsLoader implements InteractionsLoader { const benchmarkTotalTime = Benchmark.measure(); do { const benchmarkRequestTime = Benchmark.measure(); + + // to make caching in cloudfront possible + const url = upToTransactionId + ? `${this.baseUrl}/gateway/interactions/transactionId` + : `${this.baseUrl}/gateway/interactions`; + const response = await fetch( - `${this.baseUrl}/gateway/interactions?${new URLSearchParams({ + `${url}?${new URLSearchParams({ contractId: contractId, from: fromBlockHeight.toString(), to: toBlockHeight.toString(), diff --git a/tools/deploytest.ts b/tools/deploytest.ts index 100eeff..ec69f7c 100644 --- a/tools/deploytest.ts +++ b/tools/deploytest.ts @@ -5,10 +5,9 @@ import {TsLogFactory} from '../src/logging/node/TsLogFactory'; import fs from 'fs'; import path from 'path'; import {JWKInterface} from 'arweave/node/lib/wallet'; -import { readJSON } from '../../redstone-smartweave-examples/src/_utils'; async function main() { - let wallet: JWKInterface = readJSON('../redstone-node/.secrets/redstone-jwk.json');; + let wallet: JWKInterface = readJSON('./.secrets/33F0QHcb22W7LwWR1iRC8Az1ntZG09XQ03YWuw2ABqA.json');; LoggerFactory.INST.logLevel('debug'); const logger = LoggerFactory.INST.create('deploy'); @@ -60,7 +59,7 @@ async function main() { const {state, validity} = await smartweave.contract(contractTxId).readState(); - logger.info("Result", state); + //logger.info("Result", state); } catch (e) { logger.error(e) @@ -69,4 +68,13 @@ async function main() { } +export function readJSON(path: string): JWKInterface { + const content = fs.readFileSync(path, "utf-8"); + try { + return JSON.parse(content); + } catch (e) { + throw new Error(`File "${path}" does not contain a valid JSON`); + } +} + main().catch((e) => console.error(e));