@seljs/runtime 1.3.0-beta.24 → 1.3.0-beta.28

package/dist/environment/environment.cjs

@@ -194,10 +194,16 @@ var SELRuntime = class {
 				} else if (typeof error.failedCallIndex === "number") failedCall = collectedCalls[error.failedCallIndex] ?? failedCall;
 			}
 			if (!failedCall) throw error;
+			const revertFields = error instanceof require_errors.MulticallBatchError ? {
+				revertReason: error.revertReason,
+				revertData: error.revertData,
+				decodedError: error.decodedError
+			} : {};
 			throw new require_errors.SELContractError(`Contract call failed: ${failedCall.contract}.${failedCall.method}`, {
 				cause: error,
 				contractName: failedCall.contract,
-				methodName: failedCall.method
+				methodName: failedCall.method,
+				...revertFields
 			});
 		}
 		return {

package/dist/environment/environment.mjs

@@ -193,10 +193,16 @@ var SELRuntime = class {
 				} else if (typeof error.failedCallIndex === "number") failedCall = collectedCalls[error.failedCallIndex] ?? failedCall;
 			}
 			if (!failedCall) throw error;
+			const revertFields = error instanceof MulticallBatchError ? {
+				revertReason: error.revertReason,
+				revertData: error.revertData,
+				decodedError: error.decodedError
+			} : {};
 			throw new SELContractError(`Contract call failed: ${failedCall.contract}.${failedCall.method}`, {
 				cause: error,
 				contractName: failedCall.contract,
-				methodName: failedCall.method
+				methodName: failedCall.method,
+				...revertFields
 			});
 		}
 		return {

package/dist/errors/errors.cjs

@@ -4,14 +4,23 @@ let _seljs_common = require("@seljs/common");
 /**
 * Thrown when contract validation or execution fails.
 * Includes optional contract name and method name for context.
+* When the failure is a contract revert, the decoded revert reason and raw
+* revert data are exposed on `revertReason` / `revertData`, and `decodedError`
+* carries any matched custom-error name + args from the contract's ABI.
 */
 var SELContractError = class extends _seljs_common.SELError {
 	contractName;
 	methodName;
+	revertReason;
+	revertData;
+	decodedError;
 	constructor(message, options) {
 		super(message, { cause: options?.cause });
 		this.contractName = options?.contractName;
 		this.methodName = options?.methodName;
+		this.revertReason = options?.revertReason;
+		this.revertData = options?.revertData;
+		this.decodedError = options?.decodedError;
 	}
 };
 /**
@@ -43,16 +52,25 @@ var ExecutionLimitError = class extends _seljs_common.SELError {
 /**
 * Thrown when a Multicall3 batch execution fails.
 * Includes the failed call index and optional contract name/method name for context.
+* When an individual sub-call reverts, `revertReason` / `revertData` carry the
+* decoded reason text and raw return data, and `decodedError` carries any
+* matched custom-error name + args from the contract's ABI.
 */
 var MulticallBatchError = class extends _seljs_common.SELError {
 	failedCallIndex;
 	contractName;
 	methodName;
+	revertReason;
+	revertData;
+	decodedError;
 	constructor(message, options) {
 		super(message, { cause: options?.cause });
 		this.failedCallIndex = options?.failedCallIndex;
 		this.contractName = options?.contractName;
 		this.methodName = options?.methodName;
+		this.revertReason = options?.revertReason;
+		this.revertData = options?.revertData;
+		this.decodedError = options?.decodedError;
 	}
 };
 /**

package/dist/errors/errors.d.cts

@@ -5,14 +5,29 @@ import { SELError, SELEvaluationError } from "@seljs/common";
 /**
  * Thrown when contract validation or execution fails.
  * Includes optional contract name and method name for context.
+ * When the failure is a contract revert, the decoded revert reason and raw
+ * revert data are exposed on `revertReason` / `revertData`, and `decodedError`
+ * carries any matched custom-error name + args from the contract's ABI.
  */
 declare class SELContractError extends SELError {
   readonly contractName?: string;
   readonly methodName?: string;
+  readonly revertReason?: string;
+  readonly revertData?: `0x${string}`;
+  readonly decodedError?: {
+    name: string;
+    args: readonly unknown[];
+  };
   constructor(message: string, options?: {
     cause?: unknown;
     contractName?: string;
     methodName?: string;
+    revertReason?: string;
+    revertData?: `0x${string}`;
+    decodedError?: {
+      name: string;
+      args: readonly unknown[];
+    };
   });
 }
 /**
@@ -44,16 +59,31 @@ declare class ExecutionLimitError extends SELError {
 /**
  * Thrown when a Multicall3 batch execution fails.
  * Includes the failed call index and optional contract name/method name for context.
+ * When an individual sub-call reverts, `revertReason` / `revertData` carry the
+ * decoded reason text and raw return data, and `decodedError` carries any
+ * matched custom-error name + args from the contract's ABI.
  */
 declare class MulticallBatchError extends SELError {
   readonly failedCallIndex?: number;
   readonly contractName?: string;
   readonly methodName?: string;
+  readonly revertReason?: string;
+  readonly revertData?: `0x${string}`;
+  readonly decodedError?: {
+    name: string;
+    args: readonly unknown[];
+  };
   constructor(message: string, options?: {
     cause?: unknown;
     failedCallIndex?: number;
     contractName?: string;
     methodName?: string;
+    revertReason?: string;
+    revertData?: `0x${string}`;
+    decodedError?: {
+      name: string;
+      args: readonly unknown[];
+    };
   });
 }
 /**

package/dist/errors/errors.d.mts

@@ -5,14 +5,29 @@ import { SELError as SELError$1, SELEvaluationError } from "@seljs/common";
 /**
  * Thrown when contract validation or execution fails.
  * Includes optional contract name and method name for context.
+ * When the failure is a contract revert, the decoded revert reason and raw
+ * revert data are exposed on `revertReason` / `revertData`, and `decodedError`
+ * carries any matched custom-error name + args from the contract's ABI.
  */
 declare class SELContractError extends SELError$1 {
   readonly contractName?: string;
   readonly methodName?: string;
+  readonly revertReason?: string;
+  readonly revertData?: `0x${string}`;
+  readonly decodedError?: {
+    name: string;
+    args: readonly unknown[];
+  };
   constructor(message: string, options?: {
     cause?: unknown;
     contractName?: string;
     methodName?: string;
+    revertReason?: string;
+    revertData?: `0x${string}`;
+    decodedError?: {
+      name: string;
+      args: readonly unknown[];
+    };
   });
 }
 /**
@@ -44,16 +59,31 @@ declare class ExecutionLimitError extends SELError$1 {
 /**
  * Thrown when a Multicall3 batch execution fails.
  * Includes the failed call index and optional contract name/method name for context.
+ * When an individual sub-call reverts, `revertReason` / `revertData` carry the
+ * decoded reason text and raw return data, and `decodedError` carries any
+ * matched custom-error name + args from the contract's ABI.
  */
 declare class MulticallBatchError extends SELError$1 {
   readonly failedCallIndex?: number;
   readonly contractName?: string;
   readonly methodName?: string;
+  readonly revertReason?: string;
+  readonly revertData?: `0x${string}`;
+  readonly decodedError?: {
+    name: string;
+    args: readonly unknown[];
+  };
   constructor(message: string, options?: {
     cause?: unknown;
     failedCallIndex?: number;
     contractName?: string;
     methodName?: string;
+    revertReason?: string;
+    revertData?: `0x${string}`;
+    decodedError?: {
+      name: string;
+      args: readonly unknown[];
+    };
   });
 }
 /**

package/dist/errors/errors.mjs

@@ -3,14 +3,23 @@ import { SELError as SELError$1, SELEvaluationError } from "@seljs/common";
 /**
 * Thrown when contract validation or execution fails.
 * Includes optional contract name and method name for context.
+* When the failure is a contract revert, the decoded revert reason and raw
+* revert data are exposed on `revertReason` / `revertData`, and `decodedError`
+* carries any matched custom-error name + args from the contract's ABI.
 */
 var SELContractError = class extends SELError$1 {
 	contractName;
 	methodName;
+	revertReason;
+	revertData;
+	decodedError;
 	constructor(message, options) {
 		super(message, { cause: options?.cause });
 		this.contractName = options?.contractName;
 		this.methodName = options?.methodName;
+		this.revertReason = options?.revertReason;
+		this.revertData = options?.revertData;
+		this.decodedError = options?.decodedError;
 	}
 };
 /**
@@ -42,16 +51,25 @@ var ExecutionLimitError = class extends SELError$1 {
 /**
 * Thrown when a Multicall3 batch execution fails.
 * Includes the failed call index and optional contract name/method name for context.
+* When an individual sub-call reverts, `revertReason` / `revertData` carry the
+* decoded reason text and raw return data, and `decodedError` carries any
+* matched custom-error name + args from the contract's ABI.
 */
 var MulticallBatchError = class extends SELError$1 {
 	failedCallIndex;
 	contractName;
 	methodName;
+	revertReason;
+	revertData;
+	decodedError;
 	constructor(message, options) {
 		super(message, { cause: options?.cause });
 		this.failedCallIndex = options?.failedCallIndex;
 		this.contractName = options?.contractName;
 		this.methodName = options?.methodName;
+		this.revertReason = options?.revertReason;
+		this.revertData = options?.revertData;
+		this.decodedError = options?.decodedError;
 	}
 };
 /**

package/dist/execution/decode-revert.cjs

@@ -0,0 +1,67 @@
+require("../_virtual/_rolldown/runtime.cjs");
+let ox = require("ox");
+//#region src/execution/decode-revert.ts
+const ERROR_STRING_SELECTOR = "0x08c379a0";
+const PANIC_SELECTOR = "0x4e487b71";
+const PANIC_CODES = {
+	0: "generic panic",
+	1: "assertion failed",
+	17: "arithmetic overflow or underflow",
+	18: "division or modulo by zero",
+	33: "enum conversion out of bounds",
+	34: "incorrectly encoded storage byte array",
+	49: "pop on empty array",
+	50: "array index out of bounds",
+	65: "excessive memory allocation",
+	81: "zero-initialized internal function type"
+};
+const errorStringAbi = ox.AbiError.from("error Error(string reason)");
+const panicAbi = ox.AbiError.from("error Panic(uint256 code)");
+function decodeRevertData(data, abi) {
+	if (data === "0x" || data.length < 10) return { data };
+	const selector = data.slice(0, 10).toLowerCase();
+	if (selector === ERROR_STRING_SELECTOR) try {
+		return {
+			data,
+			reason: ox.AbiError.decode(errorStringAbi, data)
+		};
+	} catch {
+		return { data };
+	}
+	if (selector === PANIC_SELECTOR) try {
+		const code = ox.AbiError.decode(panicAbi, data);
+		const numeric = Number(code);
+		return {
+			data,
+			reason: `Panic: ${PANIC_CODES[numeric] ?? `panic code 0x${numeric.toString(16)}`}`
+		};
+	} catch {
+		return { data };
+	}
+	try {
+		const error = ox.AbiError.fromAbi(abi, data);
+		const decoded = ox.AbiError.decode(error, data);
+		const args = decoded === void 0 ? [] : Array.isArray(decoded) ? decoded : [decoded];
+		const formattedArgs = args.map(formatArg).join(", ");
+		return {
+			data,
+			reason: `${error.name}(${formattedArgs})`,
+			decodedError: {
+				name: error.name,
+				args
+			}
+		};
+	} catch {
+		return { data };
+	}
+}
+function formatArg(arg) {
+	if (typeof arg === "bigint") return arg.toString();
+	if (typeof arg === "string") return arg;
+	if (typeof arg === "number" || typeof arg === "boolean" || arg === null || arg === void 0) return String(arg);
+	if (Array.isArray(arg)) return `[${arg.map(formatArg).join(", ")}]`;
+	if (typeof arg === "object") return `{${Object.entries(arg).map(([k, v]) => `${k}: ${formatArg(v)}`).join(", ")}}`;
+	return "";
+}
+//#endregion
+exports.decodeRevertData = decodeRevertData;

package/dist/execution/decode-revert.mjs

@@ -0,0 +1,66 @@
+import { AbiError } from "ox";
+//#region src/execution/decode-revert.ts
+const ERROR_STRING_SELECTOR = "0x08c379a0";
+const PANIC_SELECTOR = "0x4e487b71";
+const PANIC_CODES = {
+	0: "generic panic",
+	1: "assertion failed",
+	17: "arithmetic overflow or underflow",
+	18: "division or modulo by zero",
+	33: "enum conversion out of bounds",
+	34: "incorrectly encoded storage byte array",
+	49: "pop on empty array",
+	50: "array index out of bounds",
+	65: "excessive memory allocation",
+	81: "zero-initialized internal function type"
+};
+const errorStringAbi = AbiError.from("error Error(string reason)");
+const panicAbi = AbiError.from("error Panic(uint256 code)");
+function decodeRevertData(data, abi) {
+	if (data === "0x" || data.length < 10) return { data };
+	const selector = data.slice(0, 10).toLowerCase();
+	if (selector === ERROR_STRING_SELECTOR) try {
+		return {
+			data,
+			reason: AbiError.decode(errorStringAbi, data)
+		};
+	} catch {
+		return { data };
+	}
+	if (selector === PANIC_SELECTOR) try {
+		const code = AbiError.decode(panicAbi, data);
+		const numeric = Number(code);
+		return {
+			data,
+			reason: `Panic: ${PANIC_CODES[numeric] ?? `panic code 0x${numeric.toString(16)}`}`
+		};
+	} catch {
+		return { data };
+	}
+	try {
+		const error = AbiError.fromAbi(abi, data);
+		const decoded = AbiError.decode(error, data);
+		const args = decoded === void 0 ? [] : Array.isArray(decoded) ? decoded : [decoded];
+		const formattedArgs = args.map(formatArg).join(", ");
+		return {
+			data,
+			reason: `${error.name}(${formattedArgs})`,
+			decodedError: {
+				name: error.name,
+				args
+			}
+		};
+	} catch {
+		return { data };
+	}
+}
+function formatArg(arg) {
+	if (typeof arg === "bigint") return arg.toString();
+	if (typeof arg === "string") return arg;
+	if (typeof arg === "number" || typeof arg === "boolean" || arg === null || arg === void 0) return String(arg);
+	if (Array.isArray(arg)) return `[${arg.map(formatArg).join(", ")}]`;
+	if (typeof arg === "object") return `{${Object.entries(arg).map(([k, v]) => `${k}: ${formatArg(v)}`).join(", ")}}`;
+	return "";
+}
+//#endregion
+export { decodeRevertData };

package/dist/execution/round-executor.cjs

@@ -2,6 +2,7 @@ require("../_virtual/_rolldown/runtime.cjs");
 const require_errors = require("../errors/errors.cjs");
 require("../errors/index.cjs");
 const require_debug = require("../debug.cjs");
+const require_decode_revert = require("./decode-revert.cjs");
 let ox = require("ox");
 //#region src/execution/round-executor.ts
 const debug = require_debug.createLogger("execute:round");
@@ -26,7 +27,7 @@ var RoundExecutor = class {
 				const resolvedArgs = this.resolveArgs(call.args, context);
 				encodedCalls.push({
 					target: contract.address,
-					allowFailure: false,
+					allowFailure: true,
 					callData: ox.AbiFunction.encodeData(contract.abi, call.method, resolvedArgs)
 				});
 			}
@@ -45,11 +46,18 @@ var RoundExecutor = class {
 			const contract = this.contracts.get(call.contract);
 			if (!contract) throw new Error(`No ABI registered for contract "${call.contract}"`);
 			const result = results[i];
-			if (!result?.success) throw new require_errors.MulticallBatchError(`Call failed: ${call.contract}.${call.method}`, {
-				failedCallIndex: i,
-				contractName: call.contract,
-				methodName: call.method
-			});
+			if (!result?.success) {
+				const decoded = require_decode_revert.decodeRevertData(result?.returnData ?? "0x", contract.abi);
+				const suffix = decoded.reason ? ` — ${decoded.reason}` : "";
+				throw new require_errors.MulticallBatchError(`Call failed: ${call.contract}.${call.method}${suffix}`, {
+					failedCallIndex: i,
+					contractName: call.contract,
+					methodName: call.method,
+					revertReason: decoded.reason,
+					revertData: decoded.data,
+					decodedError: decoded.decodedError
+				});
+			}
 			const decoded = ox.AbiFunction.decodeResult(contract.abi, call.method, result.returnData);
 			debug("decoded %s.%s -> %o", call.contract, call.method, decoded);
 			this.cache.set(call.id, decoded);

package/dist/execution/round-executor.mjs

@@ -1,6 +1,7 @@
 import { MulticallBatchError } from "../errors/errors.mjs";
 import "../errors/index.mjs";
 import { createLogger } from "../debug.mjs";
+import { decodeRevertData } from "./decode-revert.mjs";
 import { AbiFunction } from "ox";
 //#region src/execution/round-executor.ts
 const debug = createLogger("execute:round");
@@ -25,7 +26,7 @@ var RoundExecutor = class {
 				const resolvedArgs = this.resolveArgs(call.args, context);
 				encodedCalls.push({
 					target: contract.address,
-					allowFailure: false,
+					allowFailure: true,
 					callData: AbiFunction.encodeData(contract.abi, call.method, resolvedArgs)
 				});
 			}
@@ -44,11 +45,18 @@ var RoundExecutor = class {
 			const contract = this.contracts.get(call.contract);
 			if (!contract) throw new Error(`No ABI registered for contract "${call.contract}"`);
 			const result = results[i];
-			if (!result?.success) throw new MulticallBatchError(`Call failed: ${call.contract}.${call.method}`, {
-				failedCallIndex: i,
-				contractName: call.contract,
-				methodName: call.method
-			});
+			if (!result?.success) {
+				const decoded = decodeRevertData(result?.returnData ?? "0x", contract.abi);
+				const suffix = decoded.reason ? ` — ${decoded.reason}` : "";
+				throw new MulticallBatchError(`Call failed: ${call.contract}.${call.method}${suffix}`, {
+					failedCallIndex: i,
+					contractName: call.contract,
+					methodName: call.method,
+					revertReason: decoded.reason,
+					revertData: decoded.data,
+					decodedError: decoded.decodedError
+				});
+			}
 			const decoded = AbiFunction.decodeResult(contract.abi, call.method, result.returnData);
 			debug("decoded %s.%s -> %o", call.contract, call.method, decoded);
 			this.cache.set(call.id, decoded);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seljs/runtime",
-  "version": "1.3.0-beta.24",
+  "version": "1.3.0-beta.28",
   "repository": {
     "url": "https://github.com/abinnovision/seljs"
   },
@@ -50,11 +50,11 @@
   },
   "dependencies": {
     "@marcbachmann/cel-js": "^7.5.3",
-    "@seljs/checker": "1.3.0-beta.24",
-    "@seljs/common": "1.3.0-beta.24",
-    "@seljs/env": "1.3.0-beta.24",
+    "@seljs/checker": "1.3.0-beta.28",
+    "@seljs/common": "1.3.0-beta.28",
+    "@seljs/env": "1.3.0-beta.28",
     "@seljs/schema": "1.2.0",
-    "@seljs/types": "1.3.0-beta.24",
+    "@seljs/types": "1.3.0-beta.28",
     "debug": "^4.4.3",
     "ox": "^0.14.10"
   },