Check localsigner availability (#258)

lerna.json

@@ -3,7 +3,7 @@
     "packages/*"
   ],
   "npmClient": "yarn",
-  "version": "1.5.27",
+  "version": "1.5.28",
   "stream": "true",
   "command": {
     "version": {

packages/api/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.27",
+  "version": "1.5.28",
   "description": "The API module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -34,10 +34,10 @@
   "dependencies": {
     "@fastify/cors": "9.0.1",
     "@fastify/websocket": "10.0.1",
-    "@skandha/executor": "^1.5.27",
-    "@skandha/monitoring": "^1.5.27",
-    "@skandha/types": "^1.5.27",
-    "@skandha/utils": "^1.5.27",
+    "@skandha/executor": "^1.5.28",
+    "@skandha/monitoring": "^1.5.28",
+    "@skandha/types": "^1.5.28",
+    "@skandha/utils": "^1.5.28",
     "class-transformer": "0.5.1",
     "class-validator": "0.14.1",
     "ethers": "5.7.2",

packages/cli/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.27",
+  "version": "1.5.28",
   "description": "> TODO: description",
   "author": "zincoshine <[email protected]>",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -40,12 +40,12 @@
     "@libp2p/peer-id-factory": "2.0.1",
     "@libp2p/prometheus-metrics": "1.1.3",
     "@multiformats/multiaddr": "12.1.3",
-    "@skandha/api": "^1.5.27",
-    "@skandha/db": "^1.5.27",
-    "@skandha/executor": "^1.5.27",
-    "@skandha/monitoring": "^1.5.27",
-    "@skandha/node": "^1.5.27",
-    "@skandha/types": "^1.5.27",
+    "@skandha/api": "^1.5.28",
+    "@skandha/db": "^1.5.28",
+    "@skandha/executor": "^1.5.28",
+    "@skandha/monitoring": "^1.5.28",
+    "@skandha/node": "^1.5.28",
+    "@skandha/types": "^1.5.28",
     "find-up": "5.0.0",
     "got": "12.5.3",
     "js-yaml": "4.1.0",

packages/contracts/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.27",
+  "version": "1.5.28",
   "description": "Smart contracts of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",

packages/db/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.27",
+  "version": "1.5.28",
   "description": "The DB module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/etherspot-bundler#readme",
@@ -34,7 +34,7 @@
   "dependencies": {
     "@chainsafe/ssz": "0.10.1",
     "@farcaster/rocksdb": "5.5.0",
-    "@skandha/types": "^1.5.27"
+    "@skandha/types": "^1.5.28"
   },
   "devDependencies": {
     "@types/rocksdb": "3.0.1",

packages/executor/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.27",
+  "version": "1.5.28",
   "description": "The Relayer module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -35,10 +35,10 @@
   },
   "dependencies": {
     "@flashbots/ethers-provider-bundle": "0.6.2",
-    "@skandha/monitoring": "^1.5.27",
-    "@skandha/params": "^1.5.27",
-    "@skandha/types": "^1.5.27",
-    "@skandha/utils": "^1.5.27",
+    "@skandha/monitoring": "^1.5.28",
+    "@skandha/params": "^1.5.28",
+    "@skandha/types": "^1.5.28",
+    "@skandha/utils": "^1.5.28",
     "async-mutex": "0.4.0",
     "ethers": "5.7.2",
     "strict-event-emitter-types": "2.0.0",

packages/executor/src/config.ts

@@ -10,13 +10,15 @@ export class Config {
   redirectRpc: boolean;
   config: NetworkConfig;
   chainId: number;
+  localSigner?: providers.JsonRpcSigner;
 
   constructor(options: ConfigOptions) {
     this.testingMode = options.testingMode ?? false;
     this.unsafeMode = options.unsafeMode ?? false;
     this.redirectRpc = options.redirectRpc ?? false;
     this.config = this.getDefaultNetworkConfig(options.config);
     this.chainId = 0;
+    this.localSigner = options.localSigner;
   }
 
   static async init(configOptions: ConfigOptions): Promise<Config> {
@@ -28,6 +30,14 @@ export class Config {
       process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0";
       await config.fetchChainId();
     }
+    if (config.testingMode) {
+      const localSigner = config.getNetworkProvider().getSigner();
+      try {
+        void (await localSigner.getAddress());
+        config.localSigner = localSigner;
+        // eslint-disable-next-line no-empty
+      } catch (_) {}
+    }
     return config;
   }
 
@@ -38,8 +48,8 @@ export class Config {
   getRelayers(): Wallet[] | providers.JsonRpcSigner[] | null {
     const provider = this.getNetworkProvider();
 
-    if (this.testingMode) {
-      return [provider.getSigner()];
+    if (this.testingMode && this.localSigner) {
+      return [this.localSigner];
     }
 
     const wallets = [];

packages/executor/src/interfaces.ts

@@ -1,4 +1,4 @@
-import { BigNumber, BigNumberish, BytesLike } from "ethers";
+import { BigNumber, BigNumberish, BytesLike, providers } from "ethers";
 import {
   IWhitelistedEntities,
   RelayingMode,
@@ -188,6 +188,7 @@ export interface ConfigOptions {
   testingMode?: boolean;
   unsafeMode: boolean;
   redirectRpc: boolean;
+  localSigner?: providers.JsonRpcSigner;
 }
 
 export interface SlotMap {

packages/monitoring/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.27",
+  "version": "1.5.28",
   "description": "The Monitoring module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/etherspot-bundler#readme",
@@ -32,7 +32,7 @@
     "check-readme": "typescript-docs-verifier"
   },
   "dependencies": {
-    "@skandha/types": "^1.5.27",
+    "@skandha/types": "^1.5.28",
     "prom-client": "^14.2.0"
   }
 }

packages/node/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.27",
+  "version": "1.5.28",
   "description": "The bundler node module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -56,13 +56,13 @@
     "@libp2p/prometheus-metrics": "1.1.3",
     "@libp2p/tcp": "6.1.0",
     "@multiformats/multiaddr": "11.4.0",
-    "@skandha/api": "^1.5.27",
-    "@skandha/db": "^1.5.27",
-    "@skandha/executor": "^1.5.27",
-    "@skandha/monitoring": "^1.5.27",
-    "@skandha/params": "^1.5.27",
-    "@skandha/types": "^1.5.27",
-    "@skandha/utils": "^1.5.27",
+    "@skandha/api": "^1.5.28",
+    "@skandha/db": "^1.5.28",
+    "@skandha/executor": "^1.5.28",
+    "@skandha/monitoring": "^1.5.28",
+    "@skandha/params": "^1.5.28",
+    "@skandha/types": "^1.5.28",
+    "@skandha/utils": "^1.5.28",
     "@types/varint": "6.0.1",
     "abstract-leveldown": "7.2.0",
     "datastore-core": "8.0.1",

packages/params/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.27",
+  "version": "1.5.28",
   "description": "Various bundler parameters",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/skandha#readme",
@@ -28,8 +28,8 @@
     "@arbitrum/sdk": "3.1.4",
     "@chainsafe/ssz": "0.10.1",
     "@mantleio/sdk": "0.2.1",
-    "@skandha/types": "^1.5.27",
-    "@skandha/utils": "^1.5.27",
+    "@skandha/types": "^1.5.28",
+    "@skandha/utils": "^1.5.28",
     "ethers": "5.7.2"
   },
   "scripts": {

packages/types/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.27",
+  "version": "1.5.28",
   "description": "The types of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",

packages/utils/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.27",
+  "version": "1.5.28",
   "description": "utils of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@chainsafe/as-sha256": "0.3.1",
-    "@skandha/types": "^1.5.27",
+    "@skandha/types": "^1.5.28",
     "any-signal": "3.0.1",
     "bigint-buffer": "1.1.5",
     "case": "^1.6.3",