@ocap/tx-pipeline 1.30.9 → 1.30.11

package/esm/pipes/decode-itx.mjs

@@ -72,6 +72,7 @@ function DecodeItx(context, next) {
 	} catch (_err) {
 		return next(new CustomError("INVALID_TX", "Failed to decode itx"));
 	}
+	context.timer?.mark?.("decode");
 	next();
 }
 

package/esm/pipes/take-state-snapshot.mjs

@@ -24,6 +24,7 @@ function CreateTakeStateSnapshotPipe({ key = "stateSnapshot" } = {}) {
 			});
 		}
 		ctx[key] = cloneDeep(statesMap);
+		ctx.timer?.mark?.("protocolRead");
 		return next();
 	};
 }

package/esm/pipes/verify-multisig-v2.mjs

@@ -4,7 +4,7 @@ import { CustomError } from "@ocap/util/lib/error";
 import get from "lodash/get.js";
 import { decodeAny } from "@ocap/message";
 import { getListField, setListField } from "@ocap/util/lib/get-list-field";
-import { toTypeInfo } from "@arcblock/did";
+import { isFromPublicKey, toTypeInfo } from "@arcblock/did";
 import cloneDeep from "lodash/cloneDeep.js";
 import { fromPublicKey } from "@ocap/wallet";
 import omit from "lodash/omit.js";
@@ -26,6 +26,7 @@ function CreateVerifyMultiSigV2Pipe({ signersKey }) {
 		for (let i = 0; i < signatures.length; i++) {
 			const { signer, pk, delegator, signature, extra = "" } = signatures[i];
 			const address = delegator || signer;
+			if (isFromPublicKey(address, pk) === false) return next(new CustomError("INVALID_SIGNATURE", `signer ${address} and pk do not match`));
 			const wallet = fromPublicKey(pk, toTypeInfo(address));
 			const txBytes = encodeTxByEncoding(context.txEncoding, tx);
 			try {

package/esm/pipes/verify-multisig.mjs

@@ -3,7 +3,7 @@ import { unwrapOpaqueAnyData } from "../helpers/unwrap-opaque-any.mjs";
 import { CustomError } from "@ocap/util/lib/error";
 import { decodeAny } from "@ocap/message";
 import { deleteListField, getListField, setListField } from "@ocap/util/lib/get-list-field";
-import { toTypeInfo } from "@arcblock/did";
+import { isFromPublicKey, toTypeInfo } from "@arcblock/did";
 import cloneDeep from "lodash/cloneDeep.js";
 import { fromPublicKey } from "@ocap/wallet";
 
@@ -18,6 +18,7 @@ function CreateVerifyMultiSigPipe(numSigs = 0) {
 		while (signatures.length > 0) {
 			const { signer, pk, delegator, signature, data } = signatures.shift();
 			const address = delegator || signer;
+			if (isFromPublicKey(address, pk) === false) return next(new CustomError("INVALID_SIGNATURE", `signer ${address} and pk do not match`));
 			const wallet = fromPublicKey(pk, toTypeInfo(address));
 			setListField(tx, "signatures", [{
 				signer,

package/esm/pipes/verify-signature.mjs

@@ -28,6 +28,7 @@ async function VerifySignature(context, next) {
 		console.error("tx.signature verify failed", err);
 		return next(new CustomError("INVALID_SIGNATURE", "tx.signature verify failed"));
 	}
+	context.timer?.mark?.("verify");
 	next();
 }
 

package/esm/pipes/verify-state-diff.mjs

@@ -77,6 +77,7 @@ function fixMigratedReceipts(receipts, statesMap) {
 function CreateVerifyStateDiffPipe({ snapshotKey = "stateSnapshot" } = {}) {
 	return function VerifyStateDiff(context, next) {
 		const { logger, [snapshotKey]: snapshotStates } = context;
+		context.timer?.mark?.("protocolWrite");
 		if (!snapshotStates) return next(new CustomError("FORBIDDEN", `context.${snapshotKey} is missing, please call VerifyStateDiff after TakeStateSnapshot`));
 		const txState = create(context, "OK", false);
 		const contextStates = groupStatesByAddress(context);
@@ -125,6 +126,7 @@ function CreateVerifyStateDiffPipe({ snapshotKey = "stateSnapshot" } = {}) {
 				}
 			}
 		}
+		context.timer?.mark?.("protocolDiff");
 		next();
 	};
 }

package/lib/pipes/decode-itx.cjs

@@ -74,6 +74,7 @@ function DecodeItx(context, next) {
 	} catch (_err) {
 		return next(new _ocap_util_lib_error.CustomError("INVALID_TX", "Failed to decode itx"));
 	}
+	context.timer?.mark?.("decode");
 	next();
 }
 

package/lib/pipes/take-state-snapshot.cjs

@@ -27,6 +27,7 @@ function CreateTakeStateSnapshotPipe({ key = "stateSnapshot" } = {}) {
 			});
 		}
 		ctx[key] = (0, lodash_cloneDeep.default)(statesMap);
+		ctx.timer?.mark?.("protocolRead");
 		return next();
 	};
 }

package/lib/pipes/verify-multisig-v2.cjs

@@ -31,6 +31,7 @@ function CreateVerifyMultiSigV2Pipe({ signersKey }) {
 		for (let i = 0; i < signatures.length; i++) {
 			const { signer, pk, delegator, signature, extra = "" } = signatures[i];
 			const address = delegator || signer;
+			if ((0, _arcblock_did.isFromPublicKey)(address, pk) === false) return next(new _ocap_util_lib_error.CustomError("INVALID_SIGNATURE", `signer ${address} and pk do not match`));
 			const wallet = (0, _ocap_wallet.fromPublicKey)(pk, (0, _arcblock_did.toTypeInfo)(address));
 			const txBytes = require_helpers_encode_tx_by_context.encodeTxByEncoding(context.txEncoding, tx);
 			try {

package/lib/pipes/verify-multisig.cjs

@@ -21,6 +21,7 @@ function CreateVerifyMultiSigPipe(numSigs = 0) {
 		while (signatures.length > 0) {
 			const { signer, pk, delegator, signature, data } = signatures.shift();
 			const address = delegator || signer;
+			if ((0, _arcblock_did.isFromPublicKey)(address, pk) === false) return next(new _ocap_util_lib_error.CustomError("INVALID_SIGNATURE", `signer ${address} and pk do not match`));
 			const wallet = (0, _ocap_wallet.fromPublicKey)(pk, (0, _arcblock_did.toTypeInfo)(address));
 			(0, _ocap_util_lib_get_list_field.setListField)(tx, "signatures", [{
 				signer,

package/lib/pipes/verify-signature.cjs

@@ -32,6 +32,7 @@ async function VerifySignature(context, next) {
 		console.error("tx.signature verify failed", err);
 		return next(new _ocap_util_lib_error.CustomError("INVALID_SIGNATURE", "tx.signature verify failed"));
 	}
+	context.timer?.mark?.("verify");
 	next();
 }
 

package/lib/pipes/verify-state-diff.cjs

@@ -83,6 +83,7 @@ function fixMigratedReceipts(receipts, statesMap) {
 function CreateVerifyStateDiffPipe({ snapshotKey = "stateSnapshot" } = {}) {
 	return function VerifyStateDiff(context, next) {
 		const { logger, [snapshotKey]: snapshotStates } = context;
+		context.timer?.mark?.("protocolWrite");
 		if (!snapshotStates) return next(new _ocap_util_lib_error.CustomError("FORBIDDEN", `context.${snapshotKey} is missing, please call VerifyStateDiff after TakeStateSnapshot`));
 		const txState = (0, _ocap_state_lib_states_tx.create)(context, "OK", false);
 		const contextStates = groupStatesByAddress(context);
@@ -131,6 +132,7 @@ function CreateVerifyStateDiffPipe({ snapshotKey = "stateSnapshot" } = {}) {
 				}
 			}
 		}
+		context.timer?.mark?.("protocolDiff");
 		next();
 	};
 }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.30.9",
+  "version": "1.30.11",
   "description": "Pipeline runner and common pipelines to process transactions",
   "type": "module",
   "main": "./lib/index.cjs",
@@ -49,15 +49,15 @@
     "elliptic": "6.5.3"
   },
   "dependencies": {
-    "@arcblock/did": "1.30.9",
-    "@arcblock/did-util": "1.30.9",
-    "@ocap/client": "1.30.9",
-    "@ocap/mcrypto": "1.30.9",
-    "@ocap/message": "1.30.9",
-    "@ocap/state": "1.30.9",
-    "@ocap/types": "1.30.9",
-    "@ocap/util": "1.30.9",
-    "@ocap/wallet": "1.30.9",
+    "@arcblock/did": "1.30.11",
+    "@arcblock/did-util": "1.30.11",
+    "@ocap/client": "1.30.11",
+    "@ocap/mcrypto": "1.30.11",
+    "@ocap/message": "1.30.11",
+    "@ocap/state": "1.30.11",
+    "@ocap/types": "1.30.11",
+    "@ocap/util": "1.30.11",
+    "@ocap/wallet": "1.30.11",
     "debug": "^4.4.3",
     "lodash": "^4.17.23"
   }