Xdc (#205)

lerna.json

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

package.json

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

packages/api/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.0.3",
+  "version": "2.0.4",
   "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": "^2.0.3",
-    "@skandha/monitoring": "^2.0.3",
-    "@skandha/types": "^2.0.3",
-    "@skandha/utils": "^2.0.3",
+    "@skandha/executor": "^2.0.4",
+    "@skandha/monitoring": "^2.0.4",
+    "@skandha/types": "^2.0.4",
+    "@skandha/utils": "^2.0.4",
     "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": "2.0.3",
+  "version": "2.0.4",
   "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": "^2.0.3",
-    "@skandha/db": "^2.0.3",
-    "@skandha/executor": "^2.0.3",
-    "@skandha/monitoring": "^2.0.3",
-    "@skandha/node": "^2.0.3",
-    "@skandha/types": "^2.0.3",
+    "@skandha/api": "^2.0.4",
+    "@skandha/db": "^2.0.4",
+    "@skandha/executor": "^2.0.4",
+    "@skandha/monitoring": "^2.0.4",
+    "@skandha/node": "^2.0.4",
+    "@skandha/types": "^2.0.4",
     "find-up": "5.0.0",
     "got": "12.5.3",
     "js-yaml": "4.1.0",

packages/db/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.0.3",
+  "version": "2.0.4",
   "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": "^2.0.3"
+    "@skandha/types": "^2.0.4"
   },
   "devDependencies": {
     "@types/rocksdb": "3.0.1",

packages/executor/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.0.3",
+  "version": "2.0.4",
   "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": "^2.0.3",
-    "@skandha/params": "^2.0.3",
-    "@skandha/types": "^2.0.3",
-    "@skandha/utils": "^2.0.3",
+    "@skandha/monitoring": "^2.0.4",
+    "@skandha/params": "^2.0.4",
+    "@skandha/types": "^2.0.4",
+    "@skandha/utils": "^2.0.4",
     "async-mutex": "0.4.0",
     "ethers": "5.7.2",
     "strict-event-emitter-types": "2.0.0",

packages/executor/src/config.ts

@@ -319,6 +319,10 @@ export class Config {
       )
     );
 
+    config.eip1559 = Boolean(
+      fromEnvVar("EIP1559", config.eip1559 || bundlerDefaultConfigs.eip1559)
+    );
+
     // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
     if (!config.whitelistedEntities) {
       config.whitelistedEntities = bundlerDefaultConfigs.whitelistedEntities;
@@ -392,6 +396,7 @@ const bundlerDefaultConfigs: BundlerConfig = {
   pvgMarkupPercent: 0,
   cglMarkupPercent: 0,
   vglMarkupPercent: 3000, // 30%
+  eip1559: true,
 };
 
 function getEnvVar<T>(envVar: string, fallback: T): T | string {

packages/executor/src/executor.ts

@@ -203,7 +203,8 @@ export class Executor {
 
     // can't use eip2930 in unsafeMode and on chains that dont support 1559
     if (
-      (this.config.unsafeMode ||
+      (!this.networkConfig.eip1559 ||
+        this.config.unsafeMode ||
         chainsWithoutEIP1559.some((chainId) => chainId === this.chainId)) &&
       this.networkConfig.eip2930
     ) {

packages/executor/src/interfaces.ts

@@ -174,6 +174,8 @@ export interface NetworkConfig {
   pvgMarkupPercent: number;
   cglMarkupPercent: number;
   vglMarkupPercent: number;
+  // enables / disabled eip1559
+  eip1559: boolean;
 }
 
 export type BundlerConfig = Omit<

packages/executor/src/services/BundlingService/relayers/classic.ts

@@ -59,6 +59,7 @@ export class ClassicRelayer extends BaseRelayer {
       }
 
       if (
+        !this.networkConfig.eip1559 ||
         chainsWithoutEIP1559.some((chainId: number) => chainId === this.chainId)
       ) {
         transactionRequest.gasPrice = bundle.maxFeePerGas;

packages/executor/src/services/BundlingService/relayers/fastlane.ts

@@ -100,6 +100,7 @@ export class FastlaneRelayer extends BaseRelayer {
       }
 
       if (
+        !this.networkConfig.eip1559 ||
         chainsWithoutEIP1559.some((chainId: number) => chainId === this.chainId)
       ) {
         transactionRequest.gasPrice = bundle.maxFeePerGas;

packages/executor/src/services/BundlingService/service.ts

@@ -157,6 +157,7 @@ export class BundlingService {
         let { maxPriorityFeePerGas, maxFeePerGas } = gasFee;
         const { enforceGasPriceThreshold } = this.networkConfig;
         if (
+          !this.networkConfig.eip1559 ||
           chainsWithoutEIP1559.some(
             (chainId: number) => chainId === this.chainId
           )

packages/executor/src/services/EntryPointService/versions/0.0.7.ts

@@ -95,6 +95,7 @@ export class EntryPointV7Service implements IEntryPointService {
       );
       return res[0];
     } catch (error: any) {
+      console.log(error);
       const err = decodeRevertReason(error);
       if (err != null) {
         throw new RpcError(err, RpcErrorCodes.EXECUTION_REVERTED);
@@ -115,6 +116,7 @@ export class EntryPointV7Service implements IEntryPointService {
         .catch((err) => this.nonGethErrorHandler(err));
       return this.parseValidationResult(userOp, errorResult);
     } catch (err: any) {
+      console.log(err);
       const decodedError = decodeRevertReason(err);
       if (decodedError != null) {
         throw new RpcError(decodedError, RpcErrorCodes.VALIDATION_FAILED);

packages/monitoring/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.0.3",
+  "version": "2.0.4",
   "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": "^2.0.3",
+    "@skandha/types": "^2.0.4",
     "prom-client": "15.1.0"
   }
 }

packages/node/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.0.3",
+  "version": "2.0.4",
   "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": "^2.0.3",
-    "@skandha/db": "^2.0.3",
-    "@skandha/executor": "^2.0.3",
-    "@skandha/monitoring": "^2.0.3",
-    "@skandha/params": "^2.0.3",
-    "@skandha/types": "^2.0.3",
-    "@skandha/utils": "^2.0.3",
+    "@skandha/api": "^2.0.4",
+    "@skandha/db": "^2.0.4",
+    "@skandha/executor": "^2.0.4",
+    "@skandha/monitoring": "^2.0.4",
+    "@skandha/params": "^2.0.4",
+    "@skandha/types": "^2.0.4",
+    "@skandha/utils": "^2.0.4",
     "abstract-leveldown": "7.2.0",
     "datastore-core": "8.0.1",
     "ethers": "5.7.2",

packages/params/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.0.3",
+  "version": "2.0.4",
   "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": "^2.0.3",
-    "@skandha/utils": "^2.0.3",
+    "@skandha/types": "^2.0.4",
+    "@skandha/utils": "^2.0.4",
     "ethers": "5.7.2"
   },
   "scripts": {

packages/params/src/eip1559.ts

@@ -10,4 +10,5 @@ export const chainsWithoutEIP1559: number[] = [
   534351, // "scrollSepolia"
   31, // rootstock testnet
   30, // rootstock mainnet
+  51, // XDC Apothem Network
 ];

packages/types/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.0.3",
+  "version": "2.0.4",
   "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": "2.0.3",
+  "version": "2.0.4",
   "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": "^2.0.3",
+    "@skandha/types": "^2.0.4",
     "any-signal": "3.0.1",
     "bigint-buffer": "1.1.5",
     "case": "^1.6.3",