Updated Deploy Published Contract Flow + ProcessTx

Author: farhanW3

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,

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;

src/server/routes/deploy/published.ts

@@ -35,7 +35,7 @@ requestBodySchema.examples = [
 // OUTPUT
 const responseSchema = Type.Object({
   queueId: Type.Optional(Type.String()),
-  deployedAddress: Type.Optional(Type.String()),
+  // deployedAddress: Type.Optional(Type.String()),
 });
 
 export async function deployPublished(fastify: FastifyInstance) {
@@ -88,7 +88,7 @@ export async function deployPublished(fastify: FastifyInstance) {
       });
 
       reply.status(StatusCodes.OK).send({
-        deployedAddress,
+        // deployedAddress,
         queueId,
       });
     },

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({