@ocap/state 1.30.3 → 1.30.5

package/esm/states/tx.mjs

@@ -4,7 +4,7 @@ import { BN, fromTokenToUnit, isBN, toBase64 } from "@ocap/util";
 import { CustomError } from "@ocap/util/lib/error";
 import pick from "lodash/pick.js";
 import get from "lodash/get.js";
-import { decodeAny, formatMessage, fromTypeUrl } from "@ocap/message";
+import { createMessage, decodeAny, formatMessage, fromTypeUrl, toTypeUrl } from "@ocap/message";
 import { getListField } from "@ocap/util/lib/get-list-field";
 import { getRelatedAddresses } from "@ocap/util/lib/get-related-addr";
 import camelCase from "lodash/camelCase.js";
@@ -796,10 +796,24 @@ const getTxReceipts = ({ tx, code }, ctx = {}) => {
 };
 const create = (context, code = "OK", verifyReceipts = true) => {
 	const { txHash, txTime, tx, totalGas, itxExtras = {}, extra = {} } = context;
-	const itx = decodeAny(tx.itx).value;
-	const typeUrl = fromTypeUrl(tx.itx.typeUrl);
-	const typeName = tx.itx.typeUrl.split(":").pop() || "";
-	const itxJson = formatMessage(typeUrl, itx);
+	const rawItx = tx.itx;
+	let typeUrlRaw;
+	let itx;
+	if (rawItx && typeof rawItx.typeUrl === "string") {
+		typeUrlRaw = rawItx.typeUrl;
+		if (typeof rawItx.value === "string") itx = decodeAny(rawItx).value;
+		else {
+			itx = {};
+			for (const [k, v] of Object.entries(rawItx)) if (k !== "typeUrl" && k !== "type_url") itx[k] = v;
+		}
+	} else if (rawItx && typeof rawItx.type === "string" && "value" in rawItx) {
+		typeUrlRaw = toTypeUrl(rawItx.type);
+		itx = rawItx.value || {};
+	} else throw new CustomError("INVALID_TX", "tx.itx missing typeUrl/type");
+	const typeUrl = fromTypeUrl(typeUrlRaw);
+	const typeName = typeUrlRaw.split(":").pop() || "";
+	const innerMessage = createMessage(typeUrl, itx);
+	const itxJson = formatMessage(typeUrl, innerMessage?.toObject ? innerMessage.toObject() : itx);
 	const result = {
 		code,
 		hash: txHash,
@@ -830,8 +844,8 @@ const create = (context, code = "OK", verifyReceipts = true) => {
 			itx: { __typename: typeUrl },
 			itxJson: {
 				_type: typeUrl,
-				encoded_value: tx.itx.value,
-				type_url: tx.itx.typeUrl,
+				encoded_value: rawItx?.value ?? null,
+				type_url: typeUrlRaw,
 				...itxJson,
 				...itxExtras,
 				data: itx.data || null

package/lib/states/tx.cjs

@@ -802,10 +802,24 @@ const getTxReceipts = ({ tx, code }, ctx = {}) => {
 };
 const create = (context, code = "OK", verifyReceipts = true) => {
 	const { txHash, txTime, tx, totalGas, itxExtras = {}, extra = {} } = context;
-	const itx = (0, _ocap_message.decodeAny)(tx.itx).value;
-	const typeUrl = (0, _ocap_message.fromTypeUrl)(tx.itx.typeUrl);
-	const typeName = tx.itx.typeUrl.split(":").pop() || "";
-	const itxJson = (0, _ocap_message.formatMessage)(typeUrl, itx);
+	const rawItx = tx.itx;
+	let typeUrlRaw;
+	let itx;
+	if (rawItx && typeof rawItx.typeUrl === "string") {
+		typeUrlRaw = rawItx.typeUrl;
+		if (typeof rawItx.value === "string") itx = (0, _ocap_message.decodeAny)(rawItx).value;
+		else {
+			itx = {};
+			for (const [k, v] of Object.entries(rawItx)) if (k !== "typeUrl" && k !== "type_url") itx[k] = v;
+		}
+	} else if (rawItx && typeof rawItx.type === "string" && "value" in rawItx) {
+		typeUrlRaw = (0, _ocap_message.toTypeUrl)(rawItx.type);
+		itx = rawItx.value || {};
+	} else throw new _ocap_util_lib_error.CustomError("INVALID_TX", "tx.itx missing typeUrl/type");
+	const typeUrl = (0, _ocap_message.fromTypeUrl)(typeUrlRaw);
+	const typeName = typeUrlRaw.split(":").pop() || "";
+	const innerMessage = (0, _ocap_message.createMessage)(typeUrl, itx);
+	const itxJson = (0, _ocap_message.formatMessage)(typeUrl, innerMessage?.toObject ? innerMessage.toObject() : itx);
 	const result = {
 		code,
 		hash: txHash,
@@ -836,8 +850,8 @@ const create = (context, code = "OK", verifyReceipts = true) => {
 			itx: { __typename: typeUrl },
 			itxJson: {
 				_type: typeUrl,
-				encoded_value: tx.itx.value,
-				type_url: tx.itx.typeUrl,
+				encoded_value: rawItx?.value ?? null,
+				type_url: typeUrlRaw,
 				...itxJson,
 				...itxExtras,
 				data: itx.data || null

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.30.3",
+  "version": "1.30.5",
   "description": "State management utilities for OCAP blockchain",
   "type": "module",
   "main": "./lib/index.cjs",
@@ -40,14 +40,14 @@
     "clean": "rm -rf lib esm"
   },
   "dependencies": {
-    "@arcblock/did": "1.30.3",
-    "@arcblock/validator": "1.30.3",
-    "@ocap/contract": "1.30.3",
-    "@ocap/mcrypto": "1.30.3",
-    "@ocap/message": "1.30.3",
-    "@ocap/types": "1.30.3",
-    "@ocap/util": "1.30.3",
-    "@ocap/wallet": "1.30.3",
+    "@arcblock/did": "1.30.5",
+    "@arcblock/validator": "1.30.5",
+    "@ocap/contract": "1.30.5",
+    "@ocap/mcrypto": "1.30.5",
+    "@ocap/message": "1.30.5",
+    "@ocap/types": "1.30.5",
+    "@ocap/util": "1.30.5",
+    "@ocap/wallet": "1.30.5",
     "bloom-filters": "^1.3.9",
     "lodash": "^4.17.23"
   },