Merge pull request #26 from syscoin/mongodb-migrate

Mongodb migrate

Author: osiastedian

.github/workflows/aws.yml

@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - main
+      - mongodb-migrate
 
 env:
   AWS_REGION: us-east-1                   # set this to your preferred AWS region, e.g. us-west-1
@@ -35,7 +36,7 @@ jobs:
       id: login-ecr
       uses: aws-actions/amazon-ecr-login@v1
 
-    - name: Build, tag, and push image to Amazon ECR
+    - name: Build, tag, and push release image to Amazon ECR
       id: build-image
       if: github.ref_type == 'tag'
       env:
@@ -46,7 +47,18 @@ jobs:
         docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
         echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
 
-    - name: Build, tag, and push image to Amazon ECR
+    - name: Build, tag, and push branch image to Amazon ECR
+      id: build-image-branch
+      if: github.ref_type == 'branch'
+      env:
+        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+        IMAGE_TAG: ${{ github.ref_name }}
+      run: |
+        docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
+        docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+        echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
+    
+    - name: Build, tag, and push latest image to Amazon ECR
       id: build-image-main
       if: github.ref_type == 'branch' && github.ref_name == 'main'
       env:

api/services/transfer.ts

@@ -2,6 +2,8 @@ import { ITransfer } from "@contexts/Transfer/types";
 import { UserCredential, signInWithEmailAndPassword } from "firebase/auth";
 import firebase from "firebase-setup";
 import { doc, getDoc } from "firebase/firestore";
+import dbConnect from "lib/mongodb";
+import TransferModel from "models/transfer";
 
 export class TransferService {
   private isAuthenticated = false;
@@ -22,15 +24,62 @@ export class TransferService {
       });
     }
   }
+
+  async getAll(params: Partial<ITransfer>): Promise<ITransfer[]> {
+    const filters: (keyof ITransfer)[] = [
+      "nevmAddress",
+      "utxoAddress",
+      "utxoXpub",
+    ];
+    const queryConstraints = filters.reduce((acc, key) => {
+      if (key in params && typeof params[key] === "string") {
+        acc.push({ [key]: params[key] as string });
+      }
+      return acc;
+    }, [] as Record<string, string>[]);
+    return TransferModel.find({
+      $or: queryConstraints,
+    });
+  }
+
   async getTransfer(id: string): Promise<ITransfer> {
+    const transfer = await TransferModel.findOne({ id });
+
+    if (!transfer) {
+      return this.getTransferFirebase(id);
+    }
+
+    return transfer as unknown as ITransfer;
+  }
+
+  async getTransferFirebase(id: string): Promise<ITransfer> {
     await this.authenticate();
     const document = await getDoc(
       doc(firebase.firestore, "transfers", id as string)
     );
+
     if (!document.exists()) {
       throw new Error("Transfer not found");
     }
 
-    return document.data() as ITransfer;
+    const transferData = document.data() as ITransfer;
+
+    return this.upsertTransfer(transferData);
+  }
+
+  async upsertTransfer(transfer: ITransfer): Promise<ITransfer> {
+    const results = await TransferModel.updateOne(
+      { id: transfer.id },
+      { ...transfer, updatedAt: Date.now() },
+      { upsert: true }
+    );
+
+    if (!results.acknowledged) {
+      throw new Error("Transfer not updated");
+    }
+
+    const updatedTransfer = await TransferModel.findOne({ id: transfer.id });
+
+    return updatedTransfer as ITransfer;
   }
 }

components/Bridge/v3/Steps/ConfirmNEVMTransaction.tsx

@@ -1,9 +1,10 @@
 import { ITransferLog, TransferStatus } from "@contexts/Transfer/types";
 import { useTransfer } from "../context/TransferContext";
 import { useWeb3 } from "../context/Web";
-import { Alert, CircularProgress, Typography } from "@mui/material";
+import { Alert, CircularProgress, Link, Typography } from "@mui/material";
 import { useNevmTransaction } from "../hooks/useNevmTransaction";
 import { useEffect } from "react";
+import { NEVM_TX_BLOCKCHAIN_URL } from "@constants";
 
 type Props = {
   successStatus: TransferStatus;
@@ -61,6 +62,10 @@ const BridgeV3ConfirmNEVMTransaction: React.FC<Props> = ({
     >
       {loadingMessage}
       <CircularProgress size={"1rem"} />
+      <br />
+      <Link href={`${NEVM_TX_BLOCKCHAIN_URL}${sourceTxHash}`} target="_blank">
+        View on Explorer
+      </Link>
     </Alert>
   );
 };

components/Bridge/v3/Steps/ConfirmUTXOTransaction.tsx

@@ -1,8 +1,9 @@
-import { Alert, Box, CircularProgress } from "@mui/material";
+import { Alert, Box, CircularProgress, Link } from "@mui/material";
 import { useTransfer } from "../context/TransferContext";
 import { useUtxoTransaction } from "components/Bridge/v3/hooks/useUtxoTransaction";
 import { ITransferLog, TransferStatus } from "@contexts/Transfer/types";
 import { useEffect } from "react";
+import { SYSCOIN_TX_BLOCKCHAIN_URL } from "@constants";
 
 type Props = {
   invalidStateMessage: string;
@@ -67,6 +68,10 @@ const BridgeV3StepConfirmUTXOTransaction: React.FC<Props> = ({
     >
       {loadingMessage} &nbsp;
       <CircularProgress size={"1rem"} />
+      <br />
+      <Link href={`${SYSCOIN_TX_BLOCKCHAIN_URL}${txId}`} target="_blank">
+        View on Explorer
+      </Link>
     </Alert>
   );
 };

constants.ts

@@ -2,3 +2,6 @@ export const MIN_AMOUNT = 0.00015;
 
 export const RELAY_CONTRACT_ADDRESS =
   "0xD822557aC2F2b77A1988617308e4A29A89Cb95A6";
+
+export const SYSCOIN_TX_BLOCKCHAIN_URL = "https://blockbook.elint.services/tx/";
+export const NEVM_TX_BLOCKCHAIN_URL = "https://explorer.syscoin.org/tx/";

lib/mongodb.ts

@@ -0,0 +1,43 @@
+import mongoose, { ConnectOptions } from "mongoose";
+declare global {
+  var mongoose: any; // This must be a `var` and not a `let / const`
+}
+
+const MONGODB_URI = process.env.MONGODB_URI!;
+
+if (!MONGODB_URI) {
+  throw new Error(
+    "Please define the MONGODB_URI environment variable inside .env.local"
+  );
+}
+
+let cached = global.mongoose;
+
+if (!cached) {
+  cached = global.mongoose = { conn: null, promise: null };
+}
+
+async function dbConnect() {
+  if (cached.conn) {
+    return cached.conn;
+  }
+  if (!cached.promise) {
+    const opts: ConnectOptions = {
+      bufferCommands: false,
+    };
+    console.log({ MONGODB_URI, opts });
+    cached.promise = mongoose.connect(MONGODB_URI, opts).then((mongoose) => {
+      return mongoose;
+    });
+  }
+  try {
+    cached.conn = await cached.promise;
+  } catch (e) {
+    cached.promise = null;
+    throw e;
+  }
+
+  return cached.conn;
+}
+
+export default dbConnect;

models/transfer.ts

@@ -0,0 +1,53 @@
+import { ITransfer, ITransferLog } from "@contexts/Transfer/types";
+import mongoose from "mongoose";
+
+export type Transfer = mongoose.Document & ITransfer;
+
+const TransferLogSchema = new mongoose.Schema<ITransferLog>({
+  date: {
+    type: Number,
+  },
+  status: {
+    type: String,
+  },
+  payload: {
+    type: Object,
+  },
+});
+
+const TransferSchema = new mongoose.Schema<Transfer>({
+  id: {
+    type: String,
+  },
+  type: {
+    type: String,
+  },
+  status: {
+    type: String,
+  },
+  logs: [TransferLogSchema],
+  createdAt: {
+    type: Number,
+  },
+  updatedAt: {
+    type: Number,
+  },
+  utxoAddress: {
+    type: String,
+  },
+  utxoXpub: {
+    type: String,
+  },
+  nevmAddress: {
+    type: String,
+  },
+  version: {
+    type: String,
+  },
+  amount: {
+    type: String,
+  },
+});
+
+export default mongoose.models.Transfer ||
+  mongoose.model("Transfer", TransferSchema);

next.config.js

@@ -6,18 +6,14 @@ const nextConfig = {
 
     return config;
   },
-  env: {
-    MONGODB_URI: "mongodb://admin:admin@localhost:27017/syscoin-bridge",
-  },
-  output: 'standalone',
+  output: "standalone",
   images: {
-    domains: ['syscoin.github.io']
-  }
+    domains: ["syscoin.github.io"],
+  },
 };
 
 module.exports = nextConfig;
 
-
 // Injected content via Sentry wizard below
 
 const { withSentryConfig } = require("@sentry/nextjs");

package.json

@@ -23,6 +23,7 @@
     "bitcoinjs-lib": "^6.0.1",
     "firebase": "^9.22.1",
     "firebase-admin": "^10.2.0",
+    "mongoose": "^7.5.0",
     "next": "13.2.4",
     "react": "18.1.0",
     "react-dom": "18.1.0",

pages/api/transfer/[id].ts

@@ -1,10 +1,24 @@
 import firebase from "firebase-setup";
 import type { NextApiRequest, NextApiResponse } from "next";
-import { doc, getDoc, setDoc, updateDoc } from "firebase/firestore";
+import { doc, getDoc } from "firebase/firestore";
 import { signInWithEmailAndPassword } from "firebase/auth";
+import { TransferService } from "api/services/transfer";
+import dbConnect from "lib/mongodb";
+
+const transferService = new TransferService();
 
 const getRequest = async (req: NextApiRequest, res: NextApiResponse) => {
   const { id } = req.query;
+
+  if (!id) {
+    return res.status(400).json({ message: "Missing id" });
+  }
+
+  try {
+    const transfer = await transferService.getTransfer(id as string);
+    return res.status(200).json(transfer);
+  } catch (e) {}
+
   if (process.env.NODE_ENV !== "development" && firebase.auth) {
     await signInWithEmailAndPassword(
       firebase.auth,
@@ -27,30 +41,21 @@ const patchRequest = async (req: NextApiRequest, res: NextApiResponse) => {
   if (!id) {
     return res.status(400).json({ message: "Missing id" });
   }
-  if (process.env.NODE_ENV !== "development" && firebase.auth) {
-    await signInWithEmailAndPassword(
-      firebase.auth,
-      process.env.FIREBASE_AUTH_EMAIL!,
-      process.env.FIREBASE_AUTH_PASSWORD!
-    );
-  }
-  const document = doc(firebase.firestore, "transfers", id as string);
-
-  const transferBody = req.body;
-
-  const results = await getDoc(document);
 
-  if (results.exists()) {
-    transferBody.updatedAt = Date.now()
-    await updateDoc(document, transferBody);
-  } else {
-    await setDoc(document, transferBody);
+  try {
+    const updated = await transferService.upsertTransfer(req.body);
+    res.status(200).json(updated);
+  } catch (e) {
+    if (e instanceof Error) {
+      res.status(500).json({ message: e.message });
+    } else {
+      res.status(500).json({ message: "Unknown error" });
+    }
   }
-  const updated = await getDoc(document);
-  res.status(200).json(updated.data());
 };
 
 async function handler(req: NextApiRequest, res: NextApiResponse) {
+  await dbConnect();
   if (req.method === "GET") {
     await getRequest(req, res);
     return;