Merge branch 'master' into fix/btach-conversion-capped

Author: olivier7delf

packages/advanced-logic/src/extensions/payment-network/any-to-near.ts

@@ -4,7 +4,7 @@ import { UnsupportedNetworkError } from './address-based';
 import AnyToNativeTokenPaymentNetwork from './any-to-native';
 
 const CURRENT_VERSION = '0.1.0';
-const supportedNetworks = ['aurora', 'aurora-testnet'];
+const supportedNetworks = ['aurora', 'aurora-testnet', 'near-testnet'];
 
 export default class AnyToNearPaymentNetwork extends AnyToNativeTokenPaymentNetwork {
   public constructor(
@@ -26,6 +26,7 @@ export default class AnyToNearPaymentNetwork extends AnyToNativeTokenPaymentNetw
       case 'aurora':
         return this.isValidMainnetAddress(address);
       case 'aurora-testnet':
+      case 'near-testnet':
         return this.isValidTestnetAddress(address);
       case undefined:
         return this.isValidMainnetAddress(address) || this.isValidTestnetAddress(address);

packages/advanced-logic/src/extensions/payment-network/near-native.ts

@@ -3,7 +3,7 @@ import { UnsupportedNetworkError } from './address-based';
 import NativeTokenPaymentNetwork from './native-token';
 
 const CURRENT_VERSION = '0.2.0';
-const supportedNetworks = ['aurora', 'aurora-testnet'];
+const supportedNetworks = ['aurora', 'aurora-testnet', 'near-testnet'];
 
 /**
  * Implementation of the payment network to pay in Near based on input data.
@@ -27,6 +27,7 @@ export default class NearNativePaymentNetwork extends NativeTokenPaymentNetwork
       case 'aurora':
         return this.isValidMainnetAddress(address);
       case 'aurora-testnet':
+      case 'near-testnet':
         return this.isValidTestnetAddress(address);
       case undefined:
         return this.isValidMainnetAddress(address) || this.isValidTestnetAddress(address);

packages/advanced-logic/test/extensions/payment-network/any-to-near.test.ts

@@ -186,7 +186,7 @@ describe('extensions/payment-network/any-to-native-token', () => {
                 network: 'another-chain',
               });
             }).toThrowError(
-              `Payment network 'another-chain' is not supported by this extension (only aurora, aurora-testnet)`,
+              `Payment network 'another-chain' is not supported by this extension (only aurora, aurora-testnet, near-testnet)`,
             );
           });
           it('throws when payment network is missing', () => {

packages/advanced-logic/test/extensions/payment-network/native-token.test.ts

@@ -21,11 +21,16 @@ describe('extensions/payment-network/native-token', () => {
     value: 'NEAR',
     network: 'aurora',
   };
-  const nearTestnetCurrency = {
+  const auroraTestnetCurrency = {
     type: RequestLogicTypes.CURRENCY.ETH,
     value: 'NEAR-testnet',
     network: 'aurora-testnet',
   };
+  const nearTestnetCurrency = {
+    type: RequestLogicTypes.CURRENCY.ETH,
+    value: 'tNEAR',
+    network: 'near-testnet',
+  };
   const nativeTokenTestCases = [
     {
       name: 'Near',
@@ -34,14 +39,23 @@ describe('extensions/payment-network/native-token', () => {
       suffix: 'near',
       wrongSuffix: 'testnet',
       currency: nearCurrency,
-      wrongCurrency: nearTestnetCurrency,
+      wrongCurrency: auroraTestnetCurrency,
     },
     {
-      name: 'Near testnet',
+      name: 'Aurora testnet',
       paymentNetwork: new NearNativePaymentNetwork() as NativeTokenPaymentNetwork,
       networkName: 'aurora-testnet',
       suffix: 'testnet',
       wrongSuffix: 'near',
+      currency: auroraTestnetCurrency,
+      wrongCurrency: nearCurrency,
+    },
+    {
+      name: 'Near testnet',
+      paymentNetwork: new NearNativePaymentNetwork() as NativeTokenPaymentNetwork,
+      networkName: 'near-testnet',
+      suffix: 'testnet',
+      wrongSuffix: 'near',
       currency: nearTestnetCurrency,
       wrongCurrency: nearCurrency,
     },
@@ -136,7 +150,7 @@ describe('extensions/payment-network/native-token', () => {
           paymentNetworkName: 'another-chain',
         });
       }).toThrowError(
-        `Payment network 'another-chain' is not supported by this extension (only aurora, aurora-testnet)`,
+        `Payment network 'another-chain' is not supported by this extension (only aurora, aurora-testnet, near-testnet)`,
       );
     });
     it('createCreationAction() throws without payment network', () => {

packages/currency/src/aggregators/aurora-testnet.json

@@ -0,0 +1,8 @@
+{
+  "0x775eb53d00dd0acd3ec1696472105d579b9b386b": {
+    "0xed9cbb2837912278b47d422f36df40a1da36c4e0": 1
+  },
+  "0xed9cbb2837912278b47d422f36df40a1da36c4e0": {
+    "0x775eb53d00dd0acd3ec1696472105d579b9b386b": 1
+  }
+}

packages/currency/src/aggregators/near-testnet.json

@@ -1,8 +1,8 @@
 {
   "0x775eb53d00dd0acd3ec1696472105d579b9b386b": {
-    "0xed9cbb2837912278b47d422f36df40a1da36c4e0": 1
+    "0x45b3b427996b7091243501ee0efdc4a8e9b03c53": 1
   },
-  "0xed9cbb2837912278b47d422f36df40a1da36c4e0": {
+  "0x45b3b427996b7091243501ee0efdc4a8e9b03c53": {
     "0x775eb53d00dd0acd3ec1696472105d579b9b386b": 1
   }
 }

packages/currency/src/conversion-aggregators.ts

@@ -9,6 +9,7 @@ import maticAggregator from './aggregators/matic.json';
 import fantomAggregator from './aggregators/fantom.json';
 import nearAggregator from './aggregators/near.json';
 import nearTestnetAggregator from './aggregators/near-testnet.json';
+import auroraTestnetAggregator from './aggregators/aurora-testnet.json';
 
 /**
  * currencyFrom => currencyTo => cost
@@ -35,7 +36,8 @@ const chainlinkCurrencyPairs: AggregatorsMap = {
 // Pairs supported by Flux Protocol
 const fluxCurrencyPairs: AggregatorsMap = {
   aurora: nearAggregator,
-  'aurora-testnet': nearTestnetAggregator,
+  'aurora-testnet': auroraTestnetAggregator,
+  'near-testnet': nearTestnetAggregator,
 };
 
 // FIX ME: This fix enables to get these networks registered in conversionSupportedNetworks.

packages/currency/src/currency-utils.ts

@@ -13,7 +13,11 @@ import { RequestLogicTypes } from '@requestnetwork/types';
  */
 export const isValidNearAddress = (address: string, network?: string): boolean => {
   if (!network) {
-    return isValidNearAddress(address, 'aurora') || isValidNearAddress(address, 'aurora-testnet');
+    return (
+      isValidNearAddress(address, 'aurora') ||
+      isValidNearAddress(address, 'aurora-testnet') ||
+      isValidNearAddress(address, 'near-testnet')
+    );
   }
   // see link bellow for NEAR address specification
   // https://nomicon.io/DataStructures/Account.html
@@ -35,6 +39,7 @@ export const isValidNearAddress = (address: string, network?: string): boolean =
     case 'aurora':
       return !!address.match(/\.near$/);
     case 'aurora-testnet':
+    case 'near-testnet':
       return !!address.match(/\.testnet$/);
     default:
       throw new Error(`Cannot validate NEAR address for network ${network}`);

packages/currency/src/currencyManager.ts

@@ -237,6 +237,7 @@ export class CurrencyManager<TMeta = unknown> implements ICurrencyManager<TMeta>
         switch (currency.symbol) {
           case 'NEAR':
           case 'NEAR-testnet':
+          case 'tNEAR':
             return isValidNearAddress(address, currency.network);
           default:
             // we don't pass a third argument to the validate method here

packages/currency/src/native.ts

@@ -57,12 +57,6 @@ export const nativeCurrencies: Record<NativeCurrencyType, (NativeCurrency & { na
       name: 'Fantom',
       network: 'fantom',
     },
-    {
-      symbol: 'BNB',
-      decimals: 18,
-      name: 'BNB',
-      network: 'bsctest',
-    },
     {
       symbol: 'BNB',
       decimals: 18,
@@ -81,6 +75,12 @@ export const nativeCurrencies: Record<NativeCurrencyType, (NativeCurrency & { na
       name: 'Near Testnet',
       network: 'aurora-testnet',
     },
+    {
+      symbol: 'tNEAR',
+      decimals: 24,
+      name: 'Test Near',
+      network: 'near-testnet',
+    },
     {
       symbol: 'ARETH',
       decimals: 18,

packages/currency/test/currencyManager.test.ts

@@ -456,6 +456,7 @@ describe('CurrencyManager', () => {
     const nearAddresses: Record<string, string> = {
       aurora: 'requestnetwork.near',
       'aurora-testnet': 'requestnetwork.testnet',
+      'near-testnet': 'requestnetwork.testnet',
     };
 
     const eip55Addresses: string[] = [
@@ -489,6 +490,13 @@ describe('CurrencyManager', () => {
           network: 'aurora-testnet',
         },
       },
+      near: {
+        tNEAR: {
+          type: RequestLogicTypes.CURRENCY.ETH,
+          symbol: 'tNEAR',
+          network: 'near-testnet',
+        },
+      },
     };
 
     const testValidateAddressForCurrency = (
@@ -520,6 +528,7 @@ describe('CurrencyManager', () => {
                   switch (currency.symbol) {
                     case 'NEAR':
                     case 'NEAR-testnet':
+                    case 'tNEAR':
                       testValidateAddressForCurrency(nearAddresses[currency.network], currency);
                       break;
                     default:

packages/payment-detection/src/eth/multichainExplorerApiProvider.ts

@@ -33,7 +33,7 @@ export class MultichainExplorerApiProvider extends ethers.providers.EtherscanPro
       case 'fuse':
         return 'https://explorer.fuse.io';
       case 'celo':
-        return 'https://explorer.celo.org/mainnet';
+        return 'https://api.celoscan.io';
       case 'matic':
         return 'https://api.polygonscan.com';
       case 'fantom':
@@ -46,6 +46,7 @@ export class MultichainExplorerApiProvider extends ethers.providers.EtherscanPro
       case 'aurora':
         return 'https://explorer.mainnet.near.org';
       case 'aurora-testnet':
+      case 'near-testnet':
         return 'https://explorer.testnet.near.org';
       case 'arbitrum-rinkeby':
         return 'https://testnet.arbiscan.io/';

packages/payment-detection/src/near/near-conversion-detector.ts

@@ -51,6 +51,9 @@ export class NearConversionNativeTokenPaymentDetector extends AnyToAnyDetector<
       'aurora-testnet': {
         '0.1.0': 'native.conversion.reqnetwork.testnet',
       },
+      'near-testnet': {
+        '0.1.0': 'native.conversion.reqnetwork.testnet',
+      },
     };
     if (versionMap[chainName]?.[version]) {
       return versionMap[chainName][version];

packages/payment-detection/src/near/near-detector.ts

@@ -41,6 +41,10 @@ export class NearNativeTokenPaymentDetector extends ReferenceBasedDetector<
         '0.1.0': 'dev-1626339335241-5544297',
         '0.2.0': 'dev-1631521265288-35171138540673',
       },
+      'near-testnet': {
+        '0.1.0': 'dev-1626339335241-5544297',
+        '0.2.0': 'dev-1631521265288-35171138540673',
+      },
     };
     if (versionMap[chainName]?.[version]) {
       return versionMap[chainName][version];

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

@@ -25,7 +25,7 @@ export class NearInfoRetriever {
     protected eventName: PaymentTypes.EVENTS_NAMES,
     network: string,
   ) {
-    if (network !== 'aurora' && network !== 'aurora-testnet') {
+    if (network !== 'aurora' && network !== 'aurora-testnet' && network !== 'near-testnet') {
       throw new Error('Near input data info-retriever only works with Near mainnet and testnet');
     }
 

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

@@ -50,6 +50,9 @@ const supportedPaymentNetwork: ISupportedPaymentNetworkByCurrency = {
     'aurora-testnet': {
       [PN_ID.NATIVE_TOKEN]: NearNativeTokenPaymentDetector,
     },
+    'near-testnet': {
+      [PN_ID.NATIVE_TOKEN]: NearNativeTokenPaymentDetector,
+    },
     '*': {
       [PN_ID.ETH_INPUT_DATA]: EthInputDataPaymentDetector,
       [PN_ID.ETH_FEE_PROXY_CONTRACT]: EthFeeProxyPaymentDetector,

packages/payment-detection/src/thegraph/info-retriever.ts

@@ -50,12 +50,14 @@ export class TheGraphInfoRetriever {
 
   private filterPaymentEvents(payment: PaymentEventResultFragment, params: TransferEventsParams) {
     // Check contract address matches expected
-    if (formatAddress(payment.contractAddress) !== params.contractAddress) {
+    if (formatAddress(payment.contractAddress) !== formatAddress(params.contractAddress)) {
       return false;
     }
     // Check paid token tokens matches expected (conversion only)
     if (
       payment.tokenAddress &&
+      params.acceptedTokens &&
+      params.acceptedTokens.length > 0 &&
       !params.acceptedTokens?.includes(formatAddress(payment.tokenAddress, 'tokenAddress'))
     ) {
       return false;

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

@@ -365,4 +365,77 @@ describe('api/erc20/fee-proxy-contract', () => {
     expect(parameters.gasUsed).toBe('79220');
     expect(parameters.gasPrice).toBe('1500000011');
   });
+
+  it('can retrieve payment using thegraph info retriever', async () => {
+    const mockRequest: RequestLogicTypes.IRequest = {
+      creator: { type: IdentityTypes.TYPE.ETHEREUM_ADDRESS, value: '0x2' },
+      currency: {
+        network: 'mainnet',
+        type: RequestLogicTypes.CURRENCY.ERC20,
+        value: '0x967da4048cd07ab37855c090aaf366e4ce1b9f48',
+      },
+      events: [],
+      expectedAmount: '168040800000000000000000',
+      extensions: {
+        [ExtensionTypes.ID.PAYMENT_NETWORK_ERC20_FEE_PROXY_CONTRACT]: {
+          events: [
+            {
+              name: 'create',
+              parameters: {
+                feeAddress: '0x35d0e078755Cd84D3E0656cAaB417Dee1d7939c7',
+                feeAmount: '13386000000000000000',
+                paymentAddress: '0x6c9E04997000d6A8a353951231923d776d4Cdff2',
+                salt: 'c75c317e05c52f12',
+              },
+              timestamp: 1665989825,
+            },
+          ],
+          id: ExtensionTypes.ID.PAYMENT_NETWORK_ERC20_FEE_PROXY_CONTRACT,
+          type: ExtensionTypes.TYPE.PAYMENT_NETWORK,
+          values: {
+            salt: 'c75c317e05c52f12',
+            paymentAddress: '0x6c9E04997000d6A8a353951231923d776d4Cdff2',
+            feeAddress: '0x35d0e078755Cd84D3E0656cAaB417Dee1d7939c7',
+            feeAmount: '13386000000000000000',
+          },
+          version: '0.2.0',
+        },
+      },
+      extensionsData: [],
+      requestId: '01169f05b855a57396552cc0052b161f70590bdf9c5371649cd89a70c65fb586db',
+      state: RequestLogicTypes.STATE.CREATED,
+      timestamp: 0,
+      version: '0.2',
+    };
+    erc20FeeProxyContract = new ERC20FeeProxyPaymentDetector({
+      advancedLogic: mockAdvancedLogic,
+      currencyManager,
+      getSubgraphClient: () => ({
+        GetPaymentsAndEscrowState: jest.fn().mockImplementation(({ reference }) => ({
+          payments: [
+            {
+              contractAddress: '0x370de27fdb7d1ff1e1baa7d11c5820a324cf623c',
+              tokenAddress: '0x967da4048cd07ab37855c090aaf366e4ce1b9f48',
+              to: '0x6c9e04997000d6a8a353951231923d776d4cdff2',
+              from: '0x15339d48fbe31e349a507fd6d48eb01c45fdc79a',
+              amount: '168040800000000000000000',
+              feeAmount: '13386000000000000000',
+              reference: '0x5ac7241d9e6f419409e439c8429eea2f8f089d76528fd1d5df7496a3e58b5ce1',
+              block: 15767215,
+              txHash: '0x456d67cba236778e91a901e97c71684e82317dc2679d1b5c6bfa6d420d636b7d',
+              gasUsed: '73152',
+              gasPrice: '12709127644',
+            },
+          ].filter((x) => x.reference.toLowerCase() === reference.toLowerCase()),
+          escrowEvents: [],
+        })),
+        GetLastSyncedBlock: jest.fn(),
+        GetSyncedBlock: jest.fn(),
+      }),
+    });
+
+    const { balance, error } = await erc20FeeProxyContract.getBalance(mockRequest);
+    expect(error).toBeUndefined();
+    expect(balance).toBe('168040800000000000000000');
+  });
 });

packages/payment-detection/test/near/near-native-conversion.test.ts

@@ -18,7 +18,7 @@ import { mocked } from 'ts-jest/utils';
 jest.mock('graphql-request');
 const graphql = mocked(GraphQLClient.prototype);
 const mockNearPaymentNetwork = {
-  supportedNetworks: ['aurora', 'aurora-testnet'],
+  supportedNetworks: ['aurora', 'aurora-testnet', 'near-testnet'],
 };
 const currencyManager = CurrencyManager.getDefault();
 
@@ -199,7 +199,7 @@ describe('Near payments detection', () => {
         error: {
           code: 2,
           message:
-            'Payment network unknown-network not supported by pn-any-to-native-token payment detection. Supported networks: aurora, aurora-testnet',
+            'Payment network unknown-network not supported by pn-any-to-native-token payment detection. Supported networks: aurora, aurora-testnet, near-testnet',
         },
         events: [],
       });