@dedot/contracts 0.18.3 → 0.18.5

package/cjs/errors.js

@@ -16,6 +16,31 @@ const formatDispatchError = (err, moduleError) => {
         return `Dispatch error: ${JSON.stringify(err)}`;
     }
 };
+/**
+ * Formats a Solidity contract error message.
+ * If the error is the standard Solidity 'Error(string message)' pattern,
+ * extract and return the message string directly.
+ * Otherwise, return a formatted error name.
+ *
+ * @param details - The Solidity error result details.
+ * @returns A formatted error message string.
+ */
+const formatSolErrorMessage = (details) => {
+    if (!details) {
+        return 'Unknown Error';
+    }
+    // Check if this is the standard Solidity Error(string) pattern
+    const isSolidityError = details.errorName === 'Error' &&
+        details.abiItem.inputs.length === 1 &&
+        details.abiItem.inputs[0]?.name === 'message' &&
+        details.abiItem.inputs[0]?.type === 'string';
+    if (isSolidityError && details.args && details.args.length > 0) {
+        // Extract the message from args[0]
+        return String(details.args[0]);
+    }
+    // Default format for other errors
+    return `Error: ${details.errorName}`;
+};
 /**
  * Represents an error that occurred during the instantiation of a smart contract.
  * This class extends the base `DedotError` and includes a `raw` property of type `ContractInstantiateResult`.
@@ -220,7 +245,7 @@ class SolContractInstantiateError extends ContractInstantiateError {
             this.message = message;
         }
         else if (details) {
-            this.message = `Error: ${details.errorName}`;
+            this.message = formatSolErrorMessage(details);
         }
     }
 }
@@ -243,7 +268,7 @@ class SolContractExecutionError extends ContractExecutionError {
             this.message = message;
         }
         else if (details) {
-            this.message = `Error: ${details.errorName}`;
+            this.message = formatSolErrorMessage(details);
         }
     }
 }

package/cjs/executor/sol/SolConstructorTxExecutor.js

@@ -83,8 +83,8 @@ class SolConstructorTxExecutor extends index_js_2.SolDeployerExecutor {
                         return;
                     const executor = new SolConstructorQueryExecutor_js_1.SolConstructorQueryExecutor(this.client, // --
                     this.registry, this.code, {
-                        defaultCaller: signerAddress,
                         ...this.options,
+                        defaultCaller: signerAddress,
                     });
                     const { raw: { gasRequired, storageDeposit }, } = await executor.doExecute('new')(...params);
                     // Replace the params with gas limit and storage deposit limit

package/cjs/executor/sol/SolTxExecutor.js

@@ -37,8 +37,8 @@ class SolTxExecutor extends SolContractExecutor_js_1.SolContractExecutor {
                         return;
                     const executor = new SolQueryExecutor_js_1.SolQueryExecutor(this.client, // --
                     this.registry, this.address, {
-                        defaultCaller: signerAddress,
                         ...this.options,
+                        defaultCaller: signerAddress,
                     });
                     const { raw } = await executor.doExecute(name)(...params);
                     const { gasRequired, storageDeposit } = raw;

package/errors.js

@@ -13,6 +13,31 @@ const formatDispatchError = (err, moduleError) => {
         return `Dispatch error: ${JSON.stringify(err)}`;
     }
 };
+/**
+ * Formats a Solidity contract error message.
+ * If the error is the standard Solidity 'Error(string message)' pattern,
+ * extract and return the message string directly.
+ * Otherwise, return a formatted error name.
+ *
+ * @param details - The Solidity error result details.
+ * @returns A formatted error message string.
+ */
+const formatSolErrorMessage = (details) => {
+    if (!details) {
+        return 'Unknown Error';
+    }
+    // Check if this is the standard Solidity Error(string) pattern
+    const isSolidityError = details.errorName === 'Error' &&
+        details.abiItem.inputs.length === 1 &&
+        details.abiItem.inputs[0]?.name === 'message' &&
+        details.abiItem.inputs[0]?.type === 'string';
+    if (isSolidityError && details.args && details.args.length > 0) {
+        // Extract the message from args[0]
+        return String(details.args[0]);
+    }
+    // Default format for other errors
+    return `Error: ${details.errorName}`;
+};
 /**
  * Represents an error that occurred during the instantiation of a smart contract.
  * This class extends the base `DedotError` and includes a `raw` property of type `ContractInstantiateResult`.
@@ -211,7 +236,7 @@ export class SolContractInstantiateError extends ContractInstantiateError {
             this.message = message;
         }
         else if (details) {
-            this.message = `Error: ${details.errorName}`;
+            this.message = formatSolErrorMessage(details);
         }
     }
 }
@@ -233,7 +258,7 @@ export class SolContractExecutionError extends ContractExecutionError {
             this.message = message;
         }
         else if (details) {
-            this.message = `Error: ${details.errorName}`;
+            this.message = formatSolErrorMessage(details);
         }
     }
 }

package/executor/sol/SolConstructorTxExecutor.js

@@ -80,8 +80,8 @@ export class SolConstructorTxExecutor extends SolDeployerExecutor {
                         return;
                     const executor = new SolConstructorQueryExecutor(this.client, // --
                     this.registry, this.code, {
-                        defaultCaller: signerAddress,
                         ...this.options,
+                        defaultCaller: signerAddress,
                     });
                     const { raw: { gasRequired, storageDeposit }, } = await executor.doExecute('new')(...params);
                     // Replace the params with gas limit and storage deposit limit

package/executor/sol/SolTxExecutor.js

@@ -34,8 +34,8 @@ export class SolTxExecutor extends SolContractExecutor {
                         return;
                     const executor = new SolQueryExecutor(this.client, // --
                     this.registry, this.address, {
-                        defaultCaller: signerAddress,
                         ...this.options,
+                        defaultCaller: signerAddress,
                     });
                     const { raw } = await executor.doExecute(name)(...params);
                     const { gasRequired, storageDeposit } = raw;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/contracts",
-  "version": "0.18.3",
+  "version": "0.18.5",
   "description": "Delightful ink! Contract APIs",
   "author": "Tung Vu <tung@dedot.dev>",
   "homepage": "https://dedot.dev",
@@ -18,10 +18,10 @@
     "test": "npx vitest --watch=false"
   },
   "dependencies": {
-    "@dedot/api": "0.18.3",
-    "@dedot/codecs": "0.18.3",
-    "@dedot/types": "0.18.3",
-    "@dedot/utils": "0.18.3",
+    "@dedot/api": "0.18.5",
+    "@dedot/codecs": "0.18.5",
+    "@dedot/types": "0.18.5",
+    "@dedot/utils": "0.18.5",
     "viem": "^2.37.7"
   },
   "publishConfig": {
@@ -32,7 +32,7 @@
     "node": ">=18"
   },
   "license": "Apache-2.0",
-  "gitHead": "1252671f59eeff8f17b2280a8b13925024191438",
+  "gitHead": "54b0dcfddfc775009eacd1858441b1b2b12b9cae",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {