Refactor e2e tests (#667)

* e2e tests refactor

* fix userop types error

---------

Co-authored-by: Prithvish Baidya <deformercoding@gmail.com>

Author: joaquim-verges

package.json

@@ -69,7 +69,7 @@
     "prisma": "^5.14.0",
     "prom-client": "^15.1.3",
     "superjson": "^2.2.1",
-    "thirdweb": "^5.56.0",
+    "thirdweb": "^5.58.4",
     "uuid": "^9.0.1",
     "winston": "^3.14.1",
     "zod": "^3.23.8"

src/server/routes/contract/extensions/erc1155/write/claimTo.ts

@@ -77,7 +77,7 @@ export async function erc1155claimTo(fastify: FastifyInstance) {
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
       const chainId = await getChainIdFromChain(chain);
-      const contract = getContractV5({
+      const contract = await getContractV5({
         chainId,
         contractAddress,
       });

src/server/routes/contract/extensions/erc20/write/claimTo.ts

@@ -74,7 +74,7 @@ export async function erc20claimTo(fastify: FastifyInstance) {
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
       const chainId = await getChainIdFromChain(chain);
-      const contract = getContractV5({
+      const contract = await getContractV5({
         chainId,
         contractAddress,
       });

src/server/routes/contract/extensions/erc721/write/claimTo.ts

@@ -73,7 +73,7 @@ export async function erc721claimTo(fastify: FastifyInstance) {
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
       const chainId = await getChainIdFromChain(chain);
-      const contract = getContractV5({
+      const contract = await getContractV5({
         chainId,
         contractAddress,
       });

src/server/routes/contract/extensions/erc721/write/signatureMint.ts

@@ -3,14 +3,13 @@ import { SignedPayload721WithQuantitySignature } from "@thirdweb-dev/sdk";
 import { BigNumber } from "ethers";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { Address, Hex, getContract as getContractV5 } from "thirdweb";
+import { Address, Hex } from "thirdweb";
 import { mintWithSignature } from "thirdweb/extensions/erc721";
 import { resolvePromisedValue } from "thirdweb/utils";
 import { queueTx } from "../../../../../../db/transactions/queueTx";
 import { getContract } from "../../../../../../utils/cache/getContract";
-import { getChain } from "../../../../../../utils/chain";
+import { getContractV5 } from "../../../../../../utils/cache/getContractv5";
 import { maybeBigInt } from "../../../../../../utils/primitiveTypes";
-import { thirdwebClient } from "../../../../../../utils/sdk";
 import { insertTransaction } from "../../../../../../utils/transaction/insertTransaction";
 import { thirdwebSdkVersionSchema } from "../../../../../schemas/httpHeaders/thirdwebSdkVersion";
 import { signature721OutputSchema } from "../../../../../schemas/nft";
@@ -97,10 +96,9 @@ export async function erc721SignatureMint(fastify: FastifyInstance) {
       let queueId: string;
       if (sdkVersion === "5") {
         const payloadV5 = payload as Static<typeof signature721OutputSchemaV5>;
-        const contract = getContractV5({
-          client: thirdwebClient,
-          chain: await getChain(chainId),
-          address: contractAddress,
+        const contract = await getContractV5({
+          chainId,
+          contractAddress,
         });
         const transaction = mintWithSignature({
           contract,

src/server/routes/contract/write/write.ts

@@ -5,6 +5,7 @@ import { prepareContractCall, resolveMethod } from "thirdweb";
 import { getContractV5 } from "../../../../utils/cache/getContractv5";
 import { maybeBigInt } from "../../../../utils/primitiveTypes";
 import { queueTransaction } from "../../../../utils/transaction/queueTransation";
+import { createCustomError } from "../../../middleware/error";
 import { abiSchema } from "../../../schemas/contract";
 import {
   contractParamSchema,
@@ -76,7 +77,7 @@ export async function writeToContract(fastify: FastifyInstance) {
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
       const chainId = await getChainIdFromChain(chain);
-      const contract = getContractV5({
+      const contract = await getContractV5({
         chainId,
         contractAddress,
         abi,
@@ -87,9 +88,15 @@ export async function writeToContract(fastify: FastifyInstance) {
       // 2. functionName passed as function name + passed in ABI
       // 3. functionName passed as function name + inferred ABI (fetched at encode time)
       // this is all handled inside the `resolveMethod` function
+      let method;
+      try {
+        method = await resolveMethod(functionName)(contract);
+      } catch (e: any) {
+        throw createCustomError(`${e}`, StatusCodes.BAD_REQUEST, "BAD_REQUEST");
+      }
       const transaction = prepareContractCall({
         contract,
-        method: resolveMethod(functionName),
+        method,
         params: args,
         gas: maybeBigInt(txOverrides?.gas),
         value: maybeBigInt(txOverrides?.value),

src/server/schemas/contract/index.ts

@@ -24,6 +24,7 @@ export interface readSchema extends contractSchemaTypes {
 const abiTypeSchema = Type.Object({
   type: Type.Optional(Type.String()),
   name: Type.Optional(Type.String()),
+  internalType: Type.Optional(Type.String()),
   stateMutability: Type.Optional(Type.String()),
   components: Type.Optional(
     Type.Array(
@@ -56,6 +57,7 @@ export const abiSchema = Type.Object({
   type: Type.String(),
   name: Type.Optional(Type.String()),
   inputs: Type.Array(abiTypeSchema),
+  outputs: Type.Array(abiTypeSchema),
   stateMutability: Type.Optional(Type.String()),
 });
 

src/utils/cache/getContractv5.ts

@@ -1,5 +1,6 @@
-import { defineChain, getContract } from "thirdweb";
+import { getContract } from "thirdweb";
 import { thirdwebClient } from "../../utils/sdk";
+import { getChain } from "../chain";
 
 interface GetContractParams {
   chainId: number;
@@ -8,12 +9,12 @@ interface GetContractParams {
 }
 
 // Using new v5 SDK
-export const getContractV5 = ({
+export const getContractV5 = async ({
   chainId,
   contractAddress,
   abi,
 }: GetContractParams) => {
-  const definedChain = defineChain(chainId);
+  const definedChain = await getChain(chainId);
 
   // get a contract
   return getContract({

src/utils/transaction/userOperation.ts

@@ -88,13 +88,13 @@ export const generateSignedUserOperation = async (
 
   // Create Unsigned UserOperation
   // Todo: Future expose a way to skip paymaster
-  let unsignedOp = await createUnsignedUserOp({
+  let unsignedOp = (await createUnsignedUserOp({
     transaction: userOpCall,
     accountContract: smartAccountContract,
     sponsorGas: true,
     factoryContract: accountFactoryContract,
     adminAddress: signerAddress,
-  });
+  })) as UserOperation; // TODO support entrypoint v0.7 accounts
 
   // Pass custom gas limit for UserOperation
   if (gas) {
@@ -109,7 +109,10 @@ export const generateSignedUserOperation = async (
       client: thirdwebClient,
     });
 
-    const paymasterAndData = paymasterResult.paymasterAndData;
+    const paymasterAndData =
+      "paymasterAndData" in paymasterResult
+        ? paymasterResult.paymasterAndData
+        : "0x";
     if (paymasterAndData && paymasterAndData !== "0x") {
       unsignedOp.paymasterAndData = paymasterAndData as Hex;
     }
@@ -122,11 +125,12 @@ export const generateSignedUserOperation = async (
   });
 
   // Sign UserOperation
-  const signedUserOp = await signUserOp({
+  const signedUserOp = (await signUserOp({
+    client: thirdwebClient,
     userOp: unsignedOp,
     adminAccount,
     chain,
-  });
+  })) as UserOperation; // TODO support entrypoint v0.7 accounts
 
   // Return Signed UserOperation
   return signedUserOp;