feat(Ops): Finishing cleaning stagging env + fixing some bugs happeni…

…ng only their

backend/.env.schema

@@ -6,6 +6,7 @@ ALLOWED_ORIGINS=localhost:3000
 IS_TEST_MODE=false
 BOOST_DURATION=2
 BASE_MINING_DREAMAKER=5
+UPLOAD_PATH="src/uploads"
 
 # ======================== Ethereum ========================
 

backend/Dockerfile

@@ -8,7 +8,13 @@ RUN npm run build
 FROM node:18 as runner
 
 WORKDIR /app
+
 COPY package*.json ./
+
 RUN npm ci --only=production
+
+RUN mkdir -p uploads
+
 COPY --from=builder /app/build build/
+
 CMD [ "node", "build/server.js" ]

backend/src/Watchers/Watch.ts

@@ -16,6 +16,7 @@ const logErr = logError.extend("ws");
 class EventWatcher {
     proxyEvents: IEvent[];
     isReady: boolean = false;
+    eventsTxs: string[] = [];
 
     constructor() {
         this.proxyEvents = Object.values(events).filter(
@@ -53,6 +54,12 @@ class EventWatcher {
         }
 
         provider.on(filter, async (event) => {
+            if (this.eventsTxs.includes(event.transactionHash)) {
+                log("🟡", "[BLOCKING] Duplicate event");
+                return;
+            }
+            this.eventsTxs.push(event.transactionHash);
+
             const decoded = this.parseLogs(signature, event.data);
             const origin = event.address;
 

backend/src/middlewares/files.ts

@@ -1,12 +1,13 @@
 import koaBody from "koa-body";
 import { ValidationError } from "yup";
 import { ALLOWED_EXTENSIONS } from "../utils/constants";
+import { UPLOAD_PATH } from "../utils/config";
 
 export const filesMiddleware = koaBody({
     formidable: {
         maxFieldsSize: 10 * 1024 * 1024,
         maxFiles: 5,
-        uploadDir: "src/uploads",
+        uploadDir: UPLOAD_PATH,
         filename(name, ext) {
             const timestamp =
                 new Date().getTime() + Math.floor(Math.random() * 1000);

backend/src/utils/config.ts

@@ -26,6 +26,11 @@ if (!BASE_MINING_DREAMAKER_PERCENTAGE) {
     throw new Error("Missing BASE_MINING_DREAMAKER_PERCENTAGE");
 }
 
+export const UPLOAD_PATH = process.env.UPLOAD_PATH as string;
+if (!UPLOAD_PATH) {
+    throw new Error("Missing UPLOAD_PATH");
+}
+
 export const IS_TEST_MODE =
     process.env.IS_TEST_MODE && process.env.IS_TEST_MODE === "true"
         ? true

docker-compose.yml

@@ -25,6 +25,7 @@ services:
     environment:
       - MONGO_HOST=database
       - BLOCKCHAIN_RPC=http://hardhat:8545
+      - UPLOAD_PATH=uploads
     ports:
       - "8080:8080"
     networks:

frontend/src/components/ActionHistory.tsx

@@ -106,7 +106,10 @@ const ActionHistory: FC<ActionHistoryProps> = ({ actions }) => {
                                 <Th>
                                     {action.amount !== "None"
                                         ? ethers.formatEther(action.amount) +
-                                          " ETH"
+                                          " " +
+                                          (action.action === "BOOST"
+                                              ? "DMK"
+                                              : "ETH")
                                         : "None"}
                                 </Th>
                             </Tooltip>

frontend/src/components/AddressCadrant.tsx

@@ -20,7 +20,7 @@ import {
 import EmojiEventsIcon from "@mui/icons-material/EmojiEvents";
 import AccountCircleIcon from "@mui/icons-material/AccountCircle";
 import CottageIcon from "@mui/icons-material/Cottage";
-import AdminPanelSettingsIcon from '@mui/icons-material/AdminPanelSettings';
+import AdminPanelSettingsIcon from "@mui/icons-material/AdminPanelSettings";
 
 import { useEthereum } from "../providers/ethereum";
 import { useGlobal } from "../providers/global";

frontend/src/components/DreamList.tsx

@@ -111,7 +111,8 @@ const DreamList: FC<DreamListProps> = ({ dreams }) => {
                     my={2}
                     textDecoration="underline"
                 >
-                    {filteredDreams.length} dreams found
+                    {filteredDreams.length} dream{" "}
+                    <span> {filteredDreams.length > 1 ? "s" : ""}</span> found
                 </Text>
                 <Box
                     maxH="1000px"

frontend/src/pages/Admin.tsx

@@ -17,7 +17,6 @@ const AdminPanel: FC = () => {
         }
     }, [user, navigate]);
 
-
     if (!user) {
         return (
             <Box

frontend/src/vite-env.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="vite/client" />
 
 interface Window {
-    ethereum?: any
-}
+    ethereum?: any;
+}

frontend/vite.config.ts

@@ -8,5 +8,5 @@ export default defineConfig({
     preview: {
         port: 3000,
         strictPort: true,
-    }
+    },
 });