updates for deployedContractAddress

farhanW3 · farhanW3 · commit e63f68c89805 · 2024-07-22T20:55:56.000-07:00
diff --git a/src/db/transactions/queueTx.ts b/src/db/transactions/queueTx.ts
@@ -9,7 +9,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/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/worker/tasks/sendTransactionWorker.ts b/src/worker/tasks/sendTransactionWorker.ts
@@ -1,10 +1,9 @@
 import { Job, Processor, Worker } from "bullmq";
-import { BigNumber } from "ethers";
-import { getContractAddress } from "ethers/lib/utils";
 import superjson from "superjson";
-import { toSerializableTransaction } from "thirdweb";
+import { Address, 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 { incrWalletNonce } from "../../db/wallets/walletNonce";
 import { getAccount } from "../../utils/account";
@@ -134,14 +133,14 @@ const _handleQueuedTransaction = async (
   );
 
   // Get the contract deployed Address when using deploy-published extension.
-  let deployedContractAddress: string | undefined;
+  let deployedContractAddress: Address | undefined;
   if (
     queuedTransaction.extension === "deploy-published" &&
     queuedTransaction.functionName === "deploy"
   ) {
     deployedContractAddress = getContractAddress({
       from: queuedTransaction.from,
-      nonce: BigNumber.from(populatedTransaction.nonce!),
+      nonce: BigInt(populatedTransaction.nonce),
     });
   }
 
@@ -158,7 +157,8 @@ const _handleQueuedTransaction = async (
     gasPrice: populatedTransaction.gasPrice,
     maxFeePerGas: populatedTransaction.maxFeePerGas,
     maxPriorityFeePerGas: populatedTransaction.maxPriorityFeePerGas,
-    deployedContractAddress,
+    deployedContractAddress:
+      queuedTransaction.deployedContractAddress ?? deployedContractAddress,
   };
 };
 
