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,