chore(advanced-logic): use currency manager instance (#1268)

RequestNetwork · Nov 28, 2023 · 28cf4b6 · 28cf4b6
1 parent fc215bf
commit 28cf4b6
Show file tree

Hide file tree

Showing 36 changed files with 151 additions and 82 deletions.
diff --git a/packages/advanced-logic/src/advanced-logic.ts b/packages/advanced-logic/src/advanced-logic.ts
@@ -5,12 +5,7 @@ import {
   IdentityTypes,
   RequestLogicTypes,
 } from '@requestnetwork/types';
-import {
-  CurrencyManager,
-  ICurrencyManager,
-  NearChains,
-  isSameChain,
-} from '@requestnetwork/currency';
+import { ICurrencyManager, NearChains, isSameChain } from '@requestnetwork/currency';
 
 import ContentData from './extensions/content-data';
 import AddressBasedBtc from './extensions/payment-network/bitcoin/mainnet-address-based';
@@ -56,26 +51,26 @@ export default class AdvancedLogic implements AdvancedLogicTypes.IAdvancedLogic
     erc20TransferableReceivable: Erc20TransferableReceivablePaymentNetwork;
   };
 
-  constructor(currencyManager?: ICurrencyManager) {
-    if (!currencyManager) {
-      currencyManager = CurrencyManager.getDefault();
-    }
+  private currencyManager: ICurrencyManager;
+
+  constructor(currencyManager: ICurrencyManager) {
+    this.currencyManager = currencyManager;
     this.extensions = {
-      addressBasedBtc: new AddressBasedBtc(),
-      addressBasedErc20: new AddressBasedErc20(),
-      addressBasedTestnetBtc: new AddressBasedTestnetBtc(),
+      addressBasedBtc: new AddressBasedBtc(currencyManager),
+      addressBasedErc20: new AddressBasedErc20(currencyManager),
+      addressBasedTestnetBtc: new AddressBasedTestnetBtc(currencyManager),
       contentData: new ContentData(),
       anyToErc20Proxy: new AnyToErc20Proxy(currencyManager),
       declarative: new Declarative(),
-      ethereumInputData: new EthereumInputData(),
-      feeProxyContractErc20: new FeeProxyContractErc20(),
-      proxyContractErc20: new ProxyContractErc20(),
-      erc777Stream: new Erc777Stream(),
-      feeProxyContractEth: new FeeProxyContractEth(),
+      ethereumInputData: new EthereumInputData(currencyManager),
+      feeProxyContractErc20: new FeeProxyContractErc20(currencyManager),
+      proxyContractErc20: new ProxyContractErc20(currencyManager),
+      erc777Stream: new Erc777Stream(currencyManager),
+      feeProxyContractEth: new FeeProxyContractEth(currencyManager),
       anyToEthProxy: new AnyToEthProxy(currencyManager),
-      nativeToken: [new NearNative(), new NearTestnetNative()],
+      nativeToken: [new NearNative(currencyManager), new NearTestnetNative(currencyManager)],
       anyToNativeToken: [new AnyToNear(currencyManager), new AnyToNearTestnet(currencyManager)],
-      erc20TransferableReceivable: new Erc20TransferableReceivablePaymentNetwork(),
+      erc20TransferableReceivable: new Erc20TransferableReceivablePaymentNetwork(currencyManager),
     };
   }
 
@@ -173,7 +168,7 @@ export default class AdvancedLogic implements AdvancedLogicTypes.IAdvancedLogic
 
   public getFeeProxyContractErc20ForNetwork(network?: string): FeeProxyContractErc20 {
     return NearChains.isChainSupported(network)
-      ? new FeeProxyContractErc20(undefined, undefined, network)
+      ? new FeeProxyContractErc20(this.currencyManager, undefined, undefined, network)
       : this.extensions.feeProxyContractErc20;
   }
 

diff --git a/packages/advanced-logic/src/extensions/payment-network/address-based.ts b/packages/advanced-logic/src/extensions/payment-network/address-based.ts
@@ -1,4 +1,4 @@
-import { CurrencyManager, UnsupportedCurrencyError } from '@requestnetwork/currency';
+import { ICurrencyManager, UnsupportedCurrencyError } from '@requestnetwork/currency';
 import {
   CurrencyTypes,
   ExtensionTypes,
@@ -16,6 +16,7 @@ export default abstract class AddressBasedPaymentNetwork<
   TCreationParameters extends ExtensionTypes.PnAddressBased.ICreationParameters = ExtensionTypes.PnAddressBased.ICreationParameters,
 > extends DeclarativePaymentNetwork<TCreationParameters> {
   protected constructor(
+    protected currencyManager: ICurrencyManager,
     extensionId: ExtensionTypes.PAYMENT_NETWORK_ID,
     currentVersion: string,
     public readonly supportedCurrencyType: RequestLogicTypes.CURRENCY,
@@ -162,12 +163,11 @@ export default abstract class AddressBasedPaymentNetwork<
     symbol: string,
     network: CurrencyTypes.ChainName,
   ): boolean {
-    const currencyManager = CurrencyManager.getDefault();
-    const currency = currencyManager.from(symbol, network);
+    const currency = this.currencyManager.from(symbol, network);
     if (!currency) {
       throw new UnsupportedCurrencyError({ value: symbol, network });
     }
-    return currencyManager.validateAddress(address, currency);
+    return this.currencyManager.validateAddress(address, currency);
   }
 
   /**

diff --git a/packages/advanced-logic/src/extensions/payment-network/any-to-erc20-proxy.ts b/packages/advanced-logic/src/extensions/payment-network/any-to-erc20-proxy.ts
@@ -10,12 +10,12 @@ const CURRENT_VERSION = '0.1.0';
 
 export default class AnyToErc20ProxyPaymentNetwork extends Erc20FeeProxyPaymentNetwork {
   public constructor(
-    private currencyManager: ICurrencyManager,
+    currencyManager: ICurrencyManager,
     extensionId: ExtensionTypes.PAYMENT_NETWORK_ID = ExtensionTypes.PAYMENT_NETWORK_ID
       .ANY_TO_ERC20_PROXY,
     currentVersion: string = CURRENT_VERSION,
   ) {
-    super(extensionId, currentVersion);
+    super(currencyManager, extensionId, currentVersion);
   }
 
   /**

diff --git a/packages/advanced-logic/src/extensions/payment-network/any-to-eth-proxy.ts b/packages/advanced-logic/src/extensions/payment-network/any-to-eth-proxy.ts
@@ -5,8 +5,8 @@ import EthereumFeeProxyPaymentNetwork from './ethereum/fee-proxy-contract';
 const CURRENT_VERSION = '0.2.0';
 
 export default class AnyToEthProxyPaymentNetwork extends EthereumFeeProxyPaymentNetwork {
-  public constructor(private currencyManager: ICurrencyManager) {
-    super(ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_ETH_PROXY, CURRENT_VERSION);
+  public constructor(currencyManager: ICurrencyManager) {
+    super(currencyManager, ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_ETH_PROXY, CURRENT_VERSION);
   }
 
   /**

diff --git a/packages/advanced-logic/src/extensions/payment-network/any-to-native.ts b/packages/advanced-logic/src/extensions/payment-network/any-to-native.ts
@@ -1,14 +1,16 @@
 import { FeeReferenceBasedPaymentNetwork } from './fee-reference-based';
 import { CurrencyTypes, ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types';
 import { InvalidPaymentAddressError, UnsupportedNetworkError } from './address-based';
+import { ICurrencyManager } from '@requestnetwork/currency';
 
 export default abstract class AnyToNativeTokenPaymentNetwork extends FeeReferenceBasedPaymentNetwork {
   protected constructor(
+    currencyManager: ICurrencyManager,
     extensionId: ExtensionTypes.PAYMENT_NETWORK_ID,
     currentVersion: string,
     public readonly supportedNetworks: CurrencyTypes.ChainName[],
   ) {
-    super(extensionId, currentVersion, RequestLogicTypes.CURRENCY.ETH);
+    super(currencyManager, extensionId, currentVersion, RequestLogicTypes.CURRENCY.ETH);
   }
 
   public createCreationAction(

diff --git a/packages/advanced-logic/src/extensions/payment-network/bitcoin/mainnet-address-based.ts b/packages/advanced-logic/src/extensions/payment-network/bitcoin/mainnet-address-based.ts
@@ -1,5 +1,6 @@
 import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types';
 import AddressBasedPaymentNetwork from '../address-based';
+import { ICurrencyManager } from '@requestnetwork/currency';
 
 const CURRENT_VERSION = '0.1.0';
 const BITCOIN_NETWORK = 'mainnet';
@@ -12,10 +13,11 @@ const BITCOIN_NETWORK = 'mainnet';
  */
 export default class BitcoinAddressBasedPaymentNetwork extends AddressBasedPaymentNetwork {
   public constructor(
+    currencyManager: ICurrencyManager,
     extensionId: ExtensionTypes.PAYMENT_NETWORK_ID = ExtensionTypes.PAYMENT_NETWORK_ID
       .BITCOIN_ADDRESS_BASED,
   ) {
-    super(extensionId, CURRENT_VERSION, RequestLogicTypes.CURRENCY.BTC);
+    super(currencyManager, extensionId, CURRENT_VERSION, RequestLogicTypes.CURRENCY.BTC);
   }
 
   protected isValidAddress(address: string): boolean {

diff --git a/packages/advanced-logic/src/extensions/payment-network/bitcoin/testnet-address-based.ts b/packages/advanced-logic/src/extensions/payment-network/bitcoin/testnet-address-based.ts
@@ -1,5 +1,6 @@
 import BitcoinAddressBasedPaymentNetwork from './mainnet-address-based';
 import { ExtensionTypes } from '@requestnetwork/types';
+import { ICurrencyManager } from '@requestnetwork/currency';
 
 const BITCOIN_NETWORK = 'testnet';
 
@@ -11,8 +12,8 @@ const BITCOIN_NETWORK = 'testnet';
  * Important: the addresses must be exclusive to the request
  */
 export default class BitcoinTestnetAddressBasedPaymentNetwork extends BitcoinAddressBasedPaymentNetwork {
-  public constructor() {
-    super(ExtensionTypes.PAYMENT_NETWORK_ID.TESTNET_BITCOIN_ADDRESS_BASED);
+  public constructor(currencyManager: ICurrencyManager) {
+    super(currencyManager, ExtensionTypes.PAYMENT_NETWORK_ID.TESTNET_BITCOIN_ADDRESS_BASED);
   }
 
   protected isValidAddress(address: string): boolean {

diff --git a/packages/advanced-logic/src/extensions/payment-network/erc20/address-based.ts b/packages/advanced-logic/src/extensions/payment-network/erc20/address-based.ts
@@ -1,5 +1,6 @@
 import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types';
 import AddressBasedPaymentNetwork from '../address-based';
+import { ICurrencyManager } from '@requestnetwork/currency';
 
 const CURRENT_VERSION = '0.1.0';
 
@@ -10,8 +11,9 @@ const CURRENT_VERSION = '0.1.0';
  * Important: the addresses must be exclusive to the request
  */
 export default class Erc20AddressBasedPaymentNetwork extends AddressBasedPaymentNetwork {
-  public constructor() {
+  public constructor(currencyManager: ICurrencyManager) {
     super(
+      currencyManager,
       ExtensionTypes.PAYMENT_NETWORK_ID.ERC20_ADDRESS_BASED,
       CURRENT_VERSION,
       RequestLogicTypes.CURRENCY.ERC20,

diff --git a/packages/advanced-logic/src/extensions/payment-network/erc20/fee-proxy-contract.ts b/packages/advanced-logic/src/extensions/payment-network/erc20/fee-proxy-contract.ts
@@ -1,5 +1,5 @@
 import { CurrencyTypes, ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types';
-import { NearChains, isSameChain } from '@requestnetwork/currency';
+import { ICurrencyManager, NearChains, isSameChain } from '@requestnetwork/currency';
 import { UnsupportedNetworkError } from '../address-based';
 import { FeeReferenceBasedPaymentNetwork } from '../fee-reference-based';
 
@@ -16,12 +16,14 @@ export default class Erc20FeeProxyPaymentNetwork<
    * @param network is only relevant for non-EVM chains (Near and Near testnet)
    */
   public constructor(
+    currencyManager: ICurrencyManager,
     extensionId: ExtensionTypes.PAYMENT_NETWORK_ID = ExtensionTypes.PAYMENT_NETWORK_ID
       .ERC20_FEE_PROXY_CONTRACT,
     currentVersion?: string | undefined,
     protected network?: string | undefined,
   ) {
     super(
+      currencyManager,
       extensionId,
       currentVersion ?? Erc20FeeProxyPaymentNetwork.getDefaultCurrencyVersion(network),
       RequestLogicTypes.CURRENCY.ERC20,

diff --git a/packages/advanced-logic/src/extensions/payment-network/erc20/proxy-contract.ts b/packages/advanced-logic/src/extensions/payment-network/erc20/proxy-contract.ts
@@ -1,4 +1,5 @@
 import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types';
+import { ICurrencyManager } from '@requestnetwork/currency';
 import ReferenceBasedPaymentNetwork from '../reference-based';
 
 const CURRENT_VERSION = '0.1.0';
@@ -9,8 +10,9 @@ const CURRENT_VERSION = '0.1.0';
 export default class Erc20ProxyPaymentNetwork<
   TCreationParameters extends ExtensionTypes.PnReferenceBased.ICreationParameters = ExtensionTypes.PnReferenceBased.ICreationParameters,
 > extends ReferenceBasedPaymentNetwork<TCreationParameters> {
-  public constructor() {
+  public constructor(currencyManager: ICurrencyManager) {
     super(
+      currencyManager,
       ExtensionTypes.PAYMENT_NETWORK_ID.ERC20_PROXY_CONTRACT,
       CURRENT_VERSION,
       RequestLogicTypes.CURRENCY.ERC20,

diff --git a/packages/advanced-logic/src/extensions/payment-network/erc20/transferable-receivable.ts b/packages/advanced-logic/src/extensions/payment-network/erc20/transferable-receivable.ts
@@ -1,5 +1,6 @@
 import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types';
 import { FeeReferenceBasedPaymentNetwork } from '../fee-reference-based';
+import { ICurrencyManager } from '@requestnetwork/currency';
 
 const CURRENT_VERSION = '0.2.0';
 
@@ -10,10 +11,11 @@ export default class Erc20TransferableReceivablePaymentNetwork<
   TCreationParameters extends ExtensionTypes.PnFeeReferenceBased.ICreationParameters = ExtensionTypes.PnFeeReferenceBased.ICreationParameters,
 > extends FeeReferenceBasedPaymentNetwork<TCreationParameters> {
   public constructor(
+    currencyManager: ICurrencyManager,
     extensionId: ExtensionTypes.PAYMENT_NETWORK_ID = ExtensionTypes.PAYMENT_NETWORK_ID
       .ERC20_TRANSFERABLE_RECEIVABLE,
     currentVersion: string = CURRENT_VERSION,
   ) {
-    super(extensionId, currentVersion, RequestLogicTypes.CURRENCY.ERC20);
+    super(currencyManager, extensionId, currentVersion, RequestLogicTypes.CURRENCY.ERC20);
   }
 }
diff --git a/packages/advanced-logic/src/extensions/payment-network/erc777/stream.ts b/packages/advanced-logic/src/extensions/payment-network/erc777/stream.ts
@@ -1,6 +1,7 @@
 import { ExtensionTypes, RequestLogicTypes, TypesUtils } from '@requestnetwork/types';
 import ReferenceBasedPaymentNetwork from '../reference-based';
 import { isValidAmount } from '@requestnetwork/utils';
+import { ICurrencyManager } from '@requestnetwork/currency';
 const CURRENT_VERSION = '0.1.0';
 
 /**
@@ -9,8 +10,9 @@ const CURRENT_VERSION = '0.1.0';
 export default class Erc777StreamPaymentNetwork<
   TCreationParameters extends ExtensionTypes.PnStreamReferenceBased.ICreationParameters = ExtensionTypes.PnStreamReferenceBased.ICreationParameters,
 > extends ReferenceBasedPaymentNetwork<TCreationParameters> {
-  public constructor() {
+  public constructor(currencyManager: ICurrencyManager) {
     super(
+      currencyManager,
       ExtensionTypes.PAYMENT_NETWORK_ID.ERC777_STREAM,
       CURRENT_VERSION,
       RequestLogicTypes.CURRENCY.ERC777,

diff --git a/packages/advanced-logic/src/extensions/payment-network/ethereum/fee-proxy-contract.ts b/packages/advanced-logic/src/extensions/payment-network/ethereum/fee-proxy-contract.ts
@@ -1,5 +1,6 @@
 import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types';
 import { FeeReferenceBasedPaymentNetwork } from '../fee-reference-based';
+import { ICurrencyManager } from '@requestnetwork/currency';
 
 const CURRENT_VERSION = '0.2.0';
 
@@ -10,10 +11,11 @@ export default class EthereumFeeProxyPaymentNetwork<
   TCreationParameters extends ExtensionTypes.PnFeeReferenceBased.ICreationParameters = ExtensionTypes.PnFeeReferenceBased.ICreationParameters,
 > extends FeeReferenceBasedPaymentNetwork<TCreationParameters> {
   public constructor(
+    currencyManager: ICurrencyManager,
     extensionId: ExtensionTypes.PAYMENT_NETWORK_ID = ExtensionTypes.PAYMENT_NETWORK_ID
       .ETH_FEE_PROXY_CONTRACT,
     currentVersion: string = CURRENT_VERSION,
   ) {
-    super(extensionId, currentVersion, RequestLogicTypes.CURRENCY.ETH);
+    super(currencyManager, extensionId, currentVersion, RequestLogicTypes.CURRENCY.ETH);
   }
 }
diff --git a/packages/advanced-logic/src/extensions/payment-network/ethereum/input-data.ts b/packages/advanced-logic/src/extensions/payment-network/ethereum/input-data.ts
@@ -1,5 +1,6 @@
 import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types';
 import ReferenceBasedPaymentNetwork from '../reference-based';
+import { ICurrencyManager } from '@requestnetwork/currency';
 
 const CURRENT_VERSION = '0.3.0';
 
@@ -9,10 +10,11 @@ const CURRENT_VERSION = '0.3.0';
  */
 export default class EthInputPaymentNetwork extends ReferenceBasedPaymentNetwork {
   public constructor(
+    currencyManager: ICurrencyManager,
     extensionId: ExtensionTypes.PAYMENT_NETWORK_ID = ExtensionTypes.PAYMENT_NETWORK_ID
       .ETH_INPUT_DATA,
     currentVersion: string = CURRENT_VERSION,
   ) {
-    super(extensionId, currentVersion, RequestLogicTypes.CURRENCY.ETH);
+    super(currencyManager, extensionId, currentVersion, RequestLogicTypes.CURRENCY.ETH);
   }
 }
diff --git a/packages/advanced-logic/src/extensions/payment-network/fee-reference-based.ts b/packages/advanced-logic/src/extensions/payment-network/fee-reference-based.ts
@@ -1,6 +1,7 @@
 import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types';
 import ReferenceBasedPaymentNetwork from './reference-based';
 import { areEqualIdentities, deepCopy, isValidAmount } from '@requestnetwork/utils';
+import { ICurrencyManager } from '@requestnetwork/currency';
 
 /**
  * Core of the reference based with fee payment networks
@@ -10,11 +11,12 @@ export abstract class FeeReferenceBasedPaymentNetwork<
   TCreationParameters extends ExtensionTypes.PnFeeReferenceBased.ICreationParameters = ExtensionTypes.PnFeeReferenceBased.ICreationParameters,
 > extends ReferenceBasedPaymentNetwork<TCreationParameters> {
   protected constructor(
+    currencyManager: ICurrencyManager,
     extensionId: ExtensionTypes.PAYMENT_NETWORK_ID,
     currentVersion: string,
     supportedCurrencyType: RequestLogicTypes.CURRENCY,
   ) {
-    super(extensionId, currentVersion, supportedCurrencyType);
+    super(currencyManager, extensionId, currentVersion, supportedCurrencyType);
     this.actions = {
       ...this.actions,
       [ExtensionTypes.PnFeeReferenceBased.ACTION.ADD_FEE]: this.applyAddFee.bind(this),

diff --git a/packages/advanced-logic/src/extensions/payment-network/native-token.ts b/packages/advanced-logic/src/extensions/payment-network/native-token.ts
@@ -2,17 +2,19 @@ import { CurrencyTypes, ExtensionTypes, RequestLogicTypes } from '@requestnetwor
 import { InvalidPaymentAddressError, UnsupportedNetworkError } from './address-based';
 
 import ReferenceBasedPaymentNetwork from './reference-based';
+import { ICurrencyManager } from '@requestnetwork/currency';
 
 /**
  * Implementation of the payment network to pay in ETH based on input data.
  */
 export default abstract class NativeTokenPaymentNetwork extends ReferenceBasedPaymentNetwork {
   public constructor(
+    currencyManager: ICurrencyManager,
     extensionId: ExtensionTypes.PAYMENT_NETWORK_ID,
     currentVersion: string,
     public readonly supportedNetworks: CurrencyTypes.ChainName[],
   ) {
-    super(extensionId, currentVersion, RequestLogicTypes.CURRENCY.ETH);
+    super(currencyManager, extensionId, currentVersion, RequestLogicTypes.CURRENCY.ETH);
   }
 
   public createCreationAction(

diff --git a/packages/advanced-logic/src/extensions/payment-network/near-native.ts b/packages/advanced-logic/src/extensions/payment-network/near-native.ts
diff --git a/packages/advanced-logic/src/extensions/payment-network/near/any-to-near.ts b/packages/advanced-logic/src/extensions/payment-network/near/any-to-near.ts
@@ -11,15 +11,20 @@ const CURRENT_VERSION = '0.1.0';
 
 export default class AnyToNearPaymentNetwork extends AnyToNativeTokenPaymentNetwork {
   public constructor(
-    private currencyManager: ICurrencyManager,
+    currencyManager: ICurrencyManager,
     supportedNetworks: CurrencyTypes.NearChainName[] = [
       'aurora',
       // FIXME: enable near network support
       // 'near'
     ],
     currentVersion: string = CURRENT_VERSION,
   ) {
-    super(ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_NATIVE_TOKEN, currentVersion, supportedNetworks);
+    super(
+      currencyManager,
+      ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_NATIVE_TOKEN,
+      currentVersion,
+      supportedNetworks,
+    );
   }
 
   /**