Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert ":tada: EntryPoint v0.7 support" #716

Merged
merged 2 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 1 addition & 25 deletions config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -132,12 +129,6 @@
"url": "https://rpc.ankr.com/blast_testnet_sepolia/0f2ac70eb2e86d935951e9d3874deeb44525123a1ce2a7cf609cf1f0a098d2d6",
"type": "private"
}
],
"84532": [
{
"url": "https://sepolia.base.org",
"type": "public"
}
]
},
"currency": {
Expand Down Expand Up @@ -1008,14 +999,6 @@
},
"0x00000061fefce24a79343c27127435286bb7a4e1": {
"supportedChainIds": [88888, 88882]
},
"0x0000000071727De22E5E9d8BAf0edAc6f37da032": {
"supportedChainIds": [84532]
}
},
"entryPointV07Data": {
"0x0000000071727De22E5E9d8BAf0edAc6f37da032": {
"supportedChainIds": [84532]
}
},
"zeroAddress": "0x0000000000000000000000000000000000000000",
Expand Down Expand Up @@ -1112,12 +1095,5 @@
"preVerificationGas": 2172916
}
},
"disableFeeValidation": [],
"hardcodedGasLimits": {
"84532": {
"verificationGasLimit": 2000000,
"callGasLimit": 2000000,
"preVerificationGas": 45000000
}
}
"disableFeeValidation": []
}
2 changes: 1 addition & 1 deletion k8s/relayer/values.prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 0 additions & 5 deletions k8s/relayer/values.staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
99 changes: 0 additions & 99 deletions src/common/db/dao/UserOperationV07DAO.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/common/db/dao/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export * from "./TransactionDAO";
export * from "./UserOperationDAO";
export * from "./UserOperationStateDAO";
export * from "./UserOperationV07DAO";
4 changes: 2 additions & 2 deletions src/common/db/interface/IUserOperationDAO.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down
75 changes: 0 additions & 75 deletions src/common/db/interface/IUserOperationV07DAO.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/common/db/interface/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
export * from "./IDBService";
export * from "./ITransactionDAO";
export * from "./IUserOperationDAO";
export * from "./IUserOperationV07DAO";
export * from "./IUserOperationStateDAO";
18 changes: 1 addition & 17 deletions src/common/db/mongo/Mongo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ import {
UserOperationsMapType,
UserOperationsStateMap,
UserOperationsStateMapType,
UserOperationsV07Map,
UserOperationsV07MapType,
} from "./models";

const log = logger.child({
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down
31 changes: 0 additions & 31 deletions src/common/db/mongo/interface/IUserOperationV07.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/common/db/mongo/interface/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export * from "./IBlockchainTransaction";
export * from "./IUserOperation";
export * from "./IUserOperationState";
export * from "./IUserOperationV07";
Loading