Merge branch 'joaquim/gas' of github.com:thirdweb-dev/web3-api into j…

…oaquim/gas
thirdweb-dev · Apr 19, 2024 · 9891b06 · 9891b06
2 parents 81de10a + f0c0a29
commit 9891b06
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 5 deletions.
diff --git a/src/db/transactions/queueTx.ts b/src/db/transactions/queueTx.ts
@@ -15,6 +15,11 @@ interface QueueTxParams {
   deployedContractType?: string;
   simulateTx?: boolean;
   idempotencyKey?: string;
+  txOverrides?: {
+    gasLimit?: string;
+    maxFeePerGas?: string;
+    maxPriorityFeePerGas?: string;
+  };
 }
 
 export const queueTx = async ({
@@ -26,6 +31,7 @@ export const queueTx = async ({
   deployedContractType,
   simulateTx,
   idempotencyKey,
+  txOverrides,
 }: QueueTxParams) => {
   // TODO: We need a much safer way of detecting if the transaction should be a user operation
   const isUserOp = !!(tx.getSigner as ERC4337EthersSigner).erc4337provider;
@@ -38,6 +44,7 @@ export const queueTx = async ({
     deployedContractType: deployedContractType,
     data: tx.encode(),
     value: BigNumber.from(await tx.getValue()).toHexString(),
+    ...txOverrides,
   };
 
   if (isUserOp) {

diff --git a/src/server/routes/contract/write/write.ts b/src/server/routes/contract/write/write.ts
@@ -88,14 +88,23 @@ export async function writeToContract(fastify: FastifyInstance) {
       const tx = contract.prepare(functionName, args, {
         value: txOverrides?.value,
         gasLimit: txOverrides?.gas,
+        maxFeePerGas: txOverrides?.maxFeePerGas,
+        maxPriorityFeePerGas: txOverrides?.maxPriorityFeePerGas,
       });
 
+      const gasLimit = txOverrides?.gas;
+      delete txOverrides?.gas;
+
       const queueId = await queueTx({
         tx,
         chainId,
         simulateTx,
         extension: "none",
         idempotencyKey,
+        txOverrides: {
+          ...txOverrides,
+          gasLimit,
+        },
       });
 
       reply.status(StatusCodes.OK).send({

diff --git a/src/server/schemas/txOverrides.ts b/src/server/schemas/txOverrides.ts
@@ -15,6 +15,18 @@ export const txOverrides = Type.Object({
           description: "Gas limit for the transaction",
         }),
       ),
+      maxFeePerGas: Type.Optional(
+        Type.String({
+          examples: ["1000000000"],
+          description: "Maximum fee per gas",
+        }),
+      ),
+      maxPriorityFeePerGas: Type.Optional(
+        Type.String({
+          examples: ["1000000000"],
+          description: "Maximum priority fee per gas",
+        }),
+      ),
     }),
   ),
 });
diff --git a/src/worker/tasks/processTx.ts b/src/worker/tasks/processTx.ts
@@ -171,11 +171,27 @@ export const processTx = async () => {
                 ...gasOverrides,
               });
 
-              // TODO: We need to target specific cases
-              // Bump gas limit to avoid occasional out of gas errors
-              txRequest.gasLimit = txRequest.gasLimit
-                ? BigNumber.from(txRequest.gasLimit).mul(120).div(100)
-                : undefined;
+              // Gas limit override
+              if (tx.gasLimit) {
+                txRequest.gasLimit = BigNumber.from(tx.gasLimit);
+              } else {
+                // TODO: We need to target specific cases
+                // Bump gas limit to avoid occasional out of gas errors
+                txRequest.gasLimit = txRequest.gasLimit
+                  ? BigNumber.from(txRequest.gasLimit).mul(120).div(100)
+                  : undefined;
+              }
+
+              // Gas price overrides
+              if (tx.maxFeePerGas) {
+                txRequest.maxFeePerGas = BigNumber.from(tx.maxFeePerGas);
+              }
+
+              if (tx.maxPriorityFeePerGas) {
+                txRequest.maxPriorityFeePerGas = BigNumber.from(
+                  tx.maxPriorityFeePerGas,
+                );
+              }
 
               const signature = await signer.signTransaction(txRequest);
               const rpcRequest = {
@@ -378,6 +394,24 @@ export const processTx = async () => {
                   nonce,
                 },
               );
+
+            // Temporary fix untill SDK allows us to do this
+            if (tx.gasLimit) {
+              unsignedOp.callGasLimit = BigNumber.from(tx.gasLimit);
+              unsignedOp.paymasterAndData = "0x";
+              const DUMMY_SIGNATURE =
+                "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c";
+              unsignedOp.signature = DUMMY_SIGNATURE;
+              const paymasterResult =
+                await signer.smartAccountAPI.paymasterAPI.getPaymasterAndData(
+                  unsignedOp,
+                );
+              const paymasterAndData = paymasterResult.paymasterAndData;
+              if (paymasterAndData && paymasterAndData !== "0x") {
+                unsignedOp.paymasterAndData = paymasterAndData;
+              }
+            }
+
             const userOp = await signer.smartAccountAPI.signUserOp(unsignedOp);
             const userOpHash = await signer.smartAccountAPI.getUserOpHash(
               userOp,