Merge remote-tracking branch 'origin/ph/txWorkerRedis' into ph/txWorkerRedis

arcoraven · arcoraven · commit 690c41733376 · 2024-07-23T14:45:49.000-07:00
diff --git a/src/db/transactions/queueTx.ts b/src/db/transactions/queueTx.ts
@@ -10,7 +10,7 @@ interface QueueTxParams {
   chainId: number;
   extension: ContractExtension;
   // TODO: These shouldn't be in here
-  deployedContractAddress?: string;
+  deployedContractAddress?: Address;
   deployedContractType?: string;
   simulateTx?: boolean;
   idempotencyKey?: string;
diff --git a/src/server/routes/contract/extensions/accountFactory/write/createAccount.ts b/src/server/routes/contract/extensions/accountFactory/write/createAccount.ts
@@ -1,6 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { Address } from "thirdweb";
 import { queueTx } from "../../../../../../db/transactions/queueTx";
 import { getContract } from "../../../../../../utils/cache/getContract";
 import { prebuiltDeployResponseSchema } from "../../../../../schemas/prebuilts";
@@ -76,10 +77,10 @@ export const createAccount = async (fastify: FastifyInstance) => {
         extraData,
       );
       const deployedAddress =
-        await contract.accountFactory.predictAccountAddress(
+        (await contract.accountFactory.predictAccountAddress(
           adminAddress,
           extraData,
-        );
+        )) as Address;
 
       const queueId = await queueTx({
         tx,
diff --git a/src/server/routes/deploy/prebuilt.ts b/src/server/routes/deploy/prebuilt.ts
@@ -1,6 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { Address } from "thirdweb";
 import { queueTx } from "../../../db/transactions/queueTx";
 import { getSdk } from "../../../utils/cache/getSdk";
 import { contractDeployBasicSchema } from "../../schemas/contract";
@@ -93,7 +94,7 @@ export async function deployPrebuilt(fastify: FastifyInstance) {
           compilerOptions,
         },
       );
-      const deployedAddress = await tx.simulate();
+      const deployedAddress = (await tx.simulate()) as Address;
 
       const queueId = await queueTx({
         tx,
diff --git a/src/server/routes/deploy/prebuilts/edition.ts b/src/server/routes/deploy/prebuilts/edition.ts
@@ -1,6 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { Address } from "thirdweb";
 import { queueTx } from "../../../../db/transactions/queueTx";
 import { getSdk } from "../../../../utils/cache/getSdk";
 import { contractDeployBasicSchema } from "../../../schemas/contract";
@@ -98,7 +99,7 @@ export async function deployPrebuiltEdition(fastify: FastifyInstance) {
           compilerOptions,
         },
       );
-      const deployedAddress = await tx.simulate();
+      const deployedAddress = (await tx.simulate()) as Address;
 
       const queueId = await queueTx({
         tx,
diff --git a/src/server/routes/deploy/prebuilts/editionDrop.ts b/src/server/routes/deploy/prebuilts/editionDrop.ts
@@ -1,6 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { Address } from "thirdweb";
 import { queueTx } from "../../../../db/transactions/queueTx";
 import { getSdk } from "../../../../utils/cache/getSdk";
 import { contractDeployBasicSchema } from "../../../schemas/contract";
@@ -98,7 +99,7 @@ export async function deployPrebuiltEditionDrop(fastify: FastifyInstance) {
           compilerOptions,
         },
       );
-      const deployedAddress = await tx.simulate();
+      const deployedAddress = (await tx.simulate()) as Address;
 
       const queueId = await queueTx({
         tx,
diff --git a/src/server/routes/deploy/prebuilts/marketplaceV3.ts b/src/server/routes/deploy/prebuilts/marketplaceV3.ts
@@ -1,6 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { Address } from "thirdweb";
 import { queueTx } from "../../../../db/transactions/queueTx";
 import { getSdk } from "../../../../utils/cache/getSdk";
 import { contractDeployBasicSchema } from "../../../schemas/contract";
@@ -89,7 +90,7 @@ export async function deployPrebuiltMarketplaceV3(fastify: FastifyInstance) {
           compilerOptions,
         },
       );
-      const deployedAddress = await tx.simulate();
+      const deployedAddress = (await tx.simulate()) as Address;
 
       const queueId = await queueTx({
         tx,
diff --git a/src/server/routes/deploy/prebuilts/multiwrap.ts b/src/server/routes/deploy/prebuilts/multiwrap.ts
@@ -1,6 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { Address } from "thirdweb";
 import { queueTx } from "../../../../db/transactions/queueTx";
 import { getSdk } from "../../../../utils/cache/getSdk";
 import { contractDeployBasicSchema } from "../../../schemas/contract";
@@ -92,7 +93,7 @@ export async function deployPrebuiltMultiwrap(fastify: FastifyInstance) {
           compilerOptions,
         },
       );
-      const deployedAddress = await tx.simulate();
+      const deployedAddress = (await tx.simulate()) as Address;
 
       const queueId = await queueTx({
         tx,
diff --git a/src/server/routes/deploy/prebuilts/nftCollection.ts b/src/server/routes/deploy/prebuilts/nftCollection.ts
@@ -1,6 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { Address } from "thirdweb";
 import { queueTx } from "../../../../db/transactions/queueTx";
 import { getSdk } from "../../../../utils/cache/getSdk";
 import { contractDeployBasicSchema } from "../../../schemas/contract";
@@ -95,7 +96,7 @@ export async function deployPrebuiltNFTCollection(fastify: FastifyInstance) {
           compilerOptions,
         },
       );
-      const deployedAddress = await tx.simulate();
+      const deployedAddress = (await tx.simulate()) as Address;
 
       const queueId = await queueTx({
         tx,
diff --git a/src/server/routes/deploy/prebuilts/nftDrop.ts b/src/server/routes/deploy/prebuilts/nftDrop.ts
@@ -1,6 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { Address } from "thirdweb";
 import { queueTx } from "../../../../db/transactions/queueTx";
 import { getSdk } from "../../../../utils/cache/getSdk";
 import { contractDeployBasicSchema } from "../../../schemas/contract";
@@ -98,7 +99,7 @@ export async function deployPrebuiltNFTDrop(fastify: FastifyInstance) {
           compilerOptions,
         },
       );
-      const deployedAddress = await tx.simulate();
+      const deployedAddress = (await tx.simulate()) as Address;
 
       const queueId = await queueTx({
         tx,
diff --git a/src/server/routes/deploy/prebuilts/pack.ts b/src/server/routes/deploy/prebuilts/pack.ts
@@ -1,6 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { Address } from "thirdweb";
 import { queueTx } from "../../../../db/transactions/queueTx";
 import { getSdk } from "../../../../utils/cache/getSdk";
 import { contractDeployBasicSchema } from "../../../schemas/contract";
@@ -94,7 +95,7 @@ export async function deployPrebuiltPack(fastify: FastifyInstance) {
           compilerOptions,
         },
       );
-      const deployedAddress = await tx.simulate();
+      const deployedAddress = (await tx.simulate()) as Address;
 
       const queueId = await queueTx({
         tx,
diff --git a/src/server/routes/deploy/prebuilts/signatureDrop.ts b/src/server/routes/deploy/prebuilts/signatureDrop.ts
@@ -1,6 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { Address } from "thirdweb";
 import { queueTx } from "../../../../db/transactions/queueTx";
 import { getSdk } from "../../../../utils/cache/getSdk";
 import { contractDeployBasicSchema } from "../../../schemas/contract";
@@ -95,7 +96,7 @@ export async function deployPrebuiltSignatureDrop(fastify: FastifyInstance) {
         version,
         { saltForProxyDeploy, forceDirectDeploy, compilerOptions },
       );
-      const deployedAddress = await tx.simulate();
+      const deployedAddress = (await tx.simulate()) as Address;
 
       const queueId = await queueTx({
         tx,
diff --git a/src/server/routes/deploy/prebuilts/split.ts b/src/server/routes/deploy/prebuilts/split.ts
@@ -1,6 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { Address } from "thirdweb";
 import { queueTx } from "../../../../db/transactions/queueTx";
 import { getSdk } from "../../../../utils/cache/getSdk";
 import { contractDeployBasicSchema } from "../../../schemas/contract";
@@ -94,7 +95,7 @@ export async function deployPrebuiltSplit(fastify: FastifyInstance) {
         version,
         { saltForProxyDeploy, forceDirectDeploy, compilerOptions },
       );
-      const deployedAddress = await tx.simulate();
+      const deployedAddress = (await tx.simulate()) as Address;
       const queueId = await queueTx({
         tx,
         chainId,
diff --git a/src/server/routes/deploy/prebuilts/token.ts b/src/server/routes/deploy/prebuilts/token.ts
@@ -1,6 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { Address } from "thirdweb";
 import { queueTx } from "../../../../db/transactions/queueTx";
 import { getSdk } from "../../../../utils/cache/getSdk";
 import { contractDeployBasicSchema } from "../../../schemas/contract";
@@ -91,7 +92,7 @@ export async function deployPrebuiltToken(fastify: FastifyInstance) {
         version,
         { saltForProxyDeploy, forceDirectDeploy, compilerOptions },
       );
-      const deployedAddress = await tx.simulate();
+      const deployedAddress = (await tx.simulate()) as Address;
 
       const queueId = await queueTx({
         tx,
diff --git a/src/server/routes/deploy/prebuilts/tokenDrop.ts b/src/server/routes/deploy/prebuilts/tokenDrop.ts
@@ -1,6 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { Address } from "thirdweb";
 import { queueTx } from "../../../../db/transactions/queueTx";
 import { getSdk } from "../../../../utils/cache/getSdk";
 import { contractDeployBasicSchema } from "../../../schemas/contract";
@@ -93,7 +94,7 @@ export async function deployPrebuiltTokenDrop(fastify: FastifyInstance) {
         version,
         { saltForProxyDeploy, forceDirectDeploy, compilerOptions },
       );
-      const deployedAddress = await tx.simulate();
+      const deployedAddress = (await tx.simulate()) as Address;
 
       const queueId = await queueTx({
         tx,
diff --git a/src/server/routes/deploy/prebuilts/vote.ts b/src/server/routes/deploy/prebuilts/vote.ts
@@ -1,6 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { Address } from "thirdweb";
 import { queueTx } from "../../../../db/transactions/queueTx";
 import { getSdk } from "../../../../utils/cache/getSdk";
 import { contractDeployBasicSchema } from "../../../schemas/contract";
@@ -85,7 +86,7 @@ export async function deployPrebuiltVote(fastify: FastifyInstance) {
         version,
         { saltForProxyDeploy, forceDirectDeploy, compilerOptions },
       );
-      const deployedAddress = await tx.simulate();
+      const deployedAddress = (await tx.simulate()) as Address;
 
       const queueId = await queueTx({
         tx,
diff --git a/src/utils/transaction/types.ts b/src/utils/transaction/types.ts
@@ -25,7 +25,7 @@ export type InsertedTransaction = {
   maxPriorityFeePerGas?: bigint;
 
   // Offchain metadata
-  deployedContractAddress?: string;
+  deployedContractAddress?: Address;
   deployedContractType?: string;
   extension?: string;
 
diff --git a/src/worker/tasks/sendTransactionWorker.ts b/src/worker/tasks/sendTransactionWorker.ts
@@ -3,6 +3,7 @@ import superjson from "superjson";
 import { Hex, toSerializableTransaction } from "thirdweb";
 import { stringify } from "thirdweb/utils";
 import { bundleUserOp } from "thirdweb/wallets/smart";
+import { getContractAddress } from "viem";
 import { TransactionDB } from "../../db/transactions/db";
 import {
   addUnusedNonce,
@@ -153,6 +154,10 @@ const _handleQueuedTransaction = async (
     gasPrice: populatedTransaction.gasPrice,
     maxFeePerGas: populatedTransaction.maxFeePerGas,
     maxPriorityFeePerGas: populatedTransaction.maxPriorityFeePerGas,
+    deployedContractAddress: _resolveDeployedContractAddress(
+      queuedTransaction,
+      nonce,
+    ),
   };
 };
 
@@ -237,6 +242,25 @@ const _reportUsageError = (erroredTransaction: ErroredTransaction) => {
   ]);
 };
 
+const _resolveDeployedContractAddress = (
+  queuedTransaction: QueuedTransaction,
+  nonce: number,
+) => {
+  if (queuedTransaction.deployedContractAddress) {
+    return queuedTransaction.deployedContractAddress;
+  }
+
+  if (
+    queuedTransaction.extension === "deploy-published" &&
+    queuedTransaction.functionName === "deploy"
+  ) {
+    return getContractAddress({
+      from: queuedTransaction.from,
+      nonce: BigInt(nonce),
+    });
+  }
+};
+
 // Worker
 const _worker = new Worker(SendTransactionQueue.name, handler, {
   concurrency: env.SEND_TRANSACTION_QUEUE_CONCURRENCY,
