fixes #950 (comment)

Author: alexandre-abrioux

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

@@ -112,6 +112,7 @@ export class PaymentNetworkFactory {
     paymentNetworkId: PaymentTypes.PAYMENT_NETWORK_ID,
     currencyType: RequestLogicTypes.CURRENCY,
     currencyNetwork?: string,
+    paymentNetworkVersion?: string,
   ): PaymentTypes.IPaymentNetwork {
     const network = currencyNetwork || 'mainnet';
     const currencyPaymentMap =
@@ -142,7 +143,7 @@ export class PaymentNetworkFactory {
       // this throws when the contract isn't deployed and was mandatory for payment detection
       (detectorClass as ContractBasedDetector).getDeploymentInformation(
         network,
-        detector.extension.currentVersion,
+        paymentNetworkVersion || detector.extension.currentVersion,
       );
     }
 
@@ -160,16 +161,16 @@ export class PaymentNetworkFactory {
     request: RequestLogicTypes.IRequest,
   ): PaymentTypes.IPaymentNetwork | null {
     const pn = getPaymentNetworkExtension(request);
-
     if (!pn) {
       return null;
     }
 
-    const paymentNetworkId = pn.id as unknown as PaymentTypes.PAYMENT_NETWORK_ID;
+    const { id, version } = pn;
     return this.createPaymentNetwork(
-      paymentNetworkId,
+      id as unknown as PaymentTypes.PAYMENT_NETWORK_ID,
       request.currency.type,
       request.currency.network,
+      version,
     );
   }
 }

packages/payment-detection/src/utils.ts

@@ -1,7 +1,7 @@
 import { CurrencyDefinition } from '@requestnetwork/currency';
-import { RequestLogicTypes, PaymentTypes, ExtensionTypes } from '@requestnetwork/types';
+import { ExtensionTypes, PaymentTypes, RequestLogicTypes } from '@requestnetwork/types';
 import { BigNumber, BigNumberish, Contract, errors, logger } from 'ethers';
-import { keccak256, LogDescription, getAddress } from 'ethers/lib/utils';
+import { getAddress, keccak256, LogDescription } from 'ethers/lib/utils';
 import { ContractArtifact, DeploymentInformation } from '@requestnetwork/smart-contracts';
 import { NetworkNotSupported, VersionNotSupported } from './balance-error';
 import PaymentReferenceCalculator from './payment-reference-calculator';
@@ -131,12 +131,12 @@ export const calculateEscrowState = (
 /**
  * Return the payment network extension of a Request.
  */
-export function getPaymentNetworkExtension(
+export function getPaymentNetworkExtension<T = any>(
   request: Pick<RequestLogicTypes.IRequest, 'extensions'>,
-): ExtensionTypes.IState | undefined {
+): ExtensionTypes.IPaymentNetworkState<T> | undefined {
   return Object.values(request.extensions).find(
     (x) => x.type === ExtensionTypes.TYPE.PAYMENT_NETWORK,
-  );
+  ) as ExtensionTypes.IPaymentNetworkState<T>;
 }
 
 type PaymentParameters = PaymentTypes.IReferenceBasedCreationParameters &
@@ -158,7 +158,7 @@ export function getPaymentReference(
   request: Pick<RequestLogicTypes.IRequest, 'extensions' | 'requestId'>,
   event: PaymentTypes.EVENTS_NAMES = PaymentTypes.EVENTS_NAMES.PAYMENT,
 ): string | undefined {
-  const extension = getPaymentNetworkExtension(request) as ExtensionTypes.IState<PaymentParameters>;
+  const extension = getPaymentNetworkExtension<PaymentParameters>(request);
   if (!extension) {
     throw new Error('no payment network found');
   }

packages/types/src/extension-types.ts

@@ -53,6 +53,11 @@ export interface IState<T = any> {
   values: T;
 }
 
+/** Extensions state in advanced logic */
+export interface IPaymentNetworkState<T = any> extends IState<T> {
+  id: Exclude<ID, 'content-data'>;
+}
+
 /** Creation action object */
 export interface IAction<T = any> {
   action: string;

packages/types/src/payment-types.ts

@@ -19,6 +19,7 @@ export enum PAYMENT_NETWORK_ID {
   ANY_TO_ERC20_PROXY = Extension.ID.PAYMENT_NETWORK_ANY_TO_ERC20_PROXY,
   ANY_TO_ETH_PROXY = Extension.ID.PAYMENT_NETWORK_ANY_TO_ETH_PROXY,
 }
+
 /** Interface for payment network extensions state and interpretation */
 export interface IPaymentNetwork<TEventParameters = any> {
   paymentNetworkId: PAYMENT_NETWORK_ID;