some amendments as per #140

etherspot · Jan 18, 2024 · bc0c145 · bc0c145
1 parent 616f328
commit bc0c145
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 43 deletions.
diff --git a/packages/executor/test/fixtures/getConfig.ts b/packages/executor/test/fixtures/getConfig.ts
@@ -1,40 +1,39 @@
 import { utils } from "ethers";
 import { Config } from "../../src/config";
-import { DefaultRpcUrl, EntryPointAddress, NetworkName, TestAccountMnemonic } from "../constants";
+import { DefaultRpcUrl, EntryPointAddress, TestAccountMnemonic } from "../constants";
 import { ConfigOptions, NetworkConfig } from "../../src/interfaces";
 
 const BaseConfig: ConfigOptions = {
-  networks: {
-    [NetworkName]: {
-      entryPoints: [EntryPointAddress],
-      relayers: [TestAccountMnemonic],
-      rpcEndpoint: DefaultRpcUrl,
-      beneficiary: "",
-      minInclusionDenominator: 10,
-      throttlingSlack: 10,
-      banSlack: 50,
-      minStake: utils.parseEther("0.01"),
-      minUnstakeDelay: 0,
-      minSignerBalance: utils.parseEther("0.1"),
-      multicall: "0xcA11bde05977b3631167028862bE2a173976CA11",
-      estimationStaticBuffer: 35000,
-      validationGasLimit: 10e6,
-      receiptLookupRange: 1024,
-      etherscanApiKey: "",
-      conditionalTransactions: false,
-      rpcEndpointSubmit: "",
-      gasPriceMarkup: 0,
-      enforceGasPrice: false,
-      enforceGasPriceThreshold: 1000,
-      eip2930: false,
-      useropsTTL: 300,
-      whitelistedEntities: { paymaster: [], account: [], factory: [] },
-      bundleGasLimitMarkup: 25000,
-      bundleInterval: 10000,
-      bundleSize: 4,
-      relayingMode: "classic",
-      pvgMarkup: 0,
-    }
+  config: {
+    entryPoints: [EntryPointAddress],
+    relayers: [TestAccountMnemonic],
+    rpcEndpoint: DefaultRpcUrl,
+    beneficiary: "",
+    minInclusionDenominator: 10,
+    throttlingSlack: 10,
+    banSlack: 50,
+    minStake: utils.parseEther("0.01"),
+    minUnstakeDelay: 0,
+    minSignerBalance: utils.parseEther("0.1"),
+    multicall: "0xcA11bde05977b3631167028862bE2a173976CA11",
+    estimationStaticBuffer: 35000,
+    validationGasLimit: 10e6,
+    receiptLookupRange: 1024,
+    etherscanApiKey: "",
+    conditionalTransactions: false,
+    rpcEndpointSubmit: "",
+    gasPriceMarkup: 0,
+    enforceGasPrice: false,
+    enforceGasPriceThreshold: 1000,
+    eip2930: false,
+    useropsTTL: 300,
+    whitelistedEntities: { paymaster: [], account: [], factory: [] },
+    bundleGasLimitMarkup: 25000,
+    bundleInterval: 10000,
+    bundleSize: 4,
+    relayingMode: "classic",
+    pvgMarkup: 0,
+    canonicalMempoolId: "",
   },
   testingMode: false,
   unsafeMode: false,
@@ -49,13 +48,13 @@ let config: Config,
 export async function getConfigs() {
   if (!config) {
     config = await Config.init(BaseConfig);
-    networkConfig = config.getNetworkConfig(NetworkName)!;
+    networkConfig = config.getNetworkConfig();
 
     configUnsafe = await Config.init({
       ...BaseConfig,
       unsafeMode: true
     });
-    networkConfigUnsafe = configUnsafe.getNetworkConfig(NetworkName)!;
+    networkConfigUnsafe = configUnsafe.getNetworkConfig();
   }
   return {
     config,

diff --git a/packages/executor/test/fixtures/modules.ts b/packages/executor/test/fixtures/modules.ts
@@ -1,20 +1,23 @@
 import { Config } from "../../src/config";
 import { NetworkConfig } from "../../src/interfaces";
-import { ChainId, NetworkName } from "../constants";
+import { ChainId } from "../constants";
 import { logger } from "../mocks/logger";
 import { getServices } from "./services";
 import { Web3, Debug, Skandha, Eth } from "../../src/modules";
 
 export async function getModules(config: Config, networkConfig: NetworkConfig) {
-  const provider = config.getNetworkProvider(NetworkName)!;
+  const provider = config.getNetworkProvider()!;
   const {
     reputationService,
     userOpValidationService,
     mempoolService,
     bundlingService,
   } = await getServices(config, networkConfig);
 
-  const web3 = new Web3(config);
+  const web3 = new Web3(config, {
+    version: "test",
+    commit: "commit"
+  });
   const debug = new Debug(
     provider,
     bundlingService,
@@ -23,7 +26,6 @@ export async function getModules(config: Config, networkConfig: NetworkConfig) {
     networkConfig
   );
   const skandha = new Skandha(
-    NetworkName,
     ChainId,
     provider,
     config,

diff --git a/packages/executor/test/fixtures/services.ts b/packages/executor/test/fixtures/services.ts
@@ -3,15 +3,15 @@ import { Config } from "../../src/config";
 import { NetworkConfig } from "../../src/interfaces";
 import { BundlingService, EventsService, MempoolService, ReputationService, UserOpValidationService } from "../../src/services";
 import { LocalDbController } from "../mocks/database";
-import { ChainId, NetworkName } from "../constants";
+import { ChainId } from "../constants";
 import { logger } from "../mocks/logger";
 
 export async function getServices(config: Config, networkConfig: NetworkConfig) {
-  const provider = config.getNetworkProvider(NetworkName)!;
+  const provider = config.getNetworkProvider();
   const db = new LocalDbController("test");
   const reputationService = new ReputationService(
     db,
-    config.supportedNetworks[NetworkName],
+    config.chainId,
     networkConfig.minInclusionDenominator,
     networkConfig.throttlingSlack,
     networkConfig.banSlack,
@@ -23,7 +23,6 @@ export async function getServices(config: Config, networkConfig: NetworkConfig)
     provider,
     reputationService,
     ChainId,
-    NetworkName,
     config,
     logger
   );
@@ -37,7 +36,6 @@ export async function getServices(config: Config, networkConfig: NetworkConfig)
 
   const bundlingService = new BundlingService(
     ChainId,
-    NetworkName,
     provider,
     mempoolService,
     userOpValidationService,