From d29fab0a53dffd6d388dc076822cd7d5ab498b41 Mon Sep 17 00:00:00 2001 From: Asia Date: Sat, 10 Aug 2024 16:04:54 +0200 Subject: [PATCH] v1.4.36-beta.3 --- package.json | 2 +- src/core/modules/impl/handler/JsHandlerApi.ts | 20 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ac011405..895597ef 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "warp-contracts", - "version": "1.4.36-beta.2", + "version": "1.4.36-beta.3", "description": "An implementation of the SmartWeave smart contract protocol.", "types": "./lib/types/index.d.ts", "main": "./lib/cjs/index.js", diff --git a/src/core/modules/impl/handler/JsHandlerApi.ts b/src/core/modules/impl/handler/JsHandlerApi.ts index fe365abf..0773f269 100644 --- a/src/core/modules/impl/handler/JsHandlerApi.ts +++ b/src/core/modules/impl/handler/JsHandlerApi.ts @@ -7,6 +7,7 @@ import { deepCopy, timeout } from '../../../../utils/utils'; import { ContractError, ContractInteraction, InteractionData, InteractionResult } from '../HandlerExecutorFactory'; import { genesisSortKey } from '../LexicographicalInteractionsSorter'; import { AbstractContractHandler } from './AbstractContractHandler'; +import { Benchmark } from '../../../../logging/Benchmark'; const INIT_FUNC_NAME = '__init'; const throwErrorWithName = (name: string, message: string) => { @@ -39,10 +40,13 @@ export class JsHandlerApi extends AbstractContractHandler { ): Promise> { const { interaction, interactionTx } = interactionData; + const initialHandleBenchmark = Benchmark.measure(); this.setupSwGlobal(interactionData); this.enableInternalWrites(executionContext, interactionTx); this.assertNotConstructorCall(interaction); + initialHandleBenchmark.stop(); + this.logger.info('Initial handle benchmark', initialHandleBenchmark.stop()); return await this.runContractFunction(executionContext, interaction, currentResult.state); } @@ -138,20 +142,34 @@ export class JsHandlerApi extends AbstractContractHandler { interaction: InteractionData['interaction'], state: State ): Promise> { + const stateCloneBenchmark = Benchmark.measure(); const stateClone = deepCopy(state); + stateCloneBenchmark.stop(); + this.logger.info('State clone benchmark', stateCloneBenchmark.elapsed()); + const timeoutBenchmark = Benchmark.measure(); const { timeoutId, timeoutPromise } = timeout( executionContext.evaluationOptions.maxInteractionEvaluationTimeSeconds ); + timeoutBenchmark.stop(); + this.logger.info('timeout benchmark', timeoutBenchmark.elapsed()); try { + const openKvBenchmark = Benchmark.measure(); await this.swGlobal.kv.open(); await this.swGlobal.kv.begin(); + openKvBenchmark.stop(); + this.logger.info('openKvBenchmark', openKvBenchmark.elapsed()); + const handlerResultBenchmark = Benchmark.measure(); const handlerResult = await Promise.race([timeoutPromise, this.contractFunction(stateClone, interaction)]); + handlerResultBenchmark.stop(); + this.logger.info('handlerResultBenchmark', handlerResultBenchmark.elapsed()); if (handlerResult && (handlerResult.state !== undefined || handlerResult.result !== undefined)) { + const kvCommitBenchmark = Benchmark.measure(); await this.swGlobal.kv.commit(); - + kvCommitBenchmark.stop(); + this.logger.info('kvCommitBenchmark', kvCommitBenchmark.elapsed()); let interactionEvent: InteractionCompleteEvent = null; if (handlerResult.event) {