chore: improve type details in payment detector

packages/payment-detection/src/erc20/fee-proxy-contract.ts

@@ -76,31 +76,26 @@ export abstract class ERC20FeeProxyPaymentDetectorBase<
   );
 }
 
-export type GetSubGraphClient = (
-  network: CurrencyTypes.ChainName,
-) => TheGraphClient | TheGraphClient<'near'>;
+export type TGetSubGraphClient<TChain> = TChain extends CurrencyTypes.EvmChainName
+  ? PaymentNetworkOptions['getSubgraphClient']
+  : PaymentNetworkOptions<'near'>['getSubgraphClient'];
 
 /**
  * Handle payment networks with ERC20 fee proxy contract extension on EVM (default) or Near chains
  */
 export class ERC20FeeProxyPaymentDetector<
   TChain extends CurrencyTypes.VMChainName = CurrencyTypes.EvmChainName,
 > extends ERC20FeeProxyPaymentDetectorBase {
+  private readonly getSubgraphClient: TGetSubGraphClient<TChain>;
   protected readonly network: TChain | undefined;
-  private readonly getSubgraphClient: TChain extends CurrencyTypes.EvmChainName
-    ? PaymentNetworkOptions['getSubgraphClient']
-    : PaymentNetworkOptions<'near'>['getSubgraphClient'];
-  // private readonly getSubgraphClient: PaymentNetworkOptions['getSubgraphClient'];
   constructor({
     advancedLogic,
     currencyManager,
     getSubgraphClient,
     network,
   }: ReferenceBasedDetectorOptions & {
     network?: TChain;
-    getSubgraphClient: TChain extends CurrencyTypes.EvmChainName
-      ? PaymentNetworkOptions['getSubgraphClient']
-      : PaymentNetworkOptions<'near'>['getSubgraphClient'];
+    getSubgraphClient: TGetSubGraphClient<TChain>;
   }) {
     super(
       ExtensionTypes.PAYMENT_NETWORK_ID.ERC20_FEE_PROXY_CONTRACT,
@@ -139,16 +134,7 @@ export class ERC20FeeProxyPaymentDetector<
 
     const subgraphClient = this.getSubgraphClient(paymentChain);
     if (subgraphClient) {
-      const graphInfoRetriever = EvmChains.isChainSupported(paymentChain)
-        ? new TheGraphInfoRetriever(subgraphClient as TheGraphClient, this.currencyManager)
-        : NearChains.isChainSupported(paymentChain) && this.network
-        ? new NearInfoRetriever(subgraphClient as TheGraphClient<'near'>)
-        : undefined;
-      if (!graphInfoRetriever) {
-        throw new Error(
-          `Could not find graphInfoRetriever for chain ${paymentChain} in payment detector`,
-        );
-      }
+      const graphInfoRetriever = this.getInfoRetriever(paymentChain, subgraphClient);
       return graphInfoRetriever.getTransferEvents({
         eventName,
         paymentReference,
@@ -158,7 +144,11 @@ export class ERC20FeeProxyPaymentDetector<
         acceptedTokens: [requestCurrency.value],
       });
     } else {
-      EvmChains.assertChainSupported(paymentChain);
+      if (!EvmChains.isChainSupported(paymentChain)) {
+        throw new Error(
+          `Could not get a TheGraph-based info retriever for chain ${paymentChain} and RPC-based info retrievers are only compatible with EVM chains.`,
+        );
+      }
       const proxyInfoRetriever = new ProxyInfoRetriever(
         paymentReference,
         proxyContractAddress,
@@ -174,4 +164,21 @@ export class ERC20FeeProxyPaymentDetector<
       };
     }
   }
+
+  protected getInfoRetriever(
+    paymentChain: TChain,
+    subgraphClient: TheGraphClient | TheGraphClient<'near'>,
+  ): TheGraphInfoRetriever | NearInfoRetriever {
+    const graphInfoRetriever = EvmChains.isChainSupported(paymentChain)
+      ? new TheGraphInfoRetriever(subgraphClient as TheGraphClient, this.currencyManager)
+      : NearChains.isChainSupported(paymentChain) && this.network
+      ? new NearInfoRetriever(subgraphClient as TheGraphClient<'near'>)
+      : undefined;
+    if (!graphInfoRetriever) {
+      throw new Error(
+        `Could not find graphInfoRetriever for chain ${paymentChain} in payment detector`,
+      );
+    }
+    return graphInfoRetriever;
+  }
 }

packages/payment-detection/src/near/retrievers/near-info-retriever.ts

@@ -23,7 +23,7 @@ export type TransferEventsParams = {
 };
 /**
  * Gets a list of transfer events for a set of Near payment details
- * Retriever for ERC20 Fee Proxy and Native token payments.
+ * TheGraph-based etriever for ERC20 Fee Proxy and Native token payments.
  */
 export class NearInfoRetriever implements ITheGraphBaseInfoRetriever<NearPaymentEvent> {
   /**