@ocap/tx-protocols 1.29.7 → 1.29.9

package/esm/execute.d.mts

@@ -1,3 +1,4 @@
+import { TxTimer } from "./tx-timer.mjs";
 import { CustomError } from "@ocap/util/lib/error";
 import { Blacklist } from "@ocap/state";
 import { IAccountState, IGasContext } from "@ocap/types";
@@ -31,6 +32,8 @@ interface IExecutionContext extends IGasContext {
   ledgerSequence?: number;
   /** State commit hash set by onCommit callback (Dolt only) */
   stateCommitHash?: string;
+  /** Transaction execution timer */
+  timer?: TxTimer;
 }
 /** Protocol runner interface */
 interface IProtocolRunner {

package/esm/execute.mjs

@@ -1,6 +1,7 @@
 import ensure_cost_default from "./pipes/ensure-cost.mjs";
 import ensure_gas_default from "./pipes/ensure-gas.mjs";
 import { WriteLedger } from "./pipes/write-ledger.mjs";
+import { TxTimer } from "./tx-timer.mjs";
 import { Runner, pipes } from "@ocap/tx-pipeline";
 import { CustomError } from "@ocap/util/lib/error";
 import camelCase from "lodash/camelCase.js";
@@ -101,6 +102,7 @@ const createExecute = ({ filter, runAsLambda }) => {
 			const protocol = protocols[getTxName(context.txType)];
 			if (!protocol) return reject(new CustomError("UNSUPPORTED_TX", `Unsupported tx type ${context.txType}`));
 			protocol.run(context, async (error) => {
+				context.timer?.mark("protocol");
 				if (isRetrySupported) {
 					if (error) return reject(error);
 					return resolve(context);
@@ -114,7 +116,9 @@ const createExecute = ({ filter, runAsLambda }) => {
 						txState = states.tx.create(context, txStatus);
 					}
 					await context.statedb.tx.create(txState.hash, txState, context);
+					context.timer?.mark("commit");
 					flushEvents(context, { txState });
+					context.timer?.mark("indexdb");
 				} catch (e) {
 					context.logger?.error("Failed to save transaction to statedb", {
 						error: e,
@@ -128,7 +132,8 @@ const createExecute = ({ filter, runAsLambda }) => {
 					txHash: context.txHash,
 					txStatus,
 					txState,
-					error
+					error,
+					timing: context.timer?.summary()
 				});
 				if (error) return reject(error);
 				return resolve(context);
@@ -137,7 +142,9 @@ const createExecute = ({ filter, runAsLambda }) => {
 	});
 	if (typeof runAsLambda === "function") return async (context, protocols) => {
 		let ctx = context;
-		const startTime = Date.now();
+		context.timer = new TxTimer();
+		let entryFinalized = false;
+		let savedLedgerSequence;
 		try {
 			const txState = await runAsLambda(async (txn) => {
 				ctx = pick(context, [
@@ -150,10 +157,12 @@ const createExecute = ({ filter, runAsLambda }) => {
 					"filter",
 					"extra",
 					"logger",
-					"ledgerSequence"
+					"ledgerSequence",
+					"timer"
 				]);
 				ctx.txn = txn;
 				await execute(ctx, protocols, true);
+				if (ctx.ledgerSequence && !savedLedgerSequence) savedLedgerSequence = ctx.ledgerSequence;
 				const state = getStates(context).tx.create(ctx, "OK");
 				await context.statedb.tx.create(state.hash, state, ctx);
 				return state;
@@ -165,6 +174,7 @@ const createExecute = ({ filter, runAsLambda }) => {
 					if (ctx.txHash && ctx.ledger && ctx.ledgerSequence && ctx.txBase64) try {
 						await ctx.ledger.finalizeEntry(ctx.txHash, stateCommitHash || "", ctx.ledgerSequence, ctx.txBase64);
 						ctx.stateCommitHash = stateCommitHash || "";
+						entryFinalized = true;
 					} catch (err) {
 						ctx.logger?.error("Failed to finalize ledger entry", {
 							txHash: ctx.txHash,
@@ -174,7 +184,9 @@ const createExecute = ({ filter, runAsLambda }) => {
 					}
 				}
 			});
+			ctx.timer?.mark("commit");
 			flushEvents(ctx, { txState });
+			ctx.timer?.mark("indexdb");
 			ctx.ledger?.createCheckpointIfNeeded()?.catch((err) => {
 				ctx.logger?.error("Background checkpoint creation failed", {
 					txHash: ctx.txHash,
@@ -185,7 +197,7 @@ const createExecute = ({ filter, runAsLambda }) => {
 				txHash: ctx.txHash,
 				txState,
 				txStatus: "OK",
-				duration: Date.now() - startTime
+				timing: ctx.timer?.summary()
 			});
 		} catch (error) {
 			const err = error;
@@ -217,6 +229,7 @@ const createExecute = ({ filter, runAsLambda }) => {
 							if (ctx.txHash && ctx.ledger && ctx.ledgerSequence && ctx.txBase64) try {
 								await ctx.ledger.finalizeEntry(ctx.txHash, stateCommitHash || "", ctx.ledgerSequence, ctx.txBase64);
 								ctx.stateCommitHash = stateCommitHash || "";
+								entryFinalized = true;
 							} catch (err$1) {
 								ctx.logger?.error("Failed to finalize ledger entry", {
 									txHash: ctx.txHash,
@@ -226,7 +239,9 @@ const createExecute = ({ filter, runAsLambda }) => {
 							}
 						}
 					});
+					ctx.timer?.mark("commit");
 					flushEvents(ctx, { txState });
+					ctx.timer?.mark("indexdb");
 					ctx.ledger?.createCheckpointIfNeeded()?.catch((err$1) => {
 						ctx.logger?.error("Background checkpoint creation failed", {
 							txHash: ctx.txHash,
@@ -238,7 +253,7 @@ const createExecute = ({ filter, runAsLambda }) => {
 						txState,
 						txStatus,
 						error,
-						duration: Date.now() - startTime
+						timing: ctx.timer?.summary()
 					});
 				} catch (innerErr) {
 					ctx.logger?.error("Failed to save invalid transaction to statedb", {
@@ -253,11 +268,27 @@ const createExecute = ({ filter, runAsLambda }) => {
 			}
 			throw error;
 		} finally {
+			if (!entryFinalized) {
+				const ledger = ctx.ledger || context.ledger;
+				const txHash = ctx.txHash || context.txHash;
+				const txBase64 = ctx.txBase64 || context.txBase64;
+				const sequence = ctx.ledgerSequence || savedLedgerSequence || context.ledgerSequence;
+				if (ledger && txHash && sequence && txBase64) try {
+					await ledger.finalizeEntry(txHash, "", sequence, txBase64);
+				} catch (err) {
+					(ctx.logger || context.logger)?.error("Failed to finalize orphaned ledger entry", {
+						txHash,
+						sequence,
+						error: err
+					});
+				}
+			}
 			merge(context, ctx);
 		}
 		return ctx;
 	};
 	return async (context, protocols) => {
+		context.timer = new TxTimer();
 		const result = await execute(context, protocols);
 		if (result.ledger && result.txHash && result.ledgerSequence && result.txBase64) try {
 			await result.ledger.finalizeEntry(result.txHash, "", result.ledgerSequence, result.txBase64);
@@ -267,6 +298,7 @@ const createExecute = ({ filter, runAsLambda }) => {
 				error: err
 			});
 		}
+		result.timer?.mark("finalize");
 		result.ledger?.createCheckpointIfNeeded()?.catch((err) => {
 			result.logger?.error("Background checkpoint creation failed", {
 				txHash: result.txHash,

package/esm/pipes/write-ledger.d.mts

@@ -47,6 +47,10 @@ interface IWriteLedgerContext {
     };
     [key: string]: unknown;
   };
+  /** Transaction execution timer */
+  timer?: {
+    mark(label: string): void;
+  };
 }
 /**
  * Error codes for ledger write failures

package/esm/pipes/write-ledger.mjs

@@ -70,7 +70,9 @@ const WriteLedger = async (context, next) => {
 			timestamp: txTime ? new Date(txTime).getTime() : Date.now(),
 			txExtra
 		};
+		context.timer?.mark("verify");
 		const entry = await ledger.append(txInput);
+		context.timer?.mark("ledger");
 		context.ledgerSequence = entry.sequence;
 		debug("Transaction written to ledger", {
 			txHash,

package/esm/tx-timer.d.mts

@@ -0,0 +1,17 @@
+//#region src/tx-timer.d.ts
+/**
+ * Lightweight transaction execution timer.
+ *
+ * Records named marks at key stages and computes per-stage durations.
+ * Overhead per mark() call is a single Date.now() invocation (< 1 µs).
+ */
+declare class TxTimer {
+  private marks;
+  private origin;
+  /** Record a named timestamp. */
+  mark(label: string): void;
+  /** Compute per-stage durations (ms) between consecutive marks. */
+  summary(): Record<string, number>;
+}
+//#endregion
+export { TxTimer };

package/esm/tx-timer.mjs

@@ -0,0 +1,31 @@
+//#region src/tx-timer.ts
+/**
+* Lightweight transaction execution timer.
+*
+* Records named marks at key stages and computes per-stage durations.
+* Overhead per mark() call is a single Date.now() invocation (< 1 µs).
+*/
+var TxTimer = class {
+	constructor() {
+		this.marks = [];
+		this.origin = Date.now();
+	}
+	/** Record a named timestamp. */
+	mark(label) {
+		this.marks.push([label, Date.now()]);
+	}
+	/** Compute per-stage durations (ms) between consecutive marks. */
+	summary() {
+		const result = {};
+		let prev = this.origin;
+		for (const [label, time] of this.marks) {
+			result[label] = time - prev;
+			prev = time;
+		}
+		result.total = prev - this.origin;
+		return result;
+	}
+};
+
+//#endregion
+export { TxTimer };

package/lib/execute.cjs

@@ -3,6 +3,7 @@ const require_rolldown_runtime = require('./_virtual/rolldown_runtime.cjs');
 const require_pipes_ensure_cost = require('./pipes/ensure-cost.cjs');
 const require_pipes_ensure_gas = require('./pipes/ensure-gas.cjs');
 const require_pipes_write_ledger = require('./pipes/write-ledger.cjs');
+const require_tx_timer = require('./tx-timer.cjs');
 let _ocap_tx_pipeline = require("@ocap/tx-pipeline");
 let _ocap_util_lib_error = require("@ocap/util/lib/error");
 let lodash_camelCase = require("lodash/camelCase");
@@ -107,6 +108,7 @@ const createExecute = ({ filter, runAsLambda }) => {
 			const protocol = protocols[getTxName(context.txType)];
 			if (!protocol) return reject(new _ocap_util_lib_error.CustomError("UNSUPPORTED_TX", `Unsupported tx type ${context.txType}`));
 			protocol.run(context, async (error) => {
+				context.timer?.mark("protocol");
 				if (isRetrySupported) {
 					if (error) return reject(error);
 					return resolve(context);
@@ -120,7 +122,9 @@ const createExecute = ({ filter, runAsLambda }) => {
 						txState = states.tx.create(context, txStatus);
 					}
 					await context.statedb.tx.create(txState.hash, txState, context);
+					context.timer?.mark("commit");
 					flushEvents(context, { txState });
+					context.timer?.mark("indexdb");
 				} catch (e) {
 					context.logger?.error("Failed to save transaction to statedb", {
 						error: e,
@@ -134,7 +138,8 @@ const createExecute = ({ filter, runAsLambda }) => {
 					txHash: context.txHash,
 					txStatus,
 					txState,
-					error
+					error,
+					timing: context.timer?.summary()
 				});
 				if (error) return reject(error);
 				return resolve(context);
@@ -143,7 +148,9 @@ const createExecute = ({ filter, runAsLambda }) => {
 	});
 	if (typeof runAsLambda === "function") return async (context, protocols) => {
 		let ctx = context;
-		const startTime = Date.now();
+		context.timer = new require_tx_timer.TxTimer();
+		let entryFinalized = false;
+		let savedLedgerSequence;
 		try {
 			const txState = await runAsLambda(async (txn) => {
 				ctx = (0, lodash_pick.default)(context, [
@@ -156,10 +163,12 @@ const createExecute = ({ filter, runAsLambda }) => {
 					"filter",
 					"extra",
 					"logger",
-					"ledgerSequence"
+					"ledgerSequence",
+					"timer"
 				]);
 				ctx.txn = txn;
 				await execute(ctx, protocols, true);
+				if (ctx.ledgerSequence && !savedLedgerSequence) savedLedgerSequence = ctx.ledgerSequence;
 				const state = getStates(context).tx.create(ctx, "OK");
 				await context.statedb.tx.create(state.hash, state, ctx);
 				return state;
@@ -171,6 +180,7 @@ const createExecute = ({ filter, runAsLambda }) => {
 					if (ctx.txHash && ctx.ledger && ctx.ledgerSequence && ctx.txBase64) try {
 						await ctx.ledger.finalizeEntry(ctx.txHash, stateCommitHash || "", ctx.ledgerSequence, ctx.txBase64);
 						ctx.stateCommitHash = stateCommitHash || "";
+						entryFinalized = true;
 					} catch (err) {
 						ctx.logger?.error("Failed to finalize ledger entry", {
 							txHash: ctx.txHash,
@@ -180,7 +190,9 @@ const createExecute = ({ filter, runAsLambda }) => {
 					}
 				}
 			});
+			ctx.timer?.mark("commit");
 			flushEvents(ctx, { txState });
+			ctx.timer?.mark("indexdb");
 			ctx.ledger?.createCheckpointIfNeeded()?.catch((err) => {
 				ctx.logger?.error("Background checkpoint creation failed", {
 					txHash: ctx.txHash,
@@ -191,7 +203,7 @@ const createExecute = ({ filter, runAsLambda }) => {
 				txHash: ctx.txHash,
 				txState,
 				txStatus: "OK",
-				duration: Date.now() - startTime
+				timing: ctx.timer?.summary()
 			});
 		} catch (error) {
 			const err = error;
@@ -223,6 +235,7 @@ const createExecute = ({ filter, runAsLambda }) => {
 							if (ctx.txHash && ctx.ledger && ctx.ledgerSequence && ctx.txBase64) try {
 								await ctx.ledger.finalizeEntry(ctx.txHash, stateCommitHash || "", ctx.ledgerSequence, ctx.txBase64);
 								ctx.stateCommitHash = stateCommitHash || "";
+								entryFinalized = true;
 							} catch (err$1) {
 								ctx.logger?.error("Failed to finalize ledger entry", {
 									txHash: ctx.txHash,
@@ -232,7 +245,9 @@ const createExecute = ({ filter, runAsLambda }) => {
 							}
 						}
 					});
+					ctx.timer?.mark("commit");
 					flushEvents(ctx, { txState });
+					ctx.timer?.mark("indexdb");
 					ctx.ledger?.createCheckpointIfNeeded()?.catch((err$1) => {
 						ctx.logger?.error("Background checkpoint creation failed", {
 							txHash: ctx.txHash,
@@ -244,7 +259,7 @@ const createExecute = ({ filter, runAsLambda }) => {
 						txState,
 						txStatus,
 						error,
-						duration: Date.now() - startTime
+						timing: ctx.timer?.summary()
 					});
 				} catch (innerErr) {
 					ctx.logger?.error("Failed to save invalid transaction to statedb", {
@@ -259,11 +274,27 @@ const createExecute = ({ filter, runAsLambda }) => {
 			}
 			throw error;
 		} finally {
+			if (!entryFinalized) {
+				const ledger = ctx.ledger || context.ledger;
+				const txHash = ctx.txHash || context.txHash;
+				const txBase64 = ctx.txBase64 || context.txBase64;
+				const sequence = ctx.ledgerSequence || savedLedgerSequence || context.ledgerSequence;
+				if (ledger && txHash && sequence && txBase64) try {
+					await ledger.finalizeEntry(txHash, "", sequence, txBase64);
+				} catch (err) {
+					(ctx.logger || context.logger)?.error("Failed to finalize orphaned ledger entry", {
+						txHash,
+						sequence,
+						error: err
+					});
+				}
+			}
 			(0, lodash_merge.default)(context, ctx);
 		}
 		return ctx;
 	};
 	return async (context, protocols) => {
+		context.timer = new require_tx_timer.TxTimer();
 		const result = await execute(context, protocols);
 		if (result.ledger && result.txHash && result.ledgerSequence && result.txBase64) try {
 			await result.ledger.finalizeEntry(result.txHash, "", result.ledgerSequence, result.txBase64);
@@ -273,6 +304,7 @@ const createExecute = ({ filter, runAsLambda }) => {
 				error: err
 			});
 		}
+		result.timer?.mark("finalize");
 		result.ledger?.createCheckpointIfNeeded()?.catch((err) => {
 			result.logger?.error("Background checkpoint creation failed", {
 				txHash: result.txHash,

package/lib/execute.d.cts

@@ -1,3 +1,4 @@
+import { TxTimer } from "./tx-timer.cjs";
 import { IAccountState, IGasContext } from "@ocap/types";
 import { CustomError } from "@ocap/util/lib/error";
 import { Blacklist } from "@ocap/state";
@@ -31,6 +32,8 @@ interface IExecutionContext extends IGasContext {
   ledgerSequence?: number;
   /** State commit hash set by onCommit callback (Dolt only) */
   stateCommitHash?: string;
+  /** Transaction execution timer */
+  timer?: TxTimer;
 }
 /** Protocol runner interface */
 interface IProtocolRunner {

package/lib/pipes/write-ledger.cjs

@@ -73,7 +73,9 @@ const WriteLedger = async (context, next) => {
 			timestamp: txTime ? new Date(txTime).getTime() : Date.now(),
 			txExtra
 		};
+		context.timer?.mark("verify");
 		const entry = await ledger.append(txInput);
+		context.timer?.mark("ledger");
 		context.ledgerSequence = entry.sequence;
 		debug$1("Transaction written to ledger", {
 			txHash,

package/lib/pipes/write-ledger.d.cts

@@ -47,6 +47,10 @@ interface IWriteLedgerContext {
     };
     [key: string]: unknown;
   };
+  /** Transaction execution timer */
+  timer?: {
+    mark(label: string): void;
+  };
 }
 /**
  * Error codes for ledger write failures

package/lib/tx-timer.cjs

@@ -0,0 +1,32 @@
+
+//#region src/tx-timer.ts
+/**
+* Lightweight transaction execution timer.
+*
+* Records named marks at key stages and computes per-stage durations.
+* Overhead per mark() call is a single Date.now() invocation (< 1 µs).
+*/
+var TxTimer = class {
+	constructor() {
+		this.marks = [];
+		this.origin = Date.now();
+	}
+	/** Record a named timestamp. */
+	mark(label) {
+		this.marks.push([label, Date.now()]);
+	}
+	/** Compute per-stage durations (ms) between consecutive marks. */
+	summary() {
+		const result = {};
+		let prev = this.origin;
+		for (const [label, time] of this.marks) {
+			result[label] = time - prev;
+			prev = time;
+		}
+		result.total = prev - this.origin;
+		return result;
+	}
+};
+
+//#endregion
+exports.TxTimer = TxTimer;

package/lib/tx-timer.d.cts

@@ -0,0 +1,17 @@
+//#region src/tx-timer.d.ts
+/**
+ * Lightweight transaction execution timer.
+ *
+ * Records named marks at key stages and computes per-stage durations.
+ * Overhead per mark() call is a single Date.now() invocation (< 1 µs).
+ */
+declare class TxTimer {
+  private marks;
+  private origin;
+  /** Record a named timestamp. */
+  mark(label: string): void;
+  /** Compute per-stage durations (ms) between consecutive marks. */
+  summary(): Record<string, number>;
+}
+//#endregion
+export { TxTimer };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.29.7",
+  "version": "1.29.9",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "type": "module",
   "main": "./lib/index.cjs",
@@ -46,22 +46,22 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "1.29.7",
-    "@arcblock/did-util": "1.29.7",
-    "@arcblock/jwt": "1.29.7",
-    "@arcblock/validator": "1.29.7",
-    "@arcblock/vc": "1.29.7",
+    "@arcblock/did": "1.29.9",
+    "@arcblock/did-util": "1.29.9",
+    "@arcblock/jwt": "1.29.9",
+    "@arcblock/validator": "1.29.9",
+    "@arcblock/vc": "1.29.9",
     "@blocklet/xss": "^0.3.7",
-    "@ocap/asset": "1.29.7",
-    "@ocap/client": "1.29.7",
-    "@ocap/mcrypto": "1.29.7",
-    "@ocap/merkle-tree": "1.29.7",
-    "@ocap/message": "1.29.7",
-    "@ocap/state": "1.29.7",
-    "@ocap/tx-pipeline": "1.29.7",
-    "@ocap/types": "1.29.7",
-    "@ocap/util": "1.29.7",
-    "@ocap/wallet": "1.29.7",
+    "@ocap/asset": "1.29.9",
+    "@ocap/client": "1.29.9",
+    "@ocap/mcrypto": "1.29.9",
+    "@ocap/merkle-tree": "1.29.9",
+    "@ocap/message": "1.29.9",
+    "@ocap/state": "1.29.9",
+    "@ocap/tx-pipeline": "1.29.9",
+    "@ocap/types": "1.29.9",
+    "@ocap/util": "1.29.9",
+    "@ocap/wallet": "1.29.9",
     "debug": "^4.4.3",
     "deep-diff": "^1.0.2",
     "lodash": "^4.17.23",
@@ -72,8 +72,8 @@
     "elliptic": "6.5.3"
   },
   "devDependencies": {
-    "@ocap/e2e-test": "1.29.7",
-    "@ocap/statedb-memory": "1.29.7",
+    "@ocap/e2e-test": "1.29.9",
+    "@ocap/statedb-memory": "1.29.9",
     "@types/debug": "^4.1.12",
     "@types/lodash": "^4.17.16",
     "start-server-and-test": "^1.14.0"