Merge branch 'main' of github.com:amhedcb/nfc-relayer into justinlee/…

…substitute-sender-address

package.json

@@ -13,13 +13,15 @@
  },
  "dependencies": {
  "@prisma/client": "^3.6.0",
+ "cors": "^2.8.5",
  "ethers": "5",
  "next": "^12.0.0",
  "react": "^17.0.2",
  "react-dom": "^17.0.2",
  "uuid": "^8.3.2"
  },
  "devDependencies": {
+ "@types/cors": "^2.8.17",
  "@types/jest": "^26.0.24",
  "@types/node": "^16.11.6",
  "@types/react": "^17.0.0",

prisma/migrations/20240930213853_add_tx_hash_to_payment/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "ContactlessPaymentTxOrMsg" ADD COLUMN "txHash" TEXT;

prisma/schema.prisma

@@ -17,6 +17,7 @@ model ContactlessPaymentTxOrMsg {
  additionalPayload Json?
  dappName String?
  dappUrl String?
+ txHash String?
  createdAt DateTime @default(now())
  updatedAt DateTime @updatedAt
 }

src/pages/api/paymentTxParams/[uuid].ts

@@ -1,9 +1,12 @@
 import { NextApiRequest, NextApiResponse } from 'next';
 import { ethers } from 'ethers';
 import { getPaymentTxOrMsg } from '@/services/paymentTxOrMsgService';
+import { applyCors } from '@/services/cors';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
  if (req.method === 'GET') {
+ await applyCors(req, res);
+
  try {
  const { uuid, senderAddress } = req.query;
 

src/pages/api/paymentTxParams/index.ts

@@ -1,8 +1,11 @@
+import { applyCors } from '@/services/cors';
 import { createPaymentTxOrMsg } from '@/services/paymentTxOrMsgService';
 import { Payload } from '@/types/paymentTx';
 import { NextApiRequest, NextApiResponse } from 'next';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+ await applyCors(req, res);
+
  if (req.method === 'POST') {
  try {
  // validations
@@ -28,4 +31,4 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
  res.setHeader('Allow', ['POST']);
  res.status(405).end(`Method ${req.method} Not Allowed`);
  }
-}
+};

src/pages/api/submitPaymentTx/index.ts

@@ -1,5 +1,6 @@
-
 import { fiatTokenAbi } from "@/FiatTokenAbi";
+import { applyCors } from "@/services/cors";
+import { appendTxHashToPayment } from "@/services/paymentTxOrMsgService";
 import { sponsoredUsdcMapping } from "@/sponsoredUsdcConfig";
 import { ethers } from "ethers";
 import type { NextApiRequest, NextApiResponse } from "next";
@@ -19,8 +20,7 @@ export default async function handler(
  req: NextApiRequest,
  res: NextApiResponse<SponsoredRelayResponse>
 ) {
- // return res.status(500);
-
+ await applyCors(req, res);
  if (req.method !== "POST") {
  return res.status(500);
  }
@@ -35,8 +35,8 @@ export default async function handler(
 
  const provider = new ethers.providers.JsonRpcProvider(sponsoredInfo.rpc);
 
- // TODO (Mike): If possible, use the UUID to communicate to the appropriate websocket that a transaction was received and sent
  if (txHash) {
+ await appendTxHashToPayment(uuid, txHash);
  return res.status(200).json({ data: { txHash } as TxHashReceivedResponse });
  }
 

src/services/cors.ts

@@ -0,0 +1,32 @@
+import Cors from 'cors';
+import { NextApiRequest, NextApiResponse } from 'next';
+
+const cors = Cors({
+ methods: ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'OPTIONS'],
+ origin: '*',
+ optionsSuccessStatus: 200,
+});
+
+// eslint-disable-next-line @typescript-eslint/ban-types
+function runMiddleware(req: NextApiRequest, res: NextApiResponse, fn: Function) {
+ return new Promise((resolve, reject) => {
+ if (!fn) {
+ return reject(new Error('Middleware function is not defined'));
+ }
+ fn(req, res, (result: any) => {
+ if (result instanceof Error) {
+ return reject(result)
+ }
+ return resolve(result)
+ })
+ })
+}
+
+export async function applyCors(req: NextApiRequest, res: NextApiResponse) {
+ try {
+ await runMiddleware(req, res, cors);
+ } catch (error) {
+ console.error('Error applying CORS middleware:', error);
+ res.status(500).json({ error: 'Internal Server Error' });
+ }
+}

src/services/paymentTxOrMsgService.ts

@@ -83,3 +83,15 @@ export const getPaymentTxOrMsg = async (uuid: string) => {
  ...(txParams as Record<string, unknown>),
  };
 };
+
+// adding a tx hash will let the client know that the transaction was sent
+export const appendTxHashToPayment = async (uuid: string, txHash: string) => {
+ const prisma = getPrismaClient();
+
+ return prisma.contactlessPaymentTxOrMsg.update({
+ where: { uuid },
+ data: {
+ txHash,
+ },
+ });
+};