MTP Error Handling (#172)

* added check to see if paymaster addr is available * removed logs
etherspot · Jan 23, 2025 · a924657 · a924657
1 parent 0788a29
commit a924657
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/backend/src/paymaster/index.ts b/backend/src/paymaster/index.ts
@@ -643,8 +643,6 @@ export class Paymaster {
 
       const isCoingeckoAvailable = this.coingeckoPrice.get(`${chainId}-${feeToken}`);
 
-      console.log('oracleAggregator: ', oracleAggregator, isCoingeckoAvailable, this.coingeckoPrice);
-
       if (!oracleAggregator) {
         if (!isCoingeckoAvailable) throw new Error('Unable to fetch token price. Please try again later.')
         const {latestAnswer, decimals} = await this.getLatestAnswerAndDecimals(provider, nativeOracleAddress, chainId);
@@ -1145,6 +1143,5 @@ export class Paymaster {
       const cacheKey = `${chainId}-${ethers.utils.getAddress(tokenAddress)}`;
       this.coingeckoPrice.set(cacheKey, {data: coingeckoPrices[tokenAddress], expiry: Date.now() + ttl});
     }
-    console.log('Coingecko Price Set: ', this.coingeckoPrice);
   }
 }
diff --git a/backend/src/routes/paymaster-routes.ts b/backend/src/routes/paymaster-routes.ts
@@ -284,6 +284,8 @@ const paymasterRoutes: FastifyPluginAsync<PaymasterRoutesOpts> = async (server,
             case 'multitoken': {
               if (epVersion !== EPVersions.EPV_06)
                 throw new Error('Currently only EPV06 entryPoint address is supported')
+              if (!(multiTokenPaymasters[chainId] && multiTokenPaymasters[chainId][gasToken]))
+                return reply.code(ReturnCode.FAILURE).send({ error: ErrorMessage.UNSUPPORTED_NETWORK_TOKEN })
               const date = new Date();
               const provider = new providers.JsonRpcProvider(bundlerUrl);
               const signer = new Wallet(privateKey, provider)
@@ -306,7 +308,7 @@ const paymasterRoutes: FastifyPluginAsync<PaymasterRoutesOpts> = async (server,
                 throw new Error("Oracle is not Defined/Invalid");
               if (networkConfig.MultiTokenPaymasterOracleUsed == "chainlink" && !NativeOracles[chainId])
                 throw new Error("Native Oracle address not set for this chainId")
-              result = await paymaster.signMultiTokenPaymaster(userOp, str, str1, entryPoint, multiTokenPaymasters[chainId][gasToken], gasToken, multiTokenOracles[chainId][gasToken], bundlerUrl, signer, networkConfig.MultiTokenPaymasterOracleUsed, NativeOracles[chainId], chainId, server.log);
+              result = await paymaster.signMultiTokenPaymaster(userOp, str, str1, entryPoint, multiTokenPaymasters[chainId][gasToken], gasToken, multiTokenOracles[chainId] ? multiTokenOracles[chainId][gasToken] : '', bundlerUrl, signer, networkConfig.MultiTokenPaymasterOracleUsed, NativeOracles[chainId], chainId, server.log);
               break;
             }
             case 'vps': {