Merge pull request #716 from bcnmy/revert-713-feature/new-ep-v-0-7

Revert ":tada: EntryPoint v0.7 support"

config/default.json

@@ -7,9 +7,6 @@
     5003, 100, 10200, 195, 196, 2810, 997, 713715, 3799, 167009, 80084, 5845,
     167000, 1328, 1329, 995, 28882, 288, 1802203764, 1740, 1750, 4202, 1135
   ],
-  "supportedNetworksV07": [
-    84532
-  ],
   "EIP1559SupportedNetworks": [
     1, 137, 42161, 10, 43114, 43113, 8453, 59140, 59144, 204, 5611, 421614,
     11155111, 84532, 168587773, 80085, 81457, 42170, 169, 56400, 11155420,
@@ -132,12 +129,6 @@
           "url": "https://rpc.ankr.com/blast_testnet_sepolia/0f2ac70eb2e86d935951e9d3874deeb44525123a1ce2a7cf609cf1f0a098d2d6",
           "type": "private"
         }
-      ],
-      "84532":  [
-        {
-          "url": "https://sepolia.base.org",
-          "type": "public"
-        }
       ]
     },
     "currency": {
@@ -1008,14 +999,6 @@
     },
     "0x00000061fefce24a79343c27127435286bb7a4e1": {
       "supportedChainIds": [88888, 88882]
-    },
-    "0x0000000071727De22E5E9d8BAf0edAc6f37da032": {
-      "supportedChainIds": [84532]
-    }
-  },
-  "entryPointV07Data": {
-    "0x0000000071727De22E5E9d8BAf0edAc6f37da032": {
-      "supportedChainIds": [84532]
     }
   },
   "zeroAddress": "0x0000000000000000000000000000000000000000",
@@ -1112,12 +1095,5 @@
       "preVerificationGas": 2172916
     }
   },
-  "disableFeeValidation": [],
-  "hardcodedGasLimits": {
-    "84532": {
-      "verificationGasLimit": 2000000,
-      "callGasLimit": 2000000,
-      "preVerificationGas": 45000000 
-    }
-  }
+  "disableFeeValidation": []
 }

k8s/relayer/values.prod.yaml

@@ -6,7 +6,7 @@ index: 0
 relayer:
   environment: "production"
   name: "relayer-server"
-  image: "gcr.io/biconomy-prod/sdk/relayer-node-service@sha256:bdbe43f367e73f803838198b082d925dbcb28de0dc3936165afa0d92219c83e2"
+  image: "gcr.io/biconomy-prod/sdk/relayer-node-service@latest"
   port: "3000"
   replicaCount: 1
   resource:

k8s/relayer/values.staging.yaml

@@ -25,11 +25,6 @@ affinity_tolerations:
   key: "app"
   values: "relayer-server"
 
-# make sure pods are deployed in different nodes
-affinity:
-  antiAffinity:
-    topologyKey: "kubernetes.io/hostname"
-
 secret_encrypted:
   projectID: biconomy-staging
   key: sdk-staging-relayer-node-service

package.json

@@ -29,7 +29,7 @@
     "crypto-js": "^4.1.1",
     "dd-trace": "^4.17.0",
     "dotenv": "^16.0.3",
-    "entry-point-gas-estimations": "1.0.2",
+    "entry-point-gas-estimations": "0.0.26",
     "ethereumjs-util": "^7.1.5",
     "express": "^4.18.2",
     "express-handlebars": "^6.0.6",

src/common/db/dao/index.ts

@@ -1,4 +1,3 @@
 export * from "./TransactionDAO";
 export * from "./UserOperationDAO";
 export * from "./UserOperationStateDAO";
-export * from "./UserOperationV07DAO";

src/common/db/interface/IUserOperationDAO.ts

@@ -5,20 +5,20 @@ export type InitialUserOperationDataType = {
   dappAPIKey?: string;
   entryPoint: string;
   sender: string;
-  initCode: string;
   nonce: number;
+  initCode: string;
   callData: string;
   callGasLimit: number;
   verificationGasLimit: number;
   preVerificationGas: number;
   maxFeePerGas: number;
   maxPriorityFeePerGas: number;
+  paymasterAndData: string;
   signature: string;
   userOpHash: string;
   chainId: number;
   status: string;
   paymaster: string;
-  paymasterAndData: string;
   creationTime: number;
   metaData?: object;
 };

src/common/db/interface/index.ts

@@ -1,5 +1,4 @@
 export * from "./IDBService";
 export * from "./ITransactionDAO";
 export * from "./IUserOperationDAO";
-export * from "./IUserOperationV07DAO";
 export * from "./IUserOperationStateDAO";

src/common/db/mongo/Mongo.ts

@@ -11,8 +11,6 @@ import {
   UserOperationsMapType,
   UserOperationsStateMap,
   UserOperationsStateMapType,
-  UserOperationsV07Map,
-  UserOperationsV07MapType,
 } from "./models";
 
 const log = logger.child({
@@ -149,6 +147,7 @@ export class Mongo implements IDBService {
           dbName: "relayer-node-service",
         });
       }
+      log.info("Connected to db");
     } catch (error) {
       log.error("error while connecting to mongo db");
       log.error(error);
@@ -187,21 +186,6 @@ export class Mongo implements IDBService {
     return UserOperationsMap[networkId];
   }
 
-  /**
-   * Method returns user operation model for a given chain id
-   * @param networkId
-   * @returns user operation model for a given chain id
-   */
-  getUserOperationV07(networkId: number): UserOperationsV07MapType[number] {
-    if (!this.client) {
-      throw new Error("Not connected to db");
-    }
-    const supportedNetworksV07: number[] = config.supportedNetworksV07 || [];
-    if (!supportedNetworksV07.includes(networkId))
-      throw new Error(`Network Id ${networkId} is not supported`);
-    return UserOperationsV07Map[networkId];
-  }
-
   /**
    * Method returns user operation state model for a given chain id
    * @param networkId

src/common/db/mongo/interface/index.ts

@@ -1,4 +1,3 @@
 export * from "./IBlockchainTransaction";
 export * from "./IUserOperation";
 export * from "./IUserOperationState";
-export * from "./IUserOperationV07";