Fix: Deploy Published Contract Flow (#499)

farhanW3 · web-flow · commit 43fef096f85d · 2024-04-16T21:57:26.000+05:30
* Updated Deploy Published Contract Flow + ProcessTx

* removed commented lines

* Updates
diff --git a/src/db/transactions/queueTx.ts b/src/db/transactions/queueTx.ts
@@ -60,7 +60,12 @@ export const queueTx = async ({
     return queueId;
   } else {
     const fromAddress = await tx.getSignerAddress();
-    const toAddress = tx.getTarget();
+    const toAddress =
+      tx.getTarget() === "0x0000000000000000000000000000000000000000" &&
+      txData.functionName === "deploy" &&
+      extension === "deploy-published"
+        ? null
+        : tx.getTarget();
 
     const { id: queueId } = await queueTxRaw({
       pgtx,
diff --git a/src/db/transactions/updateTx.ts b/src/db/transactions/updateTx.ts
@@ -24,6 +24,7 @@ type UpdateTxData =
       res: ethers.providers.TransactionRequest;
       sentAtBlockNumber: number;
       retryCount?: number;
+      deployedContractAddress?: string;
     }
   | {
       status: TransactionStatus.UserOpSent;
@@ -84,6 +85,7 @@ export const updateTx = async ({ pgtx, queueId, data }: UpdateTxParams) => {
           maxFeePerGas: data.res?.maxFeePerGas?.toString(),
           maxPriorityFeePerGas: data.res?.maxPriorityFeePerGas?.toString(),
           value: data.res?.value?.toString(),
+          deployedContractAddress: data.deployedContractAddress,
         },
       });
       break;
diff --git a/src/server/middleware/logs.ts b/src/server/middleware/logs.ts
@@ -4,19 +4,19 @@ import { logger } from "../../utils/logger";
 export const withRequestLogs = async (server: FastifyInstance) => {
   server.addHook("onRequest", async (request, reply) => {
     if (
-      !request.routerPath?.includes("static") &&
-      !request.routerPath?.includes("json") &&
+      !request.routeOptions.url?.includes("static") &&
+      !request.routeOptions.url?.includes("json") &&
       request.method !== "OPTIONS"
     ) {
       logger({
         service: "server",
         level: "info",
-        message: `Request received - ${request.method} - ${request.routerPath}`,
+        message: `Request received - ${request.method} - ${request.routeOptions.url}`,
       });
     }
 
     if (process.env.NODE_ENV === "production") {
-      if (request.routerPath?.includes("static")) {
+      if (request.routeOptions.url?.includes("static")) {
         return reply.status(404).send({
           statusCode: 404,
           error: "Not Found",
@@ -28,16 +28,16 @@ export const withRequestLogs = async (server: FastifyInstance) => {
 
   server.addHook("preHandler", async (request, reply) => {
     if (
-      !request.routerPath?.includes("static") &&
-      !request.routerPath?.includes("json") &&
-      !request.routerPath?.includes("/backend-wallet/import") &&
+      !request.routeOptions.url?.includes("static") &&
+      !request.routeOptions.url?.includes("json") &&
+      !request.routeOptions.url?.includes("/backend-wallet/import") &&
       request.method !== "OPTIONS"
     ) {
       if (request.body && Object.keys(request.body).length > 0) {
         logger({
           service: "server",
           level: "info",
-          message: `Request body - ${request.method} - ${request.routerPath}`,
+          message: `Request body - ${request.method} - ${request.routeOptions.url}`,
           data: request.body,
         });
       }
@@ -55,7 +55,7 @@ export const withRequestLogs = async (server: FastifyInstance) => {
         logger({
           service: "server",
           level: "info",
-          message: `Request querystring - ${request.method} - ${request.routerPath}`,
+          message: `Request querystring - ${request.method} - ${request.routeOptions.url}`,
           data: request.query,
         });
       }
@@ -64,18 +64,18 @@ export const withRequestLogs = async (server: FastifyInstance) => {
 
   server.addHook("onResponse", (request, reply, done) => {
     if (
-      !request.routerPath?.includes("static") &&
-      !request.routerPath?.includes("json") &&
+      !request.routeOptions.url?.includes("static") &&
+      !request.routeOptions.url?.includes("json") &&
       request.method !== "OPTIONS"
     ) {
       logger({
         service: "server",
         level: "info",
         message: `Request completed - ${request.method} - ${
-          reply.request.routerPath
-        } - status code: ${reply.statusCode} - Response time: ${reply
-          .getResponseTime()
-          .toFixed(2)}ms`,
+          reply.request.routeOptions.url
+        } - status code: ${
+          reply.statusCode
+        } - Response time: ${reply.elapsedTime.toFixed(2)}ms`,
       });
     }
 
diff --git a/src/server/routes/deploy/published.ts b/src/server/routes/deploy/published.ts
@@ -10,6 +10,7 @@ import {
 import { txOverrides } from "../../schemas/txOverrides";
 import { walletHeaderSchema } from "../../schemas/wallet";
 import { getChainIdFromChain } from "../../utils/chain";
+import { isAddress } from "thirdweb";
 
 // INPUTS
 const requestSchema = publishedDeployParamSchema;
@@ -35,7 +36,12 @@ requestBodySchema.examples = [
 // OUTPUT
 const responseSchema = Type.Object({
   queueId: Type.Optional(Type.String()),
-  deployedAddress: Type.Optional(Type.String()),
+  deployedAddress: Type.Optional(
+    Type.String({
+      description: "Not all contracts return a deployed address.",
+    }),
+  ),
+  message: Type.Optional(Type.String()),
 });
 
 export async function deployPublished(fastify: FastifyInstance) {
@@ -76,7 +82,10 @@ export async function deployPublished(fastify: FastifyInstance) {
         constructorParams,
         version,
       );
-      const deployedAddress = await tx.simulate();
+      const _deployedAddress = await tx.simulate();
+      const deployedAddress = isAddress(_deployedAddress)
+        ? _deployedAddress
+        : undefined;
 
       const queueId = await queueTx({
         tx,
@@ -90,6 +99,9 @@ export async function deployPublished(fastify: FastifyInstance) {
       reply.status(StatusCodes.OK).send({
         deployedAddress,
         queueId,
+        message: !deployedAddress
+          ? `To retrieve the deployed contract address, use the endpoint '/transaction/status/${queueId}' and check the value of the 'deployedContractAddress' field`
+          : undefined,
       });
     },
   });
diff --git a/src/utils/usage.ts b/src/utils/usage.ts
@@ -80,7 +80,8 @@ export const withServerUsageReporting = (server: FastifyInstance) => {
 
   server.addHook("onResponse", async (request, reply) => {
     if (
-      URLS_LIST_TO_NOT_REPORT_USAGE.has(reply.request.routerPath) ||
+      reply.request.routeOptions.url === undefined ||
+      URLS_LIST_TO_NOT_REPORT_USAGE.has(reply.request.routeOptions.url) ||
       reply.request.method === "OPTIONS"
     ) {
       return;
@@ -100,12 +101,12 @@ export const withServerUsageReporting = (server: FastifyInstance) => {
       source: "engine",
       action: UsageEventTxActionEnum.APIRequest,
       clientId: thirdwebClientId,
-      pathname: reply.request.routerPath,
+      pathname: reply.request.routeOptions.url,
       chainId: chainId || undefined,
       walletAddress: requestParams.walletAddress || undefined,
       contractAddress: requestParams.contractAddress || undefined,
       httpStatusCode: reply.statusCode,
-      msTotalDuration: Math.ceil(reply.getResponseTime()),
+      msTotalDuration: Math.ceil(reply.elapsedTime),
     };
 
     fetch(env.CLIENT_ANALYTICS_URL, {
diff --git a/src/worker/tasks/processTx.ts b/src/worker/tasks/processTx.ts
@@ -35,6 +35,7 @@ import {
 } from "../../utils/webhook";
 import { randomNonce } from "../utils/nonce";
 import { getWithdrawValue } from "../utils/withdraw";
+import { getContractAddress } from "ethers/lib/utils";
 
 type RpcResponseData = {
   tx: Transactions;
@@ -288,6 +289,16 @@ export const processTx = async () => {
               if (rpcResponse.result) {
                 // Transaction was successful.
                 const transactionHash = rpcResponse.result;
+                let contractAddress: string | undefined;
+                if (
+                  tx.extension === "deploy-published" &&
+                  tx.functionName === "deploy"
+                ) {
+                  contractAddress = getContractAddress({
+                    from: txRequest.from!,
+                    nonce: BigNumber.from(txRequest.nonce!),
+                  });
+                }
                 await updateTx({
                   pgtx,
                   queueId: tx.id,
@@ -297,6 +308,7 @@ export const processTx = async () => {
                     res: txRequest,
                     sentAt: new Date(),
                     sentAtBlockNumber: sentAtBlockNumber!,
+                    deployedContractAddress: contractAddress,
                   },
                 });
                 reportUsageForQueueIds.push({
