fix error parsing on redirected calls (#83)

* fix error parsing on redirected calls

* chore(release): v0.0.39

Author: 0xSulpiride

lerna.json

@@ -4,7 +4,7 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.0.38",
+  "version": "0.0.39",
   "stream": "true",
   "command": {
     "version": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "root",
   "private": true,
-  "version": "0.0.38",
+  "version": "0.0.39",
   "engines": {
     "node": ">=18.0.0"
   },

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "0.0.38",
+  "version": "0.0.39",
   "description": "The API module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -35,12 +35,12 @@
     "class-transformer": "0.5.1",
     "class-validator": "0.14.0",
     "ethers": "5.7.2",
-    "executor": "^0.0.38",
+    "executor": "^0.0.39",
     "fastify": "4.14.1",
     "pino": "8.11.0",
     "pino-pretty": "10.0.0",
     "reflect-metadata": "0.1.13",
-    "types": "^0.0.38"
+    "types": "^0.0.39"
   },
   "devDependencies": {
     "@types/connect": "3.4.35"

packages/api/src/app.ts

@@ -138,11 +138,10 @@ export class ApiApp {
 
       if (this.redirectRpc && method in RedirectedRPCMethods) {
         const body = await redirectApi.redirect(method, params);
-        return res.status(200).send({
-          jsonrpc,
-          id,
-          ...body,
-        });
+        if (body.error) {
+          return res.status(200).send({ ...body, id });
+        }
+        return res.status(200).send({ jsonrpc, id, ...body });
       }
 
       if (result === undefined) {

packages/api/src/modules/redirect.ts

@@ -22,8 +22,9 @@ export class RedirectAPI {
 
             /** NETHERMIND ERROR PARSING */
             if (
-              body.error.data.startsWith("Reverted ") &&
-              body.error.code == -32015
+              body.error.data &&
+              body.error.code == -32015 &&
+              body.error.data.startsWith("Reverted ")
             ) {
               body.error.code = 3;
               body.error.message = "execution reverted";

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cli",
-  "version": "0.0.38",
+  "version": "0.0.39",
   "description": "> TODO: description",
   "author": "zincoshine <psramanuj@gmail.com>",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -31,13 +31,13 @@
     "url": "https://https://github.com/etherspot/skandha/issues"
   },
   "dependencies": {
-    "api": "^0.0.38",
-    "db": "^0.0.38",
-    "executor": "^0.0.38",
+    "api": "^0.0.39",
+    "db": "^0.0.39",
+    "executor": "^0.0.39",
     "find-up": "5.0.0",
     "got": "12.5.3",
     "js-yaml": "4.1.0",
-    "types": "^0.0.38",
+    "types": "^0.0.39",
     "yargs": "17.6.2"
   },
   "devDependencies": {

packages/db/package.json

@@ -1,6 +1,6 @@
 {
   "name": "db",
-  "version": "0.0.38",
+  "version": "0.0.39",
   "description": "The DB module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/etherspot-bundler#readme",
@@ -37,6 +37,6 @@
   "devDependencies": {
     "@types/rocksdb": "3.0.1",
     "prettier": "^2.8.4",
-    "types": "^0.0.38"
+    "types": "^0.0.39"
   }
 }

packages/executor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "executor",
-  "version": "0.0.38",
+  "version": "0.0.39",
   "description": "The Relayer module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -33,7 +33,7 @@
   "dependencies": {
     "async-mutex": "0.4.0",
     "ethers": "5.7.2",
-    "params": "^0.0.38",
-    "types": "^0.0.38"
+    "params": "^0.0.39",
+    "types": "^0.0.39"
   }
 }

packages/params/package.json

@@ -1,6 +1,6 @@
 {
   "name": "params",
-  "version": "0.0.38",
+  "version": "0.0.39",
   "description": "Various bundler parameters",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/skandha#readme",
@@ -25,7 +25,7 @@
     "@eth-optimism/sdk": "3.0.0",
     "@mantleio/sdk": "0.2.1",
     "ethers": "5.7.2",
-    "types": "^0.0.38"
+    "types": "^0.0.39"
   },
   "scripts": {
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "types",
-  "version": "0.0.38",
+  "version": "0.0.39",
   "description": "The types of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",