changes as per feedback

etherspot · Feb 27, 2024 · 02c8e98 · 02c8e98
1 parent 0e0072c
commit 02c8e98
Show file tree

Hide file tree

Showing 25 changed files with 145 additions and 136 deletions.
diff --git a/admin_frontend/package-lock.json b/admin_frontend/package-lock.json
diff --git a/admin_frontend/package.json b/admin_frontend/package.json
@@ -3,21 +3,21 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@emotion/react": "^11.11.3",
-    "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.15.3",
-    "@mui/lab": "^5.0.0-alpha.159",
-    "@mui/material": "^5.15.3",
-    "@testing-library/jest-dom": "^5.17.0",
-    "@testing-library/react": "^13.4.0",
-    "@testing-library/user-event": "^13.5.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-hot-toast": "^2.4.1",
-    "react-router-dom": "^6.21.1",
+    "@emotion/react": "11.11.3",
+    "@emotion/styled": "11.11.0",
+    "@mui/icons-material": "5.15.3",
+    "@mui/lab": "5.0.0-alpha.159",
+    "@mui/material": "5.15.3",
+    "@testing-library/jest-dom": "5.17.0",
+    "@testing-library/react": "13.4.0",
+    "@testing-library/user-event": "13.5.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
+    "react-hot-toast": "2.4.1",
+    "react-router-dom": "6.21.1",
     "react-scripts": "5.0.1",
-    "styled-components": "^6.1.8",
-    "web-vitals": "^2.1.4"
+    "styled-components": "6.1.8",
+    "web-vitals": "2.1.4"
   },
   "scripts": {
     "start": "PORT=3002 react-scripts start",
@@ -44,8 +44,8 @@
     ]
   },
   "devDependencies": {
-    "autoprefixer": "^10.4.16",
-    "postcss": "^8.4.33",
-    "tailwindcss": "^3.4.1"
+    "autoprefixer": "10.4.16",
+    "postcss": "8.4.33",
+    "tailwindcss": "3.4.1"
   }
 }
diff --git a/admin_frontend/src/components/ApiKeys.jsx b/admin_frontend/src/components/ApiKeys.jsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 import AddCircleIcon from "@mui/icons-material/AddCircle";
-import RemoveCircleIcon from '@mui/icons-material/RemoveCircle';
+import RemoveCircleIcon from "@mui/icons-material/RemoveCircle";
 import toast from "react-hot-toast";
 import { TextField } from "@mui/material";
 import Table from "@mui/material/Table";
@@ -17,7 +17,7 @@ import IconButton from "@mui/material/IconButton";
 import OutlinedInput from "@mui/material/OutlinedInput";
 import FormControl from "@mui/material/FormControl";
 import InputLabel from "@mui/material/InputLabel";
-import Checkbox from '@mui/material/Checkbox';
+import Checkbox from "@mui/material/Checkbox";
 import Header from "./Header";
 
 const ApiKeysPage = () => {
@@ -38,8 +38,8 @@ const ApiKeysPage = () => {
 	};
 
 	const handleChange = (event) => {
-		setTxnMode(event.target.checked ? 1 : 0)
-  };
+		setTxnMode(event.target.checked ? 1 : 0);
+	};
 
 	const fetchData = async () => {
 		try {
@@ -49,13 +49,10 @@ const ApiKeysPage = () => {
 					method: "GET",
 				})
 			).json();
-			console.log("data: ", data);
 			setKeys(data);
 			setLoading(false);
 		} catch (err) {
-			toast.error(
-				"Check Backend Service for more info"
-			);
+			toast.error("Check Backend Service for more info");
 		}
 	};
 
@@ -68,8 +65,14 @@ const ApiKeysPage = () => {
 			toast.error("Please input both API_KEY & PRIVATE_KEY field");
 			return;
 		}
-		if (!/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*-_&])[A-Za-z\d@$!%*-_&]{8,}$/.test(apiKey)) {
-			toast.error("Invalid Validation: API_KEY format. Please see the docs for more info");
+		if (
+			!/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*-_&])[A-Za-z\d@$!%*-_&]{8,}$/.test(
+				apiKey
+			)
+		) {
+			toast.error(
+				"Invalid Validation: API_KEY format. Please see the docs for more info"
+			);
 			return;
 		}
 		try {
@@ -80,16 +83,16 @@ const ApiKeysPage = () => {
 				SUPPORTED_NETWORKS: supportedNetworks ?? "",
 				ERC20_PAYMASTERS: customErc20Paymaster ?? "",
 				TRANSACTION_LIMIT: txnMode,
-        NO_OF_TRANSACTIONS_IN_A_MONTH: noOfTxn,
-        INDEXER_ENDPOINT: 'http://localhost:3003'
+				NO_OF_TRANSACTIONS_IN_A_MONTH: noOfTxn,
+				INDEXER_ENDPOINT:
+					process.env.REACT_APP_INDEXER_ENDPOINT ?? "http://localhost:3003",
 			};
-			const data = await (
-				await fetch("http://localhost:5050/saveKey", {
-					method: "POST",
-					body: JSON.stringify(requestData),
-				})
-			).json();
-			if (!data.error) {
+			const data = await fetch("http://localhost:5050/saveKey", {
+				method: "POST",
+				body: JSON.stringify(requestData),
+			});
+			const dataJson = await data.json();
+			if (!dataJson.error) {
 				toast.success("Saved Successfully");
 				setApiKey("");
 				setPrivateKey("");
@@ -99,9 +102,7 @@ const ApiKeysPage = () => {
 				toast.error("Could not save");
 			}
 		} catch (err) {
-			toast.error(
-				"Check Backend Service for more info"
-			);
+			toast.error("Check Backend Service for more info");
 			setLoading(false);
 		}
 	};
@@ -124,9 +125,7 @@ const ApiKeysPage = () => {
 			}
 		} catch (err) {
 			console.log("err: ", err);
-			toast.error(
-				"Check Backend Service for more info"
-			);
+			toast.error("Check Backend Service for more info");
 			setLoading(false);
 		}
 	};
@@ -229,13 +228,13 @@ const ApiKeysPage = () => {
 							</TableCell>
 							<TableCell>
 								<Checkbox
-									checked={txnMode === 0? false : true}
+									checked={txnMode === 0 ? false : true}
 									onChange={handleChange}
-									inputProps={{ 'aria-label': 'controlled' }}
+									inputProps={{ "aria-label": "controlled" }}
 								/>
 							</TableCell>
 							<TableCell>
-							<TextField
+								<TextField
 									type="number"
 									variant="outlined"
 									color="secondary"
@@ -284,7 +283,9 @@ const ApiKeysPage = () => {
 								</TableCell>
 								<TableCell>{row.SUPPORTED_NETWORKS}</TableCell>
 								<TableCell>{row.ERC20_PAYMASTERS}</TableCell>
-								<TableCell>{row.TRANSACTION_LIMIT === 0 ? 'OFF': 'ON'}</TableCell>
+								<TableCell>
+									{row.TRANSACTION_LIMIT === 0 ? "OFF" : "ON"}
+								</TableCell>
 								<TableCell>{row.NO_OF_TRANSACTIONS_IN_A_MONTH}</TableCell>
 								<TableCell>
 									<LoadingButton

diff --git a/backend/indexer/.eslintrc.json b/backend/indexer/.eslintrc.json
@@ -1,3 +1,3 @@
 {
   "extends": "ponder"
-}
+}
diff --git a/backend/indexer/.gitignore b/backend/indexer/.gitignore
@@ -17,4 +17,5 @@
  /generated/
  /.ponder/
 
- package-lock.json
+ package-lock.json
+
diff --git a/backend/indexer/EtherspotAbi.ts b/backend/indexer/EtherspotAbi.ts
@@ -597,4 +597,4 @@ export const EtherspotPaymasterAbi = [
     "stateMutability": "nonpayable",
     "type": "function"
   }
-] as const;
+] as const;
diff --git a/backend/indexer/package.json b/backend/indexer/package.json
@@ -1,26 +1,26 @@
 {
-"name": "indexer",
-"version": "0.0.1",
-"private": true,
-"type": "module",
-"scripts": {
-  "dev": "ponder dev --port 3003",
-  "start": "ponder start --port 3003",
-  "codegen": "ponder codegen",
-  "lint": "eslint .",
-  "typecheck": "tsc"
-},
-"dependencies": {
-  "@ponder/core": "0.2.2",
-  "viem": "1.19.3"
-},
-"devDependencies": {
-  "@types/node": "20.9.0",
-  "eslint": "8.53.0",
-  "eslint-config-ponder": "0.2.2",
-  "typescript": "5.2.2"
-},
-"engines": {
-  "node": ">=18.14"
-}
-} 
+  "name": "indexer",
+  "version": "0.0.1",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "dev": "ponder dev --port 3003",
+    "start": "ponder start --port 3003",
+    "codegen": "ponder codegen",
+    "lint": "eslint .",
+    "typecheck": "tsc"
+  },
+  "dependencies": {
+    "@ponder/core": "0.2.2",
+    "viem": "1.19.3"
+  },
+  "devDependencies": {
+    "@types/node": "20.9.0",
+    "eslint": "8.53.0",
+    "eslint-config-ponder": "0.2.2",
+    "typescript": "5.2.2"
+  },
+  "engines": {
+    "node": ">=18.14"
+  }
+}
diff --git a/backend/indexer/ponder.schema.ts b/backend/indexer/ponder.schema.ts
@@ -11,4 +11,4 @@ export default createSchema((p) => ({
     year: p.int(),
     chainId: p.int(),
   }),
-}));
+}));
diff --git a/backend/indexer/src/index.ts b/backend/indexer/src/index.ts
@@ -6,17 +6,20 @@ ponder.on("EtherspotPaymaster:SponsorSuccessful", async ({ event, context }) =>
   const { args, block, transaction, log } = event;
   const time = Number(BigNumber.from(block.timestamp).toString());
   const timestamp = new Date(time * 1000);
-
-  await db.PaymasterEvent.create({
-    id: transaction.hash + log.logIndex,
-    data: {
-      chainId: network.chainId,
-      sender: args.sender,
-      paymaster: args.paymaster,
-      transactionHash: transaction.hash,
-      timestamp: block.timestamp,
-      month: timestamp.getMonth(),
-      year: timestamp.getFullYear()
-    }
-  })
-});
+  try {
+    await db.PaymasterEvent.create({
+      id: transaction.hash + log.logIndex,
+      data: {
+        chainId: network.chainId,
+        sender: args.sender,
+        paymaster: args.paymaster,
+        transactionHash: transaction.hash,
+        timestamp: block.timestamp,
+        month: timestamp.getMonth(),
+        year: timestamp.getFullYear()
+      }
+    })
+  } catch (err) {
+    // caught err
+  }
+});
diff --git a/backend/indexer/tsconfig.json b/backend/indexer/tsconfig.json
@@ -23,4 +23,4 @@
   },
   "include": ["./**/*.ts"],
   "exclude": ["node_modules"]
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,4 +11,4 @@ export default createSchema((p) => ({ @@
         year: p.int(),
         chainId: p.int(),
       }),
-    }));
+    }));