Merge pull request #750 from bcnmy/fix/gnosis-mainnet

fix(eth_senduseroperation): allow 0 for request ID & support gas limit markup

Author: TheDivic

config/default.json

@@ -1165,6 +1165,9 @@
   },
   "disableFeeValidation": [],
   "adminAddresses": [],
+  "callGasLimitMarkup": {
+    "100": 20000
+  },
   "hardcodedGasLimits": {
     "84532": {
       "verificationGasLimit": 2000000,

src/server/api/v2/eth_sendUserOperation/handler.ts

@@ -6,6 +6,7 @@ import {
   userOperationDao,
   userOperationStateDao,
 } from "../../../../common/service-manager";
+import config from "config";
 import {
   getPaymasterFromPaymasterAndData,
   parseError,
@@ -34,7 +35,7 @@ const log = logger.child({
  * @returns The response object
  */
 export const eth_sendUserOperation = async (req: Request, res: Response) => {
-  const requestId = req.body.id || uniqueRequestId();
+  const requestId = req.body.id != null ? req.body.id : uniqueRequestId();
   const { chainId, dappAPIKey } = req.params;
   const chainIdNumber = parseInt(chainId, 10);
   const transactionId = uniqueTransactonId();
@@ -100,6 +101,15 @@ export const eth_sendUserOperation = async (req: Request, res: Response) => {
         gasLimit += 5e9;
       }
 
+      // Add a markup to the gas limit if specified in the config
+      const configKey = `callGasLimitMarkup.${chainId}`;
+      if (config.has(configKey)) {
+        _log.info(
+          `Adding gas limit markup of ${config.get<number>(configKey)}`,
+        );
+        gasLimit += config.get<number>(configKey);
+      }
+
       const response = routeTransactionToRelayerMap[chainIdNumber][
         TransactionType.BUNDLER
       ].sendUserOperation({