updates for value override, simulation + send Tx/UserOps using data

Author: farhanW3

docker-compose.yml

@@ -30,6 +30,11 @@ services:
     restart: always
     ports:
       - 6379:6379
+    deploy:
+      resources:
+        limits:
+          cpus: "1"
+          memory: 1024M
     volumes:
       - redis_data:/data
 

src/db/transactions/queueTx.ts

@@ -18,6 +18,7 @@ interface QueueTxParams {
     gas?: string;
     maxFeePerGas?: string;
     maxPriorityFeePerGas?: string;
+    value?: string;
   };
 }
 
@@ -34,7 +35,9 @@ export const queueTx = async ({
   // Transaction Details
   const functionName = tx.getMethod();
   const encodedData = tx.encode();
-  const value = BigInt(await tx.getValue().toString());
+  const value = maybeBigInt(
+    txOverrides?.value ?? (await tx.getValue().toString()),
+  );
   const functionArgs = tx.getArgs();
   const baseTransaction = {
     chainId,
@@ -43,6 +46,9 @@ export const queueTx = async ({
     functionName,
     functionArgs,
     extension,
+    gas: maybeBigInt(txOverrides?.gas),
+    maxFeePerGas: maybeBigInt(txOverrides?.maxFeePerGas),
+    maxPriorityFeePerGas: maybeBigInt(txOverrides?.maxPriorityFeePerGas),
   };
 
   // TODO: We need a much safer way of detecting if the transaction should be a user operation
@@ -62,9 +68,6 @@ export const queueTx = async ({
         signerAddress,
         accountAddress: normalizeAddress(await tx.getSignerAddress()),
         target: normalizeAddress(tx.getTarget()),
-        gas: maybeBigInt(txOverrides?.gas),
-        maxFeePerGas: maybeBigInt(txOverrides?.maxFeePerGas),
-        maxPriorityFeePerGas: maybeBigInt(txOverrides?.maxPriorityFeePerGas),
       },
       idempotencyKey,
       shouldSimulate: simulateTx,
@@ -85,9 +88,6 @@ export const queueTx = async ({
         to: normalizeAddress(
           isPublishedContractDeploy ? undefined : tx.getTarget(),
         ),
-        gas: maybeBigInt(txOverrides?.gas),
-        maxFeePerGas: maybeBigInt(txOverrides?.maxFeePerGas),
-        maxPriorityFeePerGas: maybeBigInt(txOverrides?.maxPriorityFeePerGas),
       },
       idempotencyKey,
       shouldSimulate: simulateTx,

src/utils/transaction/simulateQueuedTransaction.ts

@@ -1,10 +1,6 @@
 import {
-  Address,
   PreparedTransaction,
-  getContract,
-  prepareContractCall,
   prepareTransaction,
-  resolveMethod,
   simulateTransaction,
 } from "thirdweb";
 import { stringify } from "thirdweb/utils";
@@ -26,15 +22,12 @@ export const doSimulateTransaction = async (
   const {
     chainId,
     to,
-    functionName,
-    functionArgs,
     data,
     value,
     gas,
     gasPrice,
     maxFeePerGas,
     maxPriorityFeePerGas,
-    signerAddress,
     accountAddress,
     target,
     from,
@@ -43,61 +36,19 @@ export const doSimulateTransaction = async (
   const chain = await getChain(chainId);
 
   let preparedTransaction: PreparedTransaction;
-  if (data) {
+  if (data && (to || target)) {
     // Resolve data.
     preparedTransaction = prepareTransaction({
       client: thirdwebClient,
       chain,
-      to,
+      to: to ?? target,
       data,
       value,
       gas,
       gasPrice,
       maxFeePerGas,
       maxPriorityFeePerGas,
     });
-  } else if (
-    from &&
-    accountAddress &&
-    signerAddress &&
-    target &&
-    functionName
-  ) {
-    try {
-      // Resolve Target Contract
-      const targetContract = getContract({
-        client: thirdwebClient,
-        chain,
-        address: target as Address,
-      });
-
-      // Prepare UserOperation Transaction
-      preparedTransaction = prepareContractCall({
-        contract: targetContract,
-        method: await resolveMethod(functionName),
-        params: functionArgs ?? [],
-        value: value,
-        gas: gas,
-      });
-    } catch (error: any) {
-      return error.toString();
-    }
-  } else if (to && functionName && functionArgs) {
-    const contract = getContract({
-      client: thirdwebClient,
-      chain,
-      address: to,
-    });
-    preparedTransaction = await prepareContractCall({
-      contract,
-      method: resolveMethod(functionName),
-      params: functionArgs,
-      value,
-      gas,
-      gasPrice,
-      maxFeePerGas,
-      maxPriorityFeePerGas,
-    });
   } else {
     throw new Error(
       `Transaction cannot be simulated: ${stringify(transaction)}`,

src/utils/transaction/userOperation.ts

@@ -4,17 +4,14 @@ import {
   getContract,
   prepareContractCall,
   readContract,
-  resolveMethod,
 } from "thirdweb";
-import { resolvePromisedValue } from "thirdweb/utils";
 import {
   UserOperation,
   createUnsignedUserOp,
   getPaymasterAndData,
   signUserOp,
 } from "thirdweb/wallets/smart";
 import { getAccount } from "../account";
-import { getSmartWalletV5 } from "../cache/getSmartWalletV5";
 import { getChain } from "../chain";
 import { thirdwebClient } from "../sdk";
 import { QueuedTransaction } from "./types";
@@ -24,8 +21,6 @@ export const generateSignedUserOperation = async (
 ): Promise<UserOperation> => {
   const {
     chainId,
-    functionName,
-    functionArgs,
     value,
     gas,
     signerAddress,
@@ -41,13 +36,6 @@ export const generateSignedUserOperation = async (
 
   const chain = await getChain(chainId);
 
-  // Resolve Target Contract
-  const targetContract = getContract({
-    client: thirdwebClient,
-    chain,
-    address: target as Address,
-  });
-
   // Resolve Smart-Account Contract
   const smartAccountContract = getContract({
     client: thirdwebClient,
@@ -69,28 +57,12 @@ export const generateSignedUserOperation = async (
     address: accountFactoryAddress as Address,
   });
 
-  // Prepare Transaction
-  let preparedTransaction:
-    | Awaited<ReturnType<typeof prepareContractCall>>
-    | undefined;
-
   let toAddress: string | undefined;
   let txValue: bigint | undefined;
   let txData: Hex | undefined;
 
-  // Handle UserOp Requests with FunctionName & Args
-  if (functionName && functionArgs) {
-    preparedTransaction = prepareContractCall({
-      contract: targetContract,
-      method: resolveMethod(functionName),
-      params: functionArgs,
-      value,
-    });
-    toAddress = await resolvePromisedValue(preparedTransaction.to);
-    txValue = await resolvePromisedValue(preparedTransaction.value);
-    txData = await resolvePromisedValue(preparedTransaction.data);
-  } // Handle UserOp Requests with Data & Target
-  else if (data && target) {
+  // Handle UserOp Requests
+  if (data && target) {
     toAddress = target;
     txValue = value || 0n;
     txData = data;
@@ -105,13 +77,6 @@ export const generateSignedUserOperation = async (
     params: [toAddress || "", txValue || 0n, txData || "0x"],
   });
 
-  // Get Smart Wallet
-  const smartWallet = await getSmartWalletV5({
-    from,
-    chain,
-    accountAddress,
-  });
-
   // Create Unsigned UserOperation
   // Todo: Future expose a way to skip paymaster
   let unsignedOp = await createUnsignedUserOp({