got rid of ERC20NearFeeProxy

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

@@ -81,19 +81,26 @@ export type GetSubGraphClient = (
 ) => TheGraphClient | TheGraphClient<'near'>;
 
 /**
- * Handle payment networks with ERC20 fee proxy contract extension
+ * Handle payment networks with ERC20 fee proxy contract extension on EVM (default) or Near chains
  */
-export class ERC20FeeProxyPaymentDetector extends ERC20FeeProxyPaymentDetectorBase {
-  protected readonly network: CurrencyTypes.VMChainName | undefined;
-  private readonly getSubgraphClient: GetSubGraphClient;
+export class ERC20FeeProxyPaymentDetector<
+  TChain extends CurrencyTypes.VMChainName = CurrencyTypes.EvmChainName,
+> extends ERC20FeeProxyPaymentDetectorBase {
+  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?: CurrencyTypes.VMChainName;
-    getSubgraphClient: GetSubGraphClient;
+    network?: TChain;
+    getSubgraphClient: TChain extends CurrencyTypes.EvmChainName
+      ? PaymentNetworkOptions['getSubgraphClient']
+      : PaymentNetworkOptions<'near'>['getSubgraphClient'];
   }) {
     super(
       ExtensionTypes.PAYMENT_NETWORK_ID.ERC20_FEE_PROXY_CONTRACT,
@@ -113,7 +120,7 @@ export class ERC20FeeProxyPaymentDetector extends ERC20FeeProxyPaymentDetectorBa
     toAddress: string | undefined,
     paymentReference: string,
     requestCurrency: RequestLogicTypes.ICurrency,
-    paymentChain: CurrencyTypes.VMChainName,
+    paymentChain: TChain,
     paymentNetwork: ExtensionTypes.IState,
   ): Promise<PaymentTypes.AllNetworkEvents<PaymentTypes.IERC20FeePaymentEventParameters>> {
     if (this.network && paymentChain !== this.network) {
@@ -168,73 +175,3 @@ export class ERC20FeeProxyPaymentDetector extends ERC20FeeProxyPaymentDetectorBa
     }
   }
 }
-
-/**
- * Handle payment networks with ERC20 fee proxy contract extension
- */
-export class ERC20NearFeeProxyPaymentDetector extends ERC20FeeProxyPaymentDetectorBase {
-  protected readonly getSubgraphClient: PaymentNetworkOptions<'near'>['getSubgraphClient'];
-  protected readonly network: CurrencyTypes.NearChainName;
-  constructor({
-    advancedLogic,
-    currencyManager,
-    getSubgraphClient,
-    network,
-  }: ReferenceBasedDetectorOptions &
-    Pick<PaymentNetworkOptions<'near'>, 'getSubgraphClient'> & {
-      network: CurrencyTypes.NearChainName;
-    }) {
-    const extension = advancedLogic.getFeeProxyContractErc20ForNetwork(network);
-    if (!extension) {
-      throw new NetworkNotSupported(
-        `Unconfigured ERC20NearFeeProxyPaymentDetector for chain '${network}'`,
-      );
-    }
-    super(ExtensionTypes.PAYMENT_NETWORK_ID.ERC20_FEE_PROXY_CONTRACT, extension, currencyManager);
-    this.network = network;
-    this.getSubgraphClient = getSubgraphClient;
-  }
-
-  /**
-   * Extracts the payment events of a request
-   */
-  protected async extractEvents(
-    eventName: PaymentTypes.EVENTS_NAMES,
-    toAddress: string | undefined,
-    paymentReference: string,
-    requestCurrency: RequestLogicTypes.ICurrency,
-    paymentChain: CurrencyTypes.VMChainName,
-    paymentNetwork: ExtensionTypes.IState,
-  ): Promise<PaymentTypes.AllNetworkEvents<PaymentTypes.IERC20FeePaymentEventParameters>> {
-    if (paymentChain !== this.network) {
-      throw new NetworkNotSupported(
-        `Unsupported network '${paymentChain}' for payment detector instanciated with '${this.network}'`,
-      );
-    }
-    if (!toAddress) {
-      return Promise.resolve({
-        paymentEvents: [],
-      });
-    }
-
-    const { address: proxyContractAddress } =
-      ERC20NearFeeProxyPaymentDetector.getDeploymentInformation(
-        this.network,
-        paymentNetwork.version,
-      );
-
-    const subgraphClient = this.getSubgraphClient(paymentChain);
-    if (!subgraphClient) {
-      throw new Error(`Error getting subgraph client for ${paymentChain}`);
-    }
-    const graphInfoRetriever = new NearInfoRetriever(subgraphClient);
-    return graphInfoRetriever.getTransferEvents({
-      paymentReference,
-      toAddress,
-      contractAddress: proxyContractAddress,
-      eventName,
-      paymentChain,
-      acceptedTokens: [requestCurrency.value],
-    });
-  }
-}

packages/payment-detection/src/payment-network-factory.ts

@@ -27,7 +27,6 @@ import { NearConversionNativeTokenPaymentDetector, NearNativeTokenPaymentDetecto
 import { getPaymentNetworkExtension } from './utils';
 import { getTheGraphClient } from './thegraph';
 import { getDefaultProvider } from 'ethers';
-import { ERC20NearFeeProxyPaymentDetector } from './erc20/fee-proxy-contract';
 
 const PN_ID = ExtensionTypes.PAYMENT_NETWORK_ID;
 
@@ -47,12 +46,12 @@ const supportedPaymentNetwork: ISupportedPaymentNetworkByCurrency = {
     },
   },
   ERC20: {
-    aurora: { [PN_ID.ERC20_FEE_PROXY_CONTRACT]: ERC20NearFeeProxyPaymentDetector },
+    aurora: { [PN_ID.ERC20_FEE_PROXY_CONTRACT]: ERC20FeeProxyPaymentDetector<CurrencyTypes.NearChainName> },
     'aurora-testnet': {
-      [PN_ID.ERC20_FEE_PROXY_CONTRACT]: ERC20NearFeeProxyPaymentDetector,
+      [PN_ID.ERC20_FEE_PROXY_CONTRACT]: ERC20FeeProxyPaymentDetector<CurrencyTypes.NearChainName>,
     },
     'near-testnet': {
-      [PN_ID.ERC20_FEE_PROXY_CONTRACT]: ERC20NearFeeProxyPaymentDetector,
+      [PN_ID.ERC20_FEE_PROXY_CONTRACT]: ERC20FeeProxyPaymentDetector<CurrencyTypes.NearChainName>,
     },
     '*': {
       [PN_ID.ERC20_ADDRESS_BASED]: ERC20AddressBasedPaymentDetector,

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

@@ -4,12 +4,13 @@ import {
   IdentityTypes,
   PaymentTypes,
   RequestLogicTypes,
+  CurrencyTypes,
 } from '@requestnetwork/types';
 import { CurrencyManager } from '@requestnetwork/currency';
 import { ERC20FeeProxyPaymentDetector } from '../../src/erc20/fee-proxy-contract';
 import { mockAdvancedLogicBase } from '../utils';
 
-let erc20FeeProxyContract: ERC20FeeProxyPaymentDetector;
+let erc20FeeProxyContract: ERC20FeeProxyPaymentDetector<CurrencyTypes.VMChainName>;
 
 const createAddPaymentAddressAction = jest.fn();
 const createAddRefundAddressAction = jest.fn();
@@ -550,7 +551,7 @@ describe('api/erc20/fee-proxy-contract', () => {
   describe('on Near', () => {
     beforeEach(() => {
       // Same Detector, but instanciated with a Near network and a mocked Near graph client
-      erc20FeeProxyContract = new ERC20FeeProxyPaymentDetector({
+      erc20FeeProxyContract = new ERC20FeeProxyPaymentDetector<CurrencyTypes.NearChainName>({
         advancedLogic: mockAdvancedLogic,
         currencyManager,
         network: 'aurora-testnet',

packages/payment-detection/test/payment-network-factory.test.ts

@@ -7,7 +7,7 @@ import {
   PaymentNetworkFactory,
 } from '../src';
 import { AdvancedLogic } from '@requestnetwork/advanced-logic';
-import { ERC20NearFeeProxyPaymentDetector } from '../src/erc20/fee-proxy-contract';
+import { ERC20FeeProxyPaymentDetector } from '../src/erc20/fee-proxy-contract';
 
 const currencyManager = CurrencyManager.getDefault();
 const advancedLogic = new AdvancedLogic(currencyManager);
@@ -45,7 +45,7 @@ describe('api/payment-network/payment-network-factory', () => {
         'aurora-testnet',
         'NEAR-0.1.0',
       );
-      expect(pnInterpretor).toBeInstanceOf(ERC20NearFeeProxyPaymentDetector);
+      expect(pnInterpretor).toBeInstanceOf(ERC20FeeProxyPaymentDetector);
     });
 
     it('cannot createPaymentNetwork with extension id not handled', async () => {