fix: NEAR Conversion version and processor (#935)

Author: yomarion

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

@@ -3,7 +3,7 @@ import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwor
 import { UnsupportedNetworkError } from './address-based';
 import AnyToNativeTokenPaymentNetwork from './any-to-native';
 
-const CURRENT_VERSION = '0.2.0';
+const CURRENT_VERSION = '0.1.0';
 const supportedNetworks = ['aurora', 'aurora-testnet'];
 
 export default class AnyToNearPaymentNetwork extends AnyToNativeTokenPaymentNetwork {

packages/advanced-logic/test/utils/payment-network/any/generator-data-create.ts

@@ -93,7 +93,7 @@ export const actionCreationWithNativeTokenPayment: ExtensionTypes.IAction<Extens
       refundAddress: 'refund.near',
       salt: arbitrarySalt,
     },
-    version: '0.2.0',
+    version: '0.1.0',
   };
 export const actionCreationWithAnyToNativeTokenPayment: ExtensionTypes.IAction<ExtensionTypes.PnAnyToAnyConversion.ICreationParameters> =
   {
@@ -108,7 +108,7 @@ export const actionCreationWithAnyToNativeTokenPayment: ExtensionTypes.IAction<E
       network: 'aurora',
       maxRateTimespan: 1000000,
     },
-    version: '0.2.0',
+    version: '0.1.0',
   };
 
 export const actionAddDelegate = {
@@ -239,7 +239,7 @@ export const extensionStateWithNativeTokenPaymentAndRefund: RequestLogicTypes.IE
       sentPaymentAmount: '0',
       sentRefundAmount: '0',
     },
-    version: '0.2.0',
+    version: '0.1.0',
   },
 };
 export const extensionStateWithAnyToNativeTokenPaymentAndRefund: RequestLogicTypes.IExtensionStates =
@@ -279,7 +279,7 @@ export const extensionStateWithAnyToNativeTokenPaymentAndRefund: RequestLogicTyp
         maxRateTimespan: 1000000,
         feeAmount: '100',
       },
-      version: '0.2.0',
+      version: '0.1.0',
     },
   };
 export const extensionStateAnyToNativeWithPaymentAddressAdded: RequestLogicTypes.IExtensionStates =
@@ -325,7 +325,7 @@ export const extensionStateAnyToNativeWithPaymentAddressAdded: RequestLogicTypes
         maxRateTimespan: 1000000,
         feeAmount: '100',
       },
-      version: '0.2.0',
+      version: '0.1.0',
     },
   };
 
@@ -371,7 +371,7 @@ export const extensionStateAnyToNativeWithFeeAdded: RequestLogicTypes.IExtension
       maxRateTimespan: 1000000,
       feeAmount: '100',
     },
-    version: '0.2.0',
+    version: '0.1.0',
   },
 };
 

packages/payment-processor/src/payment/index.ts

@@ -22,7 +22,7 @@ import { encodeRequestPayment } from './encoder-payment';
 import { IPreparedTransaction } from './prepared-transaction';
 import { IRequestPaymentOptions } from './settings';
 
-export const supportedNetworks = [
+export const noConversionNetworks = [
   ExtensionTypes.ID.PAYMENT_NETWORK_ERC777_STREAM,
   ExtensionTypes.ID.PAYMENT_NETWORK_ERC20_PROXY_CONTRACT,
   ExtensionTypes.ID.PAYMENT_NETWORK_ERC20_FEE_PROXY_CONTRACT,
@@ -177,7 +177,7 @@ export async function swapToPayRequest(
 
 /**
  * Verifies the address has enough funds to pay the request in its currency.
- * Supported networks: ERC20_PROXY_CONTRACT, ETH_INPUT_DATA
+ * Only supports networks with no (on-chain) conversion.
  *
  * @throws UnsupportedNetworkError if network isn't supported
  * @param request the request to verify.
@@ -194,7 +194,7 @@ export async function hasSufficientFunds(
   },
 ): Promise<boolean> {
   const paymentNetwork = getPaymentNetwork(request);
-  if (!paymentNetwork || !supportedNetworks.includes(paymentNetwork)) {
+  if (!paymentNetwork || !noConversionNetworks.includes(paymentNetwork)) {
     throw new UnsupportedNetworkError(paymentNetwork);
   }
 
@@ -216,6 +216,7 @@ export async function hasSufficientFunds(
 
 /**
  * Verifies the address has enough funds to pay an amount in a given currency.
+ * Supported chains: EVMs and Near.
  *
  * @param fromAddress the address willing to pay
  * @param amount

packages/payment-processor/src/payment/near-conversion.ts

@@ -41,7 +41,7 @@ export async function payNearConversionRequest(
   }
 
   if (!network || !isNearNetwork(network)) {
-    throw new Error('Should be a near network');
+    throw new Error('Should be a Near network');
   }
 
   const amountToPay = getAmountToPay(request, amount).toString();
@@ -56,6 +56,7 @@ export async function payNearConversionRequest(
     getTicker(request.currencyInfo),
     feeAddress || '0x',
     feeAmount || 0,
+    paymentSettings.maxToSpend,
     maxRateTimespan || '0',
     version,
   );

packages/payment-processor/src/payment/utils-near.ts

@@ -34,6 +34,8 @@ export const isNearAccountSolvent = (
 
 const GAS_LIMIT_IN_TGAS = 50;
 const GAS_LIMIT = ethers.utils.parseUnits(GAS_LIMIT_IN_TGAS.toString(), 12);
+const GAS_LIMIT_NATIVE = GAS_LIMIT.toString();
+const GAS_LIMIT_CONVERSION_TO_NATIVE = GAS_LIMIT.mul(2).toString();
 
 export const processNearPayment = async (
   walletConnection: WalletConnection,
@@ -69,7 +71,7 @@ export const processNearPayment = async (
         to,
         payment_reference: paymentReference,
       },
-      GAS_LIMIT.toString(),
+      GAS_LIMIT_NATIVE,
       amount.toString(),
     );
     return;
@@ -94,6 +96,7 @@ export const processNearPaymentWithConversion = async (
   currency: string,
   feeAddress: string,
   feeAmount: BigNumberish,
+  maxToSpend: BigNumberish,
   maxRateTimespan = '0',
   version = '0.1.0',
 ): Promise<void> => {
@@ -127,8 +130,8 @@ export const processNearPaymentWithConversion = async (
         fee_amount: feeAmount,
         max_rate_timespan: maxRateTimespan,
       },
-      GAS_LIMIT.toString(),
-      amount.toString(),
+      GAS_LIMIT_CONVERSION_TO_NATIVE,
+      maxToSpend.toString(),
     );
     return;
   } catch (e) {

packages/payment-processor/test/payment/any-to-near.test.ts

@@ -41,7 +41,7 @@ const request: any = {
 };
 
 // Use the default currency manager
-const conversionSettings = {} as unknown as IConversionPaymentSettings;
+const conversionSettings: IConversionPaymentSettings = { maxToSpend: '30' };
 
 describe('payNearWithConversionRequest', () => {
   afterEach(() => {
@@ -75,6 +75,7 @@ describe('payNearWithConversionRequest', () => {
       'USD',
       feeAddress,
       feeAmount,
+      conversionSettings.maxToSpend,
       '0',
       '0.1.0',
     );
@@ -159,7 +160,7 @@ describe('payNearWithConversionRequest', () => {
 
     await expect(
       payNearConversionRequest(invalidRequest, mockedNearWalletConnection, conversionSettings),
-    ).rejects.toThrowError('Should be a near network');
+    ).rejects.toThrowError('Should be a Near network');
     expect(paymentSpy).toHaveBeenCalledTimes(0);
   });
 });