add gas to txOverrides (#477)

joaquim-verges · farhanW3 · arcoraven · web-flow · commit 0fb1556b007f · 2024-04-20T03:46:40.000+05:30
* add gas to txOverrides * Update: Completed Tx-Override (#506) * CICD for beta-nightly image (#481) * Updated Packages + UserOp Confirmation flow updated (#479) * Updated Packages + UserOp Confirmation flow updated * wallets sdk updated * fix: missing querystring + description upd (#486) * Added querystring to fastify route (#487) * fix: reject deprecated chains (#488) * chore: Allow cancelling txs that already errored (#491) * chore: Allow cancelling txs that already errored * clean up response * naming * update cancelledAt * fix: Cancel tx if populating a tx to retry fails (#493) * fix: Cancel tx if populating a tx to retry fails * ensure cancel uses high enough gas * fix build * combine prepare + send flows again * updates to GH flow, to use branch (#484) * updates to GH flow, to use branch * removed prelease incorrect tag * upds * got back tag creation check * upds * comments updated * final upds to handle the flow * Updated to use release::create for CI/CD image build/push flow * Updates to GH workflow to not push to if not release not from main (#495) * feat(experimental): Keypair auth (#494) * reorganize helper file * wip * support keypair auth * fix unit tests * return error messages for keypair auth errors * Don't catch JsonWebToken errors * catch access token * move public keys to db * fix: add crud endpoints * wip * add algorithm * add feature envvar * handle each jwt type separately * rename * remove expiration limit * Fix: Deploy Published Contract Flow (#499) * Updated Deploy Published Contract Flow + ProcessTx * removed commented lines * Updates * chore: add updated template for the railway (#490) * chore: add updated template for the railway Signed-off-by: Waren Gonzaga <opensource@warengonzaga.com> * chore: remove referral code Signed-off-by: Waren Gonzaga <opensource@warengonzaga.com> --------- Signed-off-by: Waren Gonzaga <opensource@warengonzaga.com> * Build fixes (#500) * Fix for Issue 502 (#505) * Added tx overrides for EOA + AA --------- Signed-off-by: Waren Gonzaga <opensource@warengonzaga.com> Co-authored-by: Phillip Ho <arcoraven@gmail.com> Co-authored-by: Waren Gonzaga <github@warengonzaga.com> * updates to help with better readability --------- Signed-off-by: Waren Gonzaga <opensource@warengonzaga.com> Co-authored-by: farhanW3 <farhan@thirdweb.com> Co-authored-by: farhanW3 <132962163+farhanW3@users.noreply.github.com> Co-authored-by: Phillip Ho <arcoraven@gmail.com> Co-authored-by: Waren Gonzaga <github@warengonzaga.com>
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?: {
+    gas?: 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/db/transactions/queueTxRaw.ts b/src/db/transactions/queueTxRaw.ts
@@ -25,6 +25,7 @@ type QueueTxRawParams = Omit<
     pgtx?: PrismaTransaction;
     simulateTx?: boolean;
     idempotencyKey?: string;
+    gas?: string;
   };
 
 export const queueTxRaw = async ({
@@ -60,6 +61,8 @@ export const queueTxRaw = async ({
     target: tx.target?.toLowerCase(),
     signerAddress: tx.signerAddress?.toLowerCase(),
     accountAddress: tx.accountAddress?.toLowerCase(),
+    gasLimit: tx.gas,
+    gas: undefined,
   };
 
   let txRow: Transactions;
diff --git a/src/server/routes/contract/write/write.ts b/src/server/routes/contract/write/write.ts
@@ -85,14 +85,22 @@ export async function writeToContract(fastify: FastifyInstance) {
         walletAddress,
         accountAddress,
       });
-      const tx = await contract.prepare(functionName, args, txOverrides);
+      const tx = contract.prepare(functionName, args, {
+        value: txOverrides?.value,
+        gasLimit: txOverrides?.gas,
+        maxFeePerGas: txOverrides?.maxFeePerGas,
+        maxPriorityFeePerGas: txOverrides?.maxPriorityFeePerGas,
+      });
 
       const queueId = await queueTx({
         tx,
         chainId,
         simulateTx,
         extension: "none",
         idempotencyKey,
+        txOverrides: {
+          ...txOverrides,
+        },
       });
 
       reply.status(StatusCodes.OK).send({
diff --git a/src/server/schemas/txOverrides.ts b/src/server/schemas/txOverrides.ts
@@ -5,10 +5,28 @@ export const txOverrides = Type.Object({
     Type.Object({
       value: Type.Optional(
         Type.String({
-          examples: ["0"],
+          examples: ["10000000000"],
           description: "Amount of native currency to send",
         }),
       ),
+      gas: Type.Optional(
+        Type.String({
+          examples: ["530000"],
+          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,
